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!

16 files changed, 42 insertions, 42 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 ],