texts modifications

2 files changed, 26 insertions, 26 deletions

diff --git a/mdkonline b/mdkonline
index e00fff2b..3c55305d 100755
--- a/mdkonline
+++ b/mdkonline
@@ -249,10 +249,10 @@ sub test_passwd () {
 	my $ua = LWP::UserAgent->new;
 	$ua->agent("MdkOnlineAgent/0.15" . $ua->agent);
 # TEST URL
-	print STDERR "Real url should be: $authentication_host?u=$login&p=$passwd \n";
 	my $request = HTTP::Request->new(GET => 'http://www.mandrakeexpert.com/firsttimewizard/validusercheck.php?u=mark&p=26bdb06eabafac3aea95991149dd8ea9');
 # REAL ONE
-#    my $request = HTTP::Request->new(GET => '$authentication_host?u=$login&p=$passwd');
+#	print STDERR "url used for auth.: $authentication_host?u=$login&p=$passwd \n";
+#	my $request = HTTP::Request->new(GET => '$authentication_host?u=$login&p=$passwd');
 	my $response = $ua->request($request);
 	# Check the outcome of the response
 	if ($response->is_success) {
@@ -371,7 +371,7 @@ sub step_wizard {
 
     my $vbox_rev=new Gtk::VBox(0,0);
     write_on_pixmaps($vbox_rev,"mailnews.png",_("Sending your Configuration"),540,100);
-    my $label_rev = new Gtk::Label(_("This is your chance, to help us improving Mandrake Linux.\n\nThe Wizard will now send the following informations to MandrakeSoft:\n1) the packages you have installed on your system,\n2) your hardware configuration.\n\nIf you feel uncomfortable, by that idea, press 'Cancel'.\nBy pressing 'Next', you will grant us the privilege\nto learn more about about you as our customer\nand it gives us the chance to keep you informed\nabout security updates and useful upgrades."));
+    my $label_rev = new Gtk::Label(_("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.\nFinally, an email alias with your username@mandrakeonline.net will be provided to you."));
     $label_rev->set_uposition(20,150);
     $vbox_rev->pack_start($label_rev,0,0,1);
     $notebook_global->append_page($vbox_rev,new Gtk::Label("revision"));
@@ -386,7 +386,7 @@ sub step_wizard {
     # building the "OK data sent" page
     my $vbox_oksend= new Gtk::VBox(0,0);
     write_on_pixmaps($vbox_oksend,"identity.png",_("Finished"),540,100);
-    my $label_oksend = new Gtk::Label("\n\n" . _("Your personal informations are now stored at MdkOnline"));
+    my $label_oksend = new Gtk::Label("\n\n" . _("Your upload was successfull!\nFrom now you will receive on security\nand upgrade annoucements thanks to MandrakeOnline."));
     $vbox_oksend->pack_start($label_oksend,$false ,$false,1);
     $notebook_global->append_page($vbox_oksend,new Gtk::Label("oksend"));
     
diff --git a/privacy.txt b/privacy.txt
index 7967a2d6..02dc33d0 100644
--- a/privacy.txt
+++ b/privacy.txt
@@ -1,46 +1,46 @@
 
-[*] What personal data do we collect ?
+What personal data do we collect ?
 
 Various information is collected in different areas of the website;
 what follows is an overview of the data we keep:
 
-    * We record your email addresse name and postal address on the
-first. we give you unique customer Id you will use to add other
-information related to your mandrake account such as:
-    * your subscription to mailling lists.
-    * When registering a purchased product, we ask for personal
+Firstly, we record your email address, name and postal address.
+Secondly we give you a unique customer ID. This ID will be used to 
+add additional information related to your Mandrake account such as:
+    - Your subscription to mailling lists.
+    - When registering a purchased product, we ask for personal
 information as well as system/hardware details so that we may deliver
 the best support services customized to your needs.
-    * On our donation page and on our online store, we records datas
-for billing purpose, we do not store any credit card data.
-    * When you by a product on our online store, we store the track of
-your requests and your shopping cart in order to deliver you as well
-as to inprove our service.
+    - On our donation page and on our online store (MandrakeStore), we
+record data for billing purpose (we do not store any credit card data).
 
 
-[*] What do we do with this information?
+What do we do with this information?
 
 We never share personal information with other persons or companies -
 we use this data strictly for the following purposes:
-
-    * If you have subscribed to a mailing list, we keep this email
+    - If you have subscribed to a mailing list, we keep this email
 address in our database to provide you with customized information
 and/or to enable you to participate in discussions in various mailing
 lists. If you send a message to such a list, other people will see
 your email address but no external parties have access to our database
 of subscribers. At any time you may unsubscribe to any list by using
 the appropriate form.
-    * If you provide information when registering a purchased product
+    - If you provide information when registering a purchased product
 to receive support, we keep this information private unless the
 information is required by one of our partners to deliver the support
 you require.
+    - If you use MandrakeStore, we also use your Customer ID to track
+your order and deliver your products.
+    - If you provide use with marketing information, we keep it for 
+internal use only in order to improve our products so that they can 
+better fit your needs whether you have purchased a product or not.
 
 
-[*] How to change / correct your personal data?
+How to change / correct your personal data?
 
-According to French law, individuals have the right to access, to
-correct, to modify or to remove their own personal data that we have
-on record. We offer this as a worldwide privilege. You may execute
-this right at any time by logging to your account with your customer
-Id and edit yourself all your personnal data. You can log on this
-page: http://www.mandrakeonline.net
+French law gives individuals the right to access, correct, modify or 
+remove their own personal data that we have on record. We offer this 
+as a worldwide privilege. You may execute this right at any time by 
+logging to your account with your customer ID and editing your
+personnal data. You can log on to this page: http://www.mandrakeonline.net