From c962365315fb42b07df962941419310d7dcd5feb Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Fri, 8 Jun 2007 11:51:56 +0000 Subject: re-sync after the big svn loss --- Makefile | 6 +- boot.config | 1 + common.inc | 51 ++------- dia_kernel_option.inc | 95 ++++++++++++++++ grub-gfxmenu | 11 +- help.inc | 2 +- install.config | 1 + locale.inc | 8 +- panel.inc | 12 +- po/bg.po | 4 + po/bootloader.pot | 4 + po/br.pot | 277 --------------------------------------------- po/br.potnofuz | 291 ----------------------------------------------- po/br.potnofuz1 | 291 ----------------------------------------------- po/bs.po | 4 + po/cs.po | 4 + po/cy.po | 4 + po/da.po | 4 + po/de.po | 4 + po/el.po | 4 + po/es.po | 31 ++--- po/et.po | 6 +- po/fi.po | 4 + po/fr.po | 6 +- po/he.po | 305 ++++++++++++++++++++++++++++++++++++++++++++++++++ po/hu.po | 22 ++-- po/id.po | 4 + po/is.po | 4 + po/it.po | 4 + po/ja.po | 23 ++-- po/lt.po | 4 + po/ltg.po | 4 + po/mk.po | 4 + po/nb.po | 4 + po/nl.po | 31 ++--- po/nn.po | 4 + po/pl.po | 24 ++-- po/pt.po | 4 + po/pt_BR.po | 26 +++-- po/ro.po | 4 + po/ru.po | 4 + po/sk.po | 4 + po/sl.po | 4 + po/sr.po | 4 + po/sr@Latn.po | 4 + po/sv.po | 4 + po/uk.po | 4 + po/wa.po | 4 + po/zh_CN.po | 14 ++- po/zh_TW.po | 4 + system.inc | 20 ---- 51 files changed, 656 insertions(+), 1010 deletions(-) create mode 100644 dia_kernel_option.inc delete mode 100644 po/br.pot delete mode 100644 po/br.potnofuz delete mode 100644 po/br.potnofuz1 create mode 100644 po/he.po diff --git a/Makefile b/Makefile index 7cfc948..d357985 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ NAME=mandriva-gfxboot-theme PACKAGE=mandriva-gfxboot-theme -VERSION := 0.14 +VERSION := 0.21 BINDIR := /usr/sbin/ -PRODUCT = "Mandriva Linux 2007" +PRODUCT = "Mandriva Linux 2007 Spring" export PRODUCT HELP2TXT = $(BINDIR)/help2txt @@ -30,7 +30,7 @@ IN_CPIO_BOOT = $(in_cpio_always) langs $(HELPBOOT_ALL) $(PIC_BOOT) OUTSIDE_CPIO_INST = langs $(HELPINST_ALL) $(PIC_INSTALL) #- NB: we can't put things outside cpio for grub -FILES = 16x16.fnt $(PIC_INSTALL) $(PIC_BOOT) $(INCLUDES) help*.html Makefile po install.config boot.config gimp/scripts/gimp-normalize-to-bootsplash.scm langs grub-gfxmenu +FILES = 16x16.fnt $(PIC_INSTALL) $(PIC_BOOT) $(INCLUDES) help*.html Makefile po install.config boot.config langs grub-gfxmenu sharedir=$(prefix)/usr/share themedir=$(sharedir)/gfxboot/themes/Mandriva diff --git a/boot.config b/boot.config index 0ae6030..cde4c4b 100644 --- a/boot.config +++ b/boot.config @@ -17,6 +17,7 @@ %% include dia_splash.inc %% include dia_lang.inc %% include dia_dud.inc +%% include dia_kernel_option.inc %% include dia_help.inc %% include dia_profile.inc %% include dia_install.inc diff --git a/common.inc b/common.inc index 67ee788..61a0965 100644 --- a/common.inc +++ b/common.inc @@ -58,19 +58,6 @@ } def -% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -% -% Enough memory? -% -% ( ) ==> ( true|false ) -% -/enough_mem { - biosmem 4 20 shl lt - biosmem livecd.mem.check 20 shl ge or - syslinux not or -} def - - % - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - % % Check if there are boot directories for 32 & 64bit. @@ -389,6 +376,12 @@ } { pop } ifelse } if + xmenu.kernel_option { + kernel_option.list xmenu.kernel_option .xm_current get get dup "" ne { + "%s " bc.cmd dup length add sprintf + } { pop } ifelse + } if + xmenu.profile { profile.options xmenu.profile .xm_current get get dup "" ne { "%s " bc.cmd dup length add sprintf @@ -562,11 +555,6 @@ window.show syslinux { - enough_mem not livecd and { - - notimeout nomem_popup - - } { 32+64bit_source not { @@ -578,7 +566,6 @@ } if - } ifelse } if } def @@ -1041,7 +1028,7 @@ dup "linux" eq { pop txt_install return } if dup "failsafe" eq { pop txt_safe_install return } if } ifelse - dup "live" eq { pop "Mandriva One" return } if + dup "live" eq { pop txt_linux return } if dup "noacpi" eq { pop txt_noacpi_install return } if dup "noapic" eq { pop txt_noapic_install return } if dup "nolapic" eq { pop txt_nolapic_install return } if @@ -1187,7 +1174,6 @@ over exch 0 exch put 1 add } forall - tmp 2 0 put % only short locale name tmp dup setlang pop setkeymap } { pop @@ -1458,29 +1444,6 @@ } def -% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -% Warn that we don't have enough memory. -% -% ( ) ==> ( ) -% -/nomem_popup { - window.dialog - - dup .title "Not enough memory" put - dup .text - livecd.mem.show - "Sorry, but Mandriva needs at least %dMB main memory." - dup length 32 add string dup 4 1 roll sprintf - put - dup .buttons [ - button.reboot button.default actReboot actNoClose or button.setaction - ] put - dup window.init - window.show - -} def - - % - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - % Show "power off" popup. % diff --git a/dia_kernel_option.inc b/dia_kernel_option.inc new file mode 100644 index 0000000..c1e9a96 --- /dev/null +++ b/dia_kernel_option.inc @@ -0,0 +1,95 @@ +% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +% +% kernel option selection dialog. +% +% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + +% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +% Some global vars. +% +/kernel_option.list [ + "" + "noapic" + "nolapic" + "acpi=off" + "acpi=ht" + "pci=nomsi" + "pci=nommconf" + "reboot=b" +] def + + +% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +% Build menu list. +% +% ( ) ==> ( ) +% +/kernel_option.init { + /xmenu.kernel_option .xm_size array def + + /xmenu xmenu.kernel_option def + + xmenu .xm_current 0 put + xmenu .xm_list kernel_option.list put + + xmenu .xm_title /txt_kernel_option put + + pmenu.init +} def + + +% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +% Update bit selection menu. +% +% ( ) ==> ( ) +% +/kernel_option.update { + /xmenu xmenu.kernel_option def + + /window.action actRedrawPanel def + + pmenu.update +} def + + +% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +% Show bit selection menu. +% +% ( ) => ( ) +% +/panel.kernel_option { + "kernel_option" help.setcontext + + window.xmenu + dup .xmenu xmenu.kernel_option put + dup .xmenu.update /kernel_option.update put + dup window.init + window.show +} def + + +% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +% Return width of panel entry. +% +% ( ) => ( width ) +% +/panel.kernel_option.width { + /xmenu xmenu.kernel_option def + + pmenu.width +} def + + +% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +% Redraw panel entry. +% +% ( panel ) => ( ) +% +/panel.kernel_option.update { + /xmenu xmenu.kernel_option def + + pmenu.panel.update +} def + + diff --git a/grub-gfxmenu b/grub-gfxmenu index 28b0efe..9da113a 100755 --- a/grub-gfxmenu +++ b/grub-gfxmenu @@ -8,15 +8,22 @@ my %options = ( "lang=s" => \ (my $lang), "update-theme" => \ (my $update_theme), "update-gfxmenu" => \ (my $update_gfxmenu), + "quiet" => \ (my $quiet), ); GetOptions(%options) && @ARGV == 0 && ($lang || $update_theme || $update_gfxmenu) or usage(); if ($update_gfxmenu) { $update_theme = 1; - $lang ||= get_lang(); + $lang ||= eval { get_lang() }; sys('cp', '/usr/share/gfxboot/themes/Mandriva/boot/message', $gfxmenu); } + +if (!-e $gfxmenu) { + warn "$gfxmenu doesn't exist\n" if !$quiet; + exit; +} + if ($lang) { set_lang($lang); } @@ -25,7 +32,7 @@ if ($update_theme) { } sub usage { - die "grub-gfxmenu [--lang ] [--update-theme] [--update-gfxmenu]\n"; + die "grub-gfxmenu [--quiet] [--lang ] [--update-theme] [--update-gfxmenu]\n"; } sub set_theme() { diff --git a/help.inc b/help.inc index 58f79d9..1ece9b0 100644 --- a/help.inc +++ b/help.inc @@ -65,7 +65,7 @@ clip.size pop 800 eq { dup "o_gateway" eq { pop "network" } if dup "o_pci" eq { pop "o_acpi" } if - syslinux not livecd or { + syslinux { % only help, startup, keytable and option pages dup "o_" strstr 1 ne { dup "help" ne diff --git a/install.config b/install.config index e77d02f..8ae85b9 100644 --- a/install.config +++ b/install.config @@ -14,6 +14,7 @@ %% include dia_splash.inc %% include dia_lang.inc %% include dia_dud.inc +%% include dia_kernel_option.inc %% include dia_help.inc %% include dia_profile.inc %% include dia_install.inc diff --git a/locale.inc b/locale.inc index e50d4d7..ff139b4 100644 --- a/locale.inc +++ b/locale.inc @@ -28,6 +28,7 @@ } def +/config.keymap.locale_short 2 string def % - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - % Set keyboard map. @@ -39,8 +40,13 @@ /config.keymap.locale exch def + config.keymap.locale 1 get config.keymap.locale 0 get "%c%c" config.keymap.locale_short sprintf + keymaps { - dup .km.locale get config.keymap.locale eq { + dup .km.locale get dup + config.keymap.locale eq exch + config.keymap.locale_short eq or + { .km.map get /config.keymap exch def exit } { pop } ifelse } forall diff --git a/panel.inc b/panel.inc index cd3376f..356f840 100644 --- a/panel.inc +++ b/panel.inc @@ -40,9 +40,9 @@ livecd { - [ keyF2 0 "F2" /panel.video /panel.video.width /panel.video.update /video.init ] - [ keyF3 0 "F3" /panel.splash /panel.splash.width /panel.splash.update /splash.init ] - [ keyF4 0 "F4" /panel.lang /panel.lang.width /panel.lang.update /lang.init ] + [ keyF2 0 "F2" /panel.lang /panel.lang.width /panel.lang.update /lang.init ] + [ keyF3 0 "F3" /panel.video /panel.video.width /panel.video.update /video.init ] + [ keyF4 0 "F4" /panel.kernel_option /panel.kernel_option.width /panel.kernel_option.update /kernel_option.init ] } { @@ -50,6 +50,7 @@ [ keyF3 0 "F3" /panel.video /panel.video.width /panel.video.update /video.init ] [ keyF4 0 "F4" /panel.install /panel.install.width /panel.install.update /install.init ] [ keyF5 0 "F5" /panel.dud /panel.dud.width /panel.dud.update /dud.init ] + [ keyF6 0 "F6" /panel.kernel_option /panel.kernel_option.width /panel.kernel_option.update /kernel_option.init ] 32+64bit_source { 64bit { @@ -57,7 +58,7 @@ 64bit_boot_dir .undef ne 32bit_boot_dir 64bit_boot_dir ne and and { - [ keyF6 0 "F6" /panel.bits /panel.bits.width /panel.bits.update /bits.init ] + [ keyF7 0 "F7" /panel.bits /panel.bits.width /panel.bits.update /bits.init ] } if } if } if @@ -180,9 +181,6 @@ % only for install CDs syslinux not { return } if - % not for live cd - livecd { return } if - % not for F1 dup keyF1 eq { return } if diff --git a/po/bg.po b/po/bg.po index 888e7c7..9f19c0c 100644 --- a/po/bg.po +++ b/po/bg.po @@ -324,3 +324,7 @@ msgstr "" msgid "Linux with kernel %s" msgstr "" +#. txt_kernel_option +msgid "Kernel Option" +msgstr "" + diff --git a/po/bootloader.pot b/po/bootloader.pot index 32e065f..d43db82 100644 --- a/po/bootloader.pot +++ b/po/bootloader.pot @@ -288,3 +288,7 @@ msgstr "" msgid "Linux with kernel %s" msgstr "" +#. txt_kernel_option +msgid "Kernel Option" +msgstr "" + diff --git a/po/br.pot b/po/br.pot deleted file mode 100644 index 6646c98..0000000 --- a/po/br.pot +++ /dev/null @@ -1,277 +0,0 @@ -# LANGUAGE translations for boot loader -# Copyright (C) 2005 SUSE Linux GmbH -# -msgid "" -msgstr "" -"Project-Id-Version: bootloader\n" -"POT-Creation-Date: 2005-07-27 11:49+0200\n" -"PO-Revision-Date: 2007-03-19 14:38+0100\n" -"Last-Translator: Thierry Vignaud \n" -"Language-Team: breton \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. txt_ok -msgid "OK" -msgstr "Mat eo" - -#. txt_cancel -msgid "Cancel" -msgstr "Nullañ" - -#. txt_reboot -msgid "Reboot" -msgstr "Adlañsañ" - -#. txt_continue -msgid "Continue" -msgstr "Kenderc'hel" - -#. txt_manual_install -msgid "Manual Installation" -msgstr "" - -#. txt_noacpi_install -msgid "Installation--ACPI Disabled" -msgstr "" - -#. txt_safe_install -msgid "Installation--Safe Settings" -msgstr "" - -#. txt_boot_harddisk -msgid "Boot from Hard Disk" -msgstr "Loc'hañ eus ar bladenn" - -#. txt_rescue -msgid "Rescue System" -msgstr "" - -#. txt_memtest -msgid "Memory Test" -msgstr "" - -#. txt_bootoptions -msgid "Boot Options" -msgstr "Dibaboù loc'hañ" - -#. txt_exit_title (see txt_exit_dialog) -msgid "Exiting..." -msgstr "Emaon o kuitaat ..." - -#. txt_exit_dialog -msgid "" -"You are leaving the graphical boot menu and\n" -"starting the text mode interface." -msgstr "" - -#. txt_help -msgid "Help" -msgstr "Skoazell" - -#. txt_load_kernel_title -msgid "Starting..." -msgstr "O loc'hañ ..." - -# Keep the three newlines! -#. txt_load_kernel -msgid "Loading Linux Kernel\n\n\n" -msgstr "O kargañ kalon Linux\n\n\n" - -# Keep the three newlines! -#. txt_load_memtest -msgid "Loading memtest86\n\n\n" -msgstr "O kargañ memtest86\n\n\n" - -# info box title -#. txt_info_title -msgid "Boot loader" -msgstr "" - -# error box title -#. txt_error_title -msgid "I/O error" -msgstr "" - -# boot disk change dialog title -#. txt_change_disk_title -msgid "Change Boot Disk" -msgstr "" - -#. txt_insert_disk -#, c-format -msgid "Insert boot disk %u." -msgstr "" - -#. txt_insert_disk2 -#, c-format -msgid "" -"This is boot disk %u.\n" -"Insert boot disk %u." -msgstr "" - -# is e.g. SuSE Linux X.Y or Enterprise Server Z -#. txt_insert_disk3 -#, c-format -msgid "" -"This is not a boot disk.\n" -"Please insert boot disk %u." -msgstr "" - -#. txt_password_title -msgid "Password" -msgstr "Tremenger" - -# Keep the newlines and spaces after ':'! -#. txt_password -msgid "Enter your password: \n\n\n" -msgstr "" - -#. txt_dud_ready -msgid "Get your driver update floppy ready." -msgstr "" - -# dvd warning title -#. txt_dvd_warning_title -msgid "DVD Error" -msgstr "" - -#. txt_dvd_warning2 -msgid "" -"This is a two-sided DVD. You have booted from the second side.\n" -"\n" -"Turn the DVD over then continue." -msgstr "" - -# power off dialog title -#. txt_power_off_title -msgid "Power Off" -msgstr "" - -#. txt_power_off -msgid "Halt the system now?" -msgstr "" - -#. txt_harddisk -msgid "Hard Disk" -msgstr "Pladenn" - -# dialog title for hard disk installation -#. txt_harddisk_title -msgid "Hard Disk Installation" -msgstr "" - -#. txt_hd_diskdevice -msgid "Disk Device (scan all disks if empty)\n" -msgstr "" - -#. txt_directory -msgid "Directory\n" -msgstr "" - -# dialog title for ftp installation -#. txt_ftp_title -msgid "FTP Installation" -msgstr "" - -#. txt_server -msgid "Server\n" -msgstr "" - -#. txt_password -msgid "Password\n" -msgstr "" - -# label for ftp user input -#. txt_user1 -msgid "User (anonymous login if empty)\n" -msgstr "" - -# dialog title for nfs installation -#. txt_nfs_title -msgid "NFS Installation" -msgstr "" - -# label for smb user input -#. txt_user2 -msgid "User (using \"guest\" if empty)\n" -msgstr "" - -# dialog title for ISO installation -#. txt_iso_title -msgid "Installation from ISO file" -msgstr "" - -# dialog title for http installation -#. txt_http_title -msgid "HTTP Installation" -msgstr "" - -#. txt_driver_update -msgid "Driver" -msgstr "Sturier" - -# as in Windows Authentication Domain -#. txt_domain -msgid "Domain\n" -msgstr "" - -#. txt_other_options -msgid "Other Options" -msgstr "Dibarzhoù all" - -#. txt_language -msgid "Language" -msgstr "Yezh" - -#. txt_apic -msgid "Installation--IOAPIC Enabled" -msgstr "" - -#. txt_noapic_install -msgid "Installation--IOAPIC Disabled" -msgstr "" - -#. txt_nolapic_install -msgid "Installation--Local APIC Disabled" -msgstr "" - -#. txt_yes -msgid "Yes" -msgstr "Ya" - -#. txt_no -msgid "No" -msgstr "N'eo ket" - -#. txt_file -msgid "File" -msgstr "Restr" - -# input label: share as in "Windows share" (SMB) -#. txt_share -msgid "Share\n" -msgstr "" - -#. txt_linux -msgid "Boot Mandriva Linux 2007 Spring" -msgstr "" - -#. txt_windows -msgid "Boot Microsoft Windows" -msgstr "" - -#. txt_install -msgid "Install Mandriva Linux 2007 Spring on your system" -msgstr "" - -#. txt_safe_linux -msgid "Boot Mandriva Linux 2007 Spring (safe mode)" -msgstr "" - -#. txt_linux_kernel_version -#, c-format -msgid "Linux with kernel %s" -msgstr "" - diff --git a/po/br.potnofuz b/po/br.potnofuz deleted file mode 100644 index 13a5cff..0000000 --- a/po/br.potnofuz +++ /dev/null @@ -1,291 +0,0 @@ -# LANGUAGE translations for boot loader -# Copyright (C) 2005 SUSE Linux GmbH -# -msgid "" -msgstr "" -"Project-Id-Version: bootloader\n" -"POT-Creation-Date: 2005-07-27 11:49+0200\n" -"PO-Revision-Date: 2007-03-19 14:38+0100\n" -"Last-Translator: Thierry Vignaud \n" -"Language-Team: breton \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. txt_ok -msgid "OK" -msgstr "Mat eo" - -#. txt_cancel -msgid "Cancel" -msgstr "Nullañ" - -#. txt_reboot -msgid "Reboot" -msgstr "Adlañsañ" - -#. txt_continue -msgid "Continue" -msgstr "Kenderc'hel" - -#. txt_manual_install -msgid "Manual Installation" -msgstr "" - -#. txt_noacpi_install -msgid "Installation--ACPI Disabled" -msgstr "" - -#. txt_safe_install -msgid "Installation--Safe Settings" -msgstr "" - -#. txt_boot_harddisk -msgid "Boot from Hard Disk" -msgstr "Loc'hañ eus ar bladenn" - -#. txt_rescue -msgid "Rescue System" -msgstr "" - -#. txt_memtest -msgid "Memory Test" -msgstr "" - -#. txt_bootoptions -msgid "Boot Options" -msgstr "Dibaboù loc'hañ" - -#. txt_exit_title (see txt_exit_dialog) -msgid "Exiting..." -msgstr "Emaon o kuitaat ..." - -#. txt_exit_dialog -msgid "" -"You are leaving the graphical boot menu and\n" -"starting the text mode interface." -msgstr "" - -#. txt_help -msgid "Help" -msgstr "Skoazell" - -#. txt_load_kernel_title -msgid "Starting..." -msgstr "O loc'hañ ..." - -# Keep the three newlines! -#. txt_load_kernel -msgid "" -"Loading Linux Kernel\n" -"\n" -"\n" -msgstr "" -"O kargañ kalon Linux\n" -"\n" -"\n" - -# Keep the three newlines! -#. txt_load_memtest -msgid "" -"Loading memtest86\n" -"\n" -"\n" -msgstr "" -"O kargañ memtest86\n" -"\n" -"\n" - -# info box title -#. txt_info_title -msgid "Boot loader" -msgstr "" - -# error box title -#. txt_error_title -msgid "I/O error" -msgstr "" - -# boot disk change dialog title -#. txt_change_disk_title -msgid "Change Boot Disk" -msgstr "" - -#. txt_insert_disk -#, c-format -msgid "Insert boot disk %u." -msgstr "" - -#. txt_insert_disk2 -#, c-format -msgid "" -"This is boot disk %u.\n" -"Insert boot disk %u." -msgstr "" - -# is e.g. SuSE Linux X.Y or Enterprise Server Z -#. txt_insert_disk3 -#, c-format -msgid "" -"This is not a boot disk.\n" -"Please insert boot disk %u." -msgstr "" - -#. txt_password_title -msgid "Password" -msgstr "Tremenger" - -# Keep the newlines and spaces after ':'! -#. txt_password -msgid "" -"Enter your password: \n" -"\n" -"\n" -msgstr "" - -#. txt_dud_ready -msgid "Get your driver update floppy ready." -msgstr "" - -# dvd warning title -#. txt_dvd_warning_title -msgid "DVD Error" -msgstr "" - -#. txt_dvd_warning2 -msgid "" -"This is a two-sided DVD. You have booted from the second side.\n" -"\n" -"Turn the DVD over then continue." -msgstr "" - -# power off dialog title -#. txt_power_off_title -msgid "Power Off" -msgstr "" - -#. txt_power_off -msgid "Halt the system now?" -msgstr "" - -#. txt_harddisk -msgid "Hard Disk" -msgstr "Pladenn" - -# dialog title for hard disk installation -#. txt_harddisk_title -msgid "Hard Disk Installation" -msgstr "" - -#. txt_hd_diskdevice -msgid "Disk Device (scan all disks if empty)\n" -msgstr "" - -#. txt_directory -msgid "Directory\n" -msgstr "" - -# dialog title for ftp installation -#. txt_ftp_title -msgid "FTP Installation" -msgstr "" - -#. txt_server -msgid "Server\n" -msgstr "" - -#. txt_password -msgid "Password\n" -msgstr "" - -# label for ftp user input -#. txt_user1 -msgid "User (anonymous login if empty)\n" -msgstr "" - -# dialog title for nfs installation -#. txt_nfs_title -msgid "NFS Installation" -msgstr "" - -# label for smb user input -#. txt_user2 -msgid "User (using \"guest\" if empty)\n" -msgstr "" - -# dialog title for ISO installation -#. txt_iso_title -msgid "Installation from ISO file" -msgstr "" - -# dialog title for http installation -#. txt_http_title -msgid "HTTP Installation" -msgstr "" - -#. txt_driver_update -msgid "Driver" -msgstr "Sturier" - -# as in Windows Authentication Domain -#. txt_domain -msgid "Domain\n" -msgstr "" - -#. txt_other_options -msgid "Other Options" -msgstr "Dibarzhoù all" - -#. txt_language -msgid "Language" -msgstr "Yezh" - -#. txt_apic -msgid "Installation--IOAPIC Enabled" -msgstr "" - -#. txt_noapic_install -msgid "Installation--IOAPIC Disabled" -msgstr "" - -#. txt_nolapic_install -msgid "Installation--Local APIC Disabled" -msgstr "" - -#. txt_yes -msgid "Yes" -msgstr "Ya" - -#. txt_no -msgid "No" -msgstr "N'eo ket" - -#. txt_file -msgid "File" -msgstr "Restr" - -# input label: share as in "Windows share" (SMB) -#. txt_share -msgid "Share\n" -msgstr "" - -#. txt_linux -msgid "Boot Mandriva Linux 2007 Spring" -msgstr "" - -#. txt_windows -msgid "Boot Microsoft Windows" -msgstr "" - -#. txt_install -msgid "Install Mandriva Linux 2007 Spring on your system" -msgstr "" - -#. txt_safe_linux -msgid "Boot Mandriva Linux 2007 Spring (safe mode)" -msgstr "" - -#. txt_linux_kernel_version -#, c-format -msgid "Linux with kernel %s" -msgstr "" diff --git a/po/br.potnofuz1 b/po/br.potnofuz1 deleted file mode 100644 index 13a5cff..0000000 --- a/po/br.potnofuz1 +++ /dev/null @@ -1,291 +0,0 @@ -# LANGUAGE translations for boot loader -# Copyright (C) 2005 SUSE Linux GmbH -# -msgid "" -msgstr "" -"Project-Id-Version: bootloader\n" -"POT-Creation-Date: 2005-07-27 11:49+0200\n" -"PO-Revision-Date: 2007-03-19 14:38+0100\n" -"Last-Translator: Thierry Vignaud \n" -"Language-Team: breton \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. txt_ok -msgid "OK" -msgstr "Mat eo" - -#. txt_cancel -msgid "Cancel" -msgstr "Nullañ" - -#. txt_reboot -msgid "Reboot" -msgstr "Adlañsañ" - -#. txt_continue -msgid "Continue" -msgstr "Kenderc'hel" - -#. txt_manual_install -msgid "Manual Installation" -msgstr "" - -#. txt_noacpi_install -msgid "Installation--ACPI Disabled" -msgstr "" - -#. txt_safe_install -msgid "Installation--Safe Settings" -msgstr "" - -#. txt_boot_harddisk -msgid "Boot from Hard Disk" -msgstr "Loc'hañ eus ar bladenn" - -#. txt_rescue -msgid "Rescue System" -msgstr "" - -#. txt_memtest -msgid "Memory Test" -msgstr "" - -#. txt_bootoptions -msgid "Boot Options" -msgstr "Dibaboù loc'hañ" - -#. txt_exit_title (see txt_exit_dialog) -msgid "Exiting..." -msgstr "Emaon o kuitaat ..." - -#. txt_exit_dialog -msgid "" -"You are leaving the graphical boot menu and\n" -"starting the text mode interface." -msgstr "" - -#. txt_help -msgid "Help" -msgstr "Skoazell" - -#. txt_load_kernel_title -msgid "Starting..." -msgstr "O loc'hañ ..." - -# Keep the three newlines! -#. txt_load_kernel -msgid "" -"Loading Linux Kernel\n" -"\n" -"\n" -msgstr "" -"O kargañ kalon Linux\n" -"\n" -"\n" - -# Keep the three newlines! -#. txt_load_memtest -msgid "" -"Loading memtest86\n" -"\n" -"\n" -msgstr "" -"O kargañ memtest86\n" -"\n" -"\n" - -# info box title -#. txt_info_title -msgid "Boot loader" -msgstr "" - -# error box title -#. txt_error_title -msgid "I/O error" -msgstr "" - -# boot disk change dialog title -#. txt_change_disk_title -msgid "Change Boot Disk" -msgstr "" - -#. txt_insert_disk -#, c-format -msgid "Insert boot disk %u." -msgstr "" - -#. txt_insert_disk2 -#, c-format -msgid "" -"This is boot disk %u.\n" -"Insert boot disk %u." -msgstr "" - -# is e.g. SuSE Linux X.Y or Enterprise Server Z -#. txt_insert_disk3 -#, c-format -msgid "" -"This is not a boot disk.\n" -"Please insert boot disk %u." -msgstr "" - -#. txt_password_title -msgid "Password" -msgstr "Tremenger" - -# Keep the newlines and spaces after ':'! -#. txt_password -msgid "" -"Enter your password: \n" -"\n" -"\n" -msgstr "" - -#. txt_dud_ready -msgid "Get your driver update floppy ready." -msgstr "" - -# dvd warning title -#. txt_dvd_warning_title -msgid "DVD Error" -msgstr "" - -#. txt_dvd_warning2 -msgid "" -"This is a two-sided DVD. You have booted from the second side.\n" -"\n" -"Turn the DVD over then continue." -msgstr "" - -# power off dialog title -#. txt_power_off_title -msgid "Power Off" -msgstr "" - -#. txt_power_off -msgid "Halt the system now?" -msgstr "" - -#. txt_harddisk -msgid "Hard Disk" -msgstr "Pladenn" - -# dialog title for hard disk installation -#. txt_harddisk_title -msgid "Hard Disk Installation" -msgstr "" - -#. txt_hd_diskdevice -msgid "Disk Device (scan all disks if empty)\n" -msgstr "" - -#. txt_directory -msgid "Directory\n" -msgstr "" - -# dialog title for ftp installation -#. txt_ftp_title -msgid "FTP Installation" -msgstr "" - -#. txt_server -msgid "Server\n" -msgstr "" - -#. txt_password -msgid "Password\n" -msgstr "" - -# label for ftp user input -#. txt_user1 -msgid "User (anonymous login if empty)\n" -msgstr "" - -# dialog title for nfs installation -#. txt_nfs_title -msgid "NFS Installation" -msgstr "" - -# label for smb user input -#. txt_user2 -msgid "User (using \"guest\" if empty)\n" -msgstr "" - -# dialog title for ISO installation -#. txt_iso_title -msgid "Installation from ISO file" -msgstr "" - -# dialog title for http installation -#. txt_http_title -msgid "HTTP Installation" -msgstr "" - -#. txt_driver_update -msgid "Driver" -msgstr "Sturier" - -# as in Windows Authentication Domain -#. txt_domain -msgid "Domain\n" -msgstr "" - -#. txt_other_options -msgid "Other Options" -msgstr "Dibarzhoù all" - -#. txt_language -msgid "Language" -msgstr "Yezh" - -#. txt_apic -msgid "Installation--IOAPIC Enabled" -msgstr "" - -#. txt_noapic_install -msgid "Installation--IOAPIC Disabled" -msgstr "" - -#. txt_nolapic_install -msgid "Installation--Local APIC Disabled" -msgstr "" - -#. txt_yes -msgid "Yes" -msgstr "Ya" - -#. txt_no -msgid "No" -msgstr "N'eo ket" - -#. txt_file -msgid "File" -msgstr "Restr" - -# input label: share as in "Windows share" (SMB) -#. txt_share -msgid "Share\n" -msgstr "" - -#. txt_linux -msgid "Boot Mandriva Linux 2007 Spring" -msgstr "" - -#. txt_windows -msgid "Boot Microsoft Windows" -msgstr "" - -#. txt_install -msgid "Install Mandriva Linux 2007 Spring on your system" -msgstr "" - -#. txt_safe_linux -msgid "Boot Mandriva Linux 2007 Spring (safe mode)" -msgstr "" - -#. txt_linux_kernel_version -#, c-format -msgid "Linux with kernel %s" -msgstr "" diff --git a/po/bs.po b/po/bs.po index 8e41b8d..1481fd7 100644 --- a/po/bs.po +++ b/po/bs.po @@ -318,3 +318,7 @@ msgstr "" msgid "Linux with kernel %s" msgstr "" +#. txt_kernel_option +msgid "Kernel Option" +msgstr "" + diff --git a/po/cs.po b/po/cs.po index bb8270a..fb87c79 100644 --- a/po/cs.po +++ b/po/cs.po @@ -319,3 +319,7 @@ msgstr "Zavést Mandriva Linux 2007 Spring (bezpečný režim)" msgid "Linux with kernel %s" msgstr "Linux s jádrem %s" +#. txt_kernel_option +msgid "Kernel Option" +msgstr "" + diff --git a/po/cy.po b/po/cy.po index a3609d8..088c377 100644 --- a/po/cy.po +++ b/po/cy.po @@ -312,3 +312,7 @@ msgstr "" msgid "Linux with kernel %s" msgstr "" +#. txt_kernel_option +msgid "Kernel Option" +msgstr "" + diff --git a/po/da.po b/po/da.po index e2aa70d..d1db913 100644 --- a/po/da.po +++ b/po/da.po @@ -318,3 +318,7 @@ msgstr "" msgid "Linux with kernel %s" msgstr "" +#. txt_kernel_option +msgid "Kernel Option" +msgstr "" + diff --git a/po/de.po b/po/de.po index 5c7ebf2..b0feff5 100644 --- a/po/de.po +++ b/po/de.po @@ -320,3 +320,7 @@ msgstr "Starte Mandriva Linux 2007 Spring (sicherer Modus)" msgid "Linux with kernel %s" msgstr "Linux mit Kernel %s" +#. txt_kernel_option +msgid "Kernel Option" +msgstr "" + diff --git a/po/el.po b/po/el.po index b074973..919b986 100644 --- a/po/el.po +++ b/po/el.po @@ -322,3 +322,7 @@ msgstr "" msgid "Linux with kernel %s" msgstr "" +#. txt_kernel_option +msgid "Kernel Option" +msgstr "" + diff --git a/po/es.po b/po/es.po index b51581a..19fed5c 100644 --- a/po/es.po +++ b/po/es.po @@ -2,19 +2,19 @@ # translation of bootloader.po to # LANGUAGE translations for boot loader # Copyright (C) 2004 SUSE LINUX AG -# , 2004 -# Ines Pozo , 2005. # +# Ines Pozo , 2005. +# Camille Bégnis , 2007. msgid "" msgstr "" "Project-Id-Version: es\n" -"PO-Revision-Date: 2005-03-07 10:09+0100\n" -"Last-Translator: Novell Language \n" -"Language-Team: Novell Language \n" +"PO-Revision-Date: 2007-03-23 08:22+0000\n" +"Last-Translator: Camille Bégnis \n" +"Language-Team: Français \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.3.1\n" +"X-Generator: KBabel 1.11.4\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" # ok button label @@ -298,28 +298,31 @@ msgstr "" "Recurso\n" "compartido\n" -# dialog title for smb installation -#~ msgid "SMB (Windows Share) Installation" -#~ msgstr "Instalación SMB (recurso compartido Windows)" +#, fuzzy +msgid "SMB (Windows Share) Installation" +msgstr "Instalación manual" #. txt_linux msgid "Boot Mandriva Linux 2007 Spring" -msgstr "" +msgstr "Arrancar Mandriva Linux 2007 Spring" #. txt_windows msgid "Boot Microsoft Windows" -msgstr "" +msgstr "Arrancar Microsoft Windows" #. txt_install msgid "Install Mandriva Linux 2007 Spring on your system" -msgstr "" +msgstr "Instalar Mandriva Linux 2007 Spring en su ordenador" #. txt_safe_linux msgid "Boot Mandriva Linux 2007 Spring (safe mode)" -msgstr "" +msgstr "Arancar Mandriva Linux 2007 Spring (modo seguro)" #. txt_linux_kernel_version #, c-format msgid "Linux with kernel %s" -msgstr "" +msgstr "Linux con kernel %s" +#. txt_kernel_option +msgid "Kernel Option" +msgstr "Opciones para el kernel" diff --git a/po/et.po b/po/et.po index 03a8a92..7fb3c9f 100644 --- a/po/et.po +++ b/po/et.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: bootloader\n" -"PO-Revision-Date: 2007-02-28 11:59+0200\n" +"PO-Revision-Date: 2007-03-19 15:26+0200\n" "Last-Translator: Marek Laane \n" "Language-Team: Estonian \n" "MIME-Version: 1.0\n" @@ -315,3 +315,7 @@ msgstr "Mandriva Linux 2007 Springi laadimine (safe mode)" msgid "Linux with kernel %s" msgstr "Linux kerneliga %s" +#. txt_kernel_option +msgid "Kernel Option" +msgstr "Kerneli võtmed" + diff --git a/po/fi.po b/po/fi.po index 16d46d2..db30406 100644 --- a/po/fi.po +++ b/po/fi.po @@ -323,3 +323,7 @@ msgstr "" msgid "Linux with kernel %s" msgstr "" +#. txt_kernel_option +msgid "Kernel Option" +msgstr "" + diff --git a/po/fr.po b/po/fr.po index 7668405..43ca655 100644 --- a/po/fr.po +++ b/po/fr.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: fr\n" -"PO-Revision-Date: 2007-02-18 09:18+0100\n" +"PO-Revision-Date: 2007-03-19 16:33+0100\n" "Last-Translator: Christophe Berthelé \n" "Language-Team: Français \n" "MIME-Version: 1.0\n" @@ -322,3 +322,7 @@ msgstr "Amorcer Mandriva Linux 2007 Spring (mode dégradé)" #, c-format msgid "Linux with kernel %s" msgstr "Linux avec le noyau %s" + +#. txt_kernel_option +msgid "Kernel Option" +msgstr "Option noyau" diff --git a/po/he.po b/po/he.po new file mode 100644 index 0000000..a7871f3 --- /dev/null +++ b/po/he.po @@ -0,0 +1,305 @@ +# translation of he.po to Hebrew +# LANGUAGE translations for boot loader +# Copyright (C) 2005 SUSE Linux GmbH +# +# Dotan Kamber , 2007. +msgid "" +msgstr "" +"Project-Id-Version: he\n" +"POT-Creation-Date: 2005-07-27 11:49+0200\n" +"PO-Revision-Date: 2007-03-22 00:33+0200\n" +"Last-Translator: Dotan Kamber \n" +"Language-Team: Hebrew\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" + +# ok button label +#. txt_ok +msgid "OK" +msgstr "אישור" + +# cancel button label +#. txt_cancel +msgid "Cancel" +msgstr "ביטול" + +# reboot button label +#. txt_reboot +msgid "Reboot" +msgstr "איתחול" + +# continue button label +#. txt_continue +msgid "Continue" +msgstr "המשך" + +#. txt_manual_install +msgid "Manual Installation" +msgstr "התקנה ידנית" + +#. txt_noacpi_install +msgid "Installation--ACPI Disabled" +msgstr "התקנה--ACPI אינו מופעל" + +#. txt_safe_install +msgid "Installation--Safe Settings" +msgstr "התקנה--הגדרות בטוחות" + +#. txt_boot_harddisk +msgid "Boot from Hard Disk" +msgstr "התחל מהדיסק הקשיח" + +#. txt_rescue +msgid "Rescue System" +msgstr "הצלת המערכת" + +#. txt_memtest +msgid "Memory Test" +msgstr "בדיקת הזכרון" + +#. txt_bootoptions +msgid "Boot Options" +msgstr "אפשרויות האתחול" + +# window title for exit dialog +#. txt_exit_title (see txt_exit_dialog) +msgid "Exiting..." +msgstr "יציאה..." + +#. txt_exit_dialog +msgid "" +"You are leaving the graphical boot menu and\n" +"starting the text mode interface." +msgstr "" +"עזיבת תפרית האתחול הגרפי ומעבר\n" +"למנשק הטקסטואלי." + +#. txt_help +msgid "Help" +msgstr "עזרה" + +# window title for kernel loading (see txt_load_kernel) +#. txt_load_kernel_title +msgid "Starting..." +msgstr "מתחיל..." + +# Keep the three newlines! +#. txt_load_kernel +msgid "Loading Linux Kernel\n\n\n" +msgstr "טעינת גלעין ה-Linux\n\n\n" + +# Keep the three newlines! +#. txt_load_memtest +msgid "Loading memtest86\n\n\n" +msgstr "טעינת memtest86\n\n\n" + +# info box title +#. txt_info_title +msgid "Boot loader" +msgstr "טוען המערכת" + +# error box title +#. txt_error_title +msgid "I/O error" +msgstr "שגיאת I/O" + +# boot disk change dialog title +#. txt_change_disk_title +msgid "Change Boot Disk" +msgstr "החלפת דיסק איתחול" + +#. txt_insert_disk +#, c-format +msgid "Insert boot disk %u." +msgstr "נא להכניס את דיסק האיתחול %u." + +#. txt_insert_disk2 +#, c-format +msgid "" +"This is boot disk %u.\n" +"Insert boot disk %u." +msgstr "" +"זהו דיסק האתחול %u.\n" +"נא להכניס את דיסק האיתחול %u." + +# is e.g. SuSE Linux X.Y or Enterprise Server Z +#. txt_insert_disk3 +#, c-format +msgid "" +"This is not a boot disk.\n" +"Please insert boot disk %u." +msgstr "" +"זה אינו דיסק האתחול של .\n" +"נא להכניס את דיסק האתחול %u." + +# password dialog title +#. txt_password_title +msgid "Password" +msgstr "סיסמה" + +# Keep the newlines and spaces after ':'! +#. txt_password +msgid "Enter your password: \n\n\n" +msgstr "נא להזין סיסמתך: \n\n\n" + +#. txt_dud_ready +msgid "Get your driver update floppy ready." +msgstr "נא להכין את תקליטון העדכון." + +# dvd warning title +#. txt_dvd_warning_title +msgid "DVD Error" +msgstr "שגיאת DVD" + +#. txt_dvd_warning2 +msgid "" +"This is a two-sided DVD. You have booted from the second side.\n" +"\n" +"Turn the DVD over then continue." +msgstr "" +"זהו DVD בן שני צדדים. התחלת מהצד שאינו נכון.\n" +"\n" +"נא להפוך את ה-DVD ואז להמשיך." + +# power off dialog title +#. txt_power_off_title +msgid "Power Off" +msgstr "כיבוי" + +#. txt_power_off +msgid "Halt the system now?" +msgstr "לכבות את המערכת כעת?" + +# menu entry for hard disk installation +#. txt_harddisk +msgid "Hard Disk" +msgstr "כונן קשיח" + +# dialog title for hard disk installation +#. txt_harddisk_title +msgid "Hard Disk Installation" +msgstr "התקנה מהכונן הקשיח" + +#. txt_hd_diskdevice +msgid "Disk Device (scan all disks if empty)\n" +msgstr "התקן הכונן (סריקת כל הכוננים אם ריק)\n" + +#. txt_directory +msgid "Directory\n" +msgstr "ספריה\n" + +# dialog title for ftp installation +#. txt_ftp_title +msgid "FTP Installation" +msgstr "התקנה מ-FTP" + +#. txt_server +msgid "Server\n" +msgstr "שרת\n" + +#. txt_password +msgid "Password\n" +msgstr "סיסמה\n" + +# label for ftp user input +#. txt_user1 +msgid "User (anonymous login if empty)\n" +msgstr "משתמש (כניסה אנונימית אם ריק)\n" + +# dialog title for nfs installation +#. txt_nfs_title +msgid "NFS Installation" +msgstr "התקנה מ-NFS" + +# label for smb user input +#. txt_user2 +msgid "User (using \"guest\" if empty)\n" +msgstr "משתמש (משתמש ב-\"guest\" אם ריק)\n" + +# dialog title for ISO installation +#. txt_iso_title +msgid "Installation from ISO file" +msgstr "התקנה מקובץ ISO" + +# dialog title for http installation +#. txt_http_title +msgid "HTTP Installation" +msgstr "התקנה מ-HTTP" + +# 'driver' as in '(hardware) driver update' +#. txt_driver_update +msgid "Driver" +msgstr "התקן-הינע" + +# as in Windows Authentication Domain +#. txt_domain +msgid "Domain\n" +msgstr "מתחם\n" + +# button label for other/more options +#. txt_other_options +msgid "Other Options" +msgstr "אפשרויות אחרות" + +# label for language selection +#. txt_language +msgid "Language" +msgstr "שפה" + +#. txt_apic +msgid "Installation--IOAPIC Enabled" +msgstr "התקנה--IOAPIC מופעל" + +#. txt_noapic_install +msgid "Installation--IOAPIC Disabled" +msgstr "התקנה--IOAPIC אינו מופעל" + +#. txt_nolapic_install +msgid "Installation--Local APIC Disabled" +msgstr "התקנה--APIC מקומי אינו מופעל" + +#. txt_yes +msgid "Yes" +msgstr "כן" + +#. txt_no +msgid "No" +msgstr "לא" + +# menu item for selecting a file +#. txt_file +msgid "File" +msgstr "קובץ" + +# input label: share as in "Windows share" (SMB) +#. txt_share +msgid "Share\n" +msgstr "שיתוף\n" + +#. txt_linux +msgid "Boot Mandriva Linux 2007 Spring" +msgstr "התחל את מנדריבה לינוקס אביב 2007" + +#. txt_windows +msgid "Boot Microsoft Windows" +msgstr "התחל את Microsoft Windows" + +#. txt_install +msgid "Install Mandriva Linux 2007 Spring on your system" +msgstr "התקנת מנדריבה לינוקס אביב 2007 במערכת שלך" + +#. txt_safe_linux +msgid "Boot Mandriva Linux 2007 Spring (safe mode)" +msgstr "התחל את מנדריבה לינוקס אביב 2007 (מצב בטוח)" + +#. txt_linux_kernel_version +#, c-format +msgid "Linux with kernel %s" +msgstr "לינוקס עם גלעין %s" + +#. txt_kernel_option +msgid "Kernel Option" +msgstr "אפשרויות הגלעין" + diff --git a/po/hu.po b/po/hu.po index 459a877..924dd6e 100644 --- a/po/hu.po +++ b/po/hu.po @@ -1,23 +1,23 @@ # Hungarian translations for boot loader # Copyright (C) 2004 SUSE LINUX AG +# # Kéménczy Kálmán, 2006. # Marcel Hilzinger , 2004. # Szabolcs Varga , 2004, 2005. # Kalman Kemenczy , 2006. # Kéménczy Kálmán , 2006. -# Arpad Biro , 2006. -# +# Arpad Biro , 2006, 2007. msgid "" msgstr "" "Project-Id-Version: hu\n" "POT-Creation-Date: 2005-07-27 11:49+0200\n" -"PO-Revision-Date: 2006-09-15 19:26+0200\n" +"PO-Revision-Date: 2007-03-16 22:46+0100\n" "Last-Translator: Arpad Biro \n" -"Language-Team: Hungarian\n" +"Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.10.2\n" +"X-Generator: KBabel 1.11.4\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" # ok button label @@ -302,22 +302,26 @@ msgstr "Megosztás\n" #. txt_linux msgid "Boot Mandriva Linux 2007 Spring" -msgstr "" +msgstr "Mandriva Linux 2007 Spring indítása" #. txt_windows msgid "Boot Microsoft Windows" -msgstr "" +msgstr "Microsoft Windows indítása" #. txt_install msgid "Install Mandriva Linux 2007 Spring on your system" -msgstr "" +msgstr "Mandriva Linux 2007 Spring telepítése a rendszerre" #. txt_safe_linux msgid "Boot Mandriva Linux 2007 Spring (safe mode)" -msgstr "" +msgstr "Mandriva Linux 2007 Spring indítása biztonságos módban" #. txt_linux_kernel_version #, c-format msgid "Linux with kernel %s" +msgstr "Linux %s kernellel" + +#. txt_kernel_option +msgid "Kernel Option" msgstr "" diff --git a/po/id.po b/po/id.po index 7a19db9..4fff87c 100644 --- a/po/id.po +++ b/po/id.po @@ -317,3 +317,7 @@ msgstr "" msgid "Linux with kernel %s" msgstr "" +#. txt_kernel_option +msgid "Kernel Option" +msgstr "" + diff --git a/po/is.po b/po/is.po index 8b4ba42..d7e8026 100644 --- a/po/is.po +++ b/po/is.po @@ -318,3 +318,7 @@ msgstr "" msgid "Linux with kernel %s" msgstr "" +#. txt_kernel_option +msgid "Kernel Option" +msgstr "" + diff --git a/po/it.po b/po/it.po index ea18f6c..1dfeaaf 100644 --- a/po/it.po +++ b/po/it.po @@ -318,3 +318,7 @@ msgstr "" msgid "Linux with kernel %s" msgstr "" +#. txt_kernel_option +msgid "Kernel Option" +msgstr "" + diff --git a/po/ja.po b/po/ja.po index 70382b5..c703edf 100644 --- a/po/ja.po +++ b/po/ja.po @@ -1,10 +1,13 @@ # LANGUAGE translations for boot loader # Copyright (C) 2004 SUSE LINUX AG +# Novell Language , 2004. +# Yukiko Bando , 2006, 2007. # msgid "" msgstr "" "Project-Id-Version: bootloader\n" -"PO-Revision-Date: 2006-09-15 20:45+0900\n" +"POT-Creation-Date: 2005-07-27 11:49+0200\n" +"PO-Revision-Date: 2007-03-17 08:00+0900\n" "Last-Translator: Yukiko Bando \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" @@ -30,7 +33,7 @@ msgstr "再起動" # continue button label #. txt_continue msgid "Continue" -msgstr "続ける" +msgstr "続行" #. txt_manual_install msgid "Manual Installation" @@ -174,9 +177,9 @@ msgid "" "\n" "Turn the DVD over then continue." msgstr "" -"これは両面DVDです。第2面からブートしています。\n" +"これは両面 DVD です。第 2 面から起動しています。\n" "\n" -"DVDを裏返して続行してください。" +"DVD を裏返して続行してください。" # power off dialog title #. txt_power_off_title @@ -294,22 +297,26 @@ msgstr "共有\n" #. txt_linux msgid "Boot Mandriva Linux 2007 Spring" -msgstr "" +msgstr "Mandriva Linux 2007 Spring を起動" #. txt_windows msgid "Boot Microsoft Windows" -msgstr "" +msgstr "Microsoft Windows を起動" #. txt_install msgid "Install Mandriva Linux 2007 Spring on your system" -msgstr "" +msgstr "Mandriva Linux 2007 Spring をシステムにインストール" #. txt_safe_linux msgid "Boot Mandriva Linux 2007 Spring (safe mode)" -msgstr "" +msgstr "Mandriva Linux 2007 Spring を起動 (セーフモード)" #. txt_linux_kernel_version #, c-format msgid "Linux with kernel %s" +msgstr "Linux (カーネル %s)" + +#. txt_kernel_option +msgid "Kernel Option" msgstr "" diff --git a/po/lt.po b/po/lt.po index 18f07f9..7336216 100644 --- a/po/lt.po +++ b/po/lt.po @@ -318,3 +318,7 @@ msgstr "" msgid "Linux with kernel %s" msgstr "" +#. txt_kernel_option +msgid "Kernel Option" +msgstr "" + diff --git a/po/ltg.po b/po/ltg.po index 421b9ef..217750c 100644 --- a/po/ltg.po +++ b/po/ltg.po @@ -318,3 +318,7 @@ msgstr "" msgid "Linux with kernel %s" msgstr "" +#. txt_kernel_option +msgid "Kernel Option" +msgstr "" + diff --git a/po/mk.po b/po/mk.po index a6709f1..623b3a9 100644 --- a/po/mk.po +++ b/po/mk.po @@ -317,3 +317,7 @@ msgstr "" msgid "Linux with kernel %s" msgstr "" +#. txt_kernel_option +msgid "Kernel Option" +msgstr "" + diff --git a/po/nb.po b/po/nb.po index 265a9ad..5bd43e2 100644 --- a/po/nb.po +++ b/po/nb.po @@ -321,3 +321,7 @@ msgstr "" msgid "Linux with kernel %s" msgstr "" +#. txt_kernel_option +msgid "Kernel Option" +msgstr "" + diff --git a/po/nl.po b/po/nl.po index 0b767e1..e1836a9 100644 --- a/po/nl.po +++ b/po/nl.po @@ -6,16 +6,16 @@ # Proefgelezen op 10-08-2005 door Henk Krus # Arthur & Ettie Kerkmeester , 2004, 2005. # Rinse de Vries , 2005. +# Reinout van Schouwen , 2007 msgid "" msgstr "" "Project-Id-Version: nl\n" -"PO-Revision-Date: 2005-08-10 00:45+0200\n" -"Last-Translator: Rinse de Vries \n" -"Language-Team: Dutch \n" +"PO-Revision-Date: 2007-03-20 21:05+0200\n" +"Last-Translator: Reinout van Schouwen \n" +"Language-Team: Dutch \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.10.2\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" # ok button label @@ -240,9 +240,8 @@ msgid "User (using \"guest\" if empty)\n" msgstr "Gebruiker (indien leeg: dan wordt \"guest\" gebruikt)\n" #. txt_iso_title -#, fuzzy msgid "Installation from ISO file" -msgstr "Installatieprofiel" +msgstr "Installatie vanaf iso-bestand" # dialog title for http installation #. txt_http_title @@ -271,7 +270,7 @@ msgstr "Taal" #. txt_apic msgid "Installation--IOAPIC Enabled" -msgstr "" +msgstr "Installatie--IOAPIC ingeschakeld" #. txt_noapic_install msgid "Installation--IOAPIC Disabled" @@ -279,7 +278,7 @@ msgstr "Installatie - IOAPIC uitgeschakeld" #. txt_nolapic_install msgid "Installation--Local APIC Disabled" -msgstr "" +msgstr "Installatie--Lokale APIC uitgeschakeld" #. txt_yes msgid "Yes" @@ -296,7 +295,7 @@ msgstr "Bestand" # input label: share as in "Windows share" (SMB) #. txt_share msgid "Share\n" -msgstr "" +msgstr "Gedeeld\n" # dialog title for smb installation #~ msgid "SMB (Windows Share) Installation" @@ -304,22 +303,26 @@ msgstr "" #. txt_linux msgid "Boot Mandriva Linux 2007 Spring" -msgstr "" +msgstr "Mandriva Linux 2007 Spring opstarten" #. txt_windows msgid "Boot Microsoft Windows" -msgstr "" +msgstr "Microsoft Windows opstarten" #. txt_install msgid "Install Mandriva Linux 2007 Spring on your system" -msgstr "" +msgstr "Mandriva Linux 2007 Spring op uw systeem installeren" #. txt_safe_linux msgid "Boot Mandriva Linux 2007 Spring (safe mode)" -msgstr "" +msgstr "Mandriva Linux 2007 Spring opstarten (veilige modus)" #. txt_linux_kernel_version #, c-format msgid "Linux with kernel %s" -msgstr "" +msgstr "Linux met kernel %s" + +#. txt_kernel_option +msgid "Kernel Option" +msgstr "Kernel-optie" diff --git a/po/nn.po b/po/nn.po index 1d7cde5..5f96b8e 100644 --- a/po/nn.po +++ b/po/nn.po @@ -299,3 +299,7 @@ msgstr "Start Mandriva Linux 2007 vårutgåve (sikkermodus)" msgid "Linux with kernel %s" msgstr "Linux med kjerne %s" +#. txt_kernel_option +msgid "Kernel Option" +msgstr "" + diff --git a/po/pl.po b/po/pl.po index 590d81e..b8708b2 100644 --- a/po/pl.po +++ b/po/pl.po @@ -1,4 +1,4 @@ -# translation of bootloader.po to polish +# translation of bootloader.po to Polish # translation of pl.po to # translation of pl.po to # LANGUAGE translations for boot loader @@ -6,18 +6,18 @@ # # Wojciech Kapusta , 2006. # Mandriva Poland , 2006. -# Tomasz Bednarski - Mandriva Poland , 2006. +# Tomasz Bednarski - Mandriva Poland , 2006, 2007. msgid "" msgstr "" "Project-Id-Version: bootloader\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2006-09-18 09:30+0200\n" +"PO-Revision-Date: 2007-03-21 11:35+0100\n" "Last-Translator: Tomasz Bednarski - Mandriva Poland \n" -"Language-Team: polish \n" +"Language-Team: Polish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.2\n" +"X-Generator: KBabel 1.11.4\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" # ok button label @@ -302,22 +302,26 @@ msgstr "Udział\n" #. txt_linux msgid "Boot Mandriva Linux 2007 Spring" -msgstr "" +msgstr "Uruchom Mandriva Linux 2007 Spring" #. txt_windows msgid "Boot Microsoft Windows" -msgstr "" +msgstr "Uruchom Microsoft Windows" #. txt_install msgid "Install Mandriva Linux 2007 Spring on your system" -msgstr "" +msgstr "Zainstaluje Mandriva Linux 2007 Spring na swoim komputerze" #. txt_safe_linux msgid "Boot Mandriva Linux 2007 Spring (safe mode)" -msgstr "" +msgstr "Uruchom Mandriva Linux 2007 Spring (tryb bezpieczny)" #. txt_linux_kernel_version #, c-format msgid "Linux with kernel %s" -msgstr "" +msgstr "Jądro Linuksa %s" + +#. txt_kernel_option +msgid "Kernel Option" +msgstr "Opcje jądra" diff --git a/po/pt.po b/po/pt.po index aaec567..27a689d 100644 --- a/po/pt.po +++ b/po/pt.po @@ -319,3 +319,7 @@ msgstr "Arrancar Mandriva Linux 2007 Spring (modo seguro)" msgid "Linux with kernel %s" msgstr "Linux com kernel %s" +#. txt_kernel_option +msgid "Kernel Option" +msgstr "" + diff --git a/po/pt_BR.po b/po/pt_BR.po index 1ab9034..7e38386 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -1,13 +1,13 @@ # translation of pt_BR.po to Brazilian Portuguese # LANGUAGE translations for boot loader # Copyright (C) 2004 SUSE LINUX AG -# Felipe Arruda , 2006. +# Felipe Arruda , 2006, 2007. # msgid "" msgstr "" "Project-Id-Version: pt_BR\n" "POT-Creation-Date: 2005-07-27 11:49+0200\n" -"PO-Revision-Date: 2006-09-18 09:21-0300\n" +"PO-Revision-Date: 2007-03-23 09:10-0300\n" "Last-Translator: Felipe Arruda \n" "Language-Team: Brazilian Portuguese \n" "MIME-Version: 1.0\n" @@ -295,28 +295,32 @@ msgstr "Arquivo" msgid "Share\n" msgstr "Compartilhar\n" -# dialog title for smb installation -#~ msgid "SMB (Windows Share) Installation" -#~ msgstr "Instalação por SMB (Compartilhamento Windows)" - #. txt_linux msgid "Boot Mandriva Linux 2007 Spring" -msgstr "" +msgstr "Iniciar Mandriva Linux 2007 Spring" #. txt_windows msgid "Boot Microsoft Windows" -msgstr "" +msgstr "Iniciar Microsoft Windows" #. txt_install msgid "Install Mandriva Linux 2007 Spring on your system" -msgstr "" +msgstr "Instalar o Mandriva Linux 2007 Spring no seu sistema" #. txt_safe_linux msgid "Boot Mandriva Linux 2007 Spring (safe mode)" -msgstr "" +msgstr "Iniciar Mandriva Linux 2007 Spring (modo seguro)" #. txt_linux_kernel_version #, c-format msgid "Linux with kernel %s" -msgstr "" +msgstr "Linux com kernel %s" + +#. txt_kernel_option +msgid "Kernel Option" +msgstr "Opções do Kernel" + +# dialog title for smb installation +#~ msgid "SMB (Windows Share) Installation" +#~ msgstr "Instalação por SMB (Compartilhamento Windows)" diff --git a/po/ro.po b/po/ro.po index 58e2166..cb857dd 100644 --- a/po/ro.po +++ b/po/ro.po @@ -325,3 +325,7 @@ msgstr "" msgid "Linux with kernel %s" msgstr "" +#. txt_kernel_option +msgid "Kernel Option" +msgstr "" + diff --git a/po/ru.po b/po/ru.po index 9cbb95c..1ea802e 100644 --- a/po/ru.po +++ b/po/ru.po @@ -323,3 +323,7 @@ msgstr "" msgid "Linux with kernel %s" msgstr "" +#. txt_kernel_option +msgid "Kernel Option" +msgstr "" + diff --git a/po/sk.po b/po/sk.po index a715f18..98ef46a 100644 --- a/po/sk.po +++ b/po/sk.po @@ -329,3 +329,7 @@ msgstr "" msgid "Linux with kernel %s" msgstr "" +#. txt_kernel_option +msgid "Kernel Option" +msgstr "" + diff --git a/po/sl.po b/po/sl.po index 37cbc22..81ca0c1 100644 --- a/po/sl.po +++ b/po/sl.po @@ -317,3 +317,7 @@ msgstr "" msgid "Linux with kernel %s" msgstr "" +#. txt_kernel_option +msgid "Kernel Option" +msgstr "" + diff --git a/po/sr.po b/po/sr.po index 58c453c..831a9f1 100644 --- a/po/sr.po +++ b/po/sr.po @@ -318,3 +318,7 @@ msgstr "" msgid "Linux with kernel %s" msgstr "" +#. txt_kernel_option +msgid "Kernel Option" +msgstr "" + diff --git a/po/sr@Latn.po b/po/sr@Latn.po index 81eb34b..e473fe3 100644 --- a/po/sr@Latn.po +++ b/po/sr@Latn.po @@ -318,3 +318,7 @@ msgstr "" msgid "Linux with kernel %s" msgstr "" +#. txt_kernel_option +msgid "Kernel Option" +msgstr "" + diff --git a/po/sv.po b/po/sv.po index 061660f..87f660f 100644 --- a/po/sv.po +++ b/po/sv.po @@ -322,3 +322,7 @@ msgstr "" msgid "Linux with kernel %s" msgstr "" +#. txt_kernel_option +msgid "Kernel Option" +msgstr "" + diff --git a/po/uk.po b/po/uk.po index 55b0f44..75ee0e1 100644 --- a/po/uk.po +++ b/po/uk.po @@ -322,3 +322,7 @@ msgstr "" msgid "Linux with kernel %s" msgstr "" +#. txt_kernel_option +msgid "Kernel Option" +msgstr "" + diff --git a/po/wa.po b/po/wa.po index 53582bf..651d583 100644 --- a/po/wa.po +++ b/po/wa.po @@ -291,3 +291,7 @@ msgstr "" msgid "Linux with kernel %s" msgstr "" +#. txt_kernel_option +msgid "Kernel Option" +msgstr "" + diff --git a/po/zh_CN.po b/po/zh_CN.po index 323a950..8efaf88 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -291,22 +291,26 @@ msgstr "共享\n" #. txt_linux msgid "Boot Mandriva Linux 2007 Spring" -msgstr "" +msgstr "启动 Mandriva Linux 2007 Spring" #. txt_windows msgid "Boot Microsoft Windows" -msgstr "" +msgstr "启动 Microsoft Windows" #. txt_install msgid "Install Mandriva Linux 2007 Spring on your system" -msgstr "" +msgstr "在您的计算机中安装 Mandriva Linux 2007 Spring " #. txt_safe_linux msgid "Boot Mandriva Linux 2007 Spring (safe mode)" -msgstr "" +msgstr "启动 Mandriva Linux 2007 Spring (安全模式)" #. txt_linux_kernel_version #, c-format msgid "Linux with kernel %s" -msgstr "" +msgstr "内核为 %s 的 Linux" + +#. txt_kernel_option +msgid "Kernel Option" +msgstr "内核选项" diff --git a/po/zh_TW.po b/po/zh_TW.po index db8aef4..4355a6e 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -314,3 +314,7 @@ msgstr "" msgid "Linux with kernel %s" msgstr "" +#. txt_kernel_option +msgid "Kernel Option" +msgstr "" + diff --git a/system.inc b/system.inc index 045981d..fa2a7e5 100644 --- a/system.inc +++ b/system.inc @@ -805,23 +805,3 @@ def } def -% Mininum Live-CD memory in MB. -% -% ( -- int ) -% -/livecd.mem.check { - /livecd.mem.check "livecd.mem.check" getgfxconfig dup .undef ne { cvn } { pop 200 } ifelse def - livecd.mem.check -} def - - -% Mininum Live-CD memory in MB we ask the user for. -% -% ( -- int ) -% -/livecd.mem.show { - /livecd.mem.show "livecd.mem.show" getgfxconfig dup .undef ne { cvn } { pop 256 } ifelse def - livecd.mem.show -} def - - -- cgit v1.2.1