remove stock icons (per IHM team request)

19 files changed, 138 insertions, 139 deletions

diff --git a/perl-install/Xconfig/main.pm b/perl-install/Xconfig/main.pm
index a74fe93e2..ee1065f49 100644
--- a/perl-install/Xconfig/main.pm
+++ b/perl-install/Xconfig/main.pm
@@ -99,7 +99,7 @@ sub configure_chooser_raw {
 
     my $ok;
     $in->ask_from_({ interactive_help_id => 'configureX_chooser',
-		     if_($::isStandalone, ok => $in->isa('interactive::gtk') ? 'gtk-quit' : N("Quit")) }, 
+		     if_($::isStandalone, ok => N("Quit")) }, 
 		   [
 		    { label => N("Graphic Card"), val => \$texts{card}, clicked => sub { 
 			  $may_set->('card', Xconfig::card::configure($in, $raw_X, $do_pkgs, 0, $options));
diff --git a/perl-install/Xconfig/resolution_and_depth.pm b/perl-install/Xconfig/resolution_and_depth.pm
index cba2291e5..5d448572a 100644
--- a/perl-install/Xconfig/resolution_and_depth.pm
+++ b/perl-install/Xconfig/resolution_and_depth.pm
@@ -269,7 +269,7 @@ sub choose_gtk {
 						   ),
 					  ),
 			       ),
-		    0, gtkadd($W->create_okcancel('gtk-ok', 'gtk-cancel', '', if_($help_sub, [ 'gtk-help', $help_sub, 1 ]))),
+		    0, gtkadd($W->create_okcancel(N("Ok"), N("Cancel"), '', if_($help_sub, [ N("Help"), $help_sub, 1 ]))),
 		    ));
     $depth_combo->disable_activate;
     $depth_combo->set_use_arrows_always(1);
diff --git a/perl-install/diskdrake/hd_gtk.pm b/perl-install/diskdrake/hd_gtk.pm
index 7d674e263..eee2d269f 100644
--- a/perl-install/diskdrake/hd_gtk.pm
+++ b/perl-install/diskdrake/hd_gtk.pm
@@ -152,7 +152,7 @@ sub general_action_box {
     my ($box, $nowizard, $interactive_help) = @_;
     $_->destroy foreach $box->get_children;
 
-    gtkadd($box, gtksignal_connect(Gtk2::Button->new_from_stock('gtk-help'), clicked => $interactive_help)) if $interactive_help;
+    gtkadd($box, gtksignal_connect(Gtk2::Button->new(N("Help")), clicked => $interactive_help)) if $interactive_help;
 
     my @actions = (if_($::isInstall && !$nowizard, N_("Wizard")), 
 		   diskdrake::interactive::general_possible_actions($in, $all_hds), 
diff --git a/perl-install/interactive/gtk.pm b/perl-install/interactive/gtk.pm
index 3118e1d30..fb71a595f 100644
--- a/perl-install/interactive/gtk.pm
+++ b/perl-install/interactive/gtk.pm
@@ -479,7 +479,7 @@ sub ask_fromW {
 
 		%buttons = map {
 		    my $action = $_;
-		    $action => gtksignal_connect(Gtk2::Button->new_from_stock(translate($action)),
+		    $action => gtksignal_connect(Gtk2::Button->new(translate($action)),
 						 clicked => sub { $do_action->($action) });
 		} @actions;
 		$real_w = gtkpack_(Gtk2::HBox->new(0,0),
@@ -644,7 +644,7 @@ sub ask_fromW {
 	       1, $create_widgets->($advanced_total_size, @widgets_advanced));
 
     my @help = if_($common->{interactive_help}, 
-		   [ 'gtk-help', sub { 
+		   [ N("Help"), sub { 
 			 my $message = $common->{interactive_help}->() or return;
 			 $o->ask_warn(N("Help"), $message);
 		     }, 1 ]);
@@ -754,11 +754,11 @@ sub kill {
 }
 
 sub ok {
-    'gtk-ok'
+    N("Ok");
 }
 
 sub cancel {
-    'gtk-cancel'
+    N("Cancel");
 }
 
 1;
diff --git a/perl-install/services.pm b/perl-install/services.pm
index aa55029a7..099241bd2 100644
--- a/perl-install/services.pm
+++ b/perl-install/services.pm
@@ -216,7 +216,7 @@ sub ask_standalone_gtk {
                 my ($started, $action) = $update_service->($service, gtkset_justify($l, 'left'));
 		[ gtkpack__(Gtk2::HBox->new(0,0), $_),
 		  gtkpack__(Gtk2::HBox->new(0,0), $l),
-		  gtkpack__(Gtk2::HBox->new(0,0), gtksignal_connect(Gtk2::Button->new_from_stock('gtk-dialog-info'), clicked => sub { $display->($infos) })),
+		  gtkpack__(Gtk2::HBox->new(0,0), gtksignal_connect(Gtk2::Button->new(N("Info")), clicked => sub { $display->($infos) })),
                   gtkpack__(Gtk2::HBox->new(0,0), gtkset_active(gtksignal_connect(
                           Gtk2::CheckButton->new(N("On boot")),
                           clicked => sub { if ($_[0]->get_active) {
diff --git a/perl-install/standalone/drakbackup b/perl-install/standalone/drakbackup
index 8c8ade181..5e5530c6d 100755
--- a/perl-install/standalone/drakbackup
+++ b/perl-install/standalone/drakbackup
@@ -1957,7 +1957,7 @@ sub advanced_where_net_types {
 	 		0, gtkpack_(new Gtk2::HBox(0,5),
 	   			0, gtkset_sensitive(my $check_use_expect = new Gtk2::CheckButton(N("Use Expect for SSH")), ($where_net && $net_proto eq 'ssh')),
 	   			0, gtkset_sensitive(my $check_xfer_keys = new Gtk2::CheckButton(N("Create/Transfer\nbackup keys for SSH")), ($where_net && $net_proto eq 'ssh')),
-				0, gtkset_sensitive(my $button_xfer_keys = Gtk2::Button->new_from_stock(N("  Transfer  \nNow")), $xfer_keys),
+				0, gtkset_sensitive(my $button_xfer_keys = Gtk2::Button->new(N("  Transfer  \nNow")), $xfer_keys),
 	   			0, gtkset_sensitive(my $check_user_keys = new Gtk2::CheckButton(N("Other (not drakbackup)\nkeys in place already")), ($where_net && $net_proto eq 'ssh')),
 			),
 	 		0, new Gtk2::HSeparator,
@@ -2117,7 +2117,7 @@ sub advanced_where_cd {
 			0, new Gtk2::VBox(0, 5),
 	 		0, gtkpack_(new Gtk2::HBox(0,10),
 	 			0, gtkset_sensitive(new Gtk2::Label(N("Erase your RW media (1st Session)")), $cdrw && $where_cd),
-				0, gtkset_sensitive(my $button_erase_now = Gtk2::Button->new_from_stock(N(" Erase Now ")), $cdrw),			
+				0, gtkset_sensitive(my $button_erase_now = Gtk2::Button->new(N(" Erase Now ")), $cdrw),			
 	    		1, new Gtk2::VBox(0, 5),
 	    		0, gtkset_sensitive(my $check_cdrw_erase = new Gtk2::CheckButton(), $cdrw && $where_cd),
 			),
@@ -2608,7 +2608,7 @@ sub wizard_step2() {
 				0, gtkpack_(new Gtk2::HBox(0, 15),	      
 					0, my $check_wizard_hd = new Gtk2::CheckButton(N("on Hard Drive")),
 					1, new Gtk2::VBox(0, 5),
-					0, gtkset_sensitive(gtksignal_connect(Gtk2::Button->new_from_stock(N("Configure")), clicked => sub {
+					0, gtkset_sensitive(gtksignal_connect(Gtk2::Button->new(N("Configure")), clicked => sub {
 						destroy_widget();
 						to_ok();
 						advanced_where_hd(\&wizard_step2);
@@ -2618,7 +2618,7 @@ sub wizard_step2() {
 				0, gtkpack_(new Gtk2::HBox(0, 15),	      
 					0, my $check_wizard_net = new Gtk2::CheckButton(N("across Network")),
 					1, new Gtk2::VBox(0, 5),
-					0, gtkset_sensitive(gtksignal_connect(Gtk2::Button->new_from_stock(N("Configure")), clicked => sub {
+					0, gtkset_sensitive(gtksignal_connect(Gtk2::Button->new(N("Configure")), clicked => sub {
 						destroy_widget();
 						to_ok();
 						advanced_where_net_types(\&wizard_step2);
@@ -2628,7 +2628,7 @@ sub wizard_step2() {
  				0, gtkpack_(new Gtk2::HBox(0, 15),	      
  					0, my $check_wizard_cd = new Gtk2::CheckButton(N("on CDROM")),
  					1, new Gtk2::VBox(0, 5),	
- 					0, gtkset_sensitive(gtksignal_connect(Gtk2::Button->new_from_stock(N("Configure")), clicked => sub {
+ 					0, gtkset_sensitive(gtksignal_connect(Gtk2::Button->new(N("Configure")), clicked => sub {
  						destroy_widget();
  						advanced_where_cd(\&wizard_step2);
  					}), $where_cd),
@@ -2636,7 +2636,7 @@ sub wizard_step2() {
  				0, gtkpack_(new Gtk2::HBox(0, 15),	      
  					0, my $check_wizard_tape = new Gtk2::CheckButton(N("on Tape Device")),
  					1, new Gtk2::VBox(0, 5),
- 					0, gtkset_sensitive(gtksignal_connect(Gtk2::Button->new_from_stock(N("Configure")), clicked => sub {
+ 					0, gtkset_sensitive(gtksignal_connect(Gtk2::Button->new(N("Configure")), clicked => sub {
  						destroy_widget();
  						advanced_where_tape(\&wizard_step2);
  					}), $where_tape),
@@ -2682,7 +2682,7 @@ sub wizard()   {
 				0, my $check_wizard_user = new Gtk2::CheckButton(N("Backup Users")),
 				0, gtkpack_(new Gtk2::HBox(0, 15),
 					1, new Gtk2::VBox(0, 5),	
-					0, gtksignal_connect(Gtk2::Button->new_from_stock(N("Select user manually")), clicked => sub {
+					0, gtksignal_connect(Gtk2::Button->new(N("Select user manually")), clicked => sub {
 						destroy_widget();
 						advanced_what_user(\&wizard);
 					}),
@@ -2957,7 +2957,7 @@ sub show_backup_details {
 				1, create_scrolled_window($text), 
 			),
 			0, gtkadd(gtkset_layout(new Gtk2::HButtonBox, 'spread'),
-				gtksignal_connect(Gtk2::Button->new_from_stock(N("Done")), clicked => sub { 
+				gtksignal_connect(Gtk2::Button->new(N("Done")), clicked => sub { 
 					destroy_widget(); 
 					$function->() }),
 			),
@@ -3182,7 +3182,7 @@ sub restore_step_user() {
 					my @user_list_tmp;
 					my $restore_row = new Gtk2::HBox(0,5);
 					my $b = new Gtk2::CheckButton($name_complet);
-					my $details = Gtk2::Button->new_from_stock(" Details ");
+					my $details = Gtk2::Button->new(" Details ");
 					
 					$restore_row->pack_start($b, 1, 1, 0);
 					$restore_row->pack_end(new Gtk2::VBox(1,5), 0, 0, 0);
@@ -3255,7 +3255,7 @@ sub restore_step_sys() {
 			0, gtkpack_(new Gtk2::HBox(0,10),
 				1, N("please choose the date to restore"),
 				0, $combo_restore_step_sys,
-				0, my $details = Gtk2::Button->new_from_stock(" Details "),
+				0, my $details = Gtk2::Button->new(" Details "),
 				0, new Gtk2::HBox(0,10),
 			),
 			1, new Gtk2::VBox(0,10),
@@ -3348,7 +3348,7 @@ sub restore_other_media() {
 # 					 0, new Gtk2::VBox(0, 6),
 # 					 1, gtkpack(new Gtk2::HBox(0,10),
 # 						    new Gtk2::VBox(0, 6),
-# 						    gtkset_sensitive(gtksignal_connect(Gtk2::Button->new_from_stock("Network"),  clicked => sub {
+# 						    gtkset_sensitive(gtksignal_connect(Gtk2::Button->new("Network"),  clicked => sub {
 # 							destroy_widget();
 # 							restore_find_net(\&restore_other_media);}), !$other_media_hd),
 # 						    new Gtk2::VBox(0, 6),
@@ -3406,7 +3406,7 @@ sub restore_step2() {
 			0, gtkpack_(new Gtk2::HBox(0,10),
 				0, my $check_restore_other_src = new Gtk2::CheckButton(N("Select another media to restore from")),
 				1, new Gtk2::HBox(0,10),
-				0, gtkset_sensitive(gtksignal_connect(Gtk2::Button->new_from_stock(N("Other Media")), clicked => sub {
+				0, gtkset_sensitive(gtksignal_connect(Gtk2::Button->new(N("Other Media")), clicked => sub {
 					destroy_widget();
 					restore_other_media();
 				}), $restore_other_src),
@@ -3588,7 +3588,7 @@ sub catalog_restore() {
 					1, create_scrolled_window($tree_files),
 				),
 				0, gtkpack_(new Gtk2::HBox(1, 10),
-					1, gtksignal_connect(Gtk2::Button->new_from_stock(N("Restore Selected\nCatalog Entry")), clicked => sub { 
+					1, gtksignal_connect(Gtk2::Button->new(N("Restore Selected\nCatalog Entry")), clicked => sub { 
 						if ($cat_entry) {
 							my $media_check = restore_catalog_entry($cat_entry, ());
 							if ($media_check) {
@@ -3597,7 +3597,7 @@ sub catalog_restore() {
 							} 
 						} 
 					}),
-					1, gtksignal_connect(Gtk2::Button->new_from_stock(N("Restore Selected\nFiles")), clicked => sub { 							
+					1, gtksignal_connect(Gtk2::Button->new(N("Restore Selected\nFiles")), clicked => sub { 							
 						my $files = @restore_files;
 						#- grab the array before the widget clears it 
 						my @passed_files = @restore_files;
@@ -3613,7 +3613,7 @@ sub catalog_restore() {
 						0, new Gtk2::Label("Restore To Path"),
 		    			0, $restore_path_entry = new Gtk2::Entry(),
 					),
-					1, gtksignal_connect(Gtk2::Button->new_from_stock(N("Change\nRestore Path")), clicked => sub { 							
+					1, gtksignal_connect(Gtk2::Button->new(N("Change\nRestore Path")), clicked => sub { 							
 						filedialog_generic("Path To Restore To", \$restore_path_entry, \$restore_path);
 					}),						
 				),
@@ -4000,12 +4000,12 @@ sub restore_box() {
 				1, gtkpack_(new Gtk2::VBox(0,10),
 					1, new Gtk2::VBox(0,10),
 					1, new Gtk2::VBox(0,10),
-					1, gtksignal_connect(Gtk2::Button->new_from_stock(N("Search for files to restore")), clicked => sub { 
+					1, gtksignal_connect(Gtk2::Button->new(N("Search for files to restore")), clicked => sub { 
 						$retore_box->destroy;
 						button_box_file_restore();
 						find_files_to_restore() 
 					}),
-					1, gtksignal_connect(Gtk2::Button->new_from_stock(N("Restore all backups")), clicked => sub { 
+					1, gtksignal_connect(Gtk2::Button->new(N("Restore all backups")), clicked => sub { 
 						$retore_box->destroy;
 						button_box_restore();
 						@user_list_to_restore2 = sort @user_backuped; 
@@ -4014,7 +4014,7 @@ sub restore_box() {
 						$restore_user = 1;
 						restore_do() 
 					}),
-					1, gtksignal_connect(Gtk2::Button->new_from_stock(N("Custom Restore")), clicked => sub { 
+					1, gtksignal_connect(Gtk2::Button->new(N("Custom Restore")), clicked => sub { 
 						$retore_box->destroy;
 						button_box_restore(); 
 						restore_step2();
@@ -4057,15 +4057,15 @@ sub restore_find_media_box() {
 			1, gtkpack(new Gtk2::HBox(0, 15),
 				new Gtk2::VBox(0, 5),
 				gtkpack(new Gtk2::VBox(0, 10),
-					gtkset_sensitive(gtksignal_connect(Gtk2::Button->new_from_stock(N("CD in place - continue.")), clicked => sub {  
+					gtkset_sensitive(gtksignal_connect(Gtk2::Button->new(N("CD in place - continue.")), clicked => sub {  
 						$good_restore_path = 1;
 						interactive_mode_box("restore");
 					}), $mount_media),
 					$new_path_entry = gtkset_sensitive(new Gtk2::Entry(), $mount_media),
-					gtkset_sensitive(gtksignal_connect(Gtk2::Button->new_from_stock(N("Browse to new restore repository.")), clicked => sub {  
+					gtkset_sensitive(gtksignal_connect(Gtk2::Button->new(N("Browse to new restore repository.")), clicked => sub {  
 						filedialog_generic("Directory To Restore From", \$new_path_entry, \$path_to_find_restore);
 					}), $mount_media),
-					gtksignal_connect(Gtk2::Button->new_from_stock(N("Restore From Catalog")), clicked => sub {  
+					gtksignal_connect(Gtk2::Button->new(N("Restore From Catalog")), clicked => sub {  
 						$box2->destroy;
 						catalog_restore();
 					}),
@@ -4117,18 +4117,18 @@ sub button_box_adv() {
     $button_box_tmp->destroy;
     gtkpack($button_box,
 		$button_box_tmp = gtkpack_(new Gtk2::HButtonBox,
-			0, gtksignal_connect(Gtk2::Button->new_from_stock('gtk-help'), clicked => sub { 
+			0, gtksignal_connect(Gtk2::Button->new(N("Help")), clicked => sub { 
 				adv_help();
 			}),
-			0, gtksignal_connect(Gtk2::Button->new_from_stock('gtk-cancel'), clicked => sub { 
+			0, gtksignal_connect(Gtk2::Button->new(N("Cancel")), clicked => sub { 
 				interactive_mode_box();
 			}),
 			1, new Gtk2::HBox(0, 1),	
-			0, gtksignal_connect(Gtk2::Button->new_from_stock('gtk-go-back'), clicked => sub { 
+			0, gtksignal_connect(Gtk2::Button->new(N("<- Previous")), clicked => sub { 
 				destroy_widget();
 				$previous_widget->();
 			}),
-			0, gtksignal_connect(Gtk2::Button->new_from_stock('gtk-save'), clicked => sub { 
+			0, gtksignal_connect(Gtk2::Button->new(N("Save")), clicked => sub { 
 				destroy_widget();
 				unless (check_pkg_needs()) {
 					save_conf_file();
@@ -4144,19 +4144,19 @@ sub button_box_restore_main() {
 
     gtkpack($button_box,
 	    $button_box_tmp = gtkpack_(gtkpack_(new Gtk2::HButtonBox, 
-			0, gtksignal_connect(Gtk2::Button->new_from_stock('gtk-help'), clicked => sub {
+			0, gtksignal_connect(Gtk2::Button->new(N("Help")), clicked => sub {
 				adv_help();
 			}),
-			0, gtksignal_connect(Gtk2::Button->new_from_stock('gtk-cancel'), clicked => sub { 
+			0, gtksignal_connect(Gtk2::Button->new(N("Cancel")), clicked => sub { 
 				destroy_widget(); 
 				interactive_mode_box();
 			}),
 			1, new Gtk2::HBox(0, 1),	
-			0, gtksignal_connect(Gtk2::Button->new_from_stock('gtk-go-back'), clicked => sub { 
+			0, gtksignal_connect(Gtk2::Button->new(N("<- Previous")), clicked => sub { 
 				destroy_widget(); 
 				interactive_mode_box() 
 			}),
-			0, gtksignal_connect(Gtk2::Button->new_from_stock('gtk-ok'), clicked => sub { 
+			0, gtksignal_connect(Gtk2::Button->new(N("Ok")), clicked => sub { 
 				destroy_widget(); 
 				interactive_mode_box() }),
 			),
@@ -4169,10 +4169,10 @@ sub button_box_file_restore() {
 
     gtkpack($button_box,
 	    $button_box_tmp = gtkpack_(gtkpack_(new Gtk2::HButtonBox, 
-			0, gtksignal_connect(Gtk2::Button->new_from_stock('gtk-help'), clicked => sub {
+			0, gtksignal_connect(Gtk2::Button->new(N("Help")), clicked => sub {
 				adv_help();
 			}),
-			0, gtksignal_connect(Gtk2::Button->new_from_stock('gtk-cancel'), clicked => sub { 
+			0, gtksignal_connect(Gtk2::Button->new(N("Cancel")), clicked => sub { 
 				destroy_widget(); 
 				restore_box();
 			}),
@@ -4188,7 +4188,7 @@ sub button_box_log_main() {
     gtkpack($button_box,
 	    $button_box_tmp = gtkpack_(gtkpack_(new Gtk2::HButtonBox, 
 			1, new Gtk2::HBox(0, 1),	
-			0, gtksignal_connect(Gtk2::Button->new_from_stock('gtk-ok'), clicked => sub { 
+			0, gtksignal_connect(Gtk2::Button->new(N("Ok")), clicked => sub { 
 				destroy_widget(); 
 				interactive_mode_box() }),
 			),
@@ -4202,19 +4202,19 @@ sub button_box_backup_end() {
 
     gtkpack($button_box,
 	    $button_box_tmp = gtkpack_(new Gtk2::HButtonBox,
-			0, gtksignal_connect(Gtk2::Button->new_from_stock('gtk-help'), clicked => sub { 
+			0, gtksignal_connect(Gtk2::Button->new(N("Help")), clicked => sub { 
 				adv_help() 
 			}),
-			0, gtksignal_connect(Gtk2::Button->new_from_stock('gtk-cancel'), clicked => sub { 
+			0, gtksignal_connect(Gtk2::Button->new(N("Cancel")), clicked => sub { 
 				destroy_widget(); 
 				interactive_mode_box() 
 			}),
 			1, new Gtk2::HBox(0, 1),	
-			0, gtksignal_connect(Gtk2::Button->new_from_stock('gtk-go-back'), clicked => sub { 
+			0, gtksignal_connect(Gtk2::Button->new(N("<- Previous")), clicked => sub { 
 				destroy_widget(); 
 				$previous_widget->() 
 			}),
-			0, gtksignal_connect(Gtk2::Button->new_from_stock(N("Build Backup")), clicked => sub { 
+			0, gtksignal_connect(Gtk2::Button->new(N("Build Backup")), clicked => sub { 
 				destroy_widget();
 				build_backup_status();
 				build_backup_files(); 
@@ -4228,19 +4228,19 @@ sub button_box_wizard_end() {
 
     gtkpack($button_box,
 		$button_box_tmp = gtkpack_(new Gtk2::HButtonBox,
-			0, gtksignal_connect(Gtk2::Button->new_from_stock('gtk-help'), clicked => sub { 
+			0, gtksignal_connect(Gtk2::Button->new(N("Help")), clicked => sub { 
 				adv_help();
 			}),
-			0, gtksignal_connect(Gtk2::Button->new_from_stock('gtk-cancel'), clicked => sub { 
+			0, gtksignal_connect(Gtk2::Button->new(N("Cancel")), clicked => sub { 
 				destroy_widget();
 				interactive_mode_box();
 			}),
 			1, new Gtk2::HBox(0, 1),	
-			0, gtksignal_connect(Gtk2::Button->new_from_stock('gtk-go-back'), clicked => sub { 
+			0, gtksignal_connect(Gtk2::Button->new(N("<- Previous")), clicked => sub { 
 				destroy_widget(); 
 				$previous_widget->();
 			}),
-			0, gtksignal_connect(Gtk2::Button->new_from_stock('gtk-save'), clicked => sub { 
+			0, gtksignal_connect(Gtk2::Button->new(N("Save")), clicked => sub { 
 				destroy_widget();
 				save_conf_file();
 				interactive_mode_box();
@@ -4254,15 +4254,15 @@ sub button_box_restore_end() {
 
     gtkpack($button_box,
 	    $button_box_tmp = gtkpack_(new Gtk2::HButtonBox,
-			0, gtksignal_connect(Gtk2::Button->new_from_stock('gtk-help'), clicked => sub { 
+			0, gtksignal_connect(Gtk2::Button->new(N("Help")), clicked => sub { 
 				adv_help();
 			}),
-			0, gtksignal_connect(Gtk2::Button->new_from_stock('gtk-cancel'), clicked => sub { 
+			0, gtksignal_connect(Gtk2::Button->new(N("Cancel")), clicked => sub { 
 				destroy_widget();
 				interactive_mode_box();
 			}),
 			1, new Gtk2::HBox(0, 1),	
-			0, gtksignal_connect(Gtk2::Button->new_from_stock('gtk-go-back'), clicked => sub { 
+			0, gtksignal_connect(Gtk2::Button->new(N("<- Previous")), clicked => sub { 
 				destroy_widget();
 				$previous_widget->();
 			}),
@@ -4281,7 +4281,7 @@ sub button_box_build_backup_end() {
 	    $button_box_tmp = gtkpack_(new Gtk2::HButtonBox, 
 			1, new Gtk2::HBox(0, 5),	
 			1, new Gtk2::HBox(0, 5),	
-			0, gtksignal_connect(Gtk2::Button->new_from_stock('gtk-ok'), clicked => sub { 
+			0, gtksignal_connect(Gtk2::Button->new(N("Ok")), clicked => sub { 
 #				destroy_widget();
 				interactive_mode_box();  
 			}),
@@ -4296,10 +4296,10 @@ sub button_box_restore_pbs_end() {
 		$button_box_tmp = gtkpack_(new Gtk2::HButtonBox, 
 			1, new Gtk2::HBox(0, 5),	
 			1, new Gtk2::HBox(0, 5),	
-			1, gtksignal_connect(Gtk2::Button->new_from_stock('gtk-help'), clicked => sub {
+			1, gtksignal_connect(Gtk2::Button->new(N("Help")), clicked => sub {
 				adv_help();
 			}),
-			0, gtksignal_connect(Gtk2::Button->new_from_stock('gtk-ok'), clicked => sub { 
+			0, gtksignal_connect(Gtk2::Button->new(N("Ok")), clicked => sub { 
 				destroy_widget();
 				interactive_mode_box();
 			}),
@@ -4312,19 +4312,19 @@ sub button_box_build_backup() {
 
 	gtkpack($button_box,
 		$button_box_tmp = gtkpack_(new Gtk2::HButtonBox,
-			1, gtksignal_connect(Gtk2::Button->new_from_stock('gtk-help'), clicked => sub {
+			1, gtksignal_connect(Gtk2::Button->new(N("Help")), clicked => sub {
 				adv_help(); 
 			}),
-			1, gtksignal_connect(Gtk2::Button->new_from_stock('gtk-cancel'), clicked => sub { 
+			1, gtksignal_connect(Gtk2::Button->new(N("Cancel")), clicked => sub { 
 				destroy_widget(); 
 				interactive_mode_box();
 			}),
 			1, new Gtk2::HBox(0, 0),
-			0, gtksignal_connect(Gtk2::Button->new_from_stock('gtk-go-back'), clicked => sub { 
+			0, gtksignal_connect(Gtk2::Button->new(N("<- Previous")), clicked => sub { 
 				destroy_widget();
 				$previous_widget->();
 			}),
-			1, gtksignal_connect(Gtk2::Button->new_from_stock('gtk-go-forward'), clicked => sub {
+			1, gtksignal_connect(Gtk2::Button->new(N("Next ->")), clicked => sub {
 				destroy_widget();
 				$next_widget->();
 			}),
@@ -4338,19 +4338,19 @@ sub button_box_restore() {
 
     gtkpack($button_box,
 	    $button_box_tmp = gtkpack_(new Gtk2::HButtonBox,
-			1, gtksignal_connect(Gtk2::Button->new_from_stock('gtk-help'), clicked => sub {
+			1, gtksignal_connect(Gtk2::Button->new(N("Help")), clicked => sub {
 				adv_help();
 			}),
-			1, gtksignal_connect(Gtk2::Button->new_from_stock('gtk-cancel'), clicked => sub { 
+			1, gtksignal_connect(Gtk2::Button->new(N("Cancel")), clicked => sub { 
 				destroy_widget(); 
 				interactive_mode_box();  
 			}),
 			1, new Gtk2::HBox(0, 0),
-			0, gtksignal_connect(Gtk2::Button->new_from_stock('gtk-go-back'), clicked => sub { 
+			0, gtksignal_connect(Gtk2::Button->new(N("<- Previous")), clicked => sub { 
 				destroy_widget(); 
 				$previous_widget->(); 
 			}),
-			1, gtksignal_connect(Gtk2::Button->new_from_stock('gtk-go-forward'), clicked => sub {
+			1, gtksignal_connect(Gtk2::Button->new(N("Next ->")), clicked => sub {
 				destroy_widget(); 
 				$next_widget->();
 			}),
@@ -4367,20 +4367,20 @@ sub button_box_find_media {
 
     gtkpack($button_box,
 	    $button_box_tmp = gtkpack_(new Gtk2::HButtonBox,
-			1, gtksignal_connect(Gtk2::Button->new_from_stock('gtk-help'), clicked => sub {
+			1, gtksignal_connect(Gtk2::Button->new(N("Help")), clicked => sub {
 				$central_widget = \$box2; 
 				adv_help();
 			}),
-			1, gtksignal_connect(Gtk2::Button->new_from_stock('gtk-cancel'), clicked => sub { 
+			1, gtksignal_connect(Gtk2::Button->new(N("Cancel")), clicked => sub { 
 				$central_widget = \$box2;
 				interactive_mode_box();  
 			}),
 			1, new Gtk2::HBox(0, 0),
-			0, gtksignal_connect(Gtk2::Button->new_from_stock('gtk-go-back'), clicked => sub {
+			0, gtksignal_connect(Gtk2::Button->new(N("<- Previous")), clicked => sub {
 				$central_widget = \$box2;
 				interactive_mode_box();  
 			}),
-			1, gtkset_sensitive(gtksignal_connect(Gtk2::Button->new_from_stock('gtk-go-forward'), clicked => sub {
+			1, gtkset_sensitive(gtksignal_connect(Gtk2::Button->new(N("Next ->")), clicked => sub {
 				interactive_mode_box("restore"); 
 			}), $mount_media),
 		),
@@ -4392,19 +4392,19 @@ sub button_box_wizard() {
 
     gtkpack($button_box,
 	    $button_box_tmp = gtkpack_(new Gtk2::HButtonBox,
-			1, gtksignal_connect(Gtk2::Button->new_from_stock('gtk-help'), clicked => sub {
+			1, gtksignal_connect(Gtk2::Button->new(N("Help")), clicked => sub {
 				adv_help() 
 			}),
-			1, gtksignal_connect(Gtk2::Button->new_from_stock('gtk-cancel'), clicked => sub { 
+			1, gtksignal_connect(Gtk2::Button->new(N("Cancel")), clicked => sub { 
 				destroy_widget(); 
 				interactive_mode_box() 
 			}),
 			1, new Gtk2::HBox(0, 0),
-			0, gtksignal_connect(Gtk2::Button->new_from_stock($next_widget ? 'gtk-go-back' : 'gtk-ok'), clicked => sub { 
+			0, gtksignal_connect(Gtk2::Button->new($next_widget ? N("<- Previous") : N("Ok")), clicked => sub { 
 				destroy_widget();
 				$previous_widget ? $previous_widget->() : $next_widget->();
 			}),
-			if_($next_widget, 1, gtksignal_connect(Gtk2::Button->new_from_stock('gtk-go-forward'), clicked => sub {
+			if_($next_widget, 1, gtksignal_connect(Gtk2::Button->new(N("Next ->")), clicked => sub {
 				destroy_widget();
 				$next_widget ? $next_widget->() : $previous_widget->();
 			})),
@@ -4417,10 +4417,10 @@ sub button_box_main() {
 
     gtkpack($button_box,
 	    $button_box_tmp = gtkpack(Gtk2::HButtonBox->new,
-			gtksignal_connect(Gtk2::Button->new_from_stock('gtk-help'), clicked => sub { 
+			gtksignal_connect(Gtk2::Button->new(N("Help")), clicked => sub { 
 				adv_help() 
 			}),
-			gtksignal_connect(Gtk2::Button->new_from_stock('gtk-close'), clicked => sub { ugtk2->exit(0) }),
+			gtksignal_connect(Gtk2::Button->new(N("Close")), clicked => sub { ugtk2->exit(0) }),
 		),
 	);
 }
@@ -4470,7 +4470,7 @@ sub install_rpm {
 	    $box_what_user = gtkpack_(new Gtk2::VBox(0, 15),
 			0, N("The following packages need to be installed:\n") . join(' ', @list_of_rpm_to_install),
 				0, new Gtk2::HSeparator,
-				0, gtksignal_connect(Gtk2::Button->new_from_stock(N("Install")), clicked => sub {  
+				0, gtksignal_connect(Gtk2::Button->new(N("Install")), clicked => sub {  
 					system("/usr/sbin/urpmi --X @list_of_rpm_to_install"); 
 					destroy_widget();
 					$previous_widget->();		  
@@ -4798,33 +4798,33 @@ sub interactive_mode_box {
 			1, new Gtk2::VBox(0, 5),	
 			1, gtkpack_(new Gtk2::VBox(0, 5),	
 				1, new Gtk2::VBox(0, 5),	
-				0, gtksignal_connect(Gtk2::Button->new_from_stock(N("Wizard Configuration")), clicked => sub { 
+				0, gtksignal_connect(Gtk2::Button->new(N("Wizard Configuration")), clicked => sub { 
 					destroy_widget();
 					read_conf_file();
 					wizard(); 
 				}),
-				0, gtksignal_connect(Gtk2::Button->new_from_stock(N("Advanced Configuration")), clicked => sub { 
+				0, gtksignal_connect(Gtk2::Button->new(N("Advanced Configuration")), clicked => sub { 
 					button_box_adv();
 					destroy_widget();
 					advanced_box(); 
 				}),
-				0, gtksignal_connect(Gtk2::Button->new_from_stock(N("View Configuration")), clicked => sub { 
+				0, gtksignal_connect(Gtk2::Button->new(N("View Configuration")), clicked => sub { 
 					destroy_widget();
 					build_backup_box_see_conf("interactive");
 				}),
-				0, gtksignal_connect(Gtk2::Button->new_from_stock(N("View Last Log")), clicked => sub { 
+				0, gtksignal_connect(Gtk2::Button->new(N("View Last Log")), clicked => sub { 
 					$results = cat_($log_file);
 					button_box_log_main();
 					show_status();
 				}),				
-				0, gtksignal_connect(Gtk2::Button->new_from_stock(N("Backup Now")), clicked => sub { 
+				0, gtksignal_connect(Gtk2::Button->new(N("Backup Now")), clicked => sub { 
 					if ($cfg_file_exist) { 
 						build_backup_box();
 					} else { 
 						message_noconf_box();
 					}
 				}),
-				0, gtksignal_connect(Gtk2::Button->new_from_stock(N("Restore")), clicked => sub {
+				0, gtksignal_connect(Gtk2::Button->new(N("Restore")), clicked => sub {
 					destroy_widget(); 
 					restore_box();
 				}),
diff --git a/perl-install/standalone/drakboot b/perl-install/standalone/drakboot
index 88d157db5..5d80178ac 100755
--- a/perl-install/standalone/drakboot
+++ b/perl-install/standalone/drakboot
@@ -293,8 +293,8 @@ gtkadd($window,
                                  )
                        ),
                  gtkadd(Gtk2::HButtonBox->new,
-                        gtksignal_connect(Gtk2::Button->new_from_stock('gtk-cancel'), clicked => sub { ugtk2->exit(0) }),
-                        gtksignal_connect(Gtk2::Button->new_from_stock('gtk-ok'), clicked => sub { 
+                        gtksignal_connect(Gtk2::Button->new(N("Cancel")), clicked => sub { ugtk2->exit(0) }),
+                        gtksignal_connect(Gtk2::Button->new(N("Ok")), clicked => sub { 
                                               Xconfig::various::runlevel($x_mode ? 5 : 3);
                                               updateAutologin();
                                               ugtk2->exit(0);
diff --git a/perl-install/standalone/drakbug b/perl-install/standalone/drakbug
index 346bce6ae..b6e7af892 100755
--- a/perl-install/standalone/drakbug
+++ b/perl-install/standalone/drakbug
@@ -81,7 +81,7 @@ gtkadd(
                          ),
                   gtkpack(new Gtk2::HSeparator),
                   gtkpack_(Gtk2::HBox->new(0,0),
-                           0, gtksignal_connect(Gtk2::Button->new_from_stock('gtk-help'), clicked => sub { system("drakhelp https://qa.mandrakesoft.com &") }),
+                           0, gtksignal_connect(Gtk2::Button->new(N("Help")), clicked => sub { system("drakhelp https://qa.mandrakesoft.com &") }),
                            1, Gtk2::Label->new(""),
                            0, gtksignal_connect(Gtk2::Button->new(N("Report")), clicked => sub { 
                                                     my $options = "mdkbugreport=1";
@@ -95,7 +95,7 @@ gtkadd(
                                                     connect_bugzilla($bugzilla_url."?".$options);
                                                 }
                                                ),
-                           0, gtksignal_connect(Gtk2::Button->new_from_stock('gtk-close'), clicked => sub { ugtk2->exit(0) }),
+                           0, gtksignal_connect(Gtk2::Button->new(N("Close")), clicked => sub { ugtk2->exit(0) }),
                           ),
                  ),
       );
diff --git a/perl-install/standalone/drakconnect b/perl-install/standalone/drakconnect
index d36c76f65..defaa5ad3 100755
--- a/perl-install/standalone/drakconnect
+++ b/perl-install/standalone/drakconnect
@@ -91,14 +91,14 @@ $button_del->signal_connect(clicked => sub {
 				my $bbox_dialog = new Gtk2::HButtonBox;
 				$dialog->action_area->add($bbox_dialog);
 				$bbox_dialog->set_layout('end');
-				my $button_ok = Gtk2::Button->new_from_stock('gtk-ok');
+				my $button_ok = Gtk2::Button->new(N("Ok"));
 				$button_ok->signal_connect(clicked => sub {
 							       network::netconnect::del_profile($netcnx, $combo_dialog->entry->get_text);
 							       $netcnx->{PROFILE} eq $combo_dialog->entry->get_text and $netcnx->{PROFILE} = "default";
 							       Gtk2->main_quit;
 							   });
 				$bbox_dialog->add($button_ok);
-				my $button_cancel = Gtk2::Button->new_from_stock('gtk-cancel');
+				my $button_cancel = Gtk2::Button->new(N("Cancel"));
 				$button_cancel->signal_connect(clicked => sub { Gtk2->main_quit });
 				$bbox_dialog->add($button_cancel);
 				$dialog->show_all;
@@ -118,14 +118,14 @@ $button_new->signal_connect(clicked => sub {
 				my $bbox_dialog = new Gtk2::HButtonBox;
 				$dialog->action_area->add($bbox_dialog);
 				$bbox_dialog->set_layout('end');
-				my $button_ok = Gtk2::Button->new_from_stock('gtk-ok');
+				my $button_ok = Gtk2::Button->new(N("Ok"));
 				$button_ok->signal_connect(clicked => sub {
 							       network::netconnect::add_profile($netcnx, $entry_dialog->get_text);
 							       $netcnx->{PROFILE} = $entry_dialog->get_text;
 							       Gtk2->main_quit;
 							   });
 				$bbox_dialog->add($button_ok);
-				my $button_cancel = Gtk2::Button->new_from_stock('gtk-cancel');
+				my $button_cancel = Gtk2::Button->new(N("Cancel"));
 				$button_cancel->signal_connect(clicked => sub { Gtk2->main_quit });
 				$bbox_dialog->add($button_cancel);
 				$dialog->show_all;
@@ -233,12 +233,12 @@ $window1->{window}->add(
                                            ),
                                  0, Gtk2::HSeparator->new,
                                  0, $bbox0 = gtkpack(Gtk2::HButtonBox->new,
-                                                     gtksignal_connect(Gtk2::Button->new_from_stock('gtk-help'), clicked => sub { 
+                                                     gtksignal_connect(Gtk2::Button->new(N("Help")), clicked => sub { 
                                                                            exec("drakhelp Drakxtools-Guide.html/internet-connection.html") unless fork() }),
                                                      my $button_apply = gtksignal_connect(gtkset_sensitive(Gtk2::Button->new(N("Apply")), 0),
                                                                                           clicked => \&apply),
-                                                     gtksignal_connect(Gtk2::Button->new_from_stock('gtk-cancel'), clicked => \&quit_global),
-                                                     gtksignal_connect(Gtk2::Button->new_from_stock('gtk-ok'), clicked => sub {
+                                                     gtksignal_connect(Gtk2::Button->new(N("Cancel")), clicked => \&quit_global),
+                                                     gtksignal_connect(Gtk2::Button->new(N("Ok")), clicked => sub {
                                                                            my $dialog = _create_dialog(N("Please wait"));
                                                                            gtkpack($dialog->vbox,
                                                                                    Gtk2::Label->new(N("Please Wait... Applying the configuration")));
@@ -380,7 +380,7 @@ sub configure_lan() {
 	$window->vbox->pack_start(new Gtk2::Label(N("You don't have any configured interface.
 Configure them first by clicking on 'Configure'")),1,1,0);
 	$window->action_area->add(gtkadd(gtkset_layout(Gtk2::HButtonBox->new, 'end'),
-                                         gtksignal_connect(Gtk2::Button->new_from_stock('gtk-ok'),
+                                         gtksignal_connect(Gtk2::Button->new(N("Ok")),
                                                            clicked => sub { Gtk2->main_quit })
                                          )
                                   );
@@ -461,7 +461,7 @@ Configure them first by clicking on 'Configure'")),1,1,0);
     my $bbox8 = new Gtk2::HButtonBox;
     $vbox0->pack_start($bbox8,0,0,10);
     $bbox8->set_layout('end');
-    my $button_ok = Gtk2::Button->new_from_stock('gtk-ok');
+    my $button_ok = Gtk2::Button->new(N("Ok"));
     $button_ok->signal_connect(clicked => sub {
 	foreach (0..$#all_cards) {
 	    my @infos = @{$card_tab[2*$_]};
@@ -477,7 +477,7 @@ Configure them first by clicking on 'Configure'")),1,1,0);
 	$window->destroy; Gtk2->main_quit;
     });
     $window->action_area->pack_start(gtkpack(Gtk2::HButtonBox->new,
-                                             gtksignal_connect(Gtk2::Button->new_from_stock('gtk-cancel'),
+                                             gtksignal_connect(Gtk2::Button->new(N("Cancel")),
                                                                clicked => sub { $window->destroy; Gtk2->main_quit }),
                                              $button_ok,
                                             ),
@@ -502,7 +502,7 @@ Create one first by clicking on 'Configure'")),1,1,0);
 	my $bbox_dialog = new Gtk2::HButtonBox;
 	$dialog->action_area->add($bbox_dialog);
 	$bbox_dialog->set_layout('end');
-	my $button_ok = Gtk2::Button->new_from_stock('gtk-ok');
+	my $button_ok = Gtk2::Button->new(N("Ok"));
 	$button_ok->signal_connect(clicked => sub {
 					 Gtk2->main_quit;
 				     });
@@ -602,7 +602,7 @@ Create one first by clicking on 'Configure'")),1,1,0);
                               1, 1, 0
                              );
     $window->action_area->pack_start(gtkpack(Gtk2::HButtonBox->new,
-                                             gtksignal_connect(Gtk2::Button->new_from_stock('gtk-ok'), clicked => sub {
+                                             gtksignal_connect(Gtk2::Button->new(N("Ok")), clicked => sub {
                                                                    each_index {
                                                                        ${$conf_data[$::i][1]} = $infos[2*$::i+1]->get_text if $_;
                                                                    } @mask;
@@ -610,7 +610,7 @@ Create one first by clicking on 'Configure'")),1,1,0);
                                                                    $button_apply->set_sensitive(1);
                                                                    $window->destroy; Gtk2->main_quit;
                                                                }),
-                                             gtksignal_connect(Gtk2::Button->new_from_stock('gtk-cancel'),
+                                             gtksignal_connect(Gtk2::Button->new(N("Cancel")),
                                                                clicked => sub { $window->destroy; Gtk2->main_quit })
                                             ),
                                      1, 1, 0
diff --git a/perl-install/standalone/drakfloppy b/perl-install/standalone/drakfloppy
index 4cb27ca80..56c837545 100755
--- a/perl-install/standalone/drakfloppy
+++ b/perl-install/standalone/drakfloppy
@@ -111,12 +111,12 @@ $window->{window}->add(
                                                   ),
                                          ),
                                 0, gtkpack__(new Gtk2::HButtonBox(),
-                                             gtksignal_connect(Gtk2::Button->new_from_stock('gtk-cancel'),
+                                             gtksignal_connect(Gtk2::Button->new(N("Cancel")),
                                                                clicked => sub { ugtk2->exit(0) }
                                                               ),
-                                             gtksignal_connect(Gtk2::Button->new_from_stock('gtk-preferences'), clicked => \&pref_dialog),
+                                             gtksignal_connect(Gtk2::Button->new(N("Preferences")), clicked => \&pref_dialog),
                                              gtksignal_connect(gtkset_tip($tips, 
-                                                                          Gtk2::Button->new_from_stock('gtk-ok'),
+                                                                          Gtk2::Button->new(N("Ok")),
                                                                           N("Build the disk")),
                                                                clicked => \&build_it
                                                               ),
@@ -202,8 +202,8 @@ sub pref_dialog() {
     @temp_modules = ();
 
     gtkpack($dialog->action_area,
-            gtksignal_connect(Gtk2::Button->new_from_stock('gtk-cancel'), clicked => sub { $dialog->destroy }),
-            gtksignal_connect(Gtk2::Button->new_from_stock('gtk-ok'), clicked => sub { 
+            gtksignal_connect(Gtk2::Button->new(N("Cancel")), clicked => sub { $dialog->destroy }),
+            gtksignal_connect(Gtk2::Button->new(N("Ok")), clicked => sub { 
                                   # save values:
                                   $options{$_} = $buttons{$_}->get_active foreach keys %buttons;
                                   my $val;
diff --git a/perl-install/standalone/drakfont b/perl-install/standalone/drakfont
index 713b78d46..dddb26499 100755
--- a/perl-install/standalone/drakfont
+++ b/perl-install/standalone/drakfont
@@ -551,7 +551,7 @@ sub interactive_mode() {
 					       new Gtk2::HBox(0, 2), 0,
 					       gtkadd(gtkset_layout(new Gtk2::VButtonBox, 'end'),
 						      gtksignal_connect(new Gtk2::Button(N("About")), clicked => \&help),
-						      gtksignal_connect(Gtk2::Button->new_from_stock('gtk-close'), clicked => sub { Gtk2->main_quit }),
+						      gtksignal_connect(Gtk2::Button->new(N("Close")), clicked => sub { Gtk2->main_quit }),
 						     ),
 					      ),
 				     ),
diff --git a/perl-install/standalone/drakgw b/perl-install/standalone/drakgw
index c7829d073..c2b533afa 100755
--- a/perl-install/standalone/drakgw
+++ b/perl-install/standalone/drakgw
@@ -568,7 +568,7 @@ Click on Configure to launch the setup wizard.", $setup_state));
 				       ugtk2->exit(0);
 				   });
     $bbox1->add($button_conf);
-    my $button_cancel = Gtk2::Button->new_from_stock('gtk-cancel');
+    my $button_cancel = Gtk2::Button->new(N("Cancel"));
     $button_cancel->signal_connect(clicked => sub { ugtk2->exit(0) });
     $bbox1->add($button_cancel);
     $window1->{rwindow}->show_all;
diff --git a/perl-install/standalone/drakperm b/perl-install/standalone/drakperm
index cd3af7a43..0347cc9ce 100755
--- a/perl-install/standalone/drakperm
+++ b/perl-install/standalone/drakperm
@@ -127,16 +127,16 @@ Select permissions to see/edit", $default_perm_level)),
                                     0, my $up_down_box = gtkadd(Gtk2::HBox->new(0, 5), @buttons =
                                                                 map {
                                                                     gtkset_tip($tips, 
-                                                                               gtksignal_connect(Gtk2::Button->new_from_stock($_->[0]), clicked => $_->[2]),
+                                                                               gtksignal_connect(Gtk2::Button->new($_->[0]), clicked => $_->[2]),
                                                                                $_->[1]);
-                                                                } ([ 'gtk-go-up', N("Move selected rule up one level"), \&up_callback ], 
-                                                                   [ 'gtk-go-down', N("Move selected rule down one level"), \&down_callback ], 
-                                                                   [ 'gtk-add', N("Add a new rule at the end"), \&add_callback ],
-                                                                   [ 'gtk-remove', N("Delete selected rule"), \&del_callback ], 
-                                                                   [ 'gtk-preferences', N("Edit current rule"), \&edit_callback ])),
+                                                                } ([ N("Up"), N("Move selected rule up one level"), \&up_callback ], 
+                                                                   [ N("Down"), N("Move selected rule down one level"), \&down_callback ], 
+                                                                   [ N("Add a rule"), N("Add a new rule at the end"), \&add_callback ],
+                                                                   [ N("Delete"), N("Delete selected rule"), \&del_callback ], 
+                                                                   [ N("Edit"), N("Edit current rule"), \&edit_callback ])),
                                     0, gtkpack(Gtk2::HButtonBox->new,
-                                               gtksignal_connect(Gtk2::Button->new_from_stock('gtk-cancel'), clicked => sub { ugtk2->exit }),
-                                               gtksignal_connect(Gtk2::Button->new_from_stock('gtk-ok'), clicked => \&save_perm),
+                                               gtksignal_connect(Gtk2::Button->new(N("Cancel")), clicked => sub { ugtk2->exit }),
+                                               gtksignal_connect(Gtk2::Button->new(N("Ok")), clicked => \&save_perm),
                               )
                        )
                  )
@@ -221,8 +221,8 @@ sub row_setting_dialog {
     $dlg->set_transient_for($w->{rwindow}) unless $::isEmbedded;
     $dlg->set_modal(1);
 #    $dlg->set_resizable(0);
-    my $ok          = Gtk2::Button->new_from_stock('gtk-ok');
-    my $cancel      = Gtk2::Button->new_from_stock('gtk-cancel');
+    my $ok          = Gtk2::Button->new(N("Ok"));
+    my $cancel      = Gtk2::Button->new(N("Cancel"));
     my $browse = new Gtk2::Button(N("browse"));
     my $file        = new Gtk2::Entry;
     my $usr_check  = new Gtk2::CheckButton(N("Current user"));
diff --git a/perl-install/standalone/draksec b/perl-install/standalone/draksec
index fa24132e0..7bed8c380 100755
--- a/perl-install/standalone/draksec
+++ b/perl-install/standalone/draksec
@@ -234,7 +234,7 @@ $notebook->append_page(gtkshow(create_scrolled_window(gtkpack_(new Gtk2::VBox(0,
 
 
 ####################### OK CANCEL BUTTONS ##################################
-my $bok = gtksignal_connect(Gtk2::Button->new_from_stock('gtk-ok'),
+my $bok = gtksignal_connect(Gtk2::Button->new(N("Ok")),
                             'clicked' => sub {
                                 my $seclevel_value = $seclevel_entry->entry->get_text;
                                 my $secadmin_check_value = $secadmin_check->get_active;
@@ -281,7 +281,7 @@ my $bok = gtksignal_connect(Gtk2::Button->new_from_stock('gtk-ok'),
                                 ugtk2->exit(0);
                             });
 
-my $bcancel = gtksignal_connect(Gtk2::Button->new_from_stock('gtk-cancel'),
+my $bcancel = gtksignal_connect(Gtk2::Button->new(N("Cancel")),
                                 'clicked' => sub { ugtk2->exit(0) });
 gtkpack_($vbox,
          1, gtkshow($notebook),
diff --git a/perl-install/standalone/harddrake2 b/perl-install/standalone/harddrake2
index 6efdd238e..79338e5eb 100755
--- a/perl-install/standalone/harddrake2
+++ b/perl-install/standalone/harddrake2
@@ -180,10 +180,9 @@ $w->{window}->add(gtkpack_(0, Gtk2::VBox->new(0, 0),
                                             ),
                            0, $statusbar = Gtk2::Statusbar->new,
                            if_($::isEmbedded, 0, gtkpack(create_hbox(),
-                                                         gtksignal_connect(Gtk2::Button->new_from_stock('gtk-preferences'), 'event' => popup_menu($opt_menu), $menubar),
-                                                         gtksignal_connect(Gtk2::Button->new_from_stock('gtk-help'), 'event' => popup_menu($help_menu), $menubar),
-                                                         gtksignal_connect(Gtk2::Button->new_from_stock('gtk-quit'),
-                                                                           'clicked' => \&quit_global),
+                                                         gtksignal_connect(Gtk2::Button->new(N("Options")), event => popup_menu($opt_menu), $menubar),
+                                                         gtksignal_connect(Gtk2::Button->new(N("Help")), event => popup_menu($help_menu), $menubar),
+                                                         gtksignal_connect(Gtk2::Button->new(N("Quit")), clicked => \&quit_global),
                                                          ),
                                )
                            )
diff --git a/perl-install/standalone/logdrake b/perl-install/standalone/logdrake
index cfc817681..6a4ab7c36 100755
--- a/perl-install/standalone/logdrake
+++ b/perl-install/standalone/logdrake
@@ -198,8 +198,8 @@ gtkadd($my_win->{window},
                                                       } else { print "CRITICAL: \"$@\"\n" }
 
                                                   })),
-					      gtksignal_connect(Gtk2::Button->new_from_stock('gtk-save'), clicked => \&save),
-					      gtksignal_connect(Gtk2::Button->new_from_stock($::isEmbedded ? 'gtk-cancel' : 'gtk-quit'), clicked => \&quit)
+					      gtksignal_connect(Gtk2::Button->new(N("Save")), clicked => \&save),
+					      gtksignal_connect(Gtk2::Button->new($::isEmbedded ? N("Cancel") : N("Quit")), clicked => \&quit)
 					      )
 		    )
 		)
diff --git a/perl-install/standalone/mousedrake b/perl-install/standalone/mousedrake
index 0e2176dab..c41812388 100755
--- a/perl-install/standalone/mousedrake
+++ b/perl-install/standalone/mousedrake
@@ -73,8 +73,8 @@ if (!$::isEmbedded && $in->isa('interactive::gtk')) {
                    Gtk2::Label->new(N("Please test your mouse:")),
                    my $test_hbox = Gtk2::HBox->new(0, 5),
                    gtkpack(create_hbox(),
-                           gtksignal_connect(Gtk2::Button->new_from_stock('gtk-cancel'), clicked => sub { $w->{retval} = 0; Gtk2->main_quit }),
-                           gtksignal_connect(Gtk2::Button->new_from_stock('gtk-ok'),     clicked => sub { $w->{retval} = 1; Gtk2->main_quit }),
+                           gtksignal_connect(Gtk2::Button->new(N("Cancel")), clicked => sub { $w->{retval} = 0; Gtk2->main_quit }),
+                           gtksignal_connect(Gtk2::Button->new(N("Ok")),     clicked => sub { $w->{retval} = 1; Gtk2->main_quit }),
                           )));
     mouse::test_mouse_standalone($mouse, $test_hbox);
     $w->main or goto begin;
diff --git a/perl-install/standalone/net_monitor b/perl-install/standalone/net_monitor
index 4ef113d1b..68ca5a9a2 100755
--- a/perl-install/standalone/net_monitor
+++ b/perl-install/standalone/net_monitor
@@ -121,7 +121,7 @@ gtkadd($window1->{window},
                                                                                        ? system('/usr/sbin/logdrake --file=/var/log/messages &')
                                                                                          : system('/usr/X11R6/bin/xvt -e "tail -f /var/log/messages " &')
                                                                                      }),
-                                                               gtksignal_connect(my $button_close = Gtk2::Button->new_from_stock('gtk-close'), clicked => sub { ugtk2->exit(0) }),
+                                                               gtksignal_connect(my $button_close = Gtk2::Button->new(N("Close")), clicked => sub { ugtk2->exit(0) }),
                                                               )
                                                    )
                                        )
@@ -328,11 +328,11 @@ sub change_color {
     my $doit;
     $dialog->vbox->add(my $colorsel = Gtk2::ColorSelection->new);
     gtkpack($dialog->action_area,
-            gtksignal_connect(Gtk2::Button->new_from_stock('gtk-cancel'), clicked => sub {
+            gtksignal_connect(Gtk2::Button->new(N("Cancel")), clicked => sub {
                                   $doit = 1;
                                   $dialog->destroy;
                               }),
-            gtksignal_connect(Gtk2::Button->new_from_stock('gtk-ok'), clicked => sub { 
+            gtksignal_connect(Gtk2::Button->new(N("Ok")), clicked => sub { 
                                   $dialog->destroy;
                               }),
            );
diff --git a/perl-install/ugtk2.pm b/perl-install/ugtk2.pm
index f2e708205..318c2df97 100644
--- a/perl-install/ugtk2.pm
+++ b/perl-install/ugtk2.pm
@@ -383,13 +383,13 @@ sub create_dialog {
     $text->set_line_wrap(1);
 
     if ($o_options->{cancel}) {
-	my $button2 = Gtk2::Button->new_from_stock('gtk-cancel');
+	my $button2 = Gtk2::Button->new(N("Cancel"));
 	$button2->signal_connect(clicked => sub { $ret = 0; $dialog->destroy; Gtk2->main_quit });
 	$button2->can_default(1);
 	$dialog->action_area->pack_start($button2, 1, 1, 0);
     }
 
-    my $button = Gtk2::Button->new_from_stock('gtk-ok');
+    my $button = Gtk2::Button->new(N("Ok"));
     $button->can_default(1);
     $button->signal_connect(clicked => sub { $ret = 1; $dialog->destroy; Gtk2->main_quit });
     $dialog->action_area->pack_start($button, 1, 1, 0);
@@ -470,15 +470,15 @@ sub create_packtable {
 sub create_okcancel {
     my ($w, $o_ok, $o_cancel, $o_spread, @other) = @_;
     my $wizard_buttons = $::isWizard && !$w->{pop_it};
-    my $cancel = defined $o_cancel || defined $o_ok ? $o_cancel : $wizard_buttons ? 'gtk-go-back' : 'gtk-cancel';
-    my $ok = defined $o_ok ? $o_ok : $wizard_buttons ? ($::Wizard_finished ? N("Finish") : 'gtk-go-forward') : 'gtk-ok';
-    my $b1 = gtksignal_connect($w->{ok} = Gtk2::Button->new_from_stock($ok), clicked => $w->{ok_clicked} || sub { $w->{retval} = 1; Gtk2->main_quit });
-    my $b2 = $cancel && gtksignal_connect($w->{cancel} = Gtk2::Button->new_from_stock($cancel), clicked => $w->{cancel_clicked} || sub { log::l("default cancel_clicked"); undef $w->{retval}; Gtk2->main_quit });
-    gtksignal_connect($w->{wizcancel} = Gtk2::Button->new_from_stock('gtk-cancel'), clicked => sub { die 'wizcancel' }) if $wizard_buttons && !$::isInstall;
+    my $cancel = defined $o_cancel || defined $o_ok ? $o_cancel : $wizard_buttons ? N("<- Previous") : N("Cancel");
+    my $ok = defined $o_ok ? $o_ok : $wizard_buttons ? ($::Wizard_finished ? N("Finish") : N("Next ->")) : N("Ok");
+    my $b1 = gtksignal_connect($w->{ok} = Gtk2::Button->new($ok), clicked => $w->{ok_clicked} || sub { $w->{retval} = 1; Gtk2->main_quit });
+    my $b2 = $cancel && gtksignal_connect($w->{cancel} = Gtk2::Button->new($cancel), clicked => $w->{cancel_clicked} || sub { log::l("default cancel_clicked"); undef $w->{retval}; Gtk2->main_quit });
+    gtksignal_connect($w->{wizcancel} = Gtk2::Button->new(N("Cancel")), clicked => sub { die 'wizcancel' }) if $wizard_buttons && !$::isInstall;
     my @l = grep { $_ } $wizard_buttons ? (if_(!$::isInstall, $w->{wizcancel}), 
                                            if_(!$::Wizard_no_previous, $b2), $b1) : ($b2, $b1);
-    my @l2 = map { gtksignal_connect(Gtk2::Button->new_from_stock($_->[0]), clicked => $_->[1]) } grep {  $_->[2] } @other;
-    my @r2 = map { gtksignal_connect(Gtk2::Button->new_from_stock($_->[0]), clicked => $_->[1]) } grep { !$_->[2] } @other;
+    my @l2 = map { gtksignal_connect(Gtk2::Button->new($_->[0]), clicked => $_->[1]) } grep {  $_->[2] } @other;
+    my @r2 = map { gtksignal_connect(Gtk2::Button->new($_->[0]), clicked => $_->[1]) } grep { !$_->[2] } @other;
 
     my $box = create_hbox($o_spread || "edge");
     
@@ -974,7 +974,7 @@ sub _create_window($$) {
 
 sub ask_warn       { my $w = ugtk2->new(shift @_, grab => 1); $w->_ask_warn(@_); main($w) }
 sub ask_yesorno    { my $w = ugtk2->new(shift @_, grab => 1); $w->_ask_okcancel(@_, N("Yes"), N("No")); main($w) }
-sub ask_okcancel   { my $w = ugtk2->new(shift @_, grab => 1); $w->_ask_okcancel(@_, N("Is this correct?"), 'gtk-ok', 'gtk-cancel'); main($w) }
+sub ask_okcancel   { my $w = ugtk2->new(shift @_, grab => 1); $w->_ask_okcancel(@_, N("Is this correct?"), N("Ok"), N("Cancel")); main($w) }
 sub ask_from_entry { my $w = ugtk2->new(shift @_, grab => 1); $w->_ask_from_entry(@_); main($w) }
 sub ask_dir        { my $w = ugtk2->new(shift @_, grab => 1); $w->_ask_dir(@_); main($w) }
 
@@ -997,7 +997,7 @@ sub _ask_warn($@) {
     my ($o, @msgs) = @_;
     gtkadd($o->{window},
 	  gtkpack($o->create_box_with_title(@msgs),
-		 gtksignal_connect(my $w = Gtk2::Button->new_from_stock('gtk-ok'), "clicked" => sub { Gtk2->main_quit }),
+		 gtksignal_connect(my $w = Gtk2::Button->new(N("Ok")), "clicked" => sub { Gtk2->main_quit }),
 		 ),
 	  );
     $w->grab_focus;
@@ -1073,7 +1073,7 @@ sub ask_browse_tree_info {
     @l = reverse @l if !$::isInstall;
     my @buttons = map {
 	my ($t, $val) = @$_;
-	$box2->pack_end(my $w = gtksignal_connect(Gtk2::Button->new_from_stock($t), clicked => sub {
+	$box2->pack_end(my $w = gtksignal_connect(Gtk2::Button->new($t), clicked => sub {
 						      $w->{retval} = $val;
 						      Gtk2->main_quit;
 						  }), 0, 1, 20);
@@ -1081,7 +1081,7 @@ sub ask_browse_tree_info {
     } @l;
     @buttons = reverse @buttons if !$::isInstall;    
 
-    gtkpack__($box2, gtksignal_connect(Gtk2::Button->new_from_stock('gtk-help'), clicked => sub {
+    gtkpack__($box2, gtksignal_connect(Gtk2::Button->new(N("Help")), clicked => sub {
 					   ask_warn(N("Help"), $common->{interactive_help}->())
 				       })) if $common->{interactive_help};