diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2002-11-06 13:20:21 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2002-11-06 13:20:21 +0000 |
| commit | 9091151d546e5d749b47e2efce3ff651784fcc8c (patch) | |
| tree | 2be2bec5e60f21ffe431eeef74095896ae5efe7f /perl-install/share | |
| parent | 68a1a2a6f2b9fdb1fd0c833cd9b3d8dcb9d8fd5c (diff) | |
| download | drakx-backup-do-not-use-9091151d546e5d749b47e2efce3ff651784fcc8c.tar drakx-backup-do-not-use-9091151d546e5d749b47e2efce3ff651784fcc8c.tar.gz drakx-backup-do-not-use-9091151d546e5d749b47e2efce3ff651784fcc8c.tar.bz2 drakx-backup-do-not-use-9091151d546e5d749b47e2efce3ff651784fcc8c.tar.xz drakx-backup-do-not-use-9091151d546e5d749b47e2efce3ff651784fcc8c.zip | |
replace "_" with "N" and "__" with "N_"
rationale:
- currently, we use _("xxx") as a shorthand for gettext("xxx"). It
also used to call xgettext with --keyword=_
- alas, function &_ is global and not by package (notice esp. that _
is not exported in common.pm)
- this lead to big ugly pb with packages defining their own &_,
overriding common.pm's &_
- a fix is to set @::textdomains to add a new domain (the default
being "libDrakX")
but relying on the global "_" is still dangerous!
Diffstat (limited to 'perl-install/share')
20 files changed, 424 insertions, 405 deletions
diff --git a/perl-install/share/advertising/01-thanks.pl b/perl-install/share/advertising/01-thanks.pl index a1155f3fb..fdc228785 100644 --- a/perl-install/share/advertising/01-thanks.pl +++ b/perl-install/share/advertising/01-thanks.pl @@ -6,9 +6,9 @@ $icon = 0; $icon_dx = 0; $icon_dy = 0; @data = ( - [ _("Thank you for choosing Mandrake Linux 9.0"), 0, 80, 400, 0, 1], - [ _("Welcome to the Open Source world"), 0, 110, 400, 0, 0], - [ _("The success of MandrakeSoft is based upon the principle of Free Software. Your new operating system is the result of collaborative work on the part of the worldwide Linux Community"), 0, 140, 400, 0, 0], + [ N("Thank you for choosing Mandrake Linux 9.0"), 0, 80, 400, 0, 1], + [ N("Welcome to the Open Source world"), 0, 110, 400, 0, 0], + [ N("The success of MandrakeSoft is based upon the principle of Free Software. Your new operating system is the result of collaborative work on the part of the worldwide Linux Community"), 0, 140, 400, 0, 0], # [ 'text', $x, $y, $area_width, $area_height, $bold ], diff --git a/perl-install/share/advertising/02-community.pl b/perl-install/share/advertising/02-community.pl index 5e86c822c..921304660 100644 --- a/perl-install/share/advertising/02-community.pl +++ b/perl-install/share/advertising/02-community.pl @@ -6,9 +6,9 @@ $icon = 0; $icon_dx = 0; $icon_dy = 0; @data = ( - [ _("Get involved in the Free Software world"), 0, 30, 400, 0, 1], - [ _("Want to know more about the Open Source community?"), 0, 90, 400, 20, 0], - [ _("To share your own knowledge and help build Linux tools, join the discussion forums you'll find on our \"Community\" webpages"), 0, 150, 400, 0, 0], + [ N("Get involved in the Free Software world"), 0, 30, 400, 0, 1], + [ N("Want to know more about the Open Source community?"), 0, 90, 400, 20, 0], + [ N("To share your own knowledge and help build Linux tools, join the discussion forums you'll find on our \"Community\" webpages"), 0, 150, 400, 0, 0], # [ 'text', $x, $y, $area_width, $area_height, $bold ], diff --git a/perl-install/share/advertising/03-internet.pl b/perl-install/share/advertising/03-internet.pl index 2b3a9046b..7311696d2 100644 --- a/perl-install/share/advertising/03-internet.pl +++ b/perl-install/share/advertising/03-internet.pl @@ -6,7 +6,7 @@ $icon = 0; $icon_dx = 0; $icon_dy = 0; @data = ( - [ _("Get the most from the Internet"), 0, 0, 400, 20, 1], - [ _("Mandrake Linux 9.0 has selected the best software for you. Surf the Web and view animations with Mozilla and Konqueror, or read your mail and handle your personal information with Evolution and Kmail"), 0, 30, 400, 60, 0], + [ N("Get the most from the Internet"), 0, 0, 400, 20, 1], + [ N("Mandrake Linux 9.0 has selected the best software for you. Surf the Web and view animations with Mozilla and Konqueror, or read your mail and handle your personal information with Evolution and Kmail"), 0, 30, 400, 60, 0], # [ 'text', $x, $y, $area_width, $area_height ], ); diff --git a/perl-install/share/advertising/04-multimedia.pl b/perl-install/share/advertising/04-multimedia.pl index 0791afe4f..ff59ffdd9 100644 --- a/perl-install/share/advertising/04-multimedia.pl +++ b/perl-install/share/advertising/04-multimedia.pl @@ -6,8 +6,8 @@ $icon = 0; $icon_dx = 0; $icon_dy = 0; @data = ( - [ _("Discover the most up-to-date graphical and multimedia tools!"), 0, 0, 400, 20, 1], - [ _("Push multimedia to its limits!"), 0, 40, 400, 20, 0], - [ _("Mandrake Linux 9.0 enables you to use the very latest software to play audio files, edit and handle your images or photos, and play videos"), 0, 60, 400, 20, 0], + [ N("Discover the most up-to-date graphical and multimedia tools!"), 0, 0, 400, 20, 1], + [ N("Push multimedia to its limits!"), 0, 40, 400, 20, 0], + [ N("Mandrake Linux 9.0 enables you to use the very latest software to play audio files, edit and handle your images or photos, and play videos"), 0, 60, 400, 20, 0], # [ 'text', $x, $y, $area_width, $area_height ], ); diff --git a/perl-install/share/advertising/05-games.pl b/perl-install/share/advertising/05-games.pl index dfb3a3f95..3b8646fd4 100644 --- a/perl-install/share/advertising/05-games.pl +++ b/perl-install/share/advertising/05-games.pl @@ -6,7 +6,7 @@ $icon = 0; $icon_dx = 0; $icon_dy = 0; @data = ( - [ _("Games"), 0, 0, 400, 20, 1], - [ _("Mandrake Linux 9.0 provides the best Open Source games - arcade, action, strategy, ..."), 0, 30, 400, 0, 0], + [ N("Games"), 0, 0, 400, 20, 1], + [ N("Mandrake Linux 9.0 provides the best Open Source games - arcade, action, strategy, ..."), 0, 30, 400, 0, 0], # [ 'text', $x, $y, $area_width, $area_height ], ); diff --git a/perl-install/share/advertising/06-mcc.pl b/perl-install/share/advertising/06-mcc.pl index a77e6b367..e2af9575b 100644 --- a/perl-install/share/advertising/06-mcc.pl +++ b/perl-install/share/advertising/06-mcc.pl @@ -6,7 +6,7 @@ $icon = 0; $icon_dx = 0; $icon_dy = 0; @data = ( - [ _("Mandrake Control Center"), 0, 0, 400, 20, 1], - [ _("Mandrake Linux 9.0 provides a powerful tool to fully customize and configure your machine"), 0, 40, 400, 60, 0], + [ N("Mandrake Control Center"), 0, 0, 400, 20, 1], + [ N("Mandrake Linux 9.0 provides a powerful tool to fully customize and configure your machine"), 0, 40, 400, 60, 0], # [ 'text', $x, $y, $area_width, $area_height ], ); diff --git a/perl-install/share/advertising/07-desktop.pl b/perl-install/share/advertising/07-desktop.pl index 57b3ce9e1..49bb96064 100644 --- a/perl-install/share/advertising/07-desktop.pl +++ b/perl-install/share/advertising/07-desktop.pl @@ -6,7 +6,7 @@ $icon = 0; $icon_dx = 0; $icon_dy = 0; @data = ( - [ _("User interfaces"), 0, 0, 400, 0, 1], - [ _("Mandrake Linux 9.0 provides you with 11 user interfaces that can be fully modified: KDE 3, Gnome 2, WindowMaker, ..."), 0, 40, 400, 0, 0], + [ N("User interfaces"), 0, 0, 400, 0, 1], + [ N("Mandrake Linux 9.0 provides you with 11 user interfaces that can be fully modified: KDE 3, Gnome 2, WindowMaker, ..."), 0, 40, 400, 0, 0], # [ 'text', $x, $y, $area_width, $area_height ], ); diff --git a/perl-install/share/advertising/08-development.pl b/perl-install/share/advertising/08-development.pl index 357d0dad5..69f8c36b8 100644 --- a/perl-install/share/advertising/08-development.pl +++ b/perl-install/share/advertising/08-development.pl @@ -6,8 +6,8 @@ $icon = 0; $icon_dx = 0; $icon_dy = 0; @data = ( - [ _("Development simplified"), 0, 0, 400, 0, 1], - [ _("Mandrake Linux 9.0 is the ultimate development platform"), 0, 20, 400, 0, 0], - [ _("Use the full power of the GNU gcc 3 compiler as well as the best Open Source development environments"), 0, 50, 400, 0, 0], + [ N("Development simplified"), 0, 0, 400, 0, 1], + [ N("Mandrake Linux 9.0 is the ultimate development platform"), 0, 20, 400, 0, 0], + [ N("Use the full power of the GNU gcc 3 compiler as well as the best Open Source development environments"), 0, 50, 400, 0, 0], # [ 'text', $x, $y, $area_width, $area_height ], ); diff --git a/perl-install/share/advertising/09-server.pl b/perl-install/share/advertising/09-server.pl index 15d3634a3..7aaa1f394 100644 --- a/perl-install/share/advertising/09-server.pl +++ b/perl-install/share/advertising/09-server.pl @@ -6,7 +6,7 @@ $icon = 0; $icon_dx = 0; $icon_dy = 0; @data = ( - [ _("Turn your machine into a reliable server"), 0, 10, 400, 20, 1], - [ _("Transform your machine into a powerful Linux server with a few clicks of your mouse: Web server, mail, firewall, router, file and print server, ..."), 0, 50, 400, 60, 0], + [ N("Turn your machine into a reliable server"), 0, 10, 400, 20, 1], + [ N("Transform your machine into a powerful Linux server with a few clicks of your mouse: Web server, mail, firewall, router, file and print server, ..."), 0, 50, 400, 60, 0], # [ 'text', $x, $y, $area_width, $area_height ], ); diff --git a/perl-install/share/advertising/10-mnf.pl b/perl-install/share/advertising/10-mnf.pl index e9ed01066..d2742254d 100644 --- a/perl-install/share/advertising/10-mnf.pl +++ b/perl-install/share/advertising/10-mnf.pl @@ -6,10 +6,10 @@ $icon = 0; $icon_dx = 0; $icon_dy = 0; @data = ( - [ _("Optimize your security"), 0, 0, 400, 0, 1], - [ _("The MandrakeSecurity range includes the Multi Network Firewall product (M.N.F.)"), 0, 20, 400, 0, 0], - [ _("This firewall product includes network features that allow you to fulfill all your security needs"), 0, 40, 400, 80, 0], - [ _("This product is available on MandrakeStore website"), 0, 60, 400, 100, 0], + [ N("Optimize your security"), 0, 0, 400, 0, 1], + [ N("The MandrakeSecurity range includes the Multi Network Firewall product (M.N.F.)"), 0, 20, 400, 0, 0], + [ N("This firewall product includes network features that allow you to fulfill all your security needs"), 0, 40, 400, 80, 0], + [ N("This product is available on MandrakeStore website"), 0, 60, 400, 100, 0], # [ 'text', $x, $y, $area_width, $area_height, $bold ], diff --git a/perl-install/share/advertising/11-mdkstore.pl b/perl-install/share/advertising/11-mdkstore.pl index 72237f5f0..1a87fd45d 100644 --- a/perl-install/share/advertising/11-mdkstore.pl +++ b/perl-install/share/advertising/11-mdkstore.pl @@ -6,7 +6,7 @@ $icon = 0; $icon_dx = 0; $icon_dy = 0; @data = ( - [ _("The official MandrakeSoft store"), 0, 0, 400, 20, 1], - [ _("Our full range of Linux solutions, as well as special offers on products and other \"goodies,\" are available online on our e-store:"), 0, 40, 400, 50 ], + [ N("The official MandrakeSoft store"), 0, 0, 400, 20, 1], + [ N("Our full range of Linux solutions, as well as special offers on products and other \"goodies,\" are available online on our e-store:"), 0, 40, 400, 50 ], # [ 'text', $x, $y, $area_width, $area_height ], ); diff --git a/perl-install/share/advertising/12-mdkstore.pl b/perl-install/share/advertising/12-mdkstore.pl index 3d2d634dc..adb7b1b99 100644 --- a/perl-install/share/advertising/12-mdkstore.pl +++ b/perl-install/share/advertising/12-mdkstore.pl @@ -6,8 +6,8 @@ $icon = 0; $icon_dx = 0; $icon_dy = 0; @data = ( - [ _("Strategic partners"), 0, 0, 400, 20, 1], - [ _("MandrakeSoft works alongside a selection of companies offering professional solutions compatible with Mandrake Linux. A list of these partners is available on the MandrakeStore"), 0, 30, 400, 50, 0 ], + [ N("Strategic partners"), 0, 0, 400, 20, 1], + [ N("MandrakeSoft works alongside a selection of companies offering professional solutions compatible with Mandrake Linux. A list of these partners is available on the MandrakeStore"), 0, 30, 400, 50, 0 ], [ "www.mandrakestore.com/license", 0, 70, 400, 80, 0 ], # [ 'text', $x, $y, $area_width, $area_height ], ); diff --git a/perl-install/share/advertising/13-mdkcampus.pl b/perl-install/share/advertising/13-mdkcampus.pl index 482168cbd..6963415be 100644 --- a/perl-install/share/advertising/13-mdkcampus.pl +++ b/perl-install/share/advertising/13-mdkcampus.pl @@ -6,9 +6,9 @@ $icon = 0; $icon_dx = 0; $icon_dy = 0; @data = ( - [ _("Discover MandrakeSoft's training catalogue Linux-Campus"), 0, 0, 400, 20, 1 ], - [ _("The training program has been created to respond to the needs of both end users and experts (Network and System administrators)"), 0, 40, 400, 20, 0 ], - [ _("Certify yourself on Linux"), 0, 80, 400, 40, 0 ], - [ _("Whether you choose to teach yourself online or via our network of training partners, the Linux-Campus catalogue prepares you for the acknowledged LPI certification program (worldwide professional technical certification)"), 0, 120, 400, 20, 0 ], + [ N("Discover MandrakeSoft's training catalogue Linux-Campus"), 0, 0, 400, 20, 1 ], + [ N("The training program has been created to respond to the needs of both end users and experts (Network and System administrators)"), 0, 40, 400, 20, 0 ], + [ N("Certify yourself on Linux"), 0, 80, 400, 40, 0 ], + [ N("Whether you choose to teach yourself online or via our network of training partners, the Linux-Campus catalogue prepares you for the acknowledged LPI certification program (worldwide professional technical certification)"), 0, 120, 400, 20, 0 ], # [ 'text', $x, $y, $area_width, $area_height ], ); diff --git a/perl-install/share/advertising/14-mdkexpert.pl b/perl-install/share/advertising/14-mdkexpert.pl index 7db2347d5..28d23b827 100644 --- a/perl-install/share/advertising/14-mdkexpert.pl +++ b/perl-install/share/advertising/14-mdkexpert.pl @@ -6,8 +6,8 @@ $icon = 0; $icon_dx = 0; $icon_dy = 0; @data = ( - [ _("Become a MandrakeExpert"), 0, 0, 400, 20, 1], - [ _("Find the solutions of your problems via MandrakeSoft's online support platform"), 0, 30, 400, 0, 0 ], - [ _("Join the MandrakeSoft support teams and the Linux Community online to share your knowledge and help others by becoming a recognized Expert on the online technical support website:"), 0, 70, 400, 0, 0 ], + [ N("Become a MandrakeExpert"), 0, 0, 400, 20, 1], + [ N("Find the solutions of your problems via MandrakeSoft's online support platform"), 0, 30, 400, 0, 0 ], + [ N("Join the MandrakeSoft support teams and the Linux Community online to share your knowledge and help others by becoming a recognized Expert on the online technical support website:"), 0, 70, 400, 0, 0 ], # [ 'text', $x, $y, $area_width, $area_height ], ); diff --git a/perl-install/share/advertising/15-mdkexpert-corporate.pl b/perl-install/share/advertising/15-mdkexpert-corporate.pl index c48cfc741..37e15e299 100644 --- a/perl-install/share/advertising/15-mdkexpert-corporate.pl +++ b/perl-install/share/advertising/15-mdkexpert-corporate.pl @@ -6,9 +6,9 @@ $icon = 0; $icon_dx = 0; $icon_dy = 0; @data = ( - [ _("MandrakeExpert Corporate"), 0, 0, 400, 20, 1], - [ _("An online platform to respond to company's specific support needs"), 0, 50, 400, 0, 0 ], - [ _("All incidents will be followed up by a single qualified MandrakeSoft technical expert."), 0, 100, 400, 0, 0 ], + [ N("MandrakeExpert Corporate"), 0, 0, 400, 20, 1], + [ N("An online platform to respond to company's specific support needs"), 0, 50, 400, 0, 0 ], + [ N("All incidents will be followed up by a single qualified MandrakeSoft technical expert."), 0, 100, 400, 0, 0 ], [ "corporate.mandrakeexpert.com", 0, 230, 400, 0, 1], # [ 'text', $x, $y, $area_width, $area_height ], ); diff --git a/perl-install/share/advertising/17-mdkclub.pl b/perl-install/share/advertising/17-mdkclub.pl index 03485568a..fe0beeed2 100755 --- a/perl-install/share/advertising/17-mdkclub.pl +++ b/perl-install/share/advertising/17-mdkclub.pl @@ -6,8 +6,8 @@ $icon = 0; $icon_dx = 0; $icon_dy = 0; @data = ( - [ _("Discover MandrakeClub and Mandrake Corporate Club"), 0, 0, 400, 20, 1 ], - [ _("MandrakeClub and Mandrake Corporate Club were created for business and private users of Mandrake Linux who would like to directly support their favorite Linux distribution while also receiving special privileges. If you enjoy our products, if your company benefits from our products to gain a competititve edge, if you want to support Mandrake Linux development, join MandrakeClub!"), 0, 60, 400, 20, 0 ], + [ N("Discover MandrakeClub and Mandrake Corporate Club"), 0, 0, 400, 20, 1 ], + [ N("MandrakeClub and Mandrake Corporate Club were created for business and private users of Mandrake Linux who would like to directly support their favorite Linux distribution while also receiving special privileges. If you enjoy our products, if your company benefits from our products to gain a competititve edge, if you want to support Mandrake Linux development, join MandrakeClub!"), 0, 60, 400, 20, 0 ], [ ("www.mandrakeclub.com"), 0, 220, 400, 40, 0 ], [ ("www.mandrakesoft.com/corporateclub"), 0, 240, 400, 40, 0 ], # [ 'text', $x, $y, $area_width, $area_height ], diff --git a/perl-install/share/po/DrakX.pot b/perl-install/share/po/DrakX.pot index 75e3cf395..ae65d1286 100644 --- a/perl-install/share/po/DrakX.pot +++ b/perl-install/share/po/DrakX.pot @@ -1,18 +1,19 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR Free Software Foundation, Inc. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2002-10-24 11:09+0200\n" +"POT-Creation-Date: 2002-11-06 12:38+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8-bit\n" +"Content-Transfer-Encoding: 8bit\n" #: ../../Xconfig/card.pm_.c:16 msgid "256 kB" @@ -163,7 +164,7 @@ msgid "Test" msgstr "" #: ../../Xconfig/main.pm_.c:118 ../../diskdrake/dav.pm_.c:67 -#: ../../diskdrake/interactive.pm_.c:385 ../../diskdrake/removable.pm_.c:25 +#: ../../diskdrake/interactive.pm_.c:391 ../../diskdrake/removable.pm_.c:25 #: ../../diskdrake/removable_gtk.pm_.c:16 ../../diskdrake/smbnfs_gtk.pm_.c:86 msgid "Options" msgstr "" @@ -171,8 +172,8 @@ msgstr "" #: ../../Xconfig/main.pm_.c:122 ../../Xconfig/resolution_and_depth.pm_.c:269 #: ../../install_gtk.pm_.c:79 ../../install_steps_gtk.pm_.c:275 #: ../../interactive.pm_.c:127 ../../interactive.pm_.c:142 -#: ../../interactive.pm_.c:354 ../../interactive/http.pm_.c:104 -#: ../../interactive/newt.pm_.c:195 ../../interactive/newt.pm_.c:197 +#: ../../interactive.pm_.c:345 ../../interactive/http.pm_.c:104 +#: ../../interactive/newt.pm_.c:194 ../../interactive/newt.pm_.c:196 #: ../../interactive/stdio.pm_.c:39 ../../interactive/stdio.pm_.c:143 #: ../../interactive/stdio.pm_.c:144 ../../my_gtk.pm_.c:160 #: ../../my_gtk.pm_.c:288 ../../my_gtk.pm_.c:311 ../../security/main.pm_.c:166 @@ -275,8 +276,8 @@ msgstr "" #: ../../Xconfig/resolution_and_depth.pm_.c:269 ../../any.pm_.c:1020 #: ../../bootlook.pm_.c:344 ../../diskdrake/smbnfs_gtk.pm_.c:87 #: ../../install_steps_gtk.pm_.c:406 ../../install_steps_gtk.pm_.c:464 -#: ../../interactive.pm_.c:142 ../../interactive.pm_.c:354 -#: ../../interactive/http.pm_.c:105 ../../interactive/newt.pm_.c:195 +#: ../../interactive.pm_.c:142 ../../interactive.pm_.c:345 +#: ../../interactive/http.pm_.c:105 ../../interactive/newt.pm_.c:194 #: ../../interactive/stdio.pm_.c:39 ../../interactive/stdio.pm_.c:143 #: ../../my_gtk.pm_.c:159 ../../my_gtk.pm_.c:163 ../../my_gtk.pm_.c:288 #: ../../network/netconnect.pm_.c:42 ../../printerdrake.pm_.c:2164 @@ -288,7 +289,7 @@ msgstr "" #: ../../standalone/drakbackup_.c:4181 ../../standalone/drakconnect_.c:115 #: ../../standalone/drakconnect_.c:147 ../../standalone/drakconnect_.c:289 #: ../../standalone/drakconnect_.c:537 ../../standalone/drakconnect_.c:679 -#: ../../standalone/drakfloppy_.c:235 ../../standalone/drakfont_.c:971 +#: ../../standalone/drakfloppy_.c:235 ../../standalone/drakfont_.c:966 #: ../../standalone/drakgw_.c:562 ../../standalone/logdrake_.c:225 #: ../../ugtk.pm_.c:296 msgid "Cancel" @@ -514,7 +515,7 @@ msgid "" msgstr "" #: ../../any.pm_.c:184 ../../any.pm_.c:766 -#: ../../diskdrake/interactive.pm_.c:1195 +#: ../../diskdrake/interactive.pm_.c:1201 #: ../../install_steps_interactive.pm_.c:1104 msgid "Please try again" msgstr "" @@ -564,8 +565,8 @@ msgid "" msgstr "" #: ../../any.pm_.c:258 ../../standalone/drakbackup_.c:1557 -#: ../../standalone/drakbackup_.c:1670 ../../standalone/drakfont_.c:1012 -#: ../../standalone/drakfont_.c:1055 +#: ../../standalone/drakbackup_.c:1670 ../../standalone/drakfont_.c:1007 +#: ../../standalone/drakfont_.c:1050 msgid "Add" msgstr "" @@ -1154,9 +1155,9 @@ msgstr "" #: ../../bootlook.pm_.c:200 ../../bootlook.pm_.c:230 ../../bootlook.pm_.c:232 #: ../../bootlook.pm_.c:242 ../../bootlook.pm_.c:251 ../../bootlook.pm_.c:258 #: ../../diskdrake/dav.pm_.c:77 ../../diskdrake/hd_gtk.pm_.c:116 -#: ../../diskdrake/interactive.pm_.c:213 ../../diskdrake/interactive.pm_.c:344 -#: ../../diskdrake/interactive.pm_.c:359 ../../diskdrake/interactive.pm_.c:473 -#: ../../diskdrake/interactive.pm_.c:478 ../../diskdrake/smbnfs_gtk.pm_.c:45 +#: ../../diskdrake/interactive.pm_.c:214 ../../diskdrake/interactive.pm_.c:350 +#: ../../diskdrake/interactive.pm_.c:365 ../../diskdrake/interactive.pm_.c:479 +#: ../../diskdrake/interactive.pm_.c:484 ../../diskdrake/smbnfs_gtk.pm_.c:45 #: ../../fsedit.pm_.c:239 ../../install_steps.pm_.c:75 #: ../../install_steps_interactive.pm_.c:67 ../../interactive/http.pm_.c:119 #: ../../interactive/http.pm_.c:120 ../../standalone/draksplash_.c:34 @@ -1269,15 +1270,15 @@ msgstr "" msgid "Yes, I want autologin with this (user, desktop)" msgstr "" -#: ../../bootlook.pm_.c:343 ../../network/netconnect.pm_.c:106 +#: ../../bootlook.pm_.c:343 ../../network/netconnect.pm_.c:101 #: ../../standalone/drakTermServ_.c:237 ../../standalone/drakTermServ_.c:367 #: ../../standalone/drakTermServ_.c:484 ../../standalone/drakbackup_.c:4190 #: ../../standalone/drakbackup_.c:4961 ../../standalone/drakconnect_.c:108 #: ../../standalone/drakconnect_.c:140 ../../standalone/drakconnect_.c:296 #: ../../standalone/drakconnect_.c:435 ../../standalone/drakconnect_.c:521 #: ../../standalone/drakconnect_.c:564 ../../standalone/drakconnect_.c:667 -#: ../../standalone/drakfont_.c:613 ../../standalone/drakfont_.c:800 -#: ../../standalone/drakfont_.c:877 ../../standalone/drakfont_.c:964 +#: ../../standalone/drakfont_.c:610 ../../standalone/drakfont_.c:797 +#: ../../standalone/drakfont_.c:874 ../../standalone/drakfont_.c:959 #: ../../ugtk.pm_.c:289 msgid "OK" msgstr "" @@ -1391,12 +1392,12 @@ msgstr "" msgid "New" msgstr "" -#: ../../diskdrake/dav.pm_.c:63 ../../diskdrake/interactive.pm_.c:392 +#: ../../diskdrake/dav.pm_.c:63 ../../diskdrake/interactive.pm_.c:398 #: ../../diskdrake/smbnfs_gtk.pm_.c:81 msgid "Unmount" msgstr "" -#: ../../diskdrake/dav.pm_.c:64 ../../diskdrake/interactive.pm_.c:389 +#: ../../diskdrake/dav.pm_.c:64 ../../diskdrake/interactive.pm_.c:395 #: ../../diskdrake/smbnfs_gtk.pm_.c:82 msgid "Mount" msgstr "" @@ -1405,8 +1406,8 @@ msgstr "" msgid "Server" msgstr "" -#: ../../diskdrake/dav.pm_.c:66 ../../diskdrake/interactive.pm_.c:383 -#: ../../diskdrake/interactive.pm_.c:572 ../../diskdrake/interactive.pm_.c:599 +#: ../../diskdrake/dav.pm_.c:66 ../../diskdrake/interactive.pm_.c:389 +#: ../../diskdrake/interactive.pm_.c:578 ../../diskdrake/interactive.pm_.c:605 #: ../../diskdrake/removable.pm_.c:24 ../../diskdrake/removable_gtk.pm_.c:15 #: ../../diskdrake/smbnfs_gtk.pm_.c:85 msgid "Mount point" @@ -1424,13 +1425,13 @@ msgstr "" msgid "Server: " msgstr "" -#: ../../diskdrake/dav.pm_.c:110 ../../diskdrake/interactive.pm_.c:444 -#: ../../diskdrake/interactive.pm_.c:1093 -#: ../../diskdrake/interactive.pm_.c:1168 +#: ../../diskdrake/dav.pm_.c:110 ../../diskdrake/interactive.pm_.c:450 +#: ../../diskdrake/interactive.pm_.c:1099 +#: ../../diskdrake/interactive.pm_.c:1174 msgid "Mount point: " msgstr "" -#: ../../diskdrake/dav.pm_.c:111 ../../diskdrake/interactive.pm_.c:1174 +#: ../../diskdrake/dav.pm_.c:111 ../../diskdrake/interactive.pm_.c:1180 #, c-format msgid "Options: %s" msgstr "" @@ -1439,9 +1440,9 @@ msgstr "" msgid "Please make a backup of your data first" msgstr "" -#: ../../diskdrake/hd_gtk.pm_.c:94 ../../diskdrake/interactive.pm_.c:938 -#: ../../diskdrake/interactive.pm_.c:947 -#: ../../diskdrake/interactive.pm_.c:1013 +#: ../../diskdrake/hd_gtk.pm_.c:94 ../../diskdrake/interactive.pm_.c:944 +#: ../../diskdrake/interactive.pm_.c:953 +#: ../../diskdrake/interactive.pm_.c:1019 msgid "Read carefully!" msgstr "" @@ -1505,7 +1506,7 @@ msgstr "" msgid "Swap" msgstr "" -#: ../../diskdrake/hd_gtk.pm_.c:324 ../../diskdrake/interactive.pm_.c:1109 +#: ../../diskdrake/hd_gtk.pm_.c:324 ../../diskdrake/interactive.pm_.c:1115 msgid "Empty" msgstr "" @@ -1519,12 +1520,12 @@ msgstr "" msgid "Filesystem types:" msgstr "" -#: ../../diskdrake/hd_gtk.pm_.c:345 ../../diskdrake/interactive.pm_.c:406 +#: ../../diskdrake/hd_gtk.pm_.c:345 ../../diskdrake/interactive.pm_.c:412 msgid "Create" msgstr "" -#: ../../diskdrake/hd_gtk.pm_.c:345 ../../diskdrake/interactive.pm_.c:384 -#: ../../diskdrake/interactive.pm_.c:535 ../../diskdrake/removable.pm_.c:26 +#: ../../diskdrake/hd_gtk.pm_.c:345 ../../diskdrake/interactive.pm_.c:390 +#: ../../diskdrake/interactive.pm_.c:541 ../../diskdrake/removable.pm_.c:26 #: ../../diskdrake/removable.pm_.c:49 ../../diskdrake/removable_gtk.pm_.c:17 msgid "Type" msgstr "" @@ -1534,7 +1535,7 @@ msgstr "" msgid "Use ``%s'' instead" msgstr "" -#: ../../diskdrake/hd_gtk.pm_.c:347 ../../diskdrake/interactive.pm_.c:393 +#: ../../diskdrake/hd_gtk.pm_.c:347 ../../diskdrake/interactive.pm_.c:399 msgid "Delete" msgstr "" @@ -1542,356 +1543,356 @@ msgstr "" msgid "Use ``Unmount'' first" msgstr "" -#: ../../diskdrake/hd_gtk.pm_.c:352 ../../diskdrake/interactive.pm_.c:522 +#: ../../diskdrake/hd_gtk.pm_.c:352 ../../diskdrake/interactive.pm_.c:528 #, c-format msgid "" "After changing type of partition %s, all data on this partition will be lost" msgstr "" -#: ../../diskdrake/interactive.pm_.c:174 +#: ../../diskdrake/interactive.pm_.c:175 msgid "Choose a partition" msgstr "" -#: ../../diskdrake/interactive.pm_.c:174 +#: ../../diskdrake/interactive.pm_.c:175 msgid "Choose another partition" msgstr "" -#: ../../diskdrake/interactive.pm_.c:199 +#: ../../diskdrake/interactive.pm_.c:200 msgid "Exit" msgstr "" -#: ../../diskdrake/interactive.pm_.c:225 +#: ../../diskdrake/interactive.pm_.c:226 msgid "Toggle to expert mode" msgstr "" -#: ../../diskdrake/interactive.pm_.c:225 +#: ../../diskdrake/interactive.pm_.c:226 msgid "Toggle to normal mode" msgstr "" -#: ../../diskdrake/interactive.pm_.c:225 +#: ../../diskdrake/interactive.pm_.c:226 msgid "Undo" msgstr "" -#: ../../diskdrake/interactive.pm_.c:244 +#: ../../diskdrake/interactive.pm_.c:245 msgid "Continue anyway?" msgstr "" -#: ../../diskdrake/interactive.pm_.c:249 +#: ../../diskdrake/interactive.pm_.c:250 msgid "Quit without saving" msgstr "" -#: ../../diskdrake/interactive.pm_.c:249 +#: ../../diskdrake/interactive.pm_.c:250 msgid "Quit without writing the partition table?" msgstr "" -#: ../../diskdrake/interactive.pm_.c:254 +#: ../../diskdrake/interactive.pm_.c:255 msgid "Do you want to save /etc/fstab modifications" msgstr "" -#: ../../diskdrake/interactive.pm_.c:267 -msgid "Auto allocate" +#: ../../diskdrake/interactive.pm_.c:269 +msgid "Clear all" msgstr "" -#: ../../diskdrake/interactive.pm_.c:267 -msgid "Clear all" +#: ../../diskdrake/interactive.pm_.c:270 +msgid "Auto allocate" msgstr "" -#: ../../diskdrake/interactive.pm_.c:267 +#: ../../diskdrake/interactive.pm_.c:271 #: ../../install_steps_interactive.pm_.c:220 msgid "More" msgstr "" -#: ../../diskdrake/interactive.pm_.c:271 +#: ../../diskdrake/interactive.pm_.c:276 msgid "Hard drive information" msgstr "" -#: ../../diskdrake/interactive.pm_.c:302 +#: ../../diskdrake/interactive.pm_.c:308 msgid "All primary partitions are used" msgstr "" -#: ../../diskdrake/interactive.pm_.c:303 +#: ../../diskdrake/interactive.pm_.c:309 msgid "I can't add any more partition" msgstr "" -#: ../../diskdrake/interactive.pm_.c:304 +#: ../../diskdrake/interactive.pm_.c:310 msgid "" "To have more partitions, please delete one to be able to create an extended " "partition" msgstr "" -#: ../../diskdrake/interactive.pm_.c:314 +#: ../../diskdrake/interactive.pm_.c:320 msgid "Save partition table" msgstr "" -#: ../../diskdrake/interactive.pm_.c:315 +#: ../../diskdrake/interactive.pm_.c:321 msgid "Restore partition table" msgstr "" -#: ../../diskdrake/interactive.pm_.c:316 +#: ../../diskdrake/interactive.pm_.c:322 msgid "Rescue partition table" msgstr "" -#: ../../diskdrake/interactive.pm_.c:318 +#: ../../diskdrake/interactive.pm_.c:324 msgid "Reload partition table" msgstr "" -#: ../../diskdrake/interactive.pm_.c:323 +#: ../../diskdrake/interactive.pm_.c:329 msgid "Removable media automounting" msgstr "" -#: ../../diskdrake/interactive.pm_.c:332 ../../diskdrake/interactive.pm_.c:352 +#: ../../diskdrake/interactive.pm_.c:338 ../../diskdrake/interactive.pm_.c:358 msgid "Select file" msgstr "" -#: ../../diskdrake/interactive.pm_.c:339 +#: ../../diskdrake/interactive.pm_.c:345 msgid "" "The backup partition table has not the same size\n" "Still continue?" msgstr "" -#: ../../diskdrake/interactive.pm_.c:353 ../../harddrake/sound.pm_.c:198 -#: ../../network/netconnect.pm_.c:88 +#: ../../diskdrake/interactive.pm_.c:359 ../../harddrake/sound.pm_.c:200 +#: ../../network/modem.pm_.c:72 msgid "Warning" msgstr "" -#: ../../diskdrake/interactive.pm_.c:354 +#: ../../diskdrake/interactive.pm_.c:360 msgid "" "Insert a floppy in drive\n" "All data on this floppy will be lost" msgstr "" -#: ../../diskdrake/interactive.pm_.c:365 +#: ../../diskdrake/interactive.pm_.c:371 msgid "Trying to rescue partition table" msgstr "" -#: ../../diskdrake/interactive.pm_.c:371 +#: ../../diskdrake/interactive.pm_.c:377 msgid "Detailed information" msgstr "" -#: ../../diskdrake/interactive.pm_.c:386 ../../diskdrake/interactive.pm_.c:666 +#: ../../diskdrake/interactive.pm_.c:392 ../../diskdrake/interactive.pm_.c:672 msgid "Resize" msgstr "" -#: ../../diskdrake/interactive.pm_.c:387 ../../diskdrake/interactive.pm_.c:719 +#: ../../diskdrake/interactive.pm_.c:393 ../../diskdrake/interactive.pm_.c:725 msgid "Move" msgstr "" -#: ../../diskdrake/interactive.pm_.c:388 +#: ../../diskdrake/interactive.pm_.c:394 msgid "Format" msgstr "" -#: ../../diskdrake/interactive.pm_.c:390 +#: ../../diskdrake/interactive.pm_.c:396 msgid "Add to RAID" msgstr "" -#: ../../diskdrake/interactive.pm_.c:391 +#: ../../diskdrake/interactive.pm_.c:397 msgid "Add to LVM" msgstr "" -#: ../../diskdrake/interactive.pm_.c:394 +#: ../../diskdrake/interactive.pm_.c:400 msgid "Remove from RAID" msgstr "" -#: ../../diskdrake/interactive.pm_.c:395 +#: ../../diskdrake/interactive.pm_.c:401 msgid "Remove from LVM" msgstr "" -#: ../../diskdrake/interactive.pm_.c:396 +#: ../../diskdrake/interactive.pm_.c:402 msgid "Modify RAID" msgstr "" -#: ../../diskdrake/interactive.pm_.c:397 +#: ../../diskdrake/interactive.pm_.c:403 msgid "Use for loopback" msgstr "" -#: ../../diskdrake/interactive.pm_.c:437 +#: ../../diskdrake/interactive.pm_.c:443 msgid "Create a new partition" msgstr "" -#: ../../diskdrake/interactive.pm_.c:440 +#: ../../diskdrake/interactive.pm_.c:446 msgid "Start sector: " msgstr "" -#: ../../diskdrake/interactive.pm_.c:442 ../../diskdrake/interactive.pm_.c:819 +#: ../../diskdrake/interactive.pm_.c:448 ../../diskdrake/interactive.pm_.c:825 msgid "Size in MB: " msgstr "" -#: ../../diskdrake/interactive.pm_.c:443 ../../diskdrake/interactive.pm_.c:820 +#: ../../diskdrake/interactive.pm_.c:449 ../../diskdrake/interactive.pm_.c:826 msgid "Filesystem type: " msgstr "" -#: ../../diskdrake/interactive.pm_.c:448 +#: ../../diskdrake/interactive.pm_.c:454 msgid "Preference: " msgstr "" -#: ../../diskdrake/interactive.pm_.c:473 +#: ../../diskdrake/interactive.pm_.c:479 msgid "" "You can't create a new partition\n" "(since you reached the maximal number of primary partitions).\n" "First remove a primary partition and create an extended partition." msgstr "" -#: ../../diskdrake/interactive.pm_.c:503 +#: ../../diskdrake/interactive.pm_.c:509 msgid "Remove the loopback file?" msgstr "" -#: ../../diskdrake/interactive.pm_.c:533 +#: ../../diskdrake/interactive.pm_.c:539 msgid "Change partition type" msgstr "" -#: ../../diskdrake/interactive.pm_.c:534 ../../diskdrake/removable.pm_.c:48 +#: ../../diskdrake/interactive.pm_.c:540 ../../diskdrake/removable.pm_.c:48 msgid "Which filesystem do you want?" msgstr "" -#: ../../diskdrake/interactive.pm_.c:540 +#: ../../diskdrake/interactive.pm_.c:546 msgid "Switching from ext2 to ext3" msgstr "" -#: ../../diskdrake/interactive.pm_.c:570 +#: ../../diskdrake/interactive.pm_.c:576 #, c-format msgid "Where do you want to mount loopback file %s?" msgstr "" -#: ../../diskdrake/interactive.pm_.c:571 +#: ../../diskdrake/interactive.pm_.c:577 #, c-format msgid "Where do you want to mount device %s?" msgstr "" -#: ../../diskdrake/interactive.pm_.c:577 +#: ../../diskdrake/interactive.pm_.c:583 msgid "" "Can't unset mount point as this partition is used for loop back.\n" "Remove the loopback first" msgstr "" -#: ../../diskdrake/interactive.pm_.c:598 +#: ../../diskdrake/interactive.pm_.c:604 #, c-format msgid "Where do you want to mount %s?" msgstr "" -#: ../../diskdrake/interactive.pm_.c:622 +#: ../../diskdrake/interactive.pm_.c:628 msgid "Computing FAT filesystem bounds" msgstr "" -#: ../../diskdrake/interactive.pm_.c:622 ../../diskdrake/interactive.pm_.c:681 +#: ../../diskdrake/interactive.pm_.c:628 ../../diskdrake/interactive.pm_.c:687 #: ../../install_interactive.pm_.c:133 msgid "Resizing" msgstr "" -#: ../../diskdrake/interactive.pm_.c:654 +#: ../../diskdrake/interactive.pm_.c:660 msgid "This partition is not resizeable" msgstr "" -#: ../../diskdrake/interactive.pm_.c:659 +#: ../../diskdrake/interactive.pm_.c:665 msgid "All data on this partition should be backed-up" msgstr "" -#: ../../diskdrake/interactive.pm_.c:661 +#: ../../diskdrake/interactive.pm_.c:667 #, c-format msgid "After resizing partition %s, all data on this partition will be lost" msgstr "" -#: ../../diskdrake/interactive.pm_.c:666 +#: ../../diskdrake/interactive.pm_.c:672 msgid "Choose the new size" msgstr "" -#: ../../diskdrake/interactive.pm_.c:667 +#: ../../diskdrake/interactive.pm_.c:673 msgid "New size in MB: " msgstr "" -#: ../../diskdrake/interactive.pm_.c:720 +#: ../../diskdrake/interactive.pm_.c:726 msgid "Which disk do you want to move it to?" msgstr "" -#: ../../diskdrake/interactive.pm_.c:721 +#: ../../diskdrake/interactive.pm_.c:727 msgid "Sector" msgstr "" -#: ../../diskdrake/interactive.pm_.c:722 +#: ../../diskdrake/interactive.pm_.c:728 msgid "Which sector do you want to move it to?" msgstr "" -#: ../../diskdrake/interactive.pm_.c:725 +#: ../../diskdrake/interactive.pm_.c:731 msgid "Moving" msgstr "" -#: ../../diskdrake/interactive.pm_.c:725 +#: ../../diskdrake/interactive.pm_.c:731 msgid "Moving partition..." msgstr "" -#: ../../diskdrake/interactive.pm_.c:742 +#: ../../diskdrake/interactive.pm_.c:748 msgid "Choose an existing RAID to add to" msgstr "" -#: ../../diskdrake/interactive.pm_.c:743 ../../diskdrake/interactive.pm_.c:760 +#: ../../diskdrake/interactive.pm_.c:749 ../../diskdrake/interactive.pm_.c:766 msgid "new" msgstr "" -#: ../../diskdrake/interactive.pm_.c:758 +#: ../../diskdrake/interactive.pm_.c:764 msgid "Choose an existing LVM to add to" msgstr "" -#: ../../diskdrake/interactive.pm_.c:763 +#: ../../diskdrake/interactive.pm_.c:769 msgid "LVM name?" msgstr "" -#: ../../diskdrake/interactive.pm_.c:804 +#: ../../diskdrake/interactive.pm_.c:810 msgid "This partition can't be used for loopback" msgstr "" -#: ../../diskdrake/interactive.pm_.c:817 +#: ../../diskdrake/interactive.pm_.c:823 msgid "Loopback" msgstr "" -#: ../../diskdrake/interactive.pm_.c:818 +#: ../../diskdrake/interactive.pm_.c:824 msgid "Loopback file name: " msgstr "" -#: ../../diskdrake/interactive.pm_.c:823 +#: ../../diskdrake/interactive.pm_.c:829 msgid "Give a file name" msgstr "" -#: ../../diskdrake/interactive.pm_.c:826 +#: ../../diskdrake/interactive.pm_.c:832 msgid "File already used by another loopback, choose another one" msgstr "" -#: ../../diskdrake/interactive.pm_.c:827 +#: ../../diskdrake/interactive.pm_.c:833 msgid "File already exists. Use it?" msgstr "" -#: ../../diskdrake/interactive.pm_.c:850 +#: ../../diskdrake/interactive.pm_.c:856 msgid "Mount options" msgstr "" -#: ../../diskdrake/interactive.pm_.c:857 +#: ../../diskdrake/interactive.pm_.c:863 msgid "Various" msgstr "" -#: ../../diskdrake/interactive.pm_.c:921 ../../standalone/drakfloppy_.c:104 +#: ../../diskdrake/interactive.pm_.c:927 ../../standalone/drakfloppy_.c:104 msgid "device" msgstr "" -#: ../../diskdrake/interactive.pm_.c:922 +#: ../../diskdrake/interactive.pm_.c:928 msgid "level" msgstr "" -#: ../../diskdrake/interactive.pm_.c:923 +#: ../../diskdrake/interactive.pm_.c:929 msgid "chunk size" msgstr "" -#: ../../diskdrake/interactive.pm_.c:938 +#: ../../diskdrake/interactive.pm_.c:944 msgid "Be careful: this operation is dangerous." msgstr "" -#: ../../diskdrake/interactive.pm_.c:953 +#: ../../diskdrake/interactive.pm_.c:959 msgid "What type of partitioning?" msgstr "" -#: ../../diskdrake/interactive.pm_.c:969 +#: ../../diskdrake/interactive.pm_.c:975 #, c-format msgid "The package %s is needed. Install it?" msgstr "" -#: ../../diskdrake/interactive.pm_.c:983 +#: ../../diskdrake/interactive.pm_.c:989 msgid "" "Sorry I won't accept to create /boot so far onto the drive (on a cylinder > " "1024).\n" @@ -1899,7 +1900,7 @@ msgid "" "need /boot" msgstr "" -#: ../../diskdrake/interactive.pm_.c:987 +#: ../../diskdrake/interactive.pm_.c:993 msgid "" "The partition you've selected to add as root (/) is physically located " "beyond\n" @@ -1907,167 +1908,167 @@ msgid "" "If you plan to use the LILO boot manager, be careful to add a /boot partition" msgstr "" -#: ../../diskdrake/interactive.pm_.c:993 +#: ../../diskdrake/interactive.pm_.c:999 msgid "" "You've selected a software RAID partition as root (/).\n" "No bootloader is able to handle this without a /boot partition.\n" "So be careful to add a /boot partition" msgstr "" -#: ../../diskdrake/interactive.pm_.c:1013 +#: ../../diskdrake/interactive.pm_.c:1019 #, c-format msgid "Partition table of drive %s is going to be written to disk!" msgstr "" -#: ../../diskdrake/interactive.pm_.c:1017 +#: ../../diskdrake/interactive.pm_.c:1023 msgid "You'll need to reboot before the modification can take place" msgstr "" -#: ../../diskdrake/interactive.pm_.c:1028 +#: ../../diskdrake/interactive.pm_.c:1034 #, c-format msgid "After formatting partition %s, all data on this partition will be lost" msgstr "" -#: ../../diskdrake/interactive.pm_.c:1030 +#: ../../diskdrake/interactive.pm_.c:1036 msgid "Formatting" msgstr "" -#: ../../diskdrake/interactive.pm_.c:1031 +#: ../../diskdrake/interactive.pm_.c:1037 #, c-format msgid "Formatting loopback file %s" msgstr "" -#: ../../diskdrake/interactive.pm_.c:1032 +#: ../../diskdrake/interactive.pm_.c:1038 #: ../../install_steps_interactive.pm_.c:466 #, c-format msgid "Formatting partition %s" msgstr "" -#: ../../diskdrake/interactive.pm_.c:1043 +#: ../../diskdrake/interactive.pm_.c:1049 msgid "Hide files" msgstr "" -#: ../../diskdrake/interactive.pm_.c:1043 +#: ../../diskdrake/interactive.pm_.c:1049 msgid "Move files to the new partition" msgstr "" -#: ../../diskdrake/interactive.pm_.c:1044 +#: ../../diskdrake/interactive.pm_.c:1050 #, c-format msgid "" "Directory %s already contains data\n" "(%s)" msgstr "" -#: ../../diskdrake/interactive.pm_.c:1055 +#: ../../diskdrake/interactive.pm_.c:1061 msgid "Moving files to the new partition" msgstr "" -#: ../../diskdrake/interactive.pm_.c:1059 +#: ../../diskdrake/interactive.pm_.c:1065 #, c-format msgid "Copying %s" msgstr "" -#: ../../diskdrake/interactive.pm_.c:1063 +#: ../../diskdrake/interactive.pm_.c:1069 #, c-format msgid "Removing %s" msgstr "" -#: ../../diskdrake/interactive.pm_.c:1073 +#: ../../diskdrake/interactive.pm_.c:1079 #, c-format msgid "partition %s is now known as %s" msgstr "" -#: ../../diskdrake/interactive.pm_.c:1094 -#: ../../diskdrake/interactive.pm_.c:1153 +#: ../../diskdrake/interactive.pm_.c:1100 +#: ../../diskdrake/interactive.pm_.c:1159 msgid "Device: " msgstr "" -#: ../../diskdrake/interactive.pm_.c:1095 +#: ../../diskdrake/interactive.pm_.c:1101 #, c-format msgid "DOS drive letter: %s (just a guess)\n" msgstr "" -#: ../../diskdrake/interactive.pm_.c:1099 -#: ../../diskdrake/interactive.pm_.c:1107 -#: ../../diskdrake/interactive.pm_.c:1172 +#: ../../diskdrake/interactive.pm_.c:1105 +#: ../../diskdrake/interactive.pm_.c:1113 +#: ../../diskdrake/interactive.pm_.c:1178 msgid "Type: " msgstr "" -#: ../../diskdrake/interactive.pm_.c:1103 +#: ../../diskdrake/interactive.pm_.c:1109 msgid "Name: " msgstr "" -#: ../../diskdrake/interactive.pm_.c:1111 +#: ../../diskdrake/interactive.pm_.c:1117 #, c-format msgid "Start: sector %s\n" msgstr "" -#: ../../diskdrake/interactive.pm_.c:1112 +#: ../../diskdrake/interactive.pm_.c:1118 #, c-format msgid "Size: %s" msgstr "" -#: ../../diskdrake/interactive.pm_.c:1114 +#: ../../diskdrake/interactive.pm_.c:1120 #, c-format msgid ", %s sectors" msgstr "" -#: ../../diskdrake/interactive.pm_.c:1116 +#: ../../diskdrake/interactive.pm_.c:1122 #, c-format msgid "Cylinder %d to %d\n" msgstr "" -#: ../../diskdrake/interactive.pm_.c:1117 +#: ../../diskdrake/interactive.pm_.c:1123 msgid "Formatted\n" msgstr "" -#: ../../diskdrake/interactive.pm_.c:1118 +#: ../../diskdrake/interactive.pm_.c:1124 msgid "Not formatted\n" msgstr "" -#: ../../diskdrake/interactive.pm_.c:1119 +#: ../../diskdrake/interactive.pm_.c:1125 msgid "Mounted\n" msgstr "" -#: ../../diskdrake/interactive.pm_.c:1120 +#: ../../diskdrake/interactive.pm_.c:1126 #, c-format msgid "RAID md%s\n" msgstr "" -#: ../../diskdrake/interactive.pm_.c:1122 +#: ../../diskdrake/interactive.pm_.c:1128 #, c-format msgid "" "Loopback file(s):\n" " %s\n" msgstr "" -#: ../../diskdrake/interactive.pm_.c:1123 +#: ../../diskdrake/interactive.pm_.c:1129 msgid "" "Partition booted by default\n" " (for MS-DOS boot, not for lilo)\n" msgstr "" -#: ../../diskdrake/interactive.pm_.c:1125 +#: ../../diskdrake/interactive.pm_.c:1131 #, c-format msgid "Level %s\n" msgstr "" -#: ../../diskdrake/interactive.pm_.c:1126 +#: ../../diskdrake/interactive.pm_.c:1132 #, c-format msgid "Chunk size %s\n" msgstr "" -#: ../../diskdrake/interactive.pm_.c:1127 +#: ../../diskdrake/interactive.pm_.c:1133 #, c-format msgid "RAID-disks %s\n" msgstr "" -#: ../../diskdrake/interactive.pm_.c:1129 +#: ../../diskdrake/interactive.pm_.c:1135 #, c-format msgid "Loopback file name: %s" msgstr "" -#: ../../diskdrake/interactive.pm_.c:1132 +#: ../../diskdrake/interactive.pm_.c:1138 msgid "" "\n" "Chances are, this partition is\n" @@ -2075,7 +2076,7 @@ msgid "" "probably leave it alone.\n" msgstr "" -#: ../../diskdrake/interactive.pm_.c:1135 +#: ../../diskdrake/interactive.pm_.c:1141 msgid "" "\n" "This special Bootstrap\n" @@ -2083,61 +2084,61 @@ msgid "" "dual-booting your system.\n" msgstr "" -#: ../../diskdrake/interactive.pm_.c:1154 +#: ../../diskdrake/interactive.pm_.c:1160 msgid "Read-only" msgstr "" -#: ../../diskdrake/interactive.pm_.c:1155 +#: ../../diskdrake/interactive.pm_.c:1161 #, c-format msgid "Size: %s\n" msgstr "" -#: ../../diskdrake/interactive.pm_.c:1156 +#: ../../diskdrake/interactive.pm_.c:1162 #, c-format msgid "Geometry: %s cylinders, %s heads, %s sectors\n" msgstr "" -#: ../../diskdrake/interactive.pm_.c:1157 +#: ../../diskdrake/interactive.pm_.c:1163 msgid "Info: " msgstr "" -#: ../../diskdrake/interactive.pm_.c:1158 +#: ../../diskdrake/interactive.pm_.c:1164 #, c-format msgid "LVM-disks %s\n" msgstr "" -#: ../../diskdrake/interactive.pm_.c:1159 +#: ../../diskdrake/interactive.pm_.c:1165 #, c-format msgid "Partition table type: %s\n" msgstr "" -#: ../../diskdrake/interactive.pm_.c:1160 +#: ../../diskdrake/interactive.pm_.c:1166 #, c-format msgid "on channel %d id %d\n" msgstr "" -#: ../../diskdrake/interactive.pm_.c:1190 +#: ../../diskdrake/interactive.pm_.c:1196 msgid "Filesystem encryption key" msgstr "" -#: ../../diskdrake/interactive.pm_.c:1191 +#: ../../diskdrake/interactive.pm_.c:1197 msgid "Choose your filesystem encryption key" msgstr "" -#: ../../diskdrake/interactive.pm_.c:1194 +#: ../../diskdrake/interactive.pm_.c:1200 #, c-format msgid "This encryption key is too simple (must be at least %d characters long)" msgstr "" -#: ../../diskdrake/interactive.pm_.c:1195 +#: ../../diskdrake/interactive.pm_.c:1201 msgid "The encryption keys do not match" msgstr "" -#: ../../diskdrake/interactive.pm_.c:1198 +#: ../../diskdrake/interactive.pm_.c:1204 msgid "Encryption key" msgstr "" -#: ../../diskdrake/interactive.pm_.c:1199 +#: ../../diskdrake/interactive.pm_.c:1205 msgid "Encryption key (again)" msgstr "" @@ -2183,23 +2184,23 @@ msgstr "" msgid "Search servers" msgstr "" -#: ../../fs.pm_.c:547 ../../fs.pm_.c:557 ../../fs.pm_.c:561 ../../fs.pm_.c:565 -#: ../../fs.pm_.c:569 ../../fs.pm_.c:573 +#: ../../fs.pm_.c:547 ../../fs.pm_.c:548 ../../fs.pm_.c:558 ../../fs.pm_.c:562 +#: ../../fs.pm_.c:566 ../../fs.pm_.c:570 ../../fs.pm_.c:574 #, c-format msgid "%s formatting of %s failed" msgstr "" -#: ../../fs.pm_.c:610 +#: ../../fs.pm_.c:611 #, c-format msgid "I don't know how to format %s in type %s" msgstr "" -#: ../../fs.pm_.c:684 ../../fs.pm_.c:727 +#: ../../fs.pm_.c:685 ../../fs.pm_.c:728 #, c-format msgid "mounting partition %s in directory %s failed" msgstr "" -#: ../../fs.pm_.c:742 ../../partition_table.pm_.c:598 +#: ../../fs.pm_.c:743 ../../partition_table.pm_.c:599 #, c-format msgid "error unmounting %s: %s" msgstr "" @@ -2281,29 +2282,29 @@ msgstr "" msgid "cpu number " msgstr "" -#: ../../harddrake/sound.pm_.c:166 +#: ../../harddrake/sound.pm_.c:168 msgid "No alternative driver" msgstr "" -#: ../../harddrake/sound.pm_.c:167 +#: ../../harddrake/sound.pm_.c:169 #, c-format msgid "" "There's no known OSS/ALSA alternative driver for your sound card (%s) which " "currently uses \"%s\"" msgstr "" -#: ../../harddrake/sound.pm_.c:169 +#: ../../harddrake/sound.pm_.c:171 msgid "Sound configuration" msgstr "" -#: ../../harddrake/sound.pm_.c:170 +#: ../../harddrake/sound.pm_.c:172 #, c-format msgid "" "Here you can select an alternative driver (either OSS or ALSA) for your " "sound card (%s)." msgstr "" -#: ../../harddrake/sound.pm_.c:172 +#: ../../harddrake/sound.pm_.c:174 #, c-format msgid "" "\n" @@ -2312,25 +2313,25 @@ msgid "" "\"%s\")" msgstr "" -#: ../../harddrake/sound.pm_.c:174 +#: ../../harddrake/sound.pm_.c:176 msgid "Driver:" msgstr "" -#: ../../harddrake/sound.pm_.c:179 ../../standalone/drakTermServ_.c:310 +#: ../../harddrake/sound.pm_.c:181 ../../standalone/drakTermServ_.c:310 #: ../../standalone/drakbackup_.c:3929 ../../standalone/drakbackup_.c:3962 #: ../../standalone/drakbackup_.c:3988 ../../standalone/drakbackup_.c:4015 #: ../../standalone/drakbackup_.c:4042 ../../standalone/drakbackup_.c:4081 #: ../../standalone/drakbackup_.c:4102 ../../standalone/drakbackup_.c:4129 #: ../../standalone/drakbackup_.c:4159 ../../standalone/drakbackup_.c:4185 -#: ../../standalone/drakbackup_.c:4210 ../../standalone/drakfont_.c:701 +#: ../../standalone/drakbackup_.c:4210 ../../standalone/drakfont_.c:698 msgid "Help" msgstr "" -#: ../../harddrake/sound.pm_.c:181 +#: ../../harddrake/sound.pm_.c:183 msgid "Switching between ALSA and OSS help" msgstr "" -#: ../../harddrake/sound.pm_.c:182 +#: ../../harddrake/sound.pm_.c:184 msgid "" "OSS (Open Sound System) was the first sound API. It's an OS independant " "sound API (it's available on most unices systems) but it's a very basic and " @@ -2349,7 +2350,7 @@ msgid "" "the ALSA library.\n" msgstr "" -#: ../../harddrake/sound.pm_.c:198 +#: ../../harddrake/sound.pm_.c:200 #, c-format msgid "" "The old \"%s\" driver is blacklisted.\n" @@ -2359,29 +2360,29 @@ msgid "" "The new \"%s\" driver'll only be used on next bootstrap." msgstr "" -#: ../../harddrake/sound.pm_.c:201 ../../standalone/drakconnect_.c:301 +#: ../../harddrake/sound.pm_.c:203 ../../standalone/drakconnect_.c:301 msgid "Please Wait... Applying the configuration" msgstr "" -#: ../../harddrake/sound.pm_.c:201 ../../harddrake/ui.pm_.c:153 -#: ../../interactive.pm_.c:391 +#: ../../harddrake/sound.pm_.c:203 ../../harddrake/ui.pm_.c:153 +#: ../../interactive.pm_.c:382 msgid "Please wait" msgstr "" -#: ../../harddrake/sound.pm_.c:206 +#: ../../harddrake/sound.pm_.c:208 msgid "No known driver" msgstr "" -#: ../../harddrake/sound.pm_.c:207 +#: ../../harddrake/sound.pm_.c:209 #, c-format msgid "There's no known driver for your sound card (%s)" msgstr "" -#: ../../harddrake/sound.pm_.c:210 +#: ../../harddrake/sound.pm_.c:212 msgid "Unkown driver" msgstr "" -#: ../../harddrake/sound.pm_.c:211 +#: ../../harddrake/sound.pm_.c:213 #, c-format msgid "" "The \"%s\" driver for your sound card is unlisted\n" @@ -3665,7 +3666,7 @@ msgid "" "defcfg=floppy''" msgstr "" -#: ../../install_any.pm_.c:920 ../../partition_table.pm_.c:767 +#: ../../install_any.pm_.c:920 ../../partition_table.pm_.c:768 #, c-format msgid "Error reading file %s" msgstr "" @@ -4920,20 +4921,20 @@ msgstr "" msgid "Choose a file" msgstr "" -#: ../../interactive.pm_.c:320 +#: ../../interactive.pm_.c:318 msgid "Advanced" msgstr "" -#: ../../interactive.pm_.c:321 ../../security/main.pm_.c:104 +#: ../../interactive.pm_.c:319 ../../security/main.pm_.c:104 msgid "Basic" msgstr "" -#: ../../interactive/newt.pm_.c:195 ../../my_gtk.pm_.c:159 +#: ../../interactive/newt.pm_.c:194 ../../my_gtk.pm_.c:159 #: ../../printerdrake.pm_.c:2164 msgid "<- Previous" msgstr "" -#: ../../interactive/newt.pm_.c:195 ../../interactive/newt.pm_.c:197 +#: ../../interactive/newt.pm_.c:194 ../../interactive/newt.pm_.c:196 #: ../../standalone/drakbackup_.c:4111 ../../standalone/drakbackup_.c:4138 #: ../../standalone/drakbackup_.c:4168 ../../standalone/drakbackup_.c:4194 msgid "Next" @@ -5690,10 +5691,10 @@ msgid "Host name" msgstr "" #: ../../network/isdn.pm_.c:21 ../../network/isdn.pm_.c:44 -#: ../../network/netconnect.pm_.c:99 ../../network/netconnect.pm_.c:113 -#: ../../network/netconnect.pm_.c:168 ../../network/netconnect.pm_.c:183 -#: ../../network/netconnect.pm_.c:210 ../../network/netconnect.pm_.c:233 -#: ../../network/netconnect.pm_.c:241 +#: ../../network/netconnect.pm_.c:94 ../../network/netconnect.pm_.c:108 +#: ../../network/netconnect.pm_.c:163 ../../network/netconnect.pm_.c:178 +#: ../../network/netconnect.pm_.c:206 ../../network/netconnect.pm_.c:230 +#: ../../network/netconnect.pm_.c:238 msgid "Network Configuration Wizard" msgstr "" @@ -5864,6 +5865,30 @@ msgstr "" msgid "Second DNS Server (optional)" msgstr "" +#: ../../network/modem.pm_.c:72 +msgid "" +"Your modem isn't supported by the system.\n" +"Take a look at http://www.linmodems.org" +msgstr "" + +#: ../../network/modem.pm_.c:74 +#, c-format +msgid "" +"\"%s\" based winmodem detected, do you want to install needed software ?" +msgstr "" + +#: ../../network/modem.pm_.c:74 +msgid "Do nothing" +msgstr "" + +#: ../../network/modem.pm_.c:74 +msgid "Install rpm" +msgstr "" + +#: ../../network/modem.pm_.c:74 +msgid "Title" +msgstr "" + #: ../../network/netconnect.pm_.c:29 msgid "" "\n" @@ -5906,22 +5931,12 @@ msgstr "" msgid "Internet connection & configuration" msgstr "" -#: ../../network/netconnect.pm_.c:88 -#, c-format -msgid "" -"You have internal winmodem(s) :\n" -"\n" -"%s\n" -"\n" -" Go to http://www.linmodem.org for further information" -msgstr "" - -#: ../../network/netconnect.pm_.c:104 +#: ../../network/netconnect.pm_.c:99 #, c-format msgid "We are now going to configure the %s connection." msgstr "" -#: ../../network/netconnect.pm_.c:113 +#: ../../network/netconnect.pm_.c:108 #, c-format msgid "" "\n" @@ -5933,12 +5948,12 @@ msgid "" "Press OK to continue." msgstr "" -#: ../../network/netconnect.pm_.c:142 ../../network/netconnect.pm_.c:260 -#: ../../network/netconnect.pm_.c:280 ../../network/tools.pm_.c:63 +#: ../../network/netconnect.pm_.c:137 ../../network/netconnect.pm_.c:257 +#: ../../network/netconnect.pm_.c:277 ../../network/tools.pm_.c:63 msgid "Network Configuration" msgstr "" -#: ../../network/netconnect.pm_.c:143 +#: ../../network/netconnect.pm_.c:138 msgid "" "Because you are doing a network installation, your network is already " "configured.\n" @@ -5946,7 +5961,7 @@ msgid "" "Internet & Network connection.\n" msgstr "" -#: ../../network/netconnect.pm_.c:169 +#: ../../network/netconnect.pm_.c:164 msgid "" "Welcome to The Network Configuration Wizard.\n" "\n" @@ -5954,94 +5969,98 @@ msgid "" "If you don't want to use the auto detection, deselect the checkbox.\n" msgstr "" -#: ../../network/netconnect.pm_.c:175 +#: ../../network/netconnect.pm_.c:170 msgid "Choose the profile to configure" msgstr "" -#: ../../network/netconnect.pm_.c:176 +#: ../../network/netconnect.pm_.c:171 msgid "Use auto detection" msgstr "" -#: ../../network/netconnect.pm_.c:177 ../../printerdrake.pm_.c:3199 +#: ../../network/netconnect.pm_.c:172 ../../printerdrake.pm_.c:3199 #: ../../standalone/drakconnect_.c:274 ../../standalone/drakconnect_.c:277 #: ../../standalone/drakfloppy_.c:146 msgid "Expert Mode" msgstr "" -#: ../../network/netconnect.pm_.c:183 ../../printerdrake.pm_.c:405 +#: ../../network/netconnect.pm_.c:178 ../../printerdrake.pm_.c:405 msgid "Detecting devices..." msgstr "" -#: ../../network/netconnect.pm_.c:194 ../../network/netconnect.pm_.c:203 +#: ../../network/netconnect.pm_.c:198 msgid "Normal modem connection" msgstr "" -#: ../../network/netconnect.pm_.c:194 ../../network/netconnect.pm_.c:203 +#: ../../network/netconnect.pm_.c:198 #, c-format msgid "detected on port %s" msgstr "" -#: ../../network/netconnect.pm_.c:195 ../../network/netconnect.pm_.c:204 +#: ../../network/netconnect.pm_.c:199 +msgid "Winmodem connection" +msgstr "" + +#: ../../network/netconnect.pm_.c:199 ../../network/netconnect.pm_.c:201 +msgid "detected" +msgstr "" + +#: ../../network/netconnect.pm_.c:200 msgid "ISDN connection" msgstr "" -#: ../../network/netconnect.pm_.c:195 ../../network/netconnect.pm_.c:204 +#: ../../network/netconnect.pm_.c:200 #, c-format msgid "detected %s" msgstr "" -#: ../../network/netconnect.pm_.c:196 ../../network/netconnect.pm_.c:205 +#: ../../network/netconnect.pm_.c:201 msgid "ADSL connection" msgstr "" -#: ../../network/netconnect.pm_.c:196 ../../network/netconnect.pm_.c:205 -msgid "detected" -msgstr "" - -#: ../../network/netconnect.pm_.c:197 ../../network/netconnect.pm_.c:206 +#: ../../network/netconnect.pm_.c:202 msgid "Cable connection" msgstr "" -#: ../../network/netconnect.pm_.c:197 ../../network/netconnect.pm_.c:206 +#: ../../network/netconnect.pm_.c:202 msgid "cable connection detected" msgstr "" -#: ../../network/netconnect.pm_.c:198 ../../network/netconnect.pm_.c:207 +#: ../../network/netconnect.pm_.c:203 msgid "LAN connection" msgstr "" -#: ../../network/netconnect.pm_.c:198 ../../network/netconnect.pm_.c:207 +#: ../../network/netconnect.pm_.c:203 msgid "ethernet card(s) detected" msgstr "" -#: ../../network/netconnect.pm_.c:210 +#: ../../network/netconnect.pm_.c:206 msgid "Choose the connection you want to configure" msgstr "" -#: ../../network/netconnect.pm_.c:234 +#: ../../network/netconnect.pm_.c:231 msgid "" "You have configured multiple ways to connect to the Internet.\n" "Choose the one you want to use.\n" "\n" msgstr "" -#: ../../network/netconnect.pm_.c:235 +#: ../../network/netconnect.pm_.c:232 msgid "Internet connection" msgstr "" -#: ../../network/netconnect.pm_.c:241 +#: ../../network/netconnect.pm_.c:238 msgid "Do you want to start the connection at boot?" msgstr "" -#: ../../network/netconnect.pm_.c:255 +#: ../../network/netconnect.pm_.c:252 msgid "Network configuration" msgstr "" -#: ../../network/netconnect.pm_.c:256 +#: ../../network/netconnect.pm_.c:253 msgid "The network needs to be restarted" msgstr "" -#: ../../network/netconnect.pm_.c:260 +#: ../../network/netconnect.pm_.c:257 #, c-format msgid "" "A problem occured while restarting the network: \n" @@ -6049,20 +6068,20 @@ msgid "" "%s" msgstr "" -#: ../../network/netconnect.pm_.c:270 +#: ../../network/netconnect.pm_.c:267 msgid "" "Congratulations, the network and Internet configuration is finished.\n" "The configuration will now be applied to your system.\n" "\n" msgstr "" -#: ../../network/netconnect.pm_.c:274 +#: ../../network/netconnect.pm_.c:271 msgid "" "After this is done, we recommend that you restart your X environment to " "avoid any hostname-related problems." msgstr "" -#: ../../network/netconnect.pm_.c:275 +#: ../../network/netconnect.pm_.c:272 msgid "" "Problems occured during configuration.\n" "Test your connection via net_monitor or mcc. If your connection doesn't " @@ -6286,31 +6305,31 @@ msgstr "" msgid "United Kingdom" msgstr "" -#: ../../partition_table.pm_.c:602 +#: ../../partition_table.pm_.c:603 msgid "mount failed: " msgstr "" -#: ../../partition_table.pm_.c:666 +#: ../../partition_table.pm_.c:667 msgid "Extended partition not supported on this platform" msgstr "" -#: ../../partition_table.pm_.c:684 +#: ../../partition_table.pm_.c:685 msgid "" "You have a hole in your partition table but I can't use it.\n" "The only solution is to move your primary partitions to have the hole next " "to the extended partitions." msgstr "" -#: ../../partition_table.pm_.c:774 +#: ../../partition_table.pm_.c:775 #, c-format msgid "Restoring from file %s failed: %s" msgstr "" -#: ../../partition_table.pm_.c:776 +#: ../../partition_table.pm_.c:777 msgid "Bad backup file" msgstr "" -#: ../../partition_table.pm_.c:798 +#: ../../partition_table.pm_.c:799 #, c-format msgid "Error writing to file %s" msgstr "" @@ -6370,7 +6389,7 @@ msgstr "" msgid "CUPS - Common Unix Printing System" msgstr "" -#: ../../printer.pm_.c:45 ../../printer.pm_.c:1182 +#: ../../printer.pm_.c:45 ../../printer.pm_.c:1186 msgid "CUPS" msgstr "" @@ -6410,99 +6429,99 @@ msgstr "" msgid "Pipe job into a command" msgstr "" -#: ../../printer.pm_.c:350 ../../printer.pm_.c:392 ../../printer.pm_.c:571 +#: ../../printer.pm_.c:354 ../../printer.pm_.c:396 ../../printer.pm_.c:575 msgid "Unknown Model" msgstr "" -#: ../../printer.pm_.c:792 ../../printer.pm_.c:983 ../../printer.pm_.c:1375 +#: ../../printer.pm_.c:796 ../../printer.pm_.c:987 ../../printer.pm_.c:1379 #: ../../printerdrake.pm_.c:2300 ../../printerdrake.pm_.c:3467 msgid "Unknown model" msgstr "" -#: ../../printer.pm_.c:820 +#: ../../printer.pm_.c:824 msgid "Local Printers" msgstr "" -#: ../../printer.pm_.c:822 ../../printer.pm_.c:1183 +#: ../../printer.pm_.c:826 ../../printer.pm_.c:1187 msgid "Remote Printers" msgstr "" -#: ../../printer.pm_.c:829 ../../printerdrake.pm_.c:420 +#: ../../printer.pm_.c:833 ../../printerdrake.pm_.c:420 #, c-format msgid " on parallel port \\/*%s" msgstr "" -#: ../../printer.pm_.c:832 ../../printerdrake.pm_.c:422 +#: ../../printer.pm_.c:836 ../../printerdrake.pm_.c:422 #, c-format msgid ", USB printer \\/*%s" msgstr "" -#: ../../printer.pm_.c:837 +#: ../../printer.pm_.c:841 #, c-format msgid ", multi-function device on parallel port \\/*%s" msgstr "" -#: ../../printer.pm_.c:840 +#: ../../printer.pm_.c:844 msgid ", multi-function device on USB" msgstr "" -#: ../../printer.pm_.c:842 +#: ../../printer.pm_.c:846 msgid ", multi-function device on HP JetDirect" msgstr "" -#: ../../printer.pm_.c:844 +#: ../../printer.pm_.c:848 msgid ", multi-function device" msgstr "" -#: ../../printer.pm_.c:847 +#: ../../printer.pm_.c:851 #, c-format msgid ", printing to %s" msgstr "" -#: ../../printer.pm_.c:849 +#: ../../printer.pm_.c:853 #, c-format msgid " on LPD server \"%s\", printer \"%s\"" msgstr "" -#: ../../printer.pm_.c:851 +#: ../../printer.pm_.c:855 #, c-format msgid ", TCP/IP host \"%s\", port %s" msgstr "" -#: ../../printer.pm_.c:855 +#: ../../printer.pm_.c:859 #, c-format msgid " on SMB/Windows server \"%s\", share \"%s\"" msgstr "" -#: ../../printer.pm_.c:859 +#: ../../printer.pm_.c:863 #, c-format msgid " on Novell server \"%s\", printer \"%s\"" msgstr "" -#: ../../printer.pm_.c:861 +#: ../../printer.pm_.c:865 #, c-format msgid ", using command %s" msgstr "" -#: ../../printer.pm_.c:980 ../../printerdrake.pm_.c:1696 +#: ../../printer.pm_.c:984 ../../printerdrake.pm_.c:1696 msgid "Raw printer (No driver)" msgstr "" -#: ../../printer.pm_.c:1152 +#: ../../printer.pm_.c:1156 #, c-format msgid "(on %s)" msgstr "" -#: ../../printer.pm_.c:1154 +#: ../../printer.pm_.c:1158 msgid "(on this machine)" msgstr "" -#: ../../printer.pm_.c:1179 +#: ../../printer.pm_.c:1183 #, c-format msgid "On CUPS server \"%s\"" msgstr "" -#: ../../printer.pm_.c:1185 ../../printerdrake.pm_.c:3119 +#: ../../printer.pm_.c:1189 ../../printerdrake.pm_.c:3119 #: ../../printerdrake.pm_.c:3130 ../../printerdrake.pm_.c:3356 #: ../../printerdrake.pm_.c:3408 ../../printerdrake.pm_.c:3434 #: ../../printerdrake.pm_.c:3609 ../../printerdrake.pm_.c:3611 @@ -7470,8 +7489,8 @@ msgstr "" #: ../../printerdrake.pm_.c:2394 ../../printerdrake.pm_.c:2395 #: ../../printerdrake.pm_.c:3453 ../../standalone/drakTermServ_.c:312 #: ../../standalone/drakbackup_.c:1559 ../../standalone/drakbackup_.c:4207 -#: ../../standalone/drakbug_.c:130 ../../standalone/drakfont_.c:706 -#: ../../standalone/drakfont_.c:1015 +#: ../../standalone/drakbug_.c:130 ../../standalone/drakfont_.c:703 +#: ../../standalone/drakfont_.c:1010 msgid "Close" msgstr "" @@ -9057,7 +9076,7 @@ msgid "Can't create catalog!" msgstr "" #: ../../standalone/drakbackup_.c:1516 ../../standalone/drakbackup_.c:1527 -#: ../../standalone/drakfont_.c:1005 +#: ../../standalone/drakfont_.c:1000 msgid "File Selection" msgstr "" @@ -9106,7 +9125,7 @@ msgstr "" msgid "Use Incremental Backups (do not replace old backups)" msgstr "" -#: ../../standalone/drakbackup_.c:1671 ../../standalone/drakfont_.c:1059 +#: ../../standalone/drakbackup_.c:1671 ../../standalone/drakfont_.c:1054 msgid "Remove Selected" msgstr "" @@ -10621,7 +10640,7 @@ msgstr "" msgid "xfs restart" msgstr "" -#: ../../standalone/drakfont_.c:543 ../../standalone/drakfont_.c:952 +#: ../../standalone/drakfont_.c:542 msgid "" "Before installing any fonts, be sure that you have the right to use and " "install them on your system.\n" @@ -10630,95 +10649,95 @@ msgid "" "may hang up your X Server." msgstr "" -#: ../../standalone/drakfont_.c:631 +#: ../../standalone/drakfont_.c:628 msgid "Fonts Importation" msgstr "" -#: ../../standalone/drakfont_.c:661 +#: ../../standalone/drakfont_.c:658 msgid "Get Windows Fonts" msgstr "" -#: ../../standalone/drakfont_.c:669 +#: ../../standalone/drakfont_.c:666 msgid "Uninstall Fonts" msgstr "" -#: ../../standalone/drakfont_.c:680 +#: ../../standalone/drakfont_.c:677 msgid "Advanced Options" msgstr "" -#: ../../standalone/drakfont_.c:688 +#: ../../standalone/drakfont_.c:685 msgid "Font List" msgstr "" -#: ../../standalone/drakfont_.c:910 +#: ../../standalone/drakfont_.c:906 msgid "Choose the applications that will support the fonts:" msgstr "" -#: ../../standalone/drakfont_.c:919 +#: ../../standalone/drakfont_.c:914 msgid "Ghostscript" msgstr "" -#: ../../standalone/drakfont_.c:926 +#: ../../standalone/drakfont_.c:921 msgid "StarOffice" msgstr "" -#: ../../standalone/drakfont_.c:933 +#: ../../standalone/drakfont_.c:928 msgid "Abiword" msgstr "" -#: ../../standalone/drakfont_.c:940 +#: ../../standalone/drakfont_.c:935 msgid "Generic Printers" msgstr "" -#: ../../standalone/drakfont_.c:1017 +#: ../../standalone/drakfont_.c:1012 msgid "Select the font file or directory and click on 'Add'" msgstr "" -#: ../../standalone/drakfont_.c:1064 +#: ../../standalone/drakfont_.c:1059 msgid "Install List" msgstr "" -#: ../../standalone/drakfont_.c:1107 +#: ../../standalone/drakfont_.c:1102 msgid "click here if you are sure." msgstr "" -#: ../../standalone/drakfont_.c:1114 +#: ../../standalone/drakfont_.c:1109 msgid "here if no." msgstr "" -#: ../../standalone/drakfont_.c:1175 +#: ../../standalone/drakfont_.c:1170 msgid "Unselected All" msgstr "" -#: ../../standalone/drakfont_.c:1179 +#: ../../standalone/drakfont_.c:1174 msgid "Selected All" msgstr "" -#: ../../standalone/drakfont_.c:1183 +#: ../../standalone/drakfont_.c:1178 msgid "Remove List" msgstr "" -#: ../../standalone/drakfont_.c:1205 ../../standalone/drakfont_.c:1238 +#: ../../standalone/drakfont_.c:1200 ../../standalone/drakfont_.c:1233 msgid "Initials tests" msgstr "" -#: ../../standalone/drakfont_.c:1208 +#: ../../standalone/drakfont_.c:1203 msgid "Copy fonts on your system" msgstr "" -#: ../../standalone/drakfont_.c:1212 +#: ../../standalone/drakfont_.c:1207 msgid "Install & convert Fonts" msgstr "" -#: ../../standalone/drakfont_.c:1216 +#: ../../standalone/drakfont_.c:1211 msgid "Post Install" msgstr "" -#: ../../standalone/drakfont_.c:1241 +#: ../../standalone/drakfont_.c:1236 msgid "Remove fonts on your system" msgstr "" -#: ../../standalone/drakfont_.c:1245 +#: ../../standalone/drakfont_.c:1240 msgid "Post Uninstall" msgstr "" @@ -11778,229 +11797,229 @@ msgid "-adobe-times-bold-r-normal--17-*-100-100-p-*-iso8859-*,*-r-*" msgstr "" #: ../../share/compssUsers:999 -msgid "Web/FTP" +msgid "Office Workstation" msgstr "" #: ../../share/compssUsers:999 -msgid "Network Computer (client)" +msgid "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, gnumeric), pdf viewers, etc" msgstr "" #: ../../share/compssUsers:999 -msgid "NFS server, SMB server, Proxy server, ssh server" +msgid "Workstation" msgstr "" #: ../../share/compssUsers:999 -msgid "Office" +msgid "Game station" msgstr "" #: ../../share/compssUsers:999 -msgid "Gnome Workstation" +msgid "Amusement programs: arcade, boards, strategy, etc" msgstr "" #: ../../share/compssUsers:999 -msgid "Tools for your Palm Pilot or your Visor" +msgid "Multimedia station" msgstr "" #: ../../share/compssUsers:999 -msgid "Workstation" +msgid "Sound and video playing/editing programs" msgstr "" #: ../../share/compssUsers:999 -msgid "Firewall/Router" +msgid "Internet station" msgstr "" #: ../../share/compssUsers:999 -msgid "Domain Name and Network Information Server" +msgid "Set of tools to read and send mail and news (pine, mutt, tin..) and to browse the Web" msgstr "" #: ../../share/compssUsers:999 -msgid "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, gnumeric), pdf viewers, etc" +msgid "Network Computer (client)" msgstr "" #: ../../share/compssUsers:999 -msgid "Audio-related tools: mp3 or midi players, mixers, etc" +msgid "Clients for different protocols including ssh" msgstr "" #: ../../share/compssUsers:999 -msgid "Linux Standard Base. Third party applications support" +msgid "Configuration" msgstr "" #: ../../share/compssUsers:999 -msgid "Books and Howto's on Linux and Free Software" +msgid "Tools to ease the configuration of your computer" msgstr "" #: ../../share/compssUsers:999 -msgid "KDE Workstation" +msgid "Scientific Workstation" msgstr "" #: ../../share/compssUsers:999 -msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc" +msgid "Console Tools" msgstr "" #: ../../share/compssUsers:999 -msgid "Multimedia - Video" +msgid "Editors, shells, file tools, terminals" msgstr "" #: ../../share/compssUsers:999 -msgid "Set of tools for mail, news, web, file transfer, and chat" +msgid "KDE Workstation" msgstr "" #: ../../share/compssUsers:999 -msgid "Database" +msgid "The K Desktop Environment, the basic graphical environment with a collection of accompanying tools" msgstr "" #: ../../share/compssUsers:999 -msgid "PostgreSQL or MySQL database server" +msgid "Graphical Environment" msgstr "" #: ../../share/compssUsers:999 -msgid "Tools to ease the configuration of your computer" +msgid "Gnome Workstation" msgstr "" #: ../../share/compssUsers:999 -msgid "Multimedia - Sound" +msgid "A graphical environment with user-friendly set of applications and desktop tools" msgstr "" #: ../../share/compssUsers:999 -msgid "Documentation" +msgid "Other Graphical Desktops" msgstr "" #: ../../share/compssUsers:999 -msgid "Console Tools" +msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc" msgstr "" #: ../../share/compssUsers:999 -msgid "Postfix mail server, Inn news server" +msgid "Development" msgstr "" #: ../../share/compssUsers:999 -msgid "Internet station" +msgid "C and C++ development libraries, programs and include files" msgstr "" #: ../../share/compssUsers:999 -msgid "Multimedia station" +msgid "Documentation" msgstr "" #: ../../share/compssUsers:999 -msgid "Configuration" +msgid "Books and Howto's on Linux and Free Software" msgstr "" #: ../../share/compssUsers:999 -msgid "More Graphical Desktops (Gnome, IceWM)" +msgid "LSB" msgstr "" #: ../../share/compssUsers:999 -msgid "The K Desktop Environment, the basic graphical environment with a collection of accompanying tools" +msgid "Linux Standard Base. Third party applications support" msgstr "" #: ../../share/compssUsers:999 -msgid "Graphical Environment" +msgid "Web/FTP" msgstr "" #: ../../share/compssUsers:999 -msgid "Development" +msgid "Apache, Pro-ftpd" msgstr "" #: ../../share/compssUsers:999 -msgid "Apache, Pro-ftpd" +msgid "Mail/Groupware/News" msgstr "" #: ../../share/compssUsers:999 -msgid "Tools to create and burn CD's" +msgid "Postfix mail server, Inn news server" msgstr "" #: ../../share/compssUsers:999 -msgid "Office Workstation" +msgid "Database" msgstr "" #: ../../share/compssUsers:999 -msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc" +msgid "PostgreSQL or MySQL database server" msgstr "" #: ../../share/compssUsers:999 -msgid "Graphics programs such as The Gimp" +msgid "Firewall/Router" msgstr "" #: ../../share/compssUsers:999 -msgid "DNS/NIS " +msgid "Internet gateway" msgstr "" #: ../../share/compssUsers:999 -msgid "C and C++ development libraries, programs and include files" +msgid "DNS/NIS " msgstr "" #: ../../share/compssUsers:999 -msgid "Network Computer server" +msgid "Domain Name and Network Information Server" msgstr "" #: ../../share/compssUsers:999 -msgid "Mail/Groupware/News" +msgid "Network Computer server" msgstr "" #: ../../share/compssUsers:999 -msgid "Game station" +msgid "NFS server, SMB server, Proxy server, ssh server" msgstr "" #: ../../share/compssUsers:999 -msgid "Video players and editors" +msgid "Office" msgstr "" #: ../../share/compssUsers:999 -msgid "Multimedia - Graphics" +msgid "Set of tools for mail, news, web, file transfer, and chat" msgstr "" #: ../../share/compssUsers:999 -msgid "Amusement programs: arcade, boards, strategy, etc" +msgid "Multimedia - Graphics" msgstr "" #: ../../share/compssUsers:999 -msgid "Set of tools to read and send mail and news (pine, mutt, tin..) and to browse the Web" +msgid "Graphics programs such as The Gimp" msgstr "" #: ../../share/compssUsers:999 -msgid "Personal Finance" +msgid "Multimedia - Sound" msgstr "" #: ../../share/compssUsers:999 -msgid "A graphical environment with user-friendly set of applications and desktop tools" +msgid "Audio-related tools: mp3 or midi players, mixers, etc" msgstr "" #: ../../share/compssUsers:999 -msgid "Clients for different protocols including ssh" +msgid "Multimedia - Video" msgstr "" #: ../../share/compssUsers:999 -msgid "LSB" +msgid "Video players and editors" msgstr "" #: ../../share/compssUsers:999 -msgid "Internet gateway" +msgid "Multimedia - CD Burning" msgstr "" #: ../../share/compssUsers:999 -msgid "Sound and video playing/editing programs" +msgid "Tools to create and burn CD's" msgstr "" #: ../../share/compssUsers:999 -msgid "Other Graphical Desktops" +msgid "More Graphical Desktops (Gnome, IceWM)" msgstr "" #: ../../share/compssUsers:999 -msgid "Editors, shells, file tools, terminals" +msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc" msgstr "" #: ../../share/compssUsers:999 -msgid "Programs to manage your finance, such as gnucash" +msgid "Personal Information Management" msgstr "" #: ../../share/compssUsers:999 -msgid "Personal Information Management" +msgid "Tools for your Palm Pilot or your Visor" msgstr "" #: ../../share/compssUsers:999 -msgid "Multimedia - CD Burning" +msgid "Personal Finance" msgstr "" #: ../../share/compssUsers:999 -msgid "Scientific Workstation" +msgid "Programs to manage your finance, such as gnucash" msgstr "" diff --git a/perl-install/share/po/Makefile b/perl-install/share/po/Makefile index 4abfe680c..39c272022 100644 --- a/perl-install/share/po/Makefile +++ b/perl-install/share/po/Makefile @@ -40,7 +40,7 @@ $(POFILES): DrakX.pot DrakX.pot: $(PMSFILES) $(MAKE) $(PMSCFILES); - xgettext -F -n --add-comments='-PO' --keyword=_ --keyword=__ -o $@ $(PMSCFILES) + xgettext -F -n --add-comments='-PO' --keyword=N --keyword=N_ -o $@ $(PMSCFILES) rm $(PMSCFILES) perl i18n_compssUsers 2>/dev/null >> $@ diff --git a/perl-install/share/po/b_dump_strings.pm b/perl-install/share/po/b_dump_strings.pm index f29275ecd..791eb97aa 100644 --- a/perl-install/share/po/b_dump_strings.pm +++ b/perl-install/share/po/b_dump_strings.pm @@ -24,7 +24,7 @@ sub B::OP::debug { $s =~ s/"/\\"/g; if ($l->first->sv->NAME eq '_') { - print OUT qq($::pkg _("$s")\n); + print OUT qq($::pkg N("$s")\n); } } } diff --git a/perl-install/share/po/fake_c.pl b/perl-install/share/po/fake_c.pl index 21cf25b04..cd80801eb 100755 --- a/perl-install/share/po/fake_c.pl +++ b/perl-install/share/po/fake_c.pl @@ -1,8 +1,8 @@ #!/usr/bin/perl -lp -s|^(__?\()| $1|; # add a blank at the beginning (?!) +s|^(N_?\()| $1|; # add a blank at the beginning (?!) -s|_\(\[(.*),\s*(.*),\s*(.*)\]|ngettext($2,$3,$1)|; # special plural form handling +s|N\(\[(.*),\s*(.*),\s*(.*)\]|ngettext($2,$3,$1)|; # special plural form handling s,\Qs/#.*//,,; # ugly special case |