minor i18n fixes

1 files changed, 26 insertions, 19 deletions

diff --git a/control-center b/control-center
index 2392bd09..f818007b 100755
--- a/control-center
+++ b/control-center
@@ -2,7 +2,7 @@
 
 # Control-center
 
-# Copyright (C) 1999 MandrakeSoft
+# Copyright (C) 1999-2001 MandrakeSoft
 #                                 Damien Krotkine (damien@mandrakesoft.com)
 #                                 Daouda Lo (daouda@mandrakesoft.com)
 #
@@ -37,6 +37,8 @@ my $_sbindir = "/usr/sbin";
 my $_iconsdir = "/usr/share/icons";
 my $_docdir = "/usr/share/doc";
 
+my $_version = "0.61";
+
 sub _ {
     my $s = shift @_; my $t = I_($s);
     $t && ref $t or return sprintf $t, @_;
@@ -69,19 +71,17 @@ $window_global->add($vbox_global);
 
 ######### menus
 my @item_factory_entries = (
-			    [_("/_File"),	undef,	0,	"<Branch>"],
-			    {
-				'path' => _("/File/_Quit"), 
+			        {
+				'path' => _("/_File/_Quit"), 
 				'accelerator' => _("<control>Q"),	
 				'action' => 1,
 				'type' => '<Item>'
 				},
-			    [_("/_Help"),	undef,	0,	"<Branch>"],
-			    [_("/Help/_Mandrake Control Center"),	undef,	2],
-			    [_("/Help/_Report Bug"),  undef, 3 ],
-			    [_("/Help/_MandrakeCampus"), undef, 5],
-			    [_("/Help/_MandrakeExpert"), undef, 6],
-			    [_("/Help/_About..."),  undef,  4 ],
+			    [_("/_Help")._("/_Mandrake Control Center"),	undef,	2],
+			    [_("/_Help")._("/_Report Bug"),  undef, 3 ],
+			    [_("/_Help")._("/Mandrake_Campus"), undef, 5],
+			    [_("/_Help")._("/Mandrake_Expert"), undef, 6],
+			    [_("/_Help")._("/_About..."),  undef,  4 ],
 			    );
 
 my $accel_group = new Gtk::AccelGroup;
@@ -259,7 +259,7 @@ sub about_mdk_cc {
     $button->signal_connect_object("clicked",$window_about => 'destroy');
     $bbox1->add($button);
 
-    my $label = new Gtk::Label( _("Mandrake Control Center 0.61 \n Copyright (C) 2001 Mandrakesoft SA\n") );
+    my $label = new Gtk::Label( _("Mandrake Control Center %s \n Copyright (C) 2001 Mandrakesoft SA\n", $_version) );
     my $style1 = new Gtk::Style;
     $style1->font(Gtk::Gdk::Font->fontset_load("-adobe-times-bold-r-normal--14-*-100-100-p-*-iso8859-*,*-r-*"));
     $label->set_style($style1); 
@@ -298,18 +298,25 @@ sub connect_to_site {
     my $user_current=$ENV{'USER'};
     if ($help)
     {
-	print ("$browser");
-	system("$browser -geometry 600x800+10+10 $link&");
+        if ($browser)
+        {
+	    print ("»$browser«\n»$link«\n");
+	    system("$browser $link &");
+        }
+        else 
+        {
+	    splash_warning(" "._("Warning: No browser specified")." ");
+        }
     }
     else 
     {
 	if($initial_user ne "root" && $initial_user ne undef) 
 	{
-	    system("su -m -l $initial_user -c \"$browser $link&\"");
+	    system("su -m -l $initial_user -c \"$browser $link &\"");
 	    
 	}
 	else {
-	    splash_warning(_("Security Warning: I'm not allowed to connect to the internet as root user"));
+	    splash_warning(" "._("Security Warning: I'm not allowed to connect to the internet as root user")." ");
 	}	    
     }
 }
@@ -512,10 +519,10 @@ sub item_factory_cb {
 #   print "ItemFactory: activated ", $widget->item_factory_path(), " -> ", $action, "\n";
     $action == 1 and quit_global();
     $action == 4 and about_mdk_cc();
-    $action == 2 and connect_to_site("$_docdir/DrakConf/DrakeConf.html",1);
-    $action == 3 and connect_to_site("https://qa.mandrakesoft.com",0);
-    $action == 5 and connect_to_site("http://www.mandrakecampus.com",0);
-    $action == 6 and connect_to_site("http://www.mandrakeexpert.com",0);
+    $action == 2 and connect_to_site("file://$_docdir/DrakConf/DrakeConf.html",1);
+    $action == 3 and connect_to_site("https://qa.mandrakesoft.com/",0);
+    $action == 5 and connect_to_site("http://www.mandrakecampus.com/",0);
+    $action == 6 and connect_to_site("http://www.mandrakeexpert.com/",0);
 }
 
 sub create_item_factory {