merge changes from MNF, MDK-10-update

76 files changed, 17387 insertions, 17730 deletions

diff --git a/Makefile b/Makefile
index fdd5b4d8..c996312d 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,6 @@ TAG := $(shell echo "V$(VERSION)_$(RELEASE)" | tr -- '-.' '__')
 NAME = mdkonline
 MDKUPDATE = mdkupdate
 MDKAPPLET = mdkapplet
-MDKTUI = mdkonline_tui
 SUBDIRS = po
 
 PREFIX = /
@@ -37,7 +36,6 @@ install: all
 	install -d $(PREFIX)/usr/{sbin,bin,share/{$(NAME)/pixmaps,autostart,icons/{mini,large}},lib/libDrakX/drakfirsttime}
 	install -m755 $(NAME) $(SBINDIR)
 	install -m755 $(MDKUPDATE) $(SBINDIR)
-	install -m755 $(MDKTUI) $(SBINDIR)
 	install -m755 $(MDKAPPLET) $(BINDIR)
 	install -m644 icons/$(NAME)16.png $(ICONSDIR)/mini/$(NAME).png
 	install -m644 icons/$(NAME)32.png $(ICONSDIR)/$(NAME).png
diff --git a/mdkapplet b/mdkapplet
index 2779482e..0f8b590f 100755
--- a/mdkapplet
+++ b/mdkapplet
@@ -22,6 +22,7 @@
 
 use strict;
 use lib qw(/usr/lib/libDrakX);
+use interactive;
 use common;
 
 use Gtk2::Pango;
@@ -34,15 +35,16 @@ use lib qw(/usr/lib/libDrakX/drakfirsttime);
 use mdkonline;
 use Gtk2::TrayIcon;
 
-my ($eventbox, $img);
+my $in = interactive->vnew('');
+
 ugtk2::add_icon_path("/usr/share/mdkonline/pixmaps/");
-my ($menu, $timeout, $refreshtm, $networktm);
-my $nowindow = 1;
 my $arch = arch();
 my $online_site = "http://www.mandrakeonline.net/";
-my ($av_pkgs, $update_label, $lastch, $mLog, $buffer, $textview, $wlog, $textvw, $state_global);
-my ($need_update, $raisedwindow, $isAvailable) = (0, 0, 0);
+my ($menu, $timeout, $refreshtm, $networktm, $eventbox, $img, $av_pkgs, $update_label, $lastch, $mLog, $buffer, $textview, $wlog, $textvw, $state_global);
+my ($need_update, $raisedwindow, $isAvailable, $debug) = (0, 0, 0, 0);
+
 my @proctable;
+
 my $conffile = '/etc/sysconfig/mdkonline';
 my $localdir = "$ENV{HOME}/.MdkOnline";
 my $localfile = "$localdir/mdkonline";
@@ -61,11 +63,11 @@ my %state = (
 		      tt => [ N_("Your system is up-to-date") ]
 		     },
  	     critical => {
-			  colour => [ 'noconf' ],
-			  changes => [ 'okay', 'busy', 'critical', 'disconnected' ],
-			  menu => [ 'configureApplet', 'check', 'weblink' ],
-			  tt => [ N_("Service configuration problem. Please check logs and send mail to support\@mandrakeonline.net") ]
-			 },
+		      colour => [ 'noconf' ],
+		      changes => [ 'okay', 'busy', 'critical', 'disconnected' ],
+		      menu => [ 'configureApplet', 'check', 'weblink' ],
+		      tt => [ N_("Service configuration problem. Please check logs and send mail to support\@mandrakeonline.net") ]
+		     },
 	     busy => {
 		      colour => [ 'busy' ], 
 		      changes => [ 'okay', 'critical', 'error', 'disconnected' ],
@@ -73,41 +75,43 @@ my %state = (
 		      tt => [ N_("System is busy. Please wait ...") ]
 		     },
 	     error => {
-		       colour => [ 'error' ],
-		       changes => [ 'okay' ],
-		       menu => [ 'update', 'check', 'weblink' ],
-		       tt => [ N_("New updates are available for your system") ]
-		      },
+		      colour => [ 'error' ],
+		      changes => [ 'okay' ],
+		      menu => [ 'update', 'check', 'weblink' ],
+		      tt => [ N_("New updates are available for your system") ]
+		     },
 	     noconfig => {
-			  colour => [ 'noconf' ],
-			  changes => [ 'okay' ],
-			  menu => [ 'weblink', 'register' ],
-			  tt => [ N_("Service is not configured. Please click on \"Configure the service\"") ]
-			 },
+		      colour => [ 'noconf' ],
+		      changes => [ 'okay' ],
+		      menu => [ 'weblink', 'register' ],
+		      tt => [ N_("Service is not configured. Please click on \"Configure the service\"") ]
+		     },
 	     disconnected => {
-			      colour => [ 'disconnect' ],
-			      changes => [ 'okay', 'busy', 'critical', 'error' ],
-			      menu => [ 'confNetwork' ],
-			      tt => [ N_("Network is down. Please configure your network") ]
-			     },
+		      colour => [ 'disconnect' ],
+		      changes => [ 'okay', 'busy', 'critical', 'error' ],
+		      menu => [ 'confNetwork' ],
+		      tt => [ N_("Network is down. Please configure your network") ]
+		     },
 	     disabled => {
-			  colour => [ 'disabled' ],
-			  changes => [ 'okay', 'busy', 'critical', 'error' ],
-			  menu => [ 'configureApplet', 'weblink' ],
-			  tt => [ N_("Service is not activated. Please click on \"Online Website\"") ]
-			 },
+		      colour => [ 'disabled' ],
+		      changes => [ 'okay', 'busy', 'critical', 'error' ],
+		      menu => [ 'configureApplet', 'weblink' ],
+		      tt => [ N_("Service is not activated. Please click on \"Online Website\"") ]
+		     },
 	     notsupported => {
-			colour => [ 'disabled' ],
-			changes => [ 'okay', 'busy', 'critical', 'error' ],
-			menu => [ 'weblink' ],
-			tt => [ N_("Release not supported (too old release, or development release)") ]
-			}
+		      colour => [ 'disabled' ],
+		      changes => [ 'okay', 'busy', 'critical', 'error' ],
+		      menu => [ 'weblink' ],
+		      tt => [ N_("Release not supported (too old release, or development release)") ]
+		     }
 	    );
 
 my %actions = (
 	       'update' => { name => N("Install updates"), launch => sub { installUpdates() } },
 	       'configureApplet' => { name => N("Configure the service"), launch => sub { configure() } },
-	       'check' => { name => N("Check Updates"), launch => sub { checkUpdates() } }, 
+	       'check' => { name => N("Check Updates"), launch => sub { 
+				my $w = $in->wait_message(N("Please Wait"), N("Check updates") . '...');
+				checkUpdates(); undef $w } }, 
 	       'weblink' => { name => N("Online WebSite"), launch => sub { mdkonline::get_site($online_site, 'info.php') } },
 	       'confNetwork' => { name => N("Configure Network"), launch => sub { configNetwork() } },
 	       'register' => { name => N("Configure Now!"), launch => sub { configure() } }
@@ -130,6 +134,8 @@ $eventbox->signal_connect(button_press_event => sub {
 my ($opt) = @ARGV;
 if ($opt eq '--force' || $opt eq '-f') { setAutoStart('TRUE') };
 
+if ($opt eq '--debug') { $debug = 1}
+
 shouldStart() or die "$localfile should be set to TRUE: please use --force or -f option to launch applet";
 
 checkConfig();
@@ -157,19 +163,21 @@ sub showMainWindow() {
 			      gtkpack_(Gtk2::VBox->new(0, 3),
 				       1, gtksignal_connect(Gtk2::Button->new(N("Install updates")), clicked => sub { installUpdates() }),
 				       1, gtksignal_connect(Gtk2::Button->new(N("Configure")), clicked => sub { configure() }),
-				       1, gtksignal_connect(Gtk2::Button->new(N("Check updates")), clicked => sub { checkUpdates() }),
+				       1, gtksignal_connect(Gtk2::Button->new(N("Check updates")), clicked => sub {
+								my $w = $in->wait_message(N("Please Wait"), N("Check updates") . '...');
+								checkUpdates(); undef $w }),
 				       1, gtksignal_connect(Gtk2::Button->new(N("See logs")), clicked => sub { if (defined $wlog) { $wlog->{window}->show } else { $wlog = displayLogs(); $wlog->main } }),
-				    )
-			   ),
+				      )
+			     ),
 		    1, gtkadd(gtkset_shadow_type(Gtk2::Frame->new(N("Status")), 'etched_in'),
 			    gtkpack_(Gtk2::VBox->new(0, 3),
 				 1, create_scrolled_window(gtktext_insert($textvw, refresh_contents($state_global), wrap_mode => 'none')))),
 		    0, gtkpack(Gtk2::HSeparator->new),
 		    0, gtkpack(gtksignal_connect(Gtk2::Button->new(N("Close")), clicked => sub {
-						   if (defined $wlog) { $wlog->destroy; undef $wlog }; $w->destroy; $raisedwindow = 0;
-					       })
-			    )
-		    )
+						     if (defined $wlog) { $wlog->destroy; undef $wlog }; $w->destroy; $raisedwindow = 0;
+						 })
+			      )
+		   )
 	  );
     $w->show_all
 }
@@ -210,16 +218,18 @@ sub configNetwork() { logIt(N("Launching drakconnect\n")); system "/usr/sbin/dra
 sub installUpdates {
     my $binfile = '/usr/bin/mdkapplet';
     my $oldmd5 = md5file($binfile);
-    logIt(N("Launching mdkupdate --applet\n")); 
-    gtkroot()->set_cursor(Gtk2::Gdk::Cursor->new('watch')); 
-    system "/usr/sbin/mdkupdate", "--applet"; 
+    logIt(N("Launching mdkupdate --applet\n"));
+    system "/usr/sbin/mdkupdate", "--applet";
     my $newmd5 = md5file($binfile);
     if ($newmd5 ne $oldmd5) { logIt(N("Mandrakeonline seems to be reinstalled, reloading applet ....")); exec('/usr/bin/mdkapplet') };
+    my $w = $in->wait_message(N("Please Wait"), N("Check updates"));
     silentCheck(); gtkflush(); 
-    gtkroot()->set_cursor(Gtk2::Gdk::Cursor->new('left-ptr')); 
+    undef $w;
+    my $mdkupdate_status = cat_('/tmp/mdkupdate.log');
+    if ($mdkupdate_status !~ /OK/) { logIt($mdkupdate_status); $in->ask_warn(N("Mandrakelinux Updates Applet"), $mdkupdate_status) }
 }
 sub silentCheck {
-    my $link = "http://www.mandrakeonline.net/online3_RemoteAction.php" . '?action=UpdateList';
+    my $link = $online_site . "/online3_RemoteAction.php" . '?action=UpdateList';
     my %h = getVarsFromSh($conffile); 
     my $u;
     logIt(N("Computing new updates...\n"));
@@ -229,13 +239,15 @@ sub silentCheck {
 #    print "$link\n";
     my $response = mdkonline::get_from_URL($link, 'MdkAppletAgent/0.1');
     my $ct = $response->content;
-#    print "\nCONTENTS = $ct\n";
-#    logIt(N("Response from Mandrakeonline server\n") . "$ct");
+    if ($debug) {
+	print "\nCONTENTS = $ct\n" if $debug;
+	logIt(N("Response from Mandrakeonline server\n") . "$ct");
+    }
     if ($ct =~ /rpm/) { $u = 11 } elsif ($ct =~ m/(\d+)/) { $u = sprintf("%d", $1) } else { $u = 10 };
     #   99 - log or host or action or pass empty, wrong action
     #   98 - wrong pass
     #   97 - host not active
-#    print "Returned value = $u\n";
+    logIt("Returned value after association (silentCheck)= $u\n") if $debug;
     my $retcode = {
 		   10 => sub { okState() },
 		   11 => sub {
@@ -247,13 +259,14 @@ sub silentCheck {
 			   $cand =~ /(.*)-(.*)-(.*)$/; my ($name, $ver, $rel) = ($1, $2, $3);
 			   $comp = compareWithInstalled($name, $ver, $rel, \@t);
 			   #print "COMP =  $comp\n";
-			   if ($comp) { $isAvailable = 1; logIt(N("Checking... Updates are available\n") . "\n"); go2State('error') and last } else { $isAvailable = 0 }
+			   if ($comp) { $isAvailable = 1; logIt(N("Checking... Updates are available\n") . "\n"); go2State('error') } else { $isAvailable = 0 }
+			   $comp and last;
 		       }
 		       !$comp and okState();
 		   },
 		   94 => sub { logIt(N("Development release not supported by service")); go2State('notsupported') },
 		   95 => sub { logIt(N("Too old release not supported by service")); go2State('notsupported') },
-		   96 => sub { logIt(N("Unknown state")); go2State('okay') },
+		   96 => sub { logIt(N("Unknown state")); go2State('critical') },
 		   97 => sub { logIt(N("Online services disabled. Contact Mandrakeonline site\n")); go2State('disabled') },
 		   98 => sub { logIt(N("Wrong Password.\n")); go2State('critical') },
 		   99 => sub { logIt(N("Wrong Action or host or login.\n")); go2State('critical') },
@@ -268,9 +281,10 @@ sub compareWithInstalled {
     foreach my $p (@$t) { 
 	$p =~ /(.*)-(.*)-(.*)$/; my ($n, $v, $r) = ($1, $2, $3);
 	if ($name eq $n) {
-	    #my $iu = mdkonline::rpmvercmp($ver, $v); my $ir = mdkonline::rpmvercmp($rel, $r); 
+	    my ($iu, $ir);
+	    if ($debug) { $iu = mdkonline::rpmvercmp($ver, $v); $ir = mdkonline::rpmvercmp($rel, $r) }; 
 	    if (mdkonline::rpm_ver_cmp($ver, $v) > 0 || mdkonline::rpm_ver_cmp($ver, $v) == 0 && mdkonline::rpm_ver_cmp($rel, $r) > 0) {
-		#print "$name-$ver-$rel $n-$v-$r *** CMPVER=$iu ** CMPREL = $ir \n";
+		logIt("$name-$ver-$rel $n-$v-$r *** CMPVER=$iu ** CMPREL = $ir \n") if $debug;
 		$isUpdate = 1 and last;
 	    }
 	}
@@ -323,7 +337,7 @@ sub checkConfig {
     }
 }
 sub checkUpdates {
-    silentCheck() unless member($state_global, qw(disconnected noconfig));
+    member($state_global, qw(disconnected noconfig)) or silentCheck();
 }
 sub go2State {
     my $state = shift;
@@ -339,7 +353,7 @@ sub isNetwork {
 }
 sub configure {
     system("/usr/sbin/mdkonline &");
-    $refreshtm = Glib::Timeout->add(1*10*1000, sub {
+    $refreshtm = Glib::Timeout->add(20*1000, sub {
 					if (-e $conffile) { 
 					    Glib::Source->remove($refreshtm);
 					    silentCheck();
@@ -348,8 +362,6 @@ sub configure {
 				    });
 }
 sub displayLogs {
-    #    system "/usr/sbin/logdrake --explain=drakxtools &"
-    #create_dialog(N("Logs"), $mLog, { use_markup => 1, height => 480, width => 580, scroll => 1 })
     my $w = ugtk2->new(N("Logs"), center => 1);
     gtkset_size_request($w->{window}, 500, 400);
     $w->{window}->signal_connect(delete_event => sub { $w->destroy; undef $wlog });
@@ -401,7 +413,8 @@ sub setState {
 }
 sub logIt {
     my $log = shift;
-    $mLog .= $log;
+    my ($Second, $Minute, $Hour, $Day, $Month, $Year, $WeekDay, $DayOfYear, $IsDST) = localtime();
+    $mLog .= $Hour . ':' . $Minute . ':' . $Second . '  ' . $log;
     if (defined $wlog) {
 	$buffer->insert_at_cursor($log)
     }
diff --git a/mdkonline b/mdkonline
index f4c18227..2698f637 100755
--- a/mdkonline
+++ b/mdkonline
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 ################################################################################
-# MandrakeOnline                                                               # 
+# Mandrakeonline Text User Interface                                           # 
 #                                                                              #
 # Copyright (C) 2001-2002-2003-2004 Mandrakesoft                               #
 #                                                                              #
@@ -22,283 +22,198 @@
 
 use strict;
 use lib qw(/usr/lib/libDrakX /usr/lib/libDrakX/drakfirsttime);
-use common;
 use standalone;
+
+use interactive;
+use common;
+use wizards;
 use lang;
 
-BEGIN { unshift @::textdomains, 'mdkonline', 'drakfirstboot' }
+use Getopt::Long;
 
-$::no_ugtk_init = 1;
-if (check_for_xserver()) {
-    $::no_ugtk_init = 0;
-    eval { require ugtk2 };
-    die "Can't load ugtk2...\n" if $@;
-    ugtk2->import(qw(:all));
-} else {        
-    exec("/usr/sbin/mdkonline_tui");
-}
+BEGIN { unshift @::textdomains, 'mdkonline', 'drakfirstboot' };
 
 use mdkonline;
-use comdialog;
 use Digest::MD5  qw(md5 md5_hex md5_base64);
 
-my $confdir = '/root/.MdkOnline';
-my $conffile = "$confdir/mdkupdate";
+my $in = interactive->vnew('su');
 
-add_icon_path("/usr/share/drakfirsttime/pixmaps/");
+my $expert_link = 'http://www.mandrakeexpert.com';
+my $online_link = 'https://www.mandrakeonline.net';
 
-require_root_capability();
-my $create_account = 0;
-
-my ($o, $p);
+my $confdir = '/root/.MdkOnline';
+my $conffile = "$confdir/mdkupdate";
+my $logfile = '/tmp/mdkonline.log';
 
 #for compatibilities
 mkdir_p($confdir) if !-d $confdir;
-mdkonline::mv_files("/root/.mdkupdate", $conffile);
+-e '/root/.mdkupdate' and system("mv", "/root/.mdkupdate", $conffile);
 
-$o->{mw} = ugtk2->new("Mandrakeonline" . " " . $::VERSION, center => 1);
-gtkset_size_request($o->{mw}{window}, 600, 500);
-$o->{mw}{rwindow}->set_position('center');
-$o->{mw}{window}->signal_connect("delete_event", sub { Gtk2->main_quit });
-$o->{nb} = Gtk2::Notebook->new;
-$o->{nb}->set_show_tabs(0); $o->{nb}->set_show_border(0);
-$o->{bottomHbox} = Gtk2::HBox->new;
-my %stage = (
-	     0 => sub { if ($o->{account_cb}->get_active) { subs_online() } else { $o->{nb}->next_page } },
-	     1 => sub { $o->{nb}->next_page; set_entry_with_conf() }, 
-	     2 => sub { check_passwd() },
-	     3 => sub { log::l("[mdkonline] Sending configuration to remote server"); send_conf_online() },
-	     4 => sub { log::l("[mdkonline] Writing local configuration dir"); set_conf() }
-	    );
-$o->{actions} = {
-		 Next => sub {
-		     $p = $o->{nb}->get_current_page;
-		     $stage{$p}->();
-		     $p <= 0 and $o->{Prev}->set_sensitive(1);
-		     $p == 4 and main_quit()
-		 },
-		 SkipWiz => sub {
-		     main_quit()
-		 },
-		 Prev => sub {
-		     $p = $o->{nb}->get_current_page;
-		     $o->{nb}->prev_page;
-		     $p <= 1 and init(0)
-		 }
-		};
-foreach my $l ([ 'Next', N("Next"), 1 ], [ 'SkipWiz', N("Cancel") ], [ 'Prev', N("Previous"), 1 ]) {
-    $o->{$l->[0]} = Gtk2::Button->new($l->[1]);
-    $l->[2] ? $o->{bottomHbox}->pack_end($o->{$l->[0]}, 0, 0, 1) : $o->{bottomHbox}->pack_start($o->{$l->[0]}, 0, 0, 1);
-    $o->{$l->[0]}->signal_connect(clicked => sub { $o->{actions}{$l->[0]}->() });
-}
-gtkadd($o->{mw}{window},
-       gtkpack_(Gtk2::VBox->new(0, 2),
-		1, $o->{nb},
-		0, Gtk2::HSeparator->new,
-		0, gtkpack($o->{bottomHbox}),
-	       ),
-      );
-gtkappend_page($o->{nb},
-	       gtkpack_(Gtk2::VBox->new(0, 3),
-			0, set_darea(N("Welcome to Mandrakeonline"), 'welcome'),
-			0, gtktext_insert(Gtk2::TextView->new, N("This assistant will help you to upload your configuration\n(packages, hardware configuration) to a centralized database in\norder to keep you informed about security updates and useful upgrades.\n")),
-			1, gtkadd(gtkset_border_width(Gtk2::Frame->new(N("Create a Mandrakeonline Account")), 5),
-				  gtkpack_(gtkset_border_width(Gtk2::VBox->new(0, 5), 5),
-					   0, gtksignal_connect(gtkset_active($o->{account_cb} = Gtk2::CheckButton->new(N("I don't have a Mandrakeonline account and I want to subscribe")), $create_account), clicked => sub { $create_account = !$create_account; $o->{vbox_account}->set_sensitive($create_account) }),
-					   1, gtkpack_($o->{vbox_account} = Gtk2::VBox->new(0, 3),
-						       1, create_packtable({ homogeneous => 1, col_spacings => 10, row_spacings => 10, mcc => 1 },
-									   [],
-									   [ N("Login:"), $o->{clogin} = Gtk2::Entry->new ],
-									   [ N("Password:"), $o->{cpasswd} = entry_hidepass() ],
-									   [ N("Confirm Password:"), $o->{cconfirm} = entry_hidepass() ],
-									   [ N("Mail contact:"), $o->{cmail} = Gtk2::Entry->new ]
-									  ))
-					  )
-				 ))
-	      );
-gtkappend_page($o->{nb},
-	       gtkpack_(Gtk2::VBox->new(0, 3),
-			0, set_darea(N("Mandrakelinux Privacy Policy"), 'privacy'),
-			1, create_scrolled_window(gtktext_insert(Gtk2::TextView->new, privacy_text()))
-		       )
-	      );
-gtkappend_page($o->{nb},
-	       gtkpack_(Gtk2::VBox->new(0, 3),
-			0, set_darea("Mandrakeonline" . " " . N("Authentification"), 'authentification'),
-			0, Gtk2::WrappedLabel->new("\n\n" . N("Enter your Mandrakeonline login, password and machine name:")),
-			1, create_packtable({ homogeneous => 1, col_spacings => 10, row_spacings => 10, mcc => 1 },
-					    [], 
-					    [ N("Login:"), $o->{login} = Gtk2::Entry->new, "" ],
-					    [ N("Password:"), $o->{passwd} = entry_hidepass(), "" ],
-					    [ N("Machine name:"), $o->{machine} = Gtk2::Entry->new ],
-					   ))
-	      );
-gtkappend_page($o->{nb},
-	       gtkpack_(Gtk2::VBox->new(0, 3),
-			0,  set_darea(N("Send Configuration"), 'sendingconf'),
-			1, gtktext_insert(Gtk2::TextView->new, N("In order to benefit from Mandrakeonline services,\nwe are about to upload your configuration.\n\nThe Wizard will now send the following information to Mandrakesoft:\n1) the list of packages you have installed on your system,\n2) your hardware configuration.\n\nIf you feel uncomfortable by that idea, or do not want to benefit from this service,\nplease press 'Cancel'. By pressing 'Next', you allow us to keep you informed\nabout security updates and useful upgrades via personalized email alerts.\nFurthermore, you benefit from discounted paid support services on\nwww.mandrakeexpert.com.")) 
-		       )
-	      );
-gtkappend_page($o->{nb},
-	       gtkpack_(Gtk2::VBox->new(0, 3),
-			0, set_darea(N("Finish"), 'welcome'),
-			1, Gtk2::WrappedLabel->new("\n\n" . N("Your upload was successful!") . "\n\n" . N("From now you will receive on security and updates \nannouncements thanks to Mandrakeonline.") . "\n\n" . N("Mandrakeonline offers you the ability to automate the updates.\nA program will run regulary in your system waiting for new updates\n")),
-			0, gtkadd(Gtk2::Frame->new(N("automated Upgrades")),
-				  gtkpack_(Gtk2::VBox->new(0, 3),
-					   0, gtkpack_($o->{vbox_auto} = Gtk2::VBox->new(0, 3),
-						       0, create_packtable({ homogeneous => 1, col_spacings => 5, row_spacings => 5 },
-									   [ N("Country:"), $o->{country} = Gtk2::OptionMenu->new ],
-									   [" ", " "],
-									  ))
-					  ))));
+$::Wizard_title = N("Mandrakeonline");
 
-init(1);
+my %choices = (
+	       account => N("I already have an account"),
+	       noaccount => N("I want to subscribe")
+	      );
+  
+my $choice = $choices{account};
 
-# Filling country list:
-my %countries = map { lang::c2name($_) => $_ } lang::list_countries();
-$o->{country}->set_popdown_strings(sort(keys %countries));
-$o->{country}->set_text(lang::c2name(lang::read('', $>)->{country}));
+my ($wiz, $login, $nlogin, $password, $npassword, $boxname, $cfmpassword, $email, $is_success, $key, $r, $createaccount, $sendconfres, $country);
 
-$o->{mw}{rwindow}->show_all;
+GetOptions('login=s' => \$login, 'pass=s' => \$password, 'box=s' => \$boxname, 'country:s' => \$country);
 
-Gtk2->main;
-ugtk2->exit(0);
+my %countries = map { lang::c2name($_) => $_ } lang::list_countries();
+$country = lang::c2name(lang::read('', $>)->{country});
 
-sub subs_online() {
-    my $explink = 'http://www.mandrakeexpert.com/online3_CreateAccount.php';
-    my $login = $o->{clogin}->get_text; my $despwd = $o->{cpasswd}->get_text; my $despwdcfm = $o->{cconfirm}->get_text;
-    my $cmail = $o->{cmail}->get_text;
-    $::error = 0;
-    check_errors($login, $despwd, $despwdcfm, $o->{cmail});
-    #    print "Error = $::error";
-    if (!$::error) {
-	my $url = $explink . '?desuserid=' . $login . '&despwd=' . $despwd . '&user_email=' . $cmail;
-	#print "LOGIN = $login\nPASSWD = $despwd\nMAIL= $cmail\nURL=$url\n";
-	my $ret = mdkonline::subscribe_online($url);
-	if ($ret eq 'OK') { $o->{nb}->next_page } else { raiseError($o->{mw}{window}, N("Error"), $ret) };
-    }
-}
-sub check_errors {
-    my ($login, $despwd, $despwdcfm, $cmail) = @_;
-    $login or raiseError($o->{mw}{window}, N("Error"), N("Please provide a login"));
-    if (!$::error && $despwd ne $despwdcfm) {
-	raiseError($o->{mw}{window}, N("Error"), N("The passwords do not match\n Please try again\n"))
-    } elsif (!$::error && check_valid_email($cmail) != 1) {
-	raiseError($o->{mw}{window}, N("Error"), N("Not a valid mail address!\n"))
-    }
-}
-sub set_entry_with_conf() {
+sub read_conf() {
     my $wideconf = '/etc/sysconfig/mdkonline';
     my %t = getVarsFromSh($wideconf);
     my $host = chomp_(`hostname`);
     $t{MACHINE} ||= $1 if $host =~ /(\w+)(.*)/;
-    foreach (qw(login machine)) { $o->{$_}->get_text or $o->{$_}->set_text($t{uc($_)}) }
-}
-sub send_conf_online() {
-    my ($login, $passwd, $boxname) = get_names();
-    my $w = wait_msg(N("Reading configuration\n"));
-    my $link = 'https://www.mandrakeonline.net/wizard.php';
-    mdkonline::report_config("$confdir/$login.$passwd.$boxname.online.log");
-    my $tag = { submit => "upload_wizard", wizard => ["$confdir/$login.$passwd.$boxname.online.log.bz2.uue"] };
-    remove_wait_msg($w);
-    my $ww = wait_msg(N("Sending configuration..."));
-    my ($res, $key) = mdkonline::send_config($link, $tag);
-    my $pass = $o->{passwd}->get_text;
-    mdkonline::hw_upload($login, $pass, $boxname);
-    remove_wait_msg($ww);
-    if ($res eq 'TRUE' && $key) {
-	$o->{currentkey} = $key;
-	$o->{nb}->next_page; $o->{Next}->set_label(N("Finish")); $o->{Prev}->hide
-    } else {
-	raiseError($o->{mw}{window}, N("Connection problem"), N("Problem occurs when uploading files, please try again"));
-    }
-}
-sub set_conf() {
-    my ($login, $passwd, $boxname) = get_names(); 
-    my $country = lc($countries{$o->{country}->entry->get_text});
-    my $key = $o->{currentkey}; 
-    mdkonline::automated_upgrades($conffile, $login, $passwd, $boxname, $key, $country, 'TRUE');
-    mdkonline::write_wide_conf($login, $boxname, $country);
-}
-sub init {
-    my $i = shift;
-    $o->{Prev}->set_sensitive(0); 
-    $o->{Next}->grab_focus;
-    $i and first_settings();
+    $login = $t{LOGIN}; $boxname = $t{MACHINE}
 }
-sub first_settings() {
-    $o->{vbox_account}->set_sensitive(0);
+sub check_login {
+    my ($log, $pass, $box) = @_;
+    my ($res, $resp);
+    my $pp = md5_hex($pass);
+    $log && $pass && $box or return 0;
+    my $clink = $expert_link . '/firsttimewizard/validusercheck.php' . '?u=' . $log . '&p=' . $pp;
+    $resp = mdkonline::get_from_URL($clink, "MdkOnline_tuiAgent/");
+    $resp->is_success and $res = $resp->content =~ /TRUE/ ? 1 : 0;
+    $res
 }
-sub final() {
-    $o->{Prev}->hide; $o->{SkipWiz}->hide;
-    $o->{Next}->set_label(N("Finish"))
+sub send_conf {
+    my ($log, $pass, $box) = @_;
+    my $uplink = $online_link . '/wizard.php';
+    my $pp = md5_hex($pass);
+    my $w = $in->wait_message(N("Please wait"), N("Reading configuration\n"));
+    mdkonline::report_config("$confdir/$log.$pp.$box.online.log");
+    my $tag = { submit => "upload_wizard", wizard => ["$confdir/$log.$pp.$box.online.log.bz2.uue"] };
+    undef $w;
+    my $ww = $in->wait_message(N("Please wait"), N("Sending configuration..."));
+    ($sendconfres, $key) = mdkonline::send_config($uplink, $tag);
+    mdkonline::hw_upload($log, $pass, $box);
+    undef $ww;
+    ($sendconfres, $key)
 }
-sub get_names() {
-    my ($login, $passwd, $machine);
-    $login = $o->{login}->get_text;
-    $passwd = md5_hex($o->{passwd}->get_text);
-    $machine = $o->{machine}->get_text;
-    ($login, $passwd, $machine)
+sub create_new_account {
+    my ($log, $pass, $mail) = @_;
+    my $url = $expert_link . '/online3_CreateAccount.php' . '?desuserid=' . $log . '&despwd=' . $pass . '&user_email=' . $mail;
+    my $ca = mdkonline::subscribe_online($url);
+    $ca
 }
-sub main_quit() {
-    # remove local files
-    my ($login, $passwd, $boxname) = get_names();
-    if ($login && $passwd && $boxname) {
-	-f "$confdir/$login.$passwd.$boxname.online.log.bz2.uue" and unlink("$confdir/$login.$passwd.$boxname.online.log.bz2.uue");
-	-f "$confdir/$login.$passwd.$boxname.online.log.bz2" and unlink("$confdir/$login.$passwd.$boxname.online.log.bz2");
-    }
-    # quit
-    print N("Quitting Wizard\n");
-    Gtk2->main_quit;
-}
-sub is_alphanum {
-    my ($x) = @_;
-    my $_is_num = sub { $x =~ /^[[:alnum:]]+$/ ? 1 : 0 }
-}
-sub check_passwd() {
-    my $link = 'http://www.mandrakeexpert.com/firsttimewizard/validusercheck.php';
-    my $result;
-    my $login = $o->{login}->get_text; my $passwd   = md5_hex($o->{passwd}->get_text); my $boxname = $o->{machine}->get_text;
-    $boxname = is_alphanum($boxname);
-    if ($login && $passwd && $boxname && $login !~ /\s+/ && $passwd !~ /\s+/) {
-	my $w = wait_msg("Connecting ...\n");
-	$link .= '?u=' . $login . '&p=' . $passwd;
-	my $response = mdkonline::get_from_URL($link, "MdkOnlineAgent/");
-	remove_wait_msg($w);
-	# Check the outcome of the response
-	if ($response->is_success) {
-	    $result = $response->content =~ /TRUE/ ? 0 : -1;
-	} else {
-	    # pb with the connection ? stay on page 2
-	    raiseError($o->{mw}{window}, N("Connection problem"), N("Mandrakeonline could not be contacted, please try again at a later time"));
-	    return;
-	}
-    } else {
-	$result = -1; # not needed, but this way it's clear
-    }
-    
-    # if correct, go to page 4
-    if (! $result) {
-	$o->{nb}->next_page; 
-    } else {
-	# if incorrect, clear passwd and stay on page 2
-	raiseError($o->{mw}{window}, N("Wrong password"), N("Your login or password was wrong.\n Either you'll have to type it again, or you'll need to create an account on Mandrakeonline.\n In the latter case, go back to the first step to connect to Mandrakeonline.\n Be aware that you must also provide a Machine name \n (only alphabetical characters are admitted)"));
-	$o->{passwd}->set_text("");
-    }
-}
-sub wait_msg {
-    my ($msg, %options) = @_;
-    my $mainw = ugtk2->new('mdkonline', grab => 1, if_(exists $options{transient}, transient => $options{transient}));
-    $mainw->{rwindow}->set_position($options{transient} ? 'center_on_parent' : 'center_always') if !$::isEmbedded;
-    my $label = ref($msg) =~ /^Gtk/ ? $msg : Gtk2::Label->new($msg);
-    gtkadd($mainw->{window}, gtkpack__(gtkadd(Gtk2::VBox->new(0, 5), $label, if_(exists $options{widgets}, @{$options{widgets}}))));
-    $label->signal_connect(expose_event => sub { $mainw->{displayed} = 1; 0 });
-    $mainw->sync until $mainw->{displayed};
-    gtkset_mousecursor_wait($mainw->{rwindow}->window);
-    $mainw->flush;
-    $mainw;
+$wiz = {
+	name => N("Mandrakeonline"),
+	pages => {
+		  welcome => {
+			      name => N("This assistant will help you to upload your configuration\n(packages, hardware configuration) to a centralized database in\norder to keep you informed about security updates and useful upgrades.\n"),
+			      no_back => 1,
+			      next => 'choices'
+			     },
+		  choices => {
+			      name => N("Account creation or authentication"),
+			      data => [ { val => \$choice, type => 'list', list => [ values %choices ] } ],
+			      post => sub { +{ reverse %choices }->{$choice} },
+			     },
+		  account => {
+			      name => N("Enter your Mandrakeonline login, password and machine name:"),
+			      pre => sub {
+				  read_conf();
+			      },
+			      data => sub {
+				  [
+				   { label => N("Login:"),   val => \$login },
+				   { label => N("Password:"), val => \$password, hidden => 1 },
+				   { label => N("Machine name:"), val => \$boxname },
+				  ],
+			      },
+			      post => sub {
+				  my $_wait = $in->wait_message(N("Please wait"), N("Connecting to Mandrakeonline website..."));
+				  $is_success = check_login($login, $password, $boxname); undef($_wait);
+				  "authenticate"
+			      },
+			     },
+		  authenticate => {
+				   name => sub {
+				       if ($is_success) {
+					   N("In order to benefit from Mandrakeonline services,\nwe are about to upload your configuration.\n\nThe Wizard will now send the following information to Mandrakesoft:\n1) the list of packages you have installed on your system,\n2) your hardware configuration.\n\nIf you feel uncomfortable by that idea, or do not want to benefit from this service,\nplease press 'Cancel'. By pressing 'Next', you allow us to keep you informed\nabout security updates and useful upgrades via personalized email alerts.\nFurthermore, you benefit from discounted paid support services on\nwww.mandrakeexpert.com.")
+				       } else {
+					   N("Connection problem") . "  " . N("or") . "  " . N("wrong password:") . "\n" . N("Your login or password was wrong.\n Either you'll have to type it again, or you'll need to create an account on Mandrakeonline.\n In the latter case, go back to the first step to connect to Mandrakeonline.\n Be aware that you must also provide a Machine name \n (only alphabetical characters are admitted)")
+				       }
+				   },
+				   no_back => $is_success ? 1 : 0,
+				   post => sub { 
+				       if ($is_success) {
+					   ($sendconfres, $key) = send_conf($login, $password, $boxname);
+					   "upload"
+				       } else { "choices" }
+				   }
+				  },
+		  noaccount => {
+				name => N("Create a Mandrakeonline Account"),
+				data => sub {
+				    [
+				     { label => N("Login:"),   val => \$nlogin },
+				     { label => N("Password:"), val => \$npassword, hidden => 1 },
+				     { label => N("Confirm Password:"), val => \$cfmpassword, hidden => 1 },
+				     { label => N("Mail contact:"),   val => \$email },
+				    ]
+				},
+				post => sub {
+				    $createaccount = $npassword ne $cfmpassword ? N("The passwords do not match\n Please try again\n") : $nlogin eq '' ? N("Please provide a login") : mdkonline::check_valid_email($email) == 0 ?  N("Not a valid mail address!\n") : create_new_account($nlogin, $npassword, $email);
+				    "createaccount"
+				}
+			       },
+		  createaccount => {
+				    name => sub { 
+					$createaccount eq 'OK' ? "\n\n" . N("Mandrakeonline Account successfully created.\nPlease click \"Next\" to authenticate and upload your configuration\n") : $createaccount;
+				    },
+				    post => sub {
+					$createaccount eq 'OK' ? "account" : "noaccount"
+				    }
+				   },
+		  upload => {
+			     name => sub {
+				 if ($sendconfres eq 'TRUE' && $key) {
+				     "\n\n" . N("Your upload was successful!") . "\n\n" . N("From now you will receive on security and updates \nannouncements thanks to Mandrakeonline.") . "\n\n" . N("Mandrakeonline offers you the ability to automate the updates.\nA program will run regulary in your system waiting for new updates\n");
+				 } else {
+				     N("Connection problem") . N("Problem occurs when uploading files, please try again")
+				 }
+			     },
+			     data => sub {
+				 if ($sendconfres eq 'TRUE' && $key) {
+				     [ 
+				      { label => N("Country"), val => \$country, type => "combo", list => [ sort keys %countries ], not_edit => 0 }
+				     ]
+				 }
+			     },
+			     post => sub {
+				 mdkonline::automated_upgrades($conffile, $login, md5_hex($password), $boxname, $key, $country, 'TRUE');
+				 mdkonline::write_wide_conf($login, $boxname, $country);
+				 "end"
+			     },
+			    },
+		  end => {
+			  name => sub {
+			      N("Congratulations") . "\n\n" . N("Your Mandrakeonline account has been successfully configured\n")
+			  },
+			  end => 1,
+			  no_back => 1,
+			  next => 0,
+			 }
+		 }
+       };
+
+if ($login && $password && $boxname) { 
+    $is_success = check_login($login, $password, $boxname);
+    if ($is_success) {
+	($sendconfres, $key) = send_conf($login, $password, $boxname);
+	if ($sendconfres eq 'TRUE' && $key) {
+	    mdkonline::automated_upgrades($conffile, $login, md5_hex($password), $boxname, $key, $country, 'TRUE');
+	    mdkonline::write_wide_conf($login, $boxname, $country);
+	    output($logfile, N("Configuration uploaded successfully"))
+	} else { output($logfile, N("Problem uploading configuration")) }
+    } else { output($logfile, N("Cannot connect to mandrakeonline website: wrong login/password or router/firewall bad settings")) }
+} else {
+    wizards->new->safe_process($wiz, $in);
 }
-sub remove_wait_msg { $_[0]->destroy }
-
-
-
diff --git a/mdkonline.gtk b/mdkonline.gtk
new file mode 100755
index 00000000..f4c18227
--- /dev/null
+++ b/mdkonline.gtk
@@ -0,0 +1,304 @@
+#!/usr/bin/perl
+################################################################################
+# MandrakeOnline                                                               # 
+#                                                                              #
+# Copyright (C) 2001-2002-2003-2004 Mandrakesoft                               #
+#                                                                              #
+# Daouda Lo <daouda@mandrakesoft.com>                                          #
+#
+# This program is free software; you can redistribute it and/or modify         #
+# it under the terms of the GNU General Public License Version 2 as            #
+# published by the Free Software Foundation.                                   #
+#                                                                              #
+# This program is distributed in the hope that it will be useful,              #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of               #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                #
+# GNU General Public License for more details.                                 #
+#                                                                              #
+# You should have received a copy of the GNU General Public License            #
+# along with this program; if not, write to the Free Software                  #
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.   #
+################################################################################
+
+use strict;
+use lib qw(/usr/lib/libDrakX /usr/lib/libDrakX/drakfirsttime);
+use common;
+use standalone;
+use lang;
+
+BEGIN { unshift @::textdomains, 'mdkonline', 'drakfirstboot' }
+
+$::no_ugtk_init = 1;
+if (check_for_xserver()) {
+    $::no_ugtk_init = 0;
+    eval { require ugtk2 };
+    die "Can't load ugtk2...\n" if $@;
+    ugtk2->import(qw(:all));
+} else {        
+    exec("/usr/sbin/mdkonline_tui");
+}
+
+use mdkonline;
+use comdialog;
+use Digest::MD5  qw(md5 md5_hex md5_base64);
+
+my $confdir = '/root/.MdkOnline';
+my $conffile = "$confdir/mdkupdate";
+
+add_icon_path("/usr/share/drakfirsttime/pixmaps/");
+
+require_root_capability();
+my $create_account = 0;
+
+my ($o, $p);
+
+#for compatibilities
+mkdir_p($confdir) if !-d $confdir;
+mdkonline::mv_files("/root/.mdkupdate", $conffile);
+
+$o->{mw} = ugtk2->new("Mandrakeonline" . " " . $::VERSION, center => 1);
+gtkset_size_request($o->{mw}{window}, 600, 500);
+$o->{mw}{rwindow}->set_position('center');
+$o->{mw}{window}->signal_connect("delete_event", sub { Gtk2->main_quit });
+$o->{nb} = Gtk2::Notebook->new;
+$o->{nb}->set_show_tabs(0); $o->{nb}->set_show_border(0);
+$o->{bottomHbox} = Gtk2::HBox->new;
+my %stage = (
+	     0 => sub { if ($o->{account_cb}->get_active) { subs_online() } else { $o->{nb}->next_page } },
+	     1 => sub { $o->{nb}->next_page; set_entry_with_conf() }, 
+	     2 => sub { check_passwd() },
+	     3 => sub { log::l("[mdkonline] Sending configuration to remote server"); send_conf_online() },
+	     4 => sub { log::l("[mdkonline] Writing local configuration dir"); set_conf() }
+	    );
+$o->{actions} = {
+		 Next => sub {
+		     $p = $o->{nb}->get_current_page;
+		     $stage{$p}->();
+		     $p <= 0 and $o->{Prev}->set_sensitive(1);
+		     $p == 4 and main_quit()
+		 },
+		 SkipWiz => sub {
+		     main_quit()
+		 },
+		 Prev => sub {
+		     $p = $o->{nb}->get_current_page;
+		     $o->{nb}->prev_page;
+		     $p <= 1 and init(0)
+		 }
+		};
+foreach my $l ([ 'Next', N("Next"), 1 ], [ 'SkipWiz', N("Cancel") ], [ 'Prev', N("Previous"), 1 ]) {
+    $o->{$l->[0]} = Gtk2::Button->new($l->[1]);
+    $l->[2] ? $o->{bottomHbox}->pack_end($o->{$l->[0]}, 0, 0, 1) : $o->{bottomHbox}->pack_start($o->{$l->[0]}, 0, 0, 1);
+    $o->{$l->[0]}->signal_connect(clicked => sub { $o->{actions}{$l->[0]}->() });
+}
+gtkadd($o->{mw}{window},
+       gtkpack_(Gtk2::VBox->new(0, 2),
+		1, $o->{nb},
+		0, Gtk2::HSeparator->new,
+		0, gtkpack($o->{bottomHbox}),
+	       ),
+      );
+gtkappend_page($o->{nb},
+	       gtkpack_(Gtk2::VBox->new(0, 3),
+			0, set_darea(N("Welcome to Mandrakeonline"), 'welcome'),
+			0, gtktext_insert(Gtk2::TextView->new, N("This assistant will help you to upload your configuration\n(packages, hardware configuration) to a centralized database in\norder to keep you informed about security updates and useful upgrades.\n")),
+			1, gtkadd(gtkset_border_width(Gtk2::Frame->new(N("Create a Mandrakeonline Account")), 5),
+				  gtkpack_(gtkset_border_width(Gtk2::VBox->new(0, 5), 5),
+					   0, gtksignal_connect(gtkset_active($o->{account_cb} = Gtk2::CheckButton->new(N("I don't have a Mandrakeonline account and I want to subscribe")), $create_account), clicked => sub { $create_account = !$create_account; $o->{vbox_account}->set_sensitive($create_account) }),
+					   1, gtkpack_($o->{vbox_account} = Gtk2::VBox->new(0, 3),
+						       1, create_packtable({ homogeneous => 1, col_spacings => 10, row_spacings => 10, mcc => 1 },
+									   [],
+									   [ N("Login:"), $o->{clogin} = Gtk2::Entry->new ],
+									   [ N("Password:"), $o->{cpasswd} = entry_hidepass() ],
+									   [ N("Confirm Password:"), $o->{cconfirm} = entry_hidepass() ],
+									   [ N("Mail contact:"), $o->{cmail} = Gtk2::Entry->new ]
+									  ))
+					  )
+				 ))
+	      );
+gtkappend_page($o->{nb},
+	       gtkpack_(Gtk2::VBox->new(0, 3),
+			0, set_darea(N("Mandrakelinux Privacy Policy"), 'privacy'),
+			1, create_scrolled_window(gtktext_insert(Gtk2::TextView->new, privacy_text()))
+		       )
+	      );
+gtkappend_page($o->{nb},
+	       gtkpack_(Gtk2::VBox->new(0, 3),
+			0, set_darea("Mandrakeonline" . " " . N("Authentification"), 'authentification'),
+			0, Gtk2::WrappedLabel->new("\n\n" . N("Enter your Mandrakeonline login, password and machine name:")),
+			1, create_packtable({ homogeneous => 1, col_spacings => 10, row_spacings => 10, mcc => 1 },
+					    [], 
+					    [ N("Login:"), $o->{login} = Gtk2::Entry->new, "" ],
+					    [ N("Password:"), $o->{passwd} = entry_hidepass(), "" ],
+					    [ N("Machine name:"), $o->{machine} = Gtk2::Entry->new ],
+					   ))
+	      );
+gtkappend_page($o->{nb},
+	       gtkpack_(Gtk2::VBox->new(0, 3),
+			0,  set_darea(N("Send Configuration"), 'sendingconf'),
+			1, gtktext_insert(Gtk2::TextView->new, N("In order to benefit from Mandrakeonline services,\nwe are about to upload your configuration.\n\nThe Wizard will now send the following information to Mandrakesoft:\n1) the list of packages you have installed on your system,\n2) your hardware configuration.\n\nIf you feel uncomfortable by that idea, or do not want to benefit from this service,\nplease press 'Cancel'. By pressing 'Next', you allow us to keep you informed\nabout security updates and useful upgrades via personalized email alerts.\nFurthermore, you benefit from discounted paid support services on\nwww.mandrakeexpert.com.")) 
+		       )
+	      );
+gtkappend_page($o->{nb},
+	       gtkpack_(Gtk2::VBox->new(0, 3),
+			0, set_darea(N("Finish"), 'welcome'),
+			1, Gtk2::WrappedLabel->new("\n\n" . N("Your upload was successful!") . "\n\n" . N("From now you will receive on security and updates \nannouncements thanks to Mandrakeonline.") . "\n\n" . N("Mandrakeonline offers you the ability to automate the updates.\nA program will run regulary in your system waiting for new updates\n")),
+			0, gtkadd(Gtk2::Frame->new(N("automated Upgrades")),
+				  gtkpack_(Gtk2::VBox->new(0, 3),
+					   0, gtkpack_($o->{vbox_auto} = Gtk2::VBox->new(0, 3),
+						       0, create_packtable({ homogeneous => 1, col_spacings => 5, row_spacings => 5 },
+									   [ N("Country:"), $o->{country} = Gtk2::OptionMenu->new ],
+									   [" ", " "],
+									  ))
+					  ))));
+
+init(1);
+
+# Filling country list:
+my %countries = map { lang::c2name($_) => $_ } lang::list_countries();
+$o->{country}->set_popdown_strings(sort(keys %countries));
+$o->{country}->set_text(lang::c2name(lang::read('', $>)->{country}));
+
+$o->{mw}{rwindow}->show_all;
+
+Gtk2->main;
+ugtk2->exit(0);
+
+sub subs_online() {
+    my $explink = 'http://www.mandrakeexpert.com/online3_CreateAccount.php';
+    my $login = $o->{clogin}->get_text; my $despwd = $o->{cpasswd}->get_text; my $despwdcfm = $o->{cconfirm}->get_text;
+    my $cmail = $o->{cmail}->get_text;
+    $::error = 0;
+    check_errors($login, $despwd, $despwdcfm, $o->{cmail});
+    #    print "Error = $::error";
+    if (!$::error) {
+	my $url = $explink . '?desuserid=' . $login . '&despwd=' . $despwd . '&user_email=' . $cmail;
+	#print "LOGIN = $login\nPASSWD = $despwd\nMAIL= $cmail\nURL=$url\n";
+	my $ret = mdkonline::subscribe_online($url);
+	if ($ret eq 'OK') { $o->{nb}->next_page } else { raiseError($o->{mw}{window}, N("Error"), $ret) };
+    }
+}
+sub check_errors {
+    my ($login, $despwd, $despwdcfm, $cmail) = @_;
+    $login or raiseError($o->{mw}{window}, N("Error"), N("Please provide a login"));
+    if (!$::error && $despwd ne $despwdcfm) {
+	raiseError($o->{mw}{window}, N("Error"), N("The passwords do not match\n Please try again\n"))
+    } elsif (!$::error && check_valid_email($cmail) != 1) {
+	raiseError($o->{mw}{window}, N("Error"), N("Not a valid mail address!\n"))
+    }
+}
+sub set_entry_with_conf() {
+    my $wideconf = '/etc/sysconfig/mdkonline';
+    my %t = getVarsFromSh($wideconf);
+    my $host = chomp_(`hostname`);
+    $t{MACHINE} ||= $1 if $host =~ /(\w+)(.*)/;
+    foreach (qw(login machine)) { $o->{$_}->get_text or $o->{$_}->set_text($t{uc($_)}) }
+}
+sub send_conf_online() {
+    my ($login, $passwd, $boxname) = get_names();
+    my $w = wait_msg(N("Reading configuration\n"));
+    my $link = 'https://www.mandrakeonline.net/wizard.php';
+    mdkonline::report_config("$confdir/$login.$passwd.$boxname.online.log");
+    my $tag = { submit => "upload_wizard", wizard => ["$confdir/$login.$passwd.$boxname.online.log.bz2.uue"] };
+    remove_wait_msg($w);
+    my $ww = wait_msg(N("Sending configuration..."));
+    my ($res, $key) = mdkonline::send_config($link, $tag);
+    my $pass = $o->{passwd}->get_text;
+    mdkonline::hw_upload($login, $pass, $boxname);
+    remove_wait_msg($ww);
+    if ($res eq 'TRUE' && $key) {
+	$o->{currentkey} = $key;
+	$o->{nb}->next_page; $o->{Next}->set_label(N("Finish")); $o->{Prev}->hide
+    } else {
+	raiseError($o->{mw}{window}, N("Connection problem"), N("Problem occurs when uploading files, please try again"));
+    }
+}
+sub set_conf() {
+    my ($login, $passwd, $boxname) = get_names(); 
+    my $country = lc($countries{$o->{country}->entry->get_text});
+    my $key = $o->{currentkey}; 
+    mdkonline::automated_upgrades($conffile, $login, $passwd, $boxname, $key, $country, 'TRUE');
+    mdkonline::write_wide_conf($login, $boxname, $country);
+}
+sub init {
+    my $i = shift;
+    $o->{Prev}->set_sensitive(0); 
+    $o->{Next}->grab_focus;
+    $i and first_settings();
+}
+sub first_settings() {
+    $o->{vbox_account}->set_sensitive(0);
+}
+sub final() {
+    $o->{Prev}->hide; $o->{SkipWiz}->hide;
+    $o->{Next}->set_label(N("Finish"))
+}
+sub get_names() {
+    my ($login, $passwd, $machine);
+    $login = $o->{login}->get_text;
+    $passwd = md5_hex($o->{passwd}->get_text);
+    $machine = $o->{machine}->get_text;
+    ($login, $passwd, $machine)
+}
+sub main_quit() {
+    # remove local files
+    my ($login, $passwd, $boxname) = get_names();
+    if ($login && $passwd && $boxname) {
+	-f "$confdir/$login.$passwd.$boxname.online.log.bz2.uue" and unlink("$confdir/$login.$passwd.$boxname.online.log.bz2.uue");
+	-f "$confdir/$login.$passwd.$boxname.online.log.bz2" and unlink("$confdir/$login.$passwd.$boxname.online.log.bz2");
+    }
+    # quit
+    print N("Quitting Wizard\n");
+    Gtk2->main_quit;
+}
+sub is_alphanum {
+    my ($x) = @_;
+    my $_is_num = sub { $x =~ /^[[:alnum:]]+$/ ? 1 : 0 }
+}
+sub check_passwd() {
+    my $link = 'http://www.mandrakeexpert.com/firsttimewizard/validusercheck.php';
+    my $result;
+    my $login = $o->{login}->get_text; my $passwd   = md5_hex($o->{passwd}->get_text); my $boxname = $o->{machine}->get_text;
+    $boxname = is_alphanum($boxname);
+    if ($login && $passwd && $boxname && $login !~ /\s+/ && $passwd !~ /\s+/) {
+	my $w = wait_msg("Connecting ...\n");
+	$link .= '?u=' . $login . '&p=' . $passwd;
+	my $response = mdkonline::get_from_URL($link, "MdkOnlineAgent/");
+	remove_wait_msg($w);
+	# Check the outcome of the response
+	if ($response->is_success) {
+	    $result = $response->content =~ /TRUE/ ? 0 : -1;
+	} else {
+	    # pb with the connection ? stay on page 2
+	    raiseError($o->{mw}{window}, N("Connection problem"), N("Mandrakeonline could not be contacted, please try again at a later time"));
+	    return;
+	}
+    } else {
+	$result = -1; # not needed, but this way it's clear
+    }
+    
+    # if correct, go to page 4
+    if (! $result) {
+	$o->{nb}->next_page; 
+    } else {
+	# if incorrect, clear passwd and stay on page 2
+	raiseError($o->{mw}{window}, N("Wrong password"), N("Your login or password was wrong.\n Either you'll have to type it again, or you'll need to create an account on Mandrakeonline.\n In the latter case, go back to the first step to connect to Mandrakeonline.\n Be aware that you must also provide a Machine name \n (only alphabetical characters are admitted)"));
+	$o->{passwd}->set_text("");
+    }
+}
+sub wait_msg {
+    my ($msg, %options) = @_;
+    my $mainw = ugtk2->new('mdkonline', grab => 1, if_(exists $options{transient}, transient => $options{transient}));
+    $mainw->{rwindow}->set_position($options{transient} ? 'center_on_parent' : 'center_always') if !$::isEmbedded;
+    my $label = ref($msg) =~ /^Gtk/ ? $msg : Gtk2::Label->new($msg);
+    gtkadd($mainw->{window}, gtkpack__(gtkadd(Gtk2::VBox->new(0, 5), $label, if_(exists $options{widgets}, @{$options{widgets}}))));
+    $label->signal_connect(expose_event => sub { $mainw->{displayed} = 1; 0 });
+    $mainw->sync until $mainw->{displayed};
+    gtkset_mousecursor_wait($mainw->{rwindow}->window);
+    $mainw->flush;
+    $mainw;
+}
+sub remove_wait_msg { $_[0]->destroy }
+
+
+
diff --git a/mdkonline.pm b/mdkonline.pm
index ac235e4c..994aaee5 100644
--- a/mdkonline.pm
+++ b/mdkonline.pm
@@ -13,13 +13,21 @@ use HTTP::Request::Common;
 use HTTP::Request;
 
 #Don't change version manually
-$::VERSION = '1.1-13mdk';
+$::VERSION = '1.1-20mdk';
+
+my $release_file = find { -f $_ } '/etc/mandrakelinux-release', '/etc/mandrake-release', '/etc/redhat-release';
 
 sub get_release() {
-    my ($release) = cat_('/etc/mandrake-release') =~ /release\s+(\S+)/;
+    my ($release) = cat_($release_file) =~ /release\s+(\S+)/;
     ($release)
 }
 
+sub get_distro_type() {
+    my $d;
+    cat_($release_file) =~ /(corporate|mnf)/i, and $d = $1;
+    $d
+}
+
 sub get_from_URL {
     my ($link, $agent_name) = @_;
     my $ua = LWP::UserAgent->new;
@@ -133,10 +141,9 @@ sub header { "
 * $_[0]
 ********************************************************************************";
 }
-my $releasefile = find { -f $_ } '/etc/mandrakelinux-release', '/etc/mandrake-release', '/etc/redhat-release';
 output($file, map { chomp; "$_\n" }
   header("rpm -qa"), join('', sort `rpm -qa`),
-  header("mandrake version"), cat_($releasefile));
+  header("mandrake version"), cat_($release_file));
 system("/usr/bin/bzip2 -f $file");
 open(my $F, $file . ".bz2") or die "Cannot open file : $!";
 my ($chunk, $buffer);
diff --git a/mdkonline.spec b/mdkonline.spec
index 51971016..e84fdb18 100644
--- a/mdkonline.spec
+++ b/mdkonline.spec
@@ -1,6 +1,6 @@
 %define version 1.1
 %define name mdkonline
-%define release 18mdk
+%define release 20mdk
 
 Summary:	The MandrakeOnline Tool  
 Name:		%{name}
@@ -10,20 +10,13 @@ Source0:	%{name}-%{version}.tar.bz2
 URL:		http://www.mandrakeonline.net
 License:	GPL
 Group:		System/Configuration/Other
-Requires:	%{name}-backend = %{version}-%{release}, drakfirsttime >= 1.0-0.6mdk
-Requires:   	perl-Gtk2-TrayIcon >= 0.03-3mdk
+Requires:  	drakxtools-newt, perl-Gtk2-TrayIcon >= 0.03-3mdk, perl-Crypt-SSLeay >= 0.51-2mdk
+Provides:   %{name}-backend
+#Requires: hwdb-clients >= 0.15.1-1mdk
 BuildRequires: 	gettext
 BuildRoot:	%{_tmppath}/%{name}-buildroot
 BuildArch: 	noarch
 
-%package backend
-Summary: MandrakeOnline libraries and background tools
-Group: System/Configuration/Other
-Requires: drakxtools-newt >= 10-54mdk
-Requires: perl-Crypt-SSLeay >= 0.51-2mdk
-Requires: hwdb-clients >= 0.15.1-1mdk
-Conflicts: %{name} < 1.1-4mdk
-
 %description
 The MandrakeOnline tool is designed for registered users 
 who want to upload their configuration (packages, hardware infos). 
@@ -37,9 +30,6 @@ The package include :
 * Mdkapplet which is a KDE/Gnome applet for security updates 
   notification and installation. 
 
-%description backend
-This package contains the mdkonline library and backend tools.
-
 %prep
 %setup -q
 
@@ -86,8 +76,6 @@ EOF
 %post
 %{update_menus}
 
-%post backend
-
 if [ -r /etc/cron.daily/mdkupdate ]; then
   perl -p -i -e 's!/usr/bin/mdkupdate!/usr/sbin/mdkupdate!' /etc/cron.daily/mdkupdate
 fi
@@ -98,27 +86,22 @@ fi
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files backend
-%defattr(-,root,root)
-%{_sbindir}/mdkupdate
-%{_sbindir}/mdkonline_tui
-%dir %{_prefix}/lib/libDrakX/drakfirsttime
-%{_prefix}/lib/libDrakX/drakfirsttime/*.pm
-
 %files -f %{name}.lang
 %defattr(-,root,root)
 %doc COPYING ChangeLog
+%{_sbindir}/mdkupdate
 %{_sbindir}/mdkonline
 %{_sbindir}/drakonline
 %{_bindir}/*
 %{_prefix}/X11R6/bin/*
+%dir %{_prefix}/lib/libDrakX/drakfirsttime
+%{_prefix}/lib/libDrakX/drakfirsttime/*.pm
 %{_menudir}/%{name}
 %{_miconsdir}/*.png
 %{_iconsdir}/*.png
 %{_liconsdir}/*.png
 %{_datadir}/%{name}/pixmaps/*.png
 %_sysconfdir/X11/xinit.d/mdkapplet
-#%{_datadir}/autostart/*
 
 ##################################################################
 #
@@ -130,6 +113,23 @@ rm -rf $RPM_BUILD_ROOT
 # get the source from our cvs repository (see
 # http://www.linuxmandrake.com/en/cvs.php3)
 %changelog
+* Thu Nov  4 2004 Daouda LO <daouda@mandrakesoft.com> 1.1-20mdk
+- remerge mdkonline to one package 
+- superseded gtk based wizard by interactive one
+- MNF support (config upload and misc)
+- horodate log strings
+- added a debug option to mdkapplet (--debug option)
+- check updates fixes
+
+* Tue Oct 26 2004 Daouda LO <daouda@mandrakesoft.com> 1.1-19mdk
+- 
+
+* Thu Oct 21 2004 Daouda LO <daouda@mandrakesoft.com> 1.1-19mdk
+- branch cvs to MDK10_0_update and MDK10_1 for concurrent devel
+- release for 10.0 and corpo
+- remove strict requires on drakxtools_newt
+- revert urpmi new media handling repositories
+
 * Mon Oct 11 2004 Frederic Lepied <flepied@mandrakesoft.com> 1.1-18mdk
 - put the right dependencies on the backend sub-package
 - make parsing of output from server more error safe
diff --git a/mdkupdate b/mdkupdate
index f9fafb6c..10b89a8f 100755
--- a/mdkupdate
+++ b/mdkupdate
@@ -32,6 +32,8 @@ require_root_capability();
 my $confdir = '/root/.MdkOnline';
 my $conffile = "$confdir/mdkupdate";
 
+my $logfile = '/tmp/mdkupdate.log';
+
 my $onlineUrl = "https://www.mandrakeonline.net/";
 my $url;
 foreach (qw(online_dif online_update online3_RemoteAction wizard)) {
@@ -42,7 +44,7 @@ my $YEARS = "2002-2004";
 
 #for compatibilities
 mkdir_p($confdir) if !-d $confdir;
--e '/root/.mdkupdate' and system("mv", "/root/.mdkupdate", $conffile);
+-e '/root/.mdkupdate' and system "/bin/mv", "/root/.mdkupdate", $conffile;
 
 my ($scheduled, $noscheduled);
 
@@ -55,7 +57,6 @@ usage:
 ", $VERSION, $YEARS) . N("  --help         - print this help message.
 ") . N("  --auto         - Mandrakeupdate launched automatically.
 ") . N("  --applet       - launch Mandrakeupdate.
-") . N("  --update       - Update keys
 ");
     exit(0);
 }
@@ -72,6 +73,7 @@ if ($o{LOGIN} && $o{PASS} && $o{LOGIN} !~ /\s+/ && $o{PASS} !~ /\s+/) {
     my $resp = mdkonline::get_from_URL($MandrakeUpdateURL, 'MdkUpdateAgent');
     my $contents = $resp->content;
     #print "CONTENTS = $contents \n";
+    -e $logfile and system "/bin/rm", "$logfile";
     if ($resp->is_success) {
 	if ($contents =~ /TRUE/) { $u = 10 } elsif ($contents =~ m/(\d+)/) { $u = sprintf("%d", $1) } else { $u = 83 };
 	my $action = {
@@ -89,7 +91,7 @@ if ($o{LOGIN} && $o{PASS} && $o{LOGIN} !~ /\s+/ && $o{PASS} !~ /\s+/) {
 			  $noscheduled = join(',', @{$c2h->{nosched}}); $noscheduled =~ s/\.rpm//g;
 			  #printf "SCHEDULED = $scheduled\nNOSCHEDULED = $noscheduled\n";
 			  if ($opt eq '--applet') {
-			      system "MandrakeUpdate", "--no-confirmation", "--media=mdkupdate", "--pkg-sel=$scheduled", "--pkg-nosel=$noscheduled";
+			      system "/usr/bin/MandrakeUpdate", "--no-confirmation", "--media=mdkupdate", "--pkg-sel=$scheduled", "--pkg-nosel=$noscheduled";
 			  } elsif ($opt eq '--auto') {
 			      $o{AUTO} eq 'TRUE' and auto_install_rpms($c2h->{sched});
 			  }
@@ -107,21 +109,21 @@ if ($o{LOGIN} && $o{PASS} && $o{LOGIN} !~ /\s+/ && $o{PASS} !~ /\s+/) {
 			  clean_dir();
 		      },
 		      80 => sub { 
-			  log::l("[mdkupdate] Client password does not match in database")
+			  output($logfile, "[mdkupdate] Error 80: Client password does not match in database")
 		      },
 		      81 => sub {
-			  log::l("[mdkupdate] Bad Authentification key. Please rerun mdkonline wizard")
+			  output($logfile, "[mdkupdate] Error 81: Bad Authentification key. Please rerun mdkonline wizard")
 		      },
 		      82 => sub {
-			  log::l("[mdkupdate] No active Online service found for this host.")
+			  output($logfile, "[mdkupdate] Error 82: No active Online service found for this host.")
 		      },
 		      83 => sub {
-			  log::l("[mdkupdate] Unknown problem, better relaunch mdkonline wizard or check connexion")
+			  output($logfile, "[mdkupdate] Error 83: Unknown problem, better relaunch mdkonline wizard or check connexion")
 		      }
 		     };
 	$action->{$u}->();
     } else {
-	log::l(N("Connection problem") . "\n" . N("Mandrakeupdate could not contact the site, we will try again."));
+	output($logfile, N("Connection problem") . "\n" . N("Mandrakeupdate could not contact the site, we will try again."));
     }
 } else {
     my $ret = -1; 
@@ -159,10 +161,11 @@ sub update_conf {
 sub add_media {
     my $mirror = shift;
     my ($r) = mdkonline::get_release();
-    my $fullpath2mir = "ftp://" . $mirror . "/$r" . "/main_updates" . "/";
+    my $dist_type = mdkonline::get_distro_type();
+    my $fullpath2mir = "ftp://" . $mirror . if_($dist_type, "/$dist_type") ."/$r" . "/RPMS" . "/";
     eval {
 	system "/usr/sbin/urpmi.removemedia", "mdkupdate";
-	system "/usr/sbin/urpmi.addmedia", "--update", "mdkupdate", $fullpath2mir, "with", "media_info/synthesis.hdlist.cz";
+	system "/usr/sbin/urpmi.addmedia", "--update", "mdkupdate", $fullpath2mir, "with", "../base/synthesis.hdlist.cz";
     };
     $@ and die "Problem adding Update Media with urpmi";
 }
@@ -192,17 +195,15 @@ sub send_rpm_dif {
 	unlink "$confdir/mdkupdate.rpms";
 	rename "$confdir/rpm_qa_installed_after", "$confdir/mdkupdate.rpms";
     } else {
-	log::l(N("Connection problem") . "\n" . N("Mandrakeupdate could not upload the diff files. Send a mail to support [at] mandrakeonline [dot] net"));
+	output($logfile, 'send_rpm_dif' . N("Connection problem") . "\n" . N("Mandrakeupdate could not upload the diff files. Send a mail to support [at] mandrakeonline [dot] net"));
 	return
     }
 }
-
 sub clean_dir() {
-    system("rm -f $confdir/*log.bz2 $confdir/*log.bz2.uue $confdir/*.dif $confdir/rpm_qa_installed_before $confdir/rpm_qa_installed_after");    
+    system "/bin/rm", "-f", "$confdir/*log.bz2", "$confdir/*log.bz2.uue", "$confdir/*.dif $confdir/rpm_qa_installed_before", "$confdir/rpm_qa_installed_after";
+    output($logfile, 'OK')
 }
-
 sub rpm_qa {
     my ($file) = @_;
     output($file, chomp_(join('', sort(`rpm -qa`))));
 }
-
diff --git a/po/POTFILES.in b/po/POTFILES.in
index cf3c5bbd..6e6e1e4c 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,5 +1,4 @@
 mdkonline 
 mdkupdate
 mdkapplet 
-mdkonline_tui
 mdkonline.pm
\ No newline at end of file
diff --git a/po/af.po b/po/af.po
index 477d5c8b..6f1a430a 100644
--- a/po/af.po
+++ b/po/af.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-af\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-01 22:41+0200\n"
+"POT-Creation-Date: 2004-11-03 12:10+0100\n"
 "PO-Revision-Date: 2004-02-27 21:12+0200\n"
 "Last-Translator: Dirk van der Walt <dirkvanderwalt@webmail.co.za>\n"
 "Language-Team: Afrikaans\n"
@@ -16,271 +16,291 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.2\n"
 
-#: ../mdkapplet:61
+#: ../mdkapplet:63
 #, c-format
 msgid "Your system is up-to-date"
 msgstr ""
 
-#: ../mdkapplet:67
+#: ../mdkapplet:69
 #, fuzzy, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrakeonline.net"
 msgstr "Vir enige probleem stuur 'n e-pos na support@mandrakeonline.net\n"
 
-#: ../mdkapplet:73
+#: ../mdkapplet:75
 #, c-format
 msgid "System is busy. Please wait ..."
 msgstr ""
 
-#: ../mdkapplet:79
+#: ../mdkapplet:81
 #, c-format
 msgid "New updates are available for your system"
 msgstr ""
 
-#: ../mdkapplet:85
+#: ../mdkapplet:87
 #, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr ""
 
-#: ../mdkapplet:91
+#: ../mdkapplet:93
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr ""
 
-#: ../mdkapplet:97
+#: ../mdkapplet:99
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 
-#: ../mdkapplet:103
+#: ../mdkapplet:105
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:108 ../mdkapplet:158
+#: ../mdkapplet:110 ../mdkapplet:164
 #, c-format
 msgid "Install updates"
 msgstr "Installeer updaterings"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:111
 #, fuzzy, c-format
 msgid "Configure the service"
 msgstr "Konfigureer die Netwerk"
 
-#: ../mdkapplet:110
+#: ../mdkapplet:112
 #, c-format
 msgid "Check Updates"
 msgstr "Kyk vir Opdaterings"
 
-#: ../mdkapplet:111
+#: ../mdkapplet:113 ../mdkapplet:167 ../mdkapplet:225
+#, fuzzy, c-format
+msgid "Please Wait"
+msgstr "Wag asb."
+
+#: ../mdkapplet:113 ../mdkapplet:166 ../mdkapplet:167 ../mdkapplet:225
+#, fuzzy, c-format
+msgid "Check updates"
+msgstr "Kyk vir Opdaterings"
+
+#: ../mdkapplet:115
 #, c-format
 msgid "Online WebSite"
 msgstr "Aanlyn Webwerf"
 
-#: ../mdkapplet:112
+#: ../mdkapplet:116
 #, c-format
 msgid "Configure Network"
 msgstr "Konfigureer die Netwerk"
 
-#: ../mdkapplet:113
+#: ../mdkapplet:117
 #, fuzzy, c-format
 msgid "Configure Now!"
 msgstr "Konfigureer"
 
-#: ../mdkapplet:146
+#: ../mdkapplet:152 ../mdkapplet:229
 #, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Mandrakelinux Updates Applet"
 
-#: ../mdkapplet:156
+#: ../mdkapplet:162
 #, c-format
 msgid "Actions"
 msgstr "Aksies"
 
-#: ../mdkapplet:159
+#: ../mdkapplet:165
 #, c-format
 msgid "Configure"
 msgstr "Konfigureer"
 
-#: ../mdkapplet:160
-#, fuzzy, c-format
-msgid "Check updates"
-msgstr "Kyk vir Opdaterings"
-
-#: ../mdkapplet:161
+#: ../mdkapplet:169
 #, c-format
 msgid "See logs"
 msgstr "Bekyk staaflêers"
 
-#: ../mdkapplet:164
+#: ../mdkapplet:172
 #, c-format
 msgid "Status"
 msgstr "Status"
 
-#: ../mdkapplet:168 ../mdkapplet:363
+#: ../mdkapplet:176 ../mdkapplet:375
 #, c-format
 msgid "Close"
 msgstr "Maak toe"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Network Connection: "
 msgstr "Netwerk konneksie: "
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Up"
 msgstr "Op"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Down"
 msgstr "Af"
 
-#: ../mdkapplet:204
+#: ../mdkapplet:212
 #, c-format
 msgid "Last check: "
 msgstr "Laaste gemerk: "
 
-#: ../mdkapplet:205
+#: ../mdkapplet:213
 #, fuzzy, c-format
 msgid "Updates: "
 msgstr "Nuwe Opdaterings: "
 
-#: ../mdkapplet:209
+#: ../mdkapplet:217
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr ""
 
-#: ../mdkapplet:213
+#: ../mdkapplet:221
 #, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr ""
 
-#: ../mdkapplet:217
+#: ../mdkapplet:224
 #, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 
-#: ../mdkapplet:225
+#: ../mdkapplet:235
 #, fuzzy, c-format
 msgid "Computing new updates...\n"
 msgstr "Kyk vir Opdaterings"
 
-#: ../mdkapplet:227
+#: ../mdkapplet:237
 #, fuzzy, c-format
 msgid "Connecting to"
 msgstr "Konneksie probleem"
 
-#: ../mdkapplet:250
+#: ../mdkapplet:244
+#, fuzzy, c-format
+msgid "Response from Mandrakeonline server\n"
+msgstr "Welkom by Mandrakeonline"
+
+#: ../mdkapplet:262
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr ""
 
-#: ../mdkapplet:254
+#: ../mdkapplet:267
 #, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
-#: ../mdkapplet:255
+#: ../mdkapplet:268
 #, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
-#: ../mdkapplet:256
+#: ../mdkapplet:269
 #, c-format
 msgid "Unknown state"
 msgstr ""
 
-#: ../mdkapplet:257
+#: ../mdkapplet:270
 #, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr ""
 
-#: ../mdkapplet:258
+#: ../mdkapplet:271
 #, c-format
 msgid "Wrong Password.\n"
 msgstr "Verkeerde wagwoord\n"
 
-#: ../mdkapplet:259
+#: ../mdkapplet:272
 #, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr ""
 
-#: ../mdkapplet:260
+#: ../mdkapplet:273
 #, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
 msgstr ""
 
-#: ../mdkapplet:264
+#: ../mdkapplet:277
 #, c-format
 msgid "System is up-to-date\n"
 msgstr ""
 
-#: ../mdkapplet:303
+#: ../mdkapplet:317
 #, fuzzy, c-format
 msgid "No check"
 msgstr "Laaste gemerk: "
 
-#: ../mdkapplet:316
+#: ../mdkapplet:330
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
-#: ../mdkapplet:319
+#: ../mdkapplet:333
 #, c-format
 msgid "Checking config file: Not present\n"
 msgstr ""
 
-#: ../mdkapplet:353
+#: ../mdkapplet:365
 #, c-format
 msgid "Logs"
 msgstr "Staaflêers"
 
-#: ../mdkapplet:369
+#: ../mdkapplet:381
 #, c-format
 msgid "Clear"
 msgstr "Maak skoon"
 
-#: ../mdkapplet:396
+#: ../mdkapplet:408
 #, c-format
 msgid "About..."
 msgstr "Omtrent.."
 
-#: ../mdkapplet:397
+#: ../mdkapplet:409
 #, c-format
 msgid "Always launch on startup"
 msgstr ""
 
-#: ../mdkapplet:399
+#: ../mdkapplet:411
 #, c-format
 msgid "Quit"
 msgstr "Eindig"
 
-#: ../mdkonline:89
+#: ../mdkonline:52 ../mdkonline:106
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "Welkom by Mandrakeonline"
+
+#: ../mdkonline:55
 #, c-format
-msgid "Next"
-msgstr "Volgende"
+msgid "I already have an account"
+msgstr ""
 
-#: ../mdkonline:89
+#: ../mdkonline:56
 #, c-format
-msgid "Cancel"
-msgstr "Kanselleer"
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline:89 ../mdkonline:93 ../mdkonline:131
+#, c-format
+msgid "Please wait"
+msgstr "Wag asb."
 
 #: ../mdkonline:89
 #, c-format
-msgid "Previous"
-msgstr "Vorige"
+msgid "Reading configuration\n"
+msgstr "Lees konfigurasie\n"
 
-#: ../mdkonline:103
+#: ../mdkonline:93
 #, c-format
-msgid "Welcome to Mandrakeonline"
-msgstr "Welkom by Mandrakeonline"
+msgid "Sending configuration..."
+msgstr "Stuur konfigurasie..."
 
-#: ../mdkonline:104 ../mdkonline_tui:98
+#: ../mdkonline:109
 #, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
@@ -291,62 +311,37 @@ msgstr ""
 "(pakkette, hardeware konfigurasie) na 'n sentrale databasis sodat\n"
 "jy op datum gehou kan word met sekuriteit en ander waardevolle nuus.\n"
 
-#: ../mdkonline:105 ../mdkonline_tui:142
+#: ../mdkonline:114
 #, c-format
-msgid "Create a Mandrakeonline Account"
-msgstr "Skep 'n Mandrakeonline Rekening"
+msgid "Account creation or authentication"
+msgstr ""
 
-#: ../mdkonline:107
-#, fuzzy, c-format
-msgid "I don't have a Mandrakeonline account and I want to subscribe"
-msgstr "Ek het nie 'n Mandrakeonline rekening nie en ek wil "
+#: ../mdkonline:119
+#, c-format
+msgid "Enter your Mandrakeonline login, password and machine name:"
+msgstr "Sleutel in jou Mandrakeonline inteken, wagwoord, en masjiennaam:"
 
-#: ../mdkonline:111 ../mdkonline:131 ../mdkonline_tui:114 ../mdkonline_tui:145
+#: ../mdkonline:125 ../mdkonline:156
 #, c-format
 msgid "Login:"
 msgstr "Inteken:"
 
-#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:115 ../mdkonline_tui:146
+#: ../mdkonline:126 ../mdkonline:157
 #, c-format
 msgid "Password:"
 msgstr "Wagwoord:"
 
-#: ../mdkonline:113 ../mdkonline_tui:147
-#, c-format
-msgid "Confirm Password:"
-msgstr "Bevestig Wagwoord:"
-
-#: ../mdkonline:114 ../mdkonline_tui:148
-#, c-format
-msgid "Mail contact:"
-msgstr "E-pos kontak:"
-
-#: ../mdkonline:121
-#, c-format
-msgid "Mandrakelinux Privacy Policy"
-msgstr "Mandrakelinux se Privaatheidsbeleid"
-
 #: ../mdkonline:127
 #, c-format
-msgid "Authentification"
-msgstr "Identifikasie"
-
-#: ../mdkonline:128 ../mdkonline_tui:108
-#, c-format
-msgid "Enter your Mandrakeonline login, password and machine name:"
-msgstr "Sleutel in jou Mandrakeonline inteken, wagwoord, en masjiennaam:"
-
-#: ../mdkonline:133 ../mdkonline_tui:116
-#, c-format
 msgid "Machine name:"
 msgstr "Masjiennaam:"
 
-#: ../mdkonline:138
+#: ../mdkonline:131
 #, fuzzy, c-format
-msgid "Send Configuration"
-msgstr "Konfigurasie"
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Welkom by Mandrakeonline"
 
-#: ../mdkonline:139 ../mdkonline_tui:128
+#: ../mdkonline:139
 #, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
@@ -377,55 +372,55 @@ msgstr ""
 "oor sekuriteits nuus en waardevolle opgradeerings d.m.v. e-pos.\n"
 "Verder, jy kry afslag hulp by www.mandrakeexpert.com."
 
-#: ../mdkonline:144 ../mdkonline:211 ../mdkonline:234
-#, c-format
-msgid "Finish"
-msgstr "Klaar"
-
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141 ../mdkonline:180 ../mdkupdate:126 ../mdkupdate:198
 #, c-format
-msgid "Your upload was successful!"
-msgstr "Die oplaai was suksesvol!"
+msgid "Connection problem"
+msgstr "Konneksie probleem"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandrakeonline."
+msgid "or"
 msgstr ""
-"Van nou af sal jy sekuritiets en opgradeerings nuus kry\n"
-"vanaf Mandrakeonline."
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "Verkeerde wagwoord"
+
+#: ../mdkonline:141
 #, c-format
 msgid ""
-"Mandrakeonline offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+"Your login or password was wrong.\n"
+" Either you'll have to type it again, or you'll need to create an account on "
+"Mandrakeonline.\n"
+" In the latter case, go back to the first step to connect to "
+"Mandrakeonline.\n"
+" Be aware that you must also provide a Machine name \n"
+" (only alphabetical characters are admitted)"
 msgstr ""
-"Mandrakeonline gee jou die vermoë op die opgradeerings te automatiseer.\n"
-"'n Program sal gereeld op jou stelsel loop en wag vir nuwe opgradeerings\n"
-
-#: ../mdkonline:146
-#, c-format
-msgid "automated Upgrades"
-msgstr "automatiese Upgradëerings"
+"You intekennaam of wagwoord was verkeerd.\n"
+"Of jy moet dit weer intik, of jy moet 'n rekening skep by Mandrakeonline.\n"
+"Indien laasgenoemde, gaan terug na die eerste stap om te konnekteer na\n"
+"Mandrakeonline. Hou ingedagte dat jy ook 'n Masjiennaam sal moet "
+"spesifiseer\n"
+"(net alfabetiese karakters word toegelaat)"
 
-#: ../mdkonline:150
+#: ../mdkonline:153
 #, c-format
-msgid "Country:"
-msgstr "Land:"
+msgid "Create a Mandrakeonline Account"
+msgstr "Skep 'n Mandrakeonline Rekening"
 
-#: ../mdkonline:178 ../mdkonline:183 ../mdkonline:185 ../mdkonline:187
+#: ../mdkonline:158
 #, c-format
-msgid "Error"
-msgstr "Fout"
+msgid "Confirm Password:"
+msgstr "Bevestig Wagwoord:"
 
-#: ../mdkonline:183 ../mdkonline_tui:152
+#: ../mdkonline:159
 #, c-format
-msgid "Please provide a login"
-msgstr "Voorsien u aantekennaam"
+msgid "Mail contact:"
+msgstr "E-pos kontak:"
 
-#: ../mdkonline:185 ../mdkonline_tui:152
+#: ../mdkonline:163
 #, c-format
 msgid ""
 "The passwords do not match\n"
@@ -434,158 +429,114 @@ msgstr ""
 "Die wagwoorde verskil\n"
 "probeer weer\n"
 
-#: ../mdkonline:187 ../mdkonline_tui:152
+#: ../mdkonline:163
+#, c-format
+msgid "Please provide a login"
+msgstr "Voorsien u aantekennaam"
+
+#: ../mdkonline:163
 #, c-format
 msgid "Not a valid mail address!\n"
 msgstr "Nie-geldige e-pos adres!\n"
 
-#: ../mdkonline:199 ../mdkonline_tui:78
+#: ../mdkonline:169
 #, c-format
-msgid "Reading configuration\n"
-msgstr "Lees konfigurasie\n"
+msgid ""
+"Mandrakeonline Account successfully created.\n"
+"Please click \"Next\" to authenticate and upload your configuration\n"
+msgstr ""
 
-#: ../mdkonline:204 ../mdkonline_tui:82
+#: ../mdkonline:178
 #, c-format
-msgid "Sending configuration..."
-msgstr "Stuur konfigurasie..."
+msgid "Your upload was successful!"
+msgstr "Die oplaai was suksesvol!"
 
-#: ../mdkonline:213 ../mdkonline:273 ../mdkonline_tui:130 ../mdkonline_tui:169
-#: ../mdkupdate:124 ../mdkupdate:195
+#: ../mdkonline:178
 #, c-format
-msgid "Connection problem"
-msgstr "Konneksie probleem"
+msgid ""
+"From now you will receive on security and updates \n"
+"announcements thanks to Mandrakeonline."
+msgstr ""
+"Van nou af sal jy sekuritiets en opgradeerings nuus kry\n"
+"vanaf Mandrakeonline."
 
-#: ../mdkonline:213 ../mdkonline_tui:169
+#: ../mdkonline:178
 #, c-format
-msgid "Problem occurs when uploading files, please try again"
+msgid ""
+"Mandrakeonline offers you the ability to automate the updates.\n"
+"A program will run regulary in your system waiting for new updates\n"
 msgstr ""
+"Mandrakeonline gee jou die vermoë op die opgradeerings te automatiseer.\n"
+"'n Program sal gereeld op jou stelsel loop en wag vir nuwe opgradeerings\n"
 
-#: ../mdkonline:251
+#: ../mdkonline:180
 #, c-format
-msgid "Quitting Wizard\n"
-msgstr "Beëndig Assistent\n"
+msgid "Problem occurs when uploading files, please try again"
+msgstr ""
 
-#: ../mdkonline:273
-#, c-format
-msgid "Mandrakeonline could not be contacted, please try again at a later time"
-msgstr "Mandrakeupdate kon nie die webruimte kontak nie, ons sal weer probeer"
+#: ../mdkonline:186
+#, fuzzy, c-format
+msgid "Country"
+msgstr "Land:"
+
+#: ../mdkonline:198
+#, fuzzy, c-format
+msgid "Congratulations"
+msgstr "Konfigurasie"
 
-#: ../mdkonline:285
+#: ../mdkonline:198
 #, c-format
-msgid "Wrong password"
-msgstr "Verkeerde wagwoord"
+msgid "Your Mandrakeonline account has been successfully configured\n"
+msgstr ""
+
+#: ../mdkonline:214
+#, fuzzy, c-format
+msgid "Configuration uploaded successfully"
+msgstr "Die oplaai was suksesvol!"
 
-#: ../mdkonline:285 ../mdkonline_tui:130
+#: ../mdkonline:215
+#, fuzzy, c-format
+msgid "Problem uploading configuration"
+msgstr "Lees konfigurasie\n"
+
+#: ../mdkonline:216
 #, c-format
 msgid ""
-"Your login or password was wrong.\n"
-" Either you'll have to type it again, or you'll need to create an account on "
-"Mandrakeonline.\n"
-" In the latter case, go back to the first step to connect to "
-"Mandrakeonline.\n"
-" Be aware that you must also provide a Machine name \n"
-" (only alphabetical characters are admitted)"
+"Cannot connect to mandrakeonline website: wrong login/password or router/"
+"firewall bad settings"
 msgstr ""
-"You intekennaam of wagwoord was verkeerd.\n"
-"Of jy moet dit weer intik, of jy moet 'n rekening skep by Mandrakeonline.\n"
-"Indien laasgenoemde, gaan terug na die eerste stap om te konnekteer na\n"
-"Mandrakeonline. Hou ingedagte dat jy ook 'n Masjiennaam sal moet "
-"spesifiseer\n"
-"(net alfabetiese karakters word toegelaat)"
 
-#: ../mdkonline.pm:58
+#: ../mdkonline.pm:66
 #, c-format
 msgid "Login and password should be less than 12 characters\n"
 msgstr "Anntekennaam en wagwoord moet minder as 12 karakters wees\n"
 
-#: ../mdkonline.pm:59
+#: ../mdkonline.pm:67
 #, c-format
 msgid "Special characters are not allowed\n"
 msgstr "Spesiale karakters word nie geduld nie\n"
 
-#: ../mdkonline.pm:60
+#: ../mdkonline.pm:68
 #, c-format
 msgid "Please fill in all fields\n"
 msgstr "Voorsien asselbief alle velde\n"
 
-#: ../mdkonline.pm:61
+#: ../mdkonline.pm:69
 #, c-format
 msgid "Email not valid\n"
 msgstr "e-pos nie geldig nie\n"
 
-#: ../mdkonline.pm:62
+#: ../mdkonline.pm:70
 #, c-format
 msgid "Account already exist\n"
 msgstr "Rekening bestaan reeds\n"
 
-#: ../mdkonline.pm:68
+#: ../mdkonline.pm:76
 #, c-format
 msgid "Problem connecting to server \n"
 msgstr "Probleem om na bediener te konnekteer\n"
 
-#: ../mdkonline_tui:45 ../mdkonline_tui:95
-#, fuzzy, c-format
-msgid "Mandrakeonline"
-msgstr "Welkom by Mandrakeonline"
-
-#: ../mdkonline_tui:48
-#, c-format
-msgid "I already have an account"
-msgstr ""
-
-#: ../mdkonline_tui:49
-#, c-format
-msgid "I want to subscribe"
-msgstr ""
-
-#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:120
-#, c-format
-msgid "Please wait"
-msgstr "Wag asb."
-
-#: ../mdkonline_tui:103
-#, c-format
-msgid "Account creation or authentication"
-msgstr ""
-
-#: ../mdkonline_tui:120
-#, fuzzy, c-format
-msgid "Connecting to Mandrakeonline website..."
-msgstr "Welkom by Mandrakeonline"
-
-#: ../mdkonline_tui:130
-#, c-format
-msgid "or"
-msgstr ""
-
-#: ../mdkonline_tui:130
-#, fuzzy, c-format
-msgid "wrong password:"
-msgstr "Verkeerde wagwoord"
-
-#: ../mdkonline_tui:158
-#, c-format
-msgid ""
-"Mandrakeonline Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-
-#: ../mdkonline_tui:175
-#, fuzzy, c-format
-msgid "Country"
-msgstr "Land:"
-
-#: ../mdkonline_tui:187
-#, fuzzy, c-format
-msgid "Congratulations"
-msgstr "Konfigurasie"
-
-#: ../mdkonline_tui:187
-#, c-format
-msgid "Your Mandrakeonline account has been successfully configured\n"
-msgstr ""
-
-#: ../mdkupdate:50
+#: ../mdkupdate:52
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
@@ -602,48 +553,96 @@ msgstr ""
 "\n"
 "gebruik:\n"
 
-#: ../mdkupdate:55
+#: ../mdkupdate:57
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - druk hierdie help boodskap.\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:58
 #, fuzzy, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --applet       - loods MandrakeUpdate.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:59
 #, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - loods Mandrakeupdate.\n"
 
-#: ../mdkupdate:58
-#, fuzzy, c-format
-msgid "  --update       - Update keys\n"
-msgstr "  --update       - loods Mandrakeupdate.\n"
-
-#: ../mdkupdate:66
+#: ../mdkupdate:67
 #, c-format
 msgid "No %s file found. Run mdkonline wizard first"
 msgstr ""
 
-#: ../mdkupdate:124
+#: ../mdkupdate:126
 #, c-format
 msgid "Mandrakeupdate could not contact the site, we will try again."
 msgstr "Mandrakeupdate kon nie die webruimte kontak nie, ons sal weer probeer"
 
-#: ../mdkupdate:173
+#: ../mdkupdate:176
 #, c-format
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr "Kon nie pakette vanaf mdkupdate media opgradeer nie.\n"
 
-#: ../mdkupdate:195
+#: ../mdkupdate:198
 #, c-format
 msgid ""
 "Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
 "mandrakeonline [dot] net"
 msgstr ""
 
+#~ msgid "Next"
+#~ msgstr "Volgende"
+
+#~ msgid "Cancel"
+#~ msgstr "Kanselleer"
+
+#~ msgid "Previous"
+#~ msgstr "Vorige"
+
+#~ msgid "Welcome to Mandrakeonline"
+#~ msgstr "Welkom by Mandrakeonline"
+
+#, fuzzy
+#~ msgid "I don't have a Mandrakeonline account and I want to subscribe"
+#~ msgstr "Ek het nie 'n Mandrakeonline rekening nie en ek wil "
+
+#~ msgid "Mandrakelinux Privacy Policy"
+#~ msgstr "Mandrakelinux se Privaatheidsbeleid"
+
+#~ msgid "Authentification"
+#~ msgstr "Identifikasie"
+
+#, fuzzy
+#~ msgid "Send Configuration"
+#~ msgstr "Konfigurasie"
+
+#~ msgid "Finish"
+#~ msgstr "Klaar"
+
+#~ msgid "automated Upgrades"
+#~ msgstr "automatiese Upgradëerings"
+
+#~ msgid "Country:"
+#~ msgstr "Land:"
+
+#~ msgid "Error"
+#~ msgstr "Fout"
+
+#~ msgid "Quitting Wizard\n"
+#~ msgstr "Beëndig Assistent\n"
+
+#~ msgid ""
+#~ "Mandrakeonline could not be contacted, please try again at a later time"
+#~ msgstr ""
+#~ "Mandrakeupdate kon nie die webruimte kontak nie, ons sal weer probeer"
+
+#~ msgid "Wrong password"
+#~ msgstr "Verkeerde wagwoord"
+
+#, fuzzy
+#~ msgid "  --update       - Update keys\n"
+#~ msgstr "  --update       - loods Mandrakeupdate.\n"
+
 #~ msgid "Skip Wizard"
 #~ msgstr "Verlaar Wysgeer"
 
@@ -682,10 +681,6 @@ msgstr ""
 #~ msgstr "Bediener probleem"
 
 #, fuzzy
-#~ msgid "Response from Mandrakeonline server\n"
-#~ msgstr "Welkom by Mandrakeonline"
-
-#, fuzzy
 #~ msgid "Launching Mandrakeupdate\n"
 #~ msgstr "Loods \"Mandrakelinux Update\""
 
diff --git a/po/ar.po b/po/ar.po
index edeb988e..e3dfc9a2 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-01 22:41+0200\n"
+"POT-Creation-Date: 2004-11-03 12:10+0100\n"
 "PO-Revision-Date: 2004-09-23 03:49+0300\n"
 "Last-Translator: Ossama M. Khayat <okhayat@yahoo.com>\n"
 "Language-Team: Arabeyes <support@arabeyes.org>\n"
@@ -19,12 +19,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3.1\n"
 
-#: ../mdkapplet:61
+#: ../mdkapplet:63
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "النّظام محدّث"
 
-#: ../mdkapplet:67
+#: ../mdkapplet:69
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -33,188 +33,198 @@ msgstr ""
 "مشكلة في تهيئة الخدمة. رجاء تحقّق من السجلّ وأرسل إلى support@mandrakeonline."
 "net"
 
-#: ../mdkapplet:73
+#: ../mdkapplet:75
 #, c-format
 msgid "System is busy. Please wait ..."
 msgstr "النّظام مشغول. رجاء الانتظار..."
 
-#: ../mdkapplet:79
+#: ../mdkapplet:81
 #, c-format
 msgid "New updates are available for your system"
 msgstr "هناك تحديثات متوفّرة لنظامك"
 
-#: ../mdkapplet:85
+#: ../mdkapplet:87
 #, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr "الخدمة غير مهيّئة. رجاء اضغط على  \"تهيئة الخدمة\""
 
-#: ../mdkapplet:91
+#: ../mdkapplet:93
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "الشّبكة متوقّفة. رجاء هيّئ شبكتك"
 
-#: ../mdkapplet:97
+#: ../mdkapplet:99
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "الخدمة غير مُنشَّطة. رجاء اضغط على \"موقع الإنترنت\""
 
-#: ../mdkapplet:103
+#: ../mdkapplet:105
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 "هذه الإصدارة غير مدعومة (إما بسبب أنها قديماً جداً، أو أنها إصدارة تطويريّة)"
 
-#: ../mdkapplet:108 ../mdkapplet:158
+#: ../mdkapplet:110 ../mdkapplet:164
 #, c-format
 msgid "Install updates"
 msgstr "ثبّت التّحديثات"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:111
 #, c-format
 msgid "Configure the service"
 msgstr "تهيئة الخدمة"
 
-#: ../mdkapplet:110
+#: ../mdkapplet:112
 #, c-format
 msgid "Check Updates"
 msgstr "إفحص التّحديثات"
 
-#: ../mdkapplet:111
+#: ../mdkapplet:113 ../mdkapplet:167 ../mdkapplet:225
+#, fuzzy, c-format
+msgid "Please Wait"
+msgstr "من فضلك انتظر"
+
+#: ../mdkapplet:113 ../mdkapplet:166 ../mdkapplet:167 ../mdkapplet:225
+#, c-format
+msgid "Check updates"
+msgstr "إفحص التّحديثات"
+
+#: ../mdkapplet:115
 #, c-format
 msgid "Online WebSite"
 msgstr "موقع على الخطّ"
 
-#: ../mdkapplet:112
+#: ../mdkapplet:116
 #, c-format
 msgid "Configure Network"
 msgstr "أعدّ الشّبكة"
 
-#: ../mdkapplet:113
+#: ../mdkapplet:117
 #, c-format
 msgid "Configure Now!"
 msgstr "أعدّ الآن !"
 
-#: ../mdkapplet:146
+#: ../mdkapplet:152 ../mdkapplet:229
 #, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "بريمج تحديثات ماندريك لينكس"
 
-#: ../mdkapplet:156
+#: ../mdkapplet:162
 #, c-format
 msgid "Actions"
 msgstr "الأفعال"
 
-#: ../mdkapplet:159
+#: ../mdkapplet:165
 #, c-format
 msgid "Configure"
 msgstr "أعدّ"
 
-#: ../mdkapplet:160
-#, c-format
-msgid "Check updates"
-msgstr "إفحص التّحديثات"
-
-#: ../mdkapplet:161
+#: ../mdkapplet:169
 #, c-format
 msgid "See logs"
 msgstr "شاهد السّجلّات"
 
-#: ../mdkapplet:164
+#: ../mdkapplet:172
 #, c-format
 msgid "Status"
 msgstr "الحالة"
 
-#: ../mdkapplet:168 ../mdkapplet:363
+#: ../mdkapplet:176 ../mdkapplet:375
 #, c-format
 msgid "Close"
 msgstr "إغلق"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Network Connection: "
 msgstr "وصلة الشّبكة: "
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Up"
 msgstr "أعلى"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Down"
 msgstr "أسفل"
 
-#: ../mdkapplet:204
+#: ../mdkapplet:212
 #, c-format
 msgid "Last check: "
 msgstr "آخر فحص: "
 
-#: ../mdkapplet:205
+#: ../mdkapplet:213
 #, c-format
 msgid "Updates: "
 msgstr "تحديثات: "
 
-#: ../mdkapplet:209
+#: ../mdkapplet:217
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "يجري إطلاق دراكونكت (drakconnect)\n"
 
-#: ../mdkapplet:213
+#: ../mdkapplet:221
 #, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "يجري إطلاق محدّث ماندريك --بريمج (mdkupdate --applet)\n"
 
-#: ../mdkapplet:217
+#: ../mdkapplet:224
 #, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr "يبدو أنّ ماندريك أُنلاين  مثبّت من جديد،ياجريإعادة  تحميل البريمج..."
 
-#: ../mdkapplet:225
+#: ../mdkapplet:235
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "يجري حساب التّحديثات الجديدة...\n"
 
-#: ../mdkapplet:227
+#: ../mdkapplet:237
 #, c-format
 msgid "Connecting to"
 msgstr "الإتّصال بـ"
 
-#: ../mdkapplet:250
+#: ../mdkapplet:244
+#, fuzzy, c-format
+msgid "Response from Mandrakeonline server\n"
+msgstr "أهلا بكم في ماندريك أُنلاين"
+
+#: ../mdkapplet:262
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "يجري الفحص... التّحديثات متوفّرة\n"
 
-#: ../mdkapplet:254
+#: ../mdkapplet:267
 #, c-format
 msgid "Development release not supported by service"
 msgstr "إصدارة تطويريّة غير مدعومة من قبل الخدمة"
 
-#: ../mdkapplet:255
+#: ../mdkapplet:268
 #, c-format
 msgid "Too old release not supported by service"
 msgstr "إصدارة قديمة جداً غير مدعومة من قبل الخدمة"
 
-#: ../mdkapplet:256
+#: ../mdkapplet:269
 #, c-format
 msgid "Unknown state"
 msgstr "حالة مجهولة"
 
-#: ../mdkapplet:257
+#: ../mdkapplet:270
 #, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr "الخدمات على الخطّ معطّلة. اتّصل بموقع ماندريك أُنلاين\n"
 
-#: ../mdkapplet:258
+#: ../mdkapplet:271
 #, c-format
 msgid "Wrong Password.\n"
 msgstr "كلمة مرور خاطئة.\n"
 
-#: ../mdkapplet:259
+#: ../mdkapplet:272
 #, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr "فعل أو مضيف أو إسم دخول خاطئ.\n"
 
-#: ../mdkapplet:260
+#: ../mdkapplet:273
 #, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
@@ -223,72 +233,82 @@ msgstr ""
 "هناك شيء خاطئ في إعدادات شبكتك (إفحص الطّريق، الجدار النّاري أو إعدادات "
 "البروكسي الخاصّة بك)\n"
 
-#: ../mdkapplet:264
+#: ../mdkapplet:277
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "النّظام محدّث\n"
 
-#: ../mdkapplet:303
+#: ../mdkapplet:317
 #, c-format
 msgid "No check"
 msgstr "دون فحص"
 
-#: ../mdkapplet:316
+#: ../mdkapplet:330
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "يجري فحص الشّبكة: تبدو معطّلة\n"
 
-#: ../mdkapplet:319
+#: ../mdkapplet:333
 #, c-format
 msgid "Checking config file: Not present\n"
 msgstr "يجري فحص ملفّ الإعداد: غير موجود\n"
 
-#: ../mdkapplet:353
+#: ../mdkapplet:365
 #, c-format
 msgid "Logs"
 msgstr "السّجلّات"
 
-#: ../mdkapplet:369
+#: ../mdkapplet:381
 #, c-format
 msgid "Clear"
 msgstr "إمحي"
 
-#: ../mdkapplet:396
+#: ../mdkapplet:408
 #, c-format
 msgid "About..."
 msgstr "حَوْل..."
 
-#: ../mdkapplet:397
+#: ../mdkapplet:409
 #, c-format
 msgid "Always launch on startup"
 msgstr "أطلق دوما عند البدأ"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:411
 #, c-format
 msgid "Quit"
 msgstr "خروج"
 
-#: ../mdkonline:89
+#: ../mdkonline:52 ../mdkonline:106
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "أهلا بكم في ماندريك أُنلاين"
+
+#: ../mdkonline:55
 #, c-format
-msgid "Next"
-msgstr "التالي"
+msgid "I already have an account"
+msgstr ""
 
-#: ../mdkonline:89
+#: ../mdkonline:56
+#, c-format
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline:89 ../mdkonline:93 ../mdkonline:131
 #, c-format
-msgid "Cancel"
-msgstr "إلغاء"
+msgid "Please wait"
+msgstr "من فضلك انتظر"
 
 #: ../mdkonline:89
 #, c-format
-msgid "Previous"
-msgstr "السابق"
+msgid "Reading configuration\n"
+msgstr "جاري قراءة اعداداتك\n"
 
-#: ../mdkonline:103
+#: ../mdkonline:93
 #, c-format
-msgid "Welcome to Mandrakeonline"
-msgstr "أهلا بكم في ماندريك أُنلاين"
+msgid "Sending configuration..."
+msgstr "يجري بعث الإعداد..."
 
-#: ../mdkonline:104 ../mdkonline_tui:98
+#: ../mdkonline:109
 #, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
@@ -299,62 +319,37 @@ msgstr ""
 "(الحزم، تهيئة العتاد) إلى قاعدة بيانات مركزية كي\n"
 "يتسنى لك أن تعلم بالتحديثات الأمنية و الترقيات المفيدة.\n"
 
-#: ../mdkonline:105 ../mdkonline_tui:142
+#: ../mdkonline:114
 #, c-format
-msgid "Create a Mandrakeonline Account"
-msgstr "إنشاء حساب في ماندريك أُنلاين"
+msgid "Account creation or authentication"
+msgstr ""
 
-#: ../mdkonline:107
-#, fuzzy, c-format
-msgid "I don't have a Mandrakeonline account and I want to subscribe"
-msgstr "ليس لدي حساب في ماندريك أُنلاين و أريد أن"
+#: ../mdkonline:119
+#, c-format
+msgid "Enter your Mandrakeonline login, password and machine name:"
+msgstr "أدخل اسم الدخول الخاص بماندريك أُنلاين، وكلمة المرور واسم الماكينة:"
 
-#: ../mdkonline:111 ../mdkonline:131 ../mdkonline_tui:114 ../mdkonline_tui:145
+#: ../mdkonline:125 ../mdkonline:156
 #, c-format
 msgid "Login:"
 msgstr "إسم الدّخول:"
 
-#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:115 ../mdkonline_tui:146
+#: ../mdkonline:126 ../mdkonline:157
 #, c-format
 msgid "Password:"
 msgstr "كلمة المرور:"
 
-#: ../mdkonline:113 ../mdkonline_tui:147
-#, c-format
-msgid "Confirm Password:"
-msgstr "أكّد كلمة المرور:"
-
-#: ../mdkonline:114 ../mdkonline_tui:148
-#, c-format
-msgid "Mail contact:"
-msgstr "بريد الاتّصال:"
-
-#: ../mdkonline:121
-#, c-format
-msgid "Mandrakelinux Privacy Policy"
-msgstr "سياسة السّرّية لماندريك لينكس"
-
 #: ../mdkonline:127
 #, c-format
-msgid "Authentification"
-msgstr "التّحقّق من الأصالة"
-
-#: ../mdkonline:128 ../mdkonline_tui:108
-#, c-format
-msgid "Enter your Mandrakeonline login, password and machine name:"
-msgstr "أدخل اسم الدخول الخاص بماندريك أُنلاين، وكلمة المرور واسم الماكينة:"
-
-#: ../mdkonline:133 ../mdkonline_tui:116
-#, c-format
 msgid "Machine name:"
 msgstr "إسم الماكنة:"
 
-#: ../mdkonline:138
-#, c-format
-msgid "Send Configuration"
-msgstr "إبعث الإعداد"
+#: ../mdkonline:131
+#, fuzzy, c-format
+msgid "Connecting to Mandrakeonline website..."
+msgstr "أهلا بكم في ماندريك أُنلاين"
 
-#: ../mdkonline:139 ../mdkonline_tui:128
+#: ../mdkonline:139
 #, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
@@ -385,56 +380,54 @@ msgstr ""
 "كذلك، تستفيد من خدمات دعم بسعر أقلّ على\n"
 "www.mandrakeexpert.com."
 
-#: ../mdkonline:144 ../mdkonline:211 ../mdkonline:234
+#: ../mdkonline:141 ../mdkonline:180 ../mdkupdate:126 ../mdkupdate:198
 #, c-format
-msgid "Finish"
-msgstr "إنهي"
-
-#: ../mdkonline:145 ../mdkonline_tui:167
-#, c-format
-msgid "Your upload was successful!"
-msgstr "تم التحميل بنجاحك!"
+msgid "Connection problem"
+msgstr "مشكلة في الإتصال"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandrakeonline."
+msgid "or"
 msgstr ""
-"من الآن ستستلم اشعارات بالترقيات\n"
-"و التحديثات الأمنية بفضل ماندريك أنلاين."
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "كلمة مرور خاطئة"
+
+#: ../mdkonline:141
 #, c-format
 msgid ""
-"Mandrakeonline offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+"Your login or password was wrong.\n"
+" Either you'll have to type it again, or you'll need to create an account on "
+"Mandrakeonline.\n"
+" In the latter case, go back to the first step to connect to "
+"Mandrakeonline.\n"
+" Be aware that you must also provide a Machine name \n"
+" (only alphabetical characters are admitted)"
 msgstr ""
-"يُوفّر ماندريك أنلاين القدرة على التحديث بشكل آلي.\n"
-"\n"
-"سيعمل برنامج بانتظام على نظامك منتظرا تحديثات جديدة\n"
-
-#: ../mdkonline:146
-#, c-format
-msgid "automated Upgrades"
-msgstr "تحديثات آلية"
+"إن اسم دخولك أو كلمة المرور خاطئة.\n"
+" إما أن تدخلهما من جديد، أو أن تنشأ رصيدا عند ماندريك أنلاين.\n"
+" في الحالة الثانية أعد الإتصال بماندريك أنلاين.\n"
+" عليك أن تكتب إسم الماكينة أيضا \n"
+" (تقبل فقط الحروف الأبجدية)"
 
-#: ../mdkonline:150
+#: ../mdkonline:153
 #, c-format
-msgid "Country:"
-msgstr "البلد:"
+msgid "Create a Mandrakeonline Account"
+msgstr "إنشاء حساب في ماندريك أُنلاين"
 
-#: ../mdkonline:178 ../mdkonline:183 ../mdkonline:185 ../mdkonline:187
+#: ../mdkonline:158
 #, c-format
-msgid "Error"
-msgstr "خطأ"
+msgid "Confirm Password:"
+msgstr "أكّد كلمة المرور:"
 
-#: ../mdkonline:183 ../mdkonline_tui:152
+#: ../mdkonline:159
 #, c-format
-msgid "Please provide a login"
-msgstr "أعط اسم الدّخول من فضلك"
+msgid "Mail contact:"
+msgstr "بريد الاتّصال:"
 
-#: ../mdkonline:185 ../mdkonline_tui:152
+#: ../mdkonline:163
 #, c-format
 msgid ""
 "The passwords do not match\n"
@@ -443,157 +436,115 @@ msgstr ""
 "كلمات المرور غير متطابقة\n"
 "كرّر المحاولة من فضلك\n"
 
-#: ../mdkonline:187 ../mdkonline_tui:152
+#: ../mdkonline:163
+#, c-format
+msgid "Please provide a login"
+msgstr "أعط اسم الدّخول من فضلك"
+
+#: ../mdkonline:163
 #, c-format
 msgid "Not a valid mail address!\n"
 msgstr "عنوان بريدي غير صالح !\n"
 
-#: ../mdkonline:199 ../mdkonline_tui:78
+#: ../mdkonline:169
 #, c-format
-msgid "Reading configuration\n"
-msgstr "جاري قراءة اعداداتك\n"
+msgid ""
+"Mandrakeonline Account successfully created.\n"
+"Please click \"Next\" to authenticate and upload your configuration\n"
+msgstr ""
 
-#: ../mdkonline:204 ../mdkonline_tui:82
+#: ../mdkonline:178
 #, c-format
-msgid "Sending configuration..."
-msgstr "يجري بعث الإعداد..."
+msgid "Your upload was successful!"
+msgstr "تم التحميل بنجاحك!"
 
-#: ../mdkonline:213 ../mdkonline:273 ../mdkonline_tui:130 ../mdkonline_tui:169
-#: ../mdkupdate:124 ../mdkupdate:195
+#: ../mdkonline:178
 #, c-format
-msgid "Connection problem"
-msgstr "مشكلة في الإتصال"
+msgid ""
+"From now you will receive on security and updates \n"
+"announcements thanks to Mandrakeonline."
+msgstr ""
+"من الآن ستستلم اشعارات بالترقيات\n"
+"و التحديثات الأمنية بفضل ماندريك أنلاين."
 
-#: ../mdkonline:213 ../mdkonline_tui:169
+#: ../mdkonline:178
+#, c-format
+msgid ""
+"Mandrakeonline offers you the ability to automate the updates.\n"
+"A program will run regulary in your system waiting for new updates\n"
+msgstr ""
+"يُوفّر ماندريك أنلاين القدرة على التحديث بشكل آلي.\n"
+"\n"
+"سيعمل برنامج بانتظام على نظامك منتظرا تحديثات جديدة\n"
+
+#: ../mdkonline:180
 #, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr "يحدث مشكل عند تحميل الملفّات، حاول مجدّدا من فضلك"
 
-#: ../mdkonline:251
-#, c-format
-msgid "Quitting Wizard\n"
-msgstr "جاري الخروج من المعالج\n"
+#: ../mdkonline:186
+#, fuzzy, c-format
+msgid "Country"
+msgstr "البلد:"
 
-#: ../mdkonline:273
-#, c-format
-msgid "Mandrakeonline could not be contacted, please try again at a later time"
-msgstr "تعذّر الإتّصال بـماندريك أنلاين. يرجى تجديد المحاولة فيما بعد"
+#: ../mdkonline:198
+#, fuzzy, c-format
+msgid "Congratulations"
+msgstr "إبعث الإعداد"
 
-#: ../mdkonline:285
+#: ../mdkonline:198
 #, c-format
-msgid "Wrong password"
-msgstr "كلمة مرور خاطئة"
+msgid "Your Mandrakeonline account has been successfully configured\n"
+msgstr ""
+
+#: ../mdkonline:214
+#, fuzzy, c-format
+msgid "Configuration uploaded successfully"
+msgstr "تم التحميل بنجاحك!"
+
+#: ../mdkonline:215
+#, fuzzy, c-format
+msgid "Problem uploading configuration"
+msgstr "جاري قراءة اعداداتك\n"
 
-#: ../mdkonline:285 ../mdkonline_tui:130
+#: ../mdkonline:216
 #, c-format
 msgid ""
-"Your login or password was wrong.\n"
-" Either you'll have to type it again, or you'll need to create an account on "
-"Mandrakeonline.\n"
-" In the latter case, go back to the first step to connect to "
-"Mandrakeonline.\n"
-" Be aware that you must also provide a Machine name \n"
-" (only alphabetical characters are admitted)"
+"Cannot connect to mandrakeonline website: wrong login/password or router/"
+"firewall bad settings"
 msgstr ""
-"إن اسم دخولك أو كلمة المرور خاطئة.\n"
-" إما أن تدخلهما من جديد، أو أن تنشأ رصيدا عند ماندريك أنلاين.\n"
-" في الحالة الثانية أعد الإتصال بماندريك أنلاين.\n"
-" عليك أن تكتب إسم الماكينة أيضا \n"
-" (تقبل فقط الحروف الأبجدية)"
 
-#: ../mdkonline.pm:58
+#: ../mdkonline.pm:66
 #, c-format
 msgid "Login and password should be less than 12 characters\n"
 msgstr ""
 
-#: ../mdkonline.pm:59
+#: ../mdkonline.pm:67
 #, c-format
 msgid "Special characters are not allowed\n"
 msgstr ""
 
-#: ../mdkonline.pm:60
+#: ../mdkonline.pm:68
 #, c-format
 msgid "Please fill in all fields\n"
 msgstr ""
 
-#: ../mdkonline.pm:61
+#: ../mdkonline.pm:69
 #, c-format
 msgid "Email not valid\n"
 msgstr ""
 
-#: ../mdkonline.pm:62
+#: ../mdkonline.pm:70
 #, c-format
 msgid "Account already exist\n"
 msgstr ""
 
-#: ../mdkonline.pm:68
+#: ../mdkonline.pm:76
 #, c-format
 msgid "Problem connecting to server \n"
 msgstr "مشكلة في الإتصال بالخادم \n"
 
-#: ../mdkonline_tui:45 ../mdkonline_tui:95
-#, fuzzy, c-format
-msgid "Mandrakeonline"
-msgstr "أهلا بكم في ماندريك أُنلاين"
-
-#: ../mdkonline_tui:48
-#, c-format
-msgid "I already have an account"
-msgstr ""
-
-#: ../mdkonline_tui:49
-#, c-format
-msgid "I want to subscribe"
-msgstr ""
-
-#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:120
-#, c-format
-msgid "Please wait"
-msgstr "من فضلك انتظر"
-
-#: ../mdkonline_tui:103
-#, c-format
-msgid "Account creation or authentication"
-msgstr ""
-
-#: ../mdkonline_tui:120
-#, fuzzy, c-format
-msgid "Connecting to Mandrakeonline website..."
-msgstr "أهلا بكم في ماندريك أُنلاين"
-
-#: ../mdkonline_tui:130
-#, c-format
-msgid "or"
-msgstr ""
-
-#: ../mdkonline_tui:130
-#, fuzzy, c-format
-msgid "wrong password:"
-msgstr "كلمة مرور خاطئة"
-
-#: ../mdkonline_tui:158
-#, c-format
-msgid ""
-"Mandrakeonline Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-
-#: ../mdkonline_tui:175
-#, fuzzy, c-format
-msgid "Country"
-msgstr "البلد:"
-
-#: ../mdkonline_tui:187
-#, fuzzy, c-format
-msgid "Congratulations"
-msgstr "إبعث الإعداد"
-
-#: ../mdkonline_tui:187
-#, c-format
-msgid "Your Mandrakeonline account has been successfully configured\n"
-msgstr ""
-
-#: ../mdkupdate:50
+#: ../mdkupdate:52
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
@@ -609,48 +560,90 @@ msgstr ""
 "\n"
 "الاستعمال:\n"
 
-#: ../mdkupdate:55
+#: ../mdkupdate:57
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - إظهار رسالة المساعدة هذه.\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:58
 #, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto         - تشغيل ماندريك أبدايت تلقائيّاً.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:59
 #, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - تشغيل ماندريك أبدايت.\n"
 
-#: ../mdkupdate:58
-#, c-format
-msgid "  --update       - Update keys\n"
-msgstr "  --update       - تحديث  المفاتيح\n"
-
-#: ../mdkupdate:66
+#: ../mdkupdate:67
 #, c-format
 msgid "No %s file found. Run mdkonline wizard first"
 msgstr ""
 
-#: ../mdkupdate:124
+#: ../mdkupdate:126
 #, fuzzy, c-format
 msgid "Mandrakeupdate could not contact the site, we will try again."
 msgstr "تعذّر الإتّصال بـماندريك أنلاين. يرجى تجديد المحاولة فيما بعد"
 
-#: ../mdkupdate:173
+#: ../mdkupdate:176
 #, c-format
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr ""
 
-#: ../mdkupdate:195
+#: ../mdkupdate:198
 #, c-format
 msgid ""
 "Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
 "mandrakeonline [dot] net"
 msgstr ""
 
+#~ msgid "Next"
+#~ msgstr "التالي"
+
+#~ msgid "Cancel"
+#~ msgstr "إلغاء"
+
+#~ msgid "Previous"
+#~ msgstr "السابق"
+
+#, fuzzy
+#~ msgid "I don't have a Mandrakeonline account and I want to subscribe"
+#~ msgstr "ليس لدي حساب في ماندريك أُنلاين و أريد أن"
+
+#~ msgid "Mandrakelinux Privacy Policy"
+#~ msgstr "سياسة السّرّية لماندريك لينكس"
+
+#~ msgid "Authentification"
+#~ msgstr "التّحقّق من الأصالة"
+
+#~ msgid "Send Configuration"
+#~ msgstr "إبعث الإعداد"
+
+#~ msgid "Finish"
+#~ msgstr "إنهي"
+
+#~ msgid "automated Upgrades"
+#~ msgstr "تحديثات آلية"
+
+#~ msgid "Country:"
+#~ msgstr "البلد:"
+
+#~ msgid "Error"
+#~ msgstr "خطأ"
+
+#~ msgid "Quitting Wizard\n"
+#~ msgstr "جاري الخروج من المعالج\n"
+
+#~ msgid ""
+#~ "Mandrakeonline could not be contacted, please try again at a later time"
+#~ msgstr "تعذّر الإتّصال بـماندريك أنلاين. يرجى تجديد المحاولة فيما بعد"
+
+#~ msgid "Wrong password"
+#~ msgstr "كلمة مرور خاطئة"
+
+#~ msgid "  --update       - Update keys\n"
+#~ msgstr "  --update       - تحديث  المفاتيح\n"
+
 #~ msgid "Skip Wizard"
 #~ msgstr "اجتياز المعالج"
 
diff --git a/po/az.po b/po/az.po
index 5cd16cf1..c6034617 100644
--- a/po/az.po
+++ b/po/az.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-az\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-01 22:41+0200\n"
+"POT-Creation-Date: 2004-11-03 12:10+0100\n"
 "PO-Revision-Date: 2004-09-12 19:12+0300\n"
 "Last-Translator: Mətin Əmirov <metin@karegen.com>\n"
 "Language-Team: Azerbaijani <translation-team-az@lists.sourceforge.net>\n"
@@ -16,12 +16,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3.1\n"
 
-#: ../mdkapplet:61
+#: ../mdkapplet:63
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Sisteminiz yenidir"
 
-#: ../mdkapplet:67
+#: ../mdkapplet:69
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -30,189 +30,199 @@ msgstr ""
 "Xidmət qurğu xətası. Xahiş edirik qeydlərdəki xətanı tapın və "
 "support@mandrakeonline.net ünvanına məktub göndərin."
 
-#: ../mdkapplet:73
+#: ../mdkapplet:75
 #, c-format
 msgid "System is busy. Please wait ..."
 msgstr "Sistem məşğuldur. Xahiş edirik gözləyin..."
 
-#: ../mdkapplet:79
+#: ../mdkapplet:81
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Sisteminiz üçün yeniləmələr mövcuddur"
 
-#: ../mdkapplet:85
+#: ../mdkapplet:87
 #, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr ""
 "Xidmət quraşdırılmayıb. Xahiş edirik \"Xidməti quraşdır\" düyməsinə basın"
 
-#: ../mdkapplet:91
+#: ../mdkapplet:93
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Şəbəkə fəal deyil. Xahiş edirik şəbəkənizi quraşdırın"
 
-#: ../mdkapplet:97
+#: ../mdkapplet:99
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 "Xidmət fəallaşdırılmayıb. Xahiş edirik \"Online Veb Saytı\" düyməsinə basın"
 
-#: ../mdkapplet:103
+#: ../mdkapplet:105
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:108 ../mdkapplet:158
+#: ../mdkapplet:110 ../mdkapplet:164
 #, c-format
 msgid "Install updates"
 msgstr "Yeniləmələri qur"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:111
 #, c-format
 msgid "Configure the service"
 msgstr "Xidməti quraşdır"
 
-#: ../mdkapplet:110
+#: ../mdkapplet:112
 #, c-format
 msgid "Check Updates"
 msgstr "Yeniləmələri Yoxla"
 
-#: ../mdkapplet:111
+#: ../mdkapplet:113 ../mdkapplet:167 ../mdkapplet:225
+#, fuzzy, c-format
+msgid "Please Wait"
+msgstr "Xahiş edirik, gözləyin"
+
+#: ../mdkapplet:113 ../mdkapplet:166 ../mdkapplet:167 ../mdkapplet:225
+#, c-format
+msgid "Check updates"
+msgstr "Yeniləmələri yoxla"
+
+#: ../mdkapplet:115
 #, c-format
 msgid "Online WebSite"
 msgstr "Onlayn Veb Saytı"
 
-#: ../mdkapplet:112
+#: ../mdkapplet:116
 #, c-format
 msgid "Configure Network"
 msgstr "Şəbəkəni Quraşdır"
 
-#: ../mdkapplet:113
+#: ../mdkapplet:117
 #, c-format
 msgid "Configure Now!"
 msgstr "İndi Quraşdır!"
 
-#: ../mdkapplet:146
+#: ../mdkapplet:152 ../mdkapplet:229
 #, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Mandrakelinux Yeniləmələr Appleti"
 
-#: ../mdkapplet:156
+#: ../mdkapplet:162
 #, c-format
 msgid "Actions"
 msgstr "Gedişatlar"
 
-#: ../mdkapplet:159
+#: ../mdkapplet:165
 #, c-format
 msgid "Configure"
 msgstr "Quraşdır"
 
-#: ../mdkapplet:160
-#, c-format
-msgid "Check updates"
-msgstr "Yeniləmələri yoxla"
-
-#: ../mdkapplet:161
+#: ../mdkapplet:169
 #, c-format
 msgid "See logs"
 msgstr "Qeydləri qöstər"
 
-#: ../mdkapplet:164
+#: ../mdkapplet:172
 #, c-format
 msgid "Status"
 msgstr "Vəziyyət"
 
-#: ../mdkapplet:168 ../mdkapplet:363
+#: ../mdkapplet:176 ../mdkapplet:375
 #, c-format
 msgid "Close"
 msgstr "Bağla"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Network Connection: "
 msgstr "Şəbəkə Bağlantısı:"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Up"
 msgstr "Fəal"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Down"
 msgstr "İşləmir"
 
-#: ../mdkapplet:204
+#: ../mdkapplet:212
 #, c-format
 msgid "Last check: "
 msgstr "Son yoxlama:"
 
-#: ../mdkapplet:205
+#: ../mdkapplet:213
 #, c-format
 msgid "Updates: "
 msgstr "Yeniləmələr:"
 
-#: ../mdkapplet:209
+#: ../mdkapplet:217
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Drakconnect başladılır\n"
 
-#: ../mdkapplet:213
+#: ../mdkapplet:221
 #, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "mdkupdate --applet başladılır\n"
 
-#: ../mdkapplet:217
+#: ../mdkapplet:224
 #, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr "Mandrakeonline yenidən qurulub, applet yenidən yüklənir ..."
 
-#: ../mdkapplet:225
+#: ../mdkapplet:235
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Yeniləmələr hesablanır...\n"
 
-#: ../mdkapplet:227
+#: ../mdkapplet:237
 #, c-format
 msgid "Connecting to"
 msgstr "Bağlanır"
 
-#: ../mdkapplet:250
+#: ../mdkapplet:244
+#, fuzzy, c-format
+msgid "Response from Mandrakeonline server\n"
+msgstr "Mandrakeonline-a Xoş Gəldiniz"
+
+#: ../mdkapplet:262
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Yoxlanır... Yeniləmələr mövcuddur\n"
 
-#: ../mdkapplet:254
+#: ../mdkapplet:267
 #, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
-#: ../mdkapplet:255
+#: ../mdkapplet:268
 #, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
-#: ../mdkapplet:256
+#: ../mdkapplet:269
 #, c-format
 msgid "Unknown state"
 msgstr "Naməlum vəziyyət"
 
-#: ../mdkapplet:257
+#: ../mdkapplet:270
 #, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr "Online xidmətlər qeyri-fəaldır. Mandrakeonline ilə əlaqə qurun\n"
 
-#: ../mdkapplet:258
+#: ../mdkapplet:271
 #, c-format
 msgid "Wrong Password.\n"
 msgstr "Səhv Şifrə.\n"
 
-#: ../mdkapplet:259
+#: ../mdkapplet:272
 #, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr "Səhv gedişat, qovşaq ya da giriş.\n"
 
-#: ../mdkapplet:260
+#: ../mdkapplet:273
 #, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
@@ -221,72 +231,82 @@ msgstr ""
 "Şəbəkə qurğularınızda səhv bir çey var. (router, atəş divarı ya da vəkil  "
 "qurğularınızı yoxlayın)\n"
 
-#: ../mdkapplet:264
+#: ../mdkapplet:277
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Sistem yenidir\n"
 
-#: ../mdkapplet:303
+#: ../mdkapplet:317
 #, c-format
 msgid "No check"
 msgstr "Yoxlama"
 
-#: ../mdkapplet:316
+#: ../mdkapplet:330
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Şəbəkə Yoxlanır: deyəsən qeyri-fəaldır\n"
 
-#: ../mdkapplet:319
+#: ../mdkapplet:333
 #, c-format
 msgid "Checking config file: Not present\n"
 msgstr "Quraşdırma faylı Yoxlanır: Mövcud deyil\n"
 
-#: ../mdkapplet:353
+#: ../mdkapplet:365
 #, c-format
 msgid "Logs"
 msgstr "Qeydlər"
 
-#: ../mdkapplet:369
+#: ../mdkapplet:381
 #, c-format
 msgid "Clear"
 msgstr "Təmizlə"
 
-#: ../mdkapplet:396
+#: ../mdkapplet:408
 #, c-format
 msgid "About..."
 msgstr "Haqqında..."
 
-#: ../mdkapplet:397
+#: ../mdkapplet:409
 #, c-format
 msgid "Always launch on startup"
 msgstr "Həmişə başlanğıcda işə sal"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:411
 #, c-format
 msgid "Quit"
 msgstr "Çıx"
 
-#: ../mdkonline:89
+#: ../mdkonline:52 ../mdkonline:106
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "Mandrakeonline-a Xoş Gəldiniz"
+
+#: ../mdkonline:55
 #, c-format
-msgid "Next"
-msgstr "Sonrakı"
+msgid "I already have an account"
+msgstr ""
 
-#: ../mdkonline:89
+#: ../mdkonline:56
 #, c-format
-msgid "Cancel"
-msgstr "Ləğv et"
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline:89 ../mdkonline:93 ../mdkonline:131
+#, c-format
+msgid "Please wait"
+msgstr "Xahiş edirik, gözləyin"
 
 #: ../mdkonline:89
 #, c-format
-msgid "Previous"
-msgstr "Əvvəlki"
+msgid "Reading configuration\n"
+msgstr "Qurğularınız oxunur\n"
 
-#: ../mdkonline:103
+#: ../mdkonline:93
 #, c-format
-msgid "Welcome to Mandrakeonline"
-msgstr "Mandrakeonline-a Xoş Gəldiniz"
+msgid "Sending configuration..."
+msgstr "Qurğular yollanır..."
 
-#: ../mdkonline:104 ../mdkonline_tui:98
+#: ../mdkonline:109
 #, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
@@ -298,62 +318,37 @@ msgstr ""
 "sərfəli güncəlləmələri xəbər vermək üçün\n"
 "mərkəzi verilənlər bazasına göndərəcəkdir.\n"
 
-#: ../mdkonline:105 ../mdkonline_tui:142
+#: ../mdkonline:114
 #, c-format
-msgid "Create a Mandrakeonline Account"
-msgstr "Mandrakeonline Hesabı Yaradılır"
+msgid "Account creation or authentication"
+msgstr ""
 
-#: ../mdkonline:107
-#, fuzzy, c-format
-msgid "I don't have a Mandrakeonline account and I want to subscribe"
-msgstr "Mandrakeonline hesabım yoxdur və olmasını istəyirəm "
+#: ../mdkonline:119
+#, c-format
+msgid "Enter your Mandrakeonline login, password and machine name:"
+msgstr "Mandrakeonline giriş adı, parolunuzu və kompüter adını girin:"
 
-#: ../mdkonline:111 ../mdkonline:131 ../mdkonline_tui:114 ../mdkonline_tui:145
+#: ../mdkonline:125 ../mdkonline:156
 #, c-format
 msgid "Login:"
 msgstr "Giriş Adı:"
 
-#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:115 ../mdkonline_tui:146
+#: ../mdkonline:126 ../mdkonline:157
 #, c-format
 msgid "Password:"
 msgstr "Parol:"
 
-#: ../mdkonline:113 ../mdkonline_tui:147
-#, c-format
-msgid "Confirm Password:"
-msgstr "Şifrənin Təstiqi:"
-
-#: ../mdkonline:114 ../mdkonline_tui:148
-#, c-format
-msgid "Mail contact:"
-msgstr "Poçt əlaqəsi:"
-
-#: ../mdkonline:121
-#, c-format
-msgid "Mandrakelinux Privacy Policy"
-msgstr "Mandrakelinux Mülkiyyət Siyasəti"
-
 #: ../mdkonline:127
 #, c-format
-msgid "Authentification"
-msgstr "Tanıtma"
-
-#: ../mdkonline:128 ../mdkonline_tui:108
-#, c-format
-msgid "Enter your Mandrakeonline login, password and machine name:"
-msgstr "Mandrakeonline giriş adı, parolunuzu və kompüter adını girin:"
-
-#: ../mdkonline:133 ../mdkonline_tui:116
-#, c-format
 msgid "Machine name:"
 msgstr "Kompüter adı:"
 
-#: ../mdkonline:138
-#, c-format
-msgid "Send Configuration"
-msgstr "Qurğuları Göndər"
+#: ../mdkonline:131
+#, fuzzy, c-format
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Mandrakeonline-a Xoş Gəldiniz"
 
-#: ../mdkonline:139 ../mdkonline_tui:128
+#: ../mdkonline:139
 #, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
@@ -385,56 +380,55 @@ msgstr ""
 "Həm də bu qeydlə siz www.mandrakeexpert.com ünvanındakı xitmətlərdən\n"
 "endirimli, yəni daha ucuz faydalana bilərsiniz."
 
-#: ../mdkonline:144 ../mdkonline:211 ../mdkonline:234
-#, c-format
-msgid "Finish"
-msgstr "Qurtar"
-
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141 ../mdkonline:180 ../mdkupdate:126 ../mdkupdate:198
 #, c-format
-msgid "Your upload was successful!"
-msgstr "Sizin yollamanız müvəffəqiyyətli oldu"
+msgid "Connection problem"
+msgstr "Bağlantı problemi"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandrakeonline."
+msgid "or"
 msgstr ""
-"İndidən etibarən Mandrakeonline vasitəsilə güncəlləmə və\n"
-"təhlükəsizlik elanları alacaqsınız."
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "Səhv parol"
+
+#: ../mdkonline:141
 #, c-format
 msgid ""
-"Mandrakeonline offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+"Your login or password was wrong.\n"
+" Either you'll have to type it again, or you'll need to create an account on "
+"Mandrakeonline.\n"
+" In the latter case, go back to the first step to connect to "
+"Mandrakeonline.\n"
+" Be aware that you must also provide a Machine name \n"
+" (only alphabetical characters are admitted)"
 msgstr ""
-"Mandrakeonline sizə avtokatik güncəlləmə imkanı verir.\n"
-"Proqram sürəkli olaraq sisteminizdə yeni göncəlləmələri gözləyəcək şəkildə "
-"işləyəcəkdir\n"
-
-#: ../mdkonline:146
-#, c-format
-msgid "automated Upgrades"
-msgstr "avtomatik Yüksəltmələr"
+"Sizin giriş adınız və ya parolunuz səhvdir.\n"
+" Ya yenidən yazmalısınız, ya da MandrakOnline xitmətlərində yeni  hesab "
+"açın.\n"
+" Son halda Mandrakeonline xitmətinə bağlanmaq üçün dala gedin.\n"
+" Yaddan çıxartmayın ki, ayrıca KOMPÜTER adını \n"
+" girməlisiniz (təkcə hərflərə icazə verilir)"
 
-#: ../mdkonline:150
+#: ../mdkonline:153
 #, c-format
-msgid "Country:"
-msgstr "Ölkə:"
+msgid "Create a Mandrakeonline Account"
+msgstr "Mandrakeonline Hesabı Yaradılır"
 
-#: ../mdkonline:178 ../mdkonline:183 ../mdkonline:185 ../mdkonline:187
+#: ../mdkonline:158
 #, c-format
-msgid "Error"
-msgstr "Xəta"
+msgid "Confirm Password:"
+msgstr "Şifrənin Təstiqi:"
 
-#: ../mdkonline:183 ../mdkonline_tui:152
+#: ../mdkonline:159
 #, c-format
-msgid "Please provide a login"
-msgstr "Xahiş edirik istifadəçi adı bildirin"
+msgid "Mail contact:"
+msgstr "Poçt əlaqəsi:"
 
-#: ../mdkonline:185 ../mdkonline_tui:152
+#: ../mdkonline:163
 #, c-format
 msgid ""
 "The passwords do not match\n"
@@ -443,160 +437,116 @@ msgstr ""
 "Şifrələr uyğun gəlmir\n"
 " Xahiş edirik yenidən sınayın\n"
 
-#: ../mdkonline:187 ../mdkonline_tui:152
+#: ../mdkonline:163
+#, c-format
+msgid "Please provide a login"
+msgstr "Xahiş edirik istifadəçi adı bildirin"
+
+#: ../mdkonline:163
 #, c-format
 msgid "Not a valid mail address!\n"
 msgstr "Hökmsüz epoçt ünvanı!\n"
 
-#: ../mdkonline:199 ../mdkonline_tui:78
+#: ../mdkonline:169
 #, c-format
-msgid "Reading configuration\n"
-msgstr "Qurğularınız oxunur\n"
+msgid ""
+"Mandrakeonline Account successfully created.\n"
+"Please click \"Next\" to authenticate and upload your configuration\n"
+msgstr ""
 
-#: ../mdkonline:204 ../mdkonline_tui:82
+#: ../mdkonline:178
 #, c-format
-msgid "Sending configuration..."
-msgstr "Qurğular yollanır..."
+msgid "Your upload was successful!"
+msgstr "Sizin yollamanız müvəffəqiyyətli oldu"
 
-#: ../mdkonline:213 ../mdkonline:273 ../mdkonline_tui:130 ../mdkonline_tui:169
-#: ../mdkupdate:124 ../mdkupdate:195
+#: ../mdkonline:178
 #, c-format
-msgid "Connection problem"
-msgstr "Bağlantı problemi"
+msgid ""
+"From now you will receive on security and updates \n"
+"announcements thanks to Mandrakeonline."
+msgstr ""
+"İndidən etibarən Mandrakeonline vasitəsilə güncəlləmə və\n"
+"təhlükəsizlik elanları alacaqsınız."
 
-#: ../mdkonline:213 ../mdkonline_tui:169
+#: ../mdkonline:178
+#, c-format
+msgid ""
+"Mandrakeonline offers you the ability to automate the updates.\n"
+"A program will run regulary in your system waiting for new updates\n"
+msgstr ""
+"Mandrakeonline sizə avtokatik güncəlləmə imkanı verir.\n"
+"Proqram sürəkli olaraq sisteminizdə yeni göncəlləmələri gözləyəcək şəkildə "
+"işləyəcəkdir\n"
+
+#: ../mdkonline:180
 #, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr ""
 "Fayllar göndərilirkən xəta yaranır, xahiş edirik daha sonra yenidən sınayın"
 
-#: ../mdkonline:251
-#, c-format
-msgid "Quitting Wizard\n"
-msgstr "Sehirbazdan Çıxılır\n"
+#: ../mdkonline:186
+#, fuzzy, c-format
+msgid "Country"
+msgstr "Ölkə:"
 
-#: ../mdkonline:273
+#: ../mdkonline:198
+#, fuzzy, c-format
+msgid "Congratulations"
+msgstr "Qurğuları Göndər"
+
+#: ../mdkonline:198
 #, c-format
-msgid "Mandrakeonline could not be contacted, please try again at a later time"
+msgid "Your Mandrakeonline account has been successfully configured\n"
 msgstr ""
-"Mandrakeonline ilə əlaqə qurula bilmədi, xahiş edirik daha sonra sınayın"
 
-#: ../mdkonline:285
-#, c-format
-msgid "Wrong password"
-msgstr "Səhv parol"
+#: ../mdkonline:214
+#, fuzzy, c-format
+msgid "Configuration uploaded successfully"
+msgstr "Sizin yollamanız müvəffəqiyyətli oldu"
 
-#: ../mdkonline:285 ../mdkonline_tui:130
+#: ../mdkonline:215
+#, fuzzy, c-format
+msgid "Problem uploading configuration"
+msgstr "Qurğularınız oxunur\n"
+
+#: ../mdkonline:216
 #, c-format
 msgid ""
-"Your login or password was wrong.\n"
-" Either you'll have to type it again, or you'll need to create an account on "
-"Mandrakeonline.\n"
-" In the latter case, go back to the first step to connect to "
-"Mandrakeonline.\n"
-" Be aware that you must also provide a Machine name \n"
-" (only alphabetical characters are admitted)"
+"Cannot connect to mandrakeonline website: wrong login/password or router/"
+"firewall bad settings"
 msgstr ""
-"Sizin giriş adınız və ya parolunuz səhvdir.\n"
-" Ya yenidən yazmalısınız, ya da MandrakOnline xitmətlərində yeni  hesab "
-"açın.\n"
-" Son halda Mandrakeonline xitmətinə bağlanmaq üçün dala gedin.\n"
-" Yaddan çıxartmayın ki, ayrıca KOMPÜTER adını \n"
-" girməlisiniz (təkcə hərflərə icazə verilir)"
 
-#: ../mdkonline.pm:58
+#: ../mdkonline.pm:66
 #, c-format
 msgid "Login and password should be less than 12 characters\n"
 msgstr ""
 
-#: ../mdkonline.pm:59
+#: ../mdkonline.pm:67
 #, c-format
 msgid "Special characters are not allowed\n"
 msgstr ""
 
-#: ../mdkonline.pm:60
+#: ../mdkonline.pm:68
 #, c-format
 msgid "Please fill in all fields\n"
 msgstr ""
 
-#: ../mdkonline.pm:61
+#: ../mdkonline.pm:69
 #, c-format
 msgid "Email not valid\n"
 msgstr ""
 
-#: ../mdkonline.pm:62
+#: ../mdkonline.pm:70
 #, c-format
 msgid "Account already exist\n"
 msgstr ""
 
-#: ../mdkonline.pm:68
+#: ../mdkonline.pm:76
 #, c-format
 msgid "Problem connecting to server \n"
 msgstr "Vericiyə bağlanma problemi \n"
 
-#: ../mdkonline_tui:45 ../mdkonline_tui:95
-#, fuzzy, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline-a Xoş Gəldiniz"
-
-#: ../mdkonline_tui:48
-#, c-format
-msgid "I already have an account"
-msgstr ""
-
-#: ../mdkonline_tui:49
-#, c-format
-msgid "I want to subscribe"
-msgstr ""
-
-#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:120
-#, c-format
-msgid "Please wait"
-msgstr "Xahiş edirik, gözləyin"
-
-#: ../mdkonline_tui:103
-#, c-format
-msgid "Account creation or authentication"
-msgstr ""
-
-#: ../mdkonline_tui:120
-#, fuzzy, c-format
-msgid "Connecting to Mandrakeonline website..."
-msgstr "Mandrakeonline-a Xoş Gəldiniz"
-
-#: ../mdkonline_tui:130
-#, c-format
-msgid "or"
-msgstr ""
-
-#: ../mdkonline_tui:130
-#, fuzzy, c-format
-msgid "wrong password:"
-msgstr "Səhv parol"
-
-#: ../mdkonline_tui:158
-#, c-format
-msgid ""
-"Mandrakeonline Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-
-#: ../mdkonline_tui:175
-#, fuzzy, c-format
-msgid "Country"
-msgstr "Ölkə:"
-
-#: ../mdkonline_tui:187
-#, fuzzy, c-format
-msgid "Congratulations"
-msgstr "Qurğuları Göndər"
-
-#: ../mdkonline_tui:187
-#, c-format
-msgid "Your Mandrakeonline account has been successfully configured\n"
-msgstr ""
-
-#: ../mdkupdate:50
+#: ../mdkupdate:52
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
@@ -612,49 +562,92 @@ msgstr ""
 "\n"
 "istifadə qaydası:\n"
 
-#: ../mdkupdate:55
+#: ../mdkupdate:57
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - bu yardım ismarışını göstər.\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:58
 #, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto         - Mandrakeupdate launched automatically.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:59
 #, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - launch Mandrakeupdate.\n"
 
-#: ../mdkupdate:58
-#, c-format
-msgid "  --update       - Update keys\n"
-msgstr "  --update       - Update keys\n"
-
-#: ../mdkupdate:66
+#: ../mdkupdate:67
 #, c-format
 msgid "No %s file found. Run mdkonline wizard first"
 msgstr ""
 
-#: ../mdkupdate:124
+#: ../mdkupdate:126
 #, fuzzy, c-format
 msgid "Mandrakeupdate could not contact the site, we will try again."
 msgstr ""
 "Mandrakeonline ilə əlaqə qurula bilmədi, xahiş edirik daha sonra sınayın"
 
-#: ../mdkupdate:173
+#: ../mdkupdate:176
 #, c-format
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr ""
 
-#: ../mdkupdate:195
+#: ../mdkupdate:198
 #, c-format
 msgid ""
 "Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
 "mandrakeonline [dot] net"
 msgstr ""
 
+#~ msgid "Next"
+#~ msgstr "Sonrakı"
+
+#~ msgid "Cancel"
+#~ msgstr "Ləğv et"
+
+#~ msgid "Previous"
+#~ msgstr "Əvvəlki"
+
+#, fuzzy
+#~ msgid "I don't have a Mandrakeonline account and I want to subscribe"
+#~ msgstr "Mandrakeonline hesabım yoxdur və olmasını istəyirəm "
+
+#~ msgid "Mandrakelinux Privacy Policy"
+#~ msgstr "Mandrakelinux Mülkiyyət Siyasəti"
+
+#~ msgid "Authentification"
+#~ msgstr "Tanıtma"
+
+#~ msgid "Send Configuration"
+#~ msgstr "Qurğuları Göndər"
+
+#~ msgid "Finish"
+#~ msgstr "Qurtar"
+
+#~ msgid "automated Upgrades"
+#~ msgstr "avtomatik Yüksəltmələr"
+
+#~ msgid "Country:"
+#~ msgstr "Ölkə:"
+
+#~ msgid "Error"
+#~ msgstr "Xəta"
+
+#~ msgid "Quitting Wizard\n"
+#~ msgstr "Sehirbazdan Çıxılır\n"
+
+#~ msgid ""
+#~ "Mandrakeonline could not be contacted, please try again at a later time"
+#~ msgstr ""
+#~ "Mandrakeonline ilə əlaqə qurula bilmədi, xahiş edirik daha sonra sınayın"
+
+#~ msgid "Wrong password"
+#~ msgstr "Səhv parol"
+
+#~ msgid "  --update       - Update keys\n"
+#~ msgstr "  --update       - Update keys\n"
+
 #~ msgid "Skip Wizard"
 #~ msgstr "Sehirbazı Keç"
 
diff --git a/po/bg.po b/po/bg.po
index ace2b51c..6d41a8ed 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-bg\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-01 22:41+0200\n"
+"POT-Creation-Date: 2004-11-03 12:10+0100\n"
 "PO-Revision-Date: 2003-02-14 21:48+0200\n"
 "Last-Translator: Borislav Aleksandrov <B.Aleksandrov@cnsys.bg>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
@@ -15,271 +15,291 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0\n"
 
-#: ../mdkapplet:61
+#: ../mdkapplet:63
 #, c-format
 msgid "Your system is up-to-date"
 msgstr ""
 
-#: ../mdkapplet:67
+#: ../mdkapplet:69
 #, fuzzy, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrakeonline.net"
 msgstr "Ако има проблем,изпратете поща на support@mandrakeonline.net\n"
 
-#: ../mdkapplet:73
+#: ../mdkapplet:75
 #, c-format
 msgid "System is busy. Please wait ..."
 msgstr ""
 
-#: ../mdkapplet:79
+#: ../mdkapplet:81
 #, c-format
 msgid "New updates are available for your system"
 msgstr ""
 
-#: ../mdkapplet:85
+#: ../mdkapplet:87
 #, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr ""
 
-#: ../mdkapplet:91
+#: ../mdkapplet:93
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr ""
 
-#: ../mdkapplet:97
+#: ../mdkapplet:99
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 
-#: ../mdkapplet:103
+#: ../mdkapplet:105
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:108 ../mdkapplet:158
+#: ../mdkapplet:110 ../mdkapplet:164
 #, c-format
 msgid "Install updates"
 msgstr "Инсталиране на обновления"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:111
 #, fuzzy, c-format
 msgid "Configure the service"
 msgstr "Конфигурарай"
 
-#: ../mdkapplet:110
+#: ../mdkapplet:112
 #, c-format
 msgid "Check Updates"
 msgstr ""
 
-#: ../mdkapplet:111
+#: ../mdkapplet:113 ../mdkapplet:167 ../mdkapplet:225
+#, fuzzy, c-format
+msgid "Please Wait"
+msgstr "Моля изчакайте"
+
+#: ../mdkapplet:113 ../mdkapplet:166 ../mdkapplet:167 ../mdkapplet:225
+#, c-format
+msgid "Check updates"
+msgstr ""
+
+#: ../mdkapplet:115
 #, c-format
 msgid "Online WebSite"
 msgstr ""
 
-#: ../mdkapplet:112
+#: ../mdkapplet:116
 #, c-format
 msgid "Configure Network"
 msgstr ""
 
-#: ../mdkapplet:113
+#: ../mdkapplet:117
 #, fuzzy, c-format
 msgid "Configure Now!"
 msgstr "Прочитам вашата конфигурация\n"
 
-#: ../mdkapplet:146
+#: ../mdkapplet:152 ../mdkapplet:229
 #, fuzzy, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Политика на Мандраке относно сигурността"
 
-#: ../mdkapplet:156
+#: ../mdkapplet:162
 #, c-format
 msgid "Actions"
 msgstr "Действия"
 
-#: ../mdkapplet:159
+#: ../mdkapplet:165
 #, c-format
 msgid "Configure"
 msgstr "Конфигурарай"
 
-#: ../mdkapplet:160
-#, c-format
-msgid "Check updates"
-msgstr ""
-
-#: ../mdkapplet:161
+#: ../mdkapplet:169
 #, c-format
 msgid "See logs"
 msgstr ""
 
-#: ../mdkapplet:164
+#: ../mdkapplet:172
 #, c-format
 msgid "Status"
 msgstr "Статус"
 
-#: ../mdkapplet:168 ../mdkapplet:363
+#: ../mdkapplet:176 ../mdkapplet:375
 #, c-format
 msgid "Close"
 msgstr "Затвори"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Network Connection: "
 msgstr ""
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Up"
 msgstr "Горе"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Down"
 msgstr "Долу"
 
-#: ../mdkapplet:204
+#: ../mdkapplet:212
 #, c-format
 msgid "Last check: "
 msgstr ""
 
-#: ../mdkapplet:205
+#: ../mdkapplet:213
 #, c-format
 msgid "Updates: "
 msgstr ""
 
-#: ../mdkapplet:209
+#: ../mdkapplet:217
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr ""
 
-#: ../mdkapplet:213
+#: ../mdkapplet:221
 #, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr ""
 
-#: ../mdkapplet:217
+#: ../mdkapplet:224
 #, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 
-#: ../mdkapplet:225
+#: ../mdkapplet:235
 #, fuzzy, c-format
 msgid "Computing new updates...\n"
 msgstr "Проблем с връзката"
 
-#: ../mdkapplet:227
+#: ../mdkapplet:237
 #, fuzzy, c-format
 msgid "Connecting to"
 msgstr "Проблем с връзката"
 
-#: ../mdkapplet:250
+#: ../mdkapplet:244
+#, fuzzy, c-format
+msgid "Response from Mandrakeonline server\n"
+msgstr "Добре дошли в Mandrakeonline"
+
+#: ../mdkapplet:262
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr ""
 
-#: ../mdkapplet:254
+#: ../mdkapplet:267
 #, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
-#: ../mdkapplet:255
+#: ../mdkapplet:268
 #, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
-#: ../mdkapplet:256
+#: ../mdkapplet:269
 #, c-format
 msgid "Unknown state"
 msgstr ""
 
-#: ../mdkapplet:257
+#: ../mdkapplet:270
 #, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr ""
 
-#: ../mdkapplet:258
+#: ../mdkapplet:271
 #, c-format
 msgid "Wrong Password.\n"
 msgstr "Грешна парола\n"
 
-#: ../mdkapplet:259
+#: ../mdkapplet:272
 #, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr ""
 
-#: ../mdkapplet:260
+#: ../mdkapplet:273
 #, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
 msgstr ""
 
-#: ../mdkapplet:264
+#: ../mdkapplet:277
 #, c-format
 msgid "System is up-to-date\n"
 msgstr ""
 
-#: ../mdkapplet:303
+#: ../mdkapplet:317
 #, c-format
 msgid "No check"
 msgstr ""
 
-#: ../mdkapplet:316
+#: ../mdkapplet:330
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
-#: ../mdkapplet:319
+#: ../mdkapplet:333
 #, c-format
 msgid "Checking config file: Not present\n"
 msgstr ""
 
-#: ../mdkapplet:353
+#: ../mdkapplet:365
 #, c-format
 msgid "Logs"
 msgstr "Логове"
 
-#: ../mdkapplet:369
+#: ../mdkapplet:381
 #, fuzzy, c-format
 msgid "Clear"
 msgstr "Календар"
 
-#: ../mdkapplet:396
+#: ../mdkapplet:408
 #, c-format
 msgid "About..."
 msgstr "Относно..."
 
-#: ../mdkapplet:397
+#: ../mdkapplet:409
 #, c-format
 msgid "Always launch on startup"
 msgstr ""
 
-#: ../mdkapplet:399
+#: ../mdkapplet:411
 #, c-format
 msgid "Quit"
 msgstr "Изход"
 
-#: ../mdkonline:89
+#: ../mdkonline:52 ../mdkonline:106
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "Добре дошли в Mandrakeonline"
+
+#: ../mdkonline:55
 #, c-format
-msgid "Next"
-msgstr "Нататък"
+msgid "I already have an account"
+msgstr ""
 
-#: ../mdkonline:89
+#: ../mdkonline:56
 #, c-format
-msgid "Cancel"
-msgstr "Отказ"
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline:89 ../mdkonline:93 ../mdkonline:131
+#, c-format
+msgid "Please wait"
+msgstr "Моля изчакайте"
 
 #: ../mdkonline:89
 #, c-format
-msgid "Previous"
-msgstr "Предишен"
+msgid "Reading configuration\n"
+msgstr "Прочитам вашата конфигурация\n"
 
-#: ../mdkonline:103
+#: ../mdkonline:93
 #, c-format
-msgid "Welcome to Mandrakeonline"
-msgstr "Добре дошли в Mandrakeonline"
+msgid "Sending configuration..."
+msgstr ""
 
-#: ../mdkonline:104 ../mdkonline_tui:98
+#: ../mdkonline:109
 #, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
@@ -290,62 +310,37 @@ msgstr ""
 "(пакети и хардуерни настройки) в централизираната база данни,за да\n"
 "ви държим в течение относно необходими обновявания и полезни новости.\n"
 
-#: ../mdkonline:105 ../mdkonline_tui:142
-#, fuzzy, c-format
-msgid "Create a Mandrakeonline Account"
-msgstr "Добре дошли в Mandrakeonline"
+#: ../mdkonline:114
+#, c-format
+msgid "Account creation or authentication"
+msgstr ""
 
-#: ../mdkonline:107
-#, fuzzy, c-format
-msgid "I don't have a Mandrakeonline account and I want to subscribe"
-msgstr "Не съм член на Mandrakeonline,а искам да стана"
+#: ../mdkonline:119
+#, c-format
+msgid "Enter your Mandrakeonline login, password and machine name:"
+msgstr "Въведете вашите Mandrakeonline име,парола и псевдоним на машината:"
 
-#: ../mdkonline:111 ../mdkonline:131 ../mdkonline_tui:114 ../mdkonline_tui:145
+#: ../mdkonline:125 ../mdkonline:156
 #, c-format
 msgid "Login:"
 msgstr "Име:"
 
-#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:115 ../mdkonline_tui:146
+#: ../mdkonline:126 ../mdkonline:157
 #, c-format
 msgid "Password:"
 msgstr "Парола:"
 
-#: ../mdkonline:113 ../mdkonline_tui:147
-#, c-format
-msgid "Confirm Password:"
-msgstr "Потвърди парола:"
-
-#: ../mdkonline:114 ../mdkonline_tui:148
-#, c-format
-msgid "Mail contact:"
-msgstr ""
-
-#: ../mdkonline:121
-#, c-format
-msgid "Mandrakelinux Privacy Policy"
-msgstr "Политика на Мандраке относно сигурността"
-
 #: ../mdkonline:127
 #, c-format
-msgid "Authentification"
-msgstr "Проверка"
-
-#: ../mdkonline:128 ../mdkonline_tui:108
-#, c-format
-msgid "Enter your Mandrakeonline login, password and machine name:"
-msgstr "Въведете вашите Mandrakeonline име,парола и псевдоним на машината:"
-
-#: ../mdkonline:133 ../mdkonline_tui:116
-#, c-format
 msgid "Machine name:"
 msgstr "Име на Машината:"
 
-#: ../mdkonline:138
+#: ../mdkonline:131
 #, fuzzy, c-format
-msgid "Send Configuration"
-msgstr "Прочитам вашата конфигурация\n"
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Добре дошли в Mandrakeonline"
 
-#: ../mdkonline:139 ../mdkonline_tui:128
+#: ../mdkonline:139
 #, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
@@ -378,55 +373,55 @@ msgstr ""
 "Освен това,Вие печелите още и намаление от цената за поддръжка от www."
 "mandrakeexpert.com."
 
-#: ../mdkonline:144 ../mdkonline:211 ../mdkonline:234
-#, c-format
-msgid "Finish"
-msgstr "Край"
-
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141 ../mdkonline:180 ../mdkupdate:126 ../mdkupdate:198
 #, c-format
-msgid "Your upload was successful!"
-msgstr "Изпращането бе успешно!"
+msgid "Connection problem"
+msgstr "Проблем с връзката"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandrakeonline."
+msgid "or"
 msgstr ""
-"От сега нататък,Вие ще получавате информация\n"
-"относно сигурността и новостите,благодарение на Mandrakeonline."
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "Грешна парола"
+
+#: ../mdkonline:141
 #, c-format
 msgid ""
-"Mandrakeonline offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+"Your login or password was wrong.\n"
+" Either you'll have to type it again, or you'll need to create an account on "
+"Mandrakeonline.\n"
+" In the latter case, go back to the first step to connect to "
+"Mandrakeonline.\n"
+" Be aware that you must also provide a Machine name \n"
+" (only alphabetical characters are admitted)"
 msgstr ""
-"Mandrakeonline ви предлага автоматизиране на обновлението.\n"
-"Програмата ще се пуска регулярно на системата Ви и ще следи за обновявания\n"
-
-#: ../mdkonline:146
-#, c-format
-msgid "automated Upgrades"
-msgstr "автоматизирани обновявания"
+"Вашето име или парола са грешни.\n"
+"Или го напишете отново,или ще ви трябва нова сметка за Mandrakeonline.\n"
+"Във втория случай се върнете на стъпка номер 1 за да се свържете с "
+"Mandrakeonline.\n"
+"Знайте,че ще трябва също да зададете име на Машината \n"
+" (само букви се признават)"
 
-#: ../mdkonline:150
-#, c-format
-msgid "Country:"
-msgstr "Страна:"
+#: ../mdkonline:153
+#, fuzzy, c-format
+msgid "Create a Mandrakeonline Account"
+msgstr "Добре дошли в Mandrakeonline"
 
-#: ../mdkonline:178 ../mdkonline:183 ../mdkonline:185 ../mdkonline:187
+#: ../mdkonline:158
 #, c-format
-msgid "Error"
-msgstr "Грешка"
+msgid "Confirm Password:"
+msgstr "Потвърди парола:"
 
-#: ../mdkonline:183 ../mdkonline_tui:152
+#: ../mdkonline:159
 #, c-format
-msgid "Please provide a login"
+msgid "Mail contact:"
 msgstr ""
 
-#: ../mdkonline:185 ../mdkonline_tui:152
+#: ../mdkonline:163
 #, c-format
 msgid ""
 "The passwords do not match\n"
@@ -435,158 +430,114 @@ msgstr ""
 "Паролите не съвпадат\n"
 " Моля опитайте отново\n"
 
-#: ../mdkonline:187 ../mdkonline_tui:152
+#: ../mdkonline:163
+#, c-format
+msgid "Please provide a login"
+msgstr ""
+
+#: ../mdkonline:163
 #, c-format
 msgid "Not a valid mail address!\n"
 msgstr "Невалиден адрес за е-поща!\n"
 
-#: ../mdkonline:199 ../mdkonline_tui:78
+#: ../mdkonline:169
 #, c-format
-msgid "Reading configuration\n"
-msgstr "Прочитам вашата конфигурация\n"
+msgid ""
+"Mandrakeonline Account successfully created.\n"
+"Please click \"Next\" to authenticate and upload your configuration\n"
+msgstr ""
 
-#: ../mdkonline:204 ../mdkonline_tui:82
+#: ../mdkonline:178
 #, c-format
-msgid "Sending configuration..."
+msgid "Your upload was successful!"
+msgstr "Изпращането бе успешно!"
+
+#: ../mdkonline:178
+#, c-format
+msgid ""
+"From now you will receive on security and updates \n"
+"announcements thanks to Mandrakeonline."
 msgstr ""
+"От сега нататък,Вие ще получавате информация\n"
+"относно сигурността и новостите,благодарение на Mandrakeonline."
 
-#: ../mdkonline:213 ../mdkonline:273 ../mdkonline_tui:130 ../mdkonline_tui:169
-#: ../mdkupdate:124 ../mdkupdate:195
+#: ../mdkonline:178
 #, c-format
-msgid "Connection problem"
-msgstr "Проблем с връзката"
+msgid ""
+"Mandrakeonline offers you the ability to automate the updates.\n"
+"A program will run regulary in your system waiting for new updates\n"
+msgstr ""
+"Mandrakeonline ви предлага автоматизиране на обновлението.\n"
+"Програмата ще се пуска регулярно на системата Ви и ще следи за обновявания\n"
 
-#: ../mdkonline:213 ../mdkonline_tui:169
+#: ../mdkonline:180
 #, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr ""
 
-#: ../mdkonline:251
-#, c-format
-msgid "Quitting Wizard\n"
-msgstr "Излизам\n"
+#: ../mdkonline:186
+#, fuzzy, c-format
+msgid "Country"
+msgstr "Страна:"
 
-#: ../mdkonline:273
+#: ../mdkonline:198
 #, fuzzy, c-format
-msgid "Mandrakeonline could not be contacted, please try again at a later time"
-msgstr "Не можах да се свържа с Mandrakeonline,моля опитайте по-късно."
+msgid "Congratulations"
+msgstr "Прочитам вашата конфигурация\n"
 
-#: ../mdkonline:285
+#: ../mdkonline:198
 #, c-format
-msgid "Wrong password"
-msgstr "Грешна парола"
+msgid "Your Mandrakeonline account has been successfully configured\n"
+msgstr ""
+
+#: ../mdkonline:214
+#, fuzzy, c-format
+msgid "Configuration uploaded successfully"
+msgstr "Изпращането бе успешно!"
+
+#: ../mdkonline:215
+#, fuzzy, c-format
+msgid "Problem uploading configuration"
+msgstr "Прочитам вашата конфигурация\n"
 
-#: ../mdkonline:285 ../mdkonline_tui:130
+#: ../mdkonline:216
 #, c-format
 msgid ""
-"Your login or password was wrong.\n"
-" Either you'll have to type it again, or you'll need to create an account on "
-"Mandrakeonline.\n"
-" In the latter case, go back to the first step to connect to "
-"Mandrakeonline.\n"
-" Be aware that you must also provide a Machine name \n"
-" (only alphabetical characters are admitted)"
+"Cannot connect to mandrakeonline website: wrong login/password or router/"
+"firewall bad settings"
 msgstr ""
-"Вашето име или парола са грешни.\n"
-"Или го напишете отново,или ще ви трябва нова сметка за Mandrakeonline.\n"
-"Във втория случай се върнете на стъпка номер 1 за да се свържете с "
-"Mandrakeonline.\n"
-"Знайте,че ще трябва също да зададете име на Машината \n"
-" (само букви се признават)"
 
-#: ../mdkonline.pm:58
+#: ../mdkonline.pm:66
 #, c-format
 msgid "Login and password should be less than 12 characters\n"
 msgstr ""
 
-#: ../mdkonline.pm:59
+#: ../mdkonline.pm:67
 #, c-format
 msgid "Special characters are not allowed\n"
 msgstr ""
 
-#: ../mdkonline.pm:60
+#: ../mdkonline.pm:68
 #, c-format
 msgid "Please fill in all fields\n"
 msgstr ""
 
-#: ../mdkonline.pm:61
+#: ../mdkonline.pm:69
 #, c-format
 msgid "Email not valid\n"
 msgstr ""
 
-#: ../mdkonline.pm:62
+#: ../mdkonline.pm:70
 #, c-format
 msgid "Account already exist\n"
 msgstr ""
 
-#: ../mdkonline.pm:68
+#: ../mdkonline.pm:76
 #, c-format
 msgid "Problem connecting to server \n"
 msgstr "Проблем при свързване със сървъра \n"
 
-#: ../mdkonline_tui:45 ../mdkonline_tui:95
-#, fuzzy, c-format
-msgid "Mandrakeonline"
-msgstr "Добре дошли в Mandrakeonline"
-
-#: ../mdkonline_tui:48
-#, c-format
-msgid "I already have an account"
-msgstr ""
-
-#: ../mdkonline_tui:49
-#, c-format
-msgid "I want to subscribe"
-msgstr ""
-
-#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:120
-#, c-format
-msgid "Please wait"
-msgstr "Моля изчакайте"
-
-#: ../mdkonline_tui:103
-#, c-format
-msgid "Account creation or authentication"
-msgstr ""
-
-#: ../mdkonline_tui:120
-#, fuzzy, c-format
-msgid "Connecting to Mandrakeonline website..."
-msgstr "Добре дошли в Mandrakeonline"
-
-#: ../mdkonline_tui:130
-#, c-format
-msgid "or"
-msgstr ""
-
-#: ../mdkonline_tui:130
-#, fuzzy, c-format
-msgid "wrong password:"
-msgstr "Грешна парола"
-
-#: ../mdkonline_tui:158
-#, c-format
-msgid ""
-"Mandrakeonline Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-
-#: ../mdkonline_tui:175
-#, fuzzy, c-format
-msgid "Country"
-msgstr "Страна:"
-
-#: ../mdkonline_tui:187
-#, fuzzy, c-format
-msgid "Congratulations"
-msgstr "Прочитам вашата конфигурация\n"
-
-#: ../mdkonline_tui:187
-#, c-format
-msgid "Your Mandrakeonline account has been successfully configured\n"
-msgstr ""
-
-#: ../mdkupdate:50
+#: ../mdkupdate:52
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
@@ -603,48 +554,96 @@ msgstr ""
 "\n"
 "начин на ползване:\n"
 
-#: ../mdkupdate:55
+#: ../mdkupdate:57
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr " --help         - показва това помощно съобщение.\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:58
 #, fuzzy, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --applet       - обновява цялата информация.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:59
 #, fuzzy, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - обновява цялата информация.\n"
 
-#: ../mdkupdate:58
-#, fuzzy, c-format
-msgid "  --update       - Update keys\n"
-msgstr "  --applet       - обновява цялата информация.\n"
-
-#: ../mdkupdate:66
+#: ../mdkupdate:67
 #, c-format
 msgid "No %s file found. Run mdkonline wizard first"
 msgstr ""
 
-#: ../mdkupdate:124
+#: ../mdkupdate:126
 #, c-format
 msgid "Mandrakeupdate could not contact the site, we will try again."
 msgstr "Не можах да се свържа с Mandrakeonline,моля опитайте по-късно."
 
-#: ../mdkupdate:173
+#: ../mdkupdate:176
 #, c-format
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr "Не мога да обновя пакети от източник mdkupdate.\n"
 
-#: ../mdkupdate:195
+#: ../mdkupdate:198
 #, c-format
 msgid ""
 "Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
 "mandrakeonline [dot] net"
 msgstr ""
 
+#~ msgid "Next"
+#~ msgstr "Нататък"
+
+#~ msgid "Cancel"
+#~ msgstr "Отказ"
+
+#~ msgid "Previous"
+#~ msgstr "Предишен"
+
+#~ msgid "Welcome to Mandrakeonline"
+#~ msgstr "Добре дошли в Mandrakeonline"
+
+#, fuzzy
+#~ msgid "I don't have a Mandrakeonline account and I want to subscribe"
+#~ msgstr "Не съм член на Mandrakeonline,а искам да стана"
+
+#~ msgid "Mandrakelinux Privacy Policy"
+#~ msgstr "Политика на Мандраке относно сигурността"
+
+#~ msgid "Authentification"
+#~ msgstr "Проверка"
+
+#, fuzzy
+#~ msgid "Send Configuration"
+#~ msgstr "Прочитам вашата конфигурация\n"
+
+#~ msgid "Finish"
+#~ msgstr "Край"
+
+#~ msgid "automated Upgrades"
+#~ msgstr "автоматизирани обновявания"
+
+#~ msgid "Country:"
+#~ msgstr "Страна:"
+
+#~ msgid "Error"
+#~ msgstr "Грешка"
+
+#~ msgid "Quitting Wizard\n"
+#~ msgstr "Излизам\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Mandrakeonline could not be contacted, please try again at a later time"
+#~ msgstr "Не можах да се свържа с Mandrakeonline,моля опитайте по-късно."
+
+#~ msgid "Wrong password"
+#~ msgstr "Грешна парола"
+
+#, fuzzy
+#~ msgid "  --update       - Update keys\n"
+#~ msgstr "  --applet       - обновява цялата информация.\n"
+
 #~ msgid "Skip Wizard"
 #~ msgstr "Прескача помощника"
 
@@ -659,10 +658,6 @@ msgstr ""
 #~ msgstr "Ел. поща"
 
 #, fuzzy
-#~ msgid "Response from Mandrakeonline server\n"
-#~ msgstr "Добре дошли в Mandrakeonline"
-
-#, fuzzy
 #~ msgid "Launching Mandrakeupdate\n"
 #~ msgstr "  --applet       - обновява цялата информация.\n"
 
diff --git a/po/bn.po b/po/bn.po
index bea9210e..45b8cf9c 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-01 22:41+0200\n"
+"POT-Creation-Date: 2004-11-03 12:10+0100\n"
 "PO-Revision-Date: 2004-08-14 18:00+0600\n"
 "Last-Translator: Jamil Ahmed <jamil@bengalinux.org>\n"
 "Language-Team: Bangla <mdk-translation@bengalinux.org>\n"
@@ -16,12 +16,12 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../mdkapplet:61
+#: ../mdkapplet:63
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "আপনার সিষ্টেম আপ-টু-ডেট আছে"
 
-#: ../mdkapplet:67
+#: ../mdkapplet:69
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -30,192 +30,202 @@ msgstr ""
 "পরিসেবা (service) কনফিগার করতে সমস্যা হয়েছে। অনুগ্রহ করে লগ গুলো পরীক্ষা করুন এবং "
 "support@mandrakeonline.net এ মেইল করুন"
 
-#: ../mdkapplet:73
+#: ../mdkapplet:75
 #, c-format
 msgid "System is busy. Please wait ..."
 msgstr "সিষ্টেম বর্তমানে ব্যস্ত রয়েছে। অনুগ্রহ করে অপেক্ষা করুন..."
 
-#: ../mdkapplet:79
+#: ../mdkapplet:81
 #, c-format
 msgid "New updates are available for your system"
 msgstr "আপনার সিষ্টেমের জন্য নতুন আপডেট উপস্হিত আছে"
 
-#: ../mdkapplet:85
+#: ../mdkapplet:87
 #, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr ""
 "পরিসেবা (service) বর্তমানে কনফিগার করা নেই। অনুগ্রহ করে \"পরিসেবাটি কনফিগার করো"
 "\"-এ ক্লিক করুন"
 
-#: ../mdkapplet:91
+#: ../mdkapplet:93
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "নেটওয়ার্ক বর্তমানে বন্ধ আছে। অনুগ্রহ করে আপনার নেটওয়ার্ক কনফিগার করুন"
 
-#: ../mdkapplet:97
+#: ../mdkapplet:99
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 "পরিসেবা (service) বর্তমানে সক্রিয় নেই। অনুগ্রহ করে \"অনলাইন ওয়েবসাইট\"-এ ক্লিক করুন"
 
-#: ../mdkapplet:103
+#: ../mdkapplet:105
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:108 ../mdkapplet:158
+#: ../mdkapplet:110 ../mdkapplet:164
 #, c-format
 msgid "Install updates"
 msgstr "আপডেট গুলো ইনষ্টল করো"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:111
 #, c-format
 msgid "Configure the service"
 msgstr "পরিসেবাটি কনফিগার করো"
 
-#: ../mdkapplet:110
+#: ../mdkapplet:112
 #, c-format
 msgid "Check Updates"
 msgstr "আপডেট পরীক্ষা করো"
 
-#: ../mdkapplet:111
+#: ../mdkapplet:113 ../mdkapplet:167 ../mdkapplet:225
+#, fuzzy, c-format
+msgid "Please Wait"
+msgstr "অনুগ্রহ করে অপেক্ষা করুন"
+
+#: ../mdkapplet:113 ../mdkapplet:166 ../mdkapplet:167 ../mdkapplet:225
+#, c-format
+msgid "Check updates"
+msgstr "আপডেট পরীক্ষা করো"
+
+#: ../mdkapplet:115
 #, c-format
 msgid "Online WebSite"
 msgstr "অনলাইন ওয়েবসাইট"
 
-#: ../mdkapplet:112
+#: ../mdkapplet:116
 #, c-format
 msgid "Configure Network"
 msgstr "নেটওয়ার্ক কনফিগার করো"
 
-#: ../mdkapplet:113
+#: ../mdkapplet:117
 #, c-format
 msgid "Configure Now!"
 msgstr "এক্ষুনি কনফিগার করো!"
 
-#: ../mdkapplet:146
+#: ../mdkapplet:152 ../mdkapplet:229
 #, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "ম্যান্ড্রেক আপডেট অ্যাপ্লেট"
 
-#: ../mdkapplet:156
+#: ../mdkapplet:162
 #, c-format
 msgid "Actions"
 msgstr "কার্য"
 
-#: ../mdkapplet:159
+#: ../mdkapplet:165
 #, c-format
 msgid "Configure"
 msgstr "কনফিগার"
 
-#: ../mdkapplet:160
-#, c-format
-msgid "Check updates"
-msgstr "আপডেট পরীক্ষা করো"
-
-#: ../mdkapplet:161
+#: ../mdkapplet:169
 #, c-format
 msgid "See logs"
 msgstr "লগ দেখুন"
 
-#: ../mdkapplet:164
+#: ../mdkapplet:172
 #, c-format
 msgid "Status"
 msgstr "অবস্থা"
 
-#: ../mdkapplet:168 ../mdkapplet:363
+#: ../mdkapplet:176 ../mdkapplet:375
 #, c-format
 msgid "Close"
 msgstr "বন্ধ"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Network Connection: "
 msgstr "নেটওয়ার্ক সংযোগ: "
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Up"
 msgstr "উপরে"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Down"
 msgstr "নিচে"
 
-#: ../mdkapplet:204
+#: ../mdkapplet:212
 #, c-format
 msgid "Last check: "
 msgstr "সর্বশেষ পরীক্ষা: "
 
-#: ../mdkapplet:205
+#: ../mdkapplet:213
 #, c-format
 msgid "Updates: "
 msgstr "আপডেট সমুহ: "
 
-#: ../mdkapplet:209
+#: ../mdkapplet:217
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "drakconnect চালু করা হচ্ছে\n"
 
-#: ../mdkapplet:213
+#: ../mdkapplet:221
 #, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "mdkupdate --applet চালু করা হচ্ছে\n"
 
-#: ../mdkapplet:217
+#: ../mdkapplet:224
 #, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 "মনে হচ্ছে Mandrakeonline পুনরায় ইনষ্টল করা হয়েছে, পুনরায় applet চালানো হচ্ছে ...."
 
-#: ../mdkapplet:225
+#: ../mdkapplet:235
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "নতুন আপডেট পরীক্ষা করা হচ্ছে...\n"
 
-#: ../mdkapplet:227
+#: ../mdkapplet:237
 #, c-format
 msgid "Connecting to"
 msgstr "এর সাথে সংযোগ করা হচ্ছে"
 
-#: ../mdkapplet:250
+#: ../mdkapplet:244
+#, fuzzy, c-format
+msgid "Response from Mandrakeonline server\n"
+msgstr "ম্যান্ড্রকঅনলাইনে (Mandrakeonline) আপনাকে স্বাগতম"
+
+#: ../mdkapplet:262
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "পরীক্ষা চলছে... আপডেট পাওয়া গেছে\n"
 
-#: ../mdkapplet:254
+#: ../mdkapplet:267
 #, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
-#: ../mdkapplet:255
+#: ../mdkapplet:268
 #, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
-#: ../mdkapplet:256
+#: ../mdkapplet:269
 #, c-format
 msgid "Unknown state"
 msgstr "অজ্ঞাত অবস্হা"
 
-#: ../mdkapplet:257
+#: ../mdkapplet:270
 #, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr ""
 "অনলাইন পরিসেবা নিষ্ক্রিয় করা রয়েছে। ম্যান্ড্রেকঅনলাইন সাইটের সাথে যোগাযোগ করুন\n"
 
-#: ../mdkapplet:258
+#: ../mdkapplet:271
 #, c-format
 msgid "Wrong Password.\n"
 msgstr "ভূল পাসওয়ার্ড।\n"
 
-#: ../mdkapplet:259
+#: ../mdkapplet:272
 #, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr "কাজ অথবা হোষ্ট অথবা লগ-ইন সঠিক নয়।\n"
 
-#: ../mdkapplet:260
+#: ../mdkapplet:273
 #, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
@@ -224,72 +234,82 @@ msgstr ""
 "আপনার নেটওয়ার্ক সেটিংস এ কিছু সমস্যা হয়েছে (আপনার route, firewall or proxy "
 "সেটিংস পুনায় পরীক্ষা করুন)\n"
 
-#: ../mdkapplet:264
+#: ../mdkapplet:277
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "সিষ্টেম আপ-টু-ডেট আছে\n"
 
-#: ../mdkapplet:303
+#: ../mdkapplet:317
 #, c-format
 msgid "No check"
 msgstr "কোন পরীক্ষণ নেই"
 
-#: ../mdkapplet:316
+#: ../mdkapplet:330
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "নেটওয়ার্ক পরীক্ষা করা হচ্ছে: সম্ভবত নিষ্ক্রিয় করা আছে\n"
 
-#: ../mdkapplet:319
+#: ../mdkapplet:333
 #, c-format
 msgid "Checking config file: Not present\n"
 msgstr "config ফাইল পরীক্ষা করা হচ্ছে: উপস্থিত নেই\n"
 
-#: ../mdkapplet:353
+#: ../mdkapplet:365
 #, c-format
 msgid "Logs"
 msgstr "লগ"
 
-#: ../mdkapplet:369
+#: ../mdkapplet:381
 #, c-format
 msgid "Clear"
 msgstr "পরিষ্কার করো"
 
-#: ../mdkapplet:396
+#: ../mdkapplet:408
 #, c-format
 msgid "About..."
 msgstr "পরিচিতি..."
 
-#: ../mdkapplet:397
+#: ../mdkapplet:409
 #, c-format
 msgid "Always launch on startup"
 msgstr "সবসময় স্টার্টআপে আরম্ভ করো"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:411
 #, c-format
 msgid "Quit"
 msgstr "প্রস্থান"
 
-#: ../mdkonline:89
+#: ../mdkonline:52 ../mdkonline:106
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "ম্যান্ড্রকঅনলাইনে (Mandrakeonline) আপনাকে স্বাগতম"
+
+#: ../mdkonline:55
 #, c-format
-msgid "Next"
-msgstr "পরবর্তী"
+msgid "I already have an account"
+msgstr ""
 
-#: ../mdkonline:89
+#: ../mdkonline:56
 #, c-format
-msgid "Cancel"
-msgstr "বাতিল"
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline:89 ../mdkonline:93 ../mdkonline:131
+#, c-format
+msgid "Please wait"
+msgstr "অনুগ্রহ করে অপেক্ষা করুন"
 
 #: ../mdkonline:89
 #, c-format
-msgid "Previous"
-msgstr "পূর্ববর্তী"
+msgid "Reading configuration\n"
+msgstr "কনফিগারেশন পড়া হচ্ছে\n"
 
-#: ../mdkonline:103
+#: ../mdkonline:93
 #, c-format
-msgid "Welcome to Mandrakeonline"
-msgstr "ম্যান্ড্রকঅনলাইনে (Mandrakeonline) আপনাকে স্বাগতম"
+msgid "Sending configuration..."
+msgstr "কনফিগারেশন প্রেরণ করে হচ্ছে..."
 
-#: ../mdkonline:104 ../mdkonline_tui:98
+#: ../mdkonline:109
 #, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
@@ -300,62 +320,37 @@ msgstr ""
 "একটি কেন্দ্রীয় ডাটাবেসে আপলোড করতে সাহায্য করবে যাতে\n"
 "আপনাকে সুরক্ষা সংক্রান্ত এবং অন্যান্য প্রয়োজনীয় আপডেট সম্বন্ধে জানানো করা যায়।\n"
 
-#: ../mdkonline:105 ../mdkonline_tui:142
+#: ../mdkonline:114
 #, c-format
-msgid "Create a Mandrakeonline Account"
-msgstr "ম্যান্ড্রেকঅনলাইনে একটি অ্যাকাউন্ট তৈরি করো"
+msgid "Account creation or authentication"
+msgstr ""
 
-#: ../mdkonline:107
-#, fuzzy, c-format
-msgid "I don't have a Mandrakeonline account and I want to subscribe"
-msgstr "আমার কোনো ম্যান্ড্রেকানলাইন অ্যাকাউন্ট নেই কিন্তু আমি একটি তৈরি করতে ইচ্ছুক "
+#: ../mdkonline:119
+#, c-format
+msgid "Enter your Mandrakeonline login, password and machine name:"
+msgstr "আপনার ম্যান্ড্রেকঅনলাইন লগ-ইন, পাসওয়ার্ড এবং মেশিনের নাম লিখুন:"
 
-#: ../mdkonline:111 ../mdkonline:131 ../mdkonline_tui:114 ../mdkonline_tui:145
+#: ../mdkonline:125 ../mdkonline:156
 #, c-format
 msgid "Login:"
 msgstr "লগ-ইন:"
 
-#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:115 ../mdkonline_tui:146
+#: ../mdkonline:126 ../mdkonline:157
 #, c-format
 msgid "Password:"
 msgstr "পাসওয়ার্ড:"
 
-#: ../mdkonline:113 ../mdkonline_tui:147
-#, c-format
-msgid "Confirm Password:"
-msgstr "পাসওয়ার্ড নিশ্চিত করুন:"
-
-#: ../mdkonline:114 ../mdkonline_tui:148
-#, c-format
-msgid "Mail contact:"
-msgstr "মেইলে যোগাযোগ:"
-
-#: ../mdkonline:121
-#, c-format
-msgid "Mandrakelinux Privacy Policy"
-msgstr "ম্যান্ড্রেকলিনাক্স প্রাইভেসি পলিসি"
-
 #: ../mdkonline:127
 #, c-format
-msgid "Authentification"
-msgstr "অনুমোদন"
-
-#: ../mdkonline:128 ../mdkonline_tui:108
-#, c-format
-msgid "Enter your Mandrakeonline login, password and machine name:"
-msgstr "আপনার ম্যান্ড্রেকঅনলাইন লগ-ইন, পাসওয়ার্ড এবং মেশিনের নাম লিখুন:"
-
-#: ../mdkonline:133 ../mdkonline_tui:116
-#, c-format
 msgid "Machine name:"
 msgstr "মেশিনের নাম:"
 
-#: ../mdkonline:138
-#, c-format
-msgid "Send Configuration"
-msgstr "কনফিগারেশন প্রেরণ করুন"
+#: ../mdkonline:131
+#, fuzzy, c-format
+msgid "Connecting to Mandrakeonline website..."
+msgstr "ম্যান্ড্রকঅনলাইনে (Mandrakeonline) আপনাকে স্বাগতম"
 
-#: ../mdkonline:139 ../mdkonline_tui:128
+#: ../mdkonline:139
 #, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
@@ -387,55 +382,56 @@ msgstr ""
 "উপরন্তু, আপনি www.mandrakeexpert.com-র ডিস্কাউন্টসহ মূল্য প্রদত্ত\n"
 "পরিসেবা পাবেন।"
 
-#: ../mdkonline:144 ../mdkonline:211 ../mdkonline:234
-#, c-format
-msgid "Finish"
-msgstr "সম্পন্ন"
-
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141 ../mdkonline:180 ../mdkupdate:126 ../mdkupdate:198
 #, c-format
-msgid "Your upload was successful!"
-msgstr "আপনার আপলোড সাফল্যের সাথে সম্পন্ন হয়েছে!"
+msgid "Connection problem"
+msgstr "সংযোগ সমস্যা"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandrakeonline."
+msgid "or"
 msgstr ""
-"ম্যান্ড্রেকঅনলাইন-এর জন্য, এখন থেকে আপনি নিরাপত্তা এবং \n"
-"আপডেট সংক্রান্ত ঘোষনাগুলো নিয়মিত পাবেন।"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "ভূল পাসওয়ার্ড"
+
+#: ../mdkonline:141
 #, c-format
 msgid ""
-"Mandrakeonline offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+"Your login or password was wrong.\n"
+" Either you'll have to type it again, or you'll need to create an account on "
+"Mandrakeonline.\n"
+" In the latter case, go back to the first step to connect to "
+"Mandrakeonline.\n"
+" Be aware that you must also provide a Machine name \n"
+" (only alphabetical characters are admitted)"
 msgstr ""
-"ম্যান্ড্রেকঅনলাইন আপনাকে স্বয়ংক্রিয়ভাবে আপডেট পেতে সাহায্য করে।\n"
-"একটি প্রোগ্রাম নুতন আপডেটের অপেক্ষায় আপনার সিষ্টেমে নিয়মিত চলবে\n"
-
-#: ../mdkonline:146
-#, c-format
-msgid "automated Upgrades"
-msgstr "স্বয়ংক্রিয় আপগ্রেড"
+"আপনার লগ-ইন অথবা পাসওয়ার্ড সঠিক ছিল না।\n"
+" আপনাকে হয় এই তথ্যগুলি পুনরায় লিখতে হবে অথবা ম্যান্ড্রেকঅনলাইন-এ একটি অ্যাকাউন্ট "
+"তৈরি করতে হবে।\n"
+"  দ্বিতীয় ক্ষেত্রে আপনাকে প্রথম ধাপে ফেরত গিয়ে ম্যান্ড্রেকঅনলাইন-এর সাথে সংযোগ করতে "
+"হবে।\n"
+" আপনাকে কিন্তু মেশিনের নাম লিখতে বলা হবে \n"
+" (শুধুমাত্র বর্ণমালার অক্ষর লেখা যাবে)"
 
-#: ../mdkonline:150
+#: ../mdkonline:153
 #, c-format
-msgid "Country:"
-msgstr "দেশ:"
+msgid "Create a Mandrakeonline Account"
+msgstr "ম্যান্ড্রেকঅনলাইনে একটি অ্যাকাউন্ট তৈরি করো"
 
-#: ../mdkonline:178 ../mdkonline:183 ../mdkonline:185 ../mdkonline:187
+#: ../mdkonline:158
 #, c-format
-msgid "Error"
-msgstr "ত্রুটি"
+msgid "Confirm Password:"
+msgstr "পাসওয়ার্ড নিশ্চিত করুন:"
 
-#: ../mdkonline:183 ../mdkonline_tui:152
+#: ../mdkonline:159
 #, c-format
-msgid "Please provide a login"
-msgstr "অনুগ্রহ করে একটি লগ-ইন নির্দিষ্ট করুন"
+msgid "Mail contact:"
+msgstr "মেইলে যোগাযোগ:"
 
-#: ../mdkonline:185 ../mdkonline_tui:152
+#: ../mdkonline:163
 #, c-format
 msgid ""
 "The passwords do not match\n"
@@ -444,161 +440,114 @@ msgstr ""
 "পাসওয়ার্ড মেলেনি\n"
 " অনুগ্রহ করে পুনরায় চেষ্টা করুন\n"
 
-#: ../mdkonline:187 ../mdkonline_tui:152
+#: ../mdkonline:163
+#, c-format
+msgid "Please provide a login"
+msgstr "অনুগ্রহ করে একটি লগ-ইন নির্দিষ্ট করুন"
+
+#: ../mdkonline:163
 #, c-format
 msgid "Not a valid mail address!\n"
 msgstr "এটি বৈধ ই-মেইল ঠিকানা নয়!\n"
 
-#: ../mdkonline:199 ../mdkonline_tui:78
+#: ../mdkonline:169
 #, c-format
-msgid "Reading configuration\n"
-msgstr "কনফিগারেশন পড়া হচ্ছে\n"
+msgid ""
+"Mandrakeonline Account successfully created.\n"
+"Please click \"Next\" to authenticate and upload your configuration\n"
+msgstr ""
 
-#: ../mdkonline:204 ../mdkonline_tui:82
+#: ../mdkonline:178
 #, c-format
-msgid "Sending configuration..."
-msgstr "কনফিগারেশন প্রেরণ করে হচ্ছে..."
+msgid "Your upload was successful!"
+msgstr "আপনার আপলোড সাফল্যের সাথে সম্পন্ন হয়েছে!"
 
-#: ../mdkonline:213 ../mdkonline:273 ../mdkonline_tui:130 ../mdkonline_tui:169
-#: ../mdkupdate:124 ../mdkupdate:195
+#: ../mdkonline:178
 #, c-format
-msgid "Connection problem"
-msgstr "সংযোগ সমস্যা"
+msgid ""
+"From now you will receive on security and updates \n"
+"announcements thanks to Mandrakeonline."
+msgstr ""
+"ম্যান্ড্রেকঅনলাইন-এর জন্য, এখন থেকে আপনি নিরাপত্তা এবং \n"
+"আপডেট সংক্রান্ত ঘোষনাগুলো নিয়মিত পাবেন।"
+
+#: ../mdkonline:178
+#, c-format
+msgid ""
+"Mandrakeonline offers you the ability to automate the updates.\n"
+"A program will run regulary in your system waiting for new updates\n"
+msgstr ""
+"ম্যান্ড্রেকঅনলাইন আপনাকে স্বয়ংক্রিয়ভাবে আপডেট পেতে সাহায্য করে।\n"
+"একটি প্রোগ্রাম নুতন আপডেটের অপেক্ষায় আপনার সিষ্টেমে নিয়মিত চলবে\n"
 
-#: ../mdkonline:213 ../mdkonline_tui:169
+#: ../mdkonline:180
 #, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr "ফাইল আপলোড করার সময় সমস্যা হয়েছে, অনুগ্রহ করে পুনরায় চেষ্টা করুন"
 
-#: ../mdkonline:251
-#, c-format
-msgid "Quitting Wizard\n"
-msgstr "উইজার্ড থেকে প্রস্থান করা হচ্ছে\n"
+#: ../mdkonline:186
+#, fuzzy, c-format
+msgid "Country"
+msgstr "দেশ:"
 
-#: ../mdkonline:273
+#: ../mdkonline:198
+#, fuzzy, c-format
+msgid "Congratulations"
+msgstr "কনফিগারেশন প্রেরণ করুন"
+
+#: ../mdkonline:198
 #, c-format
-msgid "Mandrakeonline could not be contacted, please try again at a later time"
+msgid "Your Mandrakeonline account has been successfully configured\n"
 msgstr ""
-"ম্যান্ড্রেকঅনলাইন-এর সাথে সংযোগ করা সম্ভব হয় নি, অনুগ্রহ করে কিছুক্ষণ পর পুনরায় চেষ্টা "
-"করুন"
 
-#: ../mdkonline:285
-#, c-format
-msgid "Wrong password"
-msgstr "ভূল পাসওয়ার্ড"
+#: ../mdkonline:214
+#, fuzzy, c-format
+msgid "Configuration uploaded successfully"
+msgstr "আপনার আপলোড সাফল্যের সাথে সম্পন্ন হয়েছে!"
+
+#: ../mdkonline:215
+#, fuzzy, c-format
+msgid "Problem uploading configuration"
+msgstr "কনফিগারেশন পড়া হচ্ছে\n"
 
-#: ../mdkonline:285 ../mdkonline_tui:130
+#: ../mdkonline:216
 #, c-format
 msgid ""
-"Your login or password was wrong.\n"
-" Either you'll have to type it again, or you'll need to create an account on "
-"Mandrakeonline.\n"
-" In the latter case, go back to the first step to connect to "
-"Mandrakeonline.\n"
-" Be aware that you must also provide a Machine name \n"
-" (only alphabetical characters are admitted)"
+"Cannot connect to mandrakeonline website: wrong login/password or router/"
+"firewall bad settings"
 msgstr ""
-"আপনার লগ-ইন অথবা পাসওয়ার্ড সঠিক ছিল না।\n"
-" আপনাকে হয় এই তথ্যগুলি পুনরায় লিখতে হবে অথবা ম্যান্ড্রেকঅনলাইন-এ একটি অ্যাকাউন্ট "
-"তৈরি করতে হবে।\n"
-"  দ্বিতীয় ক্ষেত্রে আপনাকে প্রথম ধাপে ফেরত গিয়ে ম্যান্ড্রেকঅনলাইন-এর সাথে সংযোগ করতে "
-"হবে।\n"
-" আপনাকে কিন্তু মেশিনের নাম লিখতে বলা হবে \n"
-" (শুধুমাত্র বর্ণমালার অক্ষর লেখা যাবে)"
 
-#: ../mdkonline.pm:58
+#: ../mdkonline.pm:66
 #, c-format
 msgid "Login and password should be less than 12 characters\n"
 msgstr ""
 
-#: ../mdkonline.pm:59
+#: ../mdkonline.pm:67
 #, c-format
 msgid "Special characters are not allowed\n"
 msgstr ""
 
-#: ../mdkonline.pm:60
+#: ../mdkonline.pm:68
 #, c-format
 msgid "Please fill in all fields\n"
 msgstr ""
 
-#: ../mdkonline.pm:61
+#: ../mdkonline.pm:69
 #, c-format
 msgid "Email not valid\n"
 msgstr ""
 
-#: ../mdkonline.pm:62
+#: ../mdkonline.pm:70
 #, c-format
 msgid "Account already exist\n"
 msgstr ""
 
-#: ../mdkonline.pm:68
+#: ../mdkonline.pm:76
 #, c-format
 msgid "Problem connecting to server \n"
 msgstr "সার্ভারের সাথে সংযোগ করতে সমস্যা হয়েছে \n"
 
-#: ../mdkonline_tui:45 ../mdkonline_tui:95
-#, fuzzy, c-format
-msgid "Mandrakeonline"
-msgstr "ম্যান্ড্রকঅনলাইনে (Mandrakeonline) আপনাকে স্বাগতম"
-
-#: ../mdkonline_tui:48
-#, c-format
-msgid "I already have an account"
-msgstr ""
-
-#: ../mdkonline_tui:49
-#, c-format
-msgid "I want to subscribe"
-msgstr ""
-
-#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:120
-#, c-format
-msgid "Please wait"
-msgstr "অনুগ্রহ করে অপেক্ষা করুন"
-
-#: ../mdkonline_tui:103
-#, c-format
-msgid "Account creation or authentication"
-msgstr ""
-
-#: ../mdkonline_tui:120
-#, fuzzy, c-format
-msgid "Connecting to Mandrakeonline website..."
-msgstr "ম্যান্ড্রকঅনলাইনে (Mandrakeonline) আপনাকে স্বাগতম"
-
-#: ../mdkonline_tui:130
-#, c-format
-msgid "or"
-msgstr ""
-
-#: ../mdkonline_tui:130
-#, fuzzy, c-format
-msgid "wrong password:"
-msgstr "ভূল পাসওয়ার্ড"
-
-#: ../mdkonline_tui:158
-#, c-format
-msgid ""
-"Mandrakeonline Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-
-#: ../mdkonline_tui:175
-#, fuzzy, c-format
-msgid "Country"
-msgstr "দেশ:"
-
-#: ../mdkonline_tui:187
-#, fuzzy, c-format
-msgid "Congratulations"
-msgstr "কনফিগারেশন প্রেরণ করুন"
-
-#: ../mdkonline_tui:187
-#, c-format
-msgid "Your Mandrakeonline account has been successfully configured\n"
-msgstr ""
-
-#: ../mdkupdate:50
+#: ../mdkupdate:52
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
@@ -614,50 +563,94 @@ msgstr ""
 "\n"
 "ব্যবহার বিধি:\n"
 
-#: ../mdkupdate:55
+#: ../mdkupdate:57
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr " --help          - এই সহায়িকা বার্তা প্রদর্শন করো।\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:58
 #, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto         - Mandrakeupdate স্বয়ংক্রিয়ভাবে চালু করা হয়েছে।\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:59
 #, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - Mandrakeupdate চালু করো।\n"
 
-#: ../mdkupdate:58
-#, c-format
-msgid "  --update       - Update keys\n"
-msgstr "  --update       - আপডেট কী (keys)\n"
-
-#: ../mdkupdate:66
+#: ../mdkupdate:67
 #, c-format
 msgid "No %s file found. Run mdkonline wizard first"
 msgstr ""
 
-#: ../mdkupdate:124
+#: ../mdkupdate:126
 #, fuzzy, c-format
 msgid "Mandrakeupdate could not contact the site, we will try again."
 msgstr ""
 "ম্যান্ড্রেকঅনলাইন-এর সাথে সংযোগ করা সম্ভব হয় নি, অনুগ্রহ করে কিছুক্ষণ পর পুনরায় চেষ্টা "
 "করুন"
 
-#: ../mdkupdate:173
+#: ../mdkupdate:176
 #, c-format
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr ""
 
-#: ../mdkupdate:195
+#: ../mdkupdate:198
 #, c-format
 msgid ""
 "Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
 "mandrakeonline [dot] net"
 msgstr ""
 
+#~ msgid "Next"
+#~ msgstr "পরবর্তী"
+
+#~ msgid "Cancel"
+#~ msgstr "বাতিল"
+
+#~ msgid "Previous"
+#~ msgstr "পূর্ববর্তী"
+
+#, fuzzy
+#~ msgid "I don't have a Mandrakeonline account and I want to subscribe"
+#~ msgstr "আমার কোনো ম্যান্ড্রেকানলাইন অ্যাকাউন্ট নেই কিন্তু আমি একটি তৈরি করতে ইচ্ছুক "
+
+#~ msgid "Mandrakelinux Privacy Policy"
+#~ msgstr "ম্যান্ড্রেকলিনাক্স প্রাইভেসি পলিসি"
+
+#~ msgid "Authentification"
+#~ msgstr "অনুমোদন"
+
+#~ msgid "Send Configuration"
+#~ msgstr "কনফিগারেশন প্রেরণ করুন"
+
+#~ msgid "Finish"
+#~ msgstr "সম্পন্ন"
+
+#~ msgid "automated Upgrades"
+#~ msgstr "স্বয়ংক্রিয় আপগ্রেড"
+
+#~ msgid "Country:"
+#~ msgstr "দেশ:"
+
+#~ msgid "Error"
+#~ msgstr "ত্রুটি"
+
+#~ msgid "Quitting Wizard\n"
+#~ msgstr "উইজার্ড থেকে প্রস্থান করা হচ্ছে\n"
+
+#~ msgid ""
+#~ "Mandrakeonline could not be contacted, please try again at a later time"
+#~ msgstr ""
+#~ "ম্যান্ড্রেকঅনলাইন-এর সাথে সংযোগ করা সম্ভব হয় নি, অনুগ্রহ করে কিছুক্ষণ পর পুনরায় "
+#~ "চেষ্টা করুন"
+
+#~ msgid "Wrong password"
+#~ msgstr "ভূল পাসওয়ার্ড"
+
+#~ msgid "  --update       - Update keys\n"
+#~ msgstr "  --update       - আপডেট কী (keys)\n"
+
 #~ msgid "Skip Wizard"
 #~ msgstr "উইজার্ড ছেড়ে এগিয়ে চলো"
 
diff --git a/po/br.po b/po/br.po
index 9f9d80e9..f0297689 100644
--- a/po/br.po
+++ b/po/br.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-01 22:41+0200\n"
+"POT-Creation-Date: 2004-11-03 12:10+0100\n"
 "PO-Revision-Date: 2004-10-01 19:54+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: brezhoneg <LL@li.org>\n"
@@ -14,271 +14,291 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../mdkapplet:61
+#: ../mdkapplet:63
 #, c-format
 msgid "Your system is up-to-date"
 msgstr ""
 
-#: ../mdkapplet:67
+#: ../mdkapplet:69
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrakeonline.net"
 msgstr ""
 
-#: ../mdkapplet:73
+#: ../mdkapplet:75
 #, c-format
 msgid "System is busy. Please wait ..."
 msgstr ""
 
-#: ../mdkapplet:79
+#: ../mdkapplet:81
 #, c-format
 msgid "New updates are available for your system"
 msgstr ""
 
-#: ../mdkapplet:85
+#: ../mdkapplet:87
 #, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr ""
 
-#: ../mdkapplet:91
+#: ../mdkapplet:93
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr ""
 
-#: ../mdkapplet:97
+#: ../mdkapplet:99
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 
-#: ../mdkapplet:103
+#: ../mdkapplet:105
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:108 ../mdkapplet:158
+#: ../mdkapplet:110 ../mdkapplet:164
 #, c-format
 msgid "Install updates"
 msgstr ""
 
-#: ../mdkapplet:109
+#: ../mdkapplet:111
 #, c-format
 msgid "Configure the service"
 msgstr "Kefluniañ ar servij"
 
-#: ../mdkapplet:110
+#: ../mdkapplet:112
 #, c-format
 msgid "Check Updates"
 msgstr ""
 
-#: ../mdkapplet:111
+#: ../mdkapplet:113 ../mdkapplet:167 ../mdkapplet:225
+#, fuzzy, c-format
+msgid "Please Wait"
+msgstr "Gortozit mar plij"
+
+#: ../mdkapplet:113 ../mdkapplet:166 ../mdkapplet:167 ../mdkapplet:225
+#, c-format
+msgid "Check updates"
+msgstr ""
+
+#: ../mdkapplet:115
 #, c-format
 msgid "Online WebSite"
 msgstr ""
 
-#: ../mdkapplet:112
+#: ../mdkapplet:116
 #, c-format
 msgid "Configure Network"
 msgstr "Kefluniañ ar rouedad"
 
-#: ../mdkapplet:113
+#: ../mdkapplet:117
 #, c-format
 msgid "Configure Now!"
 msgstr "Kefluniañ bremanñ !"
 
-#: ../mdkapplet:146
+#: ../mdkapplet:152 ../mdkapplet:229
 #, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr ""
 
-#: ../mdkapplet:156
+#: ../mdkapplet:162
 #, c-format
 msgid "Actions"
 msgstr "Ober"
 
-#: ../mdkapplet:159
+#: ../mdkapplet:165
 #, c-format
 msgid "Configure"
 msgstr "Kefluniañ"
 
-#: ../mdkapplet:160
-#, c-format
-msgid "Check updates"
-msgstr ""
-
-#: ../mdkapplet:161
+#: ../mdkapplet:169
 #, c-format
 msgid "See logs"
 msgstr ""
 
-#: ../mdkapplet:164
+#: ../mdkapplet:172
 #, c-format
 msgid "Status"
 msgstr "Stad"
 
-#: ../mdkapplet:168 ../mdkapplet:363
+#: ../mdkapplet:176 ../mdkapplet:375
 #, c-format
 msgid "Close"
 msgstr "Serriñ"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Network Connection: "
 msgstr "Kevreadenn ar rouedad :"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Up"
 msgstr "Sevel"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Down"
 msgstr "Diskenn"
 
-#: ../mdkapplet:204
+#: ../mdkapplet:212
 #, c-format
 msgid "Last check: "
 msgstr ""
 
-#: ../mdkapplet:205
+#: ../mdkapplet:213
 #, c-format
 msgid "Updates: "
 msgstr ""
 
-#: ../mdkapplet:209
+#: ../mdkapplet:217
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr ""
 
-#: ../mdkapplet:213
+#: ../mdkapplet:221
 #, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr ""
 
-#: ../mdkapplet:217
+#: ../mdkapplet:224
 #, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 
-#: ../mdkapplet:225
+#: ../mdkapplet:235
 #, c-format
 msgid "Computing new updates...\n"
 msgstr ""
 
-#: ../mdkapplet:227
+#: ../mdkapplet:237
 #, c-format
 msgid "Connecting to"
 msgstr ""
 
-#: ../mdkapplet:250
+#: ../mdkapplet:244
+#, fuzzy, c-format
+msgid "Response from Mandrakeonline server\n"
+msgstr "Degeler e Mandrakeonline"
+
+#: ../mdkapplet:262
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr ""
 
-#: ../mdkapplet:254
+#: ../mdkapplet:267
 #, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
-#: ../mdkapplet:255
+#: ../mdkapplet:268
 #, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
-#: ../mdkapplet:256
+#: ../mdkapplet:269
 #, c-format
 msgid "Unknown state"
 msgstr ""
 
-#: ../mdkapplet:257
+#: ../mdkapplet:270
 #, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr ""
 
-#: ../mdkapplet:258
+#: ../mdkapplet:271
 #, c-format
 msgid "Wrong Password.\n"
 msgstr "N'eo ket un tremenger mat.\n"
 
-#: ../mdkapplet:259
+#: ../mdkapplet:272
 #, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr ""
 
-#: ../mdkapplet:260
+#: ../mdkapplet:273
 #, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
 msgstr ""
 
-#: ../mdkapplet:264
+#: ../mdkapplet:277
 #, c-format
 msgid "System is up-to-date\n"
 msgstr ""
 
-#: ../mdkapplet:303
+#: ../mdkapplet:317
 #, c-format
 msgid "No check"
 msgstr ""
 
-#: ../mdkapplet:316
+#: ../mdkapplet:330
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
-#: ../mdkapplet:319
+#: ../mdkapplet:333
 #, c-format
 msgid "Checking config file: Not present\n"
 msgstr ""
 
-#: ../mdkapplet:353
+#: ../mdkapplet:365
 #, c-format
 msgid "Logs"
 msgstr "Kazetennoù"
 
-#: ../mdkapplet:369
+#: ../mdkapplet:381
 #, c-format
 msgid "Clear"
 msgstr "Skarañ"
 
-#: ../mdkapplet:396
+#: ../mdkapplet:408
 #, c-format
 msgid "About..."
 msgstr "A-brepoz ..."
 
-#: ../mdkapplet:397
+#: ../mdkapplet:409
 #, c-format
 msgid "Always launch on startup"
 msgstr ""
 
-#: ../mdkapplet:399
+#: ../mdkapplet:411
 #, c-format
 msgid "Quit"
 msgstr "Kuitaat"
 
-#: ../mdkonline:89
+#: ../mdkonline:52 ../mdkonline:106
 #, c-format
-msgid "Next"
-msgstr "A heul"
+msgid "Mandrakeonline"
+msgstr "Mandrakeonline"
 
-#: ../mdkonline:89
+#: ../mdkonline:55
 #, c-format
-msgid "Cancel"
-msgstr "Nullañ"
+msgid "I already have an account"
+msgstr ""
+
+#: ../mdkonline:56
+#, c-format
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline:89 ../mdkonline:93 ../mdkonline:131
+#, c-format
+msgid "Please wait"
+msgstr "Gortozit mar plij"
 
 #: ../mdkonline:89
 #, c-format
-msgid "Previous"
-msgstr "Diaraog"
+msgid "Reading configuration\n"
+msgstr "O lenn ar gefluniadur\n"
 
-#: ../mdkonline:103
+#: ../mdkonline:93
 #, c-format
-msgid "Welcome to Mandrakeonline"
-msgstr "Degeler e Mandrakeonline"
+msgid "Sending configuration..."
+msgstr ""
 
-#: ../mdkonline:104 ../mdkonline_tui:98
+#: ../mdkonline:109
 #, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
@@ -286,62 +306,37 @@ msgid ""
 "order to keep you informed about security updates and useful upgrades.\n"
 msgstr ""
 
-#: ../mdkonline:105 ../mdkonline_tui:142
-#, fuzzy, c-format
-msgid "Create a Mandrakeonline Account"
-msgstr "Degeler e MandrakeOnline"
+#: ../mdkonline:114
+#, c-format
+msgid "Account creation or authentication"
+msgstr ""
 
-#: ../mdkonline:107
+#: ../mdkonline:119
 #, c-format
-msgid "I don't have a Mandrakeonline account and I want to subscribe"
+msgid "Enter your Mandrakeonline login, password and machine name:"
 msgstr ""
 
-#: ../mdkonline:111 ../mdkonline:131 ../mdkonline_tui:114 ../mdkonline_tui:145
+#: ../mdkonline:125 ../mdkonline:156
 #, c-format
 msgid "Login:"
 msgstr "Anv :"
 
-#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:115 ../mdkonline_tui:146
+#: ../mdkonline:126 ../mdkonline:157
 #, c-format
 msgid "Password:"
 msgstr "Tremenger :"
 
-#: ../mdkonline:113 ../mdkonline_tui:147
-#, c-format
-msgid "Confirm Password:"
-msgstr ""
-
-#: ../mdkonline:114 ../mdkonline_tui:148
-#, c-format
-msgid "Mail contact:"
-msgstr ""
-
-#: ../mdkonline:121
-#, c-format
-msgid "Mandrakelinux Privacy Policy"
-msgstr ""
-
 #: ../mdkonline:127
 #, c-format
-msgid "Authentification"
-msgstr "Dilesadur"
-
-#: ../mdkonline:128 ../mdkonline_tui:108
-#, c-format
-msgid "Enter your Mandrakeonline login, password and machine name:"
-msgstr ""
-
-#: ../mdkonline:133 ../mdkonline_tui:116
-#, c-format
 msgid "Machine name:"
 msgstr "Anv ar ostiz :"
 
-#: ../mdkonline:138
-#, c-format
-msgid "Send Configuration"
-msgstr ""
+#: ../mdkonline:131
+#, fuzzy, c-format
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Degeler e Mandrakeonline"
 
-#: ../mdkonline:139 ../mdkonline_tui:128
+#: ../mdkonline:139
 #, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
@@ -360,203 +355,159 @@ msgid ""
 "www.mandrakeexpert.com."
 msgstr ""
 
-#: ../mdkonline:144 ../mdkonline:211 ../mdkonline:234
+#: ../mdkonline:141 ../mdkonline:180 ../mdkupdate:126 ../mdkupdate:198
 #, c-format
-msgid "Finish"
-msgstr "Disoc'h"
-
-#: ../mdkonline:145 ../mdkonline_tui:167
-#, c-format
-msgid "Your upload was successful!"
+msgid "Connection problem"
 msgstr ""
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandrakeonline."
+msgid "or"
 msgstr ""
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid ""
-"Mandrakeonline offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
-msgstr ""
+msgid "wrong password:"
+msgstr "N'eo ket un tremenger mat :"
 
-#: ../mdkonline:146
+#: ../mdkonline:141
 #, c-format
-msgid "automated Upgrades"
+msgid ""
+"Your login or password was wrong.\n"
+" Either you'll have to type it again, or you'll need to create an account on "
+"Mandrakeonline.\n"
+" In the latter case, go back to the first step to connect to "
+"Mandrakeonline.\n"
+" Be aware that you must also provide a Machine name \n"
+" (only alphabetical characters are admitted)"
 msgstr ""
 
-#: ../mdkonline:150
-#, c-format
-msgid "Country:"
-msgstr "Bro :"
+#: ../mdkonline:153
+#, fuzzy, c-format
+msgid "Create a Mandrakeonline Account"
+msgstr "Degeler e MandrakeOnline"
 
-#: ../mdkonline:178 ../mdkonline:183 ../mdkonline:185 ../mdkonline:187
+#: ../mdkonline:158
 #, c-format
-msgid "Error"
-msgstr "Fazi"
+msgid "Confirm Password:"
+msgstr ""
 
-#: ../mdkonline:183 ../mdkonline_tui:152
+#: ../mdkonline:159
 #, c-format
-msgid "Please provide a login"
+msgid "Mail contact:"
 msgstr ""
 
-#: ../mdkonline:185 ../mdkonline_tui:152
+#: ../mdkonline:163
 #, c-format
 msgid ""
 "The passwords do not match\n"
 " Please try again\n"
 msgstr ""
 
-#: ../mdkonline:187 ../mdkonline_tui:152
-#, c-format
-msgid "Not a valid mail address!\n"
-msgstr "N'eo ket ur mailh mat !\n"
-
-#: ../mdkonline:199 ../mdkonline_tui:78
-#, c-format
-msgid "Reading configuration\n"
-msgstr "O lenn ar gefluniadur\n"
-
-#: ../mdkonline:204 ../mdkonline_tui:82
+#: ../mdkonline:163
 #, c-format
-msgid "Sending configuration..."
+msgid "Please provide a login"
 msgstr ""
 
-#: ../mdkonline:213 ../mdkonline:273 ../mdkonline_tui:130 ../mdkonline_tui:169
-#: ../mdkupdate:124 ../mdkupdate:195
+#: ../mdkonline:163
 #, c-format
-msgid "Connection problem"
-msgstr ""
+msgid "Not a valid mail address!\n"
+msgstr "N'eo ket ur mailh mat !\n"
 
-#: ../mdkonline:213 ../mdkonline_tui:169
+#: ../mdkonline:169
 #, c-format
-msgid "Problem occurs when uploading files, please try again"
+msgid ""
+"Mandrakeonline Account successfully created.\n"
+"Please click \"Next\" to authenticate and upload your configuration\n"
 msgstr ""
 
-#: ../mdkonline:251
-#, c-format
-msgid "Quitting Wizard\n"
-msgstr "O kuitaat ar skoazeller\n"
-
-#: ../mdkonline:273
+#: ../mdkonline:178
 #, c-format
-msgid "Mandrakeonline could not be contacted, please try again at a later time"
+msgid "Your upload was successful!"
 msgstr ""
 
-#: ../mdkonline:285
-#, c-format
-msgid "Wrong password"
-msgstr "N'eo ket un tremenger mat"
-
-#: ../mdkonline:285 ../mdkonline_tui:130
+#: ../mdkonline:178
 #, c-format
 msgid ""
-"Your login or password was wrong.\n"
-" Either you'll have to type it again, or you'll need to create an account on "
-"Mandrakeonline.\n"
-" In the latter case, go back to the first step to connect to "
-"Mandrakeonline.\n"
-" Be aware that you must also provide a Machine name \n"
-" (only alphabetical characters are admitted)"
+"From now you will receive on security and updates \n"
+"announcements thanks to Mandrakeonline."
 msgstr ""
 
-#: ../mdkonline.pm:58
+#: ../mdkonline:178
 #, c-format
-msgid "Login and password should be less than 12 characters\n"
+msgid ""
+"Mandrakeonline offers you the ability to automate the updates.\n"
+"A program will run regulary in your system waiting for new updates\n"
 msgstr ""
 
-#: ../mdkonline.pm:59
+#: ../mdkonline:180
 #, c-format
-msgid "Special characters are not allowed\n"
+msgid "Problem occurs when uploading files, please try again"
 msgstr ""
 
-#: ../mdkonline.pm:60
+#: ../mdkonline:186
 #, c-format
-msgid "Please fill in all fields\n"
-msgstr ""
+msgid "Country"
+msgstr "Bro"
 
-#: ../mdkonline.pm:61
-#, c-format
-msgid "Email not valid\n"
-msgstr "N'eo ket ur mailh mat\n"
+#: ../mdkonline:198
+#, fuzzy, c-format
+msgid "Congratulations"
+msgstr "Kefluniadur"
 
-#: ../mdkonline.pm:62
+#: ../mdkonline:198
 #, c-format
-msgid "Account already exist\n"
+msgid "Your Mandrakeonline account has been successfully configured\n"
 msgstr ""
 
-#: ../mdkonline.pm:68
+#: ../mdkonline:214
 #, c-format
-msgid "Problem connecting to server \n"
+msgid "Configuration uploaded successfully"
 msgstr ""
 
-#: ../mdkonline_tui:45 ../mdkonline_tui:95
-#, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+#: ../mdkonline:215
+#, fuzzy, c-format
+msgid "Problem uploading configuration"
+msgstr "O lenn ar gefluniadur\n"
 
-#: ../mdkonline_tui:48
+#: ../mdkonline:216
 #, c-format
-msgid "I already have an account"
+msgid ""
+"Cannot connect to mandrakeonline website: wrong login/password or router/"
+"firewall bad settings"
 msgstr ""
 
-#: ../mdkonline_tui:49
+#: ../mdkonline.pm:66
 #, c-format
-msgid "I want to subscribe"
+msgid "Login and password should be less than 12 characters\n"
 msgstr ""
 
-#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:120
+#: ../mdkonline.pm:67
 #, c-format
-msgid "Please wait"
-msgstr "Gortozit mar plij"
-
-#: ../mdkonline_tui:103
-#, c-format
-msgid "Account creation or authentication"
+msgid "Special characters are not allowed\n"
 msgstr ""
 
-#: ../mdkonline_tui:120
-#, fuzzy, c-format
-msgid "Connecting to Mandrakeonline website..."
-msgstr "Degeler e Mandrakeonline"
-
-#: ../mdkonline_tui:130
+#: ../mdkonline.pm:68
 #, c-format
-msgid "or"
+msgid "Please fill in all fields\n"
 msgstr ""
 
-#: ../mdkonline_tui:130
+#: ../mdkonline.pm:69
 #, c-format
-msgid "wrong password:"
-msgstr "N'eo ket un tremenger mat :"
+msgid "Email not valid\n"
+msgstr "N'eo ket ur mailh mat\n"
 
-#: ../mdkonline_tui:158
+#: ../mdkonline.pm:70
 #, c-format
-msgid ""
-"Mandrakeonline Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
+msgid "Account already exist\n"
 msgstr ""
 
-#: ../mdkonline_tui:175
+#: ../mdkonline.pm:76
 #, c-format
-msgid "Country"
-msgstr "Bro"
-
-#: ../mdkonline_tui:187
-#, fuzzy, c-format
-msgid "Congratulations"
-msgstr "Kefluniadur"
-
-#: ../mdkonline_tui:187
-#, c-format
-msgid "Your Mandrakeonline account has been successfully configured\n"
+msgid "Problem connecting to server \n"
 msgstr ""
 
-#: ../mdkupdate:50
+#: ../mdkupdate:52
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
@@ -567,51 +518,72 @@ msgid ""
 "usage:\n"
 msgstr ""
 
-#: ../mdkupdate:55
+#: ../mdkupdate:57
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr ""
 
-#: ../mdkupdate:56
+#: ../mdkupdate:58
 #, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr ""
 
-#: ../mdkupdate:57
+#: ../mdkupdate:59
 #, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr ""
 
-#: ../mdkupdate:58
-#, c-format
-msgid "  --update       - Update keys\n"
-msgstr ""
-
-#: ../mdkupdate:66
+#: ../mdkupdate:67
 #, c-format
 msgid "No %s file found. Run mdkonline wizard first"
 msgstr ""
 
-#: ../mdkupdate:124
+#: ../mdkupdate:126
 #, c-format
 msgid "Mandrakeupdate could not contact the site, we will try again."
 msgstr ""
 
-#: ../mdkupdate:173
+#: ../mdkupdate:176
 #, c-format
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr ""
 
-#: ../mdkupdate:195
+#: ../mdkupdate:198
 #, c-format
 msgid ""
 "Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
 "mandrakeonline [dot] net"
 msgstr ""
 
-#~ msgid "Server Problem"
-#~ msgstr "Fazi gant ar servijer"
+#~ msgid "Next"
+#~ msgstr "A heul"
+
+#~ msgid "Cancel"
+#~ msgstr "Nullañ"
+
+#~ msgid "Previous"
+#~ msgstr "Diaraog"
 
-#, fuzzy
-#~ msgid "Response from Mandrakeonline server\n"
+#~ msgid "Welcome to Mandrakeonline"
 #~ msgstr "Degeler e Mandrakeonline"
+
+#~ msgid "Authentification"
+#~ msgstr "Dilesadur"
+
+#~ msgid "Finish"
+#~ msgstr "Disoc'h"
+
+#~ msgid "Country:"
+#~ msgstr "Bro :"
+
+#~ msgid "Error"
+#~ msgstr "Fazi"
+
+#~ msgid "Quitting Wizard\n"
+#~ msgstr "O kuitaat ar skoazeller\n"
+
+#~ msgid "Wrong password"
+#~ msgstr "N'eo ket un tremenger mat"
+
+#~ msgid "Server Problem"
+#~ msgstr "Fazi gant ar servijer"
diff --git a/po/bs.po b/po/bs.po
index 5250e1ed..61a9509d 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-bs\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-01 22:41+0200\n"
+"POT-Creation-Date: 2004-11-03 12:10+0100\n"
 "PO-Revision-Date: 2004-10-11 16:59+0200\n"
 "Last-Translator: Amila Akagić <bono@linux.org.ba>\n"
 "Language-Team: Bosnian <lokal@lugbih.org>\n"
@@ -17,12 +17,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3\n"
 
-#: ../mdkapplet:61
+#: ../mdkapplet:63
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Vaš sistem je up-to-date"
 
-#: ../mdkapplet:67
+#: ../mdkapplet:69
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -31,187 +31,198 @@ msgstr ""
 "Problem kod podešavanja servisa. Provjerite logove i pošaljite mail za "
 "support@mandrakeonline.net"
 
-#: ../mdkapplet:73
+#: ../mdkapplet:75
 #, c-format
 msgid "System is busy. Please wait ..."
 msgstr "Sistem je zauzet. Molim sačekajte..."
 
-#: ../mdkapplet:79
+#: ../mdkapplet:81
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Nove ispravke su dostupne za vaš sistem"
 
-#: ../mdkapplet:85
+#: ../mdkapplet:87
 #, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr "Servis nije podešen. Kliknite na \"Podesi servis\""
 
-#: ../mdkapplet:91
+#: ../mdkapplet:93
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Mreža ne radi. Podesite vašu mrežu"
 
-#: ../mdkapplet:97
+#: ../mdkapplet:99
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Servis nije aktiviran. Kliknite na \"Online web stranica\""
 
-#: ../mdkapplet:103
+#: ../mdkapplet:105
 #, c-format
 msgid "Release not supported (too old release, or development release)"
-msgstr "Izdanje nije podržano (prestaro izdanje ili je riječ o izdanju u razvoju)"
+msgstr ""
+"Izdanje nije podržano (prestaro izdanje ili je riječ o izdanju u razvoju)"
 
-#: ../mdkapplet:108 ../mdkapplet:158
+#: ../mdkapplet:110 ../mdkapplet:164
 #, c-format
 msgid "Install updates"
 msgstr "Instaliraj ispravke"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:111
 #, c-format
 msgid "Configure the service"
 msgstr "Podesi servis"
 
-#: ../mdkapplet:110
+#: ../mdkapplet:112
 #, c-format
 msgid "Check Updates"
 msgstr "Provjeri da li ima ispravki"
 
-#: ../mdkapplet:111
+#: ../mdkapplet:113 ../mdkapplet:167 ../mdkapplet:225
+#, fuzzy, c-format
+msgid "Please Wait"
+msgstr "Molim sačekajte"
+
+#: ../mdkapplet:113 ../mdkapplet:166 ../mdkapplet:167 ../mdkapplet:225
+#, c-format
+msgid "Check updates"
+msgstr "Provjeri ispravke"
+
+#: ../mdkapplet:115
 #, c-format
 msgid "Online WebSite"
 msgstr "Online web stranica"
 
-#: ../mdkapplet:112
+#: ../mdkapplet:116
 #, c-format
 msgid "Configure Network"
 msgstr "Podesi mrežu"
 
-#: ../mdkapplet:113
+#: ../mdkapplet:117
 #, c-format
 msgid "Configure Now!"
 msgstr "Podesi odmah!"
 
-#: ../mdkapplet:146
+#: ../mdkapplet:152 ../mdkapplet:229
 #, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Mandrakelinux aplet sa ispravkama"
 
-#: ../mdkapplet:156
+#: ../mdkapplet:162
 #, c-format
 msgid "Actions"
 msgstr "Akcije"
 
-#: ../mdkapplet:159
+#: ../mdkapplet:165
 #, c-format
 msgid "Configure"
 msgstr "Podesi"
 
-#: ../mdkapplet:160
-#, c-format
-msgid "Check updates"
-msgstr "Provjeri ispravke"
-
-#: ../mdkapplet:161
+#: ../mdkapplet:169
 #, c-format
 msgid "See logs"
 msgstr "Pogledaj logove"
 
-#: ../mdkapplet:164
+#: ../mdkapplet:172
 #, c-format
 msgid "Status"
 msgstr "Stanje"
 
-#: ../mdkapplet:168 ../mdkapplet:363
+#: ../mdkapplet:176 ../mdkapplet:375
 #, c-format
 msgid "Close"
 msgstr "Zatvori"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Network Connection: "
 msgstr "Mrežna konekcija: "
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Up"
 msgstr "Radi"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Down"
 msgstr "Ne radi"
 
-#: ../mdkapplet:204
+#: ../mdkapplet:212
 #, c-format
 msgid "Last check: "
 msgstr "Zadnja provjera: "
 
-#: ../mdkapplet:205
+#: ../mdkapplet:213
 #, c-format
 msgid "Updates: "
 msgstr "Ispravke: "
 
-#: ../mdkapplet:209
+#: ../mdkapplet:217
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Pokrećem drakconnect\n"
 
-#: ../mdkapplet:213
+#: ../mdkapplet:221
 #, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "Pokrećem mdkupdate --aplet\n"
 
-#: ../mdkapplet:217
+#: ../mdkapplet:224
 #, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr "Madrakeonline je izgleda ponovo instaliran, pokrećem aplet..."
 
-#: ../mdkapplet:225
+#: ../mdkapplet:235
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Izračunavam nove ispravke...\n"
 
-#: ../mdkapplet:227
+#: ../mdkapplet:237
 #, c-format
 msgid "Connecting to"
 msgstr "Vežem se na"
 
-#: ../mdkapplet:250
+#: ../mdkapplet:244
+#, fuzzy, c-format
+msgid "Response from Mandrakeonline server\n"
+msgstr "Dobro došli na MandrakeOnline"
+
+#: ../mdkapplet:262
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Provjeravam... Ispravke su dostupne\n"
 
-#: ../mdkapplet:254
+#: ../mdkapplet:267
 #, c-format
 msgid "Development release not supported by service"
 msgstr "Servis ne podržava razvojno izdanje"
 
-#: ../mdkapplet:255
+#: ../mdkapplet:268
 #, c-format
 msgid "Too old release not supported by service"
 msgstr "Servis ne podržava prestaro izdanje"
 
-#: ../mdkapplet:256
+#: ../mdkapplet:269
 #, c-format
 msgid "Unknown state"
 msgstr "Nepoznato stanje"
 
-#: ../mdkapplet:257
+#: ../mdkapplet:270
 #, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr "Online servisi su isključeni. Kontaktirajte Mandrakeonline stranicu\n"
 
-#: ../mdkapplet:258
+#: ../mdkapplet:271
 #, c-format
 msgid "Wrong Password.\n"
 msgstr "Pogrešna šifra\n"
 
-#: ../mdkapplet:259
+#: ../mdkapplet:272
 #, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr "Pogrešna akcija, računar ili korisničko ime.\n"
 
-#: ../mdkapplet:260
+#: ../mdkapplet:273
 #, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
@@ -220,72 +231,82 @@ msgstr ""
 "Nešto nije u redu sa vašim postavkama za mrežu (provjerite postavke za "
 "route, firewall ili proxy)\n"
 
-#: ../mdkapplet:264
+#: ../mdkapplet:277
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Sistem je up-to-date\n"
 
-#: ../mdkapplet:303
+#: ../mdkapplet:317
 #, c-format
 msgid "No check"
 msgstr "Bez provjere"
 
-#: ../mdkapplet:316
+#: ../mdkapplet:330
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Provjeravam mrežu: čini se da je isključena\n"
 
-#: ../mdkapplet:319
+#: ../mdkapplet:333
 #, c-format
 msgid "Checking config file: Not present\n"
 msgstr "Provjeravam config datoteku: Ne postoji\n"
 
-#: ../mdkapplet:353
+#: ../mdkapplet:365
 #, c-format
 msgid "Logs"
 msgstr "Logovi"
 
-#: ../mdkapplet:369
+#: ../mdkapplet:381
 #, c-format
 msgid "Clear"
 msgstr "Očisti"
 
-#: ../mdkapplet:396
+#: ../mdkapplet:408
 #, c-format
 msgid "About..."
 msgstr "O programu..."
 
-#: ../mdkapplet:397
+#: ../mdkapplet:409
 #, c-format
 msgid "Always launch on startup"
 msgstr "Uvijek pokreni na početku"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:411
 #, c-format
 msgid "Quit"
 msgstr "Završi"
 
-#: ../mdkonline:89
+#: ../mdkonline:52 ../mdkonline:106
 #, c-format
-msgid "Next"
-msgstr "Dalje"
+msgid "Mandrakeonline"
+msgstr "Mandrakeonline"
 
-#: ../mdkonline:89
+#: ../mdkonline:55
 #, c-format
-msgid "Cancel"
-msgstr "Odustani"
+msgid "I already have an account"
+msgstr "Već imam račun"
+
+#: ../mdkonline:56
+#, c-format
+msgid "I want to subscribe"
+msgstr "Želim se pretplatiti"
+
+#: ../mdkonline:89 ../mdkonline:93 ../mdkonline:131
+#, c-format
+msgid "Please wait"
+msgstr "Molim sačekajte"
 
 #: ../mdkonline:89
 #, c-format
-msgid "Previous"
-msgstr "Nazad"
+msgid "Reading configuration\n"
+msgstr "Čitam konfiguraciju\n"
 
-#: ../mdkonline:103
+#: ../mdkonline:93
 #, c-format
-msgid "Welcome to Mandrakeonline"
-msgstr "Dobro došli na Mandrakeonline"
+msgid "Sending configuration..."
+msgstr "Šaljem postavke..."
 
-#: ../mdkonline:104 ../mdkonline_tui:98
+#: ../mdkonline:109
 #, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
@@ -296,62 +317,37 @@ msgstr ""
 "(pakete, podešavanja hardvera) u centraliziranu bazu podataka kako\n"
 "bi vas mogli informisali o sigurnosnim iskravkama i korisnim nadogradnjama.\n"
 
-#: ../mdkonline:105 ../mdkonline_tui:142
+#: ../mdkonline:114
 #, c-format
-msgid "Create a Mandrakeonline Account"
-msgstr "Napravi račun na Mandrakeonline"
+msgid "Account creation or authentication"
+msgstr "Kreiranje računa ili identifikacija"
 
-#: ../mdkonline:107
+#: ../mdkonline:119
 #, c-format
-msgid "I don't have a Mandrakeonline account and I want to subscribe"
-msgstr "Nemam Mandrakeonline račun i želim se pretplatiti"
+msgid "Enter your Mandrakeonline login, password and machine name:"
+msgstr "Upišite svoje Mandrakeonline korisničko ime, šifru i naziv mašine:"
 
-#: ../mdkonline:111 ../mdkonline:131 ../mdkonline_tui:114 ../mdkonline_tui:145
+#: ../mdkonline:125 ../mdkonline:156
 #, c-format
 msgid "Login:"
 msgstr "Korisničko ime:"
 
-#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:115 ../mdkonline_tui:146
+#: ../mdkonline:126 ../mdkonline:157
 #, c-format
 msgid "Password:"
 msgstr "Šifra:"
 
-#: ../mdkonline:113 ../mdkonline_tui:147
-#, c-format
-msgid "Confirm Password:"
-msgstr "Ponovo šifra:"
-
-#: ../mdkonline:114 ../mdkonline_tui:148
-#, c-format
-msgid "Mail contact:"
-msgstr "Kontakt mail:"
-
-#: ../mdkonline:121
-#, c-format
-msgid "Mandrakelinux Privacy Policy"
-msgstr "Mandrakelinux Privacy Policy"
-
 #: ../mdkonline:127
 #, c-format
-msgid "Authentification"
-msgstr "Identifikacija"
-
-#: ../mdkonline:128 ../mdkonline_tui:108
-#, c-format
-msgid "Enter your Mandrakeonline login, password and machine name:"
-msgstr "Upišite svoje Mandrakeonline korisničko ime, šifru i naziv mašine:"
-
-#: ../mdkonline:133 ../mdkonline_tui:116
-#, c-format
 msgid "Machine name:"
 msgstr "Naziv mašine:"
 
-#: ../mdkonline:138
+#: ../mdkonline:131
 #, c-format
-msgid "Send Configuration"
-msgstr "Pošalji postavke"
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Povezujem se sa Mandrakeonline web stranicom..."
 
-#: ../mdkonline:139 ../mdkonline_tui:128
+#: ../mdkonline:139
 #, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
@@ -384,55 +380,55 @@ msgstr ""
 "Furthermore, you benefit from discounted paid support services on\n"
 "www.mandrakeexpert.com."
 
-#: ../mdkonline:144 ../mdkonline:211 ../mdkonline:234
+#: ../mdkonline:141 ../mdkonline:180 ../mdkupdate:126 ../mdkupdate:198
 #, c-format
-msgid "Finish"
-msgstr "Kraj"
+msgid "Connection problem"
+msgstr "Problem sa konekcijom"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid "Your upload was successful!"
-msgstr "Slanje je uspješno!"
+msgid "or"
+msgstr "ili"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandrakeonline."
-msgstr ""
-"Od sada ćete primati obavještenja o sigurnosti i\n"
-"ispravkama zahvaljujući Mandrakeonline."
+msgid "wrong password:"
+msgstr "pogrešna šifra:"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
 msgid ""
-"Mandrakeonline offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+"Your login or password was wrong.\n"
+" Either you'll have to type it again, or you'll need to create an account on "
+"Mandrakeonline.\n"
+" In the latter case, go back to the first step to connect to "
+"Mandrakeonline.\n"
+" Be aware that you must also provide a Machine name \n"
+" (only alphabetical characters are admitted)"
 msgstr ""
-"Mandrakeonline daje vam priliku da automatizirate ispravke.\n"
-"Program će se pokrenuti na vašem sistemu i čekati nove ispravke\n"
-
-#: ../mdkonline:146
-#, c-format
-msgid "automated Upgrades"
-msgstr "automatizovna nadogradnja"
+"Vaše korisničko ime ili šifra nije ispravna.\n"
+"Ili je ukucajte ponovo ili ponovo kreirajte account na Mandrakeonline.\n"
+"Drugi put se vratite nazad na prvi korak kako bi se konektovali na\n"
+"Mandrakeonline.\n"
+" Upamtite da morate unijeti i naziv mašine \n"
+" (unesite samo alfabetske znakove)"
 
-#: ../mdkonline:150
+#: ../mdkonline:153
 #, c-format
-msgid "Country:"
-msgstr "Država:"
+msgid "Create a Mandrakeonline Account"
+msgstr "Napravi račun na Mandrakeonline"
 
-#: ../mdkonline:178 ../mdkonline:183 ../mdkonline:185 ../mdkonline:187
+#: ../mdkonline:158
 #, c-format
-msgid "Error"
-msgstr "Greška"
+msgid "Confirm Password:"
+msgstr "Ponovo šifra:"
 
-#: ../mdkonline:183 ../mdkonline_tui:152
+#: ../mdkonline:159
 #, c-format
-msgid "Please provide a login"
-msgstr "Unesite korisničko ime"
+msgid "Mail contact:"
+msgstr "Kontakt mail:"
 
-#: ../mdkonline:185 ../mdkonline_tui:152
+#: ../mdkonline:163
 #, c-format
 msgid ""
 "The passwords do not match\n"
@@ -441,162 +437,116 @@ msgstr ""
 "Šifre se ne poklapaju\n"
 " Molim pokušajte ponovo\n"
 
-#: ../mdkonline:187 ../mdkonline_tui:152
+#: ../mdkonline:163
+#, c-format
+msgid "Please provide a login"
+msgstr "Unesite korisničko ime"
+
+#: ../mdkonline:163
 #, c-format
 msgid "Not a valid mail address!\n"
 msgstr "Neispravna e-mail adresa!\n"
 
-#: ../mdkonline:199 ../mdkonline_tui:78
+#: ../mdkonline:169
 #, c-format
-msgid "Reading configuration\n"
-msgstr "Čitam konfiguraciju\n"
+msgid ""
+"Mandrakeonline Account successfully created.\n"
+"Please click \"Next\" to authenticate and upload your configuration\n"
+msgstr ""
+"Račun za Mandrakeonline je uspješno napravljen.\n"
+"Kliknite na \"Dalje\" za identifikaciju i slanje vaših postavki\n"
 
-#: ../mdkonline:204 ../mdkonline_tui:82
+#: ../mdkonline:178
 #, c-format
-msgid "Sending configuration..."
-msgstr "Šaljem postavke..."
+msgid "Your upload was successful!"
+msgstr "Slanje je uspješno!"
 
-#: ../mdkonline:213 ../mdkonline:273 ../mdkonline_tui:130 ../mdkonline_tui:169
-#: ../mdkupdate:124 ../mdkupdate:195
+#: ../mdkonline:178
 #, c-format
-msgid "Connection problem"
-msgstr "Problem sa konekcijom"
+msgid ""
+"From now you will receive on security and updates \n"
+"announcements thanks to Mandrakeonline."
+msgstr ""
+"Od sada ćete primati obavještenja o sigurnosti i\n"
+"ispravkama zahvaljujući Mandrakeonline."
+
+#: ../mdkonline:178
+#, c-format
+msgid ""
+"Mandrakeonline offers you the ability to automate the updates.\n"
+"A program will run regulary in your system waiting for new updates\n"
+msgstr ""
+"Mandrakeonline daje vam priliku da automatizirate ispravke.\n"
+"Program će se pokrenuti na vašem sistemu i čekati nove ispravke\n"
 
-#: ../mdkonline:213 ../mdkonline_tui:169
+#: ../mdkonline:180
 #, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr "Pojavio se problem prilikom slanja datoteka, pokušajte ponovo"
 
-#: ../mdkonline:251
+#: ../mdkonline:186
 #, c-format
-msgid "Quitting Wizard\n"
-msgstr "Izlazim iz čarobnjaka\n"
+msgid "Country"
+msgstr "Država"
 
-#: ../mdkonline:273
+#: ../mdkonline:198
 #, c-format
-msgid "Mandrakeonline could not be contacted, please try again at a later time"
-msgstr ""
-"Mandrakeonline nije mogao stupiti u kontakt sa stranicom, pokušajte ponovo "
-"kasnije"
+msgid "Congratulations"
+msgstr "Čestitam"
 
-#: ../mdkonline:285
+#: ../mdkonline:198
 #, c-format
-msgid "Wrong password"
-msgstr "Pogrešna šifra"
+msgid "Your Mandrakeonline account has been successfully configured\n"
+msgstr "Vaš račun za Mandrakeonline je uspješno podešen\n"
+
+#: ../mdkonline:214
+#, fuzzy, c-format
+msgid "Configuration uploaded successfully"
+msgstr "Slanje je uspješno!"
+
+#: ../mdkonline:215
+#, fuzzy, c-format
+msgid "Problem uploading configuration"
+msgstr "Čitam konfiguraciju\n"
 
-#: ../mdkonline:285 ../mdkonline_tui:130
+#: ../mdkonline:216
 #, c-format
 msgid ""
-"Your login or password was wrong.\n"
-" Either you'll have to type it again, or you'll need to create an account on "
-"Mandrakeonline.\n"
-" In the latter case, go back to the first step to connect to "
-"Mandrakeonline.\n"
-" Be aware that you must also provide a Machine name \n"
-" (only alphabetical characters are admitted)"
+"Cannot connect to mandrakeonline website: wrong login/password or router/"
+"firewall bad settings"
 msgstr ""
-"Vaše korisničko ime ili šifra nije ispravna.\n"
-"Ili je ukucajte ponovo ili ponovo kreirajte account na Mandrakeonline.\n"
-"Drugi put se vratite nazad na prvi korak kako bi se konektovali na\n"
-"Mandrakeonline.\n"
-" Upamtite da morate unijeti i naziv mašine \n"
-" (unesite samo alfabetske znakove)"
 
-#: ../mdkonline.pm:58
+#: ../mdkonline.pm:66
 #, c-format
 msgid "Login and password should be less than 12 characters\n"
 msgstr "Korisničko ime i šifra bi trebali biti dugi manje od 12 karaktera\n"
 
-#: ../mdkonline.pm:59
+#: ../mdkonline.pm:67
 #, c-format
 msgid "Special characters are not allowed\n"
 msgstr "Posebni karakteri nisu dozvoljeni\n"
 
-#: ../mdkonline.pm:60
+#: ../mdkonline.pm:68
 #, c-format
 msgid "Please fill in all fields\n"
 msgstr "Molim unesite sva polja\n"
 
-#: ../mdkonline.pm:61
+#: ../mdkonline.pm:69
 #, c-format
 msgid "Email not valid\n"
 msgstr "Neispravan email\n"
 
-#: ../mdkonline.pm:62
+#: ../mdkonline.pm:70
 #, c-format
 msgid "Account already exist\n"
 msgstr "Račun već postoji\n"
 
-#: ../mdkonline.pm:68
+#: ../mdkonline.pm:76
 #, c-format
 msgid "Problem connecting to server \n"
 msgstr "Problem pri spajanju na server\n"
 
-#: ../mdkonline_tui:45 ../mdkonline_tui:95
-#, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
-
-#: ../mdkonline_tui:48
-#, c-format
-msgid "I already have an account"
-msgstr "Već imam račun"
-
-#: ../mdkonline_tui:49
-#, c-format
-msgid "I want to subscribe"
-msgstr "Želim se pretplatiti"
-
-#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:120
-#, c-format
-msgid "Please wait"
-msgstr "Molim sačekajte"
-
-#: ../mdkonline_tui:103
-#, c-format
-msgid "Account creation or authentication"
-msgstr "Kreiranje računa ili identifikacija"
-
-#: ../mdkonline_tui:120
-#, c-format
-msgid "Connecting to Mandrakeonline website..."
-msgstr "Povezujem se sa Mandrakeonline web stranicom..."
-
-#: ../mdkonline_tui:130
-#, c-format
-msgid "or"
-msgstr "ili"
-
-#: ../mdkonline_tui:130
-#, c-format
-msgid "wrong password:"
-msgstr "pogrešna šifra:"
-
-#: ../mdkonline_tui:158
-#, c-format
-msgid ""
-"Mandrakeonline Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-"Račun za Mandrakeonline je uspješno napravljen.\n"
-"Kliknite na \"Dalje\" za identifikaciju i slanje vaših postavki\n"
-
-#: ../mdkonline_tui:175
-#, c-format
-msgid "Country"
-msgstr "Država"
-
-#: ../mdkonline_tui:187
-#, c-format
-msgid "Congratulations"
-msgstr "Čestitam"
-
-#: ../mdkonline_tui:187
-#, c-format
-msgid "Your Mandrakeonline account has been successfully configured\n"
-msgstr "Vaš račun za Mandrakeonline je uspješno podešen\n"
-
-#: ../mdkupdate:50
+#: ../mdkupdate:52
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
@@ -612,49 +562,97 @@ msgstr ""
 "\n"
 "upotreba:\n"
 
-#: ../mdkupdate:55
+#: ../mdkupdate:57
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - štampa ovu poruku.\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:58
 #, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto         - Mandrakeupdate se automatski pokreće.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:59
 #, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - pokreće Mandrakeupdate.\n"
 
-#: ../mdkupdate:58
-#, c-format
-msgid "  --update       - Update keys\n"
-msgstr "  --update       - Update keys\n"
-
-#: ../mdkupdate:66
+#: ../mdkupdate:67
 #, c-format
 msgid "No %s file found. Run mdkonline wizard first"
 msgstr "Datoteka %s nije pronađena. Prvo pokrenite mdkonline čarobnjaka"
 
-#: ../mdkupdate:124
+#: ../mdkupdate:126
 #, c-format
 msgid "Mandrakeupdate could not contact the site, we will try again."
-msgstr "MandrakeOnline nije mogao stupiti u kontakt sa stranicom, pokušat ćemo kasnije."
+msgstr ""
+"MandrakeOnline nije mogao stupiti u kontakt sa stranicom, pokušat ćemo "
+"kasnije."
 
-#: ../mdkupdate:173
+#: ../mdkupdate:176
 #, c-format
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr "Nisam u mogućnosti da uradim update paketa sa mdkupdate medija.\n"
 
-#: ../mdkupdate:195
+#: ../mdkupdate:198
 #, c-format
 msgid ""
 "Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
 "mandrakeonline [dot] net"
 msgstr ""
-"Mandrakeupdate nije mogao poslati \"diff\" datoteke. Pošaljite email za support [at] "
-"mandrakeonline [dot] net"
+"Mandrakeupdate nije mogao poslati \"diff\" datoteke. Pošaljite email za "
+"support [at] mandrakeonline [dot] net"
+
+#~ msgid "Next"
+#~ msgstr "Dalje"
+
+#~ msgid "Cancel"
+#~ msgstr "Odustani"
+
+#~ msgid "Previous"
+#~ msgstr "Nazad"
+
+#~ msgid "Welcome to Mandrakeonline"
+#~ msgstr "Dobro došli na Mandrakeonline"
+
+#~ msgid "I don't have a Mandrakeonline account and I want to subscribe"
+#~ msgstr "Nemam Mandrakeonline račun i želim se pretplatiti"
+
+#~ msgid "Mandrakelinux Privacy Policy"
+#~ msgstr "Mandrakelinux Privacy Policy"
+
+#~ msgid "Authentification"
+#~ msgstr "Identifikacija"
+
+#~ msgid "Send Configuration"
+#~ msgstr "Pošalji postavke"
+
+#~ msgid "Finish"
+#~ msgstr "Kraj"
+
+#~ msgid "automated Upgrades"
+#~ msgstr "automatizovna nadogradnja"
+
+#~ msgid "Country:"
+#~ msgstr "Država:"
+
+#~ msgid "Error"
+#~ msgstr "Greška"
+
+#~ msgid "Quitting Wizard\n"
+#~ msgstr "Izlazim iz čarobnjaka\n"
+
+#~ msgid ""
+#~ "Mandrakeonline could not be contacted, please try again at a later time"
+#~ msgstr ""
+#~ "Mandrakeonline nije mogao stupiti u kontakt sa stranicom, pokušajte "
+#~ "ponovo kasnije"
+
+#~ msgid "Wrong password"
+#~ msgstr "Pogrešna šifra"
+
+#~ msgid "  --update       - Update keys\n"
+#~ msgstr "  --update       - Update keys\n"
 
 #~ msgid "Skip Wizard"
 #~ msgstr "Preskoči Čarobnjaka"
@@ -670,10 +668,6 @@ msgstr ""
 #~ msgstr "E-mail"
 
 #, fuzzy
-#~ msgid "Response from MandrakeOnline server\n"
-#~ msgstr "Dobro došli na MandrakeOnline"
-
-#, fuzzy
 #~ msgid "Launching MandrakeUpdate\n"
 #~ msgstr "  --applet       - update-ira sve informacije.\n"
 
@@ -756,4 +750,3 @@ msgstr ""
 
 #~ msgid "Really abort? - MandrakeOnline"
 #~ msgstr "Zaista prekini? - MandrakeOnline"
-
diff --git a/po/ca.po b/po/ca.po
index d7c1177d..c7dada3e 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ca\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-01 22:41+0200\n"
+"POT-Creation-Date: 2004-11-03 12:10+0100\n"
 "PO-Revision-Date: 2004-10-03 22:59+0200\n"
 "Last-Translator: Albert Astals Cid <astals11@terra.es>\n"
 "Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
@@ -18,12 +18,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3.1\n"
 
-#: ../mdkapplet:61
+#: ../mdkapplet:63
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "El vostre sistema està actualitzat"
 
-#: ../mdkapplet:67
+#: ../mdkapplet:69
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -32,260 +32,280 @@ msgstr ""
 "Problema de configuració del servei. Comproveu els logs i envieu un correu a "
 "support@mandrakeonline.net"
 
-#: ../mdkapplet:73
+#: ../mdkapplet:75
 #, c-format
 msgid "System is busy. Please wait ..."
 msgstr "El sistema està ocupat. Espereu ..."
 
-#: ../mdkapplet:79
+#: ../mdkapplet:81
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Hi ha actualitzacions disponibles pel vostre sistema"
 
-#: ../mdkapplet:85
+#: ../mdkapplet:87
 #, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr "El servei no està configurat. Premeu a \"configura el servei\""
 
-#: ../mdkapplet:91
+#: ../mdkapplet:93
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "La xarxa està inactiva. Si us plau configureu-la"
 
-#: ../mdkapplet:97
+#: ../mdkapplet:99
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 
-#: ../mdkapplet:103
+#: ../mdkapplet:105
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:108 ../mdkapplet:158
+#: ../mdkapplet:110 ../mdkapplet:164
 #, c-format
 msgid "Install updates"
 msgstr "Instal·la actualitzacions"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:111
 #, c-format
 msgid "Configure the service"
 msgstr "Configura el servei"
 
-#: ../mdkapplet:110
+#: ../mdkapplet:112
 #, c-format
 msgid "Check Updates"
 msgstr "Comprova actualitzacions"
 
-#: ../mdkapplet:111
+#: ../mdkapplet:113 ../mdkapplet:167 ../mdkapplet:225
+#, fuzzy, c-format
+msgid "Please Wait"
+msgstr "Espereu si us plau"
+
+#: ../mdkapplet:113 ../mdkapplet:166 ../mdkapplet:167 ../mdkapplet:225
+#, c-format
+msgid "Check updates"
+msgstr "Comprova actualitzacions"
+
+#: ../mdkapplet:115
 #, c-format
 msgid "Online WebSite"
 msgstr ""
 
-#: ../mdkapplet:112
+#: ../mdkapplet:116
 #, c-format
 msgid "Configure Network"
 msgstr "Configura la xarxa"
 
-#: ../mdkapplet:113
+#: ../mdkapplet:117
 #, c-format
 msgid "Configure Now!"
 msgstr "Configura ara!"
 
-#: ../mdkapplet:146
+#: ../mdkapplet:152 ../mdkapplet:229
 #, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Applet Mandrakelinux Update"
 
-#: ../mdkapplet:156
+#: ../mdkapplet:162
 #, c-format
 msgid "Actions"
 msgstr "Accions"
 
-#: ../mdkapplet:159
+#: ../mdkapplet:165
 #, c-format
 msgid "Configure"
 msgstr "Configura"
 
-#: ../mdkapplet:160
-#, c-format
-msgid "Check updates"
-msgstr "Comprova actualitzacions"
-
-#: ../mdkapplet:161
+#: ../mdkapplet:169
 #, c-format
 msgid "See logs"
 msgstr "Veure els logs"
 
-#: ../mdkapplet:164
+#: ../mdkapplet:172
 #, c-format
 msgid "Status"
 msgstr "Estat"
 
-#: ../mdkapplet:168 ../mdkapplet:363
+#: ../mdkapplet:176 ../mdkapplet:375
 #, c-format
 msgid "Close"
 msgstr "Tanca"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Network Connection: "
 msgstr "Connexió de xarxa: "
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Up"
 msgstr "Funcionant"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Down"
 msgstr "Caiguda"
 
-#: ../mdkapplet:204
+#: ../mdkapplet:212
 #, c-format
 msgid "Last check: "
 msgstr "Última comprovació: "
 
-#: ../mdkapplet:205
+#: ../mdkapplet:213
 #, c-format
 msgid "Updates: "
 msgstr "Actualitzacions: "
 
-#: ../mdkapplet:209
+#: ../mdkapplet:217
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "S'està executant drakconnect\n"
 
-#: ../mdkapplet:213
+#: ../mdkapplet:221
 #, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr ""
 
-#: ../mdkapplet:217
+#: ../mdkapplet:224
 #, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 
-#: ../mdkapplet:225
+#: ../mdkapplet:235
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "S'estan computant les noves actualitzacions...\n"
 
-#: ../mdkapplet:227
+#: ../mdkapplet:237
 #, c-format
 msgid "Connecting to"
 msgstr "S'està connectant a"
 
-#: ../mdkapplet:250
+#: ../mdkapplet:244
+#, c-format
+msgid "Response from Mandrakeonline server\n"
+msgstr "Resposta del servidor de Mandrakeonline\n"
+
+#: ../mdkapplet:262
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "S'està comprovant ...Hi ha actualitzacions disponibles\n"
 
-#: ../mdkapplet:254
+#: ../mdkapplet:267
 #, c-format
 msgid "Development release not supported by service"
 msgstr "Les versions de desenvolupament no estan suportades pel servei"
 
-#: ../mdkapplet:255
+#: ../mdkapplet:268
 #, c-format
 msgid "Too old release not supported by service"
 msgstr "Versió massa antiga no suportada pel servei"
 
-#: ../mdkapplet:256
+#: ../mdkapplet:269
 #, c-format
 msgid "Unknown state"
 msgstr "Estat desconegut"
 
-#: ../mdkapplet:257
+#: ../mdkapplet:270
 #, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr ""
 
-#: ../mdkapplet:258
+#: ../mdkapplet:271
 #, c-format
 msgid "Wrong Password.\n"
 msgstr "Contrasenya incorrecta.\n"
 
-#: ../mdkapplet:259
+#: ../mdkapplet:272
 #, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr ""
 
-#: ../mdkapplet:260
+#: ../mdkapplet:273
 #, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
 msgstr ""
 
-#: ../mdkapplet:264
+#: ../mdkapplet:277
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "El sistema està actualitzat\n"
 
-#: ../mdkapplet:303
+#: ../mdkapplet:317
 #, c-format
 msgid "No check"
 msgstr "No comprovis"
 
-#: ../mdkapplet:316
+#: ../mdkapplet:330
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "S'està comprovant la xarxa: sembla estar desactivada\n"
 
-#: ../mdkapplet:319
+#: ../mdkapplet:333
 #, c-format
 msgid "Checking config file: Not present\n"
 msgstr ""
 "S'està comprovant l'existència del fitxer de configuració: No està present\n"
 
-#: ../mdkapplet:353
+#: ../mdkapplet:365
 #, c-format
 msgid "Logs"
 msgstr "Registres"
 
-#: ../mdkapplet:369
+#: ../mdkapplet:381
 #, c-format
 msgid "Clear"
 msgstr "Neteja"
 
-#: ../mdkapplet:396
+#: ../mdkapplet:408
 #, c-format
 msgid "About..."
 msgstr "Quant a..."
 
-#: ../mdkapplet:397
+#: ../mdkapplet:409
 #, c-format
 msgid "Always launch on startup"
 msgstr "Executa sempre al inici"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:411
 #, c-format
 msgid "Quit"
 msgstr "Surt"
 
-#: ../mdkonline:89
+#: ../mdkonline:52 ../mdkonline:106
 #, c-format
-msgid "Next"
-msgstr "Següent"
+msgid "Mandrakeonline"
+msgstr "Mandrakeonline"
 
-#: ../mdkonline:89
+#: ../mdkonline:55
 #, c-format
-msgid "Cancel"
-msgstr "Cancel·la"
+msgid "I already have an account"
+msgstr "Ja tinc un compte"
+
+#: ../mdkonline:56
+#, c-format
+msgid "I want to subscribe"
+msgstr "Vull subscriure'm"
+
+#: ../mdkonline:89 ../mdkonline:93 ../mdkonline:131
+#, c-format
+msgid "Please wait"
+msgstr "Espereu si us plau"
 
 #: ../mdkonline:89
 #, c-format
-msgid "Previous"
-msgstr "Anterior"
+msgid "Reading configuration\n"
+msgstr "S'està llegint la configuració\n"
 
-#: ../mdkonline:103
+#: ../mdkonline:93
 #, c-format
-msgid "Welcome to Mandrakeonline"
-msgstr "Benvingut a Mandrakeonline"
+msgid "Sending configuration..."
+msgstr "S'està enviant la configuració..."
 
-#: ../mdkonline:104 ../mdkonline_tui:98
+#: ../mdkonline:109
 #, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
@@ -297,64 +317,39 @@ msgstr ""
 "per tal de mantenir-vos informat sobre les actualitzacions de seguretat i "
 "altres millores.\n"
 
-#: ../mdkonline:105 ../mdkonline_tui:142
+#: ../mdkonline:114
 #, c-format
-msgid "Create a Mandrakeonline Account"
-msgstr "Crea un compte a Mandrakeonline"
+msgid "Account creation or authentication"
+msgstr ""
 
-#: ../mdkonline:107
+#: ../mdkonline:119
 #, c-format
-msgid "I don't have a Mandrakeonline account and I want to subscribe"
-msgstr "No tinc cap compte de Mandrakeonline i en vull un"
+msgid "Enter your Mandrakeonline login, password and machine name:"
+msgstr ""
+"Introduïu el vostre nom d'usuari, contrasenya i nom de màquina de "
+"Mandrakeonline:"
 
-#: ../mdkonline:111 ../mdkonline:131 ../mdkonline_tui:114 ../mdkonline_tui:145
+#: ../mdkonline:125 ../mdkonline:156
 #, c-format
 msgid "Login:"
 msgstr "Nom d'usuari:"
 
-#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:115 ../mdkonline_tui:146
+#: ../mdkonline:126 ../mdkonline:157
 #, c-format
 msgid "Password:"
 msgstr "Contrasenya:"
 
-#: ../mdkonline:113 ../mdkonline_tui:147
-#, c-format
-msgid "Confirm Password:"
-msgstr "Confirmació de la contrasenya:"
-
-#: ../mdkonline:114 ../mdkonline_tui:148
-#, c-format
-msgid "Mail contact:"
-msgstr "Contacte de correu:"
-
-#: ../mdkonline:121
-#, c-format
-msgid "Mandrakelinux Privacy Policy"
-msgstr "Normes de privacitat de Mandrakelinux"
-
 #: ../mdkonline:127
 #, c-format
-msgid "Authentification"
-msgstr "Autenticació"
-
-#: ../mdkonline:128 ../mdkonline_tui:108
-#, c-format
-msgid "Enter your Mandrakeonline login, password and machine name:"
-msgstr ""
-"Introduïu el vostre nom d'usuari, contrasenya i nom de màquina de "
-"Mandrakeonline:"
-
-#: ../mdkonline:133 ../mdkonline_tui:116
-#, c-format
 msgid "Machine name:"
 msgstr "Nom de màquina:"
 
-#: ../mdkonline:138
+#: ../mdkonline:131
 #, c-format
-msgid "Send Configuration"
-msgstr "Envia la configuració"
+msgid "Connecting to Mandrakeonline website..."
+msgstr "S'està connectant a la web de Mandrakeonline..."
 
-#: ../mdkonline:139 ../mdkonline_tui:128
+#: ../mdkonline:139
 #, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
@@ -387,57 +382,55 @@ msgstr ""
 "A més, gaudireu de descomptes en els serveis de suport de pagament de\n"
 "www.mandrakeexpert.com."
 
-#: ../mdkonline:144 ../mdkonline:211 ../mdkonline:234
+#: ../mdkonline:141 ../mdkonline:180 ../mdkupdate:126 ../mdkupdate:198
 #, c-format
-msgid "Finish"
-msgstr "Finalitza"
+msgid "Connection problem"
+msgstr "Problema de connexió"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid "Your upload was successful!"
-msgstr ""
+msgid "or"
+msgstr "o"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandrakeonline."
-msgstr ""
-"A partir d'ara, gràcies a Mandrakeonline, rebreu\n"
-"avisos d'actualitzacions i millores de seguretat."
+msgid "wrong password:"
+msgstr "Contrasenya incorrecta:"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
 msgid ""
-"Mandrakeonline offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+"Your login or password was wrong.\n"
+" Either you'll have to type it again, or you'll need to create an account on "
+"Mandrakeonline.\n"
+" In the latter case, go back to the first step to connect to "
+"Mandrakeonline.\n"
+" Be aware that you must also provide a Machine name \n"
+" (only alphabetical characters are admitted)"
 msgstr ""
-"Mandrakeonline us ofereix la possibilitat d'automatitzar les "
-"actualitzacions.\n"
-"S'executarà regularment un programa per comprovar si hi ha noves "
-"actualitzacions\n"
-
-#: ../mdkonline:146
-#, c-format
-msgid "automated Upgrades"
-msgstr "actualitzacions automàtiques"
+"El nom d'usuari o la contrasenya són incorrectes.\n"
+" Us caldrà tornar-los a escriure, o bé crear un compte a Mandrakeonline.\n"
+" En aquest darrer cas, torneu al primer pas per connectar amb "
+"Mandrakeonline.\n"
+" Estigueu avisat de que també cal proporcionar un nom de màquina \n"
+" (només s'admeten caràcters de l'alfabet)"
 
-#: ../mdkonline:150
+#: ../mdkonline:153
 #, c-format
-msgid "Country:"
-msgstr "País:"
+msgid "Create a Mandrakeonline Account"
+msgstr "Crea un compte a Mandrakeonline"
 
-#: ../mdkonline:178 ../mdkonline:183 ../mdkonline:185 ../mdkonline:187
+#: ../mdkonline:158
 #, c-format
-msgid "Error"
-msgstr "Error"
+msgid "Confirm Password:"
+msgstr "Confirmació de la contrasenya:"
 
-#: ../mdkonline:183 ../mdkonline_tui:152
+#: ../mdkonline:159
 #, c-format
-msgid "Please provide a login"
-msgstr "Si us plau doneu un login"
+msgid "Mail contact:"
+msgstr "Contacte de correu:"
 
-#: ../mdkonline:185 ../mdkonline_tui:152
+#: ../mdkonline:163
 #, c-format
 msgid ""
 "The passwords do not match\n"
@@ -446,160 +439,117 @@ msgstr ""
 "Les contrasenyes no concorden\n"
 " Si us plau intenteu-ho de nou\n"
 
-#: ../mdkonline:187 ../mdkonline_tui:152
+#: ../mdkonline:163
+#, c-format
+msgid "Please provide a login"
+msgstr "Si us plau doneu un login"
+
+#: ../mdkonline:163
 #, c-format
 msgid "Not a valid mail address!\n"
 msgstr "No és una adreça de correu vàlida!\n"
 
-#: ../mdkonline:199 ../mdkonline_tui:78
+#: ../mdkonline:169
 #, c-format
-msgid "Reading configuration\n"
-msgstr "S'està llegint la configuració\n"
+msgid ""
+"Mandrakeonline Account successfully created.\n"
+"Please click \"Next\" to authenticate and upload your configuration\n"
+msgstr ""
 
-#: ../mdkonline:204 ../mdkonline_tui:82
+#: ../mdkonline:178
 #, c-format
-msgid "Sending configuration..."
-msgstr "S'està enviant la configuració..."
+msgid "Your upload was successful!"
+msgstr ""
 
-#: ../mdkonline:213 ../mdkonline:273 ../mdkonline_tui:130 ../mdkonline_tui:169
-#: ../mdkupdate:124 ../mdkupdate:195
+#: ../mdkonline:178
 #, c-format
-msgid "Connection problem"
-msgstr "Problema de connexió"
+msgid ""
+"From now you will receive on security and updates \n"
+"announcements thanks to Mandrakeonline."
+msgstr ""
+"A partir d'ara, gràcies a Mandrakeonline, rebreu\n"
+"avisos d'actualitzacions i millores de seguretat."
+
+#: ../mdkonline:178
+#, c-format
+msgid ""
+"Mandrakeonline offers you the ability to automate the updates.\n"
+"A program will run regulary in your system waiting for new updates\n"
+msgstr ""
+"Mandrakeonline us ofereix la possibilitat d'automatitzar les "
+"actualitzacions.\n"
+"S'executarà regularment un programa per comprovar si hi ha noves "
+"actualitzacions\n"
 
-#: ../mdkonline:213 ../mdkonline_tui:169
+#: ../mdkonline:180
 #, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr ""
 
-#: ../mdkonline:251
+#: ../mdkonline:186
 #, c-format
-msgid "Quitting Wizard\n"
-msgstr "S'està sortint de l'auxiliar\n"
+msgid "Country"
+msgstr "País"
 
-#: ../mdkonline:273
+#: ../mdkonline:198
 #, c-format
-msgid "Mandrakeonline could not be contacted, please try again at a later time"
+msgid "Congratulations"
+msgstr "Felicitats"
+
+#: ../mdkonline:198
+#, c-format
+msgid "Your Mandrakeonline account has been successfully configured\n"
 msgstr ""
-"No s'ha pogut contactar amb Mandrakeonline, si us plau, provi-ho més tard"
 
-#: ../mdkonline:285
+#: ../mdkonline:214
 #, c-format
-msgid "Wrong password"
-msgstr "Contrasenya incorrecta"
+msgid "Configuration uploaded successfully"
+msgstr ""
+
+#: ../mdkonline:215
+#, fuzzy, c-format
+msgid "Problem uploading configuration"
+msgstr "S'està llegint la configuració\n"
 
-#: ../mdkonline:285 ../mdkonline_tui:130
+#: ../mdkonline:216
 #, c-format
 msgid ""
-"Your login or password was wrong.\n"
-" Either you'll have to type it again, or you'll need to create an account on "
-"Mandrakeonline.\n"
-" In the latter case, go back to the first step to connect to "
-"Mandrakeonline.\n"
-" Be aware that you must also provide a Machine name \n"
-" (only alphabetical characters are admitted)"
+"Cannot connect to mandrakeonline website: wrong login/password or router/"
+"firewall bad settings"
 msgstr ""
-"El nom d'usuari o la contrasenya són incorrectes.\n"
-" Us caldrà tornar-los a escriure, o bé crear un compte a Mandrakeonline.\n"
-" En aquest darrer cas, torneu al primer pas per connectar amb "
-"Mandrakeonline.\n"
-" Estigueu avisat de que també cal proporcionar un nom de màquina \n"
-" (només s'admeten caràcters de l'alfabet)"
 
-#: ../mdkonline.pm:58
+#: ../mdkonline.pm:66
 #, c-format
 msgid "Login and password should be less than 12 characters\n"
 msgstr ""
 "Tant el nom d'usuari com la contrasenya han de tenir menys de 12 caràcters\n"
 
-#: ../mdkonline.pm:59
+#: ../mdkonline.pm:67
 #, c-format
 msgid "Special characters are not allowed\n"
 msgstr "No es permeten caràcters especials\n"
 
-#: ../mdkonline.pm:60
+#: ../mdkonline.pm:68
 #, c-format
 msgid "Please fill in all fields\n"
 msgstr "Si us plau ompliu tots els camps\n"
 
-#: ../mdkonline.pm:61
+#: ../mdkonline.pm:69
 #, c-format
 msgid "Email not valid\n"
 msgstr "Correu no vàlid\n"
 
-#: ../mdkonline.pm:62
+#: ../mdkonline.pm:70
 #, c-format
 msgid "Account already exist\n"
 msgstr "El compte ja existeix\n"
 
-#: ../mdkonline.pm:68
+#: ../mdkonline.pm:76
 #, c-format
 msgid "Problem connecting to server \n"
 msgstr "Problemes connectant al servidor \n"
 
-#: ../mdkonline_tui:45 ../mdkonline_tui:95
-#, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
-
-#: ../mdkonline_tui:48
-#, c-format
-msgid "I already have an account"
-msgstr "Ja tinc un compte"
-
-#: ../mdkonline_tui:49
-#, c-format
-msgid "I want to subscribe"
-msgstr "Vull subscriure'm"
-
-#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:120
-#, c-format
-msgid "Please wait"
-msgstr "Espereu si us plau"
-
-#: ../mdkonline_tui:103
-#, c-format
-msgid "Account creation or authentication"
-msgstr ""
-
-#: ../mdkonline_tui:120
-#, c-format
-msgid "Connecting to Mandrakeonline website..."
-msgstr "S'està connectant a la web de Mandrakeonline..."
-
-#: ../mdkonline_tui:130
-#, c-format
-msgid "or"
-msgstr "o"
-
-#: ../mdkonline_tui:130
-#, c-format
-msgid "wrong password:"
-msgstr "Contrasenya incorrecta:"
-
-#: ../mdkonline_tui:158
-#, c-format
-msgid ""
-"Mandrakeonline Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-
-#: ../mdkonline_tui:175
-#, c-format
-msgid "Country"
-msgstr "País"
-
-#: ../mdkonline_tui:187
-#, c-format
-msgid "Congratulations"
-msgstr "Felicitats"
-
-#: ../mdkonline_tui:187
-#, c-format
-msgid "Your Mandrakeonline account has been successfully configured\n"
-msgstr ""
-
-#: ../mdkupdate:50
+#: ../mdkupdate:52
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
@@ -616,49 +566,94 @@ msgstr ""
 "\n"
 "sintaxi:\n"
 
-#: ../mdkupdate:55
+#: ../mdkupdate:57
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - mostra aquest missatge d'ajuda.\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:58
 #, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto         - Mandrakeupdate es llança automàticament.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:59
 #, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - actualitza Mandrakeupdate.\n"
 
-#: ../mdkupdate:58
-#, c-format
-msgid "  --update       - Update keys\n"
-msgstr "  --update       - Actualitza les claus\n"
-
-#: ../mdkupdate:66
+#: ../mdkupdate:67
 #, c-format
 msgid "No %s file found. Run mdkonline wizard first"
 msgstr ""
 
-#: ../mdkupdate:124
+#: ../mdkupdate:126
 #, c-format
 msgid "Mandrakeupdate could not contact the site, we will try again."
 msgstr ""
 "Mandrakeupdate no ha pogut contactar amb el lloc, ho provarem més tard."
 
-#: ../mdkupdate:173
+#: ../mdkupdate:176
 #, c-format
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr "No es poden actualitzar els paquets des del suport mdkupdate.\n"
 
-#: ../mdkupdate:195
+#: ../mdkupdate:198
 #, c-format
 msgid ""
 "Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
 "mandrakeonline [dot] net"
 msgstr ""
 
+#~ msgid "Next"
+#~ msgstr "Següent"
+
+#~ msgid "Cancel"
+#~ msgstr "Cancel·la"
+
+#~ msgid "Previous"
+#~ msgstr "Anterior"
+
+#~ msgid "Welcome to Mandrakeonline"
+#~ msgstr "Benvingut a Mandrakeonline"
+
+#~ msgid "I don't have a Mandrakeonline account and I want to subscribe"
+#~ msgstr "No tinc cap compte de Mandrakeonline i en vull un"
+
+#~ msgid "Mandrakelinux Privacy Policy"
+#~ msgstr "Normes de privacitat de Mandrakelinux"
+
+#~ msgid "Authentification"
+#~ msgstr "Autenticació"
+
+#~ msgid "Send Configuration"
+#~ msgstr "Envia la configuració"
+
+#~ msgid "Finish"
+#~ msgstr "Finalitza"
+
+#~ msgid "automated Upgrades"
+#~ msgstr "actualitzacions automàtiques"
+
+#~ msgid "Country:"
+#~ msgstr "País:"
+
+#~ msgid "Error"
+#~ msgstr "Error"
+
+#~ msgid "Quitting Wizard\n"
+#~ msgstr "S'està sortint de l'auxiliar\n"
+
+#~ msgid ""
+#~ "Mandrakeonline could not be contacted, please try again at a later time"
+#~ msgstr ""
+#~ "No s'ha pogut contactar amb Mandrakeonline, si us plau, provi-ho més tard"
+
+#~ msgid "Wrong password"
+#~ msgstr "Contrasenya incorrecta"
+
+#~ msgid "  --update       - Update keys\n"
+#~ msgstr "  --update       - Actualitza les claus\n"
+
 #~ msgid "Skip Wizard"
 #~ msgstr "Salta l'auxiliar"
 
@@ -707,9 +702,6 @@ msgstr ""
 #~ msgid "Server Problem"
 #~ msgstr "Problema del servidor"
 
-#~ msgid "Response from Mandrakeonline server\n"
-#~ msgstr "Resposta del servidor de Mandrakeonline\n"
-
 #~ msgid "Launching Mandrakeupdate\n"
 #~ msgstr "S'està executant Mandrakeupdate\n"
 
diff --git a/po/cs.po b/po/cs.po
index 07b6489a..2f41bc8d 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-cs\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-01 22:41+0200\n"
+"POT-Creation-Date: 2004-11-03 12:10+0100\n"
 "PO-Revision-Date: 2004-10-02 10:06+0200\n"
 "Last-Translator: Michal Bukovjan <bukm@centrum.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -21,12 +21,12 @@ msgstr ""
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ../mdkapplet:61
+#: ../mdkapplet:63
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Váš systém je plně aktuální"
 
-#: ../mdkapplet:67
+#: ../mdkapplet:69
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -35,187 +35,197 @@ msgstr ""
 "Problém s nastavením služby. Zkontrolujte prosím záznamy a pošlete email na "
 "support@mandrakeonline.net"
 
-#: ../mdkapplet:73
+#: ../mdkapplet:75
 #, c-format
 msgid "System is busy. Please wait ..."
 msgstr "Systém je zaneprázdněn. Počkejte..."
 
-#: ../mdkapplet:79
+#: ../mdkapplet:81
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Pro váš systém jsou k dispozici nové aktualizace"
 
-#: ../mdkapplet:85
+#: ../mdkapplet:87
 #, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr "Služba není nastavena. Klikněte prosím na \"Nastavit službu\""
 
-#: ../mdkapplet:91
+#: ../mdkapplet:93
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Síť není dostupná. Nastavte prosím vaši síť"
 
-#: ../mdkapplet:97
+#: ../mdkapplet:99
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Služba není aktivována. Klikněte prosím na \"Online webové stránky\""
 
-#: ../mdkapplet:103
+#: ../mdkapplet:105
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "Verze není podporována (příliš stará nebo vývojová verze)"
 
-#: ../mdkapplet:108 ../mdkapplet:158
+#: ../mdkapplet:110 ../mdkapplet:164
 #, c-format
 msgid "Install updates"
 msgstr "Instalovat aktualizace"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:111
 #, c-format
 msgid "Configure the service"
 msgstr "Nastavit službu"
 
-#: ../mdkapplet:110
+#: ../mdkapplet:112
 #, c-format
 msgid "Check Updates"
 msgstr "Zkontrolovat aktualizace"
 
-#: ../mdkapplet:111
+#: ../mdkapplet:113 ../mdkapplet:167 ../mdkapplet:225
+#, fuzzy, c-format
+msgid "Please Wait"
+msgstr "Prosím počkejte"
+
+#: ../mdkapplet:113 ../mdkapplet:166 ../mdkapplet:167 ../mdkapplet:225
+#, c-format
+msgid "Check updates"
+msgstr "Zkontrolovat aktualizace"
+
+#: ../mdkapplet:115
 #, c-format
 msgid "Online WebSite"
 msgstr "Online webové stránky"
 
-#: ../mdkapplet:112
+#: ../mdkapplet:116
 #, c-format
 msgid "Configure Network"
 msgstr "Nastavit síť"
 
-#: ../mdkapplet:113
+#: ../mdkapplet:117
 #, c-format
 msgid "Configure Now!"
 msgstr "Nastavit teď!"
 
-#: ../mdkapplet:146
+#: ../mdkapplet:152 ../mdkapplet:229
 #, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Aplet pro aktualizace Mandrakelinux"
 
-#: ../mdkapplet:156
+#: ../mdkapplet:162
 #, c-format
 msgid "Actions"
 msgstr "Akce"
 
-#: ../mdkapplet:159
+#: ../mdkapplet:165
 #, c-format
 msgid "Configure"
 msgstr "Nastavit"
 
-#: ../mdkapplet:160
-#, c-format
-msgid "Check updates"
-msgstr "Zkontrolovat aktualizace"
-
-#: ../mdkapplet:161
+#: ../mdkapplet:169
 #, c-format
 msgid "See logs"
 msgstr "Prohlížet záznamy"
 
-#: ../mdkapplet:164
+#: ../mdkapplet:172
 #, c-format
 msgid "Status"
 msgstr "Stav"
 
-#: ../mdkapplet:168 ../mdkapplet:363
+#: ../mdkapplet:176 ../mdkapplet:375
 #, c-format
 msgid "Close"
 msgstr "Zavřít"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Network Connection: "
 msgstr "Připojení k síti: "
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Up"
 msgstr "Připojeno"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Down"
 msgstr "Není"
 
-#: ../mdkapplet:204
+#: ../mdkapplet:212
 #, c-format
 msgid "Last check: "
 msgstr "Poslední kontrola: "
 
-#: ../mdkapplet:205
+#: ../mdkapplet:213
 #, c-format
 msgid "Updates: "
 msgstr "Aktualizace: "
 
-#: ../mdkapplet:209
+#: ../mdkapplet:217
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Spouští se drakconnect\n"
 
-#: ../mdkapplet:213
+#: ../mdkapplet:221
 #, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "Spouští se mdkupdate --applet\n"
 
-#: ../mdkapplet:217
+#: ../mdkapplet:224
 #, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr "Mandrakeonline vypadá, že je přeinstalováno, znovu nahrávám aplet...."
 
-#: ../mdkapplet:225
+#: ../mdkapplet:235
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Vyhledávám nové aktualizace...\n"
 
-#: ../mdkapplet:227
+#: ../mdkapplet:237
 #, c-format
 msgid "Connecting to"
 msgstr "Připojuji se k"
 
-#: ../mdkapplet:250
+#: ../mdkapplet:244
+#, fuzzy, c-format
+msgid "Response from Mandrakeonline server\n"
+msgstr "Vítá vás Mandrakeonline"
+
+#: ../mdkapplet:262
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Zjišťuji... Aktualizace jsou dostupné\n"
 
-#: ../mdkapplet:254
+#: ../mdkapplet:267
 #, c-format
 msgid "Development release not supported by service"
 msgstr "Služba nepodporuje vývojovou verzi"
 
-#: ../mdkapplet:255
+#: ../mdkapplet:268
 #, c-format
 msgid "Too old release not supported by service"
 msgstr "Služba nepodporuje přiliš starou verzi"
 
-#: ../mdkapplet:256
+#: ../mdkapplet:269
 #, c-format
 msgid "Unknown state"
 msgstr "Neznámý stav"
 
-#: ../mdkapplet:257
+#: ../mdkapplet:270
 #, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr "Online služby jsou vypnuty. Kontaktujte stránky Mandrakeonline\n"
 
-#: ../mdkapplet:258
+#: ../mdkapplet:271
 #, c-format
 msgid "Wrong Password.\n"
 msgstr "Špatné heslo\n"
 
-#: ../mdkapplet:259
+#: ../mdkapplet:272
 #, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr "Chybná akce nebo počítač nebo přihlášení.\n"
 
-#: ../mdkapplet:260
+#: ../mdkapplet:273
 #, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
@@ -224,72 +234,82 @@ msgstr ""
 "S vaším nastavením sítě není něco v pořádku (zkontrolujte nastavení "
 "směrování, firewallu nebo proxy)\n"
 
-#: ../mdkapplet:264
+#: ../mdkapplet:277
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Systém je aktuální\n"
 
-#: ../mdkapplet:303
+#: ../mdkapplet:317
 #, c-format
 msgid "No check"
 msgstr "Nezjištěno"
 
-#: ../mdkapplet:316
+#: ../mdkapplet:330
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Kontroluji síť: zdá se nedostupná\n"
 
-#: ../mdkapplet:319
+#: ../mdkapplet:333
 #, c-format
 msgid "Checking config file: Not present\n"
 msgstr "Kontroluji soubor s nastavením: Nenalezen\n"
 
-#: ../mdkapplet:353
+#: ../mdkapplet:365
 #, c-format
 msgid "Logs"
 msgstr "Záznamy"
 
-#: ../mdkapplet:369
+#: ../mdkapplet:381
 #, c-format
 msgid "Clear"
 msgstr "Vyčistit"
 
-#: ../mdkapplet:396
+#: ../mdkapplet:408
 #, c-format
 msgid "About..."
 msgstr "O aplikaci..."
 
-#: ../mdkapplet:397
+#: ../mdkapplet:409
 #, c-format
 msgid "Always launch on startup"
 msgstr "Vždy spustit při startu"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:411
 #, c-format
 msgid "Quit"
 msgstr "Konec"
 
-#: ../mdkonline:89
+#: ../mdkonline:52 ../mdkonline:106
 #, c-format
-msgid "Next"
-msgstr "Další"
+msgid "Mandrakeonline"
+msgstr "Mandrakeonline"
 
-#: ../mdkonline:89
+#: ../mdkonline:55
+#, c-format
+msgid "I already have an account"
+msgstr "Už mám účet"
+
+#: ../mdkonline:56
+#, c-format
+msgid "I want to subscribe"
+msgstr "Chci se zaregistrovat"
+
+#: ../mdkonline:89 ../mdkonline:93 ../mdkonline:131
 #, c-format
-msgid "Cancel"
-msgstr "Zrušit"
+msgid "Please wait"
+msgstr "Prosím počkejte"
 
 #: ../mdkonline:89
 #, c-format
-msgid "Previous"
-msgstr "Zpět"
+msgid "Reading configuration\n"
+msgstr "Načíst konfiguraci\n"
 
-#: ../mdkonline:103
+#: ../mdkonline:93
 #, c-format
-msgid "Welcome to Mandrakeonline"
-msgstr "Vítá vás Mandrakeonline"
+msgid "Sending configuration..."
+msgstr "Posílám konfiguraci..."
 
-#: ../mdkonline:104 ../mdkonline_tui:98
+#: ../mdkonline:109
 #, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
@@ -301,62 +321,37 @@ msgstr ""
 "kdy budete ihned informováni o všech bezpečnostních a dalších\n"
 "potřebných aktualizacích.\n"
 
-#: ../mdkonline:105 ../mdkonline_tui:142
+#: ../mdkonline:114
 #, c-format
-msgid "Create a Mandrakeonline Account"
-msgstr "Vytvořit účet na Mandrakeonline"
+msgid "Account creation or authentication"
+msgstr "Vytvoření nebo ověření účtu"
 
-#: ../mdkonline:107
+#: ../mdkonline:119
 #, c-format
-msgid "I don't have a Mandrakeonline account and I want to subscribe"
-msgstr "Nemám účet na Mandrakeonline a chci se zaregistrovat"
+msgid "Enter your Mandrakeonline login, password and machine name:"
+msgstr "Zadejte jméno, heslo a název počítače pro Mandrakeonline:"
 
-#: ../mdkonline:111 ../mdkonline:131 ../mdkonline_tui:114 ../mdkonline_tui:145
+#: ../mdkonline:125 ../mdkonline:156
 #, c-format
 msgid "Login:"
 msgstr "Jméno:"
 
-#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:115 ../mdkonline_tui:146
+#: ../mdkonline:126 ../mdkonline:157
 #, c-format
 msgid "Password:"
 msgstr "Heslo:"
 
-#: ../mdkonline:113 ../mdkonline_tui:147
-#, c-format
-msgid "Confirm Password:"
-msgstr "Potvrdit heslo:"
-
-#: ../mdkonline:114 ../mdkonline_tui:148
-#, c-format
-msgid "Mail contact:"
-msgstr "Emailový kontakt:"
-
-#: ../mdkonline:121
-#, c-format
-msgid "Mandrakelinux Privacy Policy"
-msgstr "Ochrana soukromí společnosti Mandrakelinux"
-
 #: ../mdkonline:127
 #, c-format
-msgid "Authentification"
-msgstr "Ověřování"
-
-#: ../mdkonline:128 ../mdkonline_tui:108
-#, c-format
-msgid "Enter your Mandrakeonline login, password and machine name:"
-msgstr "Zadejte jméno, heslo a název počítače pro Mandrakeonline:"
-
-#: ../mdkonline:133 ../mdkonline_tui:116
-#, c-format
 msgid "Machine name:"
 msgstr "Název počítače:"
 
-#: ../mdkonline:138
+#: ../mdkonline:131
 #, c-format
-msgid "Send Configuration"
-msgstr "Poslat nastavení"
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Připojuji se k webovým stránkám Mandrakeonline..."
 
-#: ../mdkonline:139 ../mdkonline_tui:128
+#: ../mdkonline:139
 #, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
@@ -389,55 +384,56 @@ msgstr ""
 "Můžete také využít snížených cen služeb placené podpory na\n"
 "www.mandrakeexpert.com."
 
-#: ../mdkonline:144 ../mdkonline:211 ../mdkonline:234
+#: ../mdkonline:141 ../mdkonline:180 ../mdkupdate:126 ../mdkupdate:198
 #, c-format
-msgid "Finish"
-msgstr "Hotovo"
+msgid "Connection problem"
+msgstr "Problémy při spojení"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid "Your upload was successful!"
-msgstr "Zaslání informací proběhlo úspěšně!"
+msgid "or"
+msgstr "nebo"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandrakeonline."
-msgstr ""
-"Od této chvíle budete díky službě Mandrakeonline\n"
-"informováni o bezpečnostních a dalších aktualizacích."
+msgid "wrong password:"
+msgstr "špatné heslo:"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
 msgid ""
-"Mandrakeonline offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+"Your login or password was wrong.\n"
+" Either you'll have to type it again, or you'll need to create an account on "
+"Mandrakeonline.\n"
+" In the latter case, go back to the first step to connect to "
+"Mandrakeonline.\n"
+" Be aware that you must also provide a Machine name \n"
+" (only alphabetical characters are admitted)"
 msgstr ""
-"Mandrakeonline nabízí možnost automatizovat aktualizace.\n"
-"Program, který bude běžet v systému a čekat na aktualizace\n"
-
-#: ../mdkonline:146
-#, c-format
-msgid "automated Upgrades"
-msgstr "automatické aktualizace"
+"Přihlašovací jméno nebo heslo je špatné.\n"
+"Buď je zkusíte znova zadat nebo potřebujete vytvořit účet služby "
+"Mandrakeonline.\n"
+" V opačném případě se vraťte na první krok pro opětovné připojení k "
+"Mandrakeonline.\n"
+" Uvědomte si, že musíte také zadat jméno počítače \n"
+" (jsou povoleny pouze znaky abecedy bez diakritiky)"
 
-#: ../mdkonline:150
+#: ../mdkonline:153
 #, c-format
-msgid "Country:"
-msgstr "Země:"
+msgid "Create a Mandrakeonline Account"
+msgstr "Vytvořit účet na Mandrakeonline"
 
-#: ../mdkonline:178 ../mdkonline:183 ../mdkonline:185 ../mdkonline:187
+#: ../mdkonline:158
 #, c-format
-msgid "Error"
-msgstr "Chyba"
+msgid "Confirm Password:"
+msgstr "Potvrdit heslo:"
 
-#: ../mdkonline:183 ../mdkonline_tui:152
+#: ../mdkonline:159
 #, c-format
-msgid "Please provide a login"
-msgstr "Zadejte prosím přihlášení"
+msgid "Mail contact:"
+msgstr "Emailový kontakt:"
 
-#: ../mdkonline:185 ../mdkonline_tui:152
+#: ../mdkonline:163
 #, c-format
 msgid ""
 "The passwords do not match\n"
@@ -446,163 +442,116 @@ msgstr ""
 "Hesla se neshodují\n"
 "Zkuste to prosím znovu\n"
 
-#: ../mdkonline:187 ../mdkonline_tui:152
+#: ../mdkonline:163
+#, c-format
+msgid "Please provide a login"
+msgstr "Zadejte prosím přihlášení"
+
+#: ../mdkonline:163
 #, c-format
 msgid "Not a valid mail address!\n"
 msgstr "Neplatná emailová adresa!\n"
 
-#: ../mdkonline:199 ../mdkonline_tui:78
+#: ../mdkonline:169
 #, c-format
-msgid "Reading configuration\n"
-msgstr "Načíst konfiguraci\n"
+msgid ""
+"Mandrakeonline Account successfully created.\n"
+"Please click \"Next\" to authenticate and upload your configuration\n"
+msgstr ""
+"Účet na Mandrakeonline byl úspěšně vytvořen.\n"
+"Klikněte prosím na \"Další\" a přihlaste se a nahrajte své nastavení\n"
 
-#: ../mdkonline:204 ../mdkonline_tui:82
+#: ../mdkonline:178
 #, c-format
-msgid "Sending configuration..."
-msgstr "Posílám konfiguraci..."
+msgid "Your upload was successful!"
+msgstr "Zaslání informací proběhlo úspěšně!"
 
-#: ../mdkonline:213 ../mdkonline:273 ../mdkonline_tui:130 ../mdkonline_tui:169
-#: ../mdkupdate:124 ../mdkupdate:195
+#: ../mdkonline:178
 #, c-format
-msgid "Connection problem"
-msgstr "Problémy při spojení"
+msgid ""
+"From now you will receive on security and updates \n"
+"announcements thanks to Mandrakeonline."
+msgstr ""
+"Od této chvíle budete díky službě Mandrakeonline\n"
+"informováni o bezpečnostních a dalších aktualizacích."
+
+#: ../mdkonline:178
+#, c-format
+msgid ""
+"Mandrakeonline offers you the ability to automate the updates.\n"
+"A program will run regulary in your system waiting for new updates\n"
+msgstr ""
+"Mandrakeonline nabízí možnost automatizovat aktualizace.\n"
+"Program, který bude běžet v systému a čekat na aktualizace\n"
 
-#: ../mdkonline:213 ../mdkonline_tui:169
+#: ../mdkonline:180
 #, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr "Při nahrávání souborů se vyskytl problém, zkuste to prosím znovu"
 
-#: ../mdkonline:251
+#: ../mdkonline:186
 #, c-format
-msgid "Quitting Wizard\n"
-msgstr "Ukončuji průvodce\n"
+msgid "Country"
+msgstr "Země"
 
-#: ../mdkonline:273
+#: ../mdkonline:198
 #, c-format
-msgid "Mandrakeonline could not be contacted, please try again at a later time"
-msgstr ""
-"Službě Mandrakeonline se nepodařilo připojit k serveru, zkuste to prosím "
-"znovu později."
+msgid "Congratulations"
+msgstr "Gratulujeme"
 
-#: ../mdkonline:285
+#: ../mdkonline:198
 #, c-format
-msgid "Wrong password"
-msgstr "Špatné heslo"
+msgid "Your Mandrakeonline account has been successfully configured\n"
+msgstr "Váš účet na Mandrakeonline byl úspěšně nastaven\n"
+
+#: ../mdkonline:214
+#, fuzzy, c-format
+msgid "Configuration uploaded successfully"
+msgstr "Zaslání informací proběhlo úspěšně!"
 
-#: ../mdkonline:285 ../mdkonline_tui:130
+#: ../mdkonline:215
+#, fuzzy, c-format
+msgid "Problem uploading configuration"
+msgstr "Načíst konfiguraci\n"
+
+#: ../mdkonline:216
 #, c-format
 msgid ""
-"Your login or password was wrong.\n"
-" Either you'll have to type it again, or you'll need to create an account on "
-"Mandrakeonline.\n"
-" In the latter case, go back to the first step to connect to "
-"Mandrakeonline.\n"
-" Be aware that you must also provide a Machine name \n"
-" (only alphabetical characters are admitted)"
+"Cannot connect to mandrakeonline website: wrong login/password or router/"
+"firewall bad settings"
 msgstr ""
-"Přihlašovací jméno nebo heslo je špatné.\n"
-"Buď je zkusíte znova zadat nebo potřebujete vytvořit účet služby "
-"Mandrakeonline.\n"
-" V opačném případě se vraťte na první krok pro opětovné připojení k "
-"Mandrakeonline.\n"
-" Uvědomte si, že musíte také zadat jméno počítače \n"
-" (jsou povoleny pouze znaky abecedy bez diakritiky)"
 
-#: ../mdkonline.pm:58
+#: ../mdkonline.pm:66
 #, c-format
 msgid "Login and password should be less than 12 characters\n"
 msgstr "Jméno a heslo by mělo být kratší než 12 znaků\n"
 
-#: ../mdkonline.pm:59
+#: ../mdkonline.pm:67
 #, c-format
 msgid "Special characters are not allowed\n"
 msgstr "Speciální znaky nejsou povoleny\n"
 
-#: ../mdkonline.pm:60
+#: ../mdkonline.pm:68
 #, c-format
 msgid "Please fill in all fields\n"
 msgstr "Vyplňte prosím všechna pole\n"
 
-#: ../mdkonline.pm:61
+#: ../mdkonline.pm:69
 #, c-format
 msgid "Email not valid\n"
 msgstr "Email není platný\n"
 
-#: ../mdkonline.pm:62
+#: ../mdkonline.pm:70
 #, c-format
 msgid "Account already exist\n"
 msgstr "Účet již existuje\n"
 
-#: ../mdkonline.pm:68
+#: ../mdkonline.pm:76
 #, c-format
 msgid "Problem connecting to server \n"
 msgstr "Problém s připojením k serveru \n"
 
-#: ../mdkonline_tui:45 ../mdkonline_tui:95
-#, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
-
-#: ../mdkonline_tui:48
-#, c-format
-msgid "I already have an account"
-msgstr "Už mám účet"
-
-#: ../mdkonline_tui:49
-#, c-format
-msgid "I want to subscribe"
-msgstr "Chci se zaregistrovat"
-
-#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:120
-#, c-format
-msgid "Please wait"
-msgstr "Prosím počkejte"
-
-#: ../mdkonline_tui:103
-#, c-format
-msgid "Account creation or authentication"
-msgstr "Vytvoření nebo ověření účtu"
-
-#: ../mdkonline_tui:120
-#, c-format
-msgid "Connecting to Mandrakeonline website..."
-msgstr "Připojuji se k webovým stránkám Mandrakeonline..."
-
-#: ../mdkonline_tui:130
-#, c-format
-msgid "or"
-msgstr "nebo"
-
-#: ../mdkonline_tui:130
-#, c-format
-msgid "wrong password:"
-msgstr "špatné heslo:"
-
-#: ../mdkonline_tui:158
-#, c-format
-msgid ""
-"Mandrakeonline Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-"Účet na Mandrakeonline byl úspěšně vytvořen.\n"
-"Klikněte prosím na \"Další\" a přihlaste se a nahrajte své nastavení\n"
-
-#: ../mdkonline_tui:175
-#, c-format
-msgid "Country"
-msgstr "Země"
-
-#: ../mdkonline_tui:187
-#, c-format
-msgid "Congratulations"
-msgstr "Gratulujeme"
-
-#: ../mdkonline_tui:187
-#, c-format
-msgid "Your Mandrakeonline account has been successfully configured\n"
-msgstr "Váš účet na Mandrakeonline byl úspěšně nastaven\n"
-
-#: ../mdkupdate:50
+#: ../mdkupdate:52
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
@@ -619,45 +568,40 @@ msgstr ""
 "\n"
 "Použití:\n"
 
-#: ../mdkupdate:55
+#: ../mdkupdate:57
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - vytiskne tuto nápovědu.\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:58
 #, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto         - automatické spuštění Mandrakeupdate.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:59
 #, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - spustí Mandrakeupdate.\n"
 
-#: ../mdkupdate:58
-#, c-format
-msgid "  --update       - Update keys\n"
-msgstr "  --update       - aktualizace klíčů\n"
-
-#: ../mdkupdate:66
+#: ../mdkupdate:67
 #, c-format
 msgid "No %s file found. Run mdkonline wizard first"
 msgstr ""
 "Nebyl nalezen soubor %s. Spusťte prosím nejprve průvodce pro MandrakeOnline"
 
-#: ../mdkupdate:124
+#: ../mdkupdate:126
 #, c-format
 msgid "Mandrakeupdate could not contact the site, we will try again."
 msgstr ""
 "Službě MandrakeUpdate se nepodařilo připojit k serveru, zkuste to prosím "
 "znovu."
 
-#: ../mdkupdate:173
+#: ../mdkupdate:176
 #, c-format
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr "Nelze aktualizovat balíčky ze zdroje mdkupdate.\n"
 
-#: ../mdkupdate:195
+#: ../mdkupdate:198
 #, c-format
 msgid ""
 "Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
@@ -665,3 +609,51 @@ msgid ""
 msgstr ""
 "Službě MandrakeUpdate se nepodařilo nahrát soubory diff. Pošlete prosím "
 "email na adresu support [at] mandrakeonline.net."
+
+#~ msgid "Next"
+#~ msgstr "Další"
+
+#~ msgid "Cancel"
+#~ msgstr "Zrušit"
+
+#~ msgid "Previous"
+#~ msgstr "Zpět"
+
+#~ msgid "I don't have a Mandrakeonline account and I want to subscribe"
+#~ msgstr "Nemám účet na Mandrakeonline a chci se zaregistrovat"
+
+#~ msgid "Mandrakelinux Privacy Policy"
+#~ msgstr "Ochrana soukromí společnosti Mandrakelinux"
+
+#~ msgid "Authentification"
+#~ msgstr "Ověřování"
+
+#~ msgid "Send Configuration"
+#~ msgstr "Poslat nastavení"
+
+#~ msgid "Finish"
+#~ msgstr "Hotovo"
+
+#~ msgid "automated Upgrades"
+#~ msgstr "automatické aktualizace"
+
+#~ msgid "Country:"
+#~ msgstr "Země:"
+
+#~ msgid "Error"
+#~ msgstr "Chyba"
+
+#~ msgid "Quitting Wizard\n"
+#~ msgstr "Ukončuji průvodce\n"
+
+#~ msgid ""
+#~ "Mandrakeonline could not be contacted, please try again at a later time"
+#~ msgstr ""
+#~ "Službě Mandrakeonline se nepodařilo připojit k serveru, zkuste to prosím "
+#~ "znovu později."
+
+#~ msgid "Wrong password"
+#~ msgstr "Špatné heslo"
+
+#~ msgid "  --update       - Update keys\n"
+#~ msgstr "  --update       - aktualizace klíčů\n"
diff --git a/po/cy.po b/po/cy.po
index 599684db..9084c836 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline 0.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-01 22:41+0200\n"
+"POT-Creation-Date: 2004-11-03 12:10+0100\n"
 "PO-Revision-Date: 2004-08-23 20:53-0000\n"
 "Last-Translator: Rhoslyn Prys <post@meddal.com>\n"
 "Language-Team: Cymraeg/Welsh <rhoslyn.prys@meddal.org.uk>\n"
@@ -14,12 +14,12 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../mdkapplet:61
+#: ../mdkapplet:63
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Mae'r system yn gyfredol"
 
-#: ../mdkapplet:67
+#: ../mdkapplet:69
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -28,190 +28,200 @@ msgstr ""
 "Problemau ffurfweddu'r gwasanaethwr. Gwiriwch gofnodion ac anfon e-byst at "
 "support@mandrakeonline.net"
 
-#: ../mdkapplet:73
+#: ../mdkapplet:75
 #, c-format
 msgid "System is busy. Please wait ..."
 msgstr "Mae'r system yn brysur. Arhoswch..."
 
-#: ../mdkapplet:79
+#: ../mdkapplet:81
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Mae diweddariadau newydd ar gael ar gyfer eich system"
 
-#: ../mdkapplet:85
+#: ../mdkapplet:87
 #, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr ""
 "Nid yw'r gwasanaeth wedi ei ffurfweddu. Cliciwch \"Ffurfweddu'r gwasanaeth\""
 
-#: ../mdkapplet:91
+#: ../mdkapplet:93
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Nid yw'r rhwydwaith ar gael.  Ffurfweddwch eich rhwydwaith"
 
-#: ../mdkapplet:97
+#: ../mdkapplet:99
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Nid yw'r gwasanaeth ar gael. Cliciwch \"Gwefan Ar-lein\""
 
-#: ../mdkapplet:103
+#: ../mdkapplet:105
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:108 ../mdkapplet:158
+#: ../mdkapplet:110 ../mdkapplet:164
 #, c-format
 msgid "Install updates"
 msgstr "Gosod diweddariadau"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:111
 #, c-format
 msgid "Configure the service"
 msgstr "Ffurfweddu'r gwasanaeth"
 
-#: ../mdkapplet:110
+#: ../mdkapplet:112
 #, c-format
 msgid "Check Updates"
 msgstr "Gwirio Diweddariad"
 
-#: ../mdkapplet:111
+#: ../mdkapplet:113 ../mdkapplet:167 ../mdkapplet:225
+#, fuzzy, c-format
+msgid "Please Wait"
+msgstr "Arhoswch"
+
+#: ../mdkapplet:113 ../mdkapplet:166 ../mdkapplet:167 ../mdkapplet:225
+#, c-format
+msgid "Check updates"
+msgstr "Gwirio diweddariad"
+
+#: ../mdkapplet:115
 #, c-format
 msgid "Online WebSite"
 msgstr "Safle Gwe Ar-lein"
 
-#: ../mdkapplet:112
+#: ../mdkapplet:116
 #, c-format
 msgid "Configure Network"
 msgstr "Ffurfweddu'r Rhwydwaith"
 
-#: ../mdkapplet:113
+#: ../mdkapplet:117
 #, c-format
 msgid "Configure Now!"
 msgstr "Ffurfweddu!"
 
-#: ../mdkapplet:146
+#: ../mdkapplet:152 ../mdkapplet:229
 #, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Rhaglennig Diweddaru Mandrakelinux"
 
-#: ../mdkapplet:156
+#: ../mdkapplet:162
 #, c-format
 msgid "Actions"
 msgstr "Gweithredoedd"
 
-#: ../mdkapplet:159
+#: ../mdkapplet:165
 #, c-format
 msgid "Configure"
 msgstr "Ffurfweddu"
 
-#: ../mdkapplet:160
-#, c-format
-msgid "Check updates"
-msgstr "Gwirio diweddariad"
-
-#: ../mdkapplet:161
+#: ../mdkapplet:169
 #, c-format
 msgid "See logs"
 msgstr "Darllen cofnodion"
 
-#: ../mdkapplet:164
+#: ../mdkapplet:172
 #, c-format
 msgid "Status"
 msgstr "Statws"
 
-#: ../mdkapplet:168 ../mdkapplet:363
+#: ../mdkapplet:176 ../mdkapplet:375
 #, c-format
 msgid "Close"
 msgstr "Cau"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Network Connection: "
 msgstr "Cyswllt Rhwydwaith:"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Up"
 msgstr "Fyny"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Down"
 msgstr "Lawr"
 
-#: ../mdkapplet:204
+#: ../mdkapplet:212
 #, c-format
 msgid "Last check: "
 msgstr "Gwiriad diwethaf:"
 
-#: ../mdkapplet:205
+#: ../mdkapplet:213
 #, c-format
 msgid "Updates: "
 msgstr "Diweddariadau:"
 
-#: ../mdkapplet:209
+#: ../mdkapplet:217
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Cychwyn drakconnect\n"
 
-#: ../mdkapplet:213
+#: ../mdkapplet:221
 #, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "Cychwyn mdkupdate --applet\n"
 
-#: ../mdkapplet:217
+#: ../mdkapplet:224
 #, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 "Mae Mandrakeonline i'w weld wedi ei ail osod, ail lwytho'r rhaglennig..."
 
-#: ../mdkapplet:225
+#: ../mdkapplet:235
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Cyfrifo diweddariadau newydd...\n"
 
-#: ../mdkapplet:227
+#: ../mdkapplet:237
 #, c-format
 msgid "Connecting to"
 msgstr "Cysylltu â"
 
-#: ../mdkapplet:250
+#: ../mdkapplet:244
+#, fuzzy, c-format
+msgid "Response from Mandrakeonline server\n"
+msgstr "Croeso i Mandrakeonline "
+
+#: ../mdkapplet:262
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Gwirio... Mae diweddariadau ar gael\n"
 
-#: ../mdkapplet:254
+#: ../mdkapplet:267
 #, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
-#: ../mdkapplet:255
+#: ../mdkapplet:268
 #, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
-#: ../mdkapplet:256
+#: ../mdkapplet:269
 #, c-format
 msgid "Unknown state"
 msgstr "Cyflwr anhysbys"
 
-#: ../mdkapplet:257
+#: ../mdkapplet:270
 #, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr ""
 "Mae'r gwasanaethau ar-lein wedi eu hatal. Cysylltwch â safle Mandrakeonline\n"
 
-#: ../mdkapplet:258
+#: ../mdkapplet:271
 #, c-format
 msgid "Wrong Password.\n"
 msgstr "Y cyfrinair anghywir\n"
 
-#: ../mdkapplet:259
+#: ../mdkapplet:272
 #, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr "Gweithred, gwestai neu fewngofnod anghywir.\n"
 
-#: ../mdkapplet:260
+#: ../mdkapplet:273
 #, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
@@ -220,72 +230,82 @@ msgstr ""
 "Mae rhywbeth o'i le ar osodiadau eich rhwydwaith (gwiriwch eich llwybr, mur "
 "cadarn neu osodiadau dirprwy)\n"
 
-#: ../mdkapplet:264
+#: ../mdkapplet:277
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Mae'r system yn gyfredol\n"
 
-#: ../mdkapplet:303
+#: ../mdkapplet:317
 #, c-format
 msgid "No check"
 msgstr "Dim gwiriad"
 
-#: ../mdkapplet:316
+#: ../mdkapplet:330
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Gwirio'r Rhwydwaith: i weld wedi ei anablu\n"
 
-#: ../mdkapplet:319
+#: ../mdkapplet:333
 #, c-format
 msgid "Checking config file: Not present\n"
 msgstr "Gwirio ffeil ffurfweddiad: Nid yw ar gael\n"
 
-#: ../mdkapplet:353
+#: ../mdkapplet:365
 #, c-format
 msgid "Logs"
 msgstr "Cofnodion"
 
-#: ../mdkapplet:369
+#: ../mdkapplet:381
 #, c-format
 msgid "Clear"
 msgstr "Clirio"
 
-#: ../mdkapplet:396
+#: ../mdkapplet:408
 #, c-format
 msgid "About..."
 msgstr "Ynghylch..."
 
-#: ../mdkapplet:397
+#: ../mdkapplet:409
 #, c-format
 msgid "Always launch on startup"
 msgstr "Cychwyn wrth gychwyn"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:411
 #, c-format
 msgid "Quit"
 msgstr "Gadael"
 
-#: ../mdkonline:89
+#: ../mdkonline:52 ../mdkonline:106
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "Croeso i Mandrakeonline "
+
+#: ../mdkonline:55
 #, c-format
-msgid "Next"
-msgstr "Nesaf"
+msgid "I already have an account"
+msgstr ""
 
-#: ../mdkonline:89
+#: ../mdkonline:56
+#, c-format
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline:89 ../mdkonline:93 ../mdkonline:131
 #, c-format
-msgid "Cancel"
-msgstr "Dileu"
+msgid "Please wait"
+msgstr "Arhoswch"
 
 #: ../mdkonline:89
 #, c-format
-msgid "Previous"
-msgstr "Blaenorol"
+msgid "Reading configuration\n"
+msgstr "Darllen ffurfweddiad\n"
 
-#: ../mdkonline:103
+#: ../mdkonline:93
 #, c-format
-msgid "Welcome to Mandrakeonline"
-msgstr "Croeso i Mandrakeonline "
+msgid "Sending configuration..."
+msgstr "Anfon ffurfweddiad..."
 
-#: ../mdkonline:104 ../mdkonline_tui:98
+#: ../mdkonline:109
 #, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
@@ -296,63 +316,38 @@ msgstr ""
 "(pecynnau, ffurfweddiad caledwedd) i gronfa ddata canolog er\n"
 "mwyn eich hysbysu am ddiweddariadau diogelwch a defnyddiol.\n"
 
-#: ../mdkonline:105 ../mdkonline_tui:142
+#: ../mdkonline:114
 #, c-format
-msgid "Create a Mandrakeonline Account"
-msgstr "Creu cyfrif Mandrakeonline "
+msgid "Account creation or authentication"
+msgstr ""
 
-#: ../mdkonline:107
-#, fuzzy, c-format
-msgid "I don't have a Mandrakeonline account and I want to subscribe"
-msgstr "Nid oes gennyf gyfrif Mandrakeonline ac mi rydw i eisiau"
+#: ../mdkonline:119
+#, c-format
+msgid "Enter your Mandrakeonline login, password and machine name:"
+msgstr ""
+"Rhowch eich mewngofnod Mandrakeonline, eich cyfrinair ac enw'r peiriant :"
 
-#: ../mdkonline:111 ../mdkonline:131 ../mdkonline_tui:114 ../mdkonline_tui:145
+#: ../mdkonline:125 ../mdkonline:156
 #, c-format
 msgid "Login:"
 msgstr "Mewngofnod:"
 
-#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:115 ../mdkonline_tui:146
+#: ../mdkonline:126 ../mdkonline:157
 #, c-format
 msgid "Password:"
 msgstr "Cyfrinair:"
 
-#: ../mdkonline:113 ../mdkonline_tui:147
-#, c-format
-msgid "Confirm Password:"
-msgstr "Cadarnhau Cyfrinair:"
-
-#: ../mdkonline:114 ../mdkonline_tui:148
-#, c-format
-msgid "Mail contact:"
-msgstr "Cyswllt E-bost"
-
-#: ../mdkonline:121
-#, c-format
-msgid "Mandrakelinux Privacy Policy"
-msgstr "Polisi Preifatrwydd Mandrakelinux"
-
 #: ../mdkonline:127
 #, c-format
-msgid "Authentification"
-msgstr "Dilysu"
-
-#: ../mdkonline:128 ../mdkonline_tui:108
-#, c-format
-msgid "Enter your Mandrakeonline login, password and machine name:"
-msgstr ""
-"Rhowch eich mewngofnod Mandrakeonline, eich cyfrinair ac enw'r peiriant :"
-
-#: ../mdkonline:133 ../mdkonline_tui:116
-#, c-format
 msgid "Machine name:"
 msgstr "Enw'r peiriant:"
 
-#: ../mdkonline:138
-#, c-format
-msgid "Send Configuration"
-msgstr "Anfon Ffurfweddiad"
+#: ../mdkonline:131
+#, fuzzy, c-format
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Croeso i Mandrakeonline "
 
-#: ../mdkonline:139 ../mdkonline_tui:128
+#: ../mdkonline:139
 #, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
@@ -385,55 +380,54 @@ msgstr ""
 "Hefyd, byddwch yn manteisio ar wasanaeth cefnogaeth ratach gan\n"
 "www.mandrakeexpert.com."
 
-#: ../mdkonline:144 ../mdkonline:211 ../mdkonline:234
-#, c-format
-msgid "Finish"
-msgstr "Gorffen"
-
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141 ../mdkonline:180 ../mdkupdate:126 ../mdkupdate:198
 #, c-format
-msgid "Your upload was successful!"
-msgstr "Roedd eich llwytho i fyny'n llwyddiant!"
+msgid "Connection problem"
+msgstr "Problem cysylltu"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandrakeonline."
+msgid "or"
 msgstr ""
-"O hyn ymlaen byddwch yn derbyn cyhoeddiadau\n"
-"diogelwch a diweddariadau gan Mandrakeonline."
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "Y cyfrinair anghywir"
+
+#: ../mdkonline:141
 #, c-format
 msgid ""
-"Mandrakeonline offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+"Your login or password was wrong.\n"
+" Either you'll have to type it again, or you'll need to create an account on "
+"Mandrakeonline.\n"
+" In the latter case, go back to the first step to connect to "
+"Mandrakeonline.\n"
+" Be aware that you must also provide a Machine name \n"
+" (only alphabetical characters are admitted)"
 msgstr ""
-"Mae MandrakeOnline yn cynnig y dewis i chi ddiweddaru'n awtomatig,\n"
-"Bydd rhaglen yn rhedeg yn rheolaidd yn eich system i gasglu diweddariadau.\n"
-
-#: ../mdkonline:146
-#, c-format
-msgid "automated Upgrades"
-msgstr "Diweddariadau awtomatig"
+"Mae eich mewngofnod neu gyfrinair yn anghywir\n"
+"Un ai rhaid i chi ei ail deipio neu greu cyfrif Mandrakeonline newydd.\n"
+"Os yr olaf, ewch yn ôl i'r cam cyntaf â chysylltu â Mandrakeonline.\n"
+"cofiwch y bydd angen darparu enw Peiriant \n"
+"(gyda dim ond llythrennau)"
 
-#: ../mdkonline:150
+#: ../mdkonline:153
 #, c-format
-msgid "Country:"
-msgstr "Gwlad:"
+msgid "Create a Mandrakeonline Account"
+msgstr "Creu cyfrif Mandrakeonline "
 
-#: ../mdkonline:178 ../mdkonline:183 ../mdkonline:185 ../mdkonline:187
+#: ../mdkonline:158
 #, c-format
-msgid "Error"
-msgstr "Gwall"
+msgid "Confirm Password:"
+msgstr "Cadarnhau Cyfrinair:"
 
-#: ../mdkonline:183 ../mdkonline_tui:152
+#: ../mdkonline:159
 #, c-format
-msgid "Please provide a login"
-msgstr "Rhowch fewngofnod"
+msgid "Mail contact:"
+msgstr "Cyswllt E-bost"
 
-#: ../mdkonline:185 ../mdkonline_tui:152
+#: ../mdkonline:163
 #, c-format
 msgid ""
 "The passwords do not match\n"
@@ -442,157 +436,114 @@ msgstr ""
 "Nid yw'r cyfrineiriau'n cydweddu\n"
 "Ceisiwch eto\n"
 
-#: ../mdkonline:187 ../mdkonline_tui:152
+#: ../mdkonline:163
+#, c-format
+msgid "Please provide a login"
+msgstr "Rhowch fewngofnod"
+
+#: ../mdkonline:163
 #, c-format
 msgid "Not a valid mail address!\n"
 msgstr "Nid yw'n gyfeiriad e-bost dilys!\n"
 
-#: ../mdkonline:199 ../mdkonline_tui:78
+#: ../mdkonline:169
 #, c-format
-msgid "Reading configuration\n"
-msgstr "Darllen ffurfweddiad\n"
+msgid ""
+"Mandrakeonline Account successfully created.\n"
+"Please click \"Next\" to authenticate and upload your configuration\n"
+msgstr ""
 
-#: ../mdkonline:204 ../mdkonline_tui:82
+#: ../mdkonline:178
 #, c-format
-msgid "Sending configuration..."
-msgstr "Anfon ffurfweddiad..."
+msgid "Your upload was successful!"
+msgstr "Roedd eich llwytho i fyny'n llwyddiant!"
 
-#: ../mdkonline:213 ../mdkonline:273 ../mdkonline_tui:130 ../mdkonline_tui:169
-#: ../mdkupdate:124 ../mdkupdate:195
+#: ../mdkonline:178
 #, c-format
-msgid "Connection problem"
-msgstr "Problem cysylltu"
+msgid ""
+"From now you will receive on security and updates \n"
+"announcements thanks to Mandrakeonline."
+msgstr ""
+"O hyn ymlaen byddwch yn derbyn cyhoeddiadau\n"
+"diogelwch a diweddariadau gan Mandrakeonline."
 
-#: ../mdkonline:213 ../mdkonline_tui:169
+#: ../mdkonline:178
+#, c-format
+msgid ""
+"Mandrakeonline offers you the ability to automate the updates.\n"
+"A program will run regulary in your system waiting for new updates\n"
+msgstr ""
+"Mae MandrakeOnline yn cynnig y dewis i chi ddiweddaru'n awtomatig,\n"
+"Bydd rhaglen yn rhedeg yn rheolaidd yn eich system i gasglu diweddariadau.\n"
+
+#: ../mdkonline:180
 #, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr "Mae problem yn digwydd wrth lwytho ffeiliau i fyny, ceisiwch eto."
 
-#: ../mdkonline:251
-#, c-format
-msgid "Quitting Wizard\n"
-msgstr "Gadael y Dewin\n"
+#: ../mdkonline:186
+#, fuzzy, c-format
+msgid "Country"
+msgstr "Gwlad:"
 
-#: ../mdkonline:273
-#, c-format
-msgid "Mandrakeonline could not be contacted, please try again at a later time"
-msgstr "Methu cysylltu â Mandrakeonline, ceisiwch eto'n nes ymlaen"
+#: ../mdkonline:198
+#, fuzzy, c-format
+msgid "Congratulations"
+msgstr "Anfon Ffurfweddiad"
 
-#: ../mdkonline:285
+#: ../mdkonline:198
 #, c-format
-msgid "Wrong password"
-msgstr "Y cyfrinair anghywir"
+msgid "Your Mandrakeonline account has been successfully configured\n"
+msgstr ""
+
+#: ../mdkonline:214
+#, fuzzy, c-format
+msgid "Configuration uploaded successfully"
+msgstr "Roedd eich llwytho i fyny'n llwyddiant!"
+
+#: ../mdkonline:215
+#, fuzzy, c-format
+msgid "Problem uploading configuration"
+msgstr "Darllen ffurfweddiad\n"
 
-#: ../mdkonline:285 ../mdkonline_tui:130
+#: ../mdkonline:216
 #, c-format
 msgid ""
-"Your login or password was wrong.\n"
-" Either you'll have to type it again, or you'll need to create an account on "
-"Mandrakeonline.\n"
-" In the latter case, go back to the first step to connect to "
-"Mandrakeonline.\n"
-" Be aware that you must also provide a Machine name \n"
-" (only alphabetical characters are admitted)"
+"Cannot connect to mandrakeonline website: wrong login/password or router/"
+"firewall bad settings"
 msgstr ""
-"Mae eich mewngofnod neu gyfrinair yn anghywir\n"
-"Un ai rhaid i chi ei ail deipio neu greu cyfrif Mandrakeonline newydd.\n"
-"Os yr olaf, ewch yn ôl i'r cam cyntaf â chysylltu â Mandrakeonline.\n"
-"cofiwch y bydd angen darparu enw Peiriant \n"
-"(gyda dim ond llythrennau)"
 
-#: ../mdkonline.pm:58
+#: ../mdkonline.pm:66
 #, c-format
 msgid "Login and password should be less than 12 characters\n"
 msgstr ""
 
-#: ../mdkonline.pm:59
+#: ../mdkonline.pm:67
 #, c-format
 msgid "Special characters are not allowed\n"
 msgstr ""
 
-#: ../mdkonline.pm:60
+#: ../mdkonline.pm:68
 #, c-format
 msgid "Please fill in all fields\n"
 msgstr ""
 
-#: ../mdkonline.pm:61
+#: ../mdkonline.pm:69
 #, c-format
 msgid "Email not valid\n"
 msgstr ""
 
-#: ../mdkonline.pm:62
+#: ../mdkonline.pm:70
 #, c-format
 msgid "Account already exist\n"
 msgstr ""
 
-#: ../mdkonline.pm:68
+#: ../mdkonline.pm:76
 #, c-format
 msgid "Problem connecting to server \n"
 msgstr "Anhawster wrth gysylltu â'r gweinydd\n"
 
-#: ../mdkonline_tui:45 ../mdkonline_tui:95
-#, fuzzy, c-format
-msgid "Mandrakeonline"
-msgstr "Croeso i Mandrakeonline "
-
-#: ../mdkonline_tui:48
-#, c-format
-msgid "I already have an account"
-msgstr ""
-
-#: ../mdkonline_tui:49
-#, c-format
-msgid "I want to subscribe"
-msgstr ""
-
-#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:120
-#, c-format
-msgid "Please wait"
-msgstr "Arhoswch"
-
-#: ../mdkonline_tui:103
-#, c-format
-msgid "Account creation or authentication"
-msgstr ""
-
-#: ../mdkonline_tui:120
-#, fuzzy, c-format
-msgid "Connecting to Mandrakeonline website..."
-msgstr "Croeso i Mandrakeonline "
-
-#: ../mdkonline_tui:130
-#, c-format
-msgid "or"
-msgstr ""
-
-#: ../mdkonline_tui:130
-#, fuzzy, c-format
-msgid "wrong password:"
-msgstr "Y cyfrinair anghywir"
-
-#: ../mdkonline_tui:158
-#, c-format
-msgid ""
-"Mandrakeonline Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-
-#: ../mdkonline_tui:175
-#, fuzzy, c-format
-msgid "Country"
-msgstr "Gwlad:"
-
-#: ../mdkonline_tui:187
-#, fuzzy, c-format
-msgid "Congratulations"
-msgstr "Anfon Ffurfweddiad"
-
-#: ../mdkonline_tui:187
-#, c-format
-msgid "Your Mandrakeonline account has been successfully configured\n"
-msgstr ""
-
-#: ../mdkupdate:50
+#: ../mdkupdate:52
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
@@ -609,48 +560,90 @@ msgstr ""
 "\n"
 "defnydd:\n"
 
-#: ../mdkupdate:55
+#: ../mdkupdate:57
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - argraffu'r neges cymorth hon.\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:58
 #, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto         - cychwyn Mandrakeupdate yn awtomatig\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:59
 #, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - cychwyn Mandrakeupdate.\n"
 
-#: ../mdkupdate:58
-#, c-format
-msgid "  --update       - Update keys\n"
-msgstr "  --update       - Allwedd diweddaru\n"
-
-#: ../mdkupdate:66
+#: ../mdkupdate:67
 #, c-format
 msgid "No %s file found. Run mdkonline wizard first"
 msgstr ""
 
-#: ../mdkupdate:124
+#: ../mdkupdate:126
 #, fuzzy, c-format
 msgid "Mandrakeupdate could not contact the site, we will try again."
 msgstr "Methu cysylltu â Mandrakeonline, ceisiwch eto'n nes ymlaen"
 
-#: ../mdkupdate:173
+#: ../mdkupdate:176
 #, c-format
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr ""
 
-#: ../mdkupdate:195
+#: ../mdkupdate:198
 #, c-format
 msgid ""
 "Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
 "mandrakeonline [dot] net"
 msgstr ""
 
+#~ msgid "Next"
+#~ msgstr "Nesaf"
+
+#~ msgid "Cancel"
+#~ msgstr "Dileu"
+
+#~ msgid "Previous"
+#~ msgstr "Blaenorol"
+
+#, fuzzy
+#~ msgid "I don't have a Mandrakeonline account and I want to subscribe"
+#~ msgstr "Nid oes gennyf gyfrif Mandrakeonline ac mi rydw i eisiau"
+
+#~ msgid "Mandrakelinux Privacy Policy"
+#~ msgstr "Polisi Preifatrwydd Mandrakelinux"
+
+#~ msgid "Authentification"
+#~ msgstr "Dilysu"
+
+#~ msgid "Send Configuration"
+#~ msgstr "Anfon Ffurfweddiad"
+
+#~ msgid "Finish"
+#~ msgstr "Gorffen"
+
+#~ msgid "automated Upgrades"
+#~ msgstr "Diweddariadau awtomatig"
+
+#~ msgid "Country:"
+#~ msgstr "Gwlad:"
+
+#~ msgid "Error"
+#~ msgstr "Gwall"
+
+#~ msgid "Quitting Wizard\n"
+#~ msgstr "Gadael y Dewin\n"
+
+#~ msgid ""
+#~ "Mandrakeonline could not be contacted, please try again at a later time"
+#~ msgstr "Methu cysylltu â Mandrakeonline, ceisiwch eto'n nes ymlaen"
+
+#~ msgid "Wrong password"
+#~ msgstr "Y cyfrinair anghywir"
+
+#~ msgid "  --update       - Update keys\n"
+#~ msgstr "  --update       - Allwedd diweddaru\n"
+
 #~ msgid "Skip Wizard"
 #~ msgstr "Osgoi'r Dewin"
 
diff --git a/po/da.po b/po/da.po
index f4bfb14f..85630f37 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: da\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-01 22:41+0200\n"
+"POT-Creation-Date: 2004-11-03 12:10+0100\n"
 "PO-Revision-Date: 2004-10-03 13:00+0200\n"
 "Last-Translator: Keld Simonsen <keld@dkuug.dk>\n"
 "Language-Team: Danish <<dansk@klid.dk>>\n"
@@ -16,12 +16,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.2\n"
 
-#: ../mdkapplet:61
+#: ../mdkapplet:63
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Systemet er opdateret."
 
-#: ../mdkapplet:67
+#: ../mdkapplet:69
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -30,189 +30,199 @@ msgstr ""
 "Problem med konfiguration af tjeneste. Tjek venligst loggene og send post "
 "til support@mandrakeonline.net"
 
-#: ../mdkapplet:73
+#: ../mdkapplet:75
 #, c-format
 msgid "System is busy. Please wait ..."
 msgstr "Systemet er optaget. Vent ..."
 
-#: ../mdkapplet:79
+#: ../mdkapplet:81
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Nye opdateringer er tilgængelige for dit system"
 
-#: ../mdkapplet:85
+#: ../mdkapplet:87
 #, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr "Tjeneste er ikke konfigureret. Klik på \"konfigurér tjenesten\""
 
-#: ../mdkapplet:91
+#: ../mdkapplet:93
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Netværket er nede. Konfigurér venligst dit netværk"
 
-#: ../mdkapplet:97
+#: ../mdkapplet:99
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Tjeneste er ikke aktiveret. Klik på \"Websted på nettet\""
 
-#: ../mdkapplet:103
+#: ../mdkapplet:105
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 "Udgivelse ikke understøttet (for gammel udgivelse, eller udviklingsudgivelse)"
 
-#: ../mdkapplet:108 ../mdkapplet:158
+#: ../mdkapplet:110 ../mdkapplet:164
 #, c-format
 msgid "Install updates"
 msgstr "Installér opdateringer"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:111
 #, c-format
 msgid "Configure the service"
 msgstr "Konfigurér tjenesten"
 
-#: ../mdkapplet:110
+#: ../mdkapplet:112
 #, c-format
 msgid "Check Updates"
 msgstr "Tjek for opdateringer"
 
-#: ../mdkapplet:111
+#: ../mdkapplet:113 ../mdkapplet:167 ../mdkapplet:225
+#, fuzzy, c-format
+msgid "Please Wait"
+msgstr "Vent venligst"
+
+#: ../mdkapplet:113 ../mdkapplet:166 ../mdkapplet:167 ../mdkapplet:225
+#, c-format
+msgid "Check updates"
+msgstr "Tjek for opdateringer"
+
+#: ../mdkapplet:115
 #, c-format
 msgid "Online WebSite"
 msgstr "WebSite på nettet"
 
-#: ../mdkapplet:112
+#: ../mdkapplet:116
 #, c-format
 msgid "Configure Network"
 msgstr "Konfigurér netværk"
 
-#: ../mdkapplet:113
+#: ../mdkapplet:117
 #, c-format
 msgid "Configure Now!"
 msgstr "Konfigurér nu!"
 
-#: ../mdkapplet:146
+#: ../mdkapplet:152 ../mdkapplet:229
 #, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Mandrakelinux Opdateringer panelprogram"
 
-#: ../mdkapplet:156
+#: ../mdkapplet:162
 #, c-format
 msgid "Actions"
 msgstr "Handlinger"
 
-#: ../mdkapplet:159
+#: ../mdkapplet:165
 #, c-format
 msgid "Configure"
 msgstr "Konfigurér"
 
-#: ../mdkapplet:160
-#, c-format
-msgid "Check updates"
-msgstr "Tjek for opdateringer"
-
-#: ../mdkapplet:161
+#: ../mdkapplet:169
 #, c-format
 msgid "See logs"
 msgstr "Se logger"
 
-#: ../mdkapplet:164
+#: ../mdkapplet:172
 #, c-format
 msgid "Status"
 msgstr "Status"
 
-#: ../mdkapplet:168 ../mdkapplet:363
+#: ../mdkapplet:176 ../mdkapplet:375
 #, c-format
 msgid "Close"
 msgstr "Luk"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Network Connection: "
 msgstr "Netværks-forbindelse: "
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Up"
 msgstr "Op"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Down"
 msgstr "Ned"
 
-#: ../mdkapplet:204
+#: ../mdkapplet:212
 #, c-format
 msgid "Last check: "
 msgstr "Sidste tjek: "
 
-#: ../mdkapplet:205
+#: ../mdkapplet:213
 #, c-format
 msgid "Updates: "
 msgstr "Opdateringer: "
 
-#: ../mdkapplet:209
+#: ../mdkapplet:217
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Begynder på drakconnect\n"
 
-#: ../mdkapplet:213
+#: ../mdkapplet:221
 #, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "Start Mandrakelinux Opdatering op - applet\n"
 
-#: ../mdkapplet:217
+#: ../mdkapplet:224
 #, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 "Mandrakeonline ser ud til at være geninstalleret, genindlæser applet ...."
 
-#: ../mdkapplet:225
+#: ../mdkapplet:235
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Beregner nye opdateringer...\n"
 
-#: ../mdkapplet:227
+#: ../mdkapplet:237
 #, c-format
 msgid "Connecting to"
 msgstr "Kobler op til"
 
-#: ../mdkapplet:250
+#: ../mdkapplet:244
+#, c-format
+msgid "Response from Mandrakeonline server\n"
+msgstr "Svar fra Mandrakeonline-serveren\n"
+
+#: ../mdkapplet:262
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Tjekker... Opdateringer er tilgængelige\n"
 
-#: ../mdkapplet:254
+#: ../mdkapplet:267
 #, c-format
 msgid "Development release not supported by service"
 msgstr "Udviklingsudgivelse ikke understøttet af tjeneste"
 
-#: ../mdkapplet:255
+#: ../mdkapplet:268
 #, c-format
 msgid "Too old release not supported by service"
 msgstr "For gammel udgivelse ikke understøttet af tjeneste"
 
-#: ../mdkapplet:256
+#: ../mdkapplet:269
 #, c-format
 msgid "Unknown state"
 msgstr "Ukendt tilstand"
 
-#: ../mdkapplet:257
+#: ../mdkapplet:270
 #, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr "Nettjenester er deaktiveret. Kontakt Mandrakeonline webstedet\n"
 
-#: ../mdkapplet:258
+#: ../mdkapplet:271
 #, c-format
 msgid "Wrong Password.\n"
 msgstr "Forkert adgangskode\n"
 
-#: ../mdkapplet:259
+#: ../mdkapplet:272
 #, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr "Forkert handling eller vært eller brugerkonto.\n"
 
-#: ../mdkapplet:260
+#: ../mdkapplet:273
 #, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
@@ -221,72 +231,82 @@ msgstr ""
 "Noget er galt med din netværksopsætning (tjek din rute-, brandmurs- og proxy-"
 "opsætning)\n"
 
-#: ../mdkapplet:264
+#: ../mdkapplet:277
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Systemet er opdateret\n"
 
-#: ../mdkapplet:303
+#: ../mdkapplet:317
 #, c-format
 msgid "No check"
 msgstr "Ingen tjek"
 
-#: ../mdkapplet:316
+#: ../mdkapplet:330
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Tjekker netværk: ser ud til at være deaktiveret\n"
 
-#: ../mdkapplet:319
+#: ../mdkapplet:333
 #, c-format
 msgid "Checking config file: Not present\n"
 msgstr "Tjekker konfigureringsfil: Ikke til stede\n"
 
-#: ../mdkapplet:353
+#: ../mdkapplet:365
 #, c-format
 msgid "Logs"
 msgstr "Logger"
 
-#: ../mdkapplet:369
+#: ../mdkapplet:381
 #, c-format
 msgid "Clear"
 msgstr "Nulstil"
 
-#: ../mdkapplet:396
+#: ../mdkapplet:408
 #, c-format
 msgid "About..."
 msgstr "Om..."
 
-#: ../mdkapplet:397
+#: ../mdkapplet:409
 #, c-format
 msgid "Always launch on startup"
 msgstr "Start altid op ved opstart"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:411
 #, c-format
 msgid "Quit"
 msgstr "Afslut"
 
-#: ../mdkonline:89
+#: ../mdkonline:52 ../mdkonline:106
 #, c-format
-msgid "Next"
-msgstr "Næste"
+msgid "Mandrakeonline"
+msgstr "Mandrakeonline"
 
-#: ../mdkonline:89
+#: ../mdkonline:55
+#, c-format
+msgid "I already have an account"
+msgstr "Jeg har allerede en konto"
+
+#: ../mdkonline:56
+#, c-format
+msgid "I want to subscribe"
+msgstr "Jeg vil gerne tilmeldes"
+
+#: ../mdkonline:89 ../mdkonline:93 ../mdkonline:131
 #, c-format
-msgid "Cancel"
-msgstr "Annullér"
+msgid "Please wait"
+msgstr "Vent venligst"
 
 #: ../mdkonline:89
 #, c-format
-msgid "Previous"
-msgstr "Forrige"
+msgid "Reading configuration\n"
+msgstr "Læser konfiguration\n"
 
-#: ../mdkonline:103
+#: ../mdkonline:93
 #, c-format
-msgid "Welcome to Mandrakeonline"
-msgstr "Velkommen til Mandrakeonline"
+msgid "Sending configuration..."
+msgstr "Sender konfiguration..."
 
-#: ../mdkonline:104 ../mdkonline_tui:98
+#: ../mdkonline:109
 #, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
@@ -298,62 +318,37 @@ msgstr ""
 "holde dig orienteret omkring sikkerhedsopdateringer og nyttige "
 "opdateringer.\n"
 
-#: ../mdkonline:105 ../mdkonline_tui:142
+#: ../mdkonline:114
 #, c-format
-msgid "Create a Mandrakeonline Account"
-msgstr "Opret en Mandrakeonline-konto"
+msgid "Account creation or authentication"
+msgstr "Oprettelse eller bekræftelse af konto"
 
-#: ../mdkonline:107
+#: ../mdkonline:119
 #, c-format
-msgid "I don't have a Mandrakeonline account and I want to subscribe"
-msgstr "Jeg har ikke en Mandrakeonline-konto, og jeg vil gerne meldes til"
+msgid "Enter your Mandrakeonline login, password and machine name:"
+msgstr "Angiv dit Mandrakeonline brugernavn, adgangskode og maskinnavn:"
 
-#: ../mdkonline:111 ../mdkonline:131 ../mdkonline_tui:114 ../mdkonline_tui:145
+#: ../mdkonline:125 ../mdkonline:156
 #, c-format
 msgid "Login:"
 msgstr "Brugernavn:"
 
-#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:115 ../mdkonline_tui:146
+#: ../mdkonline:126 ../mdkonline:157
 #, c-format
 msgid "Password:"
 msgstr "Adgangskode:"
 
-#: ../mdkonline:113 ../mdkonline_tui:147
-#, c-format
-msgid "Confirm Password:"
-msgstr "Bekræft adgangskode:"
-
-#: ../mdkonline:114 ../mdkonline_tui:148
-#, c-format
-msgid "Mail contact:"
-msgstr "Mail-kontakt:"
-
-#: ../mdkonline:121
-#, c-format
-msgid "Mandrakelinux Privacy Policy"
-msgstr "Mandrakelinux privatbeskyttelsespolitik"
-
 #: ../mdkonline:127
 #, c-format
-msgid "Authentification"
-msgstr "Autentifikation"
-
-#: ../mdkonline:128 ../mdkonline_tui:108
-#, c-format
-msgid "Enter your Mandrakeonline login, password and machine name:"
-msgstr "Angiv dit Mandrakeonline brugernavn, adgangskode og maskinnavn:"
-
-#: ../mdkonline:133 ../mdkonline_tui:116
-#, c-format
 msgid "Machine name:"
 msgstr "Maskinnavn:"
 
-#: ../mdkonline:138
+#: ../mdkonline:131
 #, c-format
-msgid "Send Configuration"
-msgstr "Send konfiguration"
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Kobler op til Mandrakeonline-netstedet"
 
-#: ../mdkonline:139 ../mdkonline_tui:128
+#: ../mdkonline:139
 #, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
@@ -381,55 +376,56 @@ msgstr ""
 "epost-underretninger. Desuden vil du få rabat på betalbare \n"
 "supporttjenenester på www.mandrakeexpert.com."
 
-#: ../mdkonline:144 ../mdkonline:211 ../mdkonline:234
+#: ../mdkonline:141 ../mdkonline:180 ../mdkupdate:126 ../mdkupdate:198
 #, c-format
-msgid "Finish"
-msgstr "Afslut"
+msgid "Connection problem"
+msgstr "Problem med forbindelse"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid "Your upload was successful!"
-msgstr "Din oplægning lykkedes!"
+msgid "or"
+msgstr "eller"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandrakeonline."
-msgstr ""
-"Fra nu af vil du modtage annonceringer om sikkerhed\n"
-"og opdateringer takket være Mandrakeonline."
+msgid "wrong password:"
+msgstr "forkert adgangskode:"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
 msgid ""
-"Mandrakeonline offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+"Your login or password was wrong.\n"
+" Either you'll have to type it again, or you'll need to create an account on "
+"Mandrakeonline.\n"
+" In the latter case, go back to the first step to connect to "
+"Mandrakeonline.\n"
+" Be aware that you must also provide a Machine name \n"
+" (only alphabetical characters are admitted)"
 msgstr ""
-"Mandrakeonline tilbyder dig at kunne automatisere opdateringerne.\n"
-"Et program vil køre jævnligt på dit system der venter på nye opdateringer\n"
-
-#: ../mdkonline:146
-#, c-format
-msgid "automated Upgrades"
-msgstr "automatiserede upgraderinger"
+"Dit brugernavn eller adgangskode var forkert.\n"
+"Enten skal du indtaste det igen, eller også skal du oprette en konto hos "
+"Mandrakeonline.\n"
+" I sidste tilfælde skal du gå tilbage til det første trin for forbindelse "
+"til Mandrakeonline.\n"
+"Vær opmærksom på at du også skal angive et maskinnavn \n"
+"(Kun bogstaver er tilladt)"
 
-#: ../mdkonline:150
+#: ../mdkonline:153
 #, c-format
-msgid "Country:"
-msgstr "Land:"
+msgid "Create a Mandrakeonline Account"
+msgstr "Opret en Mandrakeonline-konto"
 
-#: ../mdkonline:178 ../mdkonline:183 ../mdkonline:185 ../mdkonline:187
+#: ../mdkonline:158
 #, c-format
-msgid "Error"
-msgstr "Fejl"
+msgid "Confirm Password:"
+msgstr "Bekræft adgangskode:"
 
-#: ../mdkonline:183 ../mdkonline_tui:152
+#: ../mdkonline:159
 #, c-format
-msgid "Please provide a login"
-msgstr "Angiv venligst et logind"
+msgid "Mail contact:"
+msgstr "Mail-kontakt:"
 
-#: ../mdkonline:185 ../mdkonline_tui:152
+#: ../mdkonline:163
 #, c-format
 msgid ""
 "The passwords do not match\n"
@@ -438,161 +434,116 @@ msgstr ""
 "Adgangskoderne er ikke ens\n"
 " Prøv igen\n"
 
-#: ../mdkonline:187 ../mdkonline_tui:152
+#: ../mdkonline:163
+#, c-format
+msgid "Please provide a login"
+msgstr "Angiv venligst et logind"
+
+#: ../mdkonline:163
 #, c-format
 msgid "Not a valid mail address!\n"
 msgstr "Ikke en gyldig postadresse!\n"
 
-#: ../mdkonline:199 ../mdkonline_tui:78
+#: ../mdkonline:169
 #, c-format
-msgid "Reading configuration\n"
-msgstr "Læser konfiguration\n"
+msgid ""
+"Mandrakeonline Account successfully created.\n"
+"Please click \"Next\" to authenticate and upload your configuration\n"
+msgstr ""
+"Mandrakeonline-konto oprettet uden problemer\n"
+"Klik \"Næste\" for at bekræfte og lægge din  konfiguration op\n"
 
-#: ../mdkonline:204 ../mdkonline_tui:82
+#: ../mdkonline:178
 #, c-format
-msgid "Sending configuration..."
-msgstr "Sender konfiguration..."
+msgid "Your upload was successful!"
+msgstr "Din oplægning lykkedes!"
 
-#: ../mdkonline:213 ../mdkonline:273 ../mdkonline_tui:130 ../mdkonline_tui:169
-#: ../mdkupdate:124 ../mdkupdate:195
+#: ../mdkonline:178
 #, c-format
-msgid "Connection problem"
-msgstr "Problem med forbindelse"
+msgid ""
+"From now you will receive on security and updates \n"
+"announcements thanks to Mandrakeonline."
+msgstr ""
+"Fra nu af vil du modtage annonceringer om sikkerhed\n"
+"og opdateringer takket være Mandrakeonline."
+
+#: ../mdkonline:178
+#, c-format
+msgid ""
+"Mandrakeonline offers you the ability to automate the updates.\n"
+"A program will run regulary in your system waiting for new updates\n"
+msgstr ""
+"Mandrakeonline tilbyder dig at kunne automatisere opdateringerne.\n"
+"Et program vil køre jævnligt på dit system der venter på nye opdateringer\n"
 
-#: ../mdkonline:213 ../mdkonline_tui:169
+#: ../mdkonline:180
 #, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr "Problem skete ved oplægning af filer, prøv igen"
 
-#: ../mdkonline:251
+#: ../mdkonline:186
 #, c-format
-msgid "Quitting Wizard\n"
-msgstr "Afslutter guiden\n"
+msgid "Country"
+msgstr "Land"
 
-#: ../mdkonline:273
+#: ../mdkonline:198
 #, c-format
-msgid "Mandrakeonline could not be contacted, please try again at a later time"
-msgstr "Mandrakeonline kunne ikke kontaktes, prøv igen senere"
+msgid "Congratulations"
+msgstr "Tillykke"
 
-#: ../mdkonline:285
+#: ../mdkonline:198
 #, c-format
-msgid "Wrong password"
-msgstr "Forkert adgangskode"
+msgid "Your Mandrakeonline account has been successfully configured\n"
+msgstr "Din Mandrakeonline-konto er blevet konfigureret uden problemer\n"
 
-#: ../mdkonline:285 ../mdkonline_tui:130
+#: ../mdkonline:214
+#, fuzzy, c-format
+msgid "Configuration uploaded successfully"
+msgstr "Din oplægning lykkedes!"
+
+#: ../mdkonline:215
+#, fuzzy, c-format
+msgid "Problem uploading configuration"
+msgstr "Læser konfiguration\n"
+
+#: ../mdkonline:216
 #, c-format
 msgid ""
-"Your login or password was wrong.\n"
-" Either you'll have to type it again, or you'll need to create an account on "
-"Mandrakeonline.\n"
-" In the latter case, go back to the first step to connect to "
-"Mandrakeonline.\n"
-" Be aware that you must also provide a Machine name \n"
-" (only alphabetical characters are admitted)"
+"Cannot connect to mandrakeonline website: wrong login/password or router/"
+"firewall bad settings"
 msgstr ""
-"Dit brugernavn eller adgangskode var forkert.\n"
-"Enten skal du indtaste det igen, eller også skal du oprette en konto hos "
-"Mandrakeonline.\n"
-" I sidste tilfælde skal du gå tilbage til det første trin for forbindelse "
-"til Mandrakeonline.\n"
-"Vær opmærksom på at du også skal angive et maskinnavn \n"
-"(Kun bogstaver er tilladt)"
 
-#: ../mdkonline.pm:58
+#: ../mdkonline.pm:66
 #, c-format
 msgid "Login and password should be less than 12 characters\n"
 msgstr "Logind og adgangskode bør være mindre end 12 tegn lange\n"
 
-#: ../mdkonline.pm:59
+#: ../mdkonline.pm:67
 #, c-format
 msgid "Special characters are not allowed\n"
 msgstr "Specialtegn er ikke tilladt\n"
 
-#: ../mdkonline.pm:60
+#: ../mdkonline.pm:68
 #, c-format
 msgid "Please fill in all fields\n"
 msgstr "Udfyld venligst alle felter\n"
 
-#: ../mdkonline.pm:61
+#: ../mdkonline.pm:69
 #, c-format
 msgid "Email not valid\n"
 msgstr "Email ikke gyldig\n"
 
-#: ../mdkonline.pm:62
+#: ../mdkonline.pm:70
 #, c-format
 msgid "Account already exist\n"
 msgstr "Konto eksisterer allerede\n"
 
-#: ../mdkonline.pm:68
+#: ../mdkonline.pm:76
 #, c-format
 msgid "Problem connecting to server \n"
 msgstr "Problem ved opkobling til server \n"
 
-#: ../mdkonline_tui:45 ../mdkonline_tui:95
-#, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
-
-#: ../mdkonline_tui:48
-#, c-format
-msgid "I already have an account"
-msgstr "Jeg har allerede en konto"
-
-#: ../mdkonline_tui:49
-#, c-format
-msgid "I want to subscribe"
-msgstr "Jeg vil gerne tilmeldes"
-
-#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:120
-#, c-format
-msgid "Please wait"
-msgstr "Vent venligst"
-
-#: ../mdkonline_tui:103
-#, c-format
-msgid "Account creation or authentication"
-msgstr "Oprettelse eller bekræftelse af konto"
-
-#: ../mdkonline_tui:120
-#, c-format
-msgid "Connecting to Mandrakeonline website..."
-msgstr "Kobler op til Mandrakeonline-netstedet"
-
-#: ../mdkonline_tui:130
-#, c-format
-msgid "or"
-msgstr "eller"
-
-#: ../mdkonline_tui:130
-#, c-format
-msgid "wrong password:"
-msgstr "forkert adgangskode:"
-
-#: ../mdkonline_tui:158
-#, c-format
-msgid ""
-"Mandrakeonline Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-"Mandrakeonline-konto oprettet uden problemer\n"
-"Klik \"Næste\" for at bekræfte og lægge din  konfiguration op\n"
-
-#: ../mdkonline_tui:175
-#, c-format
-msgid "Country"
-msgstr "Land"
-
-#: ../mdkonline_tui:187
-#, c-format
-msgid "Congratulations"
-msgstr "Tillykke"
-
-#: ../mdkonline_tui:187
-#, c-format
-msgid "Your Mandrakeonline account has been successfully configured\n"
-msgstr "Din Mandrakeonline-konto er blevet konfigureret uden problemer\n"
-
-#: ../mdkupdate:50
+#: ../mdkupdate:52
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
@@ -608,42 +559,37 @@ msgstr ""
 "\n"
 "brug:\n"
 
-#: ../mdkupdate:55
+#: ../mdkupdate:57
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - print denne hjælpebesked.\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:58
 #, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto         - Mandrakeupdate startes automatisk.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:59
 #, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - start MandrakeOpdatér op.\n"
 
-#: ../mdkupdate:58
-#, c-format
-msgid "  --update       - Update keys\n"
-msgstr "  --update       - Opdatér nøgler\n"
-
-#: ../mdkupdate:66
+#: ../mdkupdate:67
 #, c-format
 msgid "No %s file found. Run mdkonline wizard first"
 msgstr "Ingen %s-fil fundet. Kør mdkonline-hjælperen først"
 
-#: ../mdkupdate:124
+#: ../mdkupdate:126
 #, c-format
 msgid "Mandrakeupdate could not contact the site, we will try again."
 msgstr "Mandrakeupdate kunne ikke kontakte stedet, vi vil prøve igen."
 
-#: ../mdkupdate:173
+#: ../mdkupdate:176
 #, c-format
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr "Kan ikke opdatere pakker fra mdkupdate-medium.\n"
 
-#: ../mdkupdate:195
+#: ../mdkupdate:198
 #, c-format
 msgid ""
 "Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
@@ -652,6 +598,55 @@ msgstr ""
 "Mandrakeupdate kunne ikke lægge diff-filerne op. Send et brev til "
 "support@mandrakeonline.net"
 
+#~ msgid "Next"
+#~ msgstr "Næste"
+
+#~ msgid "Cancel"
+#~ msgstr "Annullér"
+
+#~ msgid "Previous"
+#~ msgstr "Forrige"
+
+#~ msgid "Welcome to Mandrakeonline"
+#~ msgstr "Velkommen til Mandrakeonline"
+
+#~ msgid "I don't have a Mandrakeonline account and I want to subscribe"
+#~ msgstr "Jeg har ikke en Mandrakeonline-konto, og jeg vil gerne meldes til"
+
+#~ msgid "Mandrakelinux Privacy Policy"
+#~ msgstr "Mandrakelinux privatbeskyttelsespolitik"
+
+#~ msgid "Authentification"
+#~ msgstr "Autentifikation"
+
+#~ msgid "Send Configuration"
+#~ msgstr "Send konfiguration"
+
+#~ msgid "Finish"
+#~ msgstr "Afslut"
+
+#~ msgid "automated Upgrades"
+#~ msgstr "automatiserede upgraderinger"
+
+#~ msgid "Country:"
+#~ msgstr "Land:"
+
+#~ msgid "Error"
+#~ msgstr "Fejl"
+
+#~ msgid "Quitting Wizard\n"
+#~ msgstr "Afslutter guiden\n"
+
+#~ msgid ""
+#~ "Mandrakeonline could not be contacted, please try again at a later time"
+#~ msgstr "Mandrakeonline kunne ikke kontaktes, prøv igen senere"
+
+#~ msgid "Wrong password"
+#~ msgstr "Forkert adgangskode"
+
+#~ msgid "  --update       - Update keys\n"
+#~ msgstr "  --update       - Opdatér nøgler\n"
+
 #~ msgid "Skip Wizard"
 #~ msgstr "Overspring hjælperen"
 
@@ -700,9 +695,6 @@ msgstr ""
 #~ msgid "Server Problem"
 #~ msgstr "Serverproblem"
 
-#~ msgid "Response from Mandrakeonline server\n"
-#~ msgstr "Svar fra Mandrakeonline-serveren\n"
-
 #~ msgid "Launching Mandrakeupdate\n"
 #~ msgstr "Start Mandrakelinux Opdatering op\n"
 
diff --git a/po/de.po b/po/de.po
index 69f40ce9..d65de3ce 100644
--- a/po/de.po
+++ b/po/de.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-01 22:41+0200\n"
+"POT-Creation-Date: 2004-11-03 12:10+0100\n"
 "PO-Revision-Date: 2004-09-18 12:24+0200\n"
 "Last-Translator: Frank Köster\n"
 "Language-Team: Deutsch <I18n-mdk-de@codershome.org>\n"
@@ -19,12 +19,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3.1\n"
 
-#: ../mdkapplet:61
+#: ../mdkapplet:63
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Ihr System ist aktuell"
 
-#: ../mdkapplet:67
+#: ../mdkapplet:69
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -33,188 +33,198 @@ msgstr ""
 "Konfigurationsproblem des Dienstes. Bitte überprüfen Sie die Log-Datei und "
 "senden Sie eine Mail an support@mandrakeonline.net"
 
-#: ../mdkapplet:73
+#: ../mdkapplet:75
 #, c-format
 msgid "System is busy. Please wait ..."
 msgstr "System ist beschäftigt. Warte ..."
 
-#: ../mdkapplet:79
+#: ../mdkapplet:81
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Neue Aktualisierungen für Ihr System verfügbar"
 
-#: ../mdkapplet:85
+#: ../mdkapplet:87
 #, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr "Dienst nicht konfiguriert. Klicken Sie auf „Den Dienst konfigurieren“"
 
-#: ../mdkapplet:91
+#: ../mdkapplet:93
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Kein Netzwerk. Bitte konfigurieren Sie Ihr Netzwerk"
 
-#: ../mdkapplet:97
+#: ../mdkapplet:99
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Dienst nicht verfügbar. Klicken Sie auf „Online Webseite“"
 
-#: ../mdkapplet:103
+#: ../mdkapplet:105
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:108 ../mdkapplet:158
+#: ../mdkapplet:110 ../mdkapplet:164
 #, c-format
 msgid "Install updates"
 msgstr "Aktualisieren"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:111
 #, c-format
 msgid "Configure the service"
 msgstr "Den Dienst konfigurieren"
 
-#: ../mdkapplet:110
+#: ../mdkapplet:112
 #, c-format
 msgid "Check Updates"
 msgstr "Überprüfe Updates"
 
-#: ../mdkapplet:111
+#: ../mdkapplet:113 ../mdkapplet:167 ../mdkapplet:225
+#, fuzzy, c-format
+msgid "Please Wait"
+msgstr "Bitte warten"
+
+#: ../mdkapplet:113 ../mdkapplet:166 ../mdkapplet:167 ../mdkapplet:225
+#, c-format
+msgid "Check updates"
+msgstr "Überprüfe Updates"
+
+#: ../mdkapplet:115
 #, c-format
 msgid "Online WebSite"
 msgstr "Online Webseite"
 
-#: ../mdkapplet:112
+#: ../mdkapplet:116
 #, c-format
 msgid "Configure Network"
 msgstr "Netzwerk konfigurieren"
 
-#: ../mdkapplet:113
+#: ../mdkapplet:117
 #, c-format
 msgid "Configure Now!"
 msgstr "Jetzt konfigurieren!"
 
-#: ../mdkapplet:146
+#: ../mdkapplet:152 ../mdkapplet:229
 #, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Mandrakelinux Update-Applet"
 
-#: ../mdkapplet:156
+#: ../mdkapplet:162
 #, c-format
 msgid "Actions"
 msgstr "Aktionen"
 
-#: ../mdkapplet:159
+#: ../mdkapplet:165
 #, c-format
 msgid "Configure"
 msgstr "Konfigurieren"
 
-#: ../mdkapplet:160
-#, c-format
-msgid "Check updates"
-msgstr "Überprüfe Updates"
-
-#: ../mdkapplet:161
+#: ../mdkapplet:169
 #, c-format
 msgid "See logs"
 msgstr "Logs ansehen"
 
-#: ../mdkapplet:164
+#: ../mdkapplet:172
 #, c-format
 msgid "Status"
 msgstr "Status"
 
-#: ../mdkapplet:168 ../mdkapplet:363
+#: ../mdkapplet:176 ../mdkapplet:375
 #, c-format
 msgid "Close"
 msgstr "Schließen"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Network Connection: "
 msgstr "Netzwerkverbindung:"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Up"
 msgstr "Hoch"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Down"
 msgstr "Runter"
 
-#: ../mdkapplet:204
+#: ../mdkapplet:212
 #, c-format
 msgid "Last check: "
 msgstr "Letzte Überprüfung:"
 
-#: ../mdkapplet:205
+#: ../mdkapplet:213
 #, c-format
 msgid "Updates: "
 msgstr "Aktualisierungen:"
 
-#: ../mdkapplet:209
+#: ../mdkapplet:217
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Starte drakconnect\n"
 
-#: ../mdkapplet:213
+#: ../mdkapplet:221
 #, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "Starte mdkupdate --applet\n"
 
-#: ../mdkapplet:217
+#: ../mdkapplet:224
 #, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 "Mandrakeonline scheint neu installiert worden zu sein, lade Applet erneut ..."
 
-#: ../mdkapplet:225
+#: ../mdkapplet:235
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Berechne neue Updates...\n"
 
-#: ../mdkapplet:227
+#: ../mdkapplet:237
 #, c-format
 msgid "Connecting to"
 msgstr "Verbinde mit"
 
-#: ../mdkapplet:250
+#: ../mdkapplet:244
+#, fuzzy, c-format
+msgid "Response from Mandrakeonline server\n"
+msgstr "Wilkommen bei Mandrakeonline"
+
+#: ../mdkapplet:262
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Überprüfe... Updates sind verfügbar\n"
 
-#: ../mdkapplet:254
+#: ../mdkapplet:267
 #, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
-#: ../mdkapplet:255
+#: ../mdkapplet:268
 #, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
-#: ../mdkapplet:256
+#: ../mdkapplet:269
 #, c-format
 msgid "Unknown state"
 msgstr "Unbekannter Zustand"
 
-#: ../mdkapplet:257
+#: ../mdkapplet:270
 #, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr "Onlinedienste abgeschaltet. Kontaktieren Sie die Mandrakeonline Site\n"
 
-#: ../mdkapplet:258
+#: ../mdkapplet:271
 #, c-format
 msgid "Wrong Password.\n"
 msgstr "Falsches Passwort\n"
 
-#: ../mdkapplet:259
+#: ../mdkapplet:272
 #, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr "Falsche Aktion, falscher Host oder Anmeldekennung\n"
 
-#: ../mdkapplet:260
+#: ../mdkapplet:273
 #, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
@@ -223,72 +233,82 @@ msgstr ""
 "Mit Ihren Netzwerkeinstellngen scheint etwas nicht in Ordnung zu sein "
 "(Pruefen SieRoute, Firewall, oder Prxy-einstellungen)\n"
 
-#: ../mdkapplet:264
+#: ../mdkapplet:277
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "System ist aktuell\n"
 
-#: ../mdkapplet:303
+#: ../mdkapplet:317
 #, c-format
 msgid "No check"
 msgstr "Keine Überprüfung"
 
-#: ../mdkapplet:316
+#: ../mdkapplet:330
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Überprüfe Netzwerk: Scheint abgeschaltet\n"
 
-#: ../mdkapplet:319
+#: ../mdkapplet:333
 #, c-format
 msgid "Checking config file: Not present\n"
 msgstr "Überprüfe Konfigurationsdatei: Nicht vorhanden\n"
 
-#: ../mdkapplet:353
+#: ../mdkapplet:365
 #, c-format
 msgid "Logs"
 msgstr "Logs"
 
-#: ../mdkapplet:369
+#: ../mdkapplet:381
 #, c-format
 msgid "Clear"
 msgstr "Löschen"
 
-#: ../mdkapplet:396
+#: ../mdkapplet:408
 #, c-format
 msgid "About..."
 msgstr "Über.."
 
-#: ../mdkapplet:397
+#: ../mdkapplet:409
 #, c-format
 msgid "Always launch on startup"
 msgstr "Immer beim Start ausführen"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:411
 #, c-format
 msgid "Quit"
 msgstr "Beenden"
 
-#: ../mdkonline:89
+#: ../mdkonline:52 ../mdkonline:106
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "Wilkommen bei Mandrakeonline"
+
+#: ../mdkonline:55
 #, c-format
-msgid "Next"
-msgstr "Nächster"
+msgid "I already have an account"
+msgstr ""
 
-#: ../mdkonline:89
+#: ../mdkonline:56
+#, c-format
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline:89 ../mdkonline:93 ../mdkonline:131
 #, c-format
-msgid "Cancel"
-msgstr "Abbruch"
+msgid "Please wait"
+msgstr "Bitte warten"
 
 #: ../mdkonline:89
 #, c-format
-msgid "Previous"
-msgstr "Zurück"
+msgid "Reading configuration\n"
+msgstr "Lese Konfiguration\n"
 
-#: ../mdkonline:103
+#: ../mdkonline:93
 #, c-format
-msgid "Welcome to Mandrakeonline"
-msgstr "Wilkommen bei Mandrakeonline"
+msgid "Sending configuration..."
+msgstr "Sende Konfiguration..."
 
-#: ../mdkonline:104 ../mdkonline_tui:98
+#: ../mdkonline:109
 #, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
@@ -299,63 +319,38 @@ msgstr ""
 "Konfiguration) zu einer zentralisierten Datenbank hochzuladen um\n"
 "Sie über Sicherheitsupdates und nützliche Upgrades zu informieren.\n"
 
-#: ../mdkonline:105 ../mdkonline_tui:142
+#: ../mdkonline:114
 #, c-format
-msgid "Create a Mandrakeonline Account"
-msgstr "Erstelle einen Mandrakeonline Account"
+msgid "Account creation or authentication"
+msgstr ""
 
-#: ../mdkonline:107
-#, fuzzy, c-format
-msgid "I don't have a Mandrakeonline account and I want to subscribe"
-msgstr "Ich besitze keinen Mandrakeonline Account und ich möchte"
+#: ../mdkonline:119
+#, c-format
+msgid "Enter your Mandrakeonline login, password and machine name:"
+msgstr ""
+"Geben Sie Ihren Mandrakeonline Benutzernamen, Passwort und Rechnernamen ein:"
 
-#: ../mdkonline:111 ../mdkonline:131 ../mdkonline_tui:114 ../mdkonline_tui:145
+#: ../mdkonline:125 ../mdkonline:156
 #, c-format
 msgid "Login:"
 msgstr "Benutzername:"
 
-#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:115 ../mdkonline_tui:146
+#: ../mdkonline:126 ../mdkonline:157
 #, c-format
 msgid "Password:"
 msgstr "Passwort:"
 
-#: ../mdkonline:113 ../mdkonline_tui:147
-#, c-format
-msgid "Confirm Password:"
-msgstr "Passwort bestätigen:"
-
-#: ../mdkonline:114 ../mdkonline_tui:148
-#, c-format
-msgid "Mail contact:"
-msgstr "Mail Kontakt:"
-
-#: ../mdkonline:121
-#, c-format
-msgid "Mandrakelinux Privacy Policy"
-msgstr "Mandrakelinux Datenschutzrichtlinie"
-
 #: ../mdkonline:127
 #, c-format
-msgid "Authentification"
-msgstr "Authentifizierung"
-
-#: ../mdkonline:128 ../mdkonline_tui:108
-#, c-format
-msgid "Enter your Mandrakeonline login, password and machine name:"
-msgstr ""
-"Geben Sie Ihren Mandrakeonline Benutzernamen, Passwort und Rechnernamen ein:"
-
-#: ../mdkonline:133 ../mdkonline_tui:116
-#, c-format
 msgid "Machine name:"
 msgstr "Rechnername:"
 
-#: ../mdkonline:138
-#, c-format
-msgid "Send Configuration"
-msgstr "Konfiguration senden"
+#: ../mdkonline:131
+#, fuzzy, c-format
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Wilkommen bei Mandrakeonline"
 
-#: ../mdkonline:139 ../mdkonline_tui:128
+#: ../mdkonline:139
 #, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
@@ -389,56 +384,56 @@ msgstr ""
 "Desweiteren profitiren Sie von ermäßigten Support Diensten auf\n"
 "www.mandrakeexpert.com."
 
-#: ../mdkonline:144 ../mdkonline:211 ../mdkonline:234
+#: ../mdkonline:141 ../mdkonline:180 ../mdkupdate:126 ../mdkupdate:198
 #, c-format
-msgid "Finish"
-msgstr "Ende"
-
-#: ../mdkonline:145 ../mdkonline_tui:167
-#, c-format
-msgid "Your upload was successful!"
-msgstr "Ihr Upload war erfolgreich!"
+msgid "Connection problem"
+msgstr "Verbindungsproblem"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandrakeonline."
+msgid "or"
 msgstr ""
-"Ab jetzt erhalten SIe Sicherheits- und Updateankündigungen\n"
-"dank Mandrakeonline."
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "Falsches Passwort"
+
+#: ../mdkonline:141
 #, c-format
 msgid ""
-"Mandrakeonline offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+"Your login or password was wrong.\n"
+" Either you'll have to type it again, or you'll need to create an account on "
+"Mandrakeonline.\n"
+" In the latter case, go back to the first step to connect to "
+"Mandrakeonline.\n"
+" Be aware that you must also provide a Machine name \n"
+" (only alphabetical characters are admitted)"
 msgstr ""
-"Mandrakeonline bietet Ihnen die Möglichkeit, Updates zu automatisieren.\n"
-"Ein Program wird regelmäßig auf Ihrem System laufen, um auf neue Updates zu "
-"prüfen\n"
-
-#: ../mdkonline:146
-#, c-format
-msgid "automated Upgrades"
-msgstr "automatisierte Upgrades"
+"Ihr Benutzername oder Passwort war falsch.\n"
+"Entweder habe Sie sich vertippt, oder Sie müssen ein Benutzerkonto auf "
+"Mandrakeonline erstellen.\n"
+"Im letzteren Fall gehen Sie zurück zum ersten Schritt, um sich mit "
+"Mandrakeonline zu verbinden.\n"
+"Seien Sie Sich bewustt, dass Sie eine Rechnernamen bereitstellen müssen \n"
+" (nur alphabetische Zeichen sind zugelassen)"
 
-#: ../mdkonline:150
+#: ../mdkonline:153
 #, c-format
-msgid "Country:"
-msgstr "Land:"
+msgid "Create a Mandrakeonline Account"
+msgstr "Erstelle einen Mandrakeonline Account"
 
-#: ../mdkonline:178 ../mdkonline:183 ../mdkonline:185 ../mdkonline:187
+#: ../mdkonline:158
 #, c-format
-msgid "Error"
-msgstr "Fehler"
+msgid "Confirm Password:"
+msgstr "Passwort bestätigen:"
 
-#: ../mdkonline:183 ../mdkonline_tui:152
+#: ../mdkonline:159
 #, c-format
-msgid "Please provide a login"
-msgstr "Bitte geben Sie eine Loginkennung an"
+msgid "Mail contact:"
+msgstr "Mail Kontakt:"
 
-#: ../mdkonline:185 ../mdkonline_tui:152
+#: ../mdkonline:163
 #, c-format
 msgid ""
 "The passwords do not match\n"
@@ -447,163 +442,117 @@ msgstr ""
 "Die Passwörter stimmen nicht überein!\n"
 "Versuchen Sie es erneut!\n"
 
-#: ../mdkonline:187 ../mdkonline_tui:152
+#: ../mdkonline:163
+#, c-format
+msgid "Please provide a login"
+msgstr "Bitte geben Sie eine Loginkennung an"
+
+#: ../mdkonline:163
 #, c-format
 msgid "Not a valid mail address!\n"
 msgstr "Keine gültige E-Mail-Adresse!\n"
 
-#: ../mdkonline:199 ../mdkonline_tui:78
+#: ../mdkonline:169
 #, c-format
-msgid "Reading configuration\n"
-msgstr "Lese Konfiguration\n"
+msgid ""
+"Mandrakeonline Account successfully created.\n"
+"Please click \"Next\" to authenticate and upload your configuration\n"
+msgstr ""
 
-#: ../mdkonline:204 ../mdkonline_tui:82
+#: ../mdkonline:178
 #, c-format
-msgid "Sending configuration..."
-msgstr "Sende Konfiguration..."
+msgid "Your upload was successful!"
+msgstr "Ihr Upload war erfolgreich!"
 
-#: ../mdkonline:213 ../mdkonline:273 ../mdkonline_tui:130 ../mdkonline_tui:169
-#: ../mdkupdate:124 ../mdkupdate:195
+#: ../mdkonline:178
 #, c-format
-msgid "Connection problem"
-msgstr "Verbindungsproblem"
+msgid ""
+"From now you will receive on security and updates \n"
+"announcements thanks to Mandrakeonline."
+msgstr ""
+"Ab jetzt erhalten SIe Sicherheits- und Updateankündigungen\n"
+"dank Mandrakeonline."
+
+#: ../mdkonline:178
+#, c-format
+msgid ""
+"Mandrakeonline offers you the ability to automate the updates.\n"
+"A program will run regulary in your system waiting for new updates\n"
+msgstr ""
+"Mandrakeonline bietet Ihnen die Möglichkeit, Updates zu automatisieren.\n"
+"Ein Program wird regelmäßig auf Ihrem System laufen, um auf neue Updates zu "
+"prüfen\n"
 
-#: ../mdkonline:213 ../mdkonline_tui:169
+#: ../mdkonline:180
 #, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr ""
 "Ein Problem taucht beim hochladen der Dateien auf, bitte versuchen Sie es "
 "erneut"
 
-#: ../mdkonline:251
-#, c-format
-msgid "Quitting Wizard\n"
-msgstr "Beenden des Assistenten\n"
+#: ../mdkonline:186
+#, fuzzy, c-format
+msgid "Country"
+msgstr "Land:"
+
+#: ../mdkonline:198
+#, fuzzy, c-format
+msgid "Congratulations"
+msgstr "Konfiguration senden"
 
-#: ../mdkonline:273
+#: ../mdkonline:198
 #, c-format
-msgid "Mandrakeonline could not be contacted, please try again at a later time"
+msgid "Your Mandrakeonline account has been successfully configured\n"
 msgstr ""
-"Mandrakeonline kann nicht erreicht werden, versuchen Sie es später noch "
-"einmal."
 
-#: ../mdkonline:285
-#, c-format
-msgid "Wrong password"
-msgstr "Falsches Passwort"
+#: ../mdkonline:214
+#, fuzzy, c-format
+msgid "Configuration uploaded successfully"
+msgstr "Ihr Upload war erfolgreich!"
+
+#: ../mdkonline:215
+#, fuzzy, c-format
+msgid "Problem uploading configuration"
+msgstr "Lese Konfiguration\n"
 
-#: ../mdkonline:285 ../mdkonline_tui:130
+#: ../mdkonline:216
 #, c-format
 msgid ""
-"Your login or password was wrong.\n"
-" Either you'll have to type it again, or you'll need to create an account on "
-"Mandrakeonline.\n"
-" In the latter case, go back to the first step to connect to "
-"Mandrakeonline.\n"
-" Be aware that you must also provide a Machine name \n"
-" (only alphabetical characters are admitted)"
+"Cannot connect to mandrakeonline website: wrong login/password or router/"
+"firewall bad settings"
 msgstr ""
-"Ihr Benutzername oder Passwort war falsch.\n"
-"Entweder habe Sie sich vertippt, oder Sie müssen ein Benutzerkonto auf "
-"Mandrakeonline erstellen.\n"
-"Im letzteren Fall gehen Sie zurück zum ersten Schritt, um sich mit "
-"Mandrakeonline zu verbinden.\n"
-"Seien Sie Sich bewustt, dass Sie eine Rechnernamen bereitstellen müssen \n"
-" (nur alphabetische Zeichen sind zugelassen)"
 
-#: ../mdkonline.pm:58
+#: ../mdkonline.pm:66
 #, c-format
 msgid "Login and password should be less than 12 characters\n"
 msgstr ""
 
-#: ../mdkonline.pm:59
+#: ../mdkonline.pm:67
 #, c-format
 msgid "Special characters are not allowed\n"
 msgstr ""
 
-#: ../mdkonline.pm:60
+#: ../mdkonline.pm:68
 #, c-format
 msgid "Please fill in all fields\n"
 msgstr ""
 
-#: ../mdkonline.pm:61
+#: ../mdkonline.pm:69
 #, c-format
 msgid "Email not valid\n"
 msgstr ""
 
-#: ../mdkonline.pm:62
+#: ../mdkonline.pm:70
 #, c-format
 msgid "Account already exist\n"
 msgstr ""
 
-#: ../mdkonline.pm:68
+#: ../mdkonline.pm:76
 #, c-format
 msgid "Problem connecting to server \n"
 msgstr "Problem beim Verbindungsaufbau zum Server \n"
 
-#: ../mdkonline_tui:45 ../mdkonline_tui:95
-#, fuzzy, c-format
-msgid "Mandrakeonline"
-msgstr "Wilkommen bei Mandrakeonline"
-
-#: ../mdkonline_tui:48
-#, c-format
-msgid "I already have an account"
-msgstr ""
-
-#: ../mdkonline_tui:49
-#, c-format
-msgid "I want to subscribe"
-msgstr ""
-
-#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:120
-#, c-format
-msgid "Please wait"
-msgstr "Bitte warten"
-
-#: ../mdkonline_tui:103
-#, c-format
-msgid "Account creation or authentication"
-msgstr ""
-
-#: ../mdkonline_tui:120
-#, fuzzy, c-format
-msgid "Connecting to Mandrakeonline website..."
-msgstr "Wilkommen bei Mandrakeonline"
-
-#: ../mdkonline_tui:130
-#, c-format
-msgid "or"
-msgstr ""
-
-#: ../mdkonline_tui:130
-#, fuzzy, c-format
-msgid "wrong password:"
-msgstr "Falsches Passwort"
-
-#: ../mdkonline_tui:158
-#, c-format
-msgid ""
-"Mandrakeonline Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-
-#: ../mdkonline_tui:175
-#, fuzzy, c-format
-msgid "Country"
-msgstr "Land:"
-
-#: ../mdkonline_tui:187
-#, fuzzy, c-format
-msgid "Congratulations"
-msgstr "Konfiguration senden"
-
-#: ../mdkonline_tui:187
-#, c-format
-msgid "Your Mandrakeonline account has been successfully configured\n"
-msgstr ""
-
-#: ../mdkupdate:50
+#: ../mdkupdate:52
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
@@ -620,50 +569,94 @@ msgstr ""
 "\n"
 "Verwendung: \n"
 
-#: ../mdkupdate:55
+#: ../mdkupdate:57
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - Ausgabe dieser Hilfe.\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:58
 #, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto         - Mandrakeupdate startet automatisch.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:59
 #, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - starte Mandrakeupdate.\n"
 
-#: ../mdkupdate:58
-#, c-format
-msgid "  --update       - Update keys\n"
-msgstr "  --update       - Aktualisiere Schlüssel\n"
-
-#: ../mdkupdate:66
+#: ../mdkupdate:67
 #, c-format
 msgid "No %s file found. Run mdkonline wizard first"
 msgstr ""
 
-#: ../mdkupdate:124
+#: ../mdkupdate:126
 #, fuzzy, c-format
 msgid "Mandrakeupdate could not contact the site, we will try again."
 msgstr ""
 "Mandrakeonline kann nicht erreicht werden, versuchen Sie es später noch "
 "einmal."
 
-#: ../mdkupdate:173
+#: ../mdkupdate:176
 #, c-format
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr ""
 
-#: ../mdkupdate:195
+#: ../mdkupdate:198
 #, c-format
 msgid ""
 "Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
 "mandrakeonline [dot] net"
 msgstr ""
 
+#~ msgid "Next"
+#~ msgstr "Nächster"
+
+#~ msgid "Cancel"
+#~ msgstr "Abbruch"
+
+#~ msgid "Previous"
+#~ msgstr "Zurück"
+
+#, fuzzy
+#~ msgid "I don't have a Mandrakeonline account and I want to subscribe"
+#~ msgstr "Ich besitze keinen Mandrakeonline Account und ich möchte"
+
+#~ msgid "Mandrakelinux Privacy Policy"
+#~ msgstr "Mandrakelinux Datenschutzrichtlinie"
+
+#~ msgid "Authentification"
+#~ msgstr "Authentifizierung"
+
+#~ msgid "Send Configuration"
+#~ msgstr "Konfiguration senden"
+
+#~ msgid "Finish"
+#~ msgstr "Ende"
+
+#~ msgid "automated Upgrades"
+#~ msgstr "automatisierte Upgrades"
+
+#~ msgid "Country:"
+#~ msgstr "Land:"
+
+#~ msgid "Error"
+#~ msgstr "Fehler"
+
+#~ msgid "Quitting Wizard\n"
+#~ msgstr "Beenden des Assistenten\n"
+
+#~ msgid ""
+#~ "Mandrakeonline could not be contacted, please try again at a later time"
+#~ msgstr ""
+#~ "Mandrakeonline kann nicht erreicht werden, versuchen Sie es später noch "
+#~ "einmal."
+
+#~ msgid "Wrong password"
+#~ msgstr "Falsches Passwort"
+
+#~ msgid "  --update       - Update keys\n"
+#~ msgstr "  --update       - Aktualisiere Schlüssel\n"
+
 #~ msgid "Skip Wizard"
 #~ msgstr "Überspringe Assistenten"
 
diff --git a/po/el.po b/po/el.po
index f40682d5..59a1c8d2 100644
--- a/po/el.po
+++ b/po/el.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline 0.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-01 22:41+0200\n"
+"POT-Creation-Date: 2004-11-03 12:10+0100\n"
 "PO-Revision-Date: 2003-02-18 23:24+0000\n"
 "Last-Translator: Νίκος Νύκταρης (Nick Niktaris) <niktarin@yahoo.com>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -15,271 +15,291 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../mdkapplet:61
+#: ../mdkapplet:63
 #, c-format
 msgid "Your system is up-to-date"
 msgstr ""
 
-#: ../mdkapplet:67
+#: ../mdkapplet:69
 #, fuzzy, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrakeonline.net"
 msgstr "Για κάθε πρόβλημα στείλτε ένα μήνυμα στο support@mandrakeonline.net\n"
 
-#: ../mdkapplet:73
+#: ../mdkapplet:75
 #, c-format
 msgid "System is busy. Please wait ..."
 msgstr ""
 
-#: ../mdkapplet:79
+#: ../mdkapplet:81
 #, c-format
 msgid "New updates are available for your system"
 msgstr ""
 
-#: ../mdkapplet:85
+#: ../mdkapplet:87
 #, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr ""
 
-#: ../mdkapplet:91
+#: ../mdkapplet:93
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr ""
 
-#: ../mdkapplet:97
+#: ../mdkapplet:99
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 
-#: ../mdkapplet:103
+#: ../mdkapplet:105
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:108 ../mdkapplet:158
+#: ../mdkapplet:110 ../mdkapplet:164
 #, c-format
 msgid "Install updates"
 msgstr "Αναβαθμίσεις"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:111
 #, fuzzy, c-format
 msgid "Configure the service"
 msgstr "Ρύθμιση"
 
-#: ../mdkapplet:110
+#: ../mdkapplet:112
 #, c-format
 msgid "Check Updates"
 msgstr ""
 
-#: ../mdkapplet:111
+#: ../mdkapplet:113 ../mdkapplet:167 ../mdkapplet:225
+#, fuzzy, c-format
+msgid "Please Wait"
+msgstr "Παρακαλώ περιμένετε"
+
+#: ../mdkapplet:113 ../mdkapplet:166 ../mdkapplet:167 ../mdkapplet:225
+#, c-format
+msgid "Check updates"
+msgstr ""
+
+#: ../mdkapplet:115
 #, c-format
 msgid "Online WebSite"
 msgstr ""
 
-#: ../mdkapplet:112
+#: ../mdkapplet:116
 #, c-format
 msgid "Configure Network"
 msgstr ""
 
-#: ../mdkapplet:113
+#: ../mdkapplet:117
 #, fuzzy, c-format
 msgid "Configure Now!"
 msgstr "Ανάγνωση Ρυθμίσεων\n"
 
-#: ../mdkapplet:146
+#: ../mdkapplet:152 ../mdkapplet:229
 #, fuzzy, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Πολιτική Προσωπικού Απορρήτου της Mandrakelinux"
 
-#: ../mdkapplet:156
+#: ../mdkapplet:162
 #, c-format
 msgid "Actions"
 msgstr "Ενέργειες"
 
-#: ../mdkapplet:159
+#: ../mdkapplet:165
 #, c-format
 msgid "Configure"
 msgstr "Ρύθμιση"
 
-#: ../mdkapplet:160
-#, c-format
-msgid "Check updates"
-msgstr ""
-
-#: ../mdkapplet:161
+#: ../mdkapplet:169
 #, c-format
 msgid "See logs"
 msgstr ""
 
-#: ../mdkapplet:164
+#: ../mdkapplet:172
 #, c-format
 msgid "Status"
 msgstr "Κατάσταση"
 
-#: ../mdkapplet:168 ../mdkapplet:363
+#: ../mdkapplet:176 ../mdkapplet:375
 #, c-format
 msgid "Close"
 msgstr "Κλείσιμο"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Network Connection: "
 msgstr ""
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Up"
 msgstr "Πάνω"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Down"
 msgstr "Κάτω"
 
-#: ../mdkapplet:204
+#: ../mdkapplet:212
 #, c-format
 msgid "Last check: "
 msgstr ""
 
-#: ../mdkapplet:205
+#: ../mdkapplet:213
 #, c-format
 msgid "Updates: "
 msgstr ""
 
-#: ../mdkapplet:209
+#: ../mdkapplet:217
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr ""
 
-#: ../mdkapplet:213
+#: ../mdkapplet:221
 #, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr ""
 
-#: ../mdkapplet:217
+#: ../mdkapplet:224
 #, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 
-#: ../mdkapplet:225
+#: ../mdkapplet:235
 #, fuzzy, c-format
 msgid "Computing new updates...\n"
 msgstr "Πρόβλημα σύνδεσης"
 
-#: ../mdkapplet:227
+#: ../mdkapplet:237
 #, fuzzy, c-format
 msgid "Connecting to"
 msgstr "Πρόβλημα σύνδεσης"
 
-#: ../mdkapplet:250
+#: ../mdkapplet:244
+#, fuzzy, c-format
+msgid "Response from Mandrakeonline server\n"
+msgstr "Καλώς ήρθατε στο Mandrakeonline"
+
+#: ../mdkapplet:262
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr ""
 
-#: ../mdkapplet:254
+#: ../mdkapplet:267
 #, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
-#: ../mdkapplet:255
+#: ../mdkapplet:268
 #, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
-#: ../mdkapplet:256
+#: ../mdkapplet:269
 #, c-format
 msgid "Unknown state"
 msgstr ""
 
-#: ../mdkapplet:257
+#: ../mdkapplet:270
 #, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr ""
 
-#: ../mdkapplet:258
+#: ../mdkapplet:271
 #, c-format
 msgid "Wrong Password.\n"
 msgstr "Λάθος κωδικός πρόσβασης\n"
 
-#: ../mdkapplet:259
+#: ../mdkapplet:272
 #, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr ""
 
-#: ../mdkapplet:260
+#: ../mdkapplet:273
 #, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
 msgstr ""
 
-#: ../mdkapplet:264
+#: ../mdkapplet:277
 #, c-format
 msgid "System is up-to-date\n"
 msgstr ""
 
-#: ../mdkapplet:303
+#: ../mdkapplet:317
 #, c-format
 msgid "No check"
 msgstr ""
 
-#: ../mdkapplet:316
+#: ../mdkapplet:330
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
-#: ../mdkapplet:319
+#: ../mdkapplet:333
 #, c-format
 msgid "Checking config file: Not present\n"
 msgstr ""
 
-#: ../mdkapplet:353
+#: ../mdkapplet:365
 #, c-format
 msgid "Logs"
 msgstr "Ημερολόγια"
 
-#: ../mdkapplet:369
+#: ../mdkapplet:381
 #, c-format
 msgid "Clear"
 msgstr "Καθαρισμός"
 
-#: ../mdkapplet:396
+#: ../mdkapplet:408
 #, c-format
 msgid "About..."
 msgstr "Περί..."
 
-#: ../mdkapplet:397
+#: ../mdkapplet:409
 #, c-format
 msgid "Always launch on startup"
 msgstr ""
 
-#: ../mdkapplet:399
+#: ../mdkapplet:411
 #, c-format
 msgid "Quit"
 msgstr "Έξοδος"
 
-#: ../mdkonline:89
+#: ../mdkonline:52 ../mdkonline:106
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "Καλώς ήρθατε στο Mandrakeonline"
+
+#: ../mdkonline:55
 #, c-format
-msgid "Next"
-msgstr "Επόμενο"
+msgid "I already have an account"
+msgstr ""
 
-#: ../mdkonline:89
+#: ../mdkonline:56
 #, c-format
-msgid "Cancel"
-msgstr "Άκυρο"
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline:89 ../mdkonline:93 ../mdkonline:131
+#, c-format
+msgid "Please wait"
+msgstr "Παρακαλώ περιμένετε"
 
 #: ../mdkonline:89
 #, c-format
-msgid "Previous"
-msgstr "Προηγούμενο"
+msgid "Reading configuration\n"
+msgstr "Ανάγνωση Ρυθμίσεων\n"
 
-#: ../mdkonline:103
+#: ../mdkonline:93
 #, c-format
-msgid "Welcome to Mandrakeonline"
-msgstr "Καλώς ήρθατε στο Mandrakeonline"
+msgid "Sending configuration..."
+msgstr ""
 
-#: ../mdkonline:104 ../mdkonline_tui:98
+#: ../mdkonline:109
 #, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
@@ -290,64 +310,39 @@ msgstr ""
 "(πακέτα, υλικό του υπολογιστή σας) σε μια κεντρική βάση για να μπορείτε\n"
 "να ενημερώνεστε για αναβαθμίσεις ασφαλείας και χρήσιμες αναβαθμίσεις.\n"
 
-#: ../mdkonline:105 ../mdkonline_tui:142
-#, fuzzy, c-format
-msgid "Create a Mandrakeonline Account"
-msgstr "Καλώς ήρθατε στο Mandrakeonline"
+#: ../mdkonline:114
+#, c-format
+msgid "Account creation or authentication"
+msgstr ""
 
-#: ../mdkonline:107
-#, fuzzy, c-format
-msgid "I don't have a Mandrakeonline account and I want to subscribe"
-msgstr "Δεν έχω λογαριασμό στο Mandrakeonline και θέλω να αποκτήσω "
+#: ../mdkonline:119
+#, c-format
+msgid "Enter your Mandrakeonline login, password and machine name:"
+msgstr ""
+"Εισάγετε το όνομα χρήστη ,κωδικό πρόσβασης και το Όνομα μηχανήματος για το "
+"Mandrakeonline:"
 
-#: ../mdkonline:111 ../mdkonline:131 ../mdkonline_tui:114 ../mdkonline_tui:145
+#: ../mdkonline:125 ../mdkonline:156
 #, c-format
 msgid "Login:"
 msgstr "Όνομα χρήστη:          "
 
-#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:115 ../mdkonline_tui:146
+#: ../mdkonline:126 ../mdkonline:157
 #, c-format
 msgid "Password:"
 msgstr "Κωδικός πρόσβασης:               "
 
-#: ../mdkonline:113 ../mdkonline_tui:147
-#, c-format
-msgid "Confirm Password:"
-msgstr "Επαλήθευση Κωδικού:"
-
-#: ../mdkonline:114 ../mdkonline_tui:148
-#, c-format
-msgid "Mail contact:"
-msgstr ""
-
-#: ../mdkonline:121
-#, c-format
-msgid "Mandrakelinux Privacy Policy"
-msgstr "Πολιτική Προσωπικού Απορρήτου της Mandrakelinux"
-
 #: ../mdkonline:127
 #, c-format
-msgid "Authentification"
-msgstr "Πιστοποίηση"
-
-#: ../mdkonline:128 ../mdkonline_tui:108
-#, c-format
-msgid "Enter your Mandrakeonline login, password and machine name:"
-msgstr ""
-"Εισάγετε το όνομα χρήστη ,κωδικό πρόσβασης και το Όνομα μηχανήματος για το "
-"Mandrakeonline:"
-
-#: ../mdkonline:133 ../mdkonline_tui:116
-#, c-format
 msgid "Machine name:"
 msgstr "Όνομα μηχανήματος:"
 
-#: ../mdkonline:138
+#: ../mdkonline:131
 #, fuzzy, c-format
-msgid "Send Configuration"
-msgstr "Ανάγνωση Ρυθμίσεων\n"
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Καλώς ήρθατε στο Mandrakeonline"
 
-#: ../mdkonline:139 ../mdkonline_tui:128
+#: ../mdkonline:139
 #, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
@@ -380,56 +375,56 @@ msgstr ""
 "Θα μπορείτε να επωφεληθείτε από έκπτωση στην υπηρεσία με πληρωμή στο \n"
 "www.mandrakeexpert.com"
 
-#: ../mdkonline:144 ../mdkonline:211 ../mdkonline:234
-#, c-format
-msgid "Finish"
-msgstr "Τέλος"
-
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141 ../mdkonline:180 ../mdkupdate:126 ../mdkupdate:198
 #, c-format
-msgid "Your upload was successful!"
-msgstr "Η αποστολή ήταν επιτυχής!"
+msgid "Connection problem"
+msgstr "Πρόβλημα σύνδεσης"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandrakeonline."
+msgid "or"
 msgstr ""
-"Από εδώ και πέρα θα παραλαμβάνετε ανακοινώσεις\n"
-"σχετικά με ενημερώσεις ασφαλείας και αναβαθμίσεις χάρη στο Mandrakeonline."
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "Λάθος κωδικός πρόσβασης"
+
+#: ../mdkonline:141
 #, c-format
 msgid ""
-"Mandrakeonline offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+"Your login or password was wrong.\n"
+" Either you'll have to type it again, or you'll need to create an account on "
+"Mandrakeonline.\n"
+" In the latter case, go back to the first step to connect to "
+"Mandrakeonline.\n"
+" Be aware that you must also provide a Machine name \n"
+" (only alphabetical characters are admitted)"
 msgstr ""
-"Το Mandrakeonline σας παρέχει τη δυνατότητα αυτοματοποιημένων ενημερώσεων.\n"
-"Ένα πρόγραμμα θα εκτελείται τακτικά στο σύστημά σας αναμένοντας νέες "
-"αναβαθμίσεις\n"
-
-#: ../mdkonline:146
-#, c-format
-msgid "automated Upgrades"
-msgstr "αυτοματοποιημένες Αναβαθμίσεις"
+"Το όνομα ή ο κωδικός πρόσβασης ήταν λάθος.\n"
+"Θα πρέπει να το ξαναπληκτρολογήσετε ή θα πρέπει να δημιουργήσετε έναν "
+"λογαριασμό στο Mandrakeonline.\n"
+" Στην δεύτερη περίπτωση επιστρέψτε στο πρώτο βήμα για να συνδεθείτε με το "
+"Mandrakeonline.\n"
+"Σημειώστε ότι θα πρέπει να εισάγετε και το Όνομα μηχανήματος\n"
+" (δεκτοί είναι μόνο οι αλφαβητικοί χαρακτήρες)"
 
-#: ../mdkonline:150
-#, c-format
-msgid "Country:"
-msgstr "Χώρα:"
+#: ../mdkonline:153
+#, fuzzy, c-format
+msgid "Create a Mandrakeonline Account"
+msgstr "Καλώς ήρθατε στο Mandrakeonline"
 
-#: ../mdkonline:178 ../mdkonline:183 ../mdkonline:185 ../mdkonline:187
+#: ../mdkonline:158
 #, c-format
-msgid "Error"
-msgstr "Σφάλμα"
+msgid "Confirm Password:"
+msgstr "Επαλήθευση Κωδικού:"
 
-#: ../mdkonline:183 ../mdkonline_tui:152
+#: ../mdkonline:159
 #, c-format
-msgid "Please provide a login"
+msgid "Mail contact:"
 msgstr ""
 
-#: ../mdkonline:185 ../mdkonline_tui:152
+#: ../mdkonline:163
 #, c-format
 msgid ""
 "The passwords do not match\n"
@@ -438,161 +433,115 @@ msgstr ""
 "Οι κωδικοί δεν συμπίπτουν\n"
 "Παρακαλώ προσπαθήστε ξανά\n"
 
-#: ../mdkonline:187 ../mdkonline_tui:152
+#: ../mdkonline:163
+#, c-format
+msgid "Please provide a login"
+msgstr ""
+
+#: ../mdkonline:163
 #, c-format
 msgid "Not a valid mail address!\n"
 msgstr "Μη έγκυρη διεύθυνση ταχυδρομείου!\n"
 
-#: ../mdkonline:199 ../mdkonline_tui:78
+#: ../mdkonline:169
 #, c-format
-msgid "Reading configuration\n"
-msgstr "Ανάγνωση Ρυθμίσεων\n"
+msgid ""
+"Mandrakeonline Account successfully created.\n"
+"Please click \"Next\" to authenticate and upload your configuration\n"
+msgstr ""
 
-#: ../mdkonline:204 ../mdkonline_tui:82
+#: ../mdkonline:178
 #, c-format
-msgid "Sending configuration..."
+msgid "Your upload was successful!"
+msgstr "Η αποστολή ήταν επιτυχής!"
+
+#: ../mdkonline:178
+#, c-format
+msgid ""
+"From now you will receive on security and updates \n"
+"announcements thanks to Mandrakeonline."
 msgstr ""
+"Από εδώ και πέρα θα παραλαμβάνετε ανακοινώσεις\n"
+"σχετικά με ενημερώσεις ασφαλείας και αναβαθμίσεις χάρη στο Mandrakeonline."
 
-#: ../mdkonline:213 ../mdkonline:273 ../mdkonline_tui:130 ../mdkonline_tui:169
-#: ../mdkupdate:124 ../mdkupdate:195
+#: ../mdkonline:178
 #, c-format
-msgid "Connection problem"
-msgstr "Πρόβλημα σύνδεσης"
+msgid ""
+"Mandrakeonline offers you the ability to automate the updates.\n"
+"A program will run regulary in your system waiting for new updates\n"
+msgstr ""
+"Το Mandrakeonline σας παρέχει τη δυνατότητα αυτοματοποιημένων ενημερώσεων.\n"
+"Ένα πρόγραμμα θα εκτελείται τακτικά στο σύστημά σας αναμένοντας νέες "
+"αναβαθμίσεις\n"
 
-#: ../mdkonline:213 ../mdkonline_tui:169
+#: ../mdkonline:180
 #, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr ""
 
-#: ../mdkonline:251
-#, c-format
-msgid "Quitting Wizard\n"
-msgstr "Τερματίζεται ο Οδηγός\n"
+#: ../mdkonline:186
+#, fuzzy, c-format
+msgid "Country"
+msgstr "Χώρα:"
 
-#: ../mdkonline:273
+#: ../mdkonline:198
 #, fuzzy, c-format
-msgid "Mandrakeonline could not be contacted, please try again at a later time"
-msgstr ""
-"Το Mandrakeupdate δεν μπόρεσε να συνδεθεί με την ιστοσελίδα, θα "
-"ξαναδοκιμάσουμε."
+msgid "Congratulations"
+msgstr "Ανάγνωση Ρυθμίσεων\n"
 
-#: ../mdkonline:285
+#: ../mdkonline:198
 #, c-format
-msgid "Wrong password"
-msgstr "Λάθος κωδικός πρόσβασης"
+msgid "Your Mandrakeonline account has been successfully configured\n"
+msgstr ""
 
-#: ../mdkonline:285 ../mdkonline_tui:130
+#: ../mdkonline:214
+#, fuzzy, c-format
+msgid "Configuration uploaded successfully"
+msgstr "Η αποστολή ήταν επιτυχής!"
+
+#: ../mdkonline:215
+#, fuzzy, c-format
+msgid "Problem uploading configuration"
+msgstr "Ανάγνωση Ρυθμίσεων\n"
+
+#: ../mdkonline:216
 #, c-format
 msgid ""
-"Your login or password was wrong.\n"
-" Either you'll have to type it again, or you'll need to create an account on "
-"Mandrakeonline.\n"
-" In the latter case, go back to the first step to connect to "
-"Mandrakeonline.\n"
-" Be aware that you must also provide a Machine name \n"
-" (only alphabetical characters are admitted)"
+"Cannot connect to mandrakeonline website: wrong login/password or router/"
+"firewall bad settings"
 msgstr ""
-"Το όνομα ή ο κωδικός πρόσβασης ήταν λάθος.\n"
-"Θα πρέπει να το ξαναπληκτρολογήσετε ή θα πρέπει να δημιουργήσετε έναν "
-"λογαριασμό στο Mandrakeonline.\n"
-" Στην δεύτερη περίπτωση επιστρέψτε στο πρώτο βήμα για να συνδεθείτε με το "
-"Mandrakeonline.\n"
-"Σημειώστε ότι θα πρέπει να εισάγετε και το Όνομα μηχανήματος\n"
-" (δεκτοί είναι μόνο οι αλφαβητικοί χαρακτήρες)"
 
-#: ../mdkonline.pm:58
+#: ../mdkonline.pm:66
 #, c-format
 msgid "Login and password should be less than 12 characters\n"
 msgstr ""
 
-#: ../mdkonline.pm:59
+#: ../mdkonline.pm:67
 #, c-format
 msgid "Special characters are not allowed\n"
 msgstr ""
 
-#: ../mdkonline.pm:60
+#: ../mdkonline.pm:68
 #, c-format
 msgid "Please fill in all fields\n"
 msgstr ""
 
-#: ../mdkonline.pm:61
+#: ../mdkonline.pm:69
 #, c-format
 msgid "Email not valid\n"
 msgstr ""
 
-#: ../mdkonline.pm:62
+#: ../mdkonline.pm:70
 #, c-format
 msgid "Account already exist\n"
 msgstr ""
 
-#: ../mdkonline.pm:68
+#: ../mdkonline.pm:76
 #, c-format
 msgid "Problem connecting to server \n"
 msgstr "Πρόβλημα στην επικοινωνία με τον διακομιστή \n"
 
-#: ../mdkonline_tui:45 ../mdkonline_tui:95
-#, fuzzy, c-format
-msgid "Mandrakeonline"
-msgstr "Καλώς ήρθατε στο Mandrakeonline"
-
-#: ../mdkonline_tui:48
-#, c-format
-msgid "I already have an account"
-msgstr ""
-
-#: ../mdkonline_tui:49
-#, c-format
-msgid "I want to subscribe"
-msgstr ""
-
-#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:120
-#, c-format
-msgid "Please wait"
-msgstr "Παρακαλώ περιμένετε"
-
-#: ../mdkonline_tui:103
-#, c-format
-msgid "Account creation or authentication"
-msgstr ""
-
-#: ../mdkonline_tui:120
-#, fuzzy, c-format
-msgid "Connecting to Mandrakeonline website..."
-msgstr "Καλώς ήρθατε στο Mandrakeonline"
-
-#: ../mdkonline_tui:130
-#, c-format
-msgid "or"
-msgstr ""
-
-#: ../mdkonline_tui:130
-#, fuzzy, c-format
-msgid "wrong password:"
-msgstr "Λάθος κωδικός πρόσβασης"
-
-#: ../mdkonline_tui:158
-#, c-format
-msgid ""
-"Mandrakeonline Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-
-#: ../mdkonline_tui:175
-#, fuzzy, c-format
-msgid "Country"
-msgstr "Χώρα:"
-
-#: ../mdkonline_tui:187
-#, fuzzy, c-format
-msgid "Congratulations"
-msgstr "Ανάγνωση Ρυθμίσεων\n"
-
-#: ../mdkonline_tui:187
-#, c-format
-msgid "Your Mandrakeonline account has been successfully configured\n"
-msgstr ""
-
-#: ../mdkupdate:50
+#: ../mdkupdate:52
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
@@ -609,50 +558,97 @@ msgstr ""
 "\n"
 "χρήση:\n"
 
-#: ../mdkupdate:55
+#: ../mdkupdate:57
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - εκτύπωση αυτού του μηνύματος βοήθειας.\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:58
 #, fuzzy, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --applet       - αναβάθμιση όλων των πληροφοριών.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:59
 #, fuzzy, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - αναβάθμιση όλων των πληροφοριών.\n"
 
-#: ../mdkupdate:58
-#, fuzzy, c-format
-msgid "  --update       - Update keys\n"
-msgstr "  --applet       - αναβάθμιση όλων των πληροφοριών.\n"
-
-#: ../mdkupdate:66
+#: ../mdkupdate:67
 #, c-format
 msgid "No %s file found. Run mdkonline wizard first"
 msgstr ""
 
-#: ../mdkupdate:124
+#: ../mdkupdate:126
 #, c-format
 msgid "Mandrakeupdate could not contact the site, we will try again."
 msgstr ""
 "Το Mandrakeupdate δεν μπόρεσε να συνδεθεί με την ιστοσελίδα, θα "
 "ξαναδοκιμάσουμε."
 
-#: ../mdkupdate:173
+#: ../mdkupdate:176
 #, c-format
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr "Αδύνατη η αναβάθμιση των πακέτων από το μέσο mdkupdate.\n"
 
-#: ../mdkupdate:195
+#: ../mdkupdate:198
 #, c-format
 msgid ""
 "Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
 "mandrakeonline [dot] net"
 msgstr ""
 
+#~ msgid "Next"
+#~ msgstr "Επόμενο"
+
+#~ msgid "Cancel"
+#~ msgstr "Άκυρο"
+
+#~ msgid "Previous"
+#~ msgstr "Προηγούμενο"
+
+#, fuzzy
+#~ msgid "I don't have a Mandrakeonline account and I want to subscribe"
+#~ msgstr "Δεν έχω λογαριασμό στο Mandrakeonline και θέλω να αποκτήσω "
+
+#~ msgid "Mandrakelinux Privacy Policy"
+#~ msgstr "Πολιτική Προσωπικού Απορρήτου της Mandrakelinux"
+
+#~ msgid "Authentification"
+#~ msgstr "Πιστοποίηση"
+
+#, fuzzy
+#~ msgid "Send Configuration"
+#~ msgstr "Ανάγνωση Ρυθμίσεων\n"
+
+#~ msgid "Finish"
+#~ msgstr "Τέλος"
+
+#~ msgid "automated Upgrades"
+#~ msgstr "αυτοματοποιημένες Αναβαθμίσεις"
+
+#~ msgid "Country:"
+#~ msgstr "Χώρα:"
+
+#~ msgid "Error"
+#~ msgstr "Σφάλμα"
+
+#~ msgid "Quitting Wizard\n"
+#~ msgstr "Τερματίζεται ο Οδηγός\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Mandrakeonline could not be contacted, please try again at a later time"
+#~ msgstr ""
+#~ "Το Mandrakeupdate δεν μπόρεσε να συνδεθεί με την ιστοσελίδα, θα "
+#~ "ξαναδοκιμάσουμε."
+
+#~ msgid "Wrong password"
+#~ msgstr "Λάθος κωδικός πρόσβασης"
+
+#, fuzzy
+#~ msgid "  --update       - Update keys\n"
+#~ msgstr "  --applet       - αναβάθμιση όλων των πληροφοριών.\n"
+
 #~ msgid "Subscribe"
 #~ msgstr "Εγγραφή"
 
diff --git a/po/eo.po b/po/eo.po
index abb96baa..2044f226 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-01 22:41+0200\n"
+"POT-Creation-Date: 2004-11-03 12:10+0100\n"
 "PO-Revision-Date: 2003-03-14 14:56-0400\n"
 "Last-Translator: Vilhelmo Lutermano <vlutermano@free.fr>\n"
 "Language-Team: esperanto <eo@li.org>\n"
@@ -15,271 +15,291 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../mdkapplet:61
+#: ../mdkapplet:63
 #, c-format
 msgid "Your system is up-to-date"
 msgstr ""
 
-#: ../mdkapplet:67
+#: ../mdkapplet:69
 #, fuzzy, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrakeonline.net"
 msgstr "Pri ajna problemo sendu retmesaĝon al support@mandrakeonline.net\n"
 
-#: ../mdkapplet:73
+#: ../mdkapplet:75
 #, c-format
 msgid "System is busy. Please wait ..."
 msgstr ""
 
-#: ../mdkapplet:79
+#: ../mdkapplet:81
 #, fuzzy, c-format
 msgid "New updates are available for your system"
 msgstr "Via komputilo ne havas retadaptilon!"
 
-#: ../mdkapplet:85
+#: ../mdkapplet:87
 #, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr ""
 
-#: ../mdkapplet:91
+#: ../mdkapplet:93
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr ""
 
-#: ../mdkapplet:97
+#: ../mdkapplet:99
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 
-#: ../mdkapplet:103
+#: ../mdkapplet:105
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:108 ../mdkapplet:158
+#: ../mdkapplet:110 ../mdkapplet:164
 #, c-format
 msgid "Install updates"
 msgstr "Instalu ĝisdatigojn"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:111
 #, fuzzy, c-format
 msgid "Configure the service"
 msgstr "Konfiguru"
 
-#: ../mdkapplet:110
+#: ../mdkapplet:112
 #, fuzzy, c-format
 msgid "Check Updates"
 msgstr "Ĝisdatigoj"
 
-#: ../mdkapplet:111
+#: ../mdkapplet:113 ../mdkapplet:167 ../mdkapplet:225
+#, fuzzy, c-format
+msgid "Please Wait"
+msgstr "Bonvole atendu"
+
+#: ../mdkapplet:113 ../mdkapplet:166 ../mdkapplet:167 ../mdkapplet:225
+#, fuzzy, c-format
+msgid "Check updates"
+msgstr "Sekurecaj ĝisdatigoj"
+
+#: ../mdkapplet:115
 #, c-format
 msgid "Online WebSite"
 msgstr ""
 
-#: ../mdkapplet:112
+#: ../mdkapplet:116
 #, fuzzy, c-format
 msgid "Configure Network"
 msgstr "Konfiguru retumon"
 
-#: ../mdkapplet:113
+#: ../mdkapplet:117
 #, fuzzy, c-format
 msgid "Configure Now!"
 msgstr "Konfiguru teksaĵon"
 
-#: ../mdkapplet:146
+#: ../mdkapplet:152 ../mdkapplet:229
 #, fuzzy, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Mandrakelinux-Ĝisdatigo (Mandrakeupdate)"
 
-#: ../mdkapplet:156
+#: ../mdkapplet:162
 #, c-format
 msgid "Actions"
 msgstr "Agoj"
 
-#: ../mdkapplet:159
+#: ../mdkapplet:165
 #, c-format
 msgid "Configure"
 msgstr "Konfiguru"
 
-#: ../mdkapplet:160
-#, fuzzy, c-format
-msgid "Check updates"
-msgstr "Sekurecaj ĝisdatigoj"
-
-#: ../mdkapplet:161
+#: ../mdkapplet:169
 #, fuzzy, c-format
 msgid "See logs"
 msgstr "Celu +5s"
 
-#: ../mdkapplet:164
+#: ../mdkapplet:172
 #, c-format
 msgid "Status"
 msgstr "Statuso"
 
-#: ../mdkapplet:168 ../mdkapplet:363
+#: ../mdkapplet:176 ../mdkapplet:375
 #, c-format
 msgid "Close"
 msgstr "Fermu"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, fuzzy, c-format
 msgid "Network Connection: "
 msgstr "Nova konekto"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Up"
 msgstr ""
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, fuzzy, c-format
 msgid "Down"
 msgstr "Finata"
 
-#: ../mdkapplet:204
+#: ../mdkapplet:212
 #, c-format
 msgid "Last check: "
 msgstr ""
 
-#: ../mdkapplet:205
+#: ../mdkapplet:213
 #, fuzzy, c-format
 msgid "Updates: "
 msgstr "Ĝisdatigoj"
 
-#: ../mdkapplet:209
+#: ../mdkapplet:217
 #, fuzzy, c-format
 msgid "Launching drakconnect\n"
 msgstr "Lanĉu userdrake"
 
-#: ../mdkapplet:213
+#: ../mdkapplet:221
 #, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr ""
 
-#: ../mdkapplet:217
+#: ../mdkapplet:224
 #, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 
-#: ../mdkapplet:225
+#: ../mdkapplet:235
 #, c-format
 msgid "Computing new updates...\n"
 msgstr ""
 
-#: ../mdkapplet:227
+#: ../mdkapplet:237
 #, fuzzy, c-format
 msgid "Connecting to"
 msgstr "Konektproblemo"
 
-#: ../mdkapplet:250
+#: ../mdkapplet:244
+#, fuzzy, c-format
+msgid "Response from Mandrakeonline server\n"
+msgstr "Bonvenon al Mandrakeonline"
+
+#: ../mdkapplet:262
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr ""
 
-#: ../mdkapplet:254
+#: ../mdkapplet:267
 #, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
-#: ../mdkapplet:255
+#: ../mdkapplet:268
 #, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
-#: ../mdkapplet:256
+#: ../mdkapplet:269
 #, fuzzy, c-format
 msgid "Unknown state"
 msgstr "Nekonata servilonomo"
 
-#: ../mdkapplet:257
+#: ../mdkapplet:270
 #, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr ""
 
-#: ../mdkapplet:258
+#: ../mdkapplet:271
 #, c-format
 msgid "Wrong Password.\n"
 msgstr "Malĝusta pasvorto\n"
 
-#: ../mdkapplet:259
+#: ../mdkapplet:272
 #, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr ""
 
-#: ../mdkapplet:260
+#: ../mdkapplet:273
 #, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
 msgstr ""
 
-#: ../mdkapplet:264
+#: ../mdkapplet:277
 #, fuzzy, c-format
 msgid "System is up-to-date\n"
 msgstr "Sistema modalo"
 
-#: ../mdkapplet:303
+#: ../mdkapplet:317
 #, c-format
 msgid "No check"
 msgstr ""
 
-#: ../mdkapplet:316
+#: ../mdkapplet:330
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
-#: ../mdkapplet:319
+#: ../mdkapplet:333
 #, c-format
 msgid "Checking config file: Not present\n"
 msgstr ""
 
-#: ../mdkapplet:353
+#: ../mdkapplet:365
 #, c-format
 msgid "Logs"
 msgstr "Logdosieroj"
 
-#: ../mdkapplet:369
+#: ../mdkapplet:381
 #, c-format
 msgid "Clear"
 msgstr "Forviŝu"
 
-#: ../mdkapplet:396
+#: ../mdkapplet:408
 #, c-format
 msgid "About..."
 msgstr "Pri..."
 
-#: ../mdkapplet:397
+#: ../mdkapplet:409
 #, c-format
 msgid "Always launch on startup"
 msgstr ""
 
-#: ../mdkapplet:399
+#: ../mdkapplet:411
 #, c-format
 msgid "Quit"
 msgstr "Eliru"
 
-#: ../mdkonline:89
-#, c-format
-msgid "Next"
-msgstr "Sekva"
+#: ../mdkonline:52 ../mdkonline:106
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "Bonvenon al Mandrakeonline"
 
-#: ../mdkonline:89
+#: ../mdkonline:55
 #, c-format
-msgid "Cancel"
-msgstr "Nuligu"
+msgid "I already have an account"
+msgstr ""
 
-#: ../mdkonline:89
+#: ../mdkonline:56
 #, c-format
-msgid "Previous"
-msgstr "Antaŭa"
+msgid "I want to subscribe"
+msgstr ""
 
-#: ../mdkonline:103
+#: ../mdkonline:89 ../mdkonline:93 ../mdkonline:131
 #, c-format
-msgid "Welcome to Mandrakeonline"
-msgstr "Bonvenon al Mandrakeonline"
+msgid "Please wait"
+msgstr "Bonvole atendu"
+
+#: ../mdkonline:89
+#, fuzzy, c-format
+msgid "Reading configuration\n"
+msgstr "Presil-konfigurado"
+
+#: ../mdkonline:93
+#, fuzzy, c-format
+msgid "Sending configuration..."
+msgstr "Son-konfigurado"
 
-#: ../mdkonline:104 ../mdkonline_tui:98
+#: ../mdkonline:109
 #, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
@@ -287,62 +307,37 @@ msgid ""
 "order to keep you informed about security updates and useful upgrades.\n"
 msgstr ""
 
-#: ../mdkonline:105 ../mdkonline_tui:142
-#, fuzzy, c-format
-msgid "Create a Mandrakeonline Account"
-msgstr "Bonvenon al Mandrakeonline"
+#: ../mdkonline:114
+#, c-format
+msgid "Account creation or authentication"
+msgstr ""
 
-#: ../mdkonline:107
-#, fuzzy, c-format
-msgid "I don't have a Mandrakeonline account and I want to subscribe"
-msgstr "Mi ne havas Mandrakeonline konton kaj mi deziras ĝin "
+#: ../mdkonline:119
+#, c-format
+msgid "Enter your Mandrakeonline login, password and machine name:"
+msgstr ""
 
-#: ../mdkonline:111 ../mdkonline:131 ../mdkonline_tui:114 ../mdkonline_tui:145
+#: ../mdkonline:125 ../mdkonline:156
 #, c-format
 msgid "Login:"
 msgstr "Salutnomo:"
 
-#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:115 ../mdkonline_tui:146
+#: ../mdkonline:126 ../mdkonline:157
 #, c-format
 msgid "Password:"
 msgstr "Pasvorto:"
 
-#: ../mdkonline:113 ../mdkonline_tui:147
-#, c-format
-msgid "Confirm Password:"
-msgstr "Konfirmu pasvorton:"
-
-#: ../mdkonline:114 ../mdkonline_tui:148
-#, fuzzy, c-format
-msgid "Mail contact:"
-msgstr "Retpoŝta kontakto:"
-
-#: ../mdkonline:121
-#, fuzzy, c-format
-msgid "Mandrakelinux Privacy Policy"
-msgstr "Mandrakelinux-elektoj"
-
 #: ../mdkonline:127
 #, fuzzy, c-format
-msgid "Authentification"
-msgstr "Aŭtentikigado"
-
-#: ../mdkonline:128 ../mdkonline_tui:108
-#, c-format
-msgid "Enter your Mandrakeonline login, password and machine name:"
-msgstr ""
-
-#: ../mdkonline:133 ../mdkonline_tui:116
-#, fuzzy, c-format
 msgid "Machine name:"
 msgstr "en nomoj"
 
-#: ../mdkonline:138
+#: ../mdkonline:131
 #, fuzzy, c-format
-msgid "Send Configuration"
-msgstr "Son-konfigurado"
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Bonvenon al Mandrakeonline"
 
-#: ../mdkonline:139 ../mdkonline_tui:128
+#: ../mdkonline:139
 #, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
@@ -361,51 +356,49 @@ msgid ""
 "www.mandrakeexpert.com."
 msgstr ""
 
-#: ../mdkonline:144 ../mdkonline:211 ../mdkonline:234
+#: ../mdkonline:141 ../mdkonline:180 ../mdkupdate:126 ../mdkupdate:198
 #, c-format
-msgid "Finish"
-msgstr "Finu"
+msgid "Connection problem"
+msgstr "Konektproblemo"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid "Your upload was successful!"
+msgid "or"
 msgstr ""
 
-#: ../mdkonline:145 ../mdkonline_tui:167
-#, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandrakeonline."
-msgstr ""
+#: ../mdkonline:141
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "Malĝusta pasvorto"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
 msgid ""
-"Mandrakeonline offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
-msgstr ""
-
-#: ../mdkonline:146
-#, c-format
-msgid "automated Upgrades"
+"Your login or password was wrong.\n"
+" Either you'll have to type it again, or you'll need to create an account on "
+"Mandrakeonline.\n"
+" In the latter case, go back to the first step to connect to "
+"Mandrakeonline.\n"
+" Be aware that you must also provide a Machine name \n"
+" (only alphabetical characters are admitted)"
 msgstr ""
 
-#: ../mdkonline:150
-#, c-format
-msgid "Country:"
-msgstr "Lando:"
+#: ../mdkonline:153
+#, fuzzy, c-format
+msgid "Create a Mandrakeonline Account"
+msgstr "Bonvenon al Mandrakeonline"
 
-#: ../mdkonline:178 ../mdkonline:183 ../mdkonline:185 ../mdkonline:187
+#: ../mdkonline:158
 #, c-format
-msgid "Error"
-msgstr "Eraro"
+msgid "Confirm Password:"
+msgstr "Konfirmu pasvorton:"
 
-#: ../mdkonline:183 ../mdkonline_tui:152
+#: ../mdkonline:159
 #, fuzzy, c-format
-msgid "Please provide a login"
-msgstr "Bonvole provu denove"
+msgid "Mail contact:"
+msgstr "Retpoŝta kontakto:"
 
-#: ../mdkonline:185 ../mdkonline_tui:152
+#: ../mdkonline:163
 #, c-format
 msgid ""
 "The passwords do not match\n"
@@ -414,152 +407,110 @@ msgstr ""
 "La pasvorto ne ghustas\n"
 "Bonvolu provi denove\n"
 
-#: ../mdkonline:187 ../mdkonline_tui:152
-#, c-format
-msgid "Not a valid mail address!\n"
-msgstr "Nevalida retpoŝta adreso!\n"
-
-#: ../mdkonline:199 ../mdkonline_tui:78
+#: ../mdkonline:163
 #, fuzzy, c-format
-msgid "Reading configuration\n"
-msgstr "Presil-konfigurado"
-
-#: ../mdkonline:204 ../mdkonline_tui:82
-#, fuzzy, c-format
-msgid "Sending configuration..."
-msgstr "Son-konfigurado"
+msgid "Please provide a login"
+msgstr "Bonvole provu denove"
 
-#: ../mdkonline:213 ../mdkonline:273 ../mdkonline_tui:130 ../mdkonline_tui:169
-#: ../mdkupdate:124 ../mdkupdate:195
+#: ../mdkonline:163
 #, c-format
-msgid "Connection problem"
-msgstr "Konektproblemo"
+msgid "Not a valid mail address!\n"
+msgstr "Nevalida retpoŝta adreso!\n"
 
-#: ../mdkonline:213 ../mdkonline_tui:169
+#: ../mdkonline:169
 #, c-format
-msgid "Problem occurs when uploading files, please try again"
+msgid ""
+"Mandrakeonline Account successfully created.\n"
+"Please click \"Next\" to authenticate and upload your configuration\n"
 msgstr ""
 
-#: ../mdkonline:251
-#, c-format
-msgid "Quitting Wizard\n"
-msgstr "Eliras Sorĉilon\n"
-
-#: ../mdkonline:273
-#, fuzzy, c-format
-msgid "Mandrakeonline could not be contacted, please try again at a later time"
-msgstr "Mandrakeupdate ne povis kontakti la retejon, ni reprovos."
-
-#: ../mdkonline:285
+#: ../mdkonline:178
 #, c-format
-msgid "Wrong password"
-msgstr "Malĝusta pasvorto"
+msgid "Your upload was successful!"
+msgstr ""
 
-#: ../mdkonline:285 ../mdkonline_tui:130
+#: ../mdkonline:178
 #, c-format
 msgid ""
-"Your login or password was wrong.\n"
-" Either you'll have to type it again, or you'll need to create an account on "
-"Mandrakeonline.\n"
-" In the latter case, go back to the first step to connect to "
-"Mandrakeonline.\n"
-" Be aware that you must also provide a Machine name \n"
-" (only alphabetical characters are admitted)"
+"From now you will receive on security and updates \n"
+"announcements thanks to Mandrakeonline."
 msgstr ""
 
-#: ../mdkonline.pm:58
+#: ../mdkonline:178
 #, c-format
-msgid "Login and password should be less than 12 characters\n"
+msgid ""
+"Mandrakeonline offers you the ability to automate the updates.\n"
+"A program will run regulary in your system waiting for new updates\n"
 msgstr ""
 
-#: ../mdkonline.pm:59
+#: ../mdkonline:180
 #, c-format
-msgid "Special characters are not allowed\n"
+msgid "Problem occurs when uploading files, please try again"
 msgstr ""
 
-#: ../mdkonline.pm:60
-#, c-format
-msgid "Please fill in all fields\n"
-msgstr ""
+#: ../mdkonline:186
+#, fuzzy, c-format
+msgid "Country"
+msgstr "Lando:"
 
-#: ../mdkonline.pm:61
-#, c-format
-msgid "Email not valid\n"
-msgstr ""
+#: ../mdkonline:198
+#, fuzzy, c-format
+msgid "Congratulations"
+msgstr "Konfiguraĵo"
 
-#: ../mdkonline.pm:62
+#: ../mdkonline:198
 #, c-format
-msgid "Account already exist\n"
+msgid "Your Mandrakeonline account has been successfully configured\n"
 msgstr ""
 
-#: ../mdkonline.pm:68
+#: ../mdkonline:214
 #, c-format
-msgid "Problem connecting to server \n"
-msgstr "Problemo de konektado al la servilo \n"
+msgid "Configuration uploaded successfully"
+msgstr ""
 
-#: ../mdkonline_tui:45 ../mdkonline_tui:95
+#: ../mdkonline:215
 #, fuzzy, c-format
-msgid "Mandrakeonline"
-msgstr "Bonvenon al Mandrakeonline"
+msgid "Problem uploading configuration"
+msgstr "Presil-konfigurado"
 
-#: ../mdkonline_tui:48
+#: ../mdkonline:216
 #, c-format
-msgid "I already have an account"
+msgid ""
+"Cannot connect to mandrakeonline website: wrong login/password or router/"
+"firewall bad settings"
 msgstr ""
 
-#: ../mdkonline_tui:49
+#: ../mdkonline.pm:66
 #, c-format
-msgid "I want to subscribe"
+msgid "Login and password should be less than 12 characters\n"
 msgstr ""
 
-#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:120
+#: ../mdkonline.pm:67
 #, c-format
-msgid "Please wait"
-msgstr "Bonvole atendu"
+msgid "Special characters are not allowed\n"
+msgstr ""
 
-#: ../mdkonline_tui:103
+#: ../mdkonline.pm:68
 #, c-format
-msgid "Account creation or authentication"
+msgid "Please fill in all fields\n"
 msgstr ""
 
-#: ../mdkonline_tui:120
-#, fuzzy, c-format
-msgid "Connecting to Mandrakeonline website..."
-msgstr "Bonvenon al Mandrakeonline"
-
-#: ../mdkonline_tui:130
+#: ../mdkonline.pm:69
 #, c-format
-msgid "or"
+msgid "Email not valid\n"
 msgstr ""
 
-#: ../mdkonline_tui:130
-#, fuzzy, c-format
-msgid "wrong password:"
-msgstr "Malĝusta pasvorto"
-
-#: ../mdkonline_tui:158
+#: ../mdkonline.pm:70
 #, c-format
-msgid ""
-"Mandrakeonline Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
+msgid "Account already exist\n"
 msgstr ""
 
-#: ../mdkonline_tui:175
-#, fuzzy, c-format
-msgid "Country"
-msgstr "Lando:"
-
-#: ../mdkonline_tui:187
-#, fuzzy, c-format
-msgid "Congratulations"
-msgstr "Konfiguraĵo"
-
-#: ../mdkonline_tui:187
+#: ../mdkonline.pm:76
 #, c-format
-msgid "Your Mandrakeonline account has been successfully configured\n"
-msgstr ""
+msgid "Problem connecting to server \n"
+msgstr "Problemo de konektado al la servilo \n"
 
-#: ../mdkupdate:50
+#: ../mdkupdate:52
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
@@ -576,48 +527,92 @@ msgstr ""
 "\n"
 "uzado:\n"
 
-#: ../mdkupdate:55
+#: ../mdkupdate:57
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --helpo         - presu tiun helpmesaĝon.\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:58
 #, fuzzy, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --applet       - ĝisdatigu ĉiujn informojn.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:59
 #, fuzzy, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - ĝisdatigu ĉiujn informojn.\n"
 
-#: ../mdkupdate:58
-#, fuzzy, c-format
-msgid "  --update       - Update keys\n"
-msgstr "  --applet       - ĝisdatigu ĉiujn informojn.\n"
-
-#: ../mdkupdate:66
+#: ../mdkupdate:67
 #, c-format
 msgid "No %s file found. Run mdkonline wizard first"
 msgstr ""
 
-#: ../mdkupdate:124
+#: ../mdkupdate:126
 #, c-format
 msgid "Mandrakeupdate could not contact the site, we will try again."
 msgstr "Mandrakeupdate ne povis kontakti la retejon, ni reprovos."
 
-#: ../mdkupdate:173
+#: ../mdkupdate:176
 #, c-format
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr "Ne kapablas ĝisdatigi pakaĵojn el 'mdkupdate medium'.\n"
 
-#: ../mdkupdate:195
+#: ../mdkupdate:198
 #, c-format
 msgid ""
 "Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
 "mandrakeonline [dot] net"
 msgstr ""
 
+#~ msgid "Next"
+#~ msgstr "Sekva"
+
+#~ msgid "Cancel"
+#~ msgstr "Nuligu"
+
+#~ msgid "Previous"
+#~ msgstr "Antaŭa"
+
+#, fuzzy
+#~ msgid "I don't have a Mandrakeonline account and I want to subscribe"
+#~ msgstr "Mi ne havas Mandrakeonline konton kaj mi deziras ĝin "
+
+#, fuzzy
+#~ msgid "Mandrakelinux Privacy Policy"
+#~ msgstr "Mandrakelinux-elektoj"
+
+#, fuzzy
+#~ msgid "Authentification"
+#~ msgstr "Aŭtentikigado"
+
+#, fuzzy
+#~ msgid "Send Configuration"
+#~ msgstr "Son-konfigurado"
+
+#~ msgid "Finish"
+#~ msgstr "Finu"
+
+#~ msgid "Country:"
+#~ msgstr "Lando:"
+
+#~ msgid "Error"
+#~ msgstr "Eraro"
+
+#~ msgid "Quitting Wizard\n"
+#~ msgstr "Eliras Sorĉilon\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Mandrakeonline could not be contacted, please try again at a later time"
+#~ msgstr "Mandrakeupdate ne povis kontakti la retejon, ni reprovos."
+
+#~ msgid "Wrong password"
+#~ msgstr "Malĝusta pasvorto"
+
+#, fuzzy
+#~ msgid "  --update       - Update keys\n"
+#~ msgstr "  --applet       - ĝisdatigu ĉiujn informojn.\n"
+
 #, fuzzy
 #~ msgid "Skip Wizard"
 #~ msgstr "Transsaltu la sorĉilon"
diff --git a/po/es.po b/po/es.po
index 8f907e23..1b7aa7ff 100644
--- a/po/es.po
+++ b/po/es.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-01 22:41+0200\n"
+"POT-Creation-Date: 2004-11-03 12:10+0100\n"
 "PO-Revision-Date: 2004-10-10 12:38+0200\n"
 "Last-Translator: Jaime Crespo <505201@unizar.es>\n"
 "Language-Team: Español <es@li.org>\n"
@@ -25,12 +25,12 @@ msgstr ""
 "X-Generator: KBabel 1.3\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: ../mdkapplet:61
+#: ../mdkapplet:63
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Su sistema está al día"
 
-#: ../mdkapplet:67
+#: ../mdkapplet:69
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -39,189 +39,199 @@ msgstr ""
 "Problem de configuración del servicio. Por favor verifique sus archivos de "
 "bitácora y envie un correo a support@mandrakeonline.net"
 
-#: ../mdkapplet:73
+#: ../mdkapplet:75
 #, c-format
 msgid "System is busy. Please wait ..."
 msgstr "El sistema está ocupado. Espere ..."
 
-#: ../mdkapplet:79
+#: ../mdkapplet:81
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Hay nuevas actualizaciones disponibles para su sistema"
 
-#: ../mdkapplet:85
+#: ../mdkapplet:87
 #, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr ""
 "El servicio no está configurado. Haga clic sobre \"Configurar el servicio\""
 
-#: ../mdkapplet:91
+#: ../mdkapplet:93
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "La red no está activa. Configurela por favor"
 
-#: ../mdkapplet:97
+#: ../mdkapplet:99
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "El servicio no está activado. Haga clic sobre \"Sitio web en línea\"."
 
-#: ../mdkapplet:103
+#: ../mdkapplet:105
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "Versión no soportada (muy antigua o versión de desarrollo)"
 
-#: ../mdkapplet:108 ../mdkapplet:158
+#: ../mdkapplet:110 ../mdkapplet:164
 #, c-format
 msgid "Install updates"
 msgstr "Instalar actualizaciones"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:111
 #, c-format
 msgid "Configure the service"
 msgstr "Configurar el servicio"
 
-#: ../mdkapplet:110
+#: ../mdkapplet:112
 #, c-format
 msgid "Check Updates"
 msgstr "Verificar actualizaciones"
 
-#: ../mdkapplet:111
+#: ../mdkapplet:113 ../mdkapplet:167 ../mdkapplet:225
+#, fuzzy, c-format
+msgid "Please Wait"
+msgstr "Espere, por favor"
+
+#: ../mdkapplet:113 ../mdkapplet:166 ../mdkapplet:167 ../mdkapplet:225
+#, c-format
+msgid "Check updates"
+msgstr "Verificar actualizaciones"
+
+#: ../mdkapplet:115
 #, c-format
 msgid "Online WebSite"
 msgstr "Sitio web en línea"
 
-#: ../mdkapplet:112
+#: ../mdkapplet:116
 #, c-format
 msgid "Configure Network"
 msgstr "Configurar red"
 
-#: ../mdkapplet:113
+#: ../mdkapplet:117
 #, c-format
 msgid "Configure Now!"
 msgstr "¡Configurar ahora!"
 
-#: ../mdkapplet:146
+#: ../mdkapplet:152 ../mdkapplet:229
 #, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Applet Mandrakelinux Update"
 
-#: ../mdkapplet:156
+#: ../mdkapplet:162
 #, c-format
 msgid "Actions"
 msgstr "Acciones"
 
-#: ../mdkapplet:159
+#: ../mdkapplet:165
 #, c-format
 msgid "Configure"
 msgstr "Configurar"
 
-#: ../mdkapplet:160
-#, c-format
-msgid "Check updates"
-msgstr "Verificar actualizaciones"
-
-#: ../mdkapplet:161
+#: ../mdkapplet:169
 #, c-format
 msgid "See logs"
 msgstr "Ver registros"
 
-#: ../mdkapplet:164
+#: ../mdkapplet:172
 #, c-format
 msgid "Status"
 msgstr "Estado"
 
-#: ../mdkapplet:168 ../mdkapplet:363
+#: ../mdkapplet:176 ../mdkapplet:375
 #, c-format
 msgid "Close"
 msgstr "Cerrar"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Network Connection: "
 msgstr "Conexión de red: "
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Up"
 msgstr "Activa"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Down"
 msgstr "Inactiva"
 
-#: ../mdkapplet:204
+#: ../mdkapplet:212
 #, c-format
 msgid "Last check: "
 msgstr "Última verificación: "
 
-#: ../mdkapplet:205
+#: ../mdkapplet:213
 #, c-format
 msgid "Updates: "
 msgstr "Actualizaciones: "
 
-#: ../mdkapplet:209
+#: ../mdkapplet:217
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Lanzando drakconnect\n"
 
-#: ../mdkapplet:213
+#: ../mdkapplet:221
 #, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "Lanzando mdkupdate --applet\n"
 
-#: ../mdkapplet:217
+#: ../mdkapplet:224
 #, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 "Mandrakeonline parece haber sido reinstalado, volviendo a cargar applet..."
 
-#: ../mdkapplet:225
+#: ../mdkapplet:235
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Computando actualizaciones nuevas...\n"
 
-#: ../mdkapplet:227
+#: ../mdkapplet:237
 #, c-format
 msgid "Connecting to"
 msgstr "Conectando con"
 
-#: ../mdkapplet:250
+#: ../mdkapplet:244
+#, fuzzy, c-format
+msgid "Response from Mandrakeonline server\n"
+msgstr "Bienvenido a Mandrakeonline"
+
+#: ../mdkapplet:262
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Verificando... Están disponibles actualizaciones\n"
 
-#: ../mdkapplet:254
+#: ../mdkapplet:267
 #, c-format
 msgid "Development release not supported by service"
 msgstr "Versión de desarrollo no soportada por el servicio"
 
-#: ../mdkapplet:255
+#: ../mdkapplet:268
 #, c-format
 msgid "Too old release not supported by service"
 msgstr "Versión muy antigua no soportada por el servicio"
 
-#: ../mdkapplet:256
+#: ../mdkapplet:269
 #, c-format
 msgid "Unknown state"
 msgstr "Estado desconocido"
 
-#: ../mdkapplet:257
+#: ../mdkapplet:270
 #, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr "Servicios en línea deshabilitados. Contacte al sitio Mandrakeonline\n"
 
-#: ../mdkapplet:258
+#: ../mdkapplet:271
 #, c-format
 msgid "Wrong Password.\n"
 msgstr "Contraseña incorrecta\n"
 
-#: ../mdkapplet:259
+#: ../mdkapplet:272
 #, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr "Acción, host o login incorrectos.\n"
 
-#: ../mdkapplet:260
+#: ../mdkapplet:273
 #, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
@@ -230,72 +240,82 @@ msgstr ""
 "Hay algún problema con la configuración de su red (verifique los ajustes de "
 "su ruta, cortafuegos o proxy)\n"
 
-#: ../mdkapplet:264
+#: ../mdkapplet:277
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "El sistema está al día\n"
 
-#: ../mdkapplet:303
+#: ../mdkapplet:317
 #, c-format
 msgid "No check"
 msgstr "Sin verificación"
 
-#: ../mdkapplet:316
+#: ../mdkapplet:330
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Verificando red: parece estar deshabilitada\n"
 
-#: ../mdkapplet:319
+#: ../mdkapplet:333
 #, c-format
 msgid "Checking config file: Not present\n"
 msgstr "Verificando archivo de configuración: No presente\n"
 
-#: ../mdkapplet:353
+#: ../mdkapplet:365
 #, c-format
 msgid "Logs"
 msgstr "Registros"
 
-#: ../mdkapplet:369
+#: ../mdkapplet:381
 #, c-format
 msgid "Clear"
 msgstr "Limpiar"
 
-#: ../mdkapplet:396
+#: ../mdkapplet:408
 #, c-format
 msgid "About..."
 msgstr "Acerca..."
 
-#: ../mdkapplet:397
+#: ../mdkapplet:409
 #, c-format
 msgid "Always launch on startup"
 msgstr "Lanzar siempre al arrancar"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:411
 #, c-format
 msgid "Quit"
 msgstr "Salir"
 
-#: ../mdkonline:89
+#: ../mdkonline:52 ../mdkonline:106
 #, c-format
-msgid "Next"
-msgstr "Siguiente"
+msgid "Mandrakeonline"
+msgstr "Mandrakeonline"
 
-#: ../mdkonline:89
+#: ../mdkonline:55
 #, c-format
-msgid "Cancel"
-msgstr "Cancelar"
+msgid "I already have an account"
+msgstr "Ya tengo una cuenta"
+
+#: ../mdkonline:56
+#, c-format
+msgid "I want to subscribe"
+msgstr "Deseo suscribirme"
+
+#: ../mdkonline:89 ../mdkonline:93 ../mdkonline:131
+#, c-format
+msgid "Please wait"
+msgstr "Espere, por favor"
 
 #: ../mdkonline:89
 #, c-format
-msgid "Previous"
-msgstr "Anterior"
+msgid "Reading configuration\n"
+msgstr "Leyendo la configuración\n"
 
-#: ../mdkonline:103
+#: ../mdkonline:93
 #, c-format
-msgid "Welcome to Mandrakeonline"
-msgstr "Bienvenido a Mandrakeonline"
+msgid "Sending configuration..."
+msgstr "Enviando configuración..."
 
-#: ../mdkonline:104 ../mdkonline_tui:98
+#: ../mdkonline:109
 #, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
@@ -306,64 +326,39 @@ msgstr ""
 "(paquetes, configuración del hardware) a una base de datos centralizada\n"
 "para mantenerle informado de actualizaciones de seguridad y mejoras útiles.\n"
 
-#: ../mdkonline:105 ../mdkonline_tui:142
+#: ../mdkonline:114
 #, c-format
-msgid "Create a Mandrakeonline Account"
-msgstr "Crear una cuenta en Mandrakeonline"
+msgid "Account creation or authentication"
+msgstr "Creación de cuentas o autentificación"
 
-#: ../mdkonline:107
+#: ../mdkonline:119
 #, c-format
-msgid "I don't have a Mandrakeonline account and I want to subscribe"
-msgstr "No tengo cuenta Mandrakeonline y deseo suscribir a una"
+msgid "Enter your Mandrakeonline login, password and machine name:"
+msgstr ""
+"Introduzca su nombre de usuario, contraseña y nombre de máquina de "
+"Mandrakeonline:"
 
-#: ../mdkonline:111 ../mdkonline:131 ../mdkonline_tui:114 ../mdkonline_tui:145
+#: ../mdkonline:125 ../mdkonline:156
 #, c-format
 msgid "Login:"
 msgstr "Usuario:"
 
-#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:115 ../mdkonline_tui:146
+#: ../mdkonline:126 ../mdkonline:157
 #, c-format
 msgid "Password:"
 msgstr "Contraseña:"
 
-#: ../mdkonline:113 ../mdkonline_tui:147
-#, c-format
-msgid "Confirm Password:"
-msgstr "Confirmar contraseña:"
-
-#: ../mdkonline:114 ../mdkonline_tui:148
-#, c-format
-msgid "Mail contact:"
-msgstr "Correo de contacto:"
-
-#: ../mdkonline:121
-#, c-format
-msgid "Mandrakelinux Privacy Policy"
-msgstr "Política de privacidad de Mandrakelinux"
-
 #: ../mdkonline:127
 #, c-format
-msgid "Authentification"
-msgstr "Autentificación"
-
-#: ../mdkonline:128 ../mdkonline_tui:108
-#, c-format
-msgid "Enter your Mandrakeonline login, password and machine name:"
-msgstr ""
-"Introduzca su nombre de usuario, contraseña y nombre de máquina de "
-"Mandrakeonline:"
-
-#: ../mdkonline:133 ../mdkonline_tui:116
-#, c-format
 msgid "Machine name:"
 msgstr "Nombre de máquina:"
 
-#: ../mdkonline:138
+#: ../mdkonline:131
 #, c-format
-msgid "Send Configuration"
-msgstr "Enviar la configuración"
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Conectando al sitio web Mandrakeonline..."
 
-#: ../mdkonline:139 ../mdkonline_tui:128
+#: ../mdkonline:139
 #, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
@@ -395,57 +390,56 @@ msgstr ""
 "Además, se beneficia de descuentos en los servicios de soporte pagados\n"
 "en www.mandrakeexpert.com."
 
-# evitar el termino "acabar" que tiene otras connotaciones
-#: ../mdkonline:144 ../mdkonline:211 ../mdkonline:234
+#: ../mdkonline:141 ../mdkonline:180 ../mdkupdate:126 ../mdkupdate:198
 #, c-format
-msgid "Finish"
-msgstr "Terminar"
+msgid "Connection problem"
+msgstr "Problema de conexión"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid "Your upload was successful!"
-msgstr "Actualización exitosa"
+msgid "or"
+msgstr "o"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandrakeonline."
-msgstr ""
-"Desde ahora, recibirá anuncions de seguridad\n"
-"y actualizaciones gracias a Mandrakeonline."
+msgid "wrong password:"
+msgstr "Contraseña incorrecta:"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
 msgid ""
-"Mandrakeonline offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+"Your login or password was wrong.\n"
+" Either you'll have to type it again, or you'll need to create an account on "
+"Mandrakeonline.\n"
+" In the latter case, go back to the first step to connect to "
+"Mandrakeonline.\n"
+" Be aware that you must also provide a Machine name \n"
+" (only alphabetical characters are admitted)"
 msgstr ""
-"Mandrakeonline le ofrece la posibilidad de automatizar las actualizaciones.\n"
-"Se ejecutará regularmente un programa  en su sistema a la espera de nuevas "
-"actualizaciones\n"
-
-#: ../mdkonline:146
-#, c-format
-msgid "automated Upgrades"
-msgstr "actualizaciones automatizadas"
+"Su nombre de usuario no era correcto.\n"
+" Tendrá que volverlo a escribir, o necesitará crear una cuenta en "
+"Mandrakeonline.\n"
+" En el último caso, vaya hasta el primer paso para conectarse a "
+"Mandrakeonline.\n"
+" Tenga presente que también debe proporcionar un nombre de Máquina \n"
+" (sólo se admiten caracteres alfabéticos)"
 
-#: ../mdkonline:150
+#: ../mdkonline:153
 #, c-format
-msgid "Country:"
-msgstr "País:"
+msgid "Create a Mandrakeonline Account"
+msgstr "Crear una cuenta en Mandrakeonline"
 
-#: ../mdkonline:178 ../mdkonline:183 ../mdkonline:185 ../mdkonline:187
+#: ../mdkonline:158
 #, c-format
-msgid "Error"
-msgstr "Error"
+msgid "Confirm Password:"
+msgstr "Confirmar contraseña:"
 
-#: ../mdkonline:183 ../mdkonline_tui:152
+#: ../mdkonline:159
 #, c-format
-msgid "Please provide a login"
-msgstr "Por favor, proporcione un login"
+msgid "Mail contact:"
+msgstr "Correo de contacto:"
 
-#: ../mdkonline:185 ../mdkonline_tui:152
+#: ../mdkonline:163
 #, c-format
 msgid ""
 "The passwords do not match\n"
@@ -454,164 +448,119 @@ msgstr ""
 "Las contraseñas no coinciden\n"
 " Por favor, intente de nuevo\n"
 
-#: ../mdkonline:187 ../mdkonline_tui:152
+#: ../mdkonline:163
+#, c-format
+msgid "Please provide a login"
+msgstr "Por favor, proporcione un login"
+
+#: ../mdkonline:163
 #, c-format
 msgid "Not a valid mail address!\n"
 msgstr "¡No es una dirección de correo válida!\n"
 
-#: ../mdkonline:199 ../mdkonline_tui:78
+#: ../mdkonline:169
 #, c-format
-msgid "Reading configuration\n"
-msgstr "Leyendo la configuración\n"
+msgid ""
+"Mandrakeonline Account successfully created.\n"
+"Please click \"Next\" to authenticate and upload your configuration\n"
+msgstr ""
+"Cuenta de Mandrakeonline creada con éxito.\n"
+"Por favor, pulse \"Siguiente\" para autentificarse y enviar su "
+"configuración\n"
 
-#: ../mdkonline:204 ../mdkonline_tui:82
+#: ../mdkonline:178
 #, c-format
-msgid "Sending configuration..."
-msgstr "Enviando configuración..."
+msgid "Your upload was successful!"
+msgstr "Actualización exitosa"
 
-#: ../mdkonline:213 ../mdkonline:273 ../mdkonline_tui:130 ../mdkonline_tui:169
-#: ../mdkupdate:124 ../mdkupdate:195
+#: ../mdkonline:178
 #, c-format
-msgid "Connection problem"
-msgstr "Problema de conexión"
+msgid ""
+"From now you will receive on security and updates \n"
+"announcements thanks to Mandrakeonline."
+msgstr ""
+"Desde ahora, recibirá anuncions de seguridad\n"
+"y actualizaciones gracias a Mandrakeonline."
 
-#: ../mdkonline:213 ../mdkonline_tui:169
+#: ../mdkonline:178
+#, c-format
+msgid ""
+"Mandrakeonline offers you the ability to automate the updates.\n"
+"A program will run regulary in your system waiting for new updates\n"
+msgstr ""
+"Mandrakeonline le ofrece la posibilidad de automatizar las actualizaciones.\n"
+"Se ejecutará regularmente un programa  en su sistema a la espera de nuevas "
+"actualizaciones\n"
+
+#: ../mdkonline:180
 #, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr "Ocurrieron problemas al enviar archivos, por favor intentelo de nuevo"
 
-#: ../mdkonline:251
+#: ../mdkonline:186
 #, c-format
-msgid "Quitting Wizard\n"
-msgstr "Saliendo del asistente\n"
+msgid "Country"
+msgstr "País"
 
-#: ../mdkonline:273
+#: ../mdkonline:198
 #, c-format
-msgid "Mandrakeonline could not be contacted, please try again at a later time"
-msgstr ""
-"No se pudo contactar con Mandrakeupdate, por favor, vuélvalo a intentar más "
-"tarde"
+msgid "Congratulations"
+msgstr "Felicidades"
 
-#: ../mdkonline:285
+#: ../mdkonline:198
 #, c-format
-msgid "Wrong password"
-msgstr "Contraseña incorrecta"
+msgid "Your Mandrakeonline account has been successfully configured\n"
+msgstr "Su cuenta de Mandrakeonline se ha configurado con éxito\n"
 
-#: ../mdkonline:285 ../mdkonline_tui:130
+#: ../mdkonline:214
+#, fuzzy, c-format
+msgid "Configuration uploaded successfully"
+msgstr "Actualización exitosa"
+
+#: ../mdkonline:215
+#, fuzzy, c-format
+msgid "Problem uploading configuration"
+msgstr "Leyendo la configuración\n"
+
+#: ../mdkonline:216
 #, c-format
 msgid ""
-"Your login or password was wrong.\n"
-" Either you'll have to type it again, or you'll need to create an account on "
-"Mandrakeonline.\n"
-" In the latter case, go back to the first step to connect to "
-"Mandrakeonline.\n"
-" Be aware that you must also provide a Machine name \n"
-" (only alphabetical characters are admitted)"
+"Cannot connect to mandrakeonline website: wrong login/password or router/"
+"firewall bad settings"
 msgstr ""
-"Su nombre de usuario no era correcto.\n"
-" Tendrá que volverlo a escribir, o necesitará crear una cuenta en "
-"Mandrakeonline.\n"
-" En el último caso, vaya hasta el primer paso para conectarse a "
-"Mandrakeonline.\n"
-" Tenga presente que también debe proporcionar un nombre de Máquina \n"
-" (sólo se admiten caracteres alfabéticos)"
 
-#: ../mdkonline.pm:58
+#: ../mdkonline.pm:66
 #, c-format
 msgid "Login and password should be less than 12 characters\n"
 msgstr ""
 "El nombre de usuario y la contraseña deberían tener menos de 12 caracteres\n"
 
-#: ../mdkonline.pm:59
+#: ../mdkonline.pm:67
 #, c-format
 msgid "Special characters are not allowed\n"
 msgstr "No se permiten caracteres especiales\n"
 
-#: ../mdkonline.pm:60
+#: ../mdkonline.pm:68
 #, c-format
 msgid "Please fill in all fields\n"
 msgstr "Por favor, rellene todos los campos\n"
 
-#: ../mdkonline.pm:61
+#: ../mdkonline.pm:69
 #, c-format
 msgid "Email not valid\n"
 msgstr "Correo electrónico no válido\n"
 
-#: ../mdkonline.pm:62
+#: ../mdkonline.pm:70
 #, c-format
 msgid "Account already exist\n"
 msgstr "La cuenta ya existe\n"
 
-#: ../mdkonline.pm:68
+#: ../mdkonline.pm:76
 #, c-format
 msgid "Problem connecting to server \n"
 msgstr "Problema conectando al servidor \n"
 
-#: ../mdkonline_tui:45 ../mdkonline_tui:95
-#, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
-
-#: ../mdkonline_tui:48
-#, c-format
-msgid "I already have an account"
-msgstr "Ya tengo una cuenta"
-
-#: ../mdkonline_tui:49
-#, c-format
-msgid "I want to subscribe"
-msgstr "Deseo suscribirme"
-
-#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:120
-#, c-format
-msgid "Please wait"
-msgstr "Espere, por favor"
-
-#: ../mdkonline_tui:103
-#, c-format
-msgid "Account creation or authentication"
-msgstr "Creación de cuentas o autentificación"
-
-#: ../mdkonline_tui:120
-#, c-format
-msgid "Connecting to Mandrakeonline website..."
-msgstr "Conectando al sitio web Mandrakeonline..."
-
-#: ../mdkonline_tui:130
-#, c-format
-msgid "or"
-msgstr "o"
-
-#: ../mdkonline_tui:130
-#, c-format
-msgid "wrong password:"
-msgstr "Contraseña incorrecta:"
-
-#: ../mdkonline_tui:158
-#, c-format
-msgid ""
-"Mandrakeonline Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-"Cuenta de Mandrakeonline creada con éxito.\n"
-"Por favor, pulse \"Siguiente\" para autentificarse y enviar su configuración\n"
-
-#: ../mdkonline_tui:175
-#, c-format
-msgid "Country"
-msgstr "País"
-
-#: ../mdkonline_tui:187
-#, c-format
-msgid "Congratulations"
-msgstr "Felicidades"
-
-#: ../mdkonline_tui:187
-#, c-format
-msgid "Your Mandrakeonline account has been successfully configured\n"
-msgstr "Su cuenta de Mandrakeonline se ha configurado con éxito\n"
-
-#: ../mdkupdate:50
+#: ../mdkupdate:52
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
@@ -628,42 +577,37 @@ msgstr ""
 "\n"
 "uso:\n"
 
-#: ../mdkupdate:55
+#: ../mdkupdate:57
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - mostrar este mensaje de ayuda.\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:58
 #, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto         - Mandrakeupdate lanzado automáticamente.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:59
 #, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - lanzar Mandrakeupdate.\n"
 
-#: ../mdkupdate:58
-#, c-format
-msgid "  --update       - Update keys\n"
-msgstr "  --update       - Actualizar llaves\n"
-
-#: ../mdkupdate:66
+#: ../mdkupdate:67
 #, c-format
 msgid "No %s file found. Run mdkonline wizard first"
 msgstr "No se encontró el archivo %s. Ejecute primero el asistente mdkonline"
 
-#: ../mdkupdate:124
+#: ../mdkupdate:126
 #, c-format
 msgid "Mandrakeupdate could not contact the site, we will try again."
 msgstr "Mandrakeupdate no pudo contactar con el sitio, se intentará de nuevo."
 
-#: ../mdkupdate:173
+#: ../mdkupdate:176
 #, c-format
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr "Incapaz de actualizar paquetes desde el soporte mdkupdate.\n"
 
-#: ../mdkupdate:195
+#: ../mdkupdate:198
 #, c-format
 msgid ""
 "Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
@@ -671,3 +615,52 @@ msgid ""
 msgstr ""
 "Mandrakeupdate no pudo enviar los archivos diff. Envíe un correo a support "
 "[at] mandrakeonline [dot] net"
+
+#~ msgid "Next"
+#~ msgstr "Siguiente"
+
+#~ msgid "Cancel"
+#~ msgstr "Cancelar"
+
+#~ msgid "Previous"
+#~ msgstr "Anterior"
+
+#~ msgid "I don't have a Mandrakeonline account and I want to subscribe"
+#~ msgstr "No tengo cuenta Mandrakeonline y deseo suscribir a una"
+
+#~ msgid "Mandrakelinux Privacy Policy"
+#~ msgstr "Política de privacidad de Mandrakelinux"
+
+#~ msgid "Authentification"
+#~ msgstr "Autentificación"
+
+#~ msgid "Send Configuration"
+#~ msgstr "Enviar la configuración"
+
+# evitar el termino "acabar" que tiene otras connotaciones
+#~ msgid "Finish"
+#~ msgstr "Terminar"
+
+#~ msgid "automated Upgrades"
+#~ msgstr "actualizaciones automatizadas"
+
+#~ msgid "Country:"
+#~ msgstr "País:"
+
+#~ msgid "Error"
+#~ msgstr "Error"
+
+#~ msgid "Quitting Wizard\n"
+#~ msgstr "Saliendo del asistente\n"
+
+#~ msgid ""
+#~ "Mandrakeonline could not be contacted, please try again at a later time"
+#~ msgstr ""
+#~ "No se pudo contactar con Mandrakeupdate, por favor, vuélvalo a intentar "
+#~ "más tarde"
+
+#~ msgid "Wrong password"
+#~ msgstr "Contraseña incorrecta"
+
+#~ msgid "  --update       - Update keys\n"
+#~ msgstr "  --update       - Actualizar llaves\n"
diff --git a/po/et.po b/po/et.po
index 019f7619..bf03f94a 100644
--- a/po/et.po
+++ b/po/et.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-01 22:41+0200\n"
+"POT-Creation-Date: 2004-11-03 12:10+0100\n"
 "PO-Revision-Date: 2004-10-02 12:50+0200\n"
 "Last-Translator: Marek Laane <bald@online.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -16,12 +16,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3\n"
 
-#: ../mdkapplet:61
+#: ../mdkapplet:63
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Teie süsteemis pole midagi uuendada"
 
-#: ../mdkapplet:67
+#: ../mdkapplet:69
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -30,188 +30,198 @@ msgstr ""
 "Teenuse seadistamise probleem. Palun kontrollige logisid ja saatke e-kiri "
 "aadressile support@mandrakeonline.net"
 
-#: ../mdkapplet:73
+#: ../mdkapplet:75
 #, c-format
 msgid "System is busy. Please wait ..."
 msgstr "Süsteem on tegevuses. Palun oodake..."
 
-#: ../mdkapplet:79
+#: ../mdkapplet:81
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Teie süsteemile on uuendusi"
 
-#: ../mdkapplet:85
+#: ../mdkapplet:87
 #, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr "Teenus pole seadistatud. Palun valige \"Teenuse seadistamine\""
 
-#: ../mdkapplet:91
+#: ../mdkapplet:93
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Võrk on maas. Palun seadistage võrk"
 
-#: ../mdkapplet:97
+#: ../mdkapplet:99
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Teenus pole aktiveeritud. Palun valige \"Veebilehekülg\""
 
-#: ../mdkapplet:103
+#: ../mdkapplet:105
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "Väljalase pole toetatud (liiga vana või arendusversioon)"
 
-#: ../mdkapplet:108 ../mdkapplet:158
+#: ../mdkapplet:110 ../mdkapplet:164
 #, c-format
 msgid "Install updates"
 msgstr "Uuenduste paigaldamine"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:111
 #, c-format
 msgid "Configure the service"
 msgstr "Teenuse seadistamine"
 
-#: ../mdkapplet:110
+#: ../mdkapplet:112
 #, c-format
 msgid "Check Updates"
 msgstr "Uuenduste kontrollimine"
 
-#: ../mdkapplet:111
+#: ../mdkapplet:113 ../mdkapplet:167 ../mdkapplet:225
+#, fuzzy, c-format
+msgid "Please Wait"
+msgstr "Palun oodake"
+
+#: ../mdkapplet:113 ../mdkapplet:166 ../mdkapplet:167 ../mdkapplet:225
+#, c-format
+msgid "Check updates"
+msgstr "Uuenduste kontrollimine"
+
+#: ../mdkapplet:115
 #, c-format
 msgid "Online WebSite"
 msgstr "Veebilehekülg"
 
-#: ../mdkapplet:112
+#: ../mdkapplet:116
 #, c-format
 msgid "Configure Network"
 msgstr "Võrgu seadistamine"
 
-#: ../mdkapplet:113
+#: ../mdkapplet:117
 #, c-format
 msgid "Configure Now!"
 msgstr "Seadista"
 
-#: ../mdkapplet:146
+#: ../mdkapplet:152 ../mdkapplet:229
 #, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Mandrakelinuxi uuenduste aplett"
 
-#: ../mdkapplet:156
+#: ../mdkapplet:162
 #, c-format
 msgid "Actions"
 msgstr "Toimingud"
 
-#: ../mdkapplet:159
+#: ../mdkapplet:165
 #, c-format
 msgid "Configure"
 msgstr "Seadistused"
 
-#: ../mdkapplet:160
-#, c-format
-msgid "Check updates"
-msgstr "Uuenduste kontrollimine"
-
-#: ../mdkapplet:161
+#: ../mdkapplet:169
 #, c-format
 msgid "See logs"
 msgstr "Logide vaatamine"
 
-#: ../mdkapplet:164
+#: ../mdkapplet:172
 #, c-format
 msgid "Status"
 msgstr "Olek"
 
-#: ../mdkapplet:168 ../mdkapplet:363
+#: ../mdkapplet:176 ../mdkapplet:375
 #, c-format
 msgid "Close"
 msgstr "Sulge"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Network Connection: "
 msgstr "Võrguühendus: "
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Up"
 msgstr "Olemas"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Down"
 msgstr "Puudub"
 
-#: ../mdkapplet:204
+#: ../mdkapplet:212
 #, c-format
 msgid "Last check: "
 msgstr "Viimati kontrollitud: "
 
-#: ../mdkapplet:205
+#: ../mdkapplet:213
 #, c-format
 msgid "Updates: "
 msgstr "Uuendused: "
 
-#: ../mdkapplet:209
+#: ../mdkapplet:217
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Drakconnecti käivitamine\n"
 
-#: ../mdkapplet:213
+#: ../mdkapplet:221
 #, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "mdkupdate --applet käivitamine\n"
 
-#: ../mdkapplet:217
+#: ../mdkapplet:224
 #, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 "Mandrakeonline paistab olevat uuesti paigaldatud, aplett laaditakse uuesti..."
 
-#: ../mdkapplet:225
+#: ../mdkapplet:235
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Uuenduste kontrollimine...\n"
 
-#: ../mdkapplet:227
+#: ../mdkapplet:237
 #, c-format
 msgid "Connecting to"
 msgstr "Ühendumine saidiga"
 
-#: ../mdkapplet:250
+#: ../mdkapplet:244
+#, fuzzy, c-format
+msgid "Response from Mandrakeonline server\n"
+msgstr "Tere tulemast Mandrakeonline'i"
+
+#: ../mdkapplet:262
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Kontroll... On uuendusi\n"
 
-#: ../mdkapplet:254
+#: ../mdkapplet:267
 #, c-format
 msgid "Development release not supported by service"
 msgstr "Teenus ei toeta arendusversiooni"
 
-#: ../mdkapplet:255
+#: ../mdkapplet:268
 #, c-format
 msgid "Too old release not supported by service"
 msgstr "Teenus ei toeta liiga vanu väljalaskeid"
 
-#: ../mdkapplet:256
+#: ../mdkapplet:269
 #, c-format
 msgid "Unknown state"
 msgstr "Tundmatu olek"
 
-#: ../mdkapplet:257
+#: ../mdkapplet:270
 #, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr "Võrguteenused ei ole lubatud. Ühendumine Mandrakeonline'i saidiga\n"
 
-#: ../mdkapplet:258
+#: ../mdkapplet:271
 #, c-format
 msgid "Wrong Password.\n"
 msgstr "Vale parool.\n"
 
-#: ../mdkapplet:259
+#: ../mdkapplet:272
 #, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr "Vale toiming või masin või kasutajatunnus.\n"
 
-#: ../mdkapplet:260
+#: ../mdkapplet:273
 #, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
@@ -220,72 +230,82 @@ msgstr ""
 "Teie võrguseadistustega on midagi valesti (palun kontrollige ruuteri, "
 "tulemüüri või vahendaja (proxy) seadistusi)\n"
 
-#: ../mdkapplet:264
+#: ../mdkapplet:277
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Midagi pole uuendada\n"
 
-#: ../mdkapplet:303
+#: ../mdkapplet:317
 #, c-format
 msgid "No check"
 msgstr "Pole kontrollitud"
 
-#: ../mdkapplet:316
+#: ../mdkapplet:330
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Võrgu kontroll: paistab, et see on maas\n"
 
-#: ../mdkapplet:319
+#: ../mdkapplet:333
 #, c-format
 msgid "Checking config file: Not present\n"
 msgstr "Konfiguratsioonifaili kontroll: puudub\n"
 
-#: ../mdkapplet:353
+#: ../mdkapplet:365
 #, c-format
 msgid "Logs"
 msgstr "Logid"
 
-#: ../mdkapplet:369
+#: ../mdkapplet:381
 #, c-format
 msgid "Clear"
 msgstr "Puhasta"
 
-#: ../mdkapplet:396
+#: ../mdkapplet:408
 #, c-format
 msgid "About..."
 msgstr "Info..."
 
-#: ../mdkapplet:397
+#: ../mdkapplet:409
 #, c-format
 msgid "Always launch on startup"
 msgstr "Käivitatakse alati käivitumisel"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:411
 #, c-format
 msgid "Quit"
 msgstr "Välju"
 
-#: ../mdkonline:89
+#: ../mdkonline:52 ../mdkonline:106
 #, c-format
-msgid "Next"
-msgstr "Järgmine"
+msgid "Mandrakeonline"
+msgstr "Mandrakeonline"
 
-#: ../mdkonline:89
+#: ../mdkonline:55
+#, c-format
+msgid "I already have an account"
+msgstr "Mul on juba konto"
+
+#: ../mdkonline:56
+#, c-format
+msgid "I want to subscribe"
+msgstr "Tahan konto luua"
+
+#: ../mdkonline:89 ../mdkonline:93 ../mdkonline:131
 #, c-format
-msgid "Cancel"
-msgstr "Loobu"
+msgid "Please wait"
+msgstr "Palun oodake"
 
 #: ../mdkonline:89
 #, c-format
-msgid "Previous"
-msgstr "Eelmine"
+msgid "Reading configuration\n"
+msgstr "Konfiguratsiooni tuvastamine\n"
 
-#: ../mdkonline:103
+#: ../mdkonline:93
 #, c-format
-msgid "Welcome to Mandrakeonline"
-msgstr "Tere tulemast Mandrakeonline'i"
+msgid "Sending configuration..."
+msgstr "Konfiguratsiooni saatmine..."
 
-#: ../mdkonline:104 ../mdkonline_tui:98
+#: ../mdkonline:109
 #, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
@@ -296,62 +316,37 @@ msgstr ""
 "(paketid, riistvara) tsentraalsesse andmebaasi, et edaspidi\n"
 "teavitada Teid turvaparandustest ja kasulikest uuendustest.\n"
 
-#: ../mdkonline:105 ../mdkonline_tui:142
+#: ../mdkonline:114
 #, c-format
-msgid "Create a Mandrakeonline Account"
-msgstr "Mandrakeonline'i konto loomine"
+msgid "Account creation or authentication"
+msgstr "Konto loomine või autentimine"
 
-#: ../mdkonline:107
+#: ../mdkonline:119
 #, c-format
-msgid "I don't have a Mandrakeonline account and I want to subscribe"
-msgstr "Mul ei ole veel Mandrakeonline'i kontot, aga ma tahan seda"
+msgid "Enter your Mandrakeonline login, password and machine name:"
+msgstr "Sisestage oma Mandrakeonline'i kasutajatunnus, parool ja masina nimi:"
 
-#: ../mdkonline:111 ../mdkonline:131 ../mdkonline_tui:114 ../mdkonline_tui:145
+#: ../mdkonline:125 ../mdkonline:156
 #, c-format
 msgid "Login:"
 msgstr "Kasutajatunnus:"
 
-#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:115 ../mdkonline_tui:146
+#: ../mdkonline:126 ../mdkonline:157
 #, c-format
 msgid "Password:"
 msgstr "Parool:"
 
-#: ../mdkonline:113 ../mdkonline_tui:147
-#, c-format
-msgid "Confirm Password:"
-msgstr "Parool teist korda:"
-
-#: ../mdkonline:114 ../mdkonline_tui:148
-#, c-format
-msgid "Mail contact:"
-msgstr "E-posti aadress:"
-
-#: ../mdkonline:121
-#, c-format
-msgid "Mandrakelinux Privacy Policy"
-msgstr "Mandrakelinuxi privaatsuspoliitika"
-
 #: ../mdkonline:127
 #, c-format
-msgid "Authentification"
-msgstr "Autentimine"
-
-#: ../mdkonline:128 ../mdkonline_tui:108
-#, c-format
-msgid "Enter your Mandrakeonline login, password and machine name:"
-msgstr "Sisestage oma Mandrakeonline'i kasutajatunnus, parool ja masina nimi:"
-
-#: ../mdkonline:133 ../mdkonline_tui:116
-#, c-format
 msgid "Machine name:"
 msgstr "Masina nimi:"
 
-#: ../mdkonline:138
+#: ../mdkonline:131
 #, c-format
-msgid "Send Configuration"
-msgstr "Saada konfiguratsioon"
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Ühendumine Mandrakeonline'i saidiga..."
 
-#: ../mdkonline:139 ../mdkonline_tui:128
+#: ../mdkonline:139
 #, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
@@ -383,55 +378,56 @@ msgstr ""
 "Lisaks saate hinnaalandust www.mandrakeexpert.com tasuliste\n"
 "teenuste puhul."
 
-#: ../mdkonline:144 ../mdkonline:211 ../mdkonline:234
+#: ../mdkonline:141 ../mdkonline:180 ../mdkupdate:126 ../mdkupdate:198
 #, c-format
-msgid "Finish"
-msgstr "Lõpeta"
+msgid "Connection problem"
+msgstr "Probleem ühendusega"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid "Your upload was successful!"
-msgstr "Saatmine õnnestus!"
+msgid "or"
+msgstr "või"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandrakeonline."
-msgstr ""
-"Nüüdsest alates saate tänu Mandrakeonline'ile \n"
-"teateid turvaparanduste ja uuenduste kohta."
+msgid "wrong password:"
+msgstr "vale parool:"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
 msgid ""
-"Mandrakeonline offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+"Your login or password was wrong.\n"
+" Either you'll have to type it again, or you'll need to create an account on "
+"Mandrakeonline.\n"
+" In the latter case, go back to the first step to connect to "
+"Mandrakeonline.\n"
+" Be aware that you must also provide a Machine name \n"
+" (only alphabetical characters are admitted)"
 msgstr ""
-"Mandrakeonline pakub võimalust uuendamine automaatseks muuta.\n"
-"Selleks käivitatakse Teie arvutis regulaarselt rakendus, mis otsib uuendusi\n"
-
-#: ../mdkonline:146
-#, c-format
-msgid "automated Upgrades"
-msgstr "Automaatne uuendamine"
+"Teie kasutajatunnus või parool oli vale.\n"
+" Te peate selle uuesti sisestama või siis looma endale konto "
+"Mandrakeonline'is.\n"
+" Viimasel juhul minge tagasi esimese sammu juurde, et saada ühendus "
+"Mandrakeonline'iga.\n"
+" Pange tähele, et teatada tuleb ka oma masina nimi \n"
+" (lubatud on ainult tähed)"
 
-#: ../mdkonline:150
+#: ../mdkonline:153
 #, c-format
-msgid "Country:"
-msgstr "Riik:"
+msgid "Create a Mandrakeonline Account"
+msgstr "Mandrakeonline'i konto loomine"
 
-#: ../mdkonline:178 ../mdkonline:183 ../mdkonline:185 ../mdkonline:187
+#: ../mdkonline:158
 #, c-format
-msgid "Error"
-msgstr "Viga"
+msgid "Confirm Password:"
+msgstr "Parool teist korda:"
 
-#: ../mdkonline:183 ../mdkonline_tui:152
+#: ../mdkonline:159
 #, c-format
-msgid "Please provide a login"
-msgstr "Palun andke kasutajatunnus"
+msgid "Mail contact:"
+msgstr "E-posti aadress:"
 
-#: ../mdkonline:185 ../mdkonline_tui:152
+#: ../mdkonline:163
 #, c-format
 msgid ""
 "The passwords do not match\n"
@@ -440,162 +436,117 @@ msgstr ""
 "Paroolid ei klapi\n"
 " Palun proovige uuesti\n"
 
-#: ../mdkonline:187 ../mdkonline_tui:152
+#: ../mdkonline:163
+#, c-format
+msgid "Please provide a login"
+msgstr "Palun andke kasutajatunnus"
+
+#: ../mdkonline:163
 #, c-format
 msgid "Not a valid mail address!\n"
 msgstr "See ei ole korrektne e-posti aadress!\n"
 
-#: ../mdkonline:199 ../mdkonline_tui:78
+#: ../mdkonline:169
 #, c-format
-msgid "Reading configuration\n"
-msgstr "Konfiguratsiooni tuvastamine\n"
+msgid ""
+"Mandrakeonline Account successfully created.\n"
+"Please click \"Next\" to authenticate and upload your configuration\n"
+msgstr ""
+"Mandrakeonline'i konto edukalt loodud.\n"
+"Palun klõpsake nupule \"Järgmine\" autentimiseks ja oma konfiguratsiooni "
+"saatmiseks\n"
 
-#: ../mdkonline:204 ../mdkonline_tui:82
+#: ../mdkonline:178
 #, c-format
-msgid "Sending configuration..."
-msgstr "Konfiguratsiooni saatmine..."
+msgid "Your upload was successful!"
+msgstr "Saatmine õnnestus!"
 
-#: ../mdkonline:213 ../mdkonline:273 ../mdkonline_tui:130 ../mdkonline_tui:169
-#: ../mdkupdate:124 ../mdkupdate:195
+#: ../mdkonline:178
 #, c-format
-msgid "Connection problem"
-msgstr "Probleem ühendusega"
+msgid ""
+"From now you will receive on security and updates \n"
+"announcements thanks to Mandrakeonline."
+msgstr ""
+"Nüüdsest alates saate tänu Mandrakeonline'ile \n"
+"teateid turvaparanduste ja uuenduste kohta."
+
+#: ../mdkonline:178
+#, c-format
+msgid ""
+"Mandrakeonline offers you the ability to automate the updates.\n"
+"A program will run regulary in your system waiting for new updates\n"
+msgstr ""
+"Mandrakeonline pakub võimalust uuendamine automaatseks muuta.\n"
+"Selleks käivitatakse Teie arvutis regulaarselt rakendus, mis otsib uuendusi\n"
 
-#: ../mdkonline:213 ../mdkonline_tui:169
+#: ../mdkonline:180
 #, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr "Tekkis viga failide saatmisel, palun proovige uuesti"
 
-#: ../mdkonline:251
+#: ../mdkonline:186
 #, c-format
-msgid "Quitting Wizard\n"
-msgstr "Nõustajast väljumine\n"
+msgid "Country"
+msgstr "Riik"
 
-#: ../mdkonline:273
+#: ../mdkonline:198
 #, c-format
-msgid "Mandrakeonline could not be contacted, please try again at a later time"
-msgstr "Mandrakeonline'iga ei saadud ühendust, palun proovige hiljem uuesti"
+msgid "Congratulations"
+msgstr "Õnnitlused!"
 
-#: ../mdkonline:285
+#: ../mdkonline:198
 #, c-format
-msgid "Wrong password"
-msgstr "Vale parool"
+msgid "Your Mandrakeonline account has been successfully configured\n"
+msgstr "Teie Mandrakeonline'i konto on edukalt loodud\n"
+
+#: ../mdkonline:214
+#, fuzzy, c-format
+msgid "Configuration uploaded successfully"
+msgstr "Saatmine õnnestus!"
 
-#: ../mdkonline:285 ../mdkonline_tui:130
+#: ../mdkonline:215
+#, fuzzy, c-format
+msgid "Problem uploading configuration"
+msgstr "Konfiguratsiooni tuvastamine\n"
+
+#: ../mdkonline:216
 #, c-format
 msgid ""
-"Your login or password was wrong.\n"
-" Either you'll have to type it again, or you'll need to create an account on "
-"Mandrakeonline.\n"
-" In the latter case, go back to the first step to connect to "
-"Mandrakeonline.\n"
-" Be aware that you must also provide a Machine name \n"
-" (only alphabetical characters are admitted)"
+"Cannot connect to mandrakeonline website: wrong login/password or router/"
+"firewall bad settings"
 msgstr ""
-"Teie kasutajatunnus või parool oli vale.\n"
-" Te peate selle uuesti sisestama või siis looma endale konto "
-"Mandrakeonline'is.\n"
-" Viimasel juhul minge tagasi esimese sammu juurde, et saada ühendus "
-"Mandrakeonline'iga.\n"
-" Pange tähele, et teatada tuleb ka oma masina nimi \n"
-" (lubatud on ainult tähed)"
 
-#: ../mdkonline.pm:58
+#: ../mdkonline.pm:66
 #, c-format
 msgid "Login and password should be less than 12 characters\n"
 msgstr "Kasutajatunnuses ja paroolis tohib olla kuni 12 sümbolit\n"
 
-#: ../mdkonline.pm:59
+#: ../mdkonline.pm:67
 #, c-format
 msgid "Special characters are not allowed\n"
 msgstr "Erisümbolid ei ole lubatud\n"
 
-#: ../mdkonline.pm:60
+#: ../mdkonline.pm:68
 #, c-format
 msgid "Please fill in all fields\n"
 msgstr "Palun täitke kõik väljad\n"
 
-#: ../mdkonline.pm:61
+#: ../mdkonline.pm:69
 #, c-format
 msgid "Email not valid\n"
 msgstr "E-posti aadress pole korrektne\n"
 
-#: ../mdkonline.pm:62
+#: ../mdkonline.pm:70
 #, c-format
 msgid "Account already exist\n"
 msgstr "Konto on juba olemas\n"
 
-#: ../mdkonline.pm:68
+#: ../mdkonline.pm:76
 #, c-format
 msgid "Problem connecting to server \n"
 msgstr "Probleem serveriga ühendumisel \n"
 
-#: ../mdkonline_tui:45 ../mdkonline_tui:95
-#, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
-
-#: ../mdkonline_tui:48
-#, c-format
-msgid "I already have an account"
-msgstr "Mul on juba konto"
-
-#: ../mdkonline_tui:49
-#, c-format
-msgid "I want to subscribe"
-msgstr "Tahan konto luua"
-
-#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:120
-#, c-format
-msgid "Please wait"
-msgstr "Palun oodake"
-
-#: ../mdkonline_tui:103
-#, c-format
-msgid "Account creation or authentication"
-msgstr "Konto loomine või autentimine"
-
-#: ../mdkonline_tui:120
-#, c-format
-msgid "Connecting to Mandrakeonline website..."
-msgstr "Ühendumine Mandrakeonline'i saidiga..."
-
-#: ../mdkonline_tui:130
-#, c-format
-msgid "or"
-msgstr "või"
-
-#: ../mdkonline_tui:130
-#, c-format
-msgid "wrong password:"
-msgstr "vale parool:"
-
-#: ../mdkonline_tui:158
-#, c-format
-msgid ""
-"Mandrakeonline Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-"Mandrakeonline'i konto edukalt loodud.\n"
-"Palun klõpsake nupule \"Järgmine\" autentimiseks ja oma konfiguratsiooni "
-"saatmiseks\n"
-
-#: ../mdkonline_tui:175
-#, c-format
-msgid "Country"
-msgstr "Riik"
-
-#: ../mdkonline_tui:187
-#, c-format
-msgid "Congratulations"
-msgstr "Õnnitlused!"
-
-#: ../mdkonline_tui:187
-#, c-format
-msgid "Your Mandrakeonline account has been successfully configured\n"
-msgstr "Teie Mandrakeonline'i konto on edukalt loodud\n"
-
-#: ../mdkupdate:50
+#: ../mdkupdate:52
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
@@ -612,42 +563,37 @@ msgstr ""
 "\n"
 "kasutamine:\n"
 
-#: ../mdkupdate:55
+#: ../mdkupdate:57
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - näitab seda abiteadet.\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:58
 #, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto         - Mandrakeupdate käivitatakse automaatselt.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:59
 #, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - käivitatakse Mandrakeupdate.\n"
 
-#: ../mdkupdate:58
-#, c-format
-msgid "  --update       - Update keys\n"
-msgstr "  --update       - uuendatakse võtmeid\n"
-
-#: ../mdkupdate:66
+#: ../mdkupdate:67
 #, c-format
 msgid "No %s file found. Run mdkonline wizard first"
 msgstr "%s faili ei leitud. Käivitage palun mdkonline'i nõustaja"
 
-#: ../mdkupdate:124
+#: ../mdkupdate:126
 #, c-format
 msgid "Mandrakeupdate could not contact the site, we will try again."
 msgstr "Mandrakeupdate ei suutnud ühendust luua, palun proovige hiljem uuesti."
 
-#: ../mdkupdate:173
+#: ../mdkupdate:176
 #, c-format
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr "Pakettide värskendamine mdkupdate andmekandjalt ebaõnnestus.\n"
 
-#: ../mdkupdate:195
+#: ../mdkupdate:198
 #, c-format
 msgid ""
 "Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
@@ -655,3 +601,49 @@ msgid ""
 msgstr ""
 "Mandrakeupdate ei suutnud võrdlusfaile laadida. Saatke palun e-kiri "
 "aadressile support@mandrakeonline.net"
+
+#~ msgid "Next"
+#~ msgstr "Järgmine"
+
+#~ msgid "Cancel"
+#~ msgstr "Loobu"
+
+#~ msgid "Previous"
+#~ msgstr "Eelmine"
+
+#~ msgid "I don't have a Mandrakeonline account and I want to subscribe"
+#~ msgstr "Mul ei ole veel Mandrakeonline'i kontot, aga ma tahan seda"
+
+#~ msgid "Mandrakelinux Privacy Policy"
+#~ msgstr "Mandrakelinuxi privaatsuspoliitika"
+
+#~ msgid "Authentification"
+#~ msgstr "Autentimine"
+
+#~ msgid "Send Configuration"
+#~ msgstr "Saada konfiguratsioon"
+
+#~ msgid "Finish"
+#~ msgstr "Lõpeta"
+
+#~ msgid "automated Upgrades"
+#~ msgstr "Automaatne uuendamine"
+
+#~ msgid "Country:"
+#~ msgstr "Riik:"
+
+#~ msgid "Error"
+#~ msgstr "Viga"
+
+#~ msgid "Quitting Wizard\n"
+#~ msgstr "Nõustajast väljumine\n"
+
+#~ msgid ""
+#~ "Mandrakeonline could not be contacted, please try again at a later time"
+#~ msgstr "Mandrakeonline'iga ei saadud ühendust, palun proovige hiljem uuesti"
+
+#~ msgid "Wrong password"
+#~ msgstr "Vale parool"
+
+#~ msgid "  --update       - Update keys\n"
+#~ msgstr "  --update       - uuendatakse võtmeid\n"
diff --git a/po/eu.po b/po/eu.po
index b1b571b7..3f9c27d2 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-eu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-01 22:41+0200\n"
+"POT-Creation-Date: 2004-11-03 12:10+0100\n"
 "PO-Revision-Date: 2004-10-10 23:34+0200\n"
 "Last-Translator: Iñigo Salvador Azurmendi <xalba@euskalnet.net>\n"
 "Language-Team: EUSKARA <itzulpena@euskalgnu.org>\n"
@@ -21,12 +21,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3\n"
 
-#: ../mdkapplet:61
+#: ../mdkapplet:63
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Zure sistema eguneratuta dago"
 
-#: ../mdkapplet:67
+#: ../mdkapplet:69
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -35,189 +35,199 @@ msgstr ""
 "Zerbitzuaren konfigurazio arazoa. Mesedez aztertu erregistroak eta bidali "
 "posta support@mandrakeonline.net helbidera"
 
-#: ../mdkapplet:73
+#: ../mdkapplet:75
 #, c-format
 msgid "System is busy. Please wait ..."
 msgstr "Sistema okupatuta dago. Itxaron..."
 
-#: ../mdkapplet:79
+#: ../mdkapplet:81
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Zure sistemarentzako eguneraketa berriak eskuragarri daude"
 
-#: ../mdkapplet:85
+#: ../mdkapplet:87
 #, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr ""
 "Zerbitzua ez dago konfiguratuta. Mesedez sakatu \"Zerbitzua konfiguratu\""
 
-#: ../mdkapplet:91
+#: ../mdkapplet:93
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Sarea erorita dago. Mesedez konfiguratu zure sarea"
 
-#: ../mdkapplet:97
+#: ../mdkapplet:99
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Zerbitzua ez dago aktibatuta. Mesedez klikatu \"Lerroko Webgunea\""
 
-#: ../mdkapplet:103
+#: ../mdkapplet:105
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 "Bertsio hau ez dago sostengaturik (bertsio zaharregia, edo garapen bertsioa)"
 
-#: ../mdkapplet:108 ../mdkapplet:158
+#: ../mdkapplet:110 ../mdkapplet:164
 #, c-format
 msgid "Install updates"
 msgstr "Instalatu eguneratzeak"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:111
 #, c-format
 msgid "Configure the service"
 msgstr "Zerbitzua konfiguratu"
 
-#: ../mdkapplet:110
+#: ../mdkapplet:112
 #, c-format
 msgid "Check Updates"
 msgstr "Egiaztatu eguneratzeak"
 
-#: ../mdkapplet:111
+#: ../mdkapplet:113 ../mdkapplet:167 ../mdkapplet:225
+#, fuzzy, c-format
+msgid "Please Wait"
+msgstr "Itxaron"
+
+#: ../mdkapplet:113 ../mdkapplet:166 ../mdkapplet:167 ../mdkapplet:225
+#, c-format
+msgid "Check updates"
+msgstr "Egiaztatu eguneratzeak"
+
+#: ../mdkapplet:115
 #, c-format
 msgid "Online WebSite"
 msgstr "Lerroko Webgunea"
 
-#: ../mdkapplet:112
+#: ../mdkapplet:116
 #, c-format
 msgid "Configure Network"
 msgstr "Konfiguratu sarea"
 
-#: ../mdkapplet:113
+#: ../mdkapplet:117
 #, c-format
 msgid "Configure Now!"
 msgstr "Konfiguratu orain!"
 
-#: ../mdkapplet:146
+#: ../mdkapplet:152 ../mdkapplet:229
 #, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Mandrakelinux eguneratzeen applet-a"
 
-#: ../mdkapplet:156
+#: ../mdkapplet:162
 #, c-format
 msgid "Actions"
 msgstr "Ekintzak"
 
-#: ../mdkapplet:159
+#: ../mdkapplet:165
 #, c-format
 msgid "Configure"
 msgstr "Konfiguratu"
 
-#: ../mdkapplet:160
-#, c-format
-msgid "Check updates"
-msgstr "Egiaztatu eguneratzeak"
-
-#: ../mdkapplet:161
+#: ../mdkapplet:169
 #, c-format
 msgid "See logs"
 msgstr "Ikusi egunkariak"
 
-#: ../mdkapplet:164
+#: ../mdkapplet:172
 #, c-format
 msgid "Status"
 msgstr "Egoera"
 
-#: ../mdkapplet:168 ../mdkapplet:363
+#: ../mdkapplet:176 ../mdkapplet:375
 #, c-format
 msgid "Close"
 msgstr "Itxi"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Network Connection: "
 msgstr "Sare-konexioa: "
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Up"
 msgstr "Badabil"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Down"
 msgstr "Ez dabil"
 
-#: ../mdkapplet:204
+#: ../mdkapplet:212
 #, c-format
 msgid "Last check: "
 msgstr "Azken egiaztatzea: "
 
-#: ../mdkapplet:205
+#: ../mdkapplet:213
 #, c-format
 msgid "Updates: "
 msgstr "Eguneraketak: "
 
-#: ../mdkapplet:209
+#: ../mdkapplet:217
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "drakconect abiarazten\n"
 
-#: ../mdkapplet:213
+#: ../mdkapplet:221
 #, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "mdkupdate --applet abiarazten\n"
 
-#: ../mdkapplet:217
+#: ../mdkapplet:224
 #, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr "Mandrakeonline berrinstalatu dela dirudi, appleta birzamatzen ..."
 
-#: ../mdkapplet:225
+#: ../mdkapplet:235
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Eguneraketa berriak kalkulatzen...\n"
 
-#: ../mdkapplet:227
+#: ../mdkapplet:237
 #, c-format
 msgid "Connecting to"
 msgstr "Hona konektatzen"
 
-#: ../mdkapplet:250
+#: ../mdkapplet:244
+#, fuzzy, c-format
+msgid "Response from Mandrakeonline server\n"
+msgstr "Ongi etorri Mandrakeonline-ra"
+
+#: ../mdkapplet:262
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Egiaztaketa... Dauden eguneraketak\n"
 
-#: ../mdkapplet:254
+#: ../mdkapplet:267
 #, c-format
 msgid "Development release not supported by service"
 msgstr "Garapen bertsioa zerbitzuaren sostengurik gabe"
 
-#: ../mdkapplet:255
+#: ../mdkapplet:268
 #, c-format
 msgid "Too old release not supported by service"
 msgstr "Bertsio zaharregia zerbitzuaren sostengurik gabe"
 
-#: ../mdkapplet:256
+#: ../mdkapplet:269
 #, c-format
 msgid "Unknown state"
 msgstr "Egoera ezezaguna"
 
-#: ../mdkapplet:257
+#: ../mdkapplet:270
 #, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr "Lineako zerbitzua desgaituta. Kontaktatu Mandrakeonline gunearekin\n"
 
-#: ../mdkapplet:258
+#: ../mdkapplet:271
 #, c-format
 msgid "Wrong Password.\n"
 msgstr "Pasahitza ez da zuzena\n"
 
-#: ../mdkapplet:259
+#: ../mdkapplet:272
 #, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr "Okerreko akzioa, ostalaria edo saio_hasiera.\n"
 
-#: ../mdkapplet:260
+#: ../mdkapplet:273
 #, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
@@ -226,72 +236,82 @@ msgstr ""
 "Zerbait gaizki dago zure sareko ezarpenetan (aztertu zure ibilbide, suhesi "
 "edo proxy ezarpenak)\n"
 
-#: ../mdkapplet:264
+#: ../mdkapplet:277
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Sistema eguneratzera doa\n"
 
-#: ../mdkapplet:303
+#: ../mdkapplet:317
 #, c-format
 msgid "No check"
 msgstr "Egiaztatzerik ez"
 
-#: ../mdkapplet:316
+#: ../mdkapplet:330
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Sare egiaztaketa: desgaituta dagoela dirudi\n"
 
-#: ../mdkapplet:319
+#: ../mdkapplet:333
 #, c-format
 msgid "Checking config file: Not present\n"
 msgstr "Konfigurazio-fitxategia egiaztatzea: ez dago\n"
 
-#: ../mdkapplet:353
+#: ../mdkapplet:365
 #, c-format
 msgid "Logs"
 msgstr "Egunkariak"
 
-#: ../mdkapplet:369
+#: ../mdkapplet:381
 #, c-format
 msgid "Clear"
 msgstr "Garbitu"
 
-#: ../mdkapplet:396
+#: ../mdkapplet:408
 #, c-format
 msgid "About..."
 msgstr "Honi buruz..."
 
-#: ../mdkapplet:397
+#: ../mdkapplet:409
 #, c-format
 msgid "Always launch on startup"
 msgstr "Jaurti beti hasterakoan"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:411
 #, c-format
 msgid "Quit"
 msgstr "Irten"
 
-#: ../mdkonline:89
+#: ../mdkonline:52 ../mdkonline:106
 #, c-format
-msgid "Next"
-msgstr "Hurrengoa"
+msgid "Mandrakeonline"
+msgstr "Mandrakeonline"
 
-#: ../mdkonline:89
+#: ../mdkonline:55
+#, c-format
+msgid "I already have an account"
+msgstr "Dagoeneko kontu bat daukat"
+
+#: ../mdkonline:56
+#, c-format
+msgid "I want to subscribe"
+msgstr "Harpidetu nahi dut"
+
+#: ../mdkonline:89 ../mdkonline:93 ../mdkonline:131
 #, c-format
-msgid "Cancel"
-msgstr "Utzi"
+msgid "Please wait"
+msgstr "Itxaron"
 
 #: ../mdkonline:89
 #, c-format
-msgid "Previous"
-msgstr "Aurrekoa"
+msgid "Reading configuration\n"
+msgstr "Konfigurazioa irakurtzen\n"
 
-#: ../mdkonline:103
+#: ../mdkonline:93
 #, c-format
-msgid "Welcome to Mandrakeonline"
-msgstr "Ongi etorri Mandrakeonline-ra"
+msgid "Sending configuration..."
+msgstr "Konfigurazioa bidaltzen..."
 
-#: ../mdkonline:104 ../mdkonline_tui:98
+#: ../mdkonline:109
 #, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
@@ -302,64 +322,39 @@ msgstr ""
 "zentralizatu batera kargatzen lagunduko dizu, segurtasun-eguneratzeeieta "
 "bertsio-berritzeei buruzko informazioa jaso ahal izan dezazun.\n"
 
-#: ../mdkonline:105 ../mdkonline_tui:142
+#: ../mdkonline:114
 #, c-format
-msgid "Create a Mandrakeonline Account"
-msgstr "Sortu Mandrakeonline kontua"
+msgid "Account creation or authentication"
+msgstr "Kontu sorrera edo egiaztapena"
 
-#: ../mdkonline:107
+#: ../mdkonline:119
 #, c-format
-msgid "I don't have a Mandrakeonline account and I want to subscribe"
-msgstr "Ez daukat Mandrakeonline konturik eta harpedetu nahi nuke "
+msgid "Enter your Mandrakeonline login, password and machine name:"
+msgstr ""
+"Idatzi Mandrakeonline-n sartzeko erabiltzaile-izena, pasahitza eta makina-"
+"izena:"
 
-#: ../mdkonline:111 ../mdkonline:131 ../mdkonline_tui:114 ../mdkonline_tui:145
+#: ../mdkonline:125 ../mdkonline:156
 #, c-format
 msgid "Login:"
 msgstr "Erabiltzaile-izena:"
 
-#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:115 ../mdkonline_tui:146
+#: ../mdkonline:126 ../mdkonline:157
 #, c-format
 msgid "Password:"
 msgstr "Pasahitza:"
 
-#: ../mdkonline:113 ../mdkonline_tui:147
-#, c-format
-msgid "Confirm Password:"
-msgstr "Berretsi pasahitza:"
-
-#: ../mdkonline:114 ../mdkonline_tui:148
-#, c-format
-msgid "Mail contact:"
-msgstr "Posta-kontaktua:"
-
-#: ../mdkonline:121
-#, c-format
-msgid "Mandrakelinux Privacy Policy"
-msgstr "Mandrakelinux-en pribatutasun-gidalerroa"
-
 #: ../mdkonline:127
 #, c-format
-msgid "Authentification"
-msgstr "Autentifikazioa"
-
-#: ../mdkonline:128 ../mdkonline_tui:108
-#, c-format
-msgid "Enter your Mandrakeonline login, password and machine name:"
-msgstr ""
-"Idatzi Mandrakeonline-n sartzeko erabiltzaile-izena, pasahitza eta makina-"
-"izena:"
-
-#: ../mdkonline:133 ../mdkonline_tui:116
-#, c-format
 msgid "Machine name:"
 msgstr "Makina-izena:"
 
-#: ../mdkonline:138
+#: ../mdkonline:131
 #, c-format
-msgid "Send Configuration"
-msgstr "Bidali konfigurazioa"
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Mandrakeonline webgunera konektatzen..."
 
-#: ../mdkonline:139 ../mdkonline_tui:128
+#: ../mdkonline:139
 #, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
@@ -391,55 +386,56 @@ msgstr ""
 "bidaltzeko baimena emango diguzu. Horretaz gainera, \n"
 "www.mandrakeexpert.com guneko zerbitzuetan deskontua izango duzu."
 
-#: ../mdkonline:144 ../mdkonline:211 ../mdkonline:234
+#: ../mdkonline:141 ../mdkonline:180 ../mdkupdate:126 ../mdkupdate:198
 #, c-format
-msgid "Finish"
-msgstr "Amaitu"
+msgid "Connection problem"
+msgstr "Konexio-arazoa"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid "Your upload was successful!"
-msgstr "Behar bezala kargatu da!"
+msgid "or"
+msgstr "edo"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandrakeonline."
-msgstr ""
-"Hemendik aurrera, segurtasunari eta eguneratzeei buruzko \n"
-"berriak jasoko dituzu Mandrakeonline-ri esker."
+msgid "wrong password:"
+msgstr "Pasahitz okerra:"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
 msgid ""
-"Mandrakeonline offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+"Your login or password was wrong.\n"
+" Either you'll have to type it again, or you'll need to create an account on "
+"Mandrakeonline.\n"
+" In the latter case, go back to the first step to connect to "
+"Mandrakeonline.\n"
+" Be aware that you must also provide a Machine name \n"
+" (only alphabetical characters are admitted)"
 msgstr ""
-"Mandrakeonline-k eguneratzeak automatizatzeko aukera eskaintzen dizu.\n"
-"Aldika programa bat exekutatuko da zure sisteman eguneratzeak bilatzeko.\n"
-
-#: ../mdkonline:146
-#, c-format
-msgid "automated Upgrades"
-msgstr "bertsio-berritze automatikoak"
+"Izena edo pasahitza ez da zuzena.\n"
+" Edo berriro idatzi behar duzu, edo kontu bat sortu behar duzu "
+"Mandrakeonline-n.\n"
+" Kontua sortzeko, itzuli lehen urratsera, Mandrakeonline-rekin "
+"konektatzeko.\n"
+" Kontuan izan makina-izena ere idatzi behar duzula \n"
+" (alfabeto-karaktereak bakarrik onartzen dira)"
 
-#: ../mdkonline:150
+#: ../mdkonline:153
 #, c-format
-msgid "Country:"
-msgstr "Estatua:"
+msgid "Create a Mandrakeonline Account"
+msgstr "Sortu Mandrakeonline kontua"
 
-#: ../mdkonline:178 ../mdkonline:183 ../mdkonline:185 ../mdkonline:187
+#: ../mdkonline:158
 #, c-format
-msgid "Error"
-msgstr "Errorea"
+msgid "Confirm Password:"
+msgstr "Berretsi pasahitza:"
 
-#: ../mdkonline:183 ../mdkonline_tui:152
+#: ../mdkonline:159
 #, c-format
-msgid "Please provide a login"
-msgstr "Idatzi erabiltzaile-izena"
+msgid "Mail contact:"
+msgstr "Posta-kontaktua:"
 
-#: ../mdkonline:185 ../mdkonline_tui:152
+#: ../mdkonline:163
 #, c-format
 msgid ""
 "The passwords do not match\n"
@@ -448,162 +444,117 @@ msgstr ""
 "Pasahitzak ez datoz bat\n"
 " Saiatu berriro\n"
 
-#: ../mdkonline:187 ../mdkonline_tui:152
+#: ../mdkonline:163
+#, c-format
+msgid "Please provide a login"
+msgstr "Idatzi erabiltzaile-izena"
+
+#: ../mdkonline:163
 #, c-format
 msgid "Not a valid mail address!\n"
 msgstr "Helbide elektronikoa baliogabea da!\n"
 
-#: ../mdkonline:199 ../mdkonline_tui:78
+#: ../mdkonline:169
 #, c-format
-msgid "Reading configuration\n"
-msgstr "Konfigurazioa irakurtzen\n"
+msgid ""
+"Mandrakeonline Account successfully created.\n"
+"Please click \"Next\" to authenticate and upload your configuration\n"
+msgstr ""
+"Mandrakeonline Kontu sorrera arrakastatsua.\n"
+"Mesedez klikatu \"Hurrengoa\" egiaztatu eta zure konfigurazioa igotzeko\n"
 
-#: ../mdkonline:204 ../mdkonline_tui:82
+#: ../mdkonline:178
 #, c-format
-msgid "Sending configuration..."
-msgstr "Konfigurazioa bidaltzen..."
+msgid "Your upload was successful!"
+msgstr "Behar bezala kargatu da!"
 
-#: ../mdkonline:213 ../mdkonline:273 ../mdkonline_tui:130 ../mdkonline_tui:169
-#: ../mdkupdate:124 ../mdkupdate:195
+#: ../mdkonline:178
 #, c-format
-msgid "Connection problem"
-msgstr "Konexio-arazoa"
+msgid ""
+"From now you will receive on security and updates \n"
+"announcements thanks to Mandrakeonline."
+msgstr ""
+"Hemendik aurrera, segurtasunari eta eguneratzeei buruzko \n"
+"berriak jasoko dituzu Mandrakeonline-ri esker."
+
+#: ../mdkonline:178
+#, c-format
+msgid ""
+"Mandrakeonline offers you the ability to automate the updates.\n"
+"A program will run regulary in your system waiting for new updates\n"
+msgstr ""
+"Mandrakeonline-k eguneratzeak automatizatzeko aukera eskaintzen dizu.\n"
+"Aldika programa bat exekutatuko da zure sisteman eguneratzeak bilatzeko.\n"
 
-#: ../mdkonline:213 ../mdkonline_tui:169
+#: ../mdkonline:180
 #, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr "Arazoa fitxategiak igotzerakoan gertatzen da, saiatu berriro mesedez"
 
-#: ../mdkonline:251
+#: ../mdkonline:186
 #, c-format
-msgid "Quitting Wizard\n"
-msgstr "Morroitik irteten\n"
+msgid "Country"
+msgstr "Estatua"
 
-#: ../mdkonline:273
+#: ../mdkonline:198
 #, c-format
-msgid "Mandrakeonline could not be contacted, please try again at a later time"
-msgstr "Ezin izan da Mandrakeonline-rekin kontaktatu, saiatu berriro geroago"
+msgid "Congratulations"
+msgstr "Zorionak"
 
-#: ../mdkonline:285
+#: ../mdkonline:198
 #, c-format
-msgid "Wrong password"
-msgstr "Pasahitza ez da zuzena"
+msgid "Your Mandrakeonline account has been successfully configured\n"
+msgstr "Zure Mandrakeonline kontuaren konfiguraketa arrakastatsua izan da\n"
+
+#: ../mdkonline:214
+#, fuzzy, c-format
+msgid "Configuration uploaded successfully"
+msgstr "Behar bezala kargatu da!"
+
+#: ../mdkonline:215
+#, fuzzy, c-format
+msgid "Problem uploading configuration"
+msgstr "Konfigurazioa irakurtzen\n"
 
-#: ../mdkonline:285 ../mdkonline_tui:130
+#: ../mdkonline:216
 #, c-format
 msgid ""
-"Your login or password was wrong.\n"
-" Either you'll have to type it again, or you'll need to create an account on "
-"Mandrakeonline.\n"
-" In the latter case, go back to the first step to connect to "
-"Mandrakeonline.\n"
-" Be aware that you must also provide a Machine name \n"
-" (only alphabetical characters are admitted)"
+"Cannot connect to mandrakeonline website: wrong login/password or router/"
+"firewall bad settings"
 msgstr ""
-"Izena edo pasahitza ez da zuzena.\n"
-" Edo berriro idatzi behar duzu, edo kontu bat sortu behar duzu "
-"Mandrakeonline-n.\n"
-" Kontua sortzeko, itzuli lehen urratsera, Mandrakeonline-rekin "
-"konektatzeko.\n"
-" Kontuan izan makina-izena ere idatzi behar duzula \n"
-" (alfabeto-karaktereak bakarrik onartzen dira)"
 
-#: ../mdkonline.pm:58
+#: ../mdkonline.pm:66
 #, c-format
 msgid "Login and password should be less than 12 characters\n"
 msgstr ""
 "Erregistro izena eta pasahitza 12 karaktere baino laburragoa behar lukete\n"
 
-#: ../mdkonline.pm:59
+#: ../mdkonline.pm:67
 #, c-format
 msgid "Special characters are not allowed\n"
 msgstr "Ez dira karaktere bereziak onartzen\n"
 
-#: ../mdkonline.pm:60
+#: ../mdkonline.pm:68
 #, c-format
 msgid "Please fill in all fields\n"
 msgstr "Mesedez osatu eremu guztiak\n"
 
-#: ../mdkonline.pm:61
+#: ../mdkonline.pm:69
 #, c-format
 msgid "Email not valid\n"
 msgstr "PostaE baliogabea\n"
 
-#: ../mdkonline.pm:62
+#: ../mdkonline.pm:70
 #, c-format
 msgid "Account already exist\n"
 msgstr "Kontua dagoeneko existitzen da\n"
 
-#: ../mdkonline.pm:68
+#: ../mdkonline.pm:76
 #, c-format
 msgid "Problem connecting to server \n"
 msgstr "Arazoa zerbitzariarekin konektatzean \n"
 
-#: ../mdkonline_tui:45 ../mdkonline_tui:95
-#, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
-
-#: ../mdkonline_tui:48
-#, c-format
-msgid "I already have an account"
-msgstr "Dagoeneko kontu bat daukat"
-
-#: ../mdkonline_tui:49
-#, c-format
-msgid "I want to subscribe"
-msgstr "Harpidetu nahi dut"
-
-#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:120
-#, c-format
-msgid "Please wait"
-msgstr "Itxaron"
-
-#: ../mdkonline_tui:103
-#, c-format
-msgid "Account creation or authentication"
-msgstr "Kontu sorrera edo egiaztapena"
-
-#: ../mdkonline_tui:120
-#, c-format
-msgid "Connecting to Mandrakeonline website..."
-msgstr "Mandrakeonline webgunera konektatzen..."
-
-#: ../mdkonline_tui:130
-#, c-format
-msgid "or"
-msgstr "edo"
-
-#: ../mdkonline_tui:130
-#, c-format
-msgid "wrong password:"
-msgstr "Pasahitz okerra:"
-
-#: ../mdkonline_tui:158
-#, c-format
-msgid ""
-"Mandrakeonline Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-"Mandrakeonline Kontu sorrera arrakastatsua.\n"
-"Mesedez klikatu \"Hurrengoa\" egiaztatu eta zure konfigurazioa igotzeko\n"
-
-#: ../mdkonline_tui:175
-#, c-format
-msgid "Country"
-msgstr "Estatua"
-
-#: ../mdkonline_tui:187
-#, c-format
-msgid "Congratulations"
-msgstr "Zorionak"
-
-#: ../mdkonline_tui:187
-#, c-format
-msgid "Your Mandrakeonline account has been successfully configured\n"
-msgstr "Zure Mandrakeonline kontuaren konfiguraketa arrakastatsua izan da\n"
-
-#: ../mdkupdate:50
+#: ../mdkupdate:52
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
@@ -620,42 +571,37 @@ msgstr ""
 "\n"
 "erabilera:\n"
 
-#: ../mdkupdate:55
+#: ../mdkupdate:57
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - laguntza-mezu hau inprimatzen du.\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:58
 #, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto         - Mandrakeupdate automatikoki abiarazten du.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:59
 #, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - Mandrakeupdate abiarazten du.\n"
 
-#: ../mdkupdate:58
-#, c-format
-msgid "  --update       - Update keys\n"
-msgstr "  --update       - Gakoak eguneratzen ditu\n"
-
-#: ../mdkupdate:66
+#: ../mdkupdate:67
 #, c-format
 msgid "No %s file found. Run mdkonline wizard first"
 msgstr "Ez da %s fitxategia aurkitu. Aurrena exekutatu mdkonline morroia"
 
-#: ../mdkupdate:124
+#: ../mdkupdate:126
 #, c-format
 msgid "Mandrakeupdate could not contact the site, we will try again."
 msgstr "Mandrakeupdate-k ezin izan du lekua kontaktatu, berriro saiatuko gara."
 
-#: ../mdkupdate:173
+#: ../mdkupdate:176
 #, c-format
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr "Ezin dira mdkupdate euskarritik paketeak eguneratu.\n"
 
-#: ../mdkupdate:195
+#: ../mdkupdate:198
 #, c-format
 msgid ""
 "Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
@@ -663,3 +609,50 @@ msgid ""
 msgstr ""
 "Mandrakeupdate-k ezin izan ditu diff fitxategiak igo. Bidali mezu bat "
 "support [at] mandrakeonline [dot] net helbidera"
+
+#~ msgid "Next"
+#~ msgstr "Hurrengoa"
+
+#~ msgid "Cancel"
+#~ msgstr "Utzi"
+
+#~ msgid "Previous"
+#~ msgstr "Aurrekoa"
+
+#~ msgid "I don't have a Mandrakeonline account and I want to subscribe"
+#~ msgstr "Ez daukat Mandrakeonline konturik eta harpedetu nahi nuke "
+
+#~ msgid "Mandrakelinux Privacy Policy"
+#~ msgstr "Mandrakelinux-en pribatutasun-gidalerroa"
+
+#~ msgid "Authentification"
+#~ msgstr "Autentifikazioa"
+
+#~ msgid "Send Configuration"
+#~ msgstr "Bidali konfigurazioa"
+
+#~ msgid "Finish"
+#~ msgstr "Amaitu"
+
+#~ msgid "automated Upgrades"
+#~ msgstr "bertsio-berritze automatikoak"
+
+#~ msgid "Country:"
+#~ msgstr "Estatua:"
+
+#~ msgid "Error"
+#~ msgstr "Errorea"
+
+#~ msgid "Quitting Wizard\n"
+#~ msgstr "Morroitik irteten\n"
+
+#~ msgid ""
+#~ "Mandrakeonline could not be contacted, please try again at a later time"
+#~ msgstr ""
+#~ "Ezin izan da Mandrakeonline-rekin kontaktatu, saiatu berriro geroago"
+
+#~ msgid "Wrong password"
+#~ msgstr "Pasahitza ez da zuzena"
+
+#~ msgid "  --update       - Update keys\n"
+#~ msgstr "  --update       - Gakoak eguneratzen ditu\n"
diff --git a/po/fa.po b/po/fa.po
index 3a35daa3..d49f977f 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-fa\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-01 22:41+0200\n"
+"POT-Creation-Date: 2004-11-03 12:10+0100\n"
 "PO-Revision-Date: 2004-10-05 14:29+0330\n"
 "Last-Translator: Abbas Izad <abbasizad@hotmail.com>\n"
 "Language-Team: Persian\n"
@@ -18,12 +18,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3\n"
 
-#: ../mdkapplet:61
+#: ../mdkapplet:63
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "سیستم‌تان بروز است"
 
-#: ../mdkapplet:67
+#: ../mdkapplet:69
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -32,189 +32,199 @@ msgstr ""
 "اشکال تنظیم سرویس. لطفا ثبت‌ها را کنترل کرده و پستی را به "
 "support@mandrakeonline.net ارسال کنید"
 
-#: ../mdkapplet:73
+#: ../mdkapplet:75
 #, c-format
 msgid "System is busy. Please wait ..."
 msgstr "سیستم اشغال است. صبر کنید..."
 
-#: ../mdkapplet:79
+#: ../mdkapplet:81
 #, c-format
 msgid "New updates are available for your system"
 msgstr "بروزسازی‌هایی برای سیستم‌تان در دسترس است"
 
-#: ../mdkapplet:85
+#: ../mdkapplet:87
 #, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr "سرویس تنظیم نشده است. لطفا بر \"تنظیم سرویس\" کلیک کنید"
 
-#: ../mdkapplet:91
+#: ../mdkapplet:93
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "شبکه پایین است. لطفا شبکه‌تان را تنظیم کنید"
 
-#: ../mdkapplet:97
+#: ../mdkapplet:99
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "سرویس فعال نشده است. لطفا بر \"وب‌گاه اینترنتی\" کلیک کنید"
 
-#: ../mdkapplet:103
+#: ../mdkapplet:105
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "انتشار پشتیبانی نشده است (انتشار بسیار قدیمی، یا انتشار توسعه‌ای)"
 
-#: ../mdkapplet:108 ../mdkapplet:158
+#: ../mdkapplet:110 ../mdkapplet:164
 #, c-format
 msgid "Install updates"
 msgstr "نصب کردن بروزسازی‌ها"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:111
 #, c-format
 msgid "Configure the service"
 msgstr "تنظیم سرویس"
 
-#: ../mdkapplet:110
+#: ../mdkapplet:112
 #, c-format
 msgid "Check Updates"
 msgstr "بررسی بروزسازی‌ها"
 
-#: ../mdkapplet:111
+#: ../mdkapplet:113 ../mdkapplet:167 ../mdkapplet:225
+#, fuzzy, c-format
+msgid "Please Wait"
+msgstr "لطفاً صبر کنید"
+
+#: ../mdkapplet:113 ../mdkapplet:166 ../mdkapplet:167 ../mdkapplet:225
+#, c-format
+msgid "Check updates"
+msgstr "بررسی بروزسازی‌ها"
+
+#: ../mdkapplet:115
 #, c-format
 msgid "Online WebSite"
 msgstr "وب‌گاه اینترنت"
 
-#: ../mdkapplet:112
+#: ../mdkapplet:116
 #, c-format
 msgid "Configure Network"
 msgstr "تنظیم شبکه"
 
-#: ../mdkapplet:113
+#: ../mdkapplet:117
 #, c-format
 msgid "Configure Now!"
 msgstr "تنظیم اکنون!"
 
-#: ../mdkapplet:146
+#: ../mdkapplet:152 ../mdkapplet:229
 #, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "برنامک بروزسازی ماندرایک"
 
-#: ../mdkapplet:156
+#: ../mdkapplet:162
 #, c-format
 msgid "Actions"
 msgstr "کنش‌ها"
 
-#: ../mdkapplet:159
+#: ../mdkapplet:165
 #, c-format
 msgid "Configure"
 msgstr "تنظیم"
 
-#: ../mdkapplet:160
-#, c-format
-msgid "Check updates"
-msgstr "بررسی بروزسازی‌ها"
-
-#: ../mdkapplet:161
+#: ../mdkapplet:169
 #, c-format
 msgid "See logs"
 msgstr "دیدن ثبت‌ها"
 
-#: ../mdkapplet:164
+#: ../mdkapplet:172
 #, c-format
 msgid "Status"
 msgstr "وضعیت"
 
-#: ../mdkapplet:168 ../mdkapplet:363
+#: ../mdkapplet:176 ../mdkapplet:375
 #, c-format
 msgid "Close"
 msgstr "بستن"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Network Connection: "
 msgstr "اتصال شبکه: "
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Up"
 msgstr "بالا"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Down"
 msgstr "پایین"
 
-#: ../mdkapplet:204
+#: ../mdkapplet:212
 #, c-format
 msgid "Last check: "
 msgstr "آخرین بررسی: "
 
-#: ../mdkapplet:205
+#: ../mdkapplet:213
 #, c-format
 msgid "Updates: "
 msgstr "بروزسازی‌ها: "
 
-#: ../mdkapplet:209
+#: ../mdkapplet:217
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "راه انداختن drakconnect\n"
 
-#: ../mdkapplet:213
+#: ../mdkapplet:221
 #, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "به راه انداختن mdkupdate-applet\n"
 
-#: ../mdkapplet:217
+#: ../mdkapplet:224
 #, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 "بنظر می‌رسد که Mandrakeonline نصب مجدد شده است، برنامک بارگذاری مجدد می‌شود ..."
 
-#: ../mdkapplet:225
+#: ../mdkapplet:235
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "در حال محاسبه کردن بروزسازی‌های جدید...\n"
 
-#: ../mdkapplet:227
+#: ../mdkapplet:237
 #, c-format
 msgid "Connecting to"
 msgstr "در حال اتصال به"
 
-#: ../mdkapplet:250
+#: ../mdkapplet:244
+#, fuzzy, c-format
+msgid "Response from Mandrakeonline server\n"
+msgstr "به Mandrakeonline خوش آمدید"
+
+#: ../mdkapplet:262
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "در حال بررسی... بروزسازی‌هایی در دسترس هستند\n"
 
-#: ../mdkapplet:254
+#: ../mdkapplet:267
 #, c-format
 msgid "Development release not supported by service"
 msgstr "انتشار توسعه‌ای بوسیله‌ی سرویس پشتیبانی نمی‌شود"
 
-#: ../mdkapplet:255
+#: ../mdkapplet:268
 #, c-format
 msgid "Too old release not supported by service"
 msgstr "انتشار بسیار قدیمی بوسیله‌ی سرویس پشتیبانی نمی‌شود"
 
-#: ../mdkapplet:256
+#: ../mdkapplet:269
 #, c-format
 msgid "Unknown state"
 msgstr "وضعیت ناشناخته"
 
-#: ../mdkapplet:257
+#: ../mdkapplet:270
 #, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr ""
 "سرویس‌های اینترنتی از کار افتاده‌اند. با وبگاه Mandrakeonline تماس بگیرید\n"
 
-#: ../mdkapplet:258
+#: ../mdkapplet:271
 #, c-format
 msgid "Wrong Password.\n"
 msgstr "گذرواژه‌ی اشتباه\n"
 
-#: ../mdkapplet:259
+#: ../mdkapplet:272
 #, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr "کنش یا میزبان یا ثبت‌ورود اشتباه.\n"
 
-#: ../mdkapplet:260
+#: ../mdkapplet:273
 #, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
@@ -223,72 +233,82 @@ msgstr ""
 "تنظیمات شبکه شما اشکال دارد (تنظیمات مسیریاب، دیوار آتش یا پراکسی خود را "
 "بررسی کنید)\n"
 
-#: ../mdkapplet:264
+#: ../mdkapplet:277
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "سیستم به روز است\n"
 
-#: ../mdkapplet:303
+#: ../mdkapplet:317
 #, c-format
 msgid "No check"
 msgstr "بدون بررسی"
 
-#: ../mdkapplet:316
+#: ../mdkapplet:330
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "بررسی کردن شبکه: بنظر از کار افتاده است\n"
 
-#: ../mdkapplet:319
+#: ../mdkapplet:333
 #, c-format
 msgid "Checking config file: Not present\n"
 msgstr "بررسی کردن پرونده‌ی config: حضور ندارد\n"
 
-#: ../mdkapplet:353
+#: ../mdkapplet:365
 #, c-format
 msgid "Logs"
 msgstr "ثبت‌ها"
 
-#: ../mdkapplet:369
+#: ../mdkapplet:381
 #, c-format
 msgid "Clear"
 msgstr "پاک کردن"
 
-#: ../mdkapplet:396
+#: ../mdkapplet:408
 #, c-format
 msgid "About..."
 msgstr "درباره‌ی.."
 
-#: ../mdkapplet:397
+#: ../mdkapplet:409
 #, c-format
 msgid "Always launch on startup"
 msgstr "راه‌اندازی همیشگی در شروع"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:411
 #, c-format
 msgid "Quit"
 msgstr "ترک"
 
-#: ../mdkonline:89
+#: ../mdkonline:52 ../mdkonline:106
 #, c-format
-msgid "Next"
-msgstr "بعدی"
+msgid "Mandrakeonline"
+msgstr "ماندرایک بر اینترنت"
 
-#: ../mdkonline:89
+#: ../mdkonline:55
 #, c-format
-msgid "Cancel"
-msgstr "لغو"
+msgid "I already have an account"
+msgstr "من از قبل یک حساب دارم"
+
+#: ../mdkonline:56
+#, c-format
+msgid "I want to subscribe"
+msgstr "میخواهم مشترک شوم"
+
+#: ../mdkonline:89 ../mdkonline:93 ../mdkonline:131
+#, c-format
+msgid "Please wait"
+msgstr "لطفاً صبر کنید"
 
 #: ../mdkonline:89
 #, c-format
-msgid "Previous"
-msgstr "پیشین"
+msgid "Reading configuration\n"
+msgstr "خواندن پیکربندی\n"
 
-#: ../mdkonline:103
+#: ../mdkonline:93
 #, c-format
-msgid "Welcome to Mandrakeonline"
-msgstr "به Mandrakeonline خوش آمدید"
+msgid "Sending configuration..."
+msgstr "فرستادن پیکربندی..."
 
-#: ../mdkonline:104 ../mdkonline_tui:98
+#: ../mdkonline:109
 #, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
@@ -299,62 +319,37 @@ msgstr ""
 "به بانک اطلاعاتی مرکزی بمنظور اطلاع رسانی به شما درباره‌ی بروزسازی‌ها و\n"
 "ارتقاهای مفید کمک خواهد کرد.\n"
 
-#: ../mdkonline:105 ../mdkonline_tui:142
+#: ../mdkonline:114
 #, c-format
-msgid "Create a Mandrakeonline Account"
-msgstr "ایجاد حساب Mandrakeonline"
+msgid "Account creation or authentication"
+msgstr "ایجاد حساب یا تأیید هویت"
 
-#: ../mdkonline:107
+#: ../mdkonline:119
 #, c-format
-msgid "I don't have a Mandrakeonline account and I want to subscribe"
-msgstr "حساب اینترنتی ماندرایک ندارم و میخواهم مشترک شوم"
+msgid "Enter your Mandrakeonline login, password and machine name:"
+msgstr "نام ماشین، گذرواژه و ثبت‌ورود Mandrakeonline خود را وارد کنید:"
 
-#: ../mdkonline:111 ../mdkonline:131 ../mdkonline_tui:114 ../mdkonline_tui:145
+#: ../mdkonline:125 ../mdkonline:156
 #, c-format
 msgid "Login:"
 msgstr "ثبت‌ورود:"
 
-#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:115 ../mdkonline_tui:146
+#: ../mdkonline:126 ../mdkonline:157
 #, c-format
 msgid "Password:"
 msgstr "گذرواژه:"
 
-#: ../mdkonline:113 ../mdkonline_tui:147
-#, c-format
-msgid "Confirm Password:"
-msgstr "تصدیق گذرواژه:"
-
-#: ../mdkonline:114 ../mdkonline_tui:148
-#, c-format
-msgid "Mail contact:"
-msgstr "تماس پستی:"
-
-#: ../mdkonline:121
-#, c-format
-msgid "Mandrakelinux Privacy Policy"
-msgstr "رویه‌ی خصوصیت ماندرایک"
-
 #: ../mdkonline:127
 #, c-format
-msgid "Authentification"
-msgstr "تأیید هویت"
-
-#: ../mdkonline:128 ../mdkonline_tui:108
-#, c-format
-msgid "Enter your Mandrakeonline login, password and machine name:"
-msgstr "نام ماشین، گذرواژه و ثبت‌ورود Mandrakeonline خود را وارد کنید:"
-
-#: ../mdkonline:133 ../mdkonline_tui:116
-#, c-format
 msgid "Machine name:"
 msgstr "نام ماشین:"
 
-#: ../mdkonline:138
+#: ../mdkonline:131
 #, c-format
-msgid "Send Configuration"
-msgstr "فرستادن پیکربندی"
+msgid "Connecting to Mandrakeonline website..."
+msgstr "در حال اتصال به وبگاه اینترنتی ماندرایک ..."
 
-#: ../mdkonline:139 ../mdkonline_tui:128
+#: ../mdkonline:139
 #, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
@@ -386,56 +381,55 @@ msgstr ""
 "بعلاوه، شما از تخفیف پرداخت خدمات پشتیبانی بر\n"
 "www.mandrakeexpert.com بهره میگیرید."
 
-#: ../mdkonline:144 ../mdkonline:211 ../mdkonline:234
+#: ../mdkonline:141 ../mdkonline:180 ../mdkupdate:126 ../mdkupdate:198
 #, c-format
-msgid "Finish"
-msgstr "پایان"
+msgid "Connection problem"
+msgstr "مشکل اتصال"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid "Your upload was successful!"
-msgstr "باردهی‌تان موفق بود!"
+msgid "or"
+msgstr "یا"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandrakeonline."
-msgstr ""
-"از اکنون شما آگهی‌های بروزسازی‌های امنیتی را به\n"
-"لطف Mandrakeonline دریافت خواهید کرد."
+msgid "wrong password:"
+msgstr "گذرواژه اشتباه:"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
 msgid ""
-"Mandrakeonline offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+"Your login or password was wrong.\n"
+" Either you'll have to type it again, or you'll need to create an account on "
+"Mandrakeonline.\n"
+" In the latter case, go back to the first step to connect to "
+"Mandrakeonline.\n"
+" Be aware that you must also provide a Machine name \n"
+" (only alphabetical characters are admitted)"
 msgstr ""
-"Mandrakeonline به شما توانائی بروزسازی خودکار را ارائه می‌دهد.\n"
-"برنامه‌ای در سیستم‌تان بطور متناوب اجرا شده و منتظر بروزسازی‌های جدید خواهد "
-"بود\n"
-
-#: ../mdkonline:146
-#, c-format
-msgid "automated Upgrades"
-msgstr "ارتقاهای خودکار"
+"ثبت‌ورود یا گذرواژه اشتباه بود.\n"
+" یا باید دوباره آن را تایپ کنید، یا باید حساب جدیدی بر Mandrakeonline ایجاد "
+"کنید.\n"
+" در مورد اخیر، به اولین گام برای اتصال به Mandrakeonline برگردید.\n"
+" توجه داشته باشید که باید نام ماشینی را همچنین ارائه کنید \n"
+" (فقط نویسه‌های الفبایی مجازند) "
 
-#: ../mdkonline:150
+#: ../mdkonline:153
 #, c-format
-msgid "Country:"
-msgstr "کشور:"
+msgid "Create a Mandrakeonline Account"
+msgstr "ایجاد حساب Mandrakeonline"
 
-#: ../mdkonline:178 ../mdkonline:183 ../mdkonline:185 ../mdkonline:187
+#: ../mdkonline:158
 #, c-format
-msgid "Error"
-msgstr "خطا"
+msgid "Confirm Password:"
+msgstr "تصدیق گذرواژه:"
 
-#: ../mdkonline:183 ../mdkonline_tui:152
+#: ../mdkonline:159
 #, c-format
-msgid "Please provide a login"
-msgstr "لطفاً ثبت‌ورودی را عرضه کنید"
+msgid "Mail contact:"
+msgstr "تماس پستی:"
 
-#: ../mdkonline:185 ../mdkonline_tui:152
+#: ../mdkonline:163
 #, c-format
 msgid ""
 "The passwords do not match\n"
@@ -444,160 +438,117 @@ msgstr ""
 "گذرواژه‌ها مطابقت نمی‌کنند\n"
 " لطفاً دوباره امتحان کنید\n"
 
-#: ../mdkonline:187 ../mdkonline_tui:152
+#: ../mdkonline:163
+#, c-format
+msgid "Please provide a login"
+msgstr "لطفاً ثبت‌ورودی را عرضه کنید"
+
+#: ../mdkonline:163
 #, c-format
 msgid "Not a valid mail address!\n"
 msgstr "نشانی پست معتبری نیست!\n"
 
-#: ../mdkonline:199 ../mdkonline_tui:78
+#: ../mdkonline:169
 #, c-format
-msgid "Reading configuration\n"
-msgstr "خواندن پیکربندی\n"
+msgid ""
+"Mandrakeonline Account successfully created.\n"
+"Please click \"Next\" to authenticate and upload your configuration\n"
+msgstr ""
+"حساب اینترنتی ماندرایک با موفقیت ایجاد گردید.\n"
+"لطفا برای تأیید باردهی پیکربندیتان \"بعدی\" را کلیک کنید\n"
 
-#: ../mdkonline:204 ../mdkonline_tui:82
+#: ../mdkonline:178
 #, c-format
-msgid "Sending configuration..."
-msgstr "فرستادن پیکربندی..."
+msgid "Your upload was successful!"
+msgstr "باردهی‌تان موفق بود!"
 
-#: ../mdkonline:213 ../mdkonline:273 ../mdkonline_tui:130 ../mdkonline_tui:169
-#: ../mdkupdate:124 ../mdkupdate:195
+#: ../mdkonline:178
 #, c-format
-msgid "Connection problem"
-msgstr "مشکل اتصال"
+msgid ""
+"From now you will receive on security and updates \n"
+"announcements thanks to Mandrakeonline."
+msgstr ""
+"از اکنون شما آگهی‌های بروزسازی‌های امنیتی را به\n"
+"لطف Mandrakeonline دریافت خواهید کرد."
+
+#: ../mdkonline:178
+#, c-format
+msgid ""
+"Mandrakeonline offers you the ability to automate the updates.\n"
+"A program will run regulary in your system waiting for new updates\n"
+msgstr ""
+"Mandrakeonline به شما توانائی بروزسازی خودکار را ارائه می‌دهد.\n"
+"برنامه‌ای در سیستم‌تان بطور متناوب اجرا شده و منتظر بروزسازی‌های جدید خواهد "
+"بود\n"
 
-#: ../mdkonline:213 ../mdkonline_tui:169
+#: ../mdkonline:180
 #, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr "اشکالی هنگام باردهی پرونده‌ها رخ داد، لطفا دوباره تلاش کنید"
 
-#: ../mdkonline:251
+#: ../mdkonline:186
 #, c-format
-msgid "Quitting Wizard\n"
-msgstr "ترک جادوگر\n"
+msgid "Country"
+msgstr "کانتری"
 
-#: ../mdkonline:273
+#: ../mdkonline:198
 #, c-format
-msgid "Mandrakeonline could not be contacted, please try again at a later time"
-msgstr "نتوانست با Mandrakeonline تماس گرفت، لطفاً بعداً دوباره امتحان کنید"
+msgid "Congratulations"
+msgstr "تبریکات"
 
-#: ../mdkonline:285
+#: ../mdkonline:198
 #, c-format
-msgid "Wrong password"
-msgstr "گذرواژه‌ی اشتباه"
+msgid "Your Mandrakeonline account has been successfully configured\n"
+msgstr "حساب اینترنتی ماندرایک شما با موفقیت پیکربندی شده است\n"
+
+#: ../mdkonline:214
+#, fuzzy, c-format
+msgid "Configuration uploaded successfully"
+msgstr "باردهی‌تان موفق بود!"
+
+#: ../mdkonline:215
+#, fuzzy, c-format
+msgid "Problem uploading configuration"
+msgstr "خواندن پیکربندی\n"
 
-#: ../mdkonline:285 ../mdkonline_tui:130
+#: ../mdkonline:216
 #, c-format
 msgid ""
-"Your login or password was wrong.\n"
-" Either you'll have to type it again, or you'll need to create an account on "
-"Mandrakeonline.\n"
-" In the latter case, go back to the first step to connect to "
-"Mandrakeonline.\n"
-" Be aware that you must also provide a Machine name \n"
-" (only alphabetical characters are admitted)"
+"Cannot connect to mandrakeonline website: wrong login/password or router/"
+"firewall bad settings"
 msgstr ""
-"ثبت‌ورود یا گذرواژه اشتباه بود.\n"
-" یا باید دوباره آن را تایپ کنید، یا باید حساب جدیدی بر Mandrakeonline ایجاد "
-"کنید.\n"
-" در مورد اخیر، به اولین گام برای اتصال به Mandrakeonline برگردید.\n"
-" توجه داشته باشید که باید نام ماشینی را همچنین ارائه کنید \n"
-" (فقط نویسه‌های الفبایی مجازند) "
 
-#: ../mdkonline.pm:58
+#: ../mdkonline.pm:66
 #, c-format
 msgid "Login and password should be less than 12 characters\n"
 msgstr "ثبت‌ورود و گذرواژه باید کمتر از ۱۲ نویسه باشد\n"
 
-#: ../mdkonline.pm:59
+#: ../mdkonline.pm:67
 #, c-format
 msgid "Special characters are not allowed\n"
 msgstr "نویسه‌های مخصوص مجاز نیستند\n"
 
-#: ../mdkonline.pm:60
+#: ../mdkonline.pm:68
 #, c-format
 msgid "Please fill in all fields\n"
 msgstr "لطفاً همه‌ی محوطه‌ها را پر کنید\n"
 
-#: ../mdkonline.pm:61
+#: ../mdkonline.pm:69
 #, c-format
 msgid "Email not valid\n"
 msgstr "پست الکترونیکی معتبر نیست\n"
 
-#: ../mdkonline.pm:62
+#: ../mdkonline.pm:70
 #, c-format
 msgid "Account already exist\n"
 msgstr "حساب از قبل وجود دارد\n"
 
-#: ../mdkonline.pm:68
+#: ../mdkonline.pm:76
 #, c-format
 msgid "Problem connecting to server \n"
 msgstr "اشکال هنگام اتصال به کارگزار \n"
 
-#: ../mdkonline_tui:45 ../mdkonline_tui:95
-#, c-format
-msgid "Mandrakeonline"
-msgstr "ماندرایک بر اینترنت"
-
-#: ../mdkonline_tui:48
-#, c-format
-msgid "I already have an account"
-msgstr "من از قبل یک حساب دارم"
-
-#: ../mdkonline_tui:49
-#, c-format
-msgid "I want to subscribe"
-msgstr "میخواهم مشترک شوم"
-
-#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:120
-#, c-format
-msgid "Please wait"
-msgstr "لطفاً صبر کنید"
-
-#: ../mdkonline_tui:103
-#, c-format
-msgid "Account creation or authentication"
-msgstr "ایجاد حساب یا تأیید هویت"
-
-#: ../mdkonline_tui:120
-#, c-format
-msgid "Connecting to Mandrakeonline website..."
-msgstr "در حال اتصال به وبگاه اینترنتی ماندرایک ..."
-
-#: ../mdkonline_tui:130
-#, c-format
-msgid "or"
-msgstr "یا"
-
-#: ../mdkonline_tui:130
-#, c-format
-msgid "wrong password:"
-msgstr "گذرواژه اشتباه:"
-
-#: ../mdkonline_tui:158
-#, c-format
-msgid ""
-"Mandrakeonline Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-"حساب اینترنتی ماندرایک با موفقیت ایجاد گردید.\n"
-"لطفا برای تأیید باردهی پیکربندیتان \"بعدی\" را کلیک کنید\n"
-
-#: ../mdkonline_tui:175
-#, c-format
-msgid "Country"
-msgstr "کانتری"
-
-#: ../mdkonline_tui:187
-#, c-format
-msgid "Congratulations"
-msgstr "تبریکات"
-
-#: ../mdkonline_tui:187
-#, c-format
-msgid "Your Mandrakeonline account has been successfully configured\n"
-msgstr "حساب اینترنتی ماندرایک شما با موفقیت پیکربندی شده است\n"
-
-#: ../mdkupdate:50
+#: ../mdkupdate:52
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
@@ -613,43 +564,38 @@ msgstr ""
 "\n"
 "طرز استفاده:\n"
 
-#: ../mdkupdate:55
+#: ../mdkupdate:57
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - چاپ این پیام راهنما.\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:58
 #, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto         - Mandrakeupdate بطور خودکار اجرا شد.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:59
 #, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - اجرای Mandrakeupdate.\n"
 
-#: ../mdkupdate:58
-#, c-format
-msgid "  --update       - Update keys\n"
-msgstr "  --update       - بروزسازی کلیدها.\n"
-
-#: ../mdkupdate:66
+#: ../mdkupdate:67
 #, c-format
 msgid "No %s file found. Run mdkonline wizard first"
 msgstr "هیچ پرونده %s یافت نگردید. جادوگر mdkonline را نخست اجرا کنید"
 
-#: ../mdkupdate:124
+#: ../mdkupdate:126
 #, c-format
 msgid "Mandrakeupdate could not contact the site, we will try again."
 msgstr ""
 "Mandrakeupdate نتوانست با وبگاه تماس بگیرد،  بعداً دوباره امتحانمی کنم.د"
 
-#: ../mdkupdate:173
+#: ../mdkupdate:176
 #, c-format
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr "قادر نبودن به بروزسازی بسته‌ها از رسانه‌ی mdkupdate.\n"
 
-#: ../mdkupdate:195
+#: ../mdkupdate:198
 #, c-format
 msgid ""
 "Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
@@ -657,3 +603,49 @@ msgid ""
 msgstr ""
 "Mandrakeupdate نتوانست پروندههای diff را باردهی کند. پستی به  support [at] "
 "mandrakeonline [dot] net ارسال کنید"
+
+#~ msgid "Next"
+#~ msgstr "بعدی"
+
+#~ msgid "Cancel"
+#~ msgstr "لغو"
+
+#~ msgid "Previous"
+#~ msgstr "پیشین"
+
+#~ msgid "I don't have a Mandrakeonline account and I want to subscribe"
+#~ msgstr "حساب اینترنتی ماندرایک ندارم و میخواهم مشترک شوم"
+
+#~ msgid "Mandrakelinux Privacy Policy"
+#~ msgstr "رویه‌ی خصوصیت ماندرایک"
+
+#~ msgid "Authentification"
+#~ msgstr "تأیید هویت"
+
+#~ msgid "Send Configuration"
+#~ msgstr "فرستادن پیکربندی"
+
+#~ msgid "Finish"
+#~ msgstr "پایان"
+
+#~ msgid "automated Upgrades"
+#~ msgstr "ارتقاهای خودکار"
+
+#~ msgid "Country:"
+#~ msgstr "کشور:"
+
+#~ msgid "Error"
+#~ msgstr "خطا"
+
+#~ msgid "Quitting Wizard\n"
+#~ msgstr "ترک جادوگر\n"
+
+#~ msgid ""
+#~ "Mandrakeonline could not be contacted, please try again at a later time"
+#~ msgstr "نتوانست با Mandrakeonline تماس گرفت، لطفاً بعداً دوباره امتحان کنید"
+
+#~ msgid "Wrong password"
+#~ msgstr "گذرواژه‌ی اشتباه"
+
+#~ msgid "  --update       - Update keys\n"
+#~ msgstr "  --update       - بروزسازی کلیدها.\n"
diff --git a/po/fi.po b/po/fi.po
index 8a303d2e..51ee4295 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-fi - MDK 10.1 Release\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-01 22:41+0200\n"
+"POT-Creation-Date: 2004-11-03 12:10+0100\n"
 "PO-Revision-Date: 2004-10-01 20:53+0300\n"
 "Last-Translator: Thomas Backlund <tmb@mandrake.org>\n"
 "Language-Team: Finnish <cooker-i18n@mandrakelinux.com>\n"
@@ -20,12 +20,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3\n"
 
-#: ../mdkapplet:61
+#: ../mdkapplet:63
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Järjestelmäsi on ajan tasalla"
 
-#: ../mdkapplet:67
+#: ../mdkapplet:69
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -34,188 +34,198 @@ msgstr ""
 "Palvelun asetusongelma. Tarkista lokista ja lähetä viesti osoitteeseen: "
 "support@mandrakeonline.net"
 
-#: ../mdkapplet:73
+#: ../mdkapplet:75
 #, c-format
 msgid "System is busy. Please wait ..."
 msgstr "Järjestelmä on varattu. Odota ..."
 
-#: ../mdkapplet:79
+#: ../mdkapplet:81
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Päivityksiä järjestelmällesi on saatavilla"
 
-#: ../mdkapplet:85
+#: ../mdkapplet:87
 #, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr "Palvelu ei ole asetettu. Paina \"Aseta palvelu\""
 
-#: ../mdkapplet:91
+#: ../mdkapplet:93
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Verkko on alhaalla. Ole hyvä ja aseta verkkosi"
 
-#: ../mdkapplet:97
+#: ../mdkapplet:99
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Palvelu ei ole otettu käyttöön. Paina \"Online Webbisivusto\""
 
-#: ../mdkapplet:103
+#: ../mdkapplet:105
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "Jakelu ei tuettu (liian vanha jakelu, tai kehitysjakelu)"
 
-#: ../mdkapplet:108 ../mdkapplet:158
+#: ../mdkapplet:110 ../mdkapplet:164
 #, c-format
 msgid "Install updates"
 msgstr "Asenna päivitykset"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:111
 #, c-format
 msgid "Configure the service"
 msgstr "Aseta palvelu"
 
-#: ../mdkapplet:110
+#: ../mdkapplet:112
 #, c-format
 msgid "Check Updates"
 msgstr "Tarkista päivitykset"
 
-#: ../mdkapplet:111
+#: ../mdkapplet:113 ../mdkapplet:167 ../mdkapplet:225
+#, fuzzy, c-format
+msgid "Please Wait"
+msgstr "Odota hetki"
+
+#: ../mdkapplet:113 ../mdkapplet:166 ../mdkapplet:167 ../mdkapplet:225
+#, c-format
+msgid "Check updates"
+msgstr "Tarkista päivitykset"
+
+#: ../mdkapplet:115
 #, c-format
 msgid "Online WebSite"
 msgstr "Online-sivusto"
 
-#: ../mdkapplet:112
+#: ../mdkapplet:116
 #, c-format
 msgid "Configure Network"
 msgstr "Aseta verkko"
 
-#: ../mdkapplet:113
+#: ../mdkapplet:117
 #, c-format
 msgid "Configure Now!"
 msgstr "Aseta Nyt!"
 
-#: ../mdkapplet:146
+#: ../mdkapplet:152 ../mdkapplet:229
 #, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Mandraken päivityssovelma"
 
-#: ../mdkapplet:156
+#: ../mdkapplet:162
 #, c-format
 msgid "Actions"
 msgstr "Toiminnot"
 
-#: ../mdkapplet:159
+#: ../mdkapplet:165
 #, c-format
 msgid "Configure"
 msgstr "Aseta"
 
-#: ../mdkapplet:160
-#, c-format
-msgid "Check updates"
-msgstr "Tarkista päivitykset"
-
-#: ../mdkapplet:161
+#: ../mdkapplet:169
 #, c-format
 msgid "See logs"
 msgstr "Katso lokitiedostot"
 
-#: ../mdkapplet:164
+#: ../mdkapplet:172
 #, c-format
 msgid "Status"
 msgstr "Tila"
 
-#: ../mdkapplet:168 ../mdkapplet:363
+#: ../mdkapplet:176 ../mdkapplet:375
 #, c-format
 msgid "Close"
 msgstr "Sulje"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Network Connection: "
 msgstr "Verkkoyhteys:"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Up"
 msgstr "päällä"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Down"
 msgstr "pois päältä"
 
-#: ../mdkapplet:204
+#: ../mdkapplet:212
 #, c-format
 msgid "Last check: "
 msgstr "Viimeisin tarkistus:"
 
-#: ../mdkapplet:205
+#: ../mdkapplet:213
 #, c-format
 msgid "Updates: "
 msgstr "Päivitykset:"
 
-#: ../mdkapplet:209
+#: ../mdkapplet:217
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Käynnistetään drakconnect\n"
 
-#: ../mdkapplet:213
+#: ../mdkapplet:221
 #, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "käynnistetään mdkupdate --applet\n"
 
-#: ../mdkapplet:217
+#: ../mdkapplet:224
 #, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 "Mandrakeonline on asennettu uudelleen, käynnistetäänsovelma uudestan ..."
 
-#: ../mdkapplet:225
+#: ../mdkapplet:235
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Lasketaan  uudet päivitykset...\n"
 
-#: ../mdkapplet:227
+#: ../mdkapplet:237
 #, c-format
 msgid "Connecting to"
 msgstr "Yhdistetään kohteeseen"
 
-#: ../mdkapplet:250
+#: ../mdkapplet:244
+#, c-format
+msgid "Response from Mandrakeonline server\n"
+msgstr "Vastaus Mandrakeonline palvelimelta\n"
+
+#: ../mdkapplet:262
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Tarkistetaan... Päivityksiä on saatavilla\n"
 
-#: ../mdkapplet:254
+#: ../mdkapplet:267
 #, c-format
 msgid "Development release not supported by service"
 msgstr "Kehitysjakelu ei ole tuettu tässä palvelussa"
 
-#: ../mdkapplet:255
+#: ../mdkapplet:268
 #, c-format
 msgid "Too old release not supported by service"
 msgstr "Liian vanha jakelu ei ole tuettu tässä palvelussa"
 
-#: ../mdkapplet:256
+#: ../mdkapplet:269
 #, c-format
 msgid "Unknown state"
 msgstr "Tuntematon tila"
 
-#: ../mdkapplet:257
+#: ../mdkapplet:270
 #, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr "Online palvelut pois käytöstä. Ota yhteys Mandrakeonline sivustoon\n"
 
-#: ../mdkapplet:258
+#: ../mdkapplet:271
 #, c-format
 msgid "Wrong Password.\n"
 msgstr "Väärä salasana\n"
 
-#: ../mdkapplet:259
+#: ../mdkapplet:272
 #, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr "Väärä tili, kone tai kirjautuminen.\n"
 
-#: ../mdkapplet:260
+#: ../mdkapplet:273
 #, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
@@ -224,72 +234,82 @@ msgstr ""
 "Jotain on vialla verkkoasetuksissasi (tarkista reittim palomuuri tai "
 "välityspalvelinten asetukset)\n"
 
-#: ../mdkapplet:264
+#: ../mdkapplet:277
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Järjestelmäsi on ajan tasalla\n"
 
-#: ../mdkapplet:303
+#: ../mdkapplet:317
 #, c-format
 msgid "No check"
 msgstr "Ei tarkistusta"
 
-#: ../mdkapplet:316
+#: ../mdkapplet:330
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Tarkistetaan verkko: Näyttää poistettu käytöstä\n"
 
-#: ../mdkapplet:319
+#: ../mdkapplet:333
 #, c-format
 msgid "Checking config file: Not present\n"
 msgstr "Tarkistetaan asetustiedostoa: Ei olemassa\n"
 
-#: ../mdkapplet:353
+#: ../mdkapplet:365
 #, c-format
 msgid "Logs"
 msgstr "Lokit"
 
-#: ../mdkapplet:369
+#: ../mdkapplet:381
 #, c-format
 msgid "Clear"
 msgstr "Tyhjennä"
 
-#: ../mdkapplet:396
+#: ../mdkapplet:408
 #, c-format
 msgid "About..."
 msgstr "Tietoa.."
 
-#: ../mdkapplet:397
+#: ../mdkapplet:409
 #, c-format
 msgid "Always launch on startup"
 msgstr "Käynnistä ainä käynnistyksen yhteydessä"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:411
 #, c-format
 msgid "Quit"
 msgstr "Poistu"
 
-#: ../mdkonline:89
+#: ../mdkonline:52 ../mdkonline:106
 #, c-format
-msgid "Next"
-msgstr "Seuraava"
+msgid "Mandrakeonline"
+msgstr "Mandrakeonline"
 
-#: ../mdkonline:89
+#: ../mdkonline:55
+#, c-format
+msgid "I already have an account"
+msgstr "Minulla on jo tili"
+
+#: ../mdkonline:56
+#, c-format
+msgid "I want to subscribe"
+msgstr "Haluan rekisteröityä"
+
+#: ../mdkonline:89 ../mdkonline:93 ../mdkonline:131
 #, c-format
-msgid "Cancel"
-msgstr "Peruuta"
+msgid "Please wait"
+msgstr "Odota hetki"
 
 #: ../mdkonline:89
 #, c-format
-msgid "Previous"
-msgstr "Edellinen"
+msgid "Reading configuration\n"
+msgstr "Luetaan asetukset\n"
 
-#: ../mdkonline:103
+#: ../mdkonline:93
 #, c-format
-msgid "Welcome to Mandrakeonline"
-msgstr "Tervetuloa Mandrakeonlineen"
+msgid "Sending configuration..."
+msgstr "Lähetän asetustiedot..."
 
-#: ../mdkonline:104 ../mdkonline_tui:98
+#: ../mdkonline:109
 #, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
@@ -301,62 +321,37 @@ msgstr ""
 "sinut voitaisiin pitää ajan tasalla turvapäivityksistä ja hyödyllisistä\n"
 "päivityksistä.\n"
 
-#: ../mdkonline:105 ../mdkonline_tui:142
+#: ../mdkonline:114
 #, c-format
-msgid "Create a Mandrakeonline Account"
-msgstr "Luo Mandrakeonline-tunnus"
+msgid "Account creation or authentication"
+msgstr "Tilin luonti tai kirjautuminen"
 
-#: ../mdkonline:107
+#: ../mdkonline:119
 #, c-format
-msgid "I don't have a Mandrakeonline account and I want to subscribe"
-msgstr "Minulla ei ole Mandrakeonline-tiliä ja haluan tilaa sitä"
+msgid "Enter your Mandrakeonline login, password and machine name:"
+msgstr "Syötä Mandrakeonline-käyttäjätunnuksesi, salasanasi sekä koneesi nimi:"
 
-#: ../mdkonline:111 ../mdkonline:131 ../mdkonline_tui:114 ../mdkonline_tui:145
+#: ../mdkonline:125 ../mdkonline:156
 #, c-format
 msgid "Login:"
 msgstr "Tunnus:"
 
-#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:115 ../mdkonline_tui:146
+#: ../mdkonline:126 ../mdkonline:157
 #, c-format
 msgid "Password:"
 msgstr "Salasana:"
 
-#: ../mdkonline:113 ../mdkonline_tui:147
-#, c-format
-msgid "Confirm Password:"
-msgstr "Varmista salasana:"
-
-#: ../mdkonline:114 ../mdkonline_tui:148
-#, c-format
-msgid "Mail contact:"
-msgstr "Sähköpostiosoitteesi:"
-
-#: ../mdkonline:121
-#, c-format
-msgid "Mandrakelinux Privacy Policy"
-msgstr "Mandrakelinuxin yksityisyyspolitiikka"
-
 #: ../mdkonline:127
 #, c-format
-msgid "Authentification"
-msgstr "Vahvistetaan"
-
-#: ../mdkonline:128 ../mdkonline_tui:108
-#, c-format
-msgid "Enter your Mandrakeonline login, password and machine name:"
-msgstr "Syötä Mandrakeonline-käyttäjätunnuksesi, salasanasi sekä koneesi nimi:"
-
-#: ../mdkonline:133 ../mdkonline_tui:116
-#, c-format
 msgid "Machine name:"
 msgstr "Koneen nimi:"
 
-#: ../mdkonline:138
+#: ../mdkonline:131
 #, c-format
-msgid "Send Configuration"
-msgstr "Lähetä Asetukset"
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Yhdistetään Mandrakeonline webbisivustoon..."
 
-#: ../mdkonline:139 ../mdkonline_tui:128
+#: ../mdkonline:139
 #, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
@@ -388,56 +383,55 @@ msgstr ""
 "Sen lisäksi hyödyt alennuksista www.mandrakeexpert.com:in\n"
 "maksullisissa tukipalveluissa."
 
-#: ../mdkonline:144 ../mdkonline:211 ../mdkonline:234
+#: ../mdkonline:141 ../mdkonline:180 ../mdkupdate:126 ../mdkupdate:198
 #, c-format
-msgid "Finish"
-msgstr "Valmis"
+msgid "Connection problem"
+msgstr "Yhteysongelma"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid "Your upload was successful!"
-msgstr "Tietojen siirto onnistui!"
+msgid "or"
+msgstr "tai"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandrakeonline."
-msgstr ""
-"Tästä lähtien saat turva- ja päivitysilmoitukset\n"
-"suoraan Mandrakeonlinesta."
+msgid "wrong password:"
+msgstr "väärä salasana:"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
 msgid ""
-"Mandrakeonline offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+"Your login or password was wrong.\n"
+" Either you'll have to type it again, or you'll need to create an account on "
+"Mandrakeonline.\n"
+" In the latter case, go back to the first step to connect to "
+"Mandrakeonline.\n"
+" Be aware that you must also provide a Machine name \n"
+" (only alphabetical characters are admitted)"
 msgstr ""
-"Mandrakeonline mahdollistaa päivitysten automatisoinnin.\n"
-"Ohjelma käynnistyy säännöllisesti järjestelmässäsi odottamaan uusia "
-"päivityksiä\n"
-
-#: ../mdkonline:146
-#, c-format
-msgid "automated Upgrades"
-msgstr "automaattiset päivitykset"
+"Käyttäjätunnuksesi tai salasanasi oli väärä.\n"
+" Sinun pitää joko kirjoittaa se uudelleen tai luoda tunnus "
+"Mandrakeonlineen.\n"
+" Jälkimmäisessä tapauksessa mene takaisin ensimmäiseen vaiheeseen ottaaksesi "
+"yhteyden Mandrakeonlineen.\n"
+" Tiedoksi: sinun pitää antaa myös koneen nimi (vain kirjaimet hyväksytään)"
 
-#: ../mdkonline:150
+#: ../mdkonline:153
 #, c-format
-msgid "Country:"
-msgstr "Maa:"
+msgid "Create a Mandrakeonline Account"
+msgstr "Luo Mandrakeonline-tunnus"
 
-#: ../mdkonline:178 ../mdkonline:183 ../mdkonline:185 ../mdkonline:187
+#: ../mdkonline:158
 #, c-format
-msgid "Error"
-msgstr "Virhe"
+msgid "Confirm Password:"
+msgstr "Varmista salasana:"
 
-#: ../mdkonline:183 ../mdkonline_tui:152
+#: ../mdkonline:159
 #, c-format
-msgid "Please provide a login"
-msgstr "Anna tunnuksesi"
+msgid "Mail contact:"
+msgstr "Sähköpostiosoitteesi:"
 
-#: ../mdkonline:185 ../mdkonline_tui:152
+#: ../mdkonline:163
 #, c-format
 msgid ""
 "The passwords do not match\n"
@@ -446,161 +440,118 @@ msgstr ""
 "Salasanat eivät kelpaa\n"
 "Yritä uudestaan\n"
 
-#: ../mdkonline:187 ../mdkonline_tui:152
+#: ../mdkonline:163
+#, c-format
+msgid "Please provide a login"
+msgstr "Anna tunnuksesi"
+
+#: ../mdkonline:163
 #, c-format
 msgid "Not a valid mail address!\n"
 msgstr "Sähköpostiosoite ei kelpaa!\n"
 
-#: ../mdkonline:199 ../mdkonline_tui:78
+#: ../mdkonline:169
 #, c-format
-msgid "Reading configuration\n"
-msgstr "Luetaan asetukset\n"
+msgid ""
+"Mandrakeonline Account successfully created.\n"
+"Please click \"Next\" to authenticate and upload your configuration\n"
+msgstr ""
+"Mandrakeonline tili luotiin onnistuneesti.\n"
+"Paina \"Seuraava\" kirjautuaaksesi ja lähettääksesi laitteistotietojasi\n"
 
-#: ../mdkonline:204 ../mdkonline_tui:82
+#: ../mdkonline:178
 #, c-format
-msgid "Sending configuration..."
-msgstr "Lähetän asetustiedot..."
+msgid "Your upload was successful!"
+msgstr "Tietojen siirto onnistui!"
 
-#: ../mdkonline:213 ../mdkonline:273 ../mdkonline_tui:130 ../mdkonline_tui:169
-#: ../mdkupdate:124 ../mdkupdate:195
+#: ../mdkonline:178
 #, c-format
-msgid "Connection problem"
-msgstr "Yhteysongelma"
+msgid ""
+"From now you will receive on security and updates \n"
+"announcements thanks to Mandrakeonline."
+msgstr ""
+"Tästä lähtien saat turva- ja päivitysilmoitukset\n"
+"suoraan Mandrakeonlinesta."
+
+#: ../mdkonline:178
+#, c-format
+msgid ""
+"Mandrakeonline offers you the ability to automate the updates.\n"
+"A program will run regulary in your system waiting for new updates\n"
+msgstr ""
+"Mandrakeonline mahdollistaa päivitysten automatisoinnin.\n"
+"Ohjelma käynnistyy säännöllisesti järjestelmässäsi odottamaan uusia "
+"päivityksiä\n"
 
-#: ../mdkonline:213 ../mdkonline_tui:169
+#: ../mdkonline:180
 #, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr "Virheitä tietdostojen lähettämisessä, ole hyvä ja yritä uudelleen"
 
-#: ../mdkonline:251
+#: ../mdkonline:186
 #, c-format
-msgid "Quitting Wizard\n"
-msgstr "Poistutaan velhosta\n"
+msgid "Country"
+msgstr "Maa"
 
-#: ../mdkonline:273
+#: ../mdkonline:198
 #, c-format
-msgid "Mandrakeonline could not be contacted, please try again at a later time"
-msgstr "Ei saatu yhteyttä Mandrakeonlineen kokeile myöhemmin uudelleen."
+msgid "Congratulations"
+msgstr "Onnittelut"
 
-#: ../mdkonline:285
+#: ../mdkonline:198
 #, c-format
-msgid "Wrong password"
-msgstr "Väärä salasana"
+msgid "Your Mandrakeonline account has been successfully configured\n"
+msgstr "Mandrakeonline tilisi on asetettu onnistuneesti.\n"
+
+#: ../mdkonline:214
+#, fuzzy, c-format
+msgid "Configuration uploaded successfully"
+msgstr "Tietojen siirto onnistui!"
 
-#: ../mdkonline:285 ../mdkonline_tui:130
+#: ../mdkonline:215
+#, fuzzy, c-format
+msgid "Problem uploading configuration"
+msgstr "Luetaan asetukset\n"
+
+#: ../mdkonline:216
 #, c-format
 msgid ""
-"Your login or password was wrong.\n"
-" Either you'll have to type it again, or you'll need to create an account on "
-"Mandrakeonline.\n"
-" In the latter case, go back to the first step to connect to "
-"Mandrakeonline.\n"
-" Be aware that you must also provide a Machine name \n"
-" (only alphabetical characters are admitted)"
+"Cannot connect to mandrakeonline website: wrong login/password or router/"
+"firewall bad settings"
 msgstr ""
-"Käyttäjätunnuksesi tai salasanasi oli väärä.\n"
-" Sinun pitää joko kirjoittaa se uudelleen tai luoda tunnus "
-"Mandrakeonlineen.\n"
-" Jälkimmäisessä tapauksessa mene takaisin ensimmäiseen vaiheeseen ottaaksesi "
-"yhteyden Mandrakeonlineen.\n"
-" Tiedoksi: sinun pitää antaa myös koneen nimi (vain kirjaimet hyväksytään)"
 
-#: ../mdkonline.pm:58
+#: ../mdkonline.pm:66
 #, c-format
 msgid "Login and password should be less than 12 characters\n"
 msgstr ""
 "Tunnuksen ja salasanan pituuden pitäisi olla vähemmän kuin 12 merkkiä\n"
 
-#: ../mdkonline.pm:59
+#: ../mdkonline.pm:67
 #, c-format
 msgid "Special characters are not allowed\n"
 msgstr "Erikoismerkit eivät ole sallittuja\n"
 
-#: ../mdkonline.pm:60
+#: ../mdkonline.pm:68
 #, c-format
 msgid "Please fill in all fields\n"
 msgstr "Täytä kaikkiin kenttiin\n"
 
-#: ../mdkonline.pm:61
+#: ../mdkonline.pm:69
 #, c-format
 msgid "Email not valid\n"
 msgstr "Sähköpostiosoite ei kelpaa\n"
 
-#: ../mdkonline.pm:62
+#: ../mdkonline.pm:70
 #, c-format
 msgid "Account already exist\n"
 msgstr "Tunnus on jo olemassa\n"
 
-#: ../mdkonline.pm:68
+#: ../mdkonline.pm:76
 #, c-format
 msgid "Problem connecting to server \n"
 msgstr "Ongelmia yhdistettäessä palvelimeen\n"
 
-#: ../mdkonline_tui:45 ../mdkonline_tui:95
-#, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
-
-#: ../mdkonline_tui:48
-#, c-format
-msgid "I already have an account"
-msgstr "Minulla on jo tili"
-
-#: ../mdkonline_tui:49
-#, c-format
-msgid "I want to subscribe"
-msgstr "Haluan rekisteröityä"
-
-#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:120
-#, c-format
-msgid "Please wait"
-msgstr "Odota hetki"
-
-#: ../mdkonline_tui:103
-#, c-format
-msgid "Account creation or authentication"
-msgstr "Tilin luonti tai kirjautuminen"
-
-#: ../mdkonline_tui:120
-#, c-format
-msgid "Connecting to Mandrakeonline website..."
-msgstr "Yhdistetään Mandrakeonline webbisivustoon..."
-
-#: ../mdkonline_tui:130
-#, c-format
-msgid "or"
-msgstr "tai"
-
-#: ../mdkonline_tui:130
-#, c-format
-msgid "wrong password:"
-msgstr "väärä salasana:"
-
-#: ../mdkonline_tui:158
-#, c-format
-msgid ""
-"Mandrakeonline Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-"Mandrakeonline tili luotiin onnistuneesti.\n"
-"Paina \"Seuraava\" kirjautuaaksesi ja lähettääksesi laitteistotietojasi\n"
-
-#: ../mdkonline_tui:175
-#, c-format
-msgid "Country"
-msgstr "Maa"
-
-#: ../mdkonline_tui:187
-#, c-format
-msgid "Congratulations"
-msgstr "Onnittelut"
-
-#: ../mdkonline_tui:187
-#, c-format
-msgid "Your Mandrakeonline account has been successfully configured\n"
-msgstr "Mandrakeonline tilisi on asetettu onnistuneesti.\n"
-
-#: ../mdkupdate:50
+#: ../mdkupdate:52
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
@@ -617,42 +568,37 @@ msgstr ""
 "\n"
 "Käyttö:\n"
 
-#: ../mdkupdate:55
+#: ../mdkupdate:57
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - tulosta tämä apuviesti.\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:58
 #, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto         - Mandrakeupdate käynistetään automaattisesti.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:59
 #, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - käynnistä Mandrakeupdate.\n"
 
-#: ../mdkupdate:58
-#, c-format
-msgid "  --update       - Update keys\n"
-msgstr "  --update       - Päivitä avaimet\n"
-
-#: ../mdkupdate:66
+#: ../mdkupdate:67
 #, c-format
 msgid "No %s file found. Run mdkonline wizard first"
 msgstr "%s tiedosto ei löydetty. Suorita mdkonline velho ensin"
 
-#: ../mdkupdate:124
+#: ../mdkupdate:126
 #, c-format
 msgid "Mandrakeupdate could not contact the site, we will try again."
 msgstr "Mandrakeupdate ei saanut yhteyttä sivustoon, kokeilemme uudelleen."
 
-#: ../mdkupdate:173
+#: ../mdkupdate:176
 #, c-format
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr "Ei pystytty päivittämään paketteja mdkupdate-lähteestä.\n"
 
-#: ../mdkupdate:195
+#: ../mdkupdate:198
 #, c-format
 msgid ""
 "Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
@@ -661,6 +607,55 @@ msgstr ""
 "Mandrakeupdate ei voinut lähettää diff tiedostoja. Lähetä viesti osoitteen: "
 "upport [at] mandrakeonline [piste] net"
 
+#~ msgid "Next"
+#~ msgstr "Seuraava"
+
+#~ msgid "Cancel"
+#~ msgstr "Peruuta"
+
+#~ msgid "Previous"
+#~ msgstr "Edellinen"
+
+#~ msgid "Welcome to Mandrakeonline"
+#~ msgstr "Tervetuloa Mandrakeonlineen"
+
+#~ msgid "I don't have a Mandrakeonline account and I want to subscribe"
+#~ msgstr "Minulla ei ole Mandrakeonline-tiliä ja haluan tilaa sitä"
+
+#~ msgid "Mandrakelinux Privacy Policy"
+#~ msgstr "Mandrakelinuxin yksityisyyspolitiikka"
+
+#~ msgid "Authentification"
+#~ msgstr "Vahvistetaan"
+
+#~ msgid "Send Configuration"
+#~ msgstr "Lähetä Asetukset"
+
+#~ msgid "Finish"
+#~ msgstr "Valmis"
+
+#~ msgid "automated Upgrades"
+#~ msgstr "automaattiset päivitykset"
+
+#~ msgid "Country:"
+#~ msgstr "Maa:"
+
+#~ msgid "Error"
+#~ msgstr "Virhe"
+
+#~ msgid "Quitting Wizard\n"
+#~ msgstr "Poistutaan velhosta\n"
+
+#~ msgid ""
+#~ "Mandrakeonline could not be contacted, please try again at a later time"
+#~ msgstr "Ei saatu yhteyttä Mandrakeonlineen kokeile myöhemmin uudelleen."
+
+#~ msgid "Wrong password"
+#~ msgstr "Väärä salasana"
+
+#~ msgid "  --update       - Update keys\n"
+#~ msgstr "  --update       - Päivitä avaimet\n"
+
 #~ msgid "Skip Wizard"
 #~ msgstr "Ohita velho"
 
@@ -709,9 +704,6 @@ msgstr ""
 #~ msgid "Server Problem"
 #~ msgstr "Palvelinongelma"
 
-#~ msgid "Response from Mandrakeonline server\n"
-#~ msgstr "Vastaus Mandrakeonline palvelimelta\n"
-
 #~ msgid "Launching Mandrakeupdate\n"
 #~ msgstr "Käynnistä MandrakePäivitys\n"
 
diff --git a/po/fr.po b/po/fr.po
index 0970002f..af0d2ced 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-01 22:41+0200\n"
+"POT-Creation-Date: 2004-11-03 12:10+0100\n"
 "PO-Revision-Date: 2004-10-03 21:11+0200\n"
 "Last-Translator: Lecureuil Nicolas <n1c0l4s.l3@wanadoo.fr>\n"
 "Language-Team: francais <fr@li.org>\n"
@@ -23,12 +23,12 @@ msgstr ""
 "X-Generator: KBabel 1.3.1\n"
 "Plural-Forms:  nplurals=2; plural=(n > 1);\n"
 
-#: ../mdkapplet:61
+#: ../mdkapplet:63
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Votre système est à jour"
 
-#: ../mdkapplet:67
+#: ../mdkapplet:69
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -38,191 +38,201 @@ msgstr ""
 "envoyez les à: \n"
 "support@mandrakeonline.net"
 
-#: ../mdkapplet:73
+#: ../mdkapplet:75
 #, c-format
 msgid "System is busy. Please wait ..."
 msgstr "Le système est occupé. Veuillez patienter ..."
 
-#: ../mdkapplet:79
+#: ../mdkapplet:81
 #, c-format
 msgid "New updates are available for your system"
 msgstr "De nouvelles mise à jour sont disponible pour votre système"
 
-#: ../mdkapplet:85
+#: ../mdkapplet:87
 #, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr "Service non configuré. Cliquez sur « configuration »"
 
-#: ../mdkapplet:91
+#: ../mdkapplet:93
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Le réseau n'est pas disponible. Vérifiez la configuration du réseau"
 
-#: ../mdkapplet:97
+#: ../mdkapplet:99
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Service non activé. Cliquez sur « Site Mandrakeonline »"
 
-#: ../mdkapplet:103
+#: ../mdkapplet:105
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 "Cette version de Mandrakelinux n'est pas supportée (obsolete ou en "
 "développement)"
 
-#: ../mdkapplet:108 ../mdkapplet:158
+#: ../mdkapplet:110 ../mdkapplet:164
 #, c-format
 msgid "Install updates"
 msgstr "Installer les mises à jour"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:111
 #, c-format
 msgid "Configure the service"
 msgstr "Configurer le service"
 
-#: ../mdkapplet:110
+#: ../mdkapplet:112
 #, c-format
 msgid "Check Updates"
 msgstr "Vérifier la disponibilité de mises à jour"
 
-#: ../mdkapplet:111
+#: ../mdkapplet:113 ../mdkapplet:167 ../mdkapplet:225
+#, fuzzy, c-format
+msgid "Please Wait"
+msgstr "Veuillez patienter"
+
+#: ../mdkapplet:113 ../mdkapplet:166 ../mdkapplet:167 ../mdkapplet:225
+#, c-format
+msgid "Check updates"
+msgstr "Vérifier la disponibilité de mises à jour"
+
+#: ../mdkapplet:115
 #, c-format
 msgid "Online WebSite"
 msgstr "Site Mandrakeonline"
 
-#: ../mdkapplet:112
+#: ../mdkapplet:116
 #, c-format
 msgid "Configure Network"
 msgstr "Configurer le réseau"
 
-#: ../mdkapplet:113
+#: ../mdkapplet:117
 #, c-format
 msgid "Configure Now!"
 msgstr "Configurer maintenant!"
 
-#: ../mdkapplet:146
+#: ../mdkapplet:152 ../mdkapplet:229
 #, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Appliquette des mises à jour Mandrakelinux"
 
-#: ../mdkapplet:156
+#: ../mdkapplet:162
 #, c-format
 msgid "Actions"
 msgstr "Actions"
 
-#: ../mdkapplet:159
+#: ../mdkapplet:165
 #, c-format
 msgid "Configure"
 msgstr "Configurer"
 
-#: ../mdkapplet:160
-#, c-format
-msgid "Check updates"
-msgstr "Vérifier la disponibilité de mises à jour"
-
-#: ../mdkapplet:161
+#: ../mdkapplet:169
 #, c-format
 msgid "See logs"
 msgstr "Voir les journaux"
 
-#: ../mdkapplet:164
+#: ../mdkapplet:172
 #, c-format
 msgid "Status"
 msgstr "Statut"
 
-#: ../mdkapplet:168 ../mdkapplet:363
+#: ../mdkapplet:176 ../mdkapplet:375
 #, c-format
 msgid "Close"
 msgstr "Fermer"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Network Connection: "
 msgstr "Connection réseau : "
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Up"
 msgstr "Activé"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Down"
 msgstr "Arrêté"
 
-#: ../mdkapplet:204
+#: ../mdkapplet:212
 #, c-format
 msgid "Last check: "
 msgstr "Dernière vérification : "
 
-#: ../mdkapplet:205
+#: ../mdkapplet:213
 #, c-format
 msgid "Updates: "
 msgstr "Mises à jour : "
 
-#: ../mdkapplet:209
+#: ../mdkapplet:217
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Lancement de drakconnect\n"
 
-#: ../mdkapplet:213
+#: ../mdkapplet:221
 #, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "Lancement de mdkupdate --applet\n"
 
-#: ../mdkapplet:217
+#: ../mdkapplet:224
 #, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 "Mandrakeonline semble avoir été réinstallé, rechargement de l'appliquette ..."
 
-#: ../mdkapplet:225
+#: ../mdkapplet:235
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Calcul des nouvelles mises à jour...\n"
 
-#: ../mdkapplet:227
+#: ../mdkapplet:237
 #, c-format
 msgid "Connecting to"
 msgstr "Connection à"
 
-#: ../mdkapplet:250
+#: ../mdkapplet:244
+#, fuzzy, c-format
+msgid "Response from Mandrakeonline server\n"
+msgstr "Bienvenue à Mandrakeonline"
+
+#: ../mdkapplet:262
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Verification... Des mises à jours sont disponible\n"
 
-#: ../mdkapplet:254
+#: ../mdkapplet:267
 #, c-format
 msgid "Development release not supported by service"
 msgstr "Version de développement non supportée par le service"
 
-#: ../mdkapplet:255
+#: ../mdkapplet:268
 #, c-format
 msgid "Too old release not supported by service"
 msgstr "Version de Mandrakelinux obsoléte, non supportée par le service"
 
-#: ../mdkapplet:256
+#: ../mdkapplet:269
 #, c-format
 msgid "Unknown state"
 msgstr "Etat inconnu"
 
-#: ../mdkapplet:257
+#: ../mdkapplet:270
 #, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr ""
 "Service en-ligne désactivé. Veuillez contacter le site Mandrakeonline\n"
 
-#: ../mdkapplet:258
+#: ../mdkapplet:271
 #, c-format
 msgid "Wrong Password.\n"
 msgstr "Mot de passe incorrect.\n"
 
-#: ../mdkapplet:259
+#: ../mdkapplet:272
 #, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr "Mauvaise action, hôte ou identifiant\n"
 
-#: ../mdkapplet:260
+#: ../mdkapplet:273
 #, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
@@ -232,72 +242,82 @@ msgstr ""
 "table de routage, votre pare-feu or les paramètres de votre serveur "
 "mandataire)\n"
 
-#: ../mdkapplet:264
+#: ../mdkapplet:277
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Le système est à jour\n"
 
-#: ../mdkapplet:303
+#: ../mdkapplet:317
 #, c-format
 msgid "No check"
 msgstr "Pas de vérification"
 
-#: ../mdkapplet:316
+#: ../mdkapplet:330
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Vérification de l'accès au réseau : il semble être désactivé\n"
 
-#: ../mdkapplet:319
+#: ../mdkapplet:333
 #, c-format
 msgid "Checking config file: Not present\n"
 msgstr "Vérification du fichier de configuration : Absent\n"
 
-#: ../mdkapplet:353
+#: ../mdkapplet:365
 #, c-format
 msgid "Logs"
 msgstr "Journaux"
 
-#: ../mdkapplet:369
+#: ../mdkapplet:381
 #, c-format
 msgid "Clear"
 msgstr "Effacer"
 
-#: ../mdkapplet:396
+#: ../mdkapplet:408
 #, c-format
 msgid "About..."
 msgstr "À propos..."
 
-#: ../mdkapplet:397
+#: ../mdkapplet:409
 #, c-format
 msgid "Always launch on startup"
 msgstr "Toujours lancer au démarage"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:411
 #, c-format
 msgid "Quit"
 msgstr "Quitter"
 
-#: ../mdkonline:89
+#: ../mdkonline:52 ../mdkonline:106
 #, c-format
-msgid "Next"
-msgstr "Suivant"
+msgid "Mandrakeonline"
+msgstr "Mandrakeonline"
 
-#: ../mdkonline:89
+#: ../mdkonline:55
 #, c-format
-msgid "Cancel"
-msgstr "Annuler"
+msgid "I already have an account"
+msgstr "J'ai dèja un compte"
+
+#: ../mdkonline:56
+#, c-format
+msgid "I want to subscribe"
+msgstr "Je veux m'inscrire"
+
+#: ../mdkonline:89 ../mdkonline:93 ../mdkonline:131
+#, c-format
+msgid "Please wait"
+msgstr "Veuillez patienter"
 
 #: ../mdkonline:89
 #, c-format
-msgid "Previous"
-msgstr "Précédent"
+msgid "Reading configuration\n"
+msgstr "Lecture de la configuration\n"
 
-#: ../mdkonline:103
+#: ../mdkonline:93
 #, c-format
-msgid "Welcome to Mandrakeonline"
-msgstr "Bienvenue à Mandrakeonline"
+msgid "Sending configuration..."
+msgstr "Envoi de la configuration..."
 
-#: ../mdkonline:104 ../mdkonline_tui:98
+#: ../mdkonline:109
 #, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
@@ -308,64 +328,38 @@ msgstr ""
 "paquetages, configuration matérielle) vers une base de données centralisée,\n"
 "afin de vous maintenir informé des mises-à-jour de bugs ou de sécurité.\n"
 
-#: ../mdkonline:105 ../mdkonline_tui:142
+#: ../mdkonline:114
 #, c-format
-msgid "Create a Mandrakeonline Account"
-msgstr "Créer un compte Mandrakeonline"
+msgid "Account creation or authentication"
+msgstr "Création de compte ou authetification"
 
-#: ../mdkonline:107
+#: ../mdkonline:119
 #, c-format
-msgid "I don't have a Mandrakeonline account and I want to subscribe"
-msgstr "Je n'ai pas de compte Mandrakeonline et je veux y souscrire"
+msgid "Enter your Mandrakeonline login, password and machine name:"
+msgstr ""
+"Entrez vos identifiant, mot de passe et nom de machine Mandrakeonline :"
 
-#: ../mdkonline:111 ../mdkonline:131 ../mdkonline_tui:114 ../mdkonline_tui:145
+#: ../mdkonline:125 ../mdkonline:156
 #, c-format
 msgid "Login:"
 msgstr "Identifiant :"
 
-#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:115 ../mdkonline_tui:146
+#: ../mdkonline:126 ../mdkonline:157
 #, c-format
 msgid "Password:"
 msgstr "Mot de passe :"
 
-#: ../mdkonline:113 ../mdkonline_tui:147
-#, c-format
-msgid "Confirm Password:"
-msgstr "Confirmer le mot de passe :"
-
-#: ../mdkonline:114 ../mdkonline_tui:148
-#, c-format
-msgid "Mail contact:"
-msgstr "Adresse electronique :"
-
-#: ../mdkonline:121
-#, c-format
-msgid "Mandrakelinux Privacy Policy"
-msgstr "Mandrakelinux et votre vie privée"
-
-# (in english : authentication !)
 #: ../mdkonline:127
 #, c-format
-msgid "Authentification"
-msgstr "Authentification"
-
-#: ../mdkonline:128 ../mdkonline_tui:108
-#, c-format
-msgid "Enter your Mandrakeonline login, password and machine name:"
-msgstr ""
-"Entrez vos identifiant, mot de passe et nom de machine Mandrakeonline :"
-
-#: ../mdkonline:133 ../mdkonline_tui:116
-#, c-format
 msgid "Machine name:"
 msgstr "Nom de l'ordinateur :"
 
-#: ../mdkonline:138
+#: ../mdkonline:131
 #, c-format
-msgid "Send Configuration"
-msgstr "Envoyer la configuration"
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Connexion au site Mandrakeonline en cours ..."
 
-#: ../mdkonline:139 ../mdkonline_tui:128
+#: ../mdkonline:139
 #, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
@@ -397,56 +391,56 @@ msgstr ""
 "plus, vous bénéficierez de remises sur les services d'aide payants sur\n"
 "www.mandrakeexpert.com."
 
-#: ../mdkonline:144 ../mdkonline:211 ../mdkonline:234
+#: ../mdkonline:141 ../mdkonline:180 ../mdkupdate:126 ../mdkupdate:198
 #, c-format
-msgid "Finish"
-msgstr "Terminer"
+msgid "Connection problem"
+msgstr "Problème de connexion"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid "Your upload was successful!"
-msgstr "Votre envoi a eu lieu avec succès !"
+msgid "or"
+msgstr "ou"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandrakeonline."
-msgstr ""
-"À partir de maintenant, vous recevrez les annonces\n"
-"de sécurité et de mises-à-jour grâce à Mandrakeonline."
+msgid "wrong password:"
+msgstr "Mot de passe incorrect :"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
 msgid ""
-"Mandrakeonline offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+"Your login or password was wrong.\n"
+" Either you'll have to type it again, or you'll need to create an account on "
+"Mandrakeonline.\n"
+" In the latter case, go back to the first step to connect to "
+"Mandrakeonline.\n"
+" Be aware that you must also provide a Machine name \n"
+" (only alphabetical characters are admitted)"
 msgstr ""
-"Mandrakeonline donne la possibilité d'automatiser les mises-à-jour.\n"
-"Un programme se lancera régulièrement sur votre machine\n"
-"pour vérifier la présence de nouvelles mises-à-jour.\n"
-
-#: ../mdkonline:146
-#, c-format
-msgid "automated Upgrades"
-msgstr "mises-à-jour automatiques"
+"Votre identifiant ou mot de passe était incorrect.\n"
+" Vous devrez soit en recommencer la saisie, soit créer un compte "
+"Mandrakeonline.\n"
+" Dans le second cas, revenez à la première étape pour vous connecter à "
+"Mandrakeonline.\n"
+" Veuillez noter que vous devez aussi indiquer un nom de Machine \n"
+" (seuls les caractères alphabétiques sont autorisés)."
 
-#: ../mdkonline:150
+#: ../mdkonline:153
 #, c-format
-msgid "Country:"
-msgstr "Pays :"
+msgid "Create a Mandrakeonline Account"
+msgstr "Créer un compte Mandrakeonline"
 
-#: ../mdkonline:178 ../mdkonline:183 ../mdkonline:185 ../mdkonline:187
+#: ../mdkonline:158
 #, c-format
-msgid "Error"
-msgstr "Erreur"
+msgid "Confirm Password:"
+msgstr "Confirmer le mot de passe :"
 
-#: ../mdkonline:183 ../mdkonline_tui:152
+#: ../mdkonline:159
 #, c-format
-msgid "Please provide a login"
-msgstr "Veuillez indiquer un identifiant"
+msgid "Mail contact:"
+msgstr "Adresse electronique :"
 
-#: ../mdkonline:185 ../mdkonline_tui:152
+#: ../mdkonline:163
 #, c-format
 msgid ""
 "The passwords do not match\n"
@@ -455,163 +449,119 @@ msgstr ""
 "Les mots de passe ne correspondent pas\n"
 "Veuillez essayer de nouveau\n"
 
-#: ../mdkonline:187 ../mdkonline_tui:152
+#: ../mdkonline:163
+#, c-format
+msgid "Please provide a login"
+msgstr "Veuillez indiquer un identifiant"
+
+#: ../mdkonline:163
 #, c-format
 msgid "Not a valid mail address!\n"
 msgstr "Cette adresse email n'est pas valide !\n"
 
-#: ../mdkonline:199 ../mdkonline_tui:78
+#: ../mdkonline:169
 #, c-format
-msgid "Reading configuration\n"
-msgstr "Lecture de la configuration\n"
+msgid ""
+"Mandrakeonline Account successfully created.\n"
+"Please click \"Next\" to authenticate and upload your configuration\n"
+msgstr ""
+"Compte Mandrakeonline créé avec succès.\n"
+"Cliquer sur \"Suivant\" pour vous authentifier et mettre votre configuration "
+"sur le serveur\n"
 
-#: ../mdkonline:204 ../mdkonline_tui:82
+#: ../mdkonline:178
 #, c-format
-msgid "Sending configuration..."
-msgstr "Envoi de la configuration..."
+msgid "Your upload was successful!"
+msgstr "Votre envoi a eu lieu avec succès !"
 
-#: ../mdkonline:213 ../mdkonline:273 ../mdkonline_tui:130 ../mdkonline_tui:169
-#: ../mdkupdate:124 ../mdkupdate:195
+#: ../mdkonline:178
 #, c-format
-msgid "Connection problem"
-msgstr "Problème de connexion"
+msgid ""
+"From now you will receive on security and updates \n"
+"announcements thanks to Mandrakeonline."
+msgstr ""
+"À partir de maintenant, vous recevrez les annonces\n"
+"de sécurité et de mises-à-jour grâce à Mandrakeonline."
 
-#: ../mdkonline:213 ../mdkonline_tui:169
+#: ../mdkonline:178
+#, c-format
+msgid ""
+"Mandrakeonline offers you the ability to automate the updates.\n"
+"A program will run regulary in your system waiting for new updates\n"
+msgstr ""
+"Mandrakeonline donne la possibilité d'automatiser les mises-à-jour.\n"
+"Un programme se lancera régulièrement sur votre machine\n"
+"pour vérifier la présence de nouvelles mises-à-jour.\n"
+
+#: ../mdkonline:180
 #, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr ""
 "Une erreur est survenue lors de l'envoi des fichiers, veuillez rééssayer"
 
-#: ../mdkonline:251
+#: ../mdkonline:186
 #, c-format
-msgid "Quitting Wizard\n"
-msgstr "Fermeture de l'assistant\n"
+msgid "Country"
+msgstr "Pays"
 
-#: ../mdkonline:273
+#: ../mdkonline:198
 #, c-format
-msgid "Mandrakeonline could not be contacted, please try again at a later time"
-msgstr "Mandrakeonline n'a pas pu être contacté, veuillez ré-essayer plus tard"
+msgid "Congratulations"
+msgstr "Félicitations"
 
-#: ../mdkonline:285
+#: ../mdkonline:198
 #, c-format
-msgid "Wrong password"
-msgstr "Mot de passe incorrect"
+msgid "Your Mandrakeonline account has been successfully configured\n"
+msgstr "Votre compte Mandrakeonline est correctement configuré\n"
+
+#: ../mdkonline:214
+#, fuzzy, c-format
+msgid "Configuration uploaded successfully"
+msgstr "Votre envoi a eu lieu avec succès !"
+
+#: ../mdkonline:215
+#, fuzzy, c-format
+msgid "Problem uploading configuration"
+msgstr "Lecture de la configuration\n"
 
-#: ../mdkonline:285 ../mdkonline_tui:130
+#: ../mdkonline:216
 #, c-format
 msgid ""
-"Your login or password was wrong.\n"
-" Either you'll have to type it again, or you'll need to create an account on "
-"Mandrakeonline.\n"
-" In the latter case, go back to the first step to connect to "
-"Mandrakeonline.\n"
-" Be aware that you must also provide a Machine name \n"
-" (only alphabetical characters are admitted)"
+"Cannot connect to mandrakeonline website: wrong login/password or router/"
+"firewall bad settings"
 msgstr ""
-"Votre identifiant ou mot de passe était incorrect.\n"
-" Vous devrez soit en recommencer la saisie, soit créer un compte "
-"Mandrakeonline.\n"
-" Dans le second cas, revenez à la première étape pour vous connecter à "
-"Mandrakeonline.\n"
-" Veuillez noter que vous devez aussi indiquer un nom de Machine \n"
-" (seuls les caractères alphabétiques sont autorisés)."
 
-#: ../mdkonline.pm:58
+#: ../mdkonline.pm:66
 #, c-format
 msgid "Login and password should be less than 12 characters\n"
 msgstr "Identifiant et mot de passe ne doivent pas excéder 12 caractéres\n"
 
-#: ../mdkonline.pm:59
+#: ../mdkonline.pm:67
 #, c-format
 msgid "Special characters are not allowed\n"
 msgstr "Caractères spéciaux non permis\n"
 
-#: ../mdkonline.pm:60
+#: ../mdkonline.pm:68
 #, c-format
 msgid "Please fill in all fields\n"
 msgstr "Veuillez remplir tous les champs\n"
 
-#: ../mdkonline.pm:61
+#: ../mdkonline.pm:69
 #, c-format
 msgid "Email not valid\n"
 msgstr "Email non valide\n"
 
-#: ../mdkonline.pm:62
+#: ../mdkonline.pm:70
 #, c-format
 msgid "Account already exist\n"
 msgstr "Ce compte est dèja utilisé\n"
 
-#: ../mdkonline.pm:68
+#: ../mdkonline.pm:76
 #, c-format
 msgid "Problem connecting to server \n"
 msgstr "Problème de connexion au serveur\n"
 
-#: ../mdkonline_tui:45 ../mdkonline_tui:95
-#, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
-
-#: ../mdkonline_tui:48
-#, c-format
-msgid "I already have an account"
-msgstr "J'ai dèja un compte"
-
-#: ../mdkonline_tui:49
-#, c-format
-msgid "I want to subscribe"
-msgstr "Je veux m'inscrire"
-
-#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:120
-#, c-format
-msgid "Please wait"
-msgstr "Veuillez patienter"
-
-#: ../mdkonline_tui:103
-#, c-format
-msgid "Account creation or authentication"
-msgstr "Création de compte ou authetification"
-
-#: ../mdkonline_tui:120
-#, c-format
-msgid "Connecting to Mandrakeonline website..."
-msgstr "Connexion au site Mandrakeonline en cours ..."
-
-#: ../mdkonline_tui:130
-#, c-format
-msgid "or"
-msgstr "ou"
-
-#: ../mdkonline_tui:130
-#, c-format
-msgid "wrong password:"
-msgstr "Mot de passe incorrect :"
-
-#: ../mdkonline_tui:158
-#, c-format
-msgid ""
-"Mandrakeonline Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-"Compte Mandrakeonline créé avec succès.\n"
-"Cliquer sur \"Suivant\" pour vous authentifier et mettre votre configuration "
-"sur le serveur\n"
-
-#: ../mdkonline_tui:175
-#, c-format
-msgid "Country"
-msgstr "Pays"
-
-#: ../mdkonline_tui:187
-#, c-format
-msgid "Congratulations"
-msgstr "Félicitations"
-
-#: ../mdkonline_tui:187
-#, c-format
-msgid "Your Mandrakeonline account has been successfully configured\n"
-msgstr "Votre compte Mandrakeonline est correctement configuré\n"
-
-#: ../mdkupdate:50
+#: ../mdkupdate:52
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
@@ -628,43 +578,38 @@ msgstr ""
 "\n"
 "usage :\n"
 
-#: ../mdkupdate:55
+#: ../mdkupdate:57
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - affiche ce message d'aide.\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:58
 #, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto         - Mandrakeupdate est lancé automatiquement.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:59
 #, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - lance Mandrakeupdate.\n"
 
-#: ../mdkupdate:58
-#, c-format
-msgid "  --update       - Update keys\n"
-msgstr "  --update       - met à jour les clés.\n"
-
-#: ../mdkupdate:66
+#: ../mdkupdate:67
 #, c-format
 msgid "No %s file found. Run mdkonline wizard first"
 msgstr "Fichier %s non trouvé. Relancer le wizard mdkonline pour le regénéré"
 
-#: ../mdkupdate:124
+#: ../mdkupdate:126
 #, c-format
 msgid "Mandrakeupdate could not contact the site, we will try again."
 msgstr ""
 "Mandrakeonline n'a pas pu être contacté, nous allons ré-essayer à nouveau."
 
-#: ../mdkupdate:173
+#: ../mdkupdate:176
 #, c-format
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr "Impossible de mettre a jour les paquetages du média mdkupdate\n"
 
-#: ../mdkupdate:195
+#: ../mdkupdate:198
 #, c-format
 msgid ""
 "Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
@@ -672,3 +617,51 @@ msgid ""
 msgstr ""
 "Mandrakeupdate ne peut pas uploader le résultat de la comparaison de "
 "fichiers. Envoyez un mail asupport [arobas] mandrakeonline [point] net"
+
+#~ msgid "Next"
+#~ msgstr "Suivant"
+
+#~ msgid "Cancel"
+#~ msgstr "Annuler"
+
+#~ msgid "Previous"
+#~ msgstr "Précédent"
+
+#~ msgid "I don't have a Mandrakeonline account and I want to subscribe"
+#~ msgstr "Je n'ai pas de compte Mandrakeonline et je veux y souscrire"
+
+#~ msgid "Mandrakelinux Privacy Policy"
+#~ msgstr "Mandrakelinux et votre vie privée"
+
+# (in english : authentication !)
+#~ msgid "Authentification"
+#~ msgstr "Authentification"
+
+#~ msgid "Send Configuration"
+#~ msgstr "Envoyer la configuration"
+
+#~ msgid "Finish"
+#~ msgstr "Terminer"
+
+#~ msgid "automated Upgrades"
+#~ msgstr "mises-à-jour automatiques"
+
+#~ msgid "Country:"
+#~ msgstr "Pays :"
+
+#~ msgid "Error"
+#~ msgstr "Erreur"
+
+#~ msgid "Quitting Wizard\n"
+#~ msgstr "Fermeture de l'assistant\n"
+
+#~ msgid ""
+#~ "Mandrakeonline could not be contacted, please try again at a later time"
+#~ msgstr ""
+#~ "Mandrakeonline n'a pas pu être contacté, veuillez ré-essayer plus tard"
+
+#~ msgid "Wrong password"
+#~ msgstr "Mot de passe incorrect"
+
+#~ msgid "  --update       - Update keys\n"
+#~ msgstr "  --update       - met à jour les clés.\n"
diff --git a/po/fur.po b/po/fur.po
index b85557c2..2963ae1c 100644
--- a/po/fur.po
+++ b/po/fur.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-01 22:41+0200\n"
+"POT-Creation-Date: 2004-11-03 12:10+0100\n"
 "PO-Revision-Date: 2004-06-28 16:55+0200\n"
 "Last-Translator: Andrea Gracco <graccoandrea@tin.it>\n"
 "Language-Team: furlan <gft@freelists.org>\n"
@@ -21,201 +21,211 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3\n"
 
-#: ../mdkapplet:61
+#: ../mdkapplet:63
 #, fuzzy, c-format
 msgid "Your system is up-to-date"
 msgstr "Il sisteme al è atualizât\n"
 
-#: ../mdkapplet:67
+#: ../mdkapplet:69
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrakeonline.net"
 msgstr ""
 
-#: ../mdkapplet:73
+#: ../mdkapplet:75
 #, c-format
 msgid "System is busy. Please wait ..."
 msgstr "Il sisteme al è cjapât. Spiete ..."
 
-#: ../mdkapplet:79
+#: ../mdkapplet:81
 #, fuzzy, c-format
 msgid "New updates are available for your system"
 msgstr "Nissune atualizazion dispunibile pal to sistem"
 
-#: ../mdkapplet:85
+#: ../mdkapplet:87
 #, fuzzy, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr "Servizi no disponibil. Frache su \"configurazion\""
 
-#: ../mdkapplet:91
+#: ../mdkapplet:93
 #, fuzzy, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Le rêt e je stacade. Frache su \"configure le rêt\""
 
-#: ../mdkapplet:97
+#: ../mdkapplet:99
 #, fuzzy, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Servizi no disponibil. Frache su \"configurazion\""
 
-#: ../mdkapplet:103
+#: ../mdkapplet:105
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:108 ../mdkapplet:158
+#: ../mdkapplet:110 ../mdkapplet:164
 #, c-format
 msgid "Install updates"
 msgstr "Instale atualizazions"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:111
 #, fuzzy, c-format
 msgid "Configure the service"
 msgstr "Configure le rêt"
 
-#: ../mdkapplet:110
+#: ../mdkapplet:112
 #, c-format
 msgid "Check Updates"
 msgstr "Controle Atualizazions"
 
-#: ../mdkapplet:111
+#: ../mdkapplet:113 ../mdkapplet:167 ../mdkapplet:225
+#, fuzzy, c-format
+msgid "Please Wait"
+msgstr "Par plasè, spiete"
+
+#: ../mdkapplet:113 ../mdkapplet:166 ../mdkapplet:167 ../mdkapplet:225
+#, c-format
+msgid "Check updates"
+msgstr "Controle atualizazions"
+
+#: ../mdkapplet:115
 #, c-format
 msgid "Online WebSite"
 msgstr "Sît online"
 
-#: ../mdkapplet:112
+#: ../mdkapplet:116
 #, c-format
 msgid "Configure Network"
 msgstr "Configure le rêt"
 
-#: ../mdkapplet:113
+#: ../mdkapplet:117
 #, c-format
 msgid "Configure Now!"
 msgstr "Configure Daurman!"
 
-#: ../mdkapplet:146
+#: ../mdkapplet:152 ../mdkapplet:229
 #, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Applet Atualizazions Mandrakelinux"
 
-#: ../mdkapplet:156
+#: ../mdkapplet:162
 #, c-format
 msgid "Actions"
 msgstr "Azions"
 
-#: ../mdkapplet:159
+#: ../mdkapplet:165
 #, c-format
 msgid "Configure"
 msgstr "Configure"
 
-#: ../mdkapplet:160
-#, c-format
-msgid "Check updates"
-msgstr "Controle atualizazions"
-
-#: ../mdkapplet:161
+#: ../mdkapplet:169
 #, c-format
 msgid "See logs"
 msgstr "Cjale i log"
 
-#: ../mdkapplet:164
+#: ../mdkapplet:172
 #, c-format
 msgid "Status"
 msgstr "Stât"
 
-#: ../mdkapplet:168 ../mdkapplet:363
+#: ../mdkapplet:176 ../mdkapplet:375
 #, c-format
 msgid "Close"
 msgstr "Siere"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Network Connection: "
 msgstr "Conession a le rêt"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Up"
 msgstr "Su"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Down"
 msgstr "Jù"
 
-#: ../mdkapplet:204
+#: ../mdkapplet:212
 #, c-format
 msgid "Last check: "
 msgstr "Ultin control"
 
-#: ../mdkapplet:205
+#: ../mdkapplet:213
 #, fuzzy, c-format
 msgid "Updates: "
 msgstr "Gnovis Atualizazions"
 
-#: ../mdkapplet:209
+#: ../mdkapplet:217
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Fâs lâ drakconnect\n"
 
-#: ../mdkapplet:213
+#: ../mdkapplet:221
 #, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "Inviament de applet di mdkupdate\n"
 
-#: ../mdkapplet:217
+#: ../mdkapplet:224
 #, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 "Mandrakeonline al somee sedi stât tornât a instalâ, o torni a cjariâ le "
 "applet ...."
 
-#: ../mdkapplet:225
+#: ../mdkapplet:235
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Instalant gnovis atualizazion...\n"
 
-#: ../mdkapplet:227
+#: ../mdkapplet:237
 #, c-format
 msgid "Connecting to"
 msgstr "Conesion in vore a"
 
-#: ../mdkapplet:250
+#: ../mdkapplet:244
+#, fuzzy, c-format
+msgid "Response from Mandrakeonline server\n"
+msgstr "Benvignût su Mandrakeonline"
+
+#: ../mdkapplet:262
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Controlant... Atualizazions e son disponibilis\n"
 
-#: ../mdkapplet:254
+#: ../mdkapplet:267
 #, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
-#: ../mdkapplet:255
+#: ../mdkapplet:268
 #, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
-#: ../mdkapplet:256
+#: ../mdkapplet:269
 #, c-format
 msgid "Unknown state"
 msgstr "Stât no cognossût"
 
-#: ../mdkapplet:257
+#: ../mdkapplet:270
 #, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr "Servizis Online no facoltizâs. Contate il sît Mandrakeonline\n"
 
-#: ../mdkapplet:258
+#: ../mdkapplet:271
 #, c-format
 msgid "Wrong Password.\n"
 msgstr "Password falade.\n"
 
-#: ../mdkapplet:259
+#: ../mdkapplet:272
 #, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr "Azion o host o login falâs.\n"
 
-#: ../mdkapplet:260
+#: ../mdkapplet:273
 #, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
@@ -224,72 +234,82 @@ msgstr ""
 "Al è alc che nol va tes tôs impostazions di rêt (controle les impostazions "
 "di instradament, firewall o proxy)\n"
 
-#: ../mdkapplet:264
+#: ../mdkapplet:277
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Il sisteme al è atualizât\n"
 
-#: ../mdkapplet:303
+#: ../mdkapplet:317
 #, c-format
 msgid "No check"
 msgstr "Nissun control"
 
-#: ../mdkapplet:316
+#: ../mdkapplet:330
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Controlant le rêt: e somee no facoltizade\n"
 
-#: ../mdkapplet:319
+#: ../mdkapplet:333
 #, c-format
 msgid "Checking config file: Not present\n"
 msgstr "Controlant il file di configurazion: No l'è presint\n"
 
-#: ../mdkapplet:353
+#: ../mdkapplet:365
 #, c-format
 msgid "Logs"
 msgstr "File di log"
 
-#: ../mdkapplet:369
+#: ../mdkapplet:381
 #, c-format
 msgid "Clear"
 msgstr "Scancele"
 
-#: ../mdkapplet:396
+#: ../mdkapplet:408
 #, c-format
 msgid "About..."
 msgstr "Informazions su.."
 
-#: ../mdkapplet:397
+#: ../mdkapplet:409
 #, c-format
 msgid "Always launch on startup"
 msgstr ""
 
-#: ../mdkapplet:399
+#: ../mdkapplet:411
 #, c-format
 msgid "Quit"
 msgstr "Jessî"
 
-#: ../mdkonline:89
+#: ../mdkonline:52 ../mdkonline:106
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "Benvignût su Mandrakeonline"
+
+#: ../mdkonline:55
 #, c-format
-msgid "Next"
-msgstr "Pross"
+msgid "I already have an account"
+msgstr ""
 
-#: ../mdkonline:89
+#: ../mdkonline:56
 #, c-format
-msgid "Cancel"
-msgstr "Scancele"
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline:89 ../mdkonline:93 ../mdkonline:131
+#, c-format
+msgid "Please wait"
+msgstr "Par plasè, spiete"
 
 #: ../mdkonline:89
 #, c-format
-msgid "Previous"
-msgstr "Precedent"
+msgid "Reading configuration\n"
+msgstr "Leture de configurazion in vore\n"
 
-#: ../mdkonline:103
+#: ../mdkonline:93
 #, c-format
-msgid "Welcome to Mandrakeonline"
-msgstr "Benvignût su Mandrakeonline"
+msgid "Sending configuration..."
+msgstr "Inviament de configurazion in vore..."
 
-#: ../mdkonline:104 ../mdkonline_tui:98
+#: ../mdkonline:109
 #, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
@@ -300,62 +320,37 @@ msgstr ""
 "(pachets, configurazion hardware) a un database centralizât in\n"
 "maniere di tignîti informât su atualizazions di sigurece e utii mioraments.\n"
 
-#: ../mdkonline:105 ../mdkonline_tui:142
+#: ../mdkonline:114
 #, c-format
-msgid "Create a Mandrakeonline Account"
-msgstr "Cree un account Mandrakeonline"
+msgid "Account creation or authentication"
+msgstr ""
 
-#: ../mdkonline:107
-#, fuzzy, c-format
-msgid "I don't have a Mandrakeonline account and I want to subscribe"
-msgstr "No ai un account Mandrakeonline ma o vorès vêlu "
+#: ../mdkonline:119
+#, c-format
+msgid "Enter your Mandrakeonline login, password and machine name:"
+msgstr "Insede il to login, password e non dal computer par Mandrakeonline:"
 
-#: ../mdkonline:111 ../mdkonline:131 ../mdkonline_tui:114 ../mdkonline_tui:145
+#: ../mdkonline:125 ../mdkonline:156
 #, c-format
 msgid "Login:"
 msgstr "Login:"
 
-#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:115 ../mdkonline_tui:146
+#: ../mdkonline:126 ../mdkonline:157
 #, c-format
 msgid "Password:"
 msgstr "Password:"
 
-#: ../mdkonline:113 ../mdkonline_tui:147
-#, c-format
-msgid "Confirm Password:"
-msgstr "Confirme Password:"
-
-#: ../mdkonline:114 ../mdkonline_tui:148
-#, c-format
-msgid "Mail contact:"
-msgstr "Contat email:"
-
-#: ../mdkonline:121
-#, c-format
-msgid "Mandrakelinux Privacy Policy"
-msgstr "Politiche di Mandrakelinux su le privacy"
-
 #: ../mdkonline:127
 #, c-format
-msgid "Authentification"
-msgstr "Autentificazion"
-
-#: ../mdkonline:128 ../mdkonline_tui:108
-#, c-format
-msgid "Enter your Mandrakeonline login, password and machine name:"
-msgstr "Insede il to login, password e non dal computer par Mandrakeonline:"
-
-#: ../mdkonline:133 ../mdkonline_tui:116
-#, c-format
 msgid "Machine name:"
 msgstr "Non dal computer:"
 
-#: ../mdkonline:138
-#, c-format
-msgid "Send Configuration"
-msgstr "Invie Configurazion"
+#: ../mdkonline:131
+#, fuzzy, c-format
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Benvignût su Mandrakeonline"
 
-#: ../mdkonline:139 ../mdkonline_tui:128
+#: ../mdkonline:139
 #, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
@@ -387,56 +382,55 @@ msgstr ""
 "Dongje, tu podarâs beneficiâ di sconts sul servizi di supuart su\n"
 "www.mandrakeexpert.com."
 
-#: ../mdkonline:144 ../mdkonline:211 ../mdkonline:234
-#, c-format
-msgid "Finish"
-msgstr "Finìs"
-
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141 ../mdkonline:180 ../mdkupdate:126 ../mdkupdate:198
 #, c-format
-msgid "Your upload was successful!"
-msgstr "Cjariament completât cun sucès!"
+msgid "Connection problem"
+msgstr "Probleme di conession"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandrakeonline."
+msgid "or"
 msgstr ""
-"Di cumò indenant, tu ricevarâs avîs su le sigurece\n"
-" e su lis atualizazions graziis a Mandrakeonline."
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "Password falade"
+
+#: ../mdkonline:141
 #, c-format
 msgid ""
-"Mandrakeonline offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+"Your login or password was wrong.\n"
+" Either you'll have to type it again, or you'll need to create an account on "
+"Mandrakeonline.\n"
+" In the latter case, go back to the first step to connect to "
+"Mandrakeonline.\n"
+" Be aware that you must also provide a Machine name \n"
+" (only alphabetical characters are admitted)"
 msgstr ""
-"Mandrakeonline a ti ufrìs le pussibilitât di automatizâ les atualizazions.\n"
-"Un program in spiete di gnovis atualizazions al sarà fat partî "
-"periodichementri\n"
-
-#: ../mdkonline:146
-#, c-format
-msgid "automated Upgrades"
-msgstr "Atualizazions automatichis"
+"Il non utent o le password e son faladis.\n"
+" Tu varâs di scriviju une altre volte, o tu varâs di bisugne di creâ un "
+"account su Mandrakeonline.\n"
+"Tal secont câs, torne indaûr al prin pas par conetiti a Mandrakeonline.\n"
+" Sta atent che tu às di furnî un non di computer \n"
+" (dome caratars dal alfabet e son ametûts)"
 
-#: ../mdkonline:150
+#: ../mdkonline:153
 #, c-format
-msgid "Country:"
-msgstr "Nazion:"
+msgid "Create a Mandrakeonline Account"
+msgstr "Cree un account Mandrakeonline"
 
-#: ../mdkonline:178 ../mdkonline:183 ../mdkonline:185 ../mdkonline:187
+#: ../mdkonline:158
 #, c-format
-msgid "Error"
-msgstr "Fal"
+msgid "Confirm Password:"
+msgstr "Confirme Password:"
 
-#: ../mdkonline:183 ../mdkonline_tui:152
+#: ../mdkonline:159
 #, c-format
-msgid "Please provide a login"
-msgstr "Par plasè furnìs un non utent"
+msgid "Mail contact:"
+msgstr "Contat email:"
 
-#: ../mdkonline:185 ../mdkonline_tui:152
+#: ../mdkonline:163
 #, c-format
 msgid ""
 "The passwords do not match\n"
@@ -445,158 +439,115 @@ msgstr ""
 "Les password no corispuindin\n"
 "Par plasè prove ancjemò\n"
 
-#: ../mdkonline:187 ../mdkonline_tui:152
+#: ../mdkonline:163
+#, c-format
+msgid "Please provide a login"
+msgstr "Par plasè furnìs un non utent"
+
+#: ../mdkonline:163
 #, c-format
 msgid "Not a valid mail address!\n"
 msgstr "No l'è un recapit mail valevul!\n"
 
-#: ../mdkonline:199 ../mdkonline_tui:78
+#: ../mdkonline:169
 #, c-format
-msgid "Reading configuration\n"
-msgstr "Leture de configurazion in vore\n"
+msgid ""
+"Mandrakeonline Account successfully created.\n"
+"Please click \"Next\" to authenticate and upload your configuration\n"
+msgstr ""
 
-#: ../mdkonline:204 ../mdkonline_tui:82
+#: ../mdkonline:178
 #, c-format
-msgid "Sending configuration..."
-msgstr "Inviament de configurazion in vore..."
+msgid "Your upload was successful!"
+msgstr "Cjariament completât cun sucès!"
 
-#: ../mdkonline:213 ../mdkonline:273 ../mdkonline_tui:130 ../mdkonline_tui:169
-#: ../mdkupdate:124 ../mdkupdate:195
+#: ../mdkonline:178
 #, c-format
-msgid "Connection problem"
-msgstr "Probleme di conession"
+msgid ""
+"From now you will receive on security and updates \n"
+"announcements thanks to Mandrakeonline."
+msgstr ""
+"Di cumò indenant, tu ricevarâs avîs su le sigurece\n"
+" e su lis atualizazions graziis a Mandrakeonline."
 
-#: ../mdkonline:213 ../mdkonline_tui:169
+#: ../mdkonline:178
 #, c-format
-msgid "Problem occurs when uploading files, please try again"
+msgid ""
+"Mandrakeonline offers you the ability to automate the updates.\n"
+"A program will run regulary in your system waiting for new updates\n"
 msgstr ""
+"Mandrakeonline a ti ufrìs le pussibilitât di automatizâ les atualizazions.\n"
+"Un program in spiete di gnovis atualizazions al sarà fat partî "
+"periodichementri\n"
 
-#: ../mdkonline:251
+#: ../mdkonline:180
 #, c-format
-msgid "Quitting Wizard\n"
-msgstr "Sierant il Wizard\n"
+msgid "Problem occurs when uploading files, please try again"
+msgstr ""
 
-#: ../mdkonline:273
-#, c-format
-msgid "Mandrakeonline could not be contacted, please try again at a later time"
-msgstr "Mandrakeonline nol po sedi contatât, par plasè prove plui indenant"
+#: ../mdkonline:186
+#, fuzzy, c-format
+msgid "Country"
+msgstr "Nazion:"
+
+#: ../mdkonline:198
+#, fuzzy, c-format
+msgid "Congratulations"
+msgstr "Configurazion"
 
-#: ../mdkonline:285
+#: ../mdkonline:198
 #, c-format
-msgid "Wrong password"
-msgstr "Password falade"
+msgid "Your Mandrakeonline account has been successfully configured\n"
+msgstr ""
+
+#: ../mdkonline:214
+#, fuzzy, c-format
+msgid "Configuration uploaded successfully"
+msgstr "Cjariament completât cun sucès!"
 
-#: ../mdkonline:285 ../mdkonline_tui:130
+#: ../mdkonline:215
+#, fuzzy, c-format
+msgid "Problem uploading configuration"
+msgstr "Leture de configurazion in vore\n"
+
+#: ../mdkonline:216
 #, c-format
 msgid ""
-"Your login or password was wrong.\n"
-" Either you'll have to type it again, or you'll need to create an account on "
-"Mandrakeonline.\n"
-" In the latter case, go back to the first step to connect to "
-"Mandrakeonline.\n"
-" Be aware that you must also provide a Machine name \n"
-" (only alphabetical characters are admitted)"
+"Cannot connect to mandrakeonline website: wrong login/password or router/"
+"firewall bad settings"
 msgstr ""
-"Il non utent o le password e son faladis.\n"
-" Tu varâs di scriviju une altre volte, o tu varâs di bisugne di creâ un "
-"account su Mandrakeonline.\n"
-"Tal secont câs, torne indaûr al prin pas par conetiti a Mandrakeonline.\n"
-" Sta atent che tu às di furnî un non di computer \n"
-" (dome caratars dal alfabet e son ametûts)"
 
-#: ../mdkonline.pm:58
+#: ../mdkonline.pm:66
 #, c-format
 msgid "Login and password should be less than 12 characters\n"
 msgstr "Non utent e password e varessin di sedi lungjis mancul di 12 letaris\n"
 
-#: ../mdkonline.pm:59
+#: ../mdkonline.pm:67
 #, c-format
 msgid "Special characters are not allowed\n"
 msgstr "I Caratars speciâi no son consintûts\n"
 
-#: ../mdkonline.pm:60
+#: ../mdkonline.pm:68
 #, c-format
 msgid "Please fill in all fields\n"
 msgstr "Par plase jemple ducj i cjamps\n"
 
-#: ../mdkonline.pm:61
+#: ../mdkonline.pm:69
 #, c-format
 msgid "Email not valid\n"
 msgstr "Email no valevule\n"
 
-#: ../mdkonline.pm:62
+#: ../mdkonline.pm:70
 #, c-format
 msgid "Account already exist\n"
 msgstr "L'account al esist dizà\n"
 
-#: ../mdkonline.pm:68
+#: ../mdkonline.pm:76
 #, c-format
 msgid "Problem connecting to server \n"
 msgstr "Probleme conetintsi al server \n"
 
-#: ../mdkonline_tui:45 ../mdkonline_tui:95
-#, fuzzy, c-format
-msgid "Mandrakeonline"
-msgstr "Benvignût su Mandrakeonline"
-
-#: ../mdkonline_tui:48
-#, c-format
-msgid "I already have an account"
-msgstr ""
-
-#: ../mdkonline_tui:49
-#, c-format
-msgid "I want to subscribe"
-msgstr ""
-
-#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:120
-#, c-format
-msgid "Please wait"
-msgstr "Par plasè, spiete"
-
-#: ../mdkonline_tui:103
-#, c-format
-msgid "Account creation or authentication"
-msgstr ""
-
-#: ../mdkonline_tui:120
-#, fuzzy, c-format
-msgid "Connecting to Mandrakeonline website..."
-msgstr "Benvignût su Mandrakeonline"
-
-#: ../mdkonline_tui:130
-#, c-format
-msgid "or"
-msgstr ""
-
-#: ../mdkonline_tui:130
-#, fuzzy, c-format
-msgid "wrong password:"
-msgstr "Password falade"
-
-#: ../mdkonline_tui:158
-#, c-format
-msgid ""
-"Mandrakeonline Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-
-#: ../mdkonline_tui:175
-#, fuzzy, c-format
-msgid "Country"
-msgstr "Nazion:"
-
-#: ../mdkonline_tui:187
-#, fuzzy, c-format
-msgid "Congratulations"
-msgstr "Configurazion"
-
-#: ../mdkonline_tui:187
-#, c-format
-msgid "Your Mandrakeonline account has been successfully configured\n"
-msgstr ""
-
-#: ../mdkupdate:50
+#: ../mdkupdate:52
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
@@ -613,48 +564,90 @@ msgstr ""
 "\n"
 "ûs:\n"
 
-#: ../mdkupdate:55
+#: ../mdkupdate:57
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - stampe chest mes di jutori.\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:58
 #, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto         - Mandrakeupdate inviât automatichementri.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:59
 #, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - invie Mandrakeupdate.\n"
 
-#: ../mdkupdate:58
-#, c-format
-msgid "  --update       - Update keys\n"
-msgstr "  --update       - Atualize clâf\n"
-
-#: ../mdkupdate:66
+#: ../mdkupdate:67
 #, c-format
 msgid "No %s file found. Run mdkonline wizard first"
 msgstr ""
 
-#: ../mdkupdate:124
+#: ../mdkupdate:126
 #, fuzzy, c-format
 msgid "Mandrakeupdate could not contact the site, we will try again."
 msgstr "Mandrakeonline nol po sedi contatât, par plasè prove plui indenant"
 
-#: ../mdkupdate:173
+#: ../mdkupdate:176
 #, c-format
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr "No si rive a atualizâ i pachets de font mdkupdate.\n"
 
-#: ../mdkupdate:195
+#: ../mdkupdate:198
 #, c-format
 msgid ""
 "Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
 "mandrakeonline [dot] net"
 msgstr ""
 
+#~ msgid "Next"
+#~ msgstr "Pross"
+
+#~ msgid "Cancel"
+#~ msgstr "Scancele"
+
+#~ msgid "Previous"
+#~ msgstr "Precedent"
+
+#, fuzzy
+#~ msgid "I don't have a Mandrakeonline account and I want to subscribe"
+#~ msgstr "No ai un account Mandrakeonline ma o vorès vêlu "
+
+#~ msgid "Mandrakelinux Privacy Policy"
+#~ msgstr "Politiche di Mandrakelinux su le privacy"
+
+#~ msgid "Authentification"
+#~ msgstr "Autentificazion"
+
+#~ msgid "Send Configuration"
+#~ msgstr "Invie Configurazion"
+
+#~ msgid "Finish"
+#~ msgstr "Finìs"
+
+#~ msgid "automated Upgrades"
+#~ msgstr "Atualizazions automatichis"
+
+#~ msgid "Country:"
+#~ msgstr "Nazion:"
+
+#~ msgid "Error"
+#~ msgstr "Fal"
+
+#~ msgid "Quitting Wizard\n"
+#~ msgstr "Sierant il Wizard\n"
+
+#~ msgid ""
+#~ "Mandrakeonline could not be contacted, please try again at a later time"
+#~ msgstr "Mandrakeonline nol po sedi contatât, par plasè prove plui indenant"
+
+#~ msgid "Wrong password"
+#~ msgstr "Password falade"
+
+#~ msgid "  --update       - Update keys\n"
+#~ msgstr "  --update       - Atualize clâf\n"
+
 #~ msgid "Skip Wizard"
 #~ msgstr "Salte l'assistent"
 
diff --git a/po/gl.po b/po/gl.po
index 2659f895..d60ff139 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -7,20 +7,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline.gl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-25 16:00+0200\n"
-"PO-Revision-Date: 2004-10-23 14:06+0100\n"
+"POT-Creation-Date: 2004-11-03 12:10+0100\n"
+"PO-Revision-Date: 2004-10-10 18:09+0100\n"
 "Last-Translator: Leandro Regueiro <unho@gulo.org>\n"
 "Language-Team: Galician <gpul-traduccion@ceu.fi.udc.es>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../mdkapplet:61
+#: ../mdkapplet:63
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "O seu sistema está actualizado"
 
-#: ../mdkapplet:67
+#: ../mdkapplet:69
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -29,260 +29,280 @@ msgstr ""
 "Problema na configuración do servicio. Por favor comprobe os logs e envíe un "
 "correo-e a support@mandrakeonline.net"
 
-#: ../mdkapplet:73
+#: ../mdkapplet:75
 #, c-format
 msgid "System is busy. Please wait ..."
 msgstr "O sistema esta ocupado. Agarde ..."
 
-#: ../mdkapplet:79
+#: ../mdkapplet:81
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Hai novas actualizacións dispoñibles para o seu sistema"
 
-#: ../mdkapplet:85
+#: ../mdkapplet:87
 #, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr "O servicio non está configurado. Clique en \"Configura-lo servicio\""
 
-#: ../mdkapplet:91
+#: ../mdkapplet:93
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "A rede está caída. Configure a súa rede"
 
-#: ../mdkapplet:97
+#: ../mdkapplet:99
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "O servicio non está activado. Clique en \"Sitio Web en Liña\""
 
-#: ../mdkapplet:103
+#: ../mdkapplet:105
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:108 ../mdkapplet:158
+#: ../mdkapplet:110 ../mdkapplet:164
 #, c-format
 msgid "Install updates"
 msgstr "Instala-las actualizacións"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:111
 #, c-format
 msgid "Configure the service"
 msgstr "Configura-lo servicio"
 
-#: ../mdkapplet:110
+#: ../mdkapplet:112
 #, c-format
 msgid "Check Updates"
 msgstr "Comprobar se hai Actualizacións"
 
-#: ../mdkapplet:111
+#: ../mdkapplet:113 ../mdkapplet:167 ../mdkapplet:225
+#, fuzzy, c-format
+msgid "Please Wait"
+msgstr "Por favor, agarde"
+
+#: ../mdkapplet:113 ../mdkapplet:166 ../mdkapplet:167 ../mdkapplet:225
+#, c-format
+msgid "Check updates"
+msgstr "Comprobar actualizacións"
+
+#: ../mdkapplet:115
 #, c-format
 msgid "Online WebSite"
 msgstr "Sitio Web en Liña"
 
-#: ../mdkapplet:112
+#: ../mdkapplet:116
 #, c-format
 msgid "Configure Network"
 msgstr "Configura-la Rede"
 
-#: ../mdkapplet:113
+#: ../mdkapplet:117
 #, c-format
 msgid "Configure Now!"
 msgstr "Configurar agora!"
 
-#: ../mdkapplet:146
+#: ../mdkapplet:152 ../mdkapplet:229
 #, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Applet de Actualización de Mandrakelinux"
 
-#: ../mdkapplet:156
+#: ../mdkapplet:162
 #, c-format
 msgid "Actions"
 msgstr "Accións"
 
-#: ../mdkapplet:159
+#: ../mdkapplet:165
 #, c-format
 msgid "Configure"
 msgstr "Configurar"
 
-#: ../mdkapplet:160
-#, c-format
-msgid "Check updates"
-msgstr "Comprobar actualizacións"
-
-#: ../mdkapplet:161
+#: ../mdkapplet:169
 #, c-format
 msgid "See logs"
 msgstr "Ve-los logs"
 
-#: ../mdkapplet:164
+#: ../mdkapplet:172
 #, c-format
 msgid "Status"
 msgstr "Estado"
 
-#: ../mdkapplet:168 ../mdkapplet:363
+#: ../mdkapplet:176 ../mdkapplet:375
 #, c-format
 msgid "Close"
 msgstr "Pechar"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Network Connection: "
 msgstr "Conexión á Rede: "
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Up"
 msgstr "Arriba"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Down"
 msgstr "Abaixo"
 
-#: ../mdkapplet:204
+#: ../mdkapplet:212
 #, c-format
 msgid "Last check: "
 msgstr "Última comprobación: "
 
-#: ../mdkapplet:205
+#: ../mdkapplet:213
 #, c-format
 msgid "Updates: "
 msgstr "Actualizacións: "
 
-#: ../mdkapplet:209
+#: ../mdkapplet:217
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Lanzando drakconnect\n"
 
-#: ../mdkapplet:213
+#: ../mdkapplet:221
 #, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "Lanzando mdkupdate --applet\n"
 
-#: ../mdkapplet:217
+#: ../mdkapplet:224
 #, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr "Semella que se reinstalou Mandrakeonline, recargando applet ...."
 
-#: ../mdkapplet:225
+#: ../mdkapplet:235
 #, c-format
 msgid "Computing new updates...\n"
 msgstr ""
 
-#: ../mdkapplet:227
+#: ../mdkapplet:237
 #, c-format
 msgid "Connecting to"
 msgstr "Conectando a"
 
-#: ../mdkapplet:250
+#: ../mdkapplet:244
+#, fuzzy, c-format
+msgid "Response from Mandrakeonline server\n"
+msgstr "Benvid@ a Mandrakeonline"
+
+#: ../mdkapplet:262
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Comprobando... As actualizacións están dispoñibles\n"
 
-#: ../mdkapplet:254
+#: ../mdkapplet:267
 #, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
-#: ../mdkapplet:255
+#: ../mdkapplet:268
 #, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
-#: ../mdkapplet:256
+#: ../mdkapplet:269
 #, c-format
 msgid "Unknown state"
 msgstr "Estado descoñecido"
 
-#: ../mdkapplet:257
+#: ../mdkapplet:270
 #, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr ""
 "Os sevicios en liña están deshabilitados. Contacte co sitio Mandrakeonline\n"
 
-#: ../mdkapplet:258
+#: ../mdkapplet:271
 #, c-format
 msgid "Wrong Password.\n"
 msgstr "Contrasinal Non Válido.\n"
 
-#: ../mdkapplet:259
+#: ../mdkapplet:272
 #, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr ""
 
-#: ../mdkapplet:260
+#: ../mdkapplet:273
 #, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
 msgstr ""
 
-#: ../mdkapplet:264
+#: ../mdkapplet:277
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "O sistema está actualizado\n"
 
-#: ../mdkapplet:303
+#: ../mdkapplet:317
 #, c-format
 msgid "No check"
 msgstr "Sen comprobar"
 
-#: ../mdkapplet:316
+#: ../mdkapplet:330
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Comprobando a Rede: parece que está deshabilitada\n"
 
-#: ../mdkapplet:319
+#: ../mdkapplet:333
 #, c-format
 msgid "Checking config file: Not present\n"
 msgstr "Comprobando o ficheiro de configuración: Non existe\n"
 
-#: ../mdkapplet:353
+#: ../mdkapplet:365
 #, c-format
 msgid "Logs"
 msgstr "Logs"
 
-#: ../mdkapplet:369
+#: ../mdkapplet:381
 #, c-format
 msgid "Clear"
 msgstr "Limpar"
 
-#: ../mdkapplet:396
+#: ../mdkapplet:408
 #, c-format
 msgid "About..."
 msgstr "Acerca de..."
 
-#: ../mdkapplet:397
+#: ../mdkapplet:409
 #, c-format
 msgid "Always launch on startup"
 msgstr "Lanzar sempre ó inicia-lo sistema"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:411
 #, c-format
 msgid "Quit"
 msgstr "Pechar"
 
-#: ../mdkonline:89
+#: ../mdkonline:52 ../mdkonline:106
 #, c-format
-msgid "Next"
-msgstr "Seguinte"
+msgid "Mandrakeonline"
+msgstr "Mandrakeonline"
 
-#: ../mdkonline:89
+#: ../mdkonline:55
 #, c-format
-msgid "Cancel"
-msgstr "Cancelar"
+msgid "I already have an account"
+msgstr "Xa teño unha conta"
+
+#: ../mdkonline:56
+#, c-format
+msgid "I want to subscribe"
+msgstr "Desexo subscribirme"
+
+#: ../mdkonline:89 ../mdkonline:93 ../mdkonline:131
+#, c-format
+msgid "Please wait"
+msgstr "Por favor, agarde"
 
 #: ../mdkonline:89
 #, c-format
-msgid "Previous"
-msgstr "Anterior"
+msgid "Reading configuration\n"
+msgstr "Lendo a configuración\n"
 
-#: ../mdkonline:103
+#: ../mdkonline:93
 #, c-format
-msgid "Welcome to Mandrakeonline"
-msgstr "Benvid@ a Mandrakeonline"
+msgid "Sending configuration..."
+msgstr "Enviando a configuración..."
 
-#: ../mdkonline:104 ../mdkonline_tui:102
+#: ../mdkonline:109
 #, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
@@ -293,63 +313,38 @@ msgstr ""
 "(paquetes, configuración do hardware) a unha base de datos central para\n"
 "mantelo informado acerca de actualizacións útiles e de seguridade.\n"
 
-#: ../mdkonline:105 ../mdkonline_tui:146
+#: ../mdkonline:114
 #, c-format
-msgid "Create a Mandrakeonline Account"
-msgstr "Crear unha Conta en Mandrakeonline"
+msgid "Account creation or authentication"
+msgstr ""
 
-#: ../mdkonline:107
+#: ../mdkonline:119
 #, c-format
-msgid "I don't have a Mandrakeonline account and I want to subscribe"
-msgstr "Non teño unha conta en Mandrakeonline e desexo subscribirme"
+msgid "Enter your Mandrakeonline login, password and machine name:"
+msgstr ""
+"Introduza o seu login e contrasinal de Mandrakeonline e o nome do ordenador:"
 
-#: ../mdkonline:111 ../mdkonline:131 ../mdkonline_tui:118 ../mdkonline_tui:149
+#: ../mdkonline:125 ../mdkonline:156
 #, c-format
 msgid "Login:"
 msgstr "Login:"
 
-#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:119 ../mdkonline_tui:150
+#: ../mdkonline:126 ../mdkonline:157
 #, c-format
 msgid "Password:"
 msgstr "Contrasinal:"
 
-#: ../mdkonline:113 ../mdkonline_tui:151
-#, c-format
-msgid "Confirm Password:"
-msgstr "Confirma-lo Contrasinal:"
-
-#: ../mdkonline:114 ../mdkonline_tui:152
-#, c-format
-msgid "Mail contact:"
-msgstr "Correo-e de contacto:"
-
-#: ../mdkonline:121
-#, c-format
-msgid "Mandrakelinux Privacy Policy"
-msgstr "Política de Privacidade de Linux Mandrakelinux"
-
 #: ../mdkonline:127
 #, c-format
-msgid "Authentification"
-msgstr "Identificación"
-
-#: ../mdkonline:128 ../mdkonline_tui:112
-#, c-format
-msgid "Enter your Mandrakeonline login, password and machine name:"
-msgstr ""
-"Introduza o seu login e contrasinal de Mandrakeonline e o nome do ordenador:"
-
-#: ../mdkonline:133 ../mdkonline_tui:120
-#, c-format
 msgid "Machine name:"
 msgstr "Nome do ordenador:"
 
-#: ../mdkonline:138
+#: ../mdkonline:131
 #, c-format
-msgid "Send Configuration"
-msgstr "Envia-la Configuración"
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Conectando ó sitio web de Mandrakeonline..."
 
-#: ../mdkonline:139 ../mdkonline_tui:132
+#: ../mdkonline:139
 #, fuzzy, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
@@ -382,56 +377,55 @@ msgstr ""
 "Furthermore, you benefit from discounted paid support services on\n"
 "www.mandrakeexpert.com."
 
-#: ../mdkonline:144 ../mdkonline:211 ../mdkonline:234
+#: ../mdkonline:141 ../mdkonline:180 ../mdkupdate:126 ../mdkupdate:198
 #, c-format
-msgid "Finish"
-msgstr "Rematar"
+msgid "Connection problem"
+msgstr "Problema de conexión"
 
-#: ../mdkonline:145 ../mdkonline_tui:171
+#: ../mdkonline:141
 #, c-format
-msgid "Your upload was successful!"
-msgstr "O envio de datos tivo éxito!"
+msgid "or"
+msgstr "ou"
 
-#: ../mdkonline:145 ../mdkonline_tui:171
+#: ../mdkonline:141
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandrakeonline."
-msgstr ""
-"Dende agora recibirá avisos referentes á seguridade \n"
-"e ás actualizacións gracias a Mandrakeonline."
+msgid "wrong password:"
+msgstr "contrasinal incorrecto:"
 
-#: ../mdkonline:145 ../mdkonline_tui:171
+#: ../mdkonline:141
 #, c-format
 msgid ""
-"Mandrakeonline offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+"Your login or password was wrong.\n"
+" Either you'll have to type it again, or you'll need to create an account on "
+"Mandrakeonline.\n"
+" In the latter case, go back to the first step to connect to "
+"Mandrakeonline.\n"
+" Be aware that you must also provide a Machine name \n"
+" (only alphabetical characters are admitted)"
 msgstr ""
-"Mandrakeonline ofrécelle a posibilidade de automatiza-las actualizacións.\n"
-"Un programa executarase regularmente no seu sistema agardando novas "
-"actualizacións\n"
-
-#: ../mdkonline:146
-#, c-format
-msgid "automated Upgrades"
-msgstr "Actualizacións Automáticas"
+"O seu login ou contrasinal é incorrecto.\n"
+" Terao que escribir outra vez, ou necesitará crear unha conta en "
+"Mandrakeonline.\n"
+" No último caso. volte ó primeiro paso para conectarse a Mandrakeonline.\n"
+" Asegúrese de que tamén proporciona un nome de Ordenador \n"
+" (só se admiten caracteres alfabéticos)"
 
-#: ../mdkonline:150
+#: ../mdkonline:153
 #, c-format
-msgid "Country:"
-msgstr "País:"
+msgid "Create a Mandrakeonline Account"
+msgstr "Crear unha Conta en Mandrakeonline"
 
-#: ../mdkonline:178 ../mdkonline:183 ../mdkonline:185 ../mdkonline:187
+#: ../mdkonline:158
 #, c-format
-msgid "Error"
-msgstr "Erro"
+msgid "Confirm Password:"
+msgstr "Confirma-lo Contrasinal:"
 
-#: ../mdkonline:183 ../mdkonline_tui:156
+#: ../mdkonline:159
 #, c-format
-msgid "Please provide a login"
-msgstr "Por favor, introduza un login"
+msgid "Mail contact:"
+msgstr "Correo-e de contacto:"
 
-#: ../mdkonline:185 ../mdkonline_tui:156
+#: ../mdkonline:163
 #, c-format
 msgid ""
 "The passwords do not match\n"
@@ -440,159 +434,115 @@ msgstr ""
 "Os contrasinais non coinciden\n"
 "Por favor, inténteo de novo\n"
 
-#: ../mdkonline:187 ../mdkonline_tui:156
+#: ../mdkonline:163
+#, c-format
+msgid "Please provide a login"
+msgstr "Por favor, introduza un login"
+
+#: ../mdkonline:163
 #, c-format
 msgid "Not a valid mail address!\n"
 msgstr "Non é un enderezo de email válido!\n"
 
-#: ../mdkonline:199 ../mdkonline_tui:82
+#: ../mdkonline:169
 #, c-format
-msgid "Reading configuration\n"
-msgstr "Lendo a configuración\n"
+msgid ""
+"Mandrakeonline Account successfully created.\n"
+"Please click \"Next\" to authenticate and upload your configuration\n"
+msgstr ""
 
-#: ../mdkonline:204 ../mdkonline_tui:86
+#: ../mdkonline:178
 #, c-format
-msgid "Sending configuration..."
-msgstr "Enviando a configuración..."
+msgid "Your upload was successful!"
+msgstr "O envio de datos tivo éxito!"
 
-#: ../mdkonline:213 ../mdkonline:273 ../mdkonline_tui:134 ../mdkonline_tui:173
-#: ../mdkupdate:124 ../mdkupdate:195
+#: ../mdkonline:178
 #, c-format
-msgid "Connection problem"
-msgstr "Problema de conexión"
+msgid ""
+"From now you will receive on security and updates \n"
+"announcements thanks to Mandrakeonline."
+msgstr ""
+"Dende agora recibirá avisos referentes á seguridade \n"
+"e ás actualizacións gracias a Mandrakeonline."
+
+#: ../mdkonline:178
+#, c-format
+msgid ""
+"Mandrakeonline offers you the ability to automate the updates.\n"
+"A program will run regulary in your system waiting for new updates\n"
+msgstr ""
+"Mandrakeonline ofrécelle a posibilidade de automatiza-las actualizacións.\n"
+"Un programa executarase regularmente no seu sistema agardando novas "
+"actualizacións\n"
 
-#: ../mdkonline:213 ../mdkonline_tui:173
+#: ../mdkonline:180
 #, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr "Ocorreu un problema ó subi-los ficheiros, inténteo de novo"
 
-#: ../mdkonline:251
+#: ../mdkonline:186
 #, c-format
-msgid "Quitting Wizard\n"
-msgstr "Saindo do Asistente\n"
+msgid "Country"
+msgstr "País"
 
-#: ../mdkonline:273
+#: ../mdkonline:198
+#, fuzzy, c-format
+msgid "Congratulations"
+msgstr "Envia-la Configuración"
+
+#: ../mdkonline:198
 #, c-format
-msgid "Mandrakeonline could not be contacted, please try again at a later time"
+msgid "Your Mandrakeonline account has been successfully configured\n"
 msgstr ""
-"Non se puido contactar con Mandrakeonline, por favor inténteo máis tarde"
 
-#: ../mdkonline:285
-#, c-format
-msgid "Wrong password"
-msgstr "Contrasinal incorrecto"
+#: ../mdkonline:214
+#, fuzzy, c-format
+msgid "Configuration uploaded successfully"
+msgstr "O envio de datos tivo éxito!"
 
-#: ../mdkonline:285 ../mdkonline_tui:134
+#: ../mdkonline:215
+#, fuzzy, c-format
+msgid "Problem uploading configuration"
+msgstr "Lendo a configuración\n"
+
+#: ../mdkonline:216
 #, c-format
 msgid ""
-"Your login or password was wrong.\n"
-" Either you'll have to type it again, or you'll need to create an account on "
-"Mandrakeonline.\n"
-" In the latter case, go back to the first step to connect to "
-"Mandrakeonline.\n"
-" Be aware that you must also provide a Machine name \n"
-" (only alphabetical characters are admitted)"
+"Cannot connect to mandrakeonline website: wrong login/password or router/"
+"firewall bad settings"
 msgstr ""
-"O seu login ou contrasinal é incorrecto.\n"
-" Terao que escribir outra vez, ou necesitará crear unha conta en "
-"Mandrakeonline.\n"
-" No último caso. volte ó primeiro paso para conectarse a Mandrakeonline.\n"
-" Asegúrese de que tamén proporciona un nome de Ordenador \n"
-" (só se admiten caracteres alfabéticos)"
 
-#: ../mdkonline.pm:58
+#: ../mdkonline.pm:66
 #, c-format
 msgid "Login and password should be less than 12 characters\n"
 msgstr "O nome de usuario e o contrasinal deben ter menos de 12 caracteres\n"
 
-#: ../mdkonline.pm:59
+#: ../mdkonline.pm:67
 #, c-format
 msgid "Special characters are not allowed\n"
 msgstr "Non se permite usa-los caracteres especiais\n"
 
-#: ../mdkonline.pm:60
+#: ../mdkonline.pm:68
 #, c-format
 msgid "Please fill in all fields\n"
 msgstr "Complete tódolos campos\n"
 
-#: ../mdkonline.pm:61
+#: ../mdkonline.pm:69
 #, c-format
 msgid "Email not valid\n"
 msgstr "Correo-e non válido\n"
 
-#: ../mdkonline.pm:62
+#: ../mdkonline.pm:70
 #, c-format
 msgid "Account already exist\n"
 msgstr "A conta xa existe\n"
 
-#: ../mdkonline.pm:68
+#: ../mdkonline.pm:76
 #, c-format
 msgid "Problem connecting to server \n"
 msgstr "Problema ó conectar ó servidor \n"
 
-#: ../mdkonline_tui:49 ../mdkonline_tui:99
-#, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
-
-#: ../mdkonline_tui:52
-#, c-format
-msgid "I already have an account"
-msgstr "Xa teño unha conta"
-
-#: ../mdkonline_tui:53
-#, c-format
-msgid "I want to subscribe"
-msgstr "Desexo subscribirme"
-
-#: ../mdkonline_tui:82 ../mdkonline_tui:86 ../mdkonline_tui:124
-#, c-format
-msgid "Please wait"
-msgstr "Por favor, agarde"
-
-#: ../mdkonline_tui:107
-#, c-format
-msgid "Account creation or authentication"
-msgstr ""
-
-#: ../mdkonline_tui:124
-#, c-format
-msgid "Connecting to Mandrakeonline website..."
-msgstr "Conectando ó sitio web de Mandrakeonline..."
-
-#: ../mdkonline_tui:134
-#, c-format
-msgid "or"
-msgstr "ou"
-
-#: ../mdkonline_tui:134
-#, c-format
-msgid "wrong password:"
-msgstr "contrasinal incorrecto:"
-
-#: ../mdkonline_tui:162
-#, c-format
-msgid ""
-"Mandrakeonline Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-
-#: ../mdkonline_tui:179
-#, c-format
-msgid "Country"
-msgstr "País"
-
-#: ../mdkonline_tui:191
-#, c-format
-msgid "Congratulations"
-msgstr "Noraboa"
-
-#: ../mdkonline_tui:191
-#, c-format
-msgid "Your Mandrakeonline account has been successfully configured\n"
-msgstr "A súa conta de Mandrakeonline configurouse con éxito\n"
-
-#: ../mdkupdate:50
+#: ../mdkupdate:52
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
@@ -608,44 +558,39 @@ msgstr ""
 "\n"
 "uso:\n"
 
-#: ../mdkupdate:55
+#: ../mdkupdate:57
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - imprimir esta mensaxe de axuda.\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:58
 #, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto         - Mandrakeupdate executouse automáticamente.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:59
 #, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - executar Mandrakeupdate.\n"
 
-#: ../mdkupdate:58
-#, c-format
-msgid "  --update       - Update keys\n"
-msgstr "  --update       - Actualiza-las teclas\n"
-
-#: ../mdkupdate:66
+#: ../mdkupdate:67
 #, c-format
 msgid "No %s file found. Run mdkonline wizard first"
 msgstr "Non se atopou o ficheiro %s. Execute o asistente mdkonline primeiro"
 
-#: ../mdkupdate:124
+#: ../mdkupdate:126
 #, c-format
 msgid "Mandrakeupdate could not contact the site, we will try again."
 msgstr ""
 "Mandrakeupdate non puido contactar co sitio, vai intentar contactar outra "
 "vez."
 
-#: ../mdkupdate:173
+#: ../mdkupdate:176
 #, c-format
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr "Non foi posible actualiza-los paquetes dende o soporte mdkupdate.\n"
 
-#: ../mdkupdate:195
+#: ../mdkupdate:198
 #, c-format
 msgid ""
 "Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
@@ -653,3 +598,60 @@ msgid ""
 msgstr ""
 "Mandrakeupdate non puido subir os ficheiros diff. Envie un correo-e a "
 "support [arroba] mandrakeonline [punto] net"
+
+#~ msgid "Next"
+#~ msgstr "Seguinte"
+
+#~ msgid "Cancel"
+#~ msgstr "Cancelar"
+
+#~ msgid "Previous"
+#~ msgstr "Anterior"
+
+#, fuzzy
+#~ msgid "I don't have a Mandrakeonline account and I want to subscribe"
+#~ msgstr "Non teño unha conta en Mandrakeonline e quéroa "
+
+#~ msgid "Mandrakelinux Privacy Policy"
+#~ msgstr "Política de Privacidade de Linux Mandrakelinux"
+
+#~ msgid "Authentification"
+#~ msgstr "Identificación"
+
+#~ msgid "Send Configuration"
+#~ msgstr "Envia-la Configuración"
+
+#~ msgid "Finish"
+#~ msgstr "Rematar"
+
+#~ msgid "automated Upgrades"
+#~ msgstr "Actualizacións Automáticas"
+
+#~ msgid "Country:"
+#~ msgstr "País:"
+
+#~ msgid "Error"
+#~ msgstr "Erro"
+
+#~ msgid "Quitting Wizard\n"
+#~ msgstr "Saindo do Asistente\n"
+
+#~ msgid ""
+#~ "Mandrakeonline could not be contacted, please try again at a later time"
+#~ msgstr ""
+#~ "Non se puido contactar con Mandrakeonline, por favor inténteo máis tarde"
+
+#~ msgid "Wrong password"
+#~ msgstr "Contrasinal incorrecto"
+
+#~ msgid "  --update       - Update keys\n"
+#~ msgstr "  --update       - Actualiza-las teclas\n"
+
+#~ msgid "Skip Wizard"
+#~ msgstr "Saltar Asistente"
+
+#~ msgid "I don't have a Mandrakeonline account and I want to "
+#~ msgstr "Non teño unha conta en Mandrakeonline e quéroa "
+
+#~ msgid "Subscribe"
+#~ msgstr "Subscribirse"
diff --git a/po/he.po b/po/he.po
index 33573cae..3601553f 100644
--- a/po/he.po
+++ b/po/he.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: he\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-01 22:41+0200\n"
+"POT-Creation-Date: 2004-11-03 12:10+0100\n"
 "PO-Revision-Date: 2004-10-01 17:02+0200\n"
 "Last-Translator: dovix <dovix2003@yahoo.com>\n"
 "Language-Team: Hebrew <mdk-hebrew@iglu.org.il>\n"
@@ -19,12 +19,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.2\n"
 
-#: ../mdkapplet:61
+#: ../mdkapplet:63
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "המערכת מעודכנת"
 
-#: ../mdkapplet:67
+#: ../mdkapplet:69
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -33,187 +33,197 @@ msgstr ""
 "חלה תקלה בעת הגדרת השרות. באפשרותך לדווח על התקלה ל: support@mandrakeonline."
 "net"
 
-#: ../mdkapplet:73
+#: ../mdkapplet:75
 #, c-format
 msgid "System is busy. Please wait ..."
 msgstr "המערכת עסוקה, אנא המתן..."
 
-#: ../mdkapplet:79
+#: ../mdkapplet:81
 #, c-format
 msgid "New updates are available for your system"
 msgstr "עדכונים חדשים זמינים עבור המערכת שלך"
 
-#: ../mdkapplet:85
+#: ../mdkapplet:87
 #, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr "השירות לא מוגדר. עליך ללחוץ על \"הגדרת השרות\"."
 
-#: ../mdkapplet:91
+#: ../mdkapplet:93
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "הרשת לא פעילה. עליך להגדיר את הרשת"
 
-#: ../mdkapplet:97
+#: ../mdkapplet:99
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "השירות לא הופעל. עליך ללחוץ על \"אתר מקוון\""
 
-#: ../mdkapplet:103
+#: ../mdkapplet:105
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "גרסה לא נתמכת (גרסה ישנה מדי או גרסת פיתוח)"
 
-#: ../mdkapplet:108 ../mdkapplet:158
+#: ../mdkapplet:110 ../mdkapplet:164
 #, c-format
 msgid "Install updates"
 msgstr "התקן עדכונים"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:111
 #, c-format
 msgid "Configure the service"
 msgstr "הגדרת השרות"
 
-#: ../mdkapplet:110
+#: ../mdkapplet:112
 #, c-format
 msgid "Check Updates"
 msgstr "בדוק עדכונים"
 
-#: ../mdkapplet:111
+#: ../mdkapplet:113 ../mdkapplet:167 ../mdkapplet:225
+#, fuzzy, c-format
+msgid "Please Wait"
+msgstr "נא להמתין"
+
+#: ../mdkapplet:113 ../mdkapplet:166 ../mdkapplet:167 ../mdkapplet:225
+#, c-format
+msgid "Check updates"
+msgstr "בדוק עדכונים"
+
+#: ../mdkapplet:115
 #, c-format
 msgid "Online WebSite"
 msgstr "אתר מקוון"
 
-#: ../mdkapplet:112
+#: ../mdkapplet:116
 #, c-format
 msgid "Configure Network"
 msgstr "הגדר את הרשת"
 
-#: ../mdkapplet:113
+#: ../mdkapplet:117
 #, c-format
 msgid "Configure Now!"
 msgstr "הגדר כעת"
 
-#: ../mdkapplet:146
+#: ../mdkapplet:152 ../mdkapplet:229
 #, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "יישומון עדכוני מנדרייק-לינוקס"
 
-#: ../mdkapplet:156
+#: ../mdkapplet:162
 #, c-format
 msgid "Actions"
 msgstr "פעולות"
 
-#: ../mdkapplet:159
+#: ../mdkapplet:165
 #, c-format
 msgid "Configure"
 msgstr "הגדר"
 
-#: ../mdkapplet:160
-#, c-format
-msgid "Check updates"
-msgstr "בדוק עדכונים"
-
-#: ../mdkapplet:161
+#: ../mdkapplet:169
 #, c-format
 msgid "See logs"
 msgstr "צפה ברישומי המערכת"
 
-#: ../mdkapplet:164
+#: ../mdkapplet:172
 #, c-format
 msgid "Status"
 msgstr "מצב"
 
-#: ../mdkapplet:168 ../mdkapplet:363
+#: ../mdkapplet:176 ../mdkapplet:375
 #, c-format
 msgid "Close"
 msgstr "סגור"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Network Connection: "
 msgstr "חיבור רשת: "
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Up"
 msgstr "למעלה"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Down"
 msgstr "למטה"
 
-#: ../mdkapplet:204
+#: ../mdkapplet:212
 #, c-format
 msgid "Last check: "
 msgstr "בדיקה אחרונה:"
 
-#: ../mdkapplet:205
+#: ../mdkapplet:213
 #, c-format
 msgid "Updates: "
 msgstr "עדכונים: "
 
-#: ../mdkapplet:209
+#: ../mdkapplet:217
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "מפעיל את drakconnect\n"
 
-#: ../mdkapplet:213
+#: ../mdkapplet:221
 #, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "מפעיל את mdkupdate --applet\n"
 
-#: ../mdkapplet:217
+#: ../mdkapplet:224
 #, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr "נראה ש Mandrakeonline הותקן מחדש, טוען את היישומון ..."
 
-#: ../mdkapplet:225
+#: ../mdkapplet:235
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "מנתח עדכונים חדשים...\n"
 
-#: ../mdkapplet:227
+#: ../mdkapplet:237
 #, c-format
 msgid "Connecting to"
 msgstr "מתחבר אל"
 
-#: ../mdkapplet:250
+#: ../mdkapplet:244
+#, fuzzy, c-format
+msgid "Response from Mandrakeonline server\n"
+msgstr "ברוך בואך ל מנדרייק-אונליין"
+
+#: ../mdkapplet:262
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "בודק... יש עדכונים זמינים\n"
 
-#: ../mdkapplet:254
+#: ../mdkapplet:267
 #, c-format
 msgid "Development release not supported by service"
 msgstr "גרסאת פיתוח לא נתמכת על ידי שרות זה"
 
-#: ../mdkapplet:255
+#: ../mdkapplet:268
 #, c-format
 msgid "Too old release not supported by service"
 msgstr "גרסה ישנה מדי לא נתמכת בשרות זה"
 
-#: ../mdkapplet:256
+#: ../mdkapplet:269
 #, c-format
 msgid "Unknown state"
 msgstr "מצב לא מוכר"
 
-#: ../mdkapplet:257
+#: ../mdkapplet:270
 #, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr "השירותים המקוונים הופסקו. עליך להתעדכן באתר מנדרייק-אונליין\n"
 
-#: ../mdkapplet:258
+#: ../mdkapplet:271
 #, c-format
 msgid "Wrong Password.\n"
 msgstr "סיסמה שגוייה.\n"
 
-#: ../mdkapplet:259
+#: ../mdkapplet:272
 #, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr "הפעולה או שם מחשב או שם משתמש שגויים.\n"
 
-#: ../mdkapplet:260
+#: ../mdkapplet:273
 #, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
@@ -222,72 +232,82 @@ msgstr ""
 "כנראה קיימת בעיה עם הגדרות הרשת שלך )עליך לבדוק את ה routing, חומת האש "
 "והגדרות השרת המתווך)\n"
 
-#: ../mdkapplet:264
+#: ../mdkapplet:277
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "המערכת מעודכנת\n"
 
-#: ../mdkapplet:303
+#: ../mdkapplet:317
 #, c-format
 msgid "No check"
 msgstr "ללא בדיקה"
 
-#: ../mdkapplet:316
+#: ../mdkapplet:330
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "בודק זמינות רשת: אין תגובה\n"
 
-#: ../mdkapplet:319
+#: ../mdkapplet:333
 #, c-format
 msgid "Checking config file: Not present\n"
 msgstr "בודק קובץ הגדרות: לא קיים\n"
 
-#: ../mdkapplet:353
+#: ../mdkapplet:365
 #, c-format
 msgid "Logs"
 msgstr "רישומים"
 
-#: ../mdkapplet:369
+#: ../mdkapplet:381
 #, c-format
 msgid "Clear"
 msgstr "נקה"
 
-#: ../mdkapplet:396
+#: ../mdkapplet:408
 #, c-format
 msgid "About..."
 msgstr "אודות..."
 
-#: ../mdkapplet:397
+#: ../mdkapplet:409
 #, c-format
 msgid "Always launch on startup"
 msgstr "הפעל תמיד באתחול המערכת"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:411
 #, c-format
 msgid "Quit"
 msgstr "יציאה"
 
-#: ../mdkonline:89
+#: ../mdkonline:52 ../mdkonline:106
+#, c-format
+msgid "Mandrakeonline"
+msgstr "מנדרייק-אונליין"
+
+#: ../mdkonline:55
 #, c-format
-msgid "Next"
-msgstr "הבא"
+msgid "I already have an account"
+msgstr "כבר יש לי חשבון"
 
-#: ../mdkonline:89
+#: ../mdkonline:56
+#, c-format
+msgid "I want to subscribe"
+msgstr "ברצוני להרשם"
+
+#: ../mdkonline:89 ../mdkonline:93 ../mdkonline:131
 #, c-format
-msgid "Cancel"
-msgstr "ביטול"
+msgid "Please wait"
+msgstr "נא להמתין"
 
 #: ../mdkonline:89
 #, c-format
-msgid "Previous"
-msgstr "קודם"
+msgid "Reading configuration\n"
+msgstr "קורא את קובץ התצורה \n"
 
-#: ../mdkonline:103
+#: ../mdkonline:93
 #, c-format
-msgid "Welcome to Mandrakeonline"
-msgstr "ברוך בואך ל מנדרייק-אונליין"
+msgid "Sending configuration..."
+msgstr "שולח תצורה..."
 
-#: ../mdkonline:104 ../mdkonline_tui:98
+#: ../mdkonline:109
 #, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
@@ -298,62 +318,37 @@ msgstr ""
 "תצורת חומרה) לבסיס מידע מקוון במטרה לעדכן\n"
 "אותך אודות עדכוני אבטחה ושדרוגים שימושיים\n"
 
-#: ../mdkonline:105 ../mdkonline_tui:142
+#: ../mdkonline:114
 #, c-format
-msgid "Create a Mandrakeonline Account"
-msgstr "צור חשבון מנדרייק-אונליין"
+msgid "Account creation or authentication"
+msgstr "יצירת חשבון או הזדהות"
 
-#: ../mdkonline:107
+#: ../mdkonline:119
 #, c-format
-msgid "I don't have a Mandrakeonline account and I want to subscribe"
-msgstr "אין לי חשבון ב מנדרייק-אונליין וברצוני להרשם"
+msgid "Enter your Mandrakeonline login, password and machine name:"
+msgstr "עליך להכניס את שם המשתמש, הסיסמה ושם המחשב שלך במנדרייק-אונליין:"
 
-#: ../mdkonline:111 ../mdkonline:131 ../mdkonline_tui:114 ../mdkonline_tui:145
+#: ../mdkonline:125 ../mdkonline:156
 #, c-format
 msgid "Login:"
 msgstr "שם משתמש:"
 
-#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:115 ../mdkonline_tui:146
+#: ../mdkonline:126 ../mdkonline:157
 #, c-format
 msgid "Password:"
 msgstr "סיסמה:"
 
-#: ../mdkonline:113 ../mdkonline_tui:147
-#, c-format
-msgid "Confirm Password:"
-msgstr "אישור סיסמה:"
-
-#: ../mdkonline:114 ../mdkonline_tui:148
-#, c-format
-msgid "Mail contact:"
-msgstr "דוא\"ל קשר:"
-
-#: ../mdkonline:121
-#, c-format
-msgid "Mandrakelinux Privacy Policy"
-msgstr "הצהרת הפרטיות של מנדרייק-לינוקס"
-
 #: ../mdkonline:127
 #, c-format
-msgid "Authentification"
-msgstr "אימות"
-
-#: ../mdkonline:128 ../mdkonline_tui:108
-#, c-format
-msgid "Enter your Mandrakeonline login, password and machine name:"
-msgstr "עליך להכניס את שם המשתמש, הסיסמה ושם המחשב שלך במנדרייק-אונליין:"
-
-#: ../mdkonline:133 ../mdkonline_tui:116
-#, c-format
 msgid "Machine name:"
 msgstr "שם המחשב:"
 
-#: ../mdkonline:138
+#: ../mdkonline:131
 #, c-format
-msgid "Send Configuration"
-msgstr "שלח תצורה"
+msgid "Connecting to Mandrakeonline website..."
+msgstr "מתחבר לאתר מנדרייק-אונליין..."
 
-#: ../mdkonline:139 ../mdkonline_tui:128
+#: ../mdkonline:139
 #, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
@@ -384,55 +379,54 @@ msgstr ""
 "בנוסף, נאפשר לך ליהנות מהנחות עבור שירותי תמיכה הניתנים\n"
 "בתשלום באתר www.mandrakeexpert.com."
 
-#: ../mdkonline:144 ../mdkonline:211 ../mdkonline:234
+#: ../mdkonline:141 ../mdkonline:180 ../mdkupdate:126 ../mdkupdate:198
 #, c-format
-msgid "Finish"
-msgstr "סיום"
+msgid "Connection problem"
+msgstr "ההתחברות נכשלה"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid "Your upload was successful!"
-msgstr "העלאת הנתונים הסתימה בהצלחה"
+msgid "or"
+msgstr "או"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandrakeonline."
-msgstr ""
-"מעתה ישלחו לך עדכונים לגבי עדכוני אבטחה\n"
-"ועדכונים הודות למנדרייק-אונליין."
+msgid "wrong password:"
+msgstr "סיסמה שגוייה:"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
 msgid ""
-"Mandrakeonline offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+"Your login or password was wrong.\n"
+" Either you'll have to type it again, or you'll need to create an account on "
+"Mandrakeonline.\n"
+" In the latter case, go back to the first step to connect to "
+"Mandrakeonline.\n"
+" Be aware that you must also provide a Machine name \n"
+" (only alphabetical characters are admitted)"
 msgstr ""
-"מנדרייק-אונליין מאפשר לך לעדכן את מחשבך באופן אוטומטי.\n"
-"במערכת שלך תורץ תוכנה באופן סדיר שתחכה לעדכונים.\n"
-
-#: ../mdkonline:146
-#, c-format
-msgid "automated Upgrades"
-msgstr "שדרוגים אוטומטיים"
+"שם המשתמש שלך או הסיסמה שגויים. עליך להזין את\n"
+"הנתונים שנית או ליצור חשבון במנדרייק-אונליין.\n"
+"במקרה השני, עליך לחזור אחורה לצורך רישום לשירות\n"
+"המקוון מנדרייק-אונליין. לידיעתך, עליך לספק גם \n"
+"את שם המחשב (יש להשתמש באותיות בלבד)."
 
-#: ../mdkonline:150
+#: ../mdkonline:153
 #, c-format
-msgid "Country:"
-msgstr "מדינה:"
+msgid "Create a Mandrakeonline Account"
+msgstr "צור חשבון מנדרייק-אונליין"
 
-#: ../mdkonline:178 ../mdkonline:183 ../mdkonline:185 ../mdkonline:187
+#: ../mdkonline:158
 #, c-format
-msgid "Error"
-msgstr "שגיאה"
+msgid "Confirm Password:"
+msgstr "אישור סיסמה:"
 
-#: ../mdkonline:183 ../mdkonline_tui:152
+#: ../mdkonline:159
 #, c-format
-msgid "Please provide a login"
-msgstr "עליך לספק שם משתמש"
+msgid "Mail contact:"
+msgstr "דוא\"ל קשר:"
 
-#: ../mdkonline:185 ../mdkonline_tui:152
+#: ../mdkonline:163
 #, c-format
 msgid ""
 "The passwords do not match\n"
@@ -441,159 +435,116 @@ msgstr ""
 "הסיסמאות אינן תואמות\n"
 "עליך לנסות שנית\n"
 
-#: ../mdkonline:187 ../mdkonline_tui:152
+#: ../mdkonline:163
+#, c-format
+msgid "Please provide a login"
+msgstr "עליך לספק שם משתמש"
+
+#: ../mdkonline:163
 #, c-format
 msgid "Not a valid mail address!\n"
 msgstr "זו אינה כתובת דוא\"ל תקינה!\n"
 
-#: ../mdkonline:199 ../mdkonline_tui:78
+#: ../mdkonline:169
 #, c-format
-msgid "Reading configuration\n"
-msgstr "קורא את קובץ התצורה \n"
+msgid ""
+"Mandrakeonline Account successfully created.\n"
+"Please click \"Next\" to authenticate and upload your configuration\n"
+msgstr ""
+"חשבונך במנדרייק-אונליין הוקם בהצלחה.\n"
+"עליך ללחוץ על \"הבא\" בכדי להזדהות ולטעון את תצורת מחשבך\n"
 
-#: ../mdkonline:204 ../mdkonline_tui:82
+#: ../mdkonline:178
 #, c-format
-msgid "Sending configuration..."
-msgstr "שולח תצורה..."
+msgid "Your upload was successful!"
+msgstr "העלאת הנתונים הסתימה בהצלחה"
 
-#: ../mdkonline:213 ../mdkonline:273 ../mdkonline_tui:130 ../mdkonline_tui:169
-#: ../mdkupdate:124 ../mdkupdate:195
+#: ../mdkonline:178
 #, c-format
-msgid "Connection problem"
-msgstr "ההתחברות נכשלה"
+msgid ""
+"From now you will receive on security and updates \n"
+"announcements thanks to Mandrakeonline."
+msgstr ""
+"מעתה ישלחו לך עדכונים לגבי עדכוני אבטחה\n"
+"ועדכונים הודות למנדרייק-אונליין."
 
-#: ../mdkonline:213 ../mdkonline_tui:169
+#: ../mdkonline:178
+#, c-format
+msgid ""
+"Mandrakeonline offers you the ability to automate the updates.\n"
+"A program will run regulary in your system waiting for new updates\n"
+msgstr ""
+"מנדרייק-אונליין מאפשר לך לעדכן את מחשבך באופן אוטומטי.\n"
+"במערכת שלך תורץ תוכנה באופן סדיר שתחכה לעדכונים.\n"
+
+#: ../mdkonline:180
 #, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr "ישנה בעיה בעת העלאת קבצים, עליך לנסות שנית"
 
-#: ../mdkonline:251
+#: ../mdkonline:186
 #, c-format
-msgid "Quitting Wizard\n"
-msgstr "יוצא מהאשף\n"
+msgid "Country"
+msgstr "מדינה"
 
-#: ../mdkonline:273
+#: ../mdkonline:198
 #, c-format
-msgid "Mandrakeonline could not be contacted, please try again at a later time"
-msgstr "לא יכול להתחבר לאתר של מנדרייק-אונליין, עליך לנסות שוב מאוחר יותר"
+msgid "Congratulations"
+msgstr "ברכותינו"
 
-#: ../mdkonline:285
+#: ../mdkonline:198
 #, c-format
-msgid "Wrong password"
-msgstr "סיסמה שגוייה"
+msgid "Your Mandrakeonline account has been successfully configured\n"
+msgstr "חשבונך במנדרייק-אונליין הוגדר בהצלחה\n"
+
+#: ../mdkonline:214
+#, fuzzy, c-format
+msgid "Configuration uploaded successfully"
+msgstr "העלאת הנתונים הסתימה בהצלחה"
+
+#: ../mdkonline:215
+#, fuzzy, c-format
+msgid "Problem uploading configuration"
+msgstr "קורא את קובץ התצורה \n"
 
-#: ../mdkonline:285 ../mdkonline_tui:130
+#: ../mdkonline:216
 #, c-format
 msgid ""
-"Your login or password was wrong.\n"
-" Either you'll have to type it again, or you'll need to create an account on "
-"Mandrakeonline.\n"
-" In the latter case, go back to the first step to connect to "
-"Mandrakeonline.\n"
-" Be aware that you must also provide a Machine name \n"
-" (only alphabetical characters are admitted)"
+"Cannot connect to mandrakeonline website: wrong login/password or router/"
+"firewall bad settings"
 msgstr ""
-"שם המשתמש שלך או הסיסמה שגויים. עליך להזין את\n"
-"הנתונים שנית או ליצור חשבון במנדרייק-אונליין.\n"
-"במקרה השני, עליך לחזור אחורה לצורך רישום לשירות\n"
-"המקוון מנדרייק-אונליין. לידיעתך, עליך לספק גם \n"
-"את שם המחשב (יש להשתמש באותיות בלבד)."
 
-#: ../mdkonline.pm:58
+#: ../mdkonline.pm:66
 #, c-format
 msgid "Login and password should be less than 12 characters\n"
 msgstr "שם משתמש וסיסמה יכולים לכלול עד 12 תווים\n"
 
-#: ../mdkonline.pm:59
+#: ../mdkonline.pm:67
 #, c-format
 msgid "Special characters are not allowed\n"
 msgstr "אין להשתמש בתווים מיוחדים\n"
 
-#: ../mdkonline.pm:60
+#: ../mdkonline.pm:68
 #, c-format
 msgid "Please fill in all fields\n"
 msgstr "עליך למלא את כל השדות\n"
 
-#: ../mdkonline.pm:61
+#: ../mdkonline.pm:69
 #, c-format
 msgid "Email not valid\n"
 msgstr "כתובת דוא\"ל לא תקינה\n"
 
-#: ../mdkonline.pm:62
+#: ../mdkonline.pm:70
 #, c-format
 msgid "Account already exist\n"
 msgstr "חשבון זה כבר קיים\n"
 
-#: ../mdkonline.pm:68
+#: ../mdkonline.pm:76
 #, c-format
 msgid "Problem connecting to server \n"
 msgstr "חלה תקלה בחיבור לשרת\n"
 
-#: ../mdkonline_tui:45 ../mdkonline_tui:95
-#, c-format
-msgid "Mandrakeonline"
-msgstr "מנדרייק-אונליין"
-
-#: ../mdkonline_tui:48
-#, c-format
-msgid "I already have an account"
-msgstr "כבר יש לי חשבון"
-
-#: ../mdkonline_tui:49
-#, c-format
-msgid "I want to subscribe"
-msgstr "ברצוני להרשם"
-
-#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:120
-#, c-format
-msgid "Please wait"
-msgstr "נא להמתין"
-
-#: ../mdkonline_tui:103
-#, c-format
-msgid "Account creation or authentication"
-msgstr "יצירת חשבון או הזדהות"
-
-#: ../mdkonline_tui:120
-#, c-format
-msgid "Connecting to Mandrakeonline website..."
-msgstr "מתחבר לאתר מנדרייק-אונליין..."
-
-#: ../mdkonline_tui:130
-#, c-format
-msgid "or"
-msgstr "או"
-
-#: ../mdkonline_tui:130
-#, c-format
-msgid "wrong password:"
-msgstr "סיסמה שגוייה:"
-
-#: ../mdkonline_tui:158
-#, c-format
-msgid ""
-"Mandrakeonline Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-"חשבונך במנדרייק-אונליין הוקם בהצלחה.\n"
-"עליך ללחוץ על \"הבא\" בכדי להזדהות ולטעון את תצורת מחשבך\n"
-
-#: ../mdkonline_tui:175
-#, c-format
-msgid "Country"
-msgstr "מדינה"
-
-#: ../mdkonline_tui:187
-#, c-format
-msgid "Congratulations"
-msgstr "ברכותינו"
-
-#: ../mdkonline_tui:187
-#, c-format
-msgid "Your Mandrakeonline account has been successfully configured\n"
-msgstr "חשבונך במנדרייק-אונליין הוגדר בהצלחה\n"
-
-#: ../mdkupdate:50
+#: ../mdkupdate:52
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
@@ -609,43 +560,38 @@ msgstr ""
 "\n"
 "שימוש:\n"
 
-#: ../mdkupdate:55
+#: ../mdkupdate:57
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - הדפס הודעת עזרה זו.\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:58
 #, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto         -Mandrakeupdate יופעל אוטומטי \n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:59
 #, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - הרץ את Mandrakeupdate.\n"
 
-#: ../mdkupdate:58
-#, c-format
-msgid "  --update       - Update keys\n"
-msgstr "  --update       - עדכן את המפתחות.\n"
-
-#: ../mdkupdate:66
+#: ../mdkupdate:67
 #, c-format
 msgid "No %s file found. Run mdkonline wizard first"
 msgstr "לא נמצא קובץ %s, עליך להריץ קודם את האשף mdkonline"
 
-#: ../mdkupdate:124
+#: ../mdkupdate:126
 #, c-format
 msgid "Mandrakeupdate could not contact the site, we will try again."
 msgstr ""
 "אשף העדכונים לא הצליח להתחבר לאתר מנדרייק-אונליין, יש לנסות שוב מאוחר יותר."
 
-#: ../mdkupdate:173
+#: ../mdkupdate:176
 #, c-format
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr "לא ניתן לעדכן חבילות ממדיית mdkupdate.\n"
 
-#: ../mdkupdate:195
+#: ../mdkupdate:198
 #, c-format
 msgid ""
 "Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
@@ -653,3 +599,49 @@ msgid ""
 msgstr ""
 "אשף העדכונים לא הצליח לטעון את קבצי השינויים, עליך לפנות למרכז התמיכה בכתובת "
 "support [at] mandrakeonline [dot] net"
+
+#~ msgid "Next"
+#~ msgstr "הבא"
+
+#~ msgid "Cancel"
+#~ msgstr "ביטול"
+
+#~ msgid "Previous"
+#~ msgstr "קודם"
+
+#~ msgid "I don't have a Mandrakeonline account and I want to subscribe"
+#~ msgstr "אין לי חשבון ב מנדרייק-אונליין וברצוני להרשם"
+
+#~ msgid "Mandrakelinux Privacy Policy"
+#~ msgstr "הצהרת הפרטיות של מנדרייק-לינוקס"
+
+#~ msgid "Authentification"
+#~ msgstr "אימות"
+
+#~ msgid "Send Configuration"
+#~ msgstr "שלח תצורה"
+
+#~ msgid "Finish"
+#~ msgstr "סיום"
+
+#~ msgid "automated Upgrades"
+#~ msgstr "שדרוגים אוטומטיים"
+
+#~ msgid "Country:"
+#~ msgstr "מדינה:"
+
+#~ msgid "Error"
+#~ msgstr "שגיאה"
+
+#~ msgid "Quitting Wizard\n"
+#~ msgstr "יוצא מהאשף\n"
+
+#~ msgid ""
+#~ "Mandrakeonline could not be contacted, please try again at a later time"
+#~ msgstr "לא יכול להתחבר לאתר של מנדרייק-אונליין, עליך לנסות שוב מאוחר יותר"
+
+#~ msgid "Wrong password"
+#~ msgstr "סיסמה שגוייה"
+
+#~ msgid "  --update       - Update keys\n"
+#~ msgstr "  --update       - עדכן את המפתחות.\n"
diff --git a/po/hi.po b/po/hi.po
index a0ae9721..54f856be 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-hi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-01 22:41+0200\n"
+"POT-Creation-Date: 2004-11-03 12:10+0100\n"
 "PO-Revision-Date: 2004-08-22 20:32+0530\n"
 "Last-Translator: धनञ्जय शर्मा (Dhananjaya Sharma) <dysxhi@yahoo.co.in>\n"
 "Language-Team: Hindi, India <dysxhi@yahoo.co.in>\n"
@@ -18,12 +18,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3\n"
 
-#: ../mdkapplet:61
+#: ../mdkapplet:63
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "आपका तंत्र आज-तक अप-टू-डेट है"
 
-#: ../mdkapplet:67
+#: ../mdkapplet:69
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -32,189 +32,199 @@ msgstr ""
 "सेवा संरचना समस्या । कॄपया लॉग की जाँच करें और निम्न पते पर एक विपत्र संदेश भेजें "
 "support@mandrakeonline.net"
 
-#: ../mdkapplet:73
+#: ../mdkapplet:75
 #, c-format
 msgid "System is busy. Please wait ..."
 msgstr "तंत्र व्यस्त है । प्रतीक्षा करें ..."
 
-#: ../mdkapplet:79
+#: ../mdkapplet:81
 #, c-format
 msgid "New updates are available for your system"
 msgstr "आपके तंत्र हेतु नये अपडेट उपलब्ध है"
 
-#: ../mdkapplet:85
+#: ../mdkapplet:87
 #, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr "सेवा संरचित नहीं है । कृपया \"सेवा संरचना\" पर क्लिक करें"
 
-#: ../mdkapplet:91
+#: ../mdkapplet:93
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "नेटवर्क डॉउन है । कृपया अपने नेटवर्क की संरचना करें"
 
-#: ../mdkapplet:97
+#: ../mdkapplet:99
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "सेवा सक्रिय नहीं है । कृपया \"ऑनलाइन वेब-स्थल\" पर क्लिक करें"
 
-#: ../mdkapplet:103
+#: ../mdkapplet:105
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:108 ../mdkapplet:158
+#: ../mdkapplet:110 ../mdkapplet:164
 #, c-format
 msgid "Install updates"
 msgstr "अपडेटों का संसाधन"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:111
 #, c-format
 msgid "Configure the service"
 msgstr "सेवा की संरचना"
 
-#: ../mdkapplet:110
+#: ../mdkapplet:112
 #, c-format
 msgid "Check Updates"
 msgstr "अपडेटो की जाँच"
 
-#: ../mdkapplet:111
+#: ../mdkapplet:113 ../mdkapplet:167 ../mdkapplet:225
+#, fuzzy, c-format
+msgid "Please Wait"
+msgstr "कृपया प्रतीक्षा करें"
+
+#: ../mdkapplet:113 ../mdkapplet:166 ../mdkapplet:167 ../mdkapplet:225
+#, c-format
+msgid "Check updates"
+msgstr "अपडेटो की जाँच"
+
+#: ../mdkapplet:115
 #, c-format
 msgid "Online WebSite"
 msgstr "ऑनलाइन वेबस्थल"
 
-#: ../mdkapplet:112
+#: ../mdkapplet:116
 #, c-format
 msgid "Configure Network"
 msgstr "नेटवर्क की संरचना"
 
-#: ../mdkapplet:113
+#: ../mdkapplet:117
 #, c-format
 msgid "Configure Now!"
 msgstr "अभी संरचित करें!"
 
-#: ../mdkapplet:146
+#: ../mdkapplet:152 ../mdkapplet:229
 #, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "मैनड्रैक अपडेटो का एपलेट"
 
-#: ../mdkapplet:156
+#: ../mdkapplet:162
 #, c-format
 msgid "Actions"
 msgstr "कार्यवाहिया"
 
-#: ../mdkapplet:159
+#: ../mdkapplet:165
 #, c-format
 msgid "Configure"
 msgstr "संरचना"
 
-#: ../mdkapplet:160
-#, c-format
-msgid "Check updates"
-msgstr "अपडेटो की जाँच"
-
-#: ../mdkapplet:161
+#: ../mdkapplet:169
 #, c-format
 msgid "See logs"
 msgstr "लॉगो को देखना"
 
-#: ../mdkapplet:164
+#: ../mdkapplet:172
 #, c-format
 msgid "Status"
 msgstr "स्थिति"
 
-#: ../mdkapplet:168 ../mdkapplet:363
+#: ../mdkapplet:176 ../mdkapplet:375
 #, c-format
 msgid "Close"
 msgstr "बन्द"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Network Connection: "
 msgstr "नेटवर्क कनेक्शन: "
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Up"
 msgstr "ऊपर"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Down"
 msgstr "नीचे"
 
-#: ../mdkapplet:204
+#: ../mdkapplet:212
 #, c-format
 msgid "Last check: "
 msgstr "अंतिम जाँच: "
 
-#: ../mdkapplet:205
+#: ../mdkapplet:213
 #, c-format
 msgid "Updates: "
 msgstr "अपडेट्स: "
 
-#: ../mdkapplet:209
+#: ../mdkapplet:217
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "ड्रैककनेक्ट को आरम्भ किया जा रहा है\n"
 
-#: ../mdkapplet:213
+#: ../mdkapplet:221
 #, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "एमडीकेअपडेट को आरम्भ किया जा रहा है\n"
 
-#: ../mdkapplet:217
+#: ../mdkapplet:224
 #, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 "एमडीकेऑनलाइन का लगता है कि पुनः संसाधन किया गया है, एपलेट को पुनः लाया जा रहा "
 "है .... "
 
-#: ../mdkapplet:225
+#: ../mdkapplet:235
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "नये अपडेटो की गणना की जा रही है...\n"
 
-#: ../mdkapplet:227
+#: ../mdkapplet:237
 #, c-format
 msgid "Connecting to"
 msgstr "से सम्बन्ध स्थापित हो रहा है"
 
-#: ../mdkapplet:250
+#: ../mdkapplet:244
+#, fuzzy, c-format
+msgid "Response from Mandrakeonline server\n"
+msgstr "मैनड्रैकऑनलाइन में स्वागत"
+
+#: ../mdkapplet:262
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "जाँच की जा रही है... अपडेट्स उपलब्ध है\n"
 
-#: ../mdkapplet:254
+#: ../mdkapplet:267
 #, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
-#: ../mdkapplet:255
+#: ../mdkapplet:268
 #, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
-#: ../mdkapplet:256
+#: ../mdkapplet:269
 #, c-format
 msgid "Unknown state"
 msgstr "अज्ञात अवस्था"
 
-#: ../mdkapplet:257
+#: ../mdkapplet:270
 #, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr "ऑनलाइन सेवायें निष्क्रिय है । मैनड्रैकऑनलाइन स्थल से सम्पर्क करें\n"
 
-#: ../mdkapplet:258
+#: ../mdkapplet:271
 #, c-format
 msgid "Wrong Password.\n"
 msgstr "गलत कूटशब्द।\n"
 
-#: ../mdkapplet:259
+#: ../mdkapplet:272
 #, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr "गलत एक्शन या होस्ट या लॉग-इन।\n"
 
-#: ../mdkapplet:260
+#: ../mdkapplet:273
 #, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
@@ -223,72 +233,82 @@ msgstr ""
 "आपकी नेटवर्क समायोजनाओं में कुछ त्रुटि है (अपने पथ, अग्नि-भीतिका या प्रोक्सी समायोजनाओं की "
 "जाँच करें)\n"
 
-#: ../mdkapplet:264
+#: ../mdkapplet:277
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "तंत्र आज-तक अपडेट है\n"
 
-#: ../mdkapplet:303
+#: ../mdkapplet:317
 #, c-format
 msgid "No check"
 msgstr "कोई जाँच नहीं"
 
-#: ../mdkapplet:316
+#: ../mdkapplet:330
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "नेटवर्क की जाँच की जा रही है: लगता है निष्क्रिय है\n"
 
-#: ../mdkapplet:319
+#: ../mdkapplet:333
 #, c-format
 msgid "Checking config file: Not present\n"
 msgstr "कॉन्फ़िग संचिका की जाँच की जा रही है: विलुप्त है\n"
 
-#: ../mdkapplet:353
+#: ../mdkapplet:365
 #, c-format
 msgid "Logs"
 msgstr "रोज़नामचे"
 
-#: ../mdkapplet:369
+#: ../mdkapplet:381
 #, c-format
 msgid "Clear"
 msgstr "साफ़ करना "
 
-#: ../mdkapplet:396
+#: ../mdkapplet:408
 #, c-format
 msgid "About..."
 msgstr "के बारे में ।"
 
-#: ../mdkapplet:397
+#: ../mdkapplet:409
 #, c-format
 msgid "Always launch on startup"
 msgstr "शुरूवात में सदैव आरम्भ करें"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:411
 #, c-format
 msgid "Quit"
 msgstr "निकास"
 
-#: ../mdkonline:89
+#: ../mdkonline:52 ../mdkonline:106
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "मैनड्रैकऑनलाइन में स्वागत"
+
+#: ../mdkonline:55
 #, c-format
-msgid "Next"
-msgstr "अगला"
+msgid "I already have an account"
+msgstr ""
 
-#: ../mdkonline:89
+#: ../mdkonline:56
 #, c-format
-msgid "Cancel"
-msgstr "निरस्त"
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline:89 ../mdkonline:93 ../mdkonline:131
+#, c-format
+msgid "Please wait"
+msgstr "कृपया प्रतीक्षा करें"
 
 #: ../mdkonline:89
 #, c-format
-msgid "Previous"
-msgstr "पिछला"
+msgid "Reading configuration\n"
+msgstr "संरचना पढ़ी जा रही है\n"
 
-#: ../mdkonline:103
+#: ../mdkonline:93
 #, c-format
-msgid "Welcome to Mandrakeonline"
-msgstr "मैनड्रैकऑनलाइन में स्वागत"
+msgid "Sending configuration..."
+msgstr "संरचना के बारे में सूचित किया जा रहा है..."
 
-#: ../mdkonline:104 ../mdkonline_tui:98
+#: ../mdkonline:109
 #, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
@@ -299,62 +319,37 @@ msgstr ""
 "आपके तंत्र की संरचना को (पैकेजों, हार्डवेयर संरचना), एक केन्द्रीय डाटाबेस में\n"
 "अपलोड करने के लिए, यह सहायक आपकी सहायता करेगा ।\n"
 
-#: ../mdkonline:105 ../mdkonline_tui:142
+#: ../mdkonline:114
 #, c-format
-msgid "Create a Mandrakeonline Account"
-msgstr "एक मैनड्रैकऑनलाइन खाता खोलें"
+msgid "Account creation or authentication"
+msgstr ""
 
-#: ../mdkonline:107
-#, fuzzy, c-format
-msgid "I don't have a Mandrakeonline account and I want to subscribe"
-msgstr "मेरे पास एक मैनड्रैकऑनलाइन खाता नहीं है और मै चाहता हूँ "
+#: ../mdkonline:119
+#, c-format
+msgid "Enter your Mandrakeonline login, password and machine name:"
+msgstr "अपना मैनड्रैकऑनलाइन लॉग-इन, कूटशब्द और मशीन नाम बतायें:"
 
-#: ../mdkonline:111 ../mdkonline:131 ../mdkonline_tui:114 ../mdkonline_tui:145
+#: ../mdkonline:125 ../mdkonline:156
 #, c-format
 msgid "Login:"
 msgstr "लॉग-इन:"
 
-#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:115 ../mdkonline_tui:146
+#: ../mdkonline:126 ../mdkonline:157
 #, c-format
 msgid "Password:"
 msgstr "कूटशब्द: "
 
-#: ../mdkonline:113 ../mdkonline_tui:147
-#, c-format
-msgid "Confirm Password:"
-msgstr "कूटशब्द की संपुष्टि करें:"
-
-#: ../mdkonline:114 ../mdkonline_tui:148
-#, c-format
-msgid "Mail contact:"
-msgstr "विपत्र सम्पर्क:"
-
-#: ../mdkonline:121
-#, c-format
-msgid "Mandrakelinux Privacy Policy"
-msgstr "मैनड्रैक गोपनीयता नीति"
-
 #: ../mdkonline:127
 #, c-format
-msgid "Authentification"
-msgstr "प्रमाणीकरण"
-
-#: ../mdkonline:128 ../mdkonline_tui:108
-#, c-format
-msgid "Enter your Mandrakeonline login, password and machine name:"
-msgstr "अपना मैनड्रैकऑनलाइन लॉग-इन, कूटशब्द और मशीन नाम बतायें:"
-
-#: ../mdkonline:133 ../mdkonline_tui:116
-#, c-format
 msgid "Machine name:"
 msgstr "मशीन नाम:"
 
-#: ../mdkonline:138
-#, c-format
-msgid "Send Configuration"
-msgstr "संरचना भेजें"
+#: ../mdkonline:131
+#, fuzzy, c-format
+msgid "Connecting to Mandrakeonline website..."
+msgstr "मैनड्रैकऑनलाइन में स्वागत"
 
-#: ../mdkonline:139 ../mdkonline_tui:128
+#: ../mdkonline:139
 #, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
@@ -387,56 +382,55 @@ msgstr ""
 "और भी, www.mandrakeexpert.com से आप छूट-सहित पेड सहायता सेवाओं से \n"
 "लाभान्वित हो सकते है ।"
 
-#: ../mdkonline:144 ../mdkonline:211 ../mdkonline:234
-#, c-format
-msgid "Finish"
-msgstr "समाप्त"
-
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141 ../mdkonline:180 ../mdkupdate:126 ../mdkupdate:198
 #, c-format
-msgid "Your upload was successful!"
-msgstr "आपका अपलोड सफ़ल रहा था !"
+msgid "Connection problem"
+msgstr "सम्बन्ध स्थापन समस्या"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandrakeonline."
+msgid "or"
 msgstr ""
-"अब से आप सुरक्षा व अपडेटो की घोषणाओं को प्राप्त करेगें \n"
-"मैनड्रैकऑनलाइन को धन्यवाद।"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "गलत कूटशब्द"
+
+#: ../mdkonline:141
 #, c-format
 msgid ""
-"Mandrakeonline offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+"Your login or password was wrong.\n"
+" Either you'll have to type it again, or you'll need to create an account on "
+"Mandrakeonline.\n"
+" In the latter case, go back to the first step to connect to "
+"Mandrakeonline.\n"
+" Be aware that you must also provide a Machine name \n"
+" (only alphabetical characters are admitted)"
 msgstr ""
-"मैनड्रैकऑनलाइन आपको अपडेटो को स्वचालित रूप से करने की क्षमता प्रदान करने को प्रस्तावित "
-"करता है।\n"
-"आपके तंत्र में एक कार्यक्रम लगातार नये अपडेटो की प्रतीक्षा में चलता रहेगा\n"
-
-#: ../mdkonline:146
-#, c-format
-msgid "automated Upgrades"
-msgstr "स्वचालित किये हुए अपग्रेड"
+"आपका लॉग-इन या कूट-शब्द गलत था ।\n"
+" या तो आपको इसे पुनः टाइप करना पड़ेगा, या फ़िर आपको मैनड्रैकऑनलाइन पर एकखाता खोलना "
+"पड़ेगा ।\n"
+" दूसरे विकल्प का चयन करने के लिए, मैनड्रैकऑनलाइन से कनेक्ट होने के लिए,प्रथ चरण पर जायें।\n"
+" ध्यान रहें कि आपको एक मशीन का नाम भी प्रदान करना चाहिए\n"
+" (सिर्फ़ वर्णमाला अक्षरों को ही अनुमति है)"
 
-#: ../mdkonline:150
+#: ../mdkonline:153
 #, c-format
-msgid "Country:"
-msgstr "देश:"
+msgid "Create a Mandrakeonline Account"
+msgstr "एक मैनड्रैकऑनलाइन खाता खोलें"
 
-#: ../mdkonline:178 ../mdkonline:183 ../mdkonline:185 ../mdkonline:187
+#: ../mdkonline:158
 #, c-format
-msgid "Error"
-msgstr "त्रुटि"
+msgid "Confirm Password:"
+msgstr "कूटशब्द की संपुष्टि करें:"
 
-#: ../mdkonline:183 ../mdkonline_tui:152
+#: ../mdkonline:159
 #, c-format
-msgid "Please provide a login"
-msgstr "कृपया एक लॉग-इन प्रदान करें"
+msgid "Mail contact:"
+msgstr "विपत्र सम्पर्क:"
 
-#: ../mdkonline:185 ../mdkonline_tui:152
+#: ../mdkonline:163
 #, c-format
 msgid ""
 "The passwords do not match\n"
@@ -445,159 +439,115 @@ msgstr ""
 "कूटशब्द मेल नहीं खाते है\n"
 "कृपया पुनः प्रयास करें\n"
 
-#: ../mdkonline:187 ../mdkonline_tui:152
+#: ../mdkonline:163
+#, c-format
+msgid "Please provide a login"
+msgstr "कृपया एक लॉग-इन प्रदान करें"
+
+#: ../mdkonline:163
 #, c-format
 msgid "Not a valid mail address!\n"
 msgstr "एक वैध विपत्र पता नहीं!\n"
 
-#: ../mdkonline:199 ../mdkonline_tui:78
+#: ../mdkonline:169
 #, c-format
-msgid "Reading configuration\n"
-msgstr "संरचना पढ़ी जा रही है\n"
+msgid ""
+"Mandrakeonline Account successfully created.\n"
+"Please click \"Next\" to authenticate and upload your configuration\n"
+msgstr ""
 
-#: ../mdkonline:204 ../mdkonline_tui:82
+#: ../mdkonline:178
 #, c-format
-msgid "Sending configuration..."
-msgstr "संरचना के बारे में सूचित किया जा रहा है..."
+msgid "Your upload was successful!"
+msgstr "आपका अपलोड सफ़ल रहा था !"
 
-#: ../mdkonline:213 ../mdkonline:273 ../mdkonline_tui:130 ../mdkonline_tui:169
-#: ../mdkupdate:124 ../mdkupdate:195
+#: ../mdkonline:178
 #, c-format
-msgid "Connection problem"
-msgstr "सम्बन्ध स्थापन समस्या"
+msgid ""
+"From now you will receive on security and updates \n"
+"announcements thanks to Mandrakeonline."
+msgstr ""
+"अब से आप सुरक्षा व अपडेटो की घोषणाओं को प्राप्त करेगें \n"
+"मैनड्रैकऑनलाइन को धन्यवाद।"
 
-#: ../mdkonline:213 ../mdkonline_tui:169
+#: ../mdkonline:178
+#, c-format
+msgid ""
+"Mandrakeonline offers you the ability to automate the updates.\n"
+"A program will run regulary in your system waiting for new updates\n"
+msgstr ""
+"मैनड्रैकऑनलाइन आपको अपडेटो को स्वचालित रूप से करने की क्षमता प्रदान करने को प्रस्तावित "
+"करता है।\n"
+"आपके तंत्र में एक कार्यक्रम लगातार नये अपडेटो की प्रतीक्षा में चलता रहेगा\n"
+
+#: ../mdkonline:180
 #, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr "संचिकाओं को अपलोड करते समय समस्या हुई, कॄपया पुनः प्रयास करें"
 
-#: ../mdkonline:251
-#, c-format
-msgid "Quitting Wizard\n"
-msgstr "विजार्ड से बाहर निकला जा रहा है\n"
+#: ../mdkonline:186
+#, fuzzy, c-format
+msgid "Country"
+msgstr "देश:"
 
-#: ../mdkonline:273
+#: ../mdkonline:198
+#, fuzzy, c-format
+msgid "Congratulations"
+msgstr "संरचना भेजें"
+
+#: ../mdkonline:198
 #, c-format
-msgid "Mandrakeonline could not be contacted, please try again at a later time"
+msgid "Your Mandrakeonline account has been successfully configured\n"
 msgstr ""
-"मैनड्रैकऑनलाइन से सम्पर्क स्थापित नहीं हो पाया, कृपया कुछ समय उपरान्त पुनः प्रयास करें ।"
 
-#: ../mdkonline:285
-#, c-format
-msgid "Wrong password"
-msgstr "गलत कूटशब्द"
+#: ../mdkonline:214
+#, fuzzy, c-format
+msgid "Configuration uploaded successfully"
+msgstr "आपका अपलोड सफ़ल रहा था !"
 
-#: ../mdkonline:285 ../mdkonline_tui:130
+#: ../mdkonline:215
+#, fuzzy, c-format
+msgid "Problem uploading configuration"
+msgstr "संरचना पढ़ी जा रही है\n"
+
+#: ../mdkonline:216
 #, c-format
 msgid ""
-"Your login or password was wrong.\n"
-" Either you'll have to type it again, or you'll need to create an account on "
-"Mandrakeonline.\n"
-" In the latter case, go back to the first step to connect to "
-"Mandrakeonline.\n"
-" Be aware that you must also provide a Machine name \n"
-" (only alphabetical characters are admitted)"
+"Cannot connect to mandrakeonline website: wrong login/password or router/"
+"firewall bad settings"
 msgstr ""
-"आपका लॉग-इन या कूट-शब्द गलत था ।\n"
-" या तो आपको इसे पुनः टाइप करना पड़ेगा, या फ़िर आपको मैनड्रैकऑनलाइन पर एकखाता खोलना "
-"पड़ेगा ।\n"
-" दूसरे विकल्प का चयन करने के लिए, मैनड्रैकऑनलाइन से कनेक्ट होने के लिए,प्रथ चरण पर जायें।\n"
-" ध्यान रहें कि आपको एक मशीन का नाम भी प्रदान करना चाहिए\n"
-" (सिर्फ़ वर्णमाला अक्षरों को ही अनुमति है)"
 
-#: ../mdkonline.pm:58
+#: ../mdkonline.pm:66
 #, c-format
 msgid "Login and password should be less than 12 characters\n"
 msgstr ""
 
-#: ../mdkonline.pm:59
+#: ../mdkonline.pm:67
 #, c-format
 msgid "Special characters are not allowed\n"
 msgstr ""
 
-#: ../mdkonline.pm:60
+#: ../mdkonline.pm:68
 #, c-format
 msgid "Please fill in all fields\n"
 msgstr ""
 
-#: ../mdkonline.pm:61
+#: ../mdkonline.pm:69
 #, c-format
 msgid "Email not valid\n"
 msgstr ""
 
-#: ../mdkonline.pm:62
+#: ../mdkonline.pm:70
 #, c-format
 msgid "Account already exist\n"
 msgstr ""
 
-#: ../mdkonline.pm:68
+#: ../mdkonline.pm:76
 #, c-format
 msgid "Problem connecting to server \n"
 msgstr "सर्वर के साथ सम्पर्क करने में समस्या \n"
 
-#: ../mdkonline_tui:45 ../mdkonline_tui:95
-#, fuzzy, c-format
-msgid "Mandrakeonline"
-msgstr "मैनड्रैकऑनलाइन में स्वागत"
-
-#: ../mdkonline_tui:48
-#, c-format
-msgid "I already have an account"
-msgstr ""
-
-#: ../mdkonline_tui:49
-#, c-format
-msgid "I want to subscribe"
-msgstr ""
-
-#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:120
-#, c-format
-msgid "Please wait"
-msgstr "कृपया प्रतीक्षा करें"
-
-#: ../mdkonline_tui:103
-#, c-format
-msgid "Account creation or authentication"
-msgstr ""
-
-#: ../mdkonline_tui:120
-#, fuzzy, c-format
-msgid "Connecting to Mandrakeonline website..."
-msgstr "मैनड्रैकऑनलाइन में स्वागत"
-
-#: ../mdkonline_tui:130
-#, c-format
-msgid "or"
-msgstr ""
-
-#: ../mdkonline_tui:130
-#, fuzzy, c-format
-msgid "wrong password:"
-msgstr "गलत कूटशब्द"
-
-#: ../mdkonline_tui:158
-#, c-format
-msgid ""
-"Mandrakeonline Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-
-#: ../mdkonline_tui:175
-#, fuzzy, c-format
-msgid "Country"
-msgstr "देश:"
-
-#: ../mdkonline_tui:187
-#, fuzzy, c-format
-msgid "Congratulations"
-msgstr "संरचना भेजें"
-
-#: ../mdkonline_tui:187
-#, c-format
-msgid "Your Mandrakeonline account has been successfully configured\n"
-msgstr ""
-
-#: ../mdkupdate:50
+#: ../mdkupdate:52
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
@@ -614,49 +564,92 @@ msgstr ""
 "\n"
 "प्रयोग:\n"
 
-#: ../mdkupdate:55
+#: ../mdkupdate:57
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - यह सहायता संदेश छापें ।\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:58
 #, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto         - एमडीकेअपडेट का स्वचालित रूप से शुरू होना ।\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:59
 #, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - मैनड्रैकअपडेट की शुरूवात।\n"
 
-#: ../mdkupdate:58
-#, c-format
-msgid "  --update       - Update keys\n"
-msgstr "  --update       - कुँजियों को अपडेट करना\n"
-
-#: ../mdkupdate:66
+#: ../mdkupdate:67
 #, c-format
 msgid "No %s file found. Run mdkonline wizard first"
 msgstr ""
 
-#: ../mdkupdate:124
+#: ../mdkupdate:126
 #, fuzzy, c-format
 msgid "Mandrakeupdate could not contact the site, we will try again."
 msgstr ""
 "मैनड्रैकऑनलाइन से सम्पर्क स्थापित नहीं हो पाया, कृपया कुछ समय उपरान्त पुनः प्रयास करें ।"
 
-#: ../mdkupdate:173
+#: ../mdkupdate:176
 #, c-format
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr ""
 
-#: ../mdkupdate:195
+#: ../mdkupdate:198
 #, c-format
 msgid ""
 "Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
 "mandrakeonline [dot] net"
 msgstr ""
 
+#~ msgid "Next"
+#~ msgstr "अगला"
+
+#~ msgid "Cancel"
+#~ msgstr "निरस्त"
+
+#~ msgid "Previous"
+#~ msgstr "पिछला"
+
+#, fuzzy
+#~ msgid "I don't have a Mandrakeonline account and I want to subscribe"
+#~ msgstr "मेरे पास एक मैनड्रैकऑनलाइन खाता नहीं है और मै चाहता हूँ "
+
+#~ msgid "Mandrakelinux Privacy Policy"
+#~ msgstr "मैनड्रैक गोपनीयता नीति"
+
+#~ msgid "Authentification"
+#~ msgstr "प्रमाणीकरण"
+
+#~ msgid "Send Configuration"
+#~ msgstr "संरचना भेजें"
+
+#~ msgid "Finish"
+#~ msgstr "समाप्त"
+
+#~ msgid "automated Upgrades"
+#~ msgstr "स्वचालित किये हुए अपग्रेड"
+
+#~ msgid "Country:"
+#~ msgstr "देश:"
+
+#~ msgid "Error"
+#~ msgstr "त्रुटि"
+
+#~ msgid "Quitting Wizard\n"
+#~ msgstr "विजार्ड से बाहर निकला जा रहा है\n"
+
+#~ msgid ""
+#~ "Mandrakeonline could not be contacted, please try again at a later time"
+#~ msgstr ""
+#~ "मैनड्रैकऑनलाइन से सम्पर्क स्थापित नहीं हो पाया, कृपया कुछ समय उपरान्त पुनः प्रयास करें ।"
+
+#~ msgid "Wrong password"
+#~ msgstr "गलत कूटशब्द"
+
+#~ msgid "  --update       - Update keys\n"
+#~ msgstr "  --update       - कुँजियों को अपडेट करना\n"
+
 #~ msgid "Skip Wizard"
 #~ msgstr "विज़ार्ड को छोड़ कर आगे बढ़े"
 
diff --git a/po/hr.po b/po/hr.po
index 61adf230..1105968d 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-01 22:41+0200\n"
+"POT-Creation-Date: 2004-11-03 12:10+0100\n"
 "PO-Revision-Date: 2002-03-13 01:47CET\n"
 "Last-Translator: Matija Blagus <Matija.Blagus@public.srce.hr>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -16,12 +16,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.8\n"
 
-#: ../mdkapplet:61
+#: ../mdkapplet:63
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Vaš sistem je ažuran"
 
-#: ../mdkapplet:67
+#: ../mdkapplet:69
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -30,187 +30,197 @@ msgstr ""
 "Problem s konfiguracijom servisa. Molimo provjerite logove i pošaljite mail "
 "na support@mandrakeonline.net"
 
-#: ../mdkapplet:73
+#: ../mdkapplet:75
 #, c-format
 msgid "System is busy. Please wait ..."
 msgstr "Sistem je zauzet. Molimo pričekajte ..."
 
-#: ../mdkapplet:79
+#: ../mdkapplet:81
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Nema novih datoteka dostupnih za Vas sistem!"
 
-#: ../mdkapplet:85
+#: ../mdkapplet:87
 #, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr "Servis nije podešen. Molimo kliknite na \"Configure the service\""
 
-#: ../mdkapplet:91
+#: ../mdkapplet:93
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Mreža je pala. Molimo podesite mrežu"
 
-#: ../mdkapplet:97
+#: ../mdkapplet:99
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Servis nije aktivan. Molimo kliknite na \"Online Website\""
 
-#: ../mdkapplet:103
+#: ../mdkapplet:105
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:108 ../mdkapplet:158
+#: ../mdkapplet:110 ../mdkapplet:164
 #, fuzzy, c-format
 msgid "Install updates"
 msgstr "Instaliraj zakrpe"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:111
 #, c-format
 msgid "Configure the service"
 msgstr "Podesi servise"
 
-#: ../mdkapplet:110
+#: ../mdkapplet:112
 #, c-format
 msgid "Check Updates"
 msgstr "Provjeri nadogradnje"
 
-#: ../mdkapplet:111
+#: ../mdkapplet:113 ../mdkapplet:167 ../mdkapplet:225
+#, fuzzy, c-format
+msgid "Please Wait"
+msgstr "Molim pričekajte"
+
+#: ../mdkapplet:113 ../mdkapplet:166 ../mdkapplet:167 ../mdkapplet:225
+#, c-format
+msgid "Check updates"
+msgstr "Provjeri nadogradnje"
+
+#: ../mdkapplet:115
 #, c-format
 msgid "Online WebSite"
 msgstr "Online web stranica"
 
-#: ../mdkapplet:112
+#: ../mdkapplet:116
 #, c-format
 msgid "Configure Network"
 msgstr "Podesi mrežu"
 
-#: ../mdkapplet:113
+#: ../mdkapplet:117
 #, c-format
 msgid "Configure Now!"
 msgstr "Podesi sada"
 
-#: ../mdkapplet:146
+#: ../mdkapplet:152 ../mdkapplet:229
 #, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Mandrakelinux nadograđuje applete"
 
-#: ../mdkapplet:156
+#: ../mdkapplet:162
 #, c-format
 msgid "Actions"
 msgstr "Akcije"
 
-#: ../mdkapplet:159
+#: ../mdkapplet:165
 #, c-format
 msgid "Configure"
 msgstr "Podesi"
 
-#: ../mdkapplet:160
-#, c-format
-msgid "Check updates"
-msgstr "Provjeri nadogradnje"
-
-#: ../mdkapplet:161
+#: ../mdkapplet:169
 #, c-format
 msgid "See logs"
 msgstr "Vidi logove"
 
-#: ../mdkapplet:164
+#: ../mdkapplet:172
 #, c-format
 msgid "Status"
 msgstr "Stanje"
 
-#: ../mdkapplet:168 ../mdkapplet:363
+#: ../mdkapplet:176 ../mdkapplet:375
 #, c-format
 msgid "Close"
 msgstr "Zatvori"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Network Connection: "
 msgstr "Mrežne veze:"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Up"
 msgstr "Gore"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Down"
 msgstr "Dolje"
 
-#: ../mdkapplet:204
+#: ../mdkapplet:212
 #, c-format
 msgid "Last check: "
 msgstr "Posljednja provjera:"
 
-#: ../mdkapplet:205
+#: ../mdkapplet:213
 #, c-format
 msgid "Updates: "
 msgstr "Nadogradnje:"
 
-#: ../mdkapplet:209
+#: ../mdkapplet:217
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Pokrećem drakconnect\n"
 
-#: ../mdkapplet:213
+#: ../mdkapplet:221
 #, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "Pokrećem mdkupdate --aplet\n"
 
-#: ../mdkapplet:217
+#: ../mdkapplet:224
 #, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr "Mandrakeonline se čini da je reinstaliran, ponovo pokrećem aplet ... "
 
-#: ../mdkapplet:225
+#: ../mdkapplet:235
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Proračunavam nove nadogradnje...\n"
 
-#: ../mdkapplet:227
+#: ../mdkapplet:237
 #, fuzzy, c-format
 msgid "Connecting to"
 msgstr "Povezujem se sa"
 
-#: ../mdkapplet:250
+#: ../mdkapplet:244
+#, fuzzy, c-format
+msgid "Response from Mandrakeonline server\n"
+msgstr "Dobro došli u MandrakeOnLine"
+
+#: ../mdkapplet:262
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Provjeravam... Nadogradnje su dostupne\n"
 
-#: ../mdkapplet:254
+#: ../mdkapplet:267
 #, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
-#: ../mdkapplet:255
+#: ../mdkapplet:268
 #, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
-#: ../mdkapplet:256
+#: ../mdkapplet:269
 #, fuzzy, c-format
 msgid "Unknown state"
 msgstr "Nepoznato stanje"
 
-#: ../mdkapplet:257
+#: ../mdkapplet:270
 #, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr "Online servis je isključen. Kontaktirajte Mandrakeonline stranicu\n"
 
-#: ../mdkapplet:258
+#: ../mdkapplet:271
 #, c-format
 msgid "Wrong Password.\n"
 msgstr "Kriva lozinka.\n"
 
-#: ../mdkapplet:259
+#: ../mdkapplet:272
 #, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr "Kriva akcija, host ili login.\n"
 
-#: ../mdkapplet:260
+#: ../mdkapplet:273
 #, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
@@ -219,72 +229,82 @@ msgstr ""
 "Nešto nije u redu s Vašim mrežnim postavkama (provjerite router, firewall "
 "ili postavke proxya)\n"
 
-#: ../mdkapplet:264
+#: ../mdkapplet:277
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Sistem je nadograđen\n"
 
-#: ../mdkapplet:303
+#: ../mdkapplet:317
 #, c-format
 msgid "No check"
 msgstr "Ne provjeravaj"
 
-#: ../mdkapplet:316
+#: ../mdkapplet:330
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Provjeravam mreži: čini se da je isključena\n"
 
-#: ../mdkapplet:319
+#: ../mdkapplet:333
 #, c-format
 msgid "Checking config file: Not present\n"
 msgstr "Provjeravam config datoteku: Nije prisutna\n"
 
-#: ../mdkapplet:353
+#: ../mdkapplet:365
 #, c-format
 msgid "Logs"
 msgstr "Zapisi"
 
-#: ../mdkapplet:369
+#: ../mdkapplet:381
 #, c-format
 msgid "Clear"
 msgstr "Očisti"
 
-#: ../mdkapplet:396
+#: ../mdkapplet:408
 #, c-format
 msgid "About..."
 msgstr "O programu..."
 
-#: ../mdkapplet:397
+#: ../mdkapplet:409
 #, c-format
 msgid "Always launch on startup"
 msgstr "Pokreni pri podizanju sustava"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:411
 #, c-format
 msgid "Quit"
 msgstr "Izlaz"
 
-#: ../mdkonline:89
+#: ../mdkonline:52 ../mdkonline:106
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "Dobro došli u MandrakeOnLine"
+
+#: ../mdkonline:55
 #, c-format
-msgid "Next"
-msgstr "Slijedeće"
+msgid "I already have an account"
+msgstr ""
 
-#: ../mdkonline:89
+#: ../mdkonline:56
 #, c-format
-msgid "Cancel"
-msgstr "Odustani"
+msgid "I want to subscribe"
+msgstr ""
 
-#: ../mdkonline:89
+#: ../mdkonline:89 ../mdkonline:93 ../mdkonline:131
 #, c-format
-msgid "Previous"
-msgstr "Prijašnje"
+msgid "Please wait"
+msgstr "Molim pričekajte"
 
-#: ../mdkonline:103
+#: ../mdkonline:89
 #, c-format
-msgid "Welcome to Mandrakeonline"
-msgstr "Dobro došli u MandrakeOnLine"
+msgid "Reading configuration\n"
+msgstr "Čitam postavke\n"
+
+#: ../mdkonline:93
+#, fuzzy, c-format
+msgid "Sending configuration..."
+msgstr "Čitam postavke\n"
 
-#: ../mdkonline:104 ../mdkonline_tui:98
+#: ../mdkonline:109
 #, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
@@ -295,62 +315,37 @@ msgstr ""
 "(pakete, hardwaresku konfiguraciju) u centralnu bazu kako\n"
 "bih vas mogli informirati o sigurnosnim i korisnim dogradnjama.\n"
 
-#: ../mdkonline:105 ../mdkonline_tui:142
+#: ../mdkonline:114
 #, c-format
-msgid "Create a Mandrakeonline Account"
-msgstr "Napravi MandrakeOnLine račun"
+msgid "Account creation or authentication"
+msgstr ""
 
-#: ../mdkonline:107
-#, fuzzy, c-format
-msgid "I don't have a Mandrakeonline account and I want to subscribe"
-msgstr "Nemam Mandrakeonline račun i želim "
+#: ../mdkonline:119
+#, c-format
+msgid "Enter your Mandrakeonline login, password and machine name:"
+msgstr "Unesite vaš Mandrakeonline login,lozinku i ime računala:"
 
-#: ../mdkonline:111 ../mdkonline:131 ../mdkonline_tui:114 ../mdkonline_tui:145
+#: ../mdkonline:125 ../mdkonline:156
 #, c-format
 msgid "Login:"
 msgstr "Login:"
 
-#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:115 ../mdkonline_tui:146
+#: ../mdkonline:126 ../mdkonline:157
 #, c-format
 msgid "Password:"
 msgstr "Lozinka:"
 
-#: ../mdkonline:113 ../mdkonline_tui:147
-#, c-format
-msgid "Confirm Password:"
-msgstr "Provjera lozinke:"
-
-#: ../mdkonline:114 ../mdkonline_tui:148
-#, c-format
-msgid "Mail contact:"
-msgstr "Mail adresa:"
-
-#: ../mdkonline:121
-#, c-format
-msgid "Mandrakelinux Privacy Policy"
-msgstr "Mandrakelinux Polica Privatnosti"
-
 #: ../mdkonline:127
 #, c-format
-msgid "Authentification"
-msgstr "Autentifikacija"
-
-#: ../mdkonline:128 ../mdkonline_tui:108
-#, c-format
-msgid "Enter your Mandrakeonline login, password and machine name:"
-msgstr "Unesite vaš Mandrakeonline login,lozinku i ime računala:"
-
-#: ../mdkonline:133 ../mdkonline_tui:116
-#, c-format
 msgid "Machine name:"
 msgstr "Ime računala:"
 
-#: ../mdkonline:138
-#, c-format
-msgid "Send Configuration"
-msgstr "Šaljem postavke"
+#: ../mdkonline:131
+#, fuzzy, c-format
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Dobro došli u MandrakeOnLine"
 
-#: ../mdkonline:139 ../mdkonline_tui:128
+#: ../mdkonline:139
 #, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
@@ -383,55 +378,56 @@ msgstr ""
 "Dalje, imate koristi od snižene cijene podrške na\n"
 "www.mandrakeexpert.com."
 
-#: ../mdkonline:144 ../mdkonline:211 ../mdkonline:234
-#, c-format
-msgid "Finish"
-msgstr "Završi"
-
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141 ../mdkonline:180 ../mdkupdate:126 ../mdkupdate:198
 #, c-format
-msgid "Your upload was successful!"
-msgstr "Vaše slanje je bilo uspješno!"
+msgid "Connection problem"
+msgstr "Problem s vezom"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandrakeonline."
+msgid "or"
 msgstr ""
-"Od sada ćete primati obavijesti o sigurnosti\n"
-"i dogradnjama zahvaljujući Mandrakeonlineu."
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "Kriva lozinka"
+
+#: ../mdkonline:141
 #, c-format
 msgid ""
-"Mandrakeonline offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+"Your login or password was wrong.\n"
+" Either you'll have to type it again, or you'll need to create an account on "
+"Mandrakeonline.\n"
+" In the latter case, go back to the first step to connect to "
+"Mandrakeonline.\n"
+" Be aware that you must also provide a Machine name \n"
+" (only alphabetical characters are admitted)"
 msgstr ""
-"Mandrakeonline nudi vam mogućnost automatiziranja dogradnji.\n"
-"Program će se pokrenuti redovno na vašem sustavu čekajući nove dogradnje\n"
-
-#: ../mdkonline:146
-#, c-format
-msgid "automated Upgrades"
-msgstr "automatizirane Dogradnje"
+"Vaš login ili lozinka su pogrešni.\n"
+" Ili ih trebate unijeti ponovno, ili trebate napraviti račun na "
+"Mandrakeonline.\n"
+" Ukoliko je ovaj posljednji slučaj, vratite se na prvi korak za\n"
+"spajanje na Mandrakeonline.\n"
+" Budite upozoreni da morate također omogućiti ime računala \n"
+" (samo alfabetski karakteri se priznaju)"
 
-#: ../mdkonline:150
+#: ../mdkonline:153
 #, c-format
-msgid "Country:"
-msgstr "Država:"
+msgid "Create a Mandrakeonline Account"
+msgstr "Napravi MandrakeOnLine račun"
 
-#: ../mdkonline:178 ../mdkonline:183 ../mdkonline:185 ../mdkonline:187
+#: ../mdkonline:158
 #, c-format
-msgid "Error"
-msgstr "Greška"
+msgid "Confirm Password:"
+msgstr "Provjera lozinke:"
 
-#: ../mdkonline:183 ../mdkonline_tui:152
+#: ../mdkonline:159
 #, c-format
-msgid "Please provide a login"
-msgstr "Molim upišite korisničko ime"
+msgid "Mail contact:"
+msgstr "Mail adresa:"
 
-#: ../mdkonline:185 ../mdkonline_tui:152
+#: ../mdkonline:163
 #, c-format
 msgid ""
 "The passwords do not match\n"
@@ -440,160 +436,114 @@ msgstr ""
 "Lozinke se ne podudaraju\n"
 "Molimo pokušajte ponovo\n"
 
-#: ../mdkonline:187 ../mdkonline_tui:152
+#: ../mdkonline:163
+#, c-format
+msgid "Please provide a login"
+msgstr "Molim upišite korisničko ime"
+
+#: ../mdkonline:163
 #, c-format
 msgid "Not a valid mail address!\n"
 msgstr "Unesite ispravnu adresu molim!\n"
 
-#: ../mdkonline:199 ../mdkonline_tui:78
+#: ../mdkonline:169
 #, c-format
-msgid "Reading configuration\n"
-msgstr "Čitam postavke\n"
+msgid ""
+"Mandrakeonline Account successfully created.\n"
+"Please click \"Next\" to authenticate and upload your configuration\n"
+msgstr ""
 
-#: ../mdkonline:204 ../mdkonline_tui:82
-#, fuzzy, c-format
-msgid "Sending configuration..."
-msgstr "Čitam postavke\n"
+#: ../mdkonline:178
+#, c-format
+msgid "Your upload was successful!"
+msgstr "Vaše slanje je bilo uspješno!"
 
-#: ../mdkonline:213 ../mdkonline:273 ../mdkonline_tui:130 ../mdkonline_tui:169
-#: ../mdkupdate:124 ../mdkupdate:195
+#: ../mdkonline:178
 #, c-format
-msgid "Connection problem"
-msgstr "Problem s vezom"
+msgid ""
+"From now you will receive on security and updates \n"
+"announcements thanks to Mandrakeonline."
+msgstr ""
+"Od sada ćete primati obavijesti o sigurnosti\n"
+"i dogradnjama zahvaljujući Mandrakeonlineu."
+
+#: ../mdkonline:178
+#, c-format
+msgid ""
+"Mandrakeonline offers you the ability to automate the updates.\n"
+"A program will run regulary in your system waiting for new updates\n"
+msgstr ""
+"Mandrakeonline nudi vam mogućnost automatiziranja dogradnji.\n"
+"Program će se pokrenuti redovno na vašem sustavu čekajući nove dogradnje\n"
 
-#: ../mdkonline:213 ../mdkonline_tui:169
+#: ../mdkonline:180
 #, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr "Problem kod uploada datoteka, molimo pokušajte ponovo"
 
-#: ../mdkonline:251
+#: ../mdkonline:186
 #, c-format
-msgid "Quitting Wizard\n"
-msgstr "Izlazim iz čarobnjaka\n"
+msgid "Country"
+msgstr "Country"
+
+#: ../mdkonline:198
+#, fuzzy, c-format
+msgid "Congratulations"
+msgstr "Šaljem postavke"
 
-#: ../mdkonline:273
+#: ../mdkonline:198
 #, c-format
-msgid "Mandrakeonline could not be contacted, please try again at a later time"
+msgid "Your Mandrakeonline account has been successfully configured\n"
 msgstr ""
-"Mandrakeonline ne može biti kontaktiran, molimo probajte ponovno kasnije"
 
-#: ../mdkonline:285
-#, c-format
-msgid "Wrong password"
-msgstr "Kriva lozinka"
+#: ../mdkonline:214
+#, fuzzy, c-format
+msgid "Configuration uploaded successfully"
+msgstr "Vaše slanje je bilo uspješno!"
+
+#: ../mdkonline:215
+#, fuzzy, c-format
+msgid "Problem uploading configuration"
+msgstr "Čitam postavke\n"
 
-#: ../mdkonline:285 ../mdkonline_tui:130
+#: ../mdkonline:216
 #, c-format
 msgid ""
-"Your login or password was wrong.\n"
-" Either you'll have to type it again, or you'll need to create an account on "
-"Mandrakeonline.\n"
-" In the latter case, go back to the first step to connect to "
-"Mandrakeonline.\n"
-" Be aware that you must also provide a Machine name \n"
-" (only alphabetical characters are admitted)"
+"Cannot connect to mandrakeonline website: wrong login/password or router/"
+"firewall bad settings"
 msgstr ""
-"Vaš login ili lozinka su pogrešni.\n"
-" Ili ih trebate unijeti ponovno, ili trebate napraviti račun na "
-"Mandrakeonline.\n"
-" Ukoliko je ovaj posljednji slučaj, vratite se na prvi korak za\n"
-"spajanje na Mandrakeonline.\n"
-" Budite upozoreni da morate također omogućiti ime računala \n"
-" (samo alfabetski karakteri se priznaju)"
 
-#: ../mdkonline.pm:58
+#: ../mdkonline.pm:66
 #, c-format
 msgid "Login and password should be less than 12 characters\n"
 msgstr ""
 
-#: ../mdkonline.pm:59
+#: ../mdkonline.pm:67
 #, c-format
 msgid "Special characters are not allowed\n"
 msgstr ""
 
-#: ../mdkonline.pm:60
+#: ../mdkonline.pm:68
 #, c-format
 msgid "Please fill in all fields\n"
 msgstr ""
 
-#: ../mdkonline.pm:61
+#: ../mdkonline.pm:69
 #, c-format
 msgid "Email not valid\n"
 msgstr ""
 
-#: ../mdkonline.pm:62
+#: ../mdkonline.pm:70
 #, c-format
 msgid "Account already exist\n"
 msgstr ""
 
-#: ../mdkonline.pm:68
+#: ../mdkonline.pm:76
 #, c-format
 msgid "Problem connecting to server \n"
 msgstr "Problem pri povezivanju na server \n"
 
-#: ../mdkonline_tui:45 ../mdkonline_tui:95
-#, fuzzy, c-format
-msgid "Mandrakeonline"
-msgstr "Dobro došli u MandrakeOnLine"
-
-#: ../mdkonline_tui:48
-#, c-format
-msgid "I already have an account"
-msgstr ""
-
-#: ../mdkonline_tui:49
-#, c-format
-msgid "I want to subscribe"
-msgstr ""
-
-#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:120
-#, c-format
-msgid "Please wait"
-msgstr "Molim pričekajte"
-
-#: ../mdkonline_tui:103
-#, c-format
-msgid "Account creation or authentication"
-msgstr ""
-
-#: ../mdkonline_tui:120
-#, fuzzy, c-format
-msgid "Connecting to Mandrakeonline website..."
-msgstr "Dobro došli u MandrakeOnLine"
-
-#: ../mdkonline_tui:130
-#, c-format
-msgid "or"
-msgstr ""
-
-#: ../mdkonline_tui:130
-#, fuzzy, c-format
-msgid "wrong password:"
-msgstr "Kriva lozinka"
-
-#: ../mdkonline_tui:158
-#, c-format
-msgid ""
-"Mandrakeonline Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-
-#: ../mdkonline_tui:175
-#, c-format
-msgid "Country"
-msgstr "Country"
-
-#: ../mdkonline_tui:187
-#, fuzzy, c-format
-msgid "Congratulations"
-msgstr "Šaljem postavke"
-
-#: ../mdkonline_tui:187
-#, c-format
-msgid "Your Mandrakeonline account has been successfully configured\n"
-msgstr ""
-
-#: ../mdkupdate:50
+#: ../mdkupdate:52
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
@@ -604,49 +554,92 @@ msgid ""
 "usage:\n"
 msgstr ""
 
-#: ../mdkupdate:55
+#: ../mdkupdate:57
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help           - ispiši ovaj tekst s pomoći.\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:58
 #, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto       - Mandrakeupdate pokrenuto automatski.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:59
 #, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --aplet       - pokreni Mandrakeupdate.\n"
 
-#: ../mdkupdate:58
-#, c-format
-msgid "  --update       - Update keys\n"
-msgstr "  --update       - nadogradnja ključeva.\n"
-
-#: ../mdkupdate:66
+#: ../mdkupdate:67
 #, c-format
 msgid "No %s file found. Run mdkonline wizard first"
 msgstr ""
 
-#: ../mdkupdate:124
+#: ../mdkupdate:126
 #, fuzzy, c-format
 msgid "Mandrakeupdate could not contact the site, we will try again."
 msgstr ""
 "Mandrakeonline ne može biti kontaktiran, molimo probajte ponovno kasnije"
 
-#: ../mdkupdate:173
+#: ../mdkupdate:176
 #, c-format
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr ""
 
-#: ../mdkupdate:195
+#: ../mdkupdate:198
 #, c-format
 msgid ""
 "Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
 "mandrakeonline [dot] net"
 msgstr ""
 
+#~ msgid "Next"
+#~ msgstr "Slijedeće"
+
+#~ msgid "Cancel"
+#~ msgstr "Odustani"
+
+#~ msgid "Previous"
+#~ msgstr "Prijašnje"
+
+#, fuzzy
+#~ msgid "I don't have a Mandrakeonline account and I want to subscribe"
+#~ msgstr "Nemam Mandrakeonline račun i želim "
+
+#~ msgid "Mandrakelinux Privacy Policy"
+#~ msgstr "Mandrakelinux Polica Privatnosti"
+
+#~ msgid "Authentification"
+#~ msgstr "Autentifikacija"
+
+#~ msgid "Send Configuration"
+#~ msgstr "Šaljem postavke"
+
+#~ msgid "Finish"
+#~ msgstr "Završi"
+
+#~ msgid "automated Upgrades"
+#~ msgstr "automatizirane Dogradnje"
+
+#~ msgid "Country:"
+#~ msgstr "Država:"
+
+#~ msgid "Error"
+#~ msgstr "Greška"
+
+#~ msgid "Quitting Wizard\n"
+#~ msgstr "Izlazim iz čarobnjaka\n"
+
+#~ msgid ""
+#~ "Mandrakeonline could not be contacted, please try again at a later time"
+#~ msgstr ""
+#~ "Mandrakeonline ne može biti kontaktiran, molimo probajte ponovno kasnije"
+
+#~ msgid "Wrong password"
+#~ msgstr "Kriva lozinka"
+
+#~ msgid "  --update       - Update keys\n"
+#~ msgstr "  --update       - nadogradnja ključeva.\n"
+
 #~ msgid "Skip Wizard"
 #~ msgstr "Preskoči čarobnjaka"
 
diff --git a/po/hu.po b/po/hu.po
index cb2db5fb..2a35e548 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline 0.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-01 22:41+0200\n"
+"POT-Creation-Date: 2004-11-03 12:10+0100\n"
 "PO-Revision-Date: 2004-10-02 11:09+0200\n"
 "Last-Translator: Arpad Biro <biro_arpad@yahoo.com>\n"
 "Language-Team: Hungarian\n"
@@ -16,12 +16,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3\n"
 
-#: ../mdkapplet:61
+#: ../mdkapplet:63
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "A rendszer naprakész"
 
-#: ../mdkapplet:67
+#: ../mdkapplet:69
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -30,196 +30,206 @@ msgstr ""
 "Szolgáltatásbeállítási probléma; ellenőrizze a naplókat és küldjön levelet a "
 "következő címre: support@mandrakeonline.net"
 
-#: ../mdkapplet:73
+#: ../mdkapplet:75
 #, c-format
 msgid "System is busy. Please wait ..."
 msgstr "Kis türelmet - a rendszer egy feldolgozást végez..."
 
-#: ../mdkapplet:79
+#: ../mdkapplet:81
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Elérhetők frissítések az Ön rendszeréhez"
 
-#: ../mdkapplet:85
+#: ../mdkapplet:87
 #, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr ""
 "A szolgáltatás nincs beállítva. Kattintson \"A szolgáltatás beállítása\" "
 "funkcióra."
 
-#: ../mdkapplet:91
+#: ../mdkapplet:93
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "A hálózat nem aktív. Állítsa be a hálózatot."
 
-#: ../mdkapplet:97
+#: ../mdkapplet:99
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 "A szolgáltatás nincs aktiválva. Kattintson az \"Online weboldal\" funkcióra."
 
-#: ../mdkapplet:103
+#: ../mdkapplet:105
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "Nem támogatott verzió (túl régi, vagy fejlesztői verzió)"
 
 # "Rendszerfrissítések telepítése" volt a 8.2-ben,
 #  ebből az utolsó 2 betű nem fért ki
-#: ../mdkapplet:108 ../mdkapplet:158
+#: ../mdkapplet:110 ../mdkapplet:164
 #, c-format
 msgid "Install updates"
 msgstr "Frissítések telepítése"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:111
 #, c-format
 msgid "Configure the service"
 msgstr "A szolgáltatás beállítása"
 
-#: ../mdkapplet:110
+#: ../mdkapplet:112
 #, c-format
 msgid "Check Updates"
 msgstr "Frissítések keresése"
 
-#: ../mdkapplet:111
+#: ../mdkapplet:113 ../mdkapplet:167 ../mdkapplet:225
+#, fuzzy, c-format
+msgid "Please Wait"
+msgstr "Kis türelmet"
+
+#: ../mdkapplet:113 ../mdkapplet:166 ../mdkapplet:167 ../mdkapplet:225
+#, c-format
+msgid "Check updates"
+msgstr "Frissítések keresése"
+
+#: ../mdkapplet:115
 #, c-format
 msgid "Online WebSite"
 msgstr "Online weboldal"
 
-#: ../mdkapplet:112
+#: ../mdkapplet:116
 #, c-format
 msgid "Configure Network"
 msgstr "A hálózat beállítása"
 
-#: ../mdkapplet:113
+#: ../mdkapplet:117
 #, c-format
 msgid "Configure Now!"
 msgstr "Beállítás most"
 
-#: ../mdkapplet:146
+#: ../mdkapplet:152 ../mdkapplet:229
 #, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Mandrakelinux-frissítési alkalmazás"
 
-#: ../mdkapplet:156
+#: ../mdkapplet:162
 #, c-format
 msgid "Actions"
 msgstr "Műveletek"
 
-#: ../mdkapplet:159
+#: ../mdkapplet:165
 #, c-format
 msgid "Configure"
 msgstr "Beállítás"
 
-#: ../mdkapplet:160
-#, c-format
-msgid "Check updates"
-msgstr "Frissítések keresése"
-
-#: ../mdkapplet:161
+#: ../mdkapplet:169
 #, c-format
 msgid "See logs"
 msgstr "Információ a naplóban"
 
-#: ../mdkapplet:164
+#: ../mdkapplet:172
 #, c-format
 msgid "Status"
 msgstr "Állapot"
 
-#: ../mdkapplet:168 ../mdkapplet:363
+#: ../mdkapplet:176 ../mdkapplet:375
 #, c-format
 msgid "Close"
 msgstr "Bezárás"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Network Connection: "
 msgstr "Hálózati kapcsolat: "
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Up"
 msgstr "Aktív"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Down"
 msgstr "Inaktív"
 
-#: ../mdkapplet:204
+#: ../mdkapplet:212
 #, c-format
 msgid "Last check: "
 msgstr "Legutóbbi ellenőrzés: "
 
-#: ../mdkapplet:205
+#: ../mdkapplet:213
 #, c-format
 msgid "Updates: "
 msgstr "Frissítések: "
 
-#: ../mdkapplet:209
+#: ../mdkapplet:217
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "A DrakConnect indítása\n"
 
-#: ../mdkapplet:213
+#: ../mdkapplet:221
 #, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "\"mdkupdate --applet\" indítása\n"
 
-#: ../mdkapplet:217
+#: ../mdkapplet:224
 #, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 "Úgy tűnik, a Mandrakeonline újra lett telepítve - az alkalmazás "
 "újratöltése..."
 
-#: ../mdkapplet:225
+#: ../mdkapplet:235
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Új frissítések meghatározása...\n"
 
-#: ../mdkapplet:227
+#: ../mdkapplet:237
 #, c-format
 msgid "Connecting to"
 msgstr "Kapcsolódás:"
 
-#: ../mdkapplet:250
+#: ../mdkapplet:244
+#, fuzzy, c-format
+msgid "Response from Mandrakeonline server\n"
+msgstr "Üdvözli a Mandrakeonline!"
+
+#: ../mdkapplet:262
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Ellenőrzés... vannak elérhető frissítések\n"
 
-#: ../mdkapplet:254
+#: ../mdkapplet:267
 #, c-format
 msgid "Development release not supported by service"
 msgstr "A szolgáltatás nem támogat fejlesztői verziókat"
 
-#: ../mdkapplet:255
+#: ../mdkapplet:268
 #, c-format
 msgid "Too old release not supported by service"
 msgstr "Túl régi, a szolgáltatás által nem támogatott verzió"
 
-#: ../mdkapplet:256
+#: ../mdkapplet:269
 #, c-format
 msgid "Unknown state"
 msgstr "Ismeretlen állapot"
 
-#: ../mdkapplet:257
+#: ../mdkapplet:270
 #, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr ""
 "Az online szolgáltatások inaktiválva vannak. Lépjen kapcsolatba a "
 "Mandrakeonline weboldallal.\n"
 
-#: ../mdkapplet:258
+#: ../mdkapplet:271
 #, c-format
 msgid "Wrong Password.\n"
 msgstr "Helytelen jelszó.\n"
 
-#: ../mdkapplet:259
+#: ../mdkapplet:272
 #, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr "Helytelen művelet, gép, vagy bejelentkezési név.\n"
 
-#: ../mdkapplet:260
+#: ../mdkapplet:273
 #, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
@@ -228,72 +238,82 @@ msgstr ""
 "A hálózatbeállítások nem megfelelők (ellenőrizze az útválasztást, a tűzfalat "
 "és a proxybeállításokat).\n"
 
-#: ../mdkapplet:264
+#: ../mdkapplet:277
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "A rendszer naprakész.\n"
 
-#: ../mdkapplet:303
+#: ../mdkapplet:317
 #, c-format
 msgid "No check"
 msgstr "Nincs ellenőrzés"
 
-#: ../mdkapplet:316
+#: ../mdkapplet:330
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "A hálózat ellenőrzése: úgy tűnik, nem aktív\n"
 
-#: ../mdkapplet:319
+#: ../mdkapplet:333
 #, c-format
 msgid "Checking config file: Not present\n"
 msgstr "Beállításfájl ellenőrzése: nem található\n"
 
-#: ../mdkapplet:353
+#: ../mdkapplet:365
 #, c-format
 msgid "Logs"
 msgstr "Naplók"
 
-#: ../mdkapplet:369
+#: ../mdkapplet:381
 #, c-format
 msgid "Clear"
 msgstr "Törlés"
 
-#: ../mdkapplet:396
+#: ../mdkapplet:408
 #, c-format
 msgid "About..."
 msgstr "Névjegy..."
 
-#: ../mdkapplet:397
+#: ../mdkapplet:409
 #, c-format
 msgid "Always launch on startup"
 msgstr "Minden rendszerindításnál induljon el"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:411
 #, c-format
 msgid "Quit"
 msgstr "Kilépés"
 
-#: ../mdkonline:89
+#: ../mdkonline:52 ../mdkonline:106
 #, c-format
-msgid "Next"
-msgstr "Következő"
+msgid "Mandrakeonline"
+msgstr "Mandrakeonline"
 
-#: ../mdkonline:89
+#: ../mdkonline:55
+#, c-format
+msgid "I already have an account"
+msgstr "Már van azonosítóm"
+
+#: ../mdkonline:56
+#, c-format
+msgid "I want to subscribe"
+msgstr "Szeretnék feliratkozni"
+
+#: ../mdkonline:89 ../mdkonline:93 ../mdkonline:131
 #, c-format
-msgid "Cancel"
-msgstr "Mégsem"
+msgid "Please wait"
+msgstr "Kis türelmet"
 
 #: ../mdkonline:89
 #, c-format
-msgid "Previous"
-msgstr "Előző"
+msgid "Reading configuration\n"
+msgstr "Konfiguráció beolvasása\n"
 
-#: ../mdkonline:103
+#: ../mdkonline:93
 #, c-format
-msgid "Welcome to Mandrakeonline"
-msgstr "Üdvözli a Mandrakeonline"
+msgid "Sending configuration..."
+msgstr "Konfiguráció küldése..."
 
-#: ../mdkonline:104 ../mdkonline_tui:98
+#: ../mdkonline:109
 #, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
@@ -304,64 +324,37 @@ msgstr ""
 "(csomagok és hardverkonfiguráció) egy központi adatbázisba annak érdekében,\n"
 "hogy informálhassuk a biztonsági és egyéb frissítésekről.\n"
 
-#: ../mdkonline:105 ../mdkonline_tui:142
+#: ../mdkonline:114
 #, c-format
-msgid "Create a Mandrakeonline Account"
-msgstr "Mandrakeonline-azonosító létrehozása"
+msgid "Account creation or authentication"
+msgstr "Azonosító létrehozása vagy azonosítás"
 
-# a sztring jelentése: nincs azonosítója, és szeretne egyet
-# a Mandrakeonline tulajdonnevet nem szabad lefordítani
-#: ../mdkonline:107
+#: ../mdkonline:119
 #, c-format
-msgid "I don't have a Mandrakeonline account and I want to subscribe"
-msgstr "Nincs Mandrakeonline-azonosítóm, és szeretnék feliratkozni"
+msgid "Enter your Mandrakeonline login, password and machine name:"
+msgstr "Adja meg Mandrakeonline-azonosítóját, jelszavát és a gépnevet:"
 
-#: ../mdkonline:111 ../mdkonline:131 ../mdkonline_tui:114 ../mdkonline_tui:145
+#: ../mdkonline:125 ../mdkonline:156
 #, c-format
 msgid "Login:"
 msgstr "Azonosító:"
 
-#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:115 ../mdkonline_tui:146
+#: ../mdkonline:126 ../mdkonline:157
 #, c-format
 msgid "Password:"
 msgstr "Jelszó:"
 
-#: ../mdkonline:113 ../mdkonline_tui:147
-#, c-format
-msgid "Confirm Password:"
-msgstr "Jelszó (még egyszer):"
-
-#: ../mdkonline:114 ../mdkonline_tui:148
-#, c-format
-msgid "Mail contact:"
-msgstr "Levélcím:"
-
-#: ../mdkonline:121
-#, c-format
-msgid "Mandrakelinux Privacy Policy"
-msgstr "Mandrakelinux adatvédelmi elvek"
-
 #: ../mdkonline:127
 #, c-format
-msgid "Authentification"
-msgstr "Azonosítás"
-
-#: ../mdkonline:128 ../mdkonline_tui:108
-#, c-format
-msgid "Enter your Mandrakeonline login, password and machine name:"
-msgstr "Adja meg Mandrakeonline-azonosítóját, jelszavát és a gépnevet:"
-
-#: ../mdkonline:133 ../mdkonline_tui:116
-#, c-format
 msgid "Machine name:"
 msgstr "Gépnév:"
 
-#: ../mdkonline:138
+#: ../mdkonline:131
 #, c-format
-msgid "Send Configuration"
-msgstr "Konfiguráció elküldése"
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Kapcsolódás a Mandrakeonline weboldalhoz..."
 
-#: ../mdkonline:139 ../mdkonline_tui:128
+#: ../mdkonline:139
 #, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
@@ -396,55 +389,55 @@ msgstr ""
 "hogy a megszokottnál kedvezőbb feltételekkel vegye igénybe a\n"
 "www.mandrakeexpert.com honlapon elérhető szolgáltatásokat."
 
-#: ../mdkonline:144 ../mdkonline:211 ../mdkonline:234
+#: ../mdkonline:141 ../mdkonline:180 ../mdkupdate:126 ../mdkupdate:198
 #, c-format
-msgid "Finish"
-msgstr "Befejezés"
+msgid "Connection problem"
+msgstr "Kapcsolati hiba"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid "Your upload was successful!"
-msgstr "A feltöltés sikeresen megtörtént."
+msgid "or"
+msgstr "vagy"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandrakeonline."
-msgstr ""
-"Mostantól kezdve információkat fog kapni a biztonsági\n"
-"és egyéb frissítésekről - a Mandrakeonline-nak köszönhetően."
+msgid "wrong password:"
+msgstr "helytelen jelszó:"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
 msgid ""
-"Mandrakeonline offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+"Your login or password was wrong.\n"
+" Either you'll have to type it again, or you'll need to create an account on "
+"Mandrakeonline.\n"
+" In the latter case, go back to the first step to connect to "
+"Mandrakeonline.\n"
+" Be aware that you must also provide a Machine name \n"
+" (only alphabetical characters are admitted)"
 msgstr ""
-"A Mandrakeonline lehetőséget nyújt a frissítések automatizálására.\n"
-"Egy program fog futni rendszeresen az Ön gépén, a frissítéseket figyelve.\n"
-
-#: ../mdkonline:146
-#, c-format
-msgid "automated Upgrades"
-msgstr "automatizált frissítések"
+"A bejelentkezési név vagy a jelszó helytelen.\n"
+"Gépelje be újra; ha viszont nincs létrehozva ilyen felhasználónév a "
+"Mandrakeonline-on, akkor létre kell hozni azt.\n"
+"Az utóbbi esetben lépjen vissza az első lépéshez, hogy kapcsolódhasson a "
+"Mandrakeonline-hoz.\n"
+"Egy gépnevet is meg kell adnia; a név csak normál betűket tartalmazhat."
 
-#: ../mdkonline:150
+#: ../mdkonline:153
 #, c-format
-msgid "Country:"
-msgstr "Ország:"
+msgid "Create a Mandrakeonline Account"
+msgstr "Mandrakeonline-azonosító létrehozása"
 
-#: ../mdkonline:178 ../mdkonline:183 ../mdkonline:185 ../mdkonline:187
+#: ../mdkonline:158
 #, c-format
-msgid "Error"
-msgstr "Hiba"
+msgid "Confirm Password:"
+msgstr "Jelszó (még egyszer):"
 
-#: ../mdkonline:183 ../mdkonline_tui:152
+#: ../mdkonline:159
 #, c-format
-msgid "Please provide a login"
-msgstr "Adjon meg egy azonosítót"
+msgid "Mail contact:"
+msgstr "Levélcím:"
 
-#: ../mdkonline:185 ../mdkonline_tui:152
+#: ../mdkonline:163
 #, c-format
 msgid ""
 "The passwords do not match\n"
@@ -453,164 +446,119 @@ msgstr ""
 "A jelszavak nem egyeznek meg.\n"
 "Adja meg azokat még egyszer.\n"
 
-#: ../mdkonline:187 ../mdkonline_tui:152
+#: ../mdkonline:163
+#, c-format
+msgid "Please provide a login"
+msgstr "Adjon meg egy azonosítót"
+
+#: ../mdkonline:163
 #, c-format
 msgid "Not a valid mail address!\n"
 msgstr "Helytelen levélcím.\n"
 
-#: ../mdkonline:199 ../mdkonline_tui:78
+#: ../mdkonline:169
 #, c-format
-msgid "Reading configuration\n"
-msgstr "Konfiguráció beolvasása\n"
+msgid ""
+"Mandrakeonline Account successfully created.\n"
+"Please click \"Next\" to authenticate and upload your configuration\n"
+msgstr ""
+"A Mandrakeonline-azonosító létrehozása megtörtént.\n"
+"A felhasználóazonosításhoz és a beállítások feltöltéséhez kattintson a "
+"\"Következő\" gombra.\n"
 
-#: ../mdkonline:204 ../mdkonline_tui:82
+#: ../mdkonline:178
 #, c-format
-msgid "Sending configuration..."
-msgstr "Konfiguráció küldése..."
+msgid "Your upload was successful!"
+msgstr "A feltöltés sikeresen megtörtént."
 
-#: ../mdkonline:213 ../mdkonline:273 ../mdkonline_tui:130 ../mdkonline_tui:169
-#: ../mdkupdate:124 ../mdkupdate:195
+#: ../mdkonline:178
 #, c-format
-msgid "Connection problem"
-msgstr "Kapcsolati hiba"
+msgid ""
+"From now you will receive on security and updates \n"
+"announcements thanks to Mandrakeonline."
+msgstr ""
+"Mostantól kezdve információkat fog kapni a biztonsági\n"
+"és egyéb frissítésekről - a Mandrakeonline-nak köszönhetően."
+
+#: ../mdkonline:178
+#, c-format
+msgid ""
+"Mandrakeonline offers you the ability to automate the updates.\n"
+"A program will run regulary in your system waiting for new updates\n"
+msgstr ""
+"A Mandrakeonline lehetőséget nyújt a frissítések automatizálására.\n"
+"Egy program fog futni rendszeresen az Ön gépén, a frissítéseket figyelve.\n"
 
-#: ../mdkonline:213 ../mdkonline_tui:169
+#: ../mdkonline:180
 #, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr "A fájlok feltöltésénél probléma lépett fel - próbálja meg ismét."
 
-#: ../mdkonline:251
+#: ../mdkonline:186
 #, c-format
-msgid "Quitting Wizard\n"
-msgstr "Kilépés a Varázslóból\n"
+msgid "Country"
+msgstr "Ország"
 
-#: ../mdkonline:273
+#: ../mdkonline:198
 #, c-format
-msgid "Mandrakeonline could not be contacted, please try again at a later time"
-msgstr ""
-"Nem sikerült kapcsolatba lépni a Mandrakeonline-nal; próbálja meg később."
+msgid "Congratulations"
+msgstr "Gratulálunk"
 
-#: ../mdkonline:285
+#: ../mdkonline:198
 #, c-format
-msgid "Wrong password"
-msgstr "Helytelen jelszó"
+msgid "Your Mandrakeonline account has been successfully configured\n"
+msgstr "A Mandrakeonline-azonosító beállítása megtörtént\n"
+
+#: ../mdkonline:214
+#, fuzzy, c-format
+msgid "Configuration uploaded successfully"
+msgstr "A feltöltés sikeresen megtörtént."
 
-#: ../mdkonline:285 ../mdkonline_tui:130
+#: ../mdkonline:215
+#, fuzzy, c-format
+msgid "Problem uploading configuration"
+msgstr "Konfiguráció beolvasása\n"
+
+#: ../mdkonline:216
 #, c-format
 msgid ""
-"Your login or password was wrong.\n"
-" Either you'll have to type it again, or you'll need to create an account on "
-"Mandrakeonline.\n"
-" In the latter case, go back to the first step to connect to "
-"Mandrakeonline.\n"
-" Be aware that you must also provide a Machine name \n"
-" (only alphabetical characters are admitted)"
+"Cannot connect to mandrakeonline website: wrong login/password or router/"
+"firewall bad settings"
 msgstr ""
-"A bejelentkezési név vagy a jelszó helytelen.\n"
-"Gépelje be újra; ha viszont nincs létrehozva ilyen felhasználónév a "
-"Mandrakeonline-on, akkor létre kell hozni azt.\n"
-"Az utóbbi esetben lépjen vissza az első lépéshez, hogy kapcsolódhasson a "
-"Mandrakeonline-hoz.\n"
-"Egy gépnevet is meg kell adnia; a név csak normál betűket tartalmazhat."
 
-#: ../mdkonline.pm:58
+#: ../mdkonline.pm:66
 #, c-format
 msgid "Login and password should be less than 12 characters\n"
 msgstr ""
 "A bejelentkezési névnek és a jelszónak 12 karakternél rövidebbnek kell "
 "lennie\n"
 
-#: ../mdkonline.pm:59
+#: ../mdkonline.pm:67
 #, c-format
 msgid "Special characters are not allowed\n"
 msgstr "Speciális karakterek nem használhatók\n"
 
-#: ../mdkonline.pm:60
+#: ../mdkonline.pm:68
 #, c-format
 msgid "Please fill in all fields\n"
 msgstr "Töltse ki az összes mezőt\n"
 
-#: ../mdkonline.pm:61
+#: ../mdkonline.pm:69
 #, c-format
 msgid "Email not valid\n"
 msgstr "Az email-cím érvénytelen\n"
 
-#: ../mdkonline.pm:62
+#: ../mdkonline.pm:70
 #, c-format
 msgid "Account already exist\n"
 msgstr "Ilyen azonosító már létezik\n"
 
-#: ../mdkonline.pm:68
+#: ../mdkonline.pm:76
 #, c-format
 msgid "Problem connecting to server \n"
 msgstr "Probléma a kiszolgálóhoz való kapcsolódáskor \n"
 
-#: ../mdkonline_tui:45 ../mdkonline_tui:95
-#, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
-
-#: ../mdkonline_tui:48
-#, c-format
-msgid "I already have an account"
-msgstr "Már van azonosítóm"
-
-#: ../mdkonline_tui:49
-#, c-format
-msgid "I want to subscribe"
-msgstr "Szeretnék feliratkozni"
-
-#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:120
-#, c-format
-msgid "Please wait"
-msgstr "Kis türelmet"
-
-#: ../mdkonline_tui:103
-#, c-format
-msgid "Account creation or authentication"
-msgstr "Azonosító létrehozása vagy azonosítás"
-
-#: ../mdkonline_tui:120
-#, c-format
-msgid "Connecting to Mandrakeonline website..."
-msgstr "Kapcsolódás a Mandrakeonline weboldalhoz..."
-
-#: ../mdkonline_tui:130
-#, c-format
-msgid "or"
-msgstr "vagy"
-
-#: ../mdkonline_tui:130
-#, c-format
-msgid "wrong password:"
-msgstr "helytelen jelszó:"
-
-#: ../mdkonline_tui:158
-#, c-format
-msgid ""
-"Mandrakeonline Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-"A Mandrakeonline-azonosító létrehozása megtörtént.\n"
-"A felhasználóazonosításhoz és a beállítások feltöltéséhez kattintson a "
-"\"Következő\" gombra.\n"
-
-#: ../mdkonline_tui:175
-#, c-format
-msgid "Country"
-msgstr "Ország"
-
-#: ../mdkonline_tui:187
-#, c-format
-msgid "Congratulations"
-msgstr "Gratulálunk"
-
-#: ../mdkonline_tui:187
-#, c-format
-msgid "Your Mandrakeonline account has been successfully configured\n"
-msgstr "A Mandrakeonline-azonosító beállítása megtörtént\n"
-
-#: ../mdkupdate:50
+#: ../mdkupdate:52
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
@@ -626,42 +574,37 @@ msgstr ""
 "\n"
 "Használat:\n"
 
-#: ../mdkupdate:55
+#: ../mdkupdate:57
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - jelen segítség megjelenítése\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:58
 #, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto         - Mandrakeupdate automatikus indítása\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:59
 #, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - Mandrakeupdate indítása\n"
 
-#: ../mdkupdate:58
-#, c-format
-msgid "  --update       - Update keys\n"
-msgstr "  --update       - kulcsok frissítése\n"
-
-#: ../mdkupdate:66
+#: ../mdkupdate:67
 #, c-format
 msgid "No %s file found. Run mdkonline wizard first"
 msgstr "%s fájl nem található. Futtassa a Mandrakeonline varázslót."
 
-#: ../mdkupdate:124
+#: ../mdkupdate:126
 #, c-format
 msgid "Mandrakeupdate could not contact the site, we will try again."
 msgstr "A Mandrakeupdate nem tudott kapcsolatba lépni a géppel; újabb próba."
 
-#: ../mdkupdate:173
+#: ../mdkupdate:176
 #, c-format
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr "A csomagok Mandrakeupdate-adatforrásból való frissítése sikertelen.\n"
 
-#: ../mdkupdate:195
+#: ../mdkupdate:198
 #, c-format
 msgid ""
 "Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
@@ -670,6 +613,58 @@ msgstr ""
 "A Mandrakeupdate nem tudta feltölteni a diff-fájlokat. Küldjön egy emailt a "
 "következő címre: support [kukac] mandrakeonline [pont] net"
 
+#~ msgid "Next"
+#~ msgstr "Következő"
+
+#~ msgid "Cancel"
+#~ msgstr "Mégsem"
+
+#~ msgid "Previous"
+#~ msgstr "Előző"
+
+#~ msgid "Welcome to Mandrakeonline"
+#~ msgstr "Üdvözli a Mandrakeonline"
+
+# a sztring jelentése: nincs azonosítója, és szeretne egyet
+# a Mandrakeonline tulajdonnevet nem szabad lefordítani
+#~ msgid "I don't have a Mandrakeonline account and I want to subscribe"
+#~ msgstr "Nincs Mandrakeonline-azonosítóm, és szeretnék feliratkozni"
+
+#~ msgid "Mandrakelinux Privacy Policy"
+#~ msgstr "Mandrakelinux adatvédelmi elvek"
+
+#~ msgid "Authentification"
+#~ msgstr "Azonosítás"
+
+#~ msgid "Send Configuration"
+#~ msgstr "Konfiguráció elküldése"
+
+#~ msgid "Finish"
+#~ msgstr "Befejezés"
+
+#~ msgid "automated Upgrades"
+#~ msgstr "automatizált frissítések"
+
+#~ msgid "Country:"
+#~ msgstr "Ország:"
+
+#~ msgid "Error"
+#~ msgstr "Hiba"
+
+#~ msgid "Quitting Wizard\n"
+#~ msgstr "Kilépés a Varázslóból\n"
+
+#~ msgid ""
+#~ "Mandrakeonline could not be contacted, please try again at a later time"
+#~ msgstr ""
+#~ "Nem sikerült kapcsolatba lépni a Mandrakeonline-nal; próbálja meg később."
+
+#~ msgid "Wrong password"
+#~ msgstr "Helytelen jelszó"
+
+#~ msgid "  --update       - Update keys\n"
+#~ msgstr "  --update       - kulcsok frissítése\n"
+
 #~ msgid "Skip Wizard"
 #~ msgstr "A varázsló kihagyása"
 
@@ -706,10 +701,6 @@ msgstr ""
 #~ msgstr "E-mail"
 
 #, fuzzy
-#~ msgid "Response from Mandrakeonline server\n"
-#~ msgstr "Üdvözli a Mandrakeonline!"
-
-#, fuzzy
 #~ msgid "Launching Mandrakeupdate\n"
 #~ msgstr "  --applet       - az összes információ frissítése\n"
 
diff --git a/po/hy.po b/po/hy.po
index 273dc2c3..d3679114 100644
--- a/po/hy.po
+++ b/po/hy.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-01 22:41+0200\n"
+"POT-Creation-Date: 2004-11-03 12:10+0100\n"
 "PO-Revision-Date: 2004-03-20 23:50+0300\n"
 "Last-Translator: Lilit Azizbekyan <l@freenet.am>\n"
 "Language-Team: hy <yes@hay.am>\n"
@@ -15,271 +15,291 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../mdkapplet:61
+#: ../mdkapplet:63
 #, fuzzy, c-format
 msgid "Your system is up-to-date"
 msgstr "Համակարգը զբաղված է: Սպասեք..."
 
-#: ../mdkapplet:67
+#: ../mdkapplet:69
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrakeonline.net"
 msgstr ""
 
-#: ../mdkapplet:73
+#: ../mdkapplet:75
 #, c-format
 msgid "System is busy. Please wait ..."
 msgstr "Համակարգը զբաղված է: Սպասեք..."
 
-#: ../mdkapplet:79
+#: ../mdkapplet:81
 #, fuzzy, c-format
 msgid "New updates are available for your system"
 msgstr "Ձեր համակարգի համար չկան առկա նորացումներ"
 
-#: ../mdkapplet:85
+#: ../mdkapplet:87
 #, fuzzy, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr "Ծառայությունը մատչելի չէ: Հպեք \"ձևակերպել\""
 
-#: ../mdkapplet:91
+#: ../mdkapplet:93
 #, fuzzy, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Ցանցը անհասանելի է: Ստուգեք \"Ցանցի ձևակերպումը\""
 
-#: ../mdkapplet:97
+#: ../mdkapplet:99
 #, fuzzy, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Ծառայությունը մատչելի չէ: Հպեք \"ձևակերպել\""
 
-#: ../mdkapplet:103
+#: ../mdkapplet:105
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:108 ../mdkapplet:158
+#: ../mdkapplet:110 ../mdkapplet:164
 #, c-format
 msgid "Install updates"
 msgstr "Տեղադրել Նորացումները"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:111
 #, fuzzy, c-format
 msgid "Configure the service"
 msgstr "Ցանցի Ձևակերպում"
 
-#: ../mdkapplet:110
+#: ../mdkapplet:112
 #, c-format
 msgid "Check Updates"
 msgstr "Ստուգել Նորացումները"
 
-#: ../mdkapplet:111
+#: ../mdkapplet:113 ../mdkapplet:167 ../mdkapplet:225
+#, c-format
+msgid "Please Wait"
+msgstr ""
+
+#: ../mdkapplet:113 ../mdkapplet:166 ../mdkapplet:167 ../mdkapplet:225
+#, c-format
+msgid "Check updates"
+msgstr "Ստուգել նորացումները"
+
+#: ../mdkapplet:115
 #, c-format
 msgid "Online WebSite"
 msgstr "Օնլայն ՎեբԷջ"
 
-#: ../mdkapplet:112
+#: ../mdkapplet:116
 #, c-format
 msgid "Configure Network"
 msgstr "Ցանցի Ձևակերպում"
 
-#: ../mdkapplet:113
+#: ../mdkapplet:117
 #, c-format
 msgid "Configure Now!"
 msgstr "Ձևակերպել"
 
-#: ../mdkapplet:146
+#: ../mdkapplet:152 ../mdkapplet:229
 #, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Mandrakelinux Նորացումների Ապլետ"
 
-#: ../mdkapplet:156
+#: ../mdkapplet:162
 #, c-format
 msgid "Actions"
 msgstr "Գործողություններ"
 
-#: ../mdkapplet:159
+#: ../mdkapplet:165
 #, c-format
 msgid "Configure"
 msgstr "Ձևակերպել"
 
-#: ../mdkapplet:160
-#, c-format
-msgid "Check updates"
-msgstr "Ստուգել նորացումները"
-
-#: ../mdkapplet:161
+#: ../mdkapplet:169
 #, c-format
 msgid "See logs"
 msgstr "Ընթերցել արձանագրերը"
 
-#: ../mdkapplet:164
+#: ../mdkapplet:172
 #, c-format
 msgid "Status"
 msgstr "Կարգավիճակ"
 
-#: ../mdkapplet:168 ../mdkapplet:363
+#: ../mdkapplet:176 ../mdkapplet:375
 #, c-format
 msgid "Close"
 msgstr "Փակել"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Network Connection: "
 msgstr "Ցանցի Միացում`"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Up"
 msgstr "Վերև"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Down"
 msgstr "Ներքև"
 
-#: ../mdkapplet:204
+#: ../mdkapplet:212
 #, c-format
 msgid "Last check: "
 msgstr "Նախորդ ստուգում` "
 
-#: ../mdkapplet:205
+#: ../mdkapplet:213
 #, fuzzy, c-format
 msgid "Updates: "
 msgstr "Վերջին Նորացումներ` "
 
-#: ../mdkapplet:209
+#: ../mdkapplet:217
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr ""
 
-#: ../mdkapplet:213
+#: ../mdkapplet:221
 #, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr ""
 
-#: ../mdkapplet:217
+#: ../mdkapplet:224
 #, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 
-#: ../mdkapplet:225
+#: ../mdkapplet:235
 #, fuzzy, c-format
 msgid "Computing new updates...\n"
 msgstr "Ստուգել Նորացումները"
 
-#: ../mdkapplet:227
+#: ../mdkapplet:237
 #, fuzzy, c-format
 msgid "Connecting to"
 msgstr "Միացման պրոբլեմ"
 
-#: ../mdkapplet:250
+#: ../mdkapplet:244
+#, fuzzy, c-format
+msgid "Response from Mandrakeonline server\n"
+msgstr "Բարի գալուստ Mandrakeonline"
+
+#: ../mdkapplet:262
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr ""
 
-#: ../mdkapplet:254
+#: ../mdkapplet:267
 #, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
-#: ../mdkapplet:255
+#: ../mdkapplet:268
 #, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
-#: ../mdkapplet:256
+#: ../mdkapplet:269
 #, c-format
 msgid "Unknown state"
 msgstr ""
 
-#: ../mdkapplet:257
+#: ../mdkapplet:270
 #, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr ""
 
-#: ../mdkapplet:258
+#: ../mdkapplet:271
 #, c-format
 msgid "Wrong Password.\n"
 msgstr "Սխալ գաղտնաբառ է\n"
 
-#: ../mdkapplet:259
+#: ../mdkapplet:272
 #, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr ""
 
-#: ../mdkapplet:260
+#: ../mdkapplet:273
 #, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
 msgstr ""
 
-#: ../mdkapplet:264
+#: ../mdkapplet:277
 #, fuzzy, c-format
 msgid "System is up-to-date\n"
 msgstr "Համակարգը զբաղված է: Սպասեք..."
 
-#: ../mdkapplet:303
+#: ../mdkapplet:317
 #, c-format
 msgid "No check"
 msgstr "Ստուգված չէ"
 
-#: ../mdkapplet:316
+#: ../mdkapplet:330
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
-#: ../mdkapplet:319
+#: ../mdkapplet:333
 #, c-format
 msgid "Checking config file: Not present\n"
 msgstr ""
 
-#: ../mdkapplet:353
+#: ../mdkapplet:365
 #, fuzzy, c-format
 msgid "Logs"
 msgstr "Մուտք`"
 
-#: ../mdkapplet:369
+#: ../mdkapplet:381
 #, c-format
 msgid "Clear"
 msgstr "Մաքրել"
 
-#: ../mdkapplet:396
+#: ../mdkapplet:408
 #, c-format
 msgid "About..."
 msgstr "Ծրագրի մասին.."
 
-#: ../mdkapplet:397
+#: ../mdkapplet:409
 #, c-format
 msgid "Always launch on startup"
 msgstr ""
 
-#: ../mdkapplet:399
+#: ../mdkapplet:411
 #, c-format
 msgid "Quit"
 msgstr "Ելք"
 
-#: ../mdkonline:89
+#: ../mdkonline:52 ../mdkonline:106
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "Բարի գալուստ Mandrakeonline"
+
+#: ../mdkonline:55
 #, c-format
-msgid "Next"
+msgid "I already have an account"
 msgstr ""
 
-#: ../mdkonline:89
+#: ../mdkonline:56
 #, c-format
-msgid "Cancel"
-msgstr "Հրաժարվել"
+msgid "I want to subscribe"
+msgstr ""
 
-#: ../mdkonline:89
+#: ../mdkonline:89 ../mdkonline:93 ../mdkonline:131
 #, c-format
-msgid "Previous"
+msgid "Please wait"
 msgstr ""
 
-#: ../mdkonline:103
+#: ../mdkonline:89
 #, c-format
-msgid "Welcome to Mandrakeonline"
-msgstr "Բարի գալուստ Mandrakeonline"
+msgid "Reading configuration\n"
+msgstr "Ձևակերպման ընթերցում\n"
+
+#: ../mdkonline:93
+#, c-format
+msgid "Sending configuration..."
+msgstr "Ուղարկվում են ձևակերպումները..."
 
-#: ../mdkonline:104 ../mdkonline_tui:98
+#: ../mdkonline:109
 #, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
@@ -290,62 +310,37 @@ msgstr ""
 "(փաթեթները, սարքի տվյալները) կենտրոնական բազա` ձեզ տեղյակ\n"
 "պահելու անվտանգության և այլ օգտակար նորացումների մասին:\n"
 
-#: ../mdkonline:105 ../mdkonline_tui:142
+#: ../mdkonline:114
 #, c-format
-msgid "Create a Mandrakeonline Account"
-msgstr "Ստեղծել Mandrakeonline Հաշիվ"
+msgid "Account creation or authentication"
+msgstr ""
 
-#: ../mdkonline:107
-#, fuzzy, c-format
-msgid "I don't have a Mandrakeonline account and I want to subscribe"
-msgstr "Ես չունեմ Mandrakeonline հաշիվ, և ցանկանում եմ ձեռք բերել այն "
+#: ../mdkonline:119
+#, c-format
+msgid "Enter your Mandrakeonline login, password and machine name:"
+msgstr "Ներմուծեք ձեր Mandrakeonline հաշիվը, գաղտնաբառը և մեքենայի անունը`"
 
-#: ../mdkonline:111 ../mdkonline:131 ../mdkonline_tui:114 ../mdkonline_tui:145
+#: ../mdkonline:125 ../mdkonline:156
 #, c-format
 msgid "Login:"
 msgstr "Մուտք`"
 
-#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:115 ../mdkonline_tui:146
+#: ../mdkonline:126 ../mdkonline:157
 #, c-format
 msgid "Password:"
 msgstr "Գաղտնաբառը`"
 
-#: ../mdkonline:113 ../mdkonline_tui:147
-#, c-format
-msgid "Confirm Password:"
-msgstr "Հաստատեք գաղտնաբառը`"
-
-#: ../mdkonline:114 ../mdkonline_tui:148
-#, c-format
-msgid "Mail contact:"
-msgstr "Հաղորդակցության էլփոստ`"
-
-#: ../mdkonline:121
-#, fuzzy, c-format
-msgid "Mandrakelinux Privacy Policy"
-msgstr "Mandrakelinux Անվտանգության Կանոններ"
-
 #: ../mdkonline:127
 #, c-format
-msgid "Authentification"
-msgstr "Տվյալների ստուգում"
-
-#: ../mdkonline:128 ../mdkonline_tui:108
-#, c-format
-msgid "Enter your Mandrakeonline login, password and machine name:"
-msgstr "Ներմուծեք ձեր Mandrakeonline հաշիվը, գաղտնաբառը և մեքենայի անունը`"
-
-#: ../mdkonline:133 ../mdkonline_tui:116
-#, c-format
 msgid "Machine name:"
 msgstr "Մեքենայի անունը`"
 
-#: ../mdkonline:138
-#, c-format
-msgid "Send Configuration"
-msgstr "Ուղարկել ձևակերպում"
+#: ../mdkonline:131
+#, fuzzy, c-format
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Բարի գալուստ Mandrakeonline"
 
-#: ../mdkonline:139 ../mdkonline_tui:128
+#: ../mdkonline:139
 #, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
@@ -376,55 +371,54 @@ msgstr ""
 "Ավելին, կստանաք աջակցության ծառայության վճարումների զեղչեր այստեղ`\n"
 "www.mandrakeexpert.com."
 
-#: ../mdkonline:144 ../mdkonline:211 ../mdkonline:234
-#, c-format
-msgid "Finish"
-msgstr "Վերջ"
-
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141 ../mdkonline:180 ../mdkupdate:126 ../mdkupdate:198
 #, c-format
-msgid "Your upload was successful!"
-msgstr "Ափլոադը հաջողությամբ ավարտվեց!"
+msgid "Connection problem"
+msgstr "Միացման պրոբլեմ"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandrakeonline."
+msgid "or"
 msgstr ""
-"Այսուհետև շնորհիվ Mandrakeonline-ի ստանալու եք \n"
-"նորացումների և անվտանգության  ծանուցումներ:"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "Սխալ գաղտնաբառ է"
+
+#: ../mdkonline:141
 #, c-format
 msgid ""
-"Mandrakeonline offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+"Your login or password was wrong.\n"
+" Either you'll have to type it again, or you'll need to create an account on "
+"Mandrakeonline.\n"
+" In the latter case, go back to the first step to connect to "
+"Mandrakeonline.\n"
+" Be aware that you must also provide a Machine name \n"
+" (only alphabetical characters are admitted)"
 msgstr ""
-"Mandrakeonline-ը առաջարկում է ավտոմատացնել նորացումները:\n"
-"Ծրագիրը համակարգում ինքնուրույն աշխատացվելու է` ստուգելու նորացումները\n"
-
-#: ../mdkonline:146
-#, c-format
-msgid "automated Upgrades"
-msgstr "ավտոմատացված Նորացումներ"
+"Մուտքագրված հաշիվը կամ գաղտնաբառը սխալ են:\n"
+"Մուտքագրեք կրկին, կամ ստեղծեք նոր Mandrakeonline հաշիվ:\n"
+"Երկրորդ դեպքում վերադարձեք առաջին քայլին` Mandrakeonline միանալու:\n"
+"Չմոռանաք նաև ներմուծել մեքենայի անունը\n"
+"(թույլատրված են միայն տառերը)"
 
-#: ../mdkonline:150
+#: ../mdkonline:153
 #, c-format
-msgid "Country:"
-msgstr "Երկիր`"
+msgid "Create a Mandrakeonline Account"
+msgstr "Ստեղծել Mandrakeonline Հաշիվ"
 
-#: ../mdkonline:178 ../mdkonline:183 ../mdkonline:185 ../mdkonline:187
+#: ../mdkonline:158
 #, c-format
-msgid "Error"
-msgstr "Սխալ"
+msgid "Confirm Password:"
+msgstr "Հաստատեք գաղտնաբառը`"
 
-#: ../mdkonline:183 ../mdkonline_tui:152
+#: ../mdkonline:159
 #, c-format
-msgid "Please provide a login"
-msgstr "Հայտնեք հաշվի անունը"
+msgid "Mail contact:"
+msgstr "Հաղորդակցության էլփոստ`"
 
-#: ../mdkonline:185 ../mdkonline_tui:152
+#: ../mdkonline:163
 #, c-format
 msgid ""
 "The passwords do not match\n"
@@ -433,157 +427,114 @@ msgstr ""
 "Գաղտնաբառերը չեն համընկնում\n"
 "Կրկին փորձեք\n"
 
-#: ../mdkonline:187 ../mdkonline_tui:152
+#: ../mdkonline:163
+#, c-format
+msgid "Please provide a login"
+msgstr "Հայտնեք հաշվի անունը"
+
+#: ../mdkonline:163
 #, c-format
 msgid "Not a valid mail address!\n"
 msgstr "Անվավեր էլփոստի հասցե!\n"
 
-#: ../mdkonline:199 ../mdkonline_tui:78
+#: ../mdkonline:169
 #, c-format
-msgid "Reading configuration\n"
-msgstr "Ձևակերպման ընթերցում\n"
+msgid ""
+"Mandrakeonline Account successfully created.\n"
+"Please click \"Next\" to authenticate and upload your configuration\n"
+msgstr ""
 
-#: ../mdkonline:204 ../mdkonline_tui:82
+#: ../mdkonline:178
 #, c-format
-msgid "Sending configuration..."
-msgstr "Ուղարկվում են ձևակերպումները..."
+msgid "Your upload was successful!"
+msgstr "Ափլոադը հաջողությամբ ավարտվեց!"
 
-#: ../mdkonline:213 ../mdkonline:273 ../mdkonline_tui:130 ../mdkonline_tui:169
-#: ../mdkupdate:124 ../mdkupdate:195
+#: ../mdkonline:178
 #, c-format
-msgid "Connection problem"
-msgstr "Միացման պրոբլեմ"
+msgid ""
+"From now you will receive on security and updates \n"
+"announcements thanks to Mandrakeonline."
+msgstr ""
+"Այսուհետև շնորհիվ Mandrakeonline-ի ստանալու եք \n"
+"նորացումների և անվտանգության  ծանուցումներ:"
 
-#: ../mdkonline:213 ../mdkonline_tui:169
+#: ../mdkonline:178
 #, c-format
-msgid "Problem occurs when uploading files, please try again"
+msgid ""
+"Mandrakeonline offers you the ability to automate the updates.\n"
+"A program will run regulary in your system waiting for new updates\n"
 msgstr ""
+"Mandrakeonline-ը առաջարկում է ավտոմատացնել նորացումները:\n"
+"Ծրագիրը համակարգում ինքնուրույն աշխատացվելու է` ստուգելու նորացումները\n"
 
-#: ../mdkonline:251
+#: ../mdkonline:180
 #, c-format
-msgid "Quitting Wizard\n"
-msgstr "Ելք Ուղեկցորդից\n"
+msgid "Problem occurs when uploading files, please try again"
+msgstr ""
 
-#: ../mdkonline:273
-#, c-format
-msgid "Mandrakeonline could not be contacted, please try again at a later time"
-msgstr "Անհնար է միանալ Mandrakeonline, ուշով կրկին փորձեք"
+#: ../mdkonline:186
+#, fuzzy, c-format
+msgid "Country"
+msgstr "Երկիր`"
 
-#: ../mdkonline:285
+#: ../mdkonline:198
+#, fuzzy, c-format
+msgid "Congratulations"
+msgstr "Ձևակերպում"
+
+#: ../mdkonline:198
 #, c-format
-msgid "Wrong password"
-msgstr "Սխալ գաղտնաբառ է"
+msgid "Your Mandrakeonline account has been successfully configured\n"
+msgstr ""
+
+#: ../mdkonline:214
+#, fuzzy, c-format
+msgid "Configuration uploaded successfully"
+msgstr "Ափլոադը հաջողությամբ ավարտվեց!"
 
-#: ../mdkonline:285 ../mdkonline_tui:130
+#: ../mdkonline:215
+#, fuzzy, c-format
+msgid "Problem uploading configuration"
+msgstr "Ձևակերպման ընթերցում\n"
+
+#: ../mdkonline:216
 #, c-format
 msgid ""
-"Your login or password was wrong.\n"
-" Either you'll have to type it again, or you'll need to create an account on "
-"Mandrakeonline.\n"
-" In the latter case, go back to the first step to connect to "
-"Mandrakeonline.\n"
-" Be aware that you must also provide a Machine name \n"
-" (only alphabetical characters are admitted)"
+"Cannot connect to mandrakeonline website: wrong login/password or router/"
+"firewall bad settings"
 msgstr ""
-"Մուտքագրված հաշիվը կամ գաղտնաբառը սխալ են:\n"
-"Մուտքագրեք կրկին, կամ ստեղծեք նոր Mandrakeonline հաշիվ:\n"
-"Երկրորդ դեպքում վերադարձեք առաջին քայլին` Mandrakeonline միանալու:\n"
-"Չմոռանաք նաև ներմուծել մեքենայի անունը\n"
-"(թույլատրված են միայն տառերը)"
 
-#: ../mdkonline.pm:58
+#: ../mdkonline.pm:66
 #, c-format
 msgid "Login and password should be less than 12 characters\n"
 msgstr "Հաշիվը և գաղտնաբառը չեն կարող պարունակել ավելի քան 12 նշան\n"
 
-#: ../mdkonline.pm:59
+#: ../mdkonline.pm:67
 #, c-format
 msgid "Special characters are not allowed\n"
 msgstr "Հատուկ նշանները արգելված են\n"
 
-#: ../mdkonline.pm:60
+#: ../mdkonline.pm:68
 #, c-format
 msgid "Please fill in all fields\n"
 msgstr "Լրացրեք բոլոր դատարկ տողերը\n"
 
-#: ../mdkonline.pm:61
+#: ../mdkonline.pm:69
 #, c-format
 msgid "Email not valid\n"
 msgstr "Անվավեր Էլփոստ\n"
 
-#: ../mdkonline.pm:62
+#: ../mdkonline.pm:70
 #, c-format
 msgid "Account already exist\n"
 msgstr "Հաշիվը արդեն գոյություն ունի\n"
 
-#: ../mdkonline.pm:68
+#: ../mdkonline.pm:76
 #, c-format
 msgid "Problem connecting to server \n"
 msgstr "Բանավարի հետ միացման խախտում \n"
 
-#: ../mdkonline_tui:45 ../mdkonline_tui:95
-#, fuzzy, c-format
-msgid "Mandrakeonline"
-msgstr "Բարի գալուստ Mandrakeonline"
-
-#: ../mdkonline_tui:48
-#, c-format
-msgid "I already have an account"
-msgstr ""
-
-#: ../mdkonline_tui:49
-#, c-format
-msgid "I want to subscribe"
-msgstr ""
-
-#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:120
-#, c-format
-msgid "Please wait"
-msgstr ""
-
-#: ../mdkonline_tui:103
-#, c-format
-msgid "Account creation or authentication"
-msgstr ""
-
-#: ../mdkonline_tui:120
-#, fuzzy, c-format
-msgid "Connecting to Mandrakeonline website..."
-msgstr "Բարի գալուստ Mandrakeonline"
-
-#: ../mdkonline_tui:130
-#, c-format
-msgid "or"
-msgstr ""
-
-#: ../mdkonline_tui:130
-#, fuzzy, c-format
-msgid "wrong password:"
-msgstr "Սխալ գաղտնաբառ է"
-
-#: ../mdkonline_tui:158
-#, c-format
-msgid ""
-"Mandrakeonline Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-
-#: ../mdkonline_tui:175
-#, fuzzy, c-format
-msgid "Country"
-msgstr "Երկիր`"
-
-#: ../mdkonline_tui:187
-#, fuzzy, c-format
-msgid "Congratulations"
-msgstr "Ձևակերպում"
-
-#: ../mdkonline_tui:187
-#, c-format
-msgid "Your Mandrakeonline account has been successfully configured\n"
-msgstr ""
-
-#: ../mdkupdate:50
+#: ../mdkupdate:52
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
@@ -599,48 +550,88 @@ msgstr ""
 "\n"
 "կիրառում`\n"
 
-#: ../mdkupdate:55
+#: ../mdkupdate:57
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - ցուցադրել այս տեղեկանքը:\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:58
 #, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto         - Mandrakeupdate ավտոմատ բեռնում:\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:59
 #, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - աշխատացնել Mandrakeupdate:\n"
 
-#: ../mdkupdate:58
-#, c-format
-msgid "  --update       - Update keys\n"
-msgstr "  --update       - Նորացնել բանալիները\n"
-
-#: ../mdkupdate:66
+#: ../mdkupdate:67
 #, c-format
 msgid "No %s file found. Run mdkonline wizard first"
 msgstr ""
 
-#: ../mdkupdate:124
+#: ../mdkupdate:126
 #, c-format
 msgid "Mandrakeupdate could not contact the site, we will try again."
 msgstr "Mandrakeupdate -ը չի կարողանում միանալ էջին. կփորձենք կրկին:"
 
-#: ../mdkupdate:173
+#: ../mdkupdate:176
 #, c-format
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr "Անհնար է նորացնել փաթեթները mdkupdate - ից:\n"
 
-#: ../mdkupdate:195
+#: ../mdkupdate:198
 #, c-format
 msgid ""
 "Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
 "mandrakeonline [dot] net"
 msgstr ""
 
+#~ msgid "Cancel"
+#~ msgstr "Հրաժարվել"
+
+#~ msgid "Welcome to Mandrakeonline"
+#~ msgstr "Բարի գալուստ Mandrakeonline"
+
+#, fuzzy
+#~ msgid "I don't have a Mandrakeonline account and I want to subscribe"
+#~ msgstr "Ես չունեմ Mandrakeonline հաշիվ, և ցանկանում եմ ձեռք բերել այն "
+
+#, fuzzy
+#~ msgid "Mandrakelinux Privacy Policy"
+#~ msgstr "Mandrakelinux Անվտանգության Կանոններ"
+
+#~ msgid "Authentification"
+#~ msgstr "Տվյալների ստուգում"
+
+#~ msgid "Send Configuration"
+#~ msgstr "Ուղարկել ձևակերպում"
+
+#~ msgid "Finish"
+#~ msgstr "Վերջ"
+
+#~ msgid "automated Upgrades"
+#~ msgstr "ավտոմատացված Նորացումներ"
+
+#~ msgid "Country:"
+#~ msgstr "Երկիր`"
+
+#~ msgid "Error"
+#~ msgstr "Սխալ"
+
+#~ msgid "Quitting Wizard\n"
+#~ msgstr "Ելք Ուղեկցորդից\n"
+
+#~ msgid ""
+#~ "Mandrakeonline could not be contacted, please try again at a later time"
+#~ msgstr "Անհնար է միանալ Mandrakeonline, ուշով կրկին փորձեք"
+
+#~ msgid "Wrong password"
+#~ msgstr "Սխալ գաղտնաբառ է"
+
+#~ msgid "  --update       - Update keys\n"
+#~ msgstr "  --update       - Նորացնել բանալիները\n"
+
 #~ msgid "Skip Wizard"
 #~ msgstr "Առանձ Ուղեկցորդի"
 
@@ -688,10 +679,6 @@ msgstr ""
 #~ msgstr "Բանավարի պրոբլեմ"
 
 #, fuzzy
-#~ msgid "Response from Mandrakeonline server\n"
-#~ msgstr "Բարի գալուստ Mandrakeonline"
-
-#, fuzzy
 #~ msgid "Launching Mandrakeupdate\n"
 #~ msgstr "Սկսել Mandrakelinux-ի Նորացումը"
 
diff --git a/po/id.po b/po/id.po
index fd371f5d..afe8970b 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline 0.01\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-01 22:41+0200\n"
+"POT-Creation-Date: 2004-11-03 12:10+0100\n"
 "PO-Revision-Date: 2004-09-20 23:33+0700\n"
 "Last-Translator: Willy Sudiarto Raharjo <willy@e-jogja.net>\n"
 "Language-Team: INDONESIA <id@li.org>\n"
@@ -15,12 +15,12 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: ../mdkapplet:61
+#: ../mdkapplet:63
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Sistem Anda sudah up-to-date"
 
-#: ../mdkapplet:67
+#: ../mdkapplet:69
 #, fuzzy, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -29,189 +29,199 @@ msgstr ""
 "Masalah konfigurasi layanan. Harp perika file log dan kirimkan mail ke "
 "support@mandrakeonline.net"
 
-#: ../mdkapplet:73
+#: ../mdkapplet:75
 #, c-format
 msgid "System is busy. Please wait ..."
 msgstr "Sistem sedang sibuk. Harap tunggu ..."
 
-#: ../mdkapplet:79
+#: ../mdkapplet:81
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Update baru tersedia untuk sistem Anda"
 
-#: ../mdkapplet:85
+#: ../mdkapplet:87
 #, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr ""
 "Layanan belum dikonfigurasi. Silahkan klik pada \"Konfigurasikan layanan\""
 
-#: ../mdkapplet:91
+#: ../mdkapplet:93
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Jaringan sedang non-aktif. Harap konfigurasikan jaringan Anda"
 
-#: ../mdkapplet:97
+#: ../mdkapplet:99
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Layanan tidak diaktifkan. Silahkan klik pada \"Website Online\""
 
-#: ../mdkapplet:103
+#: ../mdkapplet:105
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:108 ../mdkapplet:158
+#: ../mdkapplet:110 ../mdkapplet:164
 #, c-format
 msgid "Install updates"
 msgstr "Instal update"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:111
 #, fuzzy, c-format
 msgid "Configure the service"
 msgstr "Konfigurasikan layanan"
 
-#: ../mdkapplet:110
+#: ../mdkapplet:112
 #, c-format
 msgid "Check Updates"
 msgstr "Cek Update"
 
-#: ../mdkapplet:111
+#: ../mdkapplet:113 ../mdkapplet:167 ../mdkapplet:225
+#, fuzzy, c-format
+msgid "Please Wait"
+msgstr "Tunggu..."
+
+#: ../mdkapplet:113 ../mdkapplet:166 ../mdkapplet:167 ../mdkapplet:225
+#, c-format
+msgid "Check updates"
+msgstr "Cek update"
+
+#: ../mdkapplet:115
 #, c-format
 msgid "Online WebSite"
 msgstr "WebSite Online"
 
-#: ../mdkapplet:112
+#: ../mdkapplet:116
 #, c-format
 msgid "Configure Network"
 msgstr "Konfigurasikan Jaringan"
 
-#: ../mdkapplet:113
+#: ../mdkapplet:117
 #, fuzzy, c-format
 msgid "Configure Now!"
 msgstr "Konfigurasi Sekarang!"
 
-#: ../mdkapplet:146
+#: ../mdkapplet:152 ../mdkapplet:229
 #, fuzzy, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Kebijakan Privacy Mandrakelinux"
 
-#: ../mdkapplet:156
+#: ../mdkapplet:162
 #, c-format
 msgid "Actions"
 msgstr "Aksi"
 
-#: ../mdkapplet:159
+#: ../mdkapplet:165
 #, c-format
 msgid "Configure"
 msgstr "Konfigurasikan"
 
-#: ../mdkapplet:160
-#, c-format
-msgid "Check updates"
-msgstr "Cek update"
-
-#: ../mdkapplet:161
+#: ../mdkapplet:169
 #, c-format
 msgid "See logs"
 msgstr "Lihat log"
 
-#: ../mdkapplet:164
+#: ../mdkapplet:172
 #, c-format
 msgid "Status"
 msgstr "Status"
 
-#: ../mdkapplet:168 ../mdkapplet:363
+#: ../mdkapplet:176 ../mdkapplet:375
 #, c-format
 msgid "Close"
 msgstr "Tutup"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Network Connection: "
 msgstr "Koneksi Jaringan: "
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Up"
 msgstr "Aktif"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Down"
 msgstr "non-aktif"
 
-#: ../mdkapplet:204
+#: ../mdkapplet:212
 #, c-format
 msgid "Last check: "
 msgstr "Pengujian terakhir: "
 
-#: ../mdkapplet:205
+#: ../mdkapplet:213
 #, c-format
 msgid "Updates: "
 msgstr "Update"
 
-#: ../mdkapplet:209
+#: ../mdkapplet:217
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Menjalankan drakconnect\n"
 
-#: ../mdkapplet:213
+#: ../mdkapplet:221
 #, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "Menjalankan mdkupdate --applet\n"
 
-#: ../mdkapplet:217
+#: ../mdkapplet:224
 #, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 "Mandrakeonline tampaknya baru saja diinstall ulang, me-reload applet ...."
 
-#: ../mdkapplet:225
+#: ../mdkapplet:235
 #, fuzzy, c-format
 msgid "Computing new updates...\n"
 msgstr "Menghitung update baru...\n"
 
-#: ../mdkapplet:227
+#: ../mdkapplet:237
 #, fuzzy, c-format
 msgid "Connecting to"
 msgstr "Menghubungkan ke"
 
-#: ../mdkapplet:250
+#: ../mdkapplet:244
+#, fuzzy, c-format
+msgid "Response from Mandrakeonline server\n"
+msgstr "Selamat Datang di Mandrakeonline"
+
+#: ../mdkapplet:262
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Memeriksa... Update tersedia\n"
 
-#: ../mdkapplet:254
+#: ../mdkapplet:267
 #, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
-#: ../mdkapplet:255
+#: ../mdkapplet:268
 #, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
-#: ../mdkapplet:256
+#: ../mdkapplet:269
 #, c-format
 msgid "Unknown state"
 msgstr "status tidak diketahui"
 
-#: ../mdkapplet:257
+#: ../mdkapplet:270
 #, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr "Layanan Online dinonaktifkan. Hubungi situs Mandrakeonline\n"
 
-#: ../mdkapplet:258
+#: ../mdkapplet:271
 #, c-format
 msgid "Wrong Password.\n"
 msgstr "Katasandi salah.\n"
 
-#: ../mdkapplet:259
+#: ../mdkapplet:272
 #, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr "Aksi Salah atau host atau login.\n"
 
-#: ../mdkapplet:260
+#: ../mdkapplet:273
 #, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
@@ -220,72 +230,82 @@ msgstr ""
 "Terjadi sesuatu yang salah dengan setting jaringan Anda (periksa rute Anda, "
 "firewall atau setting proxy)\n"
 
-#: ../mdkapplet:264
+#: ../mdkapplet:277
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Sistem up-to-date\n"
 
-#: ../mdkapplet:303
+#: ../mdkapplet:317
 #, c-format
 msgid "No check"
 msgstr "Tidak ada pemeriksaan"
 
-#: ../mdkapplet:316
+#: ../mdkapplet:330
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Memeriksa Jaringan: tampaknya dinonaktifkan\n"
 
-#: ../mdkapplet:319
+#: ../mdkapplet:333
 #, c-format
 msgid "Checking config file: Not present\n"
 msgstr "Memeriksa file konfigurasi: Tidak ada\n"
 
-#: ../mdkapplet:353
+#: ../mdkapplet:365
 #, fuzzy, c-format
 msgid "Logs"
 msgstr "Log"
 
-#: ../mdkapplet:369
+#: ../mdkapplet:381
 #, fuzzy, c-format
 msgid "Clear"
 msgstr "Bersihkan"
 
-#: ../mdkapplet:396
+#: ../mdkapplet:408
 #, c-format
 msgid "About..."
 msgstr "Keterangan..."
 
-#: ../mdkapplet:397
+#: ../mdkapplet:409
 #, c-format
 msgid "Always launch on startup"
 msgstr "Selalu jalankan ketika pembukaan"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:411
 #, c-format
 msgid "Quit"
 msgstr "Keluar"
 
-#: ../mdkonline:89
+#: ../mdkonline:52 ../mdkonline:106
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "Selamat Datang di Mandrakeonline"
+
+#: ../mdkonline:55
 #, c-format
-msgid "Next"
-msgstr "Berikutnya"
+msgid "I already have an account"
+msgstr ""
 
-#: ../mdkonline:89
+#: ../mdkonline:56
 #, c-format
-msgid "Cancel"
-msgstr "Batal"
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline:89 ../mdkonline:93 ../mdkonline:131
+#, c-format
+msgid "Please wait"
+msgstr "Tunggu..."
 
 #: ../mdkonline:89
 #, c-format
-msgid "Previous"
-msgstr "Sebelumnya"
+msgid "Reading configuration\n"
+msgstr "Membaca konfigurasi\n"
 
-#: ../mdkonline:103
+#: ../mdkonline:93
 #, c-format
-msgid "Welcome to Mandrakeonline"
-msgstr "Selamat Datang di Mandrakeonline"
+msgid "Sending configuration..."
+msgstr "Mengirimkan konfigurasi..."
 
-#: ../mdkonline:104 ../mdkonline_tui:98
+#: ../mdkonline:109
 #, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
@@ -296,62 +316,37 @@ msgstr ""
 "(paket, konfigurasi perangkat keras) ke database terpusat agar Anda selalu\n"
 "diberi tahu update sekuriti dan upgrade yang berguna.\n"
 
-#: ../mdkonline:105 ../mdkonline_tui:142
-#, fuzzy, c-format
-msgid "Create a Mandrakeonline Account"
-msgstr "Buat Account Mandrakeonline"
+#: ../mdkonline:114
+#, c-format
+msgid "Account creation or authentication"
+msgstr ""
 
-#: ../mdkonline:107
-#, fuzzy, c-format
-msgid "I don't have a Mandrakeonline account and I want to subscribe"
-msgstr "Saya tak punya account Mandrakeonline dan saya ingin "
+#: ../mdkonline:119
+#, c-format
+msgid "Enter your Mandrakeonline login, password and machine name:"
+msgstr "Masukkan login, katasandi, dan nama mesin  Mandrakeonline Anda:"
 
-#: ../mdkonline:111 ../mdkonline:131 ../mdkonline_tui:114 ../mdkonline_tui:145
+#: ../mdkonline:125 ../mdkonline:156
 #, c-format
 msgid "Login:"
 msgstr "Login:"
 
-#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:115 ../mdkonline_tui:146
+#: ../mdkonline:126 ../mdkonline:157
 #, c-format
 msgid "Password:"
 msgstr "Katasandi:"
 
-#: ../mdkonline:113 ../mdkonline_tui:147
-#, c-format
-msgid "Confirm Password:"
-msgstr "Konfirmasi Katasandi:"
-
-#: ../mdkonline:114 ../mdkonline_tui:148
-#, c-format
-msgid "Mail contact:"
-msgstr "Kontak mail:"
-
-#: ../mdkonline:121
-#, c-format
-msgid "Mandrakelinux Privacy Policy"
-msgstr "Kebijakan Privacy Mandrakelinux"
-
 #: ../mdkonline:127
 #, c-format
-msgid "Authentification"
-msgstr "Authentikasi"
-
-#: ../mdkonline:128 ../mdkonline_tui:108
-#, c-format
-msgid "Enter your Mandrakeonline login, password and machine name:"
-msgstr "Masukkan login, katasandi, dan nama mesin  Mandrakeonline Anda:"
-
-#: ../mdkonline:133 ../mdkonline_tui:116
-#, c-format
 msgid "Machine name:"
 msgstr "Nama mesin:"
 
-#: ../mdkonline:138
+#: ../mdkonline:131
 #, fuzzy, c-format
-msgid "Send Configuration"
-msgstr "Kirim konfigurasi"
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Selamat Datang di Mandrakeonline"
 
-#: ../mdkonline:139 ../mdkonline_tui:128
+#: ../mdkonline:139
 #, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
@@ -381,55 +376,55 @@ msgstr ""
 "memberi tahu Anda tentang update keamanan dan upgrade bermanfaat via email.\n"
 "Tambah lagi, Anda akan mendapat diskon servis di www.mandrakeexpert.com."
 
-#: ../mdkonline:144 ../mdkonline:211 ../mdkonline:234
+#: ../mdkonline:141 ../mdkonline:180 ../mdkupdate:126 ../mdkupdate:198
 #, c-format
-msgid "Finish"
-msgstr "Selesai"
-
-#: ../mdkonline:145 ../mdkonline_tui:167
-#, c-format
-msgid "Your upload was successful!"
-msgstr "Upload Anda sukses!"
+msgid "Connection problem"
+msgstr "Masalah koneksi"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandrakeonline."
+msgid "or"
 msgstr ""
-"Mulai saat ini Anda akan menerima pemberitahuan keamanan dan upgrade\n"
-"dari Mandrakeonline."
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "Katasandi salah"
+
+#: ../mdkonline:141
 #, c-format
 msgid ""
-"Mandrakeonline offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+"Your login or password was wrong.\n"
+" Either you'll have to type it again, or you'll need to create an account on "
+"Mandrakeonline.\n"
+" In the latter case, go back to the first step to connect to "
+"Mandrakeonline.\n"
+" Be aware that you must also provide a Machine name \n"
+" (only alphabetical characters are admitted)"
 msgstr ""
-"Mandrakeonline memberi Anda kemampuan update otomatis.\n"
-"Sebuah program akan secara periodik menunggu update baru\n"
-
-#: ../mdkonline:146
-#, c-format
-msgid "automated Upgrades"
-msgstr "Upgrade otomatis"
+"Login atau katasandi Anda keliru.\n"
+"Anda harus menuliskannya lagi, atau membuat account di Mandrakeonline.\n"
+" Pada kasus terakhir, kembalilah ke langkah awal untuk menghubungi "
+"Mandrakeonline.\n"
+" Ingat, Anda juga harus memberikan nama Mesin \n"
+" (hanya karakter alfabet)"
 
-#: ../mdkonline:150
-#, c-format
-msgid "Country:"
-msgstr "Negara:"
+#: ../mdkonline:153
+#, fuzzy, c-format
+msgid "Create a Mandrakeonline Account"
+msgstr "Buat Account Mandrakeonline"
 
-#: ../mdkonline:178 ../mdkonline:183 ../mdkonline:185 ../mdkonline:187
+#: ../mdkonline:158
 #, c-format
-msgid "Error"
-msgstr "Kesalahan"
+msgid "Confirm Password:"
+msgstr "Konfirmasi Katasandi:"
 
-#: ../mdkonline:183 ../mdkonline_tui:152
+#: ../mdkonline:159
 #, c-format
-msgid "Please provide a login"
-msgstr "Harap masukkan login"
+msgid "Mail contact:"
+msgstr "Kontak mail:"
 
-#: ../mdkonline:185 ../mdkonline_tui:152
+#: ../mdkonline:163
 #, c-format
 msgid ""
 "The passwords do not match\n"
@@ -438,158 +433,114 @@ msgstr ""
 "Katasandi tak cocok\n"
 "Coba lagi!\n"
 
-#: ../mdkonline:187 ../mdkonline_tui:152
+#: ../mdkonline:163
+#, c-format
+msgid "Please provide a login"
+msgstr "Harap masukkan login"
+
+#: ../mdkonline:163
 #, c-format
 msgid "Not a valid mail address!\n"
 msgstr "Alamat mail tak valid!\n"
 
-#: ../mdkonline:199 ../mdkonline_tui:78
+#: ../mdkonline:169
 #, c-format
-msgid "Reading configuration\n"
-msgstr "Membaca konfigurasi\n"
+msgid ""
+"Mandrakeonline Account successfully created.\n"
+"Please click \"Next\" to authenticate and upload your configuration\n"
+msgstr ""
 
-#: ../mdkonline:204 ../mdkonline_tui:82
+#: ../mdkonline:178
 #, c-format
-msgid "Sending configuration..."
-msgstr "Mengirimkan konfigurasi..."
+msgid "Your upload was successful!"
+msgstr "Upload Anda sukses!"
 
-#: ../mdkonline:213 ../mdkonline:273 ../mdkonline_tui:130 ../mdkonline_tui:169
-#: ../mdkupdate:124 ../mdkupdate:195
+#: ../mdkonline:178
 #, c-format
-msgid "Connection problem"
-msgstr "Masalah koneksi"
+msgid ""
+"From now you will receive on security and updates \n"
+"announcements thanks to Mandrakeonline."
+msgstr ""
+"Mulai saat ini Anda akan menerima pemberitahuan keamanan dan upgrade\n"
+"dari Mandrakeonline."
+
+#: ../mdkonline:178
+#, c-format
+msgid ""
+"Mandrakeonline offers you the ability to automate the updates.\n"
+"A program will run regulary in your system waiting for new updates\n"
+msgstr ""
+"Mandrakeonline memberi Anda kemampuan update otomatis.\n"
+"Sebuah program akan secara periodik menunggu update baru\n"
 
-#: ../mdkonline:213 ../mdkonline_tui:169
+#: ../mdkonline:180
 #, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr "Masalah terjadi ketika mengupload file, harap mencoba lagi"
 
-#: ../mdkonline:251
-#, c-format
-msgid "Quitting Wizard\n"
-msgstr "Keluar dari Wizard\n"
+#: ../mdkonline:186
+#, fuzzy, c-format
+msgid "Country"
+msgstr "Negara:"
 
-#: ../mdkonline:273
+#: ../mdkonline:198
 #, fuzzy, c-format
-msgid "Mandrakeonline could not be contacted, please try again at a later time"
-msgstr "Mandrakeupdate gagal dihubungi, harap mencoba lagi."
+msgid "Congratulations"
+msgstr "Kirim konfigurasi"
 
-#: ../mdkonline:285
+#: ../mdkonline:198
 #, c-format
-msgid "Wrong password"
-msgstr "Katasandi salah"
+msgid "Your Mandrakeonline account has been successfully configured\n"
+msgstr ""
 
-#: ../mdkonline:285 ../mdkonline_tui:130
+#: ../mdkonline:214
+#, fuzzy, c-format
+msgid "Configuration uploaded successfully"
+msgstr "Upload Anda sukses!"
+
+#: ../mdkonline:215
+#, fuzzy, c-format
+msgid "Problem uploading configuration"
+msgstr "Membaca konfigurasi\n"
+
+#: ../mdkonline:216
 #, c-format
 msgid ""
-"Your login or password was wrong.\n"
-" Either you'll have to type it again, or you'll need to create an account on "
-"Mandrakeonline.\n"
-" In the latter case, go back to the first step to connect to "
-"Mandrakeonline.\n"
-" Be aware that you must also provide a Machine name \n"
-" (only alphabetical characters are admitted)"
+"Cannot connect to mandrakeonline website: wrong login/password or router/"
+"firewall bad settings"
 msgstr ""
-"Login atau katasandi Anda keliru.\n"
-"Anda harus menuliskannya lagi, atau membuat account di Mandrakeonline.\n"
-" Pada kasus terakhir, kembalilah ke langkah awal untuk menghubungi "
-"Mandrakeonline.\n"
-" Ingat, Anda juga harus memberikan nama Mesin \n"
-" (hanya karakter alfabet)"
 
-#: ../mdkonline.pm:58
+#: ../mdkonline.pm:66
 #, c-format
 msgid "Login and password should be less than 12 characters\n"
 msgstr ""
 
-#: ../mdkonline.pm:59
+#: ../mdkonline.pm:67
 #, c-format
 msgid "Special characters are not allowed\n"
 msgstr ""
 
-#: ../mdkonline.pm:60
+#: ../mdkonline.pm:68
 #, c-format
 msgid "Please fill in all fields\n"
 msgstr ""
 
-#: ../mdkonline.pm:61
+#: ../mdkonline.pm:69
 #, c-format
 msgid "Email not valid\n"
 msgstr ""
 
-#: ../mdkonline.pm:62
+#: ../mdkonline.pm:70
 #, c-format
 msgid "Account already exist\n"
 msgstr ""
 
-#: ../mdkonline.pm:68
+#: ../mdkonline.pm:76
 #, c-format
 msgid "Problem connecting to server \n"
 msgstr "Masalah dalam menghubungi server \n"
 
-#: ../mdkonline_tui:45 ../mdkonline_tui:95
-#, fuzzy, c-format
-msgid "Mandrakeonline"
-msgstr "Selamat Datang di Mandrakeonline"
-
-#: ../mdkonline_tui:48
-#, c-format
-msgid "I already have an account"
-msgstr ""
-
-#: ../mdkonline_tui:49
-#, c-format
-msgid "I want to subscribe"
-msgstr ""
-
-#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:120
-#, c-format
-msgid "Please wait"
-msgstr "Tunggu..."
-
-#: ../mdkonline_tui:103
-#, c-format
-msgid "Account creation or authentication"
-msgstr ""
-
-#: ../mdkonline_tui:120
-#, fuzzy, c-format
-msgid "Connecting to Mandrakeonline website..."
-msgstr "Selamat Datang di Mandrakeonline"
-
-#: ../mdkonline_tui:130
-#, c-format
-msgid "or"
-msgstr ""
-
-#: ../mdkonline_tui:130
-#, fuzzy, c-format
-msgid "wrong password:"
-msgstr "Katasandi salah"
-
-#: ../mdkonline_tui:158
-#, c-format
-msgid ""
-"Mandrakeonline Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-
-#: ../mdkonline_tui:175
-#, fuzzy, c-format
-msgid "Country"
-msgstr "Negara:"
-
-#: ../mdkonline_tui:187
-#, fuzzy, c-format
-msgid "Congratulations"
-msgstr "Kirim konfigurasi"
-
-#: ../mdkonline_tui:187
-#, c-format
-msgid "Your Mandrakeonline account has been successfully configured\n"
-msgstr ""
-
-#: ../mdkupdate:50
+#: ../mdkupdate:52
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
@@ -606,48 +557,93 @@ msgstr ""
 "\n"
 "pemakaian:\n"
 
-#: ../mdkupdate:55
+#: ../mdkupdate:57
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - cetak pesan bantuan ini.\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:58
 #, fuzzy, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto       - Mandrakeupdate dijalankan secara otomatis.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:59
 #, fuzzy, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - jalankan Mandrakeupdate.\n"
 
-#: ../mdkupdate:58
-#, fuzzy, c-format
-msgid "  --update       - Update keys\n"
-msgstr "  --update       - update kunci.\n"
-
-#: ../mdkupdate:66
+#: ../mdkupdate:67
 #, c-format
 msgid "No %s file found. Run mdkonline wizard first"
 msgstr ""
 
-#: ../mdkupdate:124
+#: ../mdkupdate:126
 #, c-format
 msgid "Mandrakeupdate could not contact the site, we will try again."
 msgstr "Mandrakeupdate tidak bisa menghubungi situs, kami akan mencoba lagi."
 
-#: ../mdkupdate:173
+#: ../mdkupdate:176
 #, c-format
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr "Gagal meng-update paket dari media mdkupdate.\n"
 
-#: ../mdkupdate:195
+#: ../mdkupdate:198
 #, c-format
 msgid ""
 "Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
 "mandrakeonline [dot] net"
 msgstr ""
 
+#~ msgid "Next"
+#~ msgstr "Berikutnya"
+
+#~ msgid "Cancel"
+#~ msgstr "Batal"
+
+#~ msgid "Previous"
+#~ msgstr "Sebelumnya"
+
+#, fuzzy
+#~ msgid "I don't have a Mandrakeonline account and I want to subscribe"
+#~ msgstr "Saya tak punya account Mandrakeonline dan saya ingin "
+
+#~ msgid "Mandrakelinux Privacy Policy"
+#~ msgstr "Kebijakan Privacy Mandrakelinux"
+
+#~ msgid "Authentification"
+#~ msgstr "Authentikasi"
+
+#, fuzzy
+#~ msgid "Send Configuration"
+#~ msgstr "Kirim konfigurasi"
+
+#~ msgid "Finish"
+#~ msgstr "Selesai"
+
+#~ msgid "automated Upgrades"
+#~ msgstr "Upgrade otomatis"
+
+#~ msgid "Country:"
+#~ msgstr "Negara:"
+
+#~ msgid "Error"
+#~ msgstr "Kesalahan"
+
+#~ msgid "Quitting Wizard\n"
+#~ msgstr "Keluar dari Wizard\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Mandrakeonline could not be contacted, please try again at a later time"
+#~ msgstr "Mandrakeupdate gagal dihubungi, harap mencoba lagi."
+
+#~ msgid "Wrong password"
+#~ msgstr "Katasandi salah"
+
+#, fuzzy
+#~ msgid "  --update       - Update keys\n"
+#~ msgstr "  --update       - update kunci.\n"
+
 #~ msgid "Skip Wizard"
 #~ msgstr "Lompati Wizard"
 
diff --git a/po/is.po b/po/is.po
index 09a935ef..f463503b 100644
--- a/po/is.po
+++ b/po/is.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-01 22:41+0200\n"
+"POT-Creation-Date: 2004-11-03 12:10+0100\n"
 "PO-Revision-Date: 2004-03-02 00:27+0000\n"
 "Last-Translator: Pjetur G. Hjaltason <pjetur@pjetur.net>\n"
 "Language-Team: Icelandic <isl@molar.is>\n"
@@ -16,24 +16,24 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.2\n"
 
-#: ../mdkapplet:61
+#: ../mdkapplet:63
 #, c-format
 msgid "Your system is up-to-date"
 msgstr ""
 
-#: ../mdkapplet:67
+#: ../mdkapplet:69
 #, fuzzy, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrakeonline.net"
 msgstr "Ef einhver vandræði eru - sendið póst til support@mandrakeonline.net\n"
 
-#: ../mdkapplet:73
+#: ../mdkapplet:75
 #, c-format
 msgid "System is busy. Please wait ..."
 msgstr ""
 
-#: ../mdkapplet:79
+#: ../mdkapplet:81
 #, fuzzy, c-format
 msgid "New updates are available for your system"
 msgstr ""
@@ -42,249 +42,269 @@ msgstr ""
 "%s\n"
 "eru tiltækir á kerfinu þínu\n"
 
-#: ../mdkapplet:85
+#: ../mdkapplet:87
 #, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr ""
 
-#: ../mdkapplet:91
+#: ../mdkapplet:93
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr ""
 
-#: ../mdkapplet:97
+#: ../mdkapplet:99
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 
-#: ../mdkapplet:103
+#: ../mdkapplet:105
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:108 ../mdkapplet:158
+#: ../mdkapplet:110 ../mdkapplet:164
 #, c-format
 msgid "Install updates"
 msgstr "Setja inn uppfærslur"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:111
 #, fuzzy, c-format
 msgid "Configure the service"
 msgstr "Stilla"
 
-#: ../mdkapplet:110
+#: ../mdkapplet:112
 #, fuzzy, c-format
 msgid "Check Updates"
 msgstr "Uppfærslur"
 
-#: ../mdkapplet:111
+#: ../mdkapplet:113 ../mdkapplet:167 ../mdkapplet:225
+#, fuzzy, c-format
+msgid "Please Wait"
+msgstr "Augnablik..."
+
+#: ../mdkapplet:113 ../mdkapplet:166 ../mdkapplet:167 ../mdkapplet:225
+#, fuzzy, c-format
+msgid "Check updates"
+msgstr "Öryggisuppfærslur"
+
+#: ../mdkapplet:115
 #, c-format
 msgid "Online WebSite"
 msgstr ""
 
-#: ../mdkapplet:112
+#: ../mdkapplet:116
 #, fuzzy, c-format
 msgid "Configure Network"
 msgstr "Stilla nettengingu"
 
-#: ../mdkapplet:113
+#: ../mdkapplet:117
 #, fuzzy, c-format
 msgid "Configure Now!"
 msgstr "Stilla vef"
 
-#: ../mdkapplet:146
+#: ../mdkapplet:152 ../mdkapplet:229
 #, fuzzy, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Mandrake Uppfærsla"
 
-#: ../mdkapplet:156
+#: ../mdkapplet:162
 #, c-format
 msgid "Actions"
 msgstr "Aðgerðir"
 
-#: ../mdkapplet:159
+#: ../mdkapplet:165
 #, c-format
 msgid "Configure"
 msgstr "Stilla"
 
-#: ../mdkapplet:160
-#, fuzzy, c-format
-msgid "Check updates"
-msgstr "Öryggisuppfærslur"
-
-#: ../mdkapplet:161
+#: ../mdkapplet:169
 #, c-format
 msgid "See logs"
 msgstr ""
 
-#: ../mdkapplet:164
+#: ../mdkapplet:172
 #, c-format
 msgid "Status"
 msgstr "Staða"
 
-#: ../mdkapplet:168 ../mdkapplet:363
+#: ../mdkapplet:176 ../mdkapplet:375
 #, c-format
 msgid "Close"
 msgstr "Loka"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, fuzzy, c-format
 msgid "Network Connection: "
 msgstr "Virtual Network Connection"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Up"
 msgstr "Upp"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Down"
 msgstr "Niður"
 
-#: ../mdkapplet:204
+#: ../mdkapplet:212
 #, c-format
 msgid "Last check: "
 msgstr ""
 
-#: ../mdkapplet:205
+#: ../mdkapplet:213
 #, fuzzy, c-format
 msgid "Updates: "
 msgstr "Uppfærslur"
 
-#: ../mdkapplet:209
+#: ../mdkapplet:217
 #, fuzzy, c-format
 msgid "Launching drakconnect\n"
 msgstr "Ræsa userdrake"
 
-#: ../mdkapplet:213
+#: ../mdkapplet:221
 #, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr ""
 
-#: ../mdkapplet:217
+#: ../mdkapplet:224
 #, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 
-#: ../mdkapplet:225
+#: ../mdkapplet:235
 #, fuzzy, c-format
 msgid "Computing new updates...\n"
 msgstr "Tengist ...\n"
 
-#: ../mdkapplet:227
+#: ../mdkapplet:237
 #, fuzzy, c-format
 msgid "Connecting to"
 msgstr "Tenging mistókst"
 
-#: ../mdkapplet:250
+#: ../mdkapplet:244
+#, fuzzy, c-format
+msgid "Response from Mandrakeonline server\n"
+msgstr "Velkomin(n) í Mandrakelinux"
+
+#: ../mdkapplet:262
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr ""
 
-#: ../mdkapplet:254
+#: ../mdkapplet:267
 #, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
-#: ../mdkapplet:255
+#: ../mdkapplet:268
 #, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
-#: ../mdkapplet:256
+#: ../mdkapplet:269
 #, fuzzy, c-format
 msgid "Unknown state"
 msgstr "Óþekkt vél"
 
-#: ../mdkapplet:257
+#: ../mdkapplet:270
 #, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr ""
 
-#: ../mdkapplet:258
+#: ../mdkapplet:271
 #, fuzzy, c-format
 msgid "Wrong Password.\n"
 msgstr "Staðfestu lykilorð:"
 
-#: ../mdkapplet:259
+#: ../mdkapplet:272
 #, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr ""
 
-#: ../mdkapplet:260
+#: ../mdkapplet:273
 #, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
 msgstr ""
 
-#: ../mdkapplet:264
+#: ../mdkapplet:277
 #, fuzzy, c-format
 msgid "System is up-to-date\n"
 msgstr "Kerfisuppsetning"
 
-#: ../mdkapplet:303
+#: ../mdkapplet:317
 #, fuzzy, c-format
 msgid "No check"
 msgstr "GNU Go tafl"
 
-#: ../mdkapplet:316
+#: ../mdkapplet:330
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
-#: ../mdkapplet:319
+#: ../mdkapplet:333
 #, c-format
 msgid "Checking config file: Not present\n"
 msgstr ""
 
-#: ../mdkapplet:353
+#: ../mdkapplet:365
 #, c-format
 msgid "Logs"
 msgstr "Annálar"
 
-#: ../mdkapplet:369
+#: ../mdkapplet:381
 #, fuzzy, c-format
 msgid "Clear"
 msgstr "Dagatal"
 
-#: ../mdkapplet:396
+#: ../mdkapplet:408
 #, c-format
 msgid "About..."
 msgstr "Um..."
 
-#: ../mdkapplet:397
+#: ../mdkapplet:409
 #, c-format
 msgid "Always launch on startup"
 msgstr ""
 
-#: ../mdkapplet:399
+#: ../mdkapplet:411
 #, c-format
 msgid "Quit"
 msgstr "Hætta"
 
-#: ../mdkonline:89
+#: ../mdkonline:52 ../mdkonline:106
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "Velkomin(n) í Mandrakelinux"
+
+#: ../mdkonline:55
+#, c-format
+msgid "I already have an account"
+msgstr ""
+
+#: ../mdkonline:56
 #, c-format
-msgid "Next"
-msgstr "Næsta"
+msgid "I want to subscribe"
+msgstr ""
 
-#: ../mdkonline:89
+#: ../mdkonline:89 ../mdkonline:93 ../mdkonline:131
 #, c-format
-msgid "Cancel"
-msgstr "Hætta við"
+msgid "Please wait"
+msgstr "Augnablik..."
 
 #: ../mdkonline:89
-#, c-format
-msgid "Previous"
-msgstr "Fyrra"
+#, fuzzy, c-format
+msgid "Reading configuration\n"
+msgstr "Endurlesa stillingar"
 
-#: ../mdkonline:103
+#: ../mdkonline:93
 #, fuzzy, c-format
-msgid "Welcome to Mandrakeonline"
-msgstr "Velkomin(n) í Mandrakelinux"
+msgid "Sending configuration..."
+msgstr "Hljóðuppsetning"
 
-#: ../mdkonline:104 ../mdkonline_tui:98
+#: ../mdkonline:109
 #, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
@@ -292,63 +312,37 @@ msgid ""
 "order to keep you informed about security updates and useful upgrades.\n"
 msgstr ""
 
-#: ../mdkonline:105 ../mdkonline_tui:142
-#, fuzzy, c-format
-msgid "Create a Mandrakeonline Account"
-msgstr "MandrakelinuxKlúbb félagi"
+#: ../mdkonline:114
+#, c-format
+msgid "Account creation or authentication"
+msgstr ""
 
-#: ../mdkonline:107
-#, fuzzy, c-format
-msgid "I don't have a Mandrakeonline account and I want to subscribe"
+#: ../mdkonline:119
+#, c-format
+msgid "Enter your Mandrakeonline login, password and machine name:"
 msgstr ""
-"Þú verður að vera með reikning hjá Mandrakeonline, eða uppfæra áskrift þína."
 
-#: ../mdkonline:111 ../mdkonline:131 ../mdkonline_tui:114 ../mdkonline_tui:145
+#: ../mdkonline:125 ../mdkonline:156
 #, c-format
 msgid "Login:"
 msgstr "Notandi:"
 
-#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:115 ../mdkonline_tui:146
+#: ../mdkonline:126 ../mdkonline:157
 #, c-format
 msgid "Password:"
 msgstr "Lykilorð:"
 
-#: ../mdkonline:113 ../mdkonline_tui:147
-#, c-format
-msgid "Confirm Password:"
-msgstr "Staðfestu lykilorð:"
-
-#: ../mdkonline:114 ../mdkonline_tui:148
-#, fuzzy, c-format
-msgid "Mail contact:"
-msgstr "Netfang:"
-
-#: ../mdkonline:121
-#, fuzzy, c-format
-msgid "Mandrakelinux Privacy Policy"
-msgstr "Mandrakelinux tilleggjendur"
-
 #: ../mdkonline:127
 #, fuzzy, c-format
-msgid "Authentification"
-msgstr "Auðkenning"
-
-#: ../mdkonline:128 ../mdkonline_tui:108
-#, c-format
-msgid "Enter your Mandrakeonline login, password and machine name:"
-msgstr ""
-
-#: ../mdkonline:133 ../mdkonline_tui:116
-#, fuzzy, c-format
 msgid "Machine name:"
 msgstr "Jarðsprengjuleikur"
 
-#: ../mdkonline:138
+#: ../mdkonline:131
 #, fuzzy, c-format
-msgid "Send Configuration"
-msgstr "Hljóðuppsetning"
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Velkomin(n) í Mandrakelinux"
 
-#: ../mdkonline:139 ../mdkonline_tui:128
+#: ../mdkonline:139
 #, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
@@ -367,51 +361,49 @@ msgid ""
 "www.mandrakeexpert.com."
 msgstr ""
 
-#: ../mdkonline:144 ../mdkonline:211 ../mdkonline:234
+#: ../mdkonline:141 ../mdkonline:180 ../mdkupdate:126 ../mdkupdate:198
 #, c-format
-msgid "Finish"
-msgstr "Ljúka"
+msgid "Connection problem"
+msgstr "Tenging mistókst"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid "Your upload was successful!"
+msgid "or"
 msgstr ""
 
-#: ../mdkonline:145 ../mdkonline_tui:167
-#, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandrakeonline."
-msgstr ""
+#: ../mdkonline:141
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "Ekkert lykilorð"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
 msgid ""
-"Mandrakeonline offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
-msgstr ""
-
-#: ../mdkonline:146
-#, c-format
-msgid "automated Upgrades"
+"Your login or password was wrong.\n"
+" Either you'll have to type it again, or you'll need to create an account on "
+"Mandrakeonline.\n"
+" In the latter case, go back to the first step to connect to "
+"Mandrakeonline.\n"
+" Be aware that you must also provide a Machine name \n"
+" (only alphabetical characters are admitted)"
 msgstr ""
 
-#: ../mdkonline:150
+#: ../mdkonline:153
 #, fuzzy, c-format
-msgid "Country:"
-msgstr "Land"
+msgid "Create a Mandrakeonline Account"
+msgstr "MandrakelinuxKlúbb félagi"
 
-#: ../mdkonline:178 ../mdkonline:183 ../mdkonline:185 ../mdkonline:187
+#: ../mdkonline:158
 #, c-format
-msgid "Error"
-msgstr "Villa"
+msgid "Confirm Password:"
+msgstr "Staðfestu lykilorð:"
 
-#: ../mdkonline:183 ../mdkonline_tui:152
+#: ../mdkonline:159
 #, fuzzy, c-format
-msgid "Please provide a login"
-msgstr "Reyndu aftur"
+msgid "Mail contact:"
+msgstr "Netfang:"
 
-#: ../mdkonline:185 ../mdkonline_tui:152
+#: ../mdkonline:163
 #, c-format
 msgid ""
 "The passwords do not match\n"
@@ -420,152 +412,110 @@ msgstr ""
 "Lykilorðin eru ekki eins\n"
 " Vinsamlega reyndu aftur\n"
 
-#: ../mdkonline:187 ../mdkonline_tui:152
-#, c-format
-msgid "Not a valid mail address!\n"
-msgstr "Ekki gilt netfang!\n"
-
-#: ../mdkonline:199 ../mdkonline_tui:78
-#, fuzzy, c-format
-msgid "Reading configuration\n"
-msgstr "Endurlesa stillingar"
-
-#: ../mdkonline:204 ../mdkonline_tui:82
+#: ../mdkonline:163
 #, fuzzy, c-format
-msgid "Sending configuration..."
-msgstr "Hljóðuppsetning"
+msgid "Please provide a login"
+msgstr "Reyndu aftur"
 
-#: ../mdkonline:213 ../mdkonline:273 ../mdkonline_tui:130 ../mdkonline_tui:169
-#: ../mdkupdate:124 ../mdkupdate:195
+#: ../mdkonline:163
 #, c-format
-msgid "Connection problem"
-msgstr "Tenging mistókst"
+msgid "Not a valid mail address!\n"
+msgstr "Ekki gilt netfang!\n"
 
-#: ../mdkonline:213 ../mdkonline_tui:169
+#: ../mdkonline:169
 #, c-format
-msgid "Problem occurs when uploading files, please try again"
+msgid ""
+"Mandrakeonline Account successfully created.\n"
+"Please click \"Next\" to authenticate and upload your configuration\n"
 msgstr ""
 
-#: ../mdkonline:251
-#, fuzzy, c-format
-msgid "Quitting Wizard\n"
-msgstr "Skjáborðsálfurinn (stillingar)"
-
-#: ../mdkonline:273
+#: ../mdkonline:178
 #, c-format
-msgid "Mandrakeonline could not be contacted, please try again at a later time"
-msgstr "Ekki var hægt að tengjast Mandrakeonline reynið aftur síðar"
-
-#: ../mdkonline:285
-#, fuzzy, c-format
-msgid "Wrong password"
-msgstr "Ekkert lykilorð"
+msgid "Your upload was successful!"
+msgstr ""
 
-#: ../mdkonline:285 ../mdkonline_tui:130
+#: ../mdkonline:178
 #, c-format
 msgid ""
-"Your login or password was wrong.\n"
-" Either you'll have to type it again, or you'll need to create an account on "
-"Mandrakeonline.\n"
-" In the latter case, go back to the first step to connect to "
-"Mandrakeonline.\n"
-" Be aware that you must also provide a Machine name \n"
-" (only alphabetical characters are admitted)"
+"From now you will receive on security and updates \n"
+"announcements thanks to Mandrakeonline."
 msgstr ""
 
-#: ../mdkonline.pm:58
+#: ../mdkonline:178
 #, c-format
-msgid "Login and password should be less than 12 characters\n"
+msgid ""
+"Mandrakeonline offers you the ability to automate the updates.\n"
+"A program will run regulary in your system waiting for new updates\n"
 msgstr ""
 
-#: ../mdkonline.pm:59
+#: ../mdkonline:180
 #, c-format
-msgid "Special characters are not allowed\n"
+msgid "Problem occurs when uploading files, please try again"
 msgstr ""
 
-#: ../mdkonline.pm:60
-#, c-format
-msgid "Please fill in all fields\n"
-msgstr ""
+#: ../mdkonline:186
+#, fuzzy, c-format
+msgid "Country"
+msgstr "Land"
 
-#: ../mdkonline.pm:61
-#, c-format
-msgid "Email not valid\n"
-msgstr ""
+#: ../mdkonline:198
+#, fuzzy, c-format
+msgid "Congratulations"
+msgstr "Stillingar"
 
-#: ../mdkonline.pm:62
+#: ../mdkonline:198
 #, c-format
-msgid "Account already exist\n"
+msgid "Your Mandrakeonline account has been successfully configured\n"
 msgstr ""
 
-#: ../mdkonline.pm:68
+#: ../mdkonline:214
 #, c-format
-msgid "Problem connecting to server \n"
-msgstr "Vandræði við tengingu við miðlara\n"
+msgid "Configuration uploaded successfully"
+msgstr ""
 
-#: ../mdkonline_tui:45 ../mdkonline_tui:95
+#: ../mdkonline:215
 #, fuzzy, c-format
-msgid "Mandrakeonline"
-msgstr "Velkomin(n) í Mandrakelinux"
+msgid "Problem uploading configuration"
+msgstr "Endurlesa stillingar"
 
-#: ../mdkonline_tui:48
+#: ../mdkonline:216
 #, c-format
-msgid "I already have an account"
+msgid ""
+"Cannot connect to mandrakeonline website: wrong login/password or router/"
+"firewall bad settings"
 msgstr ""
 
-#: ../mdkonline_tui:49
+#: ../mdkonline.pm:66
 #, c-format
-msgid "I want to subscribe"
+msgid "Login and password should be less than 12 characters\n"
 msgstr ""
 
-#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:120
+#: ../mdkonline.pm:67
 #, c-format
-msgid "Please wait"
-msgstr "Augnablik..."
+msgid "Special characters are not allowed\n"
+msgstr ""
 
-#: ../mdkonline_tui:103
+#: ../mdkonline.pm:68
 #, c-format
-msgid "Account creation or authentication"
+msgid "Please fill in all fields\n"
 msgstr ""
 
-#: ../mdkonline_tui:120
-#, fuzzy, c-format
-msgid "Connecting to Mandrakeonline website..."
-msgstr "Velkomin(n) í Mandrakelinux"
-
-#: ../mdkonline_tui:130
+#: ../mdkonline.pm:69
 #, c-format
-msgid "or"
+msgid "Email not valid\n"
 msgstr ""
 
-#: ../mdkonline_tui:130
-#, fuzzy, c-format
-msgid "wrong password:"
-msgstr "Ekkert lykilorð"
-
-#: ../mdkonline_tui:158
+#: ../mdkonline.pm:70
 #, c-format
-msgid ""
-"Mandrakeonline Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
+msgid "Account already exist\n"
 msgstr ""
 
-#: ../mdkonline_tui:175
-#, fuzzy, c-format
-msgid "Country"
-msgstr "Land"
-
-#: ../mdkonline_tui:187
-#, fuzzy, c-format
-msgid "Congratulations"
-msgstr "Stillingar"
-
-#: ../mdkonline_tui:187
+#: ../mdkonline.pm:76
 #, c-format
-msgid "Your Mandrakeonline account has been successfully configured\n"
-msgstr ""
+msgid "Problem connecting to server \n"
+msgstr "Vandræði við tengingu við miðlara\n"
 
-#: ../mdkupdate:50
+#: ../mdkupdate:52
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
@@ -581,48 +531,95 @@ msgstr ""
 "\n"
 "notkun:\n"
 
-#: ../mdkupdate:55
+#: ../mdkupdate:57
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - prenta þetta.\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:58
 #, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto       - Mandrakeupdate keyrt sjálvirkt.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:59
 #, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - ræsa Mandrakeupdate.\n"
 
-#: ../mdkupdate:58
-#, c-format
-msgid "  --update       - Update keys\n"
-msgstr "  --update       - uppfæra lykla.\n"
-
-#: ../mdkupdate:66
+#: ../mdkupdate:67
 #, c-format
 msgid "No %s file found. Run mdkonline wizard first"
 msgstr ""
 
-#: ../mdkupdate:124
+#: ../mdkupdate:126
 #, c-format
 msgid "Mandrakeupdate could not contact the site, we will try again."
 msgstr "Mandrakeupdate gat ekki tengst þjóninum, við reynum aftur."
 
-#: ../mdkupdate:173
+#: ../mdkupdate:176
 #, c-format
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr "Gat ekki uppfært pakka frá mdkupdate miðli.\n"
 
-#: ../mdkupdate:195
+#: ../mdkupdate:198
 #, c-format
 msgid ""
 "Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
 "mandrakeonline [dot] net"
 msgstr ""
 
+#~ msgid "Next"
+#~ msgstr "Næsta"
+
+#~ msgid "Cancel"
+#~ msgstr "Hætta við"
+
+#~ msgid "Previous"
+#~ msgstr "Fyrra"
+
+#, fuzzy
+#~ msgid "I don't have a Mandrakeonline account and I want to subscribe"
+#~ msgstr ""
+#~ "Þú verður að vera með reikning hjá Mandrakeonline, eða uppfæra áskrift "
+#~ "þína."
+
+#, fuzzy
+#~ msgid "Mandrakelinux Privacy Policy"
+#~ msgstr "Mandrakelinux tilleggjendur"
+
+#, fuzzy
+#~ msgid "Authentification"
+#~ msgstr "Auðkenning"
+
+#, fuzzy
+#~ msgid "Send Configuration"
+#~ msgstr "Hljóðuppsetning"
+
+#~ msgid "Finish"
+#~ msgstr "Ljúka"
+
+#, fuzzy
+#~ msgid "Country:"
+#~ msgstr "Land"
+
+#~ msgid "Error"
+#~ msgstr "Villa"
+
+#, fuzzy
+#~ msgid "Quitting Wizard\n"
+#~ msgstr "Skjáborðsálfurinn (stillingar)"
+
+#~ msgid ""
+#~ "Mandrakeonline could not be contacted, please try again at a later time"
+#~ msgstr "Ekki var hægt að tengjast Mandrakeonline reynið aftur síðar"
+
+#, fuzzy
+#~ msgid "Wrong password"
+#~ msgstr "Ekkert lykilorð"
+
+#~ msgid "  --update       - Update keys\n"
+#~ msgstr "  --update       - uppfæra lykla.\n"
+
 #, fuzzy
 #~ msgid "Skip Wizard"
 #~ msgstr " Sleppa leiðbeiningu "
diff --git a/po/it.po b/po/it.po
index 4b460474..01203b06 100644
--- a/po/it.po
+++ b/po/it.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-it\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-25 16:00+0200\n"
-"PO-Revision-Date: 2004-10-24 08:52+0200\n"
+"POT-Creation-Date: 2004-11-03 12:10+0100\n"
+"PO-Revision-Date: 2004-09-28 21:10+0200\n"
 "Last-Translator: Daniele Pighin <daniele@dcs.it>\n"
 "Language-Team: italian <timl@freelists.org>\n"
 "MIME-Version: 1.0\n"
@@ -19,12 +19,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3.1\n"
 
-#: ../mdkapplet:61
+#: ../mdkapplet:63
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Il tuo sistema è aggiornato"
 
-#: ../mdkapplet:67
+#: ../mdkapplet:69
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -33,188 +33,198 @@ msgstr ""
 "Problema di configurazione del server. Controlla i log e scrivi a "
 "support@mandrakeonline.net"
 
-#: ../mdkapplet:73
+#: ../mdkapplet:75
 #, c-format
 msgid "System is busy. Please wait ..."
 msgstr "Il sistema è occupato. Attendi ..."
 
-#: ../mdkapplet:79
+#: ../mdkapplet:81
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Nuovi aggiornamenti disponibili per il tuo sistema"
 
-#: ../mdkapplet:85
+#: ../mdkapplet:87
 #, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr "Servizio non configurato. Clicca su \"Configura il servizio\""
 
-#: ../mdkapplet:91
+#: ../mdkapplet:93
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "La rete è disattivata. Prova a riconfigurare la rete"
 
-#: ../mdkapplet:97
+#: ../mdkapplet:99
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Servizio non attivato. Clicca su \"Sito web online\""
 
-#: ../mdkapplet:103
+#: ../mdkapplet:105
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "Versione non supportata (troppo vecchia o di sviluppo)"
 
-#: ../mdkapplet:108 ../mdkapplet:158
+#: ../mdkapplet:110 ../mdkapplet:164
 #, c-format
 msgid "Install updates"
 msgstr "Installa aggiornamenti"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:111
 #, c-format
 msgid "Configure the service"
 msgstr "Configura il servizio"
 
-#: ../mdkapplet:110
+#: ../mdkapplet:112
 #, c-format
 msgid "Check Updates"
 msgstr "Controlla aggiornamenti"
 
-#: ../mdkapplet:111
+#: ../mdkapplet:113 ../mdkapplet:167 ../mdkapplet:225
+#, fuzzy, c-format
+msgid "Please Wait"
+msgstr "Attendere prego"
+
+#: ../mdkapplet:113 ../mdkapplet:166 ../mdkapplet:167 ../mdkapplet:225
+#, c-format
+msgid "Check updates"
+msgstr "Controlla aggiornamenti"
+
+#: ../mdkapplet:115
 #, c-format
 msgid "Online WebSite"
 msgstr "Sito online"
 
-#: ../mdkapplet:112
+#: ../mdkapplet:116
 #, c-format
 msgid "Configure Network"
 msgstr "Configura la rete"
 
-#: ../mdkapplet:113
+#: ../mdkapplet:117
 #, c-format
 msgid "Configure Now!"
 msgstr "Configura adesso!"
 
-#: ../mdkapplet:146
+#: ../mdkapplet:152 ../mdkapplet:229
 #, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Applet aggiornamenti Mandrakelinux"
 
-#: ../mdkapplet:156
+#: ../mdkapplet:162
 #, c-format
 msgid "Actions"
 msgstr "Azioni"
 
-#: ../mdkapplet:159
+#: ../mdkapplet:165
 #, c-format
 msgid "Configure"
 msgstr "Configura"
 
-#: ../mdkapplet:160
-#, c-format
-msgid "Check updates"
-msgstr "Controlla aggiornamenti"
-
-#: ../mdkapplet:161
+#: ../mdkapplet:169
 #, c-format
 msgid "See logs"
 msgstr "Visualizza i log"
 
-#: ../mdkapplet:164
+#: ../mdkapplet:172
 #, c-format
 msgid "Status"
 msgstr "Stato"
 
-#: ../mdkapplet:168 ../mdkapplet:363
+#: ../mdkapplet:176 ../mdkapplet:375
 #, c-format
 msgid "Close"
 msgstr "Chiudi"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Network Connection: "
 msgstr "Connessione alla rete: "
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Up"
 msgstr "Attiva"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Down"
 msgstr "Disattiva"
 
-#: ../mdkapplet:204
+#: ../mdkapplet:212
 #, c-format
 msgid "Last check: "
 msgstr "Ultimo controllo: "
 
-#: ../mdkapplet:205
+#: ../mdkapplet:213
 #, c-format
 msgid "Updates: "
 msgstr "Aggiornamenti: "
 
-#: ../mdkapplet:209
+#: ../mdkapplet:217
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Sto avviando drakconnect\n"
 
-#: ../mdkapplet:213
+#: ../mdkapplet:221
 #, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "Sto avviando mdkupdate --applet\n"
 
-#: ../mdkapplet:217
+#: ../mdkapplet:224
 #, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 "Sembra che Mandrakeonline sia stato reinstallato, ricarico l'applet ..."
 
-#: ../mdkapplet:225
+#: ../mdkapplet:235
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Calcolo dei nuovi aggiornamenti in corso...\n"
 
-#: ../mdkapplet:227
+#: ../mdkapplet:237
 #, c-format
 msgid "Connecting to"
 msgstr "Connessione in corso con"
 
-#: ../mdkapplet:250
+#: ../mdkapplet:244
+#, fuzzy, c-format
+msgid "Response from Mandrakeonline server\n"
+msgstr "Benvenuto su Mandrakeonline"
+
+#: ../mdkapplet:262
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Sto controllando... Ci sono aggiornamenti disponibili\n"
 
-#: ../mdkapplet:254
+#: ../mdkapplet:267
 #, c-format
 msgid "Development release not supported by service"
 msgstr "Versione di sviluppo non supportata dal servizio"
 
-#: ../mdkapplet:255
+#: ../mdkapplet:268
 #, c-format
 msgid "Too old release not supported by service"
 msgstr "Release troppo vecchia non supportata dal servizio"
 
-#: ../mdkapplet:256
+#: ../mdkapplet:269
 #, c-format
 msgid "Unknown state"
 msgstr "Stato ignoto"
 
-#: ../mdkapplet:257
+#: ../mdkapplet:270
 #, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr "Servizi online disabilitati .Contatta il sito Mandrakeonline\n"
 
-#: ../mdkapplet:258
+#: ../mdkapplet:271
 #, c-format
 msgid "Wrong Password.\n"
 msgstr "Password errata.\n"
 
-#: ../mdkapplet:259
+#: ../mdkapplet:272
 #, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr "Azione, host o login errati.\n"
 
-#: ../mdkapplet:260
+#: ../mdkapplet:273
 #, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
@@ -223,72 +233,82 @@ msgstr ""
 "C'è qualcosa di sbagliato nei tuoi parametri di rete (controlla i percorsi, "
 "il firewall o le impostazioni del proxy)\n"
 
-#: ../mdkapplet:264
+#: ../mdkapplet:277
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Il sistema è aggiornato\n"
 
-#: ../mdkapplet:303
+#: ../mdkapplet:317
 #, c-format
 msgid "No check"
 msgstr "Nessun controllo"
 
-#: ../mdkapplet:316
+#: ../mdkapplet:330
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Controllo la rete: sembra disattivata\n"
 
-#: ../mdkapplet:319
+#: ../mdkapplet:333
 #, c-format
 msgid "Checking config file: Not present\n"
 msgstr "Controllo il file di configurazione: Non presente\n"
 
-#: ../mdkapplet:353
+#: ../mdkapplet:365
 #, c-format
 msgid "Logs"
 msgstr "Log"
 
-#: ../mdkapplet:369
+#: ../mdkapplet:381
 #, c-format
 msgid "Clear"
 msgstr "Cancella"
 
-#: ../mdkapplet:396
+#: ../mdkapplet:408
 #, c-format
 msgid "About..."
 msgstr "Informazioni su..."
 
-#: ../mdkapplet:397
+#: ../mdkapplet:409
 #, c-format
 msgid "Always launch on startup"
 msgstr "Lanciare sempre all'avvio"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:411
 #, c-format
 msgid "Quit"
 msgstr "Esci"
 
-#: ../mdkonline:89
+#: ../mdkonline:52 ../mdkonline:106
 #, c-format
-msgid "Next"
-msgstr "Successivo"
+msgid "Mandrakeonline"
+msgstr "Mandrakeonline"
 
-#: ../mdkonline:89
+#: ../mdkonline:55
+#, c-format
+msgid "I already have an account"
+msgstr "Ho già un account"
+
+#: ../mdkonline:56
+#, c-format
+msgid "I want to subscribe"
+msgstr "Voglio iscrivermi"
+
+#: ../mdkonline:89 ../mdkonline:93 ../mdkonline:131
 #, c-format
-msgid "Cancel"
-msgstr "Annulla"
+msgid "Please wait"
+msgstr "Attendere prego"
 
 #: ../mdkonline:89
 #, c-format
-msgid "Previous"
-msgstr "Indietro"
+msgid "Reading configuration\n"
+msgstr "Lettura della configurazione in corso\n"
 
-#: ../mdkonline:103
+#: ../mdkonline:93
 #, c-format
-msgid "Welcome to Mandrakeonline"
-msgstr "Benvenuto su Mandrakeonline"
+msgid "Sending configuration..."
+msgstr "Invio della configurazione in corso..."
 
-#: ../mdkonline:104 ../mdkonline_tui:102
+#: ../mdkonline:109
 #, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
@@ -300,62 +320,37 @@ msgstr ""
 "informato su aggiornamenti del software mirati alla produttività e alla "
 "sicurezza.\n"
 
-#: ../mdkonline:105 ../mdkonline_tui:146
+#: ../mdkonline:114
 #, c-format
-msgid "Create a Mandrakeonline Account"
-msgstr "Crea un account per Mandrakeonline"
+msgid "Account creation or authentication"
+msgstr "Creazione dell'account o autenticazione"
 
-#: ../mdkonline:107
+#: ../mdkonline:119
 #, c-format
-msgid "I don't have a Mandrakeonline account and I want to subscribe"
-msgstr "Non ho un account su Mandrakeonline e vorrei iscrivermi"
+msgid "Enter your Mandrakeonline login, password and machine name:"
+msgstr "Immetti nome utente, password e nome computer per Mandrakeonline:"
 
-#: ../mdkonline:111 ../mdkonline:131 ../mdkonline_tui:118 ../mdkonline_tui:149
+#: ../mdkonline:125 ../mdkonline:156
 #, c-format
 msgid "Login:"
 msgstr "Nome utente:"
 
-#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:119 ../mdkonline_tui:150
+#: ../mdkonline:126 ../mdkonline:157
 #, c-format
 msgid "Password:"
 msgstr "Password:"
 
-#: ../mdkonline:113 ../mdkonline_tui:151
-#, c-format
-msgid "Confirm Password:"
-msgstr "Conferma password:"
-
-#: ../mdkonline:114 ../mdkonline_tui:152
-#, c-format
-msgid "Mail contact:"
-msgstr "Contatto email:"
-
-#: ../mdkonline:121
-#, c-format
-msgid "Mandrakelinux Privacy Policy"
-msgstr "Politica di Mandrakelinux sulla privacy"
-
 #: ../mdkonline:127
 #, c-format
-msgid "Authentification"
-msgstr "Identificazione"
-
-#: ../mdkonline:128 ../mdkonline_tui:112
-#, c-format
-msgid "Enter your Mandrakeonline login, password and machine name:"
-msgstr "Immetti nome utente, password e nome computer per Mandrakeonline:"
-
-#: ../mdkonline:133 ../mdkonline_tui:120
-#, c-format
 msgid "Machine name:"
 msgstr "Nome computer:"
 
-#: ../mdkonline:138
+#: ../mdkonline:131
 #, c-format
-msgid "Send Configuration"
-msgstr "Invia configurazione"
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Connessione in corso al sito Mandrakeonline..."
 
-#: ../mdkonline:139 ../mdkonline_tui:132
+#: ../mdkonline:139
 #, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
@@ -386,55 +381,55 @@ msgstr ""
 "Inoltre, potrai accedere a sconti sul supporto tecnico presso\n"
 "www.mandrakeexpert.com."
 
-#: ../mdkonline:144 ../mdkonline:211 ../mdkonline:234
+#: ../mdkonline:141 ../mdkonline:180 ../mdkupdate:126 ../mdkupdate:198
 #, c-format
-msgid "Finish"
-msgstr "Fine"
+msgid "Connection problem"
+msgstr "Problema di connessione"
 
-#: ../mdkonline:145 ../mdkonline_tui:171
+#: ../mdkonline:141
 #, c-format
-msgid "Your upload was successful!"
-msgstr "Trasmissione completata con successo!"
+msgid "or"
+msgstr "o"
 
-#: ../mdkonline:145 ../mdkonline_tui:171
+#: ../mdkonline:141
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandrakeonline."
-msgstr ""
-"Da ora in poi riceverai avvisi sulla sicurezza e sugli\n"
-"aggiornamenti grazie a Mandrakeonline."
+msgid "wrong password:"
+msgstr "password errata:"
 
-#: ../mdkonline:145 ../mdkonline_tui:171
+#: ../mdkonline:141
 #, c-format
 msgid ""
-"Mandrakeonline offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+"Your login or password was wrong.\n"
+" Either you'll have to type it again, or you'll need to create an account on "
+"Mandrakeonline.\n"
+" In the latter case, go back to the first step to connect to "
+"Mandrakeonline.\n"
+" Be aware that you must also provide a Machine name \n"
+" (only alphabetical characters are admitted)"
 msgstr ""
-"Mandrakeonline ti offre la possibilità di automatizzare gli aggiornamenti.\n"
-"Un programma in attesa di nuovi aggiornamenti sarà eseguito periodicamente\n"
-
-#: ../mdkonline:146
-#, c-format
-msgid "automated Upgrades"
-msgstr "Aggiornamenti automatici"
+"Il nome utente o la password sono errati.\n"
+" Dovrai ridigitarli oppure, qualora non ne avessi uno, creare un account su "
+"Mandrakeonline.\n"
+" Nel secondo caso, torna al primo passo per collegarti a Mandrakeonline.\n"
+" Ricorda che devi fornire anche un nome per il tuo computer \n"
+" (sono ammessi solo caratteri alfabetici)"
 
-#: ../mdkonline:150
+#: ../mdkonline:153
 #, c-format
-msgid "Country:"
-msgstr "Nazione:"
+msgid "Create a Mandrakeonline Account"
+msgstr "Crea un account per Mandrakeonline"
 
-#: ../mdkonline:178 ../mdkonline:183 ../mdkonline:185 ../mdkonline:187
+#: ../mdkonline:158
 #, c-format
-msgid "Error"
-msgstr "Errore"
+msgid "Confirm Password:"
+msgstr "Conferma password:"
 
-#: ../mdkonline:183 ../mdkonline_tui:156
+#: ../mdkonline:159
 #, c-format
-msgid "Please provide a login"
-msgstr "Fornisci un nome utente"
+msgid "Mail contact:"
+msgstr "Contatto email:"
 
-#: ../mdkonline:185 ../mdkonline_tui:156
+#: ../mdkonline:163
 #, c-format
 msgid ""
 "The passwords do not match\n"
@@ -443,161 +438,117 @@ msgstr ""
 "Le password non coincidono\n"
 "Per favore, riprova\n"
 
-#: ../mdkonline:187 ../mdkonline_tui:156
+#: ../mdkonline:163
+#, c-format
+msgid "Please provide a login"
+msgstr "Fornisci un nome utente"
+
+#: ../mdkonline:163
 #, c-format
 msgid "Not a valid mail address!\n"
 msgstr "Non è un indirizzo di email valido!\n"
 
-#: ../mdkonline:199 ../mdkonline_tui:82
+#: ../mdkonline:169
 #, c-format
-msgid "Reading configuration\n"
-msgstr "Lettura della configurazione in corso\n"
+msgid ""
+"Mandrakeonline Account successfully created.\n"
+"Please click \"Next\" to authenticate and upload your configuration\n"
+msgstr ""
+"Account Mandrakeonline creato correttamente.\n"
+"Clicca su \"Avanti\" per autenticarti e fare l'upload della tua "
+"configurazione\n"
 
-#: ../mdkonline:204 ../mdkonline_tui:86
+#: ../mdkonline:178
 #, c-format
-msgid "Sending configuration..."
-msgstr "Invio della configurazione in corso..."
+msgid "Your upload was successful!"
+msgstr "Trasmissione completata con successo!"
 
-#: ../mdkonline:213 ../mdkonline:273 ../mdkonline_tui:134 ../mdkonline_tui:173
-#: ../mdkupdate:124 ../mdkupdate:195
+#: ../mdkonline:178
 #, c-format
-msgid "Connection problem"
-msgstr "Problema di connessione"
+msgid ""
+"From now you will receive on security and updates \n"
+"announcements thanks to Mandrakeonline."
+msgstr ""
+"Da ora in poi riceverai avvisi sulla sicurezza e sugli\n"
+"aggiornamenti grazie a Mandrakeonline."
+
+#: ../mdkonline:178
+#, c-format
+msgid ""
+"Mandrakeonline offers you the ability to automate the updates.\n"
+"A program will run regulary in your system waiting for new updates\n"
+msgstr ""
+"Mandrakeonline ti offre la possibilità di automatizzare gli aggiornamenti.\n"
+"Un programma in attesa di nuovi aggiornamenti sarà eseguito periodicamente\n"
 
-#: ../mdkonline:213 ../mdkonline_tui:173
+#: ../mdkonline:180
 #, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr "C'è stato un problema in upload, per favore riprova"
 
-#: ../mdkonline:251
+#: ../mdkonline:186
 #, c-format
-msgid "Quitting Wizard\n"
-msgstr "Chiusura in corso\n"
+msgid "Country"
+msgstr "Paese"
 
-#: ../mdkonline:273
-#, c-format
-msgid "Mandrakeonline could not be contacted, please try again at a later time"
-msgstr "Non è stato possibile contattare Mandrakeonline, riprova piú tardi"
+#: ../mdkonline:198
+#, fuzzy, c-format
+msgid "Congratulations"
+msgstr "Invia configurazione"
 
-#: ../mdkonline:285
+#: ../mdkonline:198
 #, c-format
-msgid "Wrong password"
-msgstr "Password errata"
+msgid "Your Mandrakeonline account has been successfully configured\n"
+msgstr ""
+
+#: ../mdkonline:214
+#, fuzzy, c-format
+msgid "Configuration uploaded successfully"
+msgstr "Trasmissione completata con successo!"
 
-#: ../mdkonline:285 ../mdkonline_tui:134
+#: ../mdkonline:215
+#, fuzzy, c-format
+msgid "Problem uploading configuration"
+msgstr "Lettura della configurazione in corso\n"
+
+#: ../mdkonline:216
 #, c-format
 msgid ""
-"Your login or password was wrong.\n"
-" Either you'll have to type it again, or you'll need to create an account on "
-"Mandrakeonline.\n"
-" In the latter case, go back to the first step to connect to "
-"Mandrakeonline.\n"
-" Be aware that you must also provide a Machine name \n"
-" (only alphabetical characters are admitted)"
+"Cannot connect to mandrakeonline website: wrong login/password or router/"
+"firewall bad settings"
 msgstr ""
-"Il nome utente o la password sono errati.\n"
-" Dovrai ridigitarli oppure, qualora non ne avessi uno, creare un account su "
-"Mandrakeonline.\n"
-" Nel secondo caso, torna al primo passo per collegarti a Mandrakeonline.\n"
-" Ricorda che devi fornire anche un nome per il tuo computer \n"
-" (sono ammessi solo caratteri alfabetici)"
 
-#: ../mdkonline.pm:58
+#: ../mdkonline.pm:66
 #, c-format
 msgid "Login and password should be less than 12 characters\n"
 msgstr "Login e password non devono superare i 12 caratteri\n"
 
-#: ../mdkonline.pm:59
+#: ../mdkonline.pm:67
 #, c-format
 msgid "Special characters are not allowed\n"
 msgstr "I caratteri speciali non sono consentiti\n"
 
-#: ../mdkonline.pm:60
+#: ../mdkonline.pm:68
 #, c-format
 msgid "Please fill in all fields\n"
 msgstr "Per favore compila tutti i campi\n"
 
-#: ../mdkonline.pm:61
+#: ../mdkonline.pm:69
 #, c-format
 msgid "Email not valid\n"
 msgstr "Email non valida\n"
 
-#: ../mdkonline.pm:62
+#: ../mdkonline.pm:70
 #, c-format
 msgid "Account already exist\n"
 msgstr "Account già esistente\n"
 
-#: ../mdkonline.pm:68
+#: ../mdkonline.pm:76
 #, c-format
 msgid "Problem connecting to server \n"
 msgstr "Problema di connessione al server\n"
 
-#: ../mdkonline_tui:49 ../mdkonline_tui:99
-#, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
-
-#: ../mdkonline_tui:52
-#, c-format
-msgid "I already have an account"
-msgstr "Ho già un account"
-
-#: ../mdkonline_tui:53
-#, c-format
-msgid "I want to subscribe"
-msgstr "Voglio iscrivermi"
-
-#: ../mdkonline_tui:82 ../mdkonline_tui:86 ../mdkonline_tui:124
-#, c-format
-msgid "Please wait"
-msgstr "Attendere prego"
-
-#: ../mdkonline_tui:107
-#, c-format
-msgid "Account creation or authentication"
-msgstr "Creazione dell'account o autenticazione"
-
-#: ../mdkonline_tui:124
-#, c-format
-msgid "Connecting to Mandrakeonline website..."
-msgstr "Connessione in corso al sito Mandrakeonline..."
-
-#: ../mdkonline_tui:134
-#, c-format
-msgid "or"
-msgstr "o"
-
-#: ../mdkonline_tui:134
-#, c-format
-msgid "wrong password:"
-msgstr "password errata:"
-
-#: ../mdkonline_tui:162
-#, c-format
-msgid ""
-"Mandrakeonline Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-"Account Mandrakeonline creato correttamente.\n"
-"Clicca su \"Avanti\" per autenticarti e fare l'upload della tua "
-"configurazione\n"
-
-#: ../mdkonline_tui:179
-#, c-format
-msgid "Country"
-msgstr "Paese"
-
-#: ../mdkonline_tui:191
-#, c-format
-msgid "Congratulations"
-msgstr "Congratulazioni"
-
-#: ../mdkonline_tui:191
-#, c-format
-msgid "Your Mandrakeonline account has been successfully configured\n"
-msgstr "Il tuo account su Mandrakeonline è stato configurato correttamente\n"
-
-#: ../mdkupdate:50
+#: ../mdkupdate:52
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
@@ -614,42 +565,37 @@ msgstr ""
 "\n"
 "uso:\n"
 
-#: ../mdkupdate:55
+#: ../mdkupdate:57
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - stampa questo messaggio d'aiuto.\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:58
 #, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto         - Mandrakeupdate avviato automaticamente.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:59
 #, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - avvia Mandrakelinux Update.\n"
 
-#: ../mdkupdate:58
-#, c-format
-msgid "  --update       - Update keys\n"
-msgstr "  --update       - Aggiorna chiavi\n"
-
-#: ../mdkupdate:66
+#: ../mdkupdate:67
 #, c-format
 msgid "No %s file found. Run mdkonline wizard first"
 msgstr "File %s non trovato. Devi prima eseguire mdkonline"
 
-#: ../mdkupdate:124
+#: ../mdkupdate:126
 #, c-format
 msgid "Mandrakeupdate could not contact the site, we will try again."
 msgstr "Mandrakeupdate non è riuscito a contattare il sito, nuovo tentativo."
 
-#: ../mdkupdate:173
+#: ../mdkupdate:176
 #, c-format
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr "Impossibile aggiornare i pacchetti dalla sorgente mdkupdate.\n"
 
-#: ../mdkupdate:195
+#: ../mdkupdate:198
 #, c-format
 msgid ""
 "Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
@@ -657,3 +603,59 @@ msgid ""
 msgstr ""
 "Mandrakeupdate non è riuscito a fare l'upload dei file diff. Invia una email "
 "a support [chiocciola] mandrakeonline [punto] net"
+
+#~ msgid "Next"
+#~ msgstr "Successivo"
+
+#~ msgid "Cancel"
+#~ msgstr "Annulla"
+
+#~ msgid "Previous"
+#~ msgstr "Indietro"
+
+#, fuzzy
+#~ msgid "I don't have a Mandrakeonline account and I want to subscribe"
+#~ msgstr "Non ho un account su Mandrakeonline e vorrei "
+
+#~ msgid "Mandrakelinux Privacy Policy"
+#~ msgstr "Politica di Mandrakelinux sulla privacy"
+
+#~ msgid "Authentification"
+#~ msgstr "Identificazione"
+
+#~ msgid "Send Configuration"
+#~ msgstr "Invia configurazione"
+
+#~ msgid "Finish"
+#~ msgstr "Fine"
+
+#~ msgid "automated Upgrades"
+#~ msgstr "Aggiornamenti automatici"
+
+#~ msgid "Country:"
+#~ msgstr "Nazione:"
+
+#~ msgid "Error"
+#~ msgstr "Errore"
+
+#~ msgid "Quitting Wizard\n"
+#~ msgstr "Chiusura in corso\n"
+
+#~ msgid ""
+#~ "Mandrakeonline could not be contacted, please try again at a later time"
+#~ msgstr "Non è stato possibile contattare Mandrakeonline, riprova piú tardi"
+
+#~ msgid "Wrong password"
+#~ msgstr "Password errata"
+
+#~ msgid "  --update       - Update keys\n"
+#~ msgstr "  --update       - Aggiorna chiavi\n"
+
+#~ msgid "Skip Wizard"
+#~ msgstr "Salta la procedura guidata"
+
+#~ msgid "I don't have a Mandrakeonline account and I want to "
+#~ msgstr "Non ho un account su Mandrakeonline e vorrei "
+
+#~ msgid "Subscribe"
+#~ msgstr "Registrarmi"
diff --git a/po/ja.po b/po/ja.po
index efdca75c..e1f35eec 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-ja\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-01 22:41+0200\n"
+"POT-Creation-Date: 2004-11-03 12:10+0100\n"
 "PO-Revision-Date: 2004-10-03 23:35+0900\n"
 "Last-Translator: BANDO Yukiko\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -17,12 +17,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.1\n"
 
-#: ../mdkapplet:61
+#: ../mdkapplet:63
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "新しい更新はありません"
 
-#: ../mdkapplet:67
+#: ../mdkapplet:69
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -31,189 +31,199 @@ msgstr ""
 "サービスの設定に問題があります。ログを調べて support@mandrakeonline.net に"
 "メールしてください。"
 
-#: ../mdkapplet:73
+#: ../mdkapplet:75
 #, c-format
 msgid "System is busy. Please wait ..."
 msgstr "システムがビジー状態です。お待ち下さい..."
 
-#: ../mdkapplet:79
+#: ../mdkapplet:81
 #, c-format
 msgid "New updates are available for your system"
 msgstr "新しい更新があります"
 
-#: ../mdkapplet:85
+#: ../mdkapplet:87
 #, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr "サービスが設定されていません。「サービスの設定」を選択して下さい。"
 
-#: ../mdkapplet:91
+#: ../mdkapplet:93
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "ネットワークが未接続です。ネットワークを設定して下さい。"
 
-#: ../mdkapplet:97
+#: ../mdkapplet:99
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 "サービスが有効になっていません。「Onlineウェブサイト」を選択して下さい。"
 
-#: ../mdkapplet:103
+#: ../mdkapplet:105
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "お使いのバージョンはサービスの対象外です(期限切れ/開発版)"
 
-#: ../mdkapplet:108 ../mdkapplet:158
+#: ../mdkapplet:110 ../mdkapplet:164
 #, c-format
 msgid "Install updates"
 msgstr "システムを更新"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:111
 #, c-format
 msgid "Configure the service"
 msgstr "サービスの設定"
 
-#: ../mdkapplet:110
+#: ../mdkapplet:112
 #, c-format
 msgid "Check Updates"
 msgstr "更新をチェック"
 
-#: ../mdkapplet:111
+#: ../mdkapplet:113 ../mdkapplet:167 ../mdkapplet:225
+#, fuzzy, c-format
+msgid "Please Wait"
+msgstr "お待ちください"
+
+#: ../mdkapplet:113 ../mdkapplet:166 ../mdkapplet:167 ../mdkapplet:225
+#, c-format
+msgid "Check updates"
+msgstr "更新をチェック"
+
+#: ../mdkapplet:115
 #, c-format
 msgid "Online WebSite"
 msgstr "Onlineウェブサイト"
 
-#: ../mdkapplet:112
+#: ../mdkapplet:116
 #, c-format
 msgid "Configure Network"
 msgstr "ネットワークの設定"
 
-#: ../mdkapplet:113
+#: ../mdkapplet:117
 #, c-format
 msgid "Configure Now!"
 msgstr "設定して下さい"
 
-#: ../mdkapplet:146
+#: ../mdkapplet:152 ../mdkapplet:229
 #, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Mandrakelinux 更新アプレット"
 
-#: ../mdkapplet:156
+#: ../mdkapplet:162
 #, c-format
 msgid "Actions"
 msgstr "動作"
 
-#: ../mdkapplet:159
+#: ../mdkapplet:165
 #, c-format
 msgid "Configure"
 msgstr "設定"
 
-#: ../mdkapplet:160
-#, c-format
-msgid "Check updates"
-msgstr "更新をチェック"
-
-#: ../mdkapplet:161
+#: ../mdkapplet:169
 #, c-format
 msgid "See logs"
 msgstr "ログを見る"
 
-#: ../mdkapplet:164
+#: ../mdkapplet:172
 #, c-format
 msgid "Status"
 msgstr "状態"
 
-#: ../mdkapplet:168 ../mdkapplet:363
+#: ../mdkapplet:176 ../mdkapplet:375
 #, c-format
 msgid "Close"
 msgstr "閉じる"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Network Connection: "
 msgstr "ネットワーク接続: "
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Up"
 msgstr "接続"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Down"
 msgstr "未接続"
 
-#: ../mdkapplet:204
+#: ../mdkapplet:212
 #, c-format
 msgid "Last check: "
 msgstr "前回チェック: "
 
-#: ../mdkapplet:205
+#: ../mdkapplet:213
 #, c-format
 msgid "Updates: "
 msgstr "更新: "
 
-#: ../mdkapplet:209
+#: ../mdkapplet:217
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Drakconnectを起動\n"
 
-#: ../mdkapplet:213
+#: ../mdkapplet:221
 #, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "更新アプレットを起動\n"
 
-#: ../mdkapplet:217
+#: ../mdkapplet:224
 #, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr "Mandrakeonline が再インストールされたようです。アプレットを更新中 ..."
 
-#: ../mdkapplet:225
+#: ../mdkapplet:235
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "新しい更新を計算中...\n"
 
-#: ../mdkapplet:227
+#: ../mdkapplet:237
 #, c-format
 msgid "Connecting to"
 msgstr "接続しています"
 
-#: ../mdkapplet:250
+#: ../mdkapplet:244
+#, fuzzy, c-format
+msgid "Response from Mandrakeonline server\n"
+msgstr "Mandrakeonline へようこそ"
+
+#: ../mdkapplet:262
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "チェック中... 新しい更新があります\n"
 
-#: ../mdkapplet:254
+#: ../mdkapplet:267
 #, c-format
 msgid "Development release not supported by service"
 msgstr "開発版(cooker)はサービスの対象外です"
 
-#: ../mdkapplet:255
+#: ../mdkapplet:268
 #, c-format
 msgid "Too old release not supported by service"
 msgstr "サポート期限の切れたバージョンはサービスの対象外です"
 
-#: ../mdkapplet:256
+#: ../mdkapplet:269
 #, c-format
 msgid "Unknown state"
 msgstr "不明な状態"
 
-#: ../mdkapplet:257
+#: ../mdkapplet:270
 #, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr ""
 "Onlineサービスが無効になっています。Mandrakeonline に連絡して下さい。\n"
 
-#: ../mdkapplet:258
+#: ../mdkapplet:271
 #, c-format
 msgid "Wrong Password.\n"
 msgstr "パスワード誤り\n"
 
-#: ../mdkapplet:259
+#: ../mdkapplet:272
 #, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr "動作、ホスト、ログイン名のいずれかが誤り\n"
 
-#: ../mdkapplet:260
+#: ../mdkapplet:273
 #, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
@@ -222,72 +232,82 @@ msgstr ""
 "ネットワークの設定に問題があります(ルート、ファイアウォール、プロキシの設定を"
 "確認して下さい)\n"
 
-#: ../mdkapplet:264
+#: ../mdkapplet:277
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "新しい更新はありません\n"
 
-#: ../mdkapplet:303
+#: ../mdkapplet:317
 #, c-format
 msgid "No check"
 msgstr "チェックなし"
 
-#: ../mdkapplet:316
+#: ../mdkapplet:330
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "ネットワーク確認: 無効になっているようです\n"
 
-#: ../mdkapplet:319
+#: ../mdkapplet:333
 #, c-format
 msgid "Checking config file: Not present\n"
 msgstr "設定ファイル確認: ファイルがありません\n"
 
-#: ../mdkapplet:353
+#: ../mdkapplet:365
 #, c-format
 msgid "Logs"
 msgstr "ログ"
 
-#: ../mdkapplet:369
+#: ../mdkapplet:381
 #, c-format
 msgid "Clear"
 msgstr "クリア"
 
-#: ../mdkapplet:396
+#: ../mdkapplet:408
 #, c-format
 msgid "About..."
 msgstr "情報.."
 
-#: ../mdkapplet:397
+#: ../mdkapplet:409
 #, c-format
 msgid "Always launch on startup"
 msgstr "起動時に常に開始する"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:411
 #, c-format
 msgid "Quit"
 msgstr "終了"
 
-#: ../mdkonline:89
+#: ../mdkonline:52 ../mdkonline:106
 #, c-format
-msgid "Next"
-msgstr "次へ"
+msgid "Mandrakeonline"
+msgstr "Mandrakeonline"
 
-#: ../mdkonline:89
+#: ../mdkonline:55
+#, c-format
+msgid "I already have an account"
+msgstr "既にアカウントを持っています"
+
+#: ../mdkonline:56
+#, c-format
+msgid "I want to subscribe"
+msgstr "入会します"
+
+#: ../mdkonline:89 ../mdkonline:93 ../mdkonline:131
 #, c-format
-msgid "Cancel"
-msgstr "キャンセル"
+msgid "Please wait"
+msgstr "お待ちください"
 
 #: ../mdkonline:89
 #, c-format
-msgid "Previous"
-msgstr "戻る"
+msgid "Reading configuration\n"
+msgstr "設定を読み込み中\n"
 
-#: ../mdkonline:103
+#: ../mdkonline:93
 #, c-format
-msgid "Welcome to Mandrakeonline"
-msgstr "Mandrakeonline へようこそ"
+msgid "Sending configuration..."
+msgstr "設定を送信中..."
 
-#: ../mdkonline:104 ../mdkonline_tui:98
+#: ../mdkonline:109
 #, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
@@ -298,62 +318,37 @@ msgstr ""
 "個別にお知らせするために、あなたのシステムに関する情報\n"
 "(パッケージやハードウェアの設定)を集中データベースに送信します。\n"
 
-#: ../mdkonline:105 ../mdkonline_tui:142
+#: ../mdkonline:114
 #, c-format
-msgid "Create a Mandrakeonline Account"
-msgstr "Mandrakeonline のアカウント作成"
+msgid "Account creation or authentication"
+msgstr "アカウントの作成または認証"
 
-#: ../mdkonline:107
+#: ../mdkonline:119
 #, c-format
-msgid "I don't have a Mandrakeonline account and I want to subscribe"
-msgstr "Mandrakeonline にアカウントを持っていないので作成します"
+msgid "Enter your Mandrakeonline login, password and machine name:"
+msgstr "Mandrakeonline のログイン名・パスワード・マシン名を入力して下さい:"
 
-#: ../mdkonline:111 ../mdkonline:131 ../mdkonline_tui:114 ../mdkonline_tui:145
+#: ../mdkonline:125 ../mdkonline:156
 #, c-format
 msgid "Login:"
 msgstr "ログイン:"
 
-#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:115 ../mdkonline_tui:146
+#: ../mdkonline:126 ../mdkonline:157
 #, c-format
 msgid "Password:"
 msgstr "パスワード:"
 
-#: ../mdkonline:113 ../mdkonline_tui:147
-#, c-format
-msgid "Confirm Password:"
-msgstr "パスワード確認:"
-
-#: ../mdkonline:114 ../mdkonline_tui:148
-#, c-format
-msgid "Mail contact:"
-msgstr "メールアドレス:"
-
-#: ../mdkonline:121
-#, c-format
-msgid "Mandrakelinux Privacy Policy"
-msgstr "Mandrakelinux プライバシー方針"
-
 #: ../mdkonline:127
 #, c-format
-msgid "Authentification"
-msgstr "認証"
-
-#: ../mdkonline:128 ../mdkonline_tui:108
-#, c-format
-msgid "Enter your Mandrakeonline login, password and machine name:"
-msgstr "Mandrakeonline のログイン名・パスワード・マシン名を入力して下さい:"
-
-#: ../mdkonline:133 ../mdkonline_tui:116
-#, c-format
 msgid "Machine name:"
 msgstr "マシン名:"
 
-#: ../mdkonline:138
+#: ../mdkonline:131
 #, c-format
-msgid "Send Configuration"
-msgstr "設定を送信"
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Mandrakeonlineウェブサイトに接続中..."
 
-#: ../mdkonline:139 ../mdkonline_tui:128
+#: ../mdkonline:139
 #, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
@@ -387,55 +382,56 @@ msgstr ""
 "引が\n"
 "適用されます。"
 
-#: ../mdkonline:144 ../mdkonline:211 ../mdkonline:234
+#: ../mdkonline:141 ../mdkonline:180 ../mdkupdate:126 ../mdkupdate:198
 #, c-format
-msgid "Finish"
-msgstr "終る"
+msgid "Connection problem"
+msgstr "接続トラブル"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid "Your upload was successful!"
-msgstr "送信成功"
+msgid "or"
+msgstr "または"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandrakeonline."
-msgstr ""
-"これからはセキュリティその他の更新情報を Mandrakeonline \n"
-"がお知らせします。"
+msgid "wrong password:"
+msgstr "パスワード誤り:"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
 msgid ""
-"Mandrakeonline offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+"Your login or password was wrong.\n"
+" Either you'll have to type it again, or you'll need to create an account on "
+"Mandrakeonline.\n"
+" In the latter case, go back to the first step to connect to "
+"Mandrakeonline.\n"
+" Be aware that you must also provide a Machine name \n"
+" (only alphabetical characters are admitted)"
 msgstr ""
-"Mandrakeonline をご利用頂くとシステムの更新を自動化できます。\n"
-"チェックプログラムが新しい更新情報を定期的に調べに行きます。\n"
-
-#: ../mdkonline:146
-#, c-format
-msgid "automated Upgrades"
-msgstr "自動アップグレード"
+"ログイン名またはパスワードが間違っています。\n"
+"もう一度やり直すか、まだアカウントをお持ちでなければ Mandrakeonline で作成し"
+"て下さい。\n"
+"アカウントを作成するには最初のステップに戻り Mandrakeonline に接続して下さ"
+"い。\n"
+"注意：マシン名も必要です。\n"
+" (アルファベットのみ可)"
 
-#: ../mdkonline:150
+#: ../mdkonline:153
 #, c-format
-msgid "Country:"
-msgstr "国名:"
+msgid "Create a Mandrakeonline Account"
+msgstr "Mandrakeonline のアカウント作成"
 
-#: ../mdkonline:178 ../mdkonline:183 ../mdkonline:185 ../mdkonline:187
+#: ../mdkonline:158
 #, c-format
-msgid "Error"
-msgstr "エラー"
+msgid "Confirm Password:"
+msgstr "パスワード確認:"
 
-#: ../mdkonline:183 ../mdkonline_tui:152
+#: ../mdkonline:159
 #, c-format
-msgid "Please provide a login"
-msgstr "ログイン名を入力してください"
+msgid "Mail contact:"
+msgstr "メールアドレス:"
 
-#: ../mdkonline:185 ../mdkonline_tui:152
+#: ../mdkonline:163
 #, c-format
 msgid ""
 "The passwords do not match\n"
@@ -444,162 +440,116 @@ msgstr ""
 "パスワードが合っていません\n"
 "やり直してください\n"
 
-#: ../mdkonline:187 ../mdkonline_tui:152
+#: ../mdkonline:163
+#, c-format
+msgid "Please provide a login"
+msgstr "ログイン名を入力してください"
+
+#: ../mdkonline:163
 #, c-format
 msgid "Not a valid mail address!\n"
 msgstr "メールアドレスが無効です\n"
 
-#: ../mdkonline:199 ../mdkonline_tui:78
+#: ../mdkonline:169
 #, c-format
-msgid "Reading configuration\n"
-msgstr "設定を読み込み中\n"
+msgid ""
+"Mandrakeonline Account successfully created.\n"
+"Please click \"Next\" to authenticate and upload your configuration\n"
+msgstr ""
+"Mandrakeonlineアカウントを作成しました。\n"
+"「次へ」をクリックして認証と設定のアップロードを行なってください。\n"
 
-#: ../mdkonline:204 ../mdkonline_tui:82
+#: ../mdkonline:178
 #, c-format
-msgid "Sending configuration..."
-msgstr "設定を送信中..."
+msgid "Your upload was successful!"
+msgstr "送信成功"
 
-#: ../mdkonline:213 ../mdkonline:273 ../mdkonline_tui:130 ../mdkonline_tui:169
-#: ../mdkupdate:124 ../mdkupdate:195
+#: ../mdkonline:178
 #, c-format
-msgid "Connection problem"
-msgstr "接続トラブル"
+msgid ""
+"From now you will receive on security and updates \n"
+"announcements thanks to Mandrakeonline."
+msgstr ""
+"これからはセキュリティその他の更新情報を Mandrakeonline \n"
+"がお知らせします。"
+
+#: ../mdkonline:178
+#, c-format
+msgid ""
+"Mandrakeonline offers you the ability to automate the updates.\n"
+"A program will run regulary in your system waiting for new updates\n"
+msgstr ""
+"Mandrakeonline をご利用頂くとシステムの更新を自動化できます。\n"
+"チェックプログラムが新しい更新情報を定期的に調べに行きます。\n"
 
-#: ../mdkonline:213 ../mdkonline_tui:169
+#: ../mdkonline:180
 #, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr "ファイル送信中に問題が発生しました。やり直して下さい。"
 
-#: ../mdkonline:251
+#: ../mdkonline:186
 #, c-format
-msgid "Quitting Wizard\n"
-msgstr "Wizard を終了\n"
+msgid "Country"
+msgstr "国名"
 
-#: ../mdkonline:273
+#: ../mdkonline:198
 #, c-format
-msgid "Mandrakeonline could not be contacted, please try again at a later time"
-msgstr ""
-"Mandrakeonline に接続できませんでした。しばらくたってからやり直して下さい。"
+msgid "Congratulations"
+msgstr "設定"
 
-#: ../mdkonline:285
+#: ../mdkonline:198
 #, c-format
-msgid "Wrong password"
-msgstr "パスワード誤り"
+msgid "Your Mandrakeonline account has been successfully configured\n"
+msgstr "Mandrakeonlineアカウントの設定が完了しました\n"
+
+#: ../mdkonline:214
+#, fuzzy, c-format
+msgid "Configuration uploaded successfully"
+msgstr "送信成功"
 
-#: ../mdkonline:285 ../mdkonline_tui:130
+#: ../mdkonline:215
+#, fuzzy, c-format
+msgid "Problem uploading configuration"
+msgstr "設定を読み込み中\n"
+
+#: ../mdkonline:216
 #, c-format
 msgid ""
-"Your login or password was wrong.\n"
-" Either you'll have to type it again, or you'll need to create an account on "
-"Mandrakeonline.\n"
-" In the latter case, go back to the first step to connect to "
-"Mandrakeonline.\n"
-" Be aware that you must also provide a Machine name \n"
-" (only alphabetical characters are admitted)"
+"Cannot connect to mandrakeonline website: wrong login/password or router/"
+"firewall bad settings"
 msgstr ""
-"ログイン名またはパスワードが間違っています。\n"
-"もう一度やり直すか、まだアカウントをお持ちでなければ Mandrakeonline で作成し"
-"て下さい。\n"
-"アカウントを作成するには最初のステップに戻り Mandrakeonline に接続して下さ"
-"い。\n"
-"注意：マシン名も必要です。\n"
-" (アルファベットのみ可)"
 
-#: ../mdkonline.pm:58
+#: ../mdkonline.pm:66
 #, c-format
 msgid "Login and password should be less than 12 characters\n"
 msgstr "ログイン名とパスワードは12文字以内にしてください\n"
 
-#: ../mdkonline.pm:59
+#: ../mdkonline.pm:67
 #, c-format
 msgid "Special characters are not allowed\n"
 msgstr "特殊な文字は使用できません\n"
 
-#: ../mdkonline.pm:60
+#: ../mdkonline.pm:68
 #, c-format
 msgid "Please fill in all fields\n"
 msgstr "すべての項目を埋めてください\n"
 
-#: ../mdkonline.pm:61
+#: ../mdkonline.pm:69
 #, c-format
 msgid "Email not valid\n"
 msgstr "メールアドレスが無効です\n"
 
-#: ../mdkonline.pm:62
+#: ../mdkonline.pm:70
 #, c-format
 msgid "Account already exist\n"
 msgstr "アカウントが既に存在します\n"
 
-#: ../mdkonline.pm:68
+#: ../mdkonline.pm:76
 #, c-format
 msgid "Problem connecting to server \n"
 msgstr "サーバ接続中にエラーが発生\n"
 
-#: ../mdkonline_tui:45 ../mdkonline_tui:95
-#, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
-
-#: ../mdkonline_tui:48
-#, c-format
-msgid "I already have an account"
-msgstr "既にアカウントを持っています"
-
-#: ../mdkonline_tui:49
-#, c-format
-msgid "I want to subscribe"
-msgstr "入会します"
-
-#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:120
-#, c-format
-msgid "Please wait"
-msgstr "お待ちください"
-
-#: ../mdkonline_tui:103
-#, c-format
-msgid "Account creation or authentication"
-msgstr "アカウントの作成または認証"
-
-#: ../mdkonline_tui:120
-#, c-format
-msgid "Connecting to Mandrakeonline website..."
-msgstr "Mandrakeonlineウェブサイトに接続中..."
-
-#: ../mdkonline_tui:130
-#, c-format
-msgid "or"
-msgstr "または"
-
-#: ../mdkonline_tui:130
-#, c-format
-msgid "wrong password:"
-msgstr "パスワード誤り:"
-
-#: ../mdkonline_tui:158
-#, c-format
-msgid ""
-"Mandrakeonline Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-"Mandrakeonlineアカウントを作成しました。\n"
-"「次へ」をクリックして認証と設定のアップロードを行なってください。\n"
-
-#: ../mdkonline_tui:175
-#, c-format
-msgid "Country"
-msgstr "国名"
-
-#: ../mdkonline_tui:187
-#, c-format
-msgid "Congratulations"
-msgstr "設定"
-
-#: ../mdkonline_tui:187
-#, c-format
-msgid "Your Mandrakeonline account has been successfully configured\n"
-msgstr "Mandrakeonlineアカウントの設定が完了しました\n"
-
-#: ../mdkupdate:50
+#: ../mdkupdate:52
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
@@ -615,42 +565,37 @@ msgstr ""
 "\n"
 "使用方法 :\n"
 
-#: ../mdkupdate:55
+#: ../mdkupdate:57
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - このヘルプメッセージを出力する。\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:58
 #, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto       - Mandrakeupdateを自動的に起動する。\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:59
 #, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - Mandrakeupdateを起動する\n"
 
-#: ../mdkupdate:58
-#, c-format
-msgid "  --update       - Update keys\n"
-msgstr "  --update       - キー更新\n"
-
-#: ../mdkupdate:66
+#: ../mdkupdate:67
 #, c-format
 msgid "No %s file found. Run mdkonline wizard first"
 msgstr "%s ファイルがありません。まずmdkonlineウィザードを実行してください。"
 
-#: ../mdkupdate:124
+#: ../mdkupdate:126
 #, c-format
 msgid "Mandrakeupdate could not contact the site, we will try again."
 msgstr "Mandrakeupdateはこのサイトに接続できませんでした。再試行します。"
 
-#: ../mdkupdate:173
+#: ../mdkupdate:176
 #, c-format
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr "mdkupdateメディアからパッケージを更新できません。\n"
 
-#: ../mdkupdate:195
+#: ../mdkupdate:198
 #, c-format
 msgid ""
 "Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
@@ -659,6 +604,57 @@ msgstr ""
 "Mandrakeupdateは差異ファイルをアップロードできませんでした。support [at] "
 "mandrakeonline [dot] net にメールしてください。"
 
+#~ msgid "Next"
+#~ msgstr "次へ"
+
+#~ msgid "Cancel"
+#~ msgstr "キャンセル"
+
+#~ msgid "Previous"
+#~ msgstr "戻る"
+
+#~ msgid "Welcome to Mandrakeonline"
+#~ msgstr "Mandrakeonline へようこそ"
+
+#~ msgid "I don't have a Mandrakeonline account and I want to subscribe"
+#~ msgstr "Mandrakeonline にアカウントを持っていないので作成します"
+
+#~ msgid "Mandrakelinux Privacy Policy"
+#~ msgstr "Mandrakelinux プライバシー方針"
+
+#~ msgid "Authentification"
+#~ msgstr "認証"
+
+#~ msgid "Send Configuration"
+#~ msgstr "設定を送信"
+
+#~ msgid "Finish"
+#~ msgstr "終る"
+
+#~ msgid "automated Upgrades"
+#~ msgstr "自動アップグレード"
+
+#~ msgid "Country:"
+#~ msgstr "国名:"
+
+#~ msgid "Error"
+#~ msgstr "エラー"
+
+#~ msgid "Quitting Wizard\n"
+#~ msgstr "Wizard を終了\n"
+
+#~ msgid ""
+#~ "Mandrakeonline could not be contacted, please try again at a later time"
+#~ msgstr ""
+#~ "Mandrakeonline に接続できませんでした。しばらくたってからやり直して下さ"
+#~ "い。"
+
+#~ msgid "Wrong password"
+#~ msgstr "パスワード誤り"
+
+#~ msgid "  --update       - Update keys\n"
+#~ msgstr "  --update       - キー更新\n"
+
 #~ msgid "Skip Wizard"
 #~ msgstr "ウィザードを省略"
 
@@ -709,10 +705,6 @@ msgstr ""
 #~ msgstr "接続トラブル"
 
 #, fuzzy
-#~ msgid "Response from Mandrakeonline server\n"
-#~ msgstr "Mandrakeonline へようこそ"
-
-#, fuzzy
 #~ msgid "Launching Mandrakeupdate\n"
 #~ msgstr "  --applet       - 全ての情報を更新。\n"
 
diff --git a/po/ka.po b/po/ka.po
index 2ee31cd3..5128910d 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline 0.15\n"
-"POT-Creation-Date: 2004-10-01 22:41+0200\n"
+"POT-Creation-Date: 2004-11-03 12:10+0100\n"
 "PO-Revision-Date: 2004-09-29 19:58+0400\n"
 "Last-Translator: \n"
 "Language-Team: Georgian <aiet@qartuli.com>\n"
@@ -13,12 +13,12 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../mdkapplet:61
+#: ../mdkapplet:63
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "თქვენი სისტემა განახლებულია"
 
-#: ../mdkapplet:67
+#: ../mdkapplet:69
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -27,193 +27,203 @@ msgstr ""
 "პრობლემა სერვისების კონფიგურაციაში. გთხოვთ გადაამოწმოთ აღრიცხვის ფაილები "
 "(logs) დაგამოაგზავნოთ ფოსტა მისმართზე support@mandrakeonline.net"
 
-#: ../mdkapplet:73
+#: ../mdkapplet:75
 #, c-format
 msgid "System is busy. Please wait ..."
 msgstr "სისტემა დაკავებულია. მოთმინება იქონიეთ..."
 
-#: ../mdkapplet:79
+#: ../mdkapplet:81
 #, c-format
 msgid "New updates are available for your system"
 msgstr "თქვენი სისტემა განახლებას საჭიროებს"
 
-#: ../mdkapplet:85
+#: ../mdkapplet:87
 #, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr ""
 "სერვისი არ არის კონფიგურირებული. დააწკაპუნეთ „სერვისების კონფიგურირება“-ზე"
 
-#: ../mdkapplet:91
+#: ../mdkapplet:93
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "ქსელი მიუწვდომელია. შეასწორეთ ქსელის კონფიგურაცია"
 
-#: ../mdkapplet:97
+#: ../mdkapplet:99
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "სერვისი არ არის აქტივირებული. დააწკაპუნეთ „Online Website“-ზე"
 
-#: ../mdkapplet:103
+#: ../mdkapplet:105
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 "ამ გამოშვების (Release) მხარდაჭერა არ გამაჩნია (ან მოძველებულია, ან "
 "development release არის)"
 
-#: ../mdkapplet:108 ../mdkapplet:158
+#: ../mdkapplet:110 ../mdkapplet:164
 #, c-format
 msgid "Install updates"
 msgstr "განახლებების ინსტალირება"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:111
 #, c-format
 msgid "Configure the service"
 msgstr "სერვისის კონფიგურირება"
 
-#: ../mdkapplet:110
+#: ../mdkapplet:112
 #, c-format
 msgid "Check Updates"
 msgstr "განახლებების შეამოწმება"
 
-#: ../mdkapplet:111
+#: ../mdkapplet:113 ../mdkapplet:167 ../mdkapplet:225
+#, fuzzy, c-format
+msgid "Please Wait"
+msgstr "გთხოვთ იქონიოთ მოთმინება"
+
+#: ../mdkapplet:113 ../mdkapplet:166 ../mdkapplet:167 ../mdkapplet:225
+#, c-format
+msgid "Check updates"
+msgstr "განახლებების შემოწმება"
+
+#: ../mdkapplet:115
 #, c-format
 msgid "Online WebSite"
 msgstr "Online WebSite"
 
-#: ../mdkapplet:112
+#: ../mdkapplet:116
 #, c-format
 msgid "Configure Network"
 msgstr "ქსელის კონფიგურირება"
 
-#: ../mdkapplet:113
+#: ../mdkapplet:117
 #, c-format
 msgid "Configure Now!"
 msgstr "კონფიგურირება ახლა!"
 
-#: ../mdkapplet:146
+#: ../mdkapplet:152 ../mdkapplet:229
 #, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "მენდრეიქის განახლების აპლეტი"
 
-#: ../mdkapplet:156
+#: ../mdkapplet:162
 #, c-format
 msgid "Actions"
 msgstr "მოქმედებები"
 
-#: ../mdkapplet:159
+#: ../mdkapplet:165
 #, c-format
 msgid "Configure"
 msgstr "კონფიგურაცია"
 
-#: ../mdkapplet:160
-#, c-format
-msgid "Check updates"
-msgstr "განახლებების შემოწმება"
-
-#: ../mdkapplet:161
+#: ../mdkapplet:169
 #, c-format
 msgid "See logs"
 msgstr "აჩვენე აღრიცხვები"
 
-#: ../mdkapplet:164
+#: ../mdkapplet:172
 #, c-format
 msgid "Status"
 msgstr "სტატუსი"
 
-#: ../mdkapplet:168 ../mdkapplet:363
+#: ../mdkapplet:176 ../mdkapplet:375
 #, c-format
 msgid "Close"
 msgstr "დახურვა"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Network Connection: "
 msgstr "ქსელის კავშირი:"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Up"
 msgstr "ღვიძავს"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Down"
 msgstr "ძინავს"
 
-#: ../mdkapplet:204
+#: ../mdkapplet:212
 #, c-format
 msgid "Last check: "
 msgstr "ბოლო შემოწმება:"
 
-#: ../mdkapplet:205
+#: ../mdkapplet:213
 #, c-format
 msgid "Updates: "
 msgstr "განახლებები:"
 
-#: ../mdkapplet:209
+#: ../mdkapplet:217
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "ვიძახებ drakconnect-ს\n"
 
-#: ../mdkapplet:213
+#: ../mdkapplet:221
 #, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "ვიძახებ mdkupdate --applet-ს\n"
 
-#: ../mdkapplet:217
+#: ../mdkapplet:224
 #, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 "როგორ ჩანს Mandrakeonline ხელმეორედ იქნა ინსტალირებული. ხელახლა ვიძახებ "
 "აპლეტს..."
 
-#: ../mdkapplet:225
+#: ../mdkapplet:235
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "ვანგარიშობ გასაახლებელ პაკეტებს...\n"
 
-#: ../mdkapplet:227
+#: ../mdkapplet:237
 #, c-format
 msgid "Connecting to"
 msgstr "ვუკავშირდები:"
 
-#: ../mdkapplet:250
+#: ../mdkapplet:244
+#, fuzzy, c-format
+msgid "Response from Mandrakeonline server\n"
+msgstr "კეთილი იყოს თქვენი ფეხი Mandrakeonline-ზე."
+
+#: ../mdkapplet:262
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "ვამოწმებ... არსებობს გასაახლებელი პაკეტები\n"
 
-#: ../mdkapplet:254
+#: ../mdkapplet:267
 #, c-format
 msgid "Development release not supported by service"
 msgstr "Development release-ის მხარდაჭერა სერვისს არ გააჩნია"
 
-#: ../mdkapplet:255
+#: ../mdkapplet:268
 #, c-format
 msgid "Too old release not supported by service"
 msgstr "release ძალიან ძველია და service-ს მისი მხარდაჭერა არ გააჩნია"
 
-#: ../mdkapplet:256
+#: ../mdkapplet:269
 #, c-format
 msgid "Unknown state"
 msgstr "უცნობი მდგომარეობა"
 
-#: ../mdkapplet:257
+#: ../mdkapplet:270
 #, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr ""
 "ონლაინ მომსახურებები შეწყვეტილია. მიაკითხეთ Mandrakeonline-ის ვებგვერდს\n"
 
-#: ../mdkapplet:258
+#: ../mdkapplet:271
 #, c-format
 msgid "Wrong Password.\n"
 msgstr "არასწორი პაროლი\n"
 
-#: ../mdkapplet:259
+#: ../mdkapplet:272
 #, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr "არასწორი მოქმედება, ჰოსტი ან შესვლა.\n"
 
-#: ../mdkapplet:260
+#: ../mdkapplet:273
 #, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
@@ -222,72 +232,82 @@ msgstr ""
 "თქვენი ქსელის პარამეტრებში რაღაც გაუგებრობაა (გადაამოწმეთ route, firewall ან "
 "proxy პარამეტრები)\n"
 
-#: ../mdkapplet:264
+#: ../mdkapplet:277
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "სისტემა განახლებულია\n"
 
-#: ../mdkapplet:303
+#: ../mdkapplet:317
 #, c-format
 msgid "No check"
 msgstr "შეამოწმების გარეშე"
 
-#: ../mdkapplet:316
+#: ../mdkapplet:330
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "ვამოწმებ ქსელს: როგორც ჩანს გამორთულია\n"
 
-#: ../mdkapplet:319
+#: ../mdkapplet:333
 #, c-format
 msgid "Checking config file: Not present\n"
 msgstr "ვამოწმებ config ფაილს: არა იძებნება\n"
 
-#: ../mdkapplet:353
+#: ../mdkapplet:365
 #, c-format
 msgid "Logs"
 msgstr "ლოგები (აღრიცხვები)"
 
-#: ../mdkapplet:369
+#: ../mdkapplet:381
 #, c-format
 msgid "Clear"
 msgstr "ამოშლა"
 
-#: ../mdkapplet:396
+#: ../mdkapplet:408
 #, c-format
 msgid "About..."
 msgstr "შესახებ..."
 
-#: ../mdkapplet:397
+#: ../mdkapplet:409
 #, c-format
 msgid "Always launch on startup"
 msgstr "მუდამ გამოიძახე სისტემის ჩატვირთვისას (startup)"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:411
 #, c-format
 msgid "Quit"
 msgstr "გასვლა"
 
-#: ../mdkonline:89
+#: ../mdkonline:52 ../mdkonline:106
+#, c-format
+msgid "Mandrakeonline"
+msgstr "Mandrakeonline"
+
+#: ../mdkonline:55
 #, c-format
-msgid "Next"
-msgstr "შემდეგი"
+msgid "I already have an account"
+msgstr "მე უკვე გამაჩნია ანგარიში"
 
-#: ../mdkonline:89
+#: ../mdkonline:56
 #, c-format
-msgid "Cancel"
-msgstr "სტოპ!"
+msgid "I want to subscribe"
+msgstr "მინდა გავწევრიანდე"
+
+#: ../mdkonline:89 ../mdkonline:93 ../mdkonline:131
+#, c-format
+msgid "Please wait"
+msgstr "გთხოვთ იქონიოთ მოთმინება"
 
 #: ../mdkonline:89
 #, c-format
-msgid "Previous"
-msgstr "წინა"
+msgid "Reading configuration\n"
+msgstr "ვკითხულობ კონფიგურაცას\n"
 
-#: ../mdkonline:103
+#: ../mdkonline:93
 #, c-format
-msgid "Welcome to Mandrakeonline"
-msgstr "კეთილი იყოს თქვენი ფეხი Mandrakeonline-ზე."
+msgid "Sending configuration..."
+msgstr "ვაგზავნი კონფიგურაციას..."
 
-#: ../mdkonline:104 ../mdkonline_tui:98
+#: ../mdkonline:109
 #, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
@@ -300,64 +320,39 @@ msgstr ""
 "თქვენ ავტომატურად შეიტყოთ უსაფრთხობასთან დაკავშირებულ და მნიშვნელოვან "
 "გაუმჯობესებებზე.\n"
 
-#: ../mdkonline:105 ../mdkonline_tui:142
+#: ../mdkonline:114
 #, c-format
-msgid "Create a Mandrakeonline Account"
-msgstr "Mandrakeonline-ზე ანგარიშის გახსნა"
+msgid "Account creation or authentication"
+msgstr "ანგარიშის შექმნა ან ავტორიზაცია"
 
-#: ../mdkonline:107
+#: ../mdkonline:119
 #, c-format
-msgid "I don't have a Mandrakeonline account and I want to subscribe"
-msgstr "მე ჯერ არ მაქვს ანგარიში Mandrakeonline-ზე და მსურს გაწევრიანება"
+msgid "Enter your Mandrakeonline login, password and machine name:"
+msgstr ""
+"შეიყვანეთ თქვენი Mandrakeonline-ის მომხმარებლის სახელი, პაროლი და სისტემის "
+"სახელი:"
 
-#: ../mdkonline:111 ../mdkonline:131 ../mdkonline_tui:114 ../mdkonline_tui:145
+#: ../mdkonline:125 ../mdkonline:156
 #, c-format
 msgid "Login:"
 msgstr "მომხმარებელი:"
 
-#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:115 ../mdkonline_tui:146
+#: ../mdkonline:126 ../mdkonline:157
 #, c-format
 msgid "Password:"
 msgstr "პაროლი:"
 
-#: ../mdkonline:113 ../mdkonline_tui:147
-#, c-format
-msgid "Confirm Password:"
-msgstr "გაიმეორეთ პაროლი:"
-
-#: ../mdkonline:114 ../mdkonline_tui:148
-#, c-format
-msgid "Mail contact:"
-msgstr "ელფოსტით კავშირი:"
-
-#: ../mdkonline:121
-#, c-format
-msgid "Mandrakelinux Privacy Policy"
-msgstr "Mandrakelinux-ის პირადი უფლებების პოლისი"
-
 #: ../mdkonline:127
 #, c-format
-msgid "Authentification"
-msgstr "რეგისტრაცია"
-
-#: ../mdkonline:128 ../mdkonline_tui:108
-#, c-format
-msgid "Enter your Mandrakeonline login, password and machine name:"
-msgstr ""
-"შეიყვანეთ თქვენი Mandrakeonline-ის მომხმარებლის სახელი, პაროლი და სისტემის "
-"სახელი:"
-
-#: ../mdkonline:133 ../mdkonline_tui:116
-#, c-format
 msgid "Machine name:"
 msgstr "სისტემის სახელი (Machine name):"
 
-#: ../mdkonline:138
+#: ../mdkonline:131
 #, c-format
-msgid "Send Configuration"
-msgstr "კონფიგურაცის გადაგზავნა"
+msgid "Connecting to Mandrakeonline website..."
+msgstr "უკავშირდები Mandrakeonline ვებგვერდს..."
 
-#: ../mdkonline:139 ../mdkonline_tui:128
+#: ../mdkonline:139
 #, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
@@ -388,57 +383,55 @@ msgstr ""
 "განახლებების შესახებ. ასევე, თქვენ საშუალება მოგეცემათ ისარგებლოთ\n"
 "ფასდაკლებებით www.mandrakeexpert.com-ზე არსებული ფასიან მომსახურებებზე."
 
-#: ../mdkonline:144 ../mdkonline:211 ../mdkonline:234
+#: ../mdkonline:141 ../mdkonline:180 ../mdkupdate:126 ../mdkupdate:198
 #, c-format
-msgid "Finish"
-msgstr "დამთავრება"
+msgid "Connection problem"
+msgstr "კავშირის პრობლემა"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid "Your upload was successful!"
-msgstr "განახლება წარმატებით დაგვირგვინდა!"
+msgid "or"
+msgstr "ან"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandrakeonline."
-msgstr ""
-"Mandrakeonline-ის მეშვეობით დღეიდან თქვენ მიიღებთ უსაფრთხოებასთან "
-"დაკავშირებულ\n"
-"და მნიშვნელოვან გაუმჯობესებების განცხადებებს."
+msgid "wrong password:"
+msgstr "არასწორი პაროლი:"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
 msgid ""
-"Mandrakeonline offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+"Your login or password was wrong.\n"
+" Either you'll have to type it again, or you'll need to create an account on "
+"Mandrakeonline.\n"
+" In the latter case, go back to the first step to connect to "
+"Mandrakeonline.\n"
+" Be aware that you must also provide a Machine name \n"
+" (only alphabetical characters are admitted)"
 msgstr ""
-"Mandrakeonline გაძლევთ საშუალებას ავტომატურად განაახლოთ სისტემა.\n"
-"თქვენს სისტემაზე რეგულარურად გაიშვება პროგრამა, რომელიც განახლებებს "
-"დაელოდება\n"
-
-#: ../mdkonline:146
-#, c-format
-msgid "automated Upgrades"
-msgstr "ავტომატიზირებული განახლება"
+"თქვენი მომხმარებლის სახელი ან პაროლი არასწორია.\n"
+" ან ხელახლა უნდა ჩაწეროთ, ან ახალი ანგარიში შექმნათ Mandrakeonline-ზე.\n"
+" ამ უკანასკნელის გასაკეთებლად მიუბრუნდით პირველ მოქმედებას Mandrakeonline-ზე "
+"დასაკავშირებლად. გაითვალისწინეთ, რომ თქვენ ასევე უნდა მიუთითოთ სისტემის "
+"სახელი(Machine name) \n"
+" (ნებადართულია მხოლოდ ანბანის ასოები)"
 
-#: ../mdkonline:150
+#: ../mdkonline:153
 #, c-format
-msgid "Country:"
-msgstr "ქვეყანა:"
+msgid "Create a Mandrakeonline Account"
+msgstr "Mandrakeonline-ზე ანგარიშის გახსნა"
 
-#: ../mdkonline:178 ../mdkonline:183 ../mdkonline:185 ../mdkonline:187
+#: ../mdkonline:158
 #, c-format
-msgid "Error"
-msgstr "შეცდომა"
+msgid "Confirm Password:"
+msgstr "გაიმეორეთ პაროლი:"
 
-#: ../mdkonline:183 ../mdkonline_tui:152
+#: ../mdkonline:159
 #, c-format
-msgid "Please provide a login"
-msgstr "გთხოვთ მიუთითოთ შესასვლელი სახელი"
+msgid "Mail contact:"
+msgstr "ელფოსტით კავშირი:"
 
-#: ../mdkonline:185 ../mdkonline_tui:152
+#: ../mdkonline:163
 #, c-format
 msgid ""
 "The passwords do not match\n"
@@ -447,161 +440,119 @@ msgstr ""
 "პროლები არ ემთხვევა\n"
 " გთხოვთ ცადოთ ისევ\n"
 
-#: ../mdkonline:187 ../mdkonline_tui:152
+#: ../mdkonline:163
+#, c-format
+msgid "Please provide a login"
+msgstr "გთხოვთ მიუთითოთ შესასვლელი სახელი"
+
+#: ../mdkonline:163
 #, c-format
 msgid "Not a valid mail address!\n"
 msgstr "გთხოვთ სწორი მისამართი შეიყვანოთ!\n"
 
-#: ../mdkonline:199 ../mdkonline_tui:78
+#: ../mdkonline:169
 #, c-format
-msgid "Reading configuration\n"
-msgstr "ვკითხულობ კონფიგურაცას\n"
+msgid ""
+"Mandrakeonline Account successfully created.\n"
+"Please click \"Next\" to authenticate and upload your configuration\n"
+msgstr ""
+"Mandrakeonline-ზე წარმატებით განხორციელდა თქვენი ანგარიშის რეგისტრაცია.\n"
+"გთხოვთ დააჭიროთ \"შემდეგ\" ღილაკს რათა გაიაროთ ვტორიზაცია და ატვირთოთ თვენი "
+"კონფიგურაცია\n"
 
-#: ../mdkonline:204 ../mdkonline_tui:82
+#: ../mdkonline:178
 #, c-format
-msgid "Sending configuration..."
-msgstr "ვაგზავნი კონფიგურაციას..."
+msgid "Your upload was successful!"
+msgstr "განახლება წარმატებით დაგვირგვინდა!"
 
-#: ../mdkonline:213 ../mdkonline:273 ../mdkonline_tui:130 ../mdkonline_tui:169
-#: ../mdkupdate:124 ../mdkupdate:195
+#: ../mdkonline:178
 #, c-format
-msgid "Connection problem"
-msgstr "კავშირის პრობლემა"
+msgid ""
+"From now you will receive on security and updates \n"
+"announcements thanks to Mandrakeonline."
+msgstr ""
+"Mandrakeonline-ის მეშვეობით დღეიდან თქვენ მიიღებთ უსაფრთხოებასთან "
+"დაკავშირებულ\n"
+"და მნიშვნელოვან გაუმჯობესებების განცხადებებს."
+
+#: ../mdkonline:178
+#, c-format
+msgid ""
+"Mandrakeonline offers you the ability to automate the updates.\n"
+"A program will run regulary in your system waiting for new updates\n"
+msgstr ""
+"Mandrakeonline გაძლევთ საშუალებას ავტომატურად განაახლოთ სისტემა.\n"
+"თქვენს სისტემაზე რეგულარურად გაიშვება პროგრამა, რომელიც განახლებებს "
+"დაელოდება\n"
 
-#: ../mdkonline:213 ../mdkonline_tui:169
+#: ../mdkonline:180
 #, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr "ფაილების ატვირთვისას პრობლემებია. გთხოვთ კვლავ ცადოთ"
 
-#: ../mdkonline:251
+#: ../mdkonline:186
 #, c-format
-msgid "Quitting Wizard\n"
-msgstr "ოსტატის დასრულება\n"
+msgid "Country"
+msgstr "ქვეყანა"
 
-#: ../mdkonline:273
-#, c-format
-msgid "Mandrakeonline could not be contacted, please try again at a later time"
-msgstr "Mandrakeonline-ს ვერ ვუკავშირდები. გთხოვთ მოგვიანებით სცადოთ"
+#: ../mdkonline:198
+#, fuzzy, c-format
+msgid "Congratulations"
+msgstr "კონფიგურაცის გადაგზავნა"
 
-#: ../mdkonline:285
+#: ../mdkonline:198
 #, c-format
-msgid "Wrong password"
-msgstr "არასწორი პაროლი"
+msgid "Your Mandrakeonline account has been successfully configured\n"
+msgstr ""
 
-#: ../mdkonline:285 ../mdkonline_tui:130
+#: ../mdkonline:214
+#, fuzzy, c-format
+msgid "Configuration uploaded successfully"
+msgstr "განახლება წარმატებით დაგვირგვინდა!"
+
+#: ../mdkonline:215
+#, fuzzy, c-format
+msgid "Problem uploading configuration"
+msgstr "ვკითხულობ კონფიგურაცას\n"
+
+#: ../mdkonline:216
 #, c-format
 msgid ""
-"Your login or password was wrong.\n"
-" Either you'll have to type it again, or you'll need to create an account on "
-"Mandrakeonline.\n"
-" In the latter case, go back to the first step to connect to "
-"Mandrakeonline.\n"
-" Be aware that you must also provide a Machine name \n"
-" (only alphabetical characters are admitted)"
+"Cannot connect to mandrakeonline website: wrong login/password or router/"
+"firewall bad settings"
 msgstr ""
-"თქვენი მომხმარებლის სახელი ან პაროლი არასწორია.\n"
-" ან ხელახლა უნდა ჩაწეროთ, ან ახალი ანგარიში შექმნათ Mandrakeonline-ზე.\n"
-" ამ უკანასკნელის გასაკეთებლად მიუბრუნდით პირველ მოქმედებას Mandrakeonline-ზე "
-"დასაკავშირებლად. გაითვალისწინეთ, რომ თქვენ ასევე უნდა მიუთითოთ სისტემის "
-"სახელი(Machine name) \n"
-" (ნებადართულია მხოლოდ ანბანის ასოები)"
 
-#: ../mdkonline.pm:58
+#: ../mdkonline.pm:66
 #, c-format
 msgid "Login and password should be less than 12 characters\n"
 msgstr "შესასვლელი სახელი და პაროლი 12-ზე ნაკლები ნიშნისაგან უნდა შედგებოდეს\n"
 
-#: ../mdkonline.pm:59
+#: ../mdkonline.pm:67
 #, c-format
 msgid "Special characters are not allowed\n"
 msgstr "საგანგებო სიმბოლოები არ არის ნებადართული\n"
 
-#: ../mdkonline.pm:60
+#: ../mdkonline.pm:68
 #, c-format
 msgid "Please fill in all fields\n"
 msgstr "გთხოვთ შეავსოთ ყველა ველი\n"
 
-#: ../mdkonline.pm:61
+#: ../mdkonline.pm:69
 #, c-format
 msgid "Email not valid\n"
 msgstr "ელფოსტა არასწორია\n"
 
-#: ../mdkonline.pm:62
+#: ../mdkonline.pm:70
 #, c-format
 msgid "Account already exist\n"
 msgstr "ანგარიში უკვე არსებობს\n"
 
-#: ../mdkonline.pm:68
+#: ../mdkonline.pm:76
 #, c-format
 msgid "Problem connecting to server \n"
 msgstr "სერვერს ვერ ვუკავშირდები \n"
 
-#: ../mdkonline_tui:45 ../mdkonline_tui:95
-#, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
-
-#: ../mdkonline_tui:48
-#, c-format
-msgid "I already have an account"
-msgstr "მე უკვე გამაჩნია ანგარიში"
-
-#: ../mdkonline_tui:49
-#, c-format
-msgid "I want to subscribe"
-msgstr "მინდა გავწევრიანდე"
-
-#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:120
-#, c-format
-msgid "Please wait"
-msgstr "გთხოვთ იქონიოთ მოთმინება"
-
-#: ../mdkonline_tui:103
-#, c-format
-msgid "Account creation or authentication"
-msgstr "ანგარიშის შექმნა ან ავტორიზაცია"
-
-#: ../mdkonline_tui:120
-#, c-format
-msgid "Connecting to Mandrakeonline website..."
-msgstr "უკავშირდები Mandrakeonline ვებგვერდს..."
-
-#: ../mdkonline_tui:130
-#, c-format
-msgid "or"
-msgstr "ან"
-
-#: ../mdkonline_tui:130
-#, c-format
-msgid "wrong password:"
-msgstr "არასწორი პაროლი:"
-
-#: ../mdkonline_tui:158
-#, c-format
-msgid ""
-"Mandrakeonline Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-"Mandrakeonline-ზე წარმატებით განხორციელდა თქვენი ანგარიშის რეგისტრაცია.\n"
-"გთხოვთ დააჭიროთ \"შემდეგ\" ღილაკს რათა გაიაროთ ვტორიზაცია და ატვირთოთ თვენი "
-"კონფიგურაცია\n"
-
-#: ../mdkonline_tui:175
-#, c-format
-msgid "Country"
-msgstr "ქვეყანა"
-
-#: ../mdkonline_tui:187
-#, fuzzy, c-format
-msgid "Congratulations"
-msgstr "კონფიგურაცის გადაგზავნა"
-
-#: ../mdkonline_tui:187
-#, c-format
-msgid "Your Mandrakeonline account has been successfully configured\n"
-msgstr ""
-
-#: ../mdkupdate:50
+#: ../mdkupdate:52
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
@@ -618,42 +569,37 @@ msgstr ""
 "\n"
 "გამოყენება:\n"
 
-#: ../mdkupdate:55
+#: ../mdkupdate:57
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - აჩვენე ეს დამხმარე ტექსტი.\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:58
 #, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto         - Mandrakeupdate-ის ავტომატური გამოძახებ.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:59
 #, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - გამოიძახე Mandrakeupdate.\n"
 
-#: ../mdkupdate:58
-#, c-format
-msgid "  --update       - Update keys\n"
-msgstr "  --update       - განახლების კვანძები\n"
-
-#: ../mdkupdate:66
+#: ../mdkupdate:67
 #, c-format
 msgid "No %s file found. Run mdkonline wizard first"
 msgstr "%s ფაილი ვერ ვიპოვე. ჯერ mdkonline-ის ოსტატი გამოიძახეთ"
 
-#: ../mdkupdate:124
+#: ../mdkupdate:126
 #, c-format
 msgid "Mandrakeupdate could not contact the site, we will try again."
 msgstr "Mandrakeupdate-მა ვერ შეძლო დაკავშირებოდა საიტს. მოგვიანებით ვცადოთ."
 
-#: ../mdkupdate:173
+#: ../mdkupdate:176
 #, c-format
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr "mdkupdate-ის მედიუმიდან პაკეტები ვერ განვაახლე.\n"
 
-#: ../mdkupdate:195
+#: ../mdkupdate:198
 #, c-format
 msgid ""
 "Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
@@ -662,5 +608,51 @@ msgstr ""
 "Mandrakeupdate–მა ვერ შეძლო diff ფაილების ატვირთვა. გააგზავნეთ ელფოსტა "
 "მისამართზე support [at] mandrakeonline [dot] net"
 
+#~ msgid "Next"
+#~ msgstr "შემდეგი"
+
+#~ msgid "Cancel"
+#~ msgstr "სტოპ!"
+
+#~ msgid "Previous"
+#~ msgstr "წინა"
+
+#~ msgid "I don't have a Mandrakeonline account and I want to subscribe"
+#~ msgstr "მე ჯერ არ მაქვს ანგარიში Mandrakeonline-ზე და მსურს გაწევრიანება"
+
+#~ msgid "Mandrakelinux Privacy Policy"
+#~ msgstr "Mandrakelinux-ის პირადი უფლებების პოლისი"
+
+#~ msgid "Authentification"
+#~ msgstr "რეგისტრაცია"
+
+#~ msgid "Send Configuration"
+#~ msgstr "კონფიგურაცის გადაგზავნა"
+
+#~ msgid "Finish"
+#~ msgstr "დამთავრება"
+
+#~ msgid "automated Upgrades"
+#~ msgstr "ავტომატიზირებული განახლება"
+
+#~ msgid "Country:"
+#~ msgstr "ქვეყანა:"
+
+#~ msgid "Error"
+#~ msgstr "შეცდომა"
+
+#~ msgid "Quitting Wizard\n"
+#~ msgstr "ოსტატის დასრულება\n"
+
+#~ msgid ""
+#~ "Mandrakeonline could not be contacted, please try again at a later time"
+#~ msgstr "Mandrakeonline-ს ვერ ვუკავშირდები. გთხოვთ მოგვიანებით სცადოთ"
+
+#~ msgid "Wrong password"
+#~ msgstr "არასწორი პაროლი"
+
+#~ msgid "  --update       - Update keys\n"
+#~ msgstr "  --update       - განახლების კვანძები\n"
+
 #~ msgid "Skip Wizard"
 #~ msgstr "ჯადოქარის დასრულება"
diff --git a/po/ko.po b/po/ko.po
index ca3c7b51..fd832d71 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-01 22:41+0200\n"
+"POT-Creation-Date: 2004-11-03 12:10+0100\n"
 "PO-Revision-Date: 2002-08-16 12:34+0900\n"
 "Last-Translator: Jaegeum Cze <baedaron@hanafos.com>\n"
 "Language-Team: korean <baedaron@hanafos.com>\n"
@@ -14,271 +14,291 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../mdkapplet:61
+#: ../mdkapplet:63
 #, c-format
 msgid "Your system is up-to-date"
 msgstr ""
 
-#: ../mdkapplet:67
+#: ../mdkapplet:69
 #, fuzzy, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrakeonline.net"
 msgstr "문의사항은 support@mandrakeonline.net로 메일 주세요.\n"
 
-#: ../mdkapplet:73
+#: ../mdkapplet:75
 #, c-format
 msgid "System is busy. Please wait ..."
 msgstr ""
 
-#: ../mdkapplet:79
+#: ../mdkapplet:81
 #, fuzzy, c-format
 msgid "New updates are available for your system"
 msgstr "네트웍 어댑터를 찾을 수 없습니다!"
 
-#: ../mdkapplet:85
+#: ../mdkapplet:87
 #, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr ""
 
-#: ../mdkapplet:91
+#: ../mdkapplet:93
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr ""
 
-#: ../mdkapplet:97
+#: ../mdkapplet:99
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 
-#: ../mdkapplet:103
+#: ../mdkapplet:105
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:108 ../mdkapplet:158
+#: ../mdkapplet:110 ../mdkapplet:164
 #, fuzzy, c-format
 msgid "Install updates"
 msgstr "테마 설치"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:111
 #, fuzzy, c-format
 msgid "Configure the service"
 msgstr "서비스 설정"
 
-#: ../mdkapplet:110
+#: ../mdkapplet:112
 #, fuzzy, c-format
 msgid "Check Updates"
 msgstr "업데이트 버전"
 
-#: ../mdkapplet:111
+#: ../mdkapplet:113 ../mdkapplet:167 ../mdkapplet:225
+#, fuzzy, c-format
+msgid "Please Wait"
+msgstr "기다려 주세요"
+
+#: ../mdkapplet:113 ../mdkapplet:166 ../mdkapplet:167 ../mdkapplet:225
+#, fuzzy, c-format
+msgid "Check updates"
+msgstr "보안 업데이트"
+
+#: ../mdkapplet:115
 #, c-format
 msgid "Online WebSite"
 msgstr ""
 
-#: ../mdkapplet:112
+#: ../mdkapplet:116
 #, fuzzy, c-format
 msgid "Configure Network"
 msgstr "네트웍 설정"
 
-#: ../mdkapplet:113
+#: ../mdkapplet:117
 #, fuzzy, c-format
 msgid "Configure Now!"
 msgstr "설정사항 읽는 중\n"
 
-#: ../mdkapplet:146
+#: ../mdkapplet:152 ../mdkapplet:229
 #, fuzzy, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "맨드레이크 프라이버시 정책"
 
-#: ../mdkapplet:156
+#: ../mdkapplet:162
 #, c-format
 msgid "Actions"
 msgstr "동작"
 
-#: ../mdkapplet:159
+#: ../mdkapplet:165
 #, c-format
 msgid "Configure"
 msgstr "설정"
 
-#: ../mdkapplet:160
-#, fuzzy, c-format
-msgid "Check updates"
-msgstr "보안 업데이트"
-
-#: ../mdkapplet:161
+#: ../mdkapplet:169
 #, fuzzy, c-format
 msgid "See logs"
 msgstr "+5초 탐색"
 
-#: ../mdkapplet:164
+#: ../mdkapplet:172
 #, c-format
 msgid "Status"
 msgstr "상태"
 
-#: ../mdkapplet:168 ../mdkapplet:363
+#: ../mdkapplet:176 ../mdkapplet:375
 #, c-format
 msgid "Close"
 msgstr "닫기"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, fuzzy, c-format
 msgid "Network Connection: "
 msgstr "네트웍 환경 설정"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Up"
 msgstr "위로"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Down"
 msgstr "아래로"
 
-#: ../mdkapplet:204
+#: ../mdkapplet:212
 #, c-format
 msgid "Last check: "
 msgstr ""
 
-#: ../mdkapplet:205
+#: ../mdkapplet:213
 #, fuzzy, c-format
 msgid "Updates: "
 msgstr "업데이트 버전"
 
-#: ../mdkapplet:209
+#: ../mdkapplet:217
 #, fuzzy, c-format
 msgid "Launching drakconnect\n"
 msgstr "사용자드레이크 실행"
 
-#: ../mdkapplet:213
+#: ../mdkapplet:221
 #, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr ""
 
-#: ../mdkapplet:217
+#: ../mdkapplet:224
 #, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 
-#: ../mdkapplet:225
+#: ../mdkapplet:235
 #, fuzzy, c-format
 msgid "Computing new updates...\n"
 msgstr "연결 문제"
 
-#: ../mdkapplet:227
+#: ../mdkapplet:237
 #, fuzzy, c-format
 msgid "Connecting to"
 msgstr "연결 문제"
 
-#: ../mdkapplet:250
+#: ../mdkapplet:244
+#, fuzzy, c-format
+msgid "Response from Mandrakeonline server\n"
+msgstr "맨드레이크 온라인에 잘 오셨습니다."
+
+#: ../mdkapplet:262
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr ""
 
-#: ../mdkapplet:254
+#: ../mdkapplet:267
 #, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
-#: ../mdkapplet:255
+#: ../mdkapplet:268
 #, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
-#: ../mdkapplet:256
+#: ../mdkapplet:269
 #, fuzzy, c-format
 msgid "Unknown state"
 msgstr "알 수 없는 호스트 이름"
 
-#: ../mdkapplet:257
+#: ../mdkapplet:270
 #, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr ""
 
-#: ../mdkapplet:258
+#: ../mdkapplet:271
 #, c-format
 msgid "Wrong Password.\n"
 msgstr "잘못된 암호\n"
 
-#: ../mdkapplet:259
+#: ../mdkapplet:272
 #, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr ""
 
-#: ../mdkapplet:260
+#: ../mdkapplet:273
 #, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
 msgstr ""
 
-#: ../mdkapplet:264
+#: ../mdkapplet:277
 #, fuzzy, c-format
 msgid "System is up-to-date\n"
 msgstr "시스템 모드"
 
-#: ../mdkapplet:303
+#: ../mdkapplet:317
 #, c-format
 msgid "No check"
 msgstr ""
 
-#: ../mdkapplet:316
+#: ../mdkapplet:330
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
-#: ../mdkapplet:319
+#: ../mdkapplet:333
 #, c-format
 msgid "Checking config file: Not present\n"
 msgstr ""
 
-#: ../mdkapplet:353
+#: ../mdkapplet:365
 #, c-format
 msgid "Logs"
 msgstr "로그"
 
-#: ../mdkapplet:369
+#: ../mdkapplet:381
 #, fuzzy, c-format
 msgid "Clear"
 msgstr "달력"
 
-#: ../mdkapplet:396
+#: ../mdkapplet:408
 #, c-format
 msgid "About..."
 msgstr "정보..."
 
-#: ../mdkapplet:397
+#: ../mdkapplet:409
 #, c-format
 msgid "Always launch on startup"
 msgstr ""
 
-#: ../mdkapplet:399
+#: ../mdkapplet:411
 #, c-format
 msgid "Quit"
 msgstr "종료"
 
-#: ../mdkonline:89
+#: ../mdkonline:52 ../mdkonline:106
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "맨드레이크 온라인에 잘 오셨습니다."
+
+#: ../mdkonline:55
 #, c-format
-msgid "Next"
-msgstr "다음"
+msgid "I already have an account"
+msgstr ""
 
-#: ../mdkonline:89
+#: ../mdkonline:56
 #, c-format
-msgid "Cancel"
-msgstr "취소"
+msgid "I want to subscribe"
+msgstr ""
 
-#: ../mdkonline:89
+#: ../mdkonline:89 ../mdkonline:93 ../mdkonline:131
 #, c-format
-msgid "Previous"
-msgstr "이전"
+msgid "Please wait"
+msgstr "기다려 주세요"
 
-#: ../mdkonline:103
+#: ../mdkonline:89
 #, c-format
-msgid "Welcome to Mandrakeonline"
-msgstr "맨드레이크 온라인에 잘 오셨습니다."
+msgid "Reading configuration\n"
+msgstr "설정사항 읽는 중\n"
 
-#: ../mdkonline:104 ../mdkonline_tui:98
+#: ../mdkonline:93
+#, fuzzy, c-format
+msgid "Sending configuration..."
+msgstr "설정사항 읽는 중\n"
+
+#: ../mdkonline:109
 #, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
@@ -290,62 +310,37 @@ msgstr ""
 "이는 님께 보안 업데이트나 유용한 업그레이드에 대해 지속적으로 알리기 위함입니"
 "다.\n"
 
-#: ../mdkonline:105 ../mdkonline_tui:142
-#, fuzzy, c-format
-msgid "Create a Mandrakeonline Account"
-msgstr "맨드레이크 온라인에 잘 오셨습니다."
+#: ../mdkonline:114
+#, c-format
+msgid "Account creation or authentication"
+msgstr ""
 
-#: ../mdkonline:107
-#, fuzzy, c-format
-msgid "I don't have a Mandrakeonline account and I want to subscribe"
-msgstr "맨드레이크 온라인에 계정이 없으며, 새로 만들고 싶습니다."
+#: ../mdkonline:119
+#, c-format
+msgid "Enter your Mandrakeonline login, password and machine name:"
+msgstr "맨드레이크온라인 사용자명, 암호, 컴퓨터 이름을 입력하세요:"
 
-#: ../mdkonline:111 ../mdkonline:131 ../mdkonline_tui:114 ../mdkonline_tui:145
+#: ../mdkonline:125 ../mdkonline:156
 #, c-format
 msgid "Login:"
 msgstr "로그인:"
 
-#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:115 ../mdkonline_tui:146
+#: ../mdkonline:126 ../mdkonline:157
 #, c-format
 msgid "Password:"
 msgstr "암호:"
 
-#: ../mdkonline:113 ../mdkonline_tui:147
-#, fuzzy, c-format
-msgid "Confirm Password:"
-msgstr "암호:"
-
-#: ../mdkonline:114 ../mdkonline_tui:148
-#, fuzzy, c-format
-msgid "Mail contact:"
-msgstr "편지 지켜보기"
-
-#: ../mdkonline:121
-#, c-format
-msgid "Mandrakelinux Privacy Policy"
-msgstr "맨드레이크 프라이버시 정책"
-
 #: ../mdkonline:127
 #, c-format
-msgid "Authentification"
-msgstr "인증"
-
-#: ../mdkonline:128 ../mdkonline_tui:108
-#, c-format
-msgid "Enter your Mandrakeonline login, password and machine name:"
-msgstr "맨드레이크온라인 사용자명, 암호, 컴퓨터 이름을 입력하세요:"
-
-#: ../mdkonline:133 ../mdkonline_tui:116
-#, c-format
 msgid "Machine name:"
 msgstr "컴퓨터 이름:"
 
-#: ../mdkonline:138
+#: ../mdkonline:131
 #, fuzzy, c-format
-msgid "Send Configuration"
-msgstr "설정사항 읽는 중\n"
+msgid "Connecting to Mandrakeonline website..."
+msgstr "맨드레이크 온라인에 잘 오셨습니다."
 
-#: ../mdkonline:139 ../mdkonline_tui:128
+#: ../mdkonline:139
 #, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
@@ -376,213 +371,168 @@ msgstr ""
 "그리고 「www.mandrakeexpert.com」에서 할인된 지원 서비스를\n"
 "받으실 수도 있습니다."
 
-#: ../mdkonline:144 ../mdkonline:211 ../mdkonline:234
-#, c-format
-msgid "Finish"
-msgstr "완료"
-
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141 ../mdkonline:180 ../mdkupdate:126 ../mdkupdate:198
 #, c-format
-msgid "Your upload was successful!"
-msgstr "성공적으로 전송되었습니다!"
+msgid "Connection problem"
+msgstr "연결 문제"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandrakeonline."
+msgid "or"
 msgstr ""
-"이제부터 보안과 업그레이드에 대한 정보를 \n"
-"맨드레이크 온라인을 통해 받아 보실 수 있습니다."
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "잘못된 암호"
+
+#: ../mdkonline:141
 #, c-format
 msgid ""
-"Mandrakeonline offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+"Your login or password was wrong.\n"
+" Either you'll have to type it again, or you'll need to create an account on "
+"Mandrakeonline.\n"
+" In the latter case, go back to the first step to connect to "
+"Mandrakeonline.\n"
+" Be aware that you must also provide a Machine name \n"
+" (only alphabetical characters are admitted)"
 msgstr ""
-"맨들레크 온라인은 님께 자동업데이트 기능을 제공합니다.\n"
-"새로운 업데이트를 확인하기 위하여 프로그램이 정기적으로 실행될 것입니다.\n"
-
-#: ../mdkonline:146
-#, c-format
-msgid "automated Upgrades"
-msgstr "자동 업그레이드"
+"사용자명이나 암호가 틀렸습니다.\n"
+"다시 시도해 보거나, 맨드레이크 온라인에 새 계정을 만들어 보세요.\n"
+"새 계정을 만들려면, 맨드레이크 온라인에 접속하기 위한 첫 단계로 돌아가세요.\n"
+"또한 컴퓨터 이름도 입력해야 한다는 것을 알아두세요.\n"
+"(컴퓨터 이름은 알파뱃만 허용됩니다.)"
 
-#: ../mdkonline:150
+#: ../mdkonline:153
 #, fuzzy, c-format
-msgid "Country:"
-msgstr "컨트리"
+msgid "Create a Mandrakeonline Account"
+msgstr "맨드레이크 온라인에 잘 오셨습니다."
 
-#: ../mdkonline:178 ../mdkonline:183 ../mdkonline:185 ../mdkonline:187
-#, c-format
-msgid "Error"
-msgstr "오류"
+#: ../mdkonline:158
+#, fuzzy, c-format
+msgid "Confirm Password:"
+msgstr "암호:"
 
-#: ../mdkonline:183 ../mdkonline_tui:152
+#: ../mdkonline:159
 #, fuzzy, c-format
-msgid "Please provide a login"
-msgstr "다시 시도하세요."
+msgid "Mail contact:"
+msgstr "편지 지켜보기"
 
-#: ../mdkonline:185 ../mdkonline_tui:152
+#: ../mdkonline:163
 #, fuzzy, c-format
 msgid ""
 "The passwords do not match\n"
 " Please try again\n"
 msgstr "암호가 일치하지 않습니다."
 
-#: ../mdkonline:187 ../mdkonline_tui:152
+#: ../mdkonline:163
 #, fuzzy, c-format
-msgid "Not a valid mail address!\n"
-msgstr "유효한 주소를 입력하세요!"
-
-#: ../mdkonline:199 ../mdkonline_tui:78
-#, c-format
-msgid "Reading configuration\n"
-msgstr "설정사항 읽는 중\n"
+msgid "Please provide a login"
+msgstr "다시 시도하세요."
 
-#: ../mdkonline:204 ../mdkonline_tui:82
+#: ../mdkonline:163
 #, fuzzy, c-format
-msgid "Sending configuration..."
-msgstr "설정사항 읽는 중\n"
-
-#: ../mdkonline:213 ../mdkonline:273 ../mdkonline_tui:130 ../mdkonline_tui:169
-#: ../mdkupdate:124 ../mdkupdate:195
-#, c-format
-msgid "Connection problem"
-msgstr "연결 문제"
-
-#: ../mdkonline:213 ../mdkonline_tui:169
-#, c-format
-msgid "Problem occurs when uploading files, please try again"
-msgstr ""
+msgid "Not a valid mail address!\n"
+msgstr "유효한 주소를 입력하세요!"
 
-#: ../mdkonline:251
+#: ../mdkonline:169
 #, c-format
-msgid "Quitting Wizard\n"
-msgstr "마법사 종료 중\n"
-
-#: ../mdkonline:273
-#, fuzzy, c-format
-msgid "Mandrakeonline could not be contacted, please try again at a later time"
+msgid ""
+"Mandrakeonline Account successfully created.\n"
+"Please click \"Next\" to authenticate and upload your configuration\n"
 msgstr ""
-"맨드레이크 업데이트가 사이트에 접속하지 못했습니다. 다시 시도할 것입니다."
 
-#: ../mdkonline:285
+#: ../mdkonline:178
 #, c-format
-msgid "Wrong password"
-msgstr "잘못된 암호"
+msgid "Your upload was successful!"
+msgstr "성공적으로 전송되었습니다!"
 
-#: ../mdkonline:285 ../mdkonline_tui:130
+#: ../mdkonline:178
 #, c-format
 msgid ""
-"Your login or password was wrong.\n"
-" Either you'll have to type it again, or you'll need to create an account on "
-"Mandrakeonline.\n"
-" In the latter case, go back to the first step to connect to "
-"Mandrakeonline.\n"
-" Be aware that you must also provide a Machine name \n"
-" (only alphabetical characters are admitted)"
+"From now you will receive on security and updates \n"
+"announcements thanks to Mandrakeonline."
 msgstr ""
-"사용자명이나 암호가 틀렸습니다.\n"
-"다시 시도해 보거나, 맨드레이크 온라인에 새 계정을 만들어 보세요.\n"
-"새 계정을 만들려면, 맨드레이크 온라인에 접속하기 위한 첫 단계로 돌아가세요.\n"
-"또한 컴퓨터 이름도 입력해야 한다는 것을 알아두세요.\n"
-"(컴퓨터 이름은 알파뱃만 허용됩니다.)"
+"이제부터 보안과 업그레이드에 대한 정보를 \n"
+"맨드레이크 온라인을 통해 받아 보실 수 있습니다."
 
-#: ../mdkonline.pm:58
+#: ../mdkonline:178
 #, c-format
-msgid "Login and password should be less than 12 characters\n"
+msgid ""
+"Mandrakeonline offers you the ability to automate the updates.\n"
+"A program will run regulary in your system waiting for new updates\n"
 msgstr ""
+"맨들레크 온라인은 님께 자동업데이트 기능을 제공합니다.\n"
+"새로운 업데이트를 확인하기 위하여 프로그램이 정기적으로 실행될 것입니다.\n"
 
-#: ../mdkonline.pm:59
+#: ../mdkonline:180
 #, c-format
-msgid "Special characters are not allowed\n"
+msgid "Problem occurs when uploading files, please try again"
 msgstr ""
 
-#: ../mdkonline.pm:60
-#, c-format
-msgid "Please fill in all fields\n"
-msgstr ""
+#: ../mdkonline:186
+#, fuzzy, c-format
+msgid "Country"
+msgstr "컨트리"
 
-#: ../mdkonline.pm:61
-#, c-format
-msgid "Email not valid\n"
-msgstr ""
+#: ../mdkonline:198
+#, fuzzy, c-format
+msgid "Congratulations"
+msgstr "설정사항 읽는 중\n"
 
-#: ../mdkonline.pm:62
+#: ../mdkonline:198
 #, c-format
-msgid "Account already exist\n"
+msgid "Your Mandrakeonline account has been successfully configured\n"
 msgstr ""
 
-#: ../mdkonline.pm:68
-#, c-format
-msgid "Problem connecting to server \n"
-msgstr ""
+#: ../mdkonline:214
+#, fuzzy, c-format
+msgid "Configuration uploaded successfully"
+msgstr "성공적으로 전송되었습니다!"
 
-#: ../mdkonline_tui:45 ../mdkonline_tui:95
+#: ../mdkonline:215
 #, fuzzy, c-format
-msgid "Mandrakeonline"
-msgstr "맨드레이크 온라인에 잘 오셨습니다."
+msgid "Problem uploading configuration"
+msgstr "설정사항 읽는 중\n"
 
-#: ../mdkonline_tui:48
+#: ../mdkonline:216
 #, c-format
-msgid "I already have an account"
+msgid ""
+"Cannot connect to mandrakeonline website: wrong login/password or router/"
+"firewall bad settings"
 msgstr ""
 
-#: ../mdkonline_tui:49
+#: ../mdkonline.pm:66
 #, c-format
-msgid "I want to subscribe"
+msgid "Login and password should be less than 12 characters\n"
 msgstr ""
 
-#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:120
+#: ../mdkonline.pm:67
 #, c-format
-msgid "Please wait"
-msgstr "기다려 주세요"
+msgid "Special characters are not allowed\n"
+msgstr ""
 
-#: ../mdkonline_tui:103
+#: ../mdkonline.pm:68
 #, c-format
-msgid "Account creation or authentication"
+msgid "Please fill in all fields\n"
 msgstr ""
 
-#: ../mdkonline_tui:120
-#, fuzzy, c-format
-msgid "Connecting to Mandrakeonline website..."
-msgstr "맨드레이크 온라인에 잘 오셨습니다."
-
-#: ../mdkonline_tui:130
+#: ../mdkonline.pm:69
 #, c-format
-msgid "or"
+msgid "Email not valid\n"
 msgstr ""
 
-#: ../mdkonline_tui:130
-#, fuzzy, c-format
-msgid "wrong password:"
-msgstr "잘못된 암호"
-
-#: ../mdkonline_tui:158
+#: ../mdkonline.pm:70
 #, c-format
-msgid ""
-"Mandrakeonline Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
+msgid "Account already exist\n"
 msgstr ""
 
-#: ../mdkonline_tui:175
-#, fuzzy, c-format
-msgid "Country"
-msgstr "컨트리"
-
-#: ../mdkonline_tui:187
-#, fuzzy, c-format
-msgid "Congratulations"
-msgstr "설정사항 읽는 중\n"
-
-#: ../mdkonline_tui:187
+#: ../mdkonline.pm:76
 #, c-format
-msgid "Your Mandrakeonline account has been successfully configured\n"
+msgid "Problem connecting to server \n"
 msgstr ""
 
-#: ../mdkupdate:50
+#: ../mdkupdate:52
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
@@ -598,49 +548,95 @@ msgstr ""
 "\n"
 "usage:\n"
 
-#: ../mdkupdate:55
+#: ../mdkupdate:57
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - 이 도움말 출력.\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:58
 #, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr ""
 
-#: ../mdkupdate:57
+#: ../mdkupdate:59
 #, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr ""
 
-#: ../mdkupdate:58
-#, c-format
-msgid "  --update       - Update keys\n"
-msgstr ""
-
-#: ../mdkupdate:66
+#: ../mdkupdate:67
 #, c-format
 msgid "No %s file found. Run mdkonline wizard first"
 msgstr ""
 
-#: ../mdkupdate:124
+#: ../mdkupdate:126
 #, fuzzy, c-format
 msgid "Mandrakeupdate could not contact the site, we will try again."
 msgstr ""
 "맨드레이크 업데이트가 사이트에 접속하지 못했습니다. 다시 시도할 것입니다."
 
-#: ../mdkupdate:173
+#: ../mdkupdate:176
 #, c-format
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr ""
 
-#: ../mdkupdate:195
+#: ../mdkupdate:198
 #, c-format
 msgid ""
 "Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
 "mandrakeonline [dot] net"
 msgstr ""
 
+#~ msgid "Next"
+#~ msgstr "다음"
+
+#~ msgid "Cancel"
+#~ msgstr "취소"
+
+#~ msgid "Previous"
+#~ msgstr "이전"
+
+#~ msgid "Welcome to Mandrakeonline"
+#~ msgstr "맨드레이크 온라인에 잘 오셨습니다."
+
+#, fuzzy
+#~ msgid "I don't have a Mandrakeonline account and I want to subscribe"
+#~ msgstr "맨드레이크 온라인에 계정이 없으며, 새로 만들고 싶습니다."
+
+#~ msgid "Mandrakelinux Privacy Policy"
+#~ msgstr "맨드레이크 프라이버시 정책"
+
+#~ msgid "Authentification"
+#~ msgstr "인증"
+
+#, fuzzy
+#~ msgid "Send Configuration"
+#~ msgstr "설정사항 읽는 중\n"
+
+#~ msgid "Finish"
+#~ msgstr "완료"
+
+#~ msgid "automated Upgrades"
+#~ msgstr "자동 업그레이드"
+
+#, fuzzy
+#~ msgid "Country:"
+#~ msgstr "컨트리"
+
+#~ msgid "Error"
+#~ msgstr "오류"
+
+#~ msgid "Quitting Wizard\n"
+#~ msgstr "마법사 종료 중\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Mandrakeonline could not be contacted, please try again at a later time"
+#~ msgstr ""
+#~ "맨드레이크 업데이트가 사이트에 접속하지 못했습니다. 다시 시도할 것입니다."
+
+#~ msgid "Wrong password"
+#~ msgstr "잘못된 암호"
+
 #, fuzzy
 #~ msgid "Skip Wizard"
 #~ msgstr "NFS 마법사"
@@ -652,10 +648,6 @@ msgstr ""
 #~ msgid "Checking ..."
 #~ msgstr "연결 문제"
 
-#, fuzzy
-#~ msgid "Response from Mandrakeonline server\n"
-#~ msgstr "맨드레이크 온라인에 잘 오셨습니다."
-
 #~ msgid "Yes I want automated updates"
 #~ msgstr "예, 자동 업데이트하고 싶습니다."
 
diff --git a/po/ky.po b/po/ky.po
index 05faa517..36788832 100644
--- a/po/ky.po
+++ b/po/ky.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-ky\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-15 17:23+0200\n"
+"POT-Creation-Date: 2004-11-03 12:10+0100\n"
 "PO-Revision-Date: 2004-10-11 17:38+0000\n"
 "Last-Translator: Ilyas <just_ilyas@yahoo.com>\n"
 "Language-Team: kyrgyz\n"
@@ -19,12 +19,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3\n"
 
-#: ../mdkapplet:61
+#: ../mdkapplet:63
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Система жаңылоону талап кылбайт"
 
-#: ../mdkapplet:67
+#: ../mdkapplet:69
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -33,187 +33,197 @@ msgstr ""
 "Кызматты конфигурациялоо проблемасы. Логдорду карап чыгып андан соң "
 "support@mandrakeonline.net дарегин кат жазыңыз"
 
-#: ../mdkapplet:73
+#: ../mdkapplet:75
 #, c-format
 msgid "System is busy. Please wait ..."
 msgstr "Система бош эмес. Күтө туруңуз ..."
 
-#: ../mdkapplet:79
+#: ../mdkapplet:81
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Сиздин системаңызды жаңылоо мүмкүнчүлүгү бар"
 
-#: ../mdkapplet:85
+#: ../mdkapplet:87
 #, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr "Кызмат конфигурацияланган эмес. \"Кызматты конфигурациялоо\"ну басыңыз"
 
-#: ../mdkapplet:91
+#: ../mdkapplet:93
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Тармак иштеген эмес. Тармакты конфигурациялаңыз"
 
-#: ../mdkapplet:97
+#: ../mdkapplet:99
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Кызмат активдештирилген эмес. \"Онлайн веб-сайты\"н басыңыз"
 
-#: ../mdkapplet:103
+#: ../mdkapplet:105
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "Релиз колдоого ээ эмес (өтө эски же иштелип жаткан релиз)"
 
-#: ../mdkapplet:108 ../mdkapplet:158
+#: ../mdkapplet:110 ../mdkapplet:164
 #, c-format
 msgid "Install updates"
 msgstr "Жаңылоолорду орнотуу"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:111
 #, c-format
 msgid "Configure the service"
 msgstr "Кызматты конфигурациялоо"
 
-#: ../mdkapplet:110
+#: ../mdkapplet:112
 #, c-format
 msgid "Check Updates"
 msgstr "Жаңылоолорду текшерүү"
 
-#: ../mdkapplet:111
+#: ../mdkapplet:113 ../mdkapplet:167 ../mdkapplet:225
+#, fuzzy, c-format
+msgid "Please Wait"
+msgstr "Күтө туруңуз"
+
+#: ../mdkapplet:113 ../mdkapplet:166 ../mdkapplet:167 ../mdkapplet:225
+#, c-format
+msgid "Check updates"
+msgstr "Жаңылоолорду текшерүү"
+
+#: ../mdkapplet:115
 #, c-format
 msgid "Online WebSite"
 msgstr "Онлайндагы веб-сайт"
 
-#: ../mdkapplet:112
+#: ../mdkapplet:116
 #, c-format
 msgid "Configure Network"
 msgstr "Тармакты конфигурациялоо"
 
-#: ../mdkapplet:113
+#: ../mdkapplet:117
 #, c-format
 msgid "Configure Now!"
 msgstr "Азыр конфигурациялоо!"
 
-#: ../mdkapplet:146
+#: ../mdkapplet:152 ../mdkapplet:229
 #, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Mandrakelinux Updates апплети"
 
-#: ../mdkapplet:156
+#: ../mdkapplet:162
 #, c-format
 msgid "Actions"
 msgstr "Аракеттер"
 
-#: ../mdkapplet:159
+#: ../mdkapplet:165
 #, c-format
 msgid "Configure"
 msgstr "Конфигурациялоо"
 
-#: ../mdkapplet:160
-#, c-format
-msgid "Check updates"
-msgstr "Жаңылоолорду текшерүү"
-
-#: ../mdkapplet:161
+#: ../mdkapplet:169
 #, c-format
 msgid "See logs"
 msgstr "Логдорду кара"
 
-#: ../mdkapplet:164
+#: ../mdkapplet:172
 #, c-format
 msgid "Status"
 msgstr "Абалы"
 
-#: ../mdkapplet:168 ../mdkapplet:363
+#: ../mdkapplet:176 ../mdkapplet:375
 #, c-format
 msgid "Close"
 msgstr "Жабуу"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Network Connection: "
 msgstr "Тармак байланышы: "
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Up"
 msgstr "Жогору"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Down"
 msgstr "Төмөн"
 
-#: ../mdkapplet:204
+#: ../mdkapplet:212
 #, c-format
 msgid "Last check: "
 msgstr "Акыркы текшерүү: "
 
-#: ../mdkapplet:205
+#: ../mdkapplet:213
 #, c-format
 msgid "Updates: "
 msgstr "Жаңылоолор: "
 
-#: ../mdkapplet:209
+#: ../mdkapplet:217
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "drakconnect иштетүү\n"
 
-#: ../mdkapplet:213
+#: ../mdkapplet:221
 #, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "mdkupdate --applet иштетүү\n"
 
-#: ../mdkapplet:217
+#: ../mdkapplet:224
 #, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr "Mandrakeonline кайра орнотулса керек, апплет кайра жүктөлүүдө ...."
 
-#: ../mdkapplet:225
+#: ../mdkapplet:235
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Жаңы жаңылоолор эсептелүүдө...\n"
 
-#: ../mdkapplet:227
+#: ../mdkapplet:237
 #, c-format
 msgid "Connecting to"
 msgstr "Төмөнкүгө туташуу"
 
-#: ../mdkapplet:250
+#: ../mdkapplet:244
+#, fuzzy, c-format
+msgid "Response from Mandrakeonline server\n"
+msgstr "Mandrakeonline кош келиңиз"
+
+#: ../mdkapplet:262
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Текшерүү... Жаңылоолор мүмүкүн\n"
 
-#: ../mdkapplet:254
+#: ../mdkapplet:267
 #, c-format
 msgid "Development release not supported by service"
 msgstr "Иштелип жаткан релиз кызмат тарабынан колдоого ээ эмес"
 
-#: ../mdkapplet:255
+#: ../mdkapplet:268
 #, c-format
 msgid "Too old release not supported by service"
 msgstr "Өтө эле эски релиз кызмат тарабынан колдоого ээ эмес"
 
-#: ../mdkapplet:256
+#: ../mdkapplet:269
 #, c-format
 msgid "Unknown state"
 msgstr "Белгисиз абал"
 
-#: ../mdkapplet:257
+#: ../mdkapplet:270
 #, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr "Онлайн кызматы өчүрүлгөн. Mandrakeonline сайты менен байланышыңыз\n"
 
-#: ../mdkapplet:258
+#: ../mdkapplet:271
 #, c-format
 msgid "Wrong Password.\n"
 msgstr "Туура эмес пароль.\n"
 
-#: ../mdkapplet:259
+#: ../mdkapplet:272
 #, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr "Туура эмес аракет, же хост, же логин.\n"
 
-#: ../mdkapplet:260
+#: ../mdkapplet:273
 #, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
@@ -222,72 +232,82 @@ msgstr ""
 "Сиздин тармактын конфигурациясынын кайсы бири туура эмес (маршрутуңуздун, "
 "файрволуңуздун же проксиңиздин конфигурациясын текшериңиз)\n"
 
-#: ../mdkapplet:264
+#: ../mdkapplet:277
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Система жаңылоону талап кылбайт\n"
 
-#: ../mdkapplet:303
+#: ../mdkapplet:317
 #, c-format
 msgid "No check"
 msgstr "Текшерүүсүз"
 
-#: ../mdkapplet:316
+#: ../mdkapplet:330
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Тармак текшерилүүдө: өчүрүлгөн көрүнөт\n"
 
-#: ../mdkapplet:319
+#: ../mdkapplet:333
 #, c-format
 msgid "Checking config file: Not present\n"
 msgstr "Конфиг файлы текшерилүүдө: жок\n"
 
-#: ../mdkapplet:353
+#: ../mdkapplet:365
 #, c-format
 msgid "Logs"
 msgstr "Логдор"
 
-#: ../mdkapplet:369
+#: ../mdkapplet:381
 #, c-format
 msgid "Clear"
 msgstr "Тазалоо"
 
-#: ../mdkapplet:396
+#: ../mdkapplet:408
 #, c-format
 msgid "About..."
 msgstr "Жөнүндө.."
 
-#: ../mdkapplet:397
+#: ../mdkapplet:409
 #, c-format
 msgid "Always launch on startup"
 msgstr "Дайыма старт учурунда ишке киргизүү"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:411
 #, c-format
 msgid "Quit"
 msgstr "Чыгуу"
 
-#: ../mdkonline:89
+#: ../mdkonline:52 ../mdkonline:106
 #, c-format
-msgid "Next"
-msgstr "Кийинки"
+msgid "Mandrakeonline"
+msgstr "Mandrakeonline"
 
-#: ../mdkonline:89
+#: ../mdkonline:55
 #, c-format
-msgid "Cancel"
-msgstr "Калтыруу"
+msgid "I already have an account"
+msgstr "Менде аккаунт бар"
+
+#: ../mdkonline:56
+#, c-format
+msgid "I want to subscribe"
+msgstr "Мен жазылууну каалайм"
+
+#: ../mdkonline:89 ../mdkonline:93 ../mdkonline:131
+#, c-format
+msgid "Please wait"
+msgstr "Күтө туруңуз"
 
 #: ../mdkonline:89
 #, c-format
-msgid "Previous"
-msgstr "Мурунку"
+msgid "Reading configuration\n"
+msgstr "Конфигурация окулууда\n"
 
-#: ../mdkonline:103
+#: ../mdkonline:93
 #, c-format
-msgid "Welcome to Mandrakeonline"
-msgstr "Mandrakeonline кош келиңиз"
+msgid "Sending configuration..."
+msgstr "Конфигурация жөнөтүлүүдө..."
 
-#: ../mdkonline:104 ../mdkonline_tui:102
+#: ../mdkonline:109
 #, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
@@ -299,62 +319,37 @@ msgstr ""
 "сиздин конфигурацияңызды (пакеттер, техникалык жабдуулар конфигурациясын)\n"
 " борбордук берилиштер базасына жүктөөгө жардам берет.\n"
 
-#: ../mdkonline:105 ../mdkonline_tui:146
+#: ../mdkonline:114
 #, c-format
-msgid "Create a Mandrakeonline Account"
-msgstr "Mandrakeonline аккаунтун түзүү"
+msgid "Account creation or authentication"
+msgstr "Аккаунт түзүү же аутентификациялоо"
 
-#: ../mdkonline:107
+#: ../mdkonline:119
 #, c-format
-msgid "I don't have a Mandrakeonline account and I want to subscribe"
-msgstr "Менде Mandrakeonline аккаунту жок жана ага жазылууну каалайм"
+msgid "Enter your Mandrakeonline login, password and machine name:"
+msgstr "Mandrakeonline логинин, паролун жана машина атын киргизиңиз:"
 
-#: ../mdkonline:111 ../mdkonline:131 ../mdkonline_tui:118 ../mdkonline_tui:149
+#: ../mdkonline:125 ../mdkonline:156
 #, c-format
 msgid "Login:"
 msgstr "Логин:"
 
-#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:119 ../mdkonline_tui:150
+#: ../mdkonline:126 ../mdkonline:157
 #, c-format
 msgid "Password:"
 msgstr "Пароль:"
 
-#: ../mdkonline:113 ../mdkonline_tui:151
-#, c-format
-msgid "Confirm Password:"
-msgstr "Паролду кайталоо:"
-
-#: ../mdkonline:114 ../mdkonline_tui:152
-#, c-format
-msgid "Mail contact:"
-msgstr "Почта байланышы:"
-
-#: ../mdkonline:121
-#, c-format
-msgid "Mandrakelinux Privacy Policy"
-msgstr "Mandrakelinux коопсуздук саясаты"
-
 #: ../mdkonline:127
 #, c-format
-msgid "Authentification"
-msgstr "Аутентификация"
-
-#: ../mdkonline:128 ../mdkonline_tui:112
-#, c-format
-msgid "Enter your Mandrakeonline login, password and machine name:"
-msgstr "Mandrakeonline логинин, паролун жана машина атын киргизиңиз:"
-
-#: ../mdkonline:133 ../mdkonline_tui:120
-#, c-format
 msgid "Machine name:"
 msgstr "Машинанын аты:"
 
-#: ../mdkonline:138
+#: ../mdkonline:131
 #, c-format
-msgid "Send Configuration"
-msgstr "Конфигурацияны жөнөтүү"
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Mandrakeonline веб-сайтына туташуу..."
 
-#: ../mdkonline:139 ../mdkonline_tui:132
+#: ../mdkonline:139
 #, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
@@ -387,55 +382,55 @@ msgstr ""
 "Мындан тышкары, сиз www.mandrakeexpert.com колдоо кызматындан\n"
 "төлөө жеңилдиктерин аласыз."
 
-#: ../mdkonline:144 ../mdkonline:211 ../mdkonline:234
+#: ../mdkonline:141 ../mdkonline:180 ../mdkupdate:126 ../mdkupdate:198
 #, c-format
-msgid "Finish"
-msgstr "Аяктоо"
+msgid "Connection problem"
+msgstr "Туташуу проблемасы"
 
-#: ../mdkonline:145 ../mdkonline_tui:171
+#: ../mdkonline:141
 #, c-format
-msgid "Your upload was successful!"
-msgstr "Сыртка жүктөө ийгиликтүү!"
+msgid "or"
+msgstr "же"
 
-#: ../mdkonline:145 ../mdkonline_tui:171
+#: ../mdkonline:141
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandrakeonline."
-msgstr ""
-"Мындан кийин сиз коопсуздуктар жана жыңылоолор\n"
-"жөнүндө, Mandrakeonline тарабынан кабардар болосуздар."
+msgid "wrong password:"
+msgstr "туура эмес пароль:"
 
-#: ../mdkonline:145 ../mdkonline_tui:171
+#: ../mdkonline:141
 #, c-format
 msgid ""
-"Mandrakeonline offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+"Your login or password was wrong.\n"
+" Either you'll have to type it again, or you'll need to create an account on "
+"Mandrakeonline.\n"
+" In the latter case, go back to the first step to connect to "
+"Mandrakeonline.\n"
+" Be aware that you must also provide a Machine name \n"
+" (only alphabetical characters are admitted)"
 msgstr ""
-"Mandrakeonline сизге автоматташтырылган жаңылоо мүмкүнчүлүгүн сунуштайт.\n"
-"Программа сиздин системада жаңы жаңылоолор үчүн регулярдуу иштейт\n"
-
-#: ../mdkonline:146
-#, c-format
-msgid "automated Upgrades"
-msgstr "автоматтык жаңылоолор"
+"Сиздин логин же пароль туура эмес.\n"
+" Сизге же аларды кайра терүүгө же болбосо Mandrakeonline'да аккаунт түзүүгө "
+"туура келет.\n"
+" Болбосо, артка, Mandrakeonline'га туташуучу биринчи кадамга барыңыз.\n"
+" Машина ысымын көрсөткөнүңүздү байкаңыз\n"
+" (алфавиттик символдор гана кабыл алынат)"
 
-#: ../mdkonline:150
+#: ../mdkonline:153
 #, c-format
-msgid "Country:"
-msgstr "Өлкө:"
+msgid "Create a Mandrakeonline Account"
+msgstr "Mandrakeonline аккаунтун түзүү"
 
-#: ../mdkonline:178 ../mdkonline:183 ../mdkonline:185 ../mdkonline:187
+#: ../mdkonline:158
 #, c-format
-msgid "Error"
-msgstr "Ката"
+msgid "Confirm Password:"
+msgstr "Паролду кайталоо:"
 
-#: ../mdkonline:183 ../mdkonline_tui:156
+#: ../mdkonline:159
 #, c-format
-msgid "Please provide a login"
-msgstr "Логинди көрсөтүңүз"
+msgid "Mail contact:"
+msgstr "Почта байланышы:"
 
-#: ../mdkonline:185 ../mdkonline_tui:156
+#: ../mdkonline:163
 #, c-format
 msgid ""
 "The passwords do not match\n"
@@ -444,160 +439,116 @@ msgstr ""
 "Паролдор дал келишпейт\n"
 " Кайталаңыз\n"
 
-#: ../mdkonline:187 ../mdkonline_tui:156
+#: ../mdkonline:163
+#, c-format
+msgid "Please provide a login"
+msgstr "Логинди көрсөтүңүз"
+
+#: ../mdkonline:163
 #, c-format
 msgid "Not a valid mail address!\n"
 msgstr "Туура эмес почта адреси!\n"
 
-#: ../mdkonline:199 ../mdkonline_tui:82
+#: ../mdkonline:169
 #, c-format
-msgid "Reading configuration\n"
-msgstr "Конфигурация окулууда\n"
+msgid ""
+"Mandrakeonline Account successfully created.\n"
+"Please click \"Next\" to authenticate and upload your configuration\n"
+msgstr ""
+"Mandrakeonline аккаунту ийгиликтүү түзүлдү.\n"
+"Аутентификациялоо жана конфигурацияңызды жөнөтүү үчүн \"Кийинки\" басыңыз\n"
 
-#: ../mdkonline:204 ../mdkonline_tui:86
+#: ../mdkonline:178
 #, c-format
-msgid "Sending configuration..."
-msgstr "Конфигурация жөнөтүлүүдө..."
+msgid "Your upload was successful!"
+msgstr "Сыртка жүктөө ийгиликтүү!"
 
-#: ../mdkonline:213 ../mdkonline:273 ../mdkonline_tui:134 ../mdkonline_tui:173
-#: ../mdkupdate:124 ../mdkupdate:195
+#: ../mdkonline:178
 #, c-format
-msgid "Connection problem"
-msgstr "Туташуу проблемасы"
+msgid ""
+"From now you will receive on security and updates \n"
+"announcements thanks to Mandrakeonline."
+msgstr ""
+"Мындан кийин сиз коопсуздуктар жана жыңылоолор\n"
+"жөнүндө, Mandrakeonline тарабынан кабардар болосуздар."
+
+#: ../mdkonline:178
+#, c-format
+msgid ""
+"Mandrakeonline offers you the ability to automate the updates.\n"
+"A program will run regulary in your system waiting for new updates\n"
+msgstr ""
+"Mandrakeonline сизге автоматташтырылган жаңылоо мүмкүнчүлүгүн сунуштайт.\n"
+"Программа сиздин системада жаңы жаңылоолор үчүн регулярдуу иштейт\n"
 
-#: ../mdkonline:213 ../mdkonline_tui:173
+#: ../mdkonline:180
 #, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr "Файлдарды жүктөө учурундагы проблема, кайра аракет кылыңыз"
 
-#: ../mdkonline:251
+#: ../mdkonline:186
 #, c-format
-msgid "Quitting Wizard\n"
-msgstr "Устадан чыгуу\n"
+msgid "Country"
+msgstr "Өлкө"
 
-#: ../mdkonline:273
+#: ../mdkonline:198
 #, c-format
-msgid "Mandrakeonline could not be contacted, please try again at a later time"
-msgstr "Mandrakeonline туташылбады, кийинчерээк кайталаңыз"
+msgid "Congratulations"
+msgstr "Конфигурациялар"
 
-#: ../mdkonline:285
+#: ../mdkonline:198
 #, c-format
-msgid "Wrong password"
-msgstr "Туура эмес пароль"
+msgid "Your Mandrakeonline account has been successfully configured\n"
+msgstr "Сиздин Mandrakeonline аккаунтуңуз ийгиликтүү конфигурацияланды\n"
+
+#: ../mdkonline:214
+#, fuzzy, c-format
+msgid "Configuration uploaded successfully"
+msgstr "Сыртка жүктөө ийгиликтүү!"
 
-#: ../mdkonline:285 ../mdkonline_tui:134
+#: ../mdkonline:215
+#, fuzzy, c-format
+msgid "Problem uploading configuration"
+msgstr "Конфигурация окулууда\n"
+
+#: ../mdkonline:216
 #, c-format
 msgid ""
-"Your login or password was wrong.\n"
-" Either you'll have to type it again, or you'll need to create an account on "
-"Mandrakeonline.\n"
-" In the latter case, go back to the first step to connect to "
-"Mandrakeonline.\n"
-" Be aware that you must also provide a Machine name \n"
-" (only alphabetical characters are admitted)"
+"Cannot connect to mandrakeonline website: wrong login/password or router/"
+"firewall bad settings"
 msgstr ""
-"Сиздин логин же пароль туура эмес.\n"
-" Сизге же аларды кайра терүүгө же болбосо Mandrakeonline'да аккаунт түзүүгө "
-"туура келет.\n"
-" Болбосо, артка, Mandrakeonline'га туташуучу биринчи кадамга барыңыз.\n"
-" Машина ысымын көрсөткөнүңүздү байкаңыз\n"
-" (алфавиттик символдор гана кабыл алынат)"
 
-#: ../mdkonline.pm:58
+#: ../mdkonline.pm:66
 #, c-format
 msgid "Login and password should be less than 12 characters\n"
 msgstr "Логин жана пароль 12 символдон кем болушу керек\n"
 
-#: ../mdkonline.pm:59
+#: ../mdkonline.pm:67
 #, c-format
 msgid "Special characters are not allowed\n"
 msgstr "Атайын символдор мүмкүн эмес\n"
 
-#: ../mdkonline.pm:60
+#: ../mdkonline.pm:68
 #, c-format
 msgid "Please fill in all fields\n"
 msgstr "Бардык талааларды толтуруңуз\n"
 
-#: ../mdkonline.pm:61
+#: ../mdkonline.pm:69
 #, c-format
 msgid "Email not valid\n"
 msgstr "Email туура эмес\n"
 
-#: ../mdkonline.pm:62
+#: ../mdkonline.pm:70
 #, c-format
 msgid "Account already exist\n"
 msgstr "Мындай аккаунт бар\n"
 
-#: ../mdkonline.pm:68
+#: ../mdkonline.pm:76
 #, c-format
 msgid "Problem connecting to server \n"
 msgstr "Сервер менен туташуу проблемасы \n"
 
-#: ../mdkonline_tui:49 ../mdkonline_tui:99
-#, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
-
-#: ../mdkonline_tui:52
-#, c-format
-msgid "I already have an account"
-msgstr "Менде аккаунт бар"
-
-#: ../mdkonline_tui:53
-#, c-format
-msgid "I want to subscribe"
-msgstr "Мен жазылууну каалайм"
-
-#: ../mdkonline_tui:82 ../mdkonline_tui:86 ../mdkonline_tui:124
-#, c-format
-msgid "Please wait"
-msgstr "Күтө туруңуз"
-
-#: ../mdkonline_tui:107
-#, c-format
-msgid "Account creation or authentication"
-msgstr "Аккаунт түзүү же аутентификациялоо"
-
-#: ../mdkonline_tui:124
-#, c-format
-msgid "Connecting to Mandrakeonline website..."
-msgstr "Mandrakeonline веб-сайтына туташуу..."
-
-#: ../mdkonline_tui:134
-#, c-format
-msgid "or"
-msgstr "же"
-
-#: ../mdkonline_tui:134
-#, c-format
-msgid "wrong password:"
-msgstr "туура эмес пароль:"
-
-#: ../mdkonline_tui:162
-#, c-format
-msgid ""
-"Mandrakeonline Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-"Mandrakeonline аккаунту ийгиликтүү түзүлдү.\n"
-"Аутентификациялоо жана конфигурацияңызды жөнөтүү үчүн \"Кийинки\" басыңыз\n"
-
-#: ../mdkonline_tui:179
-#, c-format
-msgid "Country"
-msgstr "Өлкө"
-
-#: ../mdkonline_tui:191
-#, c-format
-msgid "Congratulations"
-msgstr "Конфигурациялар"
-
-#: ../mdkonline_tui:191
-#, c-format
-msgid "Your Mandrakeonline account has been successfully configured\n"
-msgstr "Сиздин Mandrakeonline аккаунтуңуз ийгиликтүү конфигурацияланды\n"
-
-#: ../mdkupdate:50
+#: ../mdkupdate:52
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
@@ -614,42 +565,37 @@ msgstr ""
 "\n"
 "колдонулушу:\n"
 
-#: ../mdkupdate:55
+#: ../mdkupdate:57
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - бул маалыматты чыгаруу.\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:58
 #, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto         - Mandrakeupdate автоматтык түрдө иштетүү.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:59
 #, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - Mandrakeupdate иштетүү.\n"
 
-#: ../mdkupdate:58
-#, c-format
-msgid "  --update       - Update keys\n"
-msgstr "  --update       - ачкычтарды жаңылоо\n"
-
-#: ../mdkupdate:66
+#: ../mdkupdate:67
 #, c-format
 msgid "No %s file found. Run mdkonline wizard first"
 msgstr "%s файлы табылбады. Алгач mdkonline устасын иштетиңиз"
 
-#: ../mdkupdate:124
+#: ../mdkupdate:126
 #, c-format
 msgid "Mandrakeupdate could not contact the site, we will try again."
 msgstr "Mandrakeonline сайты туташылбады, биз кайрадан аракет кылабыз."
 
-#: ../mdkupdate:173
+#: ../mdkupdate:176
 #, c-format
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr "mdkupdate булагынан пакеттерди жаңылоо мүмкүн эмес.\n"
 
-#: ../mdkupdate:195
+#: ../mdkupdate:198
 #, c-format
 msgid ""
 "Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
@@ -657,3 +603,49 @@ msgid ""
 msgstr ""
 "Mandrakeupdate diff файлдарын жүктөй албады. Бул дарекке кат жөнөтүңүз: "
 "support [at] mandrakeonline [dot] net"
+
+#~ msgid "Next"
+#~ msgstr "Кийинки"
+
+#~ msgid "Cancel"
+#~ msgstr "Калтыруу"
+
+#~ msgid "Previous"
+#~ msgstr "Мурунку"
+
+#~ msgid "I don't have a Mandrakeonline account and I want to subscribe"
+#~ msgstr "Менде Mandrakeonline аккаунту жок жана ага жазылууну каалайм"
+
+#~ msgid "Mandrakelinux Privacy Policy"
+#~ msgstr "Mandrakelinux коопсуздук саясаты"
+
+#~ msgid "Authentification"
+#~ msgstr "Аутентификация"
+
+#~ msgid "Send Configuration"
+#~ msgstr "Конфигурацияны жөнөтүү"
+
+#~ msgid "Finish"
+#~ msgstr "Аяктоо"
+
+#~ msgid "automated Upgrades"
+#~ msgstr "автоматтык жаңылоолор"
+
+#~ msgid "Country:"
+#~ msgstr "Өлкө:"
+
+#~ msgid "Error"
+#~ msgstr "Ката"
+
+#~ msgid "Quitting Wizard\n"
+#~ msgstr "Устадан чыгуу\n"
+
+#~ msgid ""
+#~ "Mandrakeonline could not be contacted, please try again at a later time"
+#~ msgstr "Mandrakeonline туташылбады, кийинчерээк кайталаңыз"
+
+#~ msgid "Wrong password"
+#~ msgstr "Туура эмес пароль"
+
+#~ msgid "  --update       - Update keys\n"
+#~ msgstr "  --update       - ачкычтарды жаңылоо\n"
diff --git a/po/lt.po b/po/lt.po
index 1114ead6..2fb560a1 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline 0.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-01 22:41+0200\n"
+"POT-Creation-Date: 2004-11-03 12:10+0100\n"
 "PO-Revision-Date: 2003-02-20 13:28+0200\n"
 "Last-Translator: Darius Liepuonis <dariusle@takas.lt>\n"
 "Language-Team: Lithuanian <>\n"
@@ -14,12 +14,12 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../mdkapplet:61
+#: ../mdkapplet:63
 #, c-format
 msgid "Your system is up-to-date"
 msgstr ""
 
-#: ../mdkapplet:67
+#: ../mdkapplet:69
 #, fuzzy, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -27,259 +27,279 @@ msgid ""
 msgstr ""
 "Dėl visų kilusių problemų galite rašyti adresu support@mandrakeonline.net\n"
 
-#: ../mdkapplet:73
+#: ../mdkapplet:75
 #, c-format
 msgid "System is busy. Please wait ..."
 msgstr ""
 
-#: ../mdkapplet:79
+#: ../mdkapplet:81
 #, fuzzy, c-format
 msgid "New updates are available for your system"
 msgstr "Tavo sistemoje nerasta jokia tinklo plokštė!"
 
-#: ../mdkapplet:85
+#: ../mdkapplet:87
 #, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr ""
 
-#: ../mdkapplet:91
+#: ../mdkapplet:93
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr ""
 
-#: ../mdkapplet:97
+#: ../mdkapplet:99
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 
-#: ../mdkapplet:103
+#: ../mdkapplet:105
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:108 ../mdkapplet:158
+#: ../mdkapplet:110 ../mdkapplet:164
 #, fuzzy, c-format
 msgid "Install updates"
 msgstr "Įdiegti sistemą"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:111
 #, fuzzy, c-format
 msgid "Configure the service"
 msgstr "Nustatyti servisus"
 
-#: ../mdkapplet:110
+#: ../mdkapplet:112
 #, fuzzy, c-format
 msgid "Check Updates"
 msgstr "Atnaujinti"
 
-#: ../mdkapplet:111
+#: ../mdkapplet:113 ../mdkapplet:167 ../mdkapplet:225
+#, fuzzy, c-format
+msgid "Please Wait"
+msgstr "Prašom palaukti"
+
+#: ../mdkapplet:113 ../mdkapplet:166 ../mdkapplet:167 ../mdkapplet:225
+#, fuzzy, c-format
+msgid "Check updates"
+msgstr "Saugumo atnaujinimai"
+
+#: ../mdkapplet:115
 #, c-format
 msgid "Online WebSite"
 msgstr ""
 
-#: ../mdkapplet:112
+#: ../mdkapplet:116
 #, fuzzy, c-format
 msgid "Configure Network"
 msgstr "Nustatyti tinklą"
 
-#: ../mdkapplet:113
+#: ../mdkapplet:117
 #, fuzzy, c-format
 msgid "Configure Now!"
 msgstr "Skaitau nustatymus\n"
 
-#: ../mdkapplet:146
+#: ../mdkapplet:152 ../mdkapplet:229
 #, fuzzy, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Mandrakelinux valdymo centras %s\n"
 
-#: ../mdkapplet:156
+#: ../mdkapplet:162
 #, c-format
 msgid "Actions"
 msgstr "Veiksmai"
 
-#: ../mdkapplet:159
+#: ../mdkapplet:165
 #, c-format
 msgid "Configure"
 msgstr "Nustatyti"
 
-#: ../mdkapplet:160
-#, fuzzy, c-format
-msgid "Check updates"
-msgstr "Saugumo atnaujinimai"
-
-#: ../mdkapplet:161
+#: ../mdkapplet:169
 #, fuzzy, c-format
 msgid "See logs"
 msgstr "Siekti +5s"
 
-#: ../mdkapplet:164
+#: ../mdkapplet:172
 #, c-format
 msgid "Status"
 msgstr "Statusas"
 
-#: ../mdkapplet:168 ../mdkapplet:363
+#: ../mdkapplet:176 ../mdkapplet:375
 #, c-format
 msgid "Close"
 msgstr "Uždaryti"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, fuzzy, c-format
 msgid "Network Connection: "
 msgstr "Tinklo konfigūravimas"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Up"
 msgstr ""
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, fuzzy, c-format
 msgid "Down"
 msgstr "Atlikta"
 
-#: ../mdkapplet:204
+#: ../mdkapplet:212
 #, c-format
 msgid "Last check: "
 msgstr ""
 
-#: ../mdkapplet:205
+#: ../mdkapplet:213
 #, fuzzy, c-format
 msgid "Updates: "
 msgstr "Atnaujinti"
 
-#: ../mdkapplet:209
+#: ../mdkapplet:217
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr ""
 
-#: ../mdkapplet:213
+#: ../mdkapplet:221
 #, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr ""
 
-#: ../mdkapplet:217
+#: ../mdkapplet:224
 #, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 
-#: ../mdkapplet:225
+#: ../mdkapplet:235
 #, fuzzy, c-format
 msgid "Computing new updates...\n"
 msgstr "Sujungimo klaida"
 
-#: ../mdkapplet:227
+#: ../mdkapplet:237
 #, fuzzy, c-format
 msgid "Connecting to"
 msgstr "Sujungimo klaida"
 
-#: ../mdkapplet:250
+#: ../mdkapplet:244
+#, fuzzy, c-format
+msgid "Response from Mandrakeonline server\n"
+msgstr "Sveiki atvykę į Mandrakeonline"
+
+#: ../mdkapplet:262
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr ""
 
-#: ../mdkapplet:254
+#: ../mdkapplet:267
 #, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
-#: ../mdkapplet:255
+#: ../mdkapplet:268
 #, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
-#: ../mdkapplet:256
+#: ../mdkapplet:269
 #, fuzzy, c-format
 msgid "Unknown state"
 msgstr "Nežinomas vartotojas."
 
-#: ../mdkapplet:257
+#: ../mdkapplet:270
 #, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr ""
 
-#: ../mdkapplet:258
+#: ../mdkapplet:271
 #, c-format
 msgid "Wrong Password.\n"
 msgstr "Neteisingas slaptažodis.\n"
 
-#: ../mdkapplet:259
+#: ../mdkapplet:272
 #, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr ""
 
-#: ../mdkapplet:260
+#: ../mdkapplet:273
 #, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
 msgstr ""
 
-#: ../mdkapplet:264
+#: ../mdkapplet:277
 #, fuzzy, c-format
 msgid "System is up-to-date\n"
 msgstr "Sistemos režimas"
 
-#: ../mdkapplet:303
+#: ../mdkapplet:317
 #, c-format
 msgid "No check"
 msgstr ""
 
-#: ../mdkapplet:316
+#: ../mdkapplet:330
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
-#: ../mdkapplet:319
+#: ../mdkapplet:333
 #, c-format
 msgid "Checking config file: Not present\n"
 msgstr ""
 
-#: ../mdkapplet:353
+#: ../mdkapplet:365
 #, c-format
 msgid "Logs"
 msgstr "Logai"
 
-#: ../mdkapplet:369
+#: ../mdkapplet:381
 #, fuzzy, c-format
 msgid "Clear"
 msgstr "Kalendorius"
 
-#: ../mdkapplet:396
+#: ../mdkapplet:408
 #, c-format
 msgid "About..."
 msgstr "Apie..."
 
-#: ../mdkapplet:397
+#: ../mdkapplet:409
 #, c-format
 msgid "Always launch on startup"
 msgstr ""
 
-#: ../mdkapplet:399
+#: ../mdkapplet:411
 #, c-format
 msgid "Quit"
 msgstr "Išeiti"
 
-#: ../mdkonline:89
+#: ../mdkonline:52 ../mdkonline:106
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "Sveiki atvykę į Mandrakeonline"
+
+#: ../mdkonline:55
 #, c-format
-msgid "Next"
-msgstr "Sekantis"
+msgid "I already have an account"
+msgstr ""
 
-#: ../mdkonline:89
+#: ../mdkonline:56
 #, c-format
-msgid "Cancel"
-msgstr "Atšaukti"
+msgid "I want to subscribe"
+msgstr ""
 
-#: ../mdkonline:89
+#: ../mdkonline:89 ../mdkonline:93 ../mdkonline:131
 #, c-format
-msgid "Previous"
-msgstr "Ankstesnis"
+msgid "Please wait"
+msgstr "Prašom palaukti"
 
-#: ../mdkonline:103
+#: ../mdkonline:89
 #, c-format
-msgid "Welcome to Mandrakeonline"
-msgstr "Sveiki atvykę į Mandrakeonline"
+msgid "Reading configuration\n"
+msgstr "Skaitau nustatymus\n"
+
+#: ../mdkonline:93
+#, fuzzy, c-format
+msgid "Sending configuration..."
+msgstr "Skaitau nustatymus\n"
 
-#: ../mdkonline:104 ../mdkonline_tui:98
+#: ../mdkonline:109
 #, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
@@ -287,62 +307,37 @@ msgid ""
 "order to keep you informed about security updates and useful upgrades.\n"
 msgstr ""
 
-#: ../mdkonline:105 ../mdkonline_tui:142
-#, fuzzy, c-format
-msgid "Create a Mandrakeonline Account"
-msgstr "Sveiki atvykę į Mandrakeonline"
+#: ../mdkonline:114
+#, c-format
+msgid "Account creation or authentication"
+msgstr ""
 
-#: ../mdkonline:107
-#, fuzzy, c-format
-msgid "I don't have a Mandrakeonline account and I want to subscribe"
-msgstr "Aš neturiu Mandrakeonline sąskaitos bet noriu "
+#: ../mdkonline:119
+#, c-format
+msgid "Enter your Mandrakeonline login, password and machine name:"
+msgstr "Įveskite savo Mandrakeonline sąskaitos vardą ir slaptažodį:"
 
-#: ../mdkonline:111 ../mdkonline:131 ../mdkonline_tui:114 ../mdkonline_tui:145
+#: ../mdkonline:125 ../mdkonline:156
 #, c-format
 msgid "Login:"
 msgstr "Vardas:"
 
-#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:115 ../mdkonline_tui:146
+#: ../mdkonline:126 ../mdkonline:157
 #, c-format
 msgid "Password:"
 msgstr "Slaptažodis"
 
-#: ../mdkonline:113 ../mdkonline_tui:147
-#, c-format
-msgid "Confirm Password:"
-msgstr "Patvirtinkite slaptažodį:"
-
-#: ../mdkonline:114 ../mdkonline_tui:148
-#, fuzzy, c-format
-msgid "Mail contact:"
-msgstr "E-pašto kontaktas:"
-
-#: ../mdkonline:121
-#, c-format
-msgid "Mandrakelinux Privacy Policy"
-msgstr ""
-
 #: ../mdkonline:127
 #, c-format
-msgid "Authentification"
-msgstr "Autentifikacija"
-
-#: ../mdkonline:128 ../mdkonline_tui:108
-#, c-format
-msgid "Enter your Mandrakeonline login, password and machine name:"
-msgstr "Įveskite savo Mandrakeonline sąskaitos vardą ir slaptažodį:"
-
-#: ../mdkonline:133 ../mdkonline_tui:116
-#, c-format
 msgid "Machine name:"
 msgstr "Mašinos vardas:"
 
-#: ../mdkonline:138
+#: ../mdkonline:131
 #, fuzzy, c-format
-msgid "Send Configuration"
-msgstr "Skaitau nustatymus\n"
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Sveiki atvykę į Mandrakeonline"
 
-#: ../mdkonline:139 ../mdkonline_tui:128
+#: ../mdkonline:139
 #, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
@@ -361,55 +356,49 @@ msgid ""
 "www.mandrakeexpert.com."
 msgstr ""
 
-#: ../mdkonline:144 ../mdkonline:211 ../mdkonline:234
-#, c-format
-msgid "Finish"
-msgstr "Baigti"
-
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141 ../mdkonline:180 ../mdkupdate:126 ../mdkupdate:198
 #, c-format
-msgid "Your upload was successful!"
-msgstr "Jūsų siuntimas buvo sėkmingas!"
+msgid "Connection problem"
+msgstr "Sujungimo klaida"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandrakeonline."
+msgid "or"
 msgstr ""
-"Nuo dabar jūs gausite pranešimus apie saugumo pataisas \n"
-"ir atnaujinimus."
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "Neteisingas slaptažodis"
+
+#: ../mdkonline:141
 #, c-format
 msgid ""
-"Mandrakeonline offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+"Your login or password was wrong.\n"
+" Either you'll have to type it again, or you'll need to create an account on "
+"Mandrakeonline.\n"
+" In the latter case, go back to the first step to connect to "
+"Mandrakeonline.\n"
+" Be aware that you must also provide a Machine name \n"
+" (only alphabetical characters are admitted)"
 msgstr ""
-"MandrakeOnlina jums siųlo galimybę automatizuoti jūsų atnaujinimus.\n"
-"Programa reguleriai pasileis jūsų sistemoje laukdama atnaujinimų\n"
-
-#: ../mdkonline:146
-#, c-format
-msgid "automated Upgrades"
-msgstr "automatizuoti Atnaujinimai"
 
-#: ../mdkonline:150
+#: ../mdkonline:153
 #, fuzzy, c-format
-msgid "Country:"
-msgstr "Kantri"
+msgid "Create a Mandrakeonline Account"
+msgstr "Sveiki atvykę į Mandrakeonline"
 
-#: ../mdkonline:178 ../mdkonline:183 ../mdkonline:185 ../mdkonline:187
+#: ../mdkonline:158
 #, c-format
-msgid "Error"
-msgstr "Klaida"
+msgid "Confirm Password:"
+msgstr "Patvirtinkite slaptažodį:"
 
-#: ../mdkonline:183 ../mdkonline_tui:152
+#: ../mdkonline:159
 #, fuzzy, c-format
-msgid "Please provide a login"
-msgstr "Prašom bandyti vėl"
+msgid "Mail contact:"
+msgstr "E-pašto kontaktas:"
 
-#: ../mdkonline:185 ../mdkonline_tui:152
+#: ../mdkonline:163
 #, c-format
 msgid ""
 "The passwords do not match\n"
@@ -418,154 +407,114 @@ msgstr ""
 "Slaptažodžiai nesutampa\n"
 " Pabandyk dar kartą\n"
 
-#: ../mdkonline:187 ../mdkonline_tui:152
-#, c-format
-msgid "Not a valid mail address!\n"
-msgstr "Neteisingas e-pašto adresas!\n"
-
-#: ../mdkonline:199 ../mdkonline_tui:78
-#, c-format
-msgid "Reading configuration\n"
-msgstr "Skaitau nustatymus\n"
-
-#: ../mdkonline:204 ../mdkonline_tui:82
+#: ../mdkonline:163
 #, fuzzy, c-format
-msgid "Sending configuration..."
-msgstr "Skaitau nustatymus\n"
-
-#: ../mdkonline:213 ../mdkonline:273 ../mdkonline_tui:130 ../mdkonline_tui:169
-#: ../mdkupdate:124 ../mdkupdate:195
-#, c-format
-msgid "Connection problem"
-msgstr "Sujungimo klaida"
+msgid "Please provide a login"
+msgstr "Prašom bandyti vėl"
 
-#: ../mdkonline:213 ../mdkonline_tui:169
+#: ../mdkonline:163
 #, c-format
-msgid "Problem occurs when uploading files, please try again"
-msgstr ""
+msgid "Not a valid mail address!\n"
+msgstr "Neteisingas e-pašto adresas!\n"
 
-#: ../mdkonline:251
+#: ../mdkonline:169
 #, c-format
-msgid "Quitting Wizard\n"
-msgstr "Baigti vedlį\n"
-
-#: ../mdkonline:273
-#, fuzzy, c-format
-msgid "Mandrakeonline could not be contacted, please try again at a later time"
+msgid ""
+"Mandrakeonline Account successfully created.\n"
+"Please click \"Next\" to authenticate and upload your configuration\n"
 msgstr ""
-"Mandrakeupdate negali prisijungti prie tarnybinės stoties, pabandysime "
-"vėliau."
 
-#: ../mdkonline:285
+#: ../mdkonline:178
 #, c-format
-msgid "Wrong password"
-msgstr "Neteisingas slaptažodis"
+msgid "Your upload was successful!"
+msgstr "Jūsų siuntimas buvo sėkmingas!"
 
-#: ../mdkonline:285 ../mdkonline_tui:130
+#: ../mdkonline:178
 #, c-format
 msgid ""
-"Your login or password was wrong.\n"
-" Either you'll have to type it again, or you'll need to create an account on "
-"Mandrakeonline.\n"
-" In the latter case, go back to the first step to connect to "
-"Mandrakeonline.\n"
-" Be aware that you must also provide a Machine name \n"
-" (only alphabetical characters are admitted)"
+"From now you will receive on security and updates \n"
+"announcements thanks to Mandrakeonline."
 msgstr ""
+"Nuo dabar jūs gausite pranešimus apie saugumo pataisas \n"
+"ir atnaujinimus."
 
-#: ../mdkonline.pm:58
+#: ../mdkonline:178
 #, c-format
-msgid "Login and password should be less than 12 characters\n"
+msgid ""
+"Mandrakeonline offers you the ability to automate the updates.\n"
+"A program will run regulary in your system waiting for new updates\n"
 msgstr ""
+"MandrakeOnlina jums siųlo galimybę automatizuoti jūsų atnaujinimus.\n"
+"Programa reguleriai pasileis jūsų sistemoje laukdama atnaujinimų\n"
 
-#: ../mdkonline.pm:59
+#: ../mdkonline:180
 #, c-format
-msgid "Special characters are not allowed\n"
+msgid "Problem occurs when uploading files, please try again"
 msgstr ""
 
-#: ../mdkonline.pm:60
-#, c-format
-msgid "Please fill in all fields\n"
-msgstr ""
+#: ../mdkonline:186
+#, fuzzy, c-format
+msgid "Country"
+msgstr "Kantri"
 
-#: ../mdkonline.pm:61
-#, c-format
-msgid "Email not valid\n"
-msgstr ""
+#: ../mdkonline:198
+#, fuzzy, c-format
+msgid "Congratulations"
+msgstr "Skaitau nustatymus\n"
 
-#: ../mdkonline.pm:62
+#: ../mdkonline:198
 #, c-format
-msgid "Account already exist\n"
+msgid "Your Mandrakeonline account has been successfully configured\n"
 msgstr ""
 
-#: ../mdkonline.pm:68
-#, c-format
-msgid "Problem connecting to server \n"
-msgstr ""
+#: ../mdkonline:214
+#, fuzzy, c-format
+msgid "Configuration uploaded successfully"
+msgstr "Jūsų siuntimas buvo sėkmingas!"
 
-#: ../mdkonline_tui:45 ../mdkonline_tui:95
+#: ../mdkonline:215
 #, fuzzy, c-format
-msgid "Mandrakeonline"
-msgstr "Sveiki atvykę į Mandrakeonline"
+msgid "Problem uploading configuration"
+msgstr "Skaitau nustatymus\n"
 
-#: ../mdkonline_tui:48
+#: ../mdkonline:216
 #, c-format
-msgid "I already have an account"
+msgid ""
+"Cannot connect to mandrakeonline website: wrong login/password or router/"
+"firewall bad settings"
 msgstr ""
 
-#: ../mdkonline_tui:49
+#: ../mdkonline.pm:66
 #, c-format
-msgid "I want to subscribe"
+msgid "Login and password should be less than 12 characters\n"
 msgstr ""
 
-#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:120
+#: ../mdkonline.pm:67
 #, c-format
-msgid "Please wait"
-msgstr "Prašom palaukti"
+msgid "Special characters are not allowed\n"
+msgstr ""
 
-#: ../mdkonline_tui:103
+#: ../mdkonline.pm:68
 #, c-format
-msgid "Account creation or authentication"
+msgid "Please fill in all fields\n"
 msgstr ""
 
-#: ../mdkonline_tui:120
-#, fuzzy, c-format
-msgid "Connecting to Mandrakeonline website..."
-msgstr "Sveiki atvykę į Mandrakeonline"
-
-#: ../mdkonline_tui:130
+#: ../mdkonline.pm:69
 #, c-format
-msgid "or"
+msgid "Email not valid\n"
 msgstr ""
 
-#: ../mdkonline_tui:130
-#, fuzzy, c-format
-msgid "wrong password:"
-msgstr "Neteisingas slaptažodis"
-
-#: ../mdkonline_tui:158
+#: ../mdkonline.pm:70
 #, c-format
-msgid ""
-"Mandrakeonline Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
+msgid "Account already exist\n"
 msgstr ""
 
-#: ../mdkonline_tui:175
-#, fuzzy, c-format
-msgid "Country"
-msgstr "Kantri"
-
-#: ../mdkonline_tui:187
-#, fuzzy, c-format
-msgid "Congratulations"
-msgstr "Skaitau nustatymus\n"
-
-#: ../mdkonline_tui:187
+#: ../mdkonline.pm:76
 #, c-format
-msgid "Your Mandrakeonline account has been successfully configured\n"
+msgid "Problem connecting to server \n"
 msgstr ""
 
-#: ../mdkupdate:50
+#: ../mdkupdate:52
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
@@ -582,50 +531,98 @@ msgstr ""
 " \n"
 "naudojimas:\n"
 
-#: ../mdkupdate:55
+#: ../mdkupdate:57
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - parodyti šį pagalbos langa.\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:58
 #, fuzzy, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --applet       - atnaujinti visa informaciją.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:59
 #, fuzzy, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - atnaujinti visa informaciją.\n"
 
-#: ../mdkupdate:58
-#, fuzzy, c-format
-msgid "  --update       - Update keys\n"
-msgstr "  --applet       - atnaujinti visa informaciją.\n"
-
-#: ../mdkupdate:66
+#: ../mdkupdate:67
 #, c-format
 msgid "No %s file found. Run mdkonline wizard first"
 msgstr ""
 
-#: ../mdkupdate:124
+#: ../mdkupdate:126
 #, c-format
 msgid "Mandrakeupdate could not contact the site, we will try again."
 msgstr ""
 "Mandrakeupdate negali prisijungti prie tarnybinės stoties, pabandysime "
 "vėliau."
 
-#: ../mdkupdate:173
+#: ../mdkupdate:176
 #, c-format
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr "Negaliu atnaujinti paketų sarašo iš mdkupdate šaltinio. \n"
 
-#: ../mdkupdate:195
+#: ../mdkupdate:198
 #, c-format
 msgid ""
 "Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
 "mandrakeonline [dot] net"
 msgstr ""
 
+#~ msgid "Next"
+#~ msgstr "Sekantis"
+
+#~ msgid "Cancel"
+#~ msgstr "Atšaukti"
+
+#~ msgid "Previous"
+#~ msgstr "Ankstesnis"
+
+#~ msgid "Welcome to Mandrakeonline"
+#~ msgstr "Sveiki atvykę į Mandrakeonline"
+
+#, fuzzy
+#~ msgid "I don't have a Mandrakeonline account and I want to subscribe"
+#~ msgstr "Aš neturiu Mandrakeonline sąskaitos bet noriu "
+
+#~ msgid "Authentification"
+#~ msgstr "Autentifikacija"
+
+#, fuzzy
+#~ msgid "Send Configuration"
+#~ msgstr "Skaitau nustatymus\n"
+
+#~ msgid "Finish"
+#~ msgstr "Baigti"
+
+#~ msgid "automated Upgrades"
+#~ msgstr "automatizuoti Atnaujinimai"
+
+#, fuzzy
+#~ msgid "Country:"
+#~ msgstr "Kantri"
+
+#~ msgid "Error"
+#~ msgstr "Klaida"
+
+#~ msgid "Quitting Wizard\n"
+#~ msgstr "Baigti vedlį\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Mandrakeonline could not be contacted, please try again at a later time"
+#~ msgstr ""
+#~ "Mandrakeupdate negali prisijungti prie tarnybinės stoties, pabandysime "
+#~ "vėliau."
+
+#~ msgid "Wrong password"
+#~ msgstr "Neteisingas slaptažodis"
+
+#, fuzzy
+#~ msgid "  --update       - Update keys\n"
+#~ msgstr "  --applet       - atnaujinti visa informaciją.\n"
+
 #, fuzzy
 #~ msgid "Skip Wizard"
 #~ msgstr "Praleisti vedlį"
@@ -638,10 +635,6 @@ msgstr ""
 #~ msgstr "Sujungimo klaida"
 
 #, fuzzy
-#~ msgid "Response from Mandrakeonline server\n"
-#~ msgstr "Sveiki atvykę į Mandrakeonline"
-
-#, fuzzy
 #~ msgid "Launching Mandrakeupdate\n"
 #~ msgstr "  --applet       - atnaujinti visa informaciją.\n"
 
diff --git a/po/ltg.po b/po/ltg.po
index 168fee1c..56138b8f 100644
--- a/po/ltg.po
+++ b/po/ltg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline 0.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-01 22:41+0200\n"
+"POT-Creation-Date: 2004-11-03 12:10+0100\n"
 "PO-Revision-Date: 2004-02-17 17:39+0200\n"
 "Last-Translator: Unknown\n"
 "Language-Team: ll10nt <ll10nt@listes.murds.lv>\n"
@@ -15,24 +15,24 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../mdkapplet:61
+#: ../mdkapplet:63
 #, c-format
 msgid "Your system is up-to-date"
 msgstr ""
 
-#: ../mdkapplet:67
+#: ../mdkapplet:69
 #, fuzzy, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrakeonline.net"
 msgstr "Problemu gadīnī syutit e-posta viesti iz support@mandrakeonline.net\n"
 
-#: ../mdkapplet:73
+#: ../mdkapplet:75
 #, c-format
 msgid "System is busy. Please wait ..."
 msgstr ""
 
-#: ../mdkapplet:79
+#: ../mdkapplet:81
 #, fuzzy, c-format
 msgid "New updates are available for your system"
 msgstr ""
@@ -41,249 +41,269 @@ msgstr ""
 "%s\n"
 "ir pīejami iz jiusu sistemys.\n"
 
-#: ../mdkapplet:85
+#: ../mdkapplet:87
 #, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr ""
 
-#: ../mdkapplet:91
+#: ../mdkapplet:93
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr ""
 
-#: ../mdkapplet:97
+#: ../mdkapplet:99
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 
-#: ../mdkapplet:103
+#: ../mdkapplet:105
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:108 ../mdkapplet:158
+#: ../mdkapplet:110 ../mdkapplet:164
 #, c-format
 msgid "Install updates"
 msgstr "Uzstuodeit jaunynuojumus"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:111
 #, fuzzy, c-format
 msgid "Configure the service"
 msgstr "Konfigurēt"
 
-#: ../mdkapplet:110
+#: ../mdkapplet:112
 #, fuzzy, c-format
 msgid "Check Updates"
 msgstr "Modernizeijumi"
 
-#: ../mdkapplet:111
+#: ../mdkapplet:113 ../mdkapplet:167 ../mdkapplet:225
+#, fuzzy, c-format
+msgid "Please Wait"
+msgstr "Lyudzu pagaidit"
+
+#: ../mdkapplet:113 ../mdkapplet:166 ../mdkapplet:167 ../mdkapplet:225
+#, fuzzy, c-format
+msgid "Check updates"
+msgstr "Atvārtū portu puorbaude"
+
+#: ../mdkapplet:115
 #, c-format
 msgid "Online WebSite"
 msgstr ""
 
-#: ../mdkapplet:112
+#: ../mdkapplet:116
 #, fuzzy, c-format
 msgid "Configure Network"
 msgstr "Teikla konfigureišona"
 
-#: ../mdkapplet:113
+#: ../mdkapplet:117
 #, fuzzy, c-format
 msgid "Configure Now!"
 msgstr "Nūlosu konfiguraceju\n"
 
-#: ../mdkapplet:146
+#: ../mdkapplet:152 ../mdkapplet:229
 #, fuzzy, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Mandrakelinux privātuma politika"
 
-#: ../mdkapplet:156
+#: ../mdkapplet:162
 #, fuzzy, c-format
 msgid "Actions"
 msgstr "Darbeiba"
 
-#: ../mdkapplet:159
+#: ../mdkapplet:165
 #, c-format
 msgid "Configure"
 msgstr "Konfigurēt"
 
-#: ../mdkapplet:160
-#, fuzzy, c-format
-msgid "Check updates"
-msgstr "Atvārtū portu puorbaude"
-
-#: ../mdkapplet:161
+#: ../mdkapplet:169
 #, fuzzy, c-format
 msgid "See logs"
 msgstr "Meklēt +5s"
 
-#: ../mdkapplet:164
+#: ../mdkapplet:172
 #, c-format
 msgid "Status"
 msgstr "Stuovūklis"
 
-#: ../mdkapplet:168 ../mdkapplet:363
+#: ../mdkapplet:176 ../mdkapplet:375
 #, c-format
 msgid "Close"
 msgstr "Aizvērt"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, fuzzy, c-format
 msgid "Network Connection: "
 msgstr "Jauns pīslāgums"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Up"
 msgstr "Iz augšu"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Down"
 msgstr "Iz leju"
 
-#: ../mdkapplet:204
+#: ../mdkapplet:212
 #, c-format
 msgid "Last check: "
 msgstr ""
 
-#: ../mdkapplet:205
+#: ../mdkapplet:213
 #, fuzzy, c-format
 msgid "Updates: "
 msgstr "Modernizeijumi"
 
-#: ../mdkapplet:209
+#: ../mdkapplet:217
 #, fuzzy, c-format
 msgid "Launching drakconnect\n"
 msgstr "Palaist userdrake"
 
-#: ../mdkapplet:213
+#: ../mdkapplet:221
 #, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr ""
 
-#: ../mdkapplet:217
+#: ../mdkapplet:224
 #, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 
-#: ../mdkapplet:225
+#: ../mdkapplet:235
 #, fuzzy, c-format
 msgid "Computing new updates...\n"
 msgstr "Dasaslādzu ...\n"
 
-#: ../mdkapplet:227
+#: ../mdkapplet:237
 #, fuzzy, c-format
 msgid "Connecting to"
 msgstr "Pīslāguma problema"
 
-#: ../mdkapplet:250
+#: ../mdkapplet:244
+#, fuzzy, c-format
+msgid "Response from Mandrakeonline server\n"
+msgstr "Laipni lyudzam Mandrakeonline"
+
+#: ../mdkapplet:262
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr ""
 
-#: ../mdkapplet:254
+#: ../mdkapplet:267
 #, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
-#: ../mdkapplet:255
+#: ../mdkapplet:268
 #, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
-#: ../mdkapplet:256
+#: ../mdkapplet:269
 #, fuzzy, c-format
 msgid "Unknown state"
 msgstr "Nazynuoms hostdatora vuords"
 
-#: ../mdkapplet:257
+#: ../mdkapplet:270
 #, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr ""
 
-#: ../mdkapplet:258
+#: ../mdkapplet:271
 #, c-format
 msgid "Wrong Password.\n"
 msgstr "Napareizs paroļs.\n"
 
-#: ../mdkapplet:259
+#: ../mdkapplet:272
 #, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr ""
 
-#: ../mdkapplet:260
+#: ../mdkapplet:273
 #, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
 msgstr ""
 
-#: ../mdkapplet:264
+#: ../mdkapplet:277
 #, fuzzy, c-format
 msgid "System is up-to-date\n"
 msgstr "Sistemys režims"
 
-#: ../mdkapplet:303
+#: ../mdkapplet:317
 #, c-format
 msgid "No check"
 msgstr ""
 
-#: ../mdkapplet:316
+#: ../mdkapplet:330
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
-#: ../mdkapplet:319
+#: ../mdkapplet:333
 #, c-format
 msgid "Checking config file: Not present\n"
 msgstr ""
 
-#: ../mdkapplet:353
+#: ../mdkapplet:365
 #, c-format
 msgid "Logs"
 msgstr "Žurnali"
 
-#: ../mdkapplet:369
+#: ../mdkapplet:381
 #, fuzzy, c-format
 msgid "Clear"
 msgstr "Kalendars"
 
-#: ../mdkapplet:396
+#: ../mdkapplet:408
 #, c-format
 msgid "About..."
 msgstr "Par..."
 
-#: ../mdkapplet:397
+#: ../mdkapplet:409
 #, c-format
 msgid "Always launch on startup"
 msgstr ""
 
-#: ../mdkapplet:399
+#: ../mdkapplet:411
 #, c-format
 msgid "Quit"
 msgstr "Izīt"
 
-#: ../mdkonline:89
+#: ../mdkonline:52 ../mdkonline:106
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "Laipni lyudzam Mandrakeonline"
+
+#: ../mdkonline:55
 #, c-format
-msgid "Next"
-msgstr "Tuoļuok"
+msgid "I already have an account"
+msgstr ""
 
-#: ../mdkonline:89
+#: ../mdkonline:56
+#, c-format
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline:89 ../mdkonline:93 ../mdkonline:131
 #, c-format
-msgid "Cancel"
-msgstr "Atceļt"
+msgid "Please wait"
+msgstr "Lyudzu pagaidit"
 
 #: ../mdkonline:89
 #, c-format
-msgid "Previous"
-msgstr "Atpakaļ"
+msgid "Reading configuration\n"
+msgstr "Nūlosu konfiguraceju\n"
 
-#: ../mdkonline:103
+#: ../mdkonline:93
 #, c-format
-msgid "Welcome to Mandrakeonline"
-msgstr "Laipni lyudzam Mandrakeonline"
+msgid "Sending configuration..."
+msgstr "Syutu konfiguraceju..."
 
-#: ../mdkonline:104 ../mdkonline_tui:98
+#: ../mdkonline:109
 #, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
@@ -295,63 +315,38 @@ msgstr ""
 "uz centralizeitu datubāzi, itys vyss teik dareits ar mierķi, lai jius tyktu\n"
 "informeits par drūšeibys uzlobuojumim i cytim vierteigim jaunumim.\n"
 
-#: ../mdkonline:105 ../mdkonline_tui:142
-#, fuzzy, c-format
-msgid "Create a Mandrakeonline Account"
-msgstr "Laipni lyudzam Mandrakeonline"
+#: ../mdkonline:114
+#, c-format
+msgid "Account creation or authentication"
+msgstr ""
 
-#: ../mdkonline:107
-#, fuzzy, c-format
-msgid "I don't have a Mandrakeonline account and I want to subscribe"
-msgstr "Maņ nav Mandrakelinux Online konta, i es grybu tū īgiut"
+#: ../mdkonline:119
+#, c-format
+msgid "Enter your Mandrakeonline login, password and machine name:"
+msgstr ""
+"Īvodit jiusu Mandrakeonline lītuotuojvuordu, paroli i datora nūsaukumu:"
 
-#: ../mdkonline:111 ../mdkonline:131 ../mdkonline_tui:114 ../mdkonline_tui:145
+#: ../mdkonline:125 ../mdkonline:156
 #, c-format
 msgid "Login:"
 msgstr "Lītuotuojs:"
 
-#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:115 ../mdkonline_tui:146
+#: ../mdkonline:126 ../mdkonline:157
 #, c-format
 msgid "Password:"
 msgstr "Parole:"
 
-#: ../mdkonline:113 ../mdkonline_tui:147
-#, c-format
-msgid "Confirm Password:"
-msgstr "Apstyprynuot paroli:"
-
-#: ../mdkonline:114 ../mdkonline_tui:148
-#, fuzzy, c-format
-msgid "Mail contact:"
-msgstr "Posta trauksme"
-
-#: ../mdkonline:121
-#, c-format
-msgid "Mandrakelinux Privacy Policy"
-msgstr "Mandrakelinux privātuma politika"
-
 #: ../mdkonline:127
 #, c-format
-msgid "Authentification"
-msgstr "Autentifikaceja"
-
-#: ../mdkonline:128 ../mdkonline_tui:108
-#, c-format
-msgid "Enter your Mandrakeonline login, password and machine name:"
-msgstr ""
-"Īvodit jiusu Mandrakeonline lītuotuojvuordu, paroli i datora nūsaukumu:"
-
-#: ../mdkonline:133 ../mdkonline_tui:116
-#, c-format
 msgid "Machine name:"
 msgstr "Datora nūsaukums:"
 
-#: ../mdkonline:138
+#: ../mdkonline:131
 #, fuzzy, c-format
-msgid "Send Configuration"
-msgstr "Nūlosu konfiguraceju\n"
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Laipni lyudzam Mandrakeonline"
 
-#: ../mdkonline:139 ../mdkonline_tui:128
+#: ../mdkonline:139
 #, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
@@ -383,214 +378,170 @@ msgstr ""
 "Turkluot, jius sajimsit atlaidis www.mandrakeexpert.com moksys\n"
 "atbolsta pakolpuojumim."
 
-#: ../mdkonline:144 ../mdkonline:211 ../mdkonline:234
-#, c-format
-msgid "Finish"
-msgstr "Beigt"
-
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141 ../mdkonline:180 ../mdkupdate:126 ../mdkupdate:198
 #, c-format
-msgid "Your upload was successful!"
-msgstr "Nūsyuteišona beja veiksmeiga!"
+msgid "Connection problem"
+msgstr "Pīslāguma problema"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandrakeonline."
+msgid "or"
 msgstr ""
-"Niule pasateicūt Mandrakeonline jius sajimsit\n"
-"paziņuojumus par drūšeibys i cytim jaunynuojumim."
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "Napareizs paroļs"
+
+#: ../mdkonline:141
 #, c-format
 msgid ""
-"Mandrakeonline offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+"Your login or password was wrong.\n"
+" Either you'll have to type it again, or you'll need to create an account on "
+"Mandrakeonline.\n"
+" In the latter case, go back to the first step to connect to "
+"Mandrakeonline.\n"
+" Be aware that you must also provide a Machine name \n"
+" (only alphabetical characters are admitted)"
 msgstr ""
-"Mandrakeonline pīduovoj īspieju automatizēt jaunynuojumus.\n"
-"Jiusu sistema regulari palaiss programmu, kas gaideis jaunynuojumus\n"
-
-#: ../mdkonline:146
-#, c-format
-msgid "automated Upgrades"
-msgstr "automatizeita uzlobuošona"
+"Jiusu lītuotuojvuords ci paroļs beja napareizs.\n"
+"Jiusim tī juoīvoda vēlreiz, voi ari juoizveidoj Mandrakeonline lītuotuoja "
+"konts.\n"
+"Jebkurā gadīnī jiusim juoīt atpakaļ uz pyrmū sūli, lai dasaslāgtu "
+"Mandrakeonline.\n"
+"Īvārojit, ka jiusim juonūruoda ari datora nūsaukums \n"
+"(atļauti tikai latiņu alfabeta burti)"
 
-#: ../mdkonline:150
+#: ../mdkonline:153
 #, fuzzy, c-format
-msgid "Country:"
-msgstr "Kauntrī"
+msgid "Create a Mandrakeonline Account"
+msgstr "Laipni lyudzam Mandrakeonline"
 
-#: ../mdkonline:178 ../mdkonline:183 ../mdkonline:185 ../mdkonline:187
+#: ../mdkonline:158
 #, c-format
-msgid "Error"
-msgstr "Klaida"
+msgid "Confirm Password:"
+msgstr "Apstyprynuot paroli:"
 
-#: ../mdkonline:183 ../mdkonline_tui:152
+#: ../mdkonline:159
 #, fuzzy, c-format
-msgid "Please provide a login"
-msgstr "Lyudzu mieginit vēlreiz"
+msgid "Mail contact:"
+msgstr "Posta trauksme"
 
-#: ../mdkonline:185 ../mdkonline_tui:152
+#: ../mdkonline:163
 #, fuzzy, c-format
 msgid ""
 "The passwords do not match\n"
 " Please try again\n"
 msgstr "Parolis nasakreit"
 
-#: ../mdkonline:187 ../mdkonline_tui:152
+#: ../mdkonline:163
+#, fuzzy, c-format
+msgid "Please provide a login"
+msgstr "Lyudzu mieginit vēlreiz"
+
+#: ../mdkonline:163
 #, fuzzy, c-format
 msgid "Not a valid mail address!\n"
 msgstr "Lyudzu, īvodit dereigu adresi!"
 
-#: ../mdkonline:199 ../mdkonline_tui:78
-#, c-format
-msgid "Reading configuration\n"
-msgstr "Nūlosu konfiguraceju\n"
-
-#: ../mdkonline:204 ../mdkonline_tui:82
-#, c-format
-msgid "Sending configuration..."
-msgstr "Syutu konfiguraceju..."
-
-#: ../mdkonline:213 ../mdkonline:273 ../mdkonline_tui:130 ../mdkonline_tui:169
-#: ../mdkupdate:124 ../mdkupdate:195
+#: ../mdkonline:169
 #, c-format
-msgid "Connection problem"
-msgstr "Pīslāguma problema"
-
-#: ../mdkonline:213 ../mdkonline_tui:169
-#, c-format
-msgid "Problem occurs when uploading files, please try again"
+msgid ""
+"Mandrakeonline Account successfully created.\n"
+"Please click \"Next\" to authenticate and upload your configuration\n"
 msgstr ""
 
-#: ../mdkonline:251
-#, c-format
-msgid "Quitting Wizard\n"
-msgstr "Izeju nu vedņa\n"
-
-#: ../mdkonline:273
+#: ../mdkonline:178
 #, c-format
-msgid "Mandrakeonline could not be contacted, please try again at a later time"
-msgstr "Mandrakeupdate navar dasaslēgt da servera, pamieginuosim vāluok"
-
-#: ../mdkonline:285
-#, c-format
-msgid "Wrong password"
-msgstr "Napareizs paroļs"
+msgid "Your upload was successful!"
+msgstr "Nūsyuteišona beja veiksmeiga!"
 
-#: ../mdkonline:285 ../mdkonline_tui:130
+#: ../mdkonline:178
 #, c-format
 msgid ""
-"Your login or password was wrong.\n"
-" Either you'll have to type it again, or you'll need to create an account on "
-"Mandrakeonline.\n"
-" In the latter case, go back to the first step to connect to "
-"Mandrakeonline.\n"
-" Be aware that you must also provide a Machine name \n"
-" (only alphabetical characters are admitted)"
+"From now you will receive on security and updates \n"
+"announcements thanks to Mandrakeonline."
 msgstr ""
-"Jiusu lītuotuojvuords ci paroļs beja napareizs.\n"
-"Jiusim tī juoīvoda vēlreiz, voi ari juoizveidoj Mandrakeonline lītuotuoja "
-"konts.\n"
-"Jebkurā gadīnī jiusim juoīt atpakaļ uz pyrmū sūli, lai dasaslāgtu "
-"Mandrakeonline.\n"
-"Īvārojit, ka jiusim juonūruoda ari datora nūsaukums \n"
-"(atļauti tikai latiņu alfabeta burti)"
+"Niule pasateicūt Mandrakeonline jius sajimsit\n"
+"paziņuojumus par drūšeibys i cytim jaunynuojumim."
 
-#: ../mdkonline.pm:58
+#: ../mdkonline:178
 #, c-format
-msgid "Login and password should be less than 12 characters\n"
+msgid ""
+"Mandrakeonline offers you the ability to automate the updates.\n"
+"A program will run regulary in your system waiting for new updates\n"
 msgstr ""
+"Mandrakeonline pīduovoj īspieju automatizēt jaunynuojumus.\n"
+"Jiusu sistema regulari palaiss programmu, kas gaideis jaunynuojumus\n"
 
-#: ../mdkonline.pm:59
+#: ../mdkonline:180
 #, c-format
-msgid "Special characters are not allowed\n"
+msgid "Problem occurs when uploading files, please try again"
 msgstr ""
 
-#: ../mdkonline.pm:60
-#, c-format
-msgid "Please fill in all fields\n"
-msgstr ""
+#: ../mdkonline:186
+#, fuzzy, c-format
+msgid "Country"
+msgstr "Kauntrī"
 
-#: ../mdkonline.pm:61
-#, c-format
-msgid "Email not valid\n"
-msgstr ""
+#: ../mdkonline:198
+#, fuzzy, c-format
+msgid "Congratulations"
+msgstr "Nūlosu konfiguraceju\n"
 
-#: ../mdkonline.pm:62
+#: ../mdkonline:198
 #, c-format
-msgid "Account already exist\n"
+msgid "Your Mandrakeonline account has been successfully configured\n"
 msgstr ""
 
-#: ../mdkonline.pm:68
-#, c-format
-msgid "Problem connecting to server \n"
-msgstr ""
+#: ../mdkonline:214
+#, fuzzy, c-format
+msgid "Configuration uploaded successfully"
+msgstr "Nūsyuteišona beja veiksmeiga!"
 
-#: ../mdkonline_tui:45 ../mdkonline_tui:95
+#: ../mdkonline:215
 #, fuzzy, c-format
-msgid "Mandrakeonline"
-msgstr "Laipni lyudzam Mandrakeonline"
+msgid "Problem uploading configuration"
+msgstr "Nūlosu konfiguraceju\n"
 
-#: ../mdkonline_tui:48
+#: ../mdkonline:216
 #, c-format
-msgid "I already have an account"
+msgid ""
+"Cannot connect to mandrakeonline website: wrong login/password or router/"
+"firewall bad settings"
 msgstr ""
 
-#: ../mdkonline_tui:49
+#: ../mdkonline.pm:66
 #, c-format
-msgid "I want to subscribe"
+msgid "Login and password should be less than 12 characters\n"
 msgstr ""
 
-#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:120
+#: ../mdkonline.pm:67
 #, c-format
-msgid "Please wait"
-msgstr "Lyudzu pagaidit"
+msgid "Special characters are not allowed\n"
+msgstr ""
 
-#: ../mdkonline_tui:103
+#: ../mdkonline.pm:68
 #, c-format
-msgid "Account creation or authentication"
+msgid "Please fill in all fields\n"
 msgstr ""
 
-#: ../mdkonline_tui:120
-#, fuzzy, c-format
-msgid "Connecting to Mandrakeonline website..."
-msgstr "Laipni lyudzam Mandrakeonline"
-
-#: ../mdkonline_tui:130
+#: ../mdkonline.pm:69
 #, c-format
-msgid "or"
+msgid "Email not valid\n"
 msgstr ""
 
-#: ../mdkonline_tui:130
-#, fuzzy, c-format
-msgid "wrong password:"
-msgstr "Napareizs paroļs"
-
-#: ../mdkonline_tui:158
+#: ../mdkonline.pm:70
 #, c-format
-msgid ""
-"Mandrakeonline Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
+msgid "Account already exist\n"
 msgstr ""
 
-#: ../mdkonline_tui:175
-#, fuzzy, c-format
-msgid "Country"
-msgstr "Kauntrī"
-
-#: ../mdkonline_tui:187
-#, fuzzy, c-format
-msgid "Congratulations"
-msgstr "Nūlosu konfiguraceju\n"
-
-#: ../mdkonline_tui:187
+#: ../mdkonline.pm:76
 #, c-format
-msgid "Your Mandrakeonline account has been successfully configured\n"
+msgid "Problem connecting to server \n"
 msgstr ""
 
-#: ../mdkupdate:50
+#: ../mdkupdate:52
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
@@ -607,48 +558,96 @@ msgstr ""
 "\n"
 "pīlītuojums:\n"
 
-#: ../mdkupdate:55
+#: ../mdkupdate:57
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - drukuot itū paliedzeibys tekstu.\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:58
 #, fuzzy, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --applet       - atjaunuot vysu informaceju.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:59
 #, fuzzy, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - atjaunuot vysu informaceju.\n"
 
-#: ../mdkupdate:58
-#, fuzzy, c-format
-msgid "  --update       - Update keys\n"
-msgstr "  --applet       - atjaunuot vysu informaceju.\n"
-
-#: ../mdkupdate:66
+#: ../mdkupdate:67
 #, c-format
 msgid "No %s file found. Run mdkonline wizard first"
 msgstr ""
 
-#: ../mdkupdate:124
+#: ../mdkupdate:126
 #, c-format
 msgid "Mandrakeupdate could not contact the site, we will try again."
 msgstr "Mandrakeupdate navar dasaslēgtda servera, mieginuosim vāluok."
 
-#: ../mdkupdate:173
+#: ../mdkupdate:176
 #, c-format
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr "Nav īspiejams atjaunuot pakūtnis nu mdkupdate medium.\n"
 
-#: ../mdkupdate:195
+#: ../mdkupdate:198
 #, c-format
 msgid ""
 "Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
 "mandrakeonline [dot] net"
 msgstr ""
 
+#~ msgid "Next"
+#~ msgstr "Tuoļuok"
+
+#~ msgid "Cancel"
+#~ msgstr "Atceļt"
+
+#~ msgid "Previous"
+#~ msgstr "Atpakaļ"
+
+#~ msgid "Welcome to Mandrakeonline"
+#~ msgstr "Laipni lyudzam Mandrakeonline"
+
+#, fuzzy
+#~ msgid "I don't have a Mandrakeonline account and I want to subscribe"
+#~ msgstr "Maņ nav Mandrakelinux Online konta, i es grybu tū īgiut"
+
+#~ msgid "Mandrakelinux Privacy Policy"
+#~ msgstr "Mandrakelinux privātuma politika"
+
+#~ msgid "Authentification"
+#~ msgstr "Autentifikaceja"
+
+#, fuzzy
+#~ msgid "Send Configuration"
+#~ msgstr "Nūlosu konfiguraceju\n"
+
+#~ msgid "Finish"
+#~ msgstr "Beigt"
+
+#~ msgid "automated Upgrades"
+#~ msgstr "automatizeita uzlobuošona"
+
+#, fuzzy
+#~ msgid "Country:"
+#~ msgstr "Kauntrī"
+
+#~ msgid "Error"
+#~ msgstr "Klaida"
+
+#~ msgid "Quitting Wizard\n"
+#~ msgstr "Izeju nu vedņa\n"
+
+#~ msgid ""
+#~ "Mandrakeonline could not be contacted, please try again at a later time"
+#~ msgstr "Mandrakeupdate navar dasaslēgt da servera, pamieginuosim vāluok"
+
+#~ msgid "Wrong password"
+#~ msgstr "Napareizs paroļs"
+
+#, fuzzy
+#~ msgid "  --update       - Update keys\n"
+#~ msgstr "  --applet       - atjaunuot vysu informaceju.\n"
+
 #, fuzzy
 #~ msgid "Skip Wizard"
 #~ msgstr "Meistars"
@@ -661,10 +660,6 @@ msgstr ""
 #~ msgstr "Dasaslādzu ...\n"
 
 #, fuzzy
-#~ msgid "Response from Mandrakeonline server\n"
-#~ msgstr "Laipni lyudzam Mandrakeonline"
-
-#, fuzzy
 #~ msgid "Launching Mandrakeupdate\n"
 #~ msgstr "  --applet       - atjaunuot vysu informaceju.\n"
 
diff --git a/po/lv.po b/po/lv.po
index 5da6598f..23619199 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline 0.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-01 22:41+0200\n"
+"POT-Creation-Date: 2004-11-03 12:10+0100\n"
 "PO-Revision-Date: 2002-09-25 19:04+0200\n"
 "Last-Translator: Raivo Saars <spaiks@inbox.lv>\n"
 "Language-Team: ll10nt <ll10nt@listes.murds.lv>\n"
@@ -15,271 +15,291 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../mdkapplet:61
+#: ../mdkapplet:63
 #, c-format
 msgid "Your system is up-to-date"
 msgstr ""
 
-#: ../mdkapplet:67
+#: ../mdkapplet:69
 #, fuzzy, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrakeonline.net"
 msgstr "Problēmu gadījumā sūtiet vēstuli uz support@mandrakeonline.net\n"
 
-#: ../mdkapplet:73
+#: ../mdkapplet:75
 #, c-format
 msgid "System is busy. Please wait ..."
 msgstr ""
 
-#: ../mdkapplet:79
+#: ../mdkapplet:81
 #, fuzzy, c-format
 msgid "New updates are available for your system"
 msgstr "Jūsu sistēmā nav tīkla adaptera!"
 
-#: ../mdkapplet:85
+#: ../mdkapplet:87
 #, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr ""
 
-#: ../mdkapplet:91
+#: ../mdkapplet:93
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr ""
 
-#: ../mdkapplet:97
+#: ../mdkapplet:99
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 
-#: ../mdkapplet:103
+#: ../mdkapplet:105
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:108 ../mdkapplet:158
+#: ../mdkapplet:110 ../mdkapplet:164
 #, fuzzy, c-format
 msgid "Install updates"
 msgstr "Instalēt tēmas"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:111
 #, fuzzy, c-format
 msgid "Configure the service"
 msgstr "Servisu konfigurēšana"
 
-#: ../mdkapplet:110
+#: ../mdkapplet:112
 #, fuzzy, c-format
 msgid "Check Updates"
 msgstr "Atjaunināt"
 
-#: ../mdkapplet:111
+#: ../mdkapplet:113 ../mdkapplet:167 ../mdkapplet:225
+#, fuzzy, c-format
+msgid "Please Wait"
+msgstr "Lūdzu uzgaidiet"
+
+#: ../mdkapplet:113 ../mdkapplet:166 ../mdkapplet:167 ../mdkapplet:225
+#, fuzzy, c-format
+msgid "Check updates"
+msgstr "Drošības atjauninājumi"
+
+#: ../mdkapplet:115
 #, c-format
 msgid "Online WebSite"
 msgstr ""
 
-#: ../mdkapplet:112
+#: ../mdkapplet:116
 #, fuzzy, c-format
 msgid "Configure Network"
 msgstr "Tīkla konfigurēšana"
 
-#: ../mdkapplet:113
+#: ../mdkapplet:117
 #, fuzzy, c-format
 msgid "Configure Now!"
 msgstr "Nolasu konfigurāciju\n"
 
-#: ../mdkapplet:146
+#: ../mdkapplet:152 ../mdkapplet:229
 #, fuzzy, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Mandrakelinux privātuma politika"
 
-#: ../mdkapplet:156
+#: ../mdkapplet:162
 #, c-format
 msgid "Actions"
 msgstr "Darbības"
 
-#: ../mdkapplet:159
+#: ../mdkapplet:165
 #, c-format
 msgid "Configure"
 msgstr "Konfigurēt"
 
-#: ../mdkapplet:160
-#, fuzzy, c-format
-msgid "Check updates"
-msgstr "Drošības atjauninājumi"
-
-#: ../mdkapplet:161
+#: ../mdkapplet:169
 #, fuzzy, c-format
 msgid "See logs"
 msgstr "Meklēt +5s"
 
-#: ../mdkapplet:164
+#: ../mdkapplet:172
 #, c-format
 msgid "Status"
 msgstr "Statuss"
 
-#: ../mdkapplet:168 ../mdkapplet:363
+#: ../mdkapplet:176 ../mdkapplet:375
 #, c-format
 msgid "Close"
 msgstr "Aizvērt"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, fuzzy, c-format
 msgid "Network Connection: "
 msgstr "Virtuālā tīkla pieslēgums"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Up"
 msgstr "Uz augšu"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Down"
 msgstr "Uz leju"
 
-#: ../mdkapplet:204
+#: ../mdkapplet:212
 #, c-format
 msgid "Last check: "
 msgstr ""
 
-#: ../mdkapplet:205
+#: ../mdkapplet:213
 #, fuzzy, c-format
 msgid "Updates: "
 msgstr "Atjaunināt"
 
-#: ../mdkapplet:209
+#: ../mdkapplet:217
 #, fuzzy, c-format
 msgid "Launching drakconnect\n"
 msgstr "Izpildīt userdrake"
 
-#: ../mdkapplet:213
+#: ../mdkapplet:221
 #, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr ""
 
-#: ../mdkapplet:217
+#: ../mdkapplet:224
 #, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 
-#: ../mdkapplet:225
+#: ../mdkapplet:235
 #, fuzzy, c-format
 msgid "Computing new updates...\n"
 msgstr "Pieslēguma problēma"
 
-#: ../mdkapplet:227
+#: ../mdkapplet:237
 #, fuzzy, c-format
 msgid "Connecting to"
 msgstr "Pieslēguma problēma"
 
-#: ../mdkapplet:250
+#: ../mdkapplet:244
+#, fuzzy, c-format
+msgid "Response from Mandrakeonline server\n"
+msgstr "Laipni lūdzam Mandrakeonline"
+
+#: ../mdkapplet:262
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr ""
 
-#: ../mdkapplet:254
+#: ../mdkapplet:267
 #, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
-#: ../mdkapplet:255
+#: ../mdkapplet:268
 #, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
-#: ../mdkapplet:256
+#: ../mdkapplet:269
 #, fuzzy, c-format
 msgid "Unknown state"
 msgstr "Nezināms servera vārds"
 
-#: ../mdkapplet:257
+#: ../mdkapplet:270
 #, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr ""
 
-#: ../mdkapplet:258
+#: ../mdkapplet:271
 #, c-format
 msgid "Wrong Password.\n"
 msgstr "Nepareiza parole.\n"
 
-#: ../mdkapplet:259
+#: ../mdkapplet:272
 #, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr ""
 
-#: ../mdkapplet:260
+#: ../mdkapplet:273
 #, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
 msgstr ""
 
-#: ../mdkapplet:264
+#: ../mdkapplet:277
 #, fuzzy, c-format
 msgid "System is up-to-date\n"
 msgstr "Sistēmas režīms"
 
-#: ../mdkapplet:303
+#: ../mdkapplet:317
 #, c-format
 msgid "No check"
 msgstr ""
 
-#: ../mdkapplet:316
+#: ../mdkapplet:330
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
-#: ../mdkapplet:319
+#: ../mdkapplet:333
 #, c-format
 msgid "Checking config file: Not present\n"
 msgstr ""
 
-#: ../mdkapplet:353
+#: ../mdkapplet:365
 #, c-format
 msgid "Logs"
 msgstr "Žurnāli"
 
-#: ../mdkapplet:369
+#: ../mdkapplet:381
 #, fuzzy, c-format
 msgid "Clear"
 msgstr "Kalendārs"
 
-#: ../mdkapplet:396
+#: ../mdkapplet:408
 #, c-format
 msgid "About..."
 msgstr "Par..."
 
-#: ../mdkapplet:397
+#: ../mdkapplet:409
 #, c-format
 msgid "Always launch on startup"
 msgstr ""
 
-#: ../mdkapplet:399
+#: ../mdkapplet:411
 #, c-format
 msgid "Quit"
 msgstr "Iziet"
 
-#: ../mdkonline:89
+#: ../mdkonline:52 ../mdkonline:106
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "Laipni lūdzam Mandrakeonline"
+
+#: ../mdkonline:55
 #, c-format
-msgid "Next"
-msgstr "Tālāk"
+msgid "I already have an account"
+msgstr ""
 
-#: ../mdkonline:89
+#: ../mdkonline:56
 #, c-format
-msgid "Cancel"
-msgstr "Atcelt"
+msgid "I want to subscribe"
+msgstr ""
 
-#: ../mdkonline:89
+#: ../mdkonline:89 ../mdkonline:93 ../mdkonline:131
 #, c-format
-msgid "Previous"
-msgstr "Atpakaļ"
+msgid "Please wait"
+msgstr "Lūdzu uzgaidiet"
 
-#: ../mdkonline:103
+#: ../mdkonline:89
 #, c-format
-msgid "Welcome to Mandrakeonline"
-msgstr "Laipni lūdzam Mandrakeonline"
+msgid "Reading configuration\n"
+msgstr "Nolasu konfigurāciju\n"
+
+#: ../mdkonline:93
+#, fuzzy, c-format
+msgid "Sending configuration..."
+msgstr "Nolasu konfigurāciju\n"
 
-#: ../mdkonline:104 ../mdkonline_tui:98
+#: ../mdkonline:109
 #, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
@@ -291,63 +311,38 @@ msgstr ""
 "uz centralizētu datubāzi, šis viss tiek darīts ar mērķi, lai Jūs tiktu\n"
 "informēts par drošības uzlabojumiem un citiem vērtīgiem jaunumiem.\n"
 
-#: ../mdkonline:105 ../mdkonline_tui:142
-#, fuzzy, c-format
-msgid "Create a Mandrakeonline Account"
-msgstr "Laipni lūdzam Mandrakeonline"
+#: ../mdkonline:114
+#, c-format
+msgid "Account creation or authentication"
+msgstr ""
 
-#: ../mdkonline:107
-#, fuzzy, c-format
-msgid "I don't have a Mandrakeonline account and I want to subscribe"
-msgstr "Man nav Mandrakelinux Online konta, un es vēlos "
+#: ../mdkonline:119
+#, c-format
+msgid "Enter your Mandrakeonline login, password and machine name:"
+msgstr ""
+"Ievadiet jūsu Mandrakeonline lietotājvārdu, paroli un datora nosaukumu:"
 
-#: ../mdkonline:111 ../mdkonline:131 ../mdkonline_tui:114 ../mdkonline_tui:145
+#: ../mdkonline:125 ../mdkonline:156
 #, c-format
 msgid "Login:"
 msgstr "Lietotājs:"
 
-#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:115 ../mdkonline_tui:146
+#: ../mdkonline:126 ../mdkonline:157
 #, c-format
 msgid "Password:"
 msgstr "Parole:"
 
-#: ../mdkonline:113 ../mdkonline_tui:147
-#, c-format
-msgid "Confirm Password:"
-msgstr "Apstiprināt paroli:"
-
-#: ../mdkonline:114 ../mdkonline_tui:148
-#, fuzzy, c-format
-msgid "Mail contact:"
-msgstr "Pasta novērotājs"
-
-#: ../mdkonline:121
-#, c-format
-msgid "Mandrakelinux Privacy Policy"
-msgstr "Mandrakelinux privātuma politika"
-
 #: ../mdkonline:127
 #, c-format
-msgid "Authentification"
-msgstr "Autentifikācija"
-
-#: ../mdkonline:128 ../mdkonline_tui:108
-#, c-format
-msgid "Enter your Mandrakeonline login, password and machine name:"
-msgstr ""
-"Ievadiet jūsu Mandrakeonline lietotājvārdu, paroli un datora nosaukumu:"
-
-#: ../mdkonline:133 ../mdkonline_tui:116
-#, c-format
 msgid "Machine name:"
 msgstr "Datora nosaukums:"
 
-#: ../mdkonline:138
+#: ../mdkonline:131
 #, fuzzy, c-format
-msgid "Send Configuration"
-msgstr "Nolasu konfigurāciju\n"
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Laipni lūdzam Mandrakeonline"
 
-#: ../mdkonline:139 ../mdkonline_tui:128
+#: ../mdkonline:139
 #, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
@@ -379,214 +374,170 @@ msgstr ""
 "Bez tam, jūs saņemsit atlaides www.mandrakeexpert.com maksas\n"
 "atbalsta pakalpojumiem."
 
-#: ../mdkonline:144 ../mdkonline:211 ../mdkonline:234
+#: ../mdkonline:141 ../mdkonline:180 ../mdkupdate:126 ../mdkupdate:198
 #, c-format
-msgid "Finish"
-msgstr "Beigt"
-
-#: ../mdkonline:145 ../mdkonline_tui:167
-#, c-format
-msgid "Your upload was successful!"
-msgstr "Nosūtīšana bija veiksmīga!"
+msgid "Connection problem"
+msgstr "Pieslēguma problēma"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandrakeonline."
+msgid "or"
 msgstr ""
-"Tagad pateicoties Mandrakeonline jūs saņemsit\n"
-"paziņojumus par drošības un citiem jauninājumiem."
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "Nepareiza parole"
+
+#: ../mdkonline:141
 #, c-format
 msgid ""
-"Mandrakeonline offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+"Your login or password was wrong.\n"
+" Either you'll have to type it again, or you'll need to create an account on "
+"Mandrakeonline.\n"
+" In the latter case, go back to the first step to connect to "
+"Mandrakeonline.\n"
+" Be aware that you must also provide a Machine name \n"
+" (only alphabetical characters are admitted)"
 msgstr ""
-"Mandrakeonline piedāvā iespēju automatizēt jauninājumus.\n"
-"Jūsu sistēma regulāri palaidīs programmu, kas gaidīs jauninājumus\n"
-
-#: ../mdkonline:146
-#, c-format
-msgid "automated Upgrades"
-msgstr "automatizēta uzlabošana"
+"Jūsu lietotājvārds vai parole bija nepareizi.\n"
+"Jums tie jāievada vēlreiz, vai arī jāizveido Mandrakeonline lietotāja "
+"konts.\n"
+"Jebkurā gadījumā jums jāiet atpakaļ uz pirmo soli, lai pieslēgtos "
+"Mandrakeonline.\n"
+"Ievērojiet, ka jums jānorāda arī datora nosaukums \n"
+"(atļauti tikai latīņu alfabēta burti)"
 
-#: ../mdkonline:150
+#: ../mdkonline:153
 #, fuzzy, c-format
-msgid "Country:"
-msgstr "Kantrī"
+msgid "Create a Mandrakeonline Account"
+msgstr "Laipni lūdzam Mandrakeonline"
 
-#: ../mdkonline:178 ../mdkonline:183 ../mdkonline:185 ../mdkonline:187
+#: ../mdkonline:158
 #, c-format
-msgid "Error"
-msgstr "Kļūda"
+msgid "Confirm Password:"
+msgstr "Apstiprināt paroli:"
 
-#: ../mdkonline:183 ../mdkonline_tui:152
+#: ../mdkonline:159
 #, fuzzy, c-format
-msgid "Please provide a login"
-msgstr "Lūdzu mēģiniet vēlreiz"
+msgid "Mail contact:"
+msgstr "Pasta novērotājs"
 
-#: ../mdkonline:185 ../mdkonline_tui:152
+#: ../mdkonline:163
 #, fuzzy, c-format
 msgid ""
 "The passwords do not match\n"
 " Please try again\n"
 msgstr "Paroles nesakrīt"
 
-#: ../mdkonline:187 ../mdkonline_tui:152
+#: ../mdkonline:163
 #, fuzzy, c-format
-msgid "Not a valid mail address!\n"
-msgstr "Ievadiet, lūdzu, derīgu adresi!"
-
-#: ../mdkonline:199 ../mdkonline_tui:78
-#, c-format
-msgid "Reading configuration\n"
-msgstr "Nolasu konfigurāciju\n"
+msgid "Please provide a login"
+msgstr "Lūdzu mēģiniet vēlreiz"
 
-#: ../mdkonline:204 ../mdkonline_tui:82
+#: ../mdkonline:163
 #, fuzzy, c-format
-msgid "Sending configuration..."
-msgstr "Nolasu konfigurāciju\n"
-
-#: ../mdkonline:213 ../mdkonline:273 ../mdkonline_tui:130 ../mdkonline_tui:169
-#: ../mdkupdate:124 ../mdkupdate:195
-#, c-format
-msgid "Connection problem"
-msgstr "Pieslēguma problēma"
+msgid "Not a valid mail address!\n"
+msgstr "Ievadiet, lūdzu, derīgu adresi!"
 
-#: ../mdkonline:213 ../mdkonline_tui:169
+#: ../mdkonline:169
 #, c-format
-msgid "Problem occurs when uploading files, please try again"
+msgid ""
+"Mandrakeonline Account successfully created.\n"
+"Please click \"Next\" to authenticate and upload your configuration\n"
 msgstr ""
 
-#: ../mdkonline:251
+#: ../mdkonline:178
 #, c-format
-msgid "Quitting Wizard\n"
-msgstr "Izeju no vedņa\n"
-
-#: ../mdkonline:273
-#, fuzzy, c-format
-msgid "Mandrakeonline could not be contacted, please try again at a later time"
-msgstr "Mandrakeupdate nevar pieslēgties serverim, mēģināsim vēlāk"
-
-#: ../mdkonline:285
-#, c-format
-msgid "Wrong password"
-msgstr "Nepareiza parole"
+msgid "Your upload was successful!"
+msgstr "Nosūtīšana bija veiksmīga!"
 
-#: ../mdkonline:285 ../mdkonline_tui:130
+#: ../mdkonline:178
 #, c-format
 msgid ""
-"Your login or password was wrong.\n"
-" Either you'll have to type it again, or you'll need to create an account on "
-"Mandrakeonline.\n"
-" In the latter case, go back to the first step to connect to "
-"Mandrakeonline.\n"
-" Be aware that you must also provide a Machine name \n"
-" (only alphabetical characters are admitted)"
+"From now you will receive on security and updates \n"
+"announcements thanks to Mandrakeonline."
 msgstr ""
-"Jūsu lietotājvārds vai parole bija nepareizi.\n"
-"Jums tie jāievada vēlreiz, vai arī jāizveido Mandrakeonline lietotāja "
-"konts.\n"
-"Jebkurā gadījumā jums jāiet atpakaļ uz pirmo soli, lai pieslēgtos "
-"Mandrakeonline.\n"
-"Ievērojiet, ka jums jānorāda arī datora nosaukums \n"
-"(atļauti tikai latīņu alfabēta burti)"
+"Tagad pateicoties Mandrakeonline jūs saņemsit\n"
+"paziņojumus par drošības un citiem jauninājumiem."
 
-#: ../mdkonline.pm:58
+#: ../mdkonline:178
 #, c-format
-msgid "Login and password should be less than 12 characters\n"
+msgid ""
+"Mandrakeonline offers you the ability to automate the updates.\n"
+"A program will run regulary in your system waiting for new updates\n"
 msgstr ""
+"Mandrakeonline piedāvā iespēju automatizēt jauninājumus.\n"
+"Jūsu sistēma regulāri palaidīs programmu, kas gaidīs jauninājumus\n"
 
-#: ../mdkonline.pm:59
+#: ../mdkonline:180
 #, c-format
-msgid "Special characters are not allowed\n"
+msgid "Problem occurs when uploading files, please try again"
 msgstr ""
 
-#: ../mdkonline.pm:60
-#, c-format
-msgid "Please fill in all fields\n"
-msgstr ""
+#: ../mdkonline:186
+#, fuzzy, c-format
+msgid "Country"
+msgstr "Kantrī"
 
-#: ../mdkonline.pm:61
-#, c-format
-msgid "Email not valid\n"
-msgstr ""
+#: ../mdkonline:198
+#, fuzzy, c-format
+msgid "Congratulations"
+msgstr "Nolasu konfigurāciju\n"
 
-#: ../mdkonline.pm:62
+#: ../mdkonline:198
 #, c-format
-msgid "Account already exist\n"
+msgid "Your Mandrakeonline account has been successfully configured\n"
 msgstr ""
 
-#: ../mdkonline.pm:68
-#, c-format
-msgid "Problem connecting to server \n"
-msgstr ""
+#: ../mdkonline:214
+#, fuzzy, c-format
+msgid "Configuration uploaded successfully"
+msgstr "Nosūtīšana bija veiksmīga!"
 
-#: ../mdkonline_tui:45 ../mdkonline_tui:95
+#: ../mdkonline:215
 #, fuzzy, c-format
-msgid "Mandrakeonline"
-msgstr "Laipni lūdzam Mandrakeonline"
+msgid "Problem uploading configuration"
+msgstr "Nolasu konfigurāciju\n"
 
-#: ../mdkonline_tui:48
+#: ../mdkonline:216
 #, c-format
-msgid "I already have an account"
+msgid ""
+"Cannot connect to mandrakeonline website: wrong login/password or router/"
+"firewall bad settings"
 msgstr ""
 
-#: ../mdkonline_tui:49
+#: ../mdkonline.pm:66
 #, c-format
-msgid "I want to subscribe"
+msgid "Login and password should be less than 12 characters\n"
 msgstr ""
 
-#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:120
+#: ../mdkonline.pm:67
 #, c-format
-msgid "Please wait"
-msgstr "Lūdzu uzgaidiet"
+msgid "Special characters are not allowed\n"
+msgstr ""
 
-#: ../mdkonline_tui:103
+#: ../mdkonline.pm:68
 #, c-format
-msgid "Account creation or authentication"
+msgid "Please fill in all fields\n"
 msgstr ""
 
-#: ../mdkonline_tui:120
-#, fuzzy, c-format
-msgid "Connecting to Mandrakeonline website..."
-msgstr "Laipni lūdzam Mandrakeonline"
-
-#: ../mdkonline_tui:130
+#: ../mdkonline.pm:69
 #, c-format
-msgid "or"
+msgid "Email not valid\n"
 msgstr ""
 
-#: ../mdkonline_tui:130
-#, fuzzy, c-format
-msgid "wrong password:"
-msgstr "Nepareiza parole"
-
-#: ../mdkonline_tui:158
+#: ../mdkonline.pm:70
 #, c-format
-msgid ""
-"Mandrakeonline Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
+msgid "Account already exist\n"
 msgstr ""
 
-#: ../mdkonline_tui:175
-#, fuzzy, c-format
-msgid "Country"
-msgstr "Kantrī"
-
-#: ../mdkonline_tui:187
-#, fuzzy, c-format
-msgid "Congratulations"
-msgstr "Nolasu konfigurāciju\n"
-
-#: ../mdkonline_tui:187
+#: ../mdkonline.pm:76
 #, c-format
-msgid "Your Mandrakeonline account has been successfully configured\n"
+msgid "Problem connecting to server \n"
 msgstr ""
 
-#: ../mdkupdate:50
+#: ../mdkupdate:52
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
@@ -602,48 +553,97 @@ msgstr ""
 "\n"
 "Pielietojums:\n"
 
-#: ../mdkupdate:55
+#: ../mdkupdate:57
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - drukāt šo palīdzības tekstu.\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:58
 #, fuzzy, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --update       - izveidot atjaunināšanas datu nesēju.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:59
 #, fuzzy, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --update       - izveidot atjaunināšanas datu nesēju.\n"
 
-#: ../mdkupdate:58
-#, fuzzy, c-format
-msgid "  --update       - Update keys\n"
-msgstr "  --update       - izveidot atjaunināšanas datu nesēju.\n"
-
-#: ../mdkupdate:66
+#: ../mdkupdate:67
 #, c-format
 msgid "No %s file found. Run mdkonline wizard first"
 msgstr ""
 
-#: ../mdkupdate:124
+#: ../mdkupdate:126
 #, fuzzy, c-format
 msgid "Mandrakeupdate could not contact the site, we will try again."
 msgstr "Mandrakeupdate nevar pieslēgties serverim, mēģināsim vēlāk"
 
-#: ../mdkupdate:173
+#: ../mdkupdate:176
 #, c-format
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr ""
 
-#: ../mdkupdate:195
+#: ../mdkupdate:198
 #, c-format
 msgid ""
 "Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
 "mandrakeonline [dot] net"
 msgstr ""
 
+#~ msgid "Next"
+#~ msgstr "Tālāk"
+
+#~ msgid "Cancel"
+#~ msgstr "Atcelt"
+
+#~ msgid "Previous"
+#~ msgstr "Atpakaļ"
+
+#~ msgid "Welcome to Mandrakeonline"
+#~ msgstr "Laipni lūdzam Mandrakeonline"
+
+#, fuzzy
+#~ msgid "I don't have a Mandrakeonline account and I want to subscribe"
+#~ msgstr "Man nav Mandrakelinux Online konta, un es vēlos "
+
+#~ msgid "Mandrakelinux Privacy Policy"
+#~ msgstr "Mandrakelinux privātuma politika"
+
+#~ msgid "Authentification"
+#~ msgstr "Autentifikācija"
+
+#, fuzzy
+#~ msgid "Send Configuration"
+#~ msgstr "Nolasu konfigurāciju\n"
+
+#~ msgid "Finish"
+#~ msgstr "Beigt"
+
+#~ msgid "automated Upgrades"
+#~ msgstr "automatizēta uzlabošana"
+
+#, fuzzy
+#~ msgid "Country:"
+#~ msgstr "Kantrī"
+
+#~ msgid "Error"
+#~ msgstr "Kļūda"
+
+#~ msgid "Quitting Wizard\n"
+#~ msgstr "Izeju no vedņa\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Mandrakeonline could not be contacted, please try again at a later time"
+#~ msgstr "Mandrakeupdate nevar pieslēgties serverim, mēģināsim vēlāk"
+
+#~ msgid "Wrong password"
+#~ msgstr "Nepareiza parole"
+
+#, fuzzy
+#~ msgid "  --update       - Update keys\n"
+#~ msgstr "  --update       - izveidot atjaunināšanas datu nesēju.\n"
+
 #, fuzzy
 #~ msgid "Skip Wizard"
 #~ msgstr "NFS meistars"
@@ -655,10 +655,6 @@ msgstr ""
 #~ msgid "Checking ..."
 #~ msgstr "Pieslēguma problēma"
 
-#, fuzzy
-#~ msgid "Response from Mandrakeonline server\n"
-#~ msgstr "Laipni lūdzam Mandrakeonline"
-
 #~ msgid "Yes I want automated updates"
 #~ msgstr "Jā, es vēlos automātiskus jauninājumus"
 
diff --git a/po/mdkonline.pot b/po/mdkonline.pot
index be7647c5..76bd3250 100644
--- a/po/mdkonline.pot
+++ b/po/mdkonline.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2004-10-01 22:41+0200\n"
+"POT-Creation-Date: 2004-11-03 12:10+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"
@@ -14,353 +14,352 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: ../mdkapplet:61
+#: ../mdkapplet:63
 #, c-format
 msgid "Your system is up-to-date"
 msgstr ""
 
-#: ../mdkapplet:67
+#: ../mdkapplet:69
 #, c-format
 msgid "Service configuration problem. Please check logs and send mail to support@mandrakeonline.net"
 msgstr ""
 
-#: ../mdkapplet:73
+#: ../mdkapplet:75
 #, c-format
 msgid "System is busy. Please wait ..."
 msgstr ""
 
-#: ../mdkapplet:79
+#: ../mdkapplet:81
 #, c-format
 msgid "New updates are available for your system"
 msgstr ""
 
-#: ../mdkapplet:85
+#: ../mdkapplet:87
 #, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr ""
 
-#: ../mdkapplet:91
+#: ../mdkapplet:93
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr ""
 
-#: ../mdkapplet:97
+#: ../mdkapplet:99
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 
-#: ../mdkapplet:103
+#: ../mdkapplet:105
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:108 ../mdkapplet:158
+#: ../mdkapplet:110 ../mdkapplet:164
 #, c-format
 msgid "Install updates"
 msgstr ""
 
-#: ../mdkapplet:109
+#: ../mdkapplet:111
 #, c-format
 msgid "Configure the service"
 msgstr ""
 
-#: ../mdkapplet:110
+#: ../mdkapplet:112
 #, c-format
 msgid "Check Updates"
 msgstr ""
 
-#: ../mdkapplet:111
+#: ../mdkapplet:113 ../mdkapplet:167 ../mdkapplet:225
+#, c-format
+msgid "Please Wait"
+msgstr ""
+
+#: ../mdkapplet:113 ../mdkapplet:166 ../mdkapplet:167 ../mdkapplet:225
+#, c-format
+msgid "Check updates"
+msgstr ""
+
+#: ../mdkapplet:115
 #, c-format
 msgid "Online WebSite"
 msgstr ""
 
-#: ../mdkapplet:112
+#: ../mdkapplet:116
 #, c-format
 msgid "Configure Network"
 msgstr ""
 
-#: ../mdkapplet:113
+#: ../mdkapplet:117
 #, c-format
 msgid "Configure Now!"
 msgstr ""
 
-#: ../mdkapplet:146
+#: ../mdkapplet:152 ../mdkapplet:229
 #, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr ""
 
-#: ../mdkapplet:156
+#: ../mdkapplet:162
 #, c-format
 msgid "Actions"
 msgstr ""
 
-#: ../mdkapplet:159
+#: ../mdkapplet:165
 #, c-format
 msgid "Configure"
 msgstr ""
 
-#: ../mdkapplet:160
-#, c-format
-msgid "Check updates"
-msgstr ""
-
-#: ../mdkapplet:161
+#: ../mdkapplet:169
 #, c-format
 msgid "See logs"
 msgstr ""
 
-#: ../mdkapplet:164
+#: ../mdkapplet:172
 #, c-format
 msgid "Status"
 msgstr ""
 
-#: ../mdkapplet:168 ../mdkapplet:363
+#: ../mdkapplet:176 ../mdkapplet:375
 #, c-format
 msgid "Close"
 msgstr ""
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Network Connection: "
 msgstr ""
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Up"
 msgstr ""
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Down"
 msgstr ""
 
-#: ../mdkapplet:204
+#: ../mdkapplet:212
 #, c-format
 msgid "Last check: "
 msgstr ""
 
-#: ../mdkapplet:205
+#: ../mdkapplet:213
 #, c-format
 msgid "Updates: "
 msgstr ""
 
-#: ../mdkapplet:209
+#: ../mdkapplet:217
 #, c-format
 msgid ""
 "Launching drakconnect\n"
 ""
 msgstr ""
 
-#: ../mdkapplet:213
+#: ../mdkapplet:221
 #, c-format
 msgid ""
 "Launching mdkupdate --applet\n"
 ""
 msgstr ""
 
-#: ../mdkapplet:217
+#: ../mdkapplet:224
 #, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 
-#: ../mdkapplet:225
+#: ../mdkapplet:235
 #, c-format
 msgid ""
 "Computing new updates...\n"
 ""
 msgstr ""
 
-#: ../mdkapplet:227
+#: ../mdkapplet:237
 #, c-format
 msgid "Connecting to"
 msgstr ""
 
-#: ../mdkapplet:250
+#: ../mdkapplet:244
+#, c-format
+msgid ""
+"Response from Mandrakeonline server\n"
+""
+msgstr ""
+
+#: ../mdkapplet:262
 #, c-format
 msgid ""
 "Checking... Updates are available\n"
 ""
 msgstr ""
 
-#: ../mdkapplet:254
+#: ../mdkapplet:267
 #, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
-#: ../mdkapplet:255
+#: ../mdkapplet:268
 #, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
-#: ../mdkapplet:256
+#: ../mdkapplet:269
 #, c-format
 msgid "Unknown state"
 msgstr ""
 
-#: ../mdkapplet:257
+#: ../mdkapplet:270
 #, c-format
 msgid ""
 "Online services disabled. Contact Mandrakeonline site\n"
 ""
 msgstr ""
 
-#: ../mdkapplet:258
+#: ../mdkapplet:271
 #, c-format
 msgid ""
 "Wrong Password.\n"
 ""
 msgstr ""
 
-#: ../mdkapplet:259
+#: ../mdkapplet:272
 #, c-format
 msgid ""
 "Wrong Action or host or login.\n"
 ""
 msgstr ""
 
-#: ../mdkapplet:260
+#: ../mdkapplet:273
 #, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or proxy settings)\n"
 ""
 msgstr ""
 
-#: ../mdkapplet:264
+#: ../mdkapplet:277
 #, c-format
 msgid ""
 "System is up-to-date\n"
 ""
 msgstr ""
 
-#: ../mdkapplet:303
+#: ../mdkapplet:317
 #, c-format
 msgid "No check"
 msgstr ""
 
-#: ../mdkapplet:316
+#: ../mdkapplet:330
 #, c-format
 msgid ""
 "Checking Network: seems disabled\n"
 ""
 msgstr ""
 
-#: ../mdkapplet:319
+#: ../mdkapplet:333
 #, c-format
 msgid ""
 "Checking config file: Not present\n"
 ""
 msgstr ""
 
-#: ../mdkapplet:353
+#: ../mdkapplet:365
 #, c-format
 msgid "Logs"
 msgstr ""
 
-#: ../mdkapplet:369
+#: ../mdkapplet:381
 #, c-format
 msgid "Clear"
 msgstr ""
 
-#: ../mdkapplet:396
+#: ../mdkapplet:408
 #, c-format
 msgid "About..."
 msgstr ""
 
-#: ../mdkapplet:397
+#: ../mdkapplet:409
 #, c-format
 msgid "Always launch on startup"
 msgstr ""
 
-#: ../mdkapplet:399
+#: ../mdkapplet:411
 #, c-format
 msgid "Quit"
 msgstr ""
 
-#: ../mdkonline:89
+#: ../mdkonline:52 ../mdkonline:106
 #, c-format
-msgid "Next"
+msgid "Mandrakeonline"
 msgstr ""
 
-#: ../mdkonline:89
+#: ../mdkonline:55
 #, c-format
-msgid "Cancel"
+msgid "I already have an account"
 msgstr ""
 
-#: ../mdkonline:89
+#: ../mdkonline:56
 #, c-format
-msgid "Previous"
+msgid "I want to subscribe"
 msgstr ""
 
-#: ../mdkonline:103
+#: ../mdkonline:89 ../mdkonline:93 ../mdkonline:131
 #, c-format
-msgid "Welcome to Mandrakeonline"
+msgid "Please wait"
 msgstr ""
 
-#: ../mdkonline:104 ../mdkonline_tui:98
+#: ../mdkonline:89
 #, c-format
 msgid ""
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
+"Reading configuration\n"
 ""
 msgstr ""
 
-#: ../mdkonline:105 ../mdkonline_tui:142
-#, c-format
-msgid "Create a Mandrakeonline Account"
-msgstr ""
-
-#: ../mdkonline:107
+#: ../mdkonline:93
 #, c-format
-msgid "I don't have a Mandrakeonline account and I want to subscribe"
+msgid "Sending configuration..."
 msgstr ""
 
-#: ../mdkonline:111 ../mdkonline:131 ../mdkonline_tui:114 ../mdkonline_tui:145
+#: ../mdkonline:109
 #, c-format
-msgid "Login:"
+msgid ""
+"This assistant will help you to upload your configuration\n"
+"(packages, hardware configuration) to a centralized database in\n"
+"order to keep you informed about security updates and useful upgrades.\n"
+""
 msgstr ""
 
-#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:115 ../mdkonline_tui:146
+#: ../mdkonline:114
 #, c-format
-msgid "Password:"
+msgid "Account creation or authentication"
 msgstr ""
 
-#: ../mdkonline:113 ../mdkonline_tui:147
+#: ../mdkonline:119
 #, c-format
-msgid "Confirm Password:"
+msgid "Enter your Mandrakeonline login, password and machine name:"
 msgstr ""
 
-#: ../mdkonline:114 ../mdkonline_tui:148
+#: ../mdkonline:125 ../mdkonline:156
 #, c-format
-msgid "Mail contact:"
+msgid "Login:"
 msgstr ""
 
-#: ../mdkonline:121
+#: ../mdkonline:126 ../mdkonline:157
 #, c-format
-msgid "Mandrakelinux Privacy Policy"
+msgid "Password:"
 msgstr ""
 
 #: ../mdkonline:127
 #, c-format
-msgid "Authentification"
-msgstr ""
-
-#: ../mdkonline:128 ../mdkonline_tui:108
-#, c-format
-msgid "Enter your Mandrakeonline login, password and machine name:"
-msgstr ""
-
-#: ../mdkonline:133 ../mdkonline_tui:116
-#, c-format
 msgid "Machine name:"
 msgstr ""
 
-#: ../mdkonline:138
+#: ../mdkonline:131
 #, c-format
-msgid "Send Configuration"
+msgid "Connecting to Mandrakeonline website..."
 msgstr ""
 
-#: ../mdkonline:139 ../mdkonline_tui:128
+#: ../mdkonline:139
 #, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
@@ -377,52 +376,47 @@ msgid ""
 "www.mandrakeexpert.com."
 msgstr ""
 
-#: ../mdkonline:144 ../mdkonline:211 ../mdkonline:234
+#: ../mdkonline:141 ../mdkonline:180 ../mdkupdate:126 ../mdkupdate:198
 #, c-format
-msgid "Finish"
+msgid "Connection problem"
 msgstr ""
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid "Your upload was successful!"
+msgid "or"
 msgstr ""
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandrakeonline."
+msgid "wrong password:"
 msgstr ""
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
 msgid ""
-"Mandrakeonline offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
-""
-msgstr ""
-
-#: ../mdkonline:146
-#, c-format
-msgid "automated Upgrades"
+"Your login or password was wrong.\n"
+" Either you'll have to type it again, or you'll need to create an account on Mandrakeonline.\n"
+" In the latter case, go back to the first step to connect to Mandrakeonline.\n"
+" Be aware that you must also provide a Machine name \n"
+" (only alphabetical characters are admitted)"
 msgstr ""
 
-#: ../mdkonline:150
+#: ../mdkonline:153
 #, c-format
-msgid "Country:"
+msgid "Create a Mandrakeonline Account"
 msgstr ""
 
-#: ../mdkonline:178 ../mdkonline:183 ../mdkonline:185 ../mdkonline:187
+#: ../mdkonline:158
 #, c-format
-msgid "Error"
+msgid "Confirm Password:"
 msgstr ""
 
-#: ../mdkonline:183 ../mdkonline_tui:152
+#: ../mdkonline:159
 #, c-format
-msgid "Please provide a login"
+msgid "Mail contact:"
 msgstr ""
 
-#: ../mdkonline:185 ../mdkonline_tui:152
+#: ../mdkonline:163
 #, c-format
 msgid ""
 "The passwords do not match\n"
@@ -430,170 +424,126 @@ msgid ""
 ""
 msgstr ""
 
-#: ../mdkonline:187 ../mdkonline_tui:152
+#: ../mdkonline:163
 #, c-format
-msgid ""
-"Not a valid mail address!\n"
-""
+msgid "Please provide a login"
 msgstr ""
 
-#: ../mdkonline:199 ../mdkonline_tui:78
+#: ../mdkonline:163
 #, c-format
 msgid ""
-"Reading configuration\n"
+"Not a valid mail address!\n"
 ""
 msgstr ""
 
-#: ../mdkonline:204 ../mdkonline_tui:82
+#: ../mdkonline:169
 #, c-format
-msgid "Sending configuration..."
+msgid ""
+"Mandrakeonline Account successfully created.\n"
+"Please click \"Next\" to authenticate and upload your configuration\n"
+""
 msgstr ""
 
-#: ../mdkonline:213 ../mdkonline:273 ../mdkonline_tui:130 ../mdkonline_tui:169 ../mdkupdate:124 ../mdkupdate:195
+#: ../mdkonline:178
 #, c-format
-msgid "Connection problem"
+msgid "Your upload was successful!"
 msgstr ""
 
-#: ../mdkonline:213 ../mdkonline_tui:169
+#: ../mdkonline:178
 #, c-format
-msgid "Problem occurs when uploading files, please try again"
+msgid ""
+"From now you will receive on security and updates \n"
+"announcements thanks to Mandrakeonline."
 msgstr ""
 
-#: ../mdkonline:251
+#: ../mdkonline:178
 #, c-format
 msgid ""
-"Quitting Wizard\n"
+"Mandrakeonline offers you the ability to automate the updates.\n"
+"A program will run regulary in your system waiting for new updates\n"
 ""
 msgstr ""
 
-#: ../mdkonline:273
+#: ../mdkonline:180
 #, c-format
-msgid "Mandrakeonline could not be contacted, please try again at a later time"
+msgid "Problem occurs when uploading files, please try again"
 msgstr ""
 
-#: ../mdkonline:285
+#: ../mdkonline:186
 #, c-format
-msgid "Wrong password"
+msgid "Country"
 msgstr ""
 
-#: ../mdkonline:285 ../mdkonline_tui:130
+#: ../mdkonline:198
 #, c-format
-msgid ""
-"Your login or password was wrong.\n"
-" Either you'll have to type it again, or you'll need to create an account on Mandrakeonline.\n"
-" In the latter case, go back to the first step to connect to Mandrakeonline.\n"
-" Be aware that you must also provide a Machine name \n"
-" (only alphabetical characters are admitted)"
+msgid "Congratulations"
 msgstr ""
 
-#: ../mdkonline.pm:58
+#: ../mdkonline:198
 #, c-format
 msgid ""
-"Login and password should be less than 12 characters\n"
+"Your Mandrakeonline account has been successfully configured\n"
 ""
 msgstr ""
 
-#: ../mdkonline.pm:59
+#: ../mdkonline:214
 #, c-format
-msgid ""
-"Special characters are not allowed\n"
-""
+msgid "Configuration uploaded successfully"
 msgstr ""
 
-#: ../mdkonline.pm:60
+#: ../mdkonline:215
 #, c-format
-msgid ""
-"Please fill in all fields\n"
-""
+msgid "Problem uploading configuration"
 msgstr ""
 
-#: ../mdkonline.pm:61
+#: ../mdkonline:216
 #, c-format
-msgid ""
-"Email not valid\n"
-""
+msgid "Cannot connect to mandrakeonline website: wrong login/password or router/firewall bad settings"
 msgstr ""
 
-#: ../mdkonline.pm:62
+#: ../mdkonline.pm:66
 #, c-format
 msgid ""
-"Account already exist\n"
+"Login and password should be less than 12 characters\n"
 ""
 msgstr ""
 
-#: ../mdkonline.pm:68
+#: ../mdkonline.pm:67
 #, c-format
 msgid ""
-"Problem connecting to server \n"
+"Special characters are not allowed\n"
 ""
 msgstr ""
 
-#: ../mdkonline_tui:45 ../mdkonline_tui:95
-#, c-format
-msgid "Mandrakeonline"
-msgstr ""
-
-#: ../mdkonline_tui:48
-#, c-format
-msgid "I already have an account"
-msgstr ""
-
-#: ../mdkonline_tui:49
-#, c-format
-msgid "I want to subscribe"
-msgstr ""
-
-#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:120
-#, c-format
-msgid "Please wait"
-msgstr ""
-
-#: ../mdkonline_tui:103
-#, c-format
-msgid "Account creation or authentication"
-msgstr ""
-
-#: ../mdkonline_tui:120
-#, c-format
-msgid "Connecting to Mandrakeonline website..."
-msgstr ""
-
-#: ../mdkonline_tui:130
-#, c-format
-msgid "or"
-msgstr ""
-
-#: ../mdkonline_tui:130
-#, c-format
-msgid "wrong password:"
-msgstr ""
-
-#: ../mdkonline_tui:158
+#: ../mdkonline.pm:68
 #, c-format
 msgid ""
-"Mandrakeonline Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
+"Please fill in all fields\n"
 ""
 msgstr ""
 
-#: ../mdkonline_tui:175
+#: ../mdkonline.pm:69
 #, c-format
-msgid "Country"
+msgid ""
+"Email not valid\n"
+""
 msgstr ""
 
-#: ../mdkonline_tui:187
+#: ../mdkonline.pm:70
 #, c-format
-msgid "Congratulations"
+msgid ""
+"Account already exist\n"
+""
 msgstr ""
 
-#: ../mdkonline_tui:187
+#: ../mdkonline.pm:76
 #, c-format
 msgid ""
-"Your Mandrakeonline account has been successfully configured\n"
+"Problem connecting to server \n"
 ""
 msgstr ""
 
-#: ../mdkupdate:50
+#: ../mdkupdate:52
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
@@ -604,52 +554,45 @@ msgid ""
 ""
 msgstr ""
 
-#: ../mdkupdate:55
+#: ../mdkupdate:57
 #, c-format
 msgid ""
 "  --help         - print this help message.\n"
 ""
 msgstr ""
 
-#: ../mdkupdate:56
+#: ../mdkupdate:58
 #, c-format
 msgid ""
 "  --auto         - Mandrakeupdate launched automatically.\n"
 ""
 msgstr ""
 
-#: ../mdkupdate:57
+#: ../mdkupdate:59
 #, c-format
 msgid ""
 "  --applet       - launch Mandrakeupdate.\n"
 ""
 msgstr ""
 
-#: ../mdkupdate:58
-#, c-format
-msgid ""
-"  --update       - Update keys\n"
-""
-msgstr ""
-
-#: ../mdkupdate:66
+#: ../mdkupdate:67
 #, c-format
 msgid "No %s file found. Run mdkonline wizard first"
 msgstr ""
 
-#: ../mdkupdate:124
+#: ../mdkupdate:126
 #, c-format
 msgid "Mandrakeupdate could not contact the site, we will try again."
 msgstr ""
 
-#: ../mdkupdate:173
+#: ../mdkupdate:176
 #, c-format
 msgid ""
 "Unable to update packages from mdkupdate medium.\n"
 ""
 msgstr ""
 
-#: ../mdkupdate:195
+#: ../mdkupdate:198
 #, c-format
 msgid "Mandrakeupdate could not upload the diff files. Send a mail to support [at] mandrakeonline [dot] net"
 msgstr ""
diff --git a/po/mk.po b/po/mk.po
index dfd246a4..e8000040 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-mk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-01 22:41+0200\n"
+"POT-Creation-Date: 2004-11-03 12:10+0100\n"
 "PO-Revision-Date: 2004-09-29 20:57+0200\n"
 "Last-Translator: Зоран Димовски <decata@mt.net.mk>\n"
 "Language-Team: Macedonian <ossm-members@hedona.on.net.mk>\n"
@@ -17,12 +17,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3\n"
 
-#: ../mdkapplet:61
+#: ../mdkapplet:63
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Вашиот систем е ажуриран"
 
-#: ../mdkapplet:67
+#: ../mdkapplet:69
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -31,193 +31,203 @@ msgstr ""
 "Проблем при конфигурирање на сервисот. Ве молиме проверете ги логовите и "
 "испратете пошта на  support@mandrakeonline.net"
 
-#: ../mdkapplet:73
+#: ../mdkapplet:75
 #, c-format
 msgid "System is busy. Please wait ..."
 msgstr "Системот е зафатен. Ве молиме почекајте ..."
 
-#: ../mdkapplet:79
+#: ../mdkapplet:81
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Достапни се нови ажурирања за вашиот систем"
 
-#: ../mdkapplet:85
+#: ../mdkapplet:87
 #, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr ""
 "Сервисот не е конфигуриран. Ве молиме притиснете на \"конфигурај го сервисот"
 "\""
 
-#: ../mdkapplet:91
+#: ../mdkapplet:93
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Мрежата не работи. Ве молиме конфигурирајте ја вашата мрежа"
 
-#: ../mdkapplet:97
+#: ../mdkapplet:99
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Сервисот не е вклучен. Ве молиме притиснете на \"Онлајн Веб сајт\""
 
-#: ../mdkapplet:103
+#: ../mdkapplet:105
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 "Верзијата не е подржана (премногу стара верзија или верзија во развоја фаза)"
 
-#: ../mdkapplet:108 ../mdkapplet:158
+#: ../mdkapplet:110 ../mdkapplet:164
 #, c-format
 msgid "Install updates"
 msgstr "Инсталирај надоградувања"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:111
 #, c-format
 msgid "Configure the service"
 msgstr "Конфигурирај го сервисот"
 
-#: ../mdkapplet:110
+#: ../mdkapplet:112
 #, c-format
 msgid "Check Updates"
 msgstr "Провери за ажурирање"
 
-#: ../mdkapplet:111
+#: ../mdkapplet:113 ../mdkapplet:167 ../mdkapplet:225
+#, fuzzy, c-format
+msgid "Please Wait"
+msgstr "Ве молиме, почекајте"
+
+#: ../mdkapplet:113 ../mdkapplet:166 ../mdkapplet:167 ../mdkapplet:225
+#, c-format
+msgid "Check updates"
+msgstr "Провери за ажурирање"
+
+#: ../mdkapplet:115
 #, c-format
 msgid "Online WebSite"
 msgstr "Онлајн Веб сајт"
 
-#: ../mdkapplet:112
+#: ../mdkapplet:116
 #, c-format
 msgid "Configure Network"
 msgstr "Конфигурирај мрежа"
 
-#: ../mdkapplet:113
+#: ../mdkapplet:117
 #, c-format
 msgid "Configure Now!"
 msgstr "Конфигурирај Веднаш!"
 
-#: ../mdkapplet:146
+#: ../mdkapplet:152 ../mdkapplet:229
 #, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Аплет за ажурирање на Mandrakelinux"
 
-#: ../mdkapplet:156
+#: ../mdkapplet:162
 #, c-format
 msgid "Actions"
 msgstr "Акции"
 
-#: ../mdkapplet:159
+#: ../mdkapplet:165
 #, c-format
 msgid "Configure"
 msgstr "Конфигурирај"
 
-#: ../mdkapplet:160
-#, c-format
-msgid "Check updates"
-msgstr "Провери за ажурирање"
-
-#: ../mdkapplet:161
+#: ../mdkapplet:169
 #, c-format
 msgid "See logs"
 msgstr "Види логови"
 
-#: ../mdkapplet:164
+#: ../mdkapplet:172
 #, c-format
 msgid "Status"
 msgstr "Статус"
 
-#: ../mdkapplet:168 ../mdkapplet:363
+#: ../mdkapplet:176 ../mdkapplet:375
 #, c-format
 msgid "Close"
 msgstr "Затвори"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Network Connection: "
 msgstr "Мрежна конекција: "
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Up"
 msgstr "Горе"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Down"
 msgstr "Долу"
 
-#: ../mdkapplet:204
+#: ../mdkapplet:212
 #, c-format
 msgid "Last check: "
 msgstr "Последна проверка: "
 
-#: ../mdkapplet:205
+#: ../mdkapplet:213
 #, c-format
 msgid "Updates: "
 msgstr "Ажурирања: "
 
-#: ../mdkapplet:209
+#: ../mdkapplet:217
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Вклучувам drakconnect\n"
 
-#: ../mdkapplet:213
+#: ../mdkapplet:221
 #, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "Вклучувам mdkupdate --аплет\n"
 
-#: ../mdkapplet:217
+#: ../mdkapplet:224
 #, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 "Изгледа дека Mandrakeonline е повторно инсталиран, го превчитувам "
 "аплетот ...."
 
-#: ../mdkapplet:225
+#: ../mdkapplet:235
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Ги пресметувам новите ажурирања...\n"
 
-#: ../mdkapplet:227
+#: ../mdkapplet:237
 #, c-format
 msgid "Connecting to"
 msgstr "Се поврзувам со"
 
-#: ../mdkapplet:250
+#: ../mdkapplet:244
+#, fuzzy, c-format
+msgid "Response from Mandrakeonline server\n"
+msgstr "Добредојдовте во Mandrakeonline"
+
+#: ../mdkapplet:262
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Проверувам... Пакетите за ажурирање се достапни\n"
 
-#: ../mdkapplet:254
+#: ../mdkapplet:267
 #, c-format
 msgid "Development release not supported by service"
 msgstr "Верзија во развојна фаза, не е подржана од сервисот"
 
-#: ../mdkapplet:255
+#: ../mdkapplet:268
 #, c-format
 msgid "Too old release not supported by service"
 msgstr "Премногу стара верзија, не е подржана од сервисот"
 
-#: ../mdkapplet:256
+#: ../mdkapplet:269
 #, c-format
 msgid "Unknown state"
 msgstr "Непозната држава"
 
-#: ../mdkapplet:257
+#: ../mdkapplet:270
 #, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr ""
 "Онлајн сервисите се оневозможени. Контактирајте со сајтот Mandrakeonline\n"
 
-#: ../mdkapplet:258
+#: ../mdkapplet:271
 #, c-format
 msgid "Wrong Password.\n"
 msgstr "Погрешна лозинка.\n"
 
-#: ../mdkapplet:259
+#: ../mdkapplet:272
 #, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr "Погрешна акција или компјутер или логирање.\n"
 
-#: ../mdkapplet:260
+#: ../mdkapplet:273
 #, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
@@ -226,72 +236,82 @@ msgstr ""
 "Нешто не е во ред со вашите мрежни подесувања (проверете го вашиот route, "
 "firewall или прокси подесувањата)\n"
 
-#: ../mdkapplet:264
+#: ../mdkapplet:277
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Системот е ажуриран\n"
 
-#: ../mdkapplet:303
+#: ../mdkapplet:317
 #, c-format
 msgid "No check"
 msgstr "Без проверка"
 
-#: ../mdkapplet:316
+#: ../mdkapplet:330
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Проверувам мрежа: изгледа е оневозможена\n"
 
-#: ../mdkapplet:319
+#: ../mdkapplet:333
 #, c-format
 msgid "Checking config file: Not present\n"
 msgstr "Проверувам конфигурациона датотека: Не е достапна\n"
 
-#: ../mdkapplet:353
+#: ../mdkapplet:365
 #, c-format
 msgid "Logs"
 msgstr "Логови"
 
-#: ../mdkapplet:369
+#: ../mdkapplet:381
 #, c-format
 msgid "Clear"
 msgstr "Исчисти"
 
-#: ../mdkapplet:396
+#: ../mdkapplet:408
 #, c-format
 msgid "About..."
 msgstr "За..."
 
-#: ../mdkapplet:397
+#: ../mdkapplet:409
 #, c-format
 msgid "Always launch on startup"
 msgstr "Секогаш стартувај при подигање"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:411
 #, c-format
 msgid "Quit"
 msgstr "Напушти"
 
-#: ../mdkonline:89
+#: ../mdkonline:52 ../mdkonline:106
 #, c-format
-msgid "Next"
-msgstr "Следен"
+msgid "Mandrakeonline"
+msgstr "Mandrakeonline"
 
-#: ../mdkonline:89
+#: ../mdkonline:55
 #, c-format
-msgid "Cancel"
-msgstr "Откажи"
+msgid "I already have an account"
+msgstr "Веќе имам сметка"
+
+#: ../mdkonline:56
+#, c-format
+msgid "I want to subscribe"
+msgstr "Сакам да се зачленам"
+
+#: ../mdkonline:89 ../mdkonline:93 ../mdkonline:131
+#, c-format
+msgid "Please wait"
+msgstr "Ве молиме, почекајте"
 
 #: ../mdkonline:89
 #, c-format
-msgid "Previous"
-msgstr "Претходно"
+msgid "Reading configuration\n"
+msgstr "Читам конфигурација\n"
 
-#: ../mdkonline:103
+#: ../mdkonline:93
 #, c-format
-msgid "Welcome to Mandrakeonline"
-msgstr "Добредојдовте во Mandrakeonline"
+msgid "Sending configuration..."
+msgstr "Испраќам конфигурација..."
 
-#: ../mdkonline:104 ../mdkonline_tui:98
+#: ../mdkonline:109
 #, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
@@ -302,62 +322,37 @@ msgstr ""
 "(пакети, хардверска конфигурација) во централизирана база на податоци\n"
 "за да ве известува за сигурносни ажурирања и корисни надоградувања.\n"
 
-#: ../mdkonline:105 ../mdkonline_tui:142
+#: ../mdkonline:114
 #, c-format
-msgid "Create a Mandrakeonline Account"
-msgstr "Создади Mandrakeonline сметка"
+msgid "Account creation or authentication"
+msgstr "Создавање на сметка или автентикација"
 
-#: ../mdkonline:107
+#: ../mdkonline:119
 #, c-format
-msgid "I don't have a Mandrakeonline account and I want to subscribe"
-msgstr "Немам Mandrakeonline сметка и сакам да се зачленам"
+msgid "Enter your Mandrakeonline login, password and machine name:"
+msgstr "Внесете го вашиот Mandrakeonline логин, лозинка и име на машината:"
 
-#: ../mdkonline:111 ../mdkonline:131 ../mdkonline_tui:114 ../mdkonline_tui:145
+#: ../mdkonline:125 ../mdkonline:156
 #, c-format
 msgid "Login:"
 msgstr "Логин:"
 
-#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:115 ../mdkonline_tui:146
+#: ../mdkonline:126 ../mdkonline:157
 #, c-format
 msgid "Password:"
 msgstr "Лозинка:"
 
-#: ../mdkonline:113 ../mdkonline_tui:147
-#, c-format
-msgid "Confirm Password:"
-msgstr "Потврди ја лозинката:"
-
-#: ../mdkonline:114 ../mdkonline_tui:148
-#, c-format
-msgid "Mail contact:"
-msgstr "Пошта за контакт:"
-
-#: ../mdkonline:121
-#, c-format
-msgid "Mandrakelinux Privacy Policy"
-msgstr "Mandrakelinux Полиса за приватноста"
-
 #: ../mdkonline:127
 #, c-format
-msgid "Authentification"
-msgstr "Афтентикација"
-
-#: ../mdkonline:128 ../mdkonline_tui:108
-#, c-format
-msgid "Enter your Mandrakeonline login, password and machine name:"
-msgstr "Внесете го вашиот Mandrakeonline логин, лозинка и име на машината:"
-
-#: ../mdkonline:133 ../mdkonline_tui:116
-#, c-format
 msgid "Machine name:"
 msgstr "Име на машината:"
 
-#: ../mdkonline:138
+#: ../mdkonline:131
 #, c-format
-msgid "Send Configuration"
-msgstr "Испрати ја конфигурацијата"
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Се поврзувам на веб страницата Mandrakeonline..."
 
-#: ../mdkonline:139 ../mdkonline_tui:128
+#: ../mdkonline:139
 #, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
@@ -391,55 +386,55 @@ msgstr ""
 "Дури и придобивате од сервисите за подршка со намалена наплата на\n"
 "www.mandrakeexpert.com."
 
-#: ../mdkonline:144 ../mdkonline:211 ../mdkonline:234
+#: ../mdkonline:141 ../mdkonline:180 ../mdkupdate:126 ../mdkupdate:198
 #, c-format
-msgid "Finish"
-msgstr "Заврши"
+msgid "Connection problem"
+msgstr "Проблем со конекцијата"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid "Your upload was successful!"
-msgstr "Вашето испраќање е успешно!"
+msgid "or"
+msgstr "или"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandrakeonline."
-msgstr ""
-"Од сега па понатаму ќе добивате известувања за \n"
-"сигурност и ажурирања, благодарение на Mandrakeonline."
+msgid "wrong password:"
+msgstr "погрешна лозинка:"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
 msgid ""
-"Mandrakeonline offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+"Your login or password was wrong.\n"
+" Either you'll have to type it again, or you'll need to create an account on "
+"Mandrakeonline.\n"
+" In the latter case, go back to the first step to connect to "
+"Mandrakeonline.\n"
+" Be aware that you must also provide a Machine name \n"
+" (only alphabetical characters are admitted)"
 msgstr ""
-"Mandrakeonline ви ја нуди способноста за автоматско ажурирање.\n"
-"Програма ќе работи регуларно на вашиот систем чекајќи за нови ажирирања\n"
-
-#: ../mdkonline:146
-#, c-format
-msgid "automated Upgrades"
-msgstr "автоматски надоградувања"
+"Вашиот логин или лозиника се погрешни.\n"
+" Треба да ѓи внесете повторно, или ќе треба да направите сметка на "
+"Mandrakeonline.\n"
+" Подоцна, вратете се на првиот чекор и поврзете се со Mandrakeonline.\n"
+" Внимавајте, истотака треба да внесете и име на машината \n"
+" (дозволени се само алфабетски карактери)"
 
-#: ../mdkonline:150
+#: ../mdkonline:153
 #, c-format
-msgid "Country:"
-msgstr "Држава:"
+msgid "Create a Mandrakeonline Account"
+msgstr "Создади Mandrakeonline сметка"
 
-#: ../mdkonline:178 ../mdkonline:183 ../mdkonline:185 ../mdkonline:187
+#: ../mdkonline:158
 #, c-format
-msgid "Error"
-msgstr "Грешка"
+msgid "Confirm Password:"
+msgstr "Потврди ја лозинката:"
 
-#: ../mdkonline:183 ../mdkonline_tui:152
+#: ../mdkonline:159
 #, c-format
-msgid "Please provide a login"
-msgstr "Ве молиме внесете логин"
+msgid "Mail contact:"
+msgstr "Пошта за контакт:"
 
-#: ../mdkonline:185 ../mdkonline_tui:152
+#: ../mdkonline:163
 #, c-format
 msgid ""
 "The passwords do not match\n"
@@ -448,161 +443,117 @@ msgstr ""
 "Лозинките не се совпаѓаат\n"
 " Ве молиме обидете се повторно\n"
 
-#: ../mdkonline:187 ../mdkonline_tui:152
+#: ../mdkonline:163
+#, c-format
+msgid "Please provide a login"
+msgstr "Ве молиме внесете логин"
+
+#: ../mdkonline:163
 #, c-format
 msgid "Not a valid mail address!\n"
 msgstr "Невалидна email адреса!\n"
 
-#: ../mdkonline:199 ../mdkonline_tui:78
+#: ../mdkonline:169
 #, c-format
-msgid "Reading configuration\n"
-msgstr "Читам конфигурација\n"
+msgid ""
+"Mandrakeonline Account successfully created.\n"
+"Please click \"Next\" to authenticate and upload your configuration\n"
+msgstr ""
+"Mandrakeonline сметката е успешно креирана.\n"
+"Ве молиме притиснете \"следно\" за автентикација и испраќање на вашата "
+"конфигурација\n"
 
-#: ../mdkonline:204 ../mdkonline_tui:82
+#: ../mdkonline:178
 #, c-format
-msgid "Sending configuration..."
-msgstr "Испраќам конфигурација..."
+msgid "Your upload was successful!"
+msgstr "Вашето испраќање е успешно!"
 
-#: ../mdkonline:213 ../mdkonline:273 ../mdkonline_tui:130 ../mdkonline_tui:169
-#: ../mdkupdate:124 ../mdkupdate:195
+#: ../mdkonline:178
 #, c-format
-msgid "Connection problem"
-msgstr "Проблем со конекцијата"
+msgid ""
+"From now you will receive on security and updates \n"
+"announcements thanks to Mandrakeonline."
+msgstr ""
+"Од сега па понатаму ќе добивате известувања за \n"
+"сигурност и ажурирања, благодарение на Mandrakeonline."
 
-#: ../mdkonline:213 ../mdkonline_tui:169
+#: ../mdkonline:178
+#, c-format
+msgid ""
+"Mandrakeonline offers you the ability to automate the updates.\n"
+"A program will run regulary in your system waiting for new updates\n"
+msgstr ""
+"Mandrakeonline ви ја нуди способноста за автоматско ажурирање.\n"
+"Програма ќе работи регуларно на вашиот систем чекајќи за нови ажирирања\n"
+
+#: ../mdkonline:180
 #, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr "Проблем при испраќање на датотеките, ве молиме обидете се повторно"
 
-#: ../mdkonline:251
+#: ../mdkonline:186
 #, c-format
-msgid "Quitting Wizard\n"
-msgstr "Излегувам од волшебникот\n"
+msgid "Country"
+msgstr "Држава"
 
-#: ../mdkonline:273
-#, c-format
-msgid "Mandrakeonline could not be contacted, please try again at a later time"
-msgstr "Не можам да контактирам со Mandrakeonline, ве молам обидете се подоцна"
+#: ../mdkonline:198
+#, fuzzy, c-format
+msgid "Congratulations"
+msgstr "Испрати ја конфигурацијата"
 
-#: ../mdkonline:285
+#: ../mdkonline:198
 #, c-format
-msgid "Wrong password"
-msgstr "Погрешна лозинка"
+msgid "Your Mandrakeonline account has been successfully configured\n"
+msgstr ""
 
-#: ../mdkonline:285 ../mdkonline_tui:130
+#: ../mdkonline:214
+#, fuzzy, c-format
+msgid "Configuration uploaded successfully"
+msgstr "Вашето испраќање е успешно!"
+
+#: ../mdkonline:215
+#, fuzzy, c-format
+msgid "Problem uploading configuration"
+msgstr "Читам конфигурација\n"
+
+#: ../mdkonline:216
 #, c-format
 msgid ""
-"Your login or password was wrong.\n"
-" Either you'll have to type it again, or you'll need to create an account on "
-"Mandrakeonline.\n"
-" In the latter case, go back to the first step to connect to "
-"Mandrakeonline.\n"
-" Be aware that you must also provide a Machine name \n"
-" (only alphabetical characters are admitted)"
+"Cannot connect to mandrakeonline website: wrong login/password or router/"
+"firewall bad settings"
 msgstr ""
-"Вашиот логин или лозиника се погрешни.\n"
-" Треба да ѓи внесете повторно, или ќе треба да направите сметка на "
-"Mandrakeonline.\n"
-" Подоцна, вратете се на првиот чекор и поврзете се со Mandrakeonline.\n"
-" Внимавајте, истотака треба да внесете и име на машината \n"
-" (дозволени се само алфабетски карактери)"
 
-#: ../mdkonline.pm:58
+#: ../mdkonline.pm:66
 #, c-format
 msgid "Login and password should be less than 12 characters\n"
 msgstr "Корисничкото име и лозинката треба да се помалку од 12 карактери\n"
 
-#: ../mdkonline.pm:59
+#: ../mdkonline.pm:67
 #, c-format
 msgid "Special characters are not allowed\n"
 msgstr "Не се дозволени специјални карактери\n"
 
-#: ../mdkonline.pm:60
+#: ../mdkonline.pm:68
 #, c-format
 msgid "Please fill in all fields\n"
 msgstr "Ве молиме пополнете ги сите полиња\n"
 
-#: ../mdkonline.pm:61
+#: ../mdkonline.pm:69
 #, c-format
 msgid "Email not valid\n"
 msgstr "Е-пошта адресата не е валидна\n"
 
-#: ../mdkonline.pm:62
+#: ../mdkonline.pm:70
 #, c-format
 msgid "Account already exist\n"
 msgstr "Сметката веќе постои\n"
 
-#: ../mdkonline.pm:68
+#: ../mdkonline.pm:76
 #, c-format
 msgid "Problem connecting to server \n"
 msgstr "Проблем при поврзување со серверот \n"
 
-#: ../mdkonline_tui:45 ../mdkonline_tui:95
-#, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
-
-#: ../mdkonline_tui:48
-#, c-format
-msgid "I already have an account"
-msgstr "Веќе имам сметка"
-
-#: ../mdkonline_tui:49
-#, c-format
-msgid "I want to subscribe"
-msgstr "Сакам да се зачленам"
-
-#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:120
-#, c-format
-msgid "Please wait"
-msgstr "Ве молиме, почекајте"
-
-#: ../mdkonline_tui:103
-#, c-format
-msgid "Account creation or authentication"
-msgstr "Создавање на сметка или автентикација"
-
-#: ../mdkonline_tui:120
-#, c-format
-msgid "Connecting to Mandrakeonline website..."
-msgstr "Се поврзувам на веб страницата Mandrakeonline..."
-
-#: ../mdkonline_tui:130
-#, c-format
-msgid "or"
-msgstr "или"
-
-#: ../mdkonline_tui:130
-#, c-format
-msgid "wrong password:"
-msgstr "погрешна лозинка:"
-
-#: ../mdkonline_tui:158
-#, c-format
-msgid ""
-"Mandrakeonline Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-"Mandrakeonline сметката е успешно креирана.\n"
-"Ве молиме притиснете \"следно\" за автентикација и испраќање на вашата "
-"конфигурација\n"
-
-#: ../mdkonline_tui:175
-#, c-format
-msgid "Country"
-msgstr "Држава"
-
-#: ../mdkonline_tui:187
-#, fuzzy, c-format
-msgid "Congratulations"
-msgstr "Испрати ја конфигурацијата"
-
-#: ../mdkonline_tui:187
-#, c-format
-msgid "Your Mandrakeonline account has been successfully configured\n"
-msgstr ""
-
-#: ../mdkupdate:50
+#: ../mdkupdate:52
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
@@ -618,43 +569,38 @@ msgstr ""
 "\n"
 "употреба:\n"
 
-#: ../mdkupdate:55
+#: ../mdkupdate:57
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - ја печати оваа помошна порака.\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:58
 #, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto         - Автоматско вклучување на Mandrakeupdate.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:59
 #, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - Вклучување на Mandrakeupdate.\n"
 
-#: ../mdkupdate:58
-#, c-format
-msgid "  --update       - Update keys\n"
-msgstr "  --update       - ажурирање на клучевите\n"
-
-#: ../mdkupdate:66
+#: ../mdkupdate:67
 #, c-format
 msgid "No %s file found. Run mdkonline wizard first"
 msgstr "Не е пронајдена датотека %s. Најпрво вклучете го волшебникот mdkonline"
 
-#: ../mdkupdate:124
+#: ../mdkupdate:126
 #, c-format
 msgid "Mandrakeupdate could not contact the site, we will try again."
 msgstr ""
 "Mandrakeupdate не може да контактира со страницата, ќе се обидеме повторно."
 
-#: ../mdkupdate:173
+#: ../mdkupdate:176
 #, c-format
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr "Не можам да ги ажурирам пакетите од медиумот mdkupdate.\n"
 
-#: ../mdkupdate:195
+#: ../mdkupdate:198
 #, c-format
 msgid ""
 "Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
@@ -663,5 +609,52 @@ msgstr ""
 "Mandrakeupdate не може да ги прати diff датотеките. Пратете е-пошта на "
 "support [at] mandrakeonline [dot] net"
 
+#~ msgid "Next"
+#~ msgstr "Следен"
+
+#~ msgid "Cancel"
+#~ msgstr "Откажи"
+
+#~ msgid "Previous"
+#~ msgstr "Претходно"
+
+#~ msgid "I don't have a Mandrakeonline account and I want to subscribe"
+#~ msgstr "Немам Mandrakeonline сметка и сакам да се зачленам"
+
+#~ msgid "Mandrakelinux Privacy Policy"
+#~ msgstr "Mandrakelinux Полиса за приватноста"
+
+#~ msgid "Authentification"
+#~ msgstr "Афтентикација"
+
+#~ msgid "Send Configuration"
+#~ msgstr "Испрати ја конфигурацијата"
+
+#~ msgid "Finish"
+#~ msgstr "Заврши"
+
+#~ msgid "automated Upgrades"
+#~ msgstr "автоматски надоградувања"
+
+#~ msgid "Country:"
+#~ msgstr "Држава:"
+
+#~ msgid "Error"
+#~ msgstr "Грешка"
+
+#~ msgid "Quitting Wizard\n"
+#~ msgstr "Излегувам од волшебникот\n"
+
+#~ msgid ""
+#~ "Mandrakeonline could not be contacted, please try again at a later time"
+#~ msgstr ""
+#~ "Не можам да контактирам со Mandrakeonline, ве молам обидете се подоцна"
+
+#~ msgid "Wrong password"
+#~ msgstr "Погрешна лозинка"
+
+#~ msgid "  --update       - Update keys\n"
+#~ msgstr "  --update       - ажурирање на клучевите\n"
+
 #~ msgid "Skip Wizard"
 #~ msgstr "Прескокни Волшебник"
diff --git a/po/mn.po b/po/mn.po
index 9367b060..01b397ba 100644
--- a/po/mn.po
+++ b/po/mn.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-01 22:41+0200\n"
+"POT-Creation-Date: 2004-11-03 12:10+0100\n"
 "PO-Revision-Date: 2003-02-21 00:17+0100\n"
 "Last-Translator: Sanlig Badral <badral@chinggis.com>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
@@ -15,271 +15,291 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../mdkapplet:61
+#: ../mdkapplet:63
 #, c-format
 msgid "Your system is up-to-date"
 msgstr ""
 
-#: ../mdkapplet:67
+#: ../mdkapplet:69
 #, fuzzy, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrakeonline.net"
 msgstr "Та гарсан асуудлаа support@mandrakeonline.net рүү илгээнэ үү\n"
 
-#: ../mdkapplet:73
+#: ../mdkapplet:75
 #, c-format
 msgid "System is busy. Please wait ..."
 msgstr ""
 
-#: ../mdkapplet:79
+#: ../mdkapplet:81
 #, c-format
 msgid "New updates are available for your system"
 msgstr ""
 
-#: ../mdkapplet:85
+#: ../mdkapplet:87
 #, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr ""
 
-#: ../mdkapplet:91
+#: ../mdkapplet:93
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr ""
 
-#: ../mdkapplet:97
+#: ../mdkapplet:99
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 
-#: ../mdkapplet:103
+#: ../mdkapplet:105
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:108 ../mdkapplet:158
+#: ../mdkapplet:110 ../mdkapplet:164
 #, c-format
 msgid "Install updates"
 msgstr ""
 
-#: ../mdkapplet:109
+#: ../mdkapplet:111
 #, c-format
 msgid "Configure the service"
 msgstr ""
 
-#: ../mdkapplet:110
+#: ../mdkapplet:112
 #, c-format
 msgid "Check Updates"
 msgstr ""
 
-#: ../mdkapplet:111
+#: ../mdkapplet:113 ../mdkapplet:167 ../mdkapplet:225
+#, c-format
+msgid "Please Wait"
+msgstr ""
+
+#: ../mdkapplet:113 ../mdkapplet:166 ../mdkapplet:167 ../mdkapplet:225
+#, c-format
+msgid "Check updates"
+msgstr ""
+
+#: ../mdkapplet:115
 #, c-format
 msgid "Online WebSite"
 msgstr ""
 
-#: ../mdkapplet:112
+#: ../mdkapplet:116
 #, c-format
 msgid "Configure Network"
 msgstr ""
 
-#: ../mdkapplet:113
+#: ../mdkapplet:117
 #, c-format
 msgid "Configure Now!"
 msgstr ""
 
-#: ../mdkapplet:146
+#: ../mdkapplet:152 ../mdkapplet:229
 #, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr ""
 
-#: ../mdkapplet:156
+#: ../mdkapplet:162
 #, c-format
 msgid "Actions"
 msgstr "Үйлдлүүл"
 
-#: ../mdkapplet:159
+#: ../mdkapplet:165
 #, c-format
 msgid "Configure"
 msgstr "Тохируулах"
 
-#: ../mdkapplet:160
-#, c-format
-msgid "Check updates"
-msgstr ""
-
-#: ../mdkapplet:161
+#: ../mdkapplet:169
 #, c-format
 msgid "See logs"
 msgstr ""
 
-#: ../mdkapplet:164
+#: ../mdkapplet:172
 #, c-format
 msgid "Status"
 msgstr "Төлөв"
 
-#: ../mdkapplet:168 ../mdkapplet:363
+#: ../mdkapplet:176 ../mdkapplet:375
 #, c-format
 msgid "Close"
 msgstr "Хаах"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Network Connection: "
 msgstr ""
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Up"
 msgstr ""
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Down"
 msgstr "Доош"
 
-#: ../mdkapplet:204
+#: ../mdkapplet:212
 #, c-format
 msgid "Last check: "
 msgstr ""
 
-#: ../mdkapplet:205
+#: ../mdkapplet:213
 #, c-format
 msgid "Updates: "
 msgstr ""
 
-#: ../mdkapplet:209
+#: ../mdkapplet:217
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr ""
 
-#: ../mdkapplet:213
+#: ../mdkapplet:221
 #, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr ""
 
-#: ../mdkapplet:217
+#: ../mdkapplet:224
 #, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 
-#: ../mdkapplet:225
+#: ../mdkapplet:235
 #, c-format
 msgid "Computing new updates...\n"
 msgstr ""
 
-#: ../mdkapplet:227
+#: ../mdkapplet:237
 #, fuzzy, c-format
 msgid "Connecting to"
 msgstr "Холболтын асуудлууд"
 
-#: ../mdkapplet:250
+#: ../mdkapplet:244
+#, c-format
+msgid "Response from Mandrakeonline server\n"
+msgstr ""
+
+#: ../mdkapplet:262
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr ""
 
-#: ../mdkapplet:254
+#: ../mdkapplet:267
 #, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
-#: ../mdkapplet:255
+#: ../mdkapplet:268
 #, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
-#: ../mdkapplet:256
+#: ../mdkapplet:269
 #, c-format
 msgid "Unknown state"
 msgstr ""
 
-#: ../mdkapplet:257
+#: ../mdkapplet:270
 #, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr ""
 
-#: ../mdkapplet:258
+#: ../mdkapplet:271
 #, fuzzy, c-format
 msgid "Wrong Password.\n"
 msgstr "Нууц үг:"
 
-#: ../mdkapplet:259
+#: ../mdkapplet:272
 #, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr ""
 
-#: ../mdkapplet:260
+#: ../mdkapplet:273
 #, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
 msgstr ""
 
-#: ../mdkapplet:264
+#: ../mdkapplet:277
 #, c-format
 msgid "System is up-to-date\n"
 msgstr ""
 
-#: ../mdkapplet:303
+#: ../mdkapplet:317
 #, c-format
 msgid "No check"
 msgstr ""
 
-#: ../mdkapplet:316
+#: ../mdkapplet:330
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
-#: ../mdkapplet:319
+#: ../mdkapplet:333
 #, c-format
 msgid "Checking config file: Not present\n"
 msgstr ""
 
-#: ../mdkapplet:353
+#: ../mdkapplet:365
 #, fuzzy, c-format
 msgid "Logs"
 msgstr "Нэвтрэх нэр:"
 
-#: ../mdkapplet:369
+#: ../mdkapplet:381
 #, c-format
 msgid "Clear"
 msgstr "Цэвэрлэх"
 
-#: ../mdkapplet:396
+#: ../mdkapplet:408
 #, c-format
 msgid "About..."
 msgstr "Тухай..."
 
-#: ../mdkapplet:397
+#: ../mdkapplet:409
 #, c-format
 msgid "Always launch on startup"
 msgstr ""
 
-#: ../mdkapplet:399
+#: ../mdkapplet:411
 #, c-format
 msgid "Quit"
 msgstr "Гарах"
 
-#: ../mdkonline:89
+#: ../mdkonline:52 ../mdkonline:106
 #, c-format
-msgid "Next"
-msgstr "Дараах"
+msgid "Mandrakeonline"
+msgstr ""
 
-#: ../mdkonline:89
+#: ../mdkonline:55
+#, c-format
+msgid "I already have an account"
+msgstr ""
+
+#: ../mdkonline:56
+#, c-format
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline:89 ../mdkonline:93 ../mdkonline:131
 #, c-format
-msgid "Cancel"
-msgstr "Хүчингүй"
+msgid "Please wait"
+msgstr ""
 
 #: ../mdkonline:89
 #, c-format
-msgid "Previous"
+msgid "Reading configuration\n"
 msgstr ""
 
-#: ../mdkonline:103
+#: ../mdkonline:93
 #, c-format
-msgid "Welcome to Mandrakeonline"
+msgid "Sending configuration..."
 msgstr ""
 
-#: ../mdkonline:104 ../mdkonline_tui:98
+#: ../mdkonline:109
 #, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
@@ -287,63 +307,37 @@ msgid ""
 "order to keep you informed about security updates and useful upgrades.\n"
 msgstr ""
 
-#: ../mdkonline:105 ../mdkonline_tui:142
+#: ../mdkonline:114
 #, c-format
-msgid "Create a Mandrakeonline Account"
+msgid "Account creation or authentication"
 msgstr ""
 
-#: ../mdkonline:107
-#, fuzzy, c-format
-msgid "I don't have a Mandrakeonline account and I want to subscribe"
+#: ../mdkonline:119
+#, c-format
+msgid "Enter your Mandrakeonline login, password and machine name:"
 msgstr ""
-"Үүний тулд та MadrakeOnline -д данстай эсвэл та бүртгэлээ идэвхижүүлэх ёстой."
 
-#: ../mdkonline:111 ../mdkonline:131 ../mdkonline_tui:114 ../mdkonline_tui:145
+#: ../mdkonline:125 ../mdkonline:156
 #, c-format
 msgid "Login:"
 msgstr "Нэвтрэх нэр:"
 
-#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:115 ../mdkonline_tui:146
+#: ../mdkonline:126 ../mdkonline:157
 #, c-format
 msgid "Password:"
 msgstr "Нууц үг:"
 
-#: ../mdkonline:113 ../mdkonline_tui:147
-#, c-format
-msgid "Confirm Password:"
-msgstr "Нууц үгээ бататгах:"
-
-#: ../mdkonline:114 ../mdkonline_tui:148
-#, c-format
-msgid "Mail contact:"
-msgstr ""
-
-#: ../mdkonline:121
-#, c-format
-msgid "Mandrakelinux Privacy Policy"
-msgstr ""
-
 #: ../mdkonline:127
 #, c-format
-msgid "Authentification"
-msgstr ""
-
-#: ../mdkonline:128 ../mdkonline_tui:108
-#, c-format
-msgid "Enter your Mandrakeonline login, password and machine name:"
-msgstr ""
-
-#: ../mdkonline:133 ../mdkonline_tui:116
-#, c-format
 msgid "Machine name:"
 msgstr ""
 
-#: ../mdkonline:138
+#: ../mdkonline:131
 #, c-format
-msgid "Send Configuration"
+msgid "Connecting to Mandrakeonline website..."
 msgstr ""
 
-#: ../mdkonline:139 ../mdkonline_tui:128
+#: ../mdkonline:139
 #, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
@@ -362,51 +356,49 @@ msgid ""
 "www.mandrakeexpert.com."
 msgstr ""
 
-#: ../mdkonline:144 ../mdkonline:211 ../mdkonline:234
+#: ../mdkonline:141 ../mdkonline:180 ../mdkupdate:126 ../mdkupdate:198
 #, c-format
-msgid "Finish"
-msgstr "Дуусгах"
+msgid "Connection problem"
+msgstr "Холболтын асуудлууд"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid "Your upload was successful!"
+msgid "or"
 msgstr ""
 
-#: ../mdkonline:145 ../mdkonline_tui:167
-#, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandrakeonline."
-msgstr ""
+#: ../mdkonline:141
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "Нууц үг:"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
 msgid ""
-"Mandrakeonline offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
-msgstr ""
-
-#: ../mdkonline:146
-#, c-format
-msgid "automated Upgrades"
+"Your login or password was wrong.\n"
+" Either you'll have to type it again, or you'll need to create an account on "
+"Mandrakeonline.\n"
+" In the latter case, go back to the first step to connect to "
+"Mandrakeonline.\n"
+" Be aware that you must also provide a Machine name \n"
+" (only alphabetical characters are admitted)"
 msgstr ""
 
-#: ../mdkonline:150
+#: ../mdkonline:153
 #, c-format
-msgid "Country:"
+msgid "Create a Mandrakeonline Account"
 msgstr ""
 
-#: ../mdkonline:178 ../mdkonline:183 ../mdkonline:185 ../mdkonline:187
+#: ../mdkonline:158
 #, c-format
-msgid "Error"
-msgstr "Алдаа"
+msgid "Confirm Password:"
+msgstr "Нууц үгээ бататгах:"
 
-#: ../mdkonline:183 ../mdkonline_tui:152
+#: ../mdkonline:159
 #, c-format
-msgid "Please provide a login"
+msgid "Mail contact:"
 msgstr ""
 
-#: ../mdkonline:185 ../mdkonline_tui:152
+#: ../mdkonline:163
 #, c-format
 msgid ""
 "The passwords do not match\n"
@@ -415,152 +407,110 @@ msgstr ""
 "Нууц үг таарахгүй байна\n"
 " Дахин оролдож үзнэ үү\n"
 
-#: ../mdkonline:187 ../mdkonline_tui:152
-#, c-format
-msgid "Not a valid mail address!\n"
-msgstr "Зөв биш э-шуудангийн хаяг! \n"
-
-#: ../mdkonline:199 ../mdkonline_tui:78
+#: ../mdkonline:163
 #, c-format
-msgid "Reading configuration\n"
-msgstr ""
-
-#: ../mdkonline:204 ../mdkonline_tui:82
-#, c-format
-msgid "Sending configuration..."
+msgid "Please provide a login"
 msgstr ""
 
-#: ../mdkonline:213 ../mdkonline:273 ../mdkonline_tui:130 ../mdkonline_tui:169
-#: ../mdkupdate:124 ../mdkupdate:195
-#, c-format
-msgid "Connection problem"
-msgstr "Холболтын асуудлууд"
-
-#: ../mdkonline:213 ../mdkonline_tui:169
+#: ../mdkonline:163
 #, c-format
-msgid "Problem occurs when uploading files, please try again"
-msgstr ""
+msgid "Not a valid mail address!\n"
+msgstr "Зөв биш э-шуудангийн хаяг! \n"
 
-#: ../mdkonline:251
+#: ../mdkonline:169
 #, c-format
-msgid "Quitting Wizard\n"
+msgid ""
+"Mandrakeonline Account successfully created.\n"
+"Please click \"Next\" to authenticate and upload your configuration\n"
 msgstr ""
 
-#: ../mdkonline:273
-#, fuzzy, c-format
-msgid "Mandrakeonline could not be contacted, please try again at a later time"
-msgstr "Mandrakeupdate вэб хуудас руу хүрч чадахгүй байна, бид дахин оролдоё."
-
-#: ../mdkonline:285
+#: ../mdkonline:178
 #, c-format
-msgid "Wrong password"
+msgid "Your upload was successful!"
 msgstr ""
 
-#: ../mdkonline:285 ../mdkonline_tui:130
+#: ../mdkonline:178
 #, c-format
 msgid ""
-"Your login or password was wrong.\n"
-" Either you'll have to type it again, or you'll need to create an account on "
-"Mandrakeonline.\n"
-" In the latter case, go back to the first step to connect to "
-"Mandrakeonline.\n"
-" Be aware that you must also provide a Machine name \n"
-" (only alphabetical characters are admitted)"
-msgstr ""
-
-#: ../mdkonline.pm:58
-#, c-format
-msgid "Login and password should be less than 12 characters\n"
+"From now you will receive on security and updates \n"
+"announcements thanks to Mandrakeonline."
 msgstr ""
 
-#: ../mdkonline.pm:59
+#: ../mdkonline:178
 #, c-format
-msgid "Special characters are not allowed\n"
+msgid ""
+"Mandrakeonline offers you the ability to automate the updates.\n"
+"A program will run regulary in your system waiting for new updates\n"
 msgstr ""
 
-#: ../mdkonline.pm:60
+#: ../mdkonline:180
 #, c-format
-msgid "Please fill in all fields\n"
+msgid "Problem occurs when uploading files, please try again"
 msgstr ""
 
-#: ../mdkonline.pm:61
+#: ../mdkonline:186
 #, c-format
-msgid "Email not valid\n"
-msgstr ""
+msgid "Country"
+msgstr "Хөдөөний"
 
-#: ../mdkonline.pm:62
+#: ../mdkonline:198
 #, c-format
-msgid "Account already exist\n"
+msgid "Congratulations"
 msgstr ""
 
-#: ../mdkonline.pm:68
-#, c-format
-msgid "Problem connecting to server \n"
-msgstr "Серверт холбогдоход асуудалтай байна \n"
-
-#: ../mdkonline_tui:45 ../mdkonline_tui:95
+#: ../mdkonline:198
 #, c-format
-msgid "Mandrakeonline"
+msgid "Your Mandrakeonline account has been successfully configured\n"
 msgstr ""
 
-#: ../mdkonline_tui:48
+#: ../mdkonline:214
 #, c-format
-msgid "I already have an account"
+msgid "Configuration uploaded successfully"
 msgstr ""
 
-#: ../mdkonline_tui:49
+#: ../mdkonline:215
 #, c-format
-msgid "I want to subscribe"
+msgid "Problem uploading configuration"
 msgstr ""
 
-#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:120
+#: ../mdkonline:216
 #, c-format
-msgid "Please wait"
+msgid ""
+"Cannot connect to mandrakeonline website: wrong login/password or router/"
+"firewall bad settings"
 msgstr ""
 
-#: ../mdkonline_tui:103
+#: ../mdkonline.pm:66
 #, c-format
-msgid "Account creation or authentication"
+msgid "Login and password should be less than 12 characters\n"
 msgstr ""
 
-#: ../mdkonline_tui:120
+#: ../mdkonline.pm:67
 #, c-format
-msgid "Connecting to Mandrakeonline website..."
+msgid "Special characters are not allowed\n"
 msgstr ""
 
-#: ../mdkonline_tui:130
+#: ../mdkonline.pm:68
 #, c-format
-msgid "or"
+msgid "Please fill in all fields\n"
 msgstr ""
 
-#: ../mdkonline_tui:130
-#, fuzzy, c-format
-msgid "wrong password:"
-msgstr "Нууц үг:"
-
-#: ../mdkonline_tui:158
+#: ../mdkonline.pm:69
 #, c-format
-msgid ""
-"Mandrakeonline Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
+msgid "Email not valid\n"
 msgstr ""
 
-#: ../mdkonline_tui:175
-#, c-format
-msgid "Country"
-msgstr "Хөдөөний"
-
-#: ../mdkonline_tui:187
+#: ../mdkonline.pm:70
 #, c-format
-msgid "Congratulations"
+msgid "Account already exist\n"
 msgstr ""
 
-#: ../mdkonline_tui:187
+#: ../mdkonline.pm:76
 #, c-format
-msgid "Your Mandrakeonline account has been successfully configured\n"
-msgstr ""
+msgid "Problem connecting to server \n"
+msgstr "Серверт холбогдоход асуудалтай байна \n"
 
-#: ../mdkupdate:50
+#: ../mdkupdate:52
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
@@ -577,48 +527,71 @@ msgstr ""
 "\n"
 "Ашиглалт: \n"
 
-#: ../mdkupdate:55
+#: ../mdkupdate:57
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - Энэ тусламжийг хэвлэх.\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:58
 #, fuzzy, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --applet       - Бүх мэдээллийг шинэчлэх.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:59
 #, fuzzy, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - Бүх мэдээллийг шинэчлэх.\n"
 
-#: ../mdkupdate:58
-#, fuzzy, c-format
-msgid "  --update       - Update keys\n"
-msgstr "  --applet       - Бүх мэдээллийг шинэчлэх.\n"
-
-#: ../mdkupdate:66
+#: ../mdkupdate:67
 #, c-format
 msgid "No %s file found. Run mdkonline wizard first"
 msgstr ""
 
-#: ../mdkupdate:124
+#: ../mdkupdate:126
 #, c-format
 msgid "Mandrakeupdate could not contact the site, we will try again."
 msgstr "Mandrakeupdate вэб хуудас руу хүрч чадахгүй байна, бид дахин оролдоё."
 
-#: ../mdkupdate:173
+#: ../mdkupdate:176
 #, c-format
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr "„mdkupdate“ хэрэгслээс багцуудыг шинэчилэхэд алдаа.\n"
 
-#: ../mdkupdate:195
+#: ../mdkupdate:198
 #, c-format
 msgid ""
 "Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
 "mandrakeonline [dot] net"
 msgstr ""
 
+#~ msgid "Next"
+#~ msgstr "Дараах"
+
+#~ msgid "Cancel"
+#~ msgstr "Хүчингүй"
+
+#, fuzzy
+#~ msgid "I don't have a Mandrakeonline account and I want to subscribe"
+#~ msgstr ""
+#~ "Үүний тулд та MadrakeOnline -д данстай эсвэл та бүртгэлээ идэвхижүүлэх "
+#~ "ёстой."
+
+#~ msgid "Finish"
+#~ msgstr "Дуусгах"
+
+#~ msgid "Error"
+#~ msgstr "Алдаа"
+
+#, fuzzy
+#~ msgid ""
+#~ "Mandrakeonline could not be contacted, please try again at a later time"
+#~ msgstr ""
+#~ "Mandrakeupdate вэб хуудас руу хүрч чадахгүй байна, бид дахин оролдоё."
+
+#, fuzzy
+#~ msgid "  --update       - Update keys\n"
+#~ msgstr "  --applet       - Бүх мэдээллийг шинэчлэх.\n"
+
 #~ msgid "Email"
 #~ msgstr "Э-Захиа"
 
diff --git a/po/ms.po b/po/ms.po
index 3e93c1b4..b60d1e5f 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline 0.01\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-01 22:41+0200\n"
+"POT-Creation-Date: 2004-11-03 12:10+0100\n"
 "PO-Revision-Date: 2003-02-20 03:30--730\n"
 "Last-Translator: Yuzz <yuzz@likom.com.my>\n"
 "Language-Team: Bahasa Melayu <yuzz@emasonline.com>\n"
@@ -15,12 +15,12 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../mdkapplet:61
+#: ../mdkapplet:63
 #, c-format
 msgid "Your system is up-to-date"
 msgstr ""
 
-#: ../mdkapplet:67
+#: ../mdkapplet:69
 #, fuzzy, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -28,259 +28,279 @@ msgid ""
 msgstr ""
 "Untuk sebarang masalah sila hantar emel kepada support@mandrakeonline.net\n"
 
-#: ../mdkapplet:73
+#: ../mdkapplet:75
 #, c-format
 msgid "System is busy. Please wait ..."
 msgstr ""
 
-#: ../mdkapplet:79
+#: ../mdkapplet:81
 #, fuzzy, c-format
 msgid "New updates are available for your system"
 msgstr "Konfigurasikan penjimatan tenaga bagi sistem anda"
 
-#: ../mdkapplet:85
+#: ../mdkapplet:87
 #, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr ""
 
-#: ../mdkapplet:91
+#: ../mdkapplet:93
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr ""
 
-#: ../mdkapplet:97
+#: ../mdkapplet:99
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 
-#: ../mdkapplet:103
+#: ../mdkapplet:105
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:108 ../mdkapplet:158
+#: ../mdkapplet:110 ../mdkapplet:164
 #, fuzzy, c-format
 msgid "Install updates"
 msgstr "Install"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:111
 #, fuzzy, c-format
 msgid "Configure the service"
 msgstr "Peranti dikonfigurasikan:\n"
 
-#: ../mdkapplet:110
+#: ../mdkapplet:112
 #, fuzzy, c-format
 msgid "Check Updates"
 msgstr "Kemaskini sekuriti"
 
-#: ../mdkapplet:111
+#: ../mdkapplet:113 ../mdkapplet:167 ../mdkapplet:225
+#, c-format
+msgid "Please Wait"
+msgstr ""
+
+#: ../mdkapplet:113 ../mdkapplet:166 ../mdkapplet:167 ../mdkapplet:225
+#, fuzzy, c-format
+msgid "Check updates"
+msgstr "Kemaskini sekuriti"
+
+#: ../mdkapplet:115
 #, c-format
 msgid "Online WebSite"
 msgstr ""
 
-#: ../mdkapplet:112
+#: ../mdkapplet:116
 #, fuzzy, c-format
 msgid "Configure Network"
 msgstr "Konfigurasikan Gema"
 
-#: ../mdkapplet:113
+#: ../mdkapplet:117
 #, fuzzy, c-format
 msgid "Configure Now!"
 msgstr "Membaca konfigurasi\n"
 
-#: ../mdkapplet:146
+#: ../mdkapplet:152 ../mdkapplet:229
 #, fuzzy, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Polisi Peribadi Mandrakelinux"
 
-#: ../mdkapplet:156
+#: ../mdkapplet:162
 #, c-format
 msgid "Actions"
 msgstr "Aksi"
 
-#: ../mdkapplet:159
+#: ../mdkapplet:165
 #, fuzzy, c-format
 msgid "Configure"
 msgstr "Konfigurasikan ..."
 
-#: ../mdkapplet:160
-#, fuzzy, c-format
-msgid "Check updates"
-msgstr "Kemaskini sekuriti"
-
-#: ../mdkapplet:161
+#: ../mdkapplet:169
 #, fuzzy, c-format
 msgid "See logs"
 msgstr "Lihat +5s"
 
-#: ../mdkapplet:164
+#: ../mdkapplet:172
 #, c-format
 msgid "Status"
 msgstr "Status"
 
-#: ../mdkapplet:168 ../mdkapplet:363
+#: ../mdkapplet:176 ../mdkapplet:375
 #, c-format
 msgid "Close"
 msgstr "Tutup"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, fuzzy, c-format
 msgid "Network Connection: "
 msgstr "Perhubungan"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Up"
 msgstr "Naik"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Down"
 msgstr "Turun"
 
-#: ../mdkapplet:204
+#: ../mdkapplet:212
 #, c-format
 msgid "Last check: "
 msgstr ""
 
-#: ../mdkapplet:205
+#: ../mdkapplet:213
 #, c-format
 msgid "Updates: "
 msgstr ""
 
-#: ../mdkapplet:209
+#: ../mdkapplet:217
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr ""
 
-#: ../mdkapplet:213
+#: ../mdkapplet:221
 #, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr ""
 
-#: ../mdkapplet:217
+#: ../mdkapplet:224
 #, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 
-#: ../mdkapplet:225
+#: ../mdkapplet:235
 #, c-format
 msgid "Computing new updates...\n"
 msgstr ""
 
-#: ../mdkapplet:227
+#: ../mdkapplet:237
 #, fuzzy, c-format
 msgid "Connecting to"
 msgstr "Masalah perhubungan"
 
-#: ../mdkapplet:250
+#: ../mdkapplet:244
+#, fuzzy, c-format
+msgid "Response from Mandrakeonline server\n"
+msgstr "Selamat Datang di Mandrakeonline"
+
+#: ../mdkapplet:262
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr ""
 
-#: ../mdkapplet:254
+#: ../mdkapplet:267
 #, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
-#: ../mdkapplet:255
+#: ../mdkapplet:268
 #, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
-#: ../mdkapplet:256
+#: ../mdkapplet:269
 #, fuzzy, c-format
 msgid "Unknown state"
 msgstr "Nama hos tidak diketahui"
 
-#: ../mdkapplet:257
+#: ../mdkapplet:270
 #, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr ""
 
-#: ../mdkapplet:258
+#: ../mdkapplet:271
 #, c-format
 msgid "Wrong Password.\n"
 msgstr "Salah katalaluan.\n"
 
-#: ../mdkapplet:259
+#: ../mdkapplet:272
 #, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr ""
 
-#: ../mdkapplet:260
+#: ../mdkapplet:273
 #, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
 msgstr ""
 
-#: ../mdkapplet:264
+#: ../mdkapplet:277
 #, c-format
 msgid "System is up-to-date\n"
 msgstr ""
 
-#: ../mdkapplet:303
+#: ../mdkapplet:317
 #, c-format
 msgid "No check"
 msgstr ""
 
-#: ../mdkapplet:316
+#: ../mdkapplet:330
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
-#: ../mdkapplet:319
+#: ../mdkapplet:333
 #, fuzzy, c-format
 msgid "Checking config file: Not present\n"
 msgstr "Periksa sistem fail\n"
 
-#: ../mdkapplet:353
+#: ../mdkapplet:365
 #, c-format
 msgid "Logs"
 msgstr "Log"
 
-#: ../mdkapplet:369
+#: ../mdkapplet:381
 #, c-format
 msgid "Clear"
 msgstr "Kosongkan"
 
-#: ../mdkapplet:396
+#: ../mdkapplet:408
 #, c-format
 msgid "About..."
 msgstr "Keterangan..."
 
-#: ../mdkapplet:397
+#: ../mdkapplet:409
 #, c-format
 msgid "Always launch on startup"
 msgstr ""
 
-#: ../mdkapplet:399
+#: ../mdkapplet:411
 #, c-format
 msgid "Quit"
 msgstr "Keluar"
 
-#: ../mdkonline:89
+#: ../mdkonline:52 ../mdkonline:106
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "Selamat Datang di Mandrakeonline"
+
+#: ../mdkonline:55
 #, c-format
-msgid "Next"
-msgstr "Lanjut"
+msgid "I already have an account"
+msgstr ""
 
-#: ../mdkonline:89
+#: ../mdkonline:56
 #, c-format
-msgid "Cancel"
-msgstr "Batal"
+msgid "I want to subscribe"
+msgstr ""
 
-#: ../mdkonline:89
-#, fuzzy, c-format
-msgid "Previous"
-msgstr "Pralihat"
+#: ../mdkonline:89 ../mdkonline:93 ../mdkonline:131
+#, c-format
+msgid "Please wait"
+msgstr ""
 
-#: ../mdkonline:103
+#: ../mdkonline:89
 #, c-format
-msgid "Welcome to Mandrakeonline"
-msgstr "Selamat Datang di Mandrakeonline"
+msgid "Reading configuration\n"
+msgstr "Membaca konfigurasi\n"
 
-#: ../mdkonline:104 ../mdkonline_tui:98
+#: ../mdkonline:93
+#, fuzzy, c-format
+msgid "Sending configuration..."
+msgstr "Membaca konfigurasi\n"
+
+#: ../mdkonline:109
 #, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
@@ -291,62 +311,37 @@ msgstr ""
 "(pakej, konfigurasi peekakasan) ke pangkalan data pusat agar Anda selalu\n"
 "diberitahu kemaskini sekuriti dan upgrade yang berguna.\n"
 
-#: ../mdkonline:105 ../mdkonline_tui:142
-#, fuzzy, c-format
-msgid "Create a Mandrakeonline Account"
-msgstr "Selamat Datang di Mandrakeonline"
+#: ../mdkonline:114
+#, c-format
+msgid "Account creation or authentication"
+msgstr ""
 
-#: ../mdkonline:107
-#, fuzzy, c-format
-msgid "I don't have a Mandrakeonline account and I want to subscribe"
-msgstr "Saya tak punya account Mandrakeonline dan saya ingin "
+#: ../mdkonline:119
+#, c-format
+msgid "Enter your Mandrakeonline login, password and machine name:"
+msgstr "Masukkan login, katalaluan, dan nama mesin  Mandrakeonline Anda:"
 
-#: ../mdkonline:111 ../mdkonline:131 ../mdkonline_tui:114 ../mdkonline_tui:145
+#: ../mdkonline:125 ../mdkonline:156
 #, c-format
 msgid "Login:"
 msgstr "Login:"
 
-#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:115 ../mdkonline_tui:146
+#: ../mdkonline:126 ../mdkonline:157
 #, c-format
 msgid "Password:"
 msgstr "Katalaluan:"
 
-#: ../mdkonline:113 ../mdkonline_tui:147
-#, c-format
-msgid "Confirm Password:"
-msgstr "Sahkan Katalaluan:"
-
-#: ../mdkonline:114 ../mdkonline_tui:148
-#, fuzzy, c-format
-msgid "Mail contact:"
-msgstr "Hubung mail:"
-
-#: ../mdkonline:121
-#, c-format
-msgid "Mandrakelinux Privacy Policy"
-msgstr "Polisi Peribadi Mandrakelinux"
-
 #: ../mdkonline:127
 #, c-format
-msgid "Authentification"
-msgstr "Otentifikasi"
-
-#: ../mdkonline:128 ../mdkonline_tui:108
-#, c-format
-msgid "Enter your Mandrakeonline login, password and machine name:"
-msgstr "Masukkan login, katalaluan, dan nama mesin  Mandrakeonline Anda:"
-
-#: ../mdkonline:133 ../mdkonline_tui:116
-#, c-format
 msgid "Machine name:"
 msgstr "Nama mesin:"
 
-#: ../mdkonline:138
+#: ../mdkonline:131
 #, fuzzy, c-format
-msgid "Send Configuration"
-msgstr "Membaca konfigurasi\n"
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Selamat Datang di Mandrakeonline"
 
-#: ../mdkonline:139 ../mdkonline_tui:128
+#: ../mdkonline:139
 #, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
@@ -378,55 +373,55 @@ msgstr ""
 "email.\n"
 "Tambahan pula, Anda akan mendapat diskaun servis di www.mandrakeexpert.com."
 
-#: ../mdkonline:144 ../mdkonline:211 ../mdkonline:234
-#, c-format
-msgid "Finish"
-msgstr "Selesai"
-
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141 ../mdkonline:180 ../mdkupdate:126 ../mdkupdate:198
 #, c-format
-msgid "Your upload was successful!"
-msgstr "Upload Anda berjaya!"
+msgid "Connection problem"
+msgstr "Masalah perhubungan"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandrakeonline."
+msgid "or"
 msgstr ""
-"Mulai saat ini Anda akan menerima pengumuman sekuriti dan upgrade\n"
-"dari Mandrakeonline."
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "Salah katalaluan"
+
+#: ../mdkonline:141
 #, c-format
 msgid ""
-"Mandrakeonline offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+"Your login or password was wrong.\n"
+" Either you'll have to type it again, or you'll need to create an account on "
+"Mandrakeonline.\n"
+" In the latter case, go back to the first step to connect to "
+"Mandrakeonline.\n"
+" Be aware that you must also provide a Machine name \n"
+" (only alphabetical characters are admitted)"
 msgstr ""
-"Mandrakeonline memberi Anda kemampuan update automatik.\n"
-"Sebuah program akan berjalan secara periodik menunggu untuk kemaskini baru\n"
-
-#: ../mdkonline:146
-#, c-format
-msgid "automated Upgrades"
-msgstr "upgrade automatik"
+"Login atau katalaluan Anda salah.\n"
+" Anda harus taip sekali lagi, atau membuat akaun di Mandrakeonline.\n"
+" Pada kes terakhir, kembali ke langkah pertama utk menghubungi "
+"Mandrakeonline.\n"
+" Ingat, Anda juga harus memberikan nama Mesin \n"
+" (hanya karektor alfabet sahaj dibenarkan)"
 
-#: ../mdkonline:150
+#: ../mdkonline:153
 #, fuzzy, c-format
-msgid "Country:"
-msgstr "Kawalan:"
+msgid "Create a Mandrakeonline Account"
+msgstr "Selamat Datang di Mandrakeonline"
 
-#: ../mdkonline:178 ../mdkonline:183 ../mdkonline:185 ../mdkonline:187
+#: ../mdkonline:158
 #, c-format
-msgid "Error"
-msgstr "Ralat"
+msgid "Confirm Password:"
+msgstr "Sahkan Katalaluan:"
 
-#: ../mdkonline:183 ../mdkonline_tui:152
+#: ../mdkonline:159
 #, fuzzy, c-format
-msgid "Please provide a login"
-msgstr "Mainkan cereka dan lagu"
+msgid "Mail contact:"
+msgstr "Hubung mail:"
 
-#: ../mdkonline:185 ../mdkonline_tui:152
+#: ../mdkonline:163
 #, c-format
 msgid ""
 "The passwords do not match\n"
@@ -435,158 +430,114 @@ msgstr ""
 "Katalaluan tidak sama\n"
 " Sila cuba lagi\n"
 
-#: ../mdkonline:187 ../mdkonline_tui:152
-#, c-format
-msgid "Not a valid mail address!\n"
-msgstr "Alamat mail yang tidak sah!\n"
-
-#: ../mdkonline:199 ../mdkonline_tui:78
-#, c-format
-msgid "Reading configuration\n"
-msgstr "Membaca konfigurasi\n"
-
-#: ../mdkonline:204 ../mdkonline_tui:82
+#: ../mdkonline:163
 #, fuzzy, c-format
-msgid "Sending configuration..."
-msgstr "Membaca konfigurasi\n"
+msgid "Please provide a login"
+msgstr "Mainkan cereka dan lagu"
 
-#: ../mdkonline:213 ../mdkonline:273 ../mdkonline_tui:130 ../mdkonline_tui:169
-#: ../mdkupdate:124 ../mdkupdate:195
+#: ../mdkonline:163
 #, c-format
-msgid "Connection problem"
-msgstr "Masalah perhubungan"
+msgid "Not a valid mail address!\n"
+msgstr "Alamat mail yang tidak sah!\n"
 
-#: ../mdkonline:213 ../mdkonline_tui:169
+#: ../mdkonline:169
 #, c-format
-msgid "Problem occurs when uploading files, please try again"
+msgid ""
+"Mandrakeonline Account successfully created.\n"
+"Please click \"Next\" to authenticate and upload your configuration\n"
 msgstr ""
 
-#: ../mdkonline:251
+#: ../mdkonline:178
 #, c-format
-msgid "Quitting Wizard\n"
-msgstr "Keluar Wizard\n"
-
-#: ../mdkonline:273
-#, fuzzy, c-format
-msgid "Mandrakeonline could not be contacted, please try again at a later time"
-msgstr "Mandrakeupdate gagal dihubungi, sila cuba sekali lagi."
-
-#: ../mdkonline:285
-#, c-format
-msgid "Wrong password"
-msgstr "Salah katalaluan"
+msgid "Your upload was successful!"
+msgstr "Upload Anda berjaya!"
 
-#: ../mdkonline:285 ../mdkonline_tui:130
+#: ../mdkonline:178
 #, c-format
 msgid ""
-"Your login or password was wrong.\n"
-" Either you'll have to type it again, or you'll need to create an account on "
-"Mandrakeonline.\n"
-" In the latter case, go back to the first step to connect to "
-"Mandrakeonline.\n"
-" Be aware that you must also provide a Machine name \n"
-" (only alphabetical characters are admitted)"
+"From now you will receive on security and updates \n"
+"announcements thanks to Mandrakeonline."
 msgstr ""
-"Login atau katalaluan Anda salah.\n"
-" Anda harus taip sekali lagi, atau membuat akaun di Mandrakeonline.\n"
-" Pada kes terakhir, kembali ke langkah pertama utk menghubungi "
-"Mandrakeonline.\n"
-" Ingat, Anda juga harus memberikan nama Mesin \n"
-" (hanya karektor alfabet sahaj dibenarkan)"
+"Mulai saat ini Anda akan menerima pengumuman sekuriti dan upgrade\n"
+"dari Mandrakeonline."
 
-#: ../mdkonline.pm:58
+#: ../mdkonline:178
 #, c-format
-msgid "Login and password should be less than 12 characters\n"
+msgid ""
+"Mandrakeonline offers you the ability to automate the updates.\n"
+"A program will run regulary in your system waiting for new updates\n"
 msgstr ""
+"Mandrakeonline memberi Anda kemampuan update automatik.\n"
+"Sebuah program akan berjalan secara periodik menunggu untuk kemaskini baru\n"
 
-#: ../mdkonline.pm:59
+#: ../mdkonline:180
 #, c-format
-msgid "Special characters are not allowed\n"
+msgid "Problem occurs when uploading files, please try again"
 msgstr ""
 
-#: ../mdkonline.pm:60
-#, c-format
-msgid "Please fill in all fields\n"
-msgstr ""
+#: ../mdkonline:186
+#, fuzzy, c-format
+msgid "Country"
+msgstr "Kawalan:"
 
-#: ../mdkonline.pm:61
-#, c-format
-msgid "Email not valid\n"
-msgstr ""
+#: ../mdkonline:198
+#, fuzzy, c-format
+msgid "Congratulations"
+msgstr "Membaca konfigurasi\n"
 
-#: ../mdkonline.pm:62
+#: ../mdkonline:198
 #, c-format
-msgid "Account already exist\n"
+msgid "Your Mandrakeonline account has been successfully configured\n"
 msgstr ""
 
-#: ../mdkonline.pm:68
-#, c-format
-msgid "Problem connecting to server \n"
-msgstr "Masalah menyambung ke pelayan \n"
+#: ../mdkonline:214
+#, fuzzy, c-format
+msgid "Configuration uploaded successfully"
+msgstr "Upload Anda berjaya!"
 
-#: ../mdkonline_tui:45 ../mdkonline_tui:95
+#: ../mdkonline:215
 #, fuzzy, c-format
-msgid "Mandrakeonline"
-msgstr "Selamat Datang di Mandrakeonline"
+msgid "Problem uploading configuration"
+msgstr "Membaca konfigurasi\n"
 
-#: ../mdkonline_tui:48
+#: ../mdkonline:216
 #, c-format
-msgid "I already have an account"
+msgid ""
+"Cannot connect to mandrakeonline website: wrong login/password or router/"
+"firewall bad settings"
 msgstr ""
 
-#: ../mdkonline_tui:49
+#: ../mdkonline.pm:66
 #, c-format
-msgid "I want to subscribe"
+msgid "Login and password should be less than 12 characters\n"
 msgstr ""
 
-#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:120
+#: ../mdkonline.pm:67
 #, c-format
-msgid "Please wait"
+msgid "Special characters are not allowed\n"
 msgstr ""
 
-#: ../mdkonline_tui:103
+#: ../mdkonline.pm:68
 #, c-format
-msgid "Account creation or authentication"
+msgid "Please fill in all fields\n"
 msgstr ""
 
-#: ../mdkonline_tui:120
-#, fuzzy, c-format
-msgid "Connecting to Mandrakeonline website..."
-msgstr "Selamat Datang di Mandrakeonline"
-
-#: ../mdkonline_tui:130
+#: ../mdkonline.pm:69
 #, c-format
-msgid "or"
+msgid "Email not valid\n"
 msgstr ""
 
-#: ../mdkonline_tui:130
-#, fuzzy, c-format
-msgid "wrong password:"
-msgstr "Salah katalaluan"
-
-#: ../mdkonline_tui:158
+#: ../mdkonline.pm:70
 #, c-format
-msgid ""
-"Mandrakeonline Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
+msgid "Account already exist\n"
 msgstr ""
 
-#: ../mdkonline_tui:175
-#, fuzzy, c-format
-msgid "Country"
-msgstr "Kawalan:"
-
-#: ../mdkonline_tui:187
-#, fuzzy, c-format
-msgid "Congratulations"
-msgstr "Membaca konfigurasi\n"
-
-#: ../mdkonline_tui:187
+#: ../mdkonline.pm:76
 #, c-format
-msgid "Your Mandrakeonline account has been successfully configured\n"
-msgstr ""
+msgid "Problem connecting to server \n"
+msgstr "Masalah menyambung ke pelayan \n"
 
-#: ../mdkupdate:50
+#: ../mdkupdate:52
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
@@ -602,48 +553,95 @@ msgstr ""
 "\n"
 "penggunaan:\n"
 
-#: ../mdkupdate:55
+#: ../mdkupdate:57
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - cetak mesej bantuan ini.\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:58
 #, fuzzy, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --applet       - kemaskini semua maklumat.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:59
 #, fuzzy, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - kemaskini semua maklumat.\n"
 
-#: ../mdkupdate:58
-#, fuzzy, c-format
-msgid "  --update       - Update keys\n"
-msgstr "  --applet       - kemaskini semua maklumat.\n"
-
-#: ../mdkupdate:66
+#: ../mdkupdate:67
 #, c-format
 msgid "No %s file found. Run mdkonline wizard first"
 msgstr ""
 
-#: ../mdkupdate:124
+#: ../mdkupdate:126
 #, c-format
 msgid "Mandrakeupdate could not contact the site, we will try again."
 msgstr "Mandrakeupdate gagal dihubungi, sila cuba sekali lagi."
 
-#: ../mdkupdate:173
+#: ../mdkupdate:176
 #, c-format
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr "Gagal mengemaskini pakej dari media mdkupdate.\n"
 
-#: ../mdkupdate:195
+#: ../mdkupdate:198
 #, c-format
 msgid ""
 "Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
 "mandrakeonline [dot] net"
 msgstr ""
 
+#~ msgid "Next"
+#~ msgstr "Lanjut"
+
+#~ msgid "Cancel"
+#~ msgstr "Batal"
+
+#, fuzzy
+#~ msgid "Previous"
+#~ msgstr "Pralihat"
+
+#, fuzzy
+#~ msgid "I don't have a Mandrakeonline account and I want to subscribe"
+#~ msgstr "Saya tak punya account Mandrakeonline dan saya ingin "
+
+#~ msgid "Mandrakelinux Privacy Policy"
+#~ msgstr "Polisi Peribadi Mandrakelinux"
+
+#~ msgid "Authentification"
+#~ msgstr "Otentifikasi"
+
+#, fuzzy
+#~ msgid "Send Configuration"
+#~ msgstr "Membaca konfigurasi\n"
+
+#~ msgid "Finish"
+#~ msgstr "Selesai"
+
+#~ msgid "automated Upgrades"
+#~ msgstr "upgrade automatik"
+
+#, fuzzy
+#~ msgid "Country:"
+#~ msgstr "Kawalan:"
+
+#~ msgid "Error"
+#~ msgstr "Ralat"
+
+#~ msgid "Quitting Wizard\n"
+#~ msgstr "Keluar Wizard\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Mandrakeonline could not be contacted, please try again at a later time"
+#~ msgstr "Mandrakeupdate gagal dihubungi, sila cuba sekali lagi."
+
+#~ msgid "Wrong password"
+#~ msgstr "Salah katalaluan"
+
+#, fuzzy
+#~ msgid "  --update       - Update keys\n"
+#~ msgstr "  --applet       - kemaskini semua maklumat.\n"
+
 #, fuzzy
 #~ msgid "Skip Wizard"
 #~ msgstr " Langkau Wizard"
diff --git a/po/mt.po b/po/mt.po
index ef63f16a..e6cc7d59 100644
--- a/po/mt.po
+++ b/po/mt.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-01 22:41+0200\n"
+"POT-Creation-Date: 2004-11-03 12:10+0100\n"
 "PO-Revision-Date: 2004-10-02 06:19+0200\n"
 "Last-Translator: Ramon Casha <ramon.casha@linux.org.mt>\n"
 "Language-Team: Maltese <mt@li.org>\n"
@@ -18,12 +18,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3.1\n"
 
-#: ../mdkapplet:61
+#: ../mdkapplet:63
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Is-sistema tiegħek hija aġġornata"
 
-#: ../mdkapplet:67
+#: ../mdkapplet:69
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -32,190 +32,200 @@ msgstr ""
 "Hemm problema fil-konfigurazzjoni. Iċċekkja l-logs u ibgħat imejl "
 "lilsupport@mandrakeonline.net"
 
-#: ../mdkapplet:73
+#: ../mdkapplet:75
 #, c-format
 msgid "System is busy. Please wait ..."
 msgstr "Is-sistema hija okkupata. Stenna ftit ..."
 
-#: ../mdkapplet:79
+#: ../mdkapplet:81
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Hemm aġġornamenti ġodda għas-sistema tiegħek"
 
-#: ../mdkapplet:85
+#: ../mdkapplet:87
 #, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr ""
 "Is-servizz għadu mhux konfigurat. Ikklikkja fuq \"Ikkonfigura s-servizz\""
 
-#: ../mdkapplet:91
+#: ../mdkapplet:93
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "In-network mhux imtella'. Jekk jogħġbok issettja n-network."
 
-#: ../mdkapplet:97
+#: ../mdkapplet:99
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "is-servizz mhux attivat. Jekk jogħġbok klikkja fuq \"Sit online\""
 
-#: ../mdkapplet:103
+#: ../mdkapplet:105
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "Verżjoni mhux sapportita (antika wisq, jew verżjoni ta' żvilupp)"
 
-#: ../mdkapplet:108 ../mdkapplet:158
+#: ../mdkapplet:110 ../mdkapplet:164
 #, c-format
 msgid "Install updates"
 msgstr "Installa aġġornamenti"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:111
 #, c-format
 msgid "Configure the service"
 msgstr "Ikkonfigura s-servizz"
 
-#: ../mdkapplet:110
+#: ../mdkapplet:112
 #, c-format
 msgid "Check Updates"
 msgstr "Iċċekkja għal aġġornamenti"
 
-#: ../mdkapplet:111
+#: ../mdkapplet:113 ../mdkapplet:167 ../mdkapplet:225
+#, fuzzy, c-format
+msgid "Please Wait"
+msgstr "Stenna ftit"
+
+#: ../mdkapplet:113 ../mdkapplet:166 ../mdkapplet:167 ../mdkapplet:225
+#, c-format
+msgid "Check updates"
+msgstr "Iċċekkja aġġornamenti"
+
+#: ../mdkapplet:115
 #, c-format
 msgid "Online WebSite"
 msgstr "Sit online"
 
-#: ../mdkapplet:112
+#: ../mdkapplet:116
 #, c-format
 msgid "Configure Network"
 msgstr "Ikkonfigura n-network"
 
-#: ../mdkapplet:113
+#: ../mdkapplet:117
 #, c-format
 msgid "Configure Now!"
 msgstr "Ikkonfigura issa"
 
-#: ../mdkapplet:146
+#: ../mdkapplet:152 ../mdkapplet:229
 #, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Applet għall-aġġornamenti Mandrakelinux"
 
-#: ../mdkapplet:156
+#: ../mdkapplet:162
 #, c-format
 msgid "Actions"
 msgstr "Azzjonijiet"
 
-#: ../mdkapplet:159
+#: ../mdkapplet:165
 #, c-format
 msgid "Configure"
 msgstr "Ikkonfigura"
 
-#: ../mdkapplet:160
-#, c-format
-msgid "Check updates"
-msgstr "Iċċekkja aġġornamenti"
-
-#: ../mdkapplet:161
+#: ../mdkapplet:169
 #, c-format
 msgid "See logs"
 msgstr "Ara logs"
 
-#: ../mdkapplet:164
+#: ../mdkapplet:172
 #, c-format
 msgid "Status"
 msgstr "Stat"
 
-#: ../mdkapplet:168 ../mdkapplet:363
+#: ../mdkapplet:176 ../mdkapplet:375
 #, c-format
 msgid "Close"
 msgstr "Agħlaq"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Network Connection: "
 msgstr "Konnessjoni network:"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Up"
 msgstr "Fuq"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Down"
 msgstr "isfel"
 
-#: ../mdkapplet:204
+#: ../mdkapplet:212
 #, c-format
 msgid "Last check: "
 msgstr "L-aħħar li ċċekkjajt: "
 
-#: ../mdkapplet:205
+#: ../mdkapplet:213
 #, c-format
 msgid "Updates: "
 msgstr "Aġġornamenti: "
 
-#: ../mdkapplet:209
+#: ../mdkapplet:217
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Qed jitħaddem drakconnect\n"
 
-#: ../mdkapplet:213
+#: ../mdkapplet:221
 #, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "Qed jitħaddem mdkupdate --applet\n"
 
-#: ../mdkapplet:217
+#: ../mdkapplet:224
 #, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 "Mandrakeonline jidher li reġa' ġie installat, qed terġa' tittella' l-"
 "applet ..."
 
-#: ../mdkapplet:225
+#: ../mdkapplet:235
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Qed jiġu kalkulati aġġornamenti ġodda...\n"
 
-#: ../mdkapplet:227
+#: ../mdkapplet:237
 #, c-format
 msgid "Connecting to"
 msgstr "Qed issir konnessjoni ma'"
 
-#: ../mdkapplet:250
+#: ../mdkapplet:244
+#, fuzzy, c-format
+msgid "Response from Mandrakeonline server\n"
+msgstr "Merħba għal Mandrakeonline"
+
+#: ../mdkapplet:262
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Qed jiġu ċċekkjati... hemm aġġornamenti disponibbli\n"
 
-#: ../mdkapplet:254
+#: ../mdkapplet:267
 #, c-format
 msgid "Development release not supported by service"
 msgstr "Verżjoni ta' żvilupp mhux sapportita mis-servizz"
 
-#: ../mdkapplet:255
+#: ../mdkapplet:268
 #, c-format
 msgid "Too old release not supported by service"
 msgstr "Verżjoni antika wisq mhux sapportita mis-servizz"
 
-#: ../mdkapplet:256
+#: ../mdkapplet:269
 #, c-format
 msgid "Unknown state"
 msgstr "Stat mhux magħruf"
 
-#: ../mdkapplet:257
+#: ../mdkapplet:270
 #, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr "Servizzi online mhux attivi. Ikkuntattja s-sit ta' Mandrakeonline\n"
 
-#: ../mdkapplet:258
+#: ../mdkapplet:271
 #, c-format
 msgid "Wrong Password.\n"
 msgstr "Password ħażina.\n"
 
-#: ../mdkapplet:259
+#: ../mdkapplet:272
 #, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr "Azzjoni, login jew server ħażin.\n"
 
-#: ../mdkapplet:260
+#: ../mdkapplet:273
 #, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
@@ -224,72 +234,82 @@ msgstr ""
 "Hemm problema bis-setings tan-network tiegħek (iċċekkja s-setings ta' route, "
 "firewall jew proxy)\n"
 
-#: ../mdkapplet:264
+#: ../mdkapplet:277
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Is-sistema hija aġġornata\n"
 
-#: ../mdkapplet:303
+#: ../mdkapplet:317
 #, c-format
 msgid "No check"
 msgstr "Ebda ċċekkjar"
 
-#: ../mdkapplet:316
+#: ../mdkapplet:330
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Qed niċċekkja n-network... jidher li mitfi\n"
 
-#: ../mdkapplet:319
+#: ../mdkapplet:333
 #, c-format
 msgid "Checking config file: Not present\n"
 msgstr "Qed jiġi ċċekkjat fajl ta' konfigurazzjoni: mhux preżenti\n"
 
-#: ../mdkapplet:353
+#: ../mdkapplet:365
 #, c-format
 msgid "Logs"
 msgstr "Logs"
 
-#: ../mdkapplet:369
+#: ../mdkapplet:381
 #, c-format
 msgid "Clear"
 msgstr "Ħassar"
 
-#: ../mdkapplet:396
+#: ../mdkapplet:408
 #, c-format
 msgid "About..."
 msgstr "Dwar.."
 
-#: ../mdkapplet:397
+#: ../mdkapplet:409
 #, c-format
 msgid "Always launch on startup"
 msgstr "Dejjem ħaddem mat-tlugħ"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:411
 #, c-format
 msgid "Quit"
 msgstr "Oħroġ"
 
-#: ../mdkonline:89
+#: ../mdkonline:52 ../mdkonline:106
 #, c-format
-msgid "Next"
-msgstr "Li jmiss"
+msgid "Mandrakeonline"
+msgstr "Mandrakeonline"
 
-#: ../mdkonline:89
+#: ../mdkonline:55
 #, c-format
-msgid "Cancel"
-msgstr "Ikkanċella"
+msgid "I already have an account"
+msgstr "Diġà għandi kont"
+
+#: ../mdkonline:56
+#, c-format
+msgid "I want to subscribe"
+msgstr "Nixtieq nabbona"
+
+#: ../mdkonline:89 ../mdkonline:93 ../mdkonline:131
+#, c-format
+msgid "Please wait"
+msgstr "Stenna ftit"
 
 #: ../mdkonline:89
 #, c-format
-msgid "Previous"
-msgstr "Ta' qabel"
+msgid "Reading configuration\n"
+msgstr "Qed tinqara' l-konfigurazzjoni\n"
 
-#: ../mdkonline:103
+#: ../mdkonline:93
 #, c-format
-msgid "Welcome to Mandrakeonline"
-msgstr "Merħba għal Mandrakeonline"
+msgid "Sending configuration..."
+msgstr "Qed tintbagħat konfigurazzjoni..."
 
-#: ../mdkonline:104 ../mdkonline_tui:98
+#: ../mdkonline:109
 #, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
@@ -300,62 +320,37 @@ msgstr ""
 "(pakketti, konfigurazzjoni tal-magna) lill database ċentrali sabiex\n"
 "tinżamm infurmat dwar aġġornamenti ta' sigurtà u oħrajn utli.\n"
 
-#: ../mdkonline:105 ../mdkonline_tui:142
+#: ../mdkonline:114
 #, c-format
-msgid "Create a Mandrakeonline Account"
-msgstr "Oħloq kont Mandrakeonline"
+msgid "Account creation or authentication"
+msgstr "Ħolqien jew awtentikazzjoni ta' kont"
 
-#: ../mdkonline:107
+#: ../mdkonline:119
 #, c-format
-msgid "I don't have a Mandrakeonline account and I want to subscribe"
-msgstr "M'għandix kont fuq Mandrakeonline u nixtieq nabbona"
+msgid "Enter your Mandrakeonline login, password and machine name:"
+msgstr "Daħħal il-login, password u isem tal-kompjuter għal Mandrakeonline:"
 
-#: ../mdkonline:111 ../mdkonline:131 ../mdkonline_tui:114 ../mdkonline_tui:145
+#: ../mdkonline:125 ../mdkonline:156
 #, c-format
 msgid "Login:"
 msgstr "Login:"
 
-#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:115 ../mdkonline_tui:146
+#: ../mdkonline:126 ../mdkonline:157
 #, c-format
 msgid "Password:"
 msgstr "Password:"
 
-#: ../mdkonline:113 ../mdkonline_tui:147
-#, c-format
-msgid "Confirm Password:"
-msgstr "Ikkonferma password:"
-
-#: ../mdkonline:114 ../mdkonline_tui:148
-#, c-format
-msgid "Mail contact:"
-msgstr "Kuntatt imejl:"
-
-#: ../mdkonline:121
-#, c-format
-msgid "Mandrakelinux Privacy Policy"
-msgstr "Polza ta' privatezza Mandrakelinux"
-
 #: ../mdkonline:127
 #, c-format
-msgid "Authentification"
-msgstr "Awtentikazzjoni"
-
-#: ../mdkonline:128 ../mdkonline_tui:108
-#, c-format
-msgid "Enter your Mandrakeonline login, password and machine name:"
-msgstr "Daħħal il-login, password u isem tal-kompjuter għal Mandrakeonline:"
-
-#: ../mdkonline:133 ../mdkonline_tui:116
-#, c-format
 msgid "Machine name:"
 msgstr "Isem tal-kompjuter:"
 
-#: ../mdkonline:138
+#: ../mdkonline:131
 #, c-format
-msgid "Send Configuration"
-msgstr "Ibgħat konfigurazzjoni"
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Qed naqbad mas-sit Mandrakeonline..."
 
-#: ../mdkonline:139 ../mdkonline_tui:128
+#: ../mdkonline:139
 #, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
@@ -389,56 +384,54 @@ msgstr ""
 "vantaġġ\n"
 "minn skonti fuq servizzi oħra bil-ħlas minn www.mandrakeexpert.com."
 
-#: ../mdkonline:144 ../mdkonline:211 ../mdkonline:234
+#: ../mdkonline:141 ../mdkonline:180 ../mdkupdate:126 ../mdkupdate:198
 #, c-format
-msgid "Finish"
-msgstr "Spiċċa"
+msgid "Connection problem"
+msgstr "Problema fil-konnessjoni"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid "Your upload was successful!"
-msgstr "It-trasferiment tal-informazzjoni rnexxa."
+msgid "or"
+msgstr "jew"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandrakeonline."
-msgstr ""
-"Minn issa 'l quddiem int tirċievi notifiki dwar \n"
-"sigurtà u aġġornamenti minngħand Mandrakeonline."
+msgid "wrong password:"
+msgstr "Password ħażina:"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
 msgid ""
-"Mandrakeonline offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+"Your login or password was wrong.\n"
+" Either you'll have to type it again, or you'll need to create an account on "
+"Mandrakeonline.\n"
+" In the latter case, go back to the first step to connect to "
+"Mandrakeonline.\n"
+" Be aware that you must also provide a Machine name \n"
+" (only alphabetical characters are admitted)"
 msgstr ""
-"Mandrakeonline joffrilek il-possibbiltà li taġġorna s-sistema "
-"awtomatikament.\n"
-"Regularment jitħaddem programm fuq is-sistema biex jistenna aġġornamenti.\n"
-
-#: ../mdkonline:146
-#, c-format
-msgid "automated Upgrades"
-msgstr "Aġġornamenti awtomatiċi"
+"Il-login jew password kien ħażin.\n"
+"Jew erġa' ttajpjaha, jew trid toħloq kont ieħor ma' Mandrakeonline.\n"
+"F'dak il-każ, mur lura fl-ewwel pass biex taqbad ma' Mandrakeonline.\n"
+"Innota li trid tipprovdi wkoll isem ta' kompjuter (karattri alfabetiċi biss "
+"aċċettati)"
 
-#: ../mdkonline:150
+#: ../mdkonline:153
 #, c-format
-msgid "Country:"
-msgstr "Pajjiż:"
+msgid "Create a Mandrakeonline Account"
+msgstr "Oħloq kont Mandrakeonline"
 
-#: ../mdkonline:178 ../mdkonline:183 ../mdkonline:185 ../mdkonline:187
+#: ../mdkonline:158
 #, c-format
-msgid "Error"
-msgstr "Problema"
+msgid "Confirm Password:"
+msgstr "Ikkonferma password:"
 
-#: ../mdkonline:183 ../mdkonline_tui:152
+#: ../mdkonline:159
 #, c-format
-msgid "Please provide a login"
-msgstr "Jekk jogħġbok ipprovdi login"
+msgid "Mail contact:"
+msgstr "Kuntatt imejl:"
 
-#: ../mdkonline:185 ../mdkonline_tui:152
+#: ../mdkonline:163
 #, c-format
 msgid ""
 "The passwords do not match\n"
@@ -447,160 +440,118 @@ msgstr ""
 "Il-passwords ma jaqblux.\n"
 "Jekk jogħġbok erġa' pprova\n"
 
-#: ../mdkonline:187 ../mdkonline_tui:152
+#: ../mdkonline:163
+#, c-format
+msgid "Please provide a login"
+msgstr "Jekk jogħġbok ipprovdi login"
+
+#: ../mdkonline:163
 #, c-format
 msgid "Not a valid mail address!\n"
 msgstr "Dan mhux indirizz tal-imejl validu!\n"
 
-#: ../mdkonline:199 ../mdkonline_tui:78
+#: ../mdkonline:169
 #, c-format
-msgid "Reading configuration\n"
-msgstr "Qed tinqara' l-konfigurazzjoni\n"
+msgid ""
+"Mandrakeonline Account successfully created.\n"
+"Please click \"Next\" to authenticate and upload your configuration\n"
+msgstr ""
+"Kont Mandrakeonline inħoloq.\n"
+"Jekk jogħġbok agħfas \"Li Jmiss\" biex tawtentika ruħek u tibgħat il-"
+"konfigurazzjoni\n"
 
-#: ../mdkonline:204 ../mdkonline_tui:82
+#: ../mdkonline:178
 #, c-format
-msgid "Sending configuration..."
-msgstr "Qed tintbagħat konfigurazzjoni..."
+msgid "Your upload was successful!"
+msgstr "It-trasferiment tal-informazzjoni rnexxa."
 
-#: ../mdkonline:213 ../mdkonline:273 ../mdkonline_tui:130 ../mdkonline_tui:169
-#: ../mdkupdate:124 ../mdkupdate:195
+#: ../mdkonline:178
 #, c-format
-msgid "Connection problem"
-msgstr "Problema fil-konnessjoni"
+msgid ""
+"From now you will receive on security and updates \n"
+"announcements thanks to Mandrakeonline."
+msgstr ""
+"Minn issa 'l quddiem int tirċievi notifiki dwar \n"
+"sigurtà u aġġornamenti minngħand Mandrakeonline."
+
+#: ../mdkonline:178
+#, c-format
+msgid ""
+"Mandrakeonline offers you the ability to automate the updates.\n"
+"A program will run regulary in your system waiting for new updates\n"
+msgstr ""
+"Mandrakeonline joffrilek il-possibbiltà li taġġorna s-sistema "
+"awtomatikament.\n"
+"Regularment jitħaddem programm fuq is-sistema biex jistenna aġġornamenti.\n"
 
-#: ../mdkonline:213 ../mdkonline_tui:169
+#: ../mdkonline:180
 #, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr "Problema waqt li jintbagħtu l-fajls, erġa' pprova"
 
-#: ../mdkonline:251
+#: ../mdkonline:186
 #, c-format
-msgid "Quitting Wizard\n"
-msgstr "Ħiereġ is-saħħar\n"
+msgid "Country"
+msgstr "Pajjiż"
 
-#: ../mdkonline:273
+#: ../mdkonline:198
 #, c-format
-msgid "Mandrakeonline could not be contacted, please try again at a later time"
-msgstr "Mandrakeonline ma setax jiġi kuntattjat, ipprova iżjed tard"
+msgid "Congratulations"
+msgstr "Prosit"
 
-#: ../mdkonline:285
+#: ../mdkonline:198
 #, c-format
-msgid "Wrong password"
-msgstr "Password ħażina"
+msgid "Your Mandrakeonline account has been successfully configured\n"
+msgstr "Il-kont Mandrakeonline tiegħek ġie konfigurat\n"
+
+#: ../mdkonline:214
+#, fuzzy, c-format
+msgid "Configuration uploaded successfully"
+msgstr "It-trasferiment tal-informazzjoni rnexxa."
+
+#: ../mdkonline:215
+#, fuzzy, c-format
+msgid "Problem uploading configuration"
+msgstr "Qed tinqara' l-konfigurazzjoni\n"
 
-#: ../mdkonline:285 ../mdkonline_tui:130
+#: ../mdkonline:216
 #, c-format
 msgid ""
-"Your login or password was wrong.\n"
-" Either you'll have to type it again, or you'll need to create an account on "
-"Mandrakeonline.\n"
-" In the latter case, go back to the first step to connect to "
-"Mandrakeonline.\n"
-" Be aware that you must also provide a Machine name \n"
-" (only alphabetical characters are admitted)"
+"Cannot connect to mandrakeonline website: wrong login/password or router/"
+"firewall bad settings"
 msgstr ""
-"Il-login jew password kien ħażin.\n"
-"Jew erġa' ttajpjaha, jew trid toħloq kont ieħor ma' Mandrakeonline.\n"
-"F'dak il-każ, mur lura fl-ewwel pass biex taqbad ma' Mandrakeonline.\n"
-"Innota li trid tipprovdi wkoll isem ta' kompjuter (karattri alfabetiċi biss "
-"aċċettati)"
 
-#: ../mdkonline.pm:58
+#: ../mdkonline.pm:66
 #, c-format
 msgid "Login and password should be less than 12 characters\n"
 msgstr "Login u password iridu jkunu inqas minn 12-il karattru\n"
 
-#: ../mdkonline.pm:59
+#: ../mdkonline.pm:67
 #, c-format
 msgid "Special characters are not allowed\n"
 msgstr "Karattri speċjali mhux permessi\n"
 
-#: ../mdkonline.pm:60
+#: ../mdkonline.pm:68
 #, c-format
 msgid "Please fill in all fields\n"
 msgstr "Jekk jogħġbok imla l-kaxex kollha\n"
 
-#: ../mdkonline.pm:61
+#: ../mdkonline.pm:69
 #, c-format
 msgid "Email not valid\n"
 msgstr "Imejl mhux validu\n"
 
-#: ../mdkonline.pm:62
+#: ../mdkonline.pm:70
 #, c-format
 msgid "Account already exist\n"
 msgstr "Kont diġà jeżisti\n"
 
-#: ../mdkonline.pm:68
+#: ../mdkonline.pm:76
 #, c-format
 msgid "Problem connecting to server \n"
 msgstr "Problema fil-konnessjoni mas-server\n"
 
-#: ../mdkonline_tui:45 ../mdkonline_tui:95
-#, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
-
-#: ../mdkonline_tui:48
-#, c-format
-msgid "I already have an account"
-msgstr "Diġà għandi kont"
-
-#: ../mdkonline_tui:49
-#, c-format
-msgid "I want to subscribe"
-msgstr "Nixtieq nabbona"
-
-#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:120
-#, c-format
-msgid "Please wait"
-msgstr "Stenna ftit"
-
-#: ../mdkonline_tui:103
-#, c-format
-msgid "Account creation or authentication"
-msgstr "Ħolqien jew awtentikazzjoni ta' kont"
-
-#: ../mdkonline_tui:120
-#, c-format
-msgid "Connecting to Mandrakeonline website..."
-msgstr "Qed naqbad mas-sit Mandrakeonline..."
-
-#: ../mdkonline_tui:130
-#, c-format
-msgid "or"
-msgstr "jew"
-
-#: ../mdkonline_tui:130
-#, c-format
-msgid "wrong password:"
-msgstr "Password ħażina:"
-
-#: ../mdkonline_tui:158
-#, c-format
-msgid ""
-"Mandrakeonline Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-"Kont Mandrakeonline inħoloq.\n"
-"Jekk jogħġbok agħfas \"Li Jmiss\" biex tawtentika ruħek u tibgħat il-"
-"konfigurazzjoni\n"
-
-#: ../mdkonline_tui:175
-#, c-format
-msgid "Country"
-msgstr "Pajjiż"
-
-#: ../mdkonline_tui:187
-#, c-format
-msgid "Congratulations"
-msgstr "Prosit"
-
-#: ../mdkonline_tui:187
-#, c-format
-msgid "Your Mandrakeonline account has been successfully configured\n"
-msgstr "Il-kont Mandrakeonline tiegħek ġie konfigurat\n"
-
-#: ../mdkupdate:50
+#: ../mdkupdate:52
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
@@ -617,42 +568,37 @@ msgstr ""
 "\n"
 "użu:\n"
 
-#: ../mdkupdate:55
+#: ../mdkupdate:57
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - uri dan il-messaġġ ta' għajnuna.\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:58
 #, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto         - Mandrakeupdate jitħaddem awtomatikament.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:59
 #, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - ħaddem Mandrakeupdate.\n"
 
-#: ../mdkupdate:58
-#, c-format
-msgid "  --update       - Update keys\n"
-msgstr "  --update       - Aġġorna ċifrarji\n"
-
-#: ../mdkupdate:66
+#: ../mdkupdate:67
 #, c-format
 msgid "No %s file found. Run mdkonline wizard first"
 msgstr "Ebda fajl %s misjub. L-ewwel ħaddem is-saħħar mdkonline"
 
-#: ../mdkupdate:124
+#: ../mdkupdate:126
 #, c-format
 msgid "Mandrakeupdate could not contact the site, we will try again."
 msgstr "Mandrakeonline ma setax jikkuntattja s-sit, se nerġa' nipprova"
 
-#: ../mdkupdate:173
+#: ../mdkupdate:176
 #, c-format
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr "Ma stajtx naġġorna pakketti mis-sors mdkupdate.\n"
 
-#: ../mdkupdate:195
+#: ../mdkupdate:198
 #, c-format
 msgid ""
 "Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
@@ -660,3 +606,49 @@ msgid ""
 msgstr ""
 "Mandrakeupdate ma setax jibgħat il-fajls diff. Ibgħat imejl lil support [at] "
 "mandrakeonline [dot] net"
+
+#~ msgid "Next"
+#~ msgstr "Li jmiss"
+
+#~ msgid "Cancel"
+#~ msgstr "Ikkanċella"
+
+#~ msgid "Previous"
+#~ msgstr "Ta' qabel"
+
+#~ msgid "I don't have a Mandrakeonline account and I want to subscribe"
+#~ msgstr "M'għandix kont fuq Mandrakeonline u nixtieq nabbona"
+
+#~ msgid "Mandrakelinux Privacy Policy"
+#~ msgstr "Polza ta' privatezza Mandrakelinux"
+
+#~ msgid "Authentification"
+#~ msgstr "Awtentikazzjoni"
+
+#~ msgid "Send Configuration"
+#~ msgstr "Ibgħat konfigurazzjoni"
+
+#~ msgid "Finish"
+#~ msgstr "Spiċċa"
+
+#~ msgid "automated Upgrades"
+#~ msgstr "Aġġornamenti awtomatiċi"
+
+#~ msgid "Country:"
+#~ msgstr "Pajjiż:"
+
+#~ msgid "Error"
+#~ msgstr "Problema"
+
+#~ msgid "Quitting Wizard\n"
+#~ msgstr "Ħiereġ is-saħħar\n"
+
+#~ msgid ""
+#~ "Mandrakeonline could not be contacted, please try again at a later time"
+#~ msgstr "Mandrakeonline ma setax jiġi kuntattjat, ipprova iżjed tard"
+
+#~ msgid "Wrong password"
+#~ msgstr "Password ħażina"
+
+#~ msgid "  --update       - Update keys\n"
+#~ msgstr "  --update       - Aġġorna ċifrarji\n"
diff --git a/po/nb.po b/po/nb.po
index 33197035..b61fde16 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-nb\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-01 22:41+0200\n"
+"POT-Creation-Date: 2004-11-03 12:10+0100\n"
 "PO-Revision-Date: 2004-10-06 15:48+0100\n"
 "Last-Translator: Eskild Hustvedt <eskild@goldenfiles.com>\n"
 "Language-Team: Norwegian Bokmål <nb@li.org>\n"
@@ -20,12 +20,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3.1\n"
 
-#: ../mdkapplet:61
+#: ../mdkapplet:63
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Systemet ditt er oppdatert"
 
-#: ../mdkapplet:67
+#: ../mdkapplet:69
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -34,191 +34,201 @@ msgstr ""
 "Tjenestekonfigurasjonsproblem. Vennligst sjekk logger og send e-post til "
 "support@mandrakeonline.net"
 
-#: ../mdkapplet:73
+#: ../mdkapplet:75
 #, c-format
 msgid "System is busy. Please wait ..."
 msgstr "Systemet er opptatt. Vennligst vent ..."
 
-#: ../mdkapplet:79
+#: ../mdkapplet:81
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Nye oppdateringer er tilgjengelig for ditt system"
 
-#: ../mdkapplet:85
+#: ../mdkapplet:87
 #, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr ""
 "Tjenesten er ikke konfigurert. Vennligst klikk på \"Konfigurer tjenesten\""
 
-#: ../mdkapplet:91
+#: ../mdkapplet:93
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Nettverket er nede. Vennligst konfigurerer nettverket ditt"
 
-#: ../mdkapplet:97
+#: ../mdkapplet:99
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Tjenesten er ikke aktivert. Vennligst klikk på \"Online-nettsted\""
 
-#: ../mdkapplet:103
+#: ../mdkapplet:105
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 "Versjonen er ikke støttet (for gammel versjon, eller utviklingsversjon)"
 
-#: ../mdkapplet:108 ../mdkapplet:158
+#: ../mdkapplet:110 ../mdkapplet:164
 #, c-format
 msgid "Install updates"
 msgstr "Installer oppdateringer"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:111
 #, c-format
 msgid "Configure the service"
 msgstr "Konfigurer tjenesten"
 
-#: ../mdkapplet:110
+#: ../mdkapplet:112
 #, c-format
 msgid "Check Updates"
 msgstr "Sjekk etter oppdateringer"
 
-#: ../mdkapplet:111
+#: ../mdkapplet:113 ../mdkapplet:167 ../mdkapplet:225
+#, fuzzy, c-format
+msgid "Please Wait"
+msgstr "Vennligst vent"
+
+#: ../mdkapplet:113 ../mdkapplet:166 ../mdkapplet:167 ../mdkapplet:225
+#, c-format
+msgid "Check updates"
+msgstr "Sjekk etter oppdateringer"
+
+#: ../mdkapplet:115
 #, c-format
 msgid "Online WebSite"
 msgstr "Online Nettsted"
 
-#: ../mdkapplet:112
+#: ../mdkapplet:116
 #, c-format
 msgid "Configure Network"
 msgstr "Konfigurer nettverk"
 
-#: ../mdkapplet:113
+#: ../mdkapplet:117
 #, c-format
 msgid "Configure Now!"
 msgstr "Konfigurer nå!"
 
-#: ../mdkapplet:146
+#: ../mdkapplet:152 ../mdkapplet:229
 #, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Mandrakelinux Updates-panelprogram"
 
-#: ../mdkapplet:156
+#: ../mdkapplet:162
 #, c-format
 msgid "Actions"
 msgstr "Handlinger"
 
-#: ../mdkapplet:159
+#: ../mdkapplet:165
 #, c-format
 msgid "Configure"
 msgstr "Konfigurer"
 
-#: ../mdkapplet:160
-#, c-format
-msgid "Check updates"
-msgstr "Sjekk etter oppdateringer"
-
-#: ../mdkapplet:161
+#: ../mdkapplet:169
 #, c-format
 msgid "See logs"
 msgstr "Se logger"
 
-#: ../mdkapplet:164
+#: ../mdkapplet:172
 #, c-format
 msgid "Status"
 msgstr "Status"
 
-#: ../mdkapplet:168 ../mdkapplet:363
+#: ../mdkapplet:176 ../mdkapplet:375
 #, c-format
 msgid "Close"
 msgstr "Lukk"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Network Connection: "
 msgstr "Nettverkstilkobling"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Up"
 msgstr "Oppe"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Down"
 msgstr "Nede"
 
-#: ../mdkapplet:204
+#: ../mdkapplet:212
 #, c-format
 msgid "Last check: "
 msgstr "Siste sjekk: "
 
-#: ../mdkapplet:205
+#: ../mdkapplet:213
 #, c-format
 msgid "Updates: "
 msgstr "Oppdateringer: "
 
-#: ../mdkapplet:209
+#: ../mdkapplet:217
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Starter drakconnect\n"
 
-#: ../mdkapplet:213
+#: ../mdkapplet:221
 #, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "Starter mdkupdate --applet\n"
 
-#: ../mdkapplet:217
+#: ../mdkapplet:224
 #, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 "Mandrakeonline ser ut til å være reinstallert, laster inn panelprogram på "
 "nytt ...."
 
-#: ../mdkapplet:225
+#: ../mdkapplet:235
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Sjekker nye oppdateringer...\n"
 
-#: ../mdkapplet:227
+#: ../mdkapplet:237
 #, c-format
 msgid "Connecting to"
 msgstr "Kobler til"
 
-#: ../mdkapplet:250
+#: ../mdkapplet:244
+#, fuzzy, c-format
+msgid "Response from Mandrakeonline server\n"
+msgstr "Velkommen til Mandrakeonline"
+
+#: ../mdkapplet:262
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Sjekker... Opdateringer er tilgjengelig\n"
 
-#: ../mdkapplet:254
+#: ../mdkapplet:267
 #, c-format
 msgid "Development release not supported by service"
 msgstr "Utviklingsversjon er ikke støttet av tjenesten"
 
-#: ../mdkapplet:255
+#: ../mdkapplet:268
 #, c-format
 msgid "Too old release not supported by service"
 msgstr "For gammel versjon ikke støttet av tjenesten"
 
-#: ../mdkapplet:256
+#: ../mdkapplet:269
 #, c-format
 msgid "Unknown state"
 msgstr "Ukjent tilstand"
 
-#: ../mdkapplet:257
+#: ../mdkapplet:270
 #, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr "Onlinetjenester deaktivert. Kontakt Mandrakeonline-siden\n"
 
-#: ../mdkapplet:258
+#: ../mdkapplet:271
 #, c-format
 msgid "Wrong Password.\n"
 msgstr "Feil passord.\n"
 
-#: ../mdkapplet:259
+#: ../mdkapplet:272
 #, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr "Feil Handling eller vert eller  brukernavn.\n"
 
-#: ../mdkapplet:260
+#: ../mdkapplet:273
 #, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
@@ -227,72 +237,82 @@ msgstr ""
 "Noe er galt med ditt nettverksoppsett (sjekk dit route-, brannmur- eller "
 "proxy-oppsett).\n"
 
-#: ../mdkapplet:264
+#: ../mdkapplet:277
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Systemet er oppdatert\n"
 
-#: ../mdkapplet:303
+#: ../mdkapplet:317
 #, c-format
 msgid "No check"
 msgstr "Ingen sjekk"
 
-#: ../mdkapplet:316
+#: ../mdkapplet:330
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Sjekker nettverk. ser ut til å være deaktivert\n"
 
-#: ../mdkapplet:319
+#: ../mdkapplet:333
 #, c-format
 msgid "Checking config file: Not present\n"
 msgstr "Sjekker konfigurasjonsfil. Ikke til stede\n"
 
-#: ../mdkapplet:353
+#: ../mdkapplet:365
 #, c-format
 msgid "Logs"
 msgstr "Logger"
 
-#: ../mdkapplet:369
+#: ../mdkapplet:381
 #, c-format
 msgid "Clear"
 msgstr "Nullstill"
 
-#: ../mdkapplet:396
+#: ../mdkapplet:408
 #, c-format
 msgid "About..."
 msgstr "Om.."
 
-#: ../mdkapplet:397
+#: ../mdkapplet:409
 #, c-format
 msgid "Always launch on startup"
 msgstr "Kjør alltid under oppstart"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:411
 #, c-format
 msgid "Quit"
 msgstr "Avslutt"
 
-#: ../mdkonline:89
+#: ../mdkonline:52 ../mdkonline:106
 #, c-format
-msgid "Next"
-msgstr "Neste"
+msgid "Mandrakeonline"
+msgstr "Mandrakeonline"
 
-#: ../mdkonline:89
+#: ../mdkonline:55
+#, c-format
+msgid "I already have an account"
+msgstr "Jeg har allerede en konto"
+
+#: ../mdkonline:56
+#, c-format
+msgid "I want to subscribe"
+msgstr "Jeg vil abonnere"
+
+#: ../mdkonline:89 ../mdkonline:93 ../mdkonline:131
 #, c-format
-msgid "Cancel"
-msgstr "Avbryt"
+msgid "Please wait"
+msgstr "Vennligst vent"
 
 #: ../mdkonline:89
 #, c-format
-msgid "Previous"
-msgstr "Forrige"
+msgid "Reading configuration\n"
+msgstr "Leser konfigurasjon\n"
 
-#: ../mdkonline:103
+#: ../mdkonline:93
 #, c-format
-msgid "Welcome to Mandrakeonline"
-msgstr "Velkommen til Mandrakeonline"
+msgid "Sending configuration..."
+msgstr "Sender konfigurasjon..."
 
-#: ../mdkonline:104 ../mdkonline_tui:98
+#: ../mdkonline:109
 #, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
@@ -303,62 +323,37 @@ msgstr ""
 "(pakker, maskinvarekonfigurasjon) til en sentral database for å holde\n"
 "deg informert om sikkerhetsoppdatering og verdifulle oppgraderinger\n"
 
-#: ../mdkonline:105 ../mdkonline_tui:142
+#: ../mdkonline:114
 #, c-format
-msgid "Create a Mandrakeonline Account"
-msgstr "Opprett en Mandrakeonline-konto"
+msgid "Account creation or authentication"
+msgstr "Konto opprettelse eller autentisering"
 
-#: ../mdkonline:107
+#: ../mdkonline:119
 #, c-format
-msgid "I don't have a Mandrakeonline account and I want to subscribe"
-msgstr "Jeg har ingen Mandrakeonline-konto og jeg ønsker å abonnere"
+msgid "Enter your Mandrakeonline login, password and machine name:"
+msgstr "Tast inn ditt Mandrakeonline-brukernavn, passord og maskinnavn:"
 
-#: ../mdkonline:111 ../mdkonline:131 ../mdkonline_tui:114 ../mdkonline_tui:145
+#: ../mdkonline:125 ../mdkonline:156
 #, c-format
 msgid "Login:"
 msgstr "Brukernavn:"
 
-#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:115 ../mdkonline_tui:146
+#: ../mdkonline:126 ../mdkonline:157
 #, c-format
 msgid "Password:"
 msgstr "Passord:"
 
-#: ../mdkonline:113 ../mdkonline_tui:147
-#, c-format
-msgid "Confirm Password:"
-msgstr "Bekreft passord:"
-
-#: ../mdkonline:114 ../mdkonline_tui:148
-#, c-format
-msgid "Mail contact:"
-msgstr "Epostkontakt:"
-
-#: ../mdkonline:121
-#, c-format
-msgid "Mandrakelinux Privacy Policy"
-msgstr "Mandrakelinux retningslinjer for personvern"
-
 #: ../mdkonline:127
 #, c-format
-msgid "Authentification"
-msgstr "Autentisering"
-
-#: ../mdkonline:128 ../mdkonline_tui:108
-#, c-format
-msgid "Enter your Mandrakeonline login, password and machine name:"
-msgstr "Tast inn ditt Mandrakeonline-brukernavn, passord og maskinnavn:"
-
-#: ../mdkonline:133 ../mdkonline_tui:116
-#, c-format
 msgid "Machine name:"
 msgstr "Maskinnavn:"
 
-#: ../mdkonline:138
+#: ../mdkonline:131
 #, c-format
-msgid "Send Configuration"
-msgstr "Send konfigurasjon"
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Kobler til Mandrakeonline nettsiden..."
 
-#: ../mdkonline:139 ../mdkonline_tui:128
+#: ../mdkonline:139
 #, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
@@ -392,56 +387,56 @@ msgstr ""
 "Videre så drar du nytte av betalt kundestøttetjenester med rabatter på\n"
 "www.mandrakeexpert.com."
 
-#: ../mdkonline:144 ../mdkonline:211 ../mdkonline:234
+#: ../mdkonline:141 ../mdkonline:180 ../mdkupdate:126 ../mdkupdate:198
 #, c-format
-msgid "Finish"
-msgstr "Fullfør"
+msgid "Connection problem"
+msgstr "Tilkoblingsproblem"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid "Your upload was successful!"
-msgstr "Din opplasting var vellykket!"
+msgid "or"
+msgstr "eller"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandrakeonline."
-msgstr ""
-"Fra nå av vil du motta sikkerhets- og oppdateringsannonseringer \n"
-"takket være Mandrakeonline."
+msgid "wrong password:"
+msgstr "feil passord:"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
 msgid ""
-"Mandrakeonline offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+"Your login or password was wrong.\n"
+" Either you'll have to type it again, or you'll need to create an account on "
+"Mandrakeonline.\n"
+" In the latter case, go back to the first step to connect to "
+"Mandrakeonline.\n"
+" Be aware that you must also provide a Machine name \n"
+" (only alphabetical characters are admitted)"
 msgstr ""
-"Mandrakeonline tilbyr deg muligheten til å automatisere oppdateringene.\n"
-"Et program vil kjøre regelmessig på ditt system i vente på nye "
-"oppdateringer\n"
-
-#: ../mdkonline:146
-#, c-format
-msgid "automated Upgrades"
-msgstr "automatiserte oppgraderinger"
+"Ditt brukernavn eller passord var feil.\n"
+" Enten så må du skrive det på nytt, eller så må du opprette en konto på "
+"Mandrakeonline.\n"
+" I det siste tilfellet, gå tilbake til det første steget for å koble til "
+"Mandrakeonline.\n"
+" Vær oppmerksom på at du også må oppgi maskinnavn \n"
+" (bare alfabetiske tegn er tillatt)"
 
-#: ../mdkonline:150
+#: ../mdkonline:153
 #, c-format
-msgid "Country:"
-msgstr "Land:"
+msgid "Create a Mandrakeonline Account"
+msgstr "Opprett en Mandrakeonline-konto"
 
-#: ../mdkonline:178 ../mdkonline:183 ../mdkonline:185 ../mdkonline:187
+#: ../mdkonline:158
 #, c-format
-msgid "Error"
-msgstr "Feil"
+msgid "Confirm Password:"
+msgstr "Bekreft passord:"
 
-#: ../mdkonline:183 ../mdkonline_tui:152
+#: ../mdkonline:159
 #, c-format
-msgid "Please provide a login"
-msgstr "Vennligst oppgi et brukernavn"
+msgid "Mail contact:"
+msgstr "Epostkontakt:"
 
-#: ../mdkonline:185 ../mdkonline_tui:152
+#: ../mdkonline:163
 #, c-format
 msgid ""
 "The passwords do not match\n"
@@ -450,163 +445,117 @@ msgstr ""
 "Passordene stemmer ikke overens\n"
 " Vennligst prøv på nytt\n"
 
-#: ../mdkonline:187 ../mdkonline_tui:152
+#: ../mdkonline:163
+#, c-format
+msgid "Please provide a login"
+msgstr "Vennligst oppgi et brukernavn"
+
+#: ../mdkonline:163
 #, c-format
 msgid "Not a valid mail address!\n"
 msgstr "Ikke en gyldig epostadresse!\n"
 
-#: ../mdkonline:199 ../mdkonline_tui:78
+#: ../mdkonline:169
 #, c-format
-msgid "Reading configuration\n"
-msgstr "Leser konfigurasjon\n"
+msgid ""
+"Mandrakeonline Account successfully created.\n"
+"Please click \"Next\" to authenticate and upload your configuration\n"
+msgstr ""
+"Mandrakeonline konto ble vellykket opprettet.\n"
+"Vennligs klikk «Neste» for å autentisere og laste opp oppsettet ditt\n"
 
-#: ../mdkonline:204 ../mdkonline_tui:82
+#: ../mdkonline:178
 #, c-format
-msgid "Sending configuration..."
-msgstr "Sender konfigurasjon..."
+msgid "Your upload was successful!"
+msgstr "Din opplasting var vellykket!"
 
-#: ../mdkonline:213 ../mdkonline:273 ../mdkonline_tui:130 ../mdkonline_tui:169
-#: ../mdkupdate:124 ../mdkupdate:195
+#: ../mdkonline:178
 #, c-format
-msgid "Connection problem"
-msgstr "Tilkoblingsproblem"
+msgid ""
+"From now you will receive on security and updates \n"
+"announcements thanks to Mandrakeonline."
+msgstr ""
+"Fra nå av vil du motta sikkerhets- og oppdateringsannonseringer \n"
+"takket være Mandrakeonline."
+
+#: ../mdkonline:178
+#, c-format
+msgid ""
+"Mandrakeonline offers you the ability to automate the updates.\n"
+"A program will run regulary in your system waiting for new updates\n"
+msgstr ""
+"Mandrakeonline tilbyr deg muligheten til å automatisere oppdateringene.\n"
+"Et program vil kjøre regelmessig på ditt system i vente på nye "
+"oppdateringer\n"
 
-#: ../mdkonline:213 ../mdkonline_tui:169
+#: ../mdkonline:180
 #, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr "Problem oppstod under opplasting av filer, vennligst prøv igjen"
 
-#: ../mdkonline:251
+#: ../mdkonline:186
 #, c-format
-msgid "Quitting Wizard\n"
-msgstr "Avslutter veiviser\n"
+msgid "Country"
+msgstr "Land"
 
-#: ../mdkonline:273
+#: ../mdkonline:198
 #, c-format
-msgid "Mandrakeonline could not be contacted, please try again at a later time"
-msgstr ""
-"Mandrakeonline kunne ikke bli kontaktet, vennligst prøv igjen på et senere "
-"tidspunkt"
+msgid "Congratulations"
+msgstr "Gratulerer"
 
-#: ../mdkonline:285
+#: ../mdkonline:198
 #, c-format
-msgid "Wrong password"
-msgstr "Feil passord"
+msgid "Your Mandrakeonline account has been successfully configured\n"
+msgstr "Din Mandrakeonline konto har blitt vellykket satt opp\n"
+
+#: ../mdkonline:214
+#, fuzzy, c-format
+msgid "Configuration uploaded successfully"
+msgstr "Din opplasting var vellykket!"
+
+#: ../mdkonline:215
+#, fuzzy, c-format
+msgid "Problem uploading configuration"
+msgstr "Leser konfigurasjon\n"
 
-#: ../mdkonline:285 ../mdkonline_tui:130
+#: ../mdkonline:216
 #, c-format
 msgid ""
-"Your login or password was wrong.\n"
-" Either you'll have to type it again, or you'll need to create an account on "
-"Mandrakeonline.\n"
-" In the latter case, go back to the first step to connect to "
-"Mandrakeonline.\n"
-" Be aware that you must also provide a Machine name \n"
-" (only alphabetical characters are admitted)"
+"Cannot connect to mandrakeonline website: wrong login/password or router/"
+"firewall bad settings"
 msgstr ""
-"Ditt brukernavn eller passord var feil.\n"
-" Enten så må du skrive det på nytt, eller så må du opprette en konto på "
-"Mandrakeonline.\n"
-" I det siste tilfellet, gå tilbake til det første steget for å koble til "
-"Mandrakeonline.\n"
-" Vær oppmerksom på at du også må oppgi maskinnavn \n"
-" (bare alfabetiske tegn er tillatt)"
 
-#: ../mdkonline.pm:58
+#: ../mdkonline.pm:66
 #, c-format
 msgid "Login and password should be less than 12 characters\n"
 msgstr "Brukernavn og passord bør være på mindre enn 12 tegn\n"
 
-#: ../mdkonline.pm:59
+#: ../mdkonline.pm:67
 #, c-format
 msgid "Special characters are not allowed\n"
 msgstr "Spesialtegn er ikke tillatt\n"
 
-#: ../mdkonline.pm:60
+#: ../mdkonline.pm:68
 #, c-format
 msgid "Please fill in all fields\n"
 msgstr "Vennligst fyll ut alle felter\n"
 
-#: ../mdkonline.pm:61
+#: ../mdkonline.pm:69
 #, c-format
 msgid "Email not valid\n"
 msgstr "Epost ikke gyldig\n"
 
-#: ../mdkonline.pm:62
+#: ../mdkonline.pm:70
 #, c-format
 msgid "Account already exist\n"
 msgstr "Konto eksisterer allerede\n"
 
-#: ../mdkonline.pm:68
+#: ../mdkonline.pm:76
 #, c-format
 msgid "Problem connecting to server \n"
 msgstr "Problem med å koble til tjener \n"
 
-#: ../mdkonline_tui:45 ../mdkonline_tui:95
-#, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
-
-#: ../mdkonline_tui:48
-#, c-format
-msgid "I already have an account"
-msgstr "Jeg har allerede en konto"
-
-#: ../mdkonline_tui:49
-#, c-format
-msgid "I want to subscribe"
-msgstr "Jeg vil abonnere"
-
-#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:120
-#, c-format
-msgid "Please wait"
-msgstr "Vennligst vent"
-
-#: ../mdkonline_tui:103
-#, c-format
-msgid "Account creation or authentication"
-msgstr "Konto opprettelse eller autentisering"
-
-#: ../mdkonline_tui:120
-#, c-format
-msgid "Connecting to Mandrakeonline website..."
-msgstr "Kobler til Mandrakeonline nettsiden..."
-
-#: ../mdkonline_tui:130
-#, c-format
-msgid "or"
-msgstr "eller"
-
-#: ../mdkonline_tui:130
-#, c-format
-msgid "wrong password:"
-msgstr "feil passord:"
-
-#: ../mdkonline_tui:158
-#, c-format
-msgid ""
-"Mandrakeonline Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-"Mandrakeonline konto ble vellykket opprettet.\n"
-"Vennligs klikk «Neste» for å autentisere og laste opp oppsettet ditt\n"
-
-#: ../mdkonline_tui:175
-#, c-format
-msgid "Country"
-msgstr "Land"
-
-#: ../mdkonline_tui:187
-#, c-format
-msgid "Congratulations"
-msgstr "Gratulerer"
-
-#: ../mdkonline_tui:187
-#, c-format
-msgid "Your Mandrakeonline account has been successfully configured\n"
-msgstr "Din Mandrakeonline konto har blitt vellykket satt opp\n"
-
-#: ../mdkupdate:50
+#: ../mdkupdate:52
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
@@ -623,42 +572,37 @@ msgstr ""
 "\n"
 "bruk:\n"
 
-#: ../mdkupdate:55
+#: ../mdkupdate:57
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - skriv denne hjelp beskjeden.\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:58
 #, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto         - Mandrakeupdate kjørt automatisk.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:59
 #, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - start Mandrakeupdate.\n"
 
-#: ../mdkupdate:58
-#, c-format
-msgid "  --update       - Update keys\n"
-msgstr "  --update       - Oppdater nøkler\n"
-
-#: ../mdkupdate:66
+#: ../mdkupdate:67
 #, c-format
 msgid "No %s file found. Run mdkonline wizard first"
 msgstr "Ingen %s fil funnet. Kjør mdkonline veiviseren først"
 
-#: ../mdkupdate:124
+#: ../mdkupdate:126
 #, c-format
 msgid "Mandrakeupdate could not contact the site, we will try again."
 msgstr "Mandrakeupdate kunne ikke kontakte stedet, vi vil prøve igjen."
 
-#: ../mdkupdate:173
+#: ../mdkupdate:176
 #, c-format
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr "Kunne ikke oppdatere pakker fra mdkupdate-medium.\n"
 
-#: ../mdkupdate:195
+#: ../mdkupdate:198
 #, c-format
 msgid ""
 "Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
@@ -666,3 +610,51 @@ msgid ""
 msgstr ""
 "Mandrakeupdate kunne ikke last opp diff filene. Send en e-post til support "
 "[at] mandrakeonline [dot] net"
+
+#~ msgid "Next"
+#~ msgstr "Neste"
+
+#~ msgid "Cancel"
+#~ msgstr "Avbryt"
+
+#~ msgid "Previous"
+#~ msgstr "Forrige"
+
+#~ msgid "I don't have a Mandrakeonline account and I want to subscribe"
+#~ msgstr "Jeg har ingen Mandrakeonline-konto og jeg ønsker å abonnere"
+
+#~ msgid "Mandrakelinux Privacy Policy"
+#~ msgstr "Mandrakelinux retningslinjer for personvern"
+
+#~ msgid "Authentification"
+#~ msgstr "Autentisering"
+
+#~ msgid "Send Configuration"
+#~ msgstr "Send konfigurasjon"
+
+#~ msgid "Finish"
+#~ msgstr "Fullfør"
+
+#~ msgid "automated Upgrades"
+#~ msgstr "automatiserte oppgraderinger"
+
+#~ msgid "Country:"
+#~ msgstr "Land:"
+
+#~ msgid "Error"
+#~ msgstr "Feil"
+
+#~ msgid "Quitting Wizard\n"
+#~ msgstr "Avslutter veiviser\n"
+
+#~ msgid ""
+#~ "Mandrakeonline could not be contacted, please try again at a later time"
+#~ msgstr ""
+#~ "Mandrakeonline kunne ikke bli kontaktet, vennligst prøv igjen på et "
+#~ "senere tidspunkt"
+
+#~ msgid "Wrong password"
+#~ msgstr "Feil passord"
+
+#~ msgid "  --update       - Update keys\n"
+#~ msgstr "  --update       - Oppdater nøkler\n"
diff --git a/po/nl.po b/po/nl.po
index 5a49cf07..1eb5e42a 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-nl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-01 22:41+0200\n"
+"POT-Creation-Date: 2004-11-03 12:10+0100\n"
 "PO-Revision-Date: 2004-10-11 19:56+0200\n"
 "Last-Translator: Rob Teng <mandrake.tips@free.fr>\n"
 "Language-Team: Nederlands\n"
@@ -18,12 +18,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: ../mdkapplet:61
+#: ../mdkapplet:63
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Uw systeem is bijgewerkt"
 
-#: ../mdkapplet:67
+#: ../mdkapplet:69
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -32,187 +32,197 @@ msgstr ""
 "Dienst-instellingsprobleem. Verifieer uw logboeken en stuur een e-mail naar "
 "support@mandrakeonline.net"
 
-#: ../mdkapplet:73
+#: ../mdkapplet:75
 #, c-format
 msgid "System is busy. Please wait ..."
 msgstr "Systeem is bezig. Even geduld..."
 
-#: ../mdkapplet:79
+#: ../mdkapplet:81
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Nieuwe herzieningen zijn beschikbaar voor uw systeem"
 
-#: ../mdkapplet:85
+#: ../mdkapplet:87
 #, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr "Dienst niet ingesteld. Klik op \"Dienst configureren\""
 
-#: ../mdkapplet:91
+#: ../mdkapplet:93
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Netwerk niet actief. Configureer uw netwerk"
 
-#: ../mdkapplet:97
+#: ../mdkapplet:99
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Dienst niet geactiveerd. Klik alstublieft op \"Webstek\""
 
-#: ../mdkapplet:103
+#: ../mdkapplet:105
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "Uitgave niet ondersteund (te oud, of een ontwikkelingsuitgave)"
 
-#: ../mdkapplet:108 ../mdkapplet:158
+#: ../mdkapplet:110 ../mdkapplet:164
 #, c-format
 msgid "Install updates"
 msgstr "Herzieningen installeren"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:111
 #, c-format
 msgid "Configure the service"
 msgstr "Dienst configureren"
 
-#: ../mdkapplet:110
+#: ../mdkapplet:112
 #, c-format
 msgid "Check Updates"
 msgstr "Herzieningen nagaan"
 
-#: ../mdkapplet:111
+#: ../mdkapplet:113 ../mdkapplet:167 ../mdkapplet:225
+#, fuzzy, c-format
+msgid "Please Wait"
+msgstr "Even geduld"
+
+#: ../mdkapplet:113 ../mdkapplet:166 ../mdkapplet:167 ../mdkapplet:225
+#, c-format
+msgid "Check updates"
+msgstr "Herzieningen nagaan"
+
+#: ../mdkapplet:115
 #, c-format
 msgid "Online WebSite"
 msgstr "Webstek"
 
-#: ../mdkapplet:112
+#: ../mdkapplet:116
 #, c-format
 msgid "Configure Network"
 msgstr "Netwerk configureren"
 
-#: ../mdkapplet:113
+#: ../mdkapplet:117
 #, c-format
 msgid "Configure Now!"
 msgstr "Nu configureren!"
 
-#: ../mdkapplet:146
+#: ../mdkapplet:152 ../mdkapplet:229
 #, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Mandrakelinux herzieningen-applet"
 
-#: ../mdkapplet:156
+#: ../mdkapplet:162
 #, c-format
 msgid "Actions"
 msgstr "Akties"
 
-#: ../mdkapplet:159
+#: ../mdkapplet:165
 #, c-format
 msgid "Configure"
 msgstr "Configureren"
 
-#: ../mdkapplet:160
-#, c-format
-msgid "Check updates"
-msgstr "Herzieningen nagaan"
-
-#: ../mdkapplet:161
+#: ../mdkapplet:169
 #, c-format
 msgid "See logs"
 msgstr "Logboeken inzien"
 
-#: ../mdkapplet:164
+#: ../mdkapplet:172
 #, c-format
 msgid "Status"
 msgstr "Status"
 
-#: ../mdkapplet:168 ../mdkapplet:363
+#: ../mdkapplet:176 ../mdkapplet:375
 #, c-format
 msgid "Close"
 msgstr "Sluiten"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Network Connection: "
 msgstr "Netwerkverbinding: "
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Up"
 msgstr "Actief"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Down"
 msgstr "Inactief"
 
-#: ../mdkapplet:204
+#: ../mdkapplet:212
 #, c-format
 msgid "Last check: "
 msgstr "Laatste controle: "
 
-#: ../mdkapplet:205
+#: ../mdkapplet:213
 #, c-format
 msgid "Updates: "
 msgstr "Herzieningen: "
 
-#: ../mdkapplet:209
+#: ../mdkapplet:217
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Drakconnect wordt gestart\n"
 
-#: ../mdkapplet:213
+#: ../mdkapplet:221
 #, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "Mdkupdate --applet wordt gestart\n"
 
-#: ../mdkapplet:217
+#: ../mdkapplet:224
 #, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr "Mandrakeonline lijkt opnieuw geïnstalleerd te zijn, herladen applet..."
 
-#: ../mdkapplet:225
+#: ../mdkapplet:235
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Nieuwe herzieningen nagaan...\n"
 
-#: ../mdkapplet:227
+#: ../mdkapplet:237
 #, c-format
 msgid "Connecting to"
 msgstr "Verbinding aan het maken met"
 
-#: ../mdkapplet:250
+#: ../mdkapplet:244
+#, fuzzy, c-format
+msgid "Response from Mandrakeonline server\n"
+msgstr "Welkom bij MandrakeOnline"
+
+#: ../mdkapplet:262
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Bezig met controleren... Herzieningen zijn beschikbaar\n"
 
-#: ../mdkapplet:254
+#: ../mdkapplet:267
 #, c-format
 msgid "Development release not supported by service"
 msgstr "Ontwikkelingsuitgaven worden niet ondersteund door deze dienst"
 
-#: ../mdkapplet:255
+#: ../mdkapplet:268
 #, c-format
 msgid "Too old release not supported by service"
 msgstr "Te oude uitgaven worden niet ondersteund door deze dienst"
 
-#: ../mdkapplet:256
+#: ../mdkapplet:269
 #, c-format
 msgid "Unknown state"
 msgstr "Onbekende toestand"
 
-#: ../mdkapplet:257
+#: ../mdkapplet:270
 #, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr "Online diensten uitgeschakeld. Zie de Mandrakeonline webstek\n"
 
-#: ../mdkapplet:258
+#: ../mdkapplet:271
 #, c-format
 msgid "Wrong Password.\n"
 msgstr "Wachtwoord onjuist.\n"
 
-#: ../mdkapplet:259
+#: ../mdkapplet:272
 #, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr "Onjuiste actie of host of gebruikersnaam.\n"
 
-#: ../mdkapplet:260
+#: ../mdkapplet:273
 #, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
@@ -221,72 +231,82 @@ msgstr ""
 "Er is een probleem met uw netwerk instellingen (verifieer uw route-, "
 "firewall- of proxy-instellingen)\n"
 
-#: ../mdkapplet:264
+#: ../mdkapplet:277
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Systeem is bijgewerkt\n"
 
-#: ../mdkapplet:303
+#: ../mdkapplet:317
 #, c-format
 msgid "No check"
 msgstr "Geen controle"
 
-#: ../mdkapplet:316
+#: ../mdkapplet:330
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Controle van het netwerk: lijkt uitgeschakeld te zijn\n"
 
-#: ../mdkapplet:319
+#: ../mdkapplet:333
 #, c-format
 msgid "Checking config file: Not present\n"
 msgstr "Controle van het instellingsbestand: niet aanwezig\n"
 
-#: ../mdkapplet:353
+#: ../mdkapplet:365
 #, c-format
 msgid "Logs"
 msgstr "Logboek"
 
-#: ../mdkapplet:369
+#: ../mdkapplet:381
 #, c-format
 msgid "Clear"
 msgstr "Wissen"
 
-#: ../mdkapplet:396
+#: ../mdkapplet:408
 #, c-format
 msgid "About..."
 msgstr "Info.."
 
-#: ../mdkapplet:397
+#: ../mdkapplet:409
 #, c-format
 msgid "Always launch on startup"
 msgstr "Altijd starten bij systeemstart"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:411
 #, c-format
 msgid "Quit"
 msgstr "Afsluiten"
 
-#: ../mdkonline:89
+#: ../mdkonline:52 ../mdkonline:106
 #, c-format
-msgid "Next"
-msgstr "Volgende"
+msgid "Mandrakeonline"
+msgstr "Mandrakeonline"
 
-#: ../mdkonline:89
+#: ../mdkonline:55
 #, c-format
-msgid "Cancel"
-msgstr "Annuleren"
+msgid "I already have an account"
+msgstr "Ik heb al een account"
+
+#: ../mdkonline:56
+#, c-format
+msgid "I want to subscribe"
+msgstr "Ik wil mijzelf afmelden"
+
+#: ../mdkonline:89 ../mdkonline:93 ../mdkonline:131
+#, c-format
+msgid "Please wait"
+msgstr "Even geduld"
 
 #: ../mdkonline:89
 #, c-format
-msgid "Previous"
-msgstr "Vorige"
+msgid "Reading configuration\n"
+msgstr "Lezen instellingen\n"
 
-#: ../mdkonline:103
+#: ../mdkonline:93
 #, c-format
-msgid "Welcome to Mandrakeonline"
-msgstr "Welkom bij MandrakeOnline"
+msgid "Sending configuration..."
+msgstr "Configuratie sturen"
 
-#: ../mdkonline:104 ../mdkonline_tui:98
+#: ../mdkonline:109
 #, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
@@ -298,62 +318,37 @@ msgstr ""
 "u op de hoogte te kunnen houden van beveiligingsherzieningen en nuttige "
 "opwaarderingen.\n"
 
-#: ../mdkonline:105 ../mdkonline_tui:142
+#: ../mdkonline:114
 #, c-format
-msgid "Create a Mandrakeonline Account"
-msgstr "MandrakeOnline account aanmaken"
+msgid "Account creation or authentication"
+msgstr "Aanmaken van account of aanmeldingscontrole"
 
-#: ../mdkonline:107
+#: ../mdkonline:119
 #, c-format
-msgid "I don't have a Mandrakeonline account and I want to subscribe"
-msgstr "Ik heb geen MandrakeOnline account en wil me aanmelden"
+msgid "Enter your Mandrakeonline login, password and machine name:"
+msgstr "Voer uw MandrakeOnline gebruikersnaam, wachtwoord en computernaam in:"
 
-#: ../mdkonline:111 ../mdkonline:131 ../mdkonline_tui:114 ../mdkonline_tui:145
+#: ../mdkonline:125 ../mdkonline:156
 #, c-format
 msgid "Login:"
 msgstr "Gebruikersnaam:"
 
-#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:115 ../mdkonline_tui:146
+#: ../mdkonline:126 ../mdkonline:157
 #, c-format
 msgid "Password:"
 msgstr "Wachtwoord:"
 
-#: ../mdkonline:113 ../mdkonline_tui:147
-#, c-format
-msgid "Confirm Password:"
-msgstr "Wachtwoord bevestigen:"
-
-#: ../mdkonline:114 ../mdkonline_tui:148
-#, c-format
-msgid "Mail contact:"
-msgstr "Mailadres: "
-
-#: ../mdkonline:121
-#, c-format
-msgid "Mandrakelinux Privacy Policy"
-msgstr "Mandrakelinux privacy-beleid"
-
 #: ../mdkonline:127
 #, c-format
-msgid "Authentification"
-msgstr "Verificatie"
-
-#: ../mdkonline:128 ../mdkonline_tui:108
-#, c-format
-msgid "Enter your Mandrakeonline login, password and machine name:"
-msgstr "Voer uw MandrakeOnline gebruikersnaam, wachtwoord en computernaam in:"
-
-#: ../mdkonline:133 ../mdkonline_tui:116
-#, c-format
 msgid "Machine name:"
 msgstr "Computernaam:"
 
-#: ../mdkonline:138
+#: ../mdkonline:131
 #, c-format
-msgid "Send Configuration"
-msgstr "Configuratie verzenden"
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Verbinden met Mandrakeonline webstek..."
 
-#: ../mdkonline:139 ../mdkonline_tui:128
+#: ../mdkonline:139
 #, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
@@ -385,56 +380,56 @@ msgstr ""
 "Verder profiteert u van goedkopere betaalde ondersteuning op\n"
 "www.mandrakeexpert.com."
 
-#: ../mdkonline:144 ../mdkonline:211 ../mdkonline:234
+#: ../mdkonline:141 ../mdkonline:180 ../mdkupdate:126 ../mdkupdate:198
 #, c-format
-msgid "Finish"
-msgstr "Voltooien"
+msgid "Connection problem"
+msgstr "Verbindingsprobleem"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid "Your upload was successful!"
-msgstr "Het versturen is gelukt!"
+msgid "or"
+msgstr "of"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandrakeonline."
-msgstr ""
-"Vanaf nu ontvangt u beveiligings- en\n"
-"herzieningsaankondigingen dankzij MandrakeOnline"
+msgid "wrong password:"
+msgstr "wachtwoord onjuist:"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
 msgid ""
-"Mandrakeonline offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+"Your login or password was wrong.\n"
+" Either you'll have to type it again, or you'll need to create an account on "
+"Mandrakeonline.\n"
+" In the latter case, go back to the first step to connect to "
+"Mandrakeonline.\n"
+" Be aware that you must also provide a Machine name \n"
+" (only alphabetical characters are admitted)"
 msgstr ""
-"MandrakeOnline biedt u de mogelijkheid om de herzieningen te automatiseren.\n"
-"Een programma in uw systeem zal regelmatig kijken of er nieuwe herziene\n"
-"versies zijn\n"
-
-#: ../mdkonline:146
-#, c-format
-msgid "automated Upgrades"
-msgstr "geautomatiseerde herzieningen"
+"Uw gebruikersnaam of wachtwoord was onjuist.\n"
+" U kunt het opnieuw proberen, of u moet zich nog registreren bij "
+"MandrakeOnline.\n"
+" In het laatste geval dient u terug te gaan naar de eerste stap om "
+"verbinding te maken met MandrakeOnline.\n"
+" Weest u zich ervan bewust dat u ook een computernaam moet invoeren \n"
+" (alleen letters zijn toegestaan)"
 
-#: ../mdkonline:150
+#: ../mdkonline:153
 #, c-format
-msgid "Country:"
-msgstr "Land:"
+msgid "Create a Mandrakeonline Account"
+msgstr "MandrakeOnline account aanmaken"
 
-#: ../mdkonline:178 ../mdkonline:183 ../mdkonline:185 ../mdkonline:187
+#: ../mdkonline:158
 #, c-format
-msgid "Error"
-msgstr "Fout"
+msgid "Confirm Password:"
+msgstr "Wachtwoord bevestigen:"
 
-#: ../mdkonline:183 ../mdkonline_tui:152
+#: ../mdkonline:159
 #, c-format
-msgid "Please provide a login"
-msgstr "Geef alstublieft uw gebruikersnaam"
+msgid "Mail contact:"
+msgstr "Mailadres: "
 
-#: ../mdkonline:185 ../mdkonline_tui:152
+#: ../mdkonline:163
 #, c-format
 msgid ""
 "The passwords do not match\n"
@@ -443,164 +438,118 @@ msgstr ""
 "De wachtwoorden komen niet overeen\n"
 "Probeer het opnieuw\n"
 
-#: ../mdkonline:187 ../mdkonline_tui:152
+#: ../mdkonline:163
+#, c-format
+msgid "Please provide a login"
+msgstr "Geef alstublieft uw gebruikersnaam"
+
+#: ../mdkonline:163
 #, c-format
 msgid "Not a valid mail address!\n"
 msgstr "Geen geldig emailadres\n"
 
-#: ../mdkonline:199 ../mdkonline_tui:78
+#: ../mdkonline:169
 #, c-format
-msgid "Reading configuration\n"
-msgstr "Lezen instellingen\n"
+msgid ""
+"Mandrakeonline Account successfully created.\n"
+"Please click \"Next\" to authenticate and upload your configuration\n"
+msgstr ""
+"Aanmaken van een Mandrakeonline-account is gelukt.\n"
+"Klik op \"Volgende\" om aan te melden en uw systeemsamenstelling te "
+"verzenden\n"
 
-#: ../mdkonline:204 ../mdkonline_tui:82
+#: ../mdkonline:178
 #, c-format
-msgid "Sending configuration..."
-msgstr "Configuratie sturen"
+msgid "Your upload was successful!"
+msgstr "Het versturen is gelukt!"
 
-#: ../mdkonline:213 ../mdkonline:273 ../mdkonline_tui:130 ../mdkonline_tui:169
-#: ../mdkupdate:124 ../mdkupdate:195
+#: ../mdkonline:178
 #, c-format
-msgid "Connection problem"
-msgstr "Verbindingsprobleem"
+msgid ""
+"From now you will receive on security and updates \n"
+"announcements thanks to Mandrakeonline."
+msgstr ""
+"Vanaf nu ontvangt u beveiligings- en\n"
+"herzieningsaankondigingen dankzij MandrakeOnline"
+
+#: ../mdkonline:178
+#, c-format
+msgid ""
+"Mandrakeonline offers you the ability to automate the updates.\n"
+"A program will run regulary in your system waiting for new updates\n"
+msgstr ""
+"MandrakeOnline biedt u de mogelijkheid om de herzieningen te automatiseren.\n"
+"Een programma in uw systeem zal regelmatig kijken of er nieuwe herziene\n"
+"versies zijn\n"
 
-#: ../mdkonline:213 ../mdkonline_tui:169
+#: ../mdkonline:180
 #, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr "Probleem met het versturen van de gegevens, probeert u het opnieuw"
 
-#: ../mdkonline:251
+#: ../mdkonline:186
 #, c-format
-msgid "Quitting Wizard\n"
-msgstr "Bezig met afsluiten wizard\n"
+msgid "Country"
+msgstr "Land"
 
-#: ../mdkonline:273
+#: ../mdkonline:198
 #, c-format
-msgid "Mandrakeonline could not be contacted, please try again at a later time"
-msgstr ""
-"Er kon geen verbinding met MandrakeOnline gemaakt worden, probeert u het "
-"later nog eens."
+msgid "Congratulations"
+msgstr "Gefeliciteerd"
 
-#: ../mdkonline:285
+#: ../mdkonline:198
 #, c-format
-msgid "Wrong password"
-msgstr "Wachtwoord onjuist"
+msgid "Your Mandrakeonline account has been successfully configured\n"
+msgstr "Uw Mandrakeonline account is met succes geconfigureerd\n"
+
+#: ../mdkonline:214
+#, fuzzy, c-format
+msgid "Configuration uploaded successfully"
+msgstr "Het versturen is gelukt!"
+
+#: ../mdkonline:215
+#, fuzzy, c-format
+msgid "Problem uploading configuration"
+msgstr "Lezen instellingen\n"
 
-#: ../mdkonline:285 ../mdkonline_tui:130
+#: ../mdkonline:216
 #, c-format
 msgid ""
-"Your login or password was wrong.\n"
-" Either you'll have to type it again, or you'll need to create an account on "
-"Mandrakeonline.\n"
-" In the latter case, go back to the first step to connect to "
-"Mandrakeonline.\n"
-" Be aware that you must also provide a Machine name \n"
-" (only alphabetical characters are admitted)"
+"Cannot connect to mandrakeonline website: wrong login/password or router/"
+"firewall bad settings"
 msgstr ""
-"Uw gebruikersnaam of wachtwoord was onjuist.\n"
-" U kunt het opnieuw proberen, of u moet zich nog registreren bij "
-"MandrakeOnline.\n"
-" In het laatste geval dient u terug te gaan naar de eerste stap om "
-"verbinding te maken met MandrakeOnline.\n"
-" Weest u zich ervan bewust dat u ook een computernaam moet invoeren \n"
-" (alleen letters zijn toegestaan)"
 
-#: ../mdkonline.pm:58
+#: ../mdkonline.pm:66
 #, c-format
 msgid "Login and password should be less than 12 characters\n"
 msgstr "Gebruikersnaam en wachtwoord moeten korter zijn dan 12 tekens\n"
 
-#: ../mdkonline.pm:59
+#: ../mdkonline.pm:67
 #, c-format
 msgid "Special characters are not allowed\n"
 msgstr "Speciale tekens zijn niet toegestaan\n"
 
-#: ../mdkonline.pm:60
+#: ../mdkonline.pm:68
 #, c-format
 msgid "Please fill in all fields\n"
 msgstr "Gelieve alle velden in te vullen\n"
 
-#: ../mdkonline.pm:61
+#: ../mdkonline.pm:69
 #, c-format
 msgid "Email not valid\n"
 msgstr "E-mailadres is ongeldig\n"
 
-#: ../mdkonline.pm:62
+#: ../mdkonline.pm:70
 #, c-format
 msgid "Account already exist\n"
 msgstr "Account bestaat al\n"
 
-#: ../mdkonline.pm:68
+#: ../mdkonline.pm:76
 #, c-format
 msgid "Problem connecting to server \n"
 msgstr "Er is een probleem opgetreden bij het verbinden met de server \n"
 
-#: ../mdkonline_tui:45 ../mdkonline_tui:95
-#, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
-
-#: ../mdkonline_tui:48
-#, c-format
-msgid "I already have an account"
-msgstr "Ik heb al een account"
-
-#: ../mdkonline_tui:49
-#, c-format
-msgid "I want to subscribe"
-msgstr "Ik wil mijzelf afmelden"
-
-#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:120
-#, c-format
-msgid "Please wait"
-msgstr "Even geduld"
-
-#: ../mdkonline_tui:103
-#, c-format
-msgid "Account creation or authentication"
-msgstr "Aanmaken van account of aanmeldingscontrole"
-
-#: ../mdkonline_tui:120
-#, c-format
-msgid "Connecting to Mandrakeonline website..."
-msgstr "Verbinden met Mandrakeonline webstek..."
-
-#: ../mdkonline_tui:130
-#, c-format
-msgid "or"
-msgstr "of"
-
-#: ../mdkonline_tui:130
-#, c-format
-msgid "wrong password:"
-msgstr "wachtwoord onjuist:"
-
-#: ../mdkonline_tui:158
-#, c-format
-msgid ""
-"Mandrakeonline Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-"Aanmaken van een Mandrakeonline-account is gelukt.\n"
-"Klik op \"Volgende\" om aan te melden en uw systeemsamenstelling te "
-"verzenden\n"
-
-#: ../mdkonline_tui:175
-#, c-format
-msgid "Country"
-msgstr "Land"
-
-#: ../mdkonline_tui:187
-#, c-format
-msgid "Congratulations"
-msgstr "Gefeliciteerd"
-
-#: ../mdkonline_tui:187
-#, c-format
-msgid "Your Mandrakeonline account has been successfully configured\n"
-msgstr "Uw Mandrakeonline account is met succes geconfigureerd\n"
-
-#: ../mdkupdate:50
+#: ../mdkupdate:52
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
@@ -617,44 +566,39 @@ msgstr ""
 "\n"
 "gebruik:\n"
 
-#: ../mdkupdate:55
+#: ../mdkupdate:57
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help          - deze gebruiksaanwijzing.tonen\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:58
 #, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto         - Mandrakeupdate automatisch starten.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:59
 #, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - Mandrakeupdate starten.\n"
 
-#: ../mdkupdate:58
-#, c-format
-msgid "  --update       - Update keys\n"
-msgstr "  --update       - sleutels bijwerken\n"
-
-#: ../mdkupdate:66
+#: ../mdkupdate:67
 #, c-format
 msgid "No %s file found. Run mdkonline wizard first"
 msgstr "Geen %s-bestand gevonden. Start eerst de mdkonline-assistent"
 
-#: ../mdkupdate:124
+#: ../mdkupdate:126
 #, c-format
 msgid "Mandrakeupdate could not contact the site, we will try again."
 msgstr ""
 "Mandrakeupdate kan geen verbinding met de webstek maken, we proberen het "
 "later nog eens."
 
-#: ../mdkupdate:173
+#: ../mdkupdate:176
 #, c-format
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr "Niet in staat pakketten bij te werken vanaf het mdkupdate-medium\n"
 
-#: ../mdkupdate:195
+#: ../mdkupdate:198
 #, c-format
 msgid ""
 "Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
@@ -663,3 +607,50 @@ msgstr ""
 "Mandrakeupdate kan de diff-bestanden niet uploaden. Stuur een e-mailtje naar "
 "support [at] mandrakeonline [punt] net"
 
+#~ msgid "Next"
+#~ msgstr "Volgende"
+
+#~ msgid "Cancel"
+#~ msgstr "Annuleren"
+
+#~ msgid "Previous"
+#~ msgstr "Vorige"
+
+#~ msgid "I don't have a Mandrakeonline account and I want to subscribe"
+#~ msgstr "Ik heb geen MandrakeOnline account en wil me aanmelden"
+
+#~ msgid "Mandrakelinux Privacy Policy"
+#~ msgstr "Mandrakelinux privacy-beleid"
+
+#~ msgid "Authentification"
+#~ msgstr "Verificatie"
+
+#~ msgid "Send Configuration"
+#~ msgstr "Configuratie verzenden"
+
+#~ msgid "Finish"
+#~ msgstr "Voltooien"
+
+#~ msgid "automated Upgrades"
+#~ msgstr "geautomatiseerde herzieningen"
+
+#~ msgid "Country:"
+#~ msgstr "Land:"
+
+#~ msgid "Error"
+#~ msgstr "Fout"
+
+#~ msgid "Quitting Wizard\n"
+#~ msgstr "Bezig met afsluiten wizard\n"
+
+#~ msgid ""
+#~ "Mandrakeonline could not be contacted, please try again at a later time"
+#~ msgstr ""
+#~ "Er kon geen verbinding met MandrakeOnline gemaakt worden, probeert u het "
+#~ "later nog eens."
+
+#~ msgid "Wrong password"
+#~ msgstr "Wachtwoord onjuist"
+
+#~ msgid "  --update       - Update keys\n"
+#~ msgstr "  --update       - sleutels bijwerken\n"
diff --git a/po/pl.po b/po/pl.po
index 72c5b70b..812f3af3 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-pl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-01 22:41+0200\n"
+"POT-Creation-Date: 2004-11-03 12:10+0100\n"
 "PO-Revision-Date: 2004-08-25 20:55+0200\n"
 "Last-Translator: Arkadiusz Lipiec <arkadiusz.lipiec@gazeta.pl>\n"
 "Language-Team: polski <pl@li.org>\n"
@@ -17,12 +17,12 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../mdkapplet:61
+#: ../mdkapplet:63
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Oprogramowanie systemu jest aktualne"
 
-#: ../mdkapplet:67
+#: ../mdkapplet:69
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -31,189 +31,199 @@ msgstr ""
 "Problem z konfiguracją usługi. Sprawdź logi i wyślij e-mail'a pod adres "
 "support@mandrakeonline.net"
 
-#: ../mdkapplet:73
+#: ../mdkapplet:75
 #, c-format
 msgid "System is busy. Please wait ..."
 msgstr "System jest zajęty. Proszę czekać ..."
 
-#: ../mdkapplet:79
+#: ../mdkapplet:81
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Dostępne są nowe aktualizacje dla Twojego systemu"
 
-#: ../mdkapplet:85
+#: ../mdkapplet:87
 #, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr "Usługa jest nieskonfigurowana. Kliknij na \"Konfiguracja usługi\""
 
-#: ../mdkapplet:91
+#: ../mdkapplet:93
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Sieć jest wyłączona. Skonfiguruj sieć"
 
-#: ../mdkapplet:97
+#: ../mdkapplet:99
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Usługa jest nieaktywna. Kliknij na Witryna internetowa\""
 
-#: ../mdkapplet:103
+#: ../mdkapplet:105
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "Nieobsługiwane wydanie (za stare, lub wydanie rozwojowe)"
 
-#: ../mdkapplet:108 ../mdkapplet:158
+#: ../mdkapplet:110 ../mdkapplet:164
 #, c-format
 msgid "Install updates"
 msgstr "Zainstaluj aktualizacje"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:111
 #, c-format
 msgid "Configure the service"
 msgstr "Konfiguracja usługi"
 
-#: ../mdkapplet:110
+#: ../mdkapplet:112
 #, c-format
 msgid "Check Updates"
 msgstr "Sprawdź aktualizacje"
 
-#: ../mdkapplet:111
+#: ../mdkapplet:113 ../mdkapplet:167 ../mdkapplet:225
+#, fuzzy, c-format
+msgid "Please Wait"
+msgstr "Proszę czekać"
+
+#: ../mdkapplet:113 ../mdkapplet:166 ../mdkapplet:167 ../mdkapplet:225
+#, c-format
+msgid "Check updates"
+msgstr "Sprawdź aktualizacje"
+
+#: ../mdkapplet:115
 #, c-format
 msgid "Online WebSite"
 msgstr "Witryna internetowa"
 
-#: ../mdkapplet:112
+#: ../mdkapplet:116
 #, c-format
 msgid "Configure Network"
 msgstr "Skonfiguruj sieć"
 
-#: ../mdkapplet:113
+#: ../mdkapplet:117
 #, c-format
 msgid "Configure Now!"
 msgstr "Skonfiguruj teraz!"
 
-#: ../mdkapplet:146
+#: ../mdkapplet:152 ../mdkapplet:229
 #, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Aplet aktualizacji Mandrakelinux"
 
-#: ../mdkapplet:156
+#: ../mdkapplet:162
 #, c-format
 msgid "Actions"
 msgstr "Operacje"
 
-#: ../mdkapplet:159
+#: ../mdkapplet:165
 #, c-format
 msgid "Configure"
 msgstr "Skonfiguruj"
 
-#: ../mdkapplet:160
-#, c-format
-msgid "Check updates"
-msgstr "Sprawdź aktualizacje"
-
-#: ../mdkapplet:161
+#: ../mdkapplet:169
 #, c-format
 msgid "See logs"
 msgstr "Zobacz dziennik"
 
-#: ../mdkapplet:164
+#: ../mdkapplet:172
 #, c-format
 msgid "Status"
 msgstr "Stan"
 
-#: ../mdkapplet:168 ../mdkapplet:363
+#: ../mdkapplet:176 ../mdkapplet:375
 #, c-format
 msgid "Close"
 msgstr "Zamknij"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Network Connection: "
 msgstr "Połączenie sieciowe: "
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Up"
 msgstr "W górę"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Down"
 msgstr "W dół"
 
-#: ../mdkapplet:204
+#: ../mdkapplet:212
 #, c-format
 msgid "Last check: "
 msgstr "Ostatnie sprawdzenie: "
 
-#: ../mdkapplet:205
+#: ../mdkapplet:213
 #, c-format
 msgid "Updates: "
 msgstr "Aktualizacje: "
 
-#: ../mdkapplet:209
+#: ../mdkapplet:217
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Uruchamianie programu drakconnect\n"
 
-#: ../mdkapplet:213
+#: ../mdkapplet:221
 #, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "Uruchamianie polecenia mdkupdate --applet\n"
 
-#: ../mdkapplet:217
+#: ../mdkapplet:224
 #, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 "Mandrakeonline prawdopodobnie zostało przeinstalowane. Ładowanie apletu ...."
 
-#: ../mdkapplet:225
+#: ../mdkapplet:235
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Przetwarzanie nowych aktualizacji...\n"
 
-#: ../mdkapplet:227
+#: ../mdkapplet:237
 #, c-format
 msgid "Connecting to"
 msgstr "Łączenie z"
 
-#: ../mdkapplet:250
+#: ../mdkapplet:244
+#, fuzzy, c-format
+msgid "Response from Mandrakeonline server\n"
+msgstr "Witamy w Mandrakeonline"
+
+#: ../mdkapplet:262
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Sprawdzanie... Uaktualnienia są dostępne\n"
 
-#: ../mdkapplet:254
+#: ../mdkapplet:267
 #, c-format
 msgid "Development release not supported by service"
 msgstr "Wydanie rozwojowe nie jest obsługiwane przez usługę"
 
-#: ../mdkapplet:255
+#: ../mdkapplet:268
 #, c-format
 msgid "Too old release not supported by service"
 msgstr "Za stare wydanie nie jest obsługiwane przez usługę"
 
-#: ../mdkapplet:256
+#: ../mdkapplet:269
 #, c-format
 msgid "Unknown state"
 msgstr "Nieznany stan"
 
-#: ../mdkapplet:257
+#: ../mdkapplet:270
 #, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr ""
 "Usługi internetowe są wyłączone. Skontaktuj się z witryną Mandrakeonline\n"
 
-#: ../mdkapplet:258
+#: ../mdkapplet:271
 #, c-format
 msgid "Wrong Password.\n"
 msgstr "Złe hasło.\n"
 
-#: ../mdkapplet:259
+#: ../mdkapplet:272
 #, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr "Niepoprawna operacja, komputer lub nazwa użytkownika.\n"
 
-#: ../mdkapplet:260
+#: ../mdkapplet:273
 #, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
@@ -222,72 +232,82 @@ msgstr ""
 "Coś nieprawidłowego dzieje się z ustawieniami sieci (sprawdź połączenie, "
 "zaporę sieciową lub ustawienia pośrednika)\n"
 
-#: ../mdkapplet:264
+#: ../mdkapplet:277
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "System jest aktualny\n"
 
-#: ../mdkapplet:303
+#: ../mdkapplet:317
 #, c-format
 msgid "No check"
 msgstr "Bez sprawdzania"
 
-#: ../mdkapplet:316
+#: ../mdkapplet:330
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Sprawdzanie sieci: wygląda na wyłączoną\n"
 
-#: ../mdkapplet:319
+#: ../mdkapplet:333
 #, c-format
 msgid "Checking config file: Not present\n"
 msgstr "Sprawdzanie pliku konfiguracyjnego: brak pliku\n"
 
-#: ../mdkapplet:353
+#: ../mdkapplet:365
 #, c-format
 msgid "Logs"
 msgstr "Dziennik"
 
-#: ../mdkapplet:369
+#: ../mdkapplet:381
 #, c-format
 msgid "Clear"
 msgstr "Wyczyść"
 
-#: ../mdkapplet:396
+#: ../mdkapplet:408
 #, c-format
 msgid "About..."
 msgstr "O programie"
 
-#: ../mdkapplet:397
+#: ../mdkapplet:409
 #, c-format
 msgid "Always launch on startup"
 msgstr "Uruchamiaj przy starcie"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:411
 #, c-format
 msgid "Quit"
 msgstr "Zakończ"
 
-#: ../mdkonline:89
+#: ../mdkonline:52 ../mdkonline:106
 #, c-format
-msgid "Next"
-msgstr "Następny"
+msgid "Mandrakeonline"
+msgstr "Mandrakeonline"
 
-#: ../mdkonline:89
+#: ../mdkonline:55
 #, c-format
-msgid "Cancel"
-msgstr "Anuluj"
+msgid "I already have an account"
+msgstr "Mam już konto"
+
+#: ../mdkonline:56
+#, c-format
+msgid "I want to subscribe"
+msgstr "Chcę się zapisać"
+
+#: ../mdkonline:89 ../mdkonline:93 ../mdkonline:131
+#, c-format
+msgid "Please wait"
+msgstr "Proszę czekać"
 
 #: ../mdkonline:89
 #, c-format
-msgid "Previous"
-msgstr "Wstecz"
+msgid "Reading configuration\n"
+msgstr "Wczytywanie konfiguracji\n"
 
-#: ../mdkonline:103
+#: ../mdkonline:93
 #, c-format
-msgid "Welcome to Mandrakeonline"
-msgstr "Witamy w Mandrakeonline"
+msgid "Sending configuration..."
+msgstr "Przesyłanie konfiguracji..."
 
-#: ../mdkonline:104 ../mdkonline_tui:98
+#: ../mdkonline:109
 #, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
@@ -298,62 +318,37 @@ msgstr ""
 "(pakiety, konfiguracja sprzętowa) do centralnej bazy danych, aby\n"
 "móc lepiej informować cię o odpowiednich uaktualnieniach.\n"
 
-#: ../mdkonline:105 ../mdkonline_tui:142
+#: ../mdkonline:114
 #, c-format
-msgid "Create a Mandrakeonline Account"
-msgstr "Utwórz konto Mandrakeonline "
+msgid "Account creation or authentication"
+msgstr "Tworzenie konta lub uwierzytelnianie"
 
-#: ../mdkonline:107
+#: ../mdkonline:119
 #, c-format
-msgid "I don't have a Mandrakeonline account and I want to subscribe"
-msgstr "Nie posiadam konta Mandrakeonline i chcę się zapisać"
+msgid "Enter your Mandrakeonline login, password and machine name:"
+msgstr "Wprowadź swój login Mandrakeonline, hasło i nazwę komputera:"
 
-#: ../mdkonline:111 ../mdkonline:131 ../mdkonline_tui:114 ../mdkonline_tui:145
+#: ../mdkonline:125 ../mdkonline:156
 #, c-format
 msgid "Login:"
 msgstr "Login:"
 
-#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:115 ../mdkonline_tui:146
+#: ../mdkonline:126 ../mdkonline:157
 #, c-format
 msgid "Password:"
 msgstr "Hasło:"
 
-#: ../mdkonline:113 ../mdkonline_tui:147
-#, c-format
-msgid "Confirm Password:"
-msgstr "Potwierdź hasło:"
-
-#: ../mdkonline:114 ../mdkonline_tui:148
-#, c-format
-msgid "Mail contact:"
-msgstr "Kontakt pocztowy:"
-
-#: ../mdkonline:121
-#, c-format
-msgid "Mandrakelinux Privacy Policy"
-msgstr "Zastrzeżenie prywatności Mandrakelinux"
-
 #: ../mdkonline:127
 #, c-format
-msgid "Authentification"
-msgstr "Uwierzytelnienie"
-
-#: ../mdkonline:128 ../mdkonline_tui:108
-#, c-format
-msgid "Enter your Mandrakeonline login, password and machine name:"
-msgstr "Wprowadź swój login Mandrakeonline, hasło i nazwę komputera:"
-
-#: ../mdkonline:133 ../mdkonline_tui:116
-#, c-format
 msgid "Machine name:"
 msgstr "Nazwa komputera:"
 
-#: ../mdkonline:138
+#: ../mdkonline:131
 #, c-format
-msgid "Send Configuration"
-msgstr "Wyślij konfigurację"
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Łączenie z witryną Mandrakeonline..."
 
-#: ../mdkonline:139 ../mdkonline_tui:128
+#: ../mdkonline:139
 #, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
@@ -385,55 +380,54 @@ msgstr ""
 "Co więcej, skorzystasz z usług bez potrzeby uiszczania dodatkowych opłat\n"
 "na www.mandrakeexpert.com."
 
-#: ../mdkonline:144 ../mdkonline:211 ../mdkonline:234
+#: ../mdkonline:141 ../mdkonline:180 ../mdkupdate:126 ../mdkupdate:198
 #, c-format
-msgid "Finish"
-msgstr "Zakończ"
+msgid "Connection problem"
+msgstr "Problem z połączeniem"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid "Your upload was successful!"
-msgstr "Informacje zostały pomyślnie przesłane!"
+msgid "or"
+msgstr "lub"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandrakeonline."
-msgstr ""
-"Od tej chwili dzięki Mandrakeonline będziesz otrzymywać \n"
-"informacje o wykrytych błędach i uaktualnieniach."
+msgid "wrong password:"
+msgstr "niepoprawne hasło:"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
 msgid ""
-"Mandrakeonline offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+"Your login or password was wrong.\n"
+" Either you'll have to type it again, or you'll need to create an account on "
+"Mandrakeonline.\n"
+" In the latter case, go back to the first step to connect to "
+"Mandrakeonline.\n"
+" Be aware that you must also provide a Machine name \n"
+" (only alphabetical characters are admitted)"
 msgstr ""
-"Mandrakeonline umożliwia Ci zautomatyzowanie uaktualnień.\n"
-"Program będzie uruchamiał się regularnie i oczekiwał na uaktualnienia\n"
-
-#: ../mdkonline:146
-#, c-format
-msgid "automated Upgrades"
-msgstr "automatyczne uaktualnienia"
+"Twój login lub hasło zostały niepoprawnie wprowadzone.\n"
+" Możesz spróbować ponownie lub też utworzyć nowe konto na Mandrakeonline.\n"
+" W drugim przypadku wróć do pierwszego kroku nawiązywania \n"
+"połączenia z Mandrakeonline. Nie zapomnij podać nazwy komputera\n"
+" (przyjmowane są tylko znaki alfanumeryczne)"
 
-#: ../mdkonline:150
+#: ../mdkonline:153
 #, c-format
-msgid "Country:"
-msgstr "Kraj:"
+msgid "Create a Mandrakeonline Account"
+msgstr "Utwórz konto Mandrakeonline "
 
-#: ../mdkonline:178 ../mdkonline:183 ../mdkonline:185 ../mdkonline:187
+#: ../mdkonline:158
 #, c-format
-msgid "Error"
-msgstr "Błąd"
+msgid "Confirm Password:"
+msgstr "Potwierdź hasło:"
 
-#: ../mdkonline:183 ../mdkonline_tui:152
+#: ../mdkonline:159
 #, c-format
-msgid "Please provide a login"
-msgstr "Podaj login"
+msgid "Mail contact:"
+msgstr "Kontakt pocztowy:"
 
-#: ../mdkonline:185 ../mdkonline_tui:152
+#: ../mdkonline:163
 #, c-format
 msgid ""
 "The passwords do not match\n"
@@ -442,160 +436,116 @@ msgstr ""
 "Hasła różnią się\n"
 "Spróbuj ponownie\n"
 
-#: ../mdkonline:187 ../mdkonline_tui:152
+#: ../mdkonline:163
+#, c-format
+msgid "Please provide a login"
+msgstr "Podaj login"
+
+#: ../mdkonline:163
 #, c-format
 msgid "Not a valid mail address!\n"
 msgstr "To nie jest poprawny adres e-mail!\n"
 
-#: ../mdkonline:199 ../mdkonline_tui:78
+#: ../mdkonline:169
 #, c-format
-msgid "Reading configuration\n"
-msgstr "Wczytywanie konfiguracji\n"
+msgid ""
+"Mandrakeonline Account successfully created.\n"
+"Please click \"Next\" to authenticate and upload your configuration\n"
+msgstr ""
+"Pomyślnie utworzono konto Mandrakeonline.\n"
+"Kliknij \"Naprzód\" aby uwierzytlenić się i pobrać swoją konfigurację\n"
 
-#: ../mdkonline:204 ../mdkonline_tui:82
+#: ../mdkonline:178
 #, c-format
-msgid "Sending configuration..."
-msgstr "Przesyłanie konfiguracji..."
+msgid "Your upload was successful!"
+msgstr "Informacje zostały pomyślnie przesłane!"
 
-#: ../mdkonline:213 ../mdkonline:273 ../mdkonline_tui:130 ../mdkonline_tui:169
-#: ../mdkupdate:124 ../mdkupdate:195
+#: ../mdkonline:178
 #, c-format
-msgid "Connection problem"
-msgstr "Problem z połączeniem"
+msgid ""
+"From now you will receive on security and updates \n"
+"announcements thanks to Mandrakeonline."
+msgstr ""
+"Od tej chwili dzięki Mandrakeonline będziesz otrzymywać \n"
+"informacje o wykrytych błędach i uaktualnieniach."
+
+#: ../mdkonline:178
+#, c-format
+msgid ""
+"Mandrakeonline offers you the ability to automate the updates.\n"
+"A program will run regulary in your system waiting for new updates\n"
+msgstr ""
+"Mandrakeonline umożliwia Ci zautomatyzowanie uaktualnień.\n"
+"Program będzie uruchamiał się regularnie i oczekiwał na uaktualnienia\n"
 
-#: ../mdkonline:213 ../mdkonline_tui:169
+#: ../mdkonline:180
 #, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr "Podczas wysyłania plików wystąpił błąd. Spróbuj ponownie."
 
-#: ../mdkonline:251
+#: ../mdkonline:186
 #, c-format
-msgid "Quitting Wizard\n"
-msgstr "Opuszczanie druida\n"
+msgid "Country"
+msgstr "Kraj"
 
-#: ../mdkonline:273
+#: ../mdkonline:198
 #, c-format
-msgid "Mandrakeonline could not be contacted, please try again at a later time"
-msgstr ""
-"Nie można nawiązać połączenia z Mandrakeonline. Spróbuj ponownie później."
+msgid "Congratulations"
+msgstr "Gratulacje"
 
-#: ../mdkonline:285
+#: ../mdkonline:198
 #, c-format
-msgid "Wrong password"
-msgstr "Niepoprawne hasło"
+msgid "Your Mandrakeonline account has been successfully configured\n"
+msgstr "Twoje konto Mandrakeonline zostało pomyślnie skonfigurowane\n"
+
+#: ../mdkonline:214
+#, fuzzy, c-format
+msgid "Configuration uploaded successfully"
+msgstr "Informacje zostały pomyślnie przesłane!"
+
+#: ../mdkonline:215
+#, fuzzy, c-format
+msgid "Problem uploading configuration"
+msgstr "Wczytywanie konfiguracji\n"
 
-#: ../mdkonline:285 ../mdkonline_tui:130
+#: ../mdkonline:216
 #, c-format
 msgid ""
-"Your login or password was wrong.\n"
-" Either you'll have to type it again, or you'll need to create an account on "
-"Mandrakeonline.\n"
-" In the latter case, go back to the first step to connect to "
-"Mandrakeonline.\n"
-" Be aware that you must also provide a Machine name \n"
-" (only alphabetical characters are admitted)"
+"Cannot connect to mandrakeonline website: wrong login/password or router/"
+"firewall bad settings"
 msgstr ""
-"Twój login lub hasło zostały niepoprawnie wprowadzone.\n"
-" Możesz spróbować ponownie lub też utworzyć nowe konto na Mandrakeonline.\n"
-" W drugim przypadku wróć do pierwszego kroku nawiązywania \n"
-"połączenia z Mandrakeonline. Nie zapomnij podać nazwy komputera\n"
-" (przyjmowane są tylko znaki alfanumeryczne)"
 
-#: ../mdkonline.pm:58
+#: ../mdkonline.pm:66
 #, c-format
 msgid "Login and password should be less than 12 characters\n"
 msgstr "Login i hasło muszą być krótsze niż 12 znaków\n"
 
-#: ../mdkonline.pm:59
+#: ../mdkonline.pm:67
 #, c-format
 msgid "Special characters are not allowed\n"
 msgstr "Nie można używać specjalnych znaków\n"
 
-#: ../mdkonline.pm:60
+#: ../mdkonline.pm:68
 #, c-format
 msgid "Please fill in all fields\n"
 msgstr "Wypełnij wszystkie pola\n"
 
-#: ../mdkonline.pm:61
+#: ../mdkonline.pm:69
 #, c-format
 msgid "Email not valid\n"
 msgstr "Adres e-mail jest nieprawidłowy\n"
 
-#: ../mdkonline.pm:62
+#: ../mdkonline.pm:70
 #, c-format
 msgid "Account already exist\n"
 msgstr "Konto już istnieje\n"
 
-#: ../mdkonline.pm:68
+#: ../mdkonline.pm:76
 #, c-format
 msgid "Problem connecting to server \n"
 msgstr "Problem podczas nawiązywania połączenia z serwerem\n"
 
-#: ../mdkonline_tui:45 ../mdkonline_tui:95
-#, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
-
-#: ../mdkonline_tui:48
-#, c-format
-msgid "I already have an account"
-msgstr "Mam już konto"
-
-#: ../mdkonline_tui:49
-#, c-format
-msgid "I want to subscribe"
-msgstr "Chcę się zapisać"
-
-#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:120
-#, c-format
-msgid "Please wait"
-msgstr "Proszę czekać"
-
-#: ../mdkonline_tui:103
-#, c-format
-msgid "Account creation or authentication"
-msgstr "Tworzenie konta lub uwierzytelnianie"
-
-#: ../mdkonline_tui:120
-#, c-format
-msgid "Connecting to Mandrakeonline website..."
-msgstr "Łączenie z witryną Mandrakeonline..."
-
-#: ../mdkonline_tui:130
-#, c-format
-msgid "or"
-msgstr "lub"
-
-#: ../mdkonline_tui:130
-#, c-format
-msgid "wrong password:"
-msgstr "niepoprawne hasło:"
-
-#: ../mdkonline_tui:158
-#, c-format
-msgid ""
-"Mandrakeonline Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-"Pomyślnie utworzono konto Mandrakeonline.\n"
-"Kliknij \"Naprzód\" aby uwierzytlenić się i pobrać swoją konfigurację\n"
-
-#: ../mdkonline_tui:175
-#, c-format
-msgid "Country"
-msgstr "Kraj"
-
-#: ../mdkonline_tui:187
-#, c-format
-msgid "Congratulations"
-msgstr "Gratulacje"
-
-#: ../mdkonline_tui:187
-#, c-format
-msgid "Your Mandrakeonline account has been successfully configured\n"
-msgstr "Twoje konto Mandrakeonline zostało pomyślnie skonfigurowane\n"
-
-#: ../mdkupdate:50
+#: ../mdkupdate:52
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
@@ -612,43 +562,38 @@ msgstr ""
 "\n"
 "użycie:\n"
 
-#: ../mdkupdate:55
+#: ../mdkupdate:57
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - wyświetla ten komunikat pomocy.\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:58
 #, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto         - automatyczne uruchamiane Mandrakeupdate .\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:59
 #, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - uruchamia Mandrakeupdate.\n"
 
-#: ../mdkupdate:58
-#, c-format
-msgid "  --update       - Update keys\n"
-msgstr "  --update       - uaktualnia klucze\n"
-
-#: ../mdkupdate:66
+#: ../mdkupdate:67
 #, c-format
 msgid "No %s file found. Run mdkonline wizard first"
 msgstr "Nie znaleziono pliku %s. Uruchom najpierw druida mdkonline"
 
-#: ../mdkupdate:124
+#: ../mdkupdate:126
 #, c-format
 msgid "Mandrakeupdate could not contact the site, we will try again."
 msgstr ""
 "Mandrakeupdate nie może nawiązać połączenia z witryną, spróbujemy później."
 
-#: ../mdkupdate:173
+#: ../mdkupdate:176
 #, c-format
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr "Nie można uaktualnić pakietów z nośnika mdkupdate.\n"
 
-#: ../mdkupdate:195
+#: ../mdkupdate:198
 #, c-format
 msgid ""
 "Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
@@ -656,3 +601,50 @@ msgid ""
 msgstr ""
 "Mandrakeupdate nie może przesłać plików diff. Prześlij e-mail na adres "
 "support [at] mandrakeonline [dot] net"
+
+#~ msgid "Next"
+#~ msgstr "Następny"
+
+#~ msgid "Cancel"
+#~ msgstr "Anuluj"
+
+#~ msgid "Previous"
+#~ msgstr "Wstecz"
+
+#~ msgid "I don't have a Mandrakeonline account and I want to subscribe"
+#~ msgstr "Nie posiadam konta Mandrakeonline i chcę się zapisać"
+
+#~ msgid "Mandrakelinux Privacy Policy"
+#~ msgstr "Zastrzeżenie prywatności Mandrakelinux"
+
+#~ msgid "Authentification"
+#~ msgstr "Uwierzytelnienie"
+
+#~ msgid "Send Configuration"
+#~ msgstr "Wyślij konfigurację"
+
+#~ msgid "Finish"
+#~ msgstr "Zakończ"
+
+#~ msgid "automated Upgrades"
+#~ msgstr "automatyczne uaktualnienia"
+
+#~ msgid "Country:"
+#~ msgstr "Kraj:"
+
+#~ msgid "Error"
+#~ msgstr "Błąd"
+
+#~ msgid "Quitting Wizard\n"
+#~ msgstr "Opuszczanie druida\n"
+
+#~ msgid ""
+#~ "Mandrakeonline could not be contacted, please try again at a later time"
+#~ msgstr ""
+#~ "Nie można nawiązać połączenia z Mandrakeonline. Spróbuj ponownie później."
+
+#~ msgid "Wrong password"
+#~ msgstr "Niepoprawne hasło"
+
+#~ msgid "  --update       - Update keys\n"
+#~ msgstr "  --update       - uaktualnia klucze\n"
diff --git a/po/pt.po b/po/pt.po
index 55e00814..e9dfe08b 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-pt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-01 22:41+0200\n"
+"POT-Creation-Date: 2004-11-03 12:10+0100\n"
 "PO-Revision-Date: 2004-10-15 01:33+0100\n"
 "Last-Translator: Américo José Melo <mmodem00@netvisao.pt>\n"
 "Language-Team: Português <pt@li.org>\n"
@@ -24,201 +24,213 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9\n"
 
-#: ../mdkapplet:61
+#: ../mdkapplet:63
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "O seu sistema está actualizado"
 
-#: ../mdkapplet:67
+#: ../mdkapplet:69
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrakeonline.net"
 msgstr ""
-"Problema na configuração do serviço. Por favor verifique os registos "
-"e envie um e-mail para support@mandrakeonline.net"
+"Problema na configuração do serviço. Por favor verifique os registos e envie "
+"um e-mail para support@mandrakeonline.net"
 
-#: ../mdkapplet:73
+#: ../mdkapplet:75
 #, c-format
 msgid "System is busy. Please wait ..."
 msgstr "O sistema está ocupado. Por favor espere ..."
 
-#: ../mdkapplet:79
+#: ../mdkapplet:81
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Há novas actualizações disponíveis para o seu sistema"
 
-#: ../mdkapplet:85
+#: ../mdkapplet:87
 #, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
-msgstr "O serviço não está configurado. Por favor clique em \"Configurar o serviço\""
+msgstr ""
+"O serviço não está configurado. Por favor clique em \"Configurar o serviço\""
 
-#: ../mdkapplet:91
+#: ../mdkapplet:93
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "A rede está desligada. Por favor configure a sua rede"
 
-#: ../mdkapplet:97
+#: ../mdkapplet:99
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "O serviço não está activado. Por favor clique em \"Website Online\""
 
-#: ../mdkapplet:103
+#: ../mdkapplet:105
 #, c-format
 msgid "Release not supported (too old release, or development release)"
-msgstr "Versão não suportada (versão demasiado antiga, ou versão de programação)"
+msgstr ""
+"Versão não suportada (versão demasiado antiga, ou versão de programação)"
 
-#: ../mdkapplet:108 ../mdkapplet:158
+#: ../mdkapplet:110 ../mdkapplet:164
 #, c-format
 msgid "Install updates"
 msgstr "Instalar actualizações"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:111
 #, c-format
 msgid "Configure the service"
 msgstr "Configurar o serviço"
 
-#: ../mdkapplet:110
+#: ../mdkapplet:112
 #, c-format
 msgid "Check Updates"
 msgstr "Verificar Actualizações"
 
-#: ../mdkapplet:111
+#: ../mdkapplet:113 ../mdkapplet:167 ../mdkapplet:225
+#, fuzzy, c-format
+msgid "Please Wait"
+msgstr "Por favor aguarde"
+
+#: ../mdkapplet:113 ../mdkapplet:166 ../mdkapplet:167 ../mdkapplet:225
+#, c-format
+msgid "Check updates"
+msgstr "Verificar actualizações"
+
+#: ../mdkapplet:115
 #, c-format
 msgid "Online WebSite"
 msgstr "WebSite Online"
 
-#: ../mdkapplet:112
+#: ../mdkapplet:116
 #, c-format
 msgid "Configure Network"
 msgstr "Configurar a Rede"
 
-#: ../mdkapplet:113
+#: ../mdkapplet:117
 #, c-format
 msgid "Configure Now!"
 msgstr "Configurar Agora!"
 
-#: ../mdkapplet:146
+#: ../mdkapplet:152 ../mdkapplet:229
 #, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Applet de Actualização Mandrakelinux"
 
-#: ../mdkapplet:156
+#: ../mdkapplet:162
 #, c-format
 msgid "Actions"
 msgstr "Acções"
 
-#: ../mdkapplet:159
+#: ../mdkapplet:165
 #, c-format
 msgid "Configure"
 msgstr "Configurar"
 
-#: ../mdkapplet:160
-#, c-format
-msgid "Check updates"
-msgstr "Verificar actualizações"
-
-#: ../mdkapplet:161
+#: ../mdkapplet:169
 #, c-format
 msgid "See logs"
 msgstr "Ver registos"
 
-#: ../mdkapplet:164
+#: ../mdkapplet:172
 #, c-format
 msgid "Status"
 msgstr "Estado"
 
-#: ../mdkapplet:168 ../mdkapplet:363
+#: ../mdkapplet:176 ../mdkapplet:375
 #, c-format
 msgid "Close"
 msgstr "Fechar"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Network Connection: "
 msgstr "Ligação da Rede : "
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Up"
 msgstr "Ligado"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Down"
 msgstr "Desligado"
 
-#: ../mdkapplet:204
+#: ../mdkapplet:212
 #, c-format
 msgid "Last check: "
 msgstr "Última verificação: "
 
-#: ../mdkapplet:205
+#: ../mdkapplet:213
 #, c-format
 msgid "Updates: "
 msgstr "Actualizações: "
 
-#: ../mdkapplet:209
+#: ../mdkapplet:217
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "A iniciar o drakconnect\n"
 
-#: ../mdkapplet:213
+#: ../mdkapplet:221
 #, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "A iniciar mdkupdate --applet\n"
 
-#: ../mdkapplet:217
+#: ../mdkapplet:224
 #, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr "O Mandrakeonline parece estar reinstalado, recarregar applet..."
 
-#: ../mdkapplet:225
+#: ../mdkapplet:235
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "A procurar novas actualizações...\n"
 
-#: ../mdkapplet:227
+#: ../mdkapplet:237
 #, c-format
 msgid "Connecting to"
 msgstr "A ligar a"
 
-#: ../mdkapplet:250
+#: ../mdkapplet:244
+#, fuzzy, c-format
+msgid "Response from Mandrakeonline server\n"
+msgstr "Bem-vindo ao Mandrakeonline"
+
+#: ../mdkapplet:262
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "A verificar... Há actualizações disponíveis\n"
 
-#: ../mdkapplet:254
+#: ../mdkapplet:267
 #, c-format
 msgid "Development release not supported by service"
 msgstr "Versão de programação não suportada pelo serviço"
 
-#: ../mdkapplet:255
+#: ../mdkapplet:268
 #, c-format
 msgid "Too old release not supported by service"
 msgstr "Versão demasiado antiga não suportada pelo serviço"
 
-#: ../mdkapplet:256
+#: ../mdkapplet:269
 #, c-format
 msgid "Unknown state"
 msgstr "Estado desconhecido"
 
-#: ../mdkapplet:257
+#: ../mdkapplet:270
 #, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr "Serviços online desactivados. Contacte o site Mandrakeonline\n"
 
-#: ../mdkapplet:258
+#: ../mdkapplet:271
 #, c-format
 msgid "Wrong Password.\n"
 msgstr "Senha Errada.\n"
 
-#: ../mdkapplet:259
+#: ../mdkapplet:272
 #, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr "Acção Errada ou host ou login.\n"
 
-#: ../mdkapplet:260
+#: ../mdkapplet:273
 #, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
@@ -227,72 +239,82 @@ msgstr ""
 "Algo está errado com as suas definições de rede (verifique as configurações "
 "do seu route, firewall ou proxy)\n"
 
-#: ../mdkapplet:264
+#: ../mdkapplet:277
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "O sistema está actualizado\n"
 
-#: ../mdkapplet:303
+#: ../mdkapplet:317
 #, c-format
 msgid "No check"
 msgstr "Nenhuma verificação"
 
-#: ../mdkapplet:316
+#: ../mdkapplet:330
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "A Verificar a Rede: parece desactivada\n"
 
-#: ../mdkapplet:319
+#: ../mdkapplet:333
 #, c-format
 msgid "Checking config file: Not present\n"
 msgstr "A verificar o ficheiro de configuração: não presente\n"
 
-#: ../mdkapplet:353
+#: ../mdkapplet:365
 #, c-format
 msgid "Logs"
 msgstr "Registos"
 
-#: ../mdkapplet:369
+#: ../mdkapplet:381
 #, c-format
 msgid "Clear"
 msgstr "Limpar"
 
-#: ../mdkapplet:396
+#: ../mdkapplet:408
 #, c-format
 msgid "About..."
 msgstr "Acerca de ..."
 
-#: ../mdkapplet:397
+#: ../mdkapplet:409
 #, c-format
 msgid "Always launch on startup"
 msgstr "Executar sempre no arranque"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:411
 #, c-format
 msgid "Quit"
 msgstr "Sair"
 
-#: ../mdkonline:89
+#: ../mdkonline:52 ../mdkonline:106
 #, c-format
-msgid "Next"
-msgstr "Seguinte"
+msgid "Mandrakeonline"
+msgstr "Mandrakeonline"
 
-#: ../mdkonline:89
+#: ../mdkonline:55
 #, c-format
-msgid "Cancel"
-msgstr "Cancelar"
+msgid "I already have an account"
+msgstr "Já tenho uma conta"
+
+#: ../mdkonline:56
+#, c-format
+msgid "I want to subscribe"
+msgstr "Quero subscrever"
+
+#: ../mdkonline:89 ../mdkonline:93 ../mdkonline:131
+#, c-format
+msgid "Please wait"
+msgstr "Por favor aguarde"
 
 #: ../mdkonline:89
 #, c-format
-msgid "Previous"
-msgstr "Anterior"
+msgid "Reading configuration\n"
+msgstr "A ler a configuração\n"
 
-#: ../mdkonline:103
+#: ../mdkonline:93
 #, c-format
-msgid "Welcome to Mandrakeonline"
-msgstr "Bem-vindo ao Mandrakeonline"
+msgid "Sending configuration..."
+msgstr "A enviar a configuração..."
 
-#: ../mdkonline:104 ../mdkonline_tui:98
+#: ../mdkonline:109
 #, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
@@ -303,62 +325,37 @@ msgstr ""
 "(pacotes, lista do hardware) para uma base de dados centralizada para\n"
 "o manter informado das actualizações de segurança e versões úteis.\n"
 
-#: ../mdkonline:105 ../mdkonline_tui:142
+#: ../mdkonline:114
 #, c-format
-msgid "Create a Mandrakeonline Account"
-msgstr "Criar uma Conta Mandrakeonline"
+msgid "Account creation or authentication"
+msgstr "Criação de conta ou autenticação"
 
-#: ../mdkonline:107
+#: ../mdkonline:119
 #, c-format
-msgid "I don't have a Mandrakeonline account and I want to subscribe"
-msgstr "Eu não tenho uma conta Mandrakeonline e quero-me subscrever"
+msgid "Enter your Mandrakeonline login, password and machine name:"
+msgstr "Indique o seu login Mandrakeonline, senha e nome da máquina:"
 
-#: ../mdkonline:111 ../mdkonline:131 ../mdkonline_tui:114 ../mdkonline_tui:145
+#: ../mdkonline:125 ../mdkonline:156
 #, c-format
 msgid "Login:"
 msgstr "Login:"
 
-#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:115 ../mdkonline_tui:146
+#: ../mdkonline:126 ../mdkonline:157
 #, c-format
 msgid "Password:"
 msgstr "Senha:"
 
-#: ../mdkonline:113 ../mdkonline_tui:147
-#, c-format
-msgid "Confirm Password:"
-msgstr "Confirmar Senha :"
-
-#: ../mdkonline:114 ../mdkonline_tui:148
-#, c-format
-msgid "Mail contact:"
-msgstr "Contacto Mail :"
-
-#: ../mdkonline:121
-#, c-format
-msgid "Mandrakelinux Privacy Policy"
-msgstr "Políticas de Privacidade Mandrakelinux"
-
 #: ../mdkonline:127
 #, c-format
-msgid "Authentification"
-msgstr "Autenticação"
-
-#: ../mdkonline:128 ../mdkonline_tui:108
-#, c-format
-msgid "Enter your Mandrakeonline login, password and machine name:"
-msgstr "Indique o seu login Mandrakeonline, senha e nome da máquina:"
-
-#: ../mdkonline:133 ../mdkonline_tui:116
-#, c-format
 msgid "Machine name:"
 msgstr "Nome da máquina:"
 
-#: ../mdkonline:138
+#: ../mdkonline:131
 #, c-format
-msgid "Send Configuration"
-msgstr "Enviar Configuração"
+msgid "Connecting to Mandrakeonline website..."
+msgstr "A ligar ao site Mandrakeonline..."
 
-#: ../mdkonline:139 ../mdkonline_tui:128
+#: ../mdkonline:139
 #, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
@@ -383,65 +380,63 @@ msgstr ""
 "1) a lista dos pacotes que instalou no seu sistema,\n"
 "2) a sua configuração de hardware.\n"
 "\n"
-"Se esta ideia não lhe agradar, ou não quiser beneficiar deste serviço, "
-"por favor\n"
+"Se esta ideia não lhe agradar, ou não quiser beneficiar deste serviço, por "
+"favor\n"
 "clique em 'Cancelar'. Ao premir 'Seguinte', irá-nos permitir mantê-lo "
 "informado\n"
-"acerca das actualizações de segurança e novas versões via alerta por "
-"email.\n"
+"acerca das actualizações de segurança e novas versões via alerta por email.\n"
 "Além disso, beneficiará de descontos nos serviços de suporte em\n"
 "www.mandrakeexpert.com."
 
-#: ../mdkonline:144 ../mdkonline:211 ../mdkonline:234
+#: ../mdkonline:141 ../mdkonline:180 ../mdkupdate:126 ../mdkupdate:198
 #, c-format
-msgid "Finish"
-msgstr "Acabar"
+msgid "Connection problem"
+msgstr "Problema na ligação"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid "Your upload was successful!"
-msgstr "O seu envio foi bem sucedido!"
+msgid "or"
+msgstr "ou"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandrakeonline."
-msgstr ""
-"A partir de agora irá receber anúncios de segurança\n"
-"e actualizações graças ao Mandrakeonline."
+msgid "wrong password:"
+msgstr "senha errada:"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
 msgid ""
-"Mandrakeonline offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+"Your login or password was wrong.\n"
+" Either you'll have to type it again, or you'll need to create an account on "
+"Mandrakeonline.\n"
+" In the latter case, go back to the first step to connect to "
+"Mandrakeonline.\n"
+" Be aware that you must also provide a Machine name \n"
+" (only alphabetical characters are admitted)"
 msgstr ""
-"O Mandrakeonline oferece-lhe a possibilidade de automatizar as\n"
-"actualizações. Um programa irá ser executado regularmente no\n"
-"seu sistema à espera de novas actualizações.\n"
-
-#: ../mdkonline:146
-#, c-format
-msgid "automated Upgrades"
-msgstr "Actualizações automatizadas"
+"O seu login ou senha estão errados.\n"
+" Irá ter de o escrever outra vez, ou irá precisar de criar uma conta no "
+"Mandrakeonline.\n"
+" Em último caso, volte atrás ao primeiro passo para ligar o Mandrakeonline.\n"
+" Tenha em atenção que também deve indicar um nome de Máquina\n"
+" (só os caracteres alfabéticos são admitidos)"
 
-#: ../mdkonline:150
+#: ../mdkonline:153
 #, c-format
-msgid "Country:"
-msgstr "País:"
+msgid "Create a Mandrakeonline Account"
+msgstr "Criar uma Conta Mandrakeonline"
 
-#: ../mdkonline:178 ../mdkonline:183 ../mdkonline:185 ../mdkonline:187
+#: ../mdkonline:158
 #, c-format
-msgid "Error"
-msgstr "Erro"
+msgid "Confirm Password:"
+msgstr "Confirmar Senha :"
 
-#: ../mdkonline:183 ../mdkonline_tui:152
+#: ../mdkonline:159
 #, c-format
-msgid "Please provide a login"
-msgstr "Por favor indique um login"
+msgid "Mail contact:"
+msgstr "Contacto Mail :"
 
-#: ../mdkonline:185 ../mdkonline_tui:152
+#: ../mdkonline:163
 #, c-format
 msgid ""
 "The passwords do not match\n"
@@ -450,161 +445,118 @@ msgstr ""
 "As senhas não combinam\n"
 " Por favor tente novamente\n"
 
-#: ../mdkonline:187 ../mdkonline_tui:152
+#: ../mdkonline:163
+#, c-format
+msgid "Please provide a login"
+msgstr "Por favor indique um login"
+
+#: ../mdkonline:163
 #, c-format
 msgid "Not a valid mail address!\n"
 msgstr "Não é um endereço de email válido!\n"
 
-#: ../mdkonline:199 ../mdkonline_tui:78
+#: ../mdkonline:169
 #, c-format
-msgid "Reading configuration\n"
-msgstr "A ler a configuração\n"
+msgid ""
+"Mandrakeonline Account successfully created.\n"
+"Please click \"Next\" to authenticate and upload your configuration\n"
+msgstr ""
+"A conta Mandrakeonline foi criada com sucesso.\n"
+"Por favor clique em \"Seguinte\" para se autenticar e enviar a sua "
+"configuração\n"
 
-#: ../mdkonline:204 ../mdkonline_tui:82
+#: ../mdkonline:178
 #, c-format
-msgid "Sending configuration..."
-msgstr "A enviar a configuração..."
+msgid "Your upload was successful!"
+msgstr "O seu envio foi bem sucedido!"
 
-#: ../mdkonline:213 ../mdkonline:273 ../mdkonline_tui:130 ../mdkonline_tui:169
-#: ../mdkupdate:124 ../mdkupdate:195
+#: ../mdkonline:178
 #, c-format
-msgid "Connection problem"
-msgstr "Problema na ligação"
+msgid ""
+"From now you will receive on security and updates \n"
+"announcements thanks to Mandrakeonline."
+msgstr ""
+"A partir de agora irá receber anúncios de segurança\n"
+"e actualizações graças ao Mandrakeonline."
+
+#: ../mdkonline:178
+#, c-format
+msgid ""
+"Mandrakeonline offers you the ability to automate the updates.\n"
+"A program will run regulary in your system waiting for new updates\n"
+msgstr ""
+"O Mandrakeonline oferece-lhe a possibilidade de automatizar as\n"
+"actualizações. Um programa irá ser executado regularmente no\n"
+"seu sistema à espera de novas actualizações.\n"
 
-#: ../mdkonline:213 ../mdkonline_tui:169
+#: ../mdkonline:180
 #, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr "Problemas ocorrem quando a enviar ficheiros, por favor tente novamente"
 
-#: ../mdkonline:251
+#: ../mdkonline:186
 #, c-format
-msgid "Quitting Wizard\n"
-msgstr "Sair do Assistente\n"
+msgid "Country"
+msgstr "País"
 
-#: ../mdkonline:273
+#: ../mdkonline:198
 #, c-format
-msgid "Mandrakeonline could not be contacted, please try again at a later time"
-msgstr "O Mandrakeonline nao se consegue contactar, por favor tente mais tarde"
+msgid "Congratulations"
+msgstr "Parabéns"
 
-#: ../mdkonline:285
+#: ../mdkonline:198
 #, c-format
-msgid "Wrong password"
-msgstr "Senha errada"
+msgid "Your Mandrakeonline account has been successfully configured\n"
+msgstr "A sua conta Mandrakeonline foi configurada com sucesso\n"
 
-#: ../mdkonline:285 ../mdkonline_tui:130
+#: ../mdkonline:214
+#, fuzzy, c-format
+msgid "Configuration uploaded successfully"
+msgstr "O seu envio foi bem sucedido!"
+
+#: ../mdkonline:215
+#, fuzzy, c-format
+msgid "Problem uploading configuration"
+msgstr "A ler a configuração\n"
+
+#: ../mdkonline:216
 #, c-format
 msgid ""
-"Your login or password was wrong.\n"
-" Either you'll have to type it again, or you'll need to create an account on "
-"Mandrakeonline.\n"
-" In the latter case, go back to the first step to connect to "
-"Mandrakeonline.\n"
-" Be aware that you must also provide a Machine name \n"
-" (only alphabetical characters are admitted)"
+"Cannot connect to mandrakeonline website: wrong login/password or router/"
+"firewall bad settings"
 msgstr ""
-"O seu login ou senha estão errados.\n"
-" Irá ter de o escrever outra vez, ou irá precisar de criar uma conta no "
-"Mandrakeonline.\n"
-" Em último caso, volte atrás ao primeiro passo para ligar o "
-"Mandrakeonline.\n"
-" Tenha em atenção que também deve indicar um nome de Máquina\n"
-" (só os caracteres alfabéticos são admitidos)"
 
-#: ../mdkonline.pm:58
+#: ../mdkonline.pm:66
 #, c-format
 msgid "Login and password should be less than 12 characters\n"
 msgstr "O login e a senha devem ter menos de 12 caracteres\n"
 
-#: ../mdkonline.pm:59
+#: ../mdkonline.pm:67
 #, c-format
 msgid "Special characters are not allowed\n"
 msgstr "Os caracteres especiais não são permitidos\n"
 
-#: ../mdkonline.pm:60
+#: ../mdkonline.pm:68
 #, c-format
 msgid "Please fill in all fields\n"
 msgstr "Por favor preencha todos os campos\n"
 
-#: ../mdkonline.pm:61
+#: ../mdkonline.pm:69
 #, c-format
 msgid "Email not valid\n"
 msgstr "Email inválido\n"
 
-#: ../mdkonline.pm:62
+#: ../mdkonline.pm:70
 #, c-format
 msgid "Account already exist\n"
 msgstr "A conta já existe\n"
 
-#: ../mdkonline.pm:68
+#: ../mdkonline.pm:76
 #, c-format
 msgid "Problem connecting to server \n"
 msgstr "Problema em ligar ao servidor \n"
 
-#: ../mdkonline_tui:45 ../mdkonline_tui:95
-#, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
-
-#: ../mdkonline_tui:48
-#, c-format
-msgid "I already have an account"
-msgstr "Já tenho uma conta"
-
-#: ../mdkonline_tui:49
-#, c-format
-msgid "I want to subscribe"
-msgstr "Quero subscrever"
-
-#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:120
-#, c-format
-msgid "Please wait"
-msgstr "Por favor aguarde"
-
-#: ../mdkonline_tui:103
-#, c-format
-msgid "Account creation or authentication"
-msgstr "Criação de conta ou autenticação"
-
-#: ../mdkonline_tui:120
-#, c-format
-msgid "Connecting to Mandrakeonline website..."
-msgstr "A ligar ao site Mandrakeonline..."
-
-#: ../mdkonline_tui:130
-#, c-format
-msgid "or"
-msgstr "ou"
-
-#: ../mdkonline_tui:130
-#, c-format
-msgid "wrong password:"
-msgstr "senha errada:"
-
-#: ../mdkonline_tui:158
-#, c-format
-msgid ""
-"Mandrakeonline Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-"A conta Mandrakeonline foi criada com sucesso.\n"
-"Por favor clique em \"Seguinte\" para se autenticar e enviar a sua configuração\n"
-
-#: ../mdkonline_tui:175
-#, c-format
-msgid "Country"
-msgstr "País"
-
-#: ../mdkonline_tui:187
-#, c-format
-msgid "Congratulations"
-msgstr "Parabéns"
-
-#: ../mdkonline_tui:187
-#, c-format
-msgid "Your Mandrakeonline account has been successfully configured\n"
-msgstr "A sua conta Mandrakeonline foi configurada com sucesso\n"
-
-#: ../mdkupdate:50
+#: ../mdkupdate:52
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
@@ -620,47 +572,88 @@ msgstr ""
 "\n"
 "uso:\n"
 
-#: ../mdkupdate:55
+#: ../mdkupdate:57
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - mostra esta mensagem de ajuda.\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:58
 #, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto         - Mandrakeupdate executado automáticamente.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:59
 #, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - executa o Mandrakeupdate..\n"
 
-#: ../mdkupdate:58
-#, c-format
-msgid "  --update       - Update keys\n"
-msgstr "  --update       - actualiza as chaves\n"
-
-#: ../mdkupdate:66
+#: ../mdkupdate:67
 #, c-format
 msgid "No %s file found. Run mdkonline wizard first"
 msgstr "Nenhum ficheiro %s encontrado. Execute primeiro o assistente mdkonline"
 
-#: ../mdkupdate:124
+#: ../mdkupdate:126
 #, c-format
 msgid "Mandrakeupdate could not contact the site, we will try again."
 msgstr "O Mandrakeupdate não conseguiu contactar o site, vai tentar outra vez."
 
-#: ../mdkupdate:173
+#: ../mdkupdate:176
 #, c-format
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr "Incapaz de actualizar os pacotes a partir da média mdkupdate.\n"
 
-#: ../mdkupdate:195
+#: ../mdkupdate:198
 #, c-format
 msgid ""
 "Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
 "mandrakeonline [dot] net"
 msgstr ""
-"O Mandrakeupdate nao conseguiu enviar os ficheiros diff. Envie um email "
-"para suport [em] mandrakeonline [ponto] net"
+"O Mandrakeupdate nao conseguiu enviar os ficheiros diff. Envie um email para "
+"suport [em] mandrakeonline [ponto] net"
+
+#~ msgid "Next"
+#~ msgstr "Seguinte"
+
+#~ msgid "Cancel"
+#~ msgstr "Cancelar"
+
+#~ msgid "Previous"
+#~ msgstr "Anterior"
+
+#~ msgid "I don't have a Mandrakeonline account and I want to subscribe"
+#~ msgstr "Eu não tenho uma conta Mandrakeonline e quero-me subscrever"
+
+#~ msgid "Mandrakelinux Privacy Policy"
+#~ msgstr "Políticas de Privacidade Mandrakelinux"
+
+#~ msgid "Authentification"
+#~ msgstr "Autenticação"
+
+#~ msgid "Send Configuration"
+#~ msgstr "Enviar Configuração"
+
+#~ msgid "Finish"
+#~ msgstr "Acabar"
+
+#~ msgid "automated Upgrades"
+#~ msgstr "Actualizações automatizadas"
+
+#~ msgid "Country:"
+#~ msgstr "País:"
+
+#~ msgid "Error"
+#~ msgstr "Erro"
+
+#~ msgid "Quitting Wizard\n"
+#~ msgstr "Sair do Assistente\n"
+
+#~ msgid ""
+#~ "Mandrakeonline could not be contacted, please try again at a later time"
+#~ msgstr ""
+#~ "O Mandrakeonline nao se consegue contactar, por favor tente mais tarde"
+
+#~ msgid "Wrong password"
+#~ msgstr "Senha errada"
 
+#~ msgid "  --update       - Update keys\n"
+#~ msgstr "  --update       - actualiza as chaves\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 7756c166..ffca185a 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-pt_BR\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-01 22:41+0200\n"
+"POT-Creation-Date: 2004-11-03 12:10+0100\n"
 "PO-Revision-Date: 2004-09-02 15:37-0300\n"
 "Last-Translator: Ricardo de Castilho <cast_brasil@ig.com.br>\n"
 "Language-Team: Português Brasileiro <linux_pt_BR@yahoogrupos.com.br>\n"
@@ -18,12 +18,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3\n"
 
-#: ../mdkapplet:61
+#: ../mdkapplet:63
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Seu sistema é moderno"
 
-#: ../mdkapplet:67
+#: ../mdkapplet:69
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -32,189 +32,199 @@ msgstr ""
 "Problema no serviço de configuração.  Por favor, verifique os logs gerados e "
 "envie para support@mandrakeonline.net"
 
-#: ../mdkapplet:73
+#: ../mdkapplet:75
 #, c-format
 msgid "System is busy. Please wait ..."
 msgstr "Sistema ocupado. Aguarde ..."
 
-#: ../mdkapplet:79
+#: ../mdkapplet:81
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Novas atualizações estão disponíveis para o seu sistema"
 
-#: ../mdkapplet:85
+#: ../mdkapplet:87
 #, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr "O serviço não está configurado. Clique em \"configurar serviço\""
 
-#: ../mdkapplet:91
+#: ../mdkapplet:93
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Sem conexão de rede. Por favor configure sua rede"
 
-#: ../mdkapplet:97
+#: ../mdkapplet:99
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "O Serviço não está ativado. Por favor clique em \"Online Website\""
 
-#: ../mdkapplet:103
+#: ../mdkapplet:105
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:108 ../mdkapplet:158
+#: ../mdkapplet:110 ../mdkapplet:164
 #, c-format
 msgid "Install updates"
 msgstr "Instalar atualizações"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:111
 #, c-format
 msgid "Configure the service"
 msgstr "Configurar o serviço"
 
-#: ../mdkapplet:110
+#: ../mdkapplet:112
 #, c-format
 msgid "Check Updates"
 msgstr "Verificar atualizações"
 
-#: ../mdkapplet:111
+#: ../mdkapplet:113 ../mdkapplet:167 ../mdkapplet:225
+#, fuzzy, c-format
+msgid "Please Wait"
+msgstr "Por favor aguarde"
+
+#: ../mdkapplet:113 ../mdkapplet:166 ../mdkapplet:167 ../mdkapplet:225
+#, c-format
+msgid "Check updates"
+msgstr "Verificar atualizações"
+
+#: ../mdkapplet:115
 #, c-format
 msgid "Online WebSite"
 msgstr "WebSite Online"
 
-#: ../mdkapplet:112
+#: ../mdkapplet:116
 #, c-format
 msgid "Configure Network"
 msgstr "Configurar rede"
 
-#: ../mdkapplet:113
+#: ../mdkapplet:117
 #, c-format
 msgid "Configure Now!"
 msgstr "Configurar Agora!"
 
-#: ../mdkapplet:146
+#: ../mdkapplet:152 ../mdkapplet:229
 #, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Aplicativo de atualizações Mandrakelinux"
 
-#: ../mdkapplet:156
+#: ../mdkapplet:162
 #, c-format
 msgid "Actions"
 msgstr "Ações"
 
-#: ../mdkapplet:159
+#: ../mdkapplet:165
 #, c-format
 msgid "Configure"
 msgstr "Configurar"
 
-#: ../mdkapplet:160
-#, c-format
-msgid "Check updates"
-msgstr "Verificar atualizações"
-
-#: ../mdkapplet:161
+#: ../mdkapplet:169
 #, c-format
 msgid "See logs"
 msgstr "Ver logs"
 
-#: ../mdkapplet:164
+#: ../mdkapplet:172
 #, c-format
 msgid "Status"
 msgstr "Status"
 
-#: ../mdkapplet:168 ../mdkapplet:363
+#: ../mdkapplet:176 ../mdkapplet:375
 #, c-format
 msgid "Close"
 msgstr "Fechar"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Network Connection: "
 msgstr "Conexão de rede: "
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Up"
 msgstr "Ativa"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Down"
 msgstr "Caida"
 
-#: ../mdkapplet:204
+#: ../mdkapplet:212
 #, c-format
 msgid "Last check: "
 msgstr "Última verificação: "
 
-#: ../mdkapplet:205
+#: ../mdkapplet:213
 #, c-format
 msgid "Updates: "
 msgstr "Atualizações:"
 
-#: ../mdkapplet:209
+#: ../mdkapplet:217
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Lançando o drakconnect\n"
 
-#: ../mdkapplet:213
+#: ../mdkapplet:221
 #, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "Lançando o mdkupdate --applet\n"
 
-#: ../mdkapplet:217
+#: ../mdkapplet:224
 #, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 "O mandrakeonline parece ter sido reinstalado, recarregando o aplicativo."
 
-#: ../mdkapplet:225
+#: ../mdkapplet:235
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Conferindo novas atualizações...\n"
 
-#: ../mdkapplet:227
+#: ../mdkapplet:237
 #, c-format
 msgid "Connecting to"
 msgstr "Conectando em"
 
-#: ../mdkapplet:250
+#: ../mdkapplet:244
+#, fuzzy, c-format
+msgid "Response from Mandrakeonline server\n"
+msgstr "Benvindo ao MandrakeonLine."
+
+#: ../mdkapplet:262
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Verificando... Atualizações estão disponíveis\n"
 
-#: ../mdkapplet:254
+#: ../mdkapplet:267
 #, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
-#: ../mdkapplet:255
+#: ../mdkapplet:268
 #, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
-#: ../mdkapplet:256
+#: ../mdkapplet:269
 #, c-format
 msgid "Unknown state"
 msgstr "Estado desconhecido"
 
-#: ../mdkapplet:257
+#: ../mdkapplet:270
 #, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr ""
 "Serviços on-line desativados.  Contate através do website Mandrakeonline\n"
 
-#: ../mdkapplet:258
+#: ../mdkapplet:271
 #, c-format
 msgid "Wrong Password.\n"
 msgstr "Senha incorreta.\n"
 
-#: ../mdkapplet:259
+#: ../mdkapplet:272
 #, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr "Erro na ação, host ou login.\n"
 
-#: ../mdkapplet:260
+#: ../mdkapplet:273
 #, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
@@ -223,72 +233,82 @@ msgstr ""
 "Algo está errado com a configuração da rede (verifique a rota, firewall ou "
 "as configurações proxy)\n"
 
-#: ../mdkapplet:264
+#: ../mdkapplet:277
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Sistema ativo até \n"
 
-#: ../mdkapplet:303
+#: ../mdkapplet:317
 #, c-format
 msgid "No check"
 msgstr "Não verificado"
 
-#: ../mdkapplet:316
+#: ../mdkapplet:330
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Checando a Rede: parece inativa\n"
 
-#: ../mdkapplet:319
+#: ../mdkapplet:333
 #, c-format
 msgid "Checking config file: Not present\n"
 msgstr "Checando Arquivo de Configuração: Não presente\n"
 
-#: ../mdkapplet:353
+#: ../mdkapplet:365
 #, c-format
 msgid "Logs"
 msgstr "Logs:"
 
-#: ../mdkapplet:369
+#: ../mdkapplet:381
 #, c-format
 msgid "Clear"
 msgstr "Limpar"
 
-#: ../mdkapplet:396
+#: ../mdkapplet:408
 #, c-format
 msgid "About..."
 msgstr "Sobre.."
 
-#: ../mdkapplet:397
+#: ../mdkapplet:409
 #, c-format
 msgid "Always launch on startup"
 msgstr "Sempre iniciar no boot"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:411
 #, c-format
 msgid "Quit"
 msgstr "Sair"
 
-#: ../mdkonline:89
+#: ../mdkonline:52 ../mdkonline:106
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "Benvindo ao MandrakeonLine."
+
+#: ../mdkonline:55
 #, c-format
-msgid "Next"
-msgstr "Próx"
+msgid "I already have an account"
+msgstr ""
 
-#: ../mdkonline:89
+#: ../mdkonline:56
+#, c-format
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline:89 ../mdkonline:93 ../mdkonline:131
 #, c-format
-msgid "Cancel"
-msgstr "Cancelar"
+msgid "Please wait"
+msgstr "Por favor aguarde"
 
 #: ../mdkonline:89
 #, c-format
-msgid "Previous"
-msgstr "Anterior"
+msgid "Reading configuration\n"
+msgstr "Lendo configuração\n"
 
-#: ../mdkonline:103
+#: ../mdkonline:93
 #, c-format
-msgid "Welcome to Mandrakeonline"
-msgstr "Benvindo ao MandrakeonLine."
+msgid "Sending configuration..."
+msgstr "Enviando configuração..."
 
-#: ../mdkonline:104 ../mdkonline_tui:98
+#: ../mdkonline:109
 #, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
@@ -300,62 +320,37 @@ msgstr ""
 "de dados centralizada com o intuito de mantê-lo informado sobre\n"
 "atualizações de segurança e melhorias úteis.\n"
 
-#: ../mdkonline:105 ../mdkonline_tui:142
+#: ../mdkonline:114
 #, c-format
-msgid "Create a Mandrakeonline Account"
-msgstr "Criar uma conta Mandrakeonline"
+msgid "Account creation or authentication"
+msgstr ""
 
-#: ../mdkonline:107
-#, fuzzy, c-format
-msgid "I don't have a Mandrakeonline account and I want to subscribe"
-msgstr "Eu ainda não tenho uma conta Mandrakeonline mas, desejo abrir uma "
+#: ../mdkonline:119
+#, c-format
+msgid "Enter your Mandrakeonline login, password and machine name:"
+msgstr "Digite seu login do Mandrakeonline, senha e o nome da máquina: "
 
-#: ../mdkonline:111 ../mdkonline:131 ../mdkonline_tui:114 ../mdkonline_tui:145
+#: ../mdkonline:125 ../mdkonline:156
 #, c-format
 msgid "Login:"
 msgstr "Login:"
 
-#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:115 ../mdkonline_tui:146
+#: ../mdkonline:126 ../mdkonline:157
 #, c-format
 msgid "Password:"
 msgstr "Senha:"
 
-#: ../mdkonline:113 ../mdkonline_tui:147
-#, c-format
-msgid "Confirm Password:"
-msgstr "Confirmar Senha:"
-
-#: ../mdkonline:114 ../mdkonline_tui:148
-#, c-format
-msgid "Mail contact:"
-msgstr "E-mail para contato:"
-
-#: ../mdkonline:121
-#, c-format
-msgid "Mandrakelinux Privacy Policy"
-msgstr "Política de Privacidade Mandrakelinux."
-
 #: ../mdkonline:127
 #, c-format
-msgid "Authentification"
-msgstr "Autenticação"
-
-#: ../mdkonline:128 ../mdkonline_tui:108
-#, c-format
-msgid "Enter your Mandrakeonline login, password and machine name:"
-msgstr "Digite seu login do Mandrakeonline, senha e o nome da máquina: "
-
-#: ../mdkonline:133 ../mdkonline_tui:116
-#, c-format
 msgid "Machine name:"
 msgstr "Nome da máquina:"
 
-#: ../mdkonline:138
-#, c-format
-msgid "Send Configuration"
-msgstr "Enviar Configuração"
+#: ../mdkonline:131
+#, fuzzy, c-format
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Benvindo ao MandrakeonLine."
 
-#: ../mdkonline:139 ../mdkonline_tui:128
+#: ../mdkonline:139
 #, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
@@ -387,56 +382,54 @@ msgstr ""
 "personalizados. Além disso, você obterá descontos em serviços pagos de\n"
 "suporte em www.mandrakeexpert.com."
 
-#: ../mdkonline:144 ../mdkonline:211 ../mdkonline:234
+#: ../mdkonline:141 ../mdkonline:180 ../mdkupdate:126 ../mdkupdate:198
 #, c-format
-msgid "Finish"
-msgstr "Fim"
-
-#: ../mdkonline:145 ../mdkonline_tui:167
-#, c-format
-msgid "Your upload was successful!"
-msgstr "Enviado com sucesso!"
+msgid "Connection problem"
+msgstr "Problema de conexão"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandrakeonline."
+msgid "or"
 msgstr ""
-"A partir de agora você receberá atualizações sobre segurança\n"
-"anúncios da MandrakeonLine."
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "Senha incorreta"
+
+#: ../mdkonline:141
 #, c-format
 msgid ""
-"Mandrakeonline offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+"Your login or password was wrong.\n"
+" Either you'll have to type it again, or you'll need to create an account on "
+"Mandrakeonline.\n"
+" In the latter case, go back to the first step to connect to "
+"Mandrakeonline.\n"
+" Be aware that you must also provide a Machine name \n"
+" (only alphabetical characters are admitted)"
 msgstr ""
-"Mandrakeonline oferece a você a facilidade de automatizar suas\n"
-"atualizações. Um programa instalado no seu sistema verificará\n"
-"regularmente as novas atualizações.\n"
-
-#: ../mdkonline:146
-#, c-format
-msgid "automated Upgrades"
-msgstr "Atualizações automáticas."
+"Seu login ou senha estão errados \n"
+" Você terá que digitá-los novamente ou criar uma conta no Mandrakeonline, \n"
+" nesse caso, volte ao passo inicial para se conectar ao Mandrakeonline.\n"
+" Será necessário fornecer um nome da máquina \n"
+" (somente caracteres alfanuméricos são permitidos)"
 
-#: ../mdkonline:150
+#: ../mdkonline:153
 #, c-format
-msgid "Country:"
-msgstr "País:"
+msgid "Create a Mandrakeonline Account"
+msgstr "Criar uma conta Mandrakeonline"
 
-#: ../mdkonline:178 ../mdkonline:183 ../mdkonline:185 ../mdkonline:187
+#: ../mdkonline:158
 #, c-format
-msgid "Error"
-msgstr "Erro"
+msgid "Confirm Password:"
+msgstr "Confirmar Senha:"
 
-#: ../mdkonline:183 ../mdkonline_tui:152
+#: ../mdkonline:159
 #, c-format
-msgid "Please provide a login"
-msgstr "Forneça um login"
+msgid "Mail contact:"
+msgstr "E-mail para contato:"
 
-#: ../mdkonline:185 ../mdkonline_tui:152
+#: ../mdkonline:163
 #, c-format
 msgid ""
 "The passwords do not match\n"
@@ -445,157 +438,115 @@ msgstr ""
 "A senha não confere\n"
 " Por favor, tente de novo\n"
 
-#: ../mdkonline:187 ../mdkonline_tui:152
+#: ../mdkonline:163
+#, c-format
+msgid "Please provide a login"
+msgstr "Forneça um login"
+
+#: ../mdkonline:163
 #, c-format
 msgid "Not a valid mail address!\n"
 msgstr "Endereço de email inválido\n"
 
-#: ../mdkonline:199 ../mdkonline_tui:78
+#: ../mdkonline:169
 #, c-format
-msgid "Reading configuration\n"
-msgstr "Lendo configuração\n"
+msgid ""
+"Mandrakeonline Account successfully created.\n"
+"Please click \"Next\" to authenticate and upload your configuration\n"
+msgstr ""
 
-#: ../mdkonline:204 ../mdkonline_tui:82
+#: ../mdkonline:178
 #, c-format
-msgid "Sending configuration..."
-msgstr "Enviando configuração..."
+msgid "Your upload was successful!"
+msgstr "Enviado com sucesso!"
 
-#: ../mdkonline:213 ../mdkonline:273 ../mdkonline_tui:130 ../mdkonline_tui:169
-#: ../mdkupdate:124 ../mdkupdate:195
+#: ../mdkonline:178
 #, c-format
-msgid "Connection problem"
-msgstr "Problema de conexão"
+msgid ""
+"From now you will receive on security and updates \n"
+"announcements thanks to Mandrakeonline."
+msgstr ""
+"A partir de agora você receberá atualizações sobre segurança\n"
+"anúncios da MandrakeonLine."
 
-#: ../mdkonline:213 ../mdkonline_tui:169
+#: ../mdkonline:178
+#, c-format
+msgid ""
+"Mandrakeonline offers you the ability to automate the updates.\n"
+"A program will run regulary in your system waiting for new updates\n"
+msgstr ""
+"Mandrakeonline oferece a você a facilidade de automatizar suas\n"
+"atualizações. Um programa instalado no seu sistema verificará\n"
+"regularmente as novas atualizações.\n"
+
+#: ../mdkonline:180
 #, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr "Ocorreu um erro ao atualizar os arquivos, por favor tente novamente"
 
-#: ../mdkonline:251
-#, c-format
-msgid "Quitting Wizard\n"
-msgstr "Saindo do assistente\n"
+#: ../mdkonline:186
+#, fuzzy, c-format
+msgid "Country"
+msgstr "País:"
 
-#: ../mdkonline:273
-#, c-format
-msgid "Mandrakeonline could not be contacted, please try again at a later time"
-msgstr "Mandrakeonline não pôde ser contactado, por favor tente mais tarde"
+#: ../mdkonline:198
+#, fuzzy, c-format
+msgid "Congratulations"
+msgstr "Enviar Configuração"
 
-#: ../mdkonline:285
+#: ../mdkonline:198
 #, c-format
-msgid "Wrong password"
-msgstr "Senha incorreta"
+msgid "Your Mandrakeonline account has been successfully configured\n"
+msgstr ""
+
+#: ../mdkonline:214
+#, fuzzy, c-format
+msgid "Configuration uploaded successfully"
+msgstr "Enviado com sucesso!"
+
+#: ../mdkonline:215
+#, fuzzy, c-format
+msgid "Problem uploading configuration"
+msgstr "Lendo configuração\n"
 
-#: ../mdkonline:285 ../mdkonline_tui:130
+#: ../mdkonline:216
 #, c-format
 msgid ""
-"Your login or password was wrong.\n"
-" Either you'll have to type it again, or you'll need to create an account on "
-"Mandrakeonline.\n"
-" In the latter case, go back to the first step to connect to "
-"Mandrakeonline.\n"
-" Be aware that you must also provide a Machine name \n"
-" (only alphabetical characters are admitted)"
+"Cannot connect to mandrakeonline website: wrong login/password or router/"
+"firewall bad settings"
 msgstr ""
-"Seu login ou senha estão errados \n"
-" Você terá que digitá-los novamente ou criar uma conta no Mandrakeonline, \n"
-" nesse caso, volte ao passo inicial para se conectar ao Mandrakeonline.\n"
-" Será necessário fornecer um nome da máquina \n"
-" (somente caracteres alfanuméricos são permitidos)"
 
-#: ../mdkonline.pm:58
+#: ../mdkonline.pm:66
 #, c-format
 msgid "Login and password should be less than 12 characters\n"
 msgstr ""
 
-#: ../mdkonline.pm:59
+#: ../mdkonline.pm:67
 #, c-format
 msgid "Special characters are not allowed\n"
 msgstr ""
 
-#: ../mdkonline.pm:60
+#: ../mdkonline.pm:68
 #, c-format
 msgid "Please fill in all fields\n"
 msgstr ""
 
-#: ../mdkonline.pm:61
+#: ../mdkonline.pm:69
 #, c-format
 msgid "Email not valid\n"
 msgstr ""
 
-#: ../mdkonline.pm:62
+#: ../mdkonline.pm:70
 #, c-format
 msgid "Account already exist\n"
 msgstr ""
 
-#: ../mdkonline.pm:68
+#: ../mdkonline.pm:76
 #, c-format
 msgid "Problem connecting to server \n"
 msgstr "Problemas de conexão com o servidor\n"
 
-#: ../mdkonline_tui:45 ../mdkonline_tui:95
-#, fuzzy, c-format
-msgid "Mandrakeonline"
-msgstr "Benvindo ao MandrakeonLine."
-
-#: ../mdkonline_tui:48
-#, c-format
-msgid "I already have an account"
-msgstr ""
-
-#: ../mdkonline_tui:49
-#, c-format
-msgid "I want to subscribe"
-msgstr ""
-
-#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:120
-#, c-format
-msgid "Please wait"
-msgstr "Por favor aguarde"
-
-#: ../mdkonline_tui:103
-#, c-format
-msgid "Account creation or authentication"
-msgstr ""
-
-#: ../mdkonline_tui:120
-#, fuzzy, c-format
-msgid "Connecting to Mandrakeonline website..."
-msgstr "Benvindo ao MandrakeonLine."
-
-#: ../mdkonline_tui:130
-#, c-format
-msgid "or"
-msgstr ""
-
-#: ../mdkonline_tui:130
-#, fuzzy, c-format
-msgid "wrong password:"
-msgstr "Senha incorreta"
-
-#: ../mdkonline_tui:158
-#, c-format
-msgid ""
-"Mandrakeonline Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-
-#: ../mdkonline_tui:175
-#, fuzzy, c-format
-msgid "Country"
-msgstr "País:"
-
-#: ../mdkonline_tui:187
-#, fuzzy, c-format
-msgid "Congratulations"
-msgstr "Enviar Configuração"
-
-#: ../mdkonline_tui:187
-#, c-format
-msgid "Your Mandrakeonline account has been successfully configured\n"
-msgstr ""
-
-#: ../mdkupdate:50
+#: ../mdkupdate:52
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
@@ -612,48 +563,90 @@ msgstr ""
 "\n"
 "uso:\n"
 
-#: ../mdkupdate:55
+#: ../mdkupdate:57
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - exibe esta mensagem de ajuda.\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:58
 #, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto         - lança Mandrakeupdate automaticamente.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:59
 #, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - lança Mandrakeupdate.\n"
 
-#: ../mdkupdate:58
-#, c-format
-msgid "  --update       - Update keys\n"
-msgstr "  --update       - atualiza chaves.\n"
-
-#: ../mdkupdate:66
+#: ../mdkupdate:67
 #, c-format
 msgid "No %s file found. Run mdkonline wizard first"
 msgstr ""
 
-#: ../mdkupdate:124
+#: ../mdkupdate:126
 #, fuzzy, c-format
 msgid "Mandrakeupdate could not contact the site, we will try again."
 msgstr "Mandrakeonline não pôde ser contactado, por favor tente mais tarde"
 
-#: ../mdkupdate:173
+#: ../mdkupdate:176
 #, c-format
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr ""
 
-#: ../mdkupdate:195
+#: ../mdkupdate:198
 #, c-format
 msgid ""
 "Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
 "mandrakeonline [dot] net"
 msgstr ""
 
+#~ msgid "Next"
+#~ msgstr "Próx"
+
+#~ msgid "Cancel"
+#~ msgstr "Cancelar"
+
+#~ msgid "Previous"
+#~ msgstr "Anterior"
+
+#, fuzzy
+#~ msgid "I don't have a Mandrakeonline account and I want to subscribe"
+#~ msgstr "Eu ainda não tenho uma conta Mandrakeonline mas, desejo abrir uma "
+
+#~ msgid "Mandrakelinux Privacy Policy"
+#~ msgstr "Política de Privacidade Mandrakelinux."
+
+#~ msgid "Authentification"
+#~ msgstr "Autenticação"
+
+#~ msgid "Send Configuration"
+#~ msgstr "Enviar Configuração"
+
+#~ msgid "Finish"
+#~ msgstr "Fim"
+
+#~ msgid "automated Upgrades"
+#~ msgstr "Atualizações automáticas."
+
+#~ msgid "Country:"
+#~ msgstr "País:"
+
+#~ msgid "Error"
+#~ msgstr "Erro"
+
+#~ msgid "Quitting Wizard\n"
+#~ msgstr "Saindo do assistente\n"
+
+#~ msgid ""
+#~ "Mandrakeonline could not be contacted, please try again at a later time"
+#~ msgstr "Mandrakeonline não pôde ser contactado, por favor tente mais tarde"
+
+#~ msgid "Wrong password"
+#~ msgstr "Senha incorreta"
+
+#~ msgid "  --update       - Update keys\n"
+#~ msgstr "  --update       - atualiza chaves.\n"
+
 #~ msgid "Skip Wizard"
 #~ msgstr "Pular Assistente"
 
diff --git a/po/ro.po b/po/ro.po
index d166af2c..a1e5c487 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-ro\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-01 22:41+0200\n"
+"POT-Creation-Date: 2004-11-03 12:10+0100\n"
 "PO-Revision-Date: 2004-10-06 14:18+0300\n"
 "Last-Translator: Ovidiu Constantin <ovidiusoft@gmail.com>\n"
 "Language-Team: Romanian <rtfs-project@lists.sourceforge.net>\n"
@@ -24,12 +24,12 @@ msgstr ""
 "sourceforge.net>\n"
 "X-Generator: KBabel 1.3.1\n"
 
-#: ../mdkapplet:61
+#: ../mdkapplet:63
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Sistemul dumneavoastră este actualizat"
 
-#: ../mdkapplet:67
+#: ../mdkapplet:69
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -38,189 +38,199 @@ msgstr ""
 "Problemă de configuraţie a serviciului. Vă rog verificaţi jurnalele şi "
 "trimiteţi mail la support@mandrakeonline.net"
 
-#: ../mdkapplet:73
+#: ../mdkapplet:75
 #, c-format
 msgid "System is busy. Please wait ..."
 msgstr "Sistemul este ocupat. Vă rugăm aşteptaţi..."
 
-#: ../mdkapplet:79
+#: ../mdkapplet:81
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Sunt disponibile noi actualizări pentru sistemul dumneavoastră"
 
-#: ../mdkapplet:85
+#: ../mdkapplet:87
 #, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr "Serviciul nu este configurat. Apăsaţi pe \"Configurează serviciul\""
 
-#: ../mdkapplet:91
+#: ../mdkapplet:93
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Reţeaua nu merge. Vă rog configuraţi-vă reţeaua"
 
-#: ../mdkapplet:97
+#: ../mdkapplet:99
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Serviciul nu este activat. Apăsaţi pe \"Sit online\""
 
-#: ../mdkapplet:103
+#: ../mdkapplet:105
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 "Versiunea nu este suportată (versiunea este prea veche sau este versiune de "
 "dezvoltare)"
 
-#: ../mdkapplet:108 ../mdkapplet:158
+#: ../mdkapplet:110 ../mdkapplet:164
 #, c-format
 msgid "Install updates"
 msgstr "Instalare actualizări pentru sistem"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:111
 #, c-format
 msgid "Configure the service"
 msgstr "Configurează serviciul"
 
-#: ../mdkapplet:110
+#: ../mdkapplet:112
 #, c-format
 msgid "Check Updates"
 msgstr "Verificare Actualizări"
 
-#: ../mdkapplet:111
+#: ../mdkapplet:113 ../mdkapplet:167 ../mdkapplet:225
+#, fuzzy, c-format
+msgid "Please Wait"
+msgstr "Vă rog să aşteptaţi"
+
+#: ../mdkapplet:113 ../mdkapplet:166 ../mdkapplet:167 ../mdkapplet:225
+#, c-format
+msgid "Check updates"
+msgstr "Verifică actualizări"
+
+#: ../mdkapplet:115
 #, c-format
 msgid "Online WebSite"
 msgstr "Pagină web"
 
-#: ../mdkapplet:112
+#: ../mdkapplet:116
 #, c-format
 msgid "Configure Network"
 msgstr "Configurare Reţea"
 
-#: ../mdkapplet:113
+#: ../mdkapplet:117
 #, c-format
 msgid "Configure Now!"
 msgstr "Setări"
 
-#: ../mdkapplet:146
+#: ../mdkapplet:152 ../mdkapplet:229
 #, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Mandrakelinux Updates Applet"
 
-#: ../mdkapplet:156
+#: ../mdkapplet:162
 #, c-format
 msgid "Actions"
 msgstr "Acţiuni"
 
-#: ../mdkapplet:159
+#: ../mdkapplet:165
 #, c-format
 msgid "Configure"
 msgstr "Configurează"
 
-#: ../mdkapplet:160
-#, c-format
-msgid "Check updates"
-msgstr "Verifică actualizări"
-
-#: ../mdkapplet:161
+#: ../mdkapplet:169
 #, c-format
 msgid "See logs"
 msgstr "Vezi logurile"
 
-#: ../mdkapplet:164
+#: ../mdkapplet:172
 #, c-format
 msgid "Status"
 msgstr "Statut"
 
-#: ../mdkapplet:168 ../mdkapplet:363
+#: ../mdkapplet:176 ../mdkapplet:375
 #, c-format
 msgid "Close"
 msgstr "Închide"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Network Connection: "
 msgstr "Conexiune Reţea:"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Up"
 msgstr "Pornită"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Down"
 msgstr "Oprită"
 
-#: ../mdkapplet:204
+#: ../mdkapplet:212
 #, c-format
 msgid "Last check: "
 msgstr "Ultima verificare:"
 
-#: ../mdkapplet:205
+#: ../mdkapplet:213
 #, c-format
 msgid "Updates: "
 msgstr "Actualizări: "
 
-#: ../mdkapplet:209
+#: ../mdkapplet:217
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Lansez drakconnect\n"
 
-#: ../mdkapplet:213
+#: ../mdkapplet:221
 #, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "Lansez mdkupdate --applet\n"
 
-#: ../mdkapplet:217
+#: ../mdkapplet:224
 #, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr "Mandrakeonline pare să fi fost reinstalat, reîncarc applet-ul ...."
 
-#: ../mdkapplet:225
+#: ../mdkapplet:235
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Calculez actualizările noi...\n"
 
-#: ../mdkapplet:227
+#: ../mdkapplet:237
 #, c-format
 msgid "Connecting to"
 msgstr "Mă conectez la"
 
-#: ../mdkapplet:250
+#: ../mdkapplet:244
+#, fuzzy, c-format
+msgid "Response from Mandrakeonline server\n"
+msgstr "Bun venit la Mandrakeonline"
+
+#: ../mdkapplet:262
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Verific...Actualizări sunt disponibile\n"
 
-#: ../mdkapplet:254
+#: ../mdkapplet:267
 #, c-format
 msgid "Development release not supported by service"
 msgstr "Versiunea de dezvoltare nu este suportată de serviciu"
 
-#: ../mdkapplet:255
+#: ../mdkapplet:268
 #, c-format
 msgid "Too old release not supported by service"
 msgstr "Versiunea este prea veche si nu este suportată de serviciu"
 
-#: ../mdkapplet:256
+#: ../mdkapplet:269
 #, c-format
 msgid "Unknown state"
 msgstr "Stare necunoscută"
 
-#: ../mdkapplet:257
+#: ../mdkapplet:270
 #, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr "Servicii online dezactivate Contactaţi pagina de web Mandrakeonline\n"
 
-#: ../mdkapplet:258
+#: ../mdkapplet:271
 #, c-format
 msgid "Wrong Password.\n"
 msgstr "Parolă greşită.\n"
 
-#: ../mdkapplet:259
+#: ../mdkapplet:272
 #, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr "Acţiune sau Gazdă sau Login greşit.\n"
 
-#: ../mdkapplet:260
+#: ../mdkapplet:273
 #, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
@@ -229,72 +239,82 @@ msgstr ""
 "Sunt probleme cu setarile reţelei(verifică ruta, firewall-ul sau setarile "
 "proxy-ului)\n"
 
-#: ../mdkapplet:264
+#: ../mdkapplet:277
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Sistemul este la zi cu actualizările\n"
 
-#: ../mdkapplet:303
+#: ../mdkapplet:317
 #, c-format
 msgid "No check"
 msgstr "Fără verificare"
 
-#: ../mdkapplet:316
+#: ../mdkapplet:330
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Verificare Reţea:se pare că este dezactivată\n"
 
-#: ../mdkapplet:319
+#: ../mdkapplet:333
 #, c-format
 msgid "Checking config file: Not present\n"
 msgstr "Verificare fisier de configurare: Nu este prezent\n"
 
-#: ../mdkapplet:353
+#: ../mdkapplet:365
 #, c-format
 msgid "Logs"
 msgstr "Loguri"
 
-#: ../mdkapplet:369
+#: ../mdkapplet:381
 #, c-format
 msgid "Clear"
 msgstr "Şterge"
 
-#: ../mdkapplet:396
+#: ../mdkapplet:408
 #, c-format
 msgid "About..."
 msgstr "Despre..."
 
-#: ../mdkapplet:397
+#: ../mdkapplet:409
 #, c-format
 msgid "Always launch on startup"
 msgstr "Lansează întotdeauna la pornire"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:411
 #, c-format
 msgid "Quit"
 msgstr "Ieşire"
 
-#: ../mdkonline:89
+#: ../mdkonline:52 ../mdkonline:106
 #, c-format
-msgid "Next"
-msgstr "Înapoi"
+msgid "Mandrakeonline"
+msgstr "Mandrakeonline"
 
-#: ../mdkonline:89
+#: ../mdkonline:55
 #, c-format
-msgid "Cancel"
-msgstr "Renunţă"
+msgid "I already have an account"
+msgstr "Am deja un cont"
+
+#: ../mdkonline:56
+#, c-format
+msgid "I want to subscribe"
+msgstr "Doresc să mă înscriu"
+
+#: ../mdkonline:89 ../mdkonline:93 ../mdkonline:131
+#, c-format
+msgid "Please wait"
+msgstr "Vă rog să aşteptaţi"
 
 #: ../mdkonline:89
 #, c-format
-msgid "Previous"
-msgstr "Precedentul"
+msgid "Reading configuration\n"
+msgstr "Citire configuraţie\n"
 
-#: ../mdkonline:103
+#: ../mdkonline:93
 #, c-format
-msgid "Welcome to Mandrakeonline"
-msgstr "Bun venit la Mandrakeonline"
+msgid "Sending configuration..."
+msgstr "Trimitere configurare..."
 
-#: ../mdkonline:104 ../mdkonline_tui:98
+#: ../mdkonline:109
 #, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
@@ -305,63 +325,38 @@ msgstr ""
 "(pachete, configuraţie hardware) la o bază de date centralizată pentru\n"
 "a vă ţine la curent cu actualizările de securitate şi noutăţi utile.\n"
 
-#: ../mdkonline:105 ../mdkonline_tui:142
+#: ../mdkonline:114
 #, c-format
-msgid "Create a Mandrakeonline Account"
-msgstr "Creează un cont Mandrakeonline"
+msgid "Account creation or authentication"
+msgstr "Creare cont sau autentificare"
 
-#: ../mdkonline:107
+#: ../mdkonline:119
 #, c-format
-msgid "I don't have a Mandrakeonline account and I want to subscribe"
-msgstr "Nu am un cont la Mandrakeonline şi vreau să mă înscriu"
+msgid "Enter your Mandrakeonline login, password and machine name:"
+msgstr ""
+"Introduceţi contul utilizator Mandrakeonline, parola şi numele maşinii:"
 
-#: ../mdkonline:111 ../mdkonline:131 ../mdkonline_tui:114 ../mdkonline_tui:145
+#: ../mdkonline:125 ../mdkonline:156
 #, c-format
 msgid "Login:"
 msgstr "Cont:"
 
-#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:115 ../mdkonline_tui:146
+#: ../mdkonline:126 ../mdkonline:157
 #, c-format
 msgid "Password:"
 msgstr "Parolă:"
 
-#: ../mdkonline:113 ../mdkonline_tui:147
-#, c-format
-msgid "Confirm Password:"
-msgstr "Confirmare parolă:"
-
-#: ../mdkonline:114 ../mdkonline_tui:148
-#, c-format
-msgid "Mail contact:"
-msgstr "Contact mail:"
-
-#: ../mdkonline:121
-#, c-format
-msgid "Mandrakelinux Privacy Policy"
-msgstr "Politica de protejare a intimităţii"
-
 #: ../mdkonline:127
 #, c-format
-msgid "Authentification"
-msgstr " Autentificare"
-
-#: ../mdkonline:128 ../mdkonline_tui:108
-#, c-format
-msgid "Enter your Mandrakeonline login, password and machine name:"
-msgstr ""
-"Introduceţi contul utilizator Mandrakeonline, parola şi numele maşinii:"
-
-#: ../mdkonline:133 ../mdkonline_tui:116
-#, c-format
 msgid "Machine name:"
 msgstr "Nume maşină:"
 
-#: ../mdkonline:138
+#: ../mdkonline:131
 #, c-format
-msgid "Send Configuration"
-msgstr "Trimit Configurarea"
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Conectare la situl Mandrakeonline..."
 
-#: ../mdkonline:139 ../mdkonline_tui:128
+#: ../mdkonline:139
 #, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
@@ -395,55 +390,56 @@ msgstr ""
 "Mai mult, beneficiaţi de discount la serviciile de suport plătit la\n"
 "www.mandrakeexpert.com."
 
-#: ../mdkonline:144 ../mdkonline:211 ../mdkonline:234
+#: ../mdkonline:141 ../mdkonline:180 ../mdkupdate:126 ../mdkupdate:198
 #, c-format
-msgid "Finish"
-msgstr "Terminare"
+msgid "Connection problem"
+msgstr "Problemă la conectare"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid "Your upload was successful!"
-msgstr "Trimiterea a fost reuşită!"
+msgid "or"
+msgstr "sau"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandrakeonline."
-msgstr ""
-"De acum veţi primi anunţuri despre securitare\n"
-"şi actualizări cu ajutorul Mandrakeonline."
+msgid "wrong password:"
+msgstr "parolă greşită:"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
 msgid ""
-"Mandrakeonline offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+"Your login or password was wrong.\n"
+" Either you'll have to type it again, or you'll need to create an account on "
+"Mandrakeonline.\n"
+" In the latter case, go back to the first step to connect to "
+"Mandrakeonline.\n"
+" Be aware that you must also provide a Machine name \n"
+" (only alphabetical characters are admitted)"
 msgstr ""
-"Mandrakeonline vă oferă posibilitatea să automatizaţi actualizările.\n"
-"Un program va rula regulat pe sistemul dumneavoastră aşteptând actualizări\n"
-
-#: ../mdkonline:146
-#, c-format
-msgid "automated Upgrades"
-msgstr "Actualizări automate"
+"Contul de utilizator sau parola au fost greşite.\n"
+" Va trebui să le tastaţi din nou, sau va trebui să creaţi un cont la "
+"Mandrakeonline.\n"
+" În acest ultim caz, mergeţi înapoi la primul pas pentru a vă conecta la "
+"Mandrakeonline.\n"
+" Va trebui de asemenea să furnizaţi un nume al maşinii \n"
+" (doar caracterele alfabetice sunt permise)"
 
-#: ../mdkonline:150
+#: ../mdkonline:153
 #, c-format
-msgid "Country:"
-msgstr "Ţara:"
+msgid "Create a Mandrakeonline Account"
+msgstr "Creează un cont Mandrakeonline"
 
-#: ../mdkonline:178 ../mdkonline:183 ../mdkonline:185 ../mdkonline:187
+#: ../mdkonline:158
 #, c-format
-msgid "Error"
-msgstr "Eroare"
+msgid "Confirm Password:"
+msgstr "Confirmare parolă:"
 
-#: ../mdkonline:183 ../mdkonline_tui:152
+#: ../mdkonline:159
 #, c-format
-msgid "Please provide a login"
-msgstr "Vă rog să furnizaţi un login"
+msgid "Mail contact:"
+msgstr "Contact mail:"
 
-#: ../mdkonline:185 ../mdkonline_tui:152
+#: ../mdkonline:163
 #, c-format
 msgid ""
 "The passwords do not match\n"
@@ -452,163 +448,117 @@ msgstr ""
 "Parolele nu se potrivesc.\n"
 "Incercaţi din nou\n"
 
-#: ../mdkonline:187 ../mdkonline_tui:152
+#: ../mdkonline:163
+#, c-format
+msgid "Please provide a login"
+msgstr "Vă rog să furnizaţi un login"
+
+#: ../mdkonline:163
 #, c-format
 msgid "Not a valid mail address!\n"
 msgstr "Nu e o adresă de mail validă!\n"
 
-#: ../mdkonline:199 ../mdkonline_tui:78
+#: ../mdkonline:169
 #, c-format
-msgid "Reading configuration\n"
-msgstr "Citire configuraţie\n"
+msgid ""
+"Mandrakeonline Account successfully created.\n"
+"Please click \"Next\" to authenticate and upload your configuration\n"
+msgstr ""
+"Contul Mandrakeonline a fost creat cu succes.\n"
+"Vă rog apăsaţi \"Înainte\" pentru a vă autentifica şi a transmite "
+"configuraţia dumneavoastră\n"
 
-#: ../mdkonline:204 ../mdkonline_tui:82
+#: ../mdkonline:178
 #, c-format
-msgid "Sending configuration..."
-msgstr "Trimitere configurare..."
+msgid "Your upload was successful!"
+msgstr "Trimiterea a fost reuşită!"
 
-#: ../mdkonline:213 ../mdkonline:273 ../mdkonline_tui:130 ../mdkonline_tui:169
-#: ../mdkupdate:124 ../mdkupdate:195
+#: ../mdkonline:178
 #, c-format
-msgid "Connection problem"
-msgstr "Problemă la conectare"
+msgid ""
+"From now you will receive on security and updates \n"
+"announcements thanks to Mandrakeonline."
+msgstr ""
+"De acum veţi primi anunţuri despre securitare\n"
+"şi actualizări cu ajutorul Mandrakeonline."
+
+#: ../mdkonline:178
+#, c-format
+msgid ""
+"Mandrakeonline offers you the ability to automate the updates.\n"
+"A program will run regulary in your system waiting for new updates\n"
+msgstr ""
+"Mandrakeonline vă oferă posibilitatea să automatizaţi actualizările.\n"
+"Un program va rula regulat pe sistemul dumneavoastră aşteptând actualizări\n"
 
-#: ../mdkonline:213 ../mdkonline_tui:169
+#: ../mdkonline:180
 #, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr "A apărut o problemă la încărcarea fişierelor, vă rog reînceraţi"
 
-#: ../mdkonline:251
+#: ../mdkonline:186
 #, c-format
-msgid "Quitting Wizard\n"
-msgstr "Terminare asistent\n"
+msgid "Country"
+msgstr "Ţara"
 
-#: ../mdkonline:273
+#: ../mdkonline:198
 #, c-format
-msgid "Mandrakeonline could not be contacted, please try again at a later time"
-msgstr ""
-"Mandrakeonline nu a putut fi contactat, vă rog încercaţi din nou mai târziu"
+msgid "Congratulations"
+msgstr "Felicitări"
 
-#: ../mdkonline:285
+#: ../mdkonline:198
 #, c-format
-msgid "Wrong password"
-msgstr "Parolă greşită"
+msgid "Your Mandrakeonline account has been successfully configured\n"
+msgstr "Contul dumneavoastră Mandrakeonline a fost configurat cu succes\n"
+
+#: ../mdkonline:214
+#, fuzzy, c-format
+msgid "Configuration uploaded successfully"
+msgstr "Trimiterea a fost reuşită!"
+
+#: ../mdkonline:215
+#, fuzzy, c-format
+msgid "Problem uploading configuration"
+msgstr "Citire configuraţie\n"
 
-#: ../mdkonline:285 ../mdkonline_tui:130
+#: ../mdkonline:216
 #, c-format
 msgid ""
-"Your login or password was wrong.\n"
-" Either you'll have to type it again, or you'll need to create an account on "
-"Mandrakeonline.\n"
-" In the latter case, go back to the first step to connect to "
-"Mandrakeonline.\n"
-" Be aware that you must also provide a Machine name \n"
-" (only alphabetical characters are admitted)"
+"Cannot connect to mandrakeonline website: wrong login/password or router/"
+"firewall bad settings"
 msgstr ""
-"Contul de utilizator sau parola au fost greşite.\n"
-" Va trebui să le tastaţi din nou, sau va trebui să creaţi un cont la "
-"Mandrakeonline.\n"
-" În acest ultim caz, mergeţi înapoi la primul pas pentru a vă conecta la "
-"Mandrakeonline.\n"
-" Va trebui de asemenea să furnizaţi un nume al maşinii \n"
-" (doar caracterele alfabetice sunt permise)"
 
-#: ../mdkonline.pm:58
+#: ../mdkonline.pm:66
 #, c-format
 msgid "Login and password should be less than 12 characters\n"
 msgstr "Login-ul şi parola trebuie să fie mai mici de 12 caractere\n"
 
-#: ../mdkonline.pm:59
+#: ../mdkonline.pm:67
 #, c-format
 msgid "Special characters are not allowed\n"
 msgstr "Caracterele speciale nu sunt permise\n"
 
-#: ../mdkonline.pm:60
+#: ../mdkonline.pm:68
 #, c-format
 msgid "Please fill in all fields\n"
 msgstr "Vă rog completaţi poate câmpurile\n"
 
-#: ../mdkonline.pm:61
+#: ../mdkonline.pm:69
 #, c-format
 msgid "Email not valid\n"
 msgstr "Email-ul nu este valid\n"
 
-#: ../mdkonline.pm:62
+#: ../mdkonline.pm:70
 #, c-format
 msgid "Account already exist\n"
 msgstr "Contul există deja\n"
 
-#: ../mdkonline.pm:68
+#: ../mdkonline.pm:76
 #, c-format
 msgid "Problem connecting to server \n"
 msgstr "Am întâmpinat probleme la contactarea serverului \n"
 
-#: ../mdkonline_tui:45 ../mdkonline_tui:95
-#, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
-
-#: ../mdkonline_tui:48
-#, c-format
-msgid "I already have an account"
-msgstr "Am deja un cont"
-
-#: ../mdkonline_tui:49
-#, c-format
-msgid "I want to subscribe"
-msgstr "Doresc să mă înscriu"
-
-#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:120
-#, c-format
-msgid "Please wait"
-msgstr "Vă rog să aşteptaţi"
-
-#: ../mdkonline_tui:103
-#, c-format
-msgid "Account creation or authentication"
-msgstr "Creare cont sau autentificare"
-
-#: ../mdkonline_tui:120
-#, c-format
-msgid "Connecting to Mandrakeonline website..."
-msgstr "Conectare la situl Mandrakeonline..."
-
-#: ../mdkonline_tui:130
-#, c-format
-msgid "or"
-msgstr "sau"
-
-#: ../mdkonline_tui:130
-#, c-format
-msgid "wrong password:"
-msgstr "parolă greşită:"
-
-#: ../mdkonline_tui:158
-#, c-format
-msgid ""
-"Mandrakeonline Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-"Contul Mandrakeonline a fost creat cu succes.\n"
-"Vă rog apăsaţi \"Înainte\" pentru a vă autentifica şi a transmite "
-"configuraţia dumneavoastră\n"
-
-#: ../mdkonline_tui:175
-#, c-format
-msgid "Country"
-msgstr "Ţara"
-
-#: ../mdkonline_tui:187
-#, c-format
-msgid "Congratulations"
-msgstr "Felicitări"
-
-#: ../mdkonline_tui:187
-#, c-format
-msgid "Your Mandrakeonline account has been successfully configured\n"
-msgstr "Contul dumneavoastră Mandrakeonline a fost configurat cu succes\n"
-
-#: ../mdkupdate:50
+#: ../mdkupdate:52
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
@@ -624,43 +574,38 @@ msgstr ""
 "\n"
 "Utilizare:\n"
 
-#: ../mdkupdate:55
+#: ../mdkupdate:57
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help             - afişează acest mesaj de ajutor.\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:58
 #, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto         - Mandrakeupdate este lansat automat.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:59
 #, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - lansează Mandrakeupdate.\n"
 
-#: ../mdkupdate:58
-#, c-format
-msgid "  --update       - Update keys\n"
-msgstr "  --update          -actualizeaza cheile\n"
-
-#: ../mdkupdate:66
+#: ../mdkupdate:67
 #, c-format
 msgid "No %s file found. Run mdkonline wizard first"
 msgstr ""
 "Nu a fost găsit fişierul %s. Vă rog rulaţi înainte asistentul mdkonline"
 
-#: ../mdkupdate:124
+#: ../mdkupdate:126
 #, c-format
 msgid "Mandrakeupdate could not contact the site, we will try again."
 msgstr "Mandrakeupdaet nu a putut să contacteze situl, vom încerca din nou."
 
-#: ../mdkupdate:173
+#: ../mdkupdate:176
 #, c-format
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr "Nu pot actualiza pachetele de pe mediul mdkupdate.\n"
 
-#: ../mdkupdate:195
+#: ../mdkupdate:198
 #, c-format
 msgid ""
 "Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
@@ -668,3 +613,51 @@ msgid ""
 msgstr ""
 "Mandrakeupdate nu a putut uploada fişierele diff. Trimiteţi un mail la "
 "support [at] mandrakeonline [dot] net"
+
+#~ msgid "Next"
+#~ msgstr "Înapoi"
+
+#~ msgid "Cancel"
+#~ msgstr "Renunţă"
+
+#~ msgid "Previous"
+#~ msgstr "Precedentul"
+
+#~ msgid "I don't have a Mandrakeonline account and I want to subscribe"
+#~ msgstr "Nu am un cont la Mandrakeonline şi vreau să mă înscriu"
+
+#~ msgid "Mandrakelinux Privacy Policy"
+#~ msgstr "Politica de protejare a intimităţii"
+
+#~ msgid "Authentification"
+#~ msgstr " Autentificare"
+
+#~ msgid "Send Configuration"
+#~ msgstr "Trimit Configurarea"
+
+#~ msgid "Finish"
+#~ msgstr "Terminare"
+
+#~ msgid "automated Upgrades"
+#~ msgstr "Actualizări automate"
+
+#~ msgid "Country:"
+#~ msgstr "Ţara:"
+
+#~ msgid "Error"
+#~ msgstr "Eroare"
+
+#~ msgid "Quitting Wizard\n"
+#~ msgstr "Terminare asistent\n"
+
+#~ msgid ""
+#~ "Mandrakeonline could not be contacted, please try again at a later time"
+#~ msgstr ""
+#~ "Mandrakeonline nu a putut fi contactat, vă rog încercaţi din nou mai "
+#~ "târziu"
+
+#~ msgid "Wrong password"
+#~ msgstr "Parolă greşită"
+
+#~ msgid "  --update       - Update keys\n"
+#~ msgstr "  --update          -actualizeaza cheile\n"
diff --git a/po/ru.po b/po/ru.po
index ddb406e7..71188b31 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-ru\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-01 22:41+0200\n"
+"POT-Creation-Date: 2004-11-03 12:10+0100\n"
 "PO-Revision-Date: 2004-10-14 11:41+0300\n"
 "Last-Translator: Pavel Maryanov <acid_jack@ukr.net>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -17,12 +17,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3\n"
 
-#: ../mdkapplet:61
+#: ../mdkapplet:63
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Системе не требуются обновления"
 
-#: ../mdkapplet:67
+#: ../mdkapplet:69
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -31,187 +31,197 @@ msgstr ""
 "Проблема настройки службы. Пожалуйста, проверьте логи и вышлите письмо на "
 "support@mandrakeonline.net"
 
-#: ../mdkapplet:73
+#: ../mdkapplet:75
 #, c-format
 msgid "System is busy. Please wait ..."
 msgstr "Система занята. Ждите ..."
 
-#: ../mdkapplet:79
+#: ../mdkapplet:81
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Для вашей системы доступны обновления"
 
-#: ../mdkapplet:85
+#: ../mdkapplet:87
 #, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr "Служба не настроена. Зайдите в \"Настроить службу\""
 
-#: ../mdkapplet:91
+#: ../mdkapplet:93
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Сеть недоступна. Настройте свою сеть"
 
-#: ../mdkapplet:97
+#: ../mdkapplet:99
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Служба не активирована. Зайдите в \"Онлайновый веб-сайт\""
 
-#: ../mdkapplet:103
+#: ../mdkapplet:105
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "Релиз не поддерживается (слишком старый или разрабатываемый релиз)"
 
-#: ../mdkapplet:108 ../mdkapplet:158
+#: ../mdkapplet:110 ../mdkapplet:164
 #, c-format
 msgid "Install updates"
 msgstr "Установить обновления"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:111
 #, c-format
 msgid "Configure the service"
 msgstr "Настроить службу"
 
-#: ../mdkapplet:110
+#: ../mdkapplet:112
 #, c-format
 msgid "Check Updates"
 msgstr "Проверить обновления"
 
-#: ../mdkapplet:111
+#: ../mdkapplet:113 ../mdkapplet:167 ../mdkapplet:225
+#, fuzzy, c-format
+msgid "Please Wait"
+msgstr "Подождите, пожалуйста"
+
+#: ../mdkapplet:113 ../mdkapplet:166 ../mdkapplet:167 ../mdkapplet:225
+#, c-format
+msgid "Check updates"
+msgstr "Проверить обновления"
+
+#: ../mdkapplet:115
 #, c-format
 msgid "Online WebSite"
 msgstr "Онлайновый веб-сайт"
 
-#: ../mdkapplet:112
+#: ../mdkapplet:116
 #, c-format
 msgid "Configure Network"
 msgstr "Настроить сеть"
 
-#: ../mdkapplet:113
+#: ../mdkapplet:117
 #, c-format
 msgid "Configure Now!"
 msgstr "Настроить сейчас!"
 
-#: ../mdkapplet:146
+#: ../mdkapplet:152 ../mdkapplet:229
 #, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Апплет Mandrakelinux Updates"
 
-#: ../mdkapplet:156
+#: ../mdkapplet:162
 #, c-format
 msgid "Actions"
 msgstr "Действия"
 
-#: ../mdkapplet:159
+#: ../mdkapplet:165
 #, c-format
 msgid "Configure"
 msgstr "Настроить"
 
-#: ../mdkapplet:160
-#, c-format
-msgid "Check updates"
-msgstr "Проверить обновления"
-
-#: ../mdkapplet:161
+#: ../mdkapplet:169
 #, c-format
 msgid "See logs"
 msgstr "Просмотр журнала"
 
-#: ../mdkapplet:164
+#: ../mdkapplet:172
 #, c-format
 msgid "Status"
 msgstr "Статус"
 
-#: ../mdkapplet:168 ../mdkapplet:363
+#: ../mdkapplet:176 ../mdkapplet:375
 #, c-format
 msgid "Close"
 msgstr "Закрыть"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Network Connection: "
 msgstr "Сетевое подключение: "
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Up"
 msgstr "Вверх"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Down"
 msgstr "Вниз"
 
-#: ../mdkapplet:204
+#: ../mdkapplet:212
 #, c-format
 msgid "Last check: "
 msgstr "Последняя проверка: "
 
-#: ../mdkapplet:205
+#: ../mdkapplet:213
 #, c-format
 msgid "Updates: "
 msgstr "Обновления: "
 
-#: ../mdkapplet:209
+#: ../mdkapplet:217
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Запускается drakconnect\n"
 
-#: ../mdkapplet:213
+#: ../mdkapplet:221
 #, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "Запускается mdkupdate --applet\n"
 
-#: ../mdkapplet:217
+#: ../mdkapplet:224
 #, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr "Похоже, что Mandrakeonline переустановлен, перезагружается апплет..."
 
-#: ../mdkapplet:225
+#: ../mdkapplet:235
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Вычисляются новые обновления...\n"
 
-#: ../mdkapplet:227
+#: ../mdkapplet:237
 #, c-format
 msgid "Connecting to"
 msgstr "Выполняется подключение к"
 
-#: ../mdkapplet:250
+#: ../mdkapplet:244
+#, fuzzy, c-format
+msgid "Response from Mandrakeonline server\n"
+msgstr "Добро пожаловать в Mandrakeonline"
+
+#: ../mdkapplet:262
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Выполняется проверка... Обновления доступны\n"
 
-#: ../mdkapplet:254
+#: ../mdkapplet:267
 #, c-format
 msgid "Development release not supported by service"
 msgstr "Разрабатываемый релиз службой не поддерживается"
 
-#: ../mdkapplet:255
+#: ../mdkapplet:268
 #, c-format
 msgid "Too old release not supported by service"
 msgstr "Слишком старый релиз службой не поддерживается"
 
-#: ../mdkapplet:256
+#: ../mdkapplet:269
 #, c-format
 msgid "Unknown state"
 msgstr "Неизвестное состояние"
 
-#: ../mdkapplet:257
+#: ../mdkapplet:270
 #, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr "Онлайновые службы отключены. Зайдите на сайт Mandrakeonline\n"
 
-#: ../mdkapplet:258
+#: ../mdkapplet:271
 #, c-format
 msgid "Wrong Password.\n"
 msgstr "Неверный пароль.\n"
 
-#: ../mdkapplet:259
+#: ../mdkapplet:272
 #, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr "Неверное действие, хост или логин.\n"
 
-#: ../mdkapplet:260
+#: ../mdkapplet:273
 #, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
@@ -220,72 +230,82 @@ msgstr ""
 "Что-то не так с настройками вашей сети (проверьте свой маршрут, файервол или "
 "настройки прокси)\n"
 
-#: ../mdkapplet:264
+#: ../mdkapplet:277
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Системе не требуются обновления\n"
 
-#: ../mdkapplet:303
+#: ../mdkapplet:317
 #, c-format
 msgid "No check"
 msgstr "Без проверок"
 
-#: ../mdkapplet:316
+#: ../mdkapplet:330
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Проверка сети: похоже отключена\n"
 
-#: ../mdkapplet:319
+#: ../mdkapplet:333
 #, c-format
 msgid "Checking config file: Not present\n"
 msgstr "Проверка файла config: Отсутствует\n"
 
-#: ../mdkapplet:353
+#: ../mdkapplet:365
 #, c-format
 msgid "Logs"
 msgstr "Логи"
 
-#: ../mdkapplet:369
+#: ../mdkapplet:381
 #, c-format
 msgid "Clear"
 msgstr "Очистить"
 
-#: ../mdkapplet:396
+#: ../mdkapplet:408
 #, c-format
 msgid "About..."
 msgstr "О программе..."
 
-#: ../mdkapplet:397
+#: ../mdkapplet:409
 #, c-format
 msgid "Always launch on startup"
 msgstr "Всегда запускать при старте"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:411
 #, c-format
 msgid "Quit"
 msgstr "Выход"
 
-#: ../mdkonline:89
+#: ../mdkonline:52 ../mdkonline:106
 #, c-format
-msgid "Next"
-msgstr "Далее"
+msgid "Mandrakeonline"
+msgstr "Mandrakeonline"
 
-#: ../mdkonline:89
+#: ../mdkonline:55
 #, c-format
-msgid "Cancel"
-msgstr "Отмена"
+msgid "I already have an account"
+msgstr "У меня уже есть учётная запись"
+
+#: ../mdkonline:56
+#, c-format
+msgid "I want to subscribe"
+msgstr "Я хочу получить учётную запись"
+
+#: ../mdkonline:89 ../mdkonline:93 ../mdkonline:131
+#, c-format
+msgid "Please wait"
+msgstr "Подождите, пожалуйста"
 
 #: ../mdkonline:89
 #, c-format
-msgid "Previous"
-msgstr "Назад"
+msgid "Reading configuration\n"
+msgstr "Считывается конфигурация\n"
 
-#: ../mdkonline:103
+#: ../mdkonline:93
 #, c-format
-msgid "Welcome to Mandrakeonline"
-msgstr "Добро пожаловать в Mandrakeonline"
+msgid "Sending configuration..."
+msgstr "Отправляется конфигурация..."
 
-#: ../mdkonline:104 ../mdkonline_tui:98
+#: ../mdkonline:109
 #, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
@@ -297,62 +317,37 @@ msgstr ""
 "чтобы держать вас в курсе при появлении обновлений по безопасности \n"
 "и полезных апгрейдов.\n"
 
-#: ../mdkonline:105 ../mdkonline_tui:142
+#: ../mdkonline:114
 #, c-format
-msgid "Create a Mandrakeonline Account"
-msgstr "Создать учетную запись Mandrakeonline"
+msgid "Account creation or authentication"
+msgstr "Создание учётной записи или аутентификация"
 
-#: ../mdkonline:107
+#: ../mdkonline:119
 #, c-format
-msgid "I don't have a Mandrakeonline account and I want to subscribe"
-msgstr "У меня нет учётной записи Mandrakeonline и я хочу получить её"
+msgid "Enter your Mandrakeonline login, password and machine name:"
+msgstr "Введите свои логин Mandrakeonline, пароль и имя машины:"
 
-#: ../mdkonline:111 ../mdkonline:131 ../mdkonline_tui:114 ../mdkonline_tui:145
+#: ../mdkonline:125 ../mdkonline:156
 #, c-format
 msgid "Login:"
 msgstr "Логин:"
 
-#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:115 ../mdkonline_tui:146
+#: ../mdkonline:126 ../mdkonline:157
 #, c-format
 msgid "Password:"
 msgstr "Пароль:"
 
-#: ../mdkonline:113 ../mdkonline_tui:147
-#, c-format
-msgid "Confirm Password:"
-msgstr "Подтвердить пароль:"
-
-#: ../mdkonline:114 ../mdkonline_tui:148
-#, c-format
-msgid "Mail contact:"
-msgstr "Почтовый контакт:"
-
-#: ../mdkonline:121
-#, c-format
-msgid "Mandrakelinux Privacy Policy"
-msgstr "Политика безопасности Mandrakelinux"
-
 #: ../mdkonline:127
 #, c-format
-msgid "Authentification"
-msgstr "Аутентификация"
-
-#: ../mdkonline:128 ../mdkonline_tui:108
-#, c-format
-msgid "Enter your Mandrakeonline login, password and machine name:"
-msgstr "Введите свои логин Mandrakeonline, пароль и имя машины:"
-
-#: ../mdkonline:133 ../mdkonline_tui:116
-#, c-format
 msgid "Machine name:"
 msgstr "Имя машины:"
 
-#: ../mdkonline:138
+#: ../mdkonline:131
 #, c-format
-msgid "Send Configuration"
-msgstr "Отправить конфигурацию"
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Выполняется подключение к веб-сайту Mandrakeonline..."
 
-#: ../mdkonline:139 ../mdkonline_tui:128
+#: ../mdkonline:139
 #, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
@@ -386,56 +381,56 @@ msgstr ""
 "Кроме того, вы получаете скидку при расплате в службе поддержки на\n"
 " www.mandrakeexpert.com."
 
-#: ../mdkonline:144 ../mdkonline:211 ../mdkonline:234
+#: ../mdkonline:141 ../mdkonline:180 ../mdkupdate:126 ../mdkupdate:198
 #, c-format
-msgid "Finish"
-msgstr "Завершить"
+msgid "Connection problem"
+msgstr "Проблема подключения"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid "Your upload was successful!"
-msgstr "Выгрузка произведена успешно!"
+msgid "or"
+msgstr "или"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandrakeonline."
-msgstr ""
-"С этого момента вы будете получать уведомления\n"
-"по безопасности и обновлениям, благодаря Mandrakeonline."
+msgid "wrong password:"
+msgstr "неверный пароль:"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
 msgid ""
-"Mandrakeonline offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+"Your login or password was wrong.\n"
+" Either you'll have to type it again, or you'll need to create an account on "
+"Mandrakeonline.\n"
+" In the latter case, go back to the first step to connect to "
+"Mandrakeonline.\n"
+" Be aware that you must also provide a Machine name \n"
+" (only alphabetical characters are admitted)"
 msgstr ""
-"Mandrakeonline предлагает вам возможность автоматизировать обновления.\n"
-"Программа будет регулярно запускаться в вашей системе, ожидая новых "
-"обновлений\n"
-
-#: ../mdkonline:146
-#, c-format
-msgid "automated Upgrades"
-msgstr "автоматизированные апгрейды"
+"Ваш логин или пароль были неверны.\n"
+"Или вы должны ввести его снова, или вам необходимо создать учетную запись в "
+"Mandrakeonline.\n"
+" В последнем случае вернитесь назад к первому шагу для соединения с "
+"Mandrakeonline.\n"
+" Обратите внимание, что вы также должны указать имя машины \n"
+" (допускаются только буквенные символы)"
 
-#: ../mdkonline:150
+#: ../mdkonline:153
 #, c-format
-msgid "Country:"
-msgstr "Страна:"
+msgid "Create a Mandrakeonline Account"
+msgstr "Создать учетную запись Mandrakeonline"
 
-#: ../mdkonline:178 ../mdkonline:183 ../mdkonline:185 ../mdkonline:187
+#: ../mdkonline:158
 #, c-format
-msgid "Error"
-msgstr "Ошибка"
+msgid "Confirm Password:"
+msgstr "Подтвердить пароль:"
 
-#: ../mdkonline:183 ../mdkonline_tui:152
+#: ../mdkonline:159
 #, c-format
-msgid "Please provide a login"
-msgstr "Пожалуйста, укажите логин"
+msgid "Mail contact:"
+msgstr "Почтовый контакт:"
 
-#: ../mdkonline:185 ../mdkonline_tui:152
+#: ../mdkonline:163
 #, c-format
 msgid ""
 "The passwords do not match\n"
@@ -444,163 +439,118 @@ msgstr ""
 "Пароли не совпадают\n"
 " Попробуйте еще раз\n"
 
-#: ../mdkonline:187 ../mdkonline_tui:152
+#: ../mdkonline:163
+#, c-format
+msgid "Please provide a login"
+msgstr "Пожалуйста, укажите логин"
+
+#: ../mdkonline:163
 #, c-format
 msgid "Not a valid mail address!\n"
 msgstr "Недействительный почтовый адрес!\n"
 
-#: ../mdkonline:199 ../mdkonline_tui:78
+#: ../mdkonline:169
 #, c-format
-msgid "Reading configuration\n"
-msgstr "Считывается конфигурация\n"
+msgid ""
+"Mandrakeonline Account successfully created.\n"
+"Please click \"Next\" to authenticate and upload your configuration\n"
+msgstr ""
+"Учётная запись Mandrakeonline успешно создана.\n"
+"Пожалуйста, нажмите \"Далее\", чтобы пройти аутентификацию и выгрузить свою "
+"конфигурацию\n"
 
-#: ../mdkonline:204 ../mdkonline_tui:82
+#: ../mdkonline:178
 #, c-format
-msgid "Sending configuration..."
-msgstr "Отправляется конфигурация..."
+msgid "Your upload was successful!"
+msgstr "Выгрузка произведена успешно!"
 
-#: ../mdkonline:213 ../mdkonline:273 ../mdkonline_tui:130 ../mdkonline_tui:169
-#: ../mdkupdate:124 ../mdkupdate:195
+#: ../mdkonline:178
 #, c-format
-msgid "Connection problem"
-msgstr "Проблема подключения"
+msgid ""
+"From now you will receive on security and updates \n"
+"announcements thanks to Mandrakeonline."
+msgstr ""
+"С этого момента вы будете получать уведомления\n"
+"по безопасности и обновлениям, благодаря Mandrakeonline."
+
+#: ../mdkonline:178
+#, c-format
+msgid ""
+"Mandrakeonline offers you the ability to automate the updates.\n"
+"A program will run regulary in your system waiting for new updates\n"
+msgstr ""
+"Mandrakeonline предлагает вам возможность автоматизировать обновления.\n"
+"Программа будет регулярно запускаться в вашей системе, ожидая новых "
+"обновлений\n"
 
-#: ../mdkonline:213 ../mdkonline_tui:169
+#: ../mdkonline:180
 #, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr "При загрузке файлов возникла проблема, попробуйте снова"
 
-#: ../mdkonline:251
+#: ../mdkonline:186
 #, c-format
-msgid "Quitting Wizard\n"
-msgstr "Завершения работы мастера\n"
+msgid "Country"
+msgstr "Страна"
 
-#: ../mdkonline:273
+#: ../mdkonline:198
 #, c-format
-msgid "Mandrakeonline could not be contacted, please try again at a later time"
-msgstr ""
-"Не удается связаться с Mandrakeonline, попробуйте еще раз несколько позже"
+msgid "Congratulations"
+msgstr "Поздравляем"
 
-#: ../mdkonline:285
+#: ../mdkonline:198
 #, c-format
-msgid "Wrong password"
-msgstr "Неверный пароль"
+msgid "Your Mandrakeonline account has been successfully configured\n"
+msgstr "Ваша учётная запись Mandrakeonline была успешно настроена\n"
+
+#: ../mdkonline:214
+#, fuzzy, c-format
+msgid "Configuration uploaded successfully"
+msgstr "Выгрузка произведена успешно!"
+
+#: ../mdkonline:215
+#, fuzzy, c-format
+msgid "Problem uploading configuration"
+msgstr "Считывается конфигурация\n"
 
-#: ../mdkonline:285 ../mdkonline_tui:130
+#: ../mdkonline:216
 #, c-format
 msgid ""
-"Your login or password was wrong.\n"
-" Either you'll have to type it again, or you'll need to create an account on "
-"Mandrakeonline.\n"
-" In the latter case, go back to the first step to connect to "
-"Mandrakeonline.\n"
-" Be aware that you must also provide a Machine name \n"
-" (only alphabetical characters are admitted)"
+"Cannot connect to mandrakeonline website: wrong login/password or router/"
+"firewall bad settings"
 msgstr ""
-"Ваш логин или пароль были неверны.\n"
-"Или вы должны ввести его снова, или вам необходимо создать учетную запись в "
-"Mandrakeonline.\n"
-" В последнем случае вернитесь назад к первому шагу для соединения с "
-"Mandrakeonline.\n"
-" Обратите внимание, что вы также должны указать имя машины \n"
-" (допускаются только буквенные символы)"
 
-#: ../mdkonline.pm:58
+#: ../mdkonline.pm:66
 #, c-format
 msgid "Login and password should be less than 12 characters\n"
 msgstr "Логин и пароль должны быть не менее 12 символов\n"
 
-#: ../mdkonline.pm:59
+#: ../mdkonline.pm:67
 #, c-format
 msgid "Special characters are not allowed\n"
 msgstr "Специальные символы не допускаются\n"
 
-#: ../mdkonline.pm:60
+#: ../mdkonline.pm:68
 #, c-format
 msgid "Please fill in all fields\n"
 msgstr "Пожалуйста, заполните все поля\n"
 
-#: ../mdkonline.pm:61
+#: ../mdkonline.pm:69
 #, c-format
 msgid "Email not valid\n"
 msgstr "Неверный e-mail\n"
 
-#: ../mdkonline.pm:62
+#: ../mdkonline.pm:70
 #, c-format
 msgid "Account already exist\n"
 msgstr "Учётная запись уже существует\n"
 
-#: ../mdkonline.pm:68
+#: ../mdkonline.pm:76
 #, c-format
 msgid "Problem connecting to server \n"
 msgstr "Проблема подключения к серверу \n"
 
-#: ../mdkonline_tui:45 ../mdkonline_tui:95
-#, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
-
-#: ../mdkonline_tui:48
-#, c-format
-msgid "I already have an account"
-msgstr "У меня уже есть учётная запись"
-
-#: ../mdkonline_tui:49
-#, c-format
-msgid "I want to subscribe"
-msgstr "Я хочу получить учётную запись"
-
-#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:120
-#, c-format
-msgid "Please wait"
-msgstr "Подождите, пожалуйста"
-
-#: ../mdkonline_tui:103
-#, c-format
-msgid "Account creation or authentication"
-msgstr "Создание учётной записи или аутентификация"
-
-#: ../mdkonline_tui:120
-#, c-format
-msgid "Connecting to Mandrakeonline website..."
-msgstr "Выполняется подключение к веб-сайту Mandrakeonline..."
-
-#: ../mdkonline_tui:130
-#, c-format
-msgid "or"
-msgstr "или"
-
-#: ../mdkonline_tui:130
-#, c-format
-msgid "wrong password:"
-msgstr "неверный пароль:"
-
-#: ../mdkonline_tui:158
-#, c-format
-msgid ""
-"Mandrakeonline Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-"Учётная запись Mandrakeonline успешно создана.\n"
-"Пожалуйста, нажмите \"Далее\", чтобы пройти аутентификацию и выгрузить свою "
-"конфигурацию\n"
-
-#: ../mdkonline_tui:175
-#, c-format
-msgid "Country"
-msgstr "Страна"
-
-#: ../mdkonline_tui:187
-#, c-format
-msgid "Congratulations"
-msgstr "Поздравляем"
-
-#: ../mdkonline_tui:187
-#, c-format
-msgid "Your Mandrakeonline account has been successfully configured\n"
-msgstr "Ваша учётная запись Mandrakeonline была успешно настроена\n"
-
-#: ../mdkupdate:50
+#: ../mdkupdate:52
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
@@ -617,42 +567,37 @@ msgstr ""
 "\n"
 "использование:\n"
 
-#: ../mdkupdate:55
+#: ../mdkupdate:57
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - вывод этого справочного сообщения.\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:58
 #, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto         - автоматический запуск Mandrakeupdate.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:59
 #, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - запуск Mandrakeupdate.\n"
 
-#: ../mdkupdate:58
-#, c-format
-msgid "  --update       - Update keys\n"
-msgstr "  --update       - обновление ключей\n"
-
-#: ../mdkupdate:66
+#: ../mdkupdate:67
 #, c-format
 msgid "No %s file found. Run mdkonline wizard first"
 msgstr "Файл %s не найден. Запустите сначала мастер mdkonline"
 
-#: ../mdkupdate:124
+#: ../mdkupdate:126
 #, c-format
 msgid "Mandrakeupdate could not contact the site, we will try again."
 msgstr "Невозможно связаться с сайтом Mandrakeonline, попробуем еще раз."
 
-#: ../mdkupdate:173
+#: ../mdkupdate:176
 #, c-format
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr "Невозможно обновить пакеты из источника mdkupdate.\n"
 
-#: ../mdkupdate:195
+#: ../mdkupdate:198
 #, c-format
 msgid ""
 "Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
@@ -660,3 +605,50 @@ msgid ""
 msgstr ""
 "Mandrakeupdate не смог выгрузить diff-файлы. Отправьте письмо на support "
 "[at] mandrakeonline [dot] net"
+
+#~ msgid "Next"
+#~ msgstr "Далее"
+
+#~ msgid "Cancel"
+#~ msgstr "Отмена"
+
+#~ msgid "Previous"
+#~ msgstr "Назад"
+
+#~ msgid "I don't have a Mandrakeonline account and I want to subscribe"
+#~ msgstr "У меня нет учётной записи Mandrakeonline и я хочу получить её"
+
+#~ msgid "Mandrakelinux Privacy Policy"
+#~ msgstr "Политика безопасности Mandrakelinux"
+
+#~ msgid "Authentification"
+#~ msgstr "Аутентификация"
+
+#~ msgid "Send Configuration"
+#~ msgstr "Отправить конфигурацию"
+
+#~ msgid "Finish"
+#~ msgstr "Завершить"
+
+#~ msgid "automated Upgrades"
+#~ msgstr "автоматизированные апгрейды"
+
+#~ msgid "Country:"
+#~ msgstr "Страна:"
+
+#~ msgid "Error"
+#~ msgstr "Ошибка"
+
+#~ msgid "Quitting Wizard\n"
+#~ msgstr "Завершения работы мастера\n"
+
+#~ msgid ""
+#~ "Mandrakeonline could not be contacted, please try again at a later time"
+#~ msgstr ""
+#~ "Не удается связаться с Mandrakeonline, попробуйте еще раз несколько позже"
+
+#~ msgid "Wrong password"
+#~ msgstr "Неверный пароль"
+
+#~ msgid "  --update       - Update keys\n"
+#~ msgstr "  --update       - обновление ключей\n"
diff --git a/po/sc.po b/po/sc.po
index 416d8a25..cbca0291 100644
--- a/po/sc.po
+++ b/po/sc.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-sc\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-01 22:41+0200\n"
+"POT-Creation-Date: 2004-11-03 12:10+0100\n"
 "PO-Revision-Date: 2004-09-25 16:59+0200\n"
 "Last-Translator: Antoni Pistis <antonio.pistis@virgilio.it>\n"
 "Language-Team: Sardu\n"
@@ -18,12 +18,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3\n"
 
-#: ../mdkapplet:61
+#: ../mdkapplet:63
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Su sistema est ajorronau"
 
-#: ../mdkapplet:67
+#: ../mdkapplet:69
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -32,187 +32,197 @@ msgstr ""
 "Probrema de assètiu de serbìtziu. Controlla is log e manda una missada a "
 "support@mandrakeonline.net"
 
-#: ../mdkapplet:73
+#: ../mdkapplet:75
 #, c-format
 msgid "System is busy. Please wait ..."
 msgstr "Su sistema est arrocau. Abeta ..."
 
-#: ../mdkapplet:79
+#: ../mdkapplet:81
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Ajorronus a disposta po su sistema tuu"
 
-#: ../mdkapplet:85
+#: ../mdkapplet:87
 #, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr "Serbìtziu no assetiau. Craca \"Assètia su Serbìtziu\""
 
-#: ../mdkapplet:91
+#: ../mdkapplet:93
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "S'arretza no andat. Assètia s'arretza tua."
 
-#: ../mdkapplet:97
+#: ../mdkapplet:99
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Serbìtziu no abivau. Craca \"Jassus Online\""
 
-#: ../mdkapplet:103
+#: ../mdkapplet:105
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "Release no suportada (release tropu beça, o release de sboddiamentu)"
 
-#: ../mdkapplet:108 ../mdkapplet:158
+#: ../mdkapplet:110 ../mdkapplet:164
 #, c-format
 msgid "Install updates"
 msgstr "Aposenta is ajorronus"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:111
 #, c-format
 msgid "Configure the service"
 msgstr "Assètia su serbìtziu"
 
-#: ../mdkapplet:110
+#: ../mdkapplet:112
 #, c-format
 msgid "Check Updates"
 msgstr "Controlla is Ajorronus"
 
-#: ../mdkapplet:111
+#: ../mdkapplet:113 ../mdkapplet:167 ../mdkapplet:225
+#, c-format
+msgid "Please Wait"
+msgstr ""
+
+#: ../mdkapplet:113 ../mdkapplet:166 ../mdkapplet:167 ../mdkapplet:225
+#, c-format
+msgid "Check updates"
+msgstr "Controlla is Annous"
+
+#: ../mdkapplet:115
 #, c-format
 msgid "Online WebSite"
 msgstr "Jassu online"
 
-#: ../mdkapplet:112
+#: ../mdkapplet:116
 #, c-format
 msgid "Configure Network"
 msgstr "Assètia Arretza"
 
-#: ../mdkapplet:113
+#: ../mdkapplet:117
 #, c-format
 msgid "Configure Now!"
 msgstr "Assètia Imoi!"
 
-#: ../mdkapplet:146
+#: ../mdkapplet:152 ../mdkapplet:229
 #, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Applet Mandrakelinux Updates"
 
-#: ../mdkapplet:156
+#: ../mdkapplet:162
 #, c-format
 msgid "Actions"
 msgstr "Fainas"
 
-#: ../mdkapplet:159
+#: ../mdkapplet:165
 #, c-format
 msgid "Configure"
 msgstr "Assètia"
 
-#: ../mdkapplet:160
-#, c-format
-msgid "Check updates"
-msgstr "Controlla is Annous"
-
-#: ../mdkapplet:161
+#: ../mdkapplet:169
 #, c-format
 msgid "See logs"
 msgstr "Càstia is logs"
 
-#: ../mdkapplet:164
+#: ../mdkapplet:172
 #, c-format
 msgid "Status"
 msgstr "Stadu"
 
-#: ../mdkapplet:168 ../mdkapplet:363
+#: ../mdkapplet:176 ../mdkapplet:375
 #, c-format
 msgid "Close"
 msgstr "Serra"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Network Connection: "
 msgstr "Acàpiu a s'Arretza: "
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Up"
 msgstr "Andat"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Down"
 msgstr "No andat"
 
-#: ../mdkapplet:204
+#: ../mdkapplet:212
 #, c-format
 msgid "Last check: "
 msgstr "Ùrtimu controllu: "
 
-#: ../mdkapplet:205
+#: ../mdkapplet:213
 #, c-format
 msgid "Updates: "
 msgstr "Annous:"
 
-#: ../mdkapplet:209
+#: ../mdkapplet:217
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Seu lancendi drakconnect\n"
 
-#: ../mdkapplet:213
+#: ../mdkapplet:221
 #, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "Seu lancedi mdkupdate --applet\n"
 
-#: ../mdkapplet:217
+#: ../mdkapplet:224
 #, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr "Mandrakeonline parit torrau a aposentai, càrrigu torra sa applet ...."
 
-#: ../mdkapplet:225
+#: ../mdkapplet:235
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Seu carculendi atrus annous...\n"
 
-#: ../mdkapplet:227
+#: ../mdkapplet:237
 #, c-format
 msgid "Connecting to"
 msgstr "Seu acapiendi"
 
-#: ../mdkapplet:250
+#: ../mdkapplet:244
+#, fuzzy, c-format
+msgid "Response from Mandrakeonline server\n"
+msgstr "Beni beniu in Mandrakeonline"
+
+#: ../mdkapplet:262
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Seu controllendi... Disponeus de annous\n"
 
-#: ../mdkapplet:254
+#: ../mdkapplet:267
 #, c-format
 msgid "Development release not supported by service"
 msgstr "Release de sboddiamentu no suportada de su serbìtziu"
 
-#: ../mdkapplet:255
+#: ../mdkapplet:268
 #, c-format
 msgid "Too old release not supported by service"
 msgstr "Release tropu beça no suportada de su serbìtziu"
 
-#: ../mdkapplet:256
+#: ../mdkapplet:269
 #, c-format
 msgid "Unknown state"
 msgstr "Stadu disconnotu"
 
-#: ../mdkapplet:257
+#: ../mdkapplet:270
 #, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr "Serbìtziu online disabilisau. Cuntata su jassu Mandrakeonline\n"
 
-#: ../mdkapplet:258
+#: ../mdkapplet:271
 #, c-format
 msgid "Wrong Password.\n"
 msgstr "Password sballiada.\n"
 
-#: ../mdkapplet:259
+#: ../mdkapplet:272
 #, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr "Faina o host o login sballiau.\n"
 
-#: ../mdkapplet:260
+#: ../mdkapplet:273
 #, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
@@ -221,72 +231,82 @@ msgstr ""
 "Calincuna cosa est sballiada is s'assètiu arretza tuu (controlla s'assètiu "
 "de route, de su firewall o de su proxy)\n"
 
-#: ../mdkapplet:264
+#: ../mdkapplet:277
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Su sistema est ajorronau\n"
 
-#: ../mdkapplet:303
+#: ../mdkapplet:317
 #, c-format
 msgid "No check"
 msgstr "Nisçunu controllu"
 
-#: ../mdkapplet:316
+#: ../mdkapplet:330
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Seu controllendi s'arretza: parit disabilisada\n"
 
-#: ../mdkapplet:319
+#: ../mdkapplet:333
 #, c-format
 msgid "Checking config file: Not present\n"
 msgstr "Seu controllendi su config file: no ddui at\n"
 
-#: ../mdkapplet:353
+#: ../mdkapplet:365
 #, c-format
 msgid "Logs"
 msgstr "Logs"
 
-#: ../mdkapplet:369
+#: ../mdkapplet:381
 #, c-format
 msgid "Clear"
 msgstr "Pulli"
 
-#: ../mdkapplet:396
+#: ../mdkapplet:408
 #, c-format
 msgid "About..."
 msgstr "Apitzus de..."
 
-#: ../mdkapplet:397
+#: ../mdkapplet:409
 #, c-format
 msgid "Always launch on startup"
 msgstr "Lança sempri a s' alluidura"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:411
 #, c-format
 msgid "Quit"
 msgstr "Bessi"
 
-#: ../mdkonline:89
+#: ../mdkonline:52 ../mdkonline:106
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "Beni beniu in Mandrakeonline"
+
+#: ../mdkonline:55
 #, c-format
-msgid "Next"
-msgstr "Sighit"
+msgid "I already have an account"
+msgstr ""
 
-#: ../mdkonline:89
+#: ../mdkonline:56
 #, c-format
-msgid "Cancel"
-msgstr "Annudda"
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline:89 ../mdkonline:93 ../mdkonline:131
+#, c-format
+msgid "Please wait"
+msgstr ""
 
 #: ../mdkonline:89
 #, c-format
-msgid "Previous"
-msgstr "Pretzedenti"
+msgid "Reading configuration\n"
+msgstr "Seu ligendi s' assètiu\n"
 
-#: ../mdkonline:103
+#: ../mdkonline:93
 #, c-format
-msgid "Welcome to Mandrakeonline"
-msgstr "Beni beniu in Mandrakeonline"
+msgid "Sending configuration..."
+msgstr "Seu mandendi s' assètiu..."
 
-#: ../mdkonline:104 ../mdkonline_tui:98
+#: ../mdkonline:109
 #, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
@@ -297,62 +317,37 @@ msgstr ""
 "(pakitus e assètiu màkina) in d-unu database centralisau po ti podi\n"
 "apoderai informau de is annous de siguresa e de mellorias utilosas.\n"
 
-#: ../mdkonline:105 ../mdkonline_tui:142
+#: ../mdkonline:114
 #, c-format
-msgid "Create a Mandrakeonline Account"
-msgstr "Crea unu Account Mandrakeonline"
+msgid "Account creation or authentication"
+msgstr ""
 
-#: ../mdkonline:107
-#, fuzzy, c-format
-msgid "I don't have a Mandrakeonline account and I want to subscribe"
-msgstr "No tenju unu account Mandrakeonline e ddu bollu "
+#: ../mdkonline:119
+#, c-format
+msgid "Enter your Mandrakeonline login, password and machine name:"
+msgstr "Intra su login e password tuus Mandrakeonline e su nòmini màkina:"
 
-#: ../mdkonline:111 ../mdkonline:131 ../mdkonline_tui:114 ../mdkonline_tui:145
+#: ../mdkonline:125 ../mdkonline:156
 #, c-format
 msgid "Login:"
 msgstr "Login:"
 
-#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:115 ../mdkonline_tui:146
+#: ../mdkonline:126 ../mdkonline:157
 #, c-format
 msgid "Password:"
 msgstr "Password:"
 
-#: ../mdkonline:113 ../mdkonline_tui:147
-#, c-format
-msgid "Confirm Password:"
-msgstr "Cunfirma sa Password:"
-
-#: ../mdkonline:114 ../mdkonline_tui:148
-#, c-format
-msgid "Mail contact:"
-msgstr "Cuntatu de Posta:"
-
-#: ../mdkonline:121
-#, c-format
-msgid "Mandrakelinux Privacy Policy"
-msgstr "Mandrakelinux Privacy Policy"
-
 #: ../mdkonline:127
 #, c-format
-msgid "Authentification"
-msgstr "Autèntiga"
-
-#: ../mdkonline:128 ../mdkonline_tui:108
-#, c-format
-msgid "Enter your Mandrakeonline login, password and machine name:"
-msgstr "Intra su login e password tuus Mandrakeonline e su nòmini màkina:"
-
-#: ../mdkonline:133 ../mdkonline_tui:116
-#, c-format
 msgid "Machine name:"
 msgstr "Nòmini màkina:"
 
-#: ../mdkonline:138
-#, c-format
-msgid "Send Configuration"
-msgstr "Manda s'assètiu"
+#: ../mdkonline:131
+#, fuzzy, c-format
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Beni beniu in Mandrakeonline"
 
-#: ../mdkonline:139 ../mdkonline_tui:128
+#: ../mdkonline:139
 #, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
@@ -384,55 +379,55 @@ msgstr ""
 "In prus, benefìtzias de su serbìtziu de ajudu scontau in\n"
 "www.mandrakeexpert.com."
 
-#: ../mdkonline:144 ../mdkonline:211 ../mdkonline:234
+#: ../mdkonline:141 ../mdkonline:180 ../mdkupdate:126 ../mdkupdate:198
 #, c-format
-msgid "Finish"
-msgstr "Acabau"
+msgid "Connection problem"
+msgstr "Probrema de acàpiu"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid "Your upload was successful!"
-msgstr "S' upload est acabau beni!"
+msgid "or"
+msgstr ""
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandrakeonline."
-msgstr ""
-"De imoi as' arriciri noas apitzus de siguresa e annous, \n"
-"gràtzias a Mandrakeonline."
+msgid "wrong password:"
+msgstr "Password sballiada:"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
 msgid ""
-"Mandrakeonline offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+"Your login or password was wrong.\n"
+" Either you'll have to type it again, or you'll need to create an account on "
+"Mandrakeonline.\n"
+" In the latter case, go back to the first step to connect to "
+"Mandrakeonline.\n"
+" Be aware that you must also provide a Machine name \n"
+" (only alphabetical characters are admitted)"
 msgstr ""
-"Mandrakeonline ti donat de podi automatisai is annous tuus.\n"
-"Unu programa at a girai in su sistema, abetendi annous\n"
-
-#: ../mdkonline:146
-#, c-format
-msgid "automated Upgrades"
-msgstr "Annous automàtigus"
+"Su login o sa password fiant sballiaus.\n"
+" O ddus depis torrai a-i scriri, o depis creai unu account in "
+"Mandrakeonline.\n"
+" In sa segundu sorti, torra a su primu passu po t'acapiai a Mandrakeonline.\n"
+" Atentu, ca depis donai unu nòmini màkina \n"
+" (funt permìtias lìteras feti)"
 
-#: ../mdkonline:150
+#: ../mdkonline:153
 #, c-format
-msgid "Country:"
-msgstr "Stadu:"
+msgid "Create a Mandrakeonline Account"
+msgstr "Crea unu Account Mandrakeonline"
 
-#: ../mdkonline:178 ../mdkonline:183 ../mdkonline:185 ../mdkonline:187
+#: ../mdkonline:158
 #, c-format
-msgid "Error"
-msgstr "Faddina"
+msgid "Confirm Password:"
+msgstr "Cunfirma sa Password:"
 
-#: ../mdkonline:183 ../mdkonline_tui:152
+#: ../mdkonline:159
 #, c-format
-msgid "Please provide a login"
-msgstr "Po prexeri, intra unu login"
+msgid "Mail contact:"
+msgstr "Cuntatu de Posta:"
 
-#: ../mdkonline:185 ../mdkonline_tui:152
+#: ../mdkonline:163
 #, c-format
 msgid ""
 "The passwords do not match\n"
@@ -441,160 +436,114 @@ msgstr ""
 "Sa password no cuncordat\n"
 "Po prexeri, torra a provai\n"
 
-#: ../mdkonline:187 ../mdkonline_tui:152
+#: ../mdkonline:163
+#, c-format
+msgid "Please provide a login"
+msgstr "Po prexeri, intra unu login"
+
+#: ../mdkonline:163
 #, c-format
 msgid "Not a valid mail address!\n"
 msgstr "No est bivimentu email bonu!\n"
 
-#: ../mdkonline:199 ../mdkonline_tui:78
+#: ../mdkonline:169
 #, c-format
-msgid "Reading configuration\n"
-msgstr "Seu ligendi s' assètiu\n"
+msgid ""
+"Mandrakeonline Account successfully created.\n"
+"Please click \"Next\" to authenticate and upload your configuration\n"
+msgstr ""
 
-#: ../mdkonline:204 ../mdkonline_tui:82
+#: ../mdkonline:178
 #, c-format
-msgid "Sending configuration..."
-msgstr "Seu mandendi s' assètiu..."
+msgid "Your upload was successful!"
+msgstr "S' upload est acabau beni!"
 
-#: ../mdkonline:213 ../mdkonline:273 ../mdkonline_tui:130 ../mdkonline_tui:169
-#: ../mdkupdate:124 ../mdkupdate:195
+#: ../mdkonline:178
 #, c-format
-msgid "Connection problem"
-msgstr "Probrema de acàpiu"
+msgid ""
+"From now you will receive on security and updates \n"
+"announcements thanks to Mandrakeonline."
+msgstr ""
+"De imoi as' arriciri noas apitzus de siguresa e annous, \n"
+"gràtzias a Mandrakeonline."
 
-#: ../mdkonline:213 ../mdkonline_tui:169
+#: ../mdkonline:178
+#, c-format
+msgid ""
+"Mandrakeonline offers you the ability to automate the updates.\n"
+"A program will run regulary in your system waiting for new updates\n"
+msgstr ""
+"Mandrakeonline ti donat de podi automatisai is annous tuus.\n"
+"Unu programa at a girai in su sistema, abetendi annous\n"
+
+#: ../mdkonline:180
 #, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr "Probrema carrighendi is file, torra a provai"
 
-#: ../mdkonline:251
+#: ../mdkonline:186
 #, c-format
-msgid "Quitting Wizard\n"
-msgstr "Seu bessendi de su Wizard\n"
+msgid "Country"
+msgstr "Stadu"
 
-#: ../mdkonline:273
+#: ../mdkonline:198
+#, fuzzy, c-format
+msgid "Congratulations"
+msgstr "Manda s'assètiu"
+
+#: ../mdkonline:198
 #, c-format
-msgid "Mandrakeonline could not be contacted, please try again at a later time"
+msgid "Your Mandrakeonline account has been successfully configured\n"
 msgstr ""
-"No apu pòtziu cuntatai Mandrakeonline, po prexeri, torra a provai prus a "
-"tradu"
 
-#: ../mdkonline:285
-#, c-format
-msgid "Wrong password"
-msgstr "Password sballiada"
+#: ../mdkonline:214
+#, fuzzy, c-format
+msgid "Configuration uploaded successfully"
+msgstr "S' upload est acabau beni!"
+
+#: ../mdkonline:215
+#, fuzzy, c-format
+msgid "Problem uploading configuration"
+msgstr "Seu ligendi s' assètiu\n"
 
-#: ../mdkonline:285 ../mdkonline_tui:130
+#: ../mdkonline:216
 #, c-format
 msgid ""
-"Your login or password was wrong.\n"
-" Either you'll have to type it again, or you'll need to create an account on "
-"Mandrakeonline.\n"
-" In the latter case, go back to the first step to connect to "
-"Mandrakeonline.\n"
-" Be aware that you must also provide a Machine name \n"
-" (only alphabetical characters are admitted)"
+"Cannot connect to mandrakeonline website: wrong login/password or router/"
+"firewall bad settings"
 msgstr ""
-"Su login o sa password fiant sballiaus.\n"
-" O ddus depis torrai a-i scriri, o depis creai unu account in "
-"Mandrakeonline.\n"
-" In sa segundu sorti, torra a su primu passu po t'acapiai a Mandrakeonline.\n"
-" Atentu, ca depis donai unu nòmini màkina \n"
-" (funt permìtias lìteras feti)"
 
-#: ../mdkonline.pm:58
+#: ../mdkonline.pm:66
 #, c-format
 msgid "Login and password should be less than 12 characters\n"
 msgstr ""
 
-#: ../mdkonline.pm:59
+#: ../mdkonline.pm:67
 #, c-format
 msgid "Special characters are not allowed\n"
 msgstr ""
 
-#: ../mdkonline.pm:60
+#: ../mdkonline.pm:68
 #, c-format
 msgid "Please fill in all fields\n"
 msgstr ""
 
-#: ../mdkonline.pm:61
+#: ../mdkonline.pm:69
 #, c-format
 msgid "Email not valid\n"
 msgstr ""
 
-#: ../mdkonline.pm:62
+#: ../mdkonline.pm:70
 #, c-format
 msgid "Account already exist\n"
 msgstr ""
 
-#: ../mdkonline.pm:68
+#: ../mdkonline.pm:76
 #, c-format
 msgid "Problem connecting to server \n"
 msgstr "Probrema de acàpiu a su server \n"
 
-#: ../mdkonline_tui:45 ../mdkonline_tui:95
-#, fuzzy, c-format
-msgid "Mandrakeonline"
-msgstr "Beni beniu in Mandrakeonline"
-
-#: ../mdkonline_tui:48
-#, c-format
-msgid "I already have an account"
-msgstr ""
-
-#: ../mdkonline_tui:49
-#, c-format
-msgid "I want to subscribe"
-msgstr ""
-
-#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:120
-#, c-format
-msgid "Please wait"
-msgstr ""
-
-#: ../mdkonline_tui:103
-#, c-format
-msgid "Account creation or authentication"
-msgstr ""
-
-#: ../mdkonline_tui:120
-#, fuzzy, c-format
-msgid "Connecting to Mandrakeonline website..."
-msgstr "Beni beniu in Mandrakeonline"
-
-#: ../mdkonline_tui:130
-#, c-format
-msgid "or"
-msgstr ""
-
-#: ../mdkonline_tui:130
-#, c-format
-msgid "wrong password:"
-msgstr "Password sballiada:"
-
-#: ../mdkonline_tui:158
-#, c-format
-msgid ""
-"Mandrakeonline Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-
-#: ../mdkonline_tui:175
-#, c-format
-msgid "Country"
-msgstr "Stadu"
-
-#: ../mdkonline_tui:187
-#, fuzzy, c-format
-msgid "Congratulations"
-msgstr "Manda s'assètiu"
-
-#: ../mdkonline_tui:187
-#, c-format
-msgid "Your Mandrakeonline account has been successfully configured\n"
-msgstr ""
-
-#: ../mdkupdate:50
+#: ../mdkupdate:52
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
@@ -610,50 +559,94 @@ msgstr ""
 "\n"
 "impreu:\n"
 
-#: ../mdkupdate:55
+#: ../mdkupdate:57
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - imprenta custa missada de ajudu.\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:58
 #, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto         - Mandrakeupdate lançau in automàtigu.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:59
 #, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - lança Mandrakeupdate.\n"
 
-#: ../mdkupdate:58
-#, c-format
-msgid "  --update       - Update keys\n"
-msgstr "  --update       - Ajorrona is crais\n"
-
-#: ../mdkupdate:66
+#: ../mdkupdate:67
 #, c-format
 msgid "No %s file found. Run mdkonline wizard first"
 msgstr ""
 
-#: ../mdkupdate:124
+#: ../mdkupdate:126
 #, fuzzy, c-format
 msgid "Mandrakeupdate could not contact the site, we will try again."
 msgstr ""
 "No apu pòtziu cuntatai Mandrakeonline, po prexeri, torra a provai prus a "
 "tradu"
 
-#: ../mdkupdate:173
+#: ../mdkupdate:176
 #, c-format
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr ""
 
-#: ../mdkupdate:195
+#: ../mdkupdate:198
 #, c-format
 msgid ""
 "Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
 "mandrakeonline [dot] net"
 msgstr ""
 
+#~ msgid "Next"
+#~ msgstr "Sighit"
+
+#~ msgid "Cancel"
+#~ msgstr "Annudda"
+
+#~ msgid "Previous"
+#~ msgstr "Pretzedenti"
+
+#, fuzzy
+#~ msgid "I don't have a Mandrakeonline account and I want to subscribe"
+#~ msgstr "No tenju unu account Mandrakeonline e ddu bollu "
+
+#~ msgid "Mandrakelinux Privacy Policy"
+#~ msgstr "Mandrakelinux Privacy Policy"
+
+#~ msgid "Authentification"
+#~ msgstr "Autèntiga"
+
+#~ msgid "Send Configuration"
+#~ msgstr "Manda s'assètiu"
+
+#~ msgid "Finish"
+#~ msgstr "Acabau"
+
+#~ msgid "automated Upgrades"
+#~ msgstr "Annous automàtigus"
+
+#~ msgid "Country:"
+#~ msgstr "Stadu:"
+
+#~ msgid "Error"
+#~ msgstr "Faddina"
+
+#~ msgid "Quitting Wizard\n"
+#~ msgstr "Seu bessendi de su Wizard\n"
+
+#~ msgid ""
+#~ "Mandrakeonline could not be contacted, please try again at a later time"
+#~ msgstr ""
+#~ "No apu pòtziu cuntatai Mandrakeonline, po prexeri, torra a provai prus a "
+#~ "tradu"
+
+#~ msgid "Wrong password"
+#~ msgstr "Password sballiada"
+
+#~ msgid "  --update       - Update keys\n"
+#~ msgstr "  --update       - Ajorrona is crais\n"
+
 #~ msgid "Skip Wizard"
 #~ msgstr "Lassa a perdi su Wizard"
 
diff --git a/po/sk.po b/po/sk.po
index 98f54e44..ed67eac8 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-01 22:41+0200\n"
+"POT-Creation-Date: 2004-11-03 12:10+0100\n"
 "PO-Revision-Date: 2004-10-06 02:06+0100\n"
 "Last-Translator: Tibor Pittich <Tibor.Pittich@mandrake.org>\n"
 "Language-Team: Slovak <i18n@mandrake.sk>\n"
@@ -15,270 +15,297 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms:  nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: ../mdkapplet:61
+#: ../mdkapplet:63
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Váš systém je dostatočne aktualizovaný"
 
-#: ../mdkapplet:67
+#: ../mdkapplet:69
 #, c-format
-msgid "Service configuration problem. Please check logs and send mail to support@mandrakeonline.net"
-msgstr "Nastal problém v konfigurácii služby. Prosím skontrolujte log súbory a pošlite e-mail na support@mandrakeonline.net"
+msgid ""
+"Service configuration problem. Please check logs and send mail to "
+"support@mandrakeonline.net"
+msgstr ""
+"Nastal problém v konfigurácii služby. Prosím skontrolujte log súbory a "
+"pošlite e-mail na support@mandrakeonline.net"
 
-#: ../mdkapplet:73
+#: ../mdkapplet:75
 #, c-format
 msgid "System is busy. Please wait ..."
 msgstr "Systém je zahltený. Prosím čakajte ..."
 
-#: ../mdkapplet:79
+#: ../mdkapplet:81
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Sú dostupné nové aktualizácie pre váš systém"
 
-#: ../mdkapplet:85
+#: ../mdkapplet:87
 #, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
-msgstr "Služba nie je nakonfigurovaná. Prosím kliknite na \"Konfigurovať službu\""
+msgstr ""
+"Služba nie je nakonfigurovaná. Prosím kliknite na \"Konfigurovať službu\""
 
-#: ../mdkapplet:91
+#: ../mdkapplet:93
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Sieť je nedostupná. Prosím skontrolute vašu sieť"
 
-#: ../mdkapplet:97
+#: ../mdkapplet:99
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Služba nie je aktivovaná. Prosím kliknite na \"Online Website\""
 
-#: ../mdkapplet:103
+#: ../mdkapplet:105
 #, c-format
 msgid "Release not supported (too old release, or development release)"
-msgstr "Táto verzia nie je podporovaná (je príliš stará alebo je vo fáze vývoja)"
+msgstr ""
+"Táto verzia nie je podporovaná (je príliš stará alebo je vo fáze vývoja)"
 
-#: ../mdkapplet:108
-#: ../mdkapplet:158
+#: ../mdkapplet:110 ../mdkapplet:164
 #, c-format
 msgid "Install updates"
 msgstr "Inštalácia aktualizácií"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:111
 #, c-format
 msgid "Configure the service"
 msgstr "Nastaviť službu"
 
-#: ../mdkapplet:110
+#: ../mdkapplet:112
 #, c-format
 msgid "Check Updates"
 msgstr "Skontrolovať aktualizácie"
 
-#: ../mdkapplet:111
+#: ../mdkapplet:113 ../mdkapplet:167 ../mdkapplet:225
+#, fuzzy, c-format
+msgid "Please Wait"
+msgstr "Prosím čakajte"
+
+#: ../mdkapplet:113 ../mdkapplet:166 ../mdkapplet:167 ../mdkapplet:225
+#, c-format
+msgid "Check updates"
+msgstr "Skontrolovať aktualizácie"
+
+#: ../mdkapplet:115
 #, c-format
 msgid "Online WebSite"
 msgstr "Online web sajty"
 
-#: ../mdkapplet:112
+#: ../mdkapplet:116
 #, c-format
 msgid "Configure Network"
 msgstr "Nastaviť sieť"
 
-#: ../mdkapplet:113
+#: ../mdkapplet:117
 #, c-format
 msgid "Configure Now!"
 msgstr "Nastaviť teraz!"
 
-#: ../mdkapplet:146
+#: ../mdkapplet:152 ../mdkapplet:229
 #, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Mandrakelinux aktualizačný applet"
 
-#: ../mdkapplet:156
+#: ../mdkapplet:162
 #, c-format
 msgid "Actions"
 msgstr "Akcie"
 
-#: ../mdkapplet:159
+#: ../mdkapplet:165
 #, c-format
 msgid "Configure"
 msgstr "Nastaviť"
 
-#: ../mdkapplet:160
-#, c-format
-msgid "Check updates"
-msgstr "Skontrolovať aktualizácie"
-
-#: ../mdkapplet:161
+#: ../mdkapplet:169
 #, c-format
 msgid "See logs"
 msgstr "Nahliadnuť do logov"
 
-#: ../mdkapplet:164
+#: ../mdkapplet:172
 #, c-format
 msgid "Status"
 msgstr "Stav"
 
-#: ../mdkapplet:168
-#: ../mdkapplet:363
+#: ../mdkapplet:176 ../mdkapplet:375
 #, c-format
 msgid "Close"
 msgstr "Zatvoriť"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Network Connection: "
 msgstr "Sieťové pripojenia:"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Up"
 msgstr "Hore"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Down"
 msgstr "Dole"
 
-#: ../mdkapplet:204
+#: ../mdkapplet:212
 #, c-format
 msgid "Last check: "
 msgstr "Posledná kontrola:"
 
-#: ../mdkapplet:205
+#: ../mdkapplet:213
 #, c-format
 msgid "Updates: "
 msgstr "Aktualizácie:"
 
-#: ../mdkapplet:209
+#: ../mdkapplet:217
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Spúšťanie drakconnect\n"
 
-#: ../mdkapplet:213
+#: ../mdkapplet:221
 #, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "Spúšťanie appletu mdkupdate\n"
 
-#: ../mdkapplet:217
+#: ../mdkapplet:224
 #, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr "Mandrakeonline bude potrebné preinštalovať, znova nahrávam applet...."
 
-#: ../mdkapplet:225
+#: ../mdkapplet:235
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Hľadanie nových aktualizácií...\n"
 
-#: ../mdkapplet:227
+#: ../mdkapplet:237
 #, c-format
 msgid "Connecting to"
 msgstr "Spájanie s"
 
-#: ../mdkapplet:250
+#: ../mdkapplet:244
+#, fuzzy, c-format
+msgid "Response from Mandrakeonline server\n"
+msgstr "Vítajte v Mandrakelinux Online"
+
+#: ../mdkapplet:262
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Hľadanie... K dispozícii sú aktualizácie\n"
 
-#: ../mdkapplet:254
+#: ../mdkapplet:267
 #, c-format
 msgid "Development release not supported by service"
 msgstr "Vývojová verzia nie je podporovaná touto službou"
 
-#: ../mdkapplet:255
+#: ../mdkapplet:268
 #, c-format
 msgid "Too old release not supported by service"
 msgstr "Príliš stará verzia nie je podporovaná službou"
 
-#: ../mdkapplet:256
+#: ../mdkapplet:269
 #, c-format
 msgid "Unknown state"
 msgstr "Neznámy status"
 
-#: ../mdkapplet:257
+#: ../mdkapplet:270
 #, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr "Online služby vypnuté. Kontaktujte stránku Mandrakeonline\n"
 
-#: ../mdkapplet:258
+#: ../mdkapplet:271
 #, c-format
 msgid "Wrong Password.\n"
 msgstr "Zlé heslo.\n"
 
-#: ../mdkapplet:259
+#: ../mdkapplet:272
 #, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr "Nesprávna akcia, hostiteľ alebo prihlasovacie údaje\n"
 
-#: ../mdkapplet:260
+#: ../mdkapplet:273
 #, c-format
-msgid "Something is wrong with your network settings (check your route, firewall or proxy settings)\n"
-msgstr "Niečo s nastavením vašej siete nie je v poriadku (skontrolujte pripojenie firewall alebo nastavenie proxy)\n"
+msgid ""
+"Something is wrong with your network settings (check your route, firewall or "
+"proxy settings)\n"
+msgstr ""
+"Niečo s nastavením vašej siete nie je v poriadku (skontrolujte pripojenie "
+"firewall alebo nastavenie proxy)\n"
 
-#: ../mdkapplet:264
+#: ../mdkapplet:277
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Váš systém je dostatočne aktualizovaný\n"
 
-#: ../mdkapplet:303
+#: ../mdkapplet:317
 #, c-format
 msgid "No check"
 msgstr "Žiadna kontrola"
 
-#: ../mdkapplet:316
+#: ../mdkapplet:330
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Kontrolovanie siete: zrejme je vypnutá\n"
 
-#: ../mdkapplet:319
+#: ../mdkapplet:333
 #, c-format
 msgid "Checking config file: Not present\n"
 msgstr "Kontrolovanie konfiguračného súboru: Nebol nájdený\n"
 
-#: ../mdkapplet:353
+#: ../mdkapplet:365
 #, c-format
 msgid "Logs"
 msgstr "Logy"
 
-#: ../mdkapplet:369
+#: ../mdkapplet:381
 #, c-format
 msgid "Clear"
 msgstr "Vyprázdniť"
 
-#: ../mdkapplet:396
+#: ../mdkapplet:408
 #, c-format
 msgid "About..."
 msgstr "O.."
 
-#: ../mdkapplet:397
+#: ../mdkapplet:409
 #, c-format
 msgid "Always launch on startup"
 msgstr "Spustiť po štarte"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:411
 #, c-format
 msgid "Quit"
 msgstr "Koniec"
 
-#: ../mdkonline:89
+#: ../mdkonline:52 ../mdkonline:106
 #, c-format
-msgid "Next"
-msgstr "Ďalšia"
+msgid "Mandrakeonline"
+msgstr "Mandrakeonline"
 
-#: ../mdkonline:89
+#: ../mdkonline:55
 #, c-format
-msgid "Cancel"
-msgstr "Zrušiť"
+msgid "I already have an account"
+msgstr "Už mám vytvorený účet"
+
+#: ../mdkonline:56
+#, c-format
+msgid "I want to subscribe"
+msgstr "Chcem sa zaregistrovať"
+
+#: ../mdkonline:89 ../mdkonline:93 ../mdkonline:131
+#, c-format
+msgid "Please wait"
+msgstr "Prosím čakajte"
 
 #: ../mdkonline:89
 #, c-format
-msgid "Previous"
-msgstr "Späť"
+msgid "Reading configuration\n"
+msgstr "Načítavanie konfigurácie\n"
 
-#: ../mdkonline:103
+#: ../mdkonline:93
 #, c-format
-msgid "Welcome to Mandrakeonline"
-msgstr "Vítajte v Mandrakelinux Online"
+msgid "Sending configuration..."
+msgstr "Zasielanie konfigurácie..."
 
-#: ../mdkonline:104
-#: ../mdkonline_tui:98
+#: ../mdkonline:109
 #, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
@@ -289,74 +316,37 @@ msgstr ""
 "(balíky, hardverová konfigurácia) do centrálnej databázy aby ste mohli\n"
 "byť informovaní o bezpečnostných aktualizáciách a zaujímavých balíkoch.\n"
 
-#: ../mdkonline:105
-#: ../mdkonline_tui:142
+#: ../mdkonline:114
 #, c-format
-msgid "Create a Mandrakeonline Account"
-msgstr "Vytvoriť Mandrakelinux Online účet"
+msgid "Account creation or authentication"
+msgstr "Vytváranie účtu a autorizácia"
 
-#: ../mdkonline:107
+#: ../mdkonline:119
 #, c-format
-msgid "I don't have a Mandrakeonline account and I want to subscribe"
-msgstr "Nemám účet na Mandrakeonline, ale chcel by som sa zaregistrovať"
+msgid "Enter your Mandrakeonline login, password and machine name:"
+msgstr "Zadajte vaše prihlasovacie meno, heslo a názov počítača:"
 
-#: ../mdkonline:111
-#: ../mdkonline:131
-#: ../mdkonline_tui:114
-#: ../mdkonline_tui:145
+#: ../mdkonline:125 ../mdkonline:156
 #, c-format
 msgid "Login:"
 msgstr "Prihlasovacie meno:"
 
-#: ../mdkonline:112
-#: ../mdkonline:132
-#: ../mdkonline_tui:115
-#: ../mdkonline_tui:146
+#: ../mdkonline:126 ../mdkonline:157
 #, c-format
 msgid "Password:"
 msgstr "Heslo:"
 
-#: ../mdkonline:113
-#: ../mdkonline_tui:147
-#, c-format
-msgid "Confirm Password:"
-msgstr "Potvrdiť heslo:"
-
-#: ../mdkonline:114
-#: ../mdkonline_tui:148
-#, c-format
-msgid "Mail contact:"
-msgstr "Mail kontakt:"
-
-#: ../mdkonline:121
-#, c-format
-msgid "Mandrakelinux Privacy Policy"
-msgstr "Bezpečnostná politika Mandrakelinux"
-
 #: ../mdkonline:127
 #, c-format
-msgid "Authentification"
-msgstr "Authentikácia"
-
-#: ../mdkonline:128
-#: ../mdkonline_tui:108
-#, c-format
-msgid "Enter your Mandrakeonline login, password and machine name:"
-msgstr "Zadajte vaše prihlasovacie meno, heslo a názov počítača:"
-
-#: ../mdkonline:133
-#: ../mdkonline_tui:116
-#, c-format
 msgid "Machine name:"
 msgstr "Meno počítača:"
 
-#: ../mdkonline:138
+#: ../mdkonline:131
 #, c-format
-msgid "Send Configuration"
-msgstr "Odoslať konfiguráciu"
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Pripájanie sa na sajt Mandrakeonline..."
 
 #: ../mdkonline:139
-#: ../mdkonline_tui:128
 #, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
@@ -366,8 +356,10 @@ msgid ""
 "1) the list of packages you have installed on your system,\n"
 "2) your hardware configuration.\n"
 "\n"
-"If you feel uncomfortable by that idea, or do not want to benefit from this service,\n"
-"please press 'Cancel'. By pressing 'Next', you allow us to keep you informed\n"
+"If you feel uncomfortable by that idea, or do not want to benefit from this "
+"service,\n"
+"please press 'Cancel'. By pressing 'Next', you allow us to keep you "
+"informed\n"
 "about security updates and useful upgrades via personalized email alerts.\n"
 "Furthermore, you benefit from discounted paid support services on\n"
 "www.mandrakeexpert.com."
@@ -379,72 +371,64 @@ msgstr ""
 "1) zoznam balíkov ktoré ste si nainštalovali\n"
 "2) vašu hardvérovú konfiguráciu\n"
 "\n"
-"Ak sa vám nepozdáva tento nápad alebo nevyžadujete používanie takýchto služieb\n"
-"kliknite na 'Zrušiť'. Kliknutím na 'Pokračovať' nám umožníte, aby sme vás informovali\n"
+"Ak sa vám nepozdáva tento nápad alebo nevyžadujete používanie takýchto "
+"služieb\n"
+"kliknite na 'Zrušiť'. Kliknutím na 'Pokračovať' nám umožníte, aby sme vás "
+"informovali\n"
 "o bezpečnostných aktualizáciách a užitočných iných vylepšeniach pomocou\n"
 "personalizovaného emailu.\n"
 "Môžete tiež zúžitkovať rôzne zľavy pre platené podporné služby na\n"
 "www.mandrakeexpert.com."
 
-#: ../mdkonline:144
-#: ../mdkonline:211
-#: ../mdkonline:234
+#: ../mdkonline:141 ../mdkonline:180 ../mdkupdate:126 ../mdkupdate:198
 #, c-format
-msgid "Finish"
-msgstr "Dokončiť"
+msgid "Connection problem"
+msgstr "Problém s pripojením"
 
-#: ../mdkonline:145
-#: ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid "Your upload was successful!"
-msgstr "Zaslanie bolo úspešné!"
+msgid "or"
+msgstr "alebo"
 
-#: ../mdkonline:145
-#: ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandrakeonline."
-msgstr ""
-"Odteraz budete môcť získavať oznámenia o bezpečnostných\n"
-"a dunkčných aktualizáciách vďaka Mandrakeonline."
+msgid "wrong password:"
+msgstr "nesprávne heslo:"
 
-#: ../mdkonline:145
-#: ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
 msgid ""
-"Mandrakeonline offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+"Your login or password was wrong.\n"
+" Either you'll have to type it again, or you'll need to create an account on "
+"Mandrakeonline.\n"
+" In the latter case, go back to the first step to connect to "
+"Mandrakeonline.\n"
+" Be aware that you must also provide a Machine name \n"
+" (only alphabetical characters are admitted)"
 msgstr ""
-"Mandrakeonline vám prináša možnosť ako vykonávať aktualizácie.\n"
-"Program môže bežať na vašom systéme a čakať na nové aktualizácie\n"
-
-#: ../mdkonline:146
-#, c-format
-msgid "automated Upgrades"
-msgstr "automatické aktualizácie"
+"Vaše prihlasovacie meno alebo heslo je nesprávne.\n"
+" Predtým ako sa ich pokúsite zadať znova, mali by ste si vytvoriť účet na "
+"Mandrakeonline.\n"
+" V opačnom prípade sa vráťte na prvý krok v pripojení k Mandrakeonline.\n"
+" Buďte si vedomí toho, že je potrebné zadať meno počítača \n"
+" (akceptované sú iba abecedné znaky)"
 
-#: ../mdkonline:150
+#: ../mdkonline:153
 #, c-format
-msgid "Country:"
-msgstr "Krajina:"
+msgid "Create a Mandrakeonline Account"
+msgstr "Vytvoriť Mandrakelinux Online účet"
 
-#: ../mdkonline:178
-#: ../mdkonline:183
-#: ../mdkonline:185
-#: ../mdkonline:187
+#: ../mdkonline:158
 #, c-format
-msgid "Error"
-msgstr "Chyba"
+msgid "Confirm Password:"
+msgstr "Potvrdiť heslo:"
 
-#: ../mdkonline:183
-#: ../mdkonline_tui:152
+#: ../mdkonline:159
 #, c-format
-msgid "Please provide a login"
-msgstr "Zadajte prosím prihlasovanie meno"
+msgid "Mail contact:"
+msgstr "Mail kontakt:"
 
-#: ../mdkonline:185
-#: ../mdkonline_tui:152
+#: ../mdkonline:163
 #, c-format
 msgid ""
 "The passwords do not match\n"
@@ -453,174 +437,122 @@ msgstr ""
 "Heslá nie sú zhodné\n"
 " Skúste znova\n"
 
-#: ../mdkonline:187
-#: ../mdkonline_tui:152
+#: ../mdkonline:163
+#, c-format
+msgid "Please provide a login"
+msgstr "Zadajte prosím prihlasovanie meno"
+
+#: ../mdkonline:163
 #, c-format
 msgid "Not a valid mail address!\n"
 msgstr "Nekorektná emailová adresa!\n"
 
-#: ../mdkonline:199
-#: ../mdkonline_tui:78
+#: ../mdkonline:169
 #, c-format
-msgid "Reading configuration\n"
-msgstr "Načítavanie konfigurácie\n"
+msgid ""
+"Mandrakeonline Account successfully created.\n"
+"Please click \"Next\" to authenticate and upload your configuration\n"
+msgstr ""
+"Účet pre Mandrakeonline bol úspešne vytvorený.\n"
+"Kliknite prosím na \"Ďalej\" pre overenie a nahratie vašej konfigurácie\n"
 
-#: ../mdkonline:204
-#: ../mdkonline_tui:82
+#: ../mdkonline:178
 #, c-format
-msgid "Sending configuration..."
-msgstr "Zasielanie konfigurácie..."
+msgid "Your upload was successful!"
+msgstr "Zaslanie bolo úspešné!"
 
-#: ../mdkonline:213
-#: ../mdkonline:273
-#: ../mdkonline_tui:130
-#: ../mdkonline_tui:169
-#: ../mdkupdate:124
-#: ../mdkupdate:195
+#: ../mdkonline:178
 #, c-format
-msgid "Connection problem"
-msgstr "Problém s pripojením"
+msgid ""
+"From now you will receive on security and updates \n"
+"announcements thanks to Mandrakeonline."
+msgstr ""
+"Odteraz budete môcť získavať oznámenia o bezpečnostných\n"
+"a dunkčných aktualizáciách vďaka Mandrakeonline."
 
-#: ../mdkonline:213
-#: ../mdkonline_tui:169
+#: ../mdkonline:178
+#, c-format
+msgid ""
+"Mandrakeonline offers you the ability to automate the updates.\n"
+"A program will run regulary in your system waiting for new updates\n"
+msgstr ""
+"Mandrakeonline vám prináša možnosť ako vykonávať aktualizácie.\n"
+"Program môže bežať na vašom systéme a čakať na nové aktualizácie\n"
+
+#: ../mdkonline:180
 #, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr "Pri odosielaní súborov nastal problém, prosím skúste ešte raz"
 
-#: ../mdkonline:251
+#: ../mdkonline:186
 #, c-format
-msgid "Quitting Wizard\n"
-msgstr "Ukončovanie sprievodcu\n"
+msgid "Country"
+msgstr "Krajina"
 
-#: ../mdkonline:273
+#: ../mdkonline:198
 #, c-format
-msgid "Mandrakeonline could not be contacted, please try again at a later time"
-msgstr "Mandrakeonline nie je možné skontaktovať, prosím skúste to neskôr znova"
+msgid "Congratulations"
+msgstr "Gratulujeme"
 
-#: ../mdkonline:285
+#: ../mdkonline:198
 #, c-format
-msgid "Wrong password"
-msgstr "Nesprávne heslo"
+msgid "Your Mandrakeonline account has been successfully configured\n"
+msgstr "Váš Mandrakeonline účet bol úspešne vytvorený\n"
+
+#: ../mdkonline:214
+#, fuzzy, c-format
+msgid "Configuration uploaded successfully"
+msgstr "Zaslanie bolo úspešné!"
+
+#: ../mdkonline:215
+#, fuzzy, c-format
+msgid "Problem uploading configuration"
+msgstr "Načítavanie konfigurácie\n"
 
-#: ../mdkonline:285
-#: ../mdkonline_tui:130
+#: ../mdkonline:216
 #, c-format
 msgid ""
-"Your login or password was wrong.\n"
-" Either you'll have to type it again, or you'll need to create an account on Mandrakeonline.\n"
-" In the latter case, go back to the first step to connect to Mandrakeonline.\n"
-" Be aware that you must also provide a Machine name \n"
-" (only alphabetical characters are admitted)"
+"Cannot connect to mandrakeonline website: wrong login/password or router/"
+"firewall bad settings"
 msgstr ""
-"Vaše prihlasovacie meno alebo heslo je nesprávne.\n"
-" Predtým ako sa ich pokúsite zadať znova, mali by ste si vytvoriť účet na Mandrakeonline.\n"
-" V opačnom prípade sa vráťte na prvý krok v pripojení k Mandrakeonline.\n"
-" Buďte si vedomí toho, že je potrebné zadať meno počítača \n"
-" (akceptované sú iba abecedné znaky)"
 
-#: ../mdkonline.pm:58
+#: ../mdkonline.pm:66
 #, c-format
 msgid "Login and password should be less than 12 characters\n"
 msgstr "Prihlasovacie meno a heslo by mali mať menej ako 12 znakov\n"
 
-#: ../mdkonline.pm:59
+#: ../mdkonline.pm:67
 #, c-format
 msgid "Special characters are not allowed\n"
 msgstr "Špeciálne znaky nie sú povolené\n"
 
-#: ../mdkonline.pm:60
+#: ../mdkonline.pm:68
 #, c-format
 msgid "Please fill in all fields\n"
 msgstr "Vyplňte prosím všetky položky\n"
 
-#: ../mdkonline.pm:61
+#: ../mdkonline.pm:69
 #, c-format
 msgid "Email not valid\n"
 msgstr "Email adresa nie je platná\n"
 
-#: ../mdkonline.pm:62
+#: ../mdkonline.pm:70
 #, c-format
 msgid "Account already exist\n"
 msgstr "Účet už existuje\n"
 
-#: ../mdkonline.pm:68
+#: ../mdkonline.pm:76
 #, c-format
 msgid "Problem connecting to server \n"
 msgstr "Problém s pripojením k serveru\n"
 
-#: ../mdkonline_tui:45
-#: ../mdkonline_tui:95
-#, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
-
-#: ../mdkonline_tui:48
-#, c-format
-msgid "I already have an account"
-msgstr "Už mám vytvorený účet"
-
-#: ../mdkonline_tui:49
-#, c-format
-msgid "I want to subscribe"
-msgstr "Chcem sa zaregistrovať"
-
-#: ../mdkonline_tui:78
-#: ../mdkonline_tui:82
-#: ../mdkonline_tui:120
-#, c-format
-msgid "Please wait"
-msgstr "Prosím čakajte"
-
-#: ../mdkonline_tui:103
-#, c-format
-msgid "Account creation or authentication"
-msgstr "Vytváranie účtu a autorizácia"
-
-#: ../mdkonline_tui:120
-#, c-format
-msgid "Connecting to Mandrakeonline website..."
-msgstr "Pripájanie sa na sajt Mandrakeonline..."
-
-#: ../mdkonline_tui:130
-#, c-format
-msgid "or"
-msgstr "alebo"
-
-#: ../mdkonline_tui:130
-#, c-format
-msgid "wrong password:"
-msgstr "nesprávne heslo:"
-
-#: ../mdkonline_tui:158
-#, c-format
-msgid ""
-"Mandrakeonline Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-"Účet pre Mandrakeonline bol úspešne vytvorený.\n"
-"Kliknite prosím na \"Ďalej\" pre overenie a nahratie vašej konfigurácie\n"
-
-#: ../mdkonline_tui:175
-#, c-format
-msgid "Country"
-msgstr "Krajina"
-
-#: ../mdkonline_tui:187
-#, c-format
-msgid "Congratulations"
-msgstr "Gratulujeme"
-
-#: ../mdkonline_tui:187
-#, c-format
-msgid "Your Mandrakeonline account has been successfully configured\n"
-msgstr "Váš Mandrakeonline účet bol úspešne vytvorený\n"
-
-#: ../mdkupdate:50
+#: ../mdkupdate:52
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
 "Copyright (C) %s Mandrakesoft.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
@@ -630,43 +562,88 @@ msgstr ""
 "\n"
 "použitie:\n"
 
-#: ../mdkupdate:55
+#: ../mdkupdate:57
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - vypíše túto pomoc.\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:58
 #, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto         - Mandrakeupdate spustený automaticky.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:59
 #, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - spustiť Mandrakeupdate.\n"
 
-#: ../mdkupdate:58
-#, c-format
-msgid "  --update       - Update keys\n"
-msgstr "  --update       - Obnoviť kľúče\n"
-
-#: ../mdkupdate:66
+#: ../mdkupdate:67
 #, c-format
 msgid "No %s file found. Run mdkonline wizard first"
 msgstr "Neboj nájdený súbor %s. Spustie najprv mdkonline sprievodcu"
 
-#: ../mdkupdate:124
+#: ../mdkupdate:126
 #, c-format
 msgid "Mandrakeupdate could not contact the site, we will try again."
 msgstr "Mandrakeupdate sa nedokáže pripojiť, prosím skúste to neskôr znova."
 
-#: ../mdkupdate:173
+#: ../mdkupdate:176
 #, c-format
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr "Nie je možné aktualizovať balíky z média mdkupdate.\n"
 
-#: ../mdkupdate:195
+#: ../mdkupdate:198
 #, c-format
-msgid "Mandrakeupdate could not upload the diff files. Send a mail to support [at] mandrakeonline [dot] net"
-msgstr "Mandrakeupdate nemohol nahrať diff súbory. Pošlite mail na support [at] mandrakeonline [dot] net"
+msgid ""
+"Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
+"mandrakeonline [dot] net"
+msgstr ""
+"Mandrakeupdate nemohol nahrať diff súbory. Pošlite mail na support [at] "
+"mandrakeonline [dot] net"
+
+#~ msgid "Next"
+#~ msgstr "Ďalšia"
+
+#~ msgid "Cancel"
+#~ msgstr "Zrušiť"
+
+#~ msgid "Previous"
+#~ msgstr "Späť"
+
+#~ msgid "I don't have a Mandrakeonline account and I want to subscribe"
+#~ msgstr "Nemám účet na Mandrakeonline, ale chcel by som sa zaregistrovať"
+
+#~ msgid "Mandrakelinux Privacy Policy"
+#~ msgstr "Bezpečnostná politika Mandrakelinux"
+
+#~ msgid "Authentification"
+#~ msgstr "Authentikácia"
+
+#~ msgid "Send Configuration"
+#~ msgstr "Odoslať konfiguráciu"
+
+#~ msgid "Finish"
+#~ msgstr "Dokončiť"
+
+#~ msgid "automated Upgrades"
+#~ msgstr "automatické aktualizácie"
+
+#~ msgid "Country:"
+#~ msgstr "Krajina:"
+
+#~ msgid "Error"
+#~ msgstr "Chyba"
+
+#~ msgid "Quitting Wizard\n"
+#~ msgstr "Ukončovanie sprievodcu\n"
+
+#~ msgid ""
+#~ "Mandrakeonline could not be contacted, please try again at a later time"
+#~ msgstr ""
+#~ "Mandrakeonline nie je možné skontaktovať, prosím skúste to neskôr znova"
+
+#~ msgid "Wrong password"
+#~ msgstr "Nesprávne heslo"
 
+#~ msgid "  --update       - Update keys\n"
+#~ msgstr "  --update       - Obnoviť kľúče\n"
diff --git a/po/sl.po b/po/sl.po
index 62f80570..212d96ad 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-sl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-01 22:41+0200\n"
+"POT-Creation-Date: 2004-11-03 12:10+0100\n"
 "PO-Revision-Date: 2004-08-26 10:02+0200\n"
 "Last-Translator: Gregor Pirnaver <gregor.pirnaver@mandrakeprinas.org>\n"
 "Language-Team: Slovenščina <lugos-slo@lugos.si>\n"
@@ -19,12 +19,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3.1\n"
 
-#: ../mdkapplet:61
+#: ../mdkapplet:63
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Vaš sistem je obnovljen"
 
-#: ../mdkapplet:67
+#: ../mdkapplet:69
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -33,189 +33,199 @@ msgstr ""
 "Težava z nastavitvijo storitve. Prosim preverite dnevnike (loge) in pošljite "
 "pošto na support@mandrakeonline.net"
 
-#: ../mdkapplet:73
+#: ../mdkapplet:75
 #, c-format
 msgid "System is busy. Please wait ..."
 msgstr "Sistem je zaposlen. Počakajte ..."
 
-#: ../mdkapplet:79
+#: ../mdkapplet:81
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Za vaš sistem so na voljo novi popravki"
 
-#: ../mdkapplet:85
+#: ../mdkapplet:87
 #, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr "Storitev ni na nastavljena. Prosim kliknite na \"Nastavi storitev\""
 
-#: ../mdkapplet:91
+#: ../mdkapplet:93
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Omrežje je nepovezano. Prosim nastavite vaše omrežje"
 
-#: ../mdkapplet:97
+#: ../mdkapplet:99
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 "Storitev ni aktivirana. Prosim kliknite na \"Internetna spletna stran\""
 
-#: ../mdkapplet:103
+#: ../mdkapplet:105
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:108 ../mdkapplet:158
+#: ../mdkapplet:110 ../mdkapplet:164
 #, c-format
 msgid "Install updates"
 msgstr "Namesti popravke"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:111
 #, c-format
 msgid "Configure the service"
 msgstr "Nastavi storitev"
 
-#: ../mdkapplet:110
+#: ../mdkapplet:112
 #, c-format
 msgid "Check Updates"
 msgstr "Preglej popravke"
 
-#: ../mdkapplet:111
+#: ../mdkapplet:113 ../mdkapplet:167 ../mdkapplet:225
+#, fuzzy, c-format
+msgid "Please Wait"
+msgstr "Prosim, počakajte!"
+
+#: ../mdkapplet:113 ../mdkapplet:166 ../mdkapplet:167 ../mdkapplet:225
+#, c-format
+msgid "Check updates"
+msgstr "Preglej popravke"
+
+#: ../mdkapplet:115
 #, c-format
 msgid "Online WebSite"
 msgstr "Spletna stran na internetu"
 
-#: ../mdkapplet:112
+#: ../mdkapplet:116
 #, c-format
 msgid "Configure Network"
 msgstr "Nastavljanje omrežja"
 
-#: ../mdkapplet:113
+#: ../mdkapplet:117
 #, c-format
 msgid "Configure Now!"
 msgstr "Nastavi Zdaj!"
 
-#: ../mdkapplet:146
+#: ../mdkapplet:152 ../mdkapplet:229
 #, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Vstavek Mandrakelinux za popravke"
 
-#: ../mdkapplet:156
+#: ../mdkapplet:162
 #, c-format
 msgid "Actions"
 msgstr "Dejanja"
 
-#: ../mdkapplet:159
+#: ../mdkapplet:165
 #, c-format
 msgid "Configure"
 msgstr "Nastavi"
 
-#: ../mdkapplet:160
-#, c-format
-msgid "Check updates"
-msgstr "Preglej popravke"
-
-#: ../mdkapplet:161
+#: ../mdkapplet:169
 #, c-format
 msgid "See logs"
 msgstr "Poglej dnevnike"
 
-#: ../mdkapplet:164
+#: ../mdkapplet:172
 #, c-format
 msgid "Status"
 msgstr "Stanje"
 
-#: ../mdkapplet:168 ../mdkapplet:363
+#: ../mdkapplet:176 ../mdkapplet:375
 #, c-format
 msgid "Close"
 msgstr "Zapri"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Network Connection: "
 msgstr "Omrežne povezava: "
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Up"
 msgstr "Povezana"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Down"
 msgstr "Nepovezana"
 
-#: ../mdkapplet:204
+#: ../mdkapplet:212
 #, c-format
 msgid "Last check: "
 msgstr "Zadnji pregled: "
 
-#: ../mdkapplet:205
+#: ../mdkapplet:213
 #, c-format
 msgid "Updates: "
 msgstr "Popravki: "
 
-#: ../mdkapplet:209
+#: ../mdkapplet:217
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Drakconnect se zaganja\n"
 
-#: ../mdkapplet:213
+#: ../mdkapplet:221
 #, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "Mandrakeupdate --applet se zaganja\n"
 
-#: ../mdkapplet:217
+#: ../mdkapplet:224
 #, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 "Izgleda, da je Mandrakeonline na novo nameščen, ponovno nalagam vstavek ..."
 
-#: ../mdkapplet:225
+#: ../mdkapplet:235
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Procesiranje novih popravkov ...\n"
 
-#: ../mdkapplet:227
+#: ../mdkapplet:237
 #, c-format
 msgid "Connecting to"
 msgstr "Povezovanje na"
 
-#: ../mdkapplet:250
+#: ../mdkapplet:244
+#, fuzzy, c-format
+msgid "Response from Mandrakeonline server\n"
+msgstr "POzdravljeni v Mandrakeonline"
+
+#: ../mdkapplet:262
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Preverjanje ... Popravki so na voljo\n"
 
-#: ../mdkapplet:254
+#: ../mdkapplet:267
 #, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
-#: ../mdkapplet:255
+#: ../mdkapplet:268
 #, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
-#: ../mdkapplet:256
+#: ../mdkapplet:269
 #, c-format
 msgid "Unknown state"
 msgstr "Neznano stanje"
 
-#: ../mdkapplet:257
+#: ../mdkapplet:270
 #, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr "Storitve na zvezi so onemogočene. Preverite stran Mandrakeonline\n"
 
-#: ../mdkapplet:258
+#: ../mdkapplet:271
 #, c-format
 msgid "Wrong Password.\n"
 msgstr "Napačno geslo.\n"
 
-#: ../mdkapplet:259
+#: ../mdkapplet:272
 #, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr "Napačno dejanje oz. gostitelj ali prijava.\n"
 
-#: ../mdkapplet:260
+#: ../mdkapplet:273
 #, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
@@ -224,72 +234,82 @@ msgstr ""
 "Nekaj je narobe z vašimi omrežnimi nastavitvami (preverite usmerjanje, "
 "požarni zid ali nastavitve proksija)\n"
 
-#: ../mdkapplet:264
+#: ../mdkapplet:277
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Sistem je obnovljen\n"
 
-#: ../mdkapplet:303
+#: ../mdkapplet:317
 #, c-format
 msgid "No check"
 msgstr "Brez pregleda"
 
-#: ../mdkapplet:316
+#: ../mdkapplet:330
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Preverjam omrežje: izgleda onemogočeno\n"
 
-#: ../mdkapplet:319
+#: ../mdkapplet:333
 #, c-format
 msgid "Checking config file: Not present\n"
 msgstr "Preverjam nastavitveno datotkeko: Ne obstaja\n"
 
-#: ../mdkapplet:353
+#: ../mdkapplet:365
 #, c-format
 msgid "Logs"
 msgstr "Dnevniki"
 
-#: ../mdkapplet:369
+#: ../mdkapplet:381
 #, c-format
 msgid "Clear"
 msgstr "Briši"
 
-#: ../mdkapplet:396
+#: ../mdkapplet:408
 #, c-format
 msgid "About..."
 msgstr "O ..."
 
-#: ../mdkapplet:397
+#: ../mdkapplet:409
 #, c-format
 msgid "Always launch on startup"
 msgstr "Vedno zaženi ob zagonu"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:411
 #, c-format
 msgid "Quit"
 msgstr "Izhod"
 
-#: ../mdkonline:89
+#: ../mdkonline:52 ../mdkonline:106
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "POzdravljeni v Mandrakeonline"
+
+#: ../mdkonline:55
 #, c-format
-msgid "Next"
-msgstr "Naslednja"
+msgid "I already have an account"
+msgstr ""
 
-#: ../mdkonline:89
+#: ../mdkonline:56
 #, c-format
-msgid "Cancel"
-msgstr "Prekliči"
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline:89 ../mdkonline:93 ../mdkonline:131
+#, c-format
+msgid "Please wait"
+msgstr "Prosim, počakajte!"
 
 #: ../mdkonline:89
 #, c-format
-msgid "Previous"
-msgstr "Nazaj"
+msgid "Reading configuration\n"
+msgstr "Berem nastavitve\n"
 
-#: ../mdkonline:103
+#: ../mdkonline:93
 #, c-format
-msgid "Welcome to Mandrakeonline"
-msgstr "POzdravljeni v Mandrakeonline"
+msgid "Sending configuration..."
+msgstr "Pošiljanje nastavitev ..."
 
-#: ../mdkonline:104 ../mdkonline_tui:98
+#: ../mdkonline:109
 #, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
@@ -300,63 +320,38 @@ msgstr ""
 "(paketov, sestava strojne opreme) v centralno bazo, tako da boste\n"
 "obveščeni o varnostnih in drugih uporabnih nadgradnjah.\n"
 
-#: ../mdkonline:105 ../mdkonline_tui:142
+#: ../mdkonline:114
 #, c-format
-msgid "Create a Mandrakeonline Account"
-msgstr "Ustvari račun Mandrakeonline"
+msgid "Account creation or authentication"
+msgstr ""
 
-#: ../mdkonline:107
-#, fuzzy, c-format
-msgid "I don't have a Mandrakeonline account and I want to subscribe"
-msgstr "Računa Mandrakeonline še nimam in se želim "
+#: ../mdkonline:119
+#, c-format
+msgid "Enter your Mandrakeonline login, password and machine name:"
+msgstr ""
+"Vnesite vaše Mandrakeonline uporabniško ime in geslo ter ime računalnika:"
 
-#: ../mdkonline:111 ../mdkonline:131 ../mdkonline_tui:114 ../mdkonline_tui:145
+#: ../mdkonline:125 ../mdkonline:156
 #, c-format
 msgid "Login:"
 msgstr "Uporabniško ime:"
 
-#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:115 ../mdkonline_tui:146
+#: ../mdkonline:126 ../mdkonline:157
 #, c-format
 msgid "Password:"
 msgstr "Geslo:"
 
-#: ../mdkonline:113 ../mdkonline_tui:147
-#, c-format
-msgid "Confirm Password:"
-msgstr "Potrdi geslo:"
-
-#: ../mdkonline:114 ../mdkonline_tui:148
-#, c-format
-msgid "Mail contact:"
-msgstr "Poštni kontakt:"
-
-#: ../mdkonline:121
-#, c-format
-msgid "Mandrakelinux Privacy Policy"
-msgstr "Mandrakelinux pravilo zasebosti"
-
 #: ../mdkonline:127
 #, c-format
-msgid "Authentification"
-msgstr "Prijava v sistem"
-
-#: ../mdkonline:128 ../mdkonline_tui:108
-#, c-format
-msgid "Enter your Mandrakeonline login, password and machine name:"
-msgstr ""
-"Vnesite vaše Mandrakeonline uporabniško ime in geslo ter ime računalnika:"
-
-#: ../mdkonline:133 ../mdkonline_tui:116
-#, c-format
 msgid "Machine name:"
 msgstr "Ime računalnika:"
 
-#: ../mdkonline:138
-#, c-format
-msgid "Send Configuration"
-msgstr "Pošlji nastavitve"
+#: ../mdkonline:131
+#, fuzzy, c-format
+msgid "Connecting to Mandrakeonline website..."
+msgstr "POzdravljeni v Mandrakeonline"
 
-#: ../mdkonline:139 ../mdkonline_tui:128
+#: ../mdkonline:139
 #, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
@@ -389,55 +384,56 @@ msgstr ""
 "Poleg tega boste imeli popust pri plačevanju podpornih storitev na\n"
 "www.mandrakeexpert.com."
 
-#: ../mdkonline:144 ../mdkonline:211 ../mdkonline:234
-#, c-format
-msgid "Finish"
-msgstr "Končaj"
-
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141 ../mdkonline:180 ../mdkupdate:126 ../mdkupdate:198
 #, c-format
-msgid "Your upload was successful!"
-msgstr "Pošiljanje je bilo uspešno!"
+msgid "Connection problem"
+msgstr "Problemi pri povezavi"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandrakeonline."
+msgid "or"
 msgstr ""
-"Od zdaj naprej boš prejemal varnostna\n"
-"in druga obvestila o nadgrajevanju zahvaljujoč Mandrakeonline."
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "Napačno geslo"
+
+#: ../mdkonline:141
 #, c-format
 msgid ""
-"Mandrakeonline offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+"Your login or password was wrong.\n"
+" Either you'll have to type it again, or you'll need to create an account on "
+"Mandrakeonline.\n"
+" In the latter case, go back to the first step to connect to "
+"Mandrakeonline.\n"
+" Be aware that you must also provide a Machine name \n"
+" (only alphabetical characters are admitted)"
 msgstr ""
-"Mandrakeonline ti omogoča, da avtomatiziraš nadgradnje.\n"
-"Program bo tekel redno v vašem sistemu čakajoč na nove nadgradnje\n"
-
-#: ../mdkonline:146
-#, c-format
-msgid "automated Upgrades"
-msgstr "avtomatiziranje Nadgradnje"
+"Uporabniško ime ali geslo je bilo napačno.\n"
+" Poskusite oboje vtipkati ponovno ali pa ustvarite nov račun "
+"Mandrakeonline.\n"
+" Če želite slednje, pojdite nazaj na prvi korak za povezavo z "
+"Mandrakeonline.\n"
+" Zavedajte se, da morate vnesti tudi ime računalnika\n"
+" (samo črke so sprejete)"
 
-#: ../mdkonline:150
+#: ../mdkonline:153
 #, c-format
-msgid "Country:"
-msgstr "Država:"
+msgid "Create a Mandrakeonline Account"
+msgstr "Ustvari račun Mandrakeonline"
 
-#: ../mdkonline:178 ../mdkonline:183 ../mdkonline:185 ../mdkonline:187
+#: ../mdkonline:158
 #, c-format
-msgid "Error"
-msgstr "Napaka"
+msgid "Confirm Password:"
+msgstr "Potrdi geslo:"
 
-#: ../mdkonline:183 ../mdkonline_tui:152
+#: ../mdkonline:159
 #, c-format
-msgid "Please provide a login"
-msgstr "Prosim vpišite uporabniško ime"
+msgid "Mail contact:"
+msgstr "Poštni kontakt:"
 
-#: ../mdkonline:185 ../mdkonline_tui:152
+#: ../mdkonline:163
 #, c-format
 msgid ""
 "The passwords do not match\n"
@@ -446,160 +442,114 @@ msgstr ""
 "Gesli se ne ujemata\n"
 " Prosim, poskusite znova\n"
 
-#: ../mdkonline:187 ../mdkonline_tui:152
+#: ../mdkonline:163
+#, c-format
+msgid "Please provide a login"
+msgstr "Prosim vpišite uporabniško ime"
+
+#: ../mdkonline:163
 #, c-format
 msgid "Not a valid mail address!\n"
 msgstr "Neveljaven poštni naslov!\n"
 
-#: ../mdkonline:199 ../mdkonline_tui:78
+#: ../mdkonline:169
 #, c-format
-msgid "Reading configuration\n"
-msgstr "Berem nastavitve\n"
+msgid ""
+"Mandrakeonline Account successfully created.\n"
+"Please click \"Next\" to authenticate and upload your configuration\n"
+msgstr ""
 
-#: ../mdkonline:204 ../mdkonline_tui:82
+#: ../mdkonline:178
 #, c-format
-msgid "Sending configuration..."
-msgstr "Pošiljanje nastavitev ..."
+msgid "Your upload was successful!"
+msgstr "Pošiljanje je bilo uspešno!"
 
-#: ../mdkonline:213 ../mdkonline:273 ../mdkonline_tui:130 ../mdkonline_tui:169
-#: ../mdkupdate:124 ../mdkupdate:195
+#: ../mdkonline:178
 #, c-format
-msgid "Connection problem"
-msgstr "Problemi pri povezavi"
+msgid ""
+"From now you will receive on security and updates \n"
+"announcements thanks to Mandrakeonline."
+msgstr ""
+"Od zdaj naprej boš prejemal varnostna\n"
+"in druga obvestila o nadgrajevanju zahvaljujoč Mandrakeonline."
+
+#: ../mdkonline:178
+#, c-format
+msgid ""
+"Mandrakeonline offers you the ability to automate the updates.\n"
+"A program will run regulary in your system waiting for new updates\n"
+msgstr ""
+"Mandrakeonline ti omogoča, da avtomatiziraš nadgradnje.\n"
+"Program bo tekel redno v vašem sistemu čakajoč na nove nadgradnje\n"
 
-#: ../mdkonline:213 ../mdkonline_tui:169
+#: ../mdkonline:180
 #, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr "Težava ob prenosu datotek na strežnik, prosim poskusite znova"
 
-#: ../mdkonline:251
-#, c-format
-msgid "Quitting Wizard\n"
-msgstr "Zapuščam čarovnika\n"
+#: ../mdkonline:186
+#, fuzzy, c-format
+msgid "Country"
+msgstr "Država:"
+
+#: ../mdkonline:198
+#, fuzzy, c-format
+msgid "Congratulations"
+msgstr "Pošlji nastavitve"
 
-#: ../mdkonline:273
+#: ../mdkonline:198
 #, c-format
-msgid "Mandrakeonline could not be contacted, please try again at a later time"
+msgid "Your Mandrakeonline account has been successfully configured\n"
 msgstr ""
-"Povezovanje z Mandrakeonline je bilo neuspešno, prosim poskusite kasneje"
 
-#: ../mdkonline:285
-#, c-format
-msgid "Wrong password"
-msgstr "Napačno geslo"
+#: ../mdkonline:214
+#, fuzzy, c-format
+msgid "Configuration uploaded successfully"
+msgstr "Pošiljanje je bilo uspešno!"
+
+#: ../mdkonline:215
+#, fuzzy, c-format
+msgid "Problem uploading configuration"
+msgstr "Berem nastavitve\n"
 
-#: ../mdkonline:285 ../mdkonline_tui:130
+#: ../mdkonline:216
 #, c-format
 msgid ""
-"Your login or password was wrong.\n"
-" Either you'll have to type it again, or you'll need to create an account on "
-"Mandrakeonline.\n"
-" In the latter case, go back to the first step to connect to "
-"Mandrakeonline.\n"
-" Be aware that you must also provide a Machine name \n"
-" (only alphabetical characters are admitted)"
+"Cannot connect to mandrakeonline website: wrong login/password or router/"
+"firewall bad settings"
 msgstr ""
-"Uporabniško ime ali geslo je bilo napačno.\n"
-" Poskusite oboje vtipkati ponovno ali pa ustvarite nov račun "
-"Mandrakeonline.\n"
-" Če želite slednje, pojdite nazaj na prvi korak za povezavo z "
-"Mandrakeonline.\n"
-" Zavedajte se, da morate vnesti tudi ime računalnika\n"
-" (samo črke so sprejete)"
 
-#: ../mdkonline.pm:58
+#: ../mdkonline.pm:66
 #, c-format
 msgid "Login and password should be less than 12 characters\n"
 msgstr ""
 
-#: ../mdkonline.pm:59
+#: ../mdkonline.pm:67
 #, c-format
 msgid "Special characters are not allowed\n"
 msgstr ""
 
-#: ../mdkonline.pm:60
+#: ../mdkonline.pm:68
 #, c-format
 msgid "Please fill in all fields\n"
 msgstr ""
 
-#: ../mdkonline.pm:61
+#: ../mdkonline.pm:69
 #, c-format
 msgid "Email not valid\n"
 msgstr ""
 
-#: ../mdkonline.pm:62
+#: ../mdkonline.pm:70
 #, c-format
 msgid "Account already exist\n"
 msgstr ""
 
-#: ../mdkonline.pm:68
+#: ../mdkonline.pm:76
 #, c-format
 msgid "Problem connecting to server \n"
 msgstr "Težava pri povezovanju s strežnikom \n"
 
-#: ../mdkonline_tui:45 ../mdkonline_tui:95
-#, fuzzy, c-format
-msgid "Mandrakeonline"
-msgstr "POzdravljeni v Mandrakeonline"
-
-#: ../mdkonline_tui:48
-#, c-format
-msgid "I already have an account"
-msgstr ""
-
-#: ../mdkonline_tui:49
-#, c-format
-msgid "I want to subscribe"
-msgstr ""
-
-#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:120
-#, c-format
-msgid "Please wait"
-msgstr "Prosim, počakajte!"
-
-#: ../mdkonline_tui:103
-#, c-format
-msgid "Account creation or authentication"
-msgstr ""
-
-#: ../mdkonline_tui:120
-#, fuzzy, c-format
-msgid "Connecting to Mandrakeonline website..."
-msgstr "POzdravljeni v Mandrakeonline"
-
-#: ../mdkonline_tui:130
-#, c-format
-msgid "or"
-msgstr ""
-
-#: ../mdkonline_tui:130
-#, fuzzy, c-format
-msgid "wrong password:"
-msgstr "Napačno geslo"
-
-#: ../mdkonline_tui:158
-#, c-format
-msgid ""
-"Mandrakeonline Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-
-#: ../mdkonline_tui:175
-#, fuzzy, c-format
-msgid "Country"
-msgstr "Država:"
-
-#: ../mdkonline_tui:187
-#, fuzzy, c-format
-msgid "Congratulations"
-msgstr "Pošlji nastavitve"
-
-#: ../mdkonline_tui:187
-#, c-format
-msgid "Your Mandrakeonline account has been successfully configured\n"
-msgstr ""
-
-#: ../mdkupdate:50
+#: ../mdkupdate:52
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
@@ -616,49 +566,92 @@ msgstr ""
 "\n"
 "usage:\n"
 
-#: ../mdkupdate:55
+#: ../mdkupdate:57
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - izpiši to pomoč.\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:58
 #, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto         - Mandrakeupdate se zažene samodejno.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:59
 #, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - poženi Mandrakeupdate.\n"
 
-#: ../mdkupdate:58
-#, c-format
-msgid "  --update       - Update keys\n"
-msgstr "  --applet       - Obnovi ključe\n"
-
-#: ../mdkupdate:66
+#: ../mdkupdate:67
 #, c-format
 msgid "No %s file found. Run mdkonline wizard first"
 msgstr ""
 
-#: ../mdkupdate:124
+#: ../mdkupdate:126
 #, fuzzy, c-format
 msgid "Mandrakeupdate could not contact the site, we will try again."
 msgstr ""
 "Povezovanje z Mandrakeonline je bilo neuspešno, prosim poskusite kasneje"
 
-#: ../mdkupdate:173
+#: ../mdkupdate:176
 #, c-format
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr ""
 
-#: ../mdkupdate:195
+#: ../mdkupdate:198
 #, c-format
 msgid ""
 "Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
 "mandrakeonline [dot] net"
 msgstr ""
 
+#~ msgid "Next"
+#~ msgstr "Naslednja"
+
+#~ msgid "Cancel"
+#~ msgstr "Prekliči"
+
+#~ msgid "Previous"
+#~ msgstr "Nazaj"
+
+#, fuzzy
+#~ msgid "I don't have a Mandrakeonline account and I want to subscribe"
+#~ msgstr "Računa Mandrakeonline še nimam in se želim "
+
+#~ msgid "Mandrakelinux Privacy Policy"
+#~ msgstr "Mandrakelinux pravilo zasebosti"
+
+#~ msgid "Authentification"
+#~ msgstr "Prijava v sistem"
+
+#~ msgid "Send Configuration"
+#~ msgstr "Pošlji nastavitve"
+
+#~ msgid "Finish"
+#~ msgstr "Končaj"
+
+#~ msgid "automated Upgrades"
+#~ msgstr "avtomatiziranje Nadgradnje"
+
+#~ msgid "Country:"
+#~ msgstr "Država:"
+
+#~ msgid "Error"
+#~ msgstr "Napaka"
+
+#~ msgid "Quitting Wizard\n"
+#~ msgstr "Zapuščam čarovnika\n"
+
+#~ msgid ""
+#~ "Mandrakeonline could not be contacted, please try again at a later time"
+#~ msgstr ""
+#~ "Povezovanje z Mandrakeonline je bilo neuspešno, prosim poskusite kasneje"
+
+#~ msgid "Wrong password"
+#~ msgstr "Napačno geslo"
+
+#~ msgid "  --update       - Update keys\n"
+#~ msgstr "  --applet       - Obnovi ključe\n"
+
 #~ msgid "Skip Wizard"
 #~ msgstr "Spusti čarovnika"
 
diff --git a/po/sq.po b/po/sq.po
index f5d719f4..52dc2684 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline 0.15 \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-01 22:41+0200\n"
+"POT-Creation-Date: 2004-11-03 12:10+0100\n"
 "PO-Revision-Date: 2002-09-24 15:30+0100\n"
 "Last-Translator: Naim Daka <naim70@freesurf.ch>\n"
 "Language-Team: Albanian <LL@li.org>\n"
@@ -15,24 +15,24 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: ../mdkapplet:61
+#: ../mdkapplet:63
 #, c-format
 msgid "Your system is up-to-date"
 msgstr ""
 
-#: ../mdkapplet:67
+#: ../mdkapplet:69
 #, fuzzy, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrakeonline.net"
 msgstr "Për çdo problem na dërgoni një e-mail në suppport@mandrakeonline.net\n"
 
-#: ../mdkapplet:73
+#: ../mdkapplet:75
 #, c-format
 msgid "System is busy. Please wait ..."
 msgstr ""
 
-#: ../mdkapplet:79
+#: ../mdkapplet:81
 #, fuzzy, c-format
 msgid "New updates are available for your system"
 msgstr ""
@@ -41,249 +41,269 @@ msgstr ""
 "%s\n"
 "janë lidhur direkt në sistemin tuaj.\n"
 
-#: ../mdkapplet:85
+#: ../mdkapplet:87
 #, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr ""
 
-#: ../mdkapplet:91
+#: ../mdkapplet:93
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr ""
 
-#: ../mdkapplet:97
+#: ../mdkapplet:99
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 
-#: ../mdkapplet:103
+#: ../mdkapplet:105
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:108 ../mdkapplet:158
+#: ../mdkapplet:110 ../mdkapplet:164
 #, c-format
 msgid "Install updates"
 msgstr "Instaloi azhurnimet"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:111
 #, fuzzy, c-format
 msgid "Configure the service"
 msgstr "Konfiguro"
 
-#: ../mdkapplet:110
+#: ../mdkapplet:112
 #, fuzzy, c-format
 msgid "Check Updates"
 msgstr "Azhurnimi"
 
-#: ../mdkapplet:111
+#: ../mdkapplet:113 ../mdkapplet:167 ../mdkapplet:225
+#, fuzzy, c-format
+msgid "Please Wait"
+msgstr "Një moment ju lutemi"
+
+#: ../mdkapplet:113 ../mdkapplet:166 ../mdkapplet:167 ../mdkapplet:225
+#, fuzzy, c-format
+msgid "Check updates"
+msgstr "Azhurnimet e sigurisë"
+
+#: ../mdkapplet:115
 #, c-format
 msgid "Online WebSite"
 msgstr ""
 
-#: ../mdkapplet:112
+#: ../mdkapplet:116
 #, fuzzy, c-format
 msgid "Configure Network"
 msgstr "Konfigurim i rrjetin"
 
-#: ../mdkapplet:113
+#: ../mdkapplet:117
 #, fuzzy, c-format
 msgid "Configure Now!"
 msgstr "Lexim i konfiguracionit\n"
 
-#: ../mdkapplet:146
+#: ../mdkapplet:152 ../mdkapplet:229
 #, fuzzy, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Mandrakelinux dhe jeta e juaj private"
 
-#: ../mdkapplet:156
+#: ../mdkapplet:162
 #, c-format
 msgid "Actions"
 msgstr "Akcionet"
 
-#: ../mdkapplet:159
+#: ../mdkapplet:165
 #, c-format
 msgid "Configure"
 msgstr "Konfiguro"
 
-#: ../mdkapplet:160
-#, fuzzy, c-format
-msgid "Check updates"
-msgstr "Azhurnimet e sigurisë"
-
-#: ../mdkapplet:161
+#: ../mdkapplet:169
 #, fuzzy, c-format
 msgid "See logs"
 msgstr "Kërkim +5s"
 
-#: ../mdkapplet:164
+#: ../mdkapplet:172
 #, c-format
 msgid "Status"
 msgstr "Statusi"
 
-#: ../mdkapplet:168 ../mdkapplet:363
+#: ../mdkapplet:176 ../mdkapplet:375
 #, c-format
 msgid "Close"
 msgstr "Mbylle"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, fuzzy, c-format
 msgid "Network Connection: "
 msgstr "Lidhje Virtuale në Rrjet"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Up"
 msgstr "Lartë"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Down"
 msgstr "Poshtë"
 
-#: ../mdkapplet:204
+#: ../mdkapplet:212
 #, c-format
 msgid "Last check: "
 msgstr ""
 
-#: ../mdkapplet:205
+#: ../mdkapplet:213
 #, fuzzy, c-format
 msgid "Updates: "
 msgstr "Azhurnimi"
 
-#: ../mdkapplet:209
+#: ../mdkapplet:217
 #, fuzzy, c-format
 msgid "Launching drakconnect\n"
 msgstr "Nise userdrake"
 
-#: ../mdkapplet:213
+#: ../mdkapplet:221
 #, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr ""
 
-#: ../mdkapplet:217
+#: ../mdkapplet:224
 #, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 
-#: ../mdkapplet:225
+#: ../mdkapplet:235
 #, fuzzy, c-format
 msgid "Computing new updates...\n"
 msgstr "Lidhje e ballafaquar"
 
-#: ../mdkapplet:227
+#: ../mdkapplet:237
 #, fuzzy, c-format
 msgid "Connecting to"
 msgstr "Lidhje e ballafaquar"
 
-#: ../mdkapplet:250
+#: ../mdkapplet:244
+#, fuzzy, c-format
+msgid "Response from Mandrakeonline server\n"
+msgstr "Mirë se Vini në Mandrakeonline"
+
+#: ../mdkapplet:262
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr ""
 
-#: ../mdkapplet:254
+#: ../mdkapplet:267
 #, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
-#: ../mdkapplet:255
+#: ../mdkapplet:268
 #, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
-#: ../mdkapplet:256
+#: ../mdkapplet:269
 #, fuzzy, c-format
 msgid "Unknown state"
 msgstr "Ftues i pa njoftur"
 
-#: ../mdkapplet:257
+#: ../mdkapplet:270
 #, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr ""
 
-#: ../mdkapplet:258
+#: ../mdkapplet:271
 #, c-format
 msgid "Wrong Password.\n"
 msgstr "Parulla e gabuar.\n"
 
-#: ../mdkapplet:259
+#: ../mdkapplet:272
 #, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr ""
 
-#: ../mdkapplet:260
+#: ../mdkapplet:273
 #, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
 msgstr ""
 
-#: ../mdkapplet:264
+#: ../mdkapplet:277
 #, fuzzy, c-format
 msgid "System is up-to-date\n"
 msgstr "Modë i sistemit"
 
-#: ../mdkapplet:303
+#: ../mdkapplet:317
 #, c-format
 msgid "No check"
 msgstr ""
 
-#: ../mdkapplet:316
+#: ../mdkapplet:330
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
-#: ../mdkapplet:319
+#: ../mdkapplet:333
 #, c-format
 msgid "Checking config file: Not present\n"
 msgstr ""
 
-#: ../mdkapplet:353
+#: ../mdkapplet:365
 #, c-format
 msgid "Logs"
 msgstr "Të përditëshmet"
 
-#: ../mdkapplet:369
+#: ../mdkapplet:381
 #, fuzzy, c-format
 msgid "Clear"
 msgstr "Kalendari"
 
-#: ../mdkapplet:396
+#: ../mdkapplet:408
 #, c-format
 msgid "About..."
 msgstr "Në lidhje me..."
 
-#: ../mdkapplet:397
+#: ../mdkapplet:409
 #, c-format
 msgid "Always launch on startup"
 msgstr ""
 
-#: ../mdkapplet:399
+#: ../mdkapplet:411
 #, c-format
 msgid "Quit"
 msgstr "Dalje"
 
-#: ../mdkonline:89
+#: ../mdkonline:52 ../mdkonline:106
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "Mirë se Vini në Mandrakeonline"
+
+#: ../mdkonline:55
 #, c-format
-msgid "Next"
-msgstr "Tjetër"
+msgid "I already have an account"
+msgstr ""
 
-#: ../mdkonline:89
+#: ../mdkonline:56
 #, c-format
-msgid "Cancel"
-msgstr "Anulo"
+msgid "I want to subscribe"
+msgstr ""
 
-#: ../mdkonline:89
+#: ../mdkonline:89 ../mdkonline:93 ../mdkonline:131
 #, c-format
-msgid "Previous"
-msgstr "Mbrapa"
+msgid "Please wait"
+msgstr "Një moment ju lutemi"
 
-#: ../mdkonline:103
+#: ../mdkonline:89
 #, c-format
-msgid "Welcome to Mandrakeonline"
-msgstr "Mirë se Vini në Mandrakeonline"
+msgid "Reading configuration\n"
+msgstr "Lexim i konfiguracionit\n"
+
+#: ../mdkonline:93
+#, fuzzy, c-format
+msgid "Sending configuration..."
+msgstr "Lexim i konfiguracionit\n"
 
-#: ../mdkonline:104 ../mdkonline_tui:98
+#: ../mdkonline:109
 #, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
@@ -295,62 +315,37 @@ msgstr ""
 "qendrore\n"
 "që në fund të ju informon për azhurnimin e sigurisë.\n"
 
-#: ../mdkonline:105 ../mdkonline_tui:142
-#, fuzzy, c-format
-msgid "Create a Mandrakeonline Account"
-msgstr "Kontoja e Klubit Mandrake"
+#: ../mdkonline:114
+#, c-format
+msgid "Account creation or authentication"
+msgstr ""
 
-#: ../mdkonline:107
-#, fuzzy, c-format
-msgid "I don't have a Mandrakeonline account and I want to subscribe"
-msgstr "Nuk e posedon llogarin Mandrakeonline dhe dëshiroj të "
+#: ../mdkonline:119
+#, c-format
+msgid "Enter your Mandrakeonline login, password and machine name:"
+msgstr "Hyni loginin, parullën dhe emrin e makinës suaj në Mandrakeonline:"
 
-#: ../mdkonline:111 ../mdkonline:131 ../mdkonline_tui:114 ../mdkonline_tui:145
+#: ../mdkonline:125 ../mdkonline:156
 #, c-format
 msgid "Login:"
 msgstr "Login:"
 
-#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:115 ../mdkonline_tui:146
+#: ../mdkonline:126 ../mdkonline:157
 #, c-format
 msgid "Password:"
 msgstr "Parulla:"
 
-#: ../mdkonline:113 ../mdkonline_tui:147
-#, c-format
-msgid "Confirm Password:"
-msgstr "Konfirmoje Parullën:"
-
-#: ../mdkonline:114 ../mdkonline_tui:148
-#, fuzzy, c-format
-msgid "Mail contact:"
-msgstr "Kontakt Mail:"
-
-#: ../mdkonline:121
-#, c-format
-msgid "Mandrakelinux Privacy Policy"
-msgstr "Mandrakelinux dhe jeta e juaj private"
-
 #: ../mdkonline:127
-#, fuzzy, c-format
-msgid "Authentification"
-msgstr "Vërtetësimi"
-
-#: ../mdkonline:128 ../mdkonline_tui:108
-#, c-format
-msgid "Enter your Mandrakeonline login, password and machine name:"
-msgstr "Hyni loginin, parullën dhe emrin e makinës suaj në Mandrakeonline:"
-
-#: ../mdkonline:133 ../mdkonline_tui:116
 #, c-format
 msgid "Machine name:"
 msgstr "Emri i Makinës:"
 
-#: ../mdkonline:138
+#: ../mdkonline:131
 #, fuzzy, c-format
-msgid "Send Configuration"
-msgstr "Konfigurimi i zërit"
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Mirë se Vini në Mandrakeonline"
 
-#: ../mdkonline:139 ../mdkonline_tui:128
+#: ../mdkonline:139
 #, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
@@ -384,56 +379,56 @@ msgstr ""
 "Njashtu, ju përfitoni në vënie të serviseve ndihmuese të paguara në\n"
 "www.mandrakeexpert.com"
 
-#: ../mdkonline:144 ../mdkonline:211 ../mdkonline:234
-#, c-format
-msgid "Finish"
-msgstr "Mbaro"
-
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141 ../mdkonline:180 ../mdkupdate:126 ../mdkupdate:198
 #, c-format
-msgid "Your upload was successful!"
-msgstr "Dërgesa e juaj ishte me sukses!"
+msgid "Connection problem"
+msgstr "Lidhje e ballafaquar"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandrakeonline."
+msgid "or"
 msgstr ""
-"Prej ketij momenti Mandrakeonline do të ju dërgon azhurnimet\n"
-"e reja të sigurisë."
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "Parulla e gabuar"
+
+#: ../mdkonline:141
 #, c-format
 msgid ""
-"Mandrakeonline offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+"Your login or password was wrong.\n"
+" Either you'll have to type it again, or you'll need to create an account on "
+"Mandrakeonline.\n"
+" In the latter case, go back to the first step to connect to "
+"Mandrakeonline.\n"
+" Be aware that you must also provide a Machine name \n"
+" (only alphabetical characters are admitted)"
 msgstr ""
-"Mandrakeonline ju mundëson që ti automatozoni azhurnimet e reja.\n"
-"Një program do të starton rregulisht në makinën tuaj për pritjen e "
-"azhurnimeve të reja.\n"
-
-#: ../mdkonline:146
-#, c-format
-msgid "automated Upgrades"
-msgstr "Azhurnim automatikë"
+"Logini apo parulla juaj janë të pa sakta.\n"
+"Ju duhet të shtypni përsëri apo të krijoni një llogarie tjetër në "
+"Mandrakeonline.\n"
+"Në këtë pjesë të dytë, ju duhet të ktheheni në pikën e parë të kyqjes "
+"Mandrakeonline.\n"
+"Shënoni se ju duhet ta shkruani emrin e Makinës suaj \n"
+"(vetëm shkronjat alfabetike janë të autorizuara)"
 
-#: ../mdkonline:150
-#, c-format
-msgid "Country:"
-msgstr "Vendi:"
+#: ../mdkonline:153
+#, fuzzy, c-format
+msgid "Create a Mandrakeonline Account"
+msgstr "Kontoja e Klubit Mandrake"
 
-#: ../mdkonline:178 ../mdkonline:183 ../mdkonline:185 ../mdkonline:187
+#: ../mdkonline:158
 #, c-format
-msgid "Error"
-msgstr "Gabim"
+msgid "Confirm Password:"
+msgstr "Konfirmoje Parullën:"
 
-#: ../mdkonline:183 ../mdkonline_tui:152
+#: ../mdkonline:159
 #, fuzzy, c-format
-msgid "Please provide a login"
-msgstr "Ju lutemi provoni edhe një herë"
+msgid "Mail contact:"
+msgstr "Kontakt Mail:"
 
-#: ../mdkonline:185 ../mdkonline_tui:152
+#: ../mdkonline:163
 #, c-format
 msgid ""
 "The passwords do not match\n"
@@ -442,160 +437,115 @@ msgstr ""
 "Parulla e juaj nuk pëputhet\n"
 " Ju lutemi provoni edhe një herë\n"
 
-#: ../mdkonline:187 ../mdkonline_tui:152
-#, c-format
-msgid "Not a valid mail address!\n"
-msgstr "Nuk është një adresë e-mail valide!\n"
-
-#: ../mdkonline:199 ../mdkonline_tui:78
-#, c-format
-msgid "Reading configuration\n"
-msgstr "Lexim i konfiguracionit\n"
-
-#: ../mdkonline:204 ../mdkonline_tui:82
+#: ../mdkonline:163
 #, fuzzy, c-format
-msgid "Sending configuration..."
-msgstr "Lexim i konfiguracionit\n"
-
-#: ../mdkonline:213 ../mdkonline:273 ../mdkonline_tui:130 ../mdkonline_tui:169
-#: ../mdkupdate:124 ../mdkupdate:195
-#, c-format
-msgid "Connection problem"
-msgstr "Lidhje e ballafaquar"
+msgid "Please provide a login"
+msgstr "Ju lutemi provoni edhe një herë"
 
-#: ../mdkonline:213 ../mdkonline_tui:169
+#: ../mdkonline:163
 #, c-format
-msgid "Problem occurs when uploading files, please try again"
-msgstr ""
+msgid "Not a valid mail address!\n"
+msgstr "Nuk është një adresë e-mail valide!\n"
 
-#: ../mdkonline:251
+#: ../mdkonline:169
 #, c-format
-msgid "Quitting Wizard\n"
-msgstr "Mbyllja e Asistentit\n"
-
-#: ../mdkonline:273
-#, fuzzy, c-format
-msgid "Mandrakeonline could not be contacted, please try again at a later time"
+msgid ""
+"Mandrakeonline Account successfully created.\n"
+"Please click \"Next\" to authenticate and upload your configuration\n"
 msgstr ""
-"Mandrakeupdate nuk mund të kontaktoj sitin, ne do të mundohemi edhe një herë."
 
-#: ../mdkonline:285
+#: ../mdkonline:178
 #, c-format
-msgid "Wrong password"
-msgstr "Parulla e gabuar"
+msgid "Your upload was successful!"
+msgstr "Dërgesa e juaj ishte me sukses!"
 
-#: ../mdkonline:285 ../mdkonline_tui:130
+#: ../mdkonline:178
 #, c-format
 msgid ""
-"Your login or password was wrong.\n"
-" Either you'll have to type it again, or you'll need to create an account on "
-"Mandrakeonline.\n"
-" In the latter case, go back to the first step to connect to "
-"Mandrakeonline.\n"
-" Be aware that you must also provide a Machine name \n"
-" (only alphabetical characters are admitted)"
+"From now you will receive on security and updates \n"
+"announcements thanks to Mandrakeonline."
 msgstr ""
-"Logini apo parulla juaj janë të pa sakta.\n"
-"Ju duhet të shtypni përsëri apo të krijoni një llogarie tjetër në "
-"Mandrakeonline.\n"
-"Në këtë pjesë të dytë, ju duhet të ktheheni në pikën e parë të kyqjes "
-"Mandrakeonline.\n"
-"Shënoni se ju duhet ta shkruani emrin e Makinës suaj \n"
-"(vetëm shkronjat alfabetike janë të autorizuara)"
+"Prej ketij momenti Mandrakeonline do të ju dërgon azhurnimet\n"
+"e reja të sigurisë."
 
-#: ../mdkonline.pm:58
+#: ../mdkonline:178
 #, c-format
-msgid "Login and password should be less than 12 characters\n"
+msgid ""
+"Mandrakeonline offers you the ability to automate the updates.\n"
+"A program will run regulary in your system waiting for new updates\n"
 msgstr ""
+"Mandrakeonline ju mundëson që ti automatozoni azhurnimet e reja.\n"
+"Një program do të starton rregulisht në makinën tuaj për pritjen e "
+"azhurnimeve të reja.\n"
 
-#: ../mdkonline.pm:59
+#: ../mdkonline:180
 #, c-format
-msgid "Special characters are not allowed\n"
+msgid "Problem occurs when uploading files, please try again"
 msgstr ""
 
-#: ../mdkonline.pm:60
-#, c-format
-msgid "Please fill in all fields\n"
-msgstr ""
+#: ../mdkonline:186
+#, fuzzy, c-format
+msgid "Country"
+msgstr "Vendi:"
 
-#: ../mdkonline.pm:61
-#, c-format
-msgid "Email not valid\n"
-msgstr ""
+#: ../mdkonline:198
+#, fuzzy, c-format
+msgid "Congratulations"
+msgstr "Konfigurimi i zërit"
 
-#: ../mdkonline.pm:62
+#: ../mdkonline:198
 #, c-format
-msgid "Account already exist\n"
+msgid "Your Mandrakeonline account has been successfully configured\n"
 msgstr ""
 
-#: ../mdkonline.pm:68
-#, c-format
-msgid "Problem connecting to server \n"
-msgstr "Problem gjatë lidhjes në server \n"
+#: ../mdkonline:214
+#, fuzzy, c-format
+msgid "Configuration uploaded successfully"
+msgstr "Dërgesa e juaj ishte me sukses!"
 
-#: ../mdkonline_tui:45 ../mdkonline_tui:95
+#: ../mdkonline:215
 #, fuzzy, c-format
-msgid "Mandrakeonline"
-msgstr "Mirë se Vini në Mandrakeonline"
+msgid "Problem uploading configuration"
+msgstr "Lexim i konfiguracionit\n"
 
-#: ../mdkonline_tui:48
+#: ../mdkonline:216
 #, c-format
-msgid "I already have an account"
+msgid ""
+"Cannot connect to mandrakeonline website: wrong login/password or router/"
+"firewall bad settings"
 msgstr ""
 
-#: ../mdkonline_tui:49
+#: ../mdkonline.pm:66
 #, c-format
-msgid "I want to subscribe"
+msgid "Login and password should be less than 12 characters\n"
 msgstr ""
 
-#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:120
+#: ../mdkonline.pm:67
 #, c-format
-msgid "Please wait"
-msgstr "Një moment ju lutemi"
+msgid "Special characters are not allowed\n"
+msgstr ""
 
-#: ../mdkonline_tui:103
+#: ../mdkonline.pm:68
 #, c-format
-msgid "Account creation or authentication"
+msgid "Please fill in all fields\n"
 msgstr ""
 
-#: ../mdkonline_tui:120
-#, fuzzy, c-format
-msgid "Connecting to Mandrakeonline website..."
-msgstr "Mirë se Vini në Mandrakeonline"
-
-#: ../mdkonline_tui:130
+#: ../mdkonline.pm:69
 #, c-format
-msgid "or"
+msgid "Email not valid\n"
 msgstr ""
 
-#: ../mdkonline_tui:130
-#, fuzzy, c-format
-msgid "wrong password:"
-msgstr "Parulla e gabuar"
-
-#: ../mdkonline_tui:158
+#: ../mdkonline.pm:70
 #, c-format
-msgid ""
-"Mandrakeonline Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
+msgid "Account already exist\n"
 msgstr ""
 
-#: ../mdkonline_tui:175
-#, fuzzy, c-format
-msgid "Country"
-msgstr "Vendi:"
-
-#: ../mdkonline_tui:187
-#, fuzzy, c-format
-msgid "Congratulations"
-msgstr "Konfigurimi i zërit"
-
-#: ../mdkonline_tui:187
+#: ../mdkonline.pm:76
 #, c-format
-msgid "Your Mandrakeonline account has been successfully configured\n"
-msgstr ""
+msgid "Problem connecting to server \n"
+msgstr "Problem gjatë lidhjes në server \n"
 
-#: ../mdkupdate:50
+#: ../mdkupdate:52
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
@@ -611,49 +561,97 @@ msgstr ""
 "\n"
 "përdorim:\n"
 
-#: ../mdkupdate:55
+#: ../mdkupdate:57
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - çfaqe këtë lajm ndihmues.\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:58
 #, fuzzy, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --applet       - azhurnoi të gjitha informacionet.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:59
 #, fuzzy, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - azhurnoi të gjitha informacionet.\n"
 
-#: ../mdkupdate:58
-#, fuzzy, c-format
-msgid "  --update       - Update keys\n"
-msgstr "  --applet       - azhurnoi të gjitha informacionet.\n"
-
-#: ../mdkupdate:66
+#: ../mdkupdate:67
 #, c-format
 msgid "No %s file found. Run mdkonline wizard first"
 msgstr ""
 
-#: ../mdkupdate:124
+#: ../mdkupdate:126
 #, c-format
 msgid "Mandrakeupdate could not contact the site, we will try again."
 msgstr ""
 "Mandrakeupdate nuk mund të kontaktoj sitin, ne do të mundohemi edhe një herë."
 
-#: ../mdkupdate:173
+#: ../mdkupdate:176
 #, c-format
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr "I pa mundur azhurnimi i pakove nga mdkupdate mesatar.\n"
 
-#: ../mdkupdate:195
+#: ../mdkupdate:198
 #, c-format
 msgid ""
 "Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
 "mandrakeonline [dot] net"
 msgstr ""
 
+#~ msgid "Next"
+#~ msgstr "Tjetër"
+
+#~ msgid "Cancel"
+#~ msgstr "Anulo"
+
+#~ msgid "Previous"
+#~ msgstr "Mbrapa"
+
+#, fuzzy
+#~ msgid "I don't have a Mandrakeonline account and I want to subscribe"
+#~ msgstr "Nuk e posedon llogarin Mandrakeonline dhe dëshiroj të "
+
+#~ msgid "Mandrakelinux Privacy Policy"
+#~ msgstr "Mandrakelinux dhe jeta e juaj private"
+
+#, fuzzy
+#~ msgid "Authentification"
+#~ msgstr "Vërtetësimi"
+
+#, fuzzy
+#~ msgid "Send Configuration"
+#~ msgstr "Konfigurimi i zërit"
+
+#~ msgid "Finish"
+#~ msgstr "Mbaro"
+
+#~ msgid "automated Upgrades"
+#~ msgstr "Azhurnim automatikë"
+
+#~ msgid "Country:"
+#~ msgstr "Vendi:"
+
+#~ msgid "Error"
+#~ msgstr "Gabim"
+
+#~ msgid "Quitting Wizard\n"
+#~ msgstr "Mbyllja e Asistentit\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Mandrakeonline could not be contacted, please try again at a later time"
+#~ msgstr ""
+#~ "Mandrakeupdate nuk mund të kontaktoj sitin, ne do të mundohemi edhe një "
+#~ "herë."
+
+#~ msgid "Wrong password"
+#~ msgstr "Parulla e gabuar"
+
+#, fuzzy
+#~ msgid "  --update       - Update keys\n"
+#~ msgstr "  --applet       - azhurnoi të gjitha informacionet.\n"
+
 #, fuzzy
 #~ msgid "Skip Wizard"
 #~ msgstr " Asistenti i Parë Ndihmues "
diff --git a/po/sr.po b/po/sr.po
index cec4147a..c7e7c801 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-01 22:41+0200\n"
+"POT-Creation-Date: 2004-11-03 12:10+0100\n"
 "PO-Revision-Date: 2003-02-15 09:31+0100\n"
 "Last-Translator: Toma Jankovic <tomaja@net.yu>\n"
 "Language-Team: Serbian <i18n@mandrake.co.yu>\n"
@@ -16,12 +16,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../mdkapplet:61
+#: ../mdkapplet:63
 #, c-format
 msgid "Your system is up-to-date"
 msgstr ""
 
-#: ../mdkapplet:67
+#: ../mdkapplet:69
 #, fuzzy, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -30,12 +30,12 @@ msgstr ""
 "Уколико имате било какав проблем пошаљите e-mail на support@mandrakeonline."
 "net\n"
 
-#: ../mdkapplet:73
+#: ../mdkapplet:75
 #, c-format
 msgid "System is busy. Please wait ..."
 msgstr ""
 
-#: ../mdkapplet:79
+#: ../mdkapplet:81
 #, fuzzy, c-format
 msgid "New updates are available for your system"
 msgstr ""
@@ -44,249 +44,269 @@ msgstr ""
 "%s\n"
 "су директно повезани на ваш систем.\n"
 
-#: ../mdkapplet:85
+#: ../mdkapplet:87
 #, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr ""
 
-#: ../mdkapplet:91
+#: ../mdkapplet:93
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr ""
 
-#: ../mdkapplet:97
+#: ../mdkapplet:99
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 
-#: ../mdkapplet:103
+#: ../mdkapplet:105
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:108 ../mdkapplet:158
+#: ../mdkapplet:110 ../mdkapplet:164
 #, c-format
 msgid "Install updates"
 msgstr "Инсталирај update-ове"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:111
 #, fuzzy, c-format
 msgid "Configure the service"
 msgstr "Подеси"
 
-#: ../mdkapplet:110
+#: ../mdkapplet:112
 #, fuzzy, c-format
 msgid "Check Updates"
 msgstr "Ажурирање"
 
-#: ../mdkapplet:111
+#: ../mdkapplet:113 ../mdkapplet:167 ../mdkapplet:225
+#, fuzzy, c-format
+msgid "Please Wait"
+msgstr "Само моменат..."
+
+#: ../mdkapplet:113 ../mdkapplet:166 ../mdkapplet:167 ../mdkapplet:225
+#, fuzzy, c-format
+msgid "Check updates"
+msgstr "Сигурносне надоградње"
+
+#: ../mdkapplet:115
 #, c-format
 msgid "Online WebSite"
 msgstr ""
 
-#: ../mdkapplet:112
+#: ../mdkapplet:116
 #, fuzzy, c-format
 msgid "Configure Network"
 msgstr "Подеси мрежу"
 
-#: ../mdkapplet:113
+#: ../mdkapplet:117
 #, fuzzy, c-format
 msgid "Configure Now!"
 msgstr "Подеси веб"
 
-#: ../mdkapplet:146
+#: ../mdkapplet:152 ../mdkapplet:229
 #, fuzzy, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Mandrake Update"
 
-#: ../mdkapplet:156
+#: ../mdkapplet:162
 #, c-format
 msgid "Actions"
 msgstr "Акције"
 
-#: ../mdkapplet:159
+#: ../mdkapplet:165
 #, c-format
 msgid "Configure"
 msgstr "Подеси"
 
-#: ../mdkapplet:160
-#, fuzzy, c-format
-msgid "Check updates"
-msgstr "Сигурносне надоградње"
-
-#: ../mdkapplet:161
+#: ../mdkapplet:169
 #, fuzzy, c-format
 msgid "See logs"
 msgstr "Тражи +5s"
 
-#: ../mdkapplet:164
+#: ../mdkapplet:172
 #, c-format
 msgid "Status"
 msgstr "Статус"
 
-#: ../mdkapplet:168 ../mdkapplet:363
+#: ../mdkapplet:176 ../mdkapplet:375
 #, c-format
 msgid "Close"
 msgstr "Затвори"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, fuzzy, c-format
 msgid "Network Connection: "
 msgstr "Конекција за Виртуелни Мрежу"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Up"
 msgstr "горе"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Down"
 msgstr "Доле"
 
-#: ../mdkapplet:204
+#: ../mdkapplet:212
 #, c-format
 msgid "Last check: "
 msgstr ""
 
-#: ../mdkapplet:205
+#: ../mdkapplet:213
 #, fuzzy, c-format
 msgid "Updates: "
 msgstr "Ажурирање"
 
-#: ../mdkapplet:209
+#: ../mdkapplet:217
 #, fuzzy, c-format
 msgid "Launching drakconnect\n"
 msgstr "Покрени userdrake"
 
-#: ../mdkapplet:213
+#: ../mdkapplet:221
 #, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr ""
 
-#: ../mdkapplet:217
+#: ../mdkapplet:224
 #, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 
-#: ../mdkapplet:225
+#: ../mdkapplet:235
 #, c-format
 msgid "Computing new updates...\n"
 msgstr ""
 
-#: ../mdkapplet:227
+#: ../mdkapplet:237
 #, fuzzy, c-format
 msgid "Connecting to"
 msgstr "Проблем са повезивањем"
 
-#: ../mdkapplet:250
+#: ../mdkapplet:244
+#, fuzzy, c-format
+msgid "Response from Mandrakeonline server\n"
+msgstr "Добродошли у Mandrakelinux"
+
+#: ../mdkapplet:262
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr ""
 
-#: ../mdkapplet:254
+#: ../mdkapplet:267
 #, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
-#: ../mdkapplet:255
+#: ../mdkapplet:268
 #, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
-#: ../mdkapplet:256
+#: ../mdkapplet:269
 #, fuzzy, c-format
 msgid "Unknown state"
 msgstr "Непознато име хоста"
 
-#: ../mdkapplet:257
+#: ../mdkapplet:270
 #, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr ""
 
-#: ../mdkapplet:258
+#: ../mdkapplet:271
 #, fuzzy, c-format
 msgid "Wrong Password.\n"
 msgstr "Потврди лозинку:"
 
-#: ../mdkapplet:259
+#: ../mdkapplet:272
 #, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr ""
 
-#: ../mdkapplet:260
+#: ../mdkapplet:273
 #, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
 msgstr ""
 
-#: ../mdkapplet:264
+#: ../mdkapplet:277
 #, fuzzy, c-format
 msgid "System is up-to-date\n"
 msgstr "Системски мод"
 
-#: ../mdkapplet:303
+#: ../mdkapplet:317
 #, c-format
 msgid "No check"
 msgstr ""
 
-#: ../mdkapplet:316
+#: ../mdkapplet:330
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
-#: ../mdkapplet:319
+#: ../mdkapplet:333
 #, fuzzy, c-format
 msgid "Checking config file: Not present\n"
 msgstr "Недостаје конфигурациони фајл %s.\n"
 
-#: ../mdkapplet:353
+#: ../mdkapplet:365
 #, c-format
 msgid "Logs"
 msgstr "Лог записи"
 
-#: ../mdkapplet:369
+#: ../mdkapplet:381
 #, c-format
 msgid "Clear"
 msgstr "Очисти"
 
-#: ../mdkapplet:396
+#: ../mdkapplet:408
 #, c-format
 msgid "About..."
 msgstr "О..."
 
-#: ../mdkapplet:397
+#: ../mdkapplet:409
 #, c-format
 msgid "Always launch on startup"
 msgstr ""
 
-#: ../mdkapplet:399
+#: ../mdkapplet:411
 #, c-format
 msgid "Quit"
 msgstr "Заврши"
 
-#: ../mdkonline:89
+#: ../mdkonline:52 ../mdkonline:106
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "Добродошли у Mandrakelinux"
+
+#: ../mdkonline:55
 #, c-format
-msgid "Next"
-msgstr "Следећа"
+msgid "I already have an account"
+msgstr ""
 
-#: ../mdkonline:89
+#: ../mdkonline:56
 #, c-format
-msgid "Cancel"
-msgstr "Поништи"
+msgid "I want to subscribe"
+msgstr ""
 
-#: ../mdkonline:89
+#: ../mdkonline:89 ../mdkonline:93 ../mdkonline:131
 #, c-format
-msgid "Previous"
-msgstr "Претходни"
+msgid "Please wait"
+msgstr "Само моменат..."
 
-#: ../mdkonline:103
+#: ../mdkonline:89
 #, fuzzy, c-format
-msgid "Welcome to Mandrakeonline"
-msgstr "Добродошли у Mandrakelinux"
+msgid "Reading configuration\n"
+msgstr "Поново уносим конфигурацију: "
 
-#: ../mdkonline:104 ../mdkonline_tui:98
+#: ../mdkonline:93
+#, fuzzy, c-format
+msgid "Sending configuration..."
+msgstr "Подешавање звука"
+
+#: ../mdkonline:109
 #, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
@@ -294,64 +314,37 @@ msgid ""
 "order to keep you informed about security updates and useful upgrades.\n"
 msgstr ""
 
-#: ../mdkonline:105 ../mdkonline_tui:142
-#, fuzzy, c-format
-msgid "Create a Mandrakeonline Account"
-msgstr "Mandrakeclub Рачун"
+#: ../mdkonline:114
+#, c-format
+msgid "Account creation or authentication"
+msgstr ""
 
-#: ../mdkonline:107
-#, fuzzy, c-format
-msgid "I don't have a Mandrakeonline account and I want to subscribe"
+#: ../mdkonline:119
+#, c-format
+msgid "Enter your Mandrakeonline login, password and machine name:"
 msgstr ""
-"Морате да имате рачун на Mandrakeonline, или да ажурирате своју постојећу "
-"пријаву."
 
-#: ../mdkonline:111 ../mdkonline:131 ../mdkonline_tui:114 ../mdkonline_tui:145
+#: ../mdkonline:125 ../mdkonline:156
 #, c-format
 msgid "Login:"
 msgstr "Login:"
 
-#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:115 ../mdkonline_tui:146
+#: ../mdkonline:126 ../mdkonline:157
 #, c-format
 msgid "Password:"
 msgstr "Лозинка:"
 
-#: ../mdkonline:113 ../mdkonline_tui:147
-#, c-format
-msgid "Confirm Password:"
-msgstr "Потврди лозинку:"
-
-#: ../mdkonline:114 ../mdkonline_tui:148
-#, fuzzy, c-format
-msgid "Mail contact:"
-msgstr "Адреса ел.поште:"
-
-#: ../mdkonline:121
-#, fuzzy, c-format
-msgid "Mandrakelinux Privacy Policy"
-msgstr "Mandrakelinux-ов избор"
-
 #: ../mdkonline:127
 #, fuzzy, c-format
-msgid "Authentification"
-msgstr "Аутентификација"
-
-#: ../mdkonline:128 ../mdkonline_tui:108
-#, c-format
-msgid "Enter your Mandrakeonline login, password and machine name:"
-msgstr ""
-
-#: ../mdkonline:133 ../mdkonline_tui:116
-#, fuzzy, c-format
 msgid "Machine name:"
 msgstr "Минице"
 
-#: ../mdkonline:138
+#: ../mdkonline:131
 #, fuzzy, c-format
-msgid "Send Configuration"
-msgstr "Подешавање звука"
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Добродошли у Mandrakelinux"
 
-#: ../mdkonline:139 ../mdkonline_tui:128
+#: ../mdkonline:139
 #, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
@@ -370,51 +363,49 @@ msgid ""
 "www.mandrakeexpert.com."
 msgstr ""
 
-#: ../mdkonline:144 ../mdkonline:211 ../mdkonline:234
+#: ../mdkonline:141 ../mdkonline:180 ../mdkupdate:126 ../mdkupdate:198
 #, c-format
-msgid "Finish"
-msgstr "Крај"
+msgid "Connection problem"
+msgstr "Проблем са повезивањем"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid "Your upload was successful!"
+msgid "or"
 msgstr ""
 
-#: ../mdkonline:145 ../mdkonline_tui:167
-#, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandrakeonline."
-msgstr ""
+#: ../mdkonline:141
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "Без лозинке"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
 msgid ""
-"Mandrakeonline offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
-msgstr ""
-
-#: ../mdkonline:146
-#, c-format
-msgid "automated Upgrades"
+"Your login or password was wrong.\n"
+" Either you'll have to type it again, or you'll need to create an account on "
+"Mandrakeonline.\n"
+" In the latter case, go back to the first step to connect to "
+"Mandrakeonline.\n"
+" Be aware that you must also provide a Machine name \n"
+" (only alphabetical characters are admitted)"
 msgstr ""
 
-#: ../mdkonline:150
-#, c-format
-msgid "Country:"
-msgstr "Земља:"
+#: ../mdkonline:153
+#, fuzzy, c-format
+msgid "Create a Mandrakeonline Account"
+msgstr "Mandrakeclub Рачун"
 
-#: ../mdkonline:178 ../mdkonline:183 ../mdkonline:185 ../mdkonline:187
+#: ../mdkonline:158
 #, c-format
-msgid "Error"
-msgstr "Грешка"
+msgid "Confirm Password:"
+msgstr "Потврди лозинку:"
 
-#: ../mdkonline:183 ../mdkonline_tui:152
+#: ../mdkonline:159
 #, fuzzy, c-format
-msgid "Please provide a login"
-msgstr "Пробајте поново"
+msgid "Mail contact:"
+msgstr "Адреса ел.поште:"
 
-#: ../mdkonline:185 ../mdkonline_tui:152
+#: ../mdkonline:163
 #, c-format
 msgid ""
 "The passwords do not match\n"
@@ -423,152 +414,110 @@ msgstr ""
 "Лозинке се не слажу\n"
 " Покушајте поново\n"
 
-#: ../mdkonline:187 ../mdkonline_tui:152
-#, c-format
-msgid "Not a valid mail address!\n"
-msgstr "Е-mail адреса није исправна!\n"
-
-#: ../mdkonline:199 ../mdkonline_tui:78
-#, fuzzy, c-format
-msgid "Reading configuration\n"
-msgstr "Поново уносим конфигурацију: "
-
-#: ../mdkonline:204 ../mdkonline_tui:82
+#: ../mdkonline:163
 #, fuzzy, c-format
-msgid "Sending configuration..."
-msgstr "Подешавање звука"
+msgid "Please provide a login"
+msgstr "Пробајте поново"
 
-#: ../mdkonline:213 ../mdkonline:273 ../mdkonline_tui:130 ../mdkonline_tui:169
-#: ../mdkupdate:124 ../mdkupdate:195
+#: ../mdkonline:163
 #, c-format
-msgid "Connection problem"
-msgstr "Проблем са повезивањем"
+msgid "Not a valid mail address!\n"
+msgstr "Е-mail адреса није исправна!\n"
 
-#: ../mdkonline:213 ../mdkonline_tui:169
+#: ../mdkonline:169
 #, c-format
-msgid "Problem occurs when uploading files, please try again"
+msgid ""
+"Mandrakeonline Account successfully created.\n"
+"Please click \"Next\" to authenticate and upload your configuration\n"
 msgstr ""
 
-#: ../mdkonline:251
+#: ../mdkonline:178
 #, c-format
-msgid "Quitting Wizard\n"
-msgstr "Изађи из Чаробњака\n"
-
-#: ../mdkonline:273
-#, fuzzy, c-format
-msgid "Mandrakeonline could not be contacted, please try again at a later time"
-msgstr "Mandrakeupdate не може да контактира сајт, покушаћемо поново."
-
-#: ../mdkonline:285
-#, fuzzy, c-format
-msgid "Wrong password"
-msgstr "Без лозинке"
+msgid "Your upload was successful!"
+msgstr ""
 
-#: ../mdkonline:285 ../mdkonline_tui:130
+#: ../mdkonline:178
 #, c-format
 msgid ""
-"Your login or password was wrong.\n"
-" Either you'll have to type it again, or you'll need to create an account on "
-"Mandrakeonline.\n"
-" In the latter case, go back to the first step to connect to "
-"Mandrakeonline.\n"
-" Be aware that you must also provide a Machine name \n"
-" (only alphabetical characters are admitted)"
+"From now you will receive on security and updates \n"
+"announcements thanks to Mandrakeonline."
 msgstr ""
 
-#: ../mdkonline.pm:58
+#: ../mdkonline:178
 #, c-format
-msgid "Login and password should be less than 12 characters\n"
+msgid ""
+"Mandrakeonline offers you the ability to automate the updates.\n"
+"A program will run regulary in your system waiting for new updates\n"
 msgstr ""
 
-#: ../mdkonline.pm:59
+#: ../mdkonline:180
 #, c-format
-msgid "Special characters are not allowed\n"
+msgid "Problem occurs when uploading files, please try again"
 msgstr ""
 
-#: ../mdkonline.pm:60
-#, c-format
-msgid "Please fill in all fields\n"
-msgstr ""
+#: ../mdkonline:186
+#, fuzzy, c-format
+msgid "Country"
+msgstr "Земља:"
 
-#: ../mdkonline.pm:61
-#, c-format
-msgid "Email not valid\n"
-msgstr ""
+#: ../mdkonline:198
+#, fuzzy, c-format
+msgid "Congratulations"
+msgstr "Конфигурација"
 
-#: ../mdkonline.pm:62
+#: ../mdkonline:198
 #, c-format
-msgid "Account already exist\n"
+msgid "Your Mandrakeonline account has been successfully configured\n"
 msgstr ""
 
-#: ../mdkonline.pm:68
+#: ../mdkonline:214
 #, c-format
-msgid "Problem connecting to server \n"
-msgstr "Проблем при повезивању на сервер \n"
+msgid "Configuration uploaded successfully"
+msgstr ""
 
-#: ../mdkonline_tui:45 ../mdkonline_tui:95
+#: ../mdkonline:215
 #, fuzzy, c-format
-msgid "Mandrakeonline"
-msgstr "Добродошли у Mandrakelinux"
+msgid "Problem uploading configuration"
+msgstr "Поново уносим конфигурацију: "
 
-#: ../mdkonline_tui:48
+#: ../mdkonline:216
 #, c-format
-msgid "I already have an account"
+msgid ""
+"Cannot connect to mandrakeonline website: wrong login/password or router/"
+"firewall bad settings"
 msgstr ""
 
-#: ../mdkonline_tui:49
+#: ../mdkonline.pm:66
 #, c-format
-msgid "I want to subscribe"
+msgid "Login and password should be less than 12 characters\n"
 msgstr ""
 
-#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:120
+#: ../mdkonline.pm:67
 #, c-format
-msgid "Please wait"
-msgstr "Само моменат..."
+msgid "Special characters are not allowed\n"
+msgstr ""
 
-#: ../mdkonline_tui:103
+#: ../mdkonline.pm:68
 #, c-format
-msgid "Account creation or authentication"
+msgid "Please fill in all fields\n"
 msgstr ""
 
-#: ../mdkonline_tui:120
-#, fuzzy, c-format
-msgid "Connecting to Mandrakeonline website..."
-msgstr "Добродошли у Mandrakelinux"
-
-#: ../mdkonline_tui:130
+#: ../mdkonline.pm:69
 #, c-format
-msgid "or"
+msgid "Email not valid\n"
 msgstr ""
 
-#: ../mdkonline_tui:130
-#, fuzzy, c-format
-msgid "wrong password:"
-msgstr "Без лозинке"
-
-#: ../mdkonline_tui:158
+#: ../mdkonline.pm:70
 #, c-format
-msgid ""
-"Mandrakeonline Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
+msgid "Account already exist\n"
 msgstr ""
 
-#: ../mdkonline_tui:175
-#, fuzzy, c-format
-msgid "Country"
-msgstr "Земља:"
-
-#: ../mdkonline_tui:187
-#, fuzzy, c-format
-msgid "Congratulations"
-msgstr "Конфигурација"
-
-#: ../mdkonline_tui:187
+#: ../mdkonline.pm:76
 #, c-format
-msgid "Your Mandrakeonline account has been successfully configured\n"
-msgstr ""
+msgid "Problem connecting to server \n"
+msgstr "Проблем при повезивању на сервер \n"
 
-#: ../mdkupdate:50
+#: ../mdkupdate:52
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
@@ -585,48 +534,95 @@ msgstr ""
 "\n"
 "употреба:\n"
 
-#: ../mdkupdate:55
+#: ../mdkupdate:57
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - приказује ову поруку.\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:58
 #, fuzzy, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --applet       - ажурира све информације.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:59
 #, fuzzy, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - ажурира све информације.\n"
 
-#: ../mdkupdate:58
-#, fuzzy, c-format
-msgid "  --update       - Update keys\n"
-msgstr "  --applet       - ажурира све информације.\n"
-
-#: ../mdkupdate:66
+#: ../mdkupdate:67
 #, c-format
 msgid "No %s file found. Run mdkonline wizard first"
 msgstr ""
 
-#: ../mdkupdate:124
+#: ../mdkupdate:126
 #, c-format
 msgid "Mandrakeupdate could not contact the site, we will try again."
 msgstr "Mandrakeupdate не може да контактира сајт, покушаћемо поново."
 
-#: ../mdkupdate:173
+#: ../mdkupdate:176
 #, c-format
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr "Не могу да ажурирам пакете са mdkupdate медија.\n"
 
-#: ../mdkupdate:195
+#: ../mdkupdate:198
 #, c-format
 msgid ""
 "Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
 "mandrakeonline [dot] net"
 msgstr ""
 
+#~ msgid "Next"
+#~ msgstr "Следећа"
+
+#~ msgid "Cancel"
+#~ msgstr "Поништи"
+
+#~ msgid "Previous"
+#~ msgstr "Претходни"
+
+#, fuzzy
+#~ msgid "I don't have a Mandrakeonline account and I want to subscribe"
+#~ msgstr ""
+#~ "Морате да имате рачун на Mandrakeonline, или да ажурирате своју постојећу "
+#~ "пријаву."
+
+#, fuzzy
+#~ msgid "Mandrakelinux Privacy Policy"
+#~ msgstr "Mandrakelinux-ов избор"
+
+#, fuzzy
+#~ msgid "Authentification"
+#~ msgstr "Аутентификација"
+
+#, fuzzy
+#~ msgid "Send Configuration"
+#~ msgstr "Подешавање звука"
+
+#~ msgid "Finish"
+#~ msgstr "Крај"
+
+#~ msgid "Country:"
+#~ msgstr "Земља:"
+
+#~ msgid "Error"
+#~ msgstr "Грешка"
+
+#~ msgid "Quitting Wizard\n"
+#~ msgstr "Изађи из Чаробњака\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Mandrakeonline could not be contacted, please try again at a later time"
+#~ msgstr "Mandrakeupdate не може да контактира сајт, покушаћемо поново."
+
+#, fuzzy
+#~ msgid "Wrong password"
+#~ msgstr "Без лозинке"
+
+#, fuzzy
+#~ msgid "  --update       - Update keys\n"
+#~ msgstr "  --applet       - ажурира све информације.\n"
+
 #, fuzzy
 #~ msgid "Skip Wizard"
 #~ msgstr "Прескочи Чаробњака"
diff --git a/po/sr@Latn.po b/po/sr@Latn.po
index 81aeec1c..7f2e0a00 100644
--- a/po/sr@Latn.po
+++ b/po/sr@Latn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-01 22:41+0200\n"
+"POT-Creation-Date: 2004-11-03 12:10+0100\n"
 "PO-Revision-Date: 2003-02-15 09:31+0100\n"
 "Last-Translator: Toma Jankovic_<tomaja@net.yu>\n"
 "Language-Team: Serbian <i18n@mandrake.co.yu>\n"
@@ -16,12 +16,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../mdkapplet:61
+#: ../mdkapplet:63
 #, c-format
 msgid "Your system is up-to-date"
 msgstr ""
 
-#: ../mdkapplet:67
+#: ../mdkapplet:69
 #, fuzzy, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -30,12 +30,12 @@ msgstr ""
 "Ukoliko imate bilo kakav problem pošaljite e-mail na support@mandrakeonline."
 "net\n"
 
-#: ../mdkapplet:73
+#: ../mdkapplet:75
 #, c-format
 msgid "System is busy. Please wait ..."
 msgstr ""
 
-#: ../mdkapplet:79
+#: ../mdkapplet:81
 #, fuzzy, c-format
 msgid "New updates are available for your system"
 msgstr ""
@@ -44,249 +44,269 @@ msgstr ""
 "%s\n"
 "su direktno povezani na vaš sistem.\n"
 
-#: ../mdkapplet:85
+#: ../mdkapplet:87
 #, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr ""
 
-#: ../mdkapplet:91
+#: ../mdkapplet:93
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr ""
 
-#: ../mdkapplet:97
+#: ../mdkapplet:99
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 
-#: ../mdkapplet:103
+#: ../mdkapplet:105
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:108 ../mdkapplet:158
+#: ../mdkapplet:110 ../mdkapplet:164
 #, c-format
 msgid "Install updates"
 msgstr "Instaliraj update-ove"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:111
 #, fuzzy, c-format
 msgid "Configure the service"
 msgstr "Podesi"
 
-#: ../mdkapplet:110
+#: ../mdkapplet:112
 #, fuzzy, c-format
 msgid "Check Updates"
 msgstr "Ažuriranje"
 
-#: ../mdkapplet:111
+#: ../mdkapplet:113 ../mdkapplet:167 ../mdkapplet:225
+#, fuzzy, c-format
+msgid "Please Wait"
+msgstr "Samo momenat..."
+
+#: ../mdkapplet:113 ../mdkapplet:166 ../mdkapplet:167 ../mdkapplet:225
+#, fuzzy, c-format
+msgid "Check updates"
+msgstr "Sigurnosne nadogradnje"
+
+#: ../mdkapplet:115
 #, c-format
 msgid "Online WebSite"
 msgstr ""
 
-#: ../mdkapplet:112
+#: ../mdkapplet:116
 #, fuzzy, c-format
 msgid "Configure Network"
 msgstr "Podesi mrežu"
 
-#: ../mdkapplet:113
+#: ../mdkapplet:117
 #, fuzzy, c-format
 msgid "Configure Now!"
 msgstr "Podesi veb"
 
-#: ../mdkapplet:146
+#: ../mdkapplet:152 ../mdkapplet:229
 #, fuzzy, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Mandrake Update"
 
-#: ../mdkapplet:156
+#: ../mdkapplet:162
 #, c-format
 msgid "Actions"
 msgstr "Akcije"
 
-#: ../mdkapplet:159
+#: ../mdkapplet:165
 #, c-format
 msgid "Configure"
 msgstr "Podesi"
 
-#: ../mdkapplet:160
-#, fuzzy, c-format
-msgid "Check updates"
-msgstr "Sigurnosne nadogradnje"
-
-#: ../mdkapplet:161
+#: ../mdkapplet:169
 #, fuzzy, c-format
 msgid "See logs"
 msgstr "Traži +5s"
 
-#: ../mdkapplet:164
+#: ../mdkapplet:172
 #, c-format
 msgid "Status"
 msgstr "Status"
 
-#: ../mdkapplet:168 ../mdkapplet:363
+#: ../mdkapplet:176 ../mdkapplet:375
 #, c-format
 msgid "Close"
 msgstr "Zatvori"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, fuzzy, c-format
 msgid "Network Connection: "
 msgstr "Konekcija za Virtuelni Mrežu"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Up"
 msgstr "gore"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Down"
 msgstr "Dole"
 
-#: ../mdkapplet:204
+#: ../mdkapplet:212
 #, c-format
 msgid "Last check: "
 msgstr ""
 
-#: ../mdkapplet:205
+#: ../mdkapplet:213
 #, fuzzy, c-format
 msgid "Updates: "
 msgstr "Ažuriranje"
 
-#: ../mdkapplet:209
+#: ../mdkapplet:217
 #, fuzzy, c-format
 msgid "Launching drakconnect\n"
 msgstr "Pokreni userdrake"
 
-#: ../mdkapplet:213
+#: ../mdkapplet:221
 #, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr ""
 
-#: ../mdkapplet:217
+#: ../mdkapplet:224
 #, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 
-#: ../mdkapplet:225
+#: ../mdkapplet:235
 #, c-format
 msgid "Computing new updates...\n"
 msgstr ""
 
-#: ../mdkapplet:227
+#: ../mdkapplet:237
 #, fuzzy, c-format
 msgid "Connecting to"
 msgstr "Problem sa povezivanjem"
 
-#: ../mdkapplet:250
+#: ../mdkapplet:244
+#, fuzzy, c-format
+msgid "Response from Mandrakeonline server\n"
+msgstr "Dobrodošli u Mandrakelinux"
+
+#: ../mdkapplet:262
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr ""
 
-#: ../mdkapplet:254
+#: ../mdkapplet:267
 #, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
-#: ../mdkapplet:255
+#: ../mdkapplet:268
 #, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
-#: ../mdkapplet:256
+#: ../mdkapplet:269
 #, fuzzy, c-format
 msgid "Unknown state"
 msgstr "Nepoznato ime hosta"
 
-#: ../mdkapplet:257
+#: ../mdkapplet:270
 #, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr ""
 
-#: ../mdkapplet:258
+#: ../mdkapplet:271
 #, fuzzy, c-format
 msgid "Wrong Password.\n"
 msgstr "Potvrdi lozinku:"
 
-#: ../mdkapplet:259
+#: ../mdkapplet:272
 #, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr ""
 
-#: ../mdkapplet:260
+#: ../mdkapplet:273
 #, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
 msgstr ""
 
-#: ../mdkapplet:264
+#: ../mdkapplet:277
 #, fuzzy, c-format
 msgid "System is up-to-date\n"
 msgstr "Sistemski mod"
 
-#: ../mdkapplet:303
+#: ../mdkapplet:317
 #, c-format
 msgid "No check"
 msgstr ""
 
-#: ../mdkapplet:316
+#: ../mdkapplet:330
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
-#: ../mdkapplet:319
+#: ../mdkapplet:333
 #, fuzzy, c-format
 msgid "Checking config file: Not present\n"
 msgstr "Nedostaje konfiguracioni fajl %s.\n"
 
-#: ../mdkapplet:353
+#: ../mdkapplet:365
 #, c-format
 msgid "Logs"
 msgstr "Log zapisi"
 
-#: ../mdkapplet:369
+#: ../mdkapplet:381
 #, c-format
 msgid "Clear"
 msgstr "Očisti"
 
-#: ../mdkapplet:396
+#: ../mdkapplet:408
 #, c-format
 msgid "About..."
 msgstr "O..."
 
-#: ../mdkapplet:397
+#: ../mdkapplet:409
 #, c-format
 msgid "Always launch on startup"
 msgstr ""
 
-#: ../mdkapplet:399
+#: ../mdkapplet:411
 #, c-format
 msgid "Quit"
 msgstr "Završi"
 
-#: ../mdkonline:89
+#: ../mdkonline:52 ../mdkonline:106
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "Dobrodošli u Mandrakelinux"
+
+#: ../mdkonline:55
 #, c-format
-msgid "Next"
-msgstr "Sledeća"
+msgid "I already have an account"
+msgstr ""
 
-#: ../mdkonline:89
+#: ../mdkonline:56
 #, c-format
-msgid "Cancel"
-msgstr "Poništi"
+msgid "I want to subscribe"
+msgstr ""
 
-#: ../mdkonline:89
+#: ../mdkonline:89 ../mdkonline:93 ../mdkonline:131
 #, c-format
-msgid "Previous"
-msgstr "Prethodni"
+msgid "Please wait"
+msgstr "Samo momenat..."
 
-#: ../mdkonline:103
+#: ../mdkonline:89
 #, fuzzy, c-format
-msgid "Welcome to Mandrakeonline"
-msgstr "Dobrodošli u Mandrakelinux"
+msgid "Reading configuration\n"
+msgstr "Ponovo unosim konfiguraciju: "
 
-#: ../mdkonline:104 ../mdkonline_tui:98
+#: ../mdkonline:93
+#, fuzzy, c-format
+msgid "Sending configuration..."
+msgstr "Podešavanje zvuka"
+
+#: ../mdkonline:109
 #, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
@@ -294,64 +314,37 @@ msgid ""
 "order to keep you informed about security updates and useful upgrades.\n"
 msgstr ""
 
-#: ../mdkonline:105 ../mdkonline_tui:142
-#, fuzzy, c-format
-msgid "Create a Mandrakeonline Account"
-msgstr "Mandrakeclub Račun"
+#: ../mdkonline:114
+#, c-format
+msgid "Account creation or authentication"
+msgstr ""
 
-#: ../mdkonline:107
-#, fuzzy, c-format
-msgid "I don't have a Mandrakeonline account and I want to subscribe"
+#: ../mdkonline:119
+#, c-format
+msgid "Enter your Mandrakeonline login, password and machine name:"
 msgstr ""
-"Morate da imate račun na Mandrakeonline, ili da ažurirate svoju postojeću "
-"prijavu."
 
-#: ../mdkonline:111 ../mdkonline:131 ../mdkonline_tui:114 ../mdkonline_tui:145
+#: ../mdkonline:125 ../mdkonline:156
 #, c-format
 msgid "Login:"
 msgstr "Login:"
 
-#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:115 ../mdkonline_tui:146
+#: ../mdkonline:126 ../mdkonline:157
 #, c-format
 msgid "Password:"
 msgstr "Lozinka:"
 
-#: ../mdkonline:113 ../mdkonline_tui:147
-#, c-format
-msgid "Confirm Password:"
-msgstr "Potvrdi lozinku:"
-
-#: ../mdkonline:114 ../mdkonline_tui:148
-#, fuzzy, c-format
-msgid "Mail contact:"
-msgstr "Adresa el.pošte:"
-
-#: ../mdkonline:121
-#, fuzzy, c-format
-msgid "Mandrakelinux Privacy Policy"
-msgstr "Mandrakelinux-ov izbor"
-
 #: ../mdkonline:127
 #, fuzzy, c-format
-msgid "Authentification"
-msgstr "Autentifikacija"
-
-#: ../mdkonline:128 ../mdkonline_tui:108
-#, c-format
-msgid "Enter your Mandrakeonline login, password and machine name:"
-msgstr ""
-
-#: ../mdkonline:133 ../mdkonline_tui:116
-#, fuzzy, c-format
 msgid "Machine name:"
 msgstr "Minice"
 
-#: ../mdkonline:138
+#: ../mdkonline:131
 #, fuzzy, c-format
-msgid "Send Configuration"
-msgstr "Podešavanje zvuka"
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Dobrodošli u Mandrakelinux"
 
-#: ../mdkonline:139 ../mdkonline_tui:128
+#: ../mdkonline:139
 #, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
@@ -370,51 +363,49 @@ msgid ""
 "www.mandrakeexpert.com."
 msgstr ""
 
-#: ../mdkonline:144 ../mdkonline:211 ../mdkonline:234
+#: ../mdkonline:141 ../mdkonline:180 ../mdkupdate:126 ../mdkupdate:198
 #, c-format
-msgid "Finish"
-msgstr "Kraj"
+msgid "Connection problem"
+msgstr "Problem sa povezivanjem"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid "Your upload was successful!"
+msgid "or"
 msgstr ""
 
-#: ../mdkonline:145 ../mdkonline_tui:167
-#, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandrakeonline."
-msgstr ""
+#: ../mdkonline:141
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "Bez lozinke"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
 msgid ""
-"Mandrakeonline offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
-msgstr ""
-
-#: ../mdkonline:146
-#, c-format
-msgid "automated Upgrades"
+"Your login or password was wrong.\n"
+" Either you'll have to type it again, or you'll need to create an account on "
+"Mandrakeonline.\n"
+" In the latter case, go back to the first step to connect to "
+"Mandrakeonline.\n"
+" Be aware that you must also provide a Machine name \n"
+" (only alphabetical characters are admitted)"
 msgstr ""
 
-#: ../mdkonline:150
-#, c-format
-msgid "Country:"
-msgstr "Zemlja:"
+#: ../mdkonline:153
+#, fuzzy, c-format
+msgid "Create a Mandrakeonline Account"
+msgstr "Mandrakeclub Račun"
 
-#: ../mdkonline:178 ../mdkonline:183 ../mdkonline:185 ../mdkonline:187
+#: ../mdkonline:158
 #, c-format
-msgid "Error"
-msgstr "Greška"
+msgid "Confirm Password:"
+msgstr "Potvrdi lozinku:"
 
-#: ../mdkonline:183 ../mdkonline_tui:152
+#: ../mdkonline:159
 #, fuzzy, c-format
-msgid "Please provide a login"
-msgstr "Probajte ponovo"
+msgid "Mail contact:"
+msgstr "Adresa el.pošte:"
 
-#: ../mdkonline:185 ../mdkonline_tui:152
+#: ../mdkonline:163
 #, c-format
 msgid ""
 "The passwords do not match\n"
@@ -423,152 +414,110 @@ msgstr ""
 "Lozinke se ne slažu\n"
 " Pokušajte ponovo\n"
 
-#: ../mdkonline:187 ../mdkonline_tui:152
-#, c-format
-msgid "Not a valid mail address!\n"
-msgstr "E-mail adresa nije ispravna!\n"
-
-#: ../mdkonline:199 ../mdkonline_tui:78
-#, fuzzy, c-format
-msgid "Reading configuration\n"
-msgstr "Ponovo unosim konfiguraciju: "
-
-#: ../mdkonline:204 ../mdkonline_tui:82
+#: ../mdkonline:163
 #, fuzzy, c-format
-msgid "Sending configuration..."
-msgstr "Podešavanje zvuka"
+msgid "Please provide a login"
+msgstr "Probajte ponovo"
 
-#: ../mdkonline:213 ../mdkonline:273 ../mdkonline_tui:130 ../mdkonline_tui:169
-#: ../mdkupdate:124 ../mdkupdate:195
+#: ../mdkonline:163
 #, c-format
-msgid "Connection problem"
-msgstr "Problem sa povezivanjem"
+msgid "Not a valid mail address!\n"
+msgstr "E-mail adresa nije ispravna!\n"
 
-#: ../mdkonline:213 ../mdkonline_tui:169
+#: ../mdkonline:169
 #, c-format
-msgid "Problem occurs when uploading files, please try again"
+msgid ""
+"Mandrakeonline Account successfully created.\n"
+"Please click \"Next\" to authenticate and upload your configuration\n"
 msgstr ""
 
-#: ../mdkonline:251
+#: ../mdkonline:178
 #, c-format
-msgid "Quitting Wizard\n"
-msgstr "Izađi iz Čarobnjaka\n"
-
-#: ../mdkonline:273
-#, fuzzy, c-format
-msgid "Mandrakeonline could not be contacted, please try again at a later time"
-msgstr "Mandrakeupdate ne može da kontaktira sajt, pokušaćemo ponovo."
-
-#: ../mdkonline:285
-#, fuzzy, c-format
-msgid "Wrong password"
-msgstr "Bez lozinke"
+msgid "Your upload was successful!"
+msgstr ""
 
-#: ../mdkonline:285 ../mdkonline_tui:130
+#: ../mdkonline:178
 #, c-format
 msgid ""
-"Your login or password was wrong.\n"
-" Either you'll have to type it again, or you'll need to create an account on "
-"Mandrakeonline.\n"
-" In the latter case, go back to the first step to connect to "
-"Mandrakeonline.\n"
-" Be aware that you must also provide a Machine name \n"
-" (only alphabetical characters are admitted)"
+"From now you will receive on security and updates \n"
+"announcements thanks to Mandrakeonline."
 msgstr ""
 
-#: ../mdkonline.pm:58
+#: ../mdkonline:178
 #, c-format
-msgid "Login and password should be less than 12 characters\n"
+msgid ""
+"Mandrakeonline offers you the ability to automate the updates.\n"
+"A program will run regulary in your system waiting for new updates\n"
 msgstr ""
 
-#: ../mdkonline.pm:59
+#: ../mdkonline:180
 #, c-format
-msgid "Special characters are not allowed\n"
+msgid "Problem occurs when uploading files, please try again"
 msgstr ""
 
-#: ../mdkonline.pm:60
-#, c-format
-msgid "Please fill in all fields\n"
-msgstr ""
+#: ../mdkonline:186
+#, fuzzy, c-format
+msgid "Country"
+msgstr "Zemlja:"
 
-#: ../mdkonline.pm:61
-#, c-format
-msgid "Email not valid\n"
-msgstr ""
+#: ../mdkonline:198
+#, fuzzy, c-format
+msgid "Congratulations"
+msgstr "Konfiguracija"
 
-#: ../mdkonline.pm:62
+#: ../mdkonline:198
 #, c-format
-msgid "Account already exist\n"
+msgid "Your Mandrakeonline account has been successfully configured\n"
 msgstr ""
 
-#: ../mdkonline.pm:68
+#: ../mdkonline:214
 #, c-format
-msgid "Problem connecting to server \n"
-msgstr "Problem pri povezivanju na server \n"
+msgid "Configuration uploaded successfully"
+msgstr ""
 
-#: ../mdkonline_tui:45 ../mdkonline_tui:95
+#: ../mdkonline:215
 #, fuzzy, c-format
-msgid "Mandrakeonline"
-msgstr "Dobrodošli u Mandrakelinux"
+msgid "Problem uploading configuration"
+msgstr "Ponovo unosim konfiguraciju: "
 
-#: ../mdkonline_tui:48
+#: ../mdkonline:216
 #, c-format
-msgid "I already have an account"
+msgid ""
+"Cannot connect to mandrakeonline website: wrong login/password or router/"
+"firewall bad settings"
 msgstr ""
 
-#: ../mdkonline_tui:49
+#: ../mdkonline.pm:66
 #, c-format
-msgid "I want to subscribe"
+msgid "Login and password should be less than 12 characters\n"
 msgstr ""
 
-#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:120
+#: ../mdkonline.pm:67
 #, c-format
-msgid "Please wait"
-msgstr "Samo momenat..."
+msgid "Special characters are not allowed\n"
+msgstr ""
 
-#: ../mdkonline_tui:103
+#: ../mdkonline.pm:68
 #, c-format
-msgid "Account creation or authentication"
+msgid "Please fill in all fields\n"
 msgstr ""
 
-#: ../mdkonline_tui:120
-#, fuzzy, c-format
-msgid "Connecting to Mandrakeonline website..."
-msgstr "Dobrodošli u Mandrakelinux"
-
-#: ../mdkonline_tui:130
+#: ../mdkonline.pm:69
 #, c-format
-msgid "or"
+msgid "Email not valid\n"
 msgstr ""
 
-#: ../mdkonline_tui:130
-#, fuzzy, c-format
-msgid "wrong password:"
-msgstr "Bez lozinke"
-
-#: ../mdkonline_tui:158
+#: ../mdkonline.pm:70
 #, c-format
-msgid ""
-"Mandrakeonline Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
+msgid "Account already exist\n"
 msgstr ""
 
-#: ../mdkonline_tui:175
-#, fuzzy, c-format
-msgid "Country"
-msgstr "Zemlja:"
-
-#: ../mdkonline_tui:187
-#, fuzzy, c-format
-msgid "Congratulations"
-msgstr "Konfiguracija"
-
-#: ../mdkonline_tui:187
+#: ../mdkonline.pm:76
 #, c-format
-msgid "Your Mandrakeonline account has been successfully configured\n"
-msgstr ""
+msgid "Problem connecting to server \n"
+msgstr "Problem pri povezivanju na server \n"
 
-#: ../mdkupdate:50
+#: ../mdkupdate:52
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
@@ -585,48 +534,95 @@ msgstr ""
 "\n"
 "upotreba:\n"
 
-#: ../mdkupdate:55
+#: ../mdkupdate:57
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - prikazuje ovu poruku.\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:58
 #, fuzzy, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --applet       - ažurira sve informacije.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:59
 #, fuzzy, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - ažurira sve informacije.\n"
 
-#: ../mdkupdate:58
-#, fuzzy, c-format
-msgid "  --update       - Update keys\n"
-msgstr "  --applet       - ažurira sve informacije.\n"
-
-#: ../mdkupdate:66
+#: ../mdkupdate:67
 #, c-format
 msgid "No %s file found. Run mdkonline wizard first"
 msgstr ""
 
-#: ../mdkupdate:124
+#: ../mdkupdate:126
 #, c-format
 msgid "Mandrakeupdate could not contact the site, we will try again."
 msgstr "Mandrakeupdate ne može da kontaktira sajt, pokušaćemo ponovo."
 
-#: ../mdkupdate:173
+#: ../mdkupdate:176
 #, c-format
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr "Ne mogu da ažuriram pakete sa mdkupdate medija.\n"
 
-#: ../mdkupdate:195
+#: ../mdkupdate:198
 #, c-format
 msgid ""
 "Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
 "mandrakeonline [dot] net"
 msgstr ""
 
+#~ msgid "Next"
+#~ msgstr "Sledeća"
+
+#~ msgid "Cancel"
+#~ msgstr "Poništi"
+
+#~ msgid "Previous"
+#~ msgstr "Prethodni"
+
+#, fuzzy
+#~ msgid "I don't have a Mandrakeonline account and I want to subscribe"
+#~ msgstr ""
+#~ "Morate da imate račun na Mandrakeonline, ili da ažurirate svoju postojeću "
+#~ "prijavu."
+
+#, fuzzy
+#~ msgid "Mandrakelinux Privacy Policy"
+#~ msgstr "Mandrakelinux-ov izbor"
+
+#, fuzzy
+#~ msgid "Authentification"
+#~ msgstr "Autentifikacija"
+
+#, fuzzy
+#~ msgid "Send Configuration"
+#~ msgstr "Podešavanje zvuka"
+
+#~ msgid "Finish"
+#~ msgstr "Kraj"
+
+#~ msgid "Country:"
+#~ msgstr "Zemlja:"
+
+#~ msgid "Error"
+#~ msgstr "Greška"
+
+#~ msgid "Quitting Wizard\n"
+#~ msgstr "Izađi iz Čarobnjaka\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Mandrakeonline could not be contacted, please try again at a later time"
+#~ msgstr "Mandrakeupdate ne može da kontaktira sajt, pokušaćemo ponovo."
+
+#, fuzzy
+#~ msgid "Wrong password"
+#~ msgstr "Bez lozinke"
+
+#, fuzzy
+#~ msgid "  --update       - Update keys\n"
+#~ msgstr "  --applet       - ažurira sve informacije.\n"
+
 #, fuzzy
 #~ msgid "Skip Wizard"
 #~ msgstr "Preskoči Čarobnjaka"
diff --git a/po/sv.po b/po/sv.po
index f4d28ce4..802cd723 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-sv\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-01 22:41+0200\n"
+"POT-Creation-Date: 2004-11-03 12:10+0100\n"
 "PO-Revision-Date: 2004-10-01 21:11+0200\n"
 "Last-Translator: Kenneth Krekula <kenneth.krekula@kiruna.se>\n"
 "Language-Team:  <sv@li.org>\n"
@@ -24,12 +24,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3\n"
 
-#: ../mdkapplet:61
+#: ../mdkapplet:63
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Ditt system är uppdaterat"
 
-#: ../mdkapplet:67
+#: ../mdkapplet:69
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -38,188 +38,198 @@ msgstr ""
 "Problem med tjänstens konfiguration. Var vänlig kontrollera loggar och "
 "skicka e-post till support@mandrakeonline.net"
 
-#: ../mdkapplet:73
+#: ../mdkapplet:75
 #, c-format
 msgid "System is busy. Please wait ..."
 msgstr "Systemet är upptaget. Var god vänta ..."
 
-#: ../mdkapplet:79
+#: ../mdkapplet:81
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Nya uppdateringar finns tillgängliga för ditt system"
 
-#: ../mdkapplet:85
+#: ../mdkapplet:87
 #, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr "Tjänsten är ej konfigurerad. Klicka på \"Konfigurera tjänsten\""
 
-#: ../mdkapplet:91
+#: ../mdkapplet:93
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Nätverket är nere. Var vänlig konfigurera ditt nätverk."
 
-#: ../mdkapplet:97
+#: ../mdkapplet:99
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Tjänsten är ej aktiverad. Klicka på \"Online webbsajt\""
 
-#: ../mdkapplet:103
+#: ../mdkapplet:105
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 "Denna version stöds inte (för gammal version, eller utvecklingsversion)"
 
-#: ../mdkapplet:108 ../mdkapplet:158
+#: ../mdkapplet:110 ../mdkapplet:164
 #, c-format
 msgid "Install updates"
 msgstr "Installera uppdateringar"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:111
 #, c-format
 msgid "Configure the service"
 msgstr "Konfigurera tjänsten"
 
-#: ../mdkapplet:110
+#: ../mdkapplet:112
 #, c-format
 msgid "Check Updates"
 msgstr "Kontrollera om det finns uppdateringar"
 
-#: ../mdkapplet:111
+#: ../mdkapplet:113 ../mdkapplet:167 ../mdkapplet:225
+#, fuzzy, c-format
+msgid "Please Wait"
+msgstr "Vänta"
+
+#: ../mdkapplet:113 ../mdkapplet:166 ../mdkapplet:167 ../mdkapplet:225
+#, c-format
+msgid "Check updates"
+msgstr "Kontrollera om det finns uppdateringar"
+
+#: ../mdkapplet:115
 #, c-format
 msgid "Online WebSite"
 msgstr "Online webbsajt"
 
-#: ../mdkapplet:112
+#: ../mdkapplet:116
 #, c-format
 msgid "Configure Network"
 msgstr "Konfigurera nätverket"
 
-#: ../mdkapplet:113
+#: ../mdkapplet:117
 #, c-format
 msgid "Configure Now!"
 msgstr "Konfigurera nu!"
 
-#: ../mdkapplet:146
+#: ../mdkapplet:152 ../mdkapplet:229
 #, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Mandrakelinux uppdateringsapplet"
 
-#: ../mdkapplet:156
+#: ../mdkapplet:162
 #, c-format
 msgid "Actions"
 msgstr "Åtgärder"
 
-#: ../mdkapplet:159
+#: ../mdkapplet:165
 #, c-format
 msgid "Configure"
 msgstr "Konfigurera"
 
-#: ../mdkapplet:160
-#, c-format
-msgid "Check updates"
-msgstr "Kontrollera om det finns uppdateringar"
-
-#: ../mdkapplet:161
+#: ../mdkapplet:169
 #, c-format
 msgid "See logs"
 msgstr "Kontrollera loggar"
 
-#: ../mdkapplet:164
+#: ../mdkapplet:172
 #, c-format
 msgid "Status"
 msgstr "Status"
 
-#: ../mdkapplet:168 ../mdkapplet:363
+#: ../mdkapplet:176 ../mdkapplet:375
 #, c-format
 msgid "Close"
 msgstr "Stäng"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Network Connection: "
 msgstr "Nätverksanslutning: "
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Up"
 msgstr "Upp"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Down"
 msgstr "Ner"
 
-#: ../mdkapplet:204
+#: ../mdkapplet:212
 #, c-format
 msgid "Last check: "
 msgstr "Sist kontrollerat: "
 
-#: ../mdkapplet:205
+#: ../mdkapplet:213
 #, c-format
 msgid "Updates: "
 msgstr "Uppdateringar: "
 
-#: ../mdkapplet:209
+#: ../mdkapplet:217
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Startar drakconnect\n"
 
-#: ../mdkapplet:213
+#: ../mdkapplet:221
 #, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "Startar mdkupdate --applet\n"
 
-#: ../mdkapplet:217
+#: ../mdkapplet:224
 #, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr "Mandrakeonline verkar ha ominstallerats,startar om applet ...."
 
-#: ../mdkapplet:225
+#: ../mdkapplet:235
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Beräknar nya uppdateringar...\n"
 
-#: ../mdkapplet:227
+#: ../mdkapplet:237
 #, c-format
 msgid "Connecting to"
 msgstr "Ansluter till"
 
-#: ../mdkapplet:250
+#: ../mdkapplet:244
+#, fuzzy, c-format
+msgid "Response from Mandrakeonline server\n"
+msgstr "Välkommen till Mandrakelinux Online"
+
+#: ../mdkapplet:262
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Kontrollerar... Uppdateringar finns tillgängliga\n"
 
-#: ../mdkapplet:254
+#: ../mdkapplet:267
 #, c-format
 msgid "Development release not supported by service"
 msgstr "Utvecklingsversion stöds inte av tjänsten"
 
-#: ../mdkapplet:255
+#: ../mdkapplet:268
 #, c-format
 msgid "Too old release not supported by service"
 msgstr "För gammal version för att stödjas av tjänsten"
 
-#: ../mdkapplet:256
+#: ../mdkapplet:269
 #, c-format
 msgid "Unknown state"
 msgstr "Okänd status"
 
-#: ../mdkapplet:257
+#: ../mdkapplet:270
 #, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr "Online tjänster avaktiverade. Kontakta Mandrakeonline\n"
 
-#: ../mdkapplet:258
+#: ../mdkapplet:271
 #, c-format
 msgid "Wrong Password.\n"
 msgstr "Felaktigt lösenord.\n"
 
-#: ../mdkapplet:259
+#: ../mdkapplet:272
 #, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr "Fel åtgärd eller värd eller login.\n"
 
-#: ../mdkapplet:260
+#: ../mdkapplet:273
 #, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
@@ -228,72 +238,82 @@ msgstr ""
 "Något verkar fel med dina nätverksinställningar (kontrollera dina routing-, "
 "brandväggs- eller proxyinställningar)\n"
 
-#: ../mdkapplet:264
+#: ../mdkapplet:277
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Systemet är uppdaterat\n"
 
-#: ../mdkapplet:303
+#: ../mdkapplet:317
 #, c-format
 msgid "No check"
 msgstr "Ingen kontroll"
 
-#: ../mdkapplet:316
+#: ../mdkapplet:330
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Kontrollerar nätverk: verkar avaktiverat\n"
 
-#: ../mdkapplet:319
+#: ../mdkapplet:333
 #, c-format
 msgid "Checking config file: Not present\n"
 msgstr "Kontrollerar konfigurationsfil: Ej tillgänglig\n"
 
-#: ../mdkapplet:353
+#: ../mdkapplet:365
 #, c-format
 msgid "Logs"
 msgstr "Loggar"
 
-#: ../mdkapplet:369
+#: ../mdkapplet:381
 #, c-format
 msgid "Clear"
 msgstr "Töm"
 
-#: ../mdkapplet:396
+#: ../mdkapplet:408
 #, c-format
 msgid "About..."
 msgstr "Om.."
 
-#: ../mdkapplet:397
+#: ../mdkapplet:409
 #, c-format
 msgid "Always launch on startup"
 msgstr "Kör alltid vid uppstart"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:411
 #, c-format
 msgid "Quit"
 msgstr "Avsluta"
 
-#: ../mdkonline:89
+#: ../mdkonline:52 ../mdkonline:106
 #, c-format
-msgid "Next"
-msgstr "Nästa"
+msgid "Mandrakeonline"
+msgstr "Mandrakeonline"
 
-#: ../mdkonline:89
+#: ../mdkonline:55
+#, c-format
+msgid "I already have an account"
+msgstr "Jag har redan ett konto"
+
+#: ../mdkonline:56
+#, c-format
+msgid "I want to subscribe"
+msgstr "Jag vill prenumerera"
+
+#: ../mdkonline:89 ../mdkonline:93 ../mdkonline:131
 #, c-format
-msgid "Cancel"
-msgstr "Avbryt"
+msgid "Please wait"
+msgstr "Vänta"
 
 #: ../mdkonline:89
 #, c-format
-msgid "Previous"
-msgstr "Föregående"
+msgid "Reading configuration\n"
+msgstr "Läser konfiguration\n"
 
-#: ../mdkonline:103
+#: ../mdkonline:93
 #, c-format
-msgid "Welcome to Mandrakeonline"
-msgstr "Välkommen till Mandrakelinux Online"
+msgid "Sending configuration..."
+msgstr "Skickar konfiguration..."
 
-#: ../mdkonline:104 ../mdkonline_tui:98
+#: ../mdkonline:109
 #, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
@@ -305,62 +325,37 @@ msgstr ""
 "databas för att kunna hålla dig informerad om säkerhetsuppdateringar\n"
 "och andra användbara uppdateringar.\n"
 
-#: ../mdkonline:105 ../mdkonline_tui:142
+#: ../mdkonline:114
 #, c-format
-msgid "Create a Mandrakeonline Account"
-msgstr "Skapa ett Mandrakeonline konto"
+msgid "Account creation or authentication"
+msgstr "Skapar eller autentiserar konto"
 
-#: ../mdkonline:107
+#: ../mdkonline:119
 #, c-format
-msgid "I don't have a Mandrakeonline account and I want to subscribe"
-msgstr "Jag har inget Mandrakeonline-konto och jag vill prenumerera"
+msgid "Enter your Mandrakeonline login, password and machine name:"
+msgstr "Ange ditt Mandrakeonline-användarnamn, lösenord och datornamn:"
 
-#: ../mdkonline:111 ../mdkonline:131 ../mdkonline_tui:114 ../mdkonline_tui:145
+#: ../mdkonline:125 ../mdkonline:156
 #, c-format
 msgid "Login:"
 msgstr "Användarnamn:"
 
-#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:115 ../mdkonline_tui:146
+#: ../mdkonline:126 ../mdkonline:157
 #, c-format
 msgid "Password:"
 msgstr "Lösenord:"
 
-#: ../mdkonline:113 ../mdkonline_tui:147
-#, c-format
-msgid "Confirm Password:"
-msgstr "Bekräfta lösenord:"
-
-#: ../mdkonline:114 ../mdkonline_tui:148
-#, c-format
-msgid "Mail contact:"
-msgstr "E-postadress:"
-
-#: ../mdkonline:121
-#, c-format
-msgid "Mandrakelinux Privacy Policy"
-msgstr "Mandrakes integritetspolicy"
-
 #: ../mdkonline:127
 #, c-format
-msgid "Authentification"
-msgstr "Autentisering"
-
-#: ../mdkonline:128 ../mdkonline_tui:108
-#, c-format
-msgid "Enter your Mandrakeonline login, password and machine name:"
-msgstr "Ange ditt Mandrakeonline-användarnamn, lösenord och datornamn:"
-
-#: ../mdkonline:133 ../mdkonline_tui:116
-#, c-format
 msgid "Machine name:"
 msgstr "Datornamn:"
 
-#: ../mdkonline:138
+#: ../mdkonline:131
 #, c-format
-msgid "Send Configuration"
-msgstr "Skicka konfiguration"
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Kontaktar Mandrakeonlines websajt"
 
-#: ../mdkonline:139 ../mdkonline_tui:128
+#: ../mdkonline:139
 #, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
@@ -394,56 +389,56 @@ msgstr ""
 "Du kan även dra nytta av de rabbatterade supporttjänsterna på \n"
 "www.mandrakeexpert.com."
 
-#: ../mdkonline:144 ../mdkonline:211 ../mdkonline:234
+#: ../mdkonline:141 ../mdkonline:180 ../mdkupdate:126 ../mdkupdate:198
 #, c-format
-msgid "Finish"
-msgstr "Klar"
+msgid "Connection problem"
+msgstr "Anslutningsproblem"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid "Your upload was successful!"
-msgstr "Uppladdningen lyckades!"
+msgid "or"
+msgstr "eller"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandrakeonline."
-msgstr ""
-"Från och med nu kommer du att få säkerhets-\n"
-"och uppdateringsannonseringar tack vare Mandrakeonline."
+msgid "wrong password:"
+msgstr "felaktigt lösenord:"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
 msgid ""
-"Mandrakeonline offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+"Your login or password was wrong.\n"
+" Either you'll have to type it again, or you'll need to create an account on "
+"Mandrakeonline.\n"
+" In the latter case, go back to the first step to connect to "
+"Mandrakeonline.\n"
+" Be aware that you must also provide a Machine name \n"
+" (only alphabetical characters are admitted)"
 msgstr ""
-"Mandrakeonline erbjuder dig möjligheten att automatisera uppdateringarna.\n"
-"Ett program kommer regelbundet att köras på systemet och vänta på nya "
-"uppdateringar.\n"
-
-#: ../mdkonline:146
-#, c-format
-msgid "automated Upgrades"
-msgstr "automatiska uppdateringar"
+"Ditt användarnamn eller lösenord var felaktigt.\n"
+" Antingen behöver du ange det igen eller så behöver du skapa ett konto på "
+"Mandrakeonline.\n"
+" I det senare fallet måste du gå tillbaks till första steget för att ansluta "
+"till Mandrakeonline.\n"
+" Var medveten om att du måste ange ett datornamn \n"
+" (bara alfabetiska tecken är tillåtna)"
 
-#: ../mdkonline:150
+#: ../mdkonline:153
 #, c-format
-msgid "Country:"
-msgstr "Land:"
+msgid "Create a Mandrakeonline Account"
+msgstr "Skapa ett Mandrakeonline konto"
 
-#: ../mdkonline:178 ../mdkonline:183 ../mdkonline:185 ../mdkonline:187
+#: ../mdkonline:158
 #, c-format
-msgid "Error"
-msgstr "Fel"
+msgid "Confirm Password:"
+msgstr "Bekräfta lösenord:"
 
-#: ../mdkonline:183 ../mdkonline_tui:152
+#: ../mdkonline:159
 #, c-format
-msgid "Please provide a login"
-msgstr "Var vänlig ange användarnamn"
+msgid "Mail contact:"
+msgstr "E-postadress:"
 
-#: ../mdkonline:185 ../mdkonline_tui:152
+#: ../mdkonline:163
 #, c-format
 msgid ""
 "The passwords do not match\n"
@@ -452,161 +447,117 @@ msgstr ""
 "Lösenorden är inte lika.\n"
 " Försök igen.\n"
 
-#: ../mdkonline:187 ../mdkonline_tui:152
+#: ../mdkonline:163
+#, c-format
+msgid "Please provide a login"
+msgstr "Var vänlig ange användarnamn"
+
+#: ../mdkonline:163
 #, c-format
 msgid "Not a valid mail address!\n"
 msgstr "Inte en giltig e-postadress.\n"
 
-#: ../mdkonline:199 ../mdkonline_tui:78
+#: ../mdkonline:169
 #, c-format
-msgid "Reading configuration\n"
-msgstr "Läser konfiguration\n"
+msgid ""
+"Mandrakeonline Account successfully created.\n"
+"Please click \"Next\" to authenticate and upload your configuration\n"
+msgstr ""
+"Mandrakeonline konto skapades.\n"
+"Klicka \"Nästa\" för att autentisera och ladda upp din konfiguration\n"
 
-#: ../mdkonline:204 ../mdkonline_tui:82
+#: ../mdkonline:178
 #, c-format
-msgid "Sending configuration..."
-msgstr "Skickar konfiguration..."
+msgid "Your upload was successful!"
+msgstr "Uppladdningen lyckades!"
 
-#: ../mdkonline:213 ../mdkonline:273 ../mdkonline_tui:130 ../mdkonline_tui:169
-#: ../mdkupdate:124 ../mdkupdate:195
+#: ../mdkonline:178
 #, c-format
-msgid "Connection problem"
-msgstr "Anslutningsproblem"
+msgid ""
+"From now you will receive on security and updates \n"
+"announcements thanks to Mandrakeonline."
+msgstr ""
+"Från och med nu kommer du att få säkerhets-\n"
+"och uppdateringsannonseringar tack vare Mandrakeonline."
+
+#: ../mdkonline:178
+#, c-format
+msgid ""
+"Mandrakeonline offers you the ability to automate the updates.\n"
+"A program will run regulary in your system waiting for new updates\n"
+msgstr ""
+"Mandrakeonline erbjuder dig möjligheten att automatisera uppdateringarna.\n"
+"Ett program kommer regelbundet att köras på systemet och vänta på nya "
+"uppdateringar.\n"
 
-#: ../mdkonline:213 ../mdkonline_tui:169
+#: ../mdkonline:180
 #, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr "Ett fel inträffade när filerna laddades upp, var vänlig försök igen"
 
-#: ../mdkonline:251
+#: ../mdkonline:186
 #, c-format
-msgid "Quitting Wizard\n"
-msgstr "Avslutar guiden\n"
+msgid "Country"
+msgstr "Land"
 
-#: ../mdkonline:273
+#: ../mdkonline:198
 #, c-format
-msgid "Mandrakeonline could not be contacted, please try again at a later time"
-msgstr "Mandrakeonline kunde inte kontaktas, var vänlig försök igen senare"
+msgid "Congratulations"
+msgstr "Gratulerar"
 
-#: ../mdkonline:285
+#: ../mdkonline:198
 #, c-format
-msgid "Wrong password"
-msgstr "Felaktigt lösenord"
+msgid "Your Mandrakeonline account has been successfully configured\n"
+msgstr "Konfigureringen av ditt Mandrakeonline-konto lyckades\n"
+
+#: ../mdkonline:214
+#, fuzzy, c-format
+msgid "Configuration uploaded successfully"
+msgstr "Uppladdningen lyckades!"
+
+#: ../mdkonline:215
+#, fuzzy, c-format
+msgid "Problem uploading configuration"
+msgstr "Läser konfiguration\n"
 
-#: ../mdkonline:285 ../mdkonline_tui:130
+#: ../mdkonline:216
 #, c-format
 msgid ""
-"Your login or password was wrong.\n"
-" Either you'll have to type it again, or you'll need to create an account on "
-"Mandrakeonline.\n"
-" In the latter case, go back to the first step to connect to "
-"Mandrakeonline.\n"
-" Be aware that you must also provide a Machine name \n"
-" (only alphabetical characters are admitted)"
+"Cannot connect to mandrakeonline website: wrong login/password or router/"
+"firewall bad settings"
 msgstr ""
-"Ditt användarnamn eller lösenord var felaktigt.\n"
-" Antingen behöver du ange det igen eller så behöver du skapa ett konto på "
-"Mandrakeonline.\n"
-" I det senare fallet måste du gå tillbaks till första steget för att ansluta "
-"till Mandrakeonline.\n"
-" Var medveten om att du måste ange ett datornamn \n"
-" (bara alfabetiska tecken är tillåtna)"
 
-#: ../mdkonline.pm:58
+#: ../mdkonline.pm:66
 #, c-format
 msgid "Login and password should be less than 12 characters\n"
 msgstr "Användarnamn och lösenord bör vara mindre än 12 tecken\n"
 
-#: ../mdkonline.pm:59
+#: ../mdkonline.pm:67
 #, c-format
 msgid "Special characters are not allowed\n"
 msgstr "Specialtecken är ej tillåtna\n"
 
-#: ../mdkonline.pm:60
+#: ../mdkonline.pm:68
 #, c-format
 msgid "Please fill in all fields\n"
 msgstr "Fyll i alla fält\n"
 
-#: ../mdkonline.pm:61
+#: ../mdkonline.pm:69
 #, c-format
 msgid "Email not valid\n"
 msgstr "Ogiltig epostadress\n"
 
-#: ../mdkonline.pm:62
+#: ../mdkonline.pm:70
 #, c-format
 msgid "Account already exist\n"
 msgstr "Kontot existerar redan\n"
 
-#: ../mdkonline.pm:68
+#: ../mdkonline.pm:76
 #, c-format
 msgid "Problem connecting to server \n"
 msgstr "Problem med att kontakta servern \n"
 
-#: ../mdkonline_tui:45 ../mdkonline_tui:95
-#, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
-
-#: ../mdkonline_tui:48
-#, c-format
-msgid "I already have an account"
-msgstr "Jag har redan ett konto"
-
-#: ../mdkonline_tui:49
-#, c-format
-msgid "I want to subscribe"
-msgstr "Jag vill prenumerera"
-
-#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:120
-#, c-format
-msgid "Please wait"
-msgstr "Vänta"
-
-#: ../mdkonline_tui:103
-#, c-format
-msgid "Account creation or authentication"
-msgstr "Skapar eller autentiserar konto"
-
-#: ../mdkonline_tui:120
-#, c-format
-msgid "Connecting to Mandrakeonline website..."
-msgstr "Kontaktar Mandrakeonlines websajt"
-
-#: ../mdkonline_tui:130
-#, c-format
-msgid "or"
-msgstr "eller"
-
-#: ../mdkonline_tui:130
-#, c-format
-msgid "wrong password:"
-msgstr "felaktigt lösenord:"
-
-#: ../mdkonline_tui:158
-#, c-format
-msgid ""
-"Mandrakeonline Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-"Mandrakeonline konto skapades.\n"
-"Klicka \"Nästa\" för att autentisera och ladda upp din konfiguration\n"
-
-#: ../mdkonline_tui:175
-#, c-format
-msgid "Country"
-msgstr "Land"
-
-#: ../mdkonline_tui:187
-#, c-format
-msgid "Congratulations"
-msgstr "Gratulerar"
-
-#: ../mdkonline_tui:187
-#, c-format
-msgid "Your Mandrakeonline account has been successfully configured\n"
-msgstr "Konfigureringen av ditt Mandrakeonline-konto lyckades\n"
-
-#: ../mdkupdate:50
+#: ../mdkupdate:52
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
@@ -622,37 +573,32 @@ msgstr ""
 "\n"
 "användning:\n"
 
-#: ../mdkupdate:55
+#: ../mdkupdate:57
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - visa det här hjälpmeddelandet.\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:58
 #, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto         - Mandrakeupdate startas automatiskt.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:59
 #, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - starta Mandrakeupdate.\n"
 
-#: ../mdkupdate:58
-#, c-format
-msgid "  --update       - Update keys\n"
-msgstr "  --update       - Uppdatera nycklar\n"
-
-#: ../mdkupdate:66
+#: ../mdkupdate:67
 #, c-format
 msgid "No %s file found. Run mdkonline wizard first"
 msgstr "%s fil ej funnen. Kör mdkonline guiden först"
 
-#: ../mdkupdate:124
+#: ../mdkupdate:126
 #, c-format
 msgid "Mandrakeupdate could not contact the site, we will try again."
 msgstr "Mandrakeupdate kunde ej nå sajten, kommer försöka igen senare."
 
-#: ../mdkupdate:173
+#: ../mdkupdate:176
 #, c-format
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr "Kunde ej uppdatera paket från mdkupdate källan.\n"
@@ -662,7 +608,7 @@ msgstr "Kunde ej uppdatera paket från mdkupdate källan.\n"
 # någon som är van vid att skriva enkla spamfällor
 # i sina mailadresser. Men varför i intern websida?
 # /Lars
-#: ../mdkupdate:195
+#: ../mdkupdate:198
 #, c-format
 msgid ""
 "Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
@@ -670,3 +616,49 @@ msgid ""
 msgstr ""
 "Mandrakeupdate kunde inte ladda upp diff filerna. Skicka ett mail till "
 "support[at]mandrakeonline[punkt]net"
+
+#~ msgid "Next"
+#~ msgstr "Nästa"
+
+#~ msgid "Cancel"
+#~ msgstr "Avbryt"
+
+#~ msgid "Previous"
+#~ msgstr "Föregående"
+
+#~ msgid "I don't have a Mandrakeonline account and I want to subscribe"
+#~ msgstr "Jag har inget Mandrakeonline-konto och jag vill prenumerera"
+
+#~ msgid "Mandrakelinux Privacy Policy"
+#~ msgstr "Mandrakes integritetspolicy"
+
+#~ msgid "Authentification"
+#~ msgstr "Autentisering"
+
+#~ msgid "Send Configuration"
+#~ msgstr "Skicka konfiguration"
+
+#~ msgid "Finish"
+#~ msgstr "Klar"
+
+#~ msgid "automated Upgrades"
+#~ msgstr "automatiska uppdateringar"
+
+#~ msgid "Country:"
+#~ msgstr "Land:"
+
+#~ msgid "Error"
+#~ msgstr "Fel"
+
+#~ msgid "Quitting Wizard\n"
+#~ msgstr "Avslutar guiden\n"
+
+#~ msgid ""
+#~ "Mandrakeonline could not be contacted, please try again at a later time"
+#~ msgstr "Mandrakeonline kunde inte kontaktas, var vänlig försök igen senare"
+
+#~ msgid "Wrong password"
+#~ msgstr "Felaktigt lösenord"
+
+#~ msgid "  --update       - Update keys\n"
+#~ msgstr "  --update       - Uppdatera nycklar\n"
diff --git a/po/ta.po b/po/ta.po
index 9b4cd5a1..6fe69573 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-01 22:41+0200\n"
+"POT-Creation-Date: 2004-11-03 12:10+0100\n"
 "PO-Revision-Date: 2002-08-23 20:02-0400\n"
 "Last-Translator: prabu <prabu_anand2000@yahoo.com>\n"
 "Language-Team: Tamil\n"
@@ -15,271 +15,291 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../mdkapplet:61
+#: ../mdkapplet:63
 #, c-format
 msgid "Your system is up-to-date"
 msgstr ""
 
-#: ../mdkapplet:67
+#: ../mdkapplet:69
 #, fuzzy, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrakeonline.net"
 msgstr "பிழைகளை ஆங்கிலத்தில் ெதரிவிக்க support@mandrakeonline.net\n"
 
-#: ../mdkapplet:73
+#: ../mdkapplet:75
 #, c-format
 msgid "System is busy. Please wait ..."
 msgstr ""
 
-#: ../mdkapplet:79
+#: ../mdkapplet:81
 #, fuzzy, c-format
 msgid "New updates are available for your system"
 msgstr "வலையமைப்பு அட்ைட எதுவும் காணப்படவில்ைல"
 
-#: ../mdkapplet:85
+#: ../mdkapplet:87
 #, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr ""
 
-#: ../mdkapplet:91
+#: ../mdkapplet:93
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr ""
 
-#: ../mdkapplet:97
+#: ../mdkapplet:99
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 
-#: ../mdkapplet:103
+#: ../mdkapplet:105
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:108 ../mdkapplet:158
+#: ../mdkapplet:110 ../mdkapplet:164
 #, fuzzy, c-format
 msgid "Install updates"
 msgstr "உருகருக்களை நிறுவுங்கள்"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:111
 #, fuzzy, c-format
 msgid "Configure the service"
 msgstr "வடிவமை"
 
-#: ../mdkapplet:110
+#: ../mdkapplet:112
 #, fuzzy, c-format
 msgid "Check Updates"
 msgstr "புதுப்பித்தல்கள்"
 
-#: ../mdkapplet:111
+#: ../mdkapplet:113 ../mdkapplet:167 ../mdkapplet:225
+#, fuzzy, c-format
+msgid "Please Wait"
+msgstr "தயவுசெய்து காத்திருக்கவும்.."
+
+#: ../mdkapplet:113 ../mdkapplet:166 ../mdkapplet:167 ../mdkapplet:225
+#, fuzzy, c-format
+msgid "Check updates"
+msgstr "பாதுகாப்பு புதுப்பித்தல்"
+
+#: ../mdkapplet:115
 #, c-format
 msgid "Online WebSite"
 msgstr ""
 
-#: ../mdkapplet:112
+#: ../mdkapplet:116
 #, fuzzy, c-format
 msgid "Configure Network"
 msgstr "வலையமைப்பாக்கங்களை வடிவமையுங்கள்"
 
-#: ../mdkapplet:113
+#: ../mdkapplet:117
 #, fuzzy, c-format
 msgid "Configure Now!"
 msgstr "வடிவமைப்பு படித்துக்கொன்டிருக்கிறது\n"
 
-#: ../mdkapplet:146
+#: ../mdkapplet:152 ../mdkapplet:229
 #, fuzzy, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "மாண்டிரேக் கொள்கை"
 
-#: ../mdkapplet:156
+#: ../mdkapplet:162
 #, c-format
 msgid "Actions"
 msgstr "செயல்கள்"
 
-#: ../mdkapplet:159
+#: ../mdkapplet:165
 #, c-format
 msgid "Configure"
 msgstr "வடிவமை"
 
-#: ../mdkapplet:160
-#, fuzzy, c-format
-msgid "Check updates"
-msgstr "பாதுகாப்பு புதுப்பித்தல்"
-
-#: ../mdkapplet:161
+#: ../mdkapplet:169
 #, c-format
 msgid "See logs"
 msgstr ""
 
-#: ../mdkapplet:164
+#: ../mdkapplet:172
 #, c-format
 msgid "Status"
 msgstr "நிலவரம்"
 
-#: ../mdkapplet:168 ../mdkapplet:363
+#: ../mdkapplet:176 ../mdkapplet:375
 #, c-format
 msgid "Close"
 msgstr "மூடு"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, fuzzy, c-format
 msgid "Network Connection: "
 msgstr "தொலைப்புழங்கி"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Up"
 msgstr ""
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, fuzzy, c-format
 msgid "Down"
 msgstr "முடிந்தது"
 
-#: ../mdkapplet:204
+#: ../mdkapplet:212
 #, c-format
 msgid "Last check: "
 msgstr ""
 
-#: ../mdkapplet:205
+#: ../mdkapplet:213
 #, fuzzy, c-format
 msgid "Updates: "
 msgstr "புதுப்பித்தல்கள்"
 
-#: ../mdkapplet:209
+#: ../mdkapplet:217
 #, fuzzy, c-format
 msgid "Launching drakconnect\n"
 msgstr "டிரேக்பயனரை துவக்கு"
 
-#: ../mdkapplet:213
+#: ../mdkapplet:221
 #, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr ""
 
-#: ../mdkapplet:217
+#: ../mdkapplet:224
 #, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 
-#: ../mdkapplet:225
+#: ../mdkapplet:235
 #, fuzzy, c-format
 msgid "Computing new updates...\n"
 msgstr "தொடர்பில் பிழை நேர்ந்துள்ளது"
 
-#: ../mdkapplet:227
+#: ../mdkapplet:237
 #, fuzzy, c-format
 msgid "Connecting to"
 msgstr "தொடர்பில் பிழை நேர்ந்துள்ளது"
 
-#: ../mdkapplet:250
+#: ../mdkapplet:244
+#, fuzzy, c-format
+msgid "Response from Mandrakeonline server\n"
+msgstr "மாண்டிரேக் இணையத்தளத்திற்கு வருக"
+
+#: ../mdkapplet:262
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr ""
 
-#: ../mdkapplet:254
+#: ../mdkapplet:267
 #, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
-#: ../mdkapplet:255
+#: ../mdkapplet:268
 #, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
-#: ../mdkapplet:256
+#: ../mdkapplet:269
 #, fuzzy, c-format
 msgid "Unknown state"
 msgstr "தெரியாத பயனர்"
 
-#: ../mdkapplet:257
+#: ../mdkapplet:270
 #, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr ""
 
-#: ../mdkapplet:258
+#: ../mdkapplet:271
 #, c-format
 msgid "Wrong Password.\n"
 msgstr "தவறான கடவுச்சொல்\n"
 
-#: ../mdkapplet:259
+#: ../mdkapplet:272
 #, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr ""
 
-#: ../mdkapplet:260
+#: ../mdkapplet:273
 #, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
 msgstr ""
 
-#: ../mdkapplet:264
+#: ../mdkapplet:277
 #, fuzzy, c-format
 msgid "System is up-to-date\n"
 msgstr "இயக்க முறைமை"
 
-#: ../mdkapplet:303
+#: ../mdkapplet:317
 #, c-format
 msgid "No check"
 msgstr ""
 
-#: ../mdkapplet:316
+#: ../mdkapplet:330
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
-#: ../mdkapplet:319
+#: ../mdkapplet:333
 #, c-format
 msgid "Checking config file: Not present\n"
 msgstr ""
 
-#: ../mdkapplet:353
+#: ../mdkapplet:365
 #, c-format
 msgid "Logs"
 msgstr "பதிவுகள்"
 
-#: ../mdkapplet:369
+#: ../mdkapplet:381
 #, c-format
 msgid "Clear"
 msgstr "துடை"
 
-#: ../mdkapplet:396
+#: ../mdkapplet:408
 #, c-format
 msgid "About..."
 msgstr "பற்றி..."
 
-#: ../mdkapplet:397
+#: ../mdkapplet:409
 #, c-format
 msgid "Always launch on startup"
 msgstr ""
 
-#: ../mdkapplet:399
+#: ../mdkapplet:411
 #, c-format
 msgid "Quit"
 msgstr "வெளிச்செல்"
 
-#: ../mdkonline:89
+#: ../mdkonline:52 ../mdkonline:106
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "மாண்டிரேக் இணையத்தளத்திற்கு வருக"
+
+#: ../mdkonline:55
 #, c-format
-msgid "Next"
-msgstr "அடுத்து"
+msgid "I already have an account"
+msgstr ""
 
-#: ../mdkonline:89
+#: ../mdkonline:56
 #, c-format
-msgid "Cancel"
-msgstr "நீக்கு"
+msgid "I want to subscribe"
+msgstr ""
 
-#: ../mdkonline:89
+#: ../mdkonline:89 ../mdkonline:93 ../mdkonline:131
 #, c-format
-msgid "Previous"
-msgstr "முன்னது"
+msgid "Please wait"
+msgstr "தயவுசெய்து காத்திருக்கவும்.."
 
-#: ../mdkonline:103
+#: ../mdkonline:89
 #, c-format
-msgid "Welcome to Mandrakeonline"
-msgstr "மாண்டிரேக் இணையத்தளத்திற்கு வருக"
+msgid "Reading configuration\n"
+msgstr "வடிவமைப்பு படித்துக்கொன்டிருக்கிறது\n"
+
+#: ../mdkonline:93
+#, fuzzy, c-format
+msgid "Sending configuration..."
+msgstr "வடிவமைப்பு படித்துக்கொன்டிருக்கிறது\n"
 
-#: ../mdkonline:104 ../mdkonline_tui:98
+#: ../mdkonline:109
 #, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
@@ -290,68 +310,39 @@ msgstr ""
 "புதிய நிரல்களை அனுப்ப வடிவமைப்பு விவரங்களை ஓர் தரவுத்தளத்திற்கு\n"
 "அனுப்பி வைக்கும்.\n"
 
-#: ../mdkonline:105 ../mdkonline_tui:142
-#, fuzzy, c-format
-msgid "Create a Mandrakeonline Account"
-msgstr "மாண்ட்ரேக் க்ளப் கணக்கு"
+#: ../mdkonline:114
+#, c-format
+msgid "Account creation or authentication"
+msgstr ""
 
-# inserted a \n because Mandrakeonline has a bug, it doens't wrap long
-# lines and the end of the line is not visible on the window...
-#: ../mdkonline:107
-#, fuzzy, c-format
-msgid "I don't have a Mandrakeonline account and I want to subscribe"
+#: ../mdkonline:119
+#, c-format
+msgid "Enter your Mandrakeonline login, password and machine name:"
 msgstr ""
-"மாண்டிரேக் இணையத்தளத்ளத்தில் எனக்கு\n"
-"பயனர்கணக்கு இல்லை.எனக்கொன்று "
+"உங்கள் மாண்டிரேக் இணையத்தள பயனர்கணக்கின்\n"
+"பெயர்,கடவுச்சொல்லை அடிக்கவும்"
 
-#: ../mdkonline:111 ../mdkonline:131 ../mdkonline_tui:114 ../mdkonline_tui:145
+#: ../mdkonline:125 ../mdkonline:156
 #, c-format
 msgid "Login:"
 msgstr "பயனர்கணக்கின் பெயர்"
 
-#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:115 ../mdkonline_tui:146
+#: ../mdkonline:126 ../mdkonline:157
 #, c-format
 msgid "Password:"
 msgstr "கடவுச்சொல்"
 
-#: ../mdkonline:113 ../mdkonline_tui:147
-#, c-format
-msgid "Confirm Password:"
-msgstr "கடவுச்சொல்லை உறுதிச் செய்:"
-
-#: ../mdkonline:114 ../mdkonline_tui:148
-#, fuzzy, c-format
-msgid "Mail contact:"
-msgstr "மின்னஞ்சல் முகவரி:"
-
-#: ../mdkonline:121
-#, c-format
-msgid "Mandrakelinux Privacy Policy"
-msgstr "மாண்டிரேக் கொள்கை"
-
 #: ../mdkonline:127
 #, c-format
-msgid "Authentification"
-msgstr "நல்குாிமை"
-
-#: ../mdkonline:128 ../mdkonline_tui:108
-#, c-format
-msgid "Enter your Mandrakeonline login, password and machine name:"
-msgstr ""
-"உங்கள் மாண்டிரேக் இணையத்தள பயனர்கணக்கின்\n"
-"பெயர்,கடவுச்சொல்லை அடிக்கவும்"
-
-#: ../mdkonline:133 ../mdkonline_tui:116
-#, c-format
 msgid "Machine name:"
 msgstr "கணிணியின் பெயர்"
 
-#: ../mdkonline:138
+#: ../mdkonline:131
 #, fuzzy, c-format
-msgid "Send Configuration"
-msgstr "ஒலி வடிவமைப்பு"
+msgid "Connecting to Mandrakeonline website..."
+msgstr "மாண்டிரேக் இணையத்தளத்திற்கு வருக"
 
-#: ../mdkonline:139 ../mdkonline_tui:128
+#: ../mdkonline:139
 #, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
@@ -381,55 +372,55 @@ msgstr ""
 "பாதுகாப்பு, புதிய நிரல் பற்றி அறியலாம்.\n"
 "மேலும் நீங்கள் www.mandrakeexpert.com என்ற இணையத்தளத்திற்கு."
 
-#: ../mdkonline:144 ../mdkonline:211 ../mdkonline:234
-#, c-format
-msgid "Finish"
-msgstr "முடிந்தது"
-
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141 ../mdkonline:180 ../mdkupdate:126 ../mdkupdate:198
 #, c-format
-msgid "Your upload was successful!"
-msgstr "உங்கள் மேலேற்றுதல் வெற்றியடைந்தது"
+msgid "Connection problem"
+msgstr "தொடர்பில் பிழை நேர்ந்துள்ளது"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandrakeonline."
+msgid "or"
 msgstr ""
-"இப்போது முதல் நீங்கள் மாண்டிரேக் இணையத்தளத்திலிருந்து\n"
-"பாதுகாப்பு, புதிய நிரல் பற்றி அறியலாம்"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "தவறான கடவுச்சொல்"
+
+#: ../mdkonline:141
 #, c-format
 msgid ""
-"Mandrakeonline offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+"Your login or password was wrong.\n"
+" Either you'll have to type it again, or you'll need to create an account on "
+"Mandrakeonline.\n"
+" In the latter case, go back to the first step to connect to "
+"Mandrakeonline.\n"
+" Be aware that you must also provide a Machine name \n"
+" (only alphabetical characters are admitted)"
 msgstr ""
-"மாண்டிரேக் இணையம் உங்கள் கணிணியில் புதிய நிரல்களை நிறுவும்\n"
-"புதிய நிரல் பற்றி அறிய உங்கள் கணிணியில் நிரல் ஓடிக்கொண்டிருக்கும்\n"
-
-#: ../mdkonline:146
-#, c-format
-msgid "automated Upgrades"
-msgstr "புதிய நிரல்களை நிறுவ"
+"உங்கள்  பயனர்கணக்கு அல்லது கடவுச்சொல் தவறானது.\n"
+"மீண்டும் முயன்று பார்க்கலாம், அல்லது மாண்டிரேக் இணையத்தளத்தில்\n"
+"புதிய பயனர்கணக்கு துவக்கலாம்.\n"
+"மாண்டிரேக் இணையத்தளத்தில் பயனர்கணக்கு துவக்க, முதல் பக்கத்திற்குச்\n"
+"செல்லவும் ஆனால் ஆங்கில்த்தில் கணிணிக்குப் பெயரிட வேண்டும்\n"
+"எழுத்துகள் மடடுமே பயனிக்கலாம்"
 
-#: ../mdkonline:150
+#: ../mdkonline:153
 #, fuzzy, c-format
-msgid "Country:"
-msgstr "நாடு "
+msgid "Create a Mandrakeonline Account"
+msgstr "மாண்ட்ரேக் க்ளப் கணக்கு"
 
-#: ../mdkonline:178 ../mdkonline:183 ../mdkonline:185 ../mdkonline:187
+#: ../mdkonline:158
 #, c-format
-msgid "Error"
-msgstr "பிழை"
+msgid "Confirm Password:"
+msgstr "கடவுச்சொல்லை உறுதிச் செய்:"
 
-#: ../mdkonline:183 ../mdkonline_tui:152
+#: ../mdkonline:159
 #, fuzzy, c-format
-msgid "Please provide a login"
-msgstr "மீண்டும் முயற்சித்து பார்க்கவும்"
+msgid "Mail contact:"
+msgstr "மின்னஞ்சல் முகவரி:"
 
-#: ../mdkonline:185 ../mdkonline_tui:152
+#: ../mdkonline:163
 #, c-format
 msgid ""
 "The passwords do not match\n"
@@ -438,160 +429,114 @@ msgstr ""
 "கடவுச்சொற்கள் பொருத்தமாக இல்லை.\n"
 "தயவுசெய்து மீண்டும் முயன்று பார்க்கவும்\n"
 
-#: ../mdkonline:187 ../mdkonline_tui:152
-#, c-format
-msgid "Not a valid mail address!\n"
-msgstr "சரியான மின்னஞ்சல் முகவரி அல்ல!\n"
-
-#: ../mdkonline:199 ../mdkonline_tui:78
-#, c-format
-msgid "Reading configuration\n"
-msgstr "வடிவமைப்பு படித்துக்கொன்டிருக்கிறது\n"
-
-#: ../mdkonline:204 ../mdkonline_tui:82
+#: ../mdkonline:163
 #, fuzzy, c-format
-msgid "Sending configuration..."
-msgstr "வடிவமைப்பு படித்துக்கொன்டிருக்கிறது\n"
-
-#: ../mdkonline:213 ../mdkonline:273 ../mdkonline_tui:130 ../mdkonline_tui:169
-#: ../mdkupdate:124 ../mdkupdate:195
-#, c-format
-msgid "Connection problem"
-msgstr "தொடர்பில் பிழை நேர்ந்துள்ளது"
+msgid "Please provide a login"
+msgstr "மீண்டும் முயற்சித்து பார்க்கவும்"
 
-#: ../mdkonline:213 ../mdkonline_tui:169
+#: ../mdkonline:163
 #, c-format
-msgid "Problem occurs when uploading files, please try again"
-msgstr ""
+msgid "Not a valid mail address!\n"
+msgstr "சரியான மின்னஞ்சல் முகவரி அல்ல!\n"
 
-#: ../mdkonline:251
+#: ../mdkonline:169
 #, c-format
-msgid "Quitting Wizard\n"
-msgstr "மாயாவியை விட்டு வெளிச்செல்\n"
-
-#: ../mdkonline:273
-#, fuzzy, c-format
-msgid "Mandrakeonline could not be contacted, please try again at a later time"
+msgid ""
+"Mandrakeonline Account successfully created.\n"
+"Please click \"Next\" to authenticate and upload your configuration\n"
 msgstr ""
-"மாண்ட்ேரக்புதுப்பி  இணையத்தளத்துடன் தொடர்பு \n"
-"கொள்ள முடியவில்லை,பிறகு முயலுங்கள்"
 
-#: ../mdkonline:285
+#: ../mdkonline:178
 #, c-format
-msgid "Wrong password"
-msgstr "தவறான கடவுச்சொல்"
+msgid "Your upload was successful!"
+msgstr "உங்கள் மேலேற்றுதல் வெற்றியடைந்தது"
 
-#: ../mdkonline:285 ../mdkonline_tui:130
+#: ../mdkonline:178
 #, c-format
 msgid ""
-"Your login or password was wrong.\n"
-" Either you'll have to type it again, or you'll need to create an account on "
-"Mandrakeonline.\n"
-" In the latter case, go back to the first step to connect to "
-"Mandrakeonline.\n"
-" Be aware that you must also provide a Machine name \n"
-" (only alphabetical characters are admitted)"
+"From now you will receive on security and updates \n"
+"announcements thanks to Mandrakeonline."
 msgstr ""
-"உங்கள்  பயனர்கணக்கு அல்லது கடவுச்சொல் தவறானது.\n"
-"மீண்டும் முயன்று பார்க்கலாம், அல்லது மாண்டிரேக் இணையத்தளத்தில்\n"
-"புதிய பயனர்கணக்கு துவக்கலாம்.\n"
-"மாண்டிரேக் இணையத்தளத்தில் பயனர்கணக்கு துவக்க, முதல் பக்கத்திற்குச்\n"
-"செல்லவும் ஆனால் ஆங்கில்த்தில் கணிணிக்குப் பெயரிட வேண்டும்\n"
-"எழுத்துகள் மடடுமே பயனிக்கலாம்"
+"இப்போது முதல் நீங்கள் மாண்டிரேக் இணையத்தளத்திலிருந்து\n"
+"பாதுகாப்பு, புதிய நிரல் பற்றி அறியலாம்"
 
-#: ../mdkonline.pm:58
+#: ../mdkonline:178
 #, c-format
-msgid "Login and password should be less than 12 characters\n"
+msgid ""
+"Mandrakeonline offers you the ability to automate the updates.\n"
+"A program will run regulary in your system waiting for new updates\n"
 msgstr ""
+"மாண்டிரேக் இணையம் உங்கள் கணிணியில் புதிய நிரல்களை நிறுவும்\n"
+"புதிய நிரல் பற்றி அறிய உங்கள் கணிணியில் நிரல் ஓடிக்கொண்டிருக்கும்\n"
 
-#: ../mdkonline.pm:59
+#: ../mdkonline:180
 #, c-format
-msgid "Special characters are not allowed\n"
+msgid "Problem occurs when uploading files, please try again"
 msgstr ""
 
-#: ../mdkonline.pm:60
-#, c-format
-msgid "Please fill in all fields\n"
-msgstr ""
+#: ../mdkonline:186
+#, fuzzy, c-format
+msgid "Country"
+msgstr "நாடு "
 
-#: ../mdkonline.pm:61
-#, c-format
-msgid "Email not valid\n"
-msgstr ""
+#: ../mdkonline:198
+#, fuzzy, c-format
+msgid "Congratulations"
+msgstr "ஒலி வடிவமைப்பு"
 
-#: ../mdkonline.pm:62
+#: ../mdkonline:198
 #, c-format
-msgid "Account already exist\n"
+msgid "Your Mandrakeonline account has been successfully configured\n"
 msgstr ""
 
-#: ../mdkonline.pm:68
-#, c-format
-msgid "Problem connecting to server \n"
-msgstr "சேவையகத்தோடு  இணைவதில் பிழை நேர்ந்துள்ளது\n"
+#: ../mdkonline:214
+#, fuzzy, c-format
+msgid "Configuration uploaded successfully"
+msgstr "உங்கள் மேலேற்றுதல் வெற்றியடைந்தது"
 
-#: ../mdkonline_tui:45 ../mdkonline_tui:95
+#: ../mdkonline:215
 #, fuzzy, c-format
-msgid "Mandrakeonline"
-msgstr "மாண்டிரேக் இணையத்தளத்திற்கு வருக"
+msgid "Problem uploading configuration"
+msgstr "வடிவமைப்பு படித்துக்கொன்டிருக்கிறது\n"
 
-#: ../mdkonline_tui:48
+#: ../mdkonline:216
 #, c-format
-msgid "I already have an account"
+msgid ""
+"Cannot connect to mandrakeonline website: wrong login/password or router/"
+"firewall bad settings"
 msgstr ""
 
-#: ../mdkonline_tui:49
+#: ../mdkonline.pm:66
 #, c-format
-msgid "I want to subscribe"
+msgid "Login and password should be less than 12 characters\n"
 msgstr ""
 
-#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:120
+#: ../mdkonline.pm:67
 #, c-format
-msgid "Please wait"
-msgstr "தயவுசெய்து காத்திருக்கவும்.."
+msgid "Special characters are not allowed\n"
+msgstr ""
 
-#: ../mdkonline_tui:103
+#: ../mdkonline.pm:68
 #, c-format
-msgid "Account creation or authentication"
+msgid "Please fill in all fields\n"
 msgstr ""
 
-#: ../mdkonline_tui:120
-#, fuzzy, c-format
-msgid "Connecting to Mandrakeonline website..."
-msgstr "மாண்டிரேக் இணையத்தளத்திற்கு வருக"
-
-#: ../mdkonline_tui:130
+#: ../mdkonline.pm:69
 #, c-format
-msgid "or"
+msgid "Email not valid\n"
 msgstr ""
 
-#: ../mdkonline_tui:130
-#, fuzzy, c-format
-msgid "wrong password:"
-msgstr "தவறான கடவுச்சொல்"
-
-#: ../mdkonline_tui:158
+#: ../mdkonline.pm:70
 #, c-format
-msgid ""
-"Mandrakeonline Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
+msgid "Account already exist\n"
 msgstr ""
 
-#: ../mdkonline_tui:175
-#, fuzzy, c-format
-msgid "Country"
-msgstr "நாடு "
-
-#: ../mdkonline_tui:187
-#, fuzzy, c-format
-msgid "Congratulations"
-msgstr "ஒலி வடிவமைப்பு"
-
-#: ../mdkonline_tui:187
+#: ../mdkonline.pm:76
 #, c-format
-msgid "Your Mandrakeonline account has been successfully configured\n"
-msgstr ""
+msgid "Problem connecting to server \n"
+msgstr "சேவையகத்தோடு  இணைவதில் பிழை நேர்ந்துள்ளது\n"
 
-#: ../mdkupdate:50
+#: ../mdkupdate:52
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
@@ -607,50 +552,102 @@ msgstr ""
 "\n"
 "பயன்பாடு\n"
 
-#: ../mdkupdate:55
+#: ../mdkupdate:57
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - இந்த உதவியை காட்டு.\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:58
 #, fuzzy, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --applet       -அைனத்து  விவரங்களையும் புதுப்பிக்கவும்\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:59
 #, fuzzy, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       -அைனத்து  விவரங்களையும் புதுப்பிக்கவும்\n"
 
-#: ../mdkupdate:58
-#, fuzzy, c-format
-msgid "  --update       - Update keys\n"
-msgstr "  --applet       -அைனத்து  விவரங்களையும் புதுப்பிக்கவும்\n"
-
-#: ../mdkupdate:66
+#: ../mdkupdate:67
 #, c-format
 msgid "No %s file found. Run mdkonline wizard first"
 msgstr ""
 
-#: ../mdkupdate:124
+#: ../mdkupdate:126
 #, c-format
 msgid "Mandrakeupdate could not contact the site, we will try again."
 msgstr ""
 "மாண்ட்ேரக்புதுப்பி  இணையத்தளத்துடன் தொடர்பு \n"
 "கொள்ள முடியவில்லை,பிறகு முயலுங்கள்"
 
-#: ../mdkupdate:173
+#: ../mdkupdate:176
 #, c-format
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr "மாண்ட்ேரக்புதுப்பி ஊடகத்திலிருந்து ெமன்ெபாருைள புதுப்பிக்க முடியவில்ைல\n"
 
-#: ../mdkupdate:195
+#: ../mdkupdate:198
 #, c-format
 msgid ""
 "Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
 "mandrakeonline [dot] net"
 msgstr ""
 
+#~ msgid "Next"
+#~ msgstr "அடுத்து"
+
+#~ msgid "Cancel"
+#~ msgstr "நீக்கு"
+
+#~ msgid "Previous"
+#~ msgstr "முன்னது"
+
+# inserted a \n because Mandrakeonline has a bug, it doens't wrap long
+# lines and the end of the line is not visible on the window...
+#, fuzzy
+#~ msgid "I don't have a Mandrakeonline account and I want to subscribe"
+#~ msgstr ""
+#~ "மாண்டிரேக் இணையத்தளத்ளத்தில் எனக்கு\n"
+#~ "பயனர்கணக்கு இல்லை.எனக்கொன்று "
+
+#~ msgid "Mandrakelinux Privacy Policy"
+#~ msgstr "மாண்டிரேக் கொள்கை"
+
+#~ msgid "Authentification"
+#~ msgstr "நல்குாிமை"
+
+#, fuzzy
+#~ msgid "Send Configuration"
+#~ msgstr "ஒலி வடிவமைப்பு"
+
+#~ msgid "Finish"
+#~ msgstr "முடிந்தது"
+
+#~ msgid "automated Upgrades"
+#~ msgstr "புதிய நிரல்களை நிறுவ"
+
+#, fuzzy
+#~ msgid "Country:"
+#~ msgstr "நாடு "
+
+#~ msgid "Error"
+#~ msgstr "பிழை"
+
+#~ msgid "Quitting Wizard\n"
+#~ msgstr "மாயாவியை விட்டு வெளிச்செல்\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Mandrakeonline could not be contacted, please try again at a later time"
+#~ msgstr ""
+#~ "மாண்ட்ேரக்புதுப்பி  இணையத்தளத்துடன் தொடர்பு \n"
+#~ "கொள்ள முடியவில்லை,பிறகு முயலுங்கள்"
+
+#~ msgid "Wrong password"
+#~ msgstr "தவறான கடவுச்சொல்"
+
+#, fuzzy
+#~ msgid "  --update       - Update keys\n"
+#~ msgstr "  --applet       -அைனத்து  விவரங்களையும் புதுப்பிக்கவும்\n"
+
 #, fuzzy
 #~ msgid "Skip Wizard"
 #~ msgstr "மாயாவியைத் தவிர்"
diff --git a/po/tg.po b/po/tg.po
index 994f3a73..536c4d4d 100644
--- a/po/tg.po
+++ b/po/tg.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-tg\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-01 22:41+0200\n"
+"POT-Creation-Date: 2004-11-03 12:10+0100\n"
 "PO-Revision-Date: 2004-08-28 16:30+0000\n"
 "Last-Translator: Abrorova <H_Abrorova@rambler.ru>\n"
 "Language-Team: Tajik\n"
@@ -24,12 +24,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.1\n"
 
-#: ../mdkapplet:61
+#: ../mdkapplet:63
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Системаи навкуниро талаб намекунад"
 
-#: ../mdkapplet:67
+#: ../mdkapplet:69
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -38,191 +38,201 @@ msgstr ""
 "Мушкилии танзими хидмат.Марҳамат карда номнависҳоро санҷед ва ба "
 "support@mandrakeonline.net пайём фиристед"
 
-#: ../mdkapplet:73
+#: ../mdkapplet:75
 #, c-format
 msgid "System is busy. Please wait ..."
 msgstr "Система банд аст. Интизор шавед ..."
 
-#: ../mdkapplet:79
+#: ../mdkapplet:81
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Барои системаи шумо навсозиҳои дастрасанд"
 
-#: ../mdkapplet:85
+#: ../mdkapplet:87
 #, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr "Хидматрасон танзим нашудааст. Ба \"Танзимкунии хидмат\" ангушт занед"
 
-#: ../mdkapplet:91
+#: ../mdkapplet:93
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Шабака дастрас нест. Марҳамат кардашабакаи худро танзим кунед"
 
-#: ../mdkapplet:97
+#: ../mdkapplet:99
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Хидмат фаъол нагаштааст. Ба \"Пойгоҳи шабакавӣ\" ангушт занед"
 
-#: ../mdkapplet:103
+#: ../mdkapplet:105
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:108 ../mdkapplet:158
+#: ../mdkapplet:110 ../mdkapplet:164
 #, c-format
 msgid "Install updates"
 msgstr "Кор гузоштани навигариҳо"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:111
 #, c-format
 msgid "Configure the service"
 msgstr "Танзимкунии хидмат"
 
-#: ../mdkapplet:110
+#: ../mdkapplet:112
 #, c-format
 msgid "Check Updates"
 msgstr "Тафтиши Навкуниҳо"
 
-#: ../mdkapplet:111
+#: ../mdkapplet:113 ../mdkapplet:167 ../mdkapplet:225
+#, fuzzy, c-format
+msgid "Please Wait"
+msgstr "Лутфан интизор шавед"
+
+#: ../mdkapplet:113 ../mdkapplet:166 ../mdkapplet:167 ../mdkapplet:225
+#, c-format
+msgid "Check updates"
+msgstr "Навкуниҳоро тафтиш кунед"
+
+#: ../mdkapplet:115
 #, c-format
 msgid "Online WebSite"
 msgstr "WebПойгоҳи Ғайрихудмухтор"
 
-#: ../mdkapplet:112
+#: ../mdkapplet:116
 #, c-format
 msgid "Configure Network"
 msgstr "Танзимкунии Шабака"
 
-#: ../mdkapplet:113
+#: ../mdkapplet:117
 #, c-format
 msgid "Configure Now!"
 msgstr "Ҳозир Танзим кунед!"
 
-#: ../mdkapplet:146
+#: ../mdkapplet:152 ../mdkapplet:229
 #, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Апплети Mandrakelinux Навкунӣ"
 
-#: ../mdkapplet:156
+#: ../mdkapplet:162
 #, c-format
 msgid "Actions"
 msgstr "Амалиёт"
 
-#: ../mdkapplet:159
+#: ../mdkapplet:165
 #, c-format
 msgid "Configure"
 msgstr "Ба танзим даровардан"
 
-#: ../mdkapplet:160
-#, c-format
-msgid "Check updates"
-msgstr "Навкуниҳоро тафтиш кунед"
-
-#: ../mdkapplet:161
+#: ../mdkapplet:169
 #, c-format
 msgid "See logs"
 msgstr "Ба номнависҳо нигаред"
 
-#: ../mdkapplet:164
+#: ../mdkapplet:172
 #, c-format
 msgid "Status"
 msgstr "Вазъият"
 
-#: ../mdkapplet:168 ../mdkapplet:363
+#: ../mdkapplet:176 ../mdkapplet:375
 #, c-format
 msgid "Close"
 msgstr "Пӯшидан"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Network Connection: "
 msgstr "Пайвастшавии Шабакавӣ:  "
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Up"
 msgstr "Ба боло"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Down"
 msgstr "Ба поён"
 
-#: ../mdkapplet:204
+#: ../mdkapplet:212
 #, c-format
 msgid "Last check: "
 msgstr "Тафтиши охирон: "
 
-#: ../mdkapplet:205
+#: ../mdkapplet:213
 #, c-format
 msgid "Updates: "
 msgstr "Навсозӣ: "
 
-#: ../mdkapplet:209
+#: ../mdkapplet:217
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Сардиҳии drakconnect\n"
 
-#: ../mdkapplet:213
+#: ../mdkapplet:221
 #, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "Сардиҳии mdkupdate --апплет\n"
 
-#: ../mdkapplet:217
+#: ../mdkapplet:224
 #, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 "Дар назар чунин аст, ки Mandrakeonline боз коргузорӣ шудааст, бозборкунии "
 "апплет ...."
 
-#: ../mdkapplet:225
+#: ../mdkapplet:235
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Ҳисобкунии навозиҳои тоза...\n"
 
-#: ../mdkapplet:227
+#: ../mdkapplet:237
 #, c-format
 msgid "Connecting to"
 msgstr "Пайвастшавӣ ба"
 
-#: ../mdkapplet:250
+#: ../mdkapplet:244
+#, fuzzy, c-format
+msgid "Response from Mandrakeonline server\n"
+msgstr "Марҳамат ба Mandrakeonline"
+
+#: ../mdkapplet:262
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Тафтишкунӣ... Навкуниҳо имконпазиранд\n"
 
-#: ../mdkapplet:254
+#: ../mdkapplet:267
 #, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
-#: ../mdkapplet:255
+#: ../mdkapplet:268
 #, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
-#: ../mdkapplet:256
+#: ../mdkapplet:269
 #, c-format
 msgid "Unknown state"
 msgstr "Ҳолати номаълум"
 
-#: ../mdkapplet:257
+#: ../mdkapplet:270
 #, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr ""
 "Хидматрасониҳои ғайрихудмухтор хомӯш карда мешаванд. Ба пойгоҳи "
 "Mandrakeonline пайваст шавед\n"
 
-#: ../mdkapplet:258
+#: ../mdkapplet:271
 #, c-format
 msgid "Wrong Password.\n"
 msgstr "Гузарвожаи нодуруст.\n"
 
-#: ../mdkapplet:259
+#: ../mdkapplet:272
 #, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr "Амалиёти нодурусти ё соҳиб ё ворид.\n"
 
-#: ../mdkapplet:260
+#: ../mdkapplet:273
 #, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
@@ -231,72 +241,82 @@ msgstr ""
 "Чизе дар гузоришҳои шабакаи шумо нодуруст аст (гардиш, фейрвол ва гузоришҳои "
 "проксии худро санҷед)\n"
 
-#: ../mdkapplet:264
+#: ../mdkapplet:277
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Системаи навкуниро талаб намекунад\n"
 
-#: ../mdkapplet:303
+#: ../mdkapplet:317
 #, c-format
 msgid "No check"
 msgstr "Бе тафтишот"
 
-#: ../mdkapplet:316
+#: ../mdkapplet:330
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Тафтиши Шабака: эҳтимолан хомӯш карда шудааст\n"
 
-#: ../mdkapplet:319
+#: ../mdkapplet:333
 #, c-format
 msgid "Checking config file: Not present\n"
 msgstr "Тафтиши файли config: ҳозир нест\n"
 
-#: ../mdkapplet:353
+#: ../mdkapplet:365
 #, c-format
 msgid "Logs"
 msgstr "Воридҳо"
 
-#: ../mdkapplet:369
+#: ../mdkapplet:381
 #, c-format
 msgid "Clear"
 msgstr "Пок кардан"
 
-#: ../mdkapplet:396
+#: ../mdkapplet:408
 #, c-format
 msgid "About..."
 msgstr "Дар бораи..."
 
-#: ../mdkapplet:397
+#: ../mdkapplet:409
 #, c-format
 msgid "Always launch on startup"
 msgstr "Ҳамеша дар оғозёбӣ сар додан"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:411
 #, c-format
 msgid "Quit"
 msgstr "Баромадан"
 
-#: ../mdkonline:89
+#: ../mdkonline:52 ../mdkonline:106
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "Марҳамат ба Mandrakeonline"
+
+#: ../mdkonline:55
 #, c-format
-msgid "Next"
-msgstr "Оянда"
+msgid "I already have an account"
+msgstr ""
 
-#: ../mdkonline:89
+#: ../mdkonline:56
+#, c-format
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline:89 ../mdkonline:93 ../mdkonline:131
 #, c-format
-msgid "Cancel"
-msgstr "Бекор кардан"
+msgid "Please wait"
+msgstr "Лутфан интизор шавед"
 
 #: ../mdkonline:89
 #, c-format
-msgid "Previous"
-msgstr "Гузашта"
+msgid "Reading configuration\n"
+msgstr "Танзимдарорӣ хонда шуда истодааст\n"
 
-#: ../mdkonline:103
+#: ../mdkonline:93
 #, c-format
-msgid "Welcome to Mandrakeonline"
-msgstr "Марҳамат ба Mandrakeonline"
+msgid "Sending configuration..."
+msgstr "Танзимкуниҳо фиристода шуда истодаанд..."
 
-#: ../mdkonline:104 ../mdkonline_tui:98
+#: ../mdkonline:109
 #, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
@@ -309,63 +329,38 @@ msgstr ""
 "барои шуморо хабардор доштан оид ба навигариҳои бехатарӣ\n"
 "ва афзоишҳои фоиданок ёрӣ хоҳад расонд.\n"
 
-#: ../mdkonline:105 ../mdkonline_tui:142
+#: ../mdkonline:114
 #, c-format
-msgid "Create a Mandrakeonline Account"
-msgstr "Офаридани Ҳисоби Mandrakeonline"
+msgid "Account creation or authentication"
+msgstr ""
 
-#: ../mdkonline:107
-#, fuzzy, c-format
-msgid "I don't have a Mandrakeonline account and I want to subscribe"
-msgstr "Ман ҳисоботи MandrakeOline надорам ва доштан мехоҳам "
+#: ../mdkonline:119
+#, c-format
+msgid "Enter your Mandrakeonline login, password and machine name:"
+msgstr ""
+"Ворикунанадаи Mandrakeonline-и худро, гузарвожа ва номи мошинаро ворид кунед:"
 
-#: ../mdkonline:111 ../mdkonline:131 ../mdkonline_tui:114 ../mdkonline_tui:145
+#: ../mdkonline:125 ../mdkonline:156
 #, c-format
 msgid "Login:"
 msgstr "Номи дохилӣ:"
 
-#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:115 ../mdkonline_tui:146
+#: ../mdkonline:126 ../mdkonline:157
 #, c-format
 msgid "Password:"
 msgstr "Гузарвожа:"
 
-#: ../mdkonline:113 ../mdkonline_tui:147
-#, c-format
-msgid "Confirm Password:"
-msgstr "Тасдиқи Гузарвожа:"
-
-#: ../mdkonline:114 ../mdkonline_tui:148
-#, c-format
-msgid "Mail contact:"
-msgstr "Пайвасти постӣ:"
-
-#: ../mdkonline:121
-#, c-format
-msgid "Mandrakelinux Privacy Policy"
-msgstr "Сиёсати Шахсии Mandrakelinux"
-
 #: ../mdkonline:127
 #, c-format
-msgid "Authentification"
-msgstr "Саҳеҳӣ"
-
-#: ../mdkonline:128 ../mdkonline_tui:108
-#, c-format
-msgid "Enter your Mandrakeonline login, password and machine name:"
-msgstr ""
-"Ворикунанадаи Mandrakeonline-и худро, гузарвожа ва номи мошинаро ворид кунед:"
-
-#: ../mdkonline:133 ../mdkonline_tui:116
-#, c-format
 msgid "Machine name:"
 msgstr "Номи мошина:"
 
-#: ../mdkonline:138
-#, c-format
-msgid "Send Configuration"
-msgstr "Фиристодани Танзимкунӣ"
+#: ../mdkonline:131
+#, fuzzy, c-format
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Марҳамат ба Mandrakeonline"
 
-#: ../mdkonline:139 ../mdkonline_tui:128
+#: ../mdkonline:139
 #, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
@@ -398,56 +393,56 @@ msgstr ""
 "Ғайр аз ин шумо аз хадамоти дастгиркунандаи арзон дар\n"
 " www.mandrakeexpert.com фоида мекунед. "
 
-#: ../mdkonline:144 ../mdkonline:211 ../mdkonline:234
-#, c-format
-msgid "Finish"
-msgstr "Итмом"
-
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141 ../mdkonline:180 ../mdkupdate:126 ../mdkupdate:198
 #, c-format
-msgid "Your upload was successful!"
-msgstr "Боркунии шумо бо муваффақият ноил гардид!"
+msgid "Connection problem"
+msgstr "Муаммои пайвастагӣ"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandrakeonline."
+msgid "or"
 msgstr ""
-"Ба туфайли Mandrakeonline аз ин лаҳза эътибран шумо ахбороти \n"
-"оиди бехатарӣ ва навкуниҳоро қабул хоҳед кард."
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "Гузарвожаи нодуруст"
+
+#: ../mdkonline:141
 #, c-format
 msgid ""
-"Mandrakeonline offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+"Your login or password was wrong.\n"
+" Either you'll have to type it again, or you'll need to create an account on "
+"Mandrakeonline.\n"
+" In the latter case, go back to the first step to connect to "
+"Mandrakeonline.\n"
+" Be aware that you must also provide a Machine name \n"
+" (only alphabetical characters are admitted)"
 msgstr ""
-"Mandrakeonline ба шумо имконияти худкоркунии навсозиҳоро пешкаш мекунад.\n"
-"Барнома доимо ар системаи шумо иҷро мегардад ва то навкуниҳои оянда интизор "
-"мешавад.\n"
-
-#: ../mdkonline:146
-#, c-format
-msgid "automated Upgrades"
-msgstr "афзоишҳои Худкоршуда"
+"Воридкунанди ё гузарвожаи шумо нодуруст буданд.\n"
+" Ё онро шумо бояд аз нав чоп кунед ё ба шумо лозим аст, ки ҳисобро дар "
+"Mandrakeonline офаред.\n"
+" Дар ҳолати охирон барои пайвастшавӣ бо Mandrakeonline ба қадами якум "
+"баргардед.\n"
+" Таваҷӯҳ фармоед, ки шумо инчунин номи Мошинаро низ бояд ворид кунед \n"
+" (танҳо аломатҳои ҳарфӣ иҷозат дода мешаванд)"
 
-#: ../mdkonline:150
+#: ../mdkonline:153
 #, c-format
-msgid "Country:"
-msgstr "Давлат:"
+msgid "Create a Mandrakeonline Account"
+msgstr "Офаридани Ҳисоби Mandrakeonline"
 
-#: ../mdkonline:178 ../mdkonline:183 ../mdkonline:185 ../mdkonline:187
+#: ../mdkonline:158
 #, c-format
-msgid "Error"
-msgstr "Хатогӣ"
+msgid "Confirm Password:"
+msgstr "Тасдиқи Гузарвожа:"
 
-#: ../mdkonline:183 ../mdkonline_tui:152
+#: ../mdkonline:159
 #, c-format
-msgid "Please provide a login"
-msgstr "Марҳамат карда ба воридкунанда таъмин кунед"
+msgid "Mail contact:"
+msgstr "Пайвасти постӣ:"
 
-#: ../mdkonline:185 ../mdkonline_tui:152
+#: ../mdkonline:163
 #, c-format
 msgid ""
 "The passwords do not match\n"
@@ -456,161 +451,115 @@ msgstr ""
 "Гузарвожаҳо мувофиқ нестанд\n"
 " Лутфан такрор кунед\n"
 
-#: ../mdkonline:187 ../mdkonline_tui:152
+#: ../mdkonline:163
+#, c-format
+msgid "Please provide a login"
+msgstr "Марҳамат карда ба воридкунанда таъмин кунед"
+
+#: ../mdkonline:163
 #, c-format
 msgid "Not a valid mail address!\n"
 msgstr "Суроғаи пост ҳақиқӣ нест!\n"
 
-#: ../mdkonline:199 ../mdkonline_tui:78
+#: ../mdkonline:169
 #, c-format
-msgid "Reading configuration\n"
-msgstr "Танзимдарорӣ хонда шуда истодааст\n"
+msgid ""
+"Mandrakeonline Account successfully created.\n"
+"Please click \"Next\" to authenticate and upload your configuration\n"
+msgstr ""
 
-#: ../mdkonline:204 ../mdkonline_tui:82
+#: ../mdkonline:178
 #, c-format
-msgid "Sending configuration..."
-msgstr "Танзимкуниҳо фиристода шуда истодаанд..."
+msgid "Your upload was successful!"
+msgstr "Боркунии шумо бо муваффақият ноил гардид!"
 
-#: ../mdkonline:213 ../mdkonline:273 ../mdkonline_tui:130 ../mdkonline_tui:169
-#: ../mdkupdate:124 ../mdkupdate:195
+#: ../mdkonline:178
 #, c-format
-msgid "Connection problem"
-msgstr "Муаммои пайвастагӣ"
+msgid ""
+"From now you will receive on security and updates \n"
+"announcements thanks to Mandrakeonline."
+msgstr ""
+"Ба туфайли Mandrakeonline аз ин лаҳза эътибран шумо ахбороти \n"
+"оиди бехатарӣ ва навкуниҳоро қабул хоҳед кард."
+
+#: ../mdkonline:178
+#, c-format
+msgid ""
+"Mandrakeonline offers you the ability to automate the updates.\n"
+"A program will run regulary in your system waiting for new updates\n"
+msgstr ""
+"Mandrakeonline ба шумо имконияти худкоркунии навсозиҳоро пешкаш мекунад.\n"
+"Барнома доимо ар системаи шумо иҷро мегардад ва то навкуниҳои оянда интизор "
+"мешавад.\n"
 
-#: ../mdkonline:213 ../mdkonline_tui:169
+#: ../mdkonline:180
 #, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr "Ҳангоми боркунии файлҳо мушкилие рух дод, бори дигар кӯшиш кунед"
 
-#: ../mdkonline:251
-#, c-format
-msgid "Quitting Wizard\n"
-msgstr "Баромад аз Устод\n"
+#: ../mdkonline:186
+#, fuzzy, c-format
+msgid "Country"
+msgstr "Давлат:"
+
+#: ../mdkonline:198
+#, fuzzy, c-format
+msgid "Congratulations"
+msgstr "Танзимкунӣ"
 
-#: ../mdkonline:273
+#: ../mdkonline:198
 #, c-format
-msgid "Mandrakeonline could not be contacted, please try again at a later time"
+msgid "Your Mandrakeonline account has been successfully configured\n"
 msgstr ""
-"Пайвастшавӣ бо Mandrakeonline нашуда истодаст, марҳамат карда дертар бори "
-"дигар кӯшиш кунед"
 
-#: ../mdkonline:285
-#, c-format
-msgid "Wrong password"
-msgstr "Гузарвожаи нодуруст"
+#: ../mdkonline:214
+#, fuzzy, c-format
+msgid "Configuration uploaded successfully"
+msgstr "Боркунии шумо бо муваффақият ноил гардид!"
 
-#: ../mdkonline:285 ../mdkonline_tui:130
+#: ../mdkonline:215
+#, fuzzy, c-format
+msgid "Problem uploading configuration"
+msgstr "Танзимдарорӣ хонда шуда истодааст\n"
+
+#: ../mdkonline:216
 #, c-format
 msgid ""
-"Your login or password was wrong.\n"
-" Either you'll have to type it again, or you'll need to create an account on "
-"Mandrakeonline.\n"
-" In the latter case, go back to the first step to connect to "
-"Mandrakeonline.\n"
-" Be aware that you must also provide a Machine name \n"
-" (only alphabetical characters are admitted)"
+"Cannot connect to mandrakeonline website: wrong login/password or router/"
+"firewall bad settings"
 msgstr ""
-"Воридкунанди ё гузарвожаи шумо нодуруст буданд.\n"
-" Ё онро шумо бояд аз нав чоп кунед ё ба шумо лозим аст, ки ҳисобро дар "
-"Mandrakeonline офаред.\n"
-" Дар ҳолати охирон барои пайвастшавӣ бо Mandrakeonline ба қадами якум "
-"баргардед.\n"
-" Таваҷӯҳ фармоед, ки шумо инчунин номи Мошинаро низ бояд ворид кунед \n"
-" (танҳо аломатҳои ҳарфӣ иҷозат дода мешаванд)"
 
-#: ../mdkonline.pm:58
+#: ../mdkonline.pm:66
 #, c-format
 msgid "Login and password should be less than 12 characters\n"
 msgstr ""
 
-#: ../mdkonline.pm:59
+#: ../mdkonline.pm:67
 #, c-format
 msgid "Special characters are not allowed\n"
 msgstr ""
 
-#: ../mdkonline.pm:60
+#: ../mdkonline.pm:68
 #, c-format
 msgid "Please fill in all fields\n"
 msgstr ""
 
-#: ../mdkonline.pm:61
+#: ../mdkonline.pm:69
 #, c-format
 msgid "Email not valid\n"
 msgstr ""
 
-#: ../mdkonline.pm:62
+#: ../mdkonline.pm:70
 #, c-format
 msgid "Account already exist\n"
 msgstr ""
 
-#: ../mdkonline.pm:68
+#: ../mdkonline.pm:76
 #, c-format
 msgid "Problem connecting to server \n"
 msgstr "Муаммои пайвастшавӣ ба хидматгор \n"
 
-#: ../mdkonline_tui:45 ../mdkonline_tui:95
-#, fuzzy, c-format
-msgid "Mandrakeonline"
-msgstr "Марҳамат ба Mandrakeonline"
-
-#: ../mdkonline_tui:48
-#, c-format
-msgid "I already have an account"
-msgstr ""
-
-#: ../mdkonline_tui:49
-#, c-format
-msgid "I want to subscribe"
-msgstr ""
-
-#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:120
-#, c-format
-msgid "Please wait"
-msgstr "Лутфан интизор шавед"
-
-#: ../mdkonline_tui:103
-#, c-format
-msgid "Account creation or authentication"
-msgstr ""
-
-#: ../mdkonline_tui:120
-#, fuzzy, c-format
-msgid "Connecting to Mandrakeonline website..."
-msgstr "Марҳамат ба Mandrakeonline"
-
-#: ../mdkonline_tui:130
-#, c-format
-msgid "or"
-msgstr ""
-
-#: ../mdkonline_tui:130
-#, fuzzy, c-format
-msgid "wrong password:"
-msgstr "Гузарвожаи нодуруст"
-
-#: ../mdkonline_tui:158
-#, c-format
-msgid ""
-"Mandrakeonline Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-
-#: ../mdkonline_tui:175
-#, fuzzy, c-format
-msgid "Country"
-msgstr "Давлат:"
-
-#: ../mdkonline_tui:187
-#, fuzzy, c-format
-msgid "Congratulations"
-msgstr "Танзимкунӣ"
-
-#: ../mdkonline_tui:187
-#, c-format
-msgid "Your Mandrakeonline account has been successfully configured\n"
-msgstr ""
-
-#: ../mdkupdate:50
+#: ../mdkupdate:52
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
@@ -627,50 +576,94 @@ msgstr ""
 "\n"
 "истифода:\n"
 
-#: ../mdkupdate:55
+#: ../mdkupdate:57
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - чопи ин пайғоми ёрӣ.\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:58
 #, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto         - Mandrakeupdate ба таври худкор сар дода мешавад.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:59
 #, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - сардиҳии MandrakeНавкунӣ.\n"
 
-#: ../mdkupdate:58
-#, c-format
-msgid "  --update       - Update keys\n"
-msgstr "  --update       - Навкунии калидҳо\n"
-
-#: ../mdkupdate:66
+#: ../mdkupdate:67
 #, c-format
 msgid "No %s file found. Run mdkonline wizard first"
 msgstr ""
 
-#: ../mdkupdate:124
+#: ../mdkupdate:126
 #, fuzzy, c-format
 msgid "Mandrakeupdate could not contact the site, we will try again."
 msgstr ""
 "Пайвастшавӣ бо Mandrakeonline нашуда истодаст, марҳамат карда дертар бори "
 "дигар кӯшиш кунед"
 
-#: ../mdkupdate:173
+#: ../mdkupdate:176
 #, c-format
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr ""
 
-#: ../mdkupdate:195
+#: ../mdkupdate:198
 #, c-format
 msgid ""
 "Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
 "mandrakeonline [dot] net"
 msgstr ""
 
+#~ msgid "Next"
+#~ msgstr "Оянда"
+
+#~ msgid "Cancel"
+#~ msgstr "Бекор кардан"
+
+#~ msgid "Previous"
+#~ msgstr "Гузашта"
+
+#, fuzzy
+#~ msgid "I don't have a Mandrakeonline account and I want to subscribe"
+#~ msgstr "Ман ҳисоботи MandrakeOline надорам ва доштан мехоҳам "
+
+#~ msgid "Mandrakelinux Privacy Policy"
+#~ msgstr "Сиёсати Шахсии Mandrakelinux"
+
+#~ msgid "Authentification"
+#~ msgstr "Саҳеҳӣ"
+
+#~ msgid "Send Configuration"
+#~ msgstr "Фиристодани Танзимкунӣ"
+
+#~ msgid "Finish"
+#~ msgstr "Итмом"
+
+#~ msgid "automated Upgrades"
+#~ msgstr "афзоишҳои Худкоршуда"
+
+#~ msgid "Country:"
+#~ msgstr "Давлат:"
+
+#~ msgid "Error"
+#~ msgstr "Хатогӣ"
+
+#~ msgid "Quitting Wizard\n"
+#~ msgstr "Баромад аз Устод\n"
+
+#~ msgid ""
+#~ "Mandrakeonline could not be contacted, please try again at a later time"
+#~ msgstr ""
+#~ "Пайвастшавӣ бо Mandrakeonline нашуда истодаст, марҳамат карда дертар бори "
+#~ "дигар кӯшиш кунед"
+
+#~ msgid "Wrong password"
+#~ msgstr "Гузарвожаи нодуруст"
+
+#~ msgid "  --update       - Update keys\n"
+#~ msgstr "  --update       - Навкунии калидҳо\n"
+
 #~ msgid "Skip Wizard"
 #~ msgstr "Радкунии Устод"
 
diff --git a/po/th.po b/po/th.po
index 4d1dc166..2165aec6 100644
--- a/po/th.po
+++ b/po/th.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-01 22:41+0200\n"
+"POT-Creation-Date: 2004-11-03 12:10+0100\n"
 "PO-Revision-Date: 2003-02-28 05:55+0900\n"
 "Last-Translator: Pramote Khuwijitjaru <kmote@hotmail.com>\n"
 "Language-Team: Thai <en@li.org>\n"
@@ -16,271 +16,291 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../mdkapplet:61
+#: ../mdkapplet:63
 #, c-format
 msgid "Your system is up-to-date"
 msgstr ""
 
-#: ../mdkapplet:67
+#: ../mdkapplet:69
 #, fuzzy, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrakeonline.net"
 msgstr "หากมีปัญหาใดๆ ให้ส่งอีเมล์ไปยัง support@mandrakeonline.net\n"
 
-#: ../mdkapplet:73
+#: ../mdkapplet:75
 #, c-format
 msgid "System is busy. Please wait ..."
 msgstr ""
 
-#: ../mdkapplet:79
+#: ../mdkapplet:81
 #, c-format
 msgid "New updates are available for your system"
 msgstr ""
 
-#: ../mdkapplet:85
+#: ../mdkapplet:87
 #, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr ""
 
-#: ../mdkapplet:91
+#: ../mdkapplet:93
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr ""
 
-#: ../mdkapplet:97
+#: ../mdkapplet:99
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 
-#: ../mdkapplet:103
+#: ../mdkapplet:105
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:108 ../mdkapplet:158
+#: ../mdkapplet:110 ../mdkapplet:164
 #, c-format
 msgid "Install updates"
 msgstr ""
 
-#: ../mdkapplet:109
+#: ../mdkapplet:111
 #, c-format
 msgid "Configure the service"
 msgstr ""
 
-#: ../mdkapplet:110
+#: ../mdkapplet:112
 #, c-format
 msgid "Check Updates"
 msgstr ""
 
-#: ../mdkapplet:111
+#: ../mdkapplet:113 ../mdkapplet:167 ../mdkapplet:225
+#, fuzzy, c-format
+msgid "Please Wait"
+msgstr "โปรดรอสักครู่"
+
+#: ../mdkapplet:113 ../mdkapplet:166 ../mdkapplet:167 ../mdkapplet:225
+#, c-format
+msgid "Check updates"
+msgstr ""
+
+#: ../mdkapplet:115
 #, c-format
 msgid "Online WebSite"
 msgstr ""
 
-#: ../mdkapplet:112
+#: ../mdkapplet:116
 #, c-format
 msgid "Configure Network"
 msgstr ""
 
-#: ../mdkapplet:113
+#: ../mdkapplet:117
 #, c-format
 msgid "Configure Now!"
 msgstr ""
 
-#: ../mdkapplet:146
+#: ../mdkapplet:152 ../mdkapplet:229
 #, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr ""
 
-#: ../mdkapplet:156
+#: ../mdkapplet:162
 #, c-format
 msgid "Actions"
 msgstr "การกระทำ"
 
-#: ../mdkapplet:159
+#: ../mdkapplet:165
 #, c-format
 msgid "Configure"
 msgstr "ตั้งค่า"
 
-#: ../mdkapplet:160
-#, c-format
-msgid "Check updates"
-msgstr ""
-
-#: ../mdkapplet:161
+#: ../mdkapplet:169
 #, c-format
 msgid "See logs"
 msgstr ""
 
-#: ../mdkapplet:164
+#: ../mdkapplet:172
 #, c-format
 msgid "Status"
 msgstr "สถานภาพ"
 
-#: ../mdkapplet:168 ../mdkapplet:363
+#: ../mdkapplet:176 ../mdkapplet:375
 #, c-format
 msgid "Close"
 msgstr "ปิด"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Network Connection: "
 msgstr ""
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Up"
 msgstr ""
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Down"
 msgstr ""
 
-#: ../mdkapplet:204
+#: ../mdkapplet:212
 #, c-format
 msgid "Last check: "
 msgstr ""
 
-#: ../mdkapplet:205
+#: ../mdkapplet:213
 #, c-format
 msgid "Updates: "
 msgstr ""
 
-#: ../mdkapplet:209
+#: ../mdkapplet:217
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr ""
 
-#: ../mdkapplet:213
+#: ../mdkapplet:221
 #, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr ""
 
-#: ../mdkapplet:217
+#: ../mdkapplet:224
 #, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 
-#: ../mdkapplet:225
+#: ../mdkapplet:235
 #, fuzzy, c-format
 msgid "Computing new updates...\n"
 msgstr "ปัญหาการคอนเน็ค"
 
-#: ../mdkapplet:227
+#: ../mdkapplet:237
 #, fuzzy, c-format
 msgid "Connecting to"
 msgstr "ปัญหาการคอนเน็ค"
 
-#: ../mdkapplet:250
+#: ../mdkapplet:244
+#, c-format
+msgid "Response from Mandrakeonline server\n"
+msgstr ""
+
+#: ../mdkapplet:262
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr ""
 
-#: ../mdkapplet:254
+#: ../mdkapplet:267
 #, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
-#: ../mdkapplet:255
+#: ../mdkapplet:268
 #, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
-#: ../mdkapplet:256
+#: ../mdkapplet:269
 #, c-format
 msgid "Unknown state"
 msgstr ""
 
-#: ../mdkapplet:257
+#: ../mdkapplet:270
 #, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr ""
 
-#: ../mdkapplet:258
+#: ../mdkapplet:271
 #, c-format
 msgid "Wrong Password.\n"
 msgstr ""
 
-#: ../mdkapplet:259
+#: ../mdkapplet:272
 #, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr ""
 
-#: ../mdkapplet:260
+#: ../mdkapplet:273
 #, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
 msgstr ""
 
-#: ../mdkapplet:264
+#: ../mdkapplet:277
 #, c-format
 msgid "System is up-to-date\n"
 msgstr ""
 
-#: ../mdkapplet:303
+#: ../mdkapplet:317
 #, c-format
 msgid "No check"
 msgstr ""
 
-#: ../mdkapplet:316
+#: ../mdkapplet:330
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
-#: ../mdkapplet:319
+#: ../mdkapplet:333
 #, c-format
 msgid "Checking config file: Not present\n"
 msgstr ""
 
-#: ../mdkapplet:353
+#: ../mdkapplet:365
 #, c-format
 msgid "Logs"
 msgstr "ล็อก"
 
-#: ../mdkapplet:369
+#: ../mdkapplet:381
 #, c-format
 msgid "Clear"
 msgstr ""
 
-#: ../mdkapplet:396
+#: ../mdkapplet:408
 #, c-format
 msgid "About..."
 msgstr "เกี่ยวกับ..."
 
-#: ../mdkapplet:397
+#: ../mdkapplet:409
 #, c-format
 msgid "Always launch on startup"
 msgstr ""
 
-#: ../mdkapplet:399
+#: ../mdkapplet:411
 #, c-format
 msgid "Quit"
 msgstr "ออก"
 
-#: ../mdkonline:89
+#: ../mdkonline:52 ../mdkonline:106
+#, c-format
+msgid "Mandrakeonline"
+msgstr ""
+
+#: ../mdkonline:55
 #, c-format
-msgid "Next"
-msgstr "ถัดไป"
+msgid "I already have an account"
+msgstr ""
 
-#: ../mdkonline:89
+#: ../mdkonline:56
 #, c-format
-msgid "Cancel"
-msgstr "ยกเลิก"
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline:89 ../mdkonline:93 ../mdkonline:131
+#, c-format
+msgid "Please wait"
+msgstr "โปรดรอสักครู่"
 
 #: ../mdkonline:89
 #, c-format
-msgid "Previous"
-msgstr "ก่อน"
+msgid "Reading configuration\n"
+msgstr ""
 
-#: ../mdkonline:103
+#: ../mdkonline:93
 #, c-format
-msgid "Welcome to Mandrakeonline"
+msgid "Sending configuration..."
 msgstr ""
 
-#: ../mdkonline:104 ../mdkonline_tui:98
+#: ../mdkonline:109
 #, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
@@ -288,62 +308,37 @@ msgid ""
 "order to keep you informed about security updates and useful upgrades.\n"
 msgstr ""
 
-#: ../mdkonline:105 ../mdkonline_tui:142
+#: ../mdkonline:114
 #, c-format
-msgid "Create a Mandrakeonline Account"
+msgid "Account creation or authentication"
 msgstr ""
 
-#: ../mdkonline:107
-#, fuzzy, c-format
-msgid "I don't have a Mandrakeonline account and I want to subscribe"
-msgstr "คุณต้องมีชื่อในบัญชีสำหรับ Mandrakeonline หรือทำการอัพเดทการเป็นสมาชิกของคุณ"
+#: ../mdkonline:119
+#, c-format
+msgid "Enter your Mandrakeonline login, password and machine name:"
+msgstr ""
 
-#: ../mdkonline:111 ../mdkonline:131 ../mdkonline_tui:114 ../mdkonline_tui:145
+#: ../mdkonline:125 ../mdkonline:156
 #, c-format
 msgid "Login:"
 msgstr "ล็อกอิน:"
 
-#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:115 ../mdkonline_tui:146
+#: ../mdkonline:126 ../mdkonline:157
 #, c-format
 msgid "Password:"
 msgstr "รหัสผ่าน:"
 
-#: ../mdkonline:113 ../mdkonline_tui:147
-#, c-format
-msgid "Confirm Password:"
-msgstr ""
-
-#: ../mdkonline:114 ../mdkonline_tui:148
-#, c-format
-msgid "Mail contact:"
-msgstr ""
-
-#: ../mdkonline:121
-#, c-format
-msgid "Mandrakelinux Privacy Policy"
-msgstr ""
-
 #: ../mdkonline:127
 #, c-format
-msgid "Authentification"
-msgstr ""
-
-#: ../mdkonline:128 ../mdkonline_tui:108
-#, c-format
-msgid "Enter your Mandrakeonline login, password and machine name:"
-msgstr ""
-
-#: ../mdkonline:133 ../mdkonline_tui:116
-#, c-format
 msgid "Machine name:"
 msgstr ""
 
-#: ../mdkonline:138
+#: ../mdkonline:131
 #, c-format
-msgid "Send Configuration"
+msgid "Connecting to Mandrakeonline website..."
 msgstr ""
 
-#: ../mdkonline:139 ../mdkonline_tui:128
+#: ../mdkonline:139
 #, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
@@ -362,203 +357,159 @@ msgid ""
 "www.mandrakeexpert.com."
 msgstr ""
 
-#: ../mdkonline:144 ../mdkonline:211 ../mdkonline:234
+#: ../mdkonline:141 ../mdkonline:180 ../mdkupdate:126 ../mdkupdate:198
 #, c-format
-msgid "Finish"
-msgstr "เสร็จแล้ว"
+msgid "Connection problem"
+msgstr "ปัญหาการคอนเน็ค"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid "Your upload was successful!"
+msgid "or"
 msgstr ""
 
-#: ../mdkonline:145 ../mdkonline_tui:167
-#, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandrakeonline."
-msgstr ""
+#: ../mdkonline:141
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "รหัสผ่าน:"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
 msgid ""
-"Mandrakeonline offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+"Your login or password was wrong.\n"
+" Either you'll have to type it again, or you'll need to create an account on "
+"Mandrakeonline.\n"
+" In the latter case, go back to the first step to connect to "
+"Mandrakeonline.\n"
+" Be aware that you must also provide a Machine name \n"
+" (only alphabetical characters are admitted)"
 msgstr ""
 
-#: ../mdkonline:146
+#: ../mdkonline:153
 #, c-format
-msgid "automated Upgrades"
+msgid "Create a Mandrakeonline Account"
 msgstr ""
 
-#: ../mdkonline:150
+#: ../mdkonline:158
 #, c-format
-msgid "Country:"
+msgid "Confirm Password:"
 msgstr ""
 
-#: ../mdkonline:178 ../mdkonline:183 ../mdkonline:185 ../mdkonline:187
+#: ../mdkonline:159
 #, c-format
-msgid "Error"
-msgstr "ข้อผิดพลาด"
-
-#: ../mdkonline:183 ../mdkonline_tui:152
-#, c-format
-msgid "Please provide a login"
+msgid "Mail contact:"
 msgstr ""
 
-#: ../mdkonline:185 ../mdkonline_tui:152
+#: ../mdkonline:163
 #, c-format
 msgid ""
 "The passwords do not match\n"
 " Please try again\n"
 msgstr ""
 
-#: ../mdkonline:187 ../mdkonline_tui:152
-#, c-format
-msgid "Not a valid mail address!\n"
-msgstr ""
-
-#: ../mdkonline:199 ../mdkonline_tui:78
-#, c-format
-msgid "Reading configuration\n"
-msgstr ""
-
-#: ../mdkonline:204 ../mdkonline_tui:82
+#: ../mdkonline:163
 #, c-format
-msgid "Sending configuration..."
+msgid "Please provide a login"
 msgstr ""
 
-#: ../mdkonline:213 ../mdkonline:273 ../mdkonline_tui:130 ../mdkonline_tui:169
-#: ../mdkupdate:124 ../mdkupdate:195
-#, c-format
-msgid "Connection problem"
-msgstr "ปัญหาการคอนเน็ค"
-
-#: ../mdkonline:213 ../mdkonline_tui:169
+#: ../mdkonline:163
 #, c-format
-msgid "Problem occurs when uploading files, please try again"
+msgid "Not a valid mail address!\n"
 msgstr ""
 
-#: ../mdkonline:251
+#: ../mdkonline:169
 #, c-format
-msgid "Quitting Wizard\n"
+msgid ""
+"Mandrakeonline Account successfully created.\n"
+"Please click \"Next\" to authenticate and upload your configuration\n"
 msgstr ""
 
-#: ../mdkonline:273
-#, fuzzy, c-format
-msgid "Mandrakeonline could not be contacted, please try again at a later time"
-msgstr "Mandrakeupdate ไม่สามารถติดต่อกับไซต์ จะลองพยายามอีกครั้ง"
-
-#: ../mdkonline:285
+#: ../mdkonline:178
 #, c-format
-msgid "Wrong password"
+msgid "Your upload was successful!"
 msgstr ""
 
-#: ../mdkonline:285 ../mdkonline_tui:130
+#: ../mdkonline:178
 #, c-format
 msgid ""
-"Your login or password was wrong.\n"
-" Either you'll have to type it again, or you'll need to create an account on "
-"Mandrakeonline.\n"
-" In the latter case, go back to the first step to connect to "
-"Mandrakeonline.\n"
-" Be aware that you must also provide a Machine name \n"
-" (only alphabetical characters are admitted)"
-msgstr ""
-
-#: ../mdkonline.pm:58
-#, c-format
-msgid "Login and password should be less than 12 characters\n"
+"From now you will receive on security and updates \n"
+"announcements thanks to Mandrakeonline."
 msgstr ""
 
-#: ../mdkonline.pm:59
+#: ../mdkonline:178
 #, c-format
-msgid "Special characters are not allowed\n"
+msgid ""
+"Mandrakeonline offers you the ability to automate the updates.\n"
+"A program will run regulary in your system waiting for new updates\n"
 msgstr ""
 
-#: ../mdkonline.pm:60
+#: ../mdkonline:180
 #, c-format
-msgid "Please fill in all fields\n"
+msgid "Problem occurs when uploading files, please try again"
 msgstr ""
 
-#: ../mdkonline.pm:61
+#: ../mdkonline:186
 #, c-format
-msgid "Email not valid\n"
-msgstr ""
+msgid "Country"
+msgstr "คันทรี"
 
-#: ../mdkonline.pm:62
+#: ../mdkonline:198
 #, c-format
-msgid "Account already exist\n"
+msgid "Congratulations"
 msgstr ""
 
-#: ../mdkonline.pm:68
+#: ../mdkonline:198
 #, c-format
-msgid "Problem connecting to server \n"
+msgid "Your Mandrakeonline account has been successfully configured\n"
 msgstr ""
 
-#: ../mdkonline_tui:45 ../mdkonline_tui:95
+#: ../mdkonline:214
 #, c-format
-msgid "Mandrakeonline"
+msgid "Configuration uploaded successfully"
 msgstr ""
 
-#: ../mdkonline_tui:48
+#: ../mdkonline:215
 #, c-format
-msgid "I already have an account"
+msgid "Problem uploading configuration"
 msgstr ""
 
-#: ../mdkonline_tui:49
+#: ../mdkonline:216
 #, c-format
-msgid "I want to subscribe"
+msgid ""
+"Cannot connect to mandrakeonline website: wrong login/password or router/"
+"firewall bad settings"
 msgstr ""
 
-#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:120
-#, c-format
-msgid "Please wait"
-msgstr "โปรดรอสักครู่"
-
-#: ../mdkonline_tui:103
+#: ../mdkonline.pm:66
 #, c-format
-msgid "Account creation or authentication"
+msgid "Login and password should be less than 12 characters\n"
 msgstr ""
 
-#: ../mdkonline_tui:120
+#: ../mdkonline.pm:67
 #, c-format
-msgid "Connecting to Mandrakeonline website..."
+msgid "Special characters are not allowed\n"
 msgstr ""
 
-#: ../mdkonline_tui:130
+#: ../mdkonline.pm:68
 #, c-format
-msgid "or"
+msgid "Please fill in all fields\n"
 msgstr ""
 
-#: ../mdkonline_tui:130
-#, fuzzy, c-format
-msgid "wrong password:"
-msgstr "รหัสผ่าน:"
-
-#: ../mdkonline_tui:158
+#: ../mdkonline.pm:69
 #, c-format
-msgid ""
-"Mandrakeonline Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
+msgid "Email not valid\n"
 msgstr ""
 
-#: ../mdkonline_tui:175
-#, c-format
-msgid "Country"
-msgstr "คันทรี"
-
-#: ../mdkonline_tui:187
+#: ../mdkonline.pm:70
 #, c-format
-msgid "Congratulations"
+msgid "Account already exist\n"
 msgstr ""
 
-#: ../mdkonline_tui:187
+#: ../mdkonline.pm:76
 #, c-format
-msgid "Your Mandrakeonline account has been successfully configured\n"
+msgid "Problem connecting to server \n"
 msgstr ""
 
-#: ../mdkupdate:50
+#: ../mdkupdate:52
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
@@ -574,48 +525,71 @@ msgstr ""
 "\n"
 "วิธีใช้:\n"
 
-#: ../mdkupdate:55
+#: ../mdkupdate:57
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - แสดงข้อความช่วยเหลือ\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:58
 #, fuzzy, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --applet       - อัพเดทข้อมูลทั้งหมด\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:59
 #, fuzzy, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - อัพเดทข้อมูลทั้งหมด\n"
 
-#: ../mdkupdate:58
-#, fuzzy, c-format
-msgid "  --update       - Update keys\n"
-msgstr "  --applet       - อัพเดทข้อมูลทั้งหมด\n"
-
-#: ../mdkupdate:66
+#: ../mdkupdate:67
 #, c-format
 msgid "No %s file found. Run mdkonline wizard first"
 msgstr ""
 
-#: ../mdkupdate:124
+#: ../mdkupdate:126
 #, c-format
 msgid "Mandrakeupdate could not contact the site, we will try again."
 msgstr "Mandrakeupdate ไม่สามารถติดต่อกับไซต์ จะลองพยายามอีกครั้ง"
 
-#: ../mdkupdate:173
+#: ../mdkupdate:176
 #, c-format
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr "ไม่สามารถอัพเดทแพ็จเกจจากมีเดียของ mdkupdate \n"
 
-#: ../mdkupdate:195
+#: ../mdkupdate:198
 #, c-format
 msgid ""
 "Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
 "mandrakeonline [dot] net"
 msgstr ""
 
+#~ msgid "Next"
+#~ msgstr "ถัดไป"
+
+#~ msgid "Cancel"
+#~ msgstr "ยกเลิก"
+
+#~ msgid "Previous"
+#~ msgstr "ก่อน"
+
+#, fuzzy
+#~ msgid "I don't have a Mandrakeonline account and I want to subscribe"
+#~ msgstr "คุณต้องมีชื่อในบัญชีสำหรับ Mandrakeonline หรือทำการอัพเดทการเป็นสมาชิกของคุณ"
+
+#~ msgid "Finish"
+#~ msgstr "เสร็จแล้ว"
+
+#~ msgid "Error"
+#~ msgstr "ข้อผิดพลาด"
+
+#, fuzzy
+#~ msgid ""
+#~ "Mandrakeonline could not be contacted, please try again at a later time"
+#~ msgstr "Mandrakeupdate ไม่สามารถติดต่อกับไซต์ จะลองพยายามอีกครั้ง"
+
+#, fuzzy
+#~ msgid "  --update       - Update keys\n"
+#~ msgstr "  --applet       - อัพเดทข้อมูลทั้งหมด\n"
+
 #, fuzzy
 #~ msgid "Checking ..."
 #~ msgstr "ปัญหาการคอนเน็ค"
diff --git a/po/tl.po b/po/tl.po
index ed5cb0a9..7fcac50f 100644
--- a/po/tl.po
+++ b/po/tl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-tl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-01 22:41+0200\n"
+"POT-Creation-Date: 2004-11-03 12:10+0100\n"
 "PO-Revision-Date: 2004-05-20 19:04+0800\n"
 "Last-Translator: Arys P. Deloso <arys@deloso.org>\n"
 "Language-Team: Filipino <salinpinoy@comitus.net>\n"
@@ -17,200 +17,210 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3\n"
 
-#: ../mdkapplet:61
+#: ../mdkapplet:63
 #, fuzzy, c-format
 msgid "Your system is up-to-date"
 msgstr "Ang Sistema ay naka-update\n"
 
-#: ../mdkapplet:67
+#: ../mdkapplet:69
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrakeonline.net"
 msgstr ""
 
-#: ../mdkapplet:73
+#: ../mdkapplet:75
 #, c-format
 msgid "System is busy. Please wait ..."
 msgstr "Abala ang sistema. Maghintay ..."
 
-#: ../mdkapplet:79
+#: ../mdkapplet:81
 #, fuzzy, c-format
 msgid "New updates are available for your system"
 msgstr "Walang mga available na update para sa iyong sistema"
 
-#: ../mdkapplet:85
+#: ../mdkapplet:87
 #, fuzzy, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr "Service ay hindi available. I-click ang \"Configuration\""
 
-#: ../mdkapplet:91
+#: ../mdkapplet:93
 #, fuzzy, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Down ang network. I-click ang \"I-configure ang Network\""
 
-#: ../mdkapplet:97
+#: ../mdkapplet:99
 #, fuzzy, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Service ay hindi available. I-click ang \"Configuration\""
 
-#: ../mdkapplet:103
+#: ../mdkapplet:105
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:108 ../mdkapplet:158
+#: ../mdkapplet:110 ../mdkapplet:164
 #, c-format
 msgid "Install updates"
 msgstr "I-install ang mga update"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:111
 #, fuzzy, c-format
 msgid "Configure the service"
 msgstr "I-configure ang Network"
 
-#: ../mdkapplet:110
+#: ../mdkapplet:112
 #, c-format
 msgid "Check Updates"
 msgstr "Suriin ang mga Update"
 
-#: ../mdkapplet:111
+#: ../mdkapplet:113 ../mdkapplet:167 ../mdkapplet:225
+#, fuzzy, c-format
+msgid "Please Wait"
+msgstr "Maghintay lamang"
+
+#: ../mdkapplet:113 ../mdkapplet:166 ../mdkapplet:167 ../mdkapplet:225
+#, c-format
+msgid "Check updates"
+msgstr "Suriin ang mga update"
+
+#: ../mdkapplet:115
 #, c-format
 msgid "Online WebSite"
 msgstr "Online WebSite"
 
-#: ../mdkapplet:112
+#: ../mdkapplet:116
 #, c-format
 msgid "Configure Network"
 msgstr "I-configure ang Network"
 
-#: ../mdkapplet:113
+#: ../mdkapplet:117
 #, c-format
 msgid "Configure Now!"
 msgstr "I-configure Ngayon!"
 
-#: ../mdkapplet:146
+#: ../mdkapplet:152 ../mdkapplet:229
 #, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Mandrakelinux Updates Applet"
 
-#: ../mdkapplet:156
+#: ../mdkapplet:162
 #, c-format
 msgid "Actions"
 msgstr "Mga Aksiyon"
 
-#: ../mdkapplet:159
+#: ../mdkapplet:165
 #, c-format
 msgid "Configure"
 msgstr "I-configure"
 
-#: ../mdkapplet:160
-#, c-format
-msgid "Check updates"
-msgstr "Suriin ang mga update"
-
-#: ../mdkapplet:161
+#: ../mdkapplet:169
 #, c-format
 msgid "See logs"
 msgstr "Tingnan ang mga log"
 
-#: ../mdkapplet:164
+#: ../mdkapplet:172
 #, c-format
 msgid "Status"
 msgstr "Kalagayan"
 
-#: ../mdkapplet:168 ../mdkapplet:363
+#: ../mdkapplet:176 ../mdkapplet:375
 #, c-format
 msgid "Close"
 msgstr "Isara"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Network Connection: "
 msgstr "Network Connection: "
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Up"
 msgstr "Up"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Down"
 msgstr "Down"
 
-#: ../mdkapplet:204
+#: ../mdkapplet:212
 #, c-format
 msgid "Last check: "
 msgstr "Huling pagsuri: "
 
-#: ../mdkapplet:205
+#: ../mdkapplet:213
 #, fuzzy, c-format
 msgid "Updates: "
 msgstr "Mga Bagong Update: "
 
-#: ../mdkapplet:209
+#: ../mdkapplet:217
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Inilulunsad ang drakconnect\n"
 
-#: ../mdkapplet:213
+#: ../mdkapplet:221
 #, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "Inilulunsad ang mdkupdate --applet\n"
 
-#: ../mdkapplet:217
+#: ../mdkapplet:224
 #, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 
-#: ../mdkapplet:225
+#: ../mdkapplet:235
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Naghahanap ng mga bagong update...\n"
 
-#: ../mdkapplet:227
+#: ../mdkapplet:237
 #, c-format
 msgid "Connecting to"
 msgstr "Kumukonekta sa"
 
-#: ../mdkapplet:250
+#: ../mdkapplet:244
+#, fuzzy, c-format
+msgid "Response from Mandrakeonline server\n"
+msgstr "Maligayang pagdating sa Mandrakeonline"
+
+#: ../mdkapplet:262
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Nagsusuri... mayroong mga Update\n"
 
-#: ../mdkapplet:254
+#: ../mdkapplet:267
 #, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
-#: ../mdkapplet:255
+#: ../mdkapplet:268
 #, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
-#: ../mdkapplet:256
+#: ../mdkapplet:269
 #, c-format
 msgid "Unknown state"
 msgstr "Di-kilalang state"
 
-#: ../mdkapplet:257
+#: ../mdkapplet:270
 #, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr ""
 "Naka-disable ang mga online service. Makipag-alam sa Mandrakeonline site\n"
 
-#: ../mdkapplet:258
+#: ../mdkapplet:271
 #, c-format
 msgid "Wrong Password.\n"
 msgstr "Maling password.\n"
 
-#: ../mdkapplet:259
+#: ../mdkapplet:272
 #, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr "Maling aksyon o host o login.\n"
 
-#: ../mdkapplet:260
+#: ../mdkapplet:273
 #, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
@@ -219,72 +229,82 @@ msgstr ""
 "May mali sa mga setting ng iyong network (pakisuri ang mga setting ng iyong "
 "route, firewall o proxy)\n"
 
-#: ../mdkapplet:264
+#: ../mdkapplet:277
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Ang Sistema ay naka-update\n"
 
-#: ../mdkapplet:303
+#: ../mdkapplet:317
 #, c-format
 msgid "No check"
 msgstr "Walang pagsuri"
 
-#: ../mdkapplet:316
+#: ../mdkapplet:330
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Sinusuri ang Network: tila naka-disable\n"
 
-#: ../mdkapplet:319
+#: ../mdkapplet:333
 #, c-format
 msgid "Checking config file: Not present\n"
 msgstr "Sinusuri ang config file: Wala\n"
 
-#: ../mdkapplet:353
+#: ../mdkapplet:365
 #, c-format
 msgid "Logs"
 msgstr "Mga Log"
 
-#: ../mdkapplet:369
+#: ../mdkapplet:381
 #, c-format
 msgid "Clear"
 msgstr "I-clear"
 
-#: ../mdkapplet:396
+#: ../mdkapplet:408
 #, c-format
 msgid "About..."
 msgstr "Tungkol sa.."
 
-#: ../mdkapplet:397
+#: ../mdkapplet:409
 #, c-format
 msgid "Always launch on startup"
 msgstr ""
 
-#: ../mdkapplet:399
+#: ../mdkapplet:411
 #, c-format
 msgid "Quit"
 msgstr "Quit"
 
-#: ../mdkonline:89
+#: ../mdkonline:52 ../mdkonline:106
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "Maligayang pagdating sa Mandrakeonline"
+
+#: ../mdkonline:55
 #, c-format
-msgid "Next"
-msgstr "Kasunod"
+msgid "I already have an account"
+msgstr ""
 
-#: ../mdkonline:89
+#: ../mdkonline:56
 #, c-format
-msgid "Cancel"
-msgstr "Kanselahin"
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline:89 ../mdkonline:93 ../mdkonline:131
+#, c-format
+msgid "Please wait"
+msgstr "Maghintay lamang"
 
 #: ../mdkonline:89
 #, c-format
-msgid "Previous"
-msgstr "Nakaraan"
+msgid "Reading configuration\n"
+msgstr "Binabasa ang configuration\n"
 
-#: ../mdkonline:103
+#: ../mdkonline:93
 #, c-format
-msgid "Welcome to Mandrakeonline"
-msgstr "Maligayang pagdating sa Mandrakeonline"
+msgid "Sending configuration..."
+msgstr "Ipinapadala ang configuration..."
 
-#: ../mdkonline:104 ../mdkonline_tui:98
+#: ../mdkonline:109
 #, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
@@ -296,62 +316,37 @@ msgstr ""
 "para mapaalam sa iyo ang tungkol sa mga update sa seguridad at mga\n"
 "kapakipakinabang na mga upgrade.\n"
 
-#: ../mdkonline:105 ../mdkonline_tui:142
+#: ../mdkonline:114
 #, c-format
-msgid "Create a Mandrakeonline Account"
-msgstr "Gumawa ng Mandrakeonline Account"
+msgid "Account creation or authentication"
+msgstr ""
 
-#: ../mdkonline:107
-#, fuzzy, c-format
-msgid "I don't have a Mandrakeonline account and I want to subscribe"
-msgstr "Wala akong Mandrakeonline account at gusto kong "
+#: ../mdkonline:119
+#, c-format
+msgid "Enter your Mandrakeonline login, password and machine name:"
+msgstr "Ipasok ang iyong Mandrakeonline login, password at pangalan ng makina:"
 
-#: ../mdkonline:111 ../mdkonline:131 ../mdkonline_tui:114 ../mdkonline_tui:145
+#: ../mdkonline:125 ../mdkonline:156
 #, c-format
 msgid "Login:"
 msgstr "Login:"
 
-#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:115 ../mdkonline_tui:146
+#: ../mdkonline:126 ../mdkonline:157
 #, c-format
 msgid "Password:"
 msgstr "Password:"
 
-#: ../mdkonline:113 ../mdkonline_tui:147
-#, c-format
-msgid "Confirm Password:"
-msgstr "Ulitin ang Password:"
-
-#: ../mdkonline:114 ../mdkonline_tui:148
-#, c-format
-msgid "Mail contact:"
-msgstr "Mail contact:"
-
-#: ../mdkonline:121
-#, c-format
-msgid "Mandrakelinux Privacy Policy"
-msgstr "Mandrakelinux Privacy Policy"
-
 #: ../mdkonline:127
 #, c-format
-msgid "Authentification"
-msgstr "Authentification"
-
-#: ../mdkonline:128 ../mdkonline_tui:108
-#, c-format
-msgid "Enter your Mandrakeonline login, password and machine name:"
-msgstr "Ipasok ang iyong Mandrakeonline login, password at pangalan ng makina:"
-
-#: ../mdkonline:133 ../mdkonline_tui:116
-#, c-format
 msgid "Machine name:"
 msgstr "Pangalan ng makina:"
 
-#: ../mdkonline:138
-#, c-format
-msgid "Send Configuration"
-msgstr "Ipadala ang Configuration"
+#: ../mdkonline:131
+#, fuzzy, c-format
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Maligayang pagdating sa Mandrakeonline"
 
-#: ../mdkonline:139 ../mdkonline_tui:128
+#: ../mdkonline:139
 #, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
@@ -387,56 +382,56 @@ msgstr ""
 "sa\n"
 "sa mga bayad na support service sa www.mandrakeexpert.com."
 
-#: ../mdkonline:144 ../mdkonline:211 ../mdkonline:234
-#, c-format
-msgid "Finish"
-msgstr "Wakas"
-
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141 ../mdkonline:180 ../mdkupdate:126 ../mdkupdate:198
 #, c-format
-msgid "Your upload was successful!"
-msgstr "Nagtagumpay ang iyong upload!"
+msgid "Connection problem"
+msgstr "Problema sa koneksyon"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandrakeonline."
+msgid "or"
 msgstr ""
-"Mula ngayon ikaw ay makakatanggap ng mga announcement\n"
-"tungkol sa seguridad at update salamat sa Mandrakeonline."
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "Maling password"
+
+#: ../mdkonline:141
 #, c-format
 msgid ""
-"Mandrakeonline offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+"Your login or password was wrong.\n"
+" Either you'll have to type it again, or you'll need to create an account on "
+"Mandrakeonline.\n"
+" In the latter case, go back to the first step to connect to "
+"Mandrakeonline.\n"
+" Be aware that you must also provide a Machine name \n"
+" (only alphabetical characters are admitted)"
 msgstr ""
-"Ang Mandrakeonline ay naghahandog sa iyo ng kakayahang i-automate\n"
-"ang mga update. May program na tatakbo tuwina sa iyong sistema na\n"
-"maghihintay para sa mga bagong update.\n"
-
-#: ../mdkonline:146
-#, c-format
-msgid "automated Upgrades"
-msgstr "naka-automate na mga Upgrade"
+"Ang iyong login o password ay mali.\n"
+" Kailangang i-type mo ulit ito, o kailangan mong gumawa ng account sa "
+"Mandrakeonline.\n"
+" Sa mas huling kaso, bumalik sa unang hakbang para kumonekta "
+"saMandrakeonline.\n"
+" Tandaan na dapat kang magbigay ng pangalan ng Makina \n"
+" (mga alphabetical na character lamang ang tatanggapin)"
 
-#: ../mdkonline:150
+#: ../mdkonline:153
 #, c-format
-msgid "Country:"
-msgstr "Bansa:"
+msgid "Create a Mandrakeonline Account"
+msgstr "Gumawa ng Mandrakeonline Account"
 
-#: ../mdkonline:178 ../mdkonline:183 ../mdkonline:185 ../mdkonline:187
+#: ../mdkonline:158
 #, c-format
-msgid "Error"
-msgstr "Error"
+msgid "Confirm Password:"
+msgstr "Ulitin ang Password:"
 
-#: ../mdkonline:183 ../mdkonline_tui:152
+#: ../mdkonline:159
 #, c-format
-msgid "Please provide a login"
-msgstr "Magbigay ng login"
+msgid "Mail contact:"
+msgstr "Mail contact:"
 
-#: ../mdkonline:185 ../mdkonline_tui:152
+#: ../mdkonline:163
 #, c-format
 msgid ""
 "The passwords do not match\n"
@@ -445,159 +440,115 @@ msgstr ""
 "Hindi magkatumbas ang mga password\n"
 " Pakisubukan muli\n"
 
-#: ../mdkonline:187 ../mdkonline_tui:152
+#: ../mdkonline:163
+#, c-format
+msgid "Please provide a login"
+msgstr "Magbigay ng login"
+
+#: ../mdkonline:163
 #, c-format
 msgid "Not a valid mail address!\n"
 msgstr "Hindi balidong mail address!\n"
 
-#: ../mdkonline:199 ../mdkonline_tui:78
+#: ../mdkonline:169
 #, c-format
-msgid "Reading configuration\n"
-msgstr "Binabasa ang configuration\n"
+msgid ""
+"Mandrakeonline Account successfully created.\n"
+"Please click \"Next\" to authenticate and upload your configuration\n"
+msgstr ""
 
-#: ../mdkonline:204 ../mdkonline_tui:82
+#: ../mdkonline:178
 #, c-format
-msgid "Sending configuration..."
-msgstr "Ipinapadala ang configuration..."
+msgid "Your upload was successful!"
+msgstr "Nagtagumpay ang iyong upload!"
 
-#: ../mdkonline:213 ../mdkonline:273 ../mdkonline_tui:130 ../mdkonline_tui:169
-#: ../mdkupdate:124 ../mdkupdate:195
+#: ../mdkonline:178
 #, c-format
-msgid "Connection problem"
-msgstr "Problema sa koneksyon"
+msgid ""
+"From now you will receive on security and updates \n"
+"announcements thanks to Mandrakeonline."
+msgstr ""
+"Mula ngayon ikaw ay makakatanggap ng mga announcement\n"
+"tungkol sa seguridad at update salamat sa Mandrakeonline."
 
-#: ../mdkonline:213 ../mdkonline_tui:169
+#: ../mdkonline:178
 #, c-format
-msgid "Problem occurs when uploading files, please try again"
+msgid ""
+"Mandrakeonline offers you the ability to automate the updates.\n"
+"A program will run regulary in your system waiting for new updates\n"
 msgstr ""
+"Ang Mandrakeonline ay naghahandog sa iyo ng kakayahang i-automate\n"
+"ang mga update. May program na tatakbo tuwina sa iyong sistema na\n"
+"maghihintay para sa mga bagong update.\n"
 
-#: ../mdkonline:251
+#: ../mdkonline:180
 #, c-format
-msgid "Quitting Wizard\n"
-msgstr "Lumalabas ng Wizard\n"
+msgid "Problem occurs when uploading files, please try again"
+msgstr ""
 
-#: ../mdkonline:273
-#, c-format
-msgid "Mandrakeonline could not be contacted, please try again at a later time"
-msgstr "Hindi ma-contact ang Mandrakeonline, pakisubukan muli mamaya"
+#: ../mdkonline:186
+#, fuzzy, c-format
+msgid "Country"
+msgstr "Bansa:"
+
+#: ../mdkonline:198
+#, fuzzy, c-format
+msgid "Congratulations"
+msgstr "Configuration"
 
-#: ../mdkonline:285
+#: ../mdkonline:198
 #, c-format
-msgid "Wrong password"
-msgstr "Maling password"
+msgid "Your Mandrakeonline account has been successfully configured\n"
+msgstr ""
 
-#: ../mdkonline:285 ../mdkonline_tui:130
+#: ../mdkonline:214
+#, fuzzy, c-format
+msgid "Configuration uploaded successfully"
+msgstr "Nagtagumpay ang iyong upload!"
+
+#: ../mdkonline:215
+#, fuzzy, c-format
+msgid "Problem uploading configuration"
+msgstr "Binabasa ang configuration\n"
+
+#: ../mdkonline:216
 #, c-format
 msgid ""
-"Your login or password was wrong.\n"
-" Either you'll have to type it again, or you'll need to create an account on "
-"Mandrakeonline.\n"
-" In the latter case, go back to the first step to connect to "
-"Mandrakeonline.\n"
-" Be aware that you must also provide a Machine name \n"
-" (only alphabetical characters are admitted)"
+"Cannot connect to mandrakeonline website: wrong login/password or router/"
+"firewall bad settings"
 msgstr ""
-"Ang iyong login o password ay mali.\n"
-" Kailangang i-type mo ulit ito, o kailangan mong gumawa ng account sa "
-"Mandrakeonline.\n"
-" Sa mas huling kaso, bumalik sa unang hakbang para kumonekta "
-"saMandrakeonline.\n"
-" Tandaan na dapat kang magbigay ng pangalan ng Makina \n"
-" (mga alphabetical na character lamang ang tatanggapin)"
 
-#: ../mdkonline.pm:58
+#: ../mdkonline.pm:66
 #, c-format
 msgid "Login and password should be less than 12 characters\n"
 msgstr "Ang login at password ay dapat mas maikli sa 12 character\n"
 
-#: ../mdkonline.pm:59
+#: ../mdkonline.pm:67
 #, c-format
 msgid "Special characters are not allowed\n"
 msgstr "Hindi pinapayagan ang mga special character\n"
 
-#: ../mdkonline.pm:60
+#: ../mdkonline.pm:68
 #, c-format
 msgid "Please fill in all fields\n"
 msgstr "Pakipuno lahat ng field\n"
 
-#: ../mdkonline.pm:61
+#: ../mdkonline.pm:69
 #, c-format
 msgid "Email not valid\n"
 msgstr "Email hindi balido\n"
 
-#: ../mdkonline.pm:62
+#: ../mdkonline.pm:70
 #, c-format
 msgid "Account already exist\n"
 msgstr "Mayroon nang account\n"
 
-#: ../mdkonline.pm:68
+#: ../mdkonline.pm:76
 #, c-format
 msgid "Problem connecting to server \n"
 msgstr "Problema sa pagkonekta sa server \n"
 
-#: ../mdkonline_tui:45 ../mdkonline_tui:95
-#, fuzzy, c-format
-msgid "Mandrakeonline"
-msgstr "Maligayang pagdating sa Mandrakeonline"
-
-#: ../mdkonline_tui:48
-#, c-format
-msgid "I already have an account"
-msgstr ""
-
-#: ../mdkonline_tui:49
-#, c-format
-msgid "I want to subscribe"
-msgstr ""
-
-#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:120
-#, c-format
-msgid "Please wait"
-msgstr "Maghintay lamang"
-
-#: ../mdkonline_tui:103
-#, c-format
-msgid "Account creation or authentication"
-msgstr ""
-
-#: ../mdkonline_tui:120
-#, fuzzy, c-format
-msgid "Connecting to Mandrakeonline website..."
-msgstr "Maligayang pagdating sa Mandrakeonline"
-
-#: ../mdkonline_tui:130
-#, c-format
-msgid "or"
-msgstr ""
-
-#: ../mdkonline_tui:130
-#, fuzzy, c-format
-msgid "wrong password:"
-msgstr "Maling password"
-
-#: ../mdkonline_tui:158
-#, c-format
-msgid ""
-"Mandrakeonline Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-
-#: ../mdkonline_tui:175
-#, fuzzy, c-format
-msgid "Country"
-msgstr "Bansa:"
-
-#: ../mdkonline_tui:187
-#, fuzzy, c-format
-msgid "Congratulations"
-msgstr "Configuration"
-
-#: ../mdkonline_tui:187
-#, c-format
-msgid "Your Mandrakeonline account has been successfully configured\n"
-msgstr ""
-
-#: ../mdkupdate:50
+#: ../mdkupdate:52
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
@@ -614,48 +565,90 @@ msgstr ""
 "\n"
 "paggamit:\n"
 
-#: ../mdkupdate:55
+#: ../mdkupdate:57
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - i-print ang mensaheng tulong na ito.\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:58
 #, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto         - Mandrakeupdate ay nakalunsad ng automatic.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:59
 #, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - ilunsad ang Mandrakeupdate.\n"
 
-#: ../mdkupdate:58
-#, c-format
-msgid "  --update       - Update keys\n"
-msgstr "  --update       - mga Update key\n"
-
-#: ../mdkupdate:66
+#: ../mdkupdate:67
 #, c-format
 msgid "No %s file found. Run mdkonline wizard first"
 msgstr ""
 
-#: ../mdkupdate:124
+#: ../mdkupdate:126
 #, fuzzy, c-format
 msgid "Mandrakeupdate could not contact the site, we will try again."
 msgstr "Hindi ma-contact ang Mandrakeonline, pakisubukan muli mamaya"
 
-#: ../mdkupdate:173
+#: ../mdkupdate:176
 #, c-format
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr "Hindi ma-update ang mga package mula sa medium ng mdkupdate.\n"
 
-#: ../mdkupdate:195
+#: ../mdkupdate:198
 #, c-format
 msgid ""
 "Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
 "mandrakeonline [dot] net"
 msgstr ""
 
+#~ msgid "Next"
+#~ msgstr "Kasunod"
+
+#~ msgid "Cancel"
+#~ msgstr "Kanselahin"
+
+#~ msgid "Previous"
+#~ msgstr "Nakaraan"
+
+#, fuzzy
+#~ msgid "I don't have a Mandrakeonline account and I want to subscribe"
+#~ msgstr "Wala akong Mandrakeonline account at gusto kong "
+
+#~ msgid "Mandrakelinux Privacy Policy"
+#~ msgstr "Mandrakelinux Privacy Policy"
+
+#~ msgid "Authentification"
+#~ msgstr "Authentification"
+
+#~ msgid "Send Configuration"
+#~ msgstr "Ipadala ang Configuration"
+
+#~ msgid "Finish"
+#~ msgstr "Wakas"
+
+#~ msgid "automated Upgrades"
+#~ msgstr "naka-automate na mga Upgrade"
+
+#~ msgid "Country:"
+#~ msgstr "Bansa:"
+
+#~ msgid "Error"
+#~ msgstr "Error"
+
+#~ msgid "Quitting Wizard\n"
+#~ msgstr "Lumalabas ng Wizard\n"
+
+#~ msgid ""
+#~ "Mandrakeonline could not be contacted, please try again at a later time"
+#~ msgstr "Hindi ma-contact ang Mandrakeonline, pakisubukan muli mamaya"
+
+#~ msgid "Wrong password"
+#~ msgstr "Maling password"
+
+#~ msgid "  --update       - Update keys\n"
+#~ msgstr "  --update       - mga Update key\n"
+
 #~ msgid "Skip Wizard"
 #~ msgstr "Laktawan ang Wizard"
 
diff --git a/po/tr.po b/po/tr.po
index c8439030..799908b5 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-tr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-01 22:41+0200\n"
+"POT-Creation-Date: 2004-11-03 12:10+0100\n"
 "PO-Revision-Date: 2004-02-26 20:24+0200\n"
 "Last-Translator: S. Alp ŞENYER <ssenyer@linux-sevenler.org>\n"
 "Language-Team: Turkish <gnome-turk@gnome.org>\n"
@@ -17,12 +17,12 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../mdkapplet:61
+#: ../mdkapplet:63
 #, c-format
 msgid "Your system is up-to-date"
 msgstr ""
 
-#: ../mdkapplet:67
+#: ../mdkapplet:69
 #, fuzzy, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -31,259 +31,279 @@ msgstr ""
 "Herhangi bir sorun için support@manrakeonline.net adresine posta "
 "gönderebilirsiniz\n"
 
-#: ../mdkapplet:73
+#: ../mdkapplet:75
 #, c-format
 msgid "System is busy. Please wait ..."
 msgstr ""
 
-#: ../mdkapplet:79
+#: ../mdkapplet:81
 #, c-format
 msgid "New updates are available for your system"
 msgstr ""
 
-#: ../mdkapplet:85
+#: ../mdkapplet:87
 #, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr ""
 
-#: ../mdkapplet:91
+#: ../mdkapplet:93
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr ""
 
-#: ../mdkapplet:97
+#: ../mdkapplet:99
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 
-#: ../mdkapplet:103
+#: ../mdkapplet:105
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:108 ../mdkapplet:158
+#: ../mdkapplet:110 ../mdkapplet:164
 #, c-format
 msgid "Install updates"
 msgstr "Güncellemeleri kur"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:111
 #, fuzzy, c-format
 msgid "Configure the service"
 msgstr "Ağı Yapılandır"
 
-#: ../mdkapplet:110
+#: ../mdkapplet:112
 #, c-format
 msgid "Check Updates"
 msgstr "Güncellemeleri Kontrol Et"
 
-#: ../mdkapplet:111
+#: ../mdkapplet:113 ../mdkapplet:167 ../mdkapplet:225
+#, fuzzy, c-format
+msgid "Please Wait"
+msgstr "Lütfen bekleyin"
+
+#: ../mdkapplet:113 ../mdkapplet:166 ../mdkapplet:167 ../mdkapplet:225
+#, fuzzy, c-format
+msgid "Check updates"
+msgstr "Güncellemeleri Kontrol Et"
+
+#: ../mdkapplet:115
 #, c-format
 msgid "Online WebSite"
 msgstr "Online WebSite"
 
-#: ../mdkapplet:112
+#: ../mdkapplet:116
 #, c-format
 msgid "Configure Network"
 msgstr "Ağı Yapılandır"
 
-#: ../mdkapplet:113
+#: ../mdkapplet:117
 #, fuzzy, c-format
 msgid "Configure Now!"
 msgstr "Yapılandır"
 
-#: ../mdkapplet:146
+#: ../mdkapplet:152 ../mdkapplet:229
 #, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Mandrakelinux Güncelleme Uygulamacığı"
 
-#: ../mdkapplet:156
+#: ../mdkapplet:162
 #, c-format
 msgid "Actions"
 msgstr "Eylemler"
 
-#: ../mdkapplet:159
+#: ../mdkapplet:165
 #, c-format
 msgid "Configure"
 msgstr "Yapılandır"
 
-#: ../mdkapplet:160
-#, fuzzy, c-format
-msgid "Check updates"
-msgstr "Güncellemeleri Kontrol Et"
-
-#: ../mdkapplet:161
+#: ../mdkapplet:169
 #, c-format
 msgid "See logs"
 msgstr "Günlüğü göster"
 
-#: ../mdkapplet:164
+#: ../mdkapplet:172
 #, c-format
 msgid "Status"
 msgstr "Durum"
 
-#: ../mdkapplet:168 ../mdkapplet:363
+#: ../mdkapplet:176 ../mdkapplet:375
 #, c-format
 msgid "Close"
 msgstr "Kapat"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Network Connection: "
 msgstr "Ağ Bağlantısı:"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Up"
 msgstr "Yukarı"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Down"
 msgstr "Aşağı"
 
-#: ../mdkapplet:204
+#: ../mdkapplet:212
 #, c-format
 msgid "Last check: "
 msgstr "Son Kontrol:"
 
-#: ../mdkapplet:205
+#: ../mdkapplet:213
 #, fuzzy, c-format
 msgid "Updates: "
 msgstr "Yeni Güncellemeler:"
 
-#: ../mdkapplet:209
+#: ../mdkapplet:217
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr ""
 
-#: ../mdkapplet:213
+#: ../mdkapplet:221
 #, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr ""
 
-#: ../mdkapplet:217
+#: ../mdkapplet:224
 #, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 
-#: ../mdkapplet:225
+#: ../mdkapplet:235
 #, fuzzy, c-format
 msgid "Computing new updates...\n"
 msgstr "Güncellemeleri Kontrol Et"
 
-#: ../mdkapplet:227
+#: ../mdkapplet:237
 #, fuzzy, c-format
 msgid "Connecting to"
 msgstr "Bağlantı problemi"
 
-#: ../mdkapplet:250
+#: ../mdkapplet:244
+#, fuzzy, c-format
+msgid "Response from Mandrakeonline server\n"
+msgstr "Mandrakeonline'na Hoşgeldiniz"
+
+#: ../mdkapplet:262
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr ""
 
-#: ../mdkapplet:254
+#: ../mdkapplet:267
 #, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
-#: ../mdkapplet:255
+#: ../mdkapplet:268
 #, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
-#: ../mdkapplet:256
+#: ../mdkapplet:269
 #, c-format
 msgid "Unknown state"
 msgstr ""
 
-#: ../mdkapplet:257
+#: ../mdkapplet:270
 #, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr ""
 
-#: ../mdkapplet:258
+#: ../mdkapplet:271
 #, c-format
 msgid "Wrong Password.\n"
 msgstr "Yanlış parola.\n"
 
-#: ../mdkapplet:259
+#: ../mdkapplet:272
 #, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr ""
 
-#: ../mdkapplet:260
+#: ../mdkapplet:273
 #, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
 msgstr ""
 
-#: ../mdkapplet:264
+#: ../mdkapplet:277
 #, c-format
 msgid "System is up-to-date\n"
 msgstr ""
 
-#: ../mdkapplet:303
+#: ../mdkapplet:317
 #, fuzzy, c-format
 msgid "No check"
 msgstr "Son Kontrol:"
 
-#: ../mdkapplet:316
+#: ../mdkapplet:330
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
-#: ../mdkapplet:319
+#: ../mdkapplet:333
 #, c-format
 msgid "Checking config file: Not present\n"
 msgstr ""
 
-#: ../mdkapplet:353
+#: ../mdkapplet:365
 #, fuzzy, c-format
 msgid "Logs"
 msgstr "Giriş:"
 
-#: ../mdkapplet:369
+#: ../mdkapplet:381
 #, c-format
 msgid "Clear"
 msgstr "Temizle"
 
-#: ../mdkapplet:396
+#: ../mdkapplet:408
 #, c-format
 msgid "About..."
 msgstr "Hakkında..."
 
-#: ../mdkapplet:397
+#: ../mdkapplet:409
 #, c-format
 msgid "Always launch on startup"
 msgstr ""
 
-#: ../mdkapplet:399
+#: ../mdkapplet:411
 #, c-format
 msgid "Quit"
 msgstr "Çıkış"
 
-#: ../mdkonline:89
+#: ../mdkonline:52 ../mdkonline:106
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "Mandrakeonline'na Hoşgeldiniz"
+
+#: ../mdkonline:55
 #, c-format
-msgid "Next"
-msgstr "İleri"
+msgid "I already have an account"
+msgstr ""
 
-#: ../mdkonline:89
+#: ../mdkonline:56
+#, c-format
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline:89 ../mdkonline:93 ../mdkonline:131
 #, c-format
-msgid "Cancel"
-msgstr "Vazgeç"
+msgid "Please wait"
+msgstr "Lütfen bekleyin"
 
 #: ../mdkonline:89
 #, c-format
-msgid "Previous"
-msgstr "Önceki"
+msgid "Reading configuration\n"
+msgstr "Yapılandırmanız okunuyor\n"
 
-#: ../mdkonline:103
+#: ../mdkonline:93
 #, c-format
-msgid "Welcome to Mandrakeonline"
-msgstr "Mandrakeonline'na Hoşgeldiniz"
+msgid "Sending configuration..."
+msgstr "Yapılandırma gönderiliyor..."
 
-#: ../mdkonline:104 ../mdkonline_tui:98
+#: ../mdkonline:109
 #, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
@@ -295,62 +315,37 @@ msgstr ""
 "oluşturulacak ve sisteminiz hakkında güvenlik yamaları ve güncellemelerden\n"
 "her an haberdar olacaksınız.\n"
 
-#: ../mdkonline:105 ../mdkonline_tui:142
+#: ../mdkonline:114
 #, c-format
-msgid "Create a Mandrakeonline Account"
-msgstr "Mandrakelinux Online Hesabı Oluştur"
+msgid "Account creation or authentication"
+msgstr ""
 
-#: ../mdkonline:107
-#, fuzzy, c-format
-msgid "I don't have a Mandrakeonline account and I want to subscribe"
-msgstr "Mandrakeonline hesabım yok ve yeni hesap açtırmak istiyorum "
+#: ../mdkonline:119
+#, c-format
+msgid "Enter your Mandrakeonline login, password and machine name:"
+msgstr "Mandrakeonline kullanıcıadınızı , parolanızı ve makine adını giriniz:"
 
-#: ../mdkonline:111 ../mdkonline:131 ../mdkonline_tui:114 ../mdkonline_tui:145
+#: ../mdkonline:125 ../mdkonline:156
 #, c-format
 msgid "Login:"
 msgstr "Giriş:"
 
-#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:115 ../mdkonline_tui:146
+#: ../mdkonline:126 ../mdkonline:157
 #, c-format
 msgid "Password:"
 msgstr "Parola:"
 
-#: ../mdkonline:113 ../mdkonline_tui:147
-#, c-format
-msgid "Confirm Password:"
-msgstr "Parolayı Onayla:"
-
-#: ../mdkonline:114 ../mdkonline_tui:148
-#, c-format
-msgid "Mail contact:"
-msgstr "Posta bağlantısı:"
-
-#: ../mdkonline:121
-#, c-format
-msgid "Mandrakelinux Privacy Policy"
-msgstr "Mandrakelinux Gizlilik Politikası"
-
 #: ../mdkonline:127
 #, c-format
-msgid "Authentification"
-msgstr "Yetkilendirme"
-
-#: ../mdkonline:128 ../mdkonline_tui:108
-#, c-format
-msgid "Enter your Mandrakeonline login, password and machine name:"
-msgstr "Mandrakeonline kullanıcıadınızı , parolanızı ve makine adını giriniz:"
-
-#: ../mdkonline:133 ../mdkonline_tui:116
-#, c-format
 msgid "Machine name:"
 msgstr "Makine adı:"
 
-#: ../mdkonline:138
+#: ../mdkonline:131
 #, fuzzy, c-format
-msgid "Send Configuration"
-msgstr "Yapılandırma"
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Mandrakeonline'na Hoşgeldiniz"
 
-#: ../mdkonline:139 ../mdkonline_tui:128
+#: ../mdkonline:139
 #, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
@@ -380,57 +375,56 @@ msgstr ""
 "Sistem bilginiz kesinlikle bir 3. şahısa iletilmeyecektir.\n"
 "Tüm bu bilgiler Mandrakelinux Gizlilik Poliçesi ile korunacaktır."
 
-#: ../mdkonline:144 ../mdkonline:211 ../mdkonline:234
+#: ../mdkonline:141 ../mdkonline:180 ../mdkupdate:126 ../mdkupdate:198
 #, c-format
-msgid "Finish"
-msgstr "Son"
-
-#: ../mdkonline:145 ../mdkonline_tui:167
-#, c-format
-msgid "Your upload was successful!"
-msgstr "Göndermeniz tamamlanmıştır!"
+msgid "Connection problem"
+msgstr "Bağlantı problemi"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandrakeonline."
+msgid "or"
 msgstr ""
-"Bundan böyle Mandrakeonline'dan sisteminiz\n"
-"hakkında ki tüm gelişmeler ve güvenlik açıkları size bildirilecektir.\n"
-"Mandrakesoft teşekkürlerini sunar..."
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "Yanlış parola"
+
+#: ../mdkonline:141
 #, c-format
 msgid ""
-"Mandrakeonline offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+"Your login or password was wrong.\n"
+" Either you'll have to type it again, or you'll need to create an account on "
+"Mandrakeonline.\n"
+" In the latter case, go back to the first step to connect to "
+"Mandrakeonline.\n"
+" Be aware that you must also provide a Machine name \n"
+" (only alphabetical characters are admitted)"
 msgstr ""
-"Mandrakeonline otamatikman uygulanabilecek güncellemeleri teklif edecektir.\n"
-"Sistemizde belirli aralıklarla çalışacak ve\n"
-"güncellemeleri takip edecek olan bir programdır\n"
-
-#: ../mdkonline:146
-#, c-format
-msgid "automated Upgrades"
-msgstr "otomatik Güncellemeler"
+"Kullanıcıadı veya parolanız yanlış.\n"
+" Parolanızı kontrollü şekilde tekrar girin, veya Mandrakeonline 'dan bir "
+"yeni hesap açtırın.\n"
+" O halde Şimdi Geri tuşuna basın ve Mandrakeonline a bağlanmak için\n"
+"talimatları izleyin!. \n"
+" Bir Makine adı tanımladığınıza emin olun. \n"
+" ( sadece karakter bazlı makine adları geçerlidir)"
 
-#: ../mdkonline:150
+#: ../mdkonline:153
 #, c-format
-msgid "Country:"
-msgstr "Ülke:"
+msgid "Create a Mandrakeonline Account"
+msgstr "Mandrakelinux Online Hesabı Oluştur"
 
-#: ../mdkonline:178 ../mdkonline:183 ../mdkonline:185 ../mdkonline:187
+#: ../mdkonline:158
 #, c-format
-msgid "Error"
-msgstr "Hata"
+msgid "Confirm Password:"
+msgstr "Parolayı Onayla:"
 
-#: ../mdkonline:183 ../mdkonline_tui:152
+#: ../mdkonline:159
 #, c-format
-msgid "Please provide a login"
-msgstr "Lütfen bir kullanıcı adı edinin"
+msgid "Mail contact:"
+msgstr "Posta bağlantısı:"
 
-#: ../mdkonline:185 ../mdkonline_tui:152
+#: ../mdkonline:163
 #, c-format
 msgid ""
 "The passwords do not match\n"
@@ -439,161 +433,116 @@ msgstr ""
 "Şifreler uyuşmuyor\n"
 "Lütfen tekrar deneyin\n"
 
-#: ../mdkonline:187 ../mdkonline_tui:152
+#: ../mdkonline:163
+#, c-format
+msgid "Please provide a login"
+msgstr "Lütfen bir kullanıcı adı edinin"
+
+#: ../mdkonline:163
 #, c-format
 msgid "Not a valid mail address!\n"
 msgstr "Geçerli bir EPosta adresi değil\n"
 
-#: ../mdkonline:199 ../mdkonline_tui:78
+#: ../mdkonline:169
 #, c-format
-msgid "Reading configuration\n"
-msgstr "Yapılandırmanız okunuyor\n"
+msgid ""
+"Mandrakeonline Account successfully created.\n"
+"Please click \"Next\" to authenticate and upload your configuration\n"
+msgstr ""
 
-#: ../mdkonline:204 ../mdkonline_tui:82
+#: ../mdkonline:178
 #, c-format
-msgid "Sending configuration..."
-msgstr "Yapılandırma gönderiliyor..."
+msgid "Your upload was successful!"
+msgstr "Göndermeniz tamamlanmıştır!"
 
-#: ../mdkonline:213 ../mdkonline:273 ../mdkonline_tui:130 ../mdkonline_tui:169
-#: ../mdkupdate:124 ../mdkupdate:195
+#: ../mdkonline:178
 #, c-format
-msgid "Connection problem"
-msgstr "Bağlantı problemi"
+msgid ""
+"From now you will receive on security and updates \n"
+"announcements thanks to Mandrakeonline."
+msgstr ""
+"Bundan böyle Mandrakeonline'dan sisteminiz\n"
+"hakkında ki tüm gelişmeler ve güvenlik açıkları size bildirilecektir.\n"
+"Mandrakesoft teşekkürlerini sunar..."
 
-#: ../mdkonline:213 ../mdkonline_tui:169
+#: ../mdkonline:178
 #, c-format
-msgid "Problem occurs when uploading files, please try again"
+msgid ""
+"Mandrakeonline offers you the ability to automate the updates.\n"
+"A program will run regulary in your system waiting for new updates\n"
 msgstr ""
+"Mandrakeonline otamatikman uygulanabilecek güncellemeleri teklif edecektir.\n"
+"Sistemizde belirli aralıklarla çalışacak ve\n"
+"güncellemeleri takip edecek olan bir programdır\n"
 
-#: ../mdkonline:251
+#: ../mdkonline:180
 #, c-format
-msgid "Quitting Wizard\n"
-msgstr "Sihirbaz Kapatılıyor\n"
+msgid "Problem occurs when uploading files, please try again"
+msgstr ""
 
-#: ../mdkonline:273
+#: ../mdkonline:186
+#, fuzzy, c-format
+msgid "Country"
+msgstr "Ülke:"
+
+#: ../mdkonline:198
+#, fuzzy, c-format
+msgid "Congratulations"
+msgstr "Yapılandırma"
+
+#: ../mdkonline:198
 #, c-format
-msgid "Mandrakeonline could not be contacted, please try again at a later time"
+msgid "Your Mandrakeonline account has been successfully configured\n"
 msgstr ""
-"Mandrakeonline sitesine bağlantı sağlanamadı, sonra lütfen daha sonra tekrar "
-"deneyin."
 
-#: ../mdkonline:285
-#, c-format
-msgid "Wrong password"
-msgstr "Yanlış parola"
+#: ../mdkonline:214
+#, fuzzy, c-format
+msgid "Configuration uploaded successfully"
+msgstr "Göndermeniz tamamlanmıştır!"
 
-#: ../mdkonline:285 ../mdkonline_tui:130
+#: ../mdkonline:215
+#, fuzzy, c-format
+msgid "Problem uploading configuration"
+msgstr "Yapılandırmanız okunuyor\n"
+
+#: ../mdkonline:216
 #, c-format
 msgid ""
-"Your login or password was wrong.\n"
-" Either you'll have to type it again, or you'll need to create an account on "
-"Mandrakeonline.\n"
-" In the latter case, go back to the first step to connect to "
-"Mandrakeonline.\n"
-" Be aware that you must also provide a Machine name \n"
-" (only alphabetical characters are admitted)"
+"Cannot connect to mandrakeonline website: wrong login/password or router/"
+"firewall bad settings"
 msgstr ""
-"Kullanıcıadı veya parolanız yanlış.\n"
-" Parolanızı kontrollü şekilde tekrar girin, veya Mandrakeonline 'dan bir "
-"yeni hesap açtırın.\n"
-" O halde Şimdi Geri tuşuna basın ve Mandrakeonline a bağlanmak için\n"
-"talimatları izleyin!. \n"
-" Bir Makine adı tanımladığınıza emin olun. \n"
-" ( sadece karakter bazlı makine adları geçerlidir)"
 
-#: ../mdkonline.pm:58
+#: ../mdkonline.pm:66
 #, c-format
 msgid "Login and password should be less than 12 characters\n"
 msgstr "Kullanıcı adı ve şifre 12 karakterden küçük olmalıdır\n"
 
-#: ../mdkonline.pm:59
+#: ../mdkonline.pm:67
 #, c-format
 msgid "Special characters are not allowed\n"
 msgstr "Özel karakterler kullanılamaz\n"
 
-#: ../mdkonline.pm:60
+#: ../mdkonline.pm:68
 #, c-format
 msgid "Please fill in all fields\n"
 msgstr "Lütfen tüm alanları doldurun\n"
 
-#: ../mdkonline.pm:61
+#: ../mdkonline.pm:69
 #, c-format
 msgid "Email not valid\n"
 msgstr "Geçersiz EPosta\n"
 
-#: ../mdkonline.pm:62
+#: ../mdkonline.pm:70
 #, c-format
 msgid "Account already exist\n"
 msgstr "Böyle bir hesap zaten var\n"
 
-#: ../mdkonline.pm:68
+#: ../mdkonline.pm:76
 #, c-format
 msgid "Problem connecting to server \n"
 msgstr "Sunucuya bağlanırken hata oluştu\n"
 
-#: ../mdkonline_tui:45 ../mdkonline_tui:95
-#, fuzzy, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline'na Hoşgeldiniz"
-
-#: ../mdkonline_tui:48
-#, c-format
-msgid "I already have an account"
-msgstr ""
-
-#: ../mdkonline_tui:49
-#, c-format
-msgid "I want to subscribe"
-msgstr ""
-
-#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:120
-#, c-format
-msgid "Please wait"
-msgstr "Lütfen bekleyin"
-
-#: ../mdkonline_tui:103
-#, c-format
-msgid "Account creation or authentication"
-msgstr ""
-
-#: ../mdkonline_tui:120
-#, fuzzy, c-format
-msgid "Connecting to Mandrakeonline website..."
-msgstr "Mandrakeonline'na Hoşgeldiniz"
-
-#: ../mdkonline_tui:130
-#, c-format
-msgid "or"
-msgstr ""
-
-#: ../mdkonline_tui:130
-#, fuzzy, c-format
-msgid "wrong password:"
-msgstr "Yanlış parola"
-
-#: ../mdkonline_tui:158
-#, c-format
-msgid ""
-"Mandrakeonline Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-
-#: ../mdkonline_tui:175
-#, fuzzy, c-format
-msgid "Country"
-msgstr "Ülke:"
-
-#: ../mdkonline_tui:187
-#, fuzzy, c-format
-msgid "Congratulations"
-msgstr "Yapılandırma"
-
-#: ../mdkonline_tui:187
-#, c-format
-msgid "Your Mandrakeonline account has been successfully configured\n"
-msgstr ""
-
-#: ../mdkupdate:50
+#: ../mdkupdate:52
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
@@ -610,49 +559,98 @@ msgstr ""
 "\n"
 "kullanımı:\n"
 
-#: ../mdkupdate:55
+#: ../mdkupdate:57
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - bu yardım mesajını görüntüler.\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:58
 #, fuzzy, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr " --update        - Mandrake Update'yi çalıştır.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:59
 #, fuzzy, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr " --update        - Mandrakelinux Update'yi çalıştır.\n"
 
-#: ../mdkupdate:58
-#, fuzzy, c-format
-msgid "  --update       - Update keys\n"
-msgstr " --update        - Mandrakelinux Update'yi çalıştır.\n"
-
-#: ../mdkupdate:66
+#: ../mdkupdate:67
 #, c-format
 msgid "No %s file found. Run mdkonline wizard first"
 msgstr ""
 
-#: ../mdkupdate:124
+#: ../mdkupdate:126
 #, c-format
 msgid "Mandrakeupdate could not contact the site, we will try again."
 msgstr ""
 "Mandrakeupdate sitesine bağlantı sağlanamadı, sonra tekrar deneyeceğiz."
 
-#: ../mdkupdate:173
+#: ../mdkupdate:176
 #, c-format
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr "mdkupdate medyasından paketler güncellenemiyor.\n"
 
-#: ../mdkupdate:195
+#: ../mdkupdate:198
 #, c-format
 msgid ""
 "Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
 "mandrakeonline [dot] net"
 msgstr ""
 
+#~ msgid "Next"
+#~ msgstr "İleri"
+
+#~ msgid "Cancel"
+#~ msgstr "Vazgeç"
+
+#~ msgid "Previous"
+#~ msgstr "Önceki"
+
+#~ msgid "Welcome to Mandrakeonline"
+#~ msgstr "Mandrakeonline'na Hoşgeldiniz"
+
+#, fuzzy
+#~ msgid "I don't have a Mandrakeonline account and I want to subscribe"
+#~ msgstr "Mandrakeonline hesabım yok ve yeni hesap açtırmak istiyorum "
+
+#~ msgid "Mandrakelinux Privacy Policy"
+#~ msgstr "Mandrakelinux Gizlilik Politikası"
+
+#~ msgid "Authentification"
+#~ msgstr "Yetkilendirme"
+
+#, fuzzy
+#~ msgid "Send Configuration"
+#~ msgstr "Yapılandırma"
+
+#~ msgid "Finish"
+#~ msgstr "Son"
+
+#~ msgid "automated Upgrades"
+#~ msgstr "otomatik Güncellemeler"
+
+#~ msgid "Country:"
+#~ msgstr "Ülke:"
+
+#~ msgid "Error"
+#~ msgstr "Hata"
+
+#~ msgid "Quitting Wizard\n"
+#~ msgstr "Sihirbaz Kapatılıyor\n"
+
+#~ msgid ""
+#~ "Mandrakeonline could not be contacted, please try again at a later time"
+#~ msgstr ""
+#~ "Mandrakeonline sitesine bağlantı sağlanamadı, sonra lütfen daha sonra "
+#~ "tekrar deneyin."
+
+#~ msgid "Wrong password"
+#~ msgstr "Yanlış parola"
+
+#, fuzzy
+#~ msgid "  --update       - Update keys\n"
+#~ msgstr " --update        - Mandrakelinux Update'yi çalıştır.\n"
+
 #~ msgid "Skip Wizard"
 #~ msgstr "Sihirbazı Atla"
 
@@ -691,10 +689,6 @@ msgstr ""
 #~ msgstr "Sunucu Hatası"
 
 #, fuzzy
-#~ msgid "Response from Mandrakeonline server\n"
-#~ msgstr "Mandrakeonline'na Hoşgeldiniz"
-
-#, fuzzy
 #~ msgid "Launching Mandrakeupdate\n"
 #~ msgstr "Mandrakelinux Update Uygulamasını Çalıştır"
 
diff --git a/po/uk.po b/po/uk.po
index 6769583b..ba953676 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-uk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-01 22:41+0200\n"
+"POT-Creation-Date: 2004-11-03 12:10+0100\n"
 "PO-Revision-Date: 2004-10-03 07:24+0300\n"
 "Last-Translator: Taras Boychuk <btr1@ukrpost.net>\n"
 "Language-Team: ukrainian <uk@li.org>\n"
@@ -20,12 +20,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3\n"
 
-#: ../mdkapplet:61
+#: ../mdkapplet:63
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Система поновлена"
 
-#: ../mdkapplet:67
+#: ../mdkapplet:69
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -34,187 +34,197 @@ msgstr ""
 "Проблема з налаштуванням служб. Будь ласка, перевірте журнал і відправте "
 "листа на support@mandrakeonline.net"
 
-#: ../mdkapplet:73
+#: ../mdkapplet:75
 #, c-format
 msgid "System is busy. Please wait ..."
 msgstr "Система зайнята. Зачекайте..."
 
-#: ../mdkapplet:79
+#: ../mdkapplet:81
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Є нові поновлення для Вашої системи"
 
-#: ../mdkapplet:85
+#: ../mdkapplet:87
 #, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr "Служба не налаштована. Натисніть на \"Налаштувати службу\""
 
-#: ../mdkapplet:91
+#: ../mdkapplet:93
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Мережа вимкнена. Будь ласка, налаштуйте мережу"
 
-#: ../mdkapplet:97
+#: ../mdkapplet:99
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Служба не ввімкнена. Натисніть на \"Online Website\""
 
-#: ../mdkapplet:103
+#: ../mdkapplet:105
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "Версія не підтримується (занадто стара або в розробці)"
 
-#: ../mdkapplet:108 ../mdkapplet:158
+#: ../mdkapplet:110 ../mdkapplet:164
 #, c-format
 msgid "Install updates"
 msgstr "Встановити поновлення"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:111
 #, c-format
 msgid "Configure the service"
 msgstr "Налаштувати службу"
 
-#: ../mdkapplet:110
+#: ../mdkapplet:112
 #, c-format
 msgid "Check Updates"
 msgstr "Перевірити поновлення"
 
-#: ../mdkapplet:111
+#: ../mdkapplet:113 ../mdkapplet:167 ../mdkapplet:225
+#, fuzzy, c-format
+msgid "Please Wait"
+msgstr "Зачекайте, будь-ласка"
+
+#: ../mdkapplet:113 ../mdkapplet:166 ../mdkapplet:167 ../mdkapplet:225
+#, c-format
+msgid "Check updates"
+msgstr "Перевірити поновлення"
+
+#: ../mdkapplet:115
 #, c-format
 msgid "Online WebSite"
 msgstr "Online WebSite"
 
-#: ../mdkapplet:112
+#: ../mdkapplet:116
 #, c-format
 msgid "Configure Network"
 msgstr "Налаштувати мережу"
 
-#: ../mdkapplet:113
+#: ../mdkapplet:117
 #, c-format
 msgid "Configure Now!"
 msgstr "Налаштувати вже!"
 
-#: ../mdkapplet:146
+#: ../mdkapplet:152 ../mdkapplet:229
 #, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Аплет Поновлення Мандрейклінакса"
 
-#: ../mdkapplet:156
+#: ../mdkapplet:162
 #, c-format
 msgid "Actions"
 msgstr "Дії"
 
-#: ../mdkapplet:159
+#: ../mdkapplet:165
 #, c-format
 msgid "Configure"
 msgstr "Налаштувати"
 
-#: ../mdkapplet:160
-#, c-format
-msgid "Check updates"
-msgstr "Перевірити поновлення"
-
-#: ../mdkapplet:161
+#: ../mdkapplet:169
 #, c-format
 msgid "See logs"
 msgstr "Переглянути журнал"
 
-#: ../mdkapplet:164
+#: ../mdkapplet:172
 #, c-format
 msgid "Status"
 msgstr "Стан"
 
-#: ../mdkapplet:168 ../mdkapplet:363
+#: ../mdkapplet:176 ../mdkapplet:375
 #, c-format
 msgid "Close"
 msgstr "Закрити"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Network Connection: "
 msgstr "Під'єднання до мережі:"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Up"
 msgstr "Увімкнути"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Down"
 msgstr "Вимкнути"
 
-#: ../mdkapplet:204
+#: ../mdkapplet:212
 #, c-format
 msgid "Last check: "
 msgstr "Остання перевірка:"
 
-#: ../mdkapplet:205
+#: ../mdkapplet:213
 #, c-format
 msgid "Updates: "
 msgstr "Поновлення: "
 
-#: ../mdkapplet:209
+#: ../mdkapplet:217
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Запускається drakconnect\n"
 
-#: ../mdkapplet:213
+#: ../mdkapplet:221
 #, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "Запускається аплет mdkupdate\n"
 
-#: ../mdkapplet:217
+#: ../mdkapplet:224
 #, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr "Здається, Mandrakeonline було перевстановлено, перезавантажую аплет..."
 
-#: ../mdkapplet:225
+#: ../mdkapplet:235
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Перевіряються нові поновлення...\n"
 
-#: ../mdkapplet:227
+#: ../mdkapplet:237
 #, c-format
 msgid "Connecting to"
 msgstr "Під'єднуюсь до"
 
-#: ../mdkapplet:250
+#: ../mdkapplet:244
+#, fuzzy, c-format
+msgid "Response from Mandrakeonline server\n"
+msgstr "Ласкаво просимо до Mandrakeonline"
+
+#: ../mdkapplet:262
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Перевірка... Поновлення готові \n"
 
-#: ../mdkapplet:254
+#: ../mdkapplet:267
 #, c-format
 msgid "Development release not supported by service"
 msgstr "Вірсії в розробці не підтримуюються послугою"
 
-#: ../mdkapplet:255
+#: ../mdkapplet:268
 #, c-format
 msgid "Too old release not supported by service"
 msgstr "Занадто стара версія, не підтримується послугою"
 
-#: ../mdkapplet:256
+#: ../mdkapplet:269
 #, c-format
 msgid "Unknown state"
 msgstr "Невідомий стан"
 
-#: ../mdkapplet:257
+#: ../mdkapplet:270
 #, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr "Онлайнові послуги вимкнено. Зверніться до сайту Mandrakeonline\n"
 
-#: ../mdkapplet:258
+#: ../mdkapplet:271
 #, c-format
 msgid "Wrong Password.\n"
 msgstr "Неправильний пароль.\n"
 
-#: ../mdkapplet:259
+#: ../mdkapplet:272
 #, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr "Направильна дія, машина або пароль.\n"
 
-#: ../mdkapplet:260
+#: ../mdkapplet:273
 #, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
@@ -223,72 +233,82 @@ msgstr ""
 "Щось сталося з налаштуваннями мережі (перевірте маршрутизатор, захисний шлюз "
 "або налаштування проксі)\n"
 
-#: ../mdkapplet:264
+#: ../mdkapplet:277
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Система поновлена\n"
 
-#: ../mdkapplet:303
+#: ../mdkapplet:317
 #, c-format
 msgid "No check"
 msgstr "Немає перевірок"
 
-#: ../mdkapplet:316
+#: ../mdkapplet:330
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Перевірка мережі: здається, вимкнена\n"
 
-#: ../mdkapplet:319
+#: ../mdkapplet:333
 #, c-format
 msgid "Checking config file: Not present\n"
 msgstr "Перевірка конфігураційного файла: немає\n"
 
-#: ../mdkapplet:353
+#: ../mdkapplet:365
 #, c-format
 msgid "Logs"
 msgstr "Журнал"
 
-#: ../mdkapplet:369
+#: ../mdkapplet:381
 #, c-format
 msgid "Clear"
 msgstr "Очистити"
 
-#: ../mdkapplet:396
+#: ../mdkapplet:408
 #, c-format
 msgid "About..."
 msgstr "Про..."
 
-#: ../mdkapplet:397
+#: ../mdkapplet:409
 #, c-format
 msgid "Always launch on startup"
 msgstr "Завжди виконувати при завантаженні"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:411
 #, c-format
 msgid "Quit"
 msgstr "Вийти"
 
-#: ../mdkonline:89
+#: ../mdkonline:52 ../mdkonline:106
 #, c-format
-msgid "Next"
-msgstr "Вперед"
+msgid "Mandrakeonline"
+msgstr "Mandrakeonline"
 
-#: ../mdkonline:89
+#: ../mdkonline:55
 #, c-format
-msgid "Cancel"
-msgstr "Відмінити"
+msgid "I already have an account"
+msgstr "Я вже маю рахунок"
+
+#: ../mdkonline:56
+#, c-format
+msgid "I want to subscribe"
+msgstr "Я хочу підписатися"
+
+#: ../mdkonline:89 ../mdkonline:93 ../mdkonline:131
+#, c-format
+msgid "Please wait"
+msgstr "Зачекайте, будь-ласка"
 
 #: ../mdkonline:89
 #, c-format
-msgid "Previous"
-msgstr "Назад"
+msgid "Reading configuration\n"
+msgstr "Читається конфігурація\n"
 
-#: ../mdkonline:103
+#: ../mdkonline:93
 #, c-format
-msgid "Welcome to Mandrakeonline"
-msgstr "Ласкаво просимо до Mandrakeonline"
+msgid "Sending configuration..."
+msgstr "Надсилається конфігурація..."
 
-#: ../mdkonline:104 ../mdkonline_tui:98
+#: ../mdkonline:109
 #, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
@@ -299,62 +319,37 @@ msgstr ""
 "(пакунки, конфігурацію системи) до централізованої бази,\n"
 "щоб інформувати Вас про поновлення безпеки та інші корисні оновлення.\n"
 
-#: ../mdkonline:105 ../mdkonline_tui:142
+#: ../mdkonline:114
 #, c-format
-msgid "Create a Mandrakeonline Account"
-msgstr "Створити рахунок Mandrakeonline"
+msgid "Account creation or authentication"
+msgstr "Створення рахунка або розпізнавання"
 
-#: ../mdkonline:107
+#: ../mdkonline:119
 #, c-format
-msgid "I don't have a Mandrakeonline account and I want to subscribe"
-msgstr "В мене немає рахунку Mandrakeonline і я хочу його створити"
+msgid "Enter your Mandrakeonline login, password and machine name:"
+msgstr "Введіть своє ім'я на Mandrakeonline, пароль та назву машини: "
 
-#: ../mdkonline:111 ../mdkonline:131 ../mdkonline_tui:114 ../mdkonline_tui:145
+#: ../mdkonline:125 ../mdkonline:156
 #, c-format
 msgid "Login:"
 msgstr "Ім'я:"
 
-#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:115 ../mdkonline_tui:146
+#: ../mdkonline:126 ../mdkonline:157
 #, c-format
 msgid "Password:"
 msgstr "Пароль:"
 
-#: ../mdkonline:113 ../mdkonline_tui:147
-#, c-format
-msgid "Confirm Password:"
-msgstr "Підтвердіть пароль:"
-
-#: ../mdkonline:114 ../mdkonline_tui:148
-#, c-format
-msgid "Mail contact:"
-msgstr "Поштовий контакт:"
-
-#: ../mdkonline:121
-#, c-format
-msgid "Mandrakelinux Privacy Policy"
-msgstr "Mandrakelinux Privacy Policy"
-
 #: ../mdkonline:127
 #, c-format
-msgid "Authentification"
-msgstr "Аутентифікація"
-
-#: ../mdkonline:128 ../mdkonline_tui:108
-#, c-format
-msgid "Enter your Mandrakeonline login, password and machine name:"
-msgstr "Введіть своє ім'я на Mandrakeonline, пароль та назву машини: "
-
-#: ../mdkonline:133 ../mdkonline_tui:116
-#, c-format
 msgid "Machine name:"
 msgstr "Назва машини:"
 
-#: ../mdkonline:138
+#: ../mdkonline:131
 #, c-format
-msgid "Send Configuration"
-msgstr "Відіслати конфігурацію"
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Під'єднання до сайта Mandrakeonline..."
 
-#: ../mdkonline:139 ../mdkonline_tui:128
+#: ../mdkonline:139
 #, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
@@ -386,55 +381,55 @@ msgstr ""
 " про поновлення безпеки і корисні оновлення через персональні попередження "
 "електронною поштою."
 
-#: ../mdkonline:144 ../mdkonline:211 ../mdkonline:234
+#: ../mdkonline:141 ../mdkonline:180 ../mdkupdate:126 ../mdkupdate:198
 #, c-format
-msgid "Finish"
-msgstr "Завершити"
+msgid "Connection problem"
+msgstr "Проблеми зі з'єднанням"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid "Your upload was successful!"
-msgstr "звантаження пройшло успішно!"
+msgid "or"
+msgstr "або"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandrakeonline."
-msgstr ""
-"Відтепер завдяки Mandrakeonline Ви отримуватимете оновлення безпеки \n"
-"оголошення про поновлення."
+msgid "wrong password:"
+msgstr "неправильний пароль:"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
 msgid ""
-"Mandrakeonline offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+"Your login or password was wrong.\n"
+" Either you'll have to type it again, or you'll need to create an account on "
+"Mandrakeonline.\n"
+" In the latter case, go back to the first step to connect to "
+"Mandrakeonline.\n"
+" Be aware that you must also provide a Machine name \n"
+" (only alphabetical characters are admitted)"
 msgstr ""
-"Mandrakeonline пропонує Вам можливість автоматизувати поновлення.\n"
-"Програма регулярно виконуватиметься і очікуватиме нових поновлень\n"
-
-#: ../mdkonline:146
-#, c-format
-msgid "automated Upgrades"
-msgstr "автоматичні Оновлення"
+"Ваше ім'я реєстрації або пароль неправильні.\n"
+" Наберіть знову або створіть рахунок на Mandrakeonline.\n"
+" В другому випадку поверніться до першого кроку, щоб з'єднатися з "
+"Mandrakeonline.\n"
+" Знайте, що Ви повинні також вказати назву машини \n"
+" (можна використовувати тільки алфавітні символи)"
 
-#: ../mdkonline:150
+#: ../mdkonline:153
 #, c-format
-msgid "Country:"
-msgstr "Країна:"
+msgid "Create a Mandrakeonline Account"
+msgstr "Створити рахунок Mandrakeonline"
 
-#: ../mdkonline:178 ../mdkonline:183 ../mdkonline:185 ../mdkonline:187
+#: ../mdkonline:158
 #, c-format
-msgid "Error"
-msgstr "Помилка"
+msgid "Confirm Password:"
+msgstr "Підтвердіть пароль:"
 
-#: ../mdkonline:183 ../mdkonline_tui:152
+#: ../mdkonline:159
 #, c-format
-msgid "Please provide a login"
-msgstr "Будь ласка, вкажіть ім'я"
+msgid "Mail contact:"
+msgstr "Поштовий контакт:"
 
-#: ../mdkonline:185 ../mdkonline_tui:152
+#: ../mdkonline:163
 #, c-format
 msgid ""
 "The passwords do not match\n"
@@ -443,162 +438,116 @@ msgstr ""
 "Паролі не співпадають\n"
 "Спробуйте ще раз\n"
 
-#: ../mdkonline:187 ../mdkonline_tui:152
+#: ../mdkonline:163
+#, c-format
+msgid "Please provide a login"
+msgstr "Будь ласка, вкажіть ім'я"
+
+#: ../mdkonline:163
 #, c-format
 msgid "Not a valid mail address!\n"
 msgstr "Неправильна електронна адреса!\n"
 
-#: ../mdkonline:199 ../mdkonline_tui:78
+#: ../mdkonline:169
 #, c-format
-msgid "Reading configuration\n"
-msgstr "Читається конфігурація\n"
+msgid ""
+"Mandrakeonline Account successfully created.\n"
+"Please click \"Next\" to authenticate and upload your configuration\n"
+msgstr ""
+"Рахунок Mandrakeonline успішно створено.\n"
+"Будь ласка, натисніть \"Далі\", щоб виявити і встановити Ваші налаштування\n"
 
-#: ../mdkonline:204 ../mdkonline_tui:82
+#: ../mdkonline:178
 #, c-format
-msgid "Sending configuration..."
-msgstr "Надсилається конфігурація..."
+msgid "Your upload was successful!"
+msgstr "звантаження пройшло успішно!"
 
-#: ../mdkonline:213 ../mdkonline:273 ../mdkonline_tui:130 ../mdkonline_tui:169
-#: ../mdkupdate:124 ../mdkupdate:195
+#: ../mdkonline:178
 #, c-format
-msgid "Connection problem"
-msgstr "Проблеми зі з'єднанням"
+msgid ""
+"From now you will receive on security and updates \n"
+"announcements thanks to Mandrakeonline."
+msgstr ""
+"Відтепер завдяки Mandrakeonline Ви отримуватимете оновлення безпеки \n"
+"оголошення про поновлення."
+
+#: ../mdkonline:178
+#, c-format
+msgid ""
+"Mandrakeonline offers you the ability to automate the updates.\n"
+"A program will run regulary in your system waiting for new updates\n"
+msgstr ""
+"Mandrakeonline пропонує Вам можливість автоматизувати поновлення.\n"
+"Програма регулярно виконуватиметься і очікуватиме нових поновлень\n"
 
-#: ../mdkonline:213 ../mdkonline_tui:169
+#: ../mdkonline:180
 #, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr "При звантаженні файлів сталася проблема, спробуйте ще раз"
 
-#: ../mdkonline:251
+#: ../mdkonline:186
 #, c-format
-msgid "Quitting Wizard\n"
-msgstr "Вихід з Помічника\n"
+msgid "Country"
+msgstr "Кантрі"
 
-#: ../mdkonline:273
+#: ../mdkonline:198
 #, c-format
-msgid "Mandrakeonline could not be contacted, please try again at a later time"
-msgstr ""
-"Неможливо встановити зв'язок з Mandrakeonline, будь ласка, спробуйте ще раз "
-"пізніше"
+msgid "Congratulations"
+msgstr "Поздоровляємо"
 
-#: ../mdkonline:285
+#: ../mdkonline:198
 #, c-format
-msgid "Wrong password"
-msgstr "Неправильний пароль"
+msgid "Your Mandrakeonline account has been successfully configured\n"
+msgstr "Ваш рахунок на Mandrakeonline було успішно налаштовано\n"
+
+#: ../mdkonline:214
+#, fuzzy, c-format
+msgid "Configuration uploaded successfully"
+msgstr "звантаження пройшло успішно!"
 
-#: ../mdkonline:285 ../mdkonline_tui:130
+#: ../mdkonline:215
+#, fuzzy, c-format
+msgid "Problem uploading configuration"
+msgstr "Читається конфігурація\n"
+
+#: ../mdkonline:216
 #, c-format
 msgid ""
-"Your login or password was wrong.\n"
-" Either you'll have to type it again, or you'll need to create an account on "
-"Mandrakeonline.\n"
-" In the latter case, go back to the first step to connect to "
-"Mandrakeonline.\n"
-" Be aware that you must also provide a Machine name \n"
-" (only alphabetical characters are admitted)"
+"Cannot connect to mandrakeonline website: wrong login/password or router/"
+"firewall bad settings"
 msgstr ""
-"Ваше ім'я реєстрації або пароль неправильні.\n"
-" Наберіть знову або створіть рахунок на Mandrakeonline.\n"
-" В другому випадку поверніться до першого кроку, щоб з'єднатися з "
-"Mandrakeonline.\n"
-" Знайте, що Ви повинні також вказати назву машини \n"
-" (можна використовувати тільки алфавітні символи)"
 
-#: ../mdkonline.pm:58
+#: ../mdkonline.pm:66
 #, c-format
 msgid "Login and password should be less than 12 characters\n"
 msgstr "Ім'я і пароль повинні бути довжиною не менше 12 символів\n"
 
-#: ../mdkonline.pm:59
+#: ../mdkonline.pm:67
 #, c-format
 msgid "Special characters are not allowed\n"
 msgstr "Спеціальні символи не дозволяються\n"
 
-#: ../mdkonline.pm:60
+#: ../mdkonline.pm:68
 #, c-format
 msgid "Please fill in all fields\n"
 msgstr "Будь ласка, заповніть усі поля\n"
 
-#: ../mdkonline.pm:61
+#: ../mdkonline.pm:69
 #, c-format
 msgid "Email not valid\n"
 msgstr "Електронна пошта недоступна\n"
 
-#: ../mdkonline.pm:62
+#: ../mdkonline.pm:70
 #, c-format
 msgid "Account already exist\n"
 msgstr "Рахунок вже існує\n"
 
-#: ../mdkonline.pm:68
+#: ../mdkonline.pm:76
 #, c-format
 msgid "Problem connecting to server \n"
 msgstr "Проблеми при з'єднанні з сервером \n"
 
-#: ../mdkonline_tui:45 ../mdkonline_tui:95
-#, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
-
-#: ../mdkonline_tui:48
-#, c-format
-msgid "I already have an account"
-msgstr "Я вже маю рахунок"
-
-#: ../mdkonline_tui:49
-#, c-format
-msgid "I want to subscribe"
-msgstr "Я хочу підписатися"
-
-#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:120
-#, c-format
-msgid "Please wait"
-msgstr "Зачекайте, будь-ласка"
-
-#: ../mdkonline_tui:103
-#, c-format
-msgid "Account creation or authentication"
-msgstr "Створення рахунка або розпізнавання"
-
-#: ../mdkonline_tui:120
-#, c-format
-msgid "Connecting to Mandrakeonline website..."
-msgstr "Під'єднання до сайта Mandrakeonline..."
-
-#: ../mdkonline_tui:130
-#, c-format
-msgid "or"
-msgstr "або"
-
-#: ../mdkonline_tui:130
-#, c-format
-msgid "wrong password:"
-msgstr "неправильний пароль:"
-
-#: ../mdkonline_tui:158
-#, c-format
-msgid ""
-"Mandrakeonline Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-"Рахунок Mandrakeonline успішно створено.\n"
-"Будь ласка, натисніть \"Далі\", щоб виявити і встановити Ваші налаштування\n"
-
-#: ../mdkonline_tui:175
-#, c-format
-msgid "Country"
-msgstr "Кантрі"
-
-#: ../mdkonline_tui:187
-#, c-format
-msgid "Congratulations"
-msgstr "Поздоровляємо"
-
-#: ../mdkonline_tui:187
-#, c-format
-msgid "Your Mandrakeonline account has been successfully configured\n"
-msgstr "Ваш рахунок на Mandrakeonline було успішно налаштовано\n"
-
-#: ../mdkupdate:50
+#: ../mdkupdate:52
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
@@ -615,44 +564,39 @@ msgstr ""
 "\n"
 "використання:\n"
 
-#: ../mdkupdate:55
+#: ../mdkupdate:57
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help        - вивести цю довідку.\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:58
 #, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto         - Mandrakeupdate виконується автоматично.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:59
 #, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - виконати Mandrakeupdate.\n"
 
-#: ../mdkupdate:58
-#, c-format
-msgid "  --update       - Update keys\n"
-msgstr "  --update       - поновити ключі\n"
-
-#: ../mdkupdate:66
+#: ../mdkupdate:67
 #, c-format
 msgid "No %s file found. Run mdkonline wizard first"
 msgstr "Файл %s не знайдено. Спочатку викличте помічника mdkonline"
 
-#: ../mdkupdate:124
+#: ../mdkupdate:126
 #, c-format
 msgid "Mandrakeupdate could not contact the site, we will try again."
 msgstr ""
 "Mandrakeupdate не може встановити зв'язок з сайтом, будь ласка, спробуйте ще "
 "раз пізніше."
 
-#: ../mdkupdate:173
+#: ../mdkupdate:176
 #, c-format
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr "Неможливо поновити пакунки з джерела mdkupdate.\n"
 
-#: ../mdkupdate:195
+#: ../mdkupdate:198
 #, c-format
 msgid ""
 "Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
@@ -660,3 +604,51 @@ msgid ""
 msgstr ""
 "Mandrakeupdate не зміг звантажити файли відмінностей. Надішліть листа на "
 "support [на] mandrakeonline [крапка] net"
+
+#~ msgid "Next"
+#~ msgstr "Вперед"
+
+#~ msgid "Cancel"
+#~ msgstr "Відмінити"
+
+#~ msgid "Previous"
+#~ msgstr "Назад"
+
+#~ msgid "I don't have a Mandrakeonline account and I want to subscribe"
+#~ msgstr "В мене немає рахунку Mandrakeonline і я хочу його створити"
+
+#~ msgid "Mandrakelinux Privacy Policy"
+#~ msgstr "Mandrakelinux Privacy Policy"
+
+#~ msgid "Authentification"
+#~ msgstr "Аутентифікація"
+
+#~ msgid "Send Configuration"
+#~ msgstr "Відіслати конфігурацію"
+
+#~ msgid "Finish"
+#~ msgstr "Завершити"
+
+#~ msgid "automated Upgrades"
+#~ msgstr "автоматичні Оновлення"
+
+#~ msgid "Country:"
+#~ msgstr "Країна:"
+
+#~ msgid "Error"
+#~ msgstr "Помилка"
+
+#~ msgid "Quitting Wizard\n"
+#~ msgstr "Вихід з Помічника\n"
+
+#~ msgid ""
+#~ "Mandrakeonline could not be contacted, please try again at a later time"
+#~ msgstr ""
+#~ "Неможливо встановити зв'язок з Mandrakeonline, будь ласка, спробуйте ще "
+#~ "раз пізніше"
+
+#~ msgid "Wrong password"
+#~ msgstr "Неправильний пароль"
+
+#~ msgid "  --update       - Update keys\n"
+#~ msgstr "  --update       - поновити ключі\n"
diff --git a/po/uz.po b/po/uz.po
index e4aaccfd..83def551 100644
--- a/po/uz.po
+++ b/po/uz.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-uz\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-01 22:41+0200\n"
+"POT-Creation-Date: 2004-11-03 12:10+0100\n"
 "PO-Revision-Date: 2004-06-27 23:53+0200\n"
 "Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
 "Language-Team: Uzbek <kmashrab@uni-bremen.de>\n"
@@ -16,271 +16,291 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3\n"
 
-#: ../mdkapplet:61
+#: ../mdkapplet:63
 #, c-format
 msgid "Your system is up-to-date"
 msgstr ""
 
-#: ../mdkapplet:67
+#: ../mdkapplet:69
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrakeonline.net"
 msgstr ""
 
-#: ../mdkapplet:73
+#: ../mdkapplet:75
 #, c-format
 msgid "System is busy. Please wait ..."
 msgstr ""
 
-#: ../mdkapplet:79
+#: ../mdkapplet:81
 #, c-format
 msgid "New updates are available for your system"
 msgstr ""
 
-#: ../mdkapplet:85
+#: ../mdkapplet:87
 #, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr ""
 
-#: ../mdkapplet:91
+#: ../mdkapplet:93
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr ""
 
-#: ../mdkapplet:97
+#: ../mdkapplet:99
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 
-#: ../mdkapplet:103
+#: ../mdkapplet:105
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:108 ../mdkapplet:158
+#: ../mdkapplet:110 ../mdkapplet:164
 #, c-format
 msgid "Install updates"
 msgstr "Янгиланишларни ўрнатиш"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:111
 #, fuzzy, c-format
 msgid "Configure the service"
 msgstr "Тармоқни мослаш"
 
-#: ../mdkapplet:110
+#: ../mdkapplet:112
 #, c-format
 msgid "Check Updates"
 msgstr "Янгиланишларни текшириш"
 
-#: ../mdkapplet:111
+#: ../mdkapplet:113 ../mdkapplet:167 ../mdkapplet:225
+#, fuzzy, c-format
+msgid "Please Wait"
+msgstr "Илтимос кутиб туринг"
+
+#: ../mdkapplet:113 ../mdkapplet:166 ../mdkapplet:167 ../mdkapplet:225
+#, c-format
+msgid "Check updates"
+msgstr "Янгиланишларни текшириш"
+
+#: ../mdkapplet:115
 #, c-format
 msgid "Online WebSite"
 msgstr ""
 
-#: ../mdkapplet:112
+#: ../mdkapplet:116
 #, c-format
 msgid "Configure Network"
 msgstr "Тармоқни мослаш"
 
-#: ../mdkapplet:113
+#: ../mdkapplet:117
 #, c-format
 msgid "Configure Now!"
 msgstr ""
 
-#: ../mdkapplet:146
+#: ../mdkapplet:152 ../mdkapplet:229
 #, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr ""
 
-#: ../mdkapplet:156
+#: ../mdkapplet:162
 #, c-format
 msgid "Actions"
 msgstr "Амаллар"
 
-#: ../mdkapplet:159
+#: ../mdkapplet:165
 #, c-format
 msgid "Configure"
 msgstr "Мослаш"
 
-#: ../mdkapplet:160
-#, c-format
-msgid "Check updates"
-msgstr "Янгиланишларни текшириш"
-
-#: ../mdkapplet:161
+#: ../mdkapplet:169
 #, c-format
 msgid "See logs"
 msgstr "Логларни кўриш"
 
-#: ../mdkapplet:164
+#: ../mdkapplet:172
 #, c-format
 msgid "Status"
 msgstr "Ҳолати"
 
-#: ../mdkapplet:168 ../mdkapplet:363
+#: ../mdkapplet:176 ../mdkapplet:375
 #, c-format
 msgid "Close"
 msgstr "Ёпиш"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Network Connection: "
 msgstr "Тармоқ: "
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Up"
 msgstr "Ишлаяпти"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Down"
 msgstr "Ишламаяпти"
 
-#: ../mdkapplet:204
+#: ../mdkapplet:212
 #, c-format
 msgid "Last check: "
 msgstr "Охирги текширув:"
 
-#: ../mdkapplet:205
+#: ../mdkapplet:213
 #, fuzzy, c-format
 msgid "Updates: "
 msgstr "Янги янгиланишлар: "
 
-#: ../mdkapplet:209
+#: ../mdkapplet:217
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr ""
 
-#: ../mdkapplet:213
+#: ../mdkapplet:221
 #, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr ""
 
-#: ../mdkapplet:217
+#: ../mdkapplet:224
 #, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 
-#: ../mdkapplet:225
+#: ../mdkapplet:235
 #, c-format
 msgid "Computing new updates...\n"
 msgstr ""
 
-#: ../mdkapplet:227
+#: ../mdkapplet:237
 #, c-format
 msgid "Connecting to"
 msgstr "Алоқа ўрнатилмоқда"
 
-#: ../mdkapplet:250
+#: ../mdkapplet:244
+#, fuzzy, c-format
+msgid "Response from Mandrakeonline server\n"
+msgstr "Mandrakeonline'га марҳамат"
+
+#: ../mdkapplet:262
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr ""
 
-#: ../mdkapplet:254
+#: ../mdkapplet:267
 #, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
-#: ../mdkapplet:255
+#: ../mdkapplet:268
 #, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
-#: ../mdkapplet:256
+#: ../mdkapplet:269
 #, c-format
 msgid "Unknown state"
 msgstr ""
 
-#: ../mdkapplet:257
+#: ../mdkapplet:270
 #, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr ""
 
-#: ../mdkapplet:258
+#: ../mdkapplet:271
 #, c-format
 msgid "Wrong Password.\n"
 msgstr "Махфий сўз нотўғри.\n"
 
-#: ../mdkapplet:259
+#: ../mdkapplet:272
 #, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr ""
 
-#: ../mdkapplet:260
+#: ../mdkapplet:273
 #, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
 msgstr ""
 
-#: ../mdkapplet:264
+#: ../mdkapplet:277
 #, c-format
 msgid "System is up-to-date\n"
 msgstr ""
 
-#: ../mdkapplet:303
+#: ../mdkapplet:317
 #, c-format
 msgid "No check"
 msgstr ""
 
-#: ../mdkapplet:316
+#: ../mdkapplet:330
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
-#: ../mdkapplet:319
+#: ../mdkapplet:333
 #, c-format
 msgid "Checking config file: Not present\n"
 msgstr ""
 
-#: ../mdkapplet:353
+#: ../mdkapplet:365
 #, c-format
 msgid "Logs"
 msgstr "Логлар"
 
-#: ../mdkapplet:369
+#: ../mdkapplet:381
 #, c-format
 msgid "Clear"
 msgstr "Тозалаш"
 
-#: ../mdkapplet:396
+#: ../mdkapplet:408
 #, c-format
 msgid "About..."
 msgstr "Ҳақида"
 
-#: ../mdkapplet:397
+#: ../mdkapplet:409
 #, c-format
 msgid "Always launch on startup"
 msgstr ""
 
-#: ../mdkapplet:399
+#: ../mdkapplet:411
 #, c-format
 msgid "Quit"
 msgstr "Чиқиш"
 
-#: ../mdkonline:89
+#: ../mdkonline:52 ../mdkonline:106
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "Mandrakeonline'га марҳамат"
+
+#: ../mdkonline:55
 #, c-format
-msgid "Next"
-msgstr "Кейингиси"
+msgid "I already have an account"
+msgstr ""
 
-#: ../mdkonline:89
+#: ../mdkonline:56
 #, c-format
-msgid "Cancel"
-msgstr "Бекор қилиш"
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline:89 ../mdkonline:93 ../mdkonline:131
+#, c-format
+msgid "Please wait"
+msgstr "Илтимос кутиб туринг"
 
 #: ../mdkonline:89
 #, c-format
-msgid "Previous"
-msgstr "Олдингиси"
+msgid "Reading configuration\n"
+msgstr ""
 
-#: ../mdkonline:103
+#: ../mdkonline:93
 #, c-format
-msgid "Welcome to Mandrakeonline"
-msgstr "Mandrakeonline'га марҳамат"
+msgid "Sending configuration..."
+msgstr "Мосламалар жўнатилмоқда..."
 
-#: ../mdkonline:104 ../mdkonline_tui:98
+#: ../mdkonline:109
 #, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
@@ -288,62 +308,37 @@ msgid ""
 "order to keep you informed about security updates and useful upgrades.\n"
 msgstr ""
 
-#: ../mdkonline:105 ../mdkonline_tui:142
+#: ../mdkonline:114
 #, c-format
-msgid "Create a Mandrakeonline Account"
-msgstr "Mandrakeonline ҳисобини яратиш"
+msgid "Account creation or authentication"
+msgstr ""
 
-#: ../mdkonline:107
-#, fuzzy, c-format
-msgid "I don't have a Mandrakeonline account and I want to subscribe"
-msgstr "MandrakeOnline ҳисобини яратиш"
+#: ../mdkonline:119
+#, c-format
+msgid "Enter your Mandrakeonline login, password and machine name:"
+msgstr ""
 
-#: ../mdkonline:111 ../mdkonline:131 ../mdkonline_tui:114 ../mdkonline_tui:145
+#: ../mdkonline:125 ../mdkonline:156
 #, c-format
 msgid "Login:"
 msgstr "Фойдаланувчи:"
 
-#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:115 ../mdkonline_tui:146
+#: ../mdkonline:126 ../mdkonline:157
 #, c-format
 msgid "Password:"
 msgstr "Махфий сўз:"
 
-#: ../mdkonline:113 ../mdkonline_tui:147
-#, c-format
-msgid "Confirm Password:"
-msgstr "Махфий сўзни тасдиқланг:"
-
-#: ../mdkonline:114 ../mdkonline_tui:148
-#, c-format
-msgid "Mail contact:"
-msgstr ""
-
-#: ../mdkonline:121
-#, c-format
-msgid "Mandrakelinux Privacy Policy"
-msgstr ""
-
 #: ../mdkonline:127
 #, c-format
-msgid "Authentification"
-msgstr "Тасдиқлаш"
-
-#: ../mdkonline:128 ../mdkonline_tui:108
-#, c-format
-msgid "Enter your Mandrakeonline login, password and machine name:"
-msgstr ""
-
-#: ../mdkonline:133 ../mdkonline_tui:116
-#, c-format
 msgid "Machine name:"
 msgstr "Компьютернинг номи:"
 
-#: ../mdkonline:138
-#, c-format
-msgid "Send Configuration"
-msgstr ""
+#: ../mdkonline:131
+#, fuzzy, c-format
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Mandrakeonline'га марҳамат"
 
-#: ../mdkonline:139 ../mdkonline_tui:128
+#: ../mdkonline:139
 #, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
@@ -362,51 +357,49 @@ msgid ""
 "www.mandrakeexpert.com."
 msgstr ""
 
-#: ../mdkonline:144 ../mdkonline:211 ../mdkonline:234
+#: ../mdkonline:141 ../mdkonline:180 ../mdkupdate:126 ../mdkupdate:198
 #, c-format
-msgid "Finish"
-msgstr "Тайёр"
+msgid "Connection problem"
+msgstr "Алоқа ўрнатишда муаммо"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid "Your upload was successful!"
+msgid "or"
 msgstr ""
 
-#: ../mdkonline:145 ../mdkonline_tui:167
-#, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandrakeonline."
-msgstr ""
+#: ../mdkonline:141
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "Махфий сўз нотўғри"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
 msgid ""
-"Mandrakeonline offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+"Your login or password was wrong.\n"
+" Either you'll have to type it again, or you'll need to create an account on "
+"Mandrakeonline.\n"
+" In the latter case, go back to the first step to connect to "
+"Mandrakeonline.\n"
+" Be aware that you must also provide a Machine name \n"
+" (only alphabetical characters are admitted)"
 msgstr ""
 
-#: ../mdkonline:146
+#: ../mdkonline:153
 #, c-format
-msgid "automated Upgrades"
-msgstr "Автоматлаштирилган янгиланишлар"
-
-#: ../mdkonline:150
-#, c-format
-msgid "Country:"
-msgstr "Давлат:"
+msgid "Create a Mandrakeonline Account"
+msgstr "Mandrakeonline ҳисобини яратиш"
 
-#: ../mdkonline:178 ../mdkonline:183 ../mdkonline:185 ../mdkonline:187
+#: ../mdkonline:158
 #, c-format
-msgid "Error"
-msgstr "Хато"
+msgid "Confirm Password:"
+msgstr "Махфий сўзни тасдиқланг:"
 
-#: ../mdkonline:183 ../mdkonline_tui:152
+#: ../mdkonline:159
 #, c-format
-msgid "Please provide a login"
+msgid "Mail contact:"
 msgstr ""
 
-#: ../mdkonline:185 ../mdkonline_tui:152
+#: ../mdkonline:163
 #, c-format
 msgid ""
 "The passwords do not match\n"
@@ -415,153 +408,110 @@ msgstr ""
 "Махфий сўзлар мос келмайди\n"
 " Илтимос яна уриниб кўринг\n"
 
-#: ../mdkonline:187 ../mdkonline_tui:152
+#: ../mdkonline:163
+#, c-format
+msgid "Please provide a login"
+msgstr ""
+
+#: ../mdkonline:163
 #, c-format
 msgid "Not a valid mail address!\n"
 msgstr "Электрон почта ҳақиқий эмас!\n"
 
-#: ../mdkonline:199 ../mdkonline_tui:78
+#: ../mdkonline:169
 #, c-format
-msgid "Reading configuration\n"
+msgid ""
+"Mandrakeonline Account successfully created.\n"
+"Please click \"Next\" to authenticate and upload your configuration\n"
 msgstr ""
 
-#: ../mdkonline:204 ../mdkonline_tui:82
+#: ../mdkonline:178
 #, c-format
-msgid "Sending configuration..."
-msgstr "Мосламалар жўнатилмоқда..."
+msgid "Your upload was successful!"
+msgstr ""
 
-#: ../mdkonline:213 ../mdkonline:273 ../mdkonline_tui:130 ../mdkonline_tui:169
-#: ../mdkupdate:124 ../mdkupdate:195
+#: ../mdkonline:178
 #, c-format
-msgid "Connection problem"
-msgstr "Алоқа ўрнатишда муаммо"
+msgid ""
+"From now you will receive on security and updates \n"
+"announcements thanks to Mandrakeonline."
+msgstr ""
 
-#: ../mdkonline:213 ../mdkonline_tui:169
+#: ../mdkonline:178
 #, c-format
-msgid "Problem occurs when uploading files, please try again"
+msgid ""
+"Mandrakeonline offers you the ability to automate the updates.\n"
+"A program will run regulary in your system waiting for new updates\n"
 msgstr ""
 
-#: ../mdkonline:251
+#: ../mdkonline:180
 #, c-format
-msgid "Quitting Wizard\n"
-msgstr "Ёрдамчидан чиқилмоқда\n"
+msgid "Problem occurs when uploading files, please try again"
+msgstr ""
+
+#: ../mdkonline:186
+#, fuzzy, c-format
+msgid "Country"
+msgstr "Давлат:"
+
+#: ../mdkonline:198
+#, fuzzy, c-format
+msgid "Congratulations"
+msgstr "Мослаш"
 
-#: ../mdkonline:273
+#: ../mdkonline:198
 #, c-format
-msgid "Mandrakeonline could not be contacted, please try again at a later time"
+msgid "Your Mandrakeonline account has been successfully configured\n"
 msgstr ""
-"Mandrakeonline билан алоқа ўрнатиб бўлмади. Илтимос кейинроқ уриниб кўринг"
 
-#: ../mdkonline:285
+#: ../mdkonline:214
 #, c-format
-msgid "Wrong password"
-msgstr "Махфий сўз нотўғри"
+msgid "Configuration uploaded successfully"
+msgstr ""
 
-#: ../mdkonline:285 ../mdkonline_tui:130
+#: ../mdkonline:215
+#, fuzzy, c-format
+msgid "Problem uploading configuration"
+msgstr "Мосламалар жўнатилмоқда..."
+
+#: ../mdkonline:216
 #, c-format
 msgid ""
-"Your login or password was wrong.\n"
-" Either you'll have to type it again, or you'll need to create an account on "
-"Mandrakeonline.\n"
-" In the latter case, go back to the first step to connect to "
-"Mandrakeonline.\n"
-" Be aware that you must also provide a Machine name \n"
-" (only alphabetical characters are admitted)"
+"Cannot connect to mandrakeonline website: wrong login/password or router/"
+"firewall bad settings"
 msgstr ""
 
-#: ../mdkonline.pm:58
+#: ../mdkonline.pm:66
 #, c-format
 msgid "Login and password should be less than 12 characters\n"
 msgstr "Фойдаланувчи ва махфий сўз 12 та белгидан кам бўлиши керак\n"
 
-#: ../mdkonline.pm:59
+#: ../mdkonline.pm:67
 #, c-format
 msgid "Special characters are not allowed\n"
 msgstr "Махсус белгилар мумкин эмас\n"
 
-#: ../mdkonline.pm:60
+#: ../mdkonline.pm:68
 #, c-format
 msgid "Please fill in all fields\n"
 msgstr "Илтимос ҳамма майдонларни тўлдиринг\n"
 
-#: ../mdkonline.pm:61
+#: ../mdkonline.pm:69
 #, c-format
 msgid "Email not valid\n"
 msgstr "Электрон почта ҳақиқий эмас\n"
 
-#: ../mdkonline.pm:62
+#: ../mdkonline.pm:70
 #, c-format
 msgid "Account already exist\n"
 msgstr "Ҳисоб аллақачон мавжуд\n"
 
-#: ../mdkonline.pm:68
+#: ../mdkonline.pm:76
 #, c-format
 msgid "Problem connecting to server \n"
 msgstr "Серверга уланишда муаммо\n"
 
-#: ../mdkonline_tui:45 ../mdkonline_tui:95
-#, fuzzy, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline'га марҳамат"
-
-#: ../mdkonline_tui:48
-#, c-format
-msgid "I already have an account"
-msgstr ""
-
-#: ../mdkonline_tui:49
-#, c-format
-msgid "I want to subscribe"
-msgstr ""
-
-#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:120
-#, c-format
-msgid "Please wait"
-msgstr "Илтимос кутиб туринг"
-
-#: ../mdkonline_tui:103
-#, c-format
-msgid "Account creation or authentication"
-msgstr ""
-
-#: ../mdkonline_tui:120
-#, fuzzy, c-format
-msgid "Connecting to Mandrakeonline website..."
-msgstr "Mandrakeonline'га марҳамат"
-
-#: ../mdkonline_tui:130
-#, c-format
-msgid "or"
-msgstr ""
-
-#: ../mdkonline_tui:130
-#, fuzzy, c-format
-msgid "wrong password:"
-msgstr "Махфий сўз нотўғри"
-
-#: ../mdkonline_tui:158
-#, c-format
-msgid ""
-"Mandrakeonline Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-
-#: ../mdkonline_tui:175
-#, fuzzy, c-format
-msgid "Country"
-msgstr "Давлат:"
-
-#: ../mdkonline_tui:187
-#, fuzzy, c-format
-msgid "Congratulations"
-msgstr "Мослаш"
-
-#: ../mdkonline_tui:187
-#, c-format
-msgid "Your Mandrakeonline account has been successfully configured\n"
-msgstr ""
-
-#: ../mdkupdate:50
+#: ../mdkupdate:52
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
@@ -577,49 +527,86 @@ msgstr ""
 "\n"
 "Фойдаланиш:\n"
 
-#: ../mdkupdate:55
+#: ../mdkupdate:57
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - шу ёрдам хабарини кўрсатиш.\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:58
 #, fuzzy, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --applet       - MandrakeUpdate хизматини ишга тушириш.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:59
 #, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - Mandrakeupdate хизматини ишга тушириш.\n"
 
-#: ../mdkupdate:58
-#, c-format
-msgid "  --update       - Update keys\n"
-msgstr "  --update       - Калитларни янгилаш.\n"
-
-#: ../mdkupdate:66
+#: ../mdkupdate:67
 #, c-format
 msgid "No %s file found. Run mdkonline wizard first"
 msgstr ""
 
-#: ../mdkupdate:124
+#: ../mdkupdate:126
 #, fuzzy, c-format
 msgid "Mandrakeupdate could not contact the site, we will try again."
 msgstr ""
 "Mandrakeonline билан алоқа ўрнатиб бўлмади. Илтимос кейинроқ уриниб кўринг"
 
-#: ../mdkupdate:173
+#: ../mdkupdate:176
 #, c-format
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr ""
 
-#: ../mdkupdate:195
+#: ../mdkupdate:198
 #, c-format
 msgid ""
 "Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
 "mandrakeonline [dot] net"
 msgstr ""
 
+#~ msgid "Next"
+#~ msgstr "Кейингиси"
+
+#~ msgid "Cancel"
+#~ msgstr "Бекор қилиш"
+
+#~ msgid "Previous"
+#~ msgstr "Олдингиси"
+
+#, fuzzy
+#~ msgid "I don't have a Mandrakeonline account and I want to subscribe"
+#~ msgstr "MandrakeOnline ҳисобини яратиш"
+
+#~ msgid "Authentification"
+#~ msgstr "Тасдиқлаш"
+
+#~ msgid "Finish"
+#~ msgstr "Тайёр"
+
+#~ msgid "automated Upgrades"
+#~ msgstr "Автоматлаштирилган янгиланишлар"
+
+#~ msgid "Country:"
+#~ msgstr "Давлат:"
+
+#~ msgid "Error"
+#~ msgstr "Хато"
+
+#~ msgid "Quitting Wizard\n"
+#~ msgstr "Ёрдамчидан чиқилмоқда\n"
+
+#~ msgid ""
+#~ "Mandrakeonline could not be contacted, please try again at a later time"
+#~ msgstr ""
+#~ "Mandrakeonline билан алоқа ўрнатиб бўлмади. Илтимос кейинроқ уриниб кўринг"
+
+#~ msgid "Wrong password"
+#~ msgstr "Махфий сўз нотўғри"
+
+#~ msgid "  --update       - Update keys\n"
+#~ msgstr "  --update       - Калитларни янгилаш.\n"
+
 #~ msgid "Skip Wizard"
 #~ msgstr "Ёрдамчисиз"
 
diff --git a/po/uz@Latn.po b/po/uz@Latn.po
index c4a8a7d8..9e847c66 100644
--- a/po/uz@Latn.po
+++ b/po/uz@Latn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-uz\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-01 22:41+0200\n"
+"POT-Creation-Date: 2004-11-03 12:10+0100\n"
 "PO-Revision-Date: 2004-06-27 23:53+0200\n"
 "Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
 "Language-Team: Uzbek <kmashrab@uni-bremen.de>\n"
@@ -16,271 +16,291 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3\n"
 
-#: ../mdkapplet:61
+#: ../mdkapplet:63
 #, c-format
 msgid "Your system is up-to-date"
 msgstr ""
 
-#: ../mdkapplet:67
+#: ../mdkapplet:69
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrakeonline.net"
 msgstr ""
 
-#: ../mdkapplet:73
+#: ../mdkapplet:75
 #, c-format
 msgid "System is busy. Please wait ..."
 msgstr ""
 
-#: ../mdkapplet:79
+#: ../mdkapplet:81
 #, c-format
 msgid "New updates are available for your system"
 msgstr ""
 
-#: ../mdkapplet:85
+#: ../mdkapplet:87
 #, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr ""
 
-#: ../mdkapplet:91
+#: ../mdkapplet:93
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr ""
 
-#: ../mdkapplet:97
+#: ../mdkapplet:99
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 
-#: ../mdkapplet:103
+#: ../mdkapplet:105
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:108 ../mdkapplet:158
+#: ../mdkapplet:110 ../mdkapplet:164
 #, c-format
 msgid "Install updates"
 msgstr "Yangilanishlarni o'rnatish"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:111
 #, fuzzy, c-format
 msgid "Configure the service"
 msgstr "Tarmoqni moslash"
 
-#: ../mdkapplet:110
+#: ../mdkapplet:112
 #, c-format
 msgid "Check Updates"
 msgstr "Yangilanishlarni tekshirish"
 
-#: ../mdkapplet:111
+#: ../mdkapplet:113 ../mdkapplet:167 ../mdkapplet:225
+#, fuzzy, c-format
+msgid "Please Wait"
+msgstr "Iltimos kutib turing"
+
+#: ../mdkapplet:113 ../mdkapplet:166 ../mdkapplet:167 ../mdkapplet:225
+#, c-format
+msgid "Check updates"
+msgstr "Yangilanishlarni tekshirish"
+
+#: ../mdkapplet:115
 #, c-format
 msgid "Online WebSite"
 msgstr ""
 
-#: ../mdkapplet:112
+#: ../mdkapplet:116
 #, c-format
 msgid "Configure Network"
 msgstr "Tarmoqni moslash"
 
-#: ../mdkapplet:113
+#: ../mdkapplet:117
 #, c-format
 msgid "Configure Now!"
 msgstr ""
 
-#: ../mdkapplet:146
+#: ../mdkapplet:152 ../mdkapplet:229
 #, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr ""
 
-#: ../mdkapplet:156
+#: ../mdkapplet:162
 #, c-format
 msgid "Actions"
 msgstr "Amallar"
 
-#: ../mdkapplet:159
+#: ../mdkapplet:165
 #, c-format
 msgid "Configure"
 msgstr "Moslash"
 
-#: ../mdkapplet:160
-#, c-format
-msgid "Check updates"
-msgstr "Yangilanishlarni tekshirish"
-
-#: ../mdkapplet:161
+#: ../mdkapplet:169
 #, c-format
 msgid "See logs"
 msgstr "Loglarni ko'rish"
 
-#: ../mdkapplet:164
+#: ../mdkapplet:172
 #, c-format
 msgid "Status"
 msgstr "Holati"
 
-#: ../mdkapplet:168 ../mdkapplet:363
+#: ../mdkapplet:176 ../mdkapplet:375
 #, c-format
 msgid "Close"
 msgstr "Yopish"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Network Connection: "
 msgstr "Tarmoq: "
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Up"
 msgstr "Ishlayapti"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Down"
 msgstr "Ishlamayapti"
 
-#: ../mdkapplet:204
+#: ../mdkapplet:212
 #, c-format
 msgid "Last check: "
 msgstr "Oxirgi tekshiruv:"
 
-#: ../mdkapplet:205
+#: ../mdkapplet:213
 #, fuzzy, c-format
 msgid "Updates: "
 msgstr "Yangi yangilanishlar: "
 
-#: ../mdkapplet:209
+#: ../mdkapplet:217
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr ""
 
-#: ../mdkapplet:213
+#: ../mdkapplet:221
 #, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr ""
 
-#: ../mdkapplet:217
+#: ../mdkapplet:224
 #, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 
-#: ../mdkapplet:225
+#: ../mdkapplet:235
 #, c-format
 msgid "Computing new updates...\n"
 msgstr ""
 
-#: ../mdkapplet:227
+#: ../mdkapplet:237
 #, c-format
 msgid "Connecting to"
 msgstr "Aloqa o'rnatilmoqda"
 
-#: ../mdkapplet:250
+#: ../mdkapplet:244
+#, fuzzy, c-format
+msgid "Response from Mandrakeonline server\n"
+msgstr "Mandrakeonline'ga marhamat"
+
+#: ../mdkapplet:262
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr ""
 
-#: ../mdkapplet:254
+#: ../mdkapplet:267
 #, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
-#: ../mdkapplet:255
+#: ../mdkapplet:268
 #, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
-#: ../mdkapplet:256
+#: ../mdkapplet:269
 #, c-format
 msgid "Unknown state"
 msgstr ""
 
-#: ../mdkapplet:257
+#: ../mdkapplet:270
 #, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr ""
 
-#: ../mdkapplet:258
+#: ../mdkapplet:271
 #, c-format
 msgid "Wrong Password.\n"
 msgstr "Maxfiy so'z noto'g'ri.\n"
 
-#: ../mdkapplet:259
+#: ../mdkapplet:272
 #, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr ""
 
-#: ../mdkapplet:260
+#: ../mdkapplet:273
 #, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
 msgstr ""
 
-#: ../mdkapplet:264
+#: ../mdkapplet:277
 #, c-format
 msgid "System is up-to-date\n"
 msgstr ""
 
-#: ../mdkapplet:303
+#: ../mdkapplet:317
 #, c-format
 msgid "No check"
 msgstr ""
 
-#: ../mdkapplet:316
+#: ../mdkapplet:330
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
-#: ../mdkapplet:319
+#: ../mdkapplet:333
 #, c-format
 msgid "Checking config file: Not present\n"
 msgstr ""
 
-#: ../mdkapplet:353
+#: ../mdkapplet:365
 #, c-format
 msgid "Logs"
 msgstr "Loglar"
 
-#: ../mdkapplet:369
+#: ../mdkapplet:381
 #, c-format
 msgid "Clear"
 msgstr "Tozalash"
 
-#: ../mdkapplet:396
+#: ../mdkapplet:408
 #, c-format
 msgid "About..."
 msgstr "Haqida"
 
-#: ../mdkapplet:397
+#: ../mdkapplet:409
 #, c-format
 msgid "Always launch on startup"
 msgstr ""
 
-#: ../mdkapplet:399
+#: ../mdkapplet:411
 #, c-format
 msgid "Quit"
 msgstr "Chiqish"
 
-#: ../mdkonline:89
+#: ../mdkonline:52 ../mdkonline:106
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "Mandrakeonline'ga marhamat"
+
+#: ../mdkonline:55
 #, c-format
-msgid "Next"
-msgstr "Keyingisi"
+msgid "I already have an account"
+msgstr ""
 
-#: ../mdkonline:89
+#: ../mdkonline:56
 #, c-format
-msgid "Cancel"
-msgstr "Bekor qilish"
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline:89 ../mdkonline:93 ../mdkonline:131
+#, c-format
+msgid "Please wait"
+msgstr "Iltimos kutib turing"
 
 #: ../mdkonline:89
 #, c-format
-msgid "Previous"
-msgstr "Oldingisi"
+msgid "Reading configuration\n"
+msgstr ""
 
-#: ../mdkonline:103
+#: ../mdkonline:93
 #, c-format
-msgid "Welcome to Mandrakeonline"
-msgstr "Mandrakeonline'ga marhamat"
+msgid "Sending configuration..."
+msgstr "Moslamalar jo'natilmoqda..."
 
-#: ../mdkonline:104 ../mdkonline_tui:98
+#: ../mdkonline:109
 #, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
@@ -288,62 +308,37 @@ msgid ""
 "order to keep you informed about security updates and useful upgrades.\n"
 msgstr ""
 
-#: ../mdkonline:105 ../mdkonline_tui:142
+#: ../mdkonline:114
 #, c-format
-msgid "Create a Mandrakeonline Account"
-msgstr "Mandrakeonline hisobini yaratish"
+msgid "Account creation or authentication"
+msgstr ""
 
-#: ../mdkonline:107
-#, fuzzy, c-format
-msgid "I don't have a Mandrakeonline account and I want to subscribe"
-msgstr "MandrakeOnline hisobini yaratish"
+#: ../mdkonline:119
+#, c-format
+msgid "Enter your Mandrakeonline login, password and machine name:"
+msgstr ""
 
-#: ../mdkonline:111 ../mdkonline:131 ../mdkonline_tui:114 ../mdkonline_tui:145
+#: ../mdkonline:125 ../mdkonline:156
 #, c-format
 msgid "Login:"
 msgstr "Foydalanuvchi:"
 
-#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:115 ../mdkonline_tui:146
+#: ../mdkonline:126 ../mdkonline:157
 #, c-format
 msgid "Password:"
 msgstr "Maxfiy so'z:"
 
-#: ../mdkonline:113 ../mdkonline_tui:147
-#, c-format
-msgid "Confirm Password:"
-msgstr "Maxfiy so'zni tasdiqlang:"
-
-#: ../mdkonline:114 ../mdkonline_tui:148
-#, c-format
-msgid "Mail contact:"
-msgstr ""
-
-#: ../mdkonline:121
-#, c-format
-msgid "Mandrakelinux Privacy Policy"
-msgstr ""
-
 #: ../mdkonline:127
 #, c-format
-msgid "Authentification"
-msgstr "Tasdiqlash"
-
-#: ../mdkonline:128 ../mdkonline_tui:108
-#, c-format
-msgid "Enter your Mandrakeonline login, password and machine name:"
-msgstr ""
-
-#: ../mdkonline:133 ../mdkonline_tui:116
-#, c-format
 msgid "Machine name:"
 msgstr "Kompyuterning nomi:"
 
-#: ../mdkonline:138
-#, c-format
-msgid "Send Configuration"
-msgstr ""
+#: ../mdkonline:131
+#, fuzzy, c-format
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Mandrakeonline'ga marhamat"
 
-#: ../mdkonline:139 ../mdkonline_tui:128
+#: ../mdkonline:139
 #, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
@@ -362,51 +357,49 @@ msgid ""
 "www.mandrakeexpert.com."
 msgstr ""
 
-#: ../mdkonline:144 ../mdkonline:211 ../mdkonline:234
+#: ../mdkonline:141 ../mdkonline:180 ../mdkupdate:126 ../mdkupdate:198
 #, c-format
-msgid "Finish"
-msgstr "Tayyor"
+msgid "Connection problem"
+msgstr "Aloqa o'rnatishda muammo"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid "Your upload was successful!"
+msgid "or"
 msgstr ""
 
-#: ../mdkonline:145 ../mdkonline_tui:167
-#, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandrakeonline."
-msgstr ""
+#: ../mdkonline:141
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "Maxfiy so'z noto'g'ri"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
 msgid ""
-"Mandrakeonline offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+"Your login or password was wrong.\n"
+" Either you'll have to type it again, or you'll need to create an account on "
+"Mandrakeonline.\n"
+" In the latter case, go back to the first step to connect to "
+"Mandrakeonline.\n"
+" Be aware that you must also provide a Machine name \n"
+" (only alphabetical characters are admitted)"
 msgstr ""
 
-#: ../mdkonline:146
+#: ../mdkonline:153
 #, c-format
-msgid "automated Upgrades"
-msgstr "Avtomatlashtirilgan yangilanishlar"
-
-#: ../mdkonline:150
-#, c-format
-msgid "Country:"
-msgstr "Davlat:"
+msgid "Create a Mandrakeonline Account"
+msgstr "Mandrakeonline hisobini yaratish"
 
-#: ../mdkonline:178 ../mdkonline:183 ../mdkonline:185 ../mdkonline:187
+#: ../mdkonline:158
 #, c-format
-msgid "Error"
-msgstr "Xato"
+msgid "Confirm Password:"
+msgstr "Maxfiy so'zni tasdiqlang:"
 
-#: ../mdkonline:183 ../mdkonline_tui:152
+#: ../mdkonline:159
 #, c-format
-msgid "Please provide a login"
+msgid "Mail contact:"
 msgstr ""
 
-#: ../mdkonline:185 ../mdkonline_tui:152
+#: ../mdkonline:163
 #, c-format
 msgid ""
 "The passwords do not match\n"
@@ -415,153 +408,110 @@ msgstr ""
 "Maxfiy so'zlar mos kelmaydi\n"
 " Iltimos yana urinib ko'ring\n"
 
-#: ../mdkonline:187 ../mdkonline_tui:152
+#: ../mdkonline:163
+#, c-format
+msgid "Please provide a login"
+msgstr ""
+
+#: ../mdkonline:163
 #, c-format
 msgid "Not a valid mail address!\n"
 msgstr "Elektron pochta haqiqiy emas!\n"
 
-#: ../mdkonline:199 ../mdkonline_tui:78
+#: ../mdkonline:169
 #, c-format
-msgid "Reading configuration\n"
+msgid ""
+"Mandrakeonline Account successfully created.\n"
+"Please click \"Next\" to authenticate and upload your configuration\n"
 msgstr ""
 
-#: ../mdkonline:204 ../mdkonline_tui:82
+#: ../mdkonline:178
 #, c-format
-msgid "Sending configuration..."
-msgstr "Moslamalar jo'natilmoqda..."
+msgid "Your upload was successful!"
+msgstr ""
 
-#: ../mdkonline:213 ../mdkonline:273 ../mdkonline_tui:130 ../mdkonline_tui:169
-#: ../mdkupdate:124 ../mdkupdate:195
+#: ../mdkonline:178
 #, c-format
-msgid "Connection problem"
-msgstr "Aloqa o'rnatishda muammo"
+msgid ""
+"From now you will receive on security and updates \n"
+"announcements thanks to Mandrakeonline."
+msgstr ""
 
-#: ../mdkonline:213 ../mdkonline_tui:169
+#: ../mdkonline:178
 #, c-format
-msgid "Problem occurs when uploading files, please try again"
+msgid ""
+"Mandrakeonline offers you the ability to automate the updates.\n"
+"A program will run regulary in your system waiting for new updates\n"
 msgstr ""
 
-#: ../mdkonline:251
+#: ../mdkonline:180
 #, c-format
-msgid "Quitting Wizard\n"
-msgstr "Yordamchidan chiqilmoqda\n"
+msgid "Problem occurs when uploading files, please try again"
+msgstr ""
+
+#: ../mdkonline:186
+#, fuzzy, c-format
+msgid "Country"
+msgstr "Davlat:"
+
+#: ../mdkonline:198
+#, fuzzy, c-format
+msgid "Congratulations"
+msgstr "Moslash"
 
-#: ../mdkonline:273
+#: ../mdkonline:198
 #, c-format
-msgid "Mandrakeonline could not be contacted, please try again at a later time"
+msgid "Your Mandrakeonline account has been successfully configured\n"
 msgstr ""
-"Mandrakeonline bilan aloqa o'rnatib bo'lmadi. Iltimos keyinroq urinib ko'ring"
 
-#: ../mdkonline:285
+#: ../mdkonline:214
 #, c-format
-msgid "Wrong password"
-msgstr "Maxfiy so'z noto'g'ri"
+msgid "Configuration uploaded successfully"
+msgstr ""
 
-#: ../mdkonline:285 ../mdkonline_tui:130
+#: ../mdkonline:215
+#, fuzzy, c-format
+msgid "Problem uploading configuration"
+msgstr "Moslamalar jo'natilmoqda..."
+
+#: ../mdkonline:216
 #, c-format
 msgid ""
-"Your login or password was wrong.\n"
-" Either you'll have to type it again, or you'll need to create an account on "
-"Mandrakeonline.\n"
-" In the latter case, go back to the first step to connect to "
-"Mandrakeonline.\n"
-" Be aware that you must also provide a Machine name \n"
-" (only alphabetical characters are admitted)"
+"Cannot connect to mandrakeonline website: wrong login/password or router/"
+"firewall bad settings"
 msgstr ""
 
-#: ../mdkonline.pm:58
+#: ../mdkonline.pm:66
 #, c-format
 msgid "Login and password should be less than 12 characters\n"
 msgstr "Foydalanuvchi va maxfiy so'z 12 ta belgidan kam bo'lishi kerak\n"
 
-#: ../mdkonline.pm:59
+#: ../mdkonline.pm:67
 #, c-format
 msgid "Special characters are not allowed\n"
 msgstr "Maxsus belgilar mumkin emas\n"
 
-#: ../mdkonline.pm:60
+#: ../mdkonline.pm:68
 #, c-format
 msgid "Please fill in all fields\n"
 msgstr "Iltimos hamma maydonlarni to'ldiring\n"
 
-#: ../mdkonline.pm:61
+#: ../mdkonline.pm:69
 #, c-format
 msgid "Email not valid\n"
 msgstr "Elektron pochta haqiqiy emas\n"
 
-#: ../mdkonline.pm:62
+#: ../mdkonline.pm:70
 #, c-format
 msgid "Account already exist\n"
 msgstr "Hisob allaqachon mavjud\n"
 
-#: ../mdkonline.pm:68
+#: ../mdkonline.pm:76
 #, c-format
 msgid "Problem connecting to server \n"
 msgstr "Serverga ulanishda muammo\n"
 
-#: ../mdkonline_tui:45 ../mdkonline_tui:95
-#, fuzzy, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline'ga marhamat"
-
-#: ../mdkonline_tui:48
-#, c-format
-msgid "I already have an account"
-msgstr ""
-
-#: ../mdkonline_tui:49
-#, c-format
-msgid "I want to subscribe"
-msgstr ""
-
-#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:120
-#, c-format
-msgid "Please wait"
-msgstr "Iltimos kutib turing"
-
-#: ../mdkonline_tui:103
-#, c-format
-msgid "Account creation or authentication"
-msgstr ""
-
-#: ../mdkonline_tui:120
-#, fuzzy, c-format
-msgid "Connecting to Mandrakeonline website..."
-msgstr "Mandrakeonline'ga marhamat"
-
-#: ../mdkonline_tui:130
-#, c-format
-msgid "or"
-msgstr ""
-
-#: ../mdkonline_tui:130
-#, fuzzy, c-format
-msgid "wrong password:"
-msgstr "Maxfiy so'z noto'g'ri"
-
-#: ../mdkonline_tui:158
-#, c-format
-msgid ""
-"Mandrakeonline Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-
-#: ../mdkonline_tui:175
-#, fuzzy, c-format
-msgid "Country"
-msgstr "Davlat:"
-
-#: ../mdkonline_tui:187
-#, fuzzy, c-format
-msgid "Congratulations"
-msgstr "Moslash"
-
-#: ../mdkonline_tui:187
-#, c-format
-msgid "Your Mandrakeonline account has been successfully configured\n"
-msgstr ""
-
-#: ../mdkupdate:50
+#: ../mdkupdate:52
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
@@ -577,49 +527,87 @@ msgstr ""
 "\n"
 "Foydalanish:\n"
 
-#: ../mdkupdate:55
+#: ../mdkupdate:57
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - shu yordam xabarini ko'rsatish.\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:58
 #, fuzzy, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --applet       - MandrakeUpdate xizmatini ishga tushirish.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:59
 #, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - Mandrakeupdate xizmatini ishga tushirish.\n"
 
-#: ../mdkupdate:58
-#, c-format
-msgid "  --update       - Update keys\n"
-msgstr "  --update       - Kalitlarni yangilash.\n"
-
-#: ../mdkupdate:66
+#: ../mdkupdate:67
 #, c-format
 msgid "No %s file found. Run mdkonline wizard first"
 msgstr ""
 
-#: ../mdkupdate:124
+#: ../mdkupdate:126
 #, fuzzy, c-format
 msgid "Mandrakeupdate could not contact the site, we will try again."
 msgstr ""
 "Mandrakeonline bilan aloqa o'rnatib bo'lmadi. Iltimos keyinroq urinib ko'ring"
 
-#: ../mdkupdate:173
+#: ../mdkupdate:176
 #, c-format
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr ""
 
-#: ../mdkupdate:195
+#: ../mdkupdate:198
 #, c-format
 msgid ""
 "Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
 "mandrakeonline [dot] net"
 msgstr ""
 
+#~ msgid "Next"
+#~ msgstr "Keyingisi"
+
+#~ msgid "Cancel"
+#~ msgstr "Bekor qilish"
+
+#~ msgid "Previous"
+#~ msgstr "Oldingisi"
+
+#, fuzzy
+#~ msgid "I don't have a Mandrakeonline account and I want to subscribe"
+#~ msgstr "MandrakeOnline hisobini yaratish"
+
+#~ msgid "Authentification"
+#~ msgstr "Tasdiqlash"
+
+#~ msgid "Finish"
+#~ msgstr "Tayyor"
+
+#~ msgid "automated Upgrades"
+#~ msgstr "Avtomatlashtirilgan yangilanishlar"
+
+#~ msgid "Country:"
+#~ msgstr "Davlat:"
+
+#~ msgid "Error"
+#~ msgstr "Xato"
+
+#~ msgid "Quitting Wizard\n"
+#~ msgstr "Yordamchidan chiqilmoqda\n"
+
+#~ msgid ""
+#~ "Mandrakeonline could not be contacted, please try again at a later time"
+#~ msgstr ""
+#~ "Mandrakeonline bilan aloqa o'rnatib bo'lmadi. Iltimos keyinroq urinib "
+#~ "ko'ring"
+
+#~ msgid "Wrong password"
+#~ msgstr "Maxfiy so'z noto'g'ri"
+
+#~ msgid "  --update       - Update keys\n"
+#~ msgstr "  --update       - Kalitlarni yangilash.\n"
+
 #~ msgid "Skip Wizard"
 #~ msgstr "Yordamchisiz"
 
diff --git a/po/vi.po b/po/vi.po
index d501f02d..1f6dc9e4 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline 0.15\n"
-"POT-Creation-Date: 2004-10-01 22:41+0200\n"
+"POT-Creation-Date: 2004-11-03 12:10+0100\n"
 "PO-Revision-Date: 2004-10-05 18:52+0700\n"
 "Last-Translator: Trinh Minh Thanh <tmthanh@yahoo.com>\n"
 "Language-Team: Gnome-Vi <Gnomevi-list@lists.sourceforge.net>\n"
@@ -13,12 +13,12 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../mdkapplet:61
+#: ../mdkapplet:63
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Hệ thống của bạn đã cập nhật"
 
-#: ../mdkapplet:67
+#: ../mdkapplet:69
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -27,187 +27,197 @@ msgstr ""
 "Trục trặc về cấu hình dịch vụ. Hãy xem log và gửi email tới "
 "support@mandrakeonline.net"
 
-#: ../mdkapplet:73
+#: ../mdkapplet:75
 #, c-format
 msgid "System is busy. Please wait ..."
 msgstr "Hệ thống đang bận, hãy chờ...."
 
-#: ../mdkapplet:79
+#: ../mdkapplet:81
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Có cập nhật mới cho hệ thống của bạn"
 
-#: ../mdkapplet:85
+#: ../mdkapplet:87
 #, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr "Chưa cấu hình dịch vụ. Hãy nhấn \"Cấu hình dịch vụ\""
 
-#: ../mdkapplet:91
+#: ../mdkapplet:93
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Network chưa có. Hãy cấu hình network !"
 
-#: ../mdkapplet:97
+#: ../mdkapplet:99
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Dịch vụ chưa được kích hoạt. Hãy nhấn chuột lên \"Website Trực Tuyến\""
 
-#: ../mdkapplet:103
+#: ../mdkapplet:105
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:108 ../mdkapplet:158
+#: ../mdkapplet:110 ../mdkapplet:164
 #, c-format
 msgid "Install updates"
 msgstr "Cài đặt các cập nhật"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:111
 #, c-format
 msgid "Configure the service"
 msgstr "Cấu hình dịch vụ"
 
-#: ../mdkapplet:110
+#: ../mdkapplet:112
 #, c-format
 msgid "Check Updates"
 msgstr "Kiểm tra cập nhật"
 
-#: ../mdkapplet:111
+#: ../mdkapplet:113 ../mdkapplet:167 ../mdkapplet:225
+#, fuzzy, c-format
+msgid "Please Wait"
+msgstr "Hãy đợi"
+
+#: ../mdkapplet:113 ../mdkapplet:166 ../mdkapplet:167 ../mdkapplet:225
+#, c-format
+msgid "Check updates"
+msgstr "Kiểm tra cập nhật"
+
+#: ../mdkapplet:115
 #, c-format
 msgid "Online WebSite"
 msgstr "WebSite Trực Tuyến"
 
-#: ../mdkapplet:112
+#: ../mdkapplet:116
 #, c-format
 msgid "Configure Network"
 msgstr "Cấu hình network"
 
-#: ../mdkapplet:113
+#: ../mdkapplet:117
 #, c-format
 msgid "Configure Now!"
 msgstr "Cấu hình bây giờ!"
 
-#: ../mdkapplet:146
+#: ../mdkapplet:152 ../mdkapplet:229
 #, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Applet Cập Nhật Mandrakelinux"
 
-#: ../mdkapplet:156
+#: ../mdkapplet:162
 #, c-format
 msgid "Actions"
 msgstr "Hành động"
 
-#: ../mdkapplet:159
+#: ../mdkapplet:165
 #, c-format
 msgid "Configure"
 msgstr "Cấu hình"
 
-#: ../mdkapplet:160
-#, c-format
-msgid "Check updates"
-msgstr "Kiểm tra cập nhật"
-
-#: ../mdkapplet:161
+#: ../mdkapplet:169
 #, c-format
 msgid "See logs"
 msgstr "Xem log"
 
-#: ../mdkapplet:164
+#: ../mdkapplet:172
 #, c-format
 msgid "Status"
 msgstr "Trạng thái"
 
-#: ../mdkapplet:168 ../mdkapplet:363
+#: ../mdkapplet:176 ../mdkapplet:375
 #, c-format
 msgid "Close"
 msgstr "Đóng"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Network Connection: "
 msgstr "Kết nối mạng:"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Up"
 msgstr "Lên"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Down"
 msgstr "Xuống"
 
-#: ../mdkapplet:204
+#: ../mdkapplet:212
 #, c-format
 msgid "Last check: "
 msgstr "Lần kiểm tra cuối:"
 
-#: ../mdkapplet:205
+#: ../mdkapplet:213
 #, c-format
 msgid "Updates: "
 msgstr "Cập nhật:"
 
-#: ../mdkapplet:209
+#: ../mdkapplet:217
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Chạy drakconnect\n"
 
-#: ../mdkapplet:213
+#: ../mdkapplet:221
 #, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "Chạy mdkupdate --applet\n"
 
-#: ../mdkapplet:217
+#: ../mdkapplet:224
 #, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr "Mandrakeonline có vẻ được cài đặt lại, đang nạp lại applet ...."
 
-#: ../mdkapplet:225
+#: ../mdkapplet:235
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Tính toán các cập nhật mới...\n"
 
-#: ../mdkapplet:227
+#: ../mdkapplet:237
 #, c-format
 msgid "Connecting to"
 msgstr "Kết nối tới"
 
-#: ../mdkapplet:250
+#: ../mdkapplet:244
+#, fuzzy, c-format
+msgid "Response from Mandrakeonline server\n"
+msgstr "Chào Mừng Mandrakeonline"
+
+#: ../mdkapplet:262
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Kiểm tra... Đang có bản cập nhật mới\n"
 
-#: ../mdkapplet:254
+#: ../mdkapplet:267
 #, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
-#: ../mdkapplet:255
+#: ../mdkapplet:268
 #, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
-#: ../mdkapplet:256
+#: ../mdkapplet:269
 #, c-format
 msgid "Unknown state"
 msgstr "Trạng thái không xác định"
 
-#: ../mdkapplet:257
+#: ../mdkapplet:270
 #, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr "Dịch vụ trực tuyến bị tắt. Hãy liên lạc với Mandrakeonline site\n"
 
-#: ../mdkapplet:258
+#: ../mdkapplet:271
 #, c-format
 msgid "Wrong Password.\n"
 msgstr "Sai mật khẩu.\n"
 
-#: ../mdkapplet:259
+#: ../mdkapplet:272
 #, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr "Sai hành động, host, đăng nhập.\n"
 
-#: ../mdkapplet:260
+#: ../mdkapplet:273
 #, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
@@ -216,72 +226,82 @@ msgstr ""
 "Có gi đó chưa đúng trong thiết lập mạng (hãy kiểm tra thiết lập route, tường "
 "lửa, proxy)\n"
 
-#: ../mdkapplet:264
+#: ../mdkapplet:277
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Hệ thống đã cập nhật mới\n"
 
-#: ../mdkapplet:303
+#: ../mdkapplet:317
 #, c-format
 msgid "No check"
 msgstr "Không kiểm tra"
 
-#: ../mdkapplet:316
+#: ../mdkapplet:330
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Kiểm tra mạng: có lẽ chưa bật chạy\n"
 
-#: ../mdkapplet:319
+#: ../mdkapplet:333
 #, c-format
 msgid "Checking config file: Not present\n"
 msgstr "Kiểm tra tập tin cấu hình: không tồn tại\n"
 
-#: ../mdkapplet:353
+#: ../mdkapplet:365
 #, c-format
 msgid "Logs"
 msgstr "Logs"
 
-#: ../mdkapplet:369
+#: ../mdkapplet:381
 #, c-format
 msgid "Clear"
 msgstr "Xóa sạch"
 
-#: ../mdkapplet:396
+#: ../mdkapplet:408
 #, c-format
 msgid "About..."
 msgstr "Giới thiệu"
 
-#: ../mdkapplet:397
+#: ../mdkapplet:409
 #, c-format
 msgid "Always launch on startup"
 msgstr "Luôn chạy khi khởi động"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:411
 #, c-format
 msgid "Quit"
 msgstr "Thoát"
 
-#: ../mdkonline:89
+#: ../mdkonline:52 ../mdkonline:106
+#, c-format
+msgid "Mandrakeonline"
+msgstr "Mandrakeonline"
+
+#: ../mdkonline:55
 #, c-format
-msgid "Next"
-msgstr "Tiến"
+msgid "I already have an account"
+msgstr "Tôi đã có một tài khoản"
 
-#: ../mdkonline:89
+#: ../mdkonline:56
+#, c-format
+msgid "I want to subscribe"
+msgstr "Tôi muốn đăng ký"
+
+#: ../mdkonline:89 ../mdkonline:93 ../mdkonline:131
 #, c-format
-msgid "Cancel"
-msgstr "Bỏ qua"
+msgid "Please wait"
+msgstr "Hãy đợi"
 
 #: ../mdkonline:89
 #, c-format
-msgid "Previous"
-msgstr "Về trước"
+msgid "Reading configuration\n"
+msgstr "Đang đọc cấu hình\n"
 
-#: ../mdkonline:103
+#: ../mdkonline:93
 #, c-format
-msgid "Welcome to Mandrakeonline"
-msgstr "Chào Mừng Mandrakeonline"
+msgid "Sending configuration..."
+msgstr "Đang gửi cấu hình..."
 
-#: ../mdkonline:104 ../mdkonline_tui:98
+#: ../mdkonline:109
 #, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
@@ -292,62 +312,37 @@ msgstr ""
 "(các gói, cấu hình phần cứng) đến cơ sở dữ liệu tập chung nhằm\n"
 "duy trì thông báo cho bạn về các cập nhật bảo mật và nâng cấp hữu ích.\n"
 
-#: ../mdkonline:105 ../mdkonline_tui:142
+#: ../mdkonline:114
 #, c-format
-msgid "Create a Mandrakeonline Account"
-msgstr "Tạo tài khoản Mandrakeonline"
+msgid "Account creation or authentication"
+msgstr ""
 
-#: ../mdkonline:107
+#: ../mdkonline:119
 #, c-format
-msgid "I don't have a Mandrakeonline account and I want to subscribe"
-msgstr "Tôi không có tài khoản Mandrakelinuxonline nên muốn đăng ký"
+msgid "Enter your Mandrakeonline login, password and machine name:"
+msgstr "Hãy điền tên đăng nhập MandraleOnline, mật khẩu và tên máy:"
 
-#: ../mdkonline:111 ../mdkonline:131 ../mdkonline_tui:114 ../mdkonline_tui:145
+#: ../mdkonline:125 ../mdkonline:156
 #, c-format
 msgid "Login:"
 msgstr "Đăng nhập:"
 
-#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:115 ../mdkonline_tui:146
+#: ../mdkonline:126 ../mdkonline:157
 #, c-format
 msgid "Password:"
 msgstr "Mật khẩu:"
 
-#: ../mdkonline:113 ../mdkonline_tui:147
-#, c-format
-msgid "Confirm Password:"
-msgstr "Xác Nhận Mật Khẩu:"
-
-#: ../mdkonline:114 ../mdkonline_tui:148
-#, c-format
-msgid "Mail contact:"
-msgstr "Thư liên lạc:"
-
-#: ../mdkonline:121
-#, c-format
-msgid "Mandrakelinux Privacy Policy"
-msgstr "Chính Sách Riêng Tư Của Mandrakelinux"
-
 #: ../mdkonline:127
 #, c-format
-msgid "Authentification"
-msgstr "Chứng thực"
-
-#: ../mdkonline:128 ../mdkonline_tui:108
-#, c-format
-msgid "Enter your Mandrakeonline login, password and machine name:"
-msgstr "Hãy điền tên đăng nhập MandraleOnline, mật khẩu và tên máy:"
-
-#: ../mdkonline:133 ../mdkonline_tui:116
-#, c-format
 msgid "Machine name:"
 msgstr "Tên máy tính:"
 
-#: ../mdkonline:138
+#: ../mdkonline:131
 #, c-format
-msgid "Send Configuration"
-msgstr "Gửi cấu hình"
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Đang kết nối đến Mandrakeonline website..."
 
-#: ../mdkonline:139 ../mdkonline_tui:128
+#: ../mdkonline:139
 #, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
@@ -379,55 +374,56 @@ msgstr ""
 "Thêm nữa, bạn được hưởng lợi do giảm giá chi trả cho các dịch vụ hỗ trợ tại\n"
 "www.mandrakeexpert.com."
 
-#: ../mdkonline:144 ../mdkonline:211 ../mdkonline:234
+#: ../mdkonline:141 ../mdkonline:180 ../mdkupdate:126 ../mdkupdate:198
 #, c-format
-msgid "Finish"
-msgstr "Kết thúc"
+msgid "Connection problem"
+msgstr "Trục trặc kết nối"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid "Your upload was successful!"
-msgstr "Đã hoàn thành việc tải lên!"
+msgid "or"
+msgstr "hoặc"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandrakeonline."
-msgstr ""
-"Từ bây giờ, bạn sẽ nhận được các thông\n"
-"báo về cập nhật bảo mật thông qua Mandrakeonline."
+msgid "wrong password:"
+msgstr "Mật khẩu sai:"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
 msgid ""
-"Mandrakeonline offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+"Your login or password was wrong.\n"
+" Either you'll have to type it again, or you'll need to create an account on "
+"Mandrakeonline.\n"
+" In the latter case, go back to the first step to connect to "
+"Mandrakeonline.\n"
+" Be aware that you must also provide a Machine name \n"
+" (only alphabetical characters are admitted)"
 msgstr ""
-"Mandrakeonline cung cấp khả năng tự động cập nhật.\n"
-"Một chương trình sẽ chạy thường quy trong hệ thống để đợi các cập nhật mới\n"
-
-#: ../mdkonline:146
-#, c-format
-msgid "automated Upgrades"
-msgstr "Nâng cấp tự động"
+"Tên đăng nhập hoặc mật khẩu của bạn không đúng.\n"
+"Hoặc là bạn phải nhập lại, hoặc bạn cần tạo một tài khoản cho Mandrakelinux "
+"Online.\n"
+" Trong trường hợp sau, hãy quay về bước đầu tiên để kết nối tới "
+"Mandrakelinux Online.\n"
+" Cần biết là bạn cũng phải cung cấp tên máy tính \n"
+" (chỉ chấp nhận các ký tự trong bảng chữ cái)"
 
-#: ../mdkonline:150
+#: ../mdkonline:153
 #, c-format
-msgid "Country:"
-msgstr "Quốc gia:"
+msgid "Create a Mandrakeonline Account"
+msgstr "Tạo tài khoản Mandrakeonline"
 
-#: ../mdkonline:178 ../mdkonline:183 ../mdkonline:185 ../mdkonline:187
+#: ../mdkonline:158
 #, c-format
-msgid "Error"
-msgstr "Lỗi"
+msgid "Confirm Password:"
+msgstr "Xác Nhận Mật Khẩu:"
 
-#: ../mdkonline:183 ../mdkonline_tui:152
+#: ../mdkonline:159
 #, c-format
-msgid "Please provide a login"
-msgstr "Hãy cung cấp đăng nhập"
+msgid "Mail contact:"
+msgstr "Thư liên lạc:"
 
-#: ../mdkonline:185 ../mdkonline_tui:152
+#: ../mdkonline:163
 #, c-format
 msgid ""
 "The passwords do not match\n"
@@ -436,159 +432,114 @@ msgstr ""
 "Mật khẩu không khớp\n"
 " Hãy thử lại\n"
 
-#: ../mdkonline:187 ../mdkonline_tui:152
+#: ../mdkonline:163
+#, c-format
+msgid "Please provide a login"
+msgstr "Hãy cung cấp đăng nhập"
+
+#: ../mdkonline:163
 #, c-format
 msgid "Not a valid mail address!\n"
 msgstr "Địa chỉ thư không hợp lệ!\n"
 
-#: ../mdkonline:199 ../mdkonline_tui:78
+#: ../mdkonline:169
 #, c-format
-msgid "Reading configuration\n"
-msgstr "Đang đọc cấu hình\n"
+msgid ""
+"Mandrakeonline Account successfully created.\n"
+"Please click \"Next\" to authenticate and upload your configuration\n"
+msgstr ""
 
-#: ../mdkonline:204 ../mdkonline_tui:82
+#: ../mdkonline:178
 #, c-format
-msgid "Sending configuration..."
-msgstr "Đang gửi cấu hình..."
+msgid "Your upload was successful!"
+msgstr "Đã hoàn thành việc tải lên!"
 
-#: ../mdkonline:213 ../mdkonline:273 ../mdkonline_tui:130 ../mdkonline_tui:169
-#: ../mdkupdate:124 ../mdkupdate:195
+#: ../mdkonline:178
 #, c-format
-msgid "Connection problem"
-msgstr "Trục trặc kết nối"
+msgid ""
+"From now you will receive on security and updates \n"
+"announcements thanks to Mandrakeonline."
+msgstr ""
+"Từ bây giờ, bạn sẽ nhận được các thông\n"
+"báo về cập nhật bảo mật thông qua Mandrakeonline."
 
-#: ../mdkonline:213 ../mdkonline_tui:169
+#: ../mdkonline:178
+#, c-format
+msgid ""
+"Mandrakeonline offers you the ability to automate the updates.\n"
+"A program will run regulary in your system waiting for new updates\n"
+msgstr ""
+"Mandrakeonline cung cấp khả năng tự động cập nhật.\n"
+"Một chương trình sẽ chạy thường quy trong hệ thống để đợi các cập nhật mới\n"
+
+#: ../mdkonline:180
 #, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr "Trục trặc khi tải lên các tập tin, hãy thực hiện lại"
 
-#: ../mdkonline:251
+#: ../mdkonline:186
 #, c-format
-msgid "Quitting Wizard\n"
-msgstr "Đang thoát khỏi Đồ Thuật\n"
+msgid "Country"
+msgstr "Quốc gia"
 
-#: ../mdkonline:273
+#: ../mdkonline:198
 #, c-format
-msgid "Mandrakeonline could not be contacted, please try again at a later time"
-msgstr "Không thể liên lạc với MandrakeOnline, hãy thực hiện lại sau"
+msgid "Congratulations"
+msgstr "Chúc mừng"
 
-#: ../mdkonline:285
+#: ../mdkonline:198
 #, c-format
-msgid "Wrong password"
-msgstr "Sai mật khẩu"
+msgid "Your Mandrakeonline account has been successfully configured\n"
+msgstr ""
+
+#: ../mdkonline:214
+#, fuzzy, c-format
+msgid "Configuration uploaded successfully"
+msgstr "Đã hoàn thành việc tải lên!"
+
+#: ../mdkonline:215
+#, fuzzy, c-format
+msgid "Problem uploading configuration"
+msgstr "Đang đọc cấu hình\n"
 
-#: ../mdkonline:285 ../mdkonline_tui:130
+#: ../mdkonline:216
 #, c-format
 msgid ""
-"Your login or password was wrong.\n"
-" Either you'll have to type it again, or you'll need to create an account on "
-"Mandrakeonline.\n"
-" In the latter case, go back to the first step to connect to "
-"Mandrakeonline.\n"
-" Be aware that you must also provide a Machine name \n"
-" (only alphabetical characters are admitted)"
+"Cannot connect to mandrakeonline website: wrong login/password or router/"
+"firewall bad settings"
 msgstr ""
-"Tên đăng nhập hoặc mật khẩu của bạn không đúng.\n"
-"Hoặc là bạn phải nhập lại, hoặc bạn cần tạo một tài khoản cho Mandrakelinux "
-"Online.\n"
-" Trong trường hợp sau, hãy quay về bước đầu tiên để kết nối tới "
-"Mandrakelinux Online.\n"
-" Cần biết là bạn cũng phải cung cấp tên máy tính \n"
-" (chỉ chấp nhận các ký tự trong bảng chữ cái)"
 
-#: ../mdkonline.pm:58
+#: ../mdkonline.pm:66
 #, c-format
 msgid "Login and password should be less than 12 characters\n"
 msgstr ""
 
-#: ../mdkonline.pm:59
+#: ../mdkonline.pm:67
 #, c-format
 msgid "Special characters are not allowed\n"
 msgstr ""
 
-#: ../mdkonline.pm:60
+#: ../mdkonline.pm:68
 #, c-format
 msgid "Please fill in all fields\n"
 msgstr "Hãy điền đủ các trường\n"
 
-#: ../mdkonline.pm:61
+#: ../mdkonline.pm:69
 #, c-format
 msgid "Email not valid\n"
 msgstr "Email không hợp lệ\n"
 
-#: ../mdkonline.pm:62
+#: ../mdkonline.pm:70
 #, c-format
 msgid "Account already exist\n"
 msgstr "Tài khoản đã có rồi\n"
 
-#: ../mdkonline.pm:68
+#: ../mdkonline.pm:76
 #, c-format
 msgid "Problem connecting to server \n"
 msgstr "Trục trặc kết nối với máy chủ\n"
 
-#: ../mdkonline_tui:45 ../mdkonline_tui:95
-#, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
-
-#: ../mdkonline_tui:48
-#, c-format
-msgid "I already have an account"
-msgstr "Tôi đã có một tài khoản"
-
-#: ../mdkonline_tui:49
-#, c-format
-msgid "I want to subscribe"
-msgstr "Tôi muốn đăng ký"
-
-#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:120
-#, c-format
-msgid "Please wait"
-msgstr "Hãy đợi"
-
-#: ../mdkonline_tui:103
-#, c-format
-msgid "Account creation or authentication"
-msgstr ""
-
-#: ../mdkonline_tui:120
-#, c-format
-msgid "Connecting to Mandrakeonline website..."
-msgstr "Đang kết nối đến Mandrakeonline website..."
-
-#: ../mdkonline_tui:130
-#, c-format
-msgid "or"
-msgstr "hoặc"
-
-#: ../mdkonline_tui:130
-#, c-format
-msgid "wrong password:"
-msgstr "Mật khẩu sai:"
-
-#: ../mdkonline_tui:158
-#, c-format
-msgid ""
-"Mandrakeonline Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-
-#: ../mdkonline_tui:175
-#, c-format
-msgid "Country"
-msgstr "Quốc gia"
-
-#: ../mdkonline_tui:187
-#, c-format
-msgid "Congratulations"
-msgstr "Chúc mừng"
-
-#: ../mdkonline_tui:187
-#, c-format
-msgid "Your Mandrakeonline account has been successfully configured\n"
-msgstr ""
-
-#: ../mdkupdate:50
+#: ../mdkupdate:52
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
@@ -605,44 +556,85 @@ msgstr ""
 "\n"
 "cách dùng:\n"
 
-#: ../mdkupdate:55
+#: ../mdkupdate:57
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - in ra thông điệp trợ giúp này.\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:58
 #, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto         - Tự động chạy Mandrakeupdate.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:59
 #, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - chạy Mandrakeupdate.\n"
 
-#: ../mdkupdate:58
-#, c-format
-msgid "  --update       - Update keys\n"
-msgstr "  --update       - Cập nhật khóa\n"
-
-#: ../mdkupdate:66
+#: ../mdkupdate:67
 #, c-format
 msgid "No %s file found. Run mdkonline wizard first"
 msgstr ""
 
-#: ../mdkupdate:124
+#: ../mdkupdate:126
 #, c-format
 msgid "Mandrakeupdate could not contact the site, we will try again."
 msgstr "Mandrakeupdate không thể liên lạc với site, hãy thử lại sau."
 
-#: ../mdkupdate:173
+#: ../mdkupdate:176
 #, c-format
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr ""
 
-#: ../mdkupdate:195
+#: ../mdkupdate:198
 #, c-format
 msgid ""
 "Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
 "mandrakeonline [dot] net"
 msgstr ""
+
+#~ msgid "Next"
+#~ msgstr "Tiến"
+
+#~ msgid "Cancel"
+#~ msgstr "Bỏ qua"
+
+#~ msgid "Previous"
+#~ msgstr "Về trước"
+
+#~ msgid "I don't have a Mandrakeonline account and I want to subscribe"
+#~ msgstr "Tôi không có tài khoản Mandrakelinuxonline nên muốn đăng ký"
+
+#~ msgid "Mandrakelinux Privacy Policy"
+#~ msgstr "Chính Sách Riêng Tư Của Mandrakelinux"
+
+#~ msgid "Authentification"
+#~ msgstr "Chứng thực"
+
+#~ msgid "Send Configuration"
+#~ msgstr "Gửi cấu hình"
+
+#~ msgid "Finish"
+#~ msgstr "Kết thúc"
+
+#~ msgid "automated Upgrades"
+#~ msgstr "Nâng cấp tự động"
+
+#~ msgid "Country:"
+#~ msgstr "Quốc gia:"
+
+#~ msgid "Error"
+#~ msgstr "Lỗi"
+
+#~ msgid "Quitting Wizard\n"
+#~ msgstr "Đang thoát khỏi Đồ Thuật\n"
+
+#~ msgid ""
+#~ "Mandrakeonline could not be contacted, please try again at a later time"
+#~ msgstr "Không thể liên lạc với MandrakeOnline, hãy thực hiện lại sau"
+
+#~ msgid "Wrong password"
+#~ msgstr "Sai mật khẩu"
+
+#~ msgid "  --update       - Update keys\n"
+#~ msgstr "  --update       - Cập nhật khóa\n"
diff --git a/po/wa.po b/po/wa.po
index 664c19b2..b75cd32a 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-01 22:41+0200\n"
+"POT-Creation-Date: 2004-11-03 12:10+0100\n"
 "PO-Revision-Date: 2004-08-11 20:48+0200\n"
 "Last-Translator: Pablo Saratxaga <pablo@walon.org>\n"
 "Language-Team: Walloon <linux-wa@walon.org>\n"
@@ -16,12 +16,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.2\n"
 
-#: ../mdkapplet:61
+#: ../mdkapplet:63
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Li sistinme da vosse est a djoû"
 
-#: ../mdkapplet:67
+#: ../mdkapplet:69
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -30,190 +30,200 @@ msgstr ""
 "Åk n' a nén stî tot-z apontiant l' siervice. Loukîz les djournås eyet emilez "
 "po dire li problinme a support@mandrakeonline.net"
 
-#: ../mdkapplet:73
+#: ../mdkapplet:75
 #, c-format
 msgid "System is busy. Please wait ..."
 msgstr "Li sistinme est ocupé. Tårdjîz ene miete..."
 
-#: ../mdkapplet:79
+#: ../mdkapplet:81
 #, c-format
 msgid "New updates are available for your system"
 msgstr "I gn des noveas metaedjes a djoû po vosse sistinme"
 
-#: ../mdkapplet:85
+#: ../mdkapplet:87
 #, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr "Siervice nén apontyî. Clitchîz so «Apontyî l' siervice»"
 
-#: ../mdkapplet:91
+#: ../mdkapplet:93
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Li rantoele est djus. Apontyîz l' rantoele s' i vs plait."
 
-#: ../mdkapplet:97
+#: ../mdkapplet:99
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Siervice nén èn alaedje. Clitchîz so «Waibe»"
 
-#: ../mdkapplet:103
+#: ../mdkapplet:105
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 "Modêye nén sopoirtêye (modêye pår trop viye, ou modêye di diswalpaedje)"
 
-#: ../mdkapplet:108 ../mdkapplet:158
+#: ../mdkapplet:110 ../mdkapplet:164
 #, c-format
 msgid "Install updates"
 msgstr "Astaler les metaedjes a djoû"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:111
 #, c-format
 msgid "Configure the service"
 msgstr "Apontyî l' siervice"
 
-#: ../mdkapplet:110
+#: ../mdkapplet:112
 #, c-format
 msgid "Check Updates"
 msgstr "Verifyî les metaedjes a djoû"
 
-#: ../mdkapplet:111
+#: ../mdkapplet:113 ../mdkapplet:167 ../mdkapplet:225
+#, fuzzy, c-format
+msgid "Please Wait"
+msgstr "Tårdjîz on pô, s' i vs plait"
+
+#: ../mdkapplet:113 ../mdkapplet:166 ../mdkapplet:167 ../mdkapplet:225
+#, c-format
+msgid "Check updates"
+msgstr "Verifyî les metaedjes a djoû"
+
+#: ../mdkapplet:115
 #, c-format
 msgid "Online WebSite"
 msgstr "Waibe"
 
-#: ../mdkapplet:112
+#: ../mdkapplet:116
 #, c-format
 msgid "Configure Network"
 msgstr "Apontyî l' rantoele"
 
-#: ../mdkapplet:113
+#: ../mdkapplet:117
 #, c-format
 msgid "Configure Now!"
 msgstr "Apontyî do côp!"
 
-#: ../mdkapplet:146
+#: ../mdkapplet:152 ../mdkapplet:229
 #, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Aplikete di metaedjes a djoû"
 
-#: ../mdkapplet:156
+#: ../mdkapplet:162
 #, c-format
 msgid "Actions"
 msgstr "Accions"
 
-#: ../mdkapplet:159
+#: ../mdkapplet:165
 #, c-format
 msgid "Configure"
 msgstr "Apontyî"
 
-#: ../mdkapplet:160
-#, c-format
-msgid "Check updates"
-msgstr "Verifyî les metaedjes a djoû"
-
-#: ../mdkapplet:161
+#: ../mdkapplet:169
 #, c-format
 msgid "See logs"
 msgstr "Vey les djournås"
 
-#: ../mdkapplet:164
+#: ../mdkapplet:172
 #, c-format
 msgid "Status"
 msgstr "Estat"
 
-#: ../mdkapplet:168 ../mdkapplet:363
+#: ../mdkapplet:176 ../mdkapplet:375
 #, c-format
 msgid "Close"
 msgstr "Clôre"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Network Connection: "
 msgstr "Raloyaedje al rantoele: "
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Up"
 msgstr "En alaedje"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Down"
 msgstr "Essocté"
 
-#: ../mdkapplet:204
+#: ../mdkapplet:212
 #, c-format
 msgid "Last check: "
 msgstr "Dierin verifiaedje: "
 
-#: ../mdkapplet:205
+#: ../mdkapplet:213
 #, c-format
 msgid "Updates: "
 msgstr "Metaedjes a djoû: "
 
-#: ../mdkapplet:209
+#: ../mdkapplet:217
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Enondant drakconnect\n"
 
-#: ../mdkapplet:213
+#: ../mdkapplet:221
 #, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "Enondant «mdkupdate --applet»\n"
 
-#: ../mdkapplet:217
+#: ../mdkapplet:224
 #, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 "I shonnreut k' Mandrakeonline åye sitî rastalé, dji rtchedje l' aplikete..."
 
-#: ../mdkapplet:225
+#: ../mdkapplet:235
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Carculaedje des metaedjes a djoû...\n"
 
-#: ../mdkapplet:227
+#: ../mdkapplet:237
 #, c-format
 msgid "Connecting to"
 msgstr "Dji m' raloyaedje a"
 
-#: ../mdkapplet:250
+#: ../mdkapplet:244
+#, fuzzy, c-format
+msgid "Response from Mandrakeonline server\n"
+msgstr "Wilicome e Mandrakeonline"
+
+#: ../mdkapplet:262
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Verifiant... Des metaedjes a djoû sont disponibes\n"
 
-#: ../mdkapplet:254
+#: ../mdkapplet:267
 #, c-format
 msgid "Development release not supported by service"
 msgstr "Modêye di diswalpaedje nén sopoirtêye på siervice"
 
-#: ../mdkapplet:255
+#: ../mdkapplet:268
 #, c-format
 msgid "Too old release not supported by service"
 msgstr "Modêye pår trop viye nén sopoirtêye på siervice"
 
-#: ../mdkapplet:256
+#: ../mdkapplet:269
 #, c-format
 msgid "Unknown state"
 msgstr "Estat nén cnoxhou"
 
-#: ../mdkapplet:257
+#: ../mdkapplet:270
 #, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr ""
 "Les siervices so les fyis sont essoctés. Contactez li site Mandrakeonline\n"
 
-#: ../mdkapplet:258
+#: ../mdkapplet:271
 #, c-format
 msgid "Wrong Password.\n"
 msgstr "Måva scret.\n"
 
-#: ../mdkapplet:259
+#: ../mdkapplet:272
 #, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr "Accion, no d' lodjoe ou no d' elodjaedje nén corek.\n"
 
-#: ../mdkapplet:260
+#: ../mdkapplet:273
 #, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
@@ -222,72 +232,82 @@ msgstr ""
 "I gn a åk ki n' va nén avou vost apontiaedje rantoele (verifyîz vosse "
 "routaedje, li côpe-feu eyet l' apontiaedje do procsi)\n"
 
-#: ../mdkapplet:264
+#: ../mdkapplet:277
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Li sistinme est a djoû\n"
 
-#: ../mdkapplet:303
+#: ../mdkapplet:317
 #, c-format
 msgid "No check"
 msgstr "Pont d' verifiaedje"
 
-#: ../mdkapplet:316
+#: ../mdkapplet:330
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Verifiaedje del rantoele: i shonnreut k' ele ni soeye nén en alaedje\n"
 
-#: ../mdkapplet:319
+#: ../mdkapplet:333
 #, c-format
 msgid "Checking config file: Not present\n"
 msgstr "Verifiaedje do fitchî d' apontiaedje: nén la\n"
 
-#: ../mdkapplet:353
+#: ../mdkapplet:365
 #, c-format
 msgid "Logs"
 msgstr "Djournås"
 
-#: ../mdkapplet:369
+#: ../mdkapplet:381
 #, c-format
 msgid "Clear"
 msgstr "Netyî"
 
-#: ../mdkapplet:396
+#: ../mdkapplet:408
 #, c-format
 msgid "About..."
 msgstr "Åd fwait..."
 
-#: ../mdkapplet:397
+#: ../mdkapplet:409
 #, c-format
 msgid "Always launch on startup"
 msgstr "El drovi tofer a l' enondaedje"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:411
 #, c-format
 msgid "Quit"
 msgstr "Cwiter"
 
-#: ../mdkonline:89
+#: ../mdkonline:52 ../mdkonline:106
 #, c-format
-msgid "Next"
-msgstr "Shuvant"
+msgid "Mandrakeonline"
+msgstr "Mandrakeonline"
 
-#: ../mdkonline:89
+#: ../mdkonline:55
+#, c-format
+msgid "I already have an account"
+msgstr "Dji so ddja mimbe"
+
+#: ../mdkonline:56
+#, c-format
+msgid "I want to subscribe"
+msgstr "Dji vôreu divni mimbe"
+
+#: ../mdkonline:89 ../mdkonline:93 ../mdkonline:131
 #, c-format
-msgid "Cancel"
-msgstr "Rinoncî"
+msgid "Please wait"
+msgstr "Tårdjîz on pô, s' i vs plait"
 
 #: ../mdkonline:89
 #, c-format
-msgid "Previous"
-msgstr "Di dvant"
+msgid "Reading configuration\n"
+msgstr "Dji lé vost apontiaedje\n"
 
-#: ../mdkonline:103
+#: ../mdkonline:93
 #, c-format
-msgid "Welcome to Mandrakeonline"
-msgstr "Wilicome e Mandrakeonline"
+msgid "Sending configuration..."
+msgstr "Evoyant l' apontiaedje..."
 
-#: ../mdkonline:104 ../mdkonline_tui:98
+#: ../mdkonline:109
 #, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
@@ -299,63 +319,38 @@ msgstr ""
 "por nos pleur vos informer tchaeke côp k' i gn årè on metaedje a djoû\n"
 "di såvrité, oudonbén ahessåve pol apontiaedje da vosse.\n"
 
-#: ../mdkonline:105 ../mdkonline_tui:142
+#: ../mdkonline:114
 #, c-format
-msgid "Create a Mandrakeonline Account"
-msgstr "Ahiver on conte Mandrakeonline"
+msgid "Account creation or authentication"
+msgstr "Ahivaedje d' on conte, ou otintifiaedje"
 
-#: ../mdkonline:107
+#: ../mdkonline:119
 #, c-format
-msgid "I don't have a Mandrakeonline account and I want to subscribe"
-msgstr "Dji n' a nén d' conte Mandrakeonline et dji vôreu m' eredjîstrer"
+msgid "Enter your Mandrakeonline login, password and machine name:"
+msgstr ""
+"Dinez vosse no d' elodjaedje, no d' éndjole eyet scret po Mandrakeonline:"
 
-#: ../mdkonline:111 ../mdkonline:131 ../mdkonline_tui:114 ../mdkonline_tui:145
+#: ../mdkonline:125 ../mdkonline:156
 #, c-format
 msgid "Login:"
 msgstr "No d' elodjaedje:"
 
-#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:115 ../mdkonline_tui:146
+#: ../mdkonline:126 ../mdkonline:157
 #, c-format
 msgid "Password:"
 msgstr "Sicret:"
 
-#: ../mdkonline:113 ../mdkonline_tui:147
-#, c-format
-msgid "Confirm Password:"
-msgstr "Acertinez l' sicret:"
-
-#: ../mdkonline:114 ../mdkonline_tui:148
-#, c-format
-msgid "Mail contact:"
-msgstr "Emile di contak:"
-
-#: ../mdkonline:121
-#, c-format
-msgid "Mandrakelinux Privacy Policy"
-msgstr "Politike sol privaceye di Mandrakelinux"
-
 #: ../mdkonline:127
 #, c-format
-msgid "Authentification"
-msgstr "Otintifiaedje"
-
-#: ../mdkonline:128 ../mdkonline_tui:108
-#, c-format
-msgid "Enter your Mandrakeonline login, password and machine name:"
-msgstr ""
-"Dinez vosse no d' elodjaedje, no d' éndjole eyet scret po Mandrakeonline:"
-
-#: ../mdkonline:133 ../mdkonline_tui:116
-#, c-format
 msgid "Machine name:"
 msgstr "No d' l' éndjole:"
 
-#: ../mdkonline:138
+#: ../mdkonline:131
 #, c-format
-msgid "Send Configuration"
-msgstr "Evoyî l' apontiaedje"
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Raloyaedje sol waibe Mandrakeonline..."
 
-#: ../mdkonline:139 ../mdkonline_tui:128
+#: ../mdkonline:139
 #, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
@@ -386,57 +381,53 @@ msgstr ""
 "emile des metaedjes a djoû di såvrité. Di pus, vos beneficyîz di rmetaedjes\n"
 "so les siervices payants di www.mandrakeexpert.com."
 
-#: ../mdkonline:144 ../mdkonline:211 ../mdkonline:234
+#: ../mdkonline:141 ../mdkonline:180 ../mdkupdate:126 ../mdkupdate:198
 #, c-format
-msgid "Finish"
-msgstr "Fini"
+msgid "Connection problem"
+msgstr "Aroke avou l' raloyaedje"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid "Your upload was successful!"
-msgstr "Vosse metaedje a djoû a stî comifåt!"
+msgid "or"
+msgstr "oudonbén"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandrakeonline."
-msgstr ""
-"A pårti d' asteure vos rçuroz les anonces di såvrité\n"
-"et di metaedjes a djoû viè Mandrakeonline."
+msgid "wrong password:"
+msgstr "måva scret:"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
 msgid ""
-"Mandrakeonline offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+"Your login or password was wrong.\n"
+" Either you'll have to type it again, or you'll need to create an account on "
+"Mandrakeonline.\n"
+" In the latter case, go back to the first step to connect to "
+"Mandrakeonline.\n"
+" Be aware that you must also provide a Machine name \n"
+" (only alphabetical characters are admitted)"
 msgstr ""
-"Mandrakeonline vos ofere li possibilité di fé des metaedjes a djoû "
-"otomatikes.\n"
-"On programe srè enondé regulirmint so vosse sistinme po cweri après des "
-"noveas metaedjes a djoû\n"
-
-#: ../mdkonline:146
-#, c-format
-msgid "automated Upgrades"
-msgstr "metaedjes a djoû otomatikes"
+"Vos avoz dné on måva no d' elodjaedje ou on måva scret.\n"
+"I vos les fåt rtaper, oudonbén i vos fåt fé on conte so Mandrakeonline.\n"
+"Po ç' dierin cas, potchîz al prumire etape po s' raloyî a Mandrakeonline.\n"
+"Vos dvroz ossu dner on no d' éndjole (seulmint des letes sins accints)"
 
-#: ../mdkonline:150
+#: ../mdkonline:153
 #, c-format
-msgid "Country:"
-msgstr "Payis:"
+msgid "Create a Mandrakeonline Account"
+msgstr "Ahiver on conte Mandrakeonline"
 
-#: ../mdkonline:178 ../mdkonline:183 ../mdkonline:185 ../mdkonline:187
+#: ../mdkonline:158
 #, c-format
-msgid "Error"
-msgstr "Aroke"
+msgid "Confirm Password:"
+msgstr "Acertinez l' sicret:"
 
-#: ../mdkonline:183 ../mdkonline_tui:152
+#: ../mdkonline:159
 #, c-format
-msgid "Please provide a login"
-msgstr "Dinez on no d' elodjaedje d' si vs plait"
+msgid "Mail contact:"
+msgstr "Emile di contak:"
 
-#: ../mdkonline:185 ../mdkonline_tui:152
+#: ../mdkonline:163
 #, c-format
 msgid ""
 "The passwords do not match\n"
@@ -445,161 +436,119 @@ msgstr ""
 "Les screts n' sont nén les minmes\n"
 " Sayîz cor on côp s' i vs plait\n"
 
-#: ../mdkonline:187 ../mdkonline_tui:152
+#: ../mdkonline:163
+#, c-format
+msgid "Please provide a login"
+msgstr "Dinez on no d' elodjaedje d' si vs plait"
+
+#: ../mdkonline:163
 #, c-format
 msgid "Not a valid mail address!\n"
 msgstr "C' est nén ene adresse emile valide!\n"
 
-#: ../mdkonline:199 ../mdkonline_tui:78
+#: ../mdkonline:169
 #, c-format
-msgid "Reading configuration\n"
-msgstr "Dji lé vost apontiaedje\n"
+msgid ""
+"Mandrakeonline Account successfully created.\n"
+"Please click \"Next\" to authenticate and upload your configuration\n"
+msgstr ""
+"Li conte mandrakeonline a stî ahivé comifåt.\n"
+"Clitchîz so «Shuvant» po vs elodjî eyet eberweter vost apontiaedje\n"
 
-#: ../mdkonline:204 ../mdkonline_tui:82
+#: ../mdkonline:178
 #, c-format
-msgid "Sending configuration..."
-msgstr "Evoyant l' apontiaedje..."
+msgid "Your upload was successful!"
+msgstr "Vosse metaedje a djoû a stî comifåt!"
 
-#: ../mdkonline:213 ../mdkonline:273 ../mdkonline_tui:130 ../mdkonline_tui:169
-#: ../mdkupdate:124 ../mdkupdate:195
+#: ../mdkonline:178
 #, c-format
-msgid "Connection problem"
-msgstr "Aroke avou l' raloyaedje"
+msgid ""
+"From now you will receive on security and updates \n"
+"announcements thanks to Mandrakeonline."
+msgstr ""
+"A pårti d' asteure vos rçuroz les anonces di såvrité\n"
+"et di metaedjes a djoû viè Mandrakeonline."
+
+#: ../mdkonline:178
+#, c-format
+msgid ""
+"Mandrakeonline offers you the ability to automate the updates.\n"
+"A program will run regulary in your system waiting for new updates\n"
+msgstr ""
+"Mandrakeonline vos ofere li possibilité di fé des metaedjes a djoû "
+"otomatikes.\n"
+"On programe srè enondé regulirmint so vosse sistinme po cweri après des "
+"noveas metaedjes a djoû\n"
 
-#: ../mdkonline:213 ../mdkonline_tui:169
+#: ../mdkonline:180
 #, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr "Åk n' a nén stî tot-z eberwetant les fitchîs, rissayîz s' i vs plait"
 
-#: ../mdkonline:251
+#: ../mdkonline:186
 #, c-format
-msgid "Quitting Wizard\n"
-msgstr "Cwitant l' macrea\n"
+msgid "Country"
+msgstr "Payis"
 
-#: ../mdkonline:273
+#: ../mdkonline:198
 #, c-format
-msgid "Mandrakeonline could not be contacted, please try again at a later time"
-msgstr ""
-"Dji n' a polou m' raloyî a Mandrakeonline, rissayîz on pô pus tård s' i vs "
-"plait."
+msgid "Congratulations"
+msgstr "Proficiate"
 
-#: ../mdkonline:285
+#: ../mdkonline:198
 #, c-format
-msgid "Wrong password"
-msgstr "Måva scret"
+msgid "Your Mandrakeonline account has been successfully configured\n"
+msgstr "Vosse conte Mandrakeonline a stî apontyî comifåt\n"
+
+#: ../mdkonline:214
+#, fuzzy, c-format
+msgid "Configuration uploaded successfully"
+msgstr "Vosse metaedje a djoû a stî comifåt!"
 
-#: ../mdkonline:285 ../mdkonline_tui:130
+#: ../mdkonline:215
+#, fuzzy, c-format
+msgid "Problem uploading configuration"
+msgstr "Dji lé vost apontiaedje\n"
+
+#: ../mdkonline:216
 #, c-format
 msgid ""
-"Your login or password was wrong.\n"
-" Either you'll have to type it again, or you'll need to create an account on "
-"Mandrakeonline.\n"
-" In the latter case, go back to the first step to connect to "
-"Mandrakeonline.\n"
-" Be aware that you must also provide a Machine name \n"
-" (only alphabetical characters are admitted)"
+"Cannot connect to mandrakeonline website: wrong login/password or router/"
+"firewall bad settings"
 msgstr ""
-"Vos avoz dné on måva no d' elodjaedje ou on måva scret.\n"
-"I vos les fåt rtaper, oudonbén i vos fåt fé on conte so Mandrakeonline.\n"
-"Po ç' dierin cas, potchîz al prumire etape po s' raloyî a Mandrakeonline.\n"
-"Vos dvroz ossu dner on no d' éndjole (seulmint des letes sins accints)"
 
-#: ../mdkonline.pm:58
+#: ../mdkonline.pm:66
 #, c-format
 msgid "Login and password should be less than 12 characters\n"
 msgstr ""
 "Li no d' elodjaedje eyet l' sicret dvèt esse di moens d' 12 caracteres\n"
 
-#: ../mdkonline.pm:59
+#: ../mdkonline.pm:67
 #, c-format
 msgid "Special characters are not allowed\n"
 msgstr "Les caracteres sipeciås ni s' polèt nén eployî\n"
 
-#: ../mdkonline.pm:60
+#: ../mdkonline.pm:68
 #, c-format
 msgid "Please fill in all fields\n"
 msgstr "Rimplixhoz tos les tchamps s' i vs plait\n"
 
-#: ../mdkonline.pm:61
+#: ../mdkonline.pm:69
 #, c-format
 msgid "Email not valid\n"
 msgstr "Adresse emile nén valide\n"
 
-#: ../mdkonline.pm:62
+#: ../mdkonline.pm:70
 #, c-format
 msgid "Account already exist\n"
 msgstr "Li conte egzistêye dedja\n"
 
-#: ../mdkonline.pm:68
+#: ../mdkonline.pm:76
 #, c-format
 msgid "Problem connecting to server \n"
 msgstr "Åk n' a nén stî tot s' raloyant å sierveu \n"
 
-#: ../mdkonline_tui:45 ../mdkonline_tui:95
-#, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
-
-#: ../mdkonline_tui:48
-#, c-format
-msgid "I already have an account"
-msgstr "Dji so ddja mimbe"
-
-#: ../mdkonline_tui:49
-#, c-format
-msgid "I want to subscribe"
-msgstr "Dji vôreu divni mimbe"
-
-#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:120
-#, c-format
-msgid "Please wait"
-msgstr "Tårdjîz on pô, s' i vs plait"
-
-#: ../mdkonline_tui:103
-#, c-format
-msgid "Account creation or authentication"
-msgstr "Ahivaedje d' on conte, ou otintifiaedje"
-
-#: ../mdkonline_tui:120
-#, c-format
-msgid "Connecting to Mandrakeonline website..."
-msgstr "Raloyaedje sol waibe Mandrakeonline..."
-
-#: ../mdkonline_tui:130
-#, c-format
-msgid "or"
-msgstr "oudonbén"
-
-#: ../mdkonline_tui:130
-#, c-format
-msgid "wrong password:"
-msgstr "måva scret:"
-
-#: ../mdkonline_tui:158
-#, c-format
-msgid ""
-"Mandrakeonline Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-"Li conte mandrakeonline a stî ahivé comifåt.\n"
-"Clitchîz so «Shuvant» po vs elodjî eyet eberweter vost apontiaedje\n"
-
-#: ../mdkonline_tui:175
-#, c-format
-msgid "Country"
-msgstr "Payis"
-
-#: ../mdkonline_tui:187
-#, c-format
-msgid "Congratulations"
-msgstr "Proficiate"
-
-#: ../mdkonline_tui:187
-#, c-format
-msgid "Your Mandrakeonline account has been successfully configured\n"
-msgstr "Vosse conte Mandrakeonline a stî apontyî comifåt\n"
-
-#: ../mdkupdate:50
+#: ../mdkupdate:52
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
@@ -616,43 +565,38 @@ msgstr ""
 "\n"
 "Po s' è siervi:\n"
 
-#: ../mdkupdate:55
+#: ../mdkupdate:57
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr " --help         - mostere ci messaedje d' aidance chal.\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:58
 #, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr " --auto         - enonder les metaedjes a djoû otomaticmint.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:59
 #, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr " --applet       - enonder les metaedjes a djoû di Mandrakelinux.\n"
 
-#: ../mdkupdate:58
-#, c-format
-msgid "  --update       - Update keys\n"
-msgstr " --update       - mete a djoû les clés.\n"
-
-#: ../mdkupdate:66
+#: ../mdkupdate:67
 #, c-format
 msgid "No %s file found. Run mdkonline wizard first"
 msgstr "Nou fitchî %s di trové. Enondez d' aprume li macrea mdkonline."
 
-#: ../mdkupdate:124
+#: ../mdkupdate:126
 #, c-format
 msgid "Mandrakeupdate could not contact the site, we will try again."
 msgstr "Dji n' a polou m' raloyî sol waibe, on rsayrè on pô pus tård."
 
-#: ../mdkupdate:173
+#: ../mdkupdate:176
 #, c-format
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr ""
 "Dji n' a nén savou mete a djoû les pacaedjes foû do sopoirt mdkupdate.\n"
 
-#: ../mdkupdate:195
+#: ../mdkupdate:198
 #, c-format
 msgid ""
 "Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
@@ -661,6 +605,54 @@ msgstr ""
 "Mandrakeupdate èn pola nén eberweter les fitchîs diff. Evoyîs èn emila a: "
 "support[at]mandrakeonline[pont]net"
 
+#~ msgid "Next"
+#~ msgstr "Shuvant"
+
+#~ msgid "Cancel"
+#~ msgstr "Rinoncî"
+
+#~ msgid "Previous"
+#~ msgstr "Di dvant"
+
+#~ msgid "I don't have a Mandrakeonline account and I want to subscribe"
+#~ msgstr "Dji n' a nén d' conte Mandrakeonline et dji vôreu m' eredjîstrer"
+
+#~ msgid "Mandrakelinux Privacy Policy"
+#~ msgstr "Politike sol privaceye di Mandrakelinux"
+
+#~ msgid "Authentification"
+#~ msgstr "Otintifiaedje"
+
+#~ msgid "Send Configuration"
+#~ msgstr "Evoyî l' apontiaedje"
+
+#~ msgid "Finish"
+#~ msgstr "Fini"
+
+#~ msgid "automated Upgrades"
+#~ msgstr "metaedjes a djoû otomatikes"
+
+#~ msgid "Country:"
+#~ msgstr "Payis:"
+
+#~ msgid "Error"
+#~ msgstr "Aroke"
+
+#~ msgid "Quitting Wizard\n"
+#~ msgstr "Cwitant l' macrea\n"
+
+#~ msgid ""
+#~ "Mandrakeonline could not be contacted, please try again at a later time"
+#~ msgstr ""
+#~ "Dji n' a polou m' raloyî a Mandrakeonline, rissayîz on pô pus tård s' i "
+#~ "vs plait."
+
+#~ msgid "Wrong password"
+#~ msgstr "Måva scret"
+
+#~ msgid "  --update       - Update keys\n"
+#~ msgstr " --update       - mete a djoû les clés.\n"
+
 #~ msgid "Skip Wizard"
 #~ msgstr "Passer houte"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 8b97fb87..1dca0fbe 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline 10.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-01 22:41+0200\n"
+"POT-Creation-Date: 2004-11-03 12:10+0100\n"
 "PO-Revision-Date: 2004-10-02 17:16+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Simplified Chinese <cooker-i18n@linux-mandrake.com>\n"
@@ -15,271 +15,291 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../mdkapplet:61
+#: ../mdkapplet:63
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "您的系统已为最新"
 
-#: ../mdkapplet:67
+#: ../mdkapplet:69
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrakeonline.net"
 msgstr "服务配置问题。请检查日志并发送邮件到 support@mandrakeonline.net"
 
-#: ../mdkapplet:73
+#: ../mdkapplet:75
 #, c-format
 msgid "System is busy. Please wait ..."
 msgstr "系统正忙。请稍候..."
 
-#: ../mdkapplet:79
+#: ../mdkapplet:81
 #, c-format
 msgid "New updates are available for your system"
 msgstr "您的系统没有可用的更新"
 
-#: ../mdkapplet:85
+#: ../mdkapplet:87
 #, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr "服务未配置。请点击“配置服务”"
 
-#: ../mdkapplet:91
+#: ../mdkapplet:93
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "网络已掉线。请配置您的网络"
 
-#: ../mdkapplet:97
+#: ../mdkapplet:99
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "服务未激活。请点击“在线网站”"
 
-#: ../mdkapplet:103
+#: ../mdkapplet:105
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "版本不支持(太旧，或者为开发版本)"
 
-#: ../mdkapplet:108 ../mdkapplet:158
+#: ../mdkapplet:110 ../mdkapplet:164
 #, c-format
 msgid "Install updates"
 msgstr "安装更新"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:111
 #, c-format
 msgid "Configure the service"
 msgstr "配置服务"
 
-#: ../mdkapplet:110
+#: ../mdkapplet:112
 #, c-format
 msgid "Check Updates"
 msgstr "检查更新"
 
-#: ../mdkapplet:111
+#: ../mdkapplet:113 ../mdkapplet:167 ../mdkapplet:225
+#, fuzzy, c-format
+msgid "Please Wait"
+msgstr "请稍候"
+
+#: ../mdkapplet:113 ../mdkapplet:166 ../mdkapplet:167 ../mdkapplet:225
+#, c-format
+msgid "Check updates"
+msgstr "检查更新"
+
+#: ../mdkapplet:115
 #, c-format
 msgid "Online WebSite"
 msgstr "在线网站"
 
-#: ../mdkapplet:112
+#: ../mdkapplet:116
 #, c-format
 msgid "Configure Network"
 msgstr "配置网络"
 
-#: ../mdkapplet:113
+#: ../mdkapplet:117
 #, c-format
 msgid "Configure Now!"
 msgstr "立即配置!"
 
-#: ../mdkapplet:146
+#: ../mdkapplet:152 ../mdkapplet:229
 #, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Mandrakelinux 更新小程序"
 
-#: ../mdkapplet:156
+#: ../mdkapplet:162
 #, c-format
 msgid "Actions"
 msgstr "动作"
 
-#: ../mdkapplet:159
+#: ../mdkapplet:165
 #, c-format
 msgid "Configure"
 msgstr "配置"
 
-#: ../mdkapplet:160
-#, c-format
-msgid "Check updates"
-msgstr "检查更新"
-
-#: ../mdkapplet:161
+#: ../mdkapplet:169
 #, c-format
 msgid "See logs"
 msgstr "查看日志"
 
-#: ../mdkapplet:164
+#: ../mdkapplet:172
 #, c-format
 msgid "Status"
 msgstr "状态"
 
-#: ../mdkapplet:168 ../mdkapplet:363
+#: ../mdkapplet:176 ../mdkapplet:375
 #, c-format
 msgid "Close"
 msgstr "关闭"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Network Connection: "
 msgstr "网络连接: "
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Up"
 msgstr "通"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Down"
 msgstr "断"
 
-#: ../mdkapplet:204
+#: ../mdkapplet:212
 #, c-format
 msgid "Last check: "
 msgstr "上次检查: "
 
-#: ../mdkapplet:205
+#: ../mdkapplet:213
 #, c-format
 msgid "Updates: "
 msgstr "更新: "
 
-#: ../mdkapplet:209
+#: ../mdkapplet:217
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "调用 Drak 连接\n"
 
-#: ../mdkapplet:213
+#: ../mdkapplet:221
 #, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "调用 mdkupdate --applet\n"
 
-#: ../mdkapplet:217
+#: ../mdkapplet:224
 #, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr "Mandrakeonline 似乎重新安装了，正在重新装入小程序..."
 
-#: ../mdkapplet:225
+#: ../mdkapplet:235
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "正在检查更新...\n"
 
-#: ../mdkapplet:227
+#: ../mdkapplet:237
 #, c-format
 msgid "Connecting to"
 msgstr "正在连接到"
 
-#: ../mdkapplet:250
+#: ../mdkapplet:244
+#, fuzzy, c-format
+msgid "Response from Mandrakeonline server\n"
+msgstr "Mandrakeonline 欢迎您"
+
+#: ../mdkapplet:262
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "正在检查... 有可用的更新\n"
 
-#: ../mdkapplet:254
+#: ../mdkapplet:267
 #, c-format
 msgid "Development release not supported by service"
 msgstr "此服务不支持开发版本"
 
-#: ../mdkapplet:255
+#: ../mdkapplet:268
 #, c-format
 msgid "Too old release not supported by service"
 msgstr "此服务器不支持太旧的版本"
 
-#: ../mdkapplet:256
+#: ../mdkapplet:269
 #, c-format
 msgid "Unknown state"
 msgstr "未知状态"
 
-#: ../mdkapplet:257
+#: ../mdkapplet:270
 #, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr "在线服务已禁用。请浏览 Mandrakeonline 网站\n"
 
-#: ../mdkapplet:258
+#: ../mdkapplet:271
 #, c-format
 msgid "Wrong Password.\n"
 msgstr "密码错误。\n"
 
-#: ../mdkapplet:259
+#: ../mdkapplet:272
 #, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr "动作、主机或用户名错误。\n"
 
-#: ../mdkapplet:260
+#: ../mdkapplet:273
 #, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
 msgstr "您的网络设置可能有错(请检查您的路由器、防火墙或代理服务器设置)\n"
 
-#: ../mdkapplet:264
+#: ../mdkapplet:277
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "系统已为最新\n"
 
-#: ../mdkapplet:303
+#: ../mdkapplet:317
 #, c-format
 msgid "No check"
 msgstr "不检查"
 
-#: ../mdkapplet:316
+#: ../mdkapplet:330
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "检查网络：似乎已禁用\n"
 
-#: ../mdkapplet:319
+#: ../mdkapplet:333
 #, c-format
 msgid "Checking config file: Not present\n"
 msgstr "检查配置文件：不存在\n"
 
-#: ../mdkapplet:353
+#: ../mdkapplet:365
 #, c-format
 msgid "Logs"
 msgstr "日志"
 
-#: ../mdkapplet:369
+#: ../mdkapplet:381
 #, c-format
 msgid "Clear"
 msgstr "清除"
 
-#: ../mdkapplet:396
+#: ../mdkapplet:408
 #, c-format
 msgid "About..."
 msgstr "关于..."
 
-#: ../mdkapplet:397
+#: ../mdkapplet:409
 #, c-format
 msgid "Always launch on startup"
 msgstr "在启动时自动调用"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:411
 #, c-format
 msgid "Quit"
 msgstr "退出"
 
-#: ../mdkonline:89
+#: ../mdkonline:52 ../mdkonline:106
+#, c-format
+msgid "Mandrakeonline"
+msgstr "Mandrakeonline"
+
+#: ../mdkonline:55
 #, c-format
-msgid "Next"
-msgstr "下一步"
+msgid "I already have an account"
+msgstr "我已经有账户了"
 
-#: ../mdkonline:89
+#: ../mdkonline:56
+#, c-format
+msgid "I want to subscribe"
+msgstr "我想要订阅"
+
+#: ../mdkonline:89 ../mdkonline:93 ../mdkonline:131
 #, c-format
-msgid "Cancel"
-msgstr "取消"
+msgid "Please wait"
+msgstr "请稍候"
 
 #: ../mdkonline:89
 #, c-format
-msgid "Previous"
-msgstr "上一步"
+msgid "Reading configuration\n"
+msgstr "正在读取配置\n"
 
-#: ../mdkonline:103
+#: ../mdkonline:93
 #, c-format
-msgid "Welcome to Mandrakeonline"
-msgstr "Mandrakeonline 欢迎您"
+msgid "Sending configuration..."
+msgstr "正在发送配置..."
 
-#: ../mdkonline:104 ../mdkonline_tui:98
+#: ../mdkonline:109
 #, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
@@ -290,62 +310,37 @@ msgstr ""
 "的配置(软件包、硬件配置)上传到中央数据库中，这样可以保证您能够时刻收到\n"
 "安全更新和有用的升级。\n"
 
-#: ../mdkonline:105 ../mdkonline_tui:142
+#: ../mdkonline:114
 #, c-format
-msgid "Create a Mandrakeonline Account"
-msgstr "创建一个 Mandrakeonline 账户"
+msgid "Account creation or authentication"
+msgstr "账户创建或身份验证"
 
-#: ../mdkonline:107
+#: ../mdkonline:119
 #, c-format
-msgid "I don't have a Mandrakeonline account and I want to subscribe"
-msgstr "我没有 Mandrakeonline 账户，我要订阅"
+msgid "Enter your Mandrakeonline login, password and machine name:"
+msgstr "请输入您的 Mandrakeonline 登录名, 密码和机器名:"
 
-#: ../mdkonline:111 ../mdkonline:131 ../mdkonline_tui:114 ../mdkonline_tui:145
+#: ../mdkonline:125 ../mdkonline:156
 #, c-format
 msgid "Login:"
 msgstr "登录名:"
 
-#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:115 ../mdkonline_tui:146
+#: ../mdkonline:126 ../mdkonline:157
 #, c-format
 msgid "Password:"
 msgstr "密码:"
 
-#: ../mdkonline:113 ../mdkonline_tui:147
-#, c-format
-msgid "Confirm Password:"
-msgstr "确认密码:"
-
-#: ../mdkonline:114 ../mdkonline_tui:148
-#, c-format
-msgid "Mail contact:"
-msgstr "联系邮件："
-
-#: ../mdkonline:121
-#, c-format
-msgid "Mandrakelinux Privacy Policy"
-msgstr "Mandrakelinux 隐私保护政策"
-
 #: ../mdkonline:127
 #, c-format
-msgid "Authentification"
-msgstr "身份验证"
-
-#: ../mdkonline:128 ../mdkonline_tui:108
-#, c-format
-msgid "Enter your Mandrakeonline login, password and machine name:"
-msgstr "请输入您的 Mandrakeonline 登录名, 密码和机器名:"
-
-#: ../mdkonline:133 ../mdkonline_tui:116
-#, c-format
 msgid "Machine name:"
 msgstr "机器名:"
 
-#: ../mdkonline:138
+#: ../mdkonline:131
 #, c-format
-msgid "Send Configuration"
-msgstr "发送配置"
+msgid "Connecting to Mandrakeonline website..."
+msgstr "正在连接到 Mandrakeonline 网站..."
 
-#: ../mdkonline:139 ../mdkonline_tui:128
+#: ../mdkonline:139
 #, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
@@ -374,55 +369,54 @@ msgstr ""
 "安全更新和有用的升级。除此以外，您还能够从 www.mandrakeexpert.com 上得\n"
 "到支持服务的付费折扣。"
 
-#: ../mdkonline:144 ../mdkonline:211 ../mdkonline:234
+#: ../mdkonline:141 ../mdkonline:180 ../mdkupdate:126 ../mdkupdate:198
 #, c-format
-msgid "Finish"
-msgstr "完成"
+msgid "Connection problem"
+msgstr "连接问题"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid "Your upload was successful!"
-msgstr "您的上传已经成功!"
+msgid "or"
+msgstr "或"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandrakeonline."
-msgstr ""
-"从现在开始，您将能够收到 Mandrakeonline 发出的安全\n"
-"和更新通知了。"
+msgid "wrong password:"
+msgstr "密码错误:"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
 msgid ""
-"Mandrakeonline offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+"Your login or password was wrong.\n"
+" Either you'll have to type it again, or you'll need to create an account on "
+"Mandrakeonline.\n"
+" In the latter case, go back to the first step to connect to "
+"Mandrakeonline.\n"
+" Be aware that you must also provide a Machine name \n"
+" (only alphabetical characters are admitted)"
 msgstr ""
-"Mandrakeonline 还能让您自动保持更新。您的系统中会定期运行一个特\n"
-"定的程序，该程序会自动下载并安装更新\n"
-
-#: ../mdkonline:146
-#, c-format
-msgid "automated Upgrades"
-msgstr "自动升级"
+"您的登录名或密码有错。\n"
+"不管是哪种情况，您都需要重新输入一次。不然，您就需要在 Mandrakeonline 上创建"
+"一个账户。\n"
+"如果您想要创建账户的话，请返回到第一步，以连接到 Mandrakeonline。\n"
+"请注意，您还必须提供一个机器名(只能由字母组成)"
 
-#: ../mdkonline:150
+#: ../mdkonline:153
 #, c-format
-msgid "Country:"
-msgstr "国家:"
+msgid "Create a Mandrakeonline Account"
+msgstr "创建一个 Mandrakeonline 账户"
 
-#: ../mdkonline:178 ../mdkonline:183 ../mdkonline:185 ../mdkonline:187
+#: ../mdkonline:158
 #, c-format
-msgid "Error"
-msgstr "出错"
+msgid "Confirm Password:"
+msgstr "确认密码:"
 
-#: ../mdkonline:183 ../mdkonline_tui:152
+#: ../mdkonline:159
 #, c-format
-msgid "Please provide a login"
-msgstr "请提供有效的登录名"
+msgid "Mail contact:"
+msgstr "联系邮件："
 
-#: ../mdkonline:185 ../mdkonline_tui:152
+#: ../mdkonline:163
 #, c-format
 msgid ""
 "The passwords do not match\n"
@@ -431,159 +425,116 @@ msgstr ""
 "密码不匹配\n"
 " 请再试一次\n"
 
-#: ../mdkonline:187 ../mdkonline_tui:152
+#: ../mdkonline:163
+#, c-format
+msgid "Please provide a login"
+msgstr "请提供有效的登录名"
+
+#: ../mdkonline:163
 #, c-format
 msgid "Not a valid mail address!\n"
 msgstr "不是有效的电子邮件地址!\n"
 
-#: ../mdkonline:199 ../mdkonline_tui:78
+#: ../mdkonline:169
 #, c-format
-msgid "Reading configuration\n"
-msgstr "正在读取配置\n"
+msgid ""
+"Mandrakeonline Account successfully created.\n"
+"Please click \"Next\" to authenticate and upload your configuration\n"
+msgstr ""
+"Mandrakeonline 账户创建成功。\n"
+"请单击“下一步”进行身份验证并上传您的配置\n"
 
-#: ../mdkonline:204 ../mdkonline_tui:82
+#: ../mdkonline:178
 #, c-format
-msgid "Sending configuration..."
-msgstr "正在发送配置..."
+msgid "Your upload was successful!"
+msgstr "您的上传已经成功!"
 
-#: ../mdkonline:213 ../mdkonline:273 ../mdkonline_tui:130 ../mdkonline_tui:169
-#: ../mdkupdate:124 ../mdkupdate:195
+#: ../mdkonline:178
 #, c-format
-msgid "Connection problem"
-msgstr "连接问题"
+msgid ""
+"From now you will receive on security and updates \n"
+"announcements thanks to Mandrakeonline."
+msgstr ""
+"从现在开始，您将能够收到 Mandrakeonline 发出的安全\n"
+"和更新通知了。"
 
-#: ../mdkonline:213 ../mdkonline_tui:169
+#: ../mdkonline:178
+#, c-format
+msgid ""
+"Mandrakeonline offers you the ability to automate the updates.\n"
+"A program will run regulary in your system waiting for new updates\n"
+msgstr ""
+"Mandrakeonline 还能让您自动保持更新。您的系统中会定期运行一个特\n"
+"定的程序，该程序会自动下载并安装更新\n"
+
+#: ../mdkonline:180
 #, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr "上传文件时发生了错误，请重试"
 
-#: ../mdkonline:251
+#: ../mdkonline:186
 #, c-format
-msgid "Quitting Wizard\n"
-msgstr "正在退出向导\n"
+msgid "Country"
+msgstr "国家"
 
-#: ../mdkonline:273
+#: ../mdkonline:198
 #, c-format
-msgid "Mandrakeonline could not be contacted, please try again at a later time"
-msgstr "Mandrakeonline 无法连接，请稍后再试一次"
+msgid "Congratulations"
+msgstr "配置"
 
-#: ../mdkonline:285
+#: ../mdkonline:198
 #, c-format
-msgid "Wrong password"
-msgstr "密码错误"
+msgid "Your Mandrakeonline account has been successfully configured\n"
+msgstr "您的 Mandrakeonline 账户已经配置成功\n"
+
+#: ../mdkonline:214
+#, fuzzy, c-format
+msgid "Configuration uploaded successfully"
+msgstr "您的上传已经成功!"
+
+#: ../mdkonline:215
+#, fuzzy, c-format
+msgid "Problem uploading configuration"
+msgstr "正在读取配置\n"
 
-#: ../mdkonline:285 ../mdkonline_tui:130
+#: ../mdkonline:216
 #, c-format
 msgid ""
-"Your login or password was wrong.\n"
-" Either you'll have to type it again, or you'll need to create an account on "
-"Mandrakeonline.\n"
-" In the latter case, go back to the first step to connect to "
-"Mandrakeonline.\n"
-" Be aware that you must also provide a Machine name \n"
-" (only alphabetical characters are admitted)"
+"Cannot connect to mandrakeonline website: wrong login/password or router/"
+"firewall bad settings"
 msgstr ""
-"您的登录名或密码有错。\n"
-"不管是哪种情况，您都需要重新输入一次。不然，您就需要在 Mandrakeonline 上创建"
-"一个账户。\n"
-"如果您想要创建账户的话，请返回到第一步，以连接到 Mandrakeonline。\n"
-"请注意，您还必须提供一个机器名(只能由字母组成)"
 
-#: ../mdkonline.pm:58
+#: ../mdkonline.pm:66
 #, c-format
 msgid "Login and password should be less than 12 characters\n"
 msgstr "登录名和密码都必须少于 12 个字符\n"
 
-#: ../mdkonline.pm:59
+#: ../mdkonline.pm:67
 #, c-format
 msgid "Special characters are not allowed\n"
 msgstr "不允许出现特殊字符\n"
 
-#: ../mdkonline.pm:60
+#: ../mdkonline.pm:68
 #, c-format
 msgid "Please fill in all fields\n"
 msgstr "所有内容都是必填的\n"
 
-#: ../mdkonline.pm:61
+#: ../mdkonline.pm:69
 #, c-format
 msgid "Email not valid\n"
 msgstr "电子邮件无效\n"
 
-#: ../mdkonline.pm:62
+#: ../mdkonline.pm:70
 #, c-format
 msgid "Account already exist\n"
 msgstr "账户已存在\n"
 
-#: ../mdkonline.pm:68
+#: ../mdkonline.pm:76
 #, c-format
 msgid "Problem connecting to server \n"
 msgstr "连接服务器出错\n"
 
-#: ../mdkonline_tui:45 ../mdkonline_tui:95
-#, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
-
-#: ../mdkonline_tui:48
-#, c-format
-msgid "I already have an account"
-msgstr "我已经有账户了"
-
-#: ../mdkonline_tui:49
-#, c-format
-msgid "I want to subscribe"
-msgstr "我想要订阅"
-
-#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:120
-#, c-format
-msgid "Please wait"
-msgstr "请稍候"
-
-#: ../mdkonline_tui:103
-#, c-format
-msgid "Account creation or authentication"
-msgstr "账户创建或身份验证"
-
-#: ../mdkonline_tui:120
-#, c-format
-msgid "Connecting to Mandrakeonline website..."
-msgstr "正在连接到 Mandrakeonline 网站..."
-
-#: ../mdkonline_tui:130
-#, c-format
-msgid "or"
-msgstr "或"
-
-#: ../mdkonline_tui:130
-#, c-format
-msgid "wrong password:"
-msgstr "密码错误:"
-
-#: ../mdkonline_tui:158
-#, c-format
-msgid ""
-"Mandrakeonline Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-"Mandrakeonline 账户创建成功。\n"
-"请单击“下一步”进行身份验证并上传您的配置\n"
-
-#: ../mdkonline_tui:175
-#, c-format
-msgid "Country"
-msgstr "国家"
-
-#: ../mdkonline_tui:187
-#, c-format
-msgid "Congratulations"
-msgstr "配置"
-
-#: ../mdkonline_tui:187
-#, c-format
-msgid "Your Mandrakeonline account has been successfully configured\n"
-msgstr "您的 Mandrakeonline 账户已经配置成功\n"
-
-#: ../mdkupdate:50
+#: ../mdkupdate:52
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
@@ -599,42 +550,37 @@ msgstr ""
 "\n"
 "用法:\n"
 
-#: ../mdkupdate:55
+#: ../mdkupdate:57
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help        - 打印本帮助信息。\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:58
 #, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto        - 自动调用 Mandrakeupdate。\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:59
 #, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet      - 调用 Mandrakeupdate。\n"
 
-#: ../mdkupdate:58
-#, c-format
-msgid "  --update       - Update keys\n"
-msgstr "  --update      - 更新密钥\n"
-
-#: ../mdkupdate:66
+#: ../mdkupdate:67
 #, c-format
 msgid "No %s file found. Run mdkonline wizard first"
 msgstr "未找到 %s 文件。请先运行 mdkonline 向导"
 
-#: ../mdkupdate:124
+#: ../mdkupdate:126
 #, c-format
 msgid "Mandrakeupdate could not contact the site, we will try again."
 msgstr "Mandrakeonline 无法连接网站，请稍后再试一次。"
 
-#: ../mdkupdate:173
+#: ../mdkupdate:176
 #, c-format
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr "无法从 mdkupdate 介质更新软件包。\n"
 
-#: ../mdkupdate:195
+#: ../mdkupdate:198
 #, c-format
 msgid ""
 "Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
@@ -642,6 +588,52 @@ msgid ""
 msgstr ""
 "Mandrakeupdate 无法上传差异文件。请给 support@mandrakeonline.net 发送邮件"
 
+#~ msgid "Next"
+#~ msgstr "下一步"
+
+#~ msgid "Cancel"
+#~ msgstr "取消"
+
+#~ msgid "Previous"
+#~ msgstr "上一步"
+
+#~ msgid "I don't have a Mandrakeonline account and I want to subscribe"
+#~ msgstr "我没有 Mandrakeonline 账户，我要订阅"
+
+#~ msgid "Mandrakelinux Privacy Policy"
+#~ msgstr "Mandrakelinux 隐私保护政策"
+
+#~ msgid "Authentification"
+#~ msgstr "身份验证"
+
+#~ msgid "Send Configuration"
+#~ msgstr "发送配置"
+
+#~ msgid "Finish"
+#~ msgstr "完成"
+
+#~ msgid "automated Upgrades"
+#~ msgstr "自动升级"
+
+#~ msgid "Country:"
+#~ msgstr "国家:"
+
+#~ msgid "Error"
+#~ msgstr "出错"
+
+#~ msgid "Quitting Wizard\n"
+#~ msgstr "正在退出向导\n"
+
+#~ msgid ""
+#~ "Mandrakeonline could not be contacted, please try again at a later time"
+#~ msgstr "Mandrakeonline 无法连接，请稍后再试一次"
+
+#~ msgid "Wrong password"
+#~ msgstr "密码错误"
+
+#~ msgid "  --update       - Update keys\n"
+#~ msgstr "  --update      - 更新密钥\n"
+
 #~ msgid "Skip Wizard"
 #~ msgstr "跳过向导"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index add8f95e..4b5d4b0b 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-zh_TW\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-01 22:41+0200\n"
+"POT-Creation-Date: 2004-11-03 12:10+0100\n"
 "PO-Revision-Date: 2003-11-30 19:38+0800\n"
 "Last-Translator: hilbert <freehil@yahoo.com>\n"
 "Language-Team: Chinese Traditional <zh@li.org>\n"
@@ -18,271 +18,291 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.1\n"
 
-#: ../mdkapplet:61
+#: ../mdkapplet:63
 #, c-format
 msgid "Your system is up-to-date"
 msgstr ""
 
-#: ../mdkapplet:67
+#: ../mdkapplet:69
 #, fuzzy, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrakeonline.net"
 msgstr "任何問題, 請寄出一封電子郵件至 support@mandrakeonline.net\n"
 
-#: ../mdkapplet:73
+#: ../mdkapplet:75
 #, c-format
 msgid "System is busy. Please wait ..."
 msgstr ""
 
-#: ../mdkapplet:79
+#: ../mdkapplet:81
 #, fuzzy, c-format
 msgid "New updates are available for your system"
 msgstr "您系統並沒有網路卡存在"
 
-#: ../mdkapplet:85
+#: ../mdkapplet:87
 #, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr ""
 
-#: ../mdkapplet:91
+#: ../mdkapplet:93
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr ""
 
-#: ../mdkapplet:97
+#: ../mdkapplet:99
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 
-#: ../mdkapplet:103
+#: ../mdkapplet:105
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:108 ../mdkapplet:158
+#: ../mdkapplet:110 ../mdkapplet:164
 #, c-format
 msgid "Install updates"
 msgstr "安裝升級"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:111
 #, fuzzy, c-format
 msgid "Configure the service"
 msgstr "設定系統服務"
 
-#: ../mdkapplet:110
+#: ../mdkapplet:112
 #, fuzzy, c-format
 msgid "Check Updates"
 msgstr "更新"
 
-#: ../mdkapplet:111
+#: ../mdkapplet:113 ../mdkapplet:167 ../mdkapplet:225
+#, fuzzy, c-format
+msgid "Please Wait"
+msgstr "請稍候"
+
+#: ../mdkapplet:113 ../mdkapplet:166 ../mdkapplet:167 ../mdkapplet:225
+#, fuzzy, c-format
+msgid "Check updates"
+msgstr "安全更新"
+
+#: ../mdkapplet:115
 #, c-format
 msgid "Online WebSite"
 msgstr ""
 
-#: ../mdkapplet:112
+#: ../mdkapplet:116
 #, fuzzy, c-format
 msgid "Configure Network"
 msgstr "設定網路連線"
 
-#: ../mdkapplet:113
+#: ../mdkapplet:117
 #, fuzzy, c-format
 msgid "Configure Now!"
 msgstr "正在讀取組態設定\n"
 
-#: ../mdkapplet:146
+#: ../mdkapplet:152 ../mdkapplet:229
 #, fuzzy, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Mandrakelinux 隱私政策"
 
-#: ../mdkapplet:156
+#: ../mdkapplet:162
 #, c-format
 msgid "Actions"
 msgstr "動作"
 
-#: ../mdkapplet:159
+#: ../mdkapplet:165
 #, c-format
 msgid "Configure"
 msgstr "設定"
 
-#: ../mdkapplet:160
-#, fuzzy, c-format
-msgid "Check updates"
-msgstr "安全更新"
-
-#: ../mdkapplet:161
+#: ../mdkapplet:169
 #, fuzzy, c-format
 msgid "See logs"
 msgstr "向前 5 秒"
 
-#: ../mdkapplet:164
+#: ../mdkapplet:172
 #, c-format
 msgid "Status"
 msgstr "狀態"
 
-#: ../mdkapplet:168 ../mdkapplet:363
+#: ../mdkapplet:176 ../mdkapplet:375
 #, c-format
 msgid "Close"
 msgstr "關閉"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, fuzzy, c-format
 msgid "Network Connection: "
 msgstr "虛擬網絡連線"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Up"
 msgstr "向上"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Down"
 msgstr "向下"
 
-#: ../mdkapplet:204
+#: ../mdkapplet:212
 #, c-format
 msgid "Last check: "
 msgstr ""
 
-#: ../mdkapplet:205
+#: ../mdkapplet:213
 #, fuzzy, c-format
 msgid "Updates: "
 msgstr "更新"
 
-#: ../mdkapplet:209
+#: ../mdkapplet:217
 #, fuzzy, c-format
 msgid "Launching drakconnect\n"
 msgstr "啟動 userdrake"
 
-#: ../mdkapplet:213
+#: ../mdkapplet:221
 #, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr ""
 
-#: ../mdkapplet:217
+#: ../mdkapplet:224
 #, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 
-#: ../mdkapplet:225
+#: ../mdkapplet:235
 #, fuzzy, c-format
 msgid "Computing new updates...\n"
 msgstr "連線問題"
 
-#: ../mdkapplet:227
+#: ../mdkapplet:237
 #, fuzzy, c-format
 msgid "Connecting to"
 msgstr "連線問題"
 
-#: ../mdkapplet:250
+#: ../mdkapplet:244
+#, fuzzy, c-format
+msgid "Response from Mandrakeonline server\n"
+msgstr "歡迎來到 Mandrakeonline"
+
+#: ../mdkapplet:262
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr ""
 
-#: ../mdkapplet:254
+#: ../mdkapplet:267
 #, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
-#: ../mdkapplet:255
+#: ../mdkapplet:268
 #, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
-#: ../mdkapplet:256
+#: ../mdkapplet:269
 #, fuzzy, c-format
 msgid "Unknown state"
 msgstr "不詳的主機名稱"
 
-#: ../mdkapplet:257
+#: ../mdkapplet:270
 #, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr ""
 
-#: ../mdkapplet:258
+#: ../mdkapplet:271
 #, c-format
 msgid "Wrong Password.\n"
 msgstr "密碼錯誤\n"
 
-#: ../mdkapplet:259
+#: ../mdkapplet:272
 #, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr ""
 
-#: ../mdkapplet:260
+#: ../mdkapplet:273
 #, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
 msgstr ""
 
-#: ../mdkapplet:264
+#: ../mdkapplet:277
 #, fuzzy, c-format
 msgid "System is up-to-date\n"
 msgstr "系統模式"
 
-#: ../mdkapplet:303
+#: ../mdkapplet:317
 #, fuzzy, c-format
 msgid "No check"
 msgstr "Gnome Go 象棋"
 
-#: ../mdkapplet:316
+#: ../mdkapplet:330
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
-#: ../mdkapplet:319
+#: ../mdkapplet:333
 #, fuzzy, c-format
 msgid "Checking config file: Not present\n"
 msgstr "遺失設定檔 %s.\n"
 
-#: ../mdkapplet:353
+#: ../mdkapplet:365
 #, c-format
 msgid "Logs"
 msgstr "日誌記錄"
 
-#: ../mdkapplet:369
+#: ../mdkapplet:381
 #, c-format
 msgid "Clear"
 msgstr "清除"
 
-#: ../mdkapplet:396
+#: ../mdkapplet:408
 #, c-format
 msgid "About..."
 msgstr "關於..."
 
-#: ../mdkapplet:397
+#: ../mdkapplet:409
 #, c-format
 msgid "Always launch on startup"
 msgstr ""
 
-#: ../mdkapplet:399
+#: ../mdkapplet:411
 #, c-format
 msgid "Quit"
 msgstr "結束"
 
-#: ../mdkonline:89
+#: ../mdkonline:52 ../mdkonline:106
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "歡迎來到 Mandrakeonline"
+
+#: ../mdkonline:55
 #, c-format
-msgid "Next"
-msgstr "下一步"
+msgid "I already have an account"
+msgstr ""
 
-#: ../mdkonline:89
+#: ../mdkonline:56
 #, c-format
-msgid "Cancel"
-msgstr "取消"
+msgid "I want to subscribe"
+msgstr ""
 
-#: ../mdkonline:89
+#: ../mdkonline:89 ../mdkonline:93 ../mdkonline:131
 #, c-format
-msgid "Previous"
-msgstr "上一步"
+msgid "Please wait"
+msgstr "請稍候"
 
-#: ../mdkonline:103
+#: ../mdkonline:89
 #, c-format
-msgid "Welcome to Mandrakeonline"
-msgstr "歡迎來到 Mandrakeonline"
+msgid "Reading configuration\n"
+msgstr "正在讀取組態設定\n"
 
-#: ../mdkonline:104 ../mdkonline_tui:98
+#: ../mdkonline:93
+#, fuzzy, c-format
+msgid "Sending configuration..."
+msgstr "正在讀取組態設定\n"
+
+#: ../mdkonline:109
 #, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
@@ -295,62 +315,37 @@ msgstr ""
 "這個步驟完成後，就能夠提供您相關的安全公告以及套件更新\n"
 "等資訊。\n"
 
-#: ../mdkonline:105 ../mdkonline_tui:142
-#, fuzzy, c-format
-msgid "Create a Mandrakeonline Account"
-msgstr "歡迎來到 Mandrakeonline"
+#: ../mdkonline:114
+#, c-format
+msgid "Account creation or authentication"
+msgstr ""
 
-#: ../mdkonline:107
-#, fuzzy, c-format
-msgid "I don't have a Mandrakeonline account and I want to subscribe"
-msgstr "我還沒有 Mandrakelinux Online 的帳號，我希望要 "
+#: ../mdkonline:119
+#, c-format
+msgid "Enter your Mandrakeonline login, password and machine name:"
+msgstr "請輸入您在 Mandrakeonline 上的帳號 ID 與密碼"
 
-#: ../mdkonline:111 ../mdkonline:131 ../mdkonline_tui:114 ../mdkonline_tui:145
+#: ../mdkonline:125 ../mdkonline:156
 #, c-format
 msgid "Login:"
 msgstr "帳號："
 
-#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:115 ../mdkonline_tui:146
+#: ../mdkonline:126 ../mdkonline:157
 #, c-format
 msgid "Password:"
 msgstr "    密碼："
 
-#: ../mdkonline:113 ../mdkonline_tui:147
-#, c-format
-msgid "Confirm Password:"
-msgstr "確認密碼:"
-
-#: ../mdkonline:114 ../mdkonline_tui:148
-#, fuzzy, c-format
-msgid "Mail contact:"
-msgstr "郵件聯絡:"
-
-#: ../mdkonline:121
-#, c-format
-msgid "Mandrakelinux Privacy Policy"
-msgstr "Mandrakelinux 隱私政策"
-
 #: ../mdkonline:127
 #, c-format
-msgid "Authentification"
-msgstr "認證確認"
-
-#: ../mdkonline:128 ../mdkonline_tui:108
-#, c-format
-msgid "Enter your Mandrakeonline login, password and machine name:"
-msgstr "請輸入您在 Mandrakeonline 上的帳號 ID 與密碼"
-
-#: ../mdkonline:133 ../mdkonline_tui:116
-#, c-format
 msgid "Machine name:"
 msgstr "機器名稱："
 
-#: ../mdkonline:138
+#: ../mdkonline:131
 #, fuzzy, c-format
-msgid "Send Configuration"
-msgstr "正在讀取組態設定\n"
+msgid "Connecting to Mandrakeonline website..."
+msgstr "歡迎來到 Mandrakeonline"
 
-#: ../mdkonline:139 ../mdkonline_tui:128
+#: ../mdkonline:139
 #, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
@@ -383,55 +378,54 @@ msgstr ""
 "此外，您可以在 http://www.mandrakeexpert.com 使用付費的機制獲得\n"
 "更多服務與支援。"
 
-#: ../mdkonline:144 ../mdkonline:211 ../mdkonline:234
-#, c-format
-msgid "Finish"
-msgstr "完成"
-
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141 ../mdkonline:180 ../mdkupdate:126 ../mdkupdate:198
 #, c-format
-msgid "Your upload was successful!"
-msgstr "已經成功上傳資訊!"
+msgid "Connection problem"
+msgstr "連線問題"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandrakeonline."
+msgid "or"
 msgstr ""
-"現在開始，您將會不定期的收到來自於Mandrakeonline\n"
-"發送的安全與更新修正套件公告資訊。"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "密碼錯誤"
+
+#: ../mdkonline:141
 #, c-format
 msgid ""
-"Mandrakeonline offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+"Your login or password was wrong.\n"
+" Either you'll have to type it again, or you'll need to create an account on "
+"Mandrakeonline.\n"
+" In the latter case, go back to the first step to connect to "
+"Mandrakeonline.\n"
+" Be aware that you must also provide a Machine name \n"
+" (only alphabetical characters are admitted)"
 msgstr ""
-"Mandrakeonline 提供讓您能夠自動進行更新動作。\n"
-"系統將會定期的執行更新程式檢查最新的更新資訊\n"
-
-#: ../mdkonline:146
-#, c-format
-msgid "automated Upgrades"
-msgstr "自動升級"
+"您所輸入的登入 ID 或者是密碼有誤導致無法登入。\n"
+"請重新確定您所輸入的登入資訊，或者是您尚未\n"
+"註冊，請先註冊一個新帳號再使用。\n"
+"請回到主畫面程式重新進行操作，以便於能夠連上\n"
+"Mandrakelinux Online 服務。"
 
-#: ../mdkonline:150
+#: ../mdkonline:153
 #, fuzzy, c-format
-msgid "Country:"
-msgstr "鄉村"
+msgid "Create a Mandrakeonline Account"
+msgstr "歡迎來到 Mandrakeonline"
 
-#: ../mdkonline:178 ../mdkonline:183 ../mdkonline:185 ../mdkonline:187
+#: ../mdkonline:158
 #, c-format
-msgid "Error"
-msgstr "錯誤"
+msgid "Confirm Password:"
+msgstr "確認密碼:"
 
-#: ../mdkonline:183 ../mdkonline_tui:152
+#: ../mdkonline:159
 #, fuzzy, c-format
-msgid "Please provide a login"
-msgstr "請再試一次"
+msgid "Mail contact:"
+msgstr "郵件聯絡:"
 
-#: ../mdkonline:185 ../mdkonline_tui:152
+#: ../mdkonline:163
 #, c-format
 msgid ""
 "The passwords do not match\n"
@@ -440,157 +434,114 @@ msgstr ""
 "密碼不合\n"
 " 請再試一次\n"
 
-#: ../mdkonline:187 ../mdkonline_tui:152
-#, c-format
-msgid "Not a valid mail address!\n"
-msgstr "不是一個有效郵件地址!\n"
-
-#: ../mdkonline:199 ../mdkonline_tui:78
-#, c-format
-msgid "Reading configuration\n"
-msgstr "正在讀取組態設定\n"
-
-#: ../mdkonline:204 ../mdkonline_tui:82
+#: ../mdkonline:163
 #, fuzzy, c-format
-msgid "Sending configuration..."
-msgstr "正在讀取組態設定\n"
+msgid "Please provide a login"
+msgstr "請再試一次"
 
-#: ../mdkonline:213 ../mdkonline:273 ../mdkonline_tui:130 ../mdkonline_tui:169
-#: ../mdkupdate:124 ../mdkupdate:195
+#: ../mdkonline:163
 #, c-format
-msgid "Connection problem"
-msgstr "連線問題"
+msgid "Not a valid mail address!\n"
+msgstr "不是一個有效郵件地址!\n"
 
-#: ../mdkonline:213 ../mdkonline_tui:169
+#: ../mdkonline:169
 #, c-format
-msgid "Problem occurs when uploading files, please try again"
+msgid ""
+"Mandrakeonline Account successfully created.\n"
+"Please click \"Next\" to authenticate and upload your configuration\n"
 msgstr ""
 
-#: ../mdkonline:251
-#, c-format
-msgid "Quitting Wizard\n"
-msgstr "正在結束設定精靈\n"
-
-#: ../mdkonline:273
-#, fuzzy, c-format
-msgid "Mandrakeonline could not be contacted, please try again at a later time"
-msgstr "Mandrakeupdate 無法聯絡到網站, 我們將再試."
-
-#: ../mdkonline:285
+#: ../mdkonline:178
 #, c-format
-msgid "Wrong password"
-msgstr "密碼錯誤"
+msgid "Your upload was successful!"
+msgstr "已經成功上傳資訊!"
 
-#: ../mdkonline:285 ../mdkonline_tui:130
+#: ../mdkonline:178
 #, c-format
 msgid ""
-"Your login or password was wrong.\n"
-" Either you'll have to type it again, or you'll need to create an account on "
-"Mandrakeonline.\n"
-" In the latter case, go back to the first step to connect to "
-"Mandrakeonline.\n"
-" Be aware that you must also provide a Machine name \n"
-" (only alphabetical characters are admitted)"
+"From now you will receive on security and updates \n"
+"announcements thanks to Mandrakeonline."
 msgstr ""
-"您所輸入的登入 ID 或者是密碼有誤導致無法登入。\n"
-"請重新確定您所輸入的登入資訊，或者是您尚未\n"
-"註冊，請先註冊一個新帳號再使用。\n"
-"請回到主畫面程式重新進行操作，以便於能夠連上\n"
-"Mandrakelinux Online 服務。"
+"現在開始，您將會不定期的收到來自於Mandrakeonline\n"
+"發送的安全與更新修正套件公告資訊。"
 
-#: ../mdkonline.pm:58
+#: ../mdkonline:178
 #, c-format
-msgid "Login and password should be less than 12 characters\n"
+msgid ""
+"Mandrakeonline offers you the ability to automate the updates.\n"
+"A program will run regulary in your system waiting for new updates\n"
 msgstr ""
+"Mandrakeonline 提供讓您能夠自動進行更新動作。\n"
+"系統將會定期的執行更新程式檢查最新的更新資訊\n"
 
-#: ../mdkonline.pm:59
+#: ../mdkonline:180
 #, c-format
-msgid "Special characters are not allowed\n"
+msgid "Problem occurs when uploading files, please try again"
 msgstr ""
 
-#: ../mdkonline.pm:60
-#, c-format
-msgid "Please fill in all fields\n"
-msgstr ""
+#: ../mdkonline:186
+#, fuzzy, c-format
+msgid "Country"
+msgstr "鄉村"
 
-#: ../mdkonline.pm:61
-#, c-format
-msgid "Email not valid\n"
-msgstr ""
+#: ../mdkonline:198
+#, fuzzy, c-format
+msgid "Congratulations"
+msgstr "正在讀取組態設定\n"
 
-#: ../mdkonline.pm:62
+#: ../mdkonline:198
 #, c-format
-msgid "Account already exist\n"
+msgid "Your Mandrakeonline account has been successfully configured\n"
 msgstr ""
 
-#: ../mdkonline.pm:68
-#, c-format
-msgid "Problem connecting to server \n"
-msgstr "連線到伺服器出問題\n"
+#: ../mdkonline:214
+#, fuzzy, c-format
+msgid "Configuration uploaded successfully"
+msgstr "已經成功上傳資訊!"
 
-#: ../mdkonline_tui:45 ../mdkonline_tui:95
+#: ../mdkonline:215
 #, fuzzy, c-format
-msgid "Mandrakeonline"
-msgstr "歡迎來到 Mandrakeonline"
+msgid "Problem uploading configuration"
+msgstr "正在讀取組態設定\n"
 
-#: ../mdkonline_tui:48
+#: ../mdkonline:216
 #, c-format
-msgid "I already have an account"
+msgid ""
+"Cannot connect to mandrakeonline website: wrong login/password or router/"
+"firewall bad settings"
 msgstr ""
 
-#: ../mdkonline_tui:49
+#: ../mdkonline.pm:66
 #, c-format
-msgid "I want to subscribe"
+msgid "Login and password should be less than 12 characters\n"
 msgstr ""
 
-#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:120
+#: ../mdkonline.pm:67
 #, c-format
-msgid "Please wait"
-msgstr "請稍候"
+msgid "Special characters are not allowed\n"
+msgstr ""
 
-#: ../mdkonline_tui:103
+#: ../mdkonline.pm:68
 #, c-format
-msgid "Account creation or authentication"
+msgid "Please fill in all fields\n"
 msgstr ""
 
-#: ../mdkonline_tui:120
-#, fuzzy, c-format
-msgid "Connecting to Mandrakeonline website..."
-msgstr "歡迎來到 Mandrakeonline"
-
-#: ../mdkonline_tui:130
+#: ../mdkonline.pm:69
 #, c-format
-msgid "or"
+msgid "Email not valid\n"
 msgstr ""
 
-#: ../mdkonline_tui:130
-#, fuzzy, c-format
-msgid "wrong password:"
-msgstr "密碼錯誤"
-
-#: ../mdkonline_tui:158
+#: ../mdkonline.pm:70
 #, c-format
-msgid ""
-"Mandrakeonline Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
+msgid "Account already exist\n"
 msgstr ""
 
-#: ../mdkonline_tui:175
-#, fuzzy, c-format
-msgid "Country"
-msgstr "鄉村"
-
-#: ../mdkonline_tui:187
-#, fuzzy, c-format
-msgid "Congratulations"
-msgstr "正在讀取組態設定\n"
-
-#: ../mdkonline_tui:187
+#: ../mdkonline.pm:76
 #, c-format
-msgid "Your Mandrakeonline account has been successfully configured\n"
-msgstr ""
+msgid "Problem connecting to server \n"
+msgstr "連線到伺服器出問題\n"
 
-#: ../mdkupdate:50
+#: ../mdkupdate:52
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
@@ -606,48 +557,97 @@ msgstr ""
 "\n"
 "使用方式:\n"
 
-#: ../mdkupdate:55
+#: ../mdkupdate:57
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - 顯示此求助訊息說明.\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:58
 #, fuzzy, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --applet       - 更新全部資訊.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:59
 #, fuzzy, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - 更新全部資訊.\n"
 
-#: ../mdkupdate:58
-#, fuzzy, c-format
-msgid "  --update       - Update keys\n"
-msgstr "  --applet       - 更新全部資訊.\n"
-
-#: ../mdkupdate:66
+#: ../mdkupdate:67
 #, c-format
 msgid "No %s file found. Run mdkonline wizard first"
 msgstr ""
 
-#: ../mdkupdate:124
+#: ../mdkupdate:126
 #, c-format
 msgid "Mandrakeupdate could not contact the site, we will try again."
 msgstr "Mandrakeupdate 無法聯絡到網站, 我們將再試."
 
-#: ../mdkupdate:173
+#: ../mdkupdate:176
 #, c-format
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr "無法由 mdkupdate 媒體更新套件.\n"
 
-#: ../mdkupdate:195
+#: ../mdkupdate:198
 #, c-format
 msgid ""
 "Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
 "mandrakeonline [dot] net"
 msgstr ""
 
+#~ msgid "Next"
+#~ msgstr "下一步"
+
+#~ msgid "Cancel"
+#~ msgstr "取消"
+
+#~ msgid "Previous"
+#~ msgstr "上一步"
+
+#~ msgid "Welcome to Mandrakeonline"
+#~ msgstr "歡迎來到 Mandrakeonline"
+
+#, fuzzy
+#~ msgid "I don't have a Mandrakeonline account and I want to subscribe"
+#~ msgstr "我還沒有 Mandrakelinux Online 的帳號，我希望要 "
+
+#~ msgid "Mandrakelinux Privacy Policy"
+#~ msgstr "Mandrakelinux 隱私政策"
+
+#~ msgid "Authentification"
+#~ msgstr "認證確認"
+
+#, fuzzy
+#~ msgid "Send Configuration"
+#~ msgstr "正在讀取組態設定\n"
+
+#~ msgid "Finish"
+#~ msgstr "完成"
+
+#~ msgid "automated Upgrades"
+#~ msgstr "自動升級"
+
+#, fuzzy
+#~ msgid "Country:"
+#~ msgstr "鄉村"
+
+#~ msgid "Error"
+#~ msgstr "錯誤"
+
+#~ msgid "Quitting Wizard\n"
+#~ msgstr "正在結束設定精靈\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Mandrakeonline could not be contacted, please try again at a later time"
+#~ msgstr "Mandrakeupdate 無法聯絡到網站, 我們將再試."
+
+#~ msgid "Wrong password"
+#~ msgstr "密碼錯誤"
+
+#, fuzzy
+#~ msgid "  --update       - Update keys\n"
+#~ msgstr "  --applet       - 更新全部資訊.\n"
+
 #, fuzzy
 #~ msgid "Skip Wizard"
 #~ msgstr " 跳過精靈 "
@@ -660,10 +660,6 @@ msgstr ""
 #~ msgstr "連線問題"
 
 #, fuzzy
-#~ msgid "Response from Mandrakeonline server\n"
-#~ msgstr "歡迎來到 Mandrakeonline"
-
-#, fuzzy
 #~ msgid "Launching Mandrakeupdate\n"
 #~ msgstr "  --applet       - 更新全部資訊.\n"