updated pot file

46 files changed, 2110 insertions, 1727 deletions

diff --git a/perl-install/share/po/DrakX.pot b/perl-install/share/po/DrakX.pot
index f377ed442..c532a1b1d 100644
--- a/perl-install/share/po/DrakX.pot
+++ b/perl-install/share/po/DrakX.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2005-12-15 09:50+0100\n"
+"POT-Creation-Date: 2005-12-08 21:52+0800\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"
@@ -131,7 +131,7 @@ msgstr ""
 msgid "Please wait, detecting and configuring devices..."
 msgstr ""
 
-#: ../move/move.pm:604 ../move/move.pm:660 ../move/move.pm:664 diskdrake/dav.pm:75 diskdrake/hd_gtk.pm:113 diskdrake/interactive.pm:230 diskdrake/interactive.pm:243 diskdrake/interactive.pm:404 diskdrake/interactive.pm:422 diskdrake/interactive.pm:559 diskdrake/interactive.pm:564 diskdrake/smbnfs_gtk.pm:41 do_pkgs.pm:19 do_pkgs.pm:39 do_pkgs.pm:52 fsedit.pm:217 install_any.pm:1775 install_any.pm:1827 install_steps.pm:81 install_steps_interactive.pm:37 interactive/http.pm:117 interactive/http.pm:118 modules/interactive.pm:19 network/ndiswrapper.pm:27 network/ndiswrapper.pm:42 network/ndiswrapper.pm:89 network/ndiswrapper.pm:101 network/netconnect.pm:838 network/netconnect.pm:867 network/netconnect.pm:966 network/netconnect.pm:970 network/netconnect.pm:974 network/netconnect.pm:979 network/netconnect.pm:1124 network/netconnect.pm:1128 network/netconnect.pm:1247 network/netconnect.pm:1252 network/netconnect.pm:1272 network/netconnect.pm:1431 network/thirdparty.pm:321 network/thirdparty.pm:328 network/thirdparty.pm:372 network/thirdparty.pm:374 network/thirdparty.pm:395 network/thirdparty.pm:419 printer/printerdrake.pm:244 printer/printerdrake.pm:251 printer/printerdrake.pm:276 printer/printerdrake.pm:422 printer/printerdrake.pm:427 printer/printerdrake.pm:440 printer/printerdrake.pm:450 printer/printerdrake.pm:514 printer/printerdrake.pm:686 printer/printerdrake.pm:690 printer/printerdrake.pm:772 printer/printerdrake.pm:1555 printer/printerdrake.pm:1603 printer/printerdrake.pm:1640 printer/printerdrake.pm:1685 printer/printerdrake.pm:1689 printer/printerdrake.pm:1703 printer/printerdrake.pm:1795 printer/printerdrake.pm:1876 printer/printerdrake.pm:1880 printer/printerdrake.pm:1884 printer/printerdrake.pm:1933 printer/printerdrake.pm:1991 printer/printerdrake.pm:1995 printer/printerdrake.pm:2009 printer/printerdrake.pm:2129 printer/printerdrake.pm:2133 printer/printerdrake.pm:2176 printer/printerdrake.pm:2249 printer/printerdrake.pm:2267 printer/printerdrake.pm:2276 printer/printerdrake.pm:2285 printer/printerdrake.pm:2296 printer/printerdrake.pm:2360 printer/printerdrake.pm:2511 printer/printerdrake.pm:2924 printer/printerdrake.pm:3208 printer/printerdrake.pm:3214 printer/printerdrake.pm:3779 printer/printerdrake.pm:3783 printer/printerdrake.pm:3787 printer/printerdrake.pm:4183 printer/printerdrake.pm:4423 printer/printerdrake.pm:4451 printer/printerdrake.pm:4528 printer/printerdrake.pm:4594 printer/printerdrake.pm:4714 standalone/drakTermServ:394 standalone/drakTermServ:464 standalone/drakTermServ:473 standalone/drakTermServ:774 standalone/drakTermServ:781 standalone/drakTermServ:802 standalone/drakTermServ:849 standalone/drakTermServ:1095 standalone/drakTermServ:1572 standalone/drakTermServ:1581 standalone/drakTermServ:1589 standalone/drakTermServ:1594 standalone/drakTermServ:1602 standalone/drakTermServ:1618 standalone/drakTermServ:1638 standalone/drakauth:36 standalone/drakbackup:510 standalone/drakbackup:624 standalone/drakbackup:1104 standalone/drakbackup:1135 standalone/drakbackup:1320 standalone/drakbackup:1652 standalone/drakbackup:1808 standalone/drakbackup:2536 standalone/drakbackup:4446 standalone/drakclock:124 standalone/drakconnect:676 standalone/drakconnect:680 standalone/drakconnect:685 standalone/drakconnect:700 standalone/drakfont:209 standalone/drakfont:222 standalone/drakfont:260 standalone/drakgw:50 standalone/drakgw:188 standalone/drakhosts:98 standalone/drakhosts:246 standalone/drakhosts:253 standalone/drakhosts:260 standalone/draknfs:306 standalone/draknfs:609 standalone/draknfs:616 standalone/draknfs:623 standalone/drakroam:33 standalone/draksambashare:385 standalone/draksambashare:389 standalone/draksambashare:392 standalone/draksambashare:395 standalone/draksambashare:455 standalone/draksambashare:479 standalone/draksambashare:553 standalone/draksambashare:635 standalone/draksambashare:702 standalone/draksambashare:802 standalone/draksambashare:809 standalone/draksambashare:944 standalone/draksambashare:1135 standalone/draksambashare:1144 standalone/draksambashare:1153 standalone/draksambashare:1174 standalone/draksambashare:1183 standalone/draksambashare:1192 standalone/draksambashare:1212 standalone/draksambashare:1220 standalone/draksambashare:1232 standalone/draksplash:162 standalone/drakxtv:107 standalone/finish-install:66 standalone/logdrake:171 standalone/logdrake:440 standalone/logdrake:445 standalone/scannerdrake:59 standalone/scannerdrake:202 standalone/scannerdrake:261 standalone/scannerdrake:715 standalone/scannerdrake:726 standalone/scannerdrake:865 standalone/scannerdrake:876 standalone/scannerdrake:946 wizards.pm:95 wizards.pm:99 wizards.pm:121
+#: ../move/move.pm:604 ../move/move.pm:660 ../move/move.pm:664 diskdrake/dav.pm:75 diskdrake/hd_gtk.pm:113 diskdrake/interactive.pm:230 diskdrake/interactive.pm:243 diskdrake/interactive.pm:404 diskdrake/interactive.pm:422 diskdrake/interactive.pm:559 diskdrake/interactive.pm:564 diskdrake/smbnfs_gtk.pm:41 do_pkgs.pm:19 do_pkgs.pm:39 do_pkgs.pm:52 fsedit.pm:217 install_any.pm:1775 install_any.pm:1827 install_steps.pm:81 install_steps_interactive.pm:37 interactive/http.pm:117 interactive/http.pm:118 modules/interactive.pm:19 network/ndiswrapper.pm:27 network/ndiswrapper.pm:42 network/ndiswrapper.pm:89 network/ndiswrapper.pm:101 network/netconnect.pm:838 network/netconnect.pm:867 network/netconnect.pm:966 network/netconnect.pm:970 network/netconnect.pm:974 network/netconnect.pm:979 network/netconnect.pm:1124 network/netconnect.pm:1128 network/netconnect.pm:1247 network/netconnect.pm:1252 network/netconnect.pm:1272 network/netconnect.pm:1431 network/thirdparty.pm:321 network/thirdparty.pm:328 network/thirdparty.pm:372 network/thirdparty.pm:374 network/thirdparty.pm:395 network/thirdparty.pm:419 printer/printerdrake.pm:244 printer/printerdrake.pm:251 printer/printerdrake.pm:276 printer/printerdrake.pm:422 printer/printerdrake.pm:427 printer/printerdrake.pm:440 printer/printerdrake.pm:450 printer/printerdrake.pm:514 printer/printerdrake.pm:686 printer/printerdrake.pm:690 printer/printerdrake.pm:772 printer/printerdrake.pm:1555 printer/printerdrake.pm:1603 printer/printerdrake.pm:1640 printer/printerdrake.pm:1685 printer/printerdrake.pm:1689 printer/printerdrake.pm:1703 printer/printerdrake.pm:1795 printer/printerdrake.pm:1876 printer/printerdrake.pm:1880 printer/printerdrake.pm:1884 printer/printerdrake.pm:1933 printer/printerdrake.pm:1991 printer/printerdrake.pm:1995 printer/printerdrake.pm:2009 printer/printerdrake.pm:2129 printer/printerdrake.pm:2133 printer/printerdrake.pm:2176 printer/printerdrake.pm:2249 printer/printerdrake.pm:2267 printer/printerdrake.pm:2276 printer/printerdrake.pm:2285 printer/printerdrake.pm:2296 printer/printerdrake.pm:2360 printer/printerdrake.pm:2511 printer/printerdrake.pm:2924 printer/printerdrake.pm:3208 printer/printerdrake.pm:3214 printer/printerdrake.pm:3779 printer/printerdrake.pm:3783 printer/printerdrake.pm:3787 printer/printerdrake.pm:4183 printer/printerdrake.pm:4423 printer/printerdrake.pm:4451 printer/printerdrake.pm:4528 printer/printerdrake.pm:4594 printer/printerdrake.pm:4714 standalone/drakTermServ:394 standalone/drakTermServ:464 standalone/drakTermServ:473 standalone/drakTermServ:774 standalone/drakTermServ:781 standalone/drakTermServ:802 standalone/drakTermServ:849 standalone/drakTermServ:1095 standalone/drakTermServ:1572 standalone/drakTermServ:1581 standalone/drakTermServ:1589 standalone/drakTermServ:1594 standalone/drakTermServ:1602 standalone/drakTermServ:1618 standalone/drakTermServ:1638 standalone/drakauth:36 standalone/drakbackup:511 standalone/drakbackup:625 standalone/drakbackup:1105 standalone/drakbackup:1136 standalone/drakbackup:1321 standalone/drakbackup:1653 standalone/drakbackup:1809 standalone/drakbackup:2525 standalone/drakbackup:4435 standalone/drakclock:124 standalone/drakconnect:676 standalone/drakconnect:680 standalone/drakconnect:685 standalone/drakconnect:700 standalone/drakfont:209 standalone/drakfont:222 standalone/drakfont:260 standalone/drakgw:50 standalone/drakgw:188 standalone/drakhosts:98 standalone/drakhosts:246 standalone/drakhosts:253 standalone/drakhosts:260 standalone/draknfs:306 standalone/draknfs:609 standalone/draknfs:616 standalone/draknfs:623 standalone/drakroam:33 standalone/draksambashare:385 standalone/draksambashare:389 standalone/draksambashare:392 standalone/draksambashare:395 standalone/draksambashare:455 standalone/draksambashare:479 standalone/draksambashare:553 standalone/draksambashare:635 standalone/draksambashare:702 standalone/draksambashare:802 standalone/draksambashare:809 standalone/draksambashare:944 standalone/draksambashare:1135 standalone/draksambashare:1144 standalone/draksambashare:1153 standalone/draksambashare:1174 standalone/draksambashare:1183 standalone/draksambashare:1192 standalone/draksambashare:1212 standalone/draksambashare:1220 standalone/draksambashare:1232 standalone/draksplash:162 standalone/drakxtv:107 standalone/finish-install:66 standalone/logdrake:171 standalone/logdrake:440 standalone/logdrake:445 standalone/scannerdrake:59 standalone/scannerdrake:202 standalone/scannerdrake:261 standalone/scannerdrake:715 standalone/scannerdrake:726 standalone/scannerdrake:865 standalone/scannerdrake:876 standalone/scannerdrake:946 wizards.pm:95 wizards.pm:99 wizards.pm:121
 #, c-format
 msgid "Error"
 msgstr ""
@@ -465,7 +465,7 @@ msgstr ""
 msgid "Resolutions"
 msgstr ""
 
-#: Xconfig/resolution_and_depth.pm:309 diskdrake/hd_gtk.pm:336 install_steps_gtk.pm:288 mouse.pm:168 services.pm:162 standalone/drakbackup:1594 standalone/drakperm:250
+#: Xconfig/resolution_and_depth.pm:309 diskdrake/hd_gtk.pm:336 install_steps_gtk.pm:288 mouse.pm:168 services.pm:162 standalone/drakbackup:1595 standalone/drakperm:250
 #, c-format
 msgid "Other"
 msgstr ""
@@ -480,17 +480,17 @@ msgstr ""
 msgid "Graphics card: %s"
 msgstr ""
 
-#: Xconfig/resolution_and_depth.pm:373 interactive.pm:119 interactive.pm:436 interactive/http.pm:103 interactive/http.pm:156 interactive/newt.pm:321 interactive/stdio.pm:39 interactive/stdio.pm:142 interactive/stdio.pm:143 standalone/drakTermServ:195 standalone/drakTermServ:515 standalone/drakbackup:1360 standalone/drakbackup:4106 standalone/drakbackup:4166 standalone/drakbackup:4210 standalone/drakbackup:4464 standalone/drakconnect:158 standalone/drakconnect:852 standalone/drakconnect:939 standalone/drakconnect:1030 standalone/drakfont:576 standalone/drakfont:586 standalone/draksplash:173 standalone/drakups:212 standalone/net_monitor:339 ugtk2.pm:392 ugtk2.pm:490 ugtk2.pm:899 ugtk2.pm:922
+#: Xconfig/resolution_and_depth.pm:373 interactive.pm:119 interactive.pm:436 interactive/http.pm:103 interactive/http.pm:156 interactive/newt.pm:321 interactive/stdio.pm:39 interactive/stdio.pm:142 interactive/stdio.pm:143 standalone/drakTermServ:195 standalone/drakTermServ:515 standalone/drakbackup:1361 standalone/drakbackup:4095 standalone/drakbackup:4155 standalone/drakbackup:4199 standalone/drakbackup:4453 standalone/drakconnect:158 standalone/drakconnect:852 standalone/drakconnect:939 standalone/drakconnect:1030 standalone/drakfont:576 standalone/drakfont:586 standalone/draksplash:173 standalone/drakups:212 standalone/net_monitor:339 ugtk2.pm:392 ugtk2.pm:490 ugtk2.pm:899 ugtk2.pm:922
 #, c-format
 msgid "Ok"
 msgstr ""
 
-#: Xconfig/resolution_and_depth.pm:373 diskdrake/smbnfs_gtk.pm:80 help.pm:89 help.pm:444 install_steps_gtk.pm:455 install_steps_interactive.pm:431 install_steps_interactive.pm:836 interactive.pm:120 interactive.pm:437 interactive/http.pm:104 interactive/http.pm:160 interactive/newt.pm:318 interactive/stdio.pm:39 interactive/stdio.pm:142 printer/printerdrake.pm:3859 standalone/drakautoinst:215 standalone/drakbackup:1360 standalone/drakbackup:4035 standalone/drakbackup:4039 standalone/drakbackup:4094 standalone/drakbackup:4464 standalone/drakconnect:157 standalone/drakconnect:937 standalone/drakconnect:1029 standalone/drakfont:586 standalone/drakfont:662 standalone/drakfont:739 standalone/draksplash:173 standalone/drakups:219 standalone/logdrake:176 standalone/net_monitor:338 ugtk2.pm:386 ugtk2.pm:488 ugtk2.pm:497 ugtk2.pm:899
+#: Xconfig/resolution_and_depth.pm:373 diskdrake/smbnfs_gtk.pm:80 help.pm:89 help.pm:444 install_steps_gtk.pm:455 install_steps_interactive.pm:431 install_steps_interactive.pm:836 interactive.pm:120 interactive.pm:437 interactive/http.pm:104 interactive/http.pm:160 interactive/newt.pm:318 interactive/stdio.pm:39 interactive/stdio.pm:142 printer/printerdrake.pm:3859 standalone/drakautoinst:215 standalone/drakbackup:1361 standalone/drakbackup:4024 standalone/drakbackup:4028 standalone/drakbackup:4083 standalone/drakbackup:4453 standalone/drakconnect:157 standalone/drakconnect:937 standalone/drakconnect:1029 standalone/drakfont:586 standalone/drakfont:662 standalone/drakfont:739 standalone/draksplash:173 standalone/drakups:219 standalone/logdrake:176 standalone/net_monitor:338 ugtk2.pm:386 ugtk2.pm:488 ugtk2.pm:497 ugtk2.pm:899
 #, c-format
 msgid "Cancel"
 msgstr ""
 
-#: Xconfig/resolution_and_depth.pm:373 diskdrake/hd_gtk.pm:150 install_steps_gtk.pm:232 install_steps_gtk.pm:617 interactive.pm:567 interactive/gtk.pm:682 interactive/gtk.pm:684 standalone/drakTermServ:284 standalone/drakbackup:4031 standalone/drakbug:105 standalone/drakconnect:153 standalone/drakconnect:236 standalone/drakfont:511 standalone/draknfs:206 standalone/drakperm:133 standalone/draksambashare:320 standalone/draksec:344 standalone/draksec:346 standalone/draksec:364 standalone/draksec:366 ugtk2.pm:1031 ugtk2.pm:1032
+#: Xconfig/resolution_and_depth.pm:373 diskdrake/hd_gtk.pm:150 install_steps_gtk.pm:232 install_steps_gtk.pm:617 interactive.pm:567 interactive/gtk.pm:682 interactive/gtk.pm:684 standalone/drakTermServ:284 standalone/drakbackup:4020 standalone/drakbug:105 standalone/drakconnect:153 standalone/drakconnect:236 standalone/drakfont:511 standalone/draknfs:206 standalone/drakperm:133 standalone/draksambashare:320 standalone/draksec:344 standalone/draksec:346 standalone/draksec:364 standalone/draksec:366 ugtk2.pm:1031 ugtk2.pm:1032
 #, c-format
 msgid "Help"
 msgstr ""
@@ -776,7 +776,7 @@ msgstr ""
 msgid "Force No Local APIC"
 msgstr ""
 
-#: any.pm:294 any.pm:650 authentication.pm:197 diskdrake/smbnfs_gtk.pm:180 network/netconnect.pm:585 printer/printerdrake.pm:1867 printer/printerdrake.pm:1988 standalone/drakbackup:1638 standalone/drakbackup:3626 standalone/drakups:299
+#: any.pm:294 any.pm:650 authentication.pm:197 diskdrake/smbnfs_gtk.pm:180 network/netconnect.pm:585 printer/printerdrake.pm:1867 printer/printerdrake.pm:1988 standalone/drakbackup:1639 standalone/drakbackup:3615 standalone/drakups:299
 #, c-format
 msgid "Password"
 msgstr ""
@@ -871,7 +871,7 @@ msgstr ""
 msgid "Label"
 msgstr ""
 
-#: any.pm:387 any.pm:397 harddrake/v4l.pm:368 standalone/drakbackup:2092 standalone/draksec:52
+#: any.pm:387 any.pm:397 harddrake/v4l.pm:368 standalone/drakbackup:2093 standalone/draksec:52
 #, c-format
 msgid "Default"
 msgstr ""
@@ -1030,7 +1030,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: any.pm:636 diskdrake/dav.pm:66 diskdrake/hd_gtk.pm:154 diskdrake/removable.pm:26 diskdrake/smbnfs_gtk.pm:81 help.pm:530 interactive/http.pm:151 printer/printerdrake.pm:197 printer/printerdrake.pm:382 printer/printerdrake.pm:4987 standalone/drakbackup:2824 standalone/scannerdrake:668 standalone/scannerdrake:818
+#: any.pm:636 diskdrake/dav.pm:66 diskdrake/hd_gtk.pm:154 diskdrake/removable.pm:26 diskdrake/smbnfs_gtk.pm:81 help.pm:530 interactive/http.pm:151 printer/printerdrake.pm:197 printer/printerdrake.pm:382 printer/printerdrake.pm:4987 standalone/drakbackup:2813 standalone/scannerdrake:668 standalone/scannerdrake:818
 #, c-format
 msgid "Done"
 msgstr ""
@@ -1045,7 +1045,7 @@ msgstr ""
 msgid "Real name"
 msgstr ""
 
-#: any.pm:649 standalone/drakbackup:1633
+#: any.pm:649 standalone/drakbackup:1634
 #, c-format
 msgid "Login name"
 msgstr ""
@@ -1193,7 +1193,7 @@ msgstr ""
 msgid "Launch userdrake"
 msgstr ""
 
-#: any.pm:1027 printer/printerdrake.pm:4062 printer/printerdrake.pm:4065 printer/printerdrake.pm:4066 printer/printerdrake.pm:4067 printer/printerdrake.pm:5305 standalone/drakTermServ:294 standalone/drakbackup:4228 standalone/drakbug:126 standalone/drakfont:499 standalone/drakids:64 standalone/drakids:77 standalone/drakids:85 standalone/draknfs:210 standalone/net_monitor:117 standalone/printerdrake:583
+#: any.pm:1027 printer/printerdrake.pm:4062 printer/printerdrake.pm:4065 printer/printerdrake.pm:4066 printer/printerdrake.pm:4067 printer/printerdrake.pm:5305 standalone/drakTermServ:294 standalone/drakbackup:4217 standalone/drakbug:126 standalone/drakfont:499 standalone/drakids:64 standalone/drakids:77 standalone/drakids:85 standalone/draknfs:210 standalone/net_monitor:117 standalone/printerdrake:583
 #, c-format
 msgid "Close"
 msgstr ""
@@ -1515,47 +1515,47 @@ msgstr ""
 msgid "Re-install Boot Loader"
 msgstr ""
 
-#: common.pm:132
+#: common.pm:131
 #, c-format
 msgid "KB"
 msgstr ""
 
-#: common.pm:132
+#: common.pm:131
 #, c-format
 msgid "MB"
 msgstr ""
 
-#: common.pm:132
+#: common.pm:131
 #, c-format
 msgid "GB"
 msgstr ""
 
-#: common.pm:140
+#: common.pm:139
 #, c-format
 msgid "TB"
 msgstr ""
 
-#: common.pm:148
+#: common.pm:147
 #, c-format
 msgid "%d minutes"
 msgstr ""
 
-#: common.pm:150
+#: common.pm:149
 #, c-format
 msgid "1 minute"
 msgstr ""
 
-#: common.pm:152
+#: common.pm:151
 #, c-format
 msgid "%d seconds"
 msgstr ""
 
-#: common.pm:258
+#: common.pm:257
 #, c-format
 msgid "kdesu missing"
 msgstr ""
 
-#: common.pm:261
+#: common.pm:260
 #, c-format
 msgid "consolehelper missing"
 msgstr ""
@@ -1814,7 +1814,7 @@ msgstr ""
 msgid "Please click on a partition"
 msgstr ""
 
-#: diskdrake/hd_gtk.pm:205 diskdrake/smbnfs_gtk.pm:62 install_steps_gtk.pm:457 standalone/drakbackup:3076 standalone/drakbackup:3136
+#: diskdrake/hd_gtk.pm:205 diskdrake/smbnfs_gtk.pm:62 install_steps_gtk.pm:457 standalone/drakbackup:3065 standalone/drakbackup:3125
 #, c-format
 msgid "Details"
 msgstr ""
@@ -2215,11 +2215,11 @@ msgstr ""
 msgid "New size in MB: "
 msgstr ""
 
-#: diskdrake/interactive.pm:810
+#: diskdrake/interactive.pm:810 install_interactive.pm:196
 #, c-format
 msgid ""
 "To ensure data integrity after resizing the partition(s), \n"
-"filesystem checks will be run on your next boot into Windows(TM)"
+"filesystem checks will be run on your next boot into Microsoft Windows®"
 msgstr ""
 
 #: diskdrake/interactive.pm:851
@@ -2639,7 +2639,7 @@ msgstr ""
 msgid "Please enter your username, password and domain name to access this host."
 msgstr ""
 
-#: diskdrake/smbnfs_gtk.pm:179 standalone/drakbackup:3625
+#: diskdrake/smbnfs_gtk.pm:179 standalone/drakbackup:3614
 #, c-format
 msgid "Username"
 msgstr ""
@@ -2669,7 +2669,7 @@ msgstr ""
 msgid "Mandatory package %s is missing"
 msgstr ""
 
-#: do_pkgs.pm:35 harddrake/sound.pm:275 install_steps_interactive.pm:1313 keyboard.pm:388 network/ndiswrapper.pm:95 network/netconnect.pm:472 printer/printerdrake.pm:1416 printer/printerdrake.pm:2494 printer/printerdrake.pm:2609 printer/printerdrake.pm:2930 printer/printerdrake.pm:2937 printer/printerdrake.pm:3924 printer/printerdrake.pm:4188 printer/printerdrake.pm:4307 printer/printerdrake.pm:5464 standalone/drakTermServ:326 standalone/drakTermServ:1205 standalone/drakTermServ:1266 standalone/drakTermServ:1935 standalone/drakbackup:509 standalone/drakbackup:608 standalone/drakboot:133 standalone/drakclock:224 standalone/drakconnect:973 standalone/drakperm:380 standalone/drakperm:390 standalone/drakups:27 standalone/harddrake2:511 standalone/harddrake2:527 standalone/localedrake:43 standalone/scannerdrake:51 standalone/scannerdrake:940
+#: do_pkgs.pm:35 harddrake/sound.pm:275 install_steps_interactive.pm:1313 keyboard.pm:388 network/ndiswrapper.pm:95 network/netconnect.pm:472 printer/printerdrake.pm:1416 printer/printerdrake.pm:2494 printer/printerdrake.pm:2609 printer/printerdrake.pm:2930 printer/printerdrake.pm:2937 printer/printerdrake.pm:3924 printer/printerdrake.pm:4188 printer/printerdrake.pm:4307 printer/printerdrake.pm:5464 standalone/drakTermServ:326 standalone/drakTermServ:1205 standalone/drakTermServ:1266 standalone/drakTermServ:1935 standalone/drakbackup:510 standalone/drakbackup:609 standalone/drakboot:133 standalone/drakclock:224 standalone/drakconnect:973 standalone/drakperm:380 standalone/drakperm:390 standalone/drakups:27 standalone/harddrake2:511 standalone/harddrake2:527 standalone/localedrake:43 standalone/scannerdrake:51 standalone/scannerdrake:940
 #, c-format
 msgid "Warning"
 msgstr ""
@@ -2950,7 +2950,7 @@ msgstr ""
 msgid "DVD-ROM"
 msgstr ""
 
-#: harddrake/data.pm:127 standalone/drakbackup:2054
+#: harddrake/data.pm:127 standalone/drakbackup:2055
 #, c-format
 msgid "Tape"
 msgstr ""
@@ -3421,7 +3421,7 @@ msgstr ""
 msgid "User name"
 msgstr ""
 
-#: help.pm:51 help.pm:51 help.pm:431 help.pm:681 install_steps_gtk.pm:237 install_steps_gtk.pm:682 interactive.pm:436 interactive/newt.pm:321 network/thirdparty.pm:385 printer/printerdrake.pm:3861 standalone/drakTermServ:384 standalone/drakbackup:4085 standalone/drakbackup:4179 standalone/drakbackup:4196 standalone/drakbackup:4214 ugtk2.pm:490
+#: help.pm:51 help.pm:51 help.pm:431 help.pm:681 install_steps_gtk.pm:237 install_steps_gtk.pm:682 interactive.pm:436 interactive/newt.pm:321 network/thirdparty.pm:385 printer/printerdrake.pm:3861 standalone/drakTermServ:384 standalone/drakbackup:4074 standalone/drakbackup:4168 standalone/drakbackup:4185 standalone/drakbackup:4203 ugtk2.pm:490
 #, c-format
 msgid "Next"
 msgstr ""
@@ -3612,12 +3612,12 @@ msgid ""
 "such a floppy."
 msgstr ""
 
-#: help.pm:180 help.pm:285 help.pm:313 help.pm:444 install_any.pm:944 interactive.pm:161 modules/interactive.pm:71 standalone/drakbackup:2624 standalone/draksec:54 standalone/harddrake2:332 ugtk2.pm:898 wizards.pm:156
+#: help.pm:180 help.pm:285 help.pm:313 help.pm:444 install_any.pm:944 interactive.pm:161 modules/interactive.pm:71 standalone/drakbackup:2613 standalone/draksec:54 standalone/harddrake2:332 ugtk2.pm:898 wizards.pm:156
 #, c-format
 msgid "No"
 msgstr ""
 
-#: help.pm:180 help.pm:285 help.pm:444 help.pm:444 install_any.pm:944 interactive.pm:161 modules/interactive.pm:71 printer/printerdrake.pm:883 printer/printerdrake.pm:898 standalone/drakbackup:2624 standalone/draksec:55 standalone/harddrake2:331 ugtk2.pm:898 wizards.pm:156
+#: help.pm:180 help.pm:285 help.pm:444 help.pm:444 install_any.pm:944 interactive.pm:161 modules/interactive.pm:71 printer/printerdrake.pm:883 printer/printerdrake.pm:898 standalone/drakbackup:2613 standalone/draksec:55 standalone/harddrake2:331 ugtk2.pm:898 wizards.pm:156
 #, c-format
 msgid "Yes"
 msgstr ""
@@ -3636,7 +3636,7 @@ msgid ""
 "manual is similar to the one used during installation."
 msgstr ""
 
-#: help.pm:186 help.pm:566 help.pm:855 help.pm:855 help.pm:855 help.pm:855 help.pm:855 help.pm:855 help.pm:855 install_steps_gtk.pm:595 standalone/drakbackup:2448 standalone/drakbackup:2452 standalone/drakbackup:2456 standalone/drakbackup:2460 standalone/drakroam:227
+#: help.pm:186 help.pm:566 help.pm:855 help.pm:855 help.pm:855 help.pm:855 help.pm:855 help.pm:855 help.pm:855 install_steps_gtk.pm:595 standalone/drakbackup:2437 standalone/drakbackup:2441 standalone/drakbackup:2445 standalone/drakbackup:2449 standalone/drakroam:227
 #, c-format
 msgid "Configure"
 msgstr ""
@@ -3876,9 +3876,9 @@ msgstr ""
 msgid "Use existing partition"
 msgstr ""
 
-#: help.pm:374
+#: help.pm:374 install_interactive.pm:137
 #, c-format
-msgid "Use the free space on the Windows partition"
+msgid "Use the free space on the Microsoft Windows® partition"
 msgstr ""
 
 #: help.pm:374
@@ -3979,7 +3979,7 @@ msgid ""
 "bad blocks on the disk."
 msgstr ""
 
-#: help.pm:431 install_steps_gtk.pm:392 interactive.pm:437 interactive/newt.pm:318 printer/printerdrake.pm:3859 standalone/drakTermServ:363 standalone/drakbackup:4048 standalone/drakbackup:4084 standalone/drakbackup:4195 standalone/drakbackup:4210 ugtk2.pm:488
+#: help.pm:431 install_steps_gtk.pm:392 interactive.pm:437 interactive/newt.pm:318 printer/printerdrake.pm:3859 standalone/drakTermServ:363 standalone/drakbackup:4037 standalone/drakbackup:4073 standalone/drakbackup:4184 standalone/drakbackup:4199 ugtk2.pm:488
 #, c-format
 msgid "Previous"
 msgstr ""
@@ -4536,7 +4536,7 @@ msgstr ""
 msgid "Graphical Interface"
 msgstr ""
 
-#: help.pm:855 install_any.pm:1733 install_steps_interactive.pm:1067 standalone/drakbackup:2039
+#: help.pm:855 install_any.pm:1733 install_steps_interactive.pm:1067 standalone/drakbackup:2040
 #, c-format
 msgid "Network"
 msgstr ""
@@ -4898,11 +4898,6 @@ msgstr ""
 msgid "There is no FAT partition to use as loopback (or not enough space left)"
 msgstr ""
 
-#: install_interactive.pm:137
-#, c-format
-msgid "Use the free space on the Microsoft Windows® partition"
-msgstr ""
-
 #: install_interactive.pm:139
 #, c-format
 msgid "Which partition do you want to resize?"
@@ -4931,14 +4926,14 @@ msgstr ""
 msgid ""
 "WARNING!\n"
 "\n"
-"\t\t\t\t\t\t\t\t\n"
+"\n"
 "Your Microsoft Windows® partition will be now resized.\n"
 "\n"
 "\n"
 "Be careful: this operation is dangerous. If you have not already done so, you first need to exit the installation, run \"chkdsk c:\" from a Command Prompt under Microsoft Windows® (beware, running graphical program \"scandisk\" is not enough, be sure to use \"chkdsk\" in a Command Prompt!), optionally run defrag, then restart the installation. You should also backup your data.\n"
 "\n"
 "\n"
-"When sure, press Next."
+"When sure, press %s."
 msgstr ""
 
 #: install_interactive.pm:178
@@ -4961,13 +4956,6 @@ msgstr ""
 msgid "FAT resizing failed: %s"
 msgstr ""
 
-#: install_interactive.pm:196
-#, c-format
-msgid ""
-"To ensure data integrity after resizing the partition(s), \n"
-"filesystem checks will be run on your next boot into Microsoft Windows®"
-msgstr ""
-
 #: install_interactive.pm:208
 #, c-format
 msgid "There is no FAT partition to resize (or not enough space left)"
@@ -5584,7 +5572,7 @@ msgstr ""
 msgid "Load"
 msgstr ""
 
-#: install_steps_interactive.pm:506 standalone/drakbackup:4066 standalone/drakbackup:4136 standalone/logdrake:175
+#: install_steps_interactive.pm:506 standalone/drakbackup:4055 standalone/drakbackup:4125 standalone/logdrake:175
 #, c-format
 msgid "Save"
 msgstr ""
@@ -5714,7 +5702,7 @@ msgstr ""
 msgid "NTP Server"
 msgstr ""
 
-#: install_steps_interactive.pm:948 install_steps_interactive.pm:956 install_steps_interactive.pm:974 install_steps_interactive.pm:981 install_steps_interactive.pm:1132 services.pm:133 standalone/drakbackup:1584
+#: install_steps_interactive.pm:948 install_steps_interactive.pm:956 install_steps_interactive.pm:974 install_steps_interactive.pm:981 install_steps_interactive.pm:1132 services.pm:133 standalone/drakbackup:1585
 #, c-format
 msgid "System"
 msgstr ""
@@ -5887,7 +5875,7 @@ msgstr ""
 msgid "Choose a file"
 msgstr ""
 
-#: interactive.pm:321 interactive/gtk.pm:508 standalone/drakbackup:1525 standalone/drakfont:656 standalone/drakhosts:242 standalone/draknfs:605 standalone/draksambashare:1129 standalone/drakups:301 standalone/drakups:361 standalone/drakups:381 standalone/drakvpn:319 standalone/drakvpn:680
+#: interactive.pm:321 interactive/gtk.pm:508 standalone/drakbackup:1526 standalone/drakfont:656 standalone/drakhosts:242 standalone/draknfs:605 standalone/draksambashare:1129 standalone/drakups:301 standalone/drakups:361 standalone/drakups:381 standalone/drakvpn:319 standalone/drakvpn:680
 #, c-format
 msgid "Add"
 msgstr ""
@@ -11106,7 +11094,7 @@ msgstr ""
 msgid "Remote printer name missing!"
 msgstr ""
 
-#: printer/printerdrake.pm:1719 printer/printerdrake.pm:2195 printer/printerdrake.pm:2318 standalone/drakTermServ:447 standalone/drakTermServ:769 standalone/drakTermServ:785 standalone/drakTermServ:1591 standalone/drakTermServ:1600 standalone/drakTermServ:1614 standalone/drakbackup:511 standalone/drakbackup:617 standalone/drakbackup:652 standalone/drakbackup:753 standalone/draknfs:203 standalone/draksambashare:629 standalone/draksambashare:796 standalone/harddrake2:276
+#: printer/printerdrake.pm:1719 printer/printerdrake.pm:2195 printer/printerdrake.pm:2318 standalone/drakTermServ:447 standalone/drakTermServ:769 standalone/drakTermServ:785 standalone/drakTermServ:1591 standalone/drakTermServ:1600 standalone/drakTermServ:1614 standalone/drakbackup:512 standalone/drakbackup:618 standalone/drakbackup:653 standalone/drakbackup:754 standalone/draknfs:203 standalone/draksambashare:629 standalone/draksambashare:796 standalone/harddrake2:276
 #, c-format
 msgid "Information"
 msgstr ""
@@ -14964,41 +14952,41 @@ msgstr ""
 msgid "No interval selected for cron operation."
 msgstr ""
 
-#: standalone/drakbackup:392
+#: standalone/drakbackup:393
 #, c-format
 msgid "Interval cron not available as non-root"
 msgstr ""
 
-#: standalone/drakbackup:476 standalone/logdrake:440
+#: standalone/drakbackup:477 standalone/logdrake:440
 #, c-format
 msgid "\"%s\" neither is a valid email nor is an existing local user!"
 msgstr ""
 
-#: standalone/drakbackup:480 standalone/logdrake:445
+#: standalone/drakbackup:481 standalone/logdrake:445
 #, c-format
 msgid "\"%s\" is a local user, but you did not select a local smtp, so you must use a complete email address!"
 msgstr ""
 
-#: standalone/drakbackup:490
+#: standalone/drakbackup:491
 #, c-format
 msgid "Valid user list changed, rewriting config file."
 msgstr ""
 
-#: standalone/drakbackup:492
+#: standalone/drakbackup:493
 #, c-format
 msgid ""
 "Old user list:\n"
 ""
 msgstr ""
 
-#: standalone/drakbackup:494
+#: standalone/drakbackup:495
 #, c-format
 msgid ""
 "New user list:\n"
 ""
 msgstr ""
 
-#: standalone/drakbackup:523
+#: standalone/drakbackup:524
 #, c-format
 msgid ""
 "\n"
@@ -15006,7 +14994,7 @@ msgid ""
 ""
 msgstr ""
 
-#: standalone/drakbackup:524
+#: standalone/drakbackup:525
 #, c-format
 msgid ""
 "\n"
@@ -15014,7 +15002,7 @@ msgid ""
 ""
 msgstr ""
 
-#: standalone/drakbackup:530
+#: standalone/drakbackup:531
 #, c-format
 msgid ""
 "\n"
@@ -15024,12 +15012,12 @@ msgid ""
 ""
 msgstr ""
 
-#: standalone/drakbackup:555 standalone/drakbackup:626 standalone/drakbackup:682
+#: standalone/drakbackup:556 standalone/drakbackup:627 standalone/drakbackup:683
 #, c-format
 msgid "Total progress"
 msgstr ""
 
-#: standalone/drakbackup:608
+#: standalone/drakbackup:609
 #, c-format
 msgid ""
 "%s exists, delete?\n"
@@ -15038,42 +15026,42 @@ msgid ""
 " need to purge the entry from authorized_keys on the server."
 msgstr ""
 
-#: standalone/drakbackup:617
+#: standalone/drakbackup:618
 #, c-format
 msgid "This may take a moment to generate the keys."
 msgstr ""
 
-#: standalone/drakbackup:624
+#: standalone/drakbackup:625
 #, c-format
 msgid "Cannot spawn %s."
 msgstr ""
 
-#: standalone/drakbackup:641
+#: standalone/drakbackup:642
 #, c-format
 msgid "No password prompt on %s at port %s"
 msgstr ""
 
-#: standalone/drakbackup:642
+#: standalone/drakbackup:643
 #, c-format
 msgid "Bad password on %s"
 msgstr ""
 
-#: standalone/drakbackup:643
+#: standalone/drakbackup:644
 #, c-format
 msgid "Permission denied transferring %s to %s"
 msgstr ""
 
-#: standalone/drakbackup:644
+#: standalone/drakbackup:645
 #, c-format
 msgid "Can not find %s on %s"
 msgstr ""
 
-#: standalone/drakbackup:648
+#: standalone/drakbackup:649
 #, c-format
 msgid "%s not responding"
 msgstr ""
 
-#: standalone/drakbackup:652
+#: standalone/drakbackup:653
 #, c-format
 msgid ""
 "Transfer successful\n"
@@ -15084,74 +15072,74 @@ msgid ""
 "without being prompted for a password."
 msgstr ""
 
-#: standalone/drakbackup:702
+#: standalone/drakbackup:703
 #, c-format
 msgid "No CD-R/DVD-R in drive!"
 msgstr ""
 
-#: standalone/drakbackup:706
+#: standalone/drakbackup:707
 #, c-format
 msgid "Does not appear to be recordable media!"
 msgstr ""
 
-#: standalone/drakbackup:711
+#: standalone/drakbackup:712
 #, c-format
 msgid "Not erasable media!"
 msgstr ""
 
-#: standalone/drakbackup:753
+#: standalone/drakbackup:754
 #, c-format
 msgid "This may take a moment to erase the media."
 msgstr ""
 
-#: standalone/drakbackup:811
+#: standalone/drakbackup:812
 #, c-format
 msgid "Permission problem accessing CD."
 msgstr ""
 
-#: standalone/drakbackup:838
+#: standalone/drakbackup:839
 #, c-format
 msgid "No tape in %s!"
 msgstr ""
 
-#: standalone/drakbackup:947
+#: standalone/drakbackup:948
 #, c-format
 msgid ""
 "Backup destination quota exceeded!\n"
 "%d MB used vs %d MB allocated."
 msgstr ""
 
-#: standalone/drakbackup:967 standalone/drakbackup:999
+#: standalone/drakbackup:968 standalone/drakbackup:1000
 #, c-format
 msgid "Backup system files..."
 msgstr ""
 
-#: standalone/drakbackup:1000 standalone/drakbackup:1039
+#: standalone/drakbackup:1001 standalone/drakbackup:1040
 #, c-format
 msgid "Hard Disk Backup files..."
 msgstr ""
 
-#: standalone/drakbackup:1038
+#: standalone/drakbackup:1039
 #, c-format
 msgid "Backup User files..."
 msgstr ""
 
-#: standalone/drakbackup:1072
+#: standalone/drakbackup:1073
 #, c-format
 msgid "Backup Other files..."
 msgstr ""
 
-#: standalone/drakbackup:1073
+#: standalone/drakbackup:1074
 #, c-format
 msgid "Hard Disk Backup Progress..."
 msgstr ""
 
-#: standalone/drakbackup:1078
+#: standalone/drakbackup:1079
 #, c-format
 msgid "No changes to backup!"
 msgstr ""
 
-#: standalone/drakbackup:1094 standalone/drakbackup:1116
+#: standalone/drakbackup:1095 standalone/drakbackup:1117
 #, c-format
 msgid ""
 "\n"
@@ -15160,7 +15148,7 @@ msgid ""
 ""
 msgstr ""
 
-#: standalone/drakbackup:1103
+#: standalone/drakbackup:1104
 #, c-format
 msgid ""
 "\n"
@@ -15168,19 +15156,19 @@ msgid ""
 ""
 msgstr ""
 
-#: standalone/drakbackup:1104
+#: standalone/drakbackup:1105
 #, c-format
 msgid "Error during sending file via FTP. Please correct your FTP configuration."
 msgstr ""
 
-#: standalone/drakbackup:1106
+#: standalone/drakbackup:1107
 #, c-format
 msgid ""
 "file list sent by FTP: %s\n"
 ""
 msgstr ""
 
-#: standalone/drakbackup:1121
+#: standalone/drakbackup:1122
 #, c-format
 msgid ""
 "\n"
@@ -15189,7 +15177,7 @@ msgid ""
 ""
 msgstr ""
 
-#: standalone/drakbackup:1126
+#: standalone/drakbackup:1127
 #, c-format
 msgid ""
 "\n"
@@ -15198,236 +15186,236 @@ msgid ""
 ""
 msgstr ""
 
-#: standalone/drakbackup:1135
+#: standalone/drakbackup:1136
 #, c-format
 msgid "Error sending mail. Your report mail was not sent."
 msgstr ""
 
-#: standalone/drakbackup:1136
+#: standalone/drakbackup:1137
 #, c-format
 msgid ""
 " Error while sending mail. \n"
 ""
 msgstr ""
 
-#: standalone/drakbackup:1166
+#: standalone/drakbackup:1167
 #, c-format
 msgid "Can not create catalog!"
 msgstr ""
 
-#: standalone/drakbackup:1320
+#: standalone/drakbackup:1321
 #, c-format
 msgid "Problem installing %s"
 msgstr ""
 
-#: standalone/drakbackup:1408
+#: standalone/drakbackup:1409
 #, c-format
 msgid "Backup your System files. (/etc directory)"
 msgstr ""
 
-#: standalone/drakbackup:1409 standalone/drakbackup:1472 standalone/drakbackup:1538
+#: standalone/drakbackup:1410 standalone/drakbackup:1473 standalone/drakbackup:1539
 #, c-format
 msgid "Use Incremental/Differential Backups  (do not replace old backups)"
 msgstr ""
 
-#: standalone/drakbackup:1411 standalone/drakbackup:1474 standalone/drakbackup:1540
+#: standalone/drakbackup:1412 standalone/drakbackup:1475 standalone/drakbackup:1541
 #, c-format
 msgid "Use Incremental Backups"
 msgstr ""
 
-#: standalone/drakbackup:1411 standalone/drakbackup:1474 standalone/drakbackup:1540
+#: standalone/drakbackup:1412 standalone/drakbackup:1475 standalone/drakbackup:1541
 #, c-format
 msgid "Use Differential Backups"
 msgstr ""
 
-#: standalone/drakbackup:1413
+#: standalone/drakbackup:1414
 #, c-format
 msgid "Do not include critical files (passwd, group, fstab)"
 msgstr ""
 
-#: standalone/drakbackup:1444
+#: standalone/drakbackup:1445
 #, c-format
 msgid "Please check all users that you want to include in your backup."
 msgstr ""
 
-#: standalone/drakbackup:1471
+#: standalone/drakbackup:1472
 #, c-format
 msgid "Do not include the browser cache"
 msgstr ""
 
-#: standalone/drakbackup:1525
+#: standalone/drakbackup:1526
 #, c-format
 msgid "Select the files or directories and click on 'OK'"
 msgstr ""
 
-#: standalone/drakbackup:1526 standalone/drakfont:657
+#: standalone/drakbackup:1527 standalone/drakfont:657
 #, c-format
 msgid "Remove Selected"
 msgstr ""
 
-#: standalone/drakbackup:1589
+#: standalone/drakbackup:1590
 #, c-format
 msgid "Users"
 msgstr ""
 
-#: standalone/drakbackup:1609
+#: standalone/drakbackup:1610
 #, c-format
 msgid "Use network connection to backup"
 msgstr ""
 
-#: standalone/drakbackup:1611
+#: standalone/drakbackup:1612
 #, c-format
 msgid "Net Method:"
 msgstr ""
 
-#: standalone/drakbackup:1615
+#: standalone/drakbackup:1616
 #, c-format
 msgid "Use Expect for SSH"
 msgstr ""
 
-#: standalone/drakbackup:1616
+#: standalone/drakbackup:1617
 #, c-format
 msgid "Create/Transfer backup keys for SSH"
 msgstr ""
 
-#: standalone/drakbackup:1618
+#: standalone/drakbackup:1619
 #, c-format
 msgid "Transfer Now"
 msgstr ""
 
-#: standalone/drakbackup:1620
+#: standalone/drakbackup:1621
 #, c-format
 msgid "Other (not drakbackup) keys in place already"
 msgstr ""
 
-#: standalone/drakbackup:1623
+#: standalone/drakbackup:1624
 #, c-format
 msgid "Host name or IP."
 msgstr ""
 
-#: standalone/drakbackup:1628
+#: standalone/drakbackup:1629
 #, c-format
 msgid "Directory (or module) to put the backup on this host."
 msgstr ""
 
-#: standalone/drakbackup:1640
+#: standalone/drakbackup:1641
 #, c-format
 msgid "Remember this password"
 msgstr ""
 
-#: standalone/drakbackup:1652
+#: standalone/drakbackup:1653
 #, c-format
 msgid "Need hostname, username and password!"
 msgstr ""
 
-#: standalone/drakbackup:1743
+#: standalone/drakbackup:1744
 #, c-format
 msgid "Use CD-R/DVD-R to backup"
 msgstr ""
 
-#: standalone/drakbackup:1746
+#: standalone/drakbackup:1747
 #, c-format
 msgid "Choose your CD/DVD device"
 msgstr ""
 
-#: standalone/drakbackup:1751
+#: standalone/drakbackup:1752
 #, c-format
 msgid "Choose your CD/DVD media size"
 msgstr ""
 
-#: standalone/drakbackup:1758
+#: standalone/drakbackup:1759
 #, c-format
 msgid "Multisession CD"
 msgstr ""
 
-#: standalone/drakbackup:1760
+#: standalone/drakbackup:1761
 #, c-format
 msgid "CDRW media"
 msgstr ""
 
-#: standalone/drakbackup:1766
+#: standalone/drakbackup:1767
 #, c-format
 msgid "Erase your RW media (1st Session)"
 msgstr ""
 
-#: standalone/drakbackup:1767
+#: standalone/drakbackup:1768
 #, c-format
 msgid " Erase Now "
 msgstr ""
 
-#: standalone/drakbackup:1773
+#: standalone/drakbackup:1774
 #, c-format
 msgid "DVD+RW media"
 msgstr ""
 
-#: standalone/drakbackup:1775
+#: standalone/drakbackup:1776
 #, c-format
 msgid "DVD-R media"
 msgstr ""
 
-#: standalone/drakbackup:1777
+#: standalone/drakbackup:1778
 #, c-format
 msgid "DVDRAM device"
 msgstr ""
 
-#: standalone/drakbackup:1808
+#: standalone/drakbackup:1809
 #, c-format
 msgid "No CD device defined!"
 msgstr ""
 
-#: standalone/drakbackup:1850
+#: standalone/drakbackup:1851
 #, c-format
 msgid "Use tape to backup"
 msgstr ""
 
-#: standalone/drakbackup:1853
+#: standalone/drakbackup:1854
 #, c-format
 msgid "Device name to use for backup"
 msgstr ""
 
-#: standalone/drakbackup:1859
+#: standalone/drakbackup:1860
 #, c-format
 msgid "Backup directly to tape"
 msgstr ""
 
-#: standalone/drakbackup:1865
+#: standalone/drakbackup:1866
 #, c-format
 msgid "Use tape hardware compression (EXPERIMENTAL)"
 msgstr ""
 
-#: standalone/drakbackup:1871
+#: standalone/drakbackup:1872
 #, c-format
 msgid "Do not rewind tape after backup"
 msgstr ""
 
-#: standalone/drakbackup:1877
+#: standalone/drakbackup:1878
 #, c-format
 msgid "Erase tape before backup"
 msgstr ""
 
-#: standalone/drakbackup:1883
+#: standalone/drakbackup:1884
 #, c-format
 msgid "Eject tape after the backup"
 msgstr ""
 
-#: standalone/drakbackup:1964
+#: standalone/drakbackup:1965
 #, c-format
 msgid "Enter the directory to save to:"
 msgstr ""
 
-#: standalone/drakbackup:1968
+#: standalone/drakbackup:1969
 #, c-format
 msgid "Directory to save to"
 msgstr ""
 
-#: standalone/drakbackup:1973
+#: standalone/drakbackup:1974
 #, c-format
 msgid ""
 "Maximum disk space\n"
 " allocated for backups (MB)"
 msgstr ""
 
-#: standalone/drakbackup:1977
+#: standalone/drakbackup:1978
 #, c-format
 msgid ""
 "Delete incremental or differential\n"
@@ -15435,337 +15423,337 @@ msgid ""
 " (0 is keep all backups) to save space"
 msgstr ""
 
-#: standalone/drakbackup:2044
+#: standalone/drakbackup:2045
 #, c-format
 msgid "CD-R / DVD-R"
 msgstr ""
 
-#: standalone/drakbackup:2049
+#: standalone/drakbackup:2050
 #, c-format
 msgid "HardDrive / NFS"
 msgstr ""
 
-#: standalone/drakbackup:2064 standalone/drakbackup:2065 standalone/drakbackup:2070
+#: standalone/drakbackup:2065 standalone/drakbackup:2066 standalone/drakbackup:2071
 #, c-format
 msgid "hourly"
 msgstr ""
 
-#: standalone/drakbackup:2064 standalone/drakbackup:2066 standalone/drakbackup:2071
+#: standalone/drakbackup:2065 standalone/drakbackup:2067 standalone/drakbackup:2072
 #, c-format
 msgid "daily"
 msgstr ""
 
-#: standalone/drakbackup:2064 standalone/drakbackup:2067 standalone/drakbackup:2072
+#: standalone/drakbackup:2065 standalone/drakbackup:2068 standalone/drakbackup:2073
 #, c-format
 msgid "weekly"
 msgstr ""
 
-#: standalone/drakbackup:2064 standalone/drakbackup:2068 standalone/drakbackup:2073
+#: standalone/drakbackup:2065 standalone/drakbackup:2069 standalone/drakbackup:2074
 #, c-format
 msgid "monthly"
 msgstr ""
 
-#: standalone/drakbackup:2064 standalone/drakbackup:2069 standalone/drakbackup:2074
+#: standalone/drakbackup:2065 standalone/drakbackup:2070 standalone/drakbackup:2075
 #, c-format
 msgid "custom"
 msgstr ""
 
-#: standalone/drakbackup:2078
+#: standalone/drakbackup:2079
 #, c-format
 msgid "January"
 msgstr ""
 
-#: standalone/drakbackup:2078
+#: standalone/drakbackup:2079
 #, c-format
 msgid "February"
 msgstr ""
 
-#: standalone/drakbackup:2078
+#: standalone/drakbackup:2079
 #, c-format
 msgid "March"
 msgstr ""
 
-#: standalone/drakbackup:2079
+#: standalone/drakbackup:2080
 #, c-format
 msgid "April"
 msgstr ""
 
-#: standalone/drakbackup:2079
+#: standalone/drakbackup:2080
 #, c-format
 msgid "May"
 msgstr ""
 
-#: standalone/drakbackup:2079
+#: standalone/drakbackup:2080
 #, c-format
 msgid "June"
 msgstr ""
 
-#: standalone/drakbackup:2079
+#: standalone/drakbackup:2080
 #, c-format
 msgid "July"
 msgstr ""
 
-#: standalone/drakbackup:2079
+#: standalone/drakbackup:2080
 #, c-format
 msgid "August"
 msgstr ""
 
-#: standalone/drakbackup:2079
+#: standalone/drakbackup:2080
 #, c-format
 msgid "September"
 msgstr ""
 
-#: standalone/drakbackup:2080
+#: standalone/drakbackup:2081
 #, c-format
 msgid "October"
 msgstr ""
 
-#: standalone/drakbackup:2080
+#: standalone/drakbackup:2081
 #, c-format
 msgid "November"
 msgstr ""
 
-#: standalone/drakbackup:2080
+#: standalone/drakbackup:2081
 #, c-format
 msgid "December"
 msgstr ""
 
-#: standalone/drakbackup:2083
+#: standalone/drakbackup:2084
 #, c-format
 msgid "Sunday"
 msgstr ""
 
-#: standalone/drakbackup:2083
+#: standalone/drakbackup:2084
 #, c-format
 msgid "Monday"
 msgstr ""
 
-#: standalone/drakbackup:2083
+#: standalone/drakbackup:2084
 #, c-format
 msgid "Tuesday"
 msgstr ""
 
-#: standalone/drakbackup:2084
+#: standalone/drakbackup:2085
 #, c-format
 msgid "Wednesday"
 msgstr ""
 
-#: standalone/drakbackup:2084
+#: standalone/drakbackup:2085
 #, c-format
 msgid "Thursday"
 msgstr ""
 
-#: standalone/drakbackup:2084
+#: standalone/drakbackup:2085
 #, c-format
 msgid "Friday"
 msgstr ""
 
-#: standalone/drakbackup:2084
+#: standalone/drakbackup:2085
 #, c-format
 msgid "Saturday"
 msgstr ""
 
-#: standalone/drakbackup:2114
+#: standalone/drakbackup:2115
 #, c-format
 msgid "Delete cron entry"
 msgstr ""
 
-#: standalone/drakbackup:2115
+#: standalone/drakbackup:2116
 #, c-format
 msgid "Add cron entry"
 msgstr ""
 
-#: standalone/drakbackup:2173
+#: standalone/drakbackup:2174
 #, c-format
 msgid "Use daemon"
 msgstr ""
 
-#: standalone/drakbackup:2177
+#: standalone/drakbackup:2178
 #, c-format
 msgid "Please choose the time interval between each backup"
 msgstr ""
 
-#: standalone/drakbackup:2185
+#: standalone/drakbackup:2186
 #, c-format
 msgid "Minute"
 msgstr ""
 
-#: standalone/drakbackup:2189
+#: standalone/drakbackup:2190
 #, c-format
 msgid "Hour"
 msgstr ""
 
-#: standalone/drakbackup:2193
+#: standalone/drakbackup:2194
 #, c-format
 msgid "Day"
 msgstr ""
 
-#: standalone/drakbackup:2197
+#: standalone/drakbackup:2198
 #, c-format
 msgid "Month"
 msgstr ""
 
-#: standalone/drakbackup:2201
+#: standalone/drakbackup:2202
 #, c-format
 msgid "Weekday (start)"
 msgstr ""
 
-#: standalone/drakbackup:2205
+#: standalone/drakbackup:2206
 #, c-format
 msgid "Weekday (end)"
 msgstr ""
 
-#: standalone/drakbackup:2209
+#: standalone/drakbackup:2210
 #, c-format
 msgid "Profile"
 msgstr ""
 
-#: standalone/drakbackup:2215
+#: standalone/drakbackup:2216
 #, c-format
 msgid "Current crontab:"
 msgstr ""
 
-#: standalone/drakbackup:2223
+#: standalone/drakbackup:2224
 #, c-format
 msgid "Please choose the media for backup."
 msgstr ""
 
-#: standalone/drakbackup:2227
+#: standalone/drakbackup:2228
 #, c-format
 msgid "Please be sure that the cron daemon is included in your services."
 msgstr ""
 
-#: standalone/drakbackup:2228
+#: standalone/drakbackup:2229
 #, c-format
 msgid "If your machine is not on all the time, you might want to install anacron."
 msgstr ""
 
-#: standalone/drakbackup:2304
+#: standalone/drakbackup:2293
 #, c-format
 msgid "Please choose the archive program"
 msgstr ""
 
-#: standalone/drakbackup:2309
+#: standalone/drakbackup:2298
 #, c-format
 msgid "Please choose the compression type"
 msgstr ""
 
-#: standalone/drakbackup:2313
+#: standalone/drakbackup:2302
 #, c-format
 msgid "Use .backupignore files"
 msgstr ""
 
-#: standalone/drakbackup:2315
+#: standalone/drakbackup:2304
 #, c-format
 msgid "Send mail report after each backup to:"
 msgstr ""
 
-#: standalone/drakbackup:2321
+#: standalone/drakbackup:2310
 #, c-format
 msgid "Return address for sent mail:"
 msgstr ""
 
-#: standalone/drakbackup:2327
+#: standalone/drakbackup:2316
 #, c-format
 msgid "SMTP server for mail:"
 msgstr ""
 
-#: standalone/drakbackup:2331
+#: standalone/drakbackup:2320
 #, c-format
 msgid "Delete Hard Drive tar files after backup to other media."
 msgstr ""
 
-#: standalone/drakbackup:2332
+#: standalone/drakbackup:2321
 #, c-format
 msgid "View restore log after file restore."
 msgstr ""
 
-#: standalone/drakbackup:2377
+#: standalone/drakbackup:2366
 #, c-format
 msgid "What"
 msgstr ""
 
-#: standalone/drakbackup:2382
+#: standalone/drakbackup:2371
 #, c-format
 msgid "Where"
 msgstr ""
 
-#: standalone/drakbackup:2387
+#: standalone/drakbackup:2376
 #, c-format
 msgid "When"
 msgstr ""
 
-#: standalone/drakbackup:2392
+#: standalone/drakbackup:2381
 #, c-format
 msgid "More Options"
 msgstr ""
 
-#: standalone/drakbackup:2405
+#: standalone/drakbackup:2394
 #, c-format
 msgid "Backup destination not configured..."
 msgstr ""
 
-#: standalone/drakbackup:2425 standalone/drakbackup:4350
+#: standalone/drakbackup:2414 standalone/drakbackup:4339
 #, c-format
 msgid "Drakbackup Configuration"
 msgstr ""
 
-#: standalone/drakbackup:2441
+#: standalone/drakbackup:2430
 #, c-format
 msgid "Please choose where you want to backup"
 msgstr ""
 
-#: standalone/drakbackup:2444
+#: standalone/drakbackup:2433
 #, c-format
 msgid "Hard Drive used to prepare backups for all media"
 msgstr ""
 
-#: standalone/drakbackup:2444
+#: standalone/drakbackup:2433
 #, c-format
 msgid "Across Network"
 msgstr ""
 
-#: standalone/drakbackup:2444
+#: standalone/drakbackup:2433
 #, c-format
 msgid "On CD-R"
 msgstr ""
 
-#: standalone/drakbackup:2444
+#: standalone/drakbackup:2433
 #, c-format
 msgid "On Tape Device"
 msgstr ""
 
-#: standalone/drakbackup:2490
+#: standalone/drakbackup:2479
 #, c-format
 msgid "Backup Users"
 msgstr ""
 
-#: standalone/drakbackup:2491
+#: standalone/drakbackup:2480
 #, c-format
 msgid " (Default is all users)"
 msgstr ""
 
-#: standalone/drakbackup:2504
+#: standalone/drakbackup:2493
 #, c-format
 msgid "Please choose what you want to backup"
 msgstr ""
 
-#: standalone/drakbackup:2505
+#: standalone/drakbackup:2494
 #, c-format
 msgid "Backup System"
 msgstr ""
 
-#: standalone/drakbackup:2507
+#: standalone/drakbackup:2496
 #, c-format
 msgid "Select user manually"
 msgstr ""
 
-#: standalone/drakbackup:2536
+#: standalone/drakbackup:2525
 #, c-format
 msgid "Please select data to backup..."
 msgstr ""
 
-#: standalone/drakbackup:2608
+#: standalone/drakbackup:2597
 #, c-format
 msgid ""
 "\n"
@@ -15773,7 +15761,7 @@ msgid ""
 ""
 msgstr ""
 
-#: standalone/drakbackup:2609
+#: standalone/drakbackup:2598
 #, c-format
 msgid ""
 "\n"
@@ -15781,7 +15769,7 @@ msgid ""
 ""
 msgstr ""
 
-#: standalone/drakbackup:2611
+#: standalone/drakbackup:2600
 #, c-format
 msgid ""
 "\n"
@@ -15789,7 +15777,7 @@ msgid ""
 ""
 msgstr ""
 
-#: standalone/drakbackup:2613
+#: standalone/drakbackup:2602
 #, c-format
 msgid ""
 "\n"
@@ -15797,7 +15785,7 @@ msgid ""
 ""
 msgstr ""
 
-#: standalone/drakbackup:2615
+#: standalone/drakbackup:2604
 #, c-format
 msgid ""
 "\n"
@@ -15805,21 +15793,21 @@ msgid ""
 ""
 msgstr ""
 
-#: standalone/drakbackup:2616
+#: standalone/drakbackup:2605
 #, c-format
 msgid ""
 "\tLimit disk usage to %s MB\n"
 ""
 msgstr ""
 
-#: standalone/drakbackup:2617
+#: standalone/drakbackup:2606
 #, c-format
 msgid ""
 "\tDelete backups older than %s day(s)\n"
 ""
 msgstr ""
 
-#: standalone/drakbackup:2620
+#: standalone/drakbackup:2609
 #, c-format
 msgid ""
 "\n"
@@ -15827,48 +15815,48 @@ msgid ""
 ""
 msgstr ""
 
-#: standalone/drakbackup:2625
+#: standalone/drakbackup:2614
 #, c-format
 msgid ""
 "\n"
 "- Burn to CD"
 msgstr ""
 
-#: standalone/drakbackup:2626
+#: standalone/drakbackup:2615
 #, c-format
 msgid "RW"
 msgstr ""
 
-#: standalone/drakbackup:2627
+#: standalone/drakbackup:2616
 #, c-format
 msgid " on device: %s"
 msgstr ""
 
-#: standalone/drakbackup:2628
+#: standalone/drakbackup:2617
 #, c-format
 msgid " (multi-session)"
 msgstr ""
 
-#: standalone/drakbackup:2629
+#: standalone/drakbackup:2618
 #, c-format
 msgid ""
 "\n"
 "- Save to Tape on device: %s"
 msgstr ""
 
-#: standalone/drakbackup:2630
+#: standalone/drakbackup:2619
 #, c-format
 msgid "\t\tErase=%s"
 msgstr ""
 
-#: standalone/drakbackup:2632
+#: standalone/drakbackup:2621
 #, c-format
 msgid ""
 "\tBackup directly to Tape\n"
 ""
 msgstr ""
 
-#: standalone/drakbackup:2634
+#: standalone/drakbackup:2623
 #, c-format
 msgid ""
 "\n"
@@ -15876,7 +15864,7 @@ msgid ""
 ""
 msgstr ""
 
-#: standalone/drakbackup:2635
+#: standalone/drakbackup:2624
 #, c-format
 msgid ""
 "\t\t user name: %s\n"
@@ -15884,7 +15872,7 @@ msgid ""
 ""
 msgstr ""
 
-#: standalone/drakbackup:2636
+#: standalone/drakbackup:2625
 #, c-format
 msgid ""
 "\n"
@@ -15892,63 +15880,63 @@ msgid ""
 ""
 msgstr ""
 
-#: standalone/drakbackup:2637
+#: standalone/drakbackup:2626
 #, c-format
 msgid ""
 "\tDo not include System Files\n"
 ""
 msgstr ""
 
-#: standalone/drakbackup:2639
+#: standalone/drakbackup:2628
 #, c-format
 msgid ""
 "\tBackups use %s and bzip2\n"
 ""
 msgstr ""
 
-#: standalone/drakbackup:2640
+#: standalone/drakbackup:2629
 #, c-format
 msgid ""
 "\tBackups use %s and gzip\n"
 ""
 msgstr ""
 
-#: standalone/drakbackup:2641
+#: standalone/drakbackup:2630
 #, c-format
 msgid ""
 "\tBackups use %s only\n"
 ""
 msgstr ""
 
-#: standalone/drakbackup:2643
+#: standalone/drakbackup:2632
 #, c-format
 msgid ""
 "\tUse .backupignore files\n"
 ""
 msgstr ""
 
-#: standalone/drakbackup:2644
+#: standalone/drakbackup:2633
 #, c-format
 msgid ""
 "\tSend mail to %s\n"
 ""
 msgstr ""
 
-#: standalone/drakbackup:2645
+#: standalone/drakbackup:2634
 #, c-format
 msgid ""
 "\tSend mail from %s\n"
 ""
 msgstr ""
 
-#: standalone/drakbackup:2646
+#: standalone/drakbackup:2635
 #, c-format
 msgid ""
 "\tUsing SMTP server %s\n"
 ""
 msgstr ""
 
-#: standalone/drakbackup:2648
+#: standalone/drakbackup:2637
 #, c-format
 msgid ""
 "\n"
@@ -15956,56 +15944,56 @@ msgid ""
 ""
 msgstr ""
 
-#: standalone/drakbackup:2649
+#: standalone/drakbackup:2638
 #, c-format
 msgid ""
 "\t-Hard drive.\n"
 ""
 msgstr ""
 
-#: standalone/drakbackup:2650
+#: standalone/drakbackup:2639
 #, c-format
 msgid ""
 "\t-CD-R.\n"
 ""
 msgstr ""
 
-#: standalone/drakbackup:2651
+#: standalone/drakbackup:2640
 #, c-format
 msgid ""
 "\t-Tape \n"
 ""
 msgstr ""
 
-#: standalone/drakbackup:2652
+#: standalone/drakbackup:2641
 #, c-format
 msgid ""
 "\t-Network by FTP.\n"
 ""
 msgstr ""
 
-#: standalone/drakbackup:2653
+#: standalone/drakbackup:2642
 #, c-format
 msgid ""
 "\t-Network by SSH.\n"
 ""
 msgstr ""
 
-#: standalone/drakbackup:2654
+#: standalone/drakbackup:2643
 #, c-format
 msgid ""
 "\t-Network by rsync.\n"
 ""
 msgstr ""
 
-#: standalone/drakbackup:2656
+#: standalone/drakbackup:2645
 #, c-format
 msgid ""
 "No configuration, please click Wizard or Advanced.\n"
 ""
 msgstr ""
 
-#: standalone/drakbackup:2661
+#: standalone/drakbackup:2650
 #, c-format
 msgid ""
 "List of data to restore:\n"
@@ -16013,35 +16001,35 @@ msgid ""
 ""
 msgstr ""
 
-#: standalone/drakbackup:2663
+#: standalone/drakbackup:2652
 #, c-format
 msgid ""
 "- Restore System Files.\n"
 ""
 msgstr ""
 
-#: standalone/drakbackup:2665 standalone/drakbackup:2675
+#: standalone/drakbackup:2654 standalone/drakbackup:2664
 #, c-format
 msgid ""
 "   - from date: %s %s\n"
 ""
 msgstr ""
 
-#: standalone/drakbackup:2668
+#: standalone/drakbackup:2657
 #, c-format
 msgid ""
 "- Restore User Files: \n"
 ""
 msgstr ""
 
-#: standalone/drakbackup:2673
+#: standalone/drakbackup:2662
 #, c-format
 msgid ""
 "- Restore Other Files: \n"
 ""
 msgstr ""
 
-#: standalone/drakbackup:2852
+#: standalone/drakbackup:2841
 #, c-format
 msgid ""
 "List of data corrupted:\n"
@@ -16049,406 +16037,406 @@ msgid ""
 ""
 msgstr ""
 
-#: standalone/drakbackup:2854
+#: standalone/drakbackup:2843
 #, c-format
 msgid "Please uncheck or remove it on next time."
 msgstr ""
 
-#: standalone/drakbackup:2864
+#: standalone/drakbackup:2853
 #, c-format
 msgid "Backup files are corrupted"
 msgstr ""
 
-#: standalone/drakbackup:2885
+#: standalone/drakbackup:2874
 #, c-format
 msgid "          All of your selected data have been          "
 msgstr ""
 
-#: standalone/drakbackup:2886
+#: standalone/drakbackup:2875
 #, c-format
 msgid "          Successfully Restored on %s       "
 msgstr ""
 
-#: standalone/drakbackup:2987
+#: standalone/drakbackup:2976
 #, c-format
 msgid "/usr/bin/star not found, using tar..."
 msgstr ""
 
-#: standalone/drakbackup:3023
+#: standalone/drakbackup:3012
 #, c-format
 msgid "         Restore Configuration       "
 msgstr ""
 
-#: standalone/drakbackup:3051
+#: standalone/drakbackup:3040
 #, c-format
 msgid "OK to restore the other files."
 msgstr ""
 
-#: standalone/drakbackup:3067
+#: standalone/drakbackup:3056
 #, c-format
 msgid "User list to restore (only the most recent date per user is important)"
 msgstr ""
 
-#: standalone/drakbackup:3132
+#: standalone/drakbackup:3121
 #, c-format
 msgid "Please choose the date to restore:"
 msgstr ""
 
-#: standalone/drakbackup:3169
+#: standalone/drakbackup:3158
 #, c-format
 msgid "Restore from Hard Disk."
 msgstr ""
 
-#: standalone/drakbackup:3171
+#: standalone/drakbackup:3160
 #, c-format
 msgid "Enter the directory where backups are stored"
 msgstr ""
 
-#: standalone/drakbackup:3175
+#: standalone/drakbackup:3164
 #, c-format
 msgid "Directory with backups"
 msgstr ""
 
-#: standalone/drakbackup:3229
+#: standalone/drakbackup:3218
 #, c-format
 msgid "Select another media to restore from"
 msgstr ""
 
-#: standalone/drakbackup:3231
+#: standalone/drakbackup:3220
 #, c-format
 msgid "Other Media"
 msgstr ""
 
-#: standalone/drakbackup:3236
+#: standalone/drakbackup:3225
 #, c-format
 msgid "Restore system"
 msgstr ""
 
-#: standalone/drakbackup:3237
+#: standalone/drakbackup:3226
 #, c-format
 msgid "Restore Users"
 msgstr ""
 
-#: standalone/drakbackup:3238
+#: standalone/drakbackup:3227
 #, c-format
 msgid "Restore Other"
 msgstr ""
 
-#: standalone/drakbackup:3240
+#: standalone/drakbackup:3229
 #, c-format
 msgid "Select path to restore (instead of /)"
 msgstr ""
 
-#: standalone/drakbackup:3244 standalone/drakbackup:3525
+#: standalone/drakbackup:3233 standalone/drakbackup:3514
 #, c-format
 msgid "Path To Restore To"
 msgstr ""
 
-#: standalone/drakbackup:3247
+#: standalone/drakbackup:3236
 #, c-format
 msgid "Do new backup before restore (only for incremental backups.)"
 msgstr ""
 
-#: standalone/drakbackup:3249
+#: standalone/drakbackup:3238
 #, c-format
 msgid "Remove user directories before restore."
 msgstr ""
 
-#: standalone/drakbackup:3333
+#: standalone/drakbackup:3322
 #, c-format
 msgid "Filename text substring to search for (empty string matches all):"
 msgstr ""
 
-#: standalone/drakbackup:3336
+#: standalone/drakbackup:3325
 #, c-format
 msgid "Search Backups"
 msgstr ""
 
-#: standalone/drakbackup:3354
+#: standalone/drakbackup:3343
 #, c-format
 msgid "No matches found..."
 msgstr ""
 
-#: standalone/drakbackup:3358
+#: standalone/drakbackup:3347
 #, c-format
 msgid "Restore Selected"
 msgstr ""
 
-#: standalone/drakbackup:3493
+#: standalone/drakbackup:3482
 #, c-format
 msgid ""
 "Click date/time to see backup files.\n"
 "Ctrl-Click files to select multiple files."
 msgstr ""
 
-#: standalone/drakbackup:3499
+#: standalone/drakbackup:3488
 #, c-format
 msgid ""
 "Restore Selected\n"
 "Catalog Entry"
 msgstr ""
 
-#: standalone/drakbackup:3508
+#: standalone/drakbackup:3497
 #, c-format
 msgid ""
 "Restore Selected\n"
 "Files"
 msgstr ""
 
-#: standalone/drakbackup:3584
+#: standalone/drakbackup:3573
 #, c-format
 msgid "Backup files not found at %s."
 msgstr ""
 
-#: standalone/drakbackup:3597
+#: standalone/drakbackup:3586
 #, c-format
 msgid "Restore From CD"
 msgstr ""
 
-#: standalone/drakbackup:3597
+#: standalone/drakbackup:3586
 #, c-format
 msgid ""
 "Insert the CD with volume label %s\n"
 " in the CD drive under mount point /mnt/cdrom"
 msgstr ""
 
-#: standalone/drakbackup:3599
+#: standalone/drakbackup:3588
 #, c-format
 msgid "Not the correct CD label. Disk is labelled %s."
 msgstr ""
 
-#: standalone/drakbackup:3609
+#: standalone/drakbackup:3598
 #, c-format
 msgid "Restore From Tape"
 msgstr ""
 
-#: standalone/drakbackup:3609
+#: standalone/drakbackup:3598
 #, c-format
 msgid ""
 "Insert the tape with volume label %s\n"
 " in the tape drive device %s"
 msgstr ""
 
-#: standalone/drakbackup:3611
+#: standalone/drakbackup:3600
 #, c-format
 msgid "Not the correct tape label. Tape is labelled %s."
 msgstr ""
 
-#: standalone/drakbackup:3622
+#: standalone/drakbackup:3611
 #, c-format
 msgid "Restore Via Network"
 msgstr ""
 
-#: standalone/drakbackup:3622
+#: standalone/drakbackup:3611
 #, c-format
 msgid "Restore Via Network Protocol: %s"
 msgstr ""
 
-#: standalone/drakbackup:3623
+#: standalone/drakbackup:3612
 #, c-format
 msgid "Host Name"
 msgstr ""
 
-#: standalone/drakbackup:3624
+#: standalone/drakbackup:3613
 #, c-format
 msgid "Host Path or Module"
 msgstr ""
 
-#: standalone/drakbackup:3631
+#: standalone/drakbackup:3620
 #, c-format
 msgid "Password required"
 msgstr ""
 
-#: standalone/drakbackup:3637
+#: standalone/drakbackup:3626
 #, c-format
 msgid "Username required"
 msgstr ""
 
-#: standalone/drakbackup:3640
+#: standalone/drakbackup:3629
 #, c-format
 msgid "Hostname required"
 msgstr ""
 
-#: standalone/drakbackup:3645
+#: standalone/drakbackup:3634
 #, c-format
 msgid "Path or Module required"
 msgstr ""
 
-#: standalone/drakbackup:3657
+#: standalone/drakbackup:3646
 #, c-format
 msgid "Files Restored..."
 msgstr ""
 
-#: standalone/drakbackup:3660
+#: standalone/drakbackup:3649
 #, c-format
 msgid "Restore Failed..."
 msgstr ""
 
-#: standalone/drakbackup:3688
+#: standalone/drakbackup:3677
 #, c-format
 msgid "%s not retrieved..."
 msgstr ""
 
-#: standalone/drakbackup:3912 standalone/drakbackup:3981
+#: standalone/drakbackup:3901 standalone/drakbackup:3970
 #, c-format
 msgid "Search for files to restore"
 msgstr ""
 
-#: standalone/drakbackup:3916
+#: standalone/drakbackup:3905
 #, c-format
 msgid "Restore all backups"
 msgstr ""
 
-#: standalone/drakbackup:3924
+#: standalone/drakbackup:3913
 #, c-format
 msgid "Custom Restore"
 msgstr ""
 
-#: standalone/drakbackup:3928 standalone/drakbackup:3977
+#: standalone/drakbackup:3917 standalone/drakbackup:3966
 #, c-format
 msgid "Restore From Catalog"
 msgstr ""
 
-#: standalone/drakbackup:3949
+#: standalone/drakbackup:3938
 #, c-format
 msgid ""
 "Unable to find backups to restore...\n"
 ""
 msgstr ""
 
-#: standalone/drakbackup:3950
+#: standalone/drakbackup:3939
 #, c-format
 msgid "Verify that %s is the correct path"
 msgstr ""
 
-#: standalone/drakbackup:3951
+#: standalone/drakbackup:3940
 #, c-format
 msgid " and the CD is in the drive"
 msgstr ""
 
-#: standalone/drakbackup:3953
+#: standalone/drakbackup:3942
 #, c-format
 msgid "Backups on unmountable media - Use Catalog to restore"
 msgstr ""
 
-#: standalone/drakbackup:3969
+#: standalone/drakbackup:3958
 #, c-format
 msgid "CD in place - continue."
 msgstr ""
 
-#: standalone/drakbackup:3974
+#: standalone/drakbackup:3963
 #, c-format
 msgid "Browse to new restore repository."
 msgstr ""
 
-#: standalone/drakbackup:3975
+#: standalone/drakbackup:3964
 #, c-format
 msgid "Directory To Restore From"
 msgstr ""
 
-#: standalone/drakbackup:4011
+#: standalone/drakbackup:4000
 #, c-format
 msgid "Restore Progress"
 msgstr ""
 
-#: standalone/drakbackup:4119
+#: standalone/drakbackup:4108
 #, c-format
 msgid "Build Backup"
 msgstr ""
 
-#: standalone/drakbackup:4152 standalone/drakbackup:4449
+#: standalone/drakbackup:4141 standalone/drakbackup:4438
 #, c-format
 msgid "Restore"
 msgstr ""
 
-#: standalone/drakbackup:4244
+#: standalone/drakbackup:4233
 #, c-format
 msgid "Please select data to restore..."
 msgstr ""
 
-#: standalone/drakbackup:4284
+#: standalone/drakbackup:4273
 #, c-format
 msgid "Backup system files"
 msgstr ""
 
-#: standalone/drakbackup:4287
+#: standalone/drakbackup:4276
 #, c-format
 msgid "Backup user files"
 msgstr ""
 
-#: standalone/drakbackup:4290
+#: standalone/drakbackup:4279
 #, c-format
 msgid "Backup other files"
 msgstr ""
 
-#: standalone/drakbackup:4293 standalone/drakbackup:4327
+#: standalone/drakbackup:4282 standalone/drakbackup:4316
 #, c-format
 msgid "Total Progress"
 msgstr ""
 
-#: standalone/drakbackup:4319
+#: standalone/drakbackup:4308
 #, c-format
 msgid "Sending files by FTP"
 msgstr ""
 
-#: standalone/drakbackup:4322
+#: standalone/drakbackup:4311
 #, c-format
 msgid "Sending files..."
 msgstr ""
 
-#: standalone/drakbackup:4392
+#: standalone/drakbackup:4381
 #, c-format
 msgid "Backup Now from configuration file"
 msgstr ""
 
-#: standalone/drakbackup:4397
+#: standalone/drakbackup:4386
 #, c-format
 msgid "View Backup Configuration."
 msgstr ""
 
-#: standalone/drakbackup:4423
+#: standalone/drakbackup:4412
 #, c-format
 msgid "Wizard Configuration"
 msgstr ""
 
-#: standalone/drakbackup:4428
+#: standalone/drakbackup:4417
 #, c-format
 msgid "Advanced Configuration"
 msgstr ""
 
-#: standalone/drakbackup:4433
+#: standalone/drakbackup:4422
 #, c-format
 msgid "View Configuration"
 msgstr ""
 
-#: standalone/drakbackup:4437
+#: standalone/drakbackup:4426
 #, c-format
 msgid "View Last Log"
 msgstr ""
 
-#: standalone/drakbackup:4442
+#: standalone/drakbackup:4431
 #, c-format
 msgid "Backup Now"
 msgstr ""
 
-#: standalone/drakbackup:4446
+#: standalone/drakbackup:4435
 #, c-format
 msgid ""
 "No configuration file found \n"
 "please click Wizard or Advanced."
 msgstr ""
 
-#: standalone/drakbackup:4484
+#: standalone/drakbackup:4473
 #, c-format
 msgid "Load profile"
 msgstr ""
 
-#: standalone/drakbackup:4493
+#: standalone/drakbackup:4482
 #, c-format
 msgid "Save profile as..."
 msgstr ""
 
-#: standalone/drakbackup:4515 standalone/drakbackup:4518
+#: standalone/drakbackup:4504 standalone/drakbackup:4507
 #, c-format
 msgid "Drakbackup"
 msgstr ""
diff --git a/perl-install/share/po/af.po b/perl-install/share/po/af.po
index c07bc3eba..0c2defea5 100644
--- a/perl-install/share/po/af.po
+++ b/perl-install/share/po/af.po
@@ -2581,11 +2581,11 @@ msgstr "Nuwe grootte in MB: "
 #, c-format
 msgid ""
 "To ensure data integrity after resizing the partition(s), \n"
-"filesystem checks will be run on your next boot into Windows(TM)"
+"filesystem checks will be run on your next boot into Microsoft Windows®"
 msgstr ""
 "Om Data-integriteit te verseker nadat u die partisie(s)\n"
 "verklien het,sal daar toetste op u lêerstelsel(s) gedoen word,\n"
-"volgende keer as Windows(TM) selflaai"
+"volgende keer as Windows™ selflaai"
 
 #: diskdrake/interactive.pm:851
 #, c-format
@@ -4679,7 +4679,7 @@ msgstr "Gebruik bestaande partisies"
 
 #: help.pm:374 install_interactive.pm:137
 #, c-format
-msgid "Use the free space on the Windows partition"
+msgid "Use the free space on the Microsoft Windows® partition"
 msgstr "Gebruik die beskikbare spasie op die Windows-partisie"
 
 #: help.pm:374
@@ -4690,7 +4690,7 @@ msgstr "Wis hele skyf"
 #: help.pm:374
 #, c-format
 msgid "Remove Windows"
-msgstr "Verwyder Windows(TM)"
+msgstr "Verwyder Windows™"
 
 #: help.pm:374 install_interactive.pm:232
 #, c-format
@@ -6133,8 +6133,8 @@ msgstr "Daar is geen bestaande partisies om te gebruik nie"
 
 #: install_interactive.pm:114
 #, c-format
-msgid "Use the Windows partition for loopback"
-msgstr "Gebruik vir die Windows-partisie vir teruglus"
+msgid "Use the Microsoft Windows® partition for loopback"
+msgstr "Gebruik vir die Microsoft Windows®-partisie vir teruglus"
 
 #: install_interactive.pm:117
 #, c-format
@@ -6179,15 +6179,15 @@ msgstr ""
 
 #: install_interactive.pm:156
 #, c-format
-msgid "Computing the size of the Windows partition"
-msgstr "Bereken die grootte van die Windowspartisie"
+msgid "Computing the size of the Microsoft Windows® partition"
+msgstr "Bereken die grootte van die Microsoft Windows®partisie"
 
 #: install_interactive.pm:163
 #, c-format
 msgid ""
-"Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
-"installation."
+"Your Microsoft Windows® partition is too fragmented. Please reboot your "
+"computer under Microsoft Windows®, run the ``defrag'' utility, then restart "
+"the Mandriva Linux installation."
 msgstr "U Windows-partisie is te gefragmenteer. Loop eers 'defrag' asb."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
@@ -6196,29 +6196,39 @@ msgstr "U Windows-partisie is te gefragmenteer. Loop eers 'defrag' asb."
 msgid ""
 "WARNING!\n"
 "\n"
-"DrakX will now resize your Windows partition. Be careful: this\n"
-"operation is dangerous. If you have not already done so, you\n"
-"first need to exit the installation, run \"chkdsk c:\" from a\n"
-"Command Prompt under Windows (beware, running graphical program\n"
-"\"scandisk\" is not enough, be sure to use \"chkdsk\" in a\n"
-"Command Prompt!), optionally run defrag, then restart the\n"
-"installation. You should also backup your data.\n"
-"When sure, press Ok."
+"\n"
+"Your Microsoft Windows® partition will be now resized.\n"
+"\n"
+"\n"
+"Be careful: this operation is dangerous. If you have not already done so, "
+"you first need to exit the installation, run \"chkdsk c:\" from a Command "
+"Prompt under Microsoft Windows® (beware, running graphical program \"scandisk"
+"\" is not enough, be sure to use \"chkdsk\" in a Command Prompt!), "
+"optionally run defrag, then restart the installation. You should also backup "
+"your data.\n"
+"\n"
+"\n"
+"When sure, press %s."
 msgstr ""
 "WAARSKUWING\n"
 "\n"
-"DrakX gaan nou u Windows-partisie vestel. WEES VERSIGTIG:\n"
-"Hierdie aksie kan gevaarlik wees. Indien nog nie, moet u tog\n"
-"\"chkdsk c:\" loop vanaf die instruksielyn in Windows. (let daarop\n"
-"die grafiese \"scandisk\" is nie voldoende nie - GEBRUIK \"chkdsk\"!)\n"
-"U kan ook gerus \"defrag\" daarna loop, en u data rugsteun\n"
-"Begin dan weer hierdie installasie.\n"
-"Andersins, klik op OK."
+"\n"
+"DrakX gaan nou u Microsoft Windows®-partisie vestel.\n"
+"\n"
+"\n"
+"WEES VERSIGTIG: Hierdie aksie kan gevaarlik wees. Indien nog nie, moet u tog "
+"\"chkdsk c:\" loop vanaf die instruksielyn in Windows. (let daarop die "
+"grafiese \"scandisk\" is nie voldoende nie - GEBRUIK \"chkdsk\"!) U kan ook "
+"gerus \"defrag\" daarna loop, en u data rugsteun Begin dan weer hierdie "
+"installasie.\n"
+"\n"
+"\n"
+"Andersins, klik op %s."
 
 #: install_interactive.pm:178
 #, c-format
-msgid "Which size do you want to keep for Windows on"
-msgstr "Watter grootte wil u vir Windows behou?"
+msgid "Which size do you want to keep for Microsoft Windows® on"
+msgstr "Watter grootte wil u vir Microsoft Windows® behou?"
 
 #: install_interactive.pm:179
 #, c-format
@@ -6227,8 +6237,8 @@ msgstr "partisie %s"
 
 #: install_interactive.pm:188
 #, c-format
-msgid "Resizing Windows partition"
-msgstr "Windowslêerstelselgrense word bereken"
+msgid "Resizing Microsoft Windows® partition"
+msgstr "Microsoft Windows®lêerstelselgrense word bereken"
 
 #: install_interactive.pm:193
 #, c-format
@@ -6242,8 +6252,8 @@ msgstr "Daar is geen FAT partisies om te verander nie(nie genoeg spasie nie)"
 
 #: install_interactive.pm:213
 #, c-format
-msgid "Remove Windows(TM)"
-msgstr "Verwyder Windows(TM)"
+msgid "Remove Microsoft Windows®"
+msgstr "Verwyder Microsoft Windows®"
 
 #: install_interactive.pm:213
 #, fuzzy, c-format
@@ -6508,7 +6518,7 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "Congratulations, installation is complete.\n"
-"Remove the boot media and press return to reboot.\n"
+"Remove the boot media and press Enter to reboot.\n"
 "\n"
 "\n"
 "For information on fixes which are available for this release of Mandriva "
@@ -16262,7 +16272,7 @@ msgstr ""
 
 #: share/advertising/26.pl:3
 #, c-format
-msgid "How to maintain your system up-to-date?"
+msgid "How to keep your system up-to-date?"
 msgstr ""
 
 #: share/advertising/intel.pl:3
diff --git a/perl-install/share/po/am.po b/perl-install/share/po/am.po
index cbfc232a1..05397aaa2 100644
--- a/perl-install/share/po/am.po
+++ b/perl-install/share/po/am.po
@@ -2423,7 +2423,7 @@ msgstr "አዲስ መጠን በMB: "
 #, c-format
 msgid ""
 "To ensure data integrity after resizing the partition(s), \n"
-"filesystem checks will be run on your next boot into Windows(TM)"
+"filesystem checks will be run on your next boot into Microsoft Windows®"
 msgstr ""
 
 #: diskdrake/interactive.pm:851
@@ -4102,7 +4102,7 @@ msgstr "የነበረውን ክፋይ ተጠቀም"
 
 #: help.pm:374 install_interactive.pm:137
 #, c-format
-msgid "Use the free space on the Windows partition"
+msgid "Use the free space on the Microsoft Windows® partition"
 msgstr ""
 
 #: help.pm:374
@@ -5119,7 +5119,7 @@ msgstr ""
 
 #: install_interactive.pm:114
 #, c-format
-msgid "Use the Windows partition for loopback"
+msgid "Use the Microsoft Windows® partition for loopback"
 msgstr ""
 
 #: install_interactive.pm:117
@@ -5161,15 +5161,15 @@ msgstr ""
 
 #: install_interactive.pm:156
 #, c-format
-msgid "Computing the size of the Windows partition"
+msgid "Computing the size of the Microsoft Windows® partition"
 msgstr ""
 
 #: install_interactive.pm:163
 #, c-format
 msgid ""
-"Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
-"installation."
+"Your Microsoft Windows® partition is too fragmented. Please reboot your "
+"computer under Microsoft Windows®, run the ``defrag'' utility, then restart "
+"the Mandriva Linux installation."
 msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
@@ -5178,19 +5178,24 @@ msgstr ""
 msgid ""
 "WARNING!\n"
 "\n"
-"DrakX will now resize your Windows partition. Be careful: this\n"
-"operation is dangerous. If you have not already done so, you\n"
-"first need to exit the installation, run \"chkdsk c:\" from a\n"
-"Command Prompt under Windows (beware, running graphical program\n"
-"\"scandisk\" is not enough, be sure to use \"chkdsk\" in a\n"
-"Command Prompt!), optionally run defrag, then restart the\n"
-"installation. You should also backup your data.\n"
-"When sure, press Ok."
+"\n"
+"Your Microsoft Windows® partition will be now resized.\n"
+"\n"
+"\n"
+"Be careful: this operation is dangerous. If you have not already done so, "
+"you first need to exit the installation, run \"chkdsk c:\" from a Command "
+"Prompt under Microsoft Windows® (beware, running graphical program \"scandisk"
+"\" is not enough, be sure to use \"chkdsk\" in a Command Prompt!), "
+"optionally run defrag, then restart the installation. You should also backup "
+"your data.\n"
+"\n"
+"\n"
+"When sure, press %s."
 msgstr ""
 
 #: install_interactive.pm:178
 #, c-format
-msgid "Which size do you want to keep for Windows on"
+msgid "Which size do you want to keep for Microsoft Windows® on"
 msgstr ""
 
 #: install_interactive.pm:179
@@ -5200,8 +5205,8 @@ msgstr ""
 
 #: install_interactive.pm:188
 #, c-format
-msgid "Resizing Windows partition"
-msgstr "የWindows ክፋይ መጠን በማስተካከል ላይ"
+msgid "Resizing Microsoft Windows® partition"
+msgstr "የMicrosoft Windows® ክፋይ መጠን በማስተካከል ላይ"
 
 #: install_interactive.pm:193
 #, c-format
@@ -5215,8 +5220,8 @@ msgstr ""
 
 #: install_interactive.pm:213
 #, c-format
-msgid "Remove Windows(TM)"
-msgstr "Windows(TM)ን አስወግድ"
+msgid "Remove Microsoft Windows®"
+msgstr "Microsoft Windows®ን አስወግድ"
 
 #: install_interactive.pm:213
 #, fuzzy, c-format
@@ -5444,7 +5449,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Congratulations, installation is complete.\n"
-"Remove the boot media and press return to reboot.\n"
+"Remove the boot media and press Enter to reboot.\n"
 "\n"
 "\n"
 "For information on fixes which are available for this release of Mandriva "
@@ -14385,7 +14390,7 @@ msgstr ""
 
 #: share/advertising/26.pl:3
 #, c-format
-msgid "How to maintain your system up-to-date?"
+msgid "How to keep your system up-to-date?"
 msgstr ""
 
 #: share/advertising/intel.pl:3
diff --git a/perl-install/share/po/ar.po b/perl-install/share/po/ar.po
index 733374ea9..648459739 100644
--- a/perl-install/share/po/ar.po
+++ b/perl-install/share/po/ar.po
@@ -2582,7 +2582,7 @@ msgstr "الحجم الجديد بالميغابايت: "
 #, c-format
 msgid ""
 "To ensure data integrity after resizing the partition(s), \n"
-"filesystem checks will be run on your next boot into Windows(TM)"
+"filesystem checks will be run on your next boot into Microsoft Windows®"
 msgstr ""
 "للتأكد من صحة البيانات بعد إعادة تحجيم التجزيئات، \n"
 "سيتم الدقيق على نظام الملفات عند التشغيل القادم لويندوز(TM)"
@@ -4690,7 +4690,7 @@ msgstr "استخدام التجزيء الموجود"
 
 #: help.pm:374 install_interactive.pm:137
 #, c-format
-msgid "Use the free space on the Windows partition"
+msgid "Use the free space on the Microsoft Windows® partition"
 msgstr "استخدام المساحة الفارغة على تجزيء ويندوز"
 
 #: help.pm:374
@@ -6207,7 +6207,7 @@ msgstr "لا يوجد تجزيء لاستخدامه"
 
 #: install_interactive.pm:114
 #, c-format
-msgid "Use the Windows partition for loopback"
+msgid "Use the Microsoft Windows® partition for loopback"
 msgstr "استخدم تجزيء ويندوز كـloopback"
 
 #: install_interactive.pm:117
@@ -6251,15 +6251,15 @@ msgstr ""
 
 #: install_interactive.pm:156
 #, c-format
-msgid "Computing the size of the Windows partition"
+msgid "Computing the size of the Microsoft Windows® partition"
 msgstr "جاري حساب مساحة تجزيء ويندوز"
 
 #: install_interactive.pm:163
 #, c-format
 msgid ""
-"Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
-"installation."
+"Your Microsoft Windows® partition is too fragmented. Please reboot your "
+"computer under Microsoft Windows®, run the ``defrag'' utility, then restart "
+"the Mandriva Linux installation."
 msgstr ""
 "تجزيء ويندوز الخاصّ بك كثير التجزّئات. رجاء أعد تشغيل جهازك إلى ويندوز، شغّل "
 "أداة ``defrag''، ثمّ أعد بدْء تثبيت ماندريبا لينكس."
@@ -6270,30 +6270,37 @@ msgstr ""
 msgid ""
 "WARNING!\n"
 "\n"
-"DrakX will now resize your Windows partition. Be careful: this\n"
-"operation is dangerous. If you have not already done so, you\n"
-"first need to exit the installation, run \"chkdsk c:\" from a\n"
-"Command Prompt under Windows (beware, running graphical program\n"
-"\"scandisk\" is not enough, be sure to use \"chkdsk\" in a\n"
-"Command Prompt!), optionally run defrag, then restart the\n"
-"installation. You should also backup your data.\n"
-"When sure, press Ok."
+"\n"
+"Your Microsoft Windows® partition will be now resized.\n"
+"\n"
+"\n"
+"Be careful: this operation is dangerous. If you have not already done so, "
+"you first need to exit the installation, run \"chkdsk c:\" from a Command "
+"Prompt under Microsoft Windows® (beware, running graphical program \"scandisk"
+"\" is not enough, be sure to use \"chkdsk\" in a Command Prompt!), "
+"optionally run defrag, then restart the installation. You should also backup "
+"your data.\n"
+"\n"
+"\n"
+"When sure, press %s."
 msgstr ""
 "تحذير!\n"
 "\n"
-"DrakX سيقوم الآن بتغيير حجم تجزيء ويندوز. كن حذراً:\n"
-"هذه العملية خطرة. فإذا لم تكن فعلت ذلك،\n"
-"يجب عليك أولاً الخروج من التثبيت، ثم تشغيل \"scandisk c:\"\n"
-" من\n"
-"سطر الأوامر في ويندوز (احذر، تشغيل البرنامج الرّسومي\n"
-"\"scandisk\" غير كافي، تأكّد من استخدام \"chkdsk\" في\n"
-"سطر الأوامر!)، اختياريّاً شغّل defrag، ثمّ أعد بدء\n"
-"التثبيت. يجب عليك كذلك عمل نسخة احتياطية من بياناتك.\n"
-"عندما تكون متأكداً، اضغط موافق."
+"DrakX سيقوم الآن بتغيير حجم تجزيء ويندوز.\n"
+"\n"
+"\n"
+"كن حذراً: هذه العملية خطرة. فإذا لم تكن فعلت ذلك، يجب عليك أولاً الخروج من "
+"التثبيت، ثم تشغيل \"scandisk c:\"  من سطر الأوامر في ويندوز (احذر، تشغيل "
+"البرنامج الرّسومي \"scandisk\" غير كافي، تأكّد من استخدام \"chkdsk\" في سطر "
+"الأوامر!)، اختياريّاً شغّل defrag، ثمّ أعد بدء التثبيت. يجب عليك كذلك عمل نسخة "
+"احتياطية من بياناتك. \n"
+"\n"
+"\n"
+"عندما تكون متأكداً، اضغط %s."
 
 #: install_interactive.pm:178
 #, c-format
-msgid "Which size do you want to keep for Windows on"
+msgid "Which size do you want to keep for Microsoft Windows® on"
 msgstr "ما حجم المساحة التي تريد إبقائها لويندوز على"
 
 #: install_interactive.pm:179
@@ -6303,7 +6310,7 @@ msgstr "التجزيء %s"
 
 #: install_interactive.pm:188
 #, c-format
-msgid "Resizing Windows partition"
+msgid "Resizing Microsoft Windows® partition"
 msgstr "تغيير حجم تجزيء ويندوز"
 
 #: install_interactive.pm:193
@@ -6318,7 +6325,7 @@ msgstr "لا توجد تجزيء FAT قابل لتغيير حجمها (أو لا
 
 #: install_interactive.pm:213
 #, c-format
-msgid "Remove Windows(TM)"
+msgid "Remove Microsoft Windows®"
 msgstr "حذف ويندوز(TM)"
 
 #: install_interactive.pm:213
@@ -6675,7 +6682,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Congratulations, installation is complete.\n"
-"Remove the boot media and press return to reboot.\n"
+"Remove the boot media and press Enter to reboot.\n"
 "\n"
 "\n"
 "For information on fixes which are available for this release of Mandriva "
@@ -16375,7 +16382,7 @@ msgstr ""
 
 #: share/advertising/26.pl:3
 #, c-format
-msgid "How to maintain your system up-to-date?"
+msgid "How to keep your system up-to-date?"
 msgstr ""
 
 #: share/advertising/intel.pl:3
diff --git a/perl-install/share/po/az.po b/perl-install/share/po/az.po
index d1a2d4785..062730eac 100644
--- a/perl-install/share/po/az.po
+++ b/perl-install/share/po/az.po
@@ -2533,7 +2533,7 @@ msgstr "MB cinsindən yeni böyüklük: "
 #, c-format
 msgid ""
 "To ensure data integrity after resizing the partition(s), \n"
-"filesystem checks will be run on your next boot into Windows(TM)"
+"filesystem checks will be run on your next boot into Microsoft Windows®"
 msgstr ""
 "Bölmə(lər)in böyüklüyünün dəyişdirilməsindən sonra mə'lumat \n"
 "bütövlüyünü qorumaq üçün fayl sistemi yoxlamaları bir sonrakı\n"
@@ -4686,7 +4686,7 @@ msgstr "Mövcud bölməni işlət"
 
 #: help.pm:374 install_interactive.pm:137
 #, c-format
-msgid "Use the free space on the Windows partition"
+msgid "Use the free space on the Microsoft Windows® partition"
 msgstr "Windows bölməsindəki boş sahəni işlət"
 
 #: help.pm:374
@@ -6172,8 +6172,8 @@ msgstr "İstifadə ediləcək mövcud bölmə yoxdur"
 
 #: install_interactive.pm:114
 #, c-format
-msgid "Use the Windows partition for loopback"
-msgstr "Loopback üçün Windows bölməsini işlət"
+msgid "Use the Microsoft Windows® partition for loopback"
+msgstr "Loopback üçün Microsoft Windows® bölməsini işlət"
 
 #: install_interactive.pm:117
 #, c-format
@@ -6216,19 +6216,19 @@ msgstr ""
 
 #: install_interactive.pm:156
 #, c-format
-msgid "Computing the size of the Windows partition"
-msgstr "Windows bölməsin böyüklüyü hesablanır"
+msgid "Computing the size of the Microsoft Windows® partition"
+msgstr "Microsoft Windows® bölməsin böyüklüyü hesablanır"
 
 #: install_interactive.pm:163
 #, c-format
 msgid ""
-"Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
-"installation."
+"Your Microsoft Windows® partition is too fragmented. Please reboot your "
+"computer under Microsoft Windows®, run the ``defrag'' utility, then restart "
+"the Mandriva Linux installation."
 msgstr ""
-"Windows bölümünüz çox dağınıqdır. Daxiş edirik, əvvəlcə kompüterinizi "
-"Windows ilə açın, ''defrag'' vasitəsini işlədin, sonra Mandriva Linux "
-"qurulumunu yenidən başladın."
+"Microsoft Windows® bölümünüz çox dağınıqdır. Daxiş edirik, əvvəlcə "
+"kompüterinizi Microsoft Windows® ilə açın, ''defrag'' vasitəsini işlədin, "
+"sonra Mandriva Linux qurulumunu yenidən başladın."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_interactive.pm:166
@@ -6236,28 +6236,37 @@ msgstr ""
 msgid ""
 "WARNING!\n"
 "\n"
-"DrakX will now resize your Windows partition. Be careful: this\n"
-"operation is dangerous. If you have not already done so, you\n"
-"first need to exit the installation, run \"chkdsk c:\" from a\n"
-"Command Prompt under Windows (beware, running graphical program\n"
-"\"scandisk\" is not enough, be sure to use \"chkdsk\" in a\n"
-"Command Prompt!), optionally run defrag, then restart the\n"
-"installation. You should also backup your data.\n"
-"When sure, press Ok."
+"\n"
+"Your Microsoft Windows® partition will be now resized.\n"
+"\n"
+"\n"
+"Be careful: this operation is dangerous. If you have not already done so, "
+"you first need to exit the installation, run \"chkdsk c:\" from a Command "
+"Prompt under Microsoft Windows® (beware, running graphical program \"scandisk"
+"\" is not enough, be sure to use \"chkdsk\" in a Command Prompt!), "
+"optionally run defrag, then restart the installation. You should also backup "
+"your data.\n"
+"\n"
+"\n"
+"When sure, press %s."
 msgstr ""
 "XƏBƏRDARLIQ!\n"
 "\n"
-"DrakX indi Windows disk bölmənizin böyüklüyünü dəyişdirəcək.\n"
-"Diqqətli olun, bu təhlükəli ola bilər. Hələ də etmədinizsə qurulumdan\n"
-"çıxın və Windows altında scandisk (lazım gələrsə defrag da) proqramını\n"
-"icra edin. Eyni zamanda mə'lumatlarınızın da ehtiyat nüsxəsini alın.\n"
-"Ardından quruluma davam edin.\n"
-"Hazır olanda, Oldu düyməsinə basın."
+" DrakX indi Windows disk bölmənizin böyüklüyünü dəyişdirəcək.\n"
+"\n"
+"\n"
+"Diqqətli olun, bu təhlükəli ola bilər. Hələ də etmədinizsə qurulumdan çıxın "
+"və Windows altında scandisk (lazım gələrsə defrag da) proqramını icra edin. "
+"Eyni zamanda mə'lumatlarınızın da ehtiyat nüsxəsini alın. Ardından quruluma "
+"davam edin.\n"
+"\n"
+"\n"
+"Hazır olanda, %s düyməsinə basın."
 
 #: install_interactive.pm:178
 #, c-format
-msgid "Which size do you want to keep for Windows on"
-msgstr "Windows üçün hansı böyüklüyü saxlamaq istəyirsiniz"
+msgid "Which size do you want to keep for Microsoft Windows® on"
+msgstr "Microsoft Windows® üçün hansı böyüklüyü saxlamaq istəyirsiniz"
 
 #: install_interactive.pm:179
 #, c-format
@@ -6266,8 +6275,8 @@ msgstr "%s bölməsi"
 
 #: install_interactive.pm:188
 #, c-format
-msgid "Resizing Windows partition"
-msgstr "Windows bölməsi ölçüləndirilir"
+msgid "Resizing Microsoft Windows® partition"
+msgstr "Microsoft Windows® bölməsi ölçüləndirilir"
 
 #: install_interactive.pm:193
 #, c-format
@@ -6281,8 +6290,8 @@ msgstr "Ölçüləndiriləcək FAT bölməsi mövcud deyil (ya da lazımi yer yo
 
 #: install_interactive.pm:213
 #, c-format
-msgid "Remove Windows(TM)"
-msgstr "Windows(TM)'u Sil"
+msgid "Remove Microsoft Windows®"
+msgstr "Microsoft Windows®'u Sil"
 
 #: install_interactive.pm:213
 #, fuzzy, c-format
@@ -6665,7 +6674,7 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "Congratulations, installation is complete.\n"
-"Remove the boot media and press return to reboot.\n"
+"Remove the boot media and press Enter to reboot.\n"
 "\n"
 "\n"
 "For information on fixes which are available for this release of Mandriva "
@@ -16326,7 +16335,7 @@ msgstr ""
 
 #: share/advertising/26.pl:3
 #, c-format
-msgid "How to maintain your system up-to-date?"
+msgid "How to keep your system up-to-date?"
 msgstr ""
 
 #: share/advertising/intel.pl:3
diff --git a/perl-install/share/po/be.po b/perl-install/share/po/be.po
index cef488722..8f6e5d84d 100644
--- a/perl-install/share/po/be.po
+++ b/perl-install/share/po/be.po
@@ -2460,7 +2460,7 @@ msgstr "Памер у Мб:"
 #, c-format
 msgid ""
 "To ensure data integrity after resizing the partition(s), \n"
-"filesystem checks will be run on your next boot into Windows(TM)"
+"filesystem checks will be run on your next boot into Microsoft Windows®"
 msgstr ""
 
 #: diskdrake/interactive.pm:851
@@ -4140,7 +4140,7 @@ msgstr "Выкарыстоўваць існуючы раздзел"
 
 #: help.pm:374 install_interactive.pm:137
 #, c-format
-msgid "Use the free space on the Windows partition"
+msgid "Use the free space on the Microsoft Windows® partition"
 msgstr "Выкарыстоўваць незанятую прастору на раздзеле Windows"
 
 #: help.pm:374
@@ -5170,8 +5170,9 @@ msgstr "Няма існуючых раздзелаў, якія можна вык
 
 #: install_interactive.pm:114
 #, c-format
-msgid "Use the Windows partition for loopback"
-msgstr "Выкарыстоўваць раздзел Windows для віртуальнай файлавай сістэмы"
+msgid "Use the Microsoft Windows® partition for loopback"
+msgstr ""
+"Выкарыстоўваць раздзел Microsoft Windows® для віртуальнай файлавай сістэмы"
 
 #: install_interactive.pm:117
 #, fuzzy, c-format
@@ -5214,17 +5215,17 @@ msgstr ""
 
 #: install_interactive.pm:156
 #, fuzzy, c-format
-msgid "Computing the size of the Windows partition"
-msgstr "Выкарыстоўваць незанятую прастору на раздзеле Windows"
+msgid "Computing the size of the Microsoft Windows® partition"
+msgstr "Выкарыстоўваць незанятую прастору на раздзеле Microsoft Windows®"
 
 #: install_interactive.pm:163
 #, c-format
 msgid ""
-"Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
-"installation."
+"Your Microsoft Windows® partition is too fragmented. Please reboot your "
+"computer under Microsoft Windows®, run the ``defrag'' utility, then restart "
+"the Mandriva Linux installation."
 msgstr ""
-"Ваш раздзел з Windows занадта фрагментаваны. \n"
+"Ваш раздзел з Microsoft Windows® занадта фрагментаваны. \n"
 "Рэкамендуем спачатку запусціць праграму ‟defrag”"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
@@ -5233,20 +5234,25 @@ msgstr ""
 msgid ""
 "WARNING!\n"
 "\n"
-"DrakX will now resize your Windows partition. Be careful: this\n"
-"operation is dangerous. If you have not already done so, you\n"
-"first need to exit the installation, run \"chkdsk c:\" from a\n"
-"Command Prompt under Windows (beware, running graphical program\n"
-"\"scandisk\" is not enough, be sure to use \"chkdsk\" in a\n"
-"Command Prompt!), optionally run defrag, then restart the\n"
-"installation. You should also backup your data.\n"
-"When sure, press Ok."
+"\n"
+"Your Microsoft Windows® partition will be now resized.\n"
+"\n"
+"\n"
+"Be careful: this operation is dangerous. If you have not already done so, "
+"you first need to exit the installation, run \"chkdsk c:\" from a Command "
+"Prompt under Microsoft Windows® (beware, running graphical program \"scandisk"
+"\" is not enough, be sure to use \"chkdsk\" in a Command Prompt!), "
+"optionally run defrag, then restart the installation. You should also backup "
+"your data.\n"
+"\n"
+"\n"
+"When sure, press %s."
 msgstr ""
 
 #: install_interactive.pm:178
 #, c-format
-msgid "Which size do you want to keep for Windows on"
-msgstr "Якую прастору захаваць для Windows?"
+msgid "Which size do you want to keep for Microsoft Windows® on"
+msgstr "Якую прастору захаваць для Microsoft Windows®?"
 
 #: install_interactive.pm:179
 #, c-format
@@ -5255,8 +5261,8 @@ msgstr "Раздзел %s"
 
 #: install_interactive.pm:188
 #, c-format
-msgid "Resizing Windows partition"
-msgstr "Вылічэнне межаў файлавай сістэмы Windows"
+msgid "Resizing Microsoft Windows® partition"
+msgstr "Вылічэнне межаў файлавай сістэмы Microsoft Windows®"
 
 #: install_interactive.pm:193
 #, c-format
@@ -5270,7 +5276,7 @@ msgstr ""
 
 #: install_interactive.pm:213
 #, c-format
-msgid "Remove Windows(TM)"
+msgid "Remove Microsoft Windows®"
 msgstr "Выдаліць Windows™"
 
 #: install_interactive.pm:213
@@ -5501,7 +5507,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Congratulations, installation is complete.\n"
-"Remove the boot media and press return to reboot.\n"
+"Remove the boot media and press Enter to reboot.\n"
 "\n"
 "\n"
 "For information on fixes which are available for this release of Mandriva "
@@ -14559,7 +14565,7 @@ msgstr ""
 
 #: share/advertising/26.pl:3
 #, c-format
-msgid "How to maintain your system up-to-date?"
+msgid "How to keep your system up-to-date?"
 msgstr ""
 
 #: share/advertising/intel.pl:3
diff --git a/perl-install/share/po/bg.po b/perl-install/share/po/bg.po
index 47b1341cf..6687894ce 100644
--- a/perl-install/share/po/bg.po
+++ b/perl-install/share/po/bg.po
@@ -2502,7 +2502,7 @@ msgstr "Нова големина в MB: "
 #, c-format
 msgid ""
 "To ensure data integrity after resizing the partition(s), \n"
-"filesystem checks will be run on your next boot into Windows(TM)"
+"filesystem checks will be run on your next boot into Microsoft Windows®"
 msgstr ""
 
 #: diskdrake/interactive.pm:851
@@ -4488,7 +4488,7 @@ msgstr "Изпозване на съществуващ дял"
 
 #: help.pm:374 install_interactive.pm:137
 #, c-format
-msgid "Use the free space on the Windows partition"
+msgid "Use the free space on the Microsoft Windows® partition"
 msgstr "Използвай свободното място на Windows дяла"
 
 #: help.pm:374
@@ -5797,8 +5797,8 @@ msgstr "Няма дял, който мога да използвам"
 
 #: install_interactive.pm:114
 #, c-format
-msgid "Use the Windows partition for loopback"
-msgstr "Използвай за Windows дялът за loopback"
+msgid "Use the Microsoft Windows® partition for loopback"
+msgstr "Използвай за Microsoft Windows® дялът за loopback"
 
 #: install_interactive.pm:117
 #, c-format
@@ -5843,17 +5843,18 @@ msgstr ""
 
 #: install_interactive.pm:156
 #, c-format
-msgid "Computing the size of the Windows partition"
-msgstr "Изчислява свободното място на Windows дял"
+msgid "Computing the size of the Microsoft Windows® partition"
+msgstr "Изчислява свободното място на Microsoft Windows® дял"
 
 #: install_interactive.pm:163
 #, c-format
 msgid ""
-"Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
-"installation."
+"Your Microsoft Windows® partition is too fragmented. Please reboot your "
+"computer under Microsoft Windows®, run the ``defrag'' utility, then restart "
+"the Mandriva Linux installation."
 msgstr ""
-"Вашият Windows дял е много фрагментиран, моля първо стартирайте ''defrag''"
+"Вашият Microsoft Windows® дял е много фрагментиран, моля първо стартирайте "
+"''defrag''"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_interactive.pm:166
@@ -5861,27 +5862,36 @@ msgstr ""
 msgid ""
 "WARNING!\n"
 "\n"
-"DrakX will now resize your Windows partition. Be careful: this\n"
-"operation is dangerous. If you have not already done so, you\n"
-"first need to exit the installation, run \"chkdsk c:\" from a\n"
-"Command Prompt under Windows (beware, running graphical program\n"
-"\"scandisk\" is not enough, be sure to use \"chkdsk\" in a\n"
-"Command Prompt!), optionally run defrag, then restart the\n"
-"installation. You should also backup your data.\n"
-"When sure, press Ok."
+"\n"
+"Your Microsoft Windows® partition will be now resized.\n"
+"\n"
+"\n"
+"Be careful: this operation is dangerous. If you have not already done so, "
+"you first need to exit the installation, run \"chkdsk c:\" from a Command "
+"Prompt under Microsoft Windows® (beware, running graphical program \"scandisk"
+"\" is not enough, be sure to use \"chkdsk\" in a Command Prompt!), "
+"optionally run defrag, then restart the installation. You should also backup "
+"your data.\n"
+"\n"
+"\n"
+"When sure, press %s."
 msgstr ""
 "ВНИМАНИЕ!\n"
 "\n"
-"DrakX трябва да прераздели Вашия Windows дял. Бъдете внимателни: тази "
-"операция е\n"
-"опасна. Ако още не сте го направили, трябва първо да пуснете scandisk (и\n"
-"евентуално да използвате defrag) под Windows върху този дял, тогава \n"
-"повторете инсталациаята. Би било добре да направите архив на данните си.\n"
-"Когато сте сигурни, натиснете ОК."
+" DrakX трябва да прераздели Вашия Windows дял.\n"
+"\n"
+"\n"
+"Бъдете внимателни: тази операция е опасна. Ако още не сте го направили, "
+"трябва първо да пуснете scandisk (и евентуално да използвате defrag) под "
+"Windows върху този дял, тогава  повторете инсталациаята. Би било добре да "
+"направите архив на данните си.\n"
+"\n"
+"\n"
+"Когато сте сигурни, натиснете %s."
 
 #: install_interactive.pm:178
 #, c-format
-msgid "Which size do you want to keep for Windows on"
+msgid "Which size do you want to keep for Microsoft Windows® on"
 msgstr "Колко искате да оставите за windows?"
 
 #: install_interactive.pm:179
@@ -5891,8 +5901,8 @@ msgstr "дял %s"
 
 #: install_interactive.pm:188
 #, c-format
-msgid "Resizing Windows partition"
-msgstr "Изчислявам границите на Windows файловата система"
+msgid "Resizing Microsoft Windows® partition"
+msgstr "Изчислявам границите на Microsoft Windows® файловата система"
 
 #: install_interactive.pm:193
 #, c-format
@@ -5906,8 +5916,8 @@ msgstr "Няма FAT дялове за смяна на големината (и�
 
 #: install_interactive.pm:213
 #, c-format
-msgid "Remove Windows(TM)"
-msgstr "Премахни Windows(TM)"
+msgid "Remove Microsoft Windows®"
+msgstr "Премахни Microsoft Windows®"
 
 #: install_interactive.pm:213
 #, fuzzy, c-format
@@ -6284,7 +6294,7 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "Congratulations, installation is complete.\n"
-"Remove the boot media and press return to reboot.\n"
+"Remove the boot media and press Enter to reboot.\n"
 "\n"
 "\n"
 "For information on fixes which are available for this release of Mandriva "
@@ -15678,7 +15688,7 @@ msgstr ""
 
 #: share/advertising/26.pl:3
 #, c-format
-msgid "How to maintain your system up-to-date?"
+msgid "How to keep your system up-to-date?"
 msgstr ""
 
 #: share/advertising/intel.pl:3
diff --git a/perl-install/share/po/bn.po b/perl-install/share/po/bn.po
index d21a6137f..210f2e864 100644
--- a/perl-install/share/po/bn.po
+++ b/perl-install/share/po/bn.po
@@ -2605,7 +2605,7 @@ msgstr "মেগাবাইটে নতুন সাইজ:"
 #, c-format
 msgid ""
 "To ensure data integrity after resizing the partition(s), \n"
-"filesystem checks will be run on your next boot into Windows(TM)"
+"filesystem checks will be run on your next boot into Microsoft Windows®"
 msgstr ""
 "পার্টিশনের পুনরাকৃতির পর ডাটার সম্পূর্ণতা নিশ্চিত করার জন্য, \n"
 "উইন্ডোজে(TM) আপনার পরবর্তী বুটে ফাইলসিস্টেম পরীক্ষা চলবে"
@@ -4589,7 +4589,7 @@ msgstr "উপস্থিত পার্টিশন ব্যবহার ক
 
 #: help.pm:374 install_interactive.pm:137
 #, c-format
-msgid "Use the free space on the Windows partition"
+msgid "Use the free space on the Microsoft Windows® partition"
 msgstr "উইন্ডোজ পার্টিশনের খালি জায়গা ব্যবহার করে"
 
 #: help.pm:374
@@ -5848,7 +5848,7 @@ msgstr "ব্যবহারের জন্য এখানে উপস্থ
 
 #: install_interactive.pm:114
 #, c-format
-msgid "Use the Windows partition for loopback"
+msgid "Use the Microsoft Windows® partition for loopback"
 msgstr "লুপ ব্যাকের জন্য উইন্ডোজের পার্টিশন ব্যবহার করো"
 
 #: install_interactive.pm:117
@@ -5892,15 +5892,15 @@ msgstr ""
 
 #: install_interactive.pm:156
 #, c-format
-msgid "Computing the size of the Windows partition"
+msgid "Computing the size of the Microsoft Windows® partition"
 msgstr "আপনার উইন্ডোজের পার্টিশনের সাইজ হিসেব করা হচ্ছে"
 
 #: install_interactive.pm:163
 #, c-format
 msgid ""
-"Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
-"installation."
+"Your Microsoft Windows® partition is too fragmented. Please reboot your "
+"computer under Microsoft Windows®, run the ``defrag'' utility, then restart "
+"the Mandriva Linux installation."
 msgstr ""
 "আপনার উইন্ডোজের পার্টিশনটি প্রচন্ড অসম। অনুগ্রহ করে আপনার কম্পিউটারটি উইন্ডোজে রি-বুট "
 "করে, ``defrag'' ইউটিলিটি চালান, পরে  রি-ষ্টার্ট করে আবার মেনড্রক ইনস্টলেশন চালান।"
@@ -5911,28 +5911,37 @@ msgstr ""
 msgid ""
 "WARNING!\n"
 "\n"
-"DrakX will now resize your Windows partition. Be careful: this\n"
-"operation is dangerous. If you have not already done so, you\n"
-"first need to exit the installation, run \"chkdsk c:\" from a\n"
-"Command Prompt under Windows (beware, running graphical program\n"
-"\"scandisk\" is not enough, be sure to use \"chkdsk\" in a\n"
-"Command Prompt!), optionally run defrag, then restart the\n"
-"installation. You should also backup your data.\n"
-"When sure, press Ok."
+"\n"
+"Your Microsoft Windows® partition will be now resized.\n"
+"\n"
+"\n"
+"Be careful: this operation is dangerous. If you have not already done so, "
+"you first need to exit the installation, run \"chkdsk c:\" from a Command "
+"Prompt under Microsoft Windows® (beware, running graphical program \"scandisk"
+"\" is not enough, be sure to use \"chkdsk\" in a Command Prompt!), "
+"optionally run defrag, then restart the installation. You should also backup "
+"your data.\n"
+"\n"
+"\n"
+"When sure, press %s."
 msgstr ""
 "সতর্ক বানী!\n"
 "\n"
-"DrakX এখন আপনার উইন্ডোজের পার্টিশন আকার পরিবর্তন করবে। খুবই সাবধান: এই\n"
-"কার্যক্রমটি বিপদজ্জনক। আপনি যদি এরকম আগে করে না থাকেন, তাহলে আপনাকে\n"
-"ইনস্টলেশন থেকে বের হয়ে, উইন্ডোজের কমান্ডপ্রমপ্ট থেকে \"chkdsk c:\" চালাতে হবে\n"
-"(লক্ষ্য রাখবেন, \"scandisk\"-এর মত গ্রাফিক্যাল প্রোগ্রামগুলি যথেষ্ট নয়, আপনাকে\n"
-"অবশ্যই কমান্ডপ্রমপ্ট থেকে \"chkdsk\" চালাতে হবে), ঐচ্ছিকভাবে defrag চালাতে\n"
-"পরেন, পরে ইনস্টলেশন পুনরায় শুরু করবেন। আপনকে আপনার ডাটা ব্যাকআপ করা\n"
-"উচিত্‍‌। নিশ্চিত্‍‌ হলে ঠিক আছে চাপুন।"
+"DrakX এখন আপনার উইন্ডোজের পার্টিশন আকার পরিবর্তন করবে।\n"
+"\n"
+"\n"
+"খুবই সাবধান: এই কার্যক্রমটি বিপদজ্জনক। আপনি যদি এরকম আগে করে না থাকেন, তাহলে "
+"আপনাকে ইনস্টলেশন থেকে বের হয়ে, উইন্ডোজের কমান্ডপ্রমপ্ট থেকে \"chkdsk c:\" চালাতে "
+"হবে (লক্ষ্য রাখবেন, \"scandisk\"-এর মত গ্রাফিক্যাল প্রোগ্রামগুলি যথেষ্ট নয়, আপনাকে "
+"অবশ্যই কমান্ডপ্রমপ্ট থেকে \"chkdsk\" চালাতে হবে), ঐচ্ছিকভাবে defrag চালাতে পরেন, "
+"পরে ইনস্টলেশন পুনরায় শুরু করবেন। আপনকে আপনার ডাটা ব্যাকআপ করা উচিত্‍‌।\n"
+"\n"
+"\n"
+"নিশ্চিত্‍‌ হলে %s চাপুন।"
 
 #: install_interactive.pm:178
 #, c-format
-msgid "Which size do you want to keep for Windows on"
+msgid "Which size do you want to keep for Microsoft Windows® on"
 msgstr "আপনি কোথায় উইন্ডোজের জন্য কোন সাইজটি রাখতে চান"
 
 #: install_interactive.pm:179
@@ -5942,7 +5951,7 @@ msgstr "পার্টিশনসমূহ %s"
 
 #: install_interactive.pm:188
 #, c-format
-msgid "Resizing Windows partition"
+msgid "Resizing Microsoft Windows® partition"
 msgstr "উইন্ডোজ পার্টিশন আকার পরিবর্তন করা হচ্ছে"
 
 #: install_interactive.pm:193
@@ -5958,7 +5967,7 @@ msgstr ""
 
 #: install_interactive.pm:213
 #, c-format
-msgid "Remove Windows(TM)"
+msgid "Remove Microsoft Windows®"
 msgstr "উইন্ডোজ(TM) মুছে ফেলো"
 
 #: install_interactive.pm:213
@@ -6194,7 +6203,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Congratulations, installation is complete.\n"
-"Remove the boot media and press return to reboot.\n"
+"Remove the boot media and press Enter to reboot.\n"
 "\n"
 "\n"
 "For information on fixes which are available for this release of Mandriva "
@@ -16170,7 +16179,7 @@ msgstr ""
 
 #: share/advertising/26.pl:3
 #, c-format
-msgid "How to maintain your system up-to-date?"
+msgid "How to keep your system up-to-date?"
 msgstr ""
 
 #: share/advertising/intel.pl:3
diff --git a/perl-install/share/po/br.po b/perl-install/share/po/br.po
index a6e642983..369f40742 100644
--- a/perl-install/share/po/br.po
+++ b/perl-install/share/po/br.po
@@ -2476,7 +2476,7 @@ msgstr "Ment nevez e Mo : "
 #, c-format
 msgid ""
 "To ensure data integrity after resizing the partition(s), \n"
-"filesystem checks will be run on your next boot into Windows(TM)"
+"filesystem checks will be run on your next boot into Microsoft Windows®"
 msgstr ""
 
 #: diskdrake/interactive.pm:851
@@ -4200,7 +4200,7 @@ msgstr "Impliji parzhadur o vezañ"
 
 #: help.pm:374 install_interactive.pm:137
 #, c-format
-msgid "Use the free space on the Windows partition"
+msgid "Use the free space on the Microsoft Windows® partition"
 msgstr "Implijit an egor dieub war ar barzhadur Windows"
 
 #: help.pm:374
@@ -5243,8 +5243,8 @@ msgstr "N'eus parzhadur da implij ebet"
 
 #: install_interactive.pm:114
 #, c-format
-msgid "Use the Windows partition for loopback"
-msgstr "Implij ar barzhadur Windows evit saveteiñ"
+msgid "Use the Microsoft Windows® partition for loopback"
+msgstr "Implij ar barzhadur Microsoft Windows® evit saveteiñ"
 
 #: install_interactive.pm:117
 #, c-format
@@ -5288,44 +5288,53 @@ msgstr ""
 
 #: install_interactive.pm:156
 #, c-format
-msgid "Computing the size of the Windows partition"
-msgstr "Emaon o jediñ ment ar barzhadur Windows"
+msgid "Computing the size of the Microsoft Windows® partition"
+msgstr "Emaon o jediñ ment ar barzhadur Microsoft Windows®"
 
 #: install_interactive.pm:163
 #, c-format
 msgid ""
-"Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
-"installation."
+"Your Microsoft Windows® partition is too fragmented. Please reboot your "
+"computer under Microsoft Windows®, run the ``defrag'' utility, then restart "
+"the Mandriva Linux installation."
 msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_interactive.pm:166
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "WARNING!\n"
 "\n"
-"DrakX will now resize your Windows partition. Be careful: this\n"
-"operation is dangerous. If you have not already done so, you\n"
-"first need to exit the installation, run \"chkdsk c:\" from a\n"
-"Command Prompt under Windows (beware, running graphical program\n"
-"\"scandisk\" is not enough, be sure to use \"chkdsk\" in a\n"
-"Command Prompt!), optionally run defrag, then restart the\n"
-"installation. You should also backup your data.\n"
-"When sure, press Ok."
+"\n"
+"Your Microsoft Windows® partition will be now resized.\n"
+"\n"
+"\n"
+"Be careful: this operation is dangerous. If you have not already done so, "
+"you first need to exit the installation, run \"chkdsk c:\" from a Command "
+"Prompt under Microsoft Windows® (beware, running graphical program \"scandisk"
+"\" is not enough, be sure to use \"chkdsk\" in a Command Prompt!), "
+"optionally run defrag, then restart the installation. You should also backup "
+"your data.\n"
+"\n"
+"\n"
+"When sure, press %s."
 msgstr ""
 "HO EVEZH !\n"
 "\n"
-"Ezhomm en deus DrakX adventañ ho parzhadur Windows bremañ. Bezit war "
-"evezh :\n"
-"arvarus eo an obererezh-se. Ma n'hoc'h eus ket graet c'hoazh, gwelloc'h e\n"
-"vije deoc'h seveniñ da gentañ scandisk (ha diouzh ret seveniñ defrag) war "
-"ar\n"
-"parzhadur-se, ha gwareziñ ho roadoù. Pa vezit sur, gwaskit « Mat eo »"
+"\n"
+"Ezhomm en deus DrakX adventañ ho parzhadur Windows bremañ.\n"
+"\n"
+"\n"
+"Bezit war evezh : arvarus eo an obererezh-se. Ma n'hoc'h eus ket graet "
+"c'hoazh, gwelloc'h e vije deoc'h seveniñ da gentañ scandisk (ha diouzh ret "
+"seveniñ defrag) war arparzhadur-se, ha gwareziñ ho roadoù.\n"
+"\n"
+"\n"
+"Pa vezit sur, gwaskit « %s »"
 
 #: install_interactive.pm:178
 #, fuzzy, c-format
-msgid "Which size do you want to keep for Windows on"
+msgid "Which size do you want to keep for Microsoft Windows® on"
 msgstr "Da beseurt rann e mennit dilec'hiañ ?"
 
 #: install_interactive.pm:179
@@ -5335,8 +5344,8 @@ msgstr "parzhadur %s"
 
 #: install_interactive.pm:188
 #, c-format
-msgid "Resizing Windows partition"
-msgstr "Oc'h adventañ ar parzhadur Windows"
+msgid "Resizing Microsoft Windows® partition"
+msgstr "Oc'h adventañ ar parzhadur Microsoft Windows®"
 
 #: install_interactive.pm:193
 #, c-format
@@ -5350,8 +5359,8 @@ msgstr "N'eus ket ur barzhadur FAT d'adventañ (n'eus ket a-walc'h egor dieub)"
 
 #: install_interactive.pm:213
 #, c-format
-msgid "Remove Windows(TM)"
-msgstr "Chetan Windows(TM)"
+msgid "Remove Microsoft Windows®"
+msgstr "Chetan Microsoft Windows®"
 
 #: install_interactive.pm:213
 #, c-format
@@ -5584,7 +5593,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Congratulations, installation is complete.\n"
-"Remove the boot media and press return to reboot.\n"
+"Remove the boot media and press Enter to reboot.\n"
 "\n"
 "\n"
 "For information on fixes which are available for this release of Mandriva "
@@ -14753,7 +14762,7 @@ msgstr ""
 
 #: share/advertising/26.pl:3
 #, c-format
-msgid "How to maintain your system up-to-date?"
+msgid "How to keep your system up-to-date?"
 msgstr ""
 
 #: share/advertising/intel.pl:3
diff --git a/perl-install/share/po/bs.po b/perl-install/share/po/bs.po
index f4ee31f01..af450c1cc 100644
--- a/perl-install/share/po/bs.po
+++ b/perl-install/share/po/bs.po
@@ -2606,7 +2606,7 @@ msgstr "Nova veličina u MB: "
 #, c-format
 msgid ""
 "To ensure data integrity after resizing the partition(s), \n"
-"filesystem checks will be run on your next boot into Windows(TM)"
+"filesystem checks will be run on your next boot into Microsoft Windows®"
 msgstr ""
 "Da bi se osigurao integritet podataka nakon promjene veličine, \n"
 "prilikom idućeg pokretanja Windows(TM) biće izvršena provjera datotečnog "
@@ -4758,7 +4758,7 @@ msgstr "Koristi postojeću particiju"
 
 #: help.pm:374 install_interactive.pm:137
 #, c-format
-msgid "Use the free space on the Windows partition"
+msgid "Use the free space on the Microsoft Windows® partition"
 msgstr "Koristi slobodan prostor na Windows particiji"
 
 #: help.pm:374
@@ -6279,8 +6279,8 @@ msgstr "Nema nijedne postojeće particije za upotrebu"
 
 #: install_interactive.pm:114
 #, c-format
-msgid "Use the Windows partition for loopback"
-msgstr "Koristi Windows particiju za loopback"
+msgid "Use the Microsoft Windows® partition for loopback"
+msgstr "Koristi Microsoft Windows® particiju za loopback"
 
 #: install_interactive.pm:117
 #, c-format
@@ -6325,19 +6325,19 @@ msgstr ""
 
 #: install_interactive.pm:156
 #, c-format
-msgid "Computing the size of the Windows partition"
-msgstr "Izračunavam veličinu Windows particije"
+msgid "Computing the size of the Microsoft Windows® partition"
+msgstr "Izračunavam veličinu Microsoft Windows® particije"
 
 #: install_interactive.pm:163
 #, c-format
 msgid ""
-"Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
-"installation."
+"Your Microsoft Windows® partition is too fragmented. Please reboot your "
+"computer under Microsoft Windows®, run the ``defrag'' utility, then restart "
+"the Mandriva Linux installation."
 msgstr ""
-"Vaša Windows particija je previše fragmentirana. Molim restartujte vaš "
-"računar pod Windows-om, pokrenite ``defrag'' alat, zatim pokrenite Mandriva "
-"Linux instalaciju."
+"Vaša Microsoft Windows® particija je previše fragmentirana. Molim "
+"restartujte vaš računar pod Microsoft Windows®-om, pokrenite ``defrag'' "
+"alat, zatim pokrenite Mandriva Linux instalaciju."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_interactive.pm:166
@@ -6345,30 +6345,39 @@ msgstr ""
 msgid ""
 "WARNING!\n"
 "\n"
-"DrakX will now resize your Windows partition. Be careful: this\n"
-"operation is dangerous. If you have not already done so, you\n"
-"first need to exit the installation, run \"chkdsk c:\" from a\n"
-"Command Prompt under Windows (beware, running graphical program\n"
-"\"scandisk\" is not enough, be sure to use \"chkdsk\" in a\n"
-"Command Prompt!), optionally run defrag, then restart the\n"
-"installation. You should also backup your data.\n"
-"When sure, press Ok."
+"\n"
+"Your Microsoft Windows® partition will be now resized.\n"
+"\n"
+"\n"
+"Be careful: this operation is dangerous. If you have not already done so, "
+"you first need to exit the installation, run \"chkdsk c:\" from a Command "
+"Prompt under Microsoft Windows® (beware, running graphical program \"scandisk"
+"\" is not enough, be sure to use \"chkdsk\" in a Command Prompt!), "
+"optionally run defrag, then restart the installation. You should also backup "
+"your data.\n"
+"\n"
+"\n"
+"When sure, press %s."
 msgstr ""
 "UPOZORENJE!\n"
 "\n"
-"DrakX će sada promijeniti veličinu vaše Windows particije. Budite pažljivi,\n"
-"ova operacija je opasna. Ako to već niste uradili, najprije napustite\n"
-"instalaciju, izvršite naredbu \"chkdsk c:\" iz Command Prompt-a pod\n"
-"Windowsom (obratite pažnju da izvršavanje grafičkog programa \"scandisk\"\n"
-"nije dovoljno, trebate koristiti \"chkdsk\" u komandnom upitu!), opcionalno\n"
-"pokrenite \"defrag\", zatim ponovo pokrenite instalaciju. Također biste\n"
-"trebali spasiti sve podatke.\n"
-"Kada ste sigurni, kliknite na \"U redu\"."
+" DrakX će sada promijeniti veličinu vaše Windows particije.\n"
+"\n"
+"\n"
+"Budite pažljivi, ova operacija je opasna. Ako to već niste uradili, najprije "
+"napustite instalaciju, izvršite naredbu \"chkdsk c:\" iz Command Prompt-a "
+"pod Windowsom (obratite pažnju da izvršavanje grafičkog programa \"scandisk"
+"\" nije dovoljno, trebate koristiti \"chkdsk\" u komandnom upitu!), "
+"opcionalno pokrenite \"defrag\", zatim ponovo pokrenite instalaciju. Također "
+"biste trebali spasiti sve podatke.\n"
+"\n"
+"\n"
+"Kada ste sigurni, kliknite na \"%s\"."
 
 #: install_interactive.pm:178
 #, c-format
-msgid "Which size do you want to keep for Windows on"
-msgstr "Koju veličinu želite da sačuvate za Windows na"
+msgid "Which size do you want to keep for Microsoft Windows® on"
+msgstr "Koju veličinu želite da sačuvate za Microsoft Windows® na"
 
 #: install_interactive.pm:179
 #, c-format
@@ -6377,8 +6386,8 @@ msgstr "particiji %s"
 
 #: install_interactive.pm:188
 #, c-format
-msgid "Resizing Windows partition"
-msgstr "Smanjujem Windows particiju"
+msgid "Resizing Microsoft Windows® partition"
+msgstr "Smanjujem Microsoft Windows® particiju"
 
 #: install_interactive.pm:193
 #, c-format
@@ -6394,8 +6403,8 @@ msgstr ""
 
 #: install_interactive.pm:213
 #, c-format
-msgid "Remove Windows(TM)"
-msgstr "Ukloni Windows(TM)"
+msgid "Remove Microsoft Windows®"
+msgstr "Ukloni Microsoft Windows®"
 
 #: install_interactive.pm:213
 #, fuzzy, c-format
@@ -6789,7 +6798,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Congratulations, installation is complete.\n"
-"Remove the boot media and press return to reboot.\n"
+"Remove the boot media and press Enter to reboot.\n"
 "\n"
 "\n"
 "For information on fixes which are available for this release of Mandriva "
@@ -16579,7 +16588,7 @@ msgstr ""
 
 #: share/advertising/26.pl:3
 #, c-format
-msgid "How to maintain your system up-to-date?"
+msgid "How to keep your system up-to-date?"
 msgstr ""
 
 #: share/advertising/intel.pl:3
diff --git a/perl-install/share/po/ca.po b/perl-install/share/po/ca.po
index a65c4f83c..539dc217c 100644
--- a/perl-install/share/po/ca.po
+++ b/perl-install/share/po/ca.po
@@ -2630,7 +2630,7 @@ msgstr "Nova mida en MB: "
 #, c-format
 msgid ""
 "To ensure data integrity after resizing the partition(s), \n"
-"filesystem checks will be run on your next boot into Windows(TM)"
+"filesystem checks will be run on your next boot into Microsoft Windows®"
 msgstr ""
 "Per assegurar la integritat de les dades després de canviar la mida de la o "
 "les particions,\n"
@@ -4826,7 +4826,7 @@ msgstr "Utilitza les particions existents"
 
 #: help.pm:374 install_interactive.pm:137
 #, c-format
-msgid "Use the free space on the Windows partition"
+msgid "Use the free space on the Microsoft Windows® partition"
 msgstr "Utilitza l'espai lliure de la partició de Windows"
 
 #: help.pm:374
@@ -6360,8 +6360,8 @@ msgstr "No hi ha cap partició que es pugui utilitzar"
 
 #: install_interactive.pm:114
 #, c-format
-msgid "Use the Windows partition for loopback"
-msgstr "Utilitza la partició Windows per al loopback"
+msgid "Use the Microsoft Windows® partition for loopback"
+msgstr "Utilitza la partició Microsoft Windows® per al loopback"
 
 #: install_interactive.pm:117
 #, c-format
@@ -6406,19 +6406,19 @@ msgstr ""
 
 #: install_interactive.pm:156
 #, c-format
-msgid "Computing the size of the Windows partition"
-msgstr "S'està calculant la mida de la partició de Windows"
+msgid "Computing the size of the Microsoft Windows® partition"
+msgstr "S'està calculant la mida de la partició de Microsoft Windows®"
 
 #: install_interactive.pm:163
 #, c-format
 msgid ""
-"Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
-"installation."
+"Your Microsoft Windows® partition is too fragmented. Please reboot your "
+"computer under Microsoft Windows®, run the ``defrag'' utility, then restart "
+"the Mandriva Linux installation."
 msgstr ""
-"La partició de Windows està massa fragmentada. Si us plau, reinicieu "
-"l'ordinador sota Windows i executeu l'eina \"defrag\". Llavors, torneu a "
-"començar la instal·lació del Mandriva Linux."
+"La partició de Microsoft Windows® està massa fragmentada. Si us plau, "
+"reinicieu l'ordinador sota Microsoft Windows® i executeu l'eina \"defrag\". "
+"Llavors, torneu a començar la instal·lació del Mandriva Linux."
 
 #
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
@@ -6427,32 +6427,40 @@ msgstr ""
 msgid ""
 "WARNING!\n"
 "\n"
-"DrakX will now resize your Windows partition. Be careful: this\n"
-"operation is dangerous. If you have not already done so, you\n"
-"first need to exit the installation, run \"chkdsk c:\" from a\n"
-"Command Prompt under Windows (beware, running graphical program\n"
-"\"scandisk\" is not enough, be sure to use \"chkdsk\" in a\n"
-"Command Prompt!), optionally run defrag, then restart the\n"
-"installation. You should also backup your data.\n"
-"When sure, press Ok."
+"\n"
+"Your Microsoft Windows® partition will be now resized.\n"
+"\n"
+"\n"
+"Be careful: this operation is dangerous. If you have not already done so, "
+"you first need to exit the installation, run \"chkdsk c:\" from a Command "
+"Prompt under Microsoft Windows® (beware, running graphical program \"scandisk"
+"\" is not enough, be sure to use \"chkdsk\" in a Command Prompt!), "
+"optionally run defrag, then restart the installation. You should also backup "
+"your data.\n"
+"\n"
+"\n"
+"When sure, press %s."
 msgstr ""
 "ATENCIÓ!\n"
 "\n"
-"Tot seguit, DrakX canviarà la mida de la vostra partició de Windows. Aneu\n"
-"amb compte: aquesta operació és perillosa. Si encara no ho heu fet, sortiu "
-"de\n"
-"la instal·lació, executeu \"chkdsk c:\" a la línia de comandes sota Windows\n"
-"(atenció el programa gràfic\"scandisk\" no és suficient, assegura't d'usar\n"
-"\"chkdsk\" en una línia de comandes), opcionalment executeu defrag, després\n"
-"torneu a començar la instal·lació. També haurieu de fer una còpia de "
-"seguretat\n"
-"de les vostres dades.\n"
-"Quan estigueu segur, premeu D'acord."
+"\n"
+"Tot seguit, DrakX canviarà la mida de la vostra partició de Windows.\n"
+"\n"
+"\n"
+"Aneu amb compte: aquesta operació és perillosa. Si encara no ho heu fet, "
+"sortiu de la instal·lació, executeu \"chkdsk c:\" a la línia de comandes "
+"sota Windows (atenció el programa gràfic \"scandisk\" no és suficient, "
+"assegura't d'usar \"chkdsk\" en una línia de comandes), opcionalment "
+"executeu defrag, despréstorneu a començar la instal·lació. També haurieu de "
+"fer una còpia de seguretat de les vostres dades.\n"
+"\n"
+"\n"
+"Quan estigueu segur, premeu %s."
 
 #: install_interactive.pm:178
 #, c-format
-msgid "Which size do you want to keep for Windows on"
-msgstr "Quina mida voleu deixar per a la partició de Windows?"
+msgid "Which size do you want to keep for Microsoft Windows® on"
+msgstr "Quina mida voleu deixar per a la partició de Microsoft Windows®?"
 
 #: install_interactive.pm:179
 #, c-format
@@ -6461,8 +6469,8 @@ msgstr "partició %s"
 
 #: install_interactive.pm:188
 #, c-format
-msgid "Resizing Windows partition"
-msgstr "S'està redimensionant la partició de Windows"
+msgid "Resizing Microsoft Windows® partition"
+msgstr "S'està redimensionant la partició de Microsoft Windows®"
 
 #: install_interactive.pm:193
 #, c-format
@@ -6477,8 +6485,8 @@ msgstr ""
 
 #: install_interactive.pm:213
 #, c-format
-msgid "Remove Windows(TM)"
-msgstr "Elimina el Windows(TM)"
+msgid "Remove Microsoft Windows®"
+msgstr "Elimina el Microsoft Windows®"
 
 #: install_interactive.pm:213
 #, fuzzy, c-format
@@ -6853,7 +6861,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Congratulations, installation is complete.\n"
-"Remove the boot media and press return to reboot.\n"
+"Remove the boot media and press Enter to reboot.\n"
 "\n"
 "\n"
 "For information on fixes which are available for this release of Mandriva "
@@ -16825,7 +16833,7 @@ msgstr "Com unir-se a la comunitat de Mandriva Linux?"
 
 #: share/advertising/26.pl:3
 #, c-format
-msgid "How to maintain your system up-to-date?"
+msgid "How to keep your system up-to-date?"
 msgstr ""
 
 #: share/advertising/intel.pl:3
diff --git a/perl-install/share/po/cs.po b/perl-install/share/po/cs.po
index 796a3181c..c73e74740 100644
--- a/perl-install/share/po/cs.po
+++ b/perl-install/share/po/cs.po
@@ -2613,7 +2613,7 @@ msgstr "Nová velikost v MB: "
 #, c-format
 msgid ""
 "To ensure data integrity after resizing the partition(s), \n"
-"filesystem checks will be run on your next boot into Windows(TM)"
+"filesystem checks will be run on your next boot into Microsoft Windows®"
 msgstr ""
 "Pro zachování integrity po provedené změně velikosti oddílu(ů) bude při\n"
 "dalším spuštění systému Windows provedena kontrola souborového systému."
@@ -4743,7 +4743,7 @@ msgstr "Použije existující oddíl"
 
 #: help.pm:374 install_interactive.pm:137
 #, c-format
-msgid "Use the free space on the Windows partition"
+msgid "Use the free space on the Microsoft Windows® partition"
 msgstr "Použít volné místo na Windows oddílu"
 
 #: help.pm:374
@@ -6290,8 +6290,8 @@ msgstr "Není zde žádný existující oddíl k použití"
 
 #: install_interactive.pm:114
 #, c-format
-msgid "Use the Windows partition for loopback"
-msgstr "Použít Windows oddíl jako loopback"
+msgid "Use the Microsoft Windows® partition for loopback"
+msgstr "Použít Microsoft Windows® oddíl jako loopback"
 
 #: install_interactive.pm:117
 #, c-format
@@ -6336,50 +6336,59 @@ msgstr ""
 
 #: install_interactive.pm:156
 #, c-format
-msgid "Computing the size of the Windows partition"
-msgstr "Počítám volné místo na Windows oddílu"
+msgid "Computing the size of the Microsoft Windows® partition"
+msgstr "Počítám volné místo na Microsoft Windows® oddílu"
 
 #: install_interactive.pm:163
 #, c-format
 msgid ""
-"Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
-"installation."
+"Your Microsoft Windows® partition is too fragmented. Please reboot your "
+"computer under Microsoft Windows®, run the ``defrag'' utility, then restart "
+"the Mandriva Linux installation."
 msgstr ""
-"Váš diskový oddíl s Windows je příliš fragmentován. Restartujte počítač do "
-"systému Windows, použijte program 'defrag' a potom spusťte opět instalaci."
+"Váš diskový oddíl s Microsoft Windows® je příliš fragmentován. Restartujte "
+"počítač do systému Microsoft Windows®, použijte program 'defrag' a potom "
+"spusťte opět instalaci."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_interactive.pm:166
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "WARNING!\n"
 "\n"
-"DrakX will now resize your Windows partition. Be careful: this\n"
-"operation is dangerous. If you have not already done so, you\n"
-"first need to exit the installation, run \"chkdsk c:\" from a\n"
-"Command Prompt under Windows (beware, running graphical program\n"
-"\"scandisk\" is not enough, be sure to use \"chkdsk\" in a\n"
-"Command Prompt!), optionally run defrag, then restart the\n"
-"installation. You should also backup your data.\n"
-"When sure, press Ok."
+"\n"
+"Your Microsoft Windows® partition will be now resized.\n"
+"\n"
+"\n"
+"Be careful: this operation is dangerous. If you have not already done so, "
+"you first need to exit the installation, run \"chkdsk c:\" from a Command "
+"Prompt under Microsoft Windows® (beware, running graphical program \"scandisk"
+"\" is not enough, be sure to use \"chkdsk\" in a Command Prompt!), "
+"optionally run defrag, then restart the installation. You should also backup "
+"your data.\n"
+"\n"
+"\n"
+"When sure, press %s."
 msgstr ""
 "VAROVÁNÍ!\n"
 "\n"
-"DrakX nyní musí zmenšit oddíl s Windows. Buďte opatrní: tato operace je\n"
-"nebezpečná. Pokud jste tak již neučinili, měli byste nejprve ukončit "
-"instalaci,\n"
-"spustit \"chkdsk c:\" z příkazové řádky (spuštění programu \"scandisk\" "
-"nestačí, použijte příkaz \"chkdsk\"!), popřípadě i defrag a potom instalaci "
-"spustit znovu.\n"
-"Také byste si měli data zálohovat. Až si budete jistí, že chcete "
-"pokračovat,\n"
-"stiskněte Ok."
+"\n"
+"DrakX nyní musí zmenšit oddíl s Windows.\n"
+"\n"
+"\n"
+"Buďte opatrní: tato operace je nebezpečná. Pokud jste tak již neučinili, "
+"měli byste nejprve ukončit instalaci, spustit \"chkdsk c:\" z příkazové "
+"řádky (spuštění programu \"scandisk\" nestačí, použijte příkaz \"chkdsk\"!), "
+"popřípadě i defrag a potom instalaci spustit znovu. Také byste si měli data "
+"zálohovat.\n"
+"\n"
+"\n"
+"Až si budete jistí, že chcete pokračovat, stiskněte %s."
 
 #: install_interactive.pm:178
 #, c-format
-msgid "Which size do you want to keep for Windows on"
-msgstr "Jakou velikost oddílu chcete nechat pro Windows na"
+msgid "Which size do you want to keep for Microsoft Windows® on"
+msgstr "Jakou velikost oddílu chcete nechat pro Microsoft Windows® na"
 
 #: install_interactive.pm:179
 #, c-format
@@ -6388,8 +6397,8 @@ msgstr "diskovém oddílu %s"
 
 #: install_interactive.pm:188
 #, c-format
-msgid "Resizing Windows partition"
-msgstr "Počítám hranice souborového systému s Windows"
+msgid "Resizing Microsoft Windows® partition"
+msgstr "Počítám hranice souborového systému s Microsoft Windows®"
 
 #: install_interactive.pm:193
 #, c-format
@@ -6405,8 +6414,8 @@ msgstr ""
 
 #: install_interactive.pm:213
 #, c-format
-msgid "Remove Windows(TM)"
-msgstr "Odstranit Windows(TM)"
+msgid "Remove Microsoft Windows®"
+msgstr "Odstranit Microsoft Windows®"
 
 #: install_interactive.pm:213
 #, fuzzy, c-format
@@ -6782,7 +6791,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Congratulations, installation is complete.\n"
-"Remove the boot media and press return to reboot.\n"
+"Remove the boot media and press Enter to reboot.\n"
 "\n"
 "\n"
 "For information on fixes which are available for this release of Mandriva "
@@ -16577,7 +16586,7 @@ msgstr "Jak se připojit ke komunitě Mandriva Linux?"
 
 #: share/advertising/26.pl:3
 #, c-format
-msgid "How to maintain your system up-to-date?"
+msgid "How to keep your system up-to-date?"
 msgstr "Jak udržovat váš systém aktuální?"
 
 #: share/advertising/intel.pl:3
diff --git a/perl-install/share/po/cy.po b/perl-install/share/po/cy.po
index 1fc12b8d0..1e5687408 100644
--- a/perl-install/share/po/cy.po
+++ b/perl-install/share/po/cy.po
@@ -2596,7 +2596,7 @@ msgstr "Maint mewn MB: "
 #, c-format
 msgid ""
 "To ensure data integrity after resizing the partition(s), \n"
-"filesystem checks will be run on your next boot into Windows(TM)"
+"filesystem checks will be run on your next boot into Microsoft Windows®"
 msgstr ""
 "I sicrhau cywirdeb data'r rhaniad ar ôl ail-feintioli’r rhaniad(au), bydd \n"
 "gwiriadau'r system ffeiliau'n cael eu gwneud wrth i chi ail gychwyn Windows "
@@ -4695,7 +4695,7 @@ msgstr "Defnyddiwch y rhaniadau presennol"
 
 #: help.pm:374 install_interactive.pm:137
 #, c-format
-msgid "Use the free space on the Windows partition"
+msgid "Use the free space on the Microsoft Windows® partition"
 msgstr "Defnyddiwch y lle gwag ar raniad Windows"
 
 #: help.pm:374
@@ -6229,8 +6229,8 @@ msgstr "Nid oes rhaniad cyfredol i'w ddefnyddio"
 
 #: install_interactive.pm:114
 #, c-format
-msgid "Use the Windows partition for loopback"
-msgstr "Defnyddiwch raniad Windows ar gyfer cylchol"
+msgid "Use the Microsoft Windows® partition for loopback"
+msgstr "Defnyddiwch raniad Microsoft Windows® ar gyfer cylchol"
 
 #: install_interactive.pm:117
 #, c-format
@@ -6275,18 +6275,18 @@ msgstr ""
 
 #: install_interactive.pm:156
 #, c-format
-msgid "Computing the size of the Windows partition"
-msgstr "Cyfrifo maint rhaniad Windows"
+msgid "Computing the size of the Microsoft Windows® partition"
+msgstr "Cyfrifo maint rhaniad Microsoft Windows®"
 
 #: install_interactive.pm:163
 #, c-format
 msgid ""
-"Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
-"installation."
+"Your Microsoft Windows® partition is too fragmented. Please reboot your "
+"computer under Microsoft Windows®, run the ``defrag'' utility, then restart "
+"the Mandriva Linux installation."
 msgstr ""
-"Mae eich rhaniad Windows yn rhy ysgyriog, rhedwch \"defrag\" yn gyntaf o dan "
-"Windows ac yna ailgychwyn gosodi Mandriva Linux."
+"Mae eich rhaniad Microsoft Windows® yn rhy ysgyriog, rhedwch \"defrag\" yn "
+"gyntaf o dan Microsoft Windows® ac yna ailgychwyn gosodi Mandriva Linux."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_interactive.pm:166
@@ -6294,30 +6294,39 @@ msgstr ""
 msgid ""
 "WARNING!\n"
 "\n"
-"DrakX will now resize your Windows partition. Be careful: this\n"
-"operation is dangerous. If you have not already done so, you\n"
-"first need to exit the installation, run \"chkdsk c:\" from a\n"
-"Command Prompt under Windows (beware, running graphical program\n"
-"\"scandisk\" is not enough, be sure to use \"chkdsk\" in a\n"
-"Command Prompt!), optionally run defrag, then restart the\n"
-"installation. You should also backup your data.\n"
-"When sure, press Ok."
+"\n"
+"Your Microsoft Windows® partition will be now resized.\n"
+"\n"
+"\n"
+"Be careful: this operation is dangerous. If you have not already done so, "
+"you first need to exit the installation, run \"chkdsk c:\" from a Command "
+"Prompt under Microsoft Windows® (beware, running graphical program \"scandisk"
+"\" is not enough, be sure to use \"chkdsk\" in a Command Prompt!), "
+"optionally run defrag, then restart the installation. You should also backup "
+"your data.\n"
+"\n"
+"\n"
+"When sure, press %s."
 msgstr ""
 "RHYBUDD!\n"
 "\n"
-"Bydd DrakX yn newid maint eich rhaniad Windows. Byddwch\n"
-"ofalus: mae gwneud hyn yn beryglus. Os nad ydych wedi\n"
-"gwneud yn barod, dylech fynd allan o'r gosod, rhedeg\n"
-"\"chkdsk c:\" o'r Annogwr yn Windows (byddwch ofalus nid \n"
-"yw rhedeg \"scandisk\" yn ddigon, gwnewch yn siŵr i ddefnyddio \n"
-"\"chkdsk\" o fewn Anogwr!), hefyd, defnyddiwch defrag ac ail\n"
-"gychwyn gosod. Dylech hefyd wneud copi wrth gefn\n"
-"o'ch data. Pan rydych yn siŵr, cliciwch Iawn."
+"\n"
+"Bydd DrakX yn newid maint eich rhaniad Windows.\n"
+"\n"
+"\n"
+"Byddwch ofalus: mae gwneud hyn yn beryglus. Os nad ydych wedi gwneud yn "
+"barod, dylech fynd allan o'r gosod, rhedeg \"chkdsk c:\" o'r Annogwr yn "
+"Windows (byddwch ofalus nid  yw rhedeg \"scandisk\" yn ddigon, gwnewch yn "
+"siŵr i ddefnyddio  \"chkdsk\" o fewn Anogwr!), hefyd, defnyddiwch defrag ac "
+"ail gychwyn gosod. Dylech hefyd wneud copi wrth gefn o'ch data.\n"
+"\n"
+"\n"
+"Pan rydych yn siŵr, cliciwch %s."
 
 #: install_interactive.pm:178
 #, c-format
-msgid "Which size do you want to keep for Windows on"
-msgstr "Pa faint o le ydych am ei gadw ar gyfer Windows ar"
+msgid "Which size do you want to keep for Microsoft Windows® on"
+msgstr "Pa faint o le ydych am ei gadw ar gyfer Microsoft Windows® ar"
 
 #: install_interactive.pm:179
 #, c-format
@@ -6326,8 +6335,8 @@ msgstr "rhaniad %s"
 
 #: install_interactive.pm:188
 #, c-format
-msgid "Resizing Windows partition"
-msgstr "Mesur ffiniau system ffeilio Windows"
+msgid "Resizing Microsoft Windows® partition"
+msgstr "Mesur ffiniau system ffeilio Microsoft Windows®"
 
 #: install_interactive.pm:193
 #, c-format
@@ -6341,8 +6350,8 @@ msgstr "Nid oes rhaniadau FAT i newid eu maint (neu nad oes digon o le ar ôl)"
 
 #: install_interactive.pm:213
 #, c-format
-msgid "Remove Windows(TM)"
-msgstr "Tynnu Windows(TM)"
+msgid "Remove Microsoft Windows®"
+msgstr "Tynnu Microsoft Windows®"
 
 #: install_interactive.pm:213
 #, fuzzy, c-format
@@ -6725,7 +6734,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Congratulations, installation is complete.\n"
-"Remove the boot media and press return to reboot.\n"
+"Remove the boot media and press Enter to reboot.\n"
 "\n"
 "\n"
 "For information on fixes which are available for this release of Mandriva "
@@ -16555,7 +16564,7 @@ msgstr ""
 
 #: share/advertising/26.pl:3
 #, c-format
-msgid "How to maintain your system up-to-date?"
+msgid "How to keep your system up-to-date?"
 msgstr ""
 
 #: share/advertising/intel.pl:3
diff --git a/perl-install/share/po/da.po b/perl-install/share/po/da.po
index e9255b098..1279f17dd 100644
--- a/perl-install/share/po/da.po
+++ b/perl-install/share/po/da.po
@@ -2623,7 +2623,7 @@ msgstr "Ny størrelse i Mb: "
 #, c-format
 msgid ""
 "To ensure data integrity after resizing the partition(s), \n"
-"filesystem checks will be run on your next boot into Windows(TM)"
+"filesystem checks will be run on your next boot into Microsoft Windows®"
 msgstr ""
 "For at sikre dataintegritet efter ændring af størrelse på partitioner \n"
 "vil filsystemtjek blive kørt ved din næste opstart af Windows(TM)"
@@ -4741,7 +4741,7 @@ msgstr "Brug eksisterende partition"
 
 #: help.pm:374 install_interactive.pm:137
 #, c-format
-msgid "Use the free space on the Windows partition"
+msgid "Use the free space on the Microsoft Windows® partition"
 msgstr "Brug den frie plads på Windows-partitionen"
 
 #: help.pm:374
@@ -6249,8 +6249,8 @@ msgstr "Der er ingen eksisterende partition der kan bruges"
 
 #: install_interactive.pm:114
 #, c-format
-msgid "Use the Windows partition for loopback"
-msgstr "Brug Windows partitionen til Loopback"
+msgid "Use the Microsoft Windows® partition for loopback"
+msgstr "Brug Microsoft Windows® partitionen til Loopback"
 
 #: install_interactive.pm:117
 #, c-format
@@ -6295,16 +6295,17 @@ msgstr ""
 
 #: install_interactive.pm:156
 #, c-format
-msgid "Computing the size of the Windows partition"
-msgstr "Beregner størrelsen på Windows-partitionen"
+msgid "Computing the size of the Microsoft Windows® partition"
+msgstr "Beregner størrelsen på Microsoft Windows®-partitionen"
 
 #: install_interactive.pm:163
 #, c-format
 msgid ""
-"Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
-"installation."
-msgstr "Din Windows partition er for fragmenteret, kør 'defrag' først"
+"Your Microsoft Windows® partition is too fragmented. Please reboot your "
+"computer under Microsoft Windows®, run the ``defrag'' utility, then restart "
+"the Mandriva Linux installation."
+msgstr ""
+"Din Microsoft Windows® partition er for fragmenteret, kør 'defrag' først"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_interactive.pm:166
@@ -6312,29 +6313,39 @@ msgstr "Din Windows partition er for fragmenteret, kør 'defrag' først"
 msgid ""
 "WARNING!\n"
 "\n"
-"DrakX will now resize your Windows partition. Be careful: this\n"
-"operation is dangerous. If you have not already done so, you\n"
-"first need to exit the installation, run \"chkdsk c:\" from a\n"
-"Command Prompt under Windows (beware, running graphical program\n"
-"\"scandisk\" is not enough, be sure to use \"chkdsk\" in a\n"
-"Command Prompt!), optionally run defrag, then restart the\n"
-"installation. You should also backup your data.\n"
-"When sure, press Ok."
+"\n"
+"Your Microsoft Windows® partition will be now resized.\n"
+"\n"
+"\n"
+"Be careful: this operation is dangerous. If you have not already done so, "
+"you first need to exit the installation, run \"chkdsk c:\" from a Command "
+"Prompt under Microsoft Windows® (beware, running graphical program \"scandisk"
+"\" is not enough, be sure to use \"chkdsk\" in a Command Prompt!), "
+"optionally run defrag, then restart the installation. You should also backup "
+"your data.\n"
+"\n"
+"\n"
+"When sure, press %s."
 msgstr ""
 "ADVARSEL!\n"
 "\n"
-"DrakX vil nu ændre størrelsen på din Windows-partition. Vær forsigtig: denne "
-"operation er farlig. Hvis du ikke allerede har gjort det, bør du først gå ud "
-"af denne installation,  køre 'chkdsk c:' fra en kommandolinje under Windows "
-"(bemærk, det er ikke nok at køre det grafiske program 'scandisk', vær sikker "
-"på at køre 'chkdsk' i en kommandolinje!) og eventuelt defrag) og så "
-"genstarte installationen. Du bør også tage en sikkerhedskopi af dine data. "
-"Tryk på O.k., hvis du er helt sikker."
+"\n"
+"DrakX vil nu ændre størrelsen på din Windows-partition.\n"
+"\n"
+"Vær forsigtig: denne operation er farlig. Hvis du ikke allerede har gjort "
+"det, bør du først gå ud af denne installation,  køre 'chkdsk c:' fra en "
+"kommandolinje under Windows (bemærk, det er ikke nok at køre det grafiske "
+"program 'scandisk', vær sikker på at køre 'chkdsk' i en kommandolinje!) og "
+"eventuelt defrag) og så genstarte installationen. Du bør også tage en "
+"sikkerhedskopi af dine data.\n"
+"\n"
+"\n"
+"Tryk på %s, hvis du er helt sikker."
 
 #: install_interactive.pm:178
 #, c-format
-msgid "Which size do you want to keep for Windows on"
-msgstr "Hvilken størrelse ønsker du at at beholde Windows på?"
+msgid "Which size do you want to keep for Microsoft Windows® on"
+msgstr "Hvilken størrelse ønsker du at at beholde Microsoft Windows® på?"
 
 #: install_interactive.pm:179
 #, c-format
@@ -6343,8 +6354,8 @@ msgstr "partition %s"
 
 #: install_interactive.pm:188
 #, c-format
-msgid "Resizing Windows partition"
-msgstr "Udregner Windows-filsystemets grænser"
+msgid "Resizing Microsoft Windows® partition"
+msgstr "Udregner Microsoft Windows®-filsystemets grænser"
 
 #: install_interactive.pm:193
 #, c-format
@@ -6360,8 +6371,8 @@ msgstr ""
 
 #: install_interactive.pm:213
 #, c-format
-msgid "Remove Windows(TM)"
-msgstr "Fjern Windows(TM)"
+msgid "Remove Microsoft Windows®"
+msgstr "Fjern Microsoft Windows®"
 
 #: install_interactive.pm:213
 #, fuzzy, c-format
@@ -6709,7 +6720,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Congratulations, installation is complete.\n"
-"Remove the boot media and press return to reboot.\n"
+"Remove the boot media and press Enter to reboot.\n"
 "\n"
 "\n"
 "For information on fixes which are available for this release of Mandriva "
@@ -16549,7 +16560,7 @@ msgstr "Hvordan kommer man med i Mandriva Linux-fællesskabet?"
 
 #: share/advertising/26.pl:3
 #, c-format
-msgid "How to maintain your system up-to-date?"
+msgid "How to keep your system up-to-date?"
 msgstr "Hvordan kan du holde dit system opdateret?"
 
 #: share/advertising/intel.pl:3
diff --git a/perl-install/share/po/de.po b/perl-install/share/po/de.po
index 931cd0810..c91d0b493 100644
--- a/perl-install/share/po/de.po
+++ b/perl-install/share/po/de.po
@@ -2646,7 +2646,7 @@ msgstr "Neue Größe in MB:"
 #, c-format
 msgid ""
 "To ensure data integrity after resizing the partition(s), \n"
-"filesystem checks will be run on your next boot into Windows(TM)"
+"filesystem checks will be run on your next boot into Microsoft Windows®"
 msgstr ""
 "Um nach der Größenänderung der Partition(en) die Datenintegrität\n"
 "zu gewährleisten, wird Windows™ beim nächsten Hochfahren eine\n"
@@ -4812,7 +4812,7 @@ msgstr "Verwende existierende Partition(en)"
 
 #: help.pm:374 install_interactive.pm:137
 #, c-format
-msgid "Use the free space on the Windows partition"
+msgid "Use the free space on the Microsoft Windows® partition"
 msgstr "Den freien Platz der Windows-Partition verwenden"
 
 #: help.pm:374
@@ -6395,8 +6395,8 @@ msgstr "Es gibt keine existierende Partition, die ich verwenden kann."
 
 #: install_interactive.pm:114
 #, c-format
-msgid "Use the Windows partition for loopback"
-msgstr "Auf der Windows-Partition Loopbacks anlegen"
+msgid "Use the Microsoft Windows® partition for loopback"
+msgstr "Auf der Microsoft Windows®-Partition Loopbacks anlegen"
 
 #: install_interactive.pm:117
 #, c-format
@@ -6442,18 +6442,18 @@ msgstr ""
 
 #: install_interactive.pm:156
 #, c-format
-msgid "Computing the size of the Windows partition"
-msgstr "Berechne die Größe der Windows-Partition"
+msgid "Computing the size of the Microsoft Windows® partition"
+msgstr "Berechne die Größe der Microsoft Windows®-Partition"
 
 #: install_interactive.pm:163
 #, c-format
 msgid ""
-"Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
-"installation."
+"Your Microsoft Windows® partition is too fragmented. Please reboot your "
+"computer under Microsoft Windows®, run the ``defrag'' utility, then restart "
+"the Mandriva Linux installation."
 msgstr ""
-"Ihre Windows-Partition ist zu sehr fragmentiert.\n"
-"Starten Sie bitte erst „defrag“ unter Windows."
+"Ihre Microsoft Windows®-Partition ist zu sehr fragmentiert.\n"
+"Starten Sie bitte erst „defrag“ unter Microsoft Windows®."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_interactive.pm:166
@@ -6461,32 +6461,42 @@ msgstr ""
 msgid ""
 "WARNING!\n"
 "\n"
-"DrakX will now resize your Windows partition. Be careful: this\n"
-"operation is dangerous. If you have not already done so, you\n"
-"first need to exit the installation, run \"chkdsk c:\" from a\n"
-"Command Prompt under Windows (beware, running graphical program\n"
-"\"scandisk\" is not enough, be sure to use \"chkdsk\" in a\n"
-"Command Prompt!), optionally run defrag, then restart the\n"
-"installation. You should also backup your data.\n"
-"When sure, press Ok."
+"\n"
+"Your Microsoft Windows® partition will be now resized.\n"
+"\n"
+"\n"
+"Be careful: this operation is dangerous. If you have not already done so, "
+"you first need to exit the installation, run \"chkdsk c:\" from a Command "
+"Prompt under Microsoft Windows® (beware, running graphical program \"scandisk"
+"\" is not enough, be sure to use \"chkdsk\" in a Command Prompt!), "
+"optionally run defrag, then restart the installation. You should also backup "
+"your data.\n"
+"\n"
+"\n"
+"When sure, press %s."
 msgstr ""
 "WARNUNG!\n"
 "\n"
+"\n"
 "DrakX wird nun die Größe Ihrer Windows-Partition verändern.\n"
-"Seien Sie vorsichtig: Diese Aktion ist gefährlich. Falls Sie es noch\n"
-"nicht getan haben, sollten Sie nun die Installation abbrechen, um\n"
-"„chkdsk c:“ von einem DOS Prompt unter Windows auf die\n"
-"Partition anzuwenden (Achtung:scandisk unter der grafischen\n"
-"Windows Oberfläche reicht nicht aus, bitte „chkdsk“ in einem DOS Prompt "
-"ausführen!)\n"
-"Defragmentieren. Anschließend können Sie die Installation erneut starten.\n"
+"\n"
+"\n"
+"Seien Sie vorsichtig: Diese Aktion ist gefährlich. Falls Sie es noch nicht "
+"getan haben, sollten Sie nun die Installation abbrechen, um „chkdsk c:“ von "
+"einem DOS Prompt unter Windows auf die Partition anzuwenden (Achtung:"
+"scandisk unter der grafischen Windows Oberfläche reicht nicht aus, bitte "
+"„chkdsk“ in einem DOS Prompt ausführen!)Defragmentieren. Anschließend können "
+"Sie die Installation erneut starten.\n"
 "Sie sollten natürlich generell Sicherheitskopien Ihrer Daten angelegt\n"
-"haben. Falls dies der Fall ist, können Sie mit OK fortfahren."
+"haben.\n"
+"\n"
+"\n"
+"Falls dies der Fall ist, können Sie mit %s fortfahren."
 
 #: install_interactive.pm:178
 #, c-format
-msgid "Which size do you want to keep for Windows on"
-msgstr "Wieviel Platz benötigen sie noch für Windows auf"
+msgid "Which size do you want to keep for Microsoft Windows® on"
+msgstr "Wieviel Platz benötigen sie noch für Microsoft Windows® auf"
 
 #: install_interactive.pm:179
 #, c-format
@@ -6495,8 +6505,8 @@ msgstr "Partition %s"
 
 #: install_interactive.pm:188
 #, c-format
-msgid "Resizing Windows partition"
-msgstr "Größe der Windows-Partition wird geändert"
+msgid "Resizing Microsoft Windows® partition"
+msgstr "Größe der Microsoft Windows®-Partition wird geändert"
 
 #: install_interactive.pm:193
 #, c-format
@@ -6513,7 +6523,7 @@ msgstr ""
 
 #: install_interactive.pm:213
 #, c-format
-msgid "Remove Windows(TM)"
+msgid "Remove Microsoft Windows®"
 msgstr "Windows™ löschen"
 
 #: install_interactive.pm:213
@@ -6898,7 +6908,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Congratulations, installation is complete.\n"
-"Remove the boot media and press return to reboot.\n"
+"Remove the boot media and press Enter to reboot.\n"
 "\n"
 "\n"
 "For information on fixes which are available for this release of Mandriva "
@@ -16847,7 +16857,7 @@ msgstr "Wie der Mandriva Linux-Gemeinschaft beitreten?"
 
 #: share/advertising/26.pl:3
 #, c-format
-msgid "How to maintain your system up-to-date?"
+msgid "How to keep your system up-to-date?"
 msgstr "Wie Ihr System auf dem aktuellsten Stand halten?"
 
 #: share/advertising/intel.pl:3
diff --git a/perl-install/share/po/el.po b/perl-install/share/po/el.po
index 249fc8a53..aef29f572 100644
--- a/perl-install/share/po/el.po
+++ b/perl-install/share/po/el.po
@@ -2541,7 +2541,7 @@ msgstr "Νέο μέγεθος σε MB:"
 #, c-format
 msgid ""
 "To ensure data integrity after resizing the partition(s), \n"
-"filesystem checks will be run on your next boot into Windows(TM)"
+"filesystem checks will be run on your next boot into Microsoft Windows®"
 msgstr ""
 
 #: diskdrake/interactive.pm:851
@@ -4632,7 +4632,7 @@ msgstr "Χρήση υπαρχουσών κατατμήσεων"
 
 #: help.pm:374 install_interactive.pm:137
 #, c-format
-msgid "Use the free space on the Windows partition"
+msgid "Use the free space on the Microsoft Windows® partition"
 msgstr "Χρήση του ελεύθερου χώρου στην κατάτμηση των Windows"
 
 #: help.pm:374
@@ -6036,8 +6036,8 @@ msgstr "Δεν υπάρχουν κατατμήσεις προς χρήση"
 
 #: install_interactive.pm:114
 #, c-format
-msgid "Use the Windows partition for loopback"
-msgstr "Χρήση κατάτμησης Windows για loopback"
+msgid "Use the Microsoft Windows® partition for loopback"
+msgstr "Χρήση κατάτμησης Microsoft Windows® για loopback"
 
 #: install_interactive.pm:117
 #, c-format
@@ -6081,19 +6081,19 @@ msgstr ""
 
 #: install_interactive.pm:156
 #, c-format
-msgid "Computing the size of the Windows partition"
-msgstr "Υπολογίζεται το μέγεθος της κατάτμησης των Windows"
+msgid "Computing the size of the Microsoft Windows® partition"
+msgstr "Υπολογίζεται το μέγεθος της κατάτμησης των Microsoft Windows®"
 
 #: install_interactive.pm:163
 #, c-format
 msgid ""
-"Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
-"installation."
+"Your Microsoft Windows® partition is too fragmented. Please reboot your "
+"computer under Microsoft Windows®, run the ``defrag'' utility, then restart "
+"the Mandriva Linux installation."
 msgstr ""
-"Η κατάτμηση των Windows είναι πολύ κατακερματισμένη, παρακαλώ τρέξτε πρώτα "
-"το ``defrag'' μέσα από τα Windows και ξεκινήστε ξανά την εγκατάσταση του  "
-"Mandriva Linux "
+"Η κατάτμηση των Microsoft Windows® είναι πολύ κατακερματισμένη, παρακαλώ "
+"τρέξτε πρώτα το ``defrag'' μέσα από τα Microsoft Windows® και ξεκινήστε ξανά "
+"την εγκατάσταση του  Mandriva Linux "
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_interactive.pm:166
@@ -6101,28 +6101,38 @@ msgstr ""
 msgid ""
 "WARNING!\n"
 "\n"
-"DrakX will now resize your Windows partition. Be careful: this\n"
-"operation is dangerous. If you have not already done so, you\n"
-"first need to exit the installation, run \"chkdsk c:\" from a\n"
-"Command Prompt under Windows (beware, running graphical program\n"
-"\"scandisk\" is not enough, be sure to use \"chkdsk\" in a\n"
-"Command Prompt!), optionally run defrag, then restart the\n"
-"installation. You should also backup your data.\n"
-"When sure, press Ok."
+"\n"
+"Your Microsoft Windows® partition will be now resized.\n"
+"\n"
+"\n"
+"Be careful: this operation is dangerous. If you have not already done so, "
+"you first need to exit the installation, run \"chkdsk c:\" from a Command "
+"Prompt under Microsoft Windows® (beware, running graphical program \"scandisk"
+"\" is not enough, be sure to use \"chkdsk\" in a Command Prompt!), "
+"optionally run defrag, then restart the installation. You should also backup "
+"your data.\n"
+"\n"
+"\n"
+"When sure, press %s."
 msgstr ""
 "ΠΡΟΣΟΧΗ!\n"
 "\n"
+"\n"
 "Το DrakX πρέπει τώρα να αλλάξει το μέγεθος της κατάτμησης των Windows.\n"
-"Η διαδικασία αυτή εμπεριέχει κινδύνους. Εάν δεν το έχετε κάνει ήδη,\n"
-"βγείτε από την εγκατάσταση ελέγξετε την κατάτμηση με το \n"
-"scandisk μέσα από τα Windows και κατά περίπτωση την αποκατακερμάτιση \n"
-"(defragment). Μετά ξεκινήστε ξανά την εγκατάσταση.\n"
-"Μετά θα πρέπει να κρατήσετε αντίγραφο ασφαλείας των δεδομένων σας.\n"
-"Εάν είστε σίγουροι, πατήστε Εντάξει."
+"\n"
+"\n"
+"Η διαδικασία αυτή εμπεριέχει κινδύνους. Εάν δεν το έχετε κάνει ήδη, βγείτε "
+"από την εγκατάσταση ελέγξετε την κατάτμηση με το  scandisk μέσα από τα "
+"Windows και κατά περίπτωση την αποκατακερμάτιση  (defragment). Μετά "
+"ξεκινήστε ξανά την εγκατάσταση. Μετά θα πρέπει να κρατήσετε αντίγραφο "
+"ασφαλείας των δεδομένων σας.\n"
+"\n"
+"\n"
+"Εάν είστε σίγουροι, πατήστε %s."
 
 #: install_interactive.pm:178
 #, c-format
-msgid "Which size do you want to keep for Windows on"
+msgid "Which size do you want to keep for Microsoft Windows® on"
 msgstr "Τι χώρο θέλετε να κρατήσετε για τα windows στο"
 
 #: install_interactive.pm:179
@@ -6132,8 +6142,8 @@ msgstr "κατάτμηση %s"
 
 #: install_interactive.pm:188
 #, c-format
-msgid "Resizing Windows partition"
-msgstr "Γίνεται αλλαγή τις κατάτμησης των Windows"
+msgid "Resizing Microsoft Windows® partition"
+msgstr "Γίνεται αλλαγή τις κατάτμησης των Microsoft Windows®"
 
 #: install_interactive.pm:193
 #, c-format
@@ -6148,8 +6158,8 @@ msgstr ""
 
 #: install_interactive.pm:213
 #, c-format
-msgid "Remove Windows(TM)"
-msgstr "Αφαίρεση Windows(TM)"
+msgid "Remove Microsoft Windows®"
+msgstr "Αφαίρεση Microsoft Windows®"
 
 #: install_interactive.pm:213
 #, fuzzy, c-format
@@ -6484,7 +6494,7 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "Congratulations, installation is complete.\n"
-"Remove the boot media and press return to reboot.\n"
+"Remove the boot media and press Enter to reboot.\n"
 "\n"
 "\n"
 "For information on fixes which are available for this release of Mandriva "
@@ -16089,7 +16099,7 @@ msgstr ""
 
 #: share/advertising/26.pl:3
 #, c-format
-msgid "How to maintain your system up-to-date?"
+msgid "How to keep your system up-to-date?"
 msgstr ""
 
 #: share/advertising/intel.pl:3
diff --git a/perl-install/share/po/eo.po b/perl-install/share/po/eo.po
index b48df7784..be09280ec 100644
--- a/perl-install/share/po/eo.po
+++ b/perl-install/share/po/eo.po
@@ -2501,7 +2501,7 @@ msgstr "Nova grandeco en MB: "
 #, c-format
 msgid ""
 "To ensure data integrity after resizing the partition(s), \n"
-"filesystem checks will be run on your next boot into Windows(TM)"
+"filesystem checks will be run on your next boot into Microsoft Windows®"
 msgstr ""
 
 #: diskdrake/interactive.pm:851
@@ -4238,7 +4238,7 @@ msgstr "Uzu ekzistantajn subdiskojn"
 
 #: help.pm:374 install_interactive.pm:137
 #, c-format
-msgid "Use the free space on the Windows partition"
+msgid "Use the free space on the Microsoft Windows® partition"
 msgstr "Uzu la liberan spacon sur la Vindoza subdisko"
 
 #: help.pm:374
@@ -5342,7 +5342,7 @@ msgstr "Ne ekzistas subdiskojn por uzi"
 
 #: install_interactive.pm:114
 #, c-format
-msgid "Use the Windows partition for loopback"
+msgid "Use the Microsoft Windows® partition for loopback"
 msgstr "Uzu la Vindoza subdiskon por retrokonektado"
 
 #: install_interactive.pm:117
@@ -5388,15 +5388,15 @@ msgstr ""
 
 #: install_interactive.pm:156
 #, c-format
-msgid "Computing the size of the Windows partition"
+msgid "Computing the size of the Microsoft Windows® partition"
 msgstr "Kalkulante la liberan spacon sur la Vindoza subdisko"
 
 #: install_interactive.pm:163
 #, c-format
 msgid ""
-"Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
-"installation."
+"Your Microsoft Windows® partition is too fragmented. Please reboot your "
+"computer under Microsoft Windows®, run the ``defrag'' utility, then restart "
+"the Mandriva Linux installation."
 msgstr ""
 "Via Vindoza subdisko estas tro fragmentigata, bonvole uzu ``defrag'' antaŭe"
 
@@ -5406,28 +5406,37 @@ msgstr ""
 msgid ""
 "WARNING!\n"
 "\n"
-"DrakX will now resize your Windows partition. Be careful: this\n"
-"operation is dangerous. If you have not already done so, you\n"
-"first need to exit the installation, run \"chkdsk c:\" from a\n"
-"Command Prompt under Windows (beware, running graphical program\n"
-"\"scandisk\" is not enough, be sure to use \"chkdsk\" in a\n"
-"Command Prompt!), optionally run defrag, then restart the\n"
-"installation. You should also backup your data.\n"
-"When sure, press Ok."
+"\n"
+"Your Microsoft Windows® partition will be now resized.\n"
+"\n"
+"\n"
+"Be careful: this operation is dangerous. If you have not already done so, "
+"you first need to exit the installation, run \"chkdsk c:\" from a Command "
+"Prompt under Microsoft Windows® (beware, running graphical program \"scandisk"
+"\" is not enough, be sure to use \"chkdsk\" in a Command Prompt!), "
+"optionally run defrag, then restart the installation. You should also backup "
+"your data.\n"
+"\n"
+"\n"
+"When sure, press %s."
 msgstr ""
 "AVERTO!\n"
 "\n"
-"DrakX nun regrandecigos vian Vindozan subdiskon.  Zorgu:\n"
-"ĉi tiu operacio estas danĝera.  Se vi ne jam faris ĝin,\n"
-"vi prefere antaŭe eliru el la instalado, uzu\n"
-"\"scandisk\" sub Vindozo (kaj laŭvole rulu \"defrag\"), kaj sekve relanĉu "
-"la\n"
-"instaladon. Vi prefere faru ankaŭ rezervan kopion de via datenoj.\n"
-"Kiam vi estos certa, klaku \"Jeso\"."
+"\n"
+"DrakX nun regrandecigos vian Vindozan subdiskon.\n"
+"\n"
+"\n"
+"Zorgu: ĉi tiu operacio estas danĝera.  Se vi ne jam faris ĝin, vi prefere "
+"antaŭe eliru el la instalado, uzu \"scandisk\" sub Vindozo (kaj laŭvole rulu "
+"\"defrag\"), kaj sekve relanĉu la instaladon. Vi prefere faru ankaŭ rezervan "
+"kopion de via datenoj.\n"
+"\n"
+"\n"
+"Kiam vi estos certa, klaku \"%s\"."
 
 #: install_interactive.pm:178
 #, c-format
-msgid "Which size do you want to keep for Windows on"
+msgid "Which size do you want to keep for Microsoft Windows® on"
 msgstr "Kiun grandecon vi deziras teni por Vindozo?"
 
 #: install_interactive.pm:179
@@ -5437,7 +5446,7 @@ msgstr "subdisko: %s"
 
 #: install_interactive.pm:188
 #, c-format
-msgid "Resizing Windows partition"
+msgid "Resizing Microsoft Windows® partition"
 msgstr "Kalkulas Vindozajn dosiersistemajn limojn"
 
 #: install_interactive.pm:193
@@ -5454,7 +5463,7 @@ msgstr ""
 
 #: install_interactive.pm:213
 #, c-format
-msgid "Remove Windows(TM)"
+msgid "Remove Microsoft Windows®"
 msgstr "Forigu Vindozon"
 
 #: install_interactive.pm:213
@@ -5738,7 +5747,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Congratulations, installation is complete.\n"
-"Remove the boot media and press return to reboot.\n"
+"Remove the boot media and press Enter to reboot.\n"
 "\n"
 "\n"
 "For information on fixes which are available for this release of Mandriva "
@@ -14895,7 +14904,7 @@ msgstr ""
 
 #: share/advertising/26.pl:3
 #, c-format
-msgid "How to maintain your system up-to-date?"
+msgid "How to keep your system up-to-date?"
 msgstr ""
 
 #: share/advertising/intel.pl:3
diff --git a/perl-install/share/po/es.po b/perl-install/share/po/es.po
index 25bd7b981..09b5aea05 100644
--- a/perl-install/share/po/es.po
+++ b/perl-install/share/po/es.po
@@ -2624,7 +2624,7 @@ msgstr "Tamaño nuevo en MB: "
 #, c-format
 msgid ""
 "To ensure data integrity after resizing the partition(s), \n"
-"filesystem checks will be run on your next boot into Windows(TM)"
+"filesystem checks will be run on your next boot into Microsoft Windows®"
 msgstr ""
 "Para asegurar la integridad de los datos luego de cambiar el tamaño a\n"
 "las particiones, se pueden ejecutar verificaciones de los sist. de archivos\n"
@@ -4811,7 +4811,7 @@ msgstr "Usar la partición existente"
 
 #: help.pm:374 install_interactive.pm:137
 #, c-format
-msgid "Use the free space on the Windows partition"
+msgid "Use the free space on the Microsoft Windows® partition"
 msgstr "Usar el espacio libre de la partición Windows"
 
 #: help.pm:374
@@ -6405,8 +6405,8 @@ msgstr "No hay ninguna partición existente para usar"
 
 #: install_interactive.pm:114
 #, c-format
-msgid "Use the Windows partition for loopback"
-msgstr "Usar la partición de Windows para loopback"
+msgid "Use the Microsoft Windows® partition for loopback"
+msgstr "Usar la partición de Microsoft Windows® para loopback"
 
 #: install_interactive.pm:117
 #, c-format
@@ -6451,18 +6451,18 @@ msgstr ""
 
 #: install_interactive.pm:156
 #, c-format
-msgid "Computing the size of the Windows partition"
-msgstr "Calculando el espacio de la partición Windows"
+msgid "Computing the size of the Microsoft Windows® partition"
+msgstr "Calculando el espacio de la partición Microsoft Windows®"
 
 #: install_interactive.pm:163
 #, c-format
 msgid ""
-"Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
-"installation."
+"Your Microsoft Windows® partition is too fragmented. Please reboot your "
+"computer under Microsoft Windows®, run the ``defrag'' utility, then restart "
+"the Mandriva Linux installation."
 msgstr ""
-"Su partición Windows está muy fragmentada, por favor primero ejecute \"defrag"
-"\""
+"Su partición Microsoft Windows® está muy fragmentada, por favor primero "
+"ejecute \"defrag\""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_interactive.pm:166
@@ -6470,34 +6470,40 @@ msgstr ""
 msgid ""
 "WARNING!\n"
 "\n"
-"DrakX will now resize your Windows partition. Be careful: this\n"
-"operation is dangerous. If you have not already done so, you\n"
-"first need to exit the installation, run \"chkdsk c:\" from a\n"
-"Command Prompt under Windows (beware, running graphical program\n"
-"\"scandisk\" is not enough, be sure to use \"chkdsk\" in a\n"
-"Command Prompt!), optionally run defrag, then restart the\n"
-"installation. You should also backup your data.\n"
-"When sure, press Ok."
+"\n"
+"Your Microsoft Windows® partition will be now resized.\n"
+"\n"
+"\n"
+"Be careful: this operation is dangerous. If you have not already done so, "
+"you first need to exit the installation, run \"chkdsk c:\" from a Command "
+"Prompt under Microsoft Windows® (beware, running graphical program \"scandisk"
+"\" is not enough, be sure to use \"chkdsk\" in a Command Prompt!), "
+"optionally run defrag, then restart the installation. You should also backup "
+"your data.\n"
+"\n"
+"\n"
+"When sure, press %s."
 msgstr ""
 "¡ADVERTENCIA!\n"
 "\n"
-"Ahora DrakX cambiará el tamaño de su partición Windows. Proceda con "
-"cuidado:\n"
-"esta operación es peligrosa. Si aún no lo hizo, primero debería salir de\n"
-"la instalación, ejecutar \"chkdsk c:\" desde una Línea de Comandos bajo\n"
-"Windows (atención, ejecutar el programa gráfico \"scandisk\" no es "
-"suficiente,\n"
-"¡asegúrese de usar \"chkdsk\" en una Línea de Comandos!), ejecutar \"defrag"
-"\"\n"
-"opcionalmente, y luego volver a iniciar la instalación. También debería "
-"hacer\n"
-"una copia de seguridad de sus datos.\n"
-"Cuando esté seguro, pulse sobre Aceptar."
+"\n"
+"Ahora DrakX cambiará el tamaño de su partición Windows.\n"
+"\n"
+"\n"
+"Proceda con cuidado: esta operación es peligrosa. Si aún no lo hizo, primero "
+"debería salir de la instalación, ejecutar \"chkdsk c:\" desde una Línea de "
+"Comandos bajo Windows (atención, ejecutar el programa gráfico \"scandisk\" "
+"no es suficiente, ¡asegúrese de usar \"chkdsk\" en una Línea de Comandos!), "
+"ejecutar \"defrag\" opcionalmente, y luego volver a iniciar la instalación. "
+"También debería hacer una copia de seguridad de sus datos.\n"
+"\n"
+"\n"
+"Cuando esté seguro, pulse sobre %s."
 
 #: install_interactive.pm:178
 #, c-format
-msgid "Which size do you want to keep for Windows on"
-msgstr "¿Qué tamaño desea conservar para Windows en la"
+msgid "Which size do you want to keep for Microsoft Windows® on"
+msgstr "¿Qué tamaño desea conservar para Microsoft Windows® en la"
 
 #: install_interactive.pm:179
 #, c-format
@@ -6506,8 +6512,8 @@ msgstr "partición %s"
 
 #: install_interactive.pm:188
 #, c-format
-msgid "Resizing Windows partition"
-msgstr "Cambiando tamaño a partición Windows"
+msgid "Resizing Microsoft Windows® partition"
+msgstr "Cambiando tamaño a partición Microsoft Windows®"
 
 #: install_interactive.pm:193
 #, c-format
@@ -6522,8 +6528,8 @@ msgstr ""
 
 #: install_interactive.pm:213
 #, c-format
-msgid "Remove Windows(TM)"
-msgstr "Quitar Windows(TM)"
+msgid "Remove Microsoft Windows®"
+msgstr "Quitar Microsoft Windows®"
 
 #: install_interactive.pm:213
 #, fuzzy, c-format
@@ -6914,7 +6920,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Congratulations, installation is complete.\n"
-"Remove the boot media and press return to reboot.\n"
+"Remove the boot media and press Enter to reboot.\n"
 "\n"
 "\n"
 "For information on fixes which are available for this release of Mandriva "
@@ -16816,7 +16822,7 @@ msgstr ""
 
 #: share/advertising/26.pl:3
 #, c-format
-msgid "How to maintain your system up-to-date?"
+msgid "How to keep your system up-to-date?"
 msgstr ""
 
 #: share/advertising/intel.pl:3
diff --git a/perl-install/share/po/et.po b/perl-install/share/po/et.po
index 16e243a3b..d30fbba80 100644
--- a/perl-install/share/po/et.po
+++ b/perl-install/share/po/et.po
@@ -2598,7 +2598,7 @@ msgstr "Uus suurus (MB): "
 #, c-format
 msgid ""
 "To ensure data integrity after resizing the partition(s), \n"
-"filesystem checks will be run on your next boot into Windows(TM)"
+"filesystem checks will be run on your next boot into Microsoft Windows®"
 msgstr ""
 "Andmete terviklikkuse tagamiseks pärast partitsiooni(de) suuruse muutmist \n"
 "kontrollitakse järgmisel Windows(TM) alglaadimisel failisüsteemi"
@@ -4742,7 +4742,7 @@ msgstr "Kasuta olemasolevat partitsiooni"
 
 #: help.pm:374 install_interactive.pm:137
 #, c-format
-msgid "Use the free space on the Windows partition"
+msgid "Use the free space on the Microsoft Windows® partition"
 msgstr "Kasuta vaba ruumi Windowsi partitsioonil"
 
 #: help.pm:374
@@ -6268,7 +6268,7 @@ msgstr "Kasutatavat partitsiooni ei leitud"
 
 #: install_interactive.pm:114
 #, c-format
-msgid "Use the Windows partition for loopback"
+msgid "Use the Microsoft Windows® partition for loopback"
 msgstr "Kasuta Windowsi partitsiooni loopbackina"
 
 #: install_interactive.pm:117
@@ -6314,19 +6314,19 @@ msgstr ""
 
 #: install_interactive.pm:156
 #, c-format
-msgid "Computing the size of the Windows partition"
+msgid "Computing the size of the Microsoft Windows® partition"
 msgstr "Vaba ruumi arvutamine Windowsi partitsioonil"
 
 #: install_interactive.pm:163
 #, c-format
 msgid ""
-"Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
-"installation."
+"Your Microsoft Windows® partition is too fragmented. Please reboot your "
+"computer under Microsoft Windows®, run the ``defrag'' utility, then restart "
+"the Mandriva Linux installation."
 msgstr ""
-"Teie Windowsi partitsioon on fragmenteerunud. Palun tehke arvutile uus "
-"alglaadimine, käivitage Windows ja seejärel utiliit \"defrag\" ning tulge "
-"siis Mandriva Linuxi paigaldamise juurde tagasi."
+"Teie Microsoft Windows®i partitsioon on fragmenteerunud. Palun tehke "
+"arvutile uus alglaadimine, käivitage Microsoft Windows® ja seejärel utiliit "
+"\"defrag\" ning tulge siis Mandriva Linuxi paigaldamise juurde tagasi."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_interactive.pm:166
@@ -6334,32 +6334,40 @@ msgstr ""
 msgid ""
 "WARNING!\n"
 "\n"
-"DrakX will now resize your Windows partition. Be careful: this\n"
-"operation is dangerous. If you have not already done so, you\n"
-"first need to exit the installation, run \"chkdsk c:\" from a\n"
-"Command Prompt under Windows (beware, running graphical program\n"
-"\"scandisk\" is not enough, be sure to use \"chkdsk\" in a\n"
-"Command Prompt!), optionally run defrag, then restart the\n"
-"installation. You should also backup your data.\n"
-"When sure, press Ok."
+"\n"
+"Your Microsoft Windows® partition will be now resized.\n"
+"\n"
+"\n"
+"Be careful: this operation is dangerous. If you have not already done so, "
+"you first need to exit the installation, run \"chkdsk c:\" from a Command "
+"Prompt under Microsoft Windows® (beware, running graphical program \"scandisk"
+"\" is not enough, be sure to use \"chkdsk\" in a Command Prompt!), "
+"optionally run defrag, then restart the installation. You should also backup "
+"your data.\n"
+"\n"
+"\n"
+"When sure, press %s."
 msgstr ""
 "HOIATUS!\n"
 "\n"
+"\n"
 "DrakX hakkab Teie Windowsi partitsiooni suurust muutma.\n"
-"Olge ettevaatlik: see operatsioon võib olla ohtlik Teie failidele.\n"
-"Palun käivitage enne seda, kui asute paigaldamise juurde,\n"
-"Windowsis käsurealt \"chkdsk c:\" (arvestage, et graafilisest\n"
-"rakendusest \"scandisk\" ei piisa, seepärast kasutage\n"
-"kindlasti käsurealt käivitatavat \"chkdsk\"!).\n"
-"Lisaks sellele defragmenteerige ketas ja alles siis asuge\n"
-"taas paigaldamise kallale. Kasulik oleks juba Windowsis\n"
-"ka oma andmetest tagavarakoopia teha.\n"
-"Kui olete oma otsuses kindel, klõpsake nupule \"Olgu\"."
+"\n"
+"\n"
+"Olge ettevaatlik: see operatsioon võib olla ohtlik Teie failidele. Palun "
+"käivitage enne seda, kui asute paigaldamise juurde, Windowsis käsurealt "
+"\"chkdsk c:\" (arvestage, et graafilisest rakendusest \"scandisk\" ei piisa, "
+"seepärast kasutage kindlasti käsurealt käivitatavat \"chkdsk\"!). Lisaks "
+"sellele defragmenteerige ketas ja alles siis asuge taas paigaldamise "
+"kallale. Kasulik oleks juba Windowsis ka oma andmetest tagavarakoopia teha.\n"
+"\n"
+"\n"
+"Kui olete oma otsuses kindel, klõpsake nupule \"%s\"."
 
 #: install_interactive.pm:178
 #, c-format
-msgid "Which size do you want to keep for Windows on"
-msgstr "Kui palju ruumi jätate Windowsi jaoks?"
+msgid "Which size do you want to keep for Microsoft Windows® on"
+msgstr "Kui palju ruumi jätate Microsoft Windows®i jaoks?"
 
 #: install_interactive.pm:179
 #, c-format
@@ -6368,8 +6376,8 @@ msgstr "partitsioon %s"
 
 #: install_interactive.pm:188
 #, c-format
-msgid "Resizing Windows partition"
-msgstr "Arvutan Windowsi failisüsteemi piire"
+msgid "Resizing Microsoft Windows® partition"
+msgstr "Arvutan Microsoft Windows®i failisüsteemi piire"
 
 #: install_interactive.pm:193
 #, c-format
@@ -6383,8 +6391,8 @@ msgstr "Sobivat FAT-partitsiooni ei leitud (ei ole piisavalt ruumi)"
 
 #: install_interactive.pm:213
 #, c-format
-msgid "Remove Windows(TM)"
-msgstr "Eemalda Windows(TM)"
+msgid "Remove Microsoft Windows®"
+msgstr "Eemalda Microsoft Windows®"
 
 #: install_interactive.pm:213
 #, fuzzy, c-format
@@ -6772,7 +6780,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Congratulations, installation is complete.\n"
-"Remove the boot media and press return to reboot.\n"
+"Remove the boot media and press Enter to reboot.\n"
 "\n"
 "\n"
 "For information on fixes which are available for this release of Mandriva "
@@ -16564,7 +16572,7 @@ msgstr "Kuidas liituda Mandriva Linuxi kogukonnaga?"
 
 #: share/advertising/26.pl:3
 #, c-format
-msgid "How to maintain your system up-to-date?"
+msgid "How to keep your system up-to-date?"
 msgstr "Kuidas hoida süsteem alati uue ja värskena?"
 
 #: share/advertising/intel.pl:3
diff --git a/perl-install/share/po/eu.po b/perl-install/share/po/eu.po
index d0ec41314..825c909c9 100644
--- a/perl-install/share/po/eu.po
+++ b/perl-install/share/po/eu.po
@@ -2613,7 +2613,7 @@ msgstr "Tamaina berria MBtan: "
 #, c-format
 msgid ""
 "To ensure data integrity after resizing the partition(s), \n"
-"filesystem checks will be run on your next boot into Windows(TM)"
+"filesystem checks will be run on your next boot into Microsoft Windows®"
 msgstr ""
 "Partizioen tamaina aldatu ondoren datuen osotasuna ziurtatzeko, \n"
 "fitxategi-sistemaren probak exekutatuko dira Windows(TM) hurrengo\n"
@@ -4772,7 +4772,7 @@ msgstr "Erabili lehendik dagoen partizioa"
 
 #: help.pm:374 install_interactive.pm:137
 #, c-format
-msgid "Use the free space on the Windows partition"
+msgid "Use the free space on the Microsoft Windows® partition"
 msgstr "Erabili Windows-en partizioko leku librea"
 
 #: help.pm:374
@@ -6346,8 +6346,8 @@ msgstr "Ez dago erabiltzeko moduko partiziorik"
 
 #: install_interactive.pm:114
 #, c-format
-msgid "Use the Windows partition for loopback"
-msgstr "Erabili Windows partizioa atzera-begiztarako"
+msgid "Use the Microsoft Windows® partition for loopback"
+msgstr "Erabili Microsoft Windows® partizioa atzera-begiztarako"
 
 #: install_interactive.pm:117
 #, c-format
@@ -6392,19 +6392,19 @@ msgstr ""
 
 #: install_interactive.pm:156
 #, c-format
-msgid "Computing the size of the Windows partition"
-msgstr "Windows-en partizioaren tamaina kalkulatzen"
+msgid "Computing the size of the Microsoft Windows® partition"
+msgstr "Microsoft Windows®-en partizioaren tamaina kalkulatzen"
 
 #: install_interactive.pm:163
 #, c-format
 msgid ""
-"Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
-"installation."
+"Your Microsoft Windows® partition is too fragmented. Please reboot your "
+"computer under Microsoft Windows®, run the ``defrag'' utility, then restart "
+"the Mandriva Linux installation."
 msgstr ""
-"Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
-"installation."
+"Your Microsoft Windows® partition is too fragmented. Please reboot your "
+"computer under Microsoft Windows®, run the ``defrag'' utility, then restart "
+"the Mandriva Linux installation."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_interactive.pm:166
@@ -6412,30 +6412,40 @@ msgstr ""
 msgid ""
 "WARNING!\n"
 "\n"
-"DrakX will now resize your Windows partition. Be careful: this\n"
-"operation is dangerous. If you have not already done so, you\n"
-"first need to exit the installation, run \"chkdsk c:\" from a\n"
-"Command Prompt under Windows (beware, running graphical program\n"
-"\"scandisk\" is not enough, be sure to use \"chkdsk\" in a\n"
-"Command Prompt!), optionally run defrag, then restart the\n"
-"installation. You should also backup your data.\n"
-"When sure, press Ok."
+"\n"
+"Your Microsoft Windows® partition will be now resized.\n"
+"\n"
+"\n"
+"Be careful: this operation is dangerous. If you have not already done so, "
+"you first need to exit the installation, run \"chkdsk c:\" from a Command "
+"Prompt under Microsoft Windows® (beware, running graphical program \"scandisk"
+"\" is not enough, be sure to use \"chkdsk\" in a Command Prompt!), "
+"optionally run defrag, then restart the installation. You should also backup "
+"your data.\n"
+"\n"
+"\n"
+"When sure, press %s."
 msgstr ""
 "ABISUA!\n"
 "\n"
-"DrakX-k Windows-en partizioaren tamaina aldatuko du orain. Kontuz ibili:\n"
-"eragiketa hau arriskutsua da. Oraindik halakorik ez baduzu egin,\n"
-"aurrena instalaziotik irten beharko zenuke, \"chkdsk c:\" exekutatu\n"
-"Windows-eko komando-gonbitetik (kontuan izan \"scandisk\" programa \n"
-"grafikoa exekutatzea ez dela nahikoa, \"chkdsk\" exekutatu behar duzula "
-"komando-gonbitetik!), nahi baduzu defrag ere exekuta dezakezu, eta ondoren\n"
+"\n"
+"DrakX-k Windows-en partizioaren tamaina aldatuko du orain.\n"
+"\n"
+"\n"
+"Kontuz ibili: eragiketa hau arriskutsua da. Oraindik halakorik ez baduzu "
+"egin, aurrena instalaziotik irten beharko zenuke, \"chkdsk c:\" exekutatu "
+"Windows-eko komando-gonbitetik (kontuan izan \"scandisk\" programa  grafikoa "
+"exekutatzea ez dela nahikoa, \"chkdsk\" exekutatu behar duzula komando-"
+"gonbitetik!), nahi baduzu defrag ere exekuta dezakezu, eta ondoren "
 "instalazioa berriro hasi. Datuen babeskopia ere egin beharko zenuke.\n"
-"Ziur bazaude, sakatu 'Ados'."
+"\n"
+"\n"
+"Ziur bazaude, sakatu '%s'."
 
 #: install_interactive.pm:178
 #, c-format
-msgid "Which size do you want to keep for Windows on"
-msgstr "Zein tamaina utzi nahi duzu Windows-entzat"
+msgid "Which size do you want to keep for Microsoft Windows® on"
+msgstr "Zein tamaina utzi nahi duzu Microsoft Windows®-entzat"
 
 #: install_interactive.pm:179
 #, c-format
@@ -6444,8 +6454,8 @@ msgstr "%s partizioan"
 
 #: install_interactive.pm:188
 #, c-format
-msgid "Resizing Windows partition"
-msgstr "Windows partizioaren tamaina aldatzen"
+msgid "Resizing Microsoft Windows® partition"
+msgstr "Microsoft Windows® partizioaren tamaina aldatzen"
 
 #: install_interactive.pm:193
 #, c-format
@@ -6459,8 +6469,8 @@ msgstr "Ez dago FAT partiziorik tamainaz aldatzeko (edo ez dago nahikoa leku)"
 
 #: install_interactive.pm:213
 #, c-format
-msgid "Remove Windows(TM)"
-msgstr "Kendu Windows(TM)"
+msgid "Remove Microsoft Windows®"
+msgstr "Kendu Microsoft Windows®"
 
 #: install_interactive.pm:213
 #, fuzzy, c-format
@@ -6841,7 +6851,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Congratulations, installation is complete.\n"
-"Remove the boot media and press return to reboot.\n"
+"Remove the boot media and press Enter to reboot.\n"
 "\n"
 "\n"
 "For information on fixes which are available for this release of Mandriva "
@@ -16709,7 +16719,7 @@ msgstr "Nola batu Mandriva Linux elkartera?"
 
 #: share/advertising/26.pl:3
 #, c-format
-msgid "How to maintain your system up-to-date?"
+msgid "How to keep your system up-to-date?"
 msgstr "Nola mantendu zure sistema eguneratuta?"
 
 #: share/advertising/intel.pl:3
diff --git a/perl-install/share/po/fa.po b/perl-install/share/po/fa.po
index 2089289da..671d7c355 100644
--- a/perl-install/share/po/fa.po
+++ b/perl-install/share/po/fa.po
@@ -2604,7 +2604,7 @@ msgstr "اندازه‌ی جدید به مگابایت: "
 #, c-format
 msgid ""
 "To ensure data integrity after resizing the partition(s), \n"
-"filesystem checks will be run on your next boot into Windows(TM)"
+"filesystem checks will be run on your next boot into Microsoft Windows®"
 msgstr ""
 "برای اطمینان از صحت داده‌ها بعد از تغییراندازه‌ی قسمت‌بندی(ها)، \n"
 "در آغازگری بعدی بدرون ویندوز کنترل سیستم‌پرونده اجرا خواهد شد"
@@ -4742,7 +4742,7 @@ msgstr "استفاده از قسمت‌بندی‌های موجود"
 
 #: help.pm:374 install_interactive.pm:137
 #, c-format
-msgid "Use the free space on the Windows partition"
+msgid "Use the free space on the Microsoft Windows® partition"
 msgstr "استفاده از فضای آزاد بر قسمت‌بندی ویندوز"
 
 #: help.pm:374
@@ -6266,7 +6266,7 @@ msgstr "قسمت‌بندیی برای استفاده وجود ندارد"
 
 #: install_interactive.pm:114
 #, c-format
-msgid "Use the Windows partition for loopback"
+msgid "Use the Microsoft Windows® partition for loopback"
 msgstr "استفاده از قسمت‌بندی ویندوز برای loopback"
 
 #: install_interactive.pm:117
@@ -6312,15 +6312,15 @@ msgstr ""
 
 #: install_interactive.pm:156
 #, c-format
-msgid "Computing the size of the Windows partition"
+msgid "Computing the size of the Microsoft Windows® partition"
 msgstr "حساب کردن اندازه‌ی قسمت‌بندی ویندوز"
 
 #: install_interactive.pm:163
 #, c-format
 msgid ""
-"Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
-"installation."
+"Your Microsoft Windows® partition is too fragmented. Please reboot your "
+"computer under Microsoft Windows®, run the ``defrag'' utility, then restart "
+"the Mandriva Linux installation."
 msgstr ""
 "قسمت‌بندی ویندوز شما خیلی درهم ریخته است. لطفا رایانه‌ی خود را با ویندوز "
 "آغازگری مجدد کرده، برنامه‌ی نظم بخشی ``defrag'' را اجرا کرده و سپس نصبلینوکس "
@@ -6332,29 +6332,39 @@ msgstr ""
 msgid ""
 "WARNING!\n"
 "\n"
-"DrakX will now resize your Windows partition. Be careful: this\n"
-"operation is dangerous. If you have not already done so, you\n"
-"first need to exit the installation, run \"chkdsk c:\" from a\n"
-"Command Prompt under Windows (beware, running graphical program\n"
-"\"scandisk\" is not enough, be sure to use \"chkdsk\" in a\n"
-"Command Prompt!), optionally run defrag, then restart the\n"
-"installation. You should also backup your data.\n"
-"When sure, press Ok."
+"\n"
+"Your Microsoft Windows® partition will be now resized.\n"
+"\n"
+"\n"
+"Be careful: this operation is dangerous. If you have not already done so, "
+"you first need to exit the installation, run \"chkdsk c:\" from a Command "
+"Prompt under Microsoft Windows® (beware, running graphical program \"scandisk"
+"\" is not enough, be sure to use \"chkdsk\" in a Command Prompt!), "
+"optionally run defrag, then restart the installation. You should also backup "
+"your data.\n"
+"\n"
+"\n"
+"When sure, press %s."
 msgstr ""
 "هشدار!\n"
 "\n"
-"برنامه درایک‌ایکس اکنون قسمت‌بندی ویندوز شما را تغییر اندازه می‌دهد. دقت کنید:\n"
-"این عملیات خطرناکی است. اگر قبلًا این کار را نکرده‌اید، باید نخست از\n"
-"نصب خارج شده، برنامه‌ی \"chkdsk c:\" را از یک اعلان فرمان در\n"
-"ویندوز اجرا کرده (توجه داشته باشید که اجرای برنامه‌ی گرافیکی \"scandisk\"کافی "
-"نیست، مطمئن شوید که از \"chkdsk\" در یک اعلان فرمان استفاده می‌کنید), بد نیست "
-"که برنامه‌ی defrag را نیز اجرا کنید، سپس نصب را\n"
-"راه‌اندازی مجدد کنید. شما باید داده‌های خود را ذخیره پشتیبانی کنید.\n"
-"وقتی مطمئن شدید، تأیید را فشار دهید."
+"\n"
+"برنامه درایک‌ایکس اکنون قسمت‌بندی ویندوز شما را تغییر اندازه می‌دهد.\n"
+"\n"
+"\n"
+"دقت کنید: این عملیات خطرناکی است. اگر قبلًا این کار را نکرده‌اید، باید نخست از "
+"نصب خارج شده، برنامه‌ی \"chkdsk c:\" را از یک اعلان فرمان در ویندوز اجرا کرده "
+"(توجه داشته باشید که اجرای برنامه‌ی گرافیکی \"scandisk\"کافی نیست، مطمئن شوید "
+"که از \"chkdsk\" در یک اعلان فرمان استفاده می‌کنید), بد نیست که برنامه‌ی "
+"defrag را نیز اجرا کنید، سپس نصب را راه‌اندازی مجدد کنید. شما باید داده‌های "
+"خود را ذخیره پشتیبانی کنید.\n"
+"\n"
+"\n"
+"وقتی مطمئن شدید، %s را فشار دهید."
 
 #: install_interactive.pm:178
 #, c-format
-msgid "Which size do you want to keep for Windows on"
+msgid "Which size do you want to keep for Microsoft Windows® on"
 msgstr "چه اندازه‌ای را می‌خواهید برای ویندوز نگهدارید"
 
 #: install_interactive.pm:179
@@ -6364,7 +6374,7 @@ msgstr "قسمت‌بندی %s"
 
 #: install_interactive.pm:188
 #, c-format
-msgid "Resizing Windows partition"
+msgid "Resizing Microsoft Windows® partition"
 msgstr "تغییر اندازه‌ی قسمت‌بندی ویندوز"
 
 #: install_interactive.pm:193
@@ -6380,8 +6390,8 @@ msgstr ""
 
 #: install_interactive.pm:213
 #, c-format
-msgid "Remove Windows(TM)"
-msgstr "برداشتن Windows(TM)"
+msgid "Remove Microsoft Windows®"
+msgstr "برداشتن Microsoft Windows®"
 
 #: install_interactive.pm:213
 #, fuzzy, c-format
@@ -6735,7 +6745,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Congratulations, installation is complete.\n"
-"Remove the boot media and press return to reboot.\n"
+"Remove the boot media and press Enter to reboot.\n"
 "\n"
 "\n"
 "For information on fixes which are available for this release of Mandriva "
@@ -16483,7 +16493,7 @@ msgstr ""
 
 #: share/advertising/26.pl:3
 #, c-format
-msgid "How to maintain your system up-to-date?"
+msgid "How to keep your system up-to-date?"
 msgstr ""
 
 #: share/advertising/intel.pl:3
diff --git a/perl-install/share/po/fi.po b/perl-install/share/po/fi.po
index b4584a12b..0f3f2349f 100644
--- a/perl-install/share/po/fi.po
+++ b/perl-install/share/po/fi.po
@@ -2615,7 +2615,7 @@ msgstr "Uusi koko (Mt): "
 #, c-format
 msgid ""
 "To ensure data integrity after resizing the partition(s), \n"
-"filesystem checks will be run on your next boot into Windows(TM)"
+"filesystem checks will be run on your next boot into Microsoft Windows®"
 msgstr ""
 "Tietojen yhtenäisyyden varmistamiseksi osio(ide)n koon\n"
 "muuttamisen jälkeen suoritetaan tiedostojärjestelmän\n"
@@ -4736,7 +4736,7 @@ msgstr "Käytä olemassa olevia osioita"
 
 #: help.pm:374 install_interactive.pm:137
 #, c-format
-msgid "Use the free space on the Windows partition"
+msgid "Use the free space on the Microsoft Windows® partition"
 msgstr "Käytä tyhjää tilaa Windows-osiolla"
 
 #: help.pm:374
@@ -6247,8 +6247,8 @@ msgstr "Ei ole olemassa olevaa osiota käytettäväksi"
 
 #: install_interactive.pm:114
 #, c-format
-msgid "Use the Windows partition for loopback"
-msgstr "Käytä Windows-osiota loopback-tiedostona"
+msgid "Use the Microsoft Windows® partition for loopback"
+msgstr "Käytä Microsoft Windows®-osiota loopback-tiedostona"
 
 #: install_interactive.pm:117
 #, c-format
@@ -6293,19 +6293,19 @@ msgstr ""
 
 #: install_interactive.pm:156
 #, c-format
-msgid "Computing the size of the Windows partition"
-msgstr "Lasken Windows-osion kokoa"
+msgid "Computing the size of the Microsoft Windows® partition"
+msgstr "Lasken Microsoft Windows®-osion kokoa"
 
 #: install_interactive.pm:163
 #, c-format
 msgid ""
-"Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
-"installation."
+"Your Microsoft Windows® partition is too fragmented. Please reboot your "
+"computer under Microsoft Windows®, run the ``defrag'' utility, then restart "
+"the Mandriva Linux installation."
 msgstr ""
-"Windows-osiosi on liian pirstoutunut, käynnistä koneesi uudelleen, mene "
-"Windowsiin ja aja \"Levyn eheytys\" ensin, ja aloita Mandriva Linuxin "
-"asennus uudestaan sen jälkeen."
+"Microsoft Windows®-osiosi on liian pirstoutunut, käynnistä koneesi "
+"uudelleen, mene Microsoft Windows®iin ja aja \"Levyn eheytys\" ensin, ja "
+"aloita Mandriva Linuxin asennus uudestaan sen jälkeen."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_interactive.pm:166
@@ -6313,31 +6313,40 @@ msgstr ""
 msgid ""
 "WARNING!\n"
 "\n"
-"DrakX will now resize your Windows partition. Be careful: this\n"
-"operation is dangerous. If you have not already done so, you\n"
-"first need to exit the installation, run \"chkdsk c:\" from a\n"
-"Command Prompt under Windows (beware, running graphical program\n"
-"\"scandisk\" is not enough, be sure to use \"chkdsk\" in a\n"
-"Command Prompt!), optionally run defrag, then restart the\n"
-"installation. You should also backup your data.\n"
-"When sure, press Ok."
+"\n"
+"Your Microsoft Windows® partition will be now resized.\n"
+"\n"
+"\n"
+"Be careful: this operation is dangerous. If you have not already done so, "
+"you first need to exit the installation, run \"chkdsk c:\" from a Command "
+"Prompt under Microsoft Windows® (beware, running graphical program \"scandisk"
+"\" is not enough, be sure to use \"chkdsk\" in a Command Prompt!), "
+"optionally run defrag, then restart the installation. You should also backup "
+"your data.\n"
+"\n"
+"\n"
+"When sure, press %s."
 msgstr ""
 "VAROITUS!\n"
 "\n"
-"DrakX aikoo nyt muuttaa Windows-osiosi kokoa. Ole varovainen:\n"
-"tämä toimenpide on vaarallinen. Jos et ole vielä tarkistanut \n"
-"Windows-osioitasi, sinun tulisi poistua asennuksesta, ajaa\n"
-"kiintolevyjen tarkistus \"chkdsk c:\" Windowsissa komentokehotteessa\n"
-"(huomaa että graafisen \"scandisk\" ohjelman käyttö ei riitä), sekä\n"
-"mahdollisesti myös eheyttää levyt käyttäen defrag. Sen jälkeen voit \n"
-"aloittaa asennuksen uudelleen.Samalla suosittelemme ottamaan \n"
-"varmuuskopiot tärkeistä tiedoista.\n"
-"Kun olet varma, paina OK."
+"\n"
+"DrakX aikoo nyt muuttaa Windows-osiosi kokoa.\n"
+"\n"
+"\n"
+"Ole varovainen: tämä toimenpide on vaarallinen. Jos et ole vielä "
+"tarkistanut  Windows-osioitasi, sinun tulisi poistua asennuksesta, ajaa "
+"kiintolevyjen tarkistus \"chkdsk c:\" Windowsissa komentokehotteessa (huomaa "
+"että graafisen \"scandisk\" ohjelman käyttö ei riitä), sekä mahdollisesti "
+"myös eheyttää levyt käyttäen defrag. Sen jälkeen voit aloittaa asennuksen "
+"uudelleen.Samalla suosittelemme ottamaan varmuuskopiot tärkeistä tiedoista.\n"
+"\n"
+"\n"
+"Kun olet varma, paina %s."
 
 #: install_interactive.pm:178
 #, c-format
-msgid "Which size do you want to keep for Windows on"
-msgstr "Kuinka paljon tilaa haluat säilyttää Windowsille"
+msgid "Which size do you want to keep for Microsoft Windows® on"
+msgstr "Kuinka paljon tilaa haluat säilyttää Microsoft Windows®ille"
 
 #: install_interactive.pm:179
 #, c-format
@@ -6346,8 +6355,8 @@ msgstr "osio %s"
 
 #: install_interactive.pm:188
 #, c-format
-msgid "Resizing Windows partition"
-msgstr "Muutan Windows-osion kokoa"
+msgid "Resizing Microsoft Windows® partition"
+msgstr "Muutan Microsoft Windows®-osion kokoa"
 
 #: install_interactive.pm:193
 #, c-format
@@ -6363,8 +6372,8 @@ msgstr ""
 
 #: install_interactive.pm:213
 #, c-format
-msgid "Remove Windows(TM)"
-msgstr "Poista Windows(TM)"
+msgid "Remove Microsoft Windows®"
+msgstr "Poista Microsoft Windows®"
 
 #: install_interactive.pm:213
 #, fuzzy, c-format
@@ -6891,7 +6900,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Congratulations, installation is complete.\n"
-"Remove the boot media and press return to reboot.\n"
+"Remove the boot media and press Enter to reboot.\n"
 "\n"
 "\n"
 "For information on fixes which are available for this release of Mandriva "
@@ -16703,7 +16712,7 @@ msgstr ""
 
 #: share/advertising/26.pl:3
 #, c-format
-msgid "How to maintain your system up-to-date?"
+msgid "How to keep your system up-to-date?"
 msgstr ""
 
 #: share/advertising/intel.pl:3
diff --git a/perl-install/share/po/fr.po b/perl-install/share/po/fr.po
index 1943288b6..4bb18d661 100644
--- a/perl-install/share/po/fr.po
+++ b/perl-install/share/po/fr.po
@@ -2718,7 +2718,7 @@ msgstr "Nouvelle taille en Mo : "
 #, c-format
 msgid ""
 "To ensure data integrity after resizing the partition(s), \n"
-"filesystem checks will be run on your next boot into Windows(TM)"
+"filesystem checks will be run on your next boot into Microsoft Windows®"
 msgstr ""
 "Afin d'assurer l'intégrité des données après le redimensionnement de(s) "
 "partition(s),\n"
@@ -4898,7 +4898,7 @@ msgstr "Utiliser une partition existante"
 
 #: help.pm:374 install_interactive.pm:137
 #, c-format
-msgid "Use the free space on the Windows partition"
+msgid "Use the free space on the Microsoft Windows® partition"
 msgstr "Utiliser l'espace libre sur la partition Windows"
 
 #: help.pm:374
@@ -6464,8 +6464,8 @@ msgstr "Pas de partition existante à utiliser"
 
 #: install_interactive.pm:114
 #, c-format
-msgid "Use the Windows partition for loopback"
-msgstr "Utiliser la partition Windows pour le bouclage"
+msgid "Use the Microsoft Windows® partition for loopback"
+msgstr "Utiliser la partition Microsoft Windows® pour le bouclage"
 
 #: install_interactive.pm:117
 #, c-format
@@ -6510,17 +6510,17 @@ msgstr ""
 
 #: install_interactive.pm:156
 #, c-format
-msgid "Computing the size of the Windows partition"
-msgstr "Calcul de l'espace libre sur la partition Windows"
+msgid "Computing the size of the Microsoft Windows® partition"
+msgstr "Calcul de l'espace libre sur la partition Microsoft Windows®"
 
 #: install_interactive.pm:163
 #, c-format
 msgid ""
-"Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
-"installation."
+"Your Microsoft Windows® partition is too fragmented. Please reboot your "
+"computer under Microsoft Windows®, run the ``defrag'' utility, then restart "
+"the Mandriva Linux installation."
 msgstr ""
-"Votre partition FAT est trop fragmentée. Redémarrez sous Windows\n"
+"Votre partition FAT est trop fragmentée. Redémarrez sous Microsoft Windows®\n"
 "et lancez le programme de défragmentation « defrag »,\n"
 "puis relancez l'installation de Mandriva Linux."
 
@@ -6530,31 +6530,40 @@ msgstr ""
 msgid ""
 "WARNING!\n"
 "\n"
-"DrakX will now resize your Windows partition. Be careful: this\n"
-"operation is dangerous. If you have not already done so, you\n"
-"first need to exit the installation, run \"chkdsk c:\" from a\n"
-"Command Prompt under Windows (beware, running graphical program\n"
-"\"scandisk\" is not enough, be sure to use \"chkdsk\" in a\n"
-"Command Prompt!), optionally run defrag, then restart the\n"
-"installation. You should also backup your data.\n"
-"When sure, press Ok."
+"\n"
+"Your Microsoft Windows® partition will be now resized.\n"
+"\n"
+"\n"
+"Be careful: this operation is dangerous. If you have not already done so, "
+"you first need to exit the installation, run \"chkdsk c:\" from a Command "
+"Prompt under Microsoft Windows® (beware, running graphical program \"scandisk"
+"\" is not enough, be sure to use \"chkdsk\" in a Command Prompt!), "
+"optionally run defrag, then restart the installation. You should also backup "
+"your data.\n"
+"\n"
+"\n"
+"When sure, press %s."
 msgstr ""
 "ATTENTION !\n"
 "\n"
+"\n"
 "La taille de votre partition Windows va maintenant être réduite.\n"
-"Soyez prudent : cette opération est dangereuse. Si ce n'est pas déjà\n"
-"fait, vous devriez tout d'abord quitter l'installation, lancer\n"
-"« chkdsk c: » depuis la ligne de commande sous Windows (attention, le\n"
-"programme graphique « scandisk » n'est pas suffisant, utilisez\n"
-"réellement « chkdsk » depuis la ligne de commande ! ), éventuellement\n"
-"exécutez defrag, puis recommencez l'installation. Vous devriez\n"
-"également sauvegarder vos données.\n"
-"Si vous êtes sûr de vous, cliquez sur OK."
+"\n"
+"\n"
+"Soyez prudent : cette opération est dangereuse. Si ce n'est pas déjà fait, "
+"vous devriez tout d'abord quitter l'installation, lancer « chkdsk c: » "
+"depuis la ligne de commande sous Windows (attention, le programme graphique "
+"« scandisk » n'est pas suffisant, utilisez réellement « chkdsk » depuis la "
+"ligne de commande ! ), éventuellement exécutez defrag, puis recommencez "
+"l'installation. Vous devriez également sauvegarder vos données.\n"
+"\n"
+"\n"
+"Si vous êtes sûr de vous, cliquez sur %s."
 
 #: install_interactive.pm:178
 #, c-format
-msgid "Which size do you want to keep for Windows on"
-msgstr "Quelle taille désirez-vous allouer à Windows sur la"
+msgid "Which size do you want to keep for Microsoft Windows® on"
+msgstr "Quelle taille désirez-vous allouer à Microsoft Windows® sur la"
 
 #: install_interactive.pm:179
 #, c-format
@@ -6563,8 +6572,9 @@ msgstr "partition %s"
 
 #: install_interactive.pm:188
 #, c-format
-msgid "Resizing Windows partition"
-msgstr "Calcul des limites du système de fichiers de Windows en cours"
+msgid "Resizing Microsoft Windows® partition"
+msgstr ""
+"Calcul des limites du système de fichiers de Microsoft Windows® en cours"
 
 #: install_interactive.pm:193
 #, c-format
@@ -6580,7 +6590,7 @@ msgstr ""
 
 #: install_interactive.pm:213
 #, c-format
-msgid "Remove Windows(TM)"
+msgid "Remove Microsoft Windows®"
 msgstr "Supprimer Microsoft Windows™"
 
 #: install_interactive.pm:213
@@ -6960,7 +6970,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Congratulations, installation is complete.\n"
-"Remove the boot media and press return to reboot.\n"
+"Remove the boot media and press Enter to reboot.\n"
 "\n"
 "\n"
 "For information on fixes which are available for this release of Mandriva "
@@ -16980,7 +16990,7 @@ msgstr "Comment rejoindre la communauté Mandriva Linux ?"
 
 #: share/advertising/26.pl:3
 #, c-format
-msgid "How to maintain your system up-to-date?"
+msgid "How to keep your system up-to-date?"
 msgstr "Comment conserver votre système à jour ? "
 
 #: share/advertising/intel.pl:3
diff --git a/perl-install/share/po/fur.po b/perl-install/share/po/fur.po
index 467bb0d31..8240c409e 100644
--- a/perl-install/share/po/fur.po
+++ b/perl-install/share/po/fur.po
@@ -2447,7 +2447,7 @@ msgstr "Gnove dimension in MB: "
 #, c-format
 msgid ""
 "To ensure data integrity after resizing the partition(s), \n"
-"filesystem checks will be run on your next boot into Windows(TM)"
+"filesystem checks will be run on your next boot into Microsoft Windows®"
 msgstr ""
 
 #: diskdrake/interactive.pm:851
@@ -4132,7 +4132,7 @@ msgstr ""
 
 #: help.pm:374 install_interactive.pm:137
 #, c-format
-msgid "Use the free space on the Windows partition"
+msgid "Use the free space on the Microsoft Windows® partition"
 msgstr ""
 
 #: help.pm:374
@@ -5149,7 +5149,7 @@ msgstr ""
 
 #: install_interactive.pm:114
 #, c-format
-msgid "Use the Windows partition for loopback"
+msgid "Use the Microsoft Windows® partition for loopback"
 msgstr ""
 
 #: install_interactive.pm:117
@@ -5191,15 +5191,15 @@ msgstr ""
 
 #: install_interactive.pm:156
 #, c-format
-msgid "Computing the size of the Windows partition"
+msgid "Computing the size of the Microsoft Windows® partition"
 msgstr ""
 
 #: install_interactive.pm:163
 #, c-format
 msgid ""
-"Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
-"installation."
+"Your Microsoft Windows® partition is too fragmented. Please reboot your "
+"computer under Microsoft Windows®, run the ``defrag'' utility, then restart "
+"the Mandriva Linux installation."
 msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
@@ -5208,19 +5208,24 @@ msgstr ""
 msgid ""
 "WARNING!\n"
 "\n"
-"DrakX will now resize your Windows partition. Be careful: this\n"
-"operation is dangerous. If you have not already done so, you\n"
-"first need to exit the installation, run \"chkdsk c:\" from a\n"
-"Command Prompt under Windows (beware, running graphical program\n"
-"\"scandisk\" is not enough, be sure to use \"chkdsk\" in a\n"
-"Command Prompt!), optionally run defrag, then restart the\n"
-"installation. You should also backup your data.\n"
-"When sure, press Ok."
+"\n"
+"Your Microsoft Windows® partition will be now resized.\n"
+"\n"
+"\n"
+"Be careful: this operation is dangerous. If you have not already done so, "
+"you first need to exit the installation, run \"chkdsk c:\" from a Command "
+"Prompt under Microsoft Windows® (beware, running graphical program \"scandisk"
+"\" is not enough, be sure to use \"chkdsk\" in a Command Prompt!), "
+"optionally run defrag, then restart the installation. You should also backup "
+"your data.\n"
+"\n"
+"\n"
+"When sure, press %s."
 msgstr ""
 
 #: install_interactive.pm:178
 #, c-format
-msgid "Which size do you want to keep for Windows on"
+msgid "Which size do you want to keep for Microsoft Windows® on"
 msgstr ""
 
 #: install_interactive.pm:179
@@ -5230,7 +5235,7 @@ msgstr ""
 
 #: install_interactive.pm:188
 #, c-format
-msgid "Resizing Windows partition"
+msgid "Resizing Microsoft Windows® partition"
 msgstr ""
 
 #: install_interactive.pm:193
@@ -5245,8 +5250,8 @@ msgstr ""
 
 #: install_interactive.pm:213
 #, c-format
-msgid "Remove Windows(TM)"
-msgstr "Rimôf Windows (TM)"
+msgid "Remove Microsoft Windows®"
+msgstr "Rimôf Windows™"
 
 #: install_interactive.pm:213
 #, c-format
@@ -5474,7 +5479,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Congratulations, installation is complete.\n"
-"Remove the boot media and press return to reboot.\n"
+"Remove the boot media and press Enter to reboot.\n"
 "\n"
 "\n"
 "For information on fixes which are available for this release of Mandriva "
@@ -14412,7 +14417,7 @@ msgstr ""
 
 #: share/advertising/26.pl:3
 #, c-format
-msgid "How to maintain your system up-to-date?"
+msgid "How to keep your system up-to-date?"
 msgstr ""
 
 #: share/advertising/intel.pl:3
diff --git a/perl-install/share/po/ga.po b/perl-install/share/po/ga.po
index 76e813890..ee8b3ae30 100644
--- a/perl-install/share/po/ga.po
+++ b/perl-install/share/po/ga.po
@@ -2445,7 +2445,7 @@ msgstr "Nua méid i MB: "
 #, c-format
 msgid ""
 "To ensure data integrity after resizing the partition(s), \n"
-"filesystem checks will be run on your next boot into Windows(TM)"
+"filesystem checks will be run on your next boot into Microsoft Windows®"
 msgstr ""
 
 #: diskdrake/interactive.pm:851
@@ -4126,7 +4126,7 @@ msgstr "Ag iarraidh an clár-ranna a tarrtháil"
 
 #: help.pm:374 install_interactive.pm:137
 #, c-format
-msgid "Use the free space on the Windows partition"
+msgid "Use the free space on the Microsoft Windows® partition"
 msgstr "Úsáid an spás saor ar an rann Windows"
 
 #: help.pm:374
@@ -5149,7 +5149,7 @@ msgstr "Ag iarraidh an clár-ranna a tarrtháil"
 
 #: install_interactive.pm:114
 #, c-format
-msgid "Use the Windows partition for loopback"
+msgid "Use the Microsoft Windows® partition for loopback"
 msgstr ""
 
 #: install_interactive.pm:117
@@ -5191,15 +5191,15 @@ msgstr ""
 
 #: install_interactive.pm:156
 #, fuzzy, c-format
-msgid "Computing the size of the Windows partition"
+msgid "Computing the size of the Microsoft Windows® partition"
 msgstr "Cruthaigh rann nua"
 
 #: install_interactive.pm:163
 #, c-format
 msgid ""
-"Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
-"installation."
+"Your Microsoft Windows® partition is too fragmented. Please reboot your "
+"computer under Microsoft Windows®, run the ``defrag'' utility, then restart "
+"the Mandriva Linux installation."
 msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
@@ -5208,19 +5208,24 @@ msgstr ""
 msgid ""
 "WARNING!\n"
 "\n"
-"DrakX will now resize your Windows partition. Be careful: this\n"
-"operation is dangerous. If you have not already done so, you\n"
-"first need to exit the installation, run \"chkdsk c:\" from a\n"
-"Command Prompt under Windows (beware, running graphical program\n"
-"\"scandisk\" is not enough, be sure to use \"chkdsk\" in a\n"
-"Command Prompt!), optionally run defrag, then restart the\n"
-"installation. You should also backup your data.\n"
-"When sure, press Ok."
+"\n"
+"Your Microsoft Windows® partition will be now resized.\n"
+"\n"
+"\n"
+"Be careful: this operation is dangerous. If you have not already done so, "
+"you first need to exit the installation, run \"chkdsk c:\" from a Command "
+"Prompt under Microsoft Windows® (beware, running graphical program \"scandisk"
+"\" is not enough, be sure to use \"chkdsk\" in a Command Prompt!), "
+"optionally run defrag, then restart the installation. You should also backup "
+"your data.\n"
+"\n"
+"\n"
+"When sure, press %s."
 msgstr ""
 
 #: install_interactive.pm:178
 #, c-format
-msgid "Which size do you want to keep for Windows on"
+msgid "Which size do you want to keep for Microsoft Windows® on"
 msgstr ""
 
 #: install_interactive.pm:179
@@ -5230,7 +5235,7 @@ msgstr "rann %s"
 
 #: install_interactive.pm:188
 #, fuzzy, c-format
-msgid "Resizing Windows partition"
+msgid "Resizing Microsoft Windows® partition"
 msgstr "Ag ríomhadh teorainn na córais-comhadlanna FAT"
 
 #: install_interactive.pm:193
@@ -5245,8 +5250,8 @@ msgstr ""
 
 #: install_interactive.pm:213
 #, c-format
-msgid "Remove Windows(TM)"
-msgstr "Dealaigh Windows(TM)"
+msgid "Remove Microsoft Windows®"
+msgstr "Dealaigh Microsoft Windows®"
 
 #: install_interactive.pm:213
 #, fuzzy, c-format
@@ -5474,7 +5479,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Congratulations, installation is complete.\n"
-"Remove the boot media and press return to reboot.\n"
+"Remove the boot media and press Enter to reboot.\n"
 "\n"
 "\n"
 "For information on fixes which are available for this release of Mandriva "
@@ -14452,7 +14457,7 @@ msgstr ""
 
 #: share/advertising/26.pl:3
 #, c-format
-msgid "How to maintain your system up-to-date?"
+msgid "How to keep your system up-to-date?"
 msgstr ""
 
 #: share/advertising/intel.pl:3
diff --git a/perl-install/share/po/gl.po b/perl-install/share/po/gl.po
index 76e084cf2..d76b58956 100644
--- a/perl-install/share/po/gl.po
+++ b/perl-install/share/po/gl.po
@@ -2602,7 +2602,7 @@ msgstr "Novo tamaño en MB: "
 #, c-format
 msgid ""
 "To ensure data integrity after resizing the partition(s), \n"
-"filesystem checks will be run on your next boot into Windows(TM)"
+"filesystem checks will be run on your next boot into Microsoft Windows®"
 msgstr ""
 "Para asegurar a integridade dos datos despois de redimensionar a(s) partición"
 "(s), \n"
@@ -4736,7 +4736,7 @@ msgstr "Usar partición existente"
 
 #: help.pm:374 install_interactive.pm:137
 #, c-format
-msgid "Use the free space on the Windows partition"
+msgid "Use the free space on the Microsoft Windows® partition"
 msgstr "Usa-lo espacio libre da partición de Windows"
 
 #: help.pm:374
@@ -6281,8 +6281,8 @@ msgstr "Non hai ningunha partición existente para usar"
 
 #: install_interactive.pm:114
 #, c-format
-msgid "Use the Windows partition for loopback"
-msgstr "Usar a partición de Windows para loopback"
+msgid "Use the Microsoft Windows® partition for loopback"
+msgstr "Usar a partición de Microsoft Windows® para loopback"
 
 #: install_interactive.pm:117
 #, c-format
@@ -6326,19 +6326,19 @@ msgstr ""
 
 #: install_interactive.pm:156
 #, c-format
-msgid "Computing the size of the Windows partition"
-msgstr "Calculando o tamaño da partición de Windows"
+msgid "Computing the size of the Microsoft Windows® partition"
+msgstr "Calculando o tamaño da partición de Microsoft Windows®"
 
 #: install_interactive.pm:163
 #, c-format
 msgid ""
-"Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
-"installation."
+"Your Microsoft Windows® partition is too fragmented. Please reboot your "
+"computer under Microsoft Windows®, run the ``defrag'' utility, then restart "
+"the Mandriva Linux installation."
 msgstr ""
-"A partición de Windows está demasiado fragmentada. Por favor reinicie o seu "
-"sistema con Windows, execute a utilidade ``defrag'', e despois reinicie a "
-"instalación de Mandriva Linux."
+"A partición de Microsoft Windows® está demasiado fragmentada. Por favor "
+"reinicie o seu sistema con Microsoft Windows®, execute a utilidade "
+"``defrag'', e despois reinicie a instalación de Mandriva Linux."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_interactive.pm:166
@@ -6346,30 +6346,40 @@ msgstr ""
 msgid ""
 "WARNING!\n"
 "\n"
-"DrakX will now resize your Windows partition. Be careful: this\n"
-"operation is dangerous. If you have not already done so, you\n"
-"first need to exit the installation, run \"chkdsk c:\" from a\n"
-"Command Prompt under Windows (beware, running graphical program\n"
-"\"scandisk\" is not enough, be sure to use \"chkdsk\" in a\n"
-"Command Prompt!), optionally run defrag, then restart the\n"
-"installation. You should also backup your data.\n"
-"When sure, press Ok."
+"\n"
+"Your Microsoft Windows® partition will be now resized.\n"
+"\n"
+"\n"
+"Be careful: this operation is dangerous. If you have not already done so, "
+"you first need to exit the installation, run \"chkdsk c:\" from a Command "
+"Prompt under Microsoft Windows® (beware, running graphical program \"scandisk"
+"\" is not enough, be sure to use \"chkdsk\" in a Command Prompt!), "
+"optionally run defrag, then restart the installation. You should also backup "
+"your data.\n"
+"\n"
+"\n"
+"When sure, press %s."
 msgstr ""
 "¡ADVERTENCIA!\n"
 "\n"
-"O DrakX vai redimensiona-la partición de Windows agora. Teña coidado:\n"
-"esta operación é perigosa. Se aínda non o fixo, necesita sair da\n"
-"instalación primeiro, executar \"chkdsk c:\" nun Intérprete de Comandos\n"
-"en Windows (Teña coidado, executa-lo programa gráfico \"scandisk\")\n"
-"non é dabondo, ¡asegúrese de usar \"chkdsk\" nun Intérprete de\n"
-"Comandos!), e opcionalmente o defrag, e reinicia-la instalación.\n"
-"Tamén é aconsellable facer unha copia de seguridade dos seus datos.\n"
-"Cando estea seguro, prema Aceptar."
+"\n"
+"O DrakX vai redimensiona-la partición de Windows agora.\n"
+"\n"
+"\n"
+"Teña coidado: esta operación é perigosa. Se aínda non o fixo, necesita sair "
+"da instalación primeiro, executar \"chkdsk c:\" nun Intérprete de Comandos "
+"en Windows (Teña coidado, executa-lo programa gráfico \"scandisk\") non é "
+"dabondo, ¡asegúrese de usar \"chkdsk\" nun Intérprete de Comandos!), e "
+"opcionalmente o defrag, e reinicia-la instalación. Tamén é aconsellable "
+"facer unha copia de seguridade dos seus datos.\n"
+"\n"
+"\n"
+"Cando estea seguro, prema %s."
 
 #: install_interactive.pm:178
 #, c-format
-msgid "Which size do you want to keep for Windows on"
-msgstr "¿Que tamaño desexa manter para o Windows en"
+msgid "Which size do you want to keep for Microsoft Windows® on"
+msgstr "¿Que tamaño desexa manter para o Microsoft Windows® en"
 
 #: install_interactive.pm:179
 #, c-format
@@ -6378,8 +6388,8 @@ msgstr "partición %s"
 
 #: install_interactive.pm:188
 #, c-format
-msgid "Resizing Windows partition"
-msgstr "Redimensionando a partición de Windows"
+msgid "Resizing Microsoft Windows® partition"
+msgstr "Redimensionando a partición de Microsoft Windows®"
 
 #: install_interactive.pm:193
 #, c-format
@@ -6394,8 +6404,8 @@ msgstr ""
 
 #: install_interactive.pm:213
 #, c-format
-msgid "Remove Windows(TM)"
-msgstr "Elimina-lo Windows(TM)"
+msgid "Remove Microsoft Windows®"
+msgstr "Elimina-lo Microsoft Windows®"
 
 #: install_interactive.pm:213
 #, c-format
@@ -6663,7 +6673,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Congratulations, installation is complete.\n"
-"Remove the boot media and press return to reboot.\n"
+"Remove the boot media and press Enter to reboot.\n"
 "\n"
 "\n"
 "For information on fixes which are available for this release of Mandriva "
@@ -16350,7 +16360,7 @@ msgstr "Como unirse á comunidade de Mandriva Linux?"
 
 #: share/advertising/26.pl:3
 #, c-format
-msgid "How to maintain your system up-to-date?"
+msgid "How to keep your system up-to-date?"
 msgstr "Como manter o seu sistema actualizado?"
 
 #: share/advertising/intel.pl:3
diff --git a/perl-install/share/po/he.po b/perl-install/share/po/he.po
index 015a26e5b..3ae7c5c17 100644
--- a/perl-install/share/po/he.po
+++ b/perl-install/share/po/he.po
@@ -2545,7 +2545,7 @@ msgstr "גודל חדש ב-MB: "
 #, c-format
 msgid ""
 "To ensure data integrity after resizing the partition(s), \n"
-"filesystem checks will be run on your next boot into Windows(TM)"
+"filesystem checks will be run on your next boot into Microsoft Windows®"
 msgstr ""
 "על מנת להבטיח את שלמות הנתונים אחרי שינוי גודל המחיצה(ות) \n"
 "תiפעל בדיקה של מערכת הקבצים באתחול הבא של חלונות"
@@ -4436,7 +4436,7 @@ msgstr "שימוש במחיצות קיימות"
 
 #: help.pm:374 install_interactive.pm:137
 #, c-format
-msgid "Use the free space on the Windows partition"
+msgid "Use the free space on the Microsoft Windows® partition"
 msgstr "שימוש בשטח החופשי שעל מחיצת חלונות"
 
 #: help.pm:374
@@ -5699,7 +5699,7 @@ msgstr "אין מחיצה קיימת לשימוש"
 
 #: install_interactive.pm:114
 #, c-format
-msgid "Use the Windows partition for loopback"
+msgid "Use the Microsoft Windows® partition for loopback"
 msgstr "שימוש במחיצת חלונות ל-loopback"
 
 #: install_interactive.pm:117
@@ -5743,15 +5743,15 @@ msgstr ""
 
 #: install_interactive.pm:156
 #, c-format
-msgid "Computing the size of the Windows partition"
+msgid "Computing the size of the Microsoft Windows® partition"
 msgstr "חישוב השטח החופשי על מחיצת חלונות"
 
 #: install_interactive.pm:163
 #, c-format
 msgid ""
-"Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
-"installation."
+"Your Microsoft Windows® partition is too fragmented. Please reboot your "
+"computer under Microsoft Windows®, run the ``defrag'' utility, then restart "
+"the Mandriva Linux installation."
 msgstr ""
 "מחיצת החלונות אינה מאוחה. עליך להפעיל מחדש את המחשב ולהיכנס לחלונות, ושם "
 "להפעיל את תוכנת איחוי המחיצות (defrag). לאחר מכן יש להפעיל מחדש את התקנת "
@@ -5763,26 +5763,36 @@ msgstr ""
 msgid ""
 "WARNING!\n"
 "\n"
-"DrakX will now resize your Windows partition. Be careful: this\n"
-"operation is dangerous. If you have not already done so, you\n"
-"first need to exit the installation, run \"chkdsk c:\" from a\n"
-"Command Prompt under Windows (beware, running graphical program\n"
-"\"scandisk\" is not enough, be sure to use \"chkdsk\" in a\n"
-"Command Prompt!), optionally run defrag, then restart the\n"
-"installation. You should also backup your data.\n"
-"When sure, press Ok."
+"\n"
+"Your Microsoft Windows® partition will be now resized.\n"
+"\n"
+"\n"
+"Be careful: this operation is dangerous. If you have not already done so, "
+"you first need to exit the installation, run \"chkdsk c:\" from a Command "
+"Prompt under Microsoft Windows® (beware, running graphical program \"scandisk"
+"\" is not enough, be sure to use \"chkdsk\" in a Command Prompt!), "
+"optionally run defrag, then restart the installation. You should also backup "
+"your data.\n"
+"\n"
+"\n"
+"When sure, press %s."
 msgstr ""
 "אזהרה!\n"
 "\n"
-"התכנית DrakX תשנה עכשיו את גודל מחיצת חלונות. נא לשים לב\n"
-"שפעולה זאת מסוכנת. אם לא עשית כן, עליך לצאת מההתקנה, להריץ scandisk\n"
-"תחת חלונות (וכנראה גם defrag) ואז לאתחל את ההתקנה.\n"
-"עליך לדאוג גם לגיבויים של המידע שלך.\n"
-"אם ניתן להמשיך כעת, נא ללחוץ על \"אישור\"."
+"\n"
+"התכנית DrakX תשנה עכשיו את גודל מחיצת חלונות.\n"
+"\n"
+"\n"
+"נא לשים לב שפעולה זאת מסוכנת. אם לא עשית כן, עליך לצאת מההתקנה, להריץ "
+"scandisk תחת חלונות (וכנראה גם defrag) ואז לאתחל את ההתקנה. עליך לדאוג גם "
+"לגיבויים של המידע שלך.\n"
+"\n"
+"\n"
+"אם ניתן להמשיך כעת, נא ללחוץ על \"%s\"."
 
 #: install_interactive.pm:178
 #, c-format
-msgid "Which size do you want to keep for Windows on"
+msgid "Which size do you want to keep for Microsoft Windows® on"
 msgstr "איזה גודל שטח ברצונך להשאיר לחלונות ב-"
 
 #: install_interactive.pm:179
@@ -5792,7 +5802,7 @@ msgstr "מחיצת %s"
 
 #: install_interactive.pm:188
 #, c-format
-msgid "Resizing Windows partition"
+msgid "Resizing Microsoft Windows® partition"
 msgstr "שינוי גודל של מחיצת חלונות"
 
 #: install_interactive.pm:193
@@ -5807,7 +5817,7 @@ msgstr "אין מחיצת FAT שניתן לשנות את גודלה (או לא �
 
 #: install_interactive.pm:213
 #, c-format
-msgid "Remove Windows(TM)"
+msgid "Remove Microsoft Windows®"
 msgstr "הסרת מערכת חלונות"
 
 #: install_interactive.pm:213
@@ -6154,7 +6164,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Congratulations, installation is complete.\n"
-"Remove the boot media and press return to reboot.\n"
+"Remove the boot media and press Enter to reboot.\n"
 "\n"
 "\n"
 "For information on fixes which are available for this release of Mandriva "
@@ -15573,7 +15583,7 @@ msgstr "איך ניתן להצטרף לקהילת מנדריבה לינוקס?"
 
 #: share/advertising/26.pl:3
 #, c-format
-msgid "How to maintain your system up-to-date?"
+msgid "How to keep your system up-to-date?"
 msgstr "איך ניתן לשמור על עדכניות המערכת?"
 
 #: share/advertising/intel.pl:3
diff --git a/perl-install/share/po/hi.po b/perl-install/share/po/hi.po
index 6ad863549..11b3481c5 100644
--- a/perl-install/share/po/hi.po
+++ b/perl-install/share/po/hi.po
@@ -2579,7 +2579,7 @@ msgstr "एमबी में नया आकार: "
 #, c-format
 msgid ""
 "To ensure data integrity after resizing the partition(s), \n"
-"filesystem checks will be run on your next boot into Windows(TM)"
+"filesystem checks will be run on your next boot into Microsoft Windows®"
 msgstr ""
 "विभाजन(विभाजनों) के पुनःआकारीकरण के उपरान्त, डाटा की स्थिरता एकनिष्टता को सुनिश्चत "
 "करने हेतु, \n"
@@ -4651,7 +4651,7 @@ msgstr "विद्यमान विभाजन को उपयोग क�
 
 #: help.pm:374 install_interactive.pm:137
 #, c-format
-msgid "Use the free space on the Windows partition"
+msgid "Use the free space on the Microsoft Windows® partition"
 msgstr "विण्डो विभाजन पर उपलब्ध मुक्त स्थान का उपयोग करें"
 
 #: help.pm:374
@@ -5768,7 +5768,7 @@ msgstr "कोई विद्यमान विभाजन उपयोगा
 
 #: install_interactive.pm:114
 #, c-format
-msgid "Use the Windows partition for loopback"
+msgid "Use the Microsoft Windows® partition for loopback"
 msgstr "लूपबैक के लिए विण्डो विभाजन का उपयोग करें"
 
 #: install_interactive.pm:117
@@ -5814,15 +5814,15 @@ msgstr ""
 
 #: install_interactive.pm:156
 #, c-format
-msgid "Computing the size of the Windows partition"
+msgid "Computing the size of the Microsoft Windows® partition"
 msgstr "विण्डो विभाजन के आकार की गणना की जा रही है"
 
 #: install_interactive.pm:163
 #, c-format
 msgid ""
-"Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
-"installation."
+"Your Microsoft Windows® partition is too fragmented. Please reboot your "
+"computer under Microsoft Windows®, run the ``defrag'' utility, then restart "
+"the Mandriva Linux installation."
 msgstr ""
 "आपका विण्डो विभाजन अति खंडित है । कृपया अपने कम्प्यूटर को विण्डो के अन्तर्गत पुनः आरम्भ "
 "करें, ``defrag'' कार्यक्रम को चलायें, और फ़िर मैनड्रिव लिनक्स संसाधन को पुनः आरम्भ करें ।"
@@ -5833,29 +5833,37 @@ msgstr ""
 msgid ""
 "WARNING!\n"
 "\n"
-"DrakX will now resize your Windows partition. Be careful: this\n"
-"operation is dangerous. If you have not already done so, you\n"
-"first need to exit the installation, run \"chkdsk c:\" from a\n"
-"Command Prompt under Windows (beware, running graphical program\n"
-"\"scandisk\" is not enough, be sure to use \"chkdsk\" in a\n"
-"Command Prompt!), optionally run defrag, then restart the\n"
-"installation. You should also backup your data.\n"
-"When sure, press Ok."
+"\n"
+"Your Microsoft Windows® partition will be now resized.\n"
+"\n"
+"\n"
+"Be careful: this operation is dangerous. If you have not already done so, "
+"you first need to exit the installation, run \"chkdsk c:\" from a Command "
+"Prompt under Microsoft Windows® (beware, running graphical program \"scandisk"
+"\" is not enough, be sure to use \"chkdsk\" in a Command Prompt!), "
+"optionally run defrag, then restart the installation. You should also backup "
+"your data.\n"
+"\n"
+"\n"
+"When sure, press %s."
 msgstr ""
 "चेतावनी!\n"
 "\n"
-"ड्रैकएक्स अब आपके विण्डो विभाजन को पुनःआकार देगा। सावधान रहें: \n"
-"यह कार्य खतरनाक है । यदि आप पहिले से ऐसा नहीं चुके है, तो आपको\n"
-"पहले संसाधन प्रक्रिया से बाहर निकलने की आवश्यकता है, फ़िर विण्डो के अन्तर्गत एक\n"
-"कॉमाण्ड प्रॉम्पट से \"chkdsk c:\" को चलना होगा (सावधान, सचित्र कार्यक्रम\n"
-"\"scandisk\" को चलाना काफ़ी नहीं है, \"chkdsk\" को कॉमाण्ड प्रॉम्पट से ही चलायें !)\n"
-", वैकल्पिक रूप से defrag को चलायें, और फ़िर संसाधन प्रक्रिया को पुनः आरम्भ करें ।\n"
-"आपको अपनी सूचनाओं का बैक-अप भी ले लेना चाहिए । \n"
-"जब यह सब सुनिश्चित कर लें, तब ठीक को दबायें।"
+"\n"
+"ड्रैकएक्स अब आपके विण्डो विभाजन को पुनःआकार देगा।\n"
+"सावधान रहें:  यह कार्य खतरनाक है । यदि आप पहिले से ऐसा नहीं चुके है, तो आपको पहले संसाधन "
+"प्रक्रिया से बाहर निकलने की आवश्यकता है, फ़िर विण्डो के अन्तर्गत एक कॉमाण्ड प्रॉम्पट से "
+"\"chkdsk c:\" को चलना होगा (सावधान, सचित्र कार्यक्रम \"scandisk\" को चलाना काफ़ी "
+"नहीं है, \"chkdsk\" को कॉमाण्ड प्रॉम्पट से ही चलायें !) , वैकल्पिक रूप से defrag को "
+"चलायें, और फ़िर संसाधन प्रक्रिया को पुनः आरम्भ करें । आपको अपनी सूचनाओं का बैक-अप भी ले "
+"लेना चाहिए । \n"
+"\n"
+"\n"
+"जब यह सब सुनिश्चित कर लें, तब %s को दबायें।"
 
 #: install_interactive.pm:178
 #, c-format
-msgid "Which size do you want to keep for Windows on"
+msgid "Which size do you want to keep for Microsoft Windows® on"
 msgstr "विण्डो के लिए आप क्या आकार रखना चाहते है"
 
 #: install_interactive.pm:179
@@ -5865,7 +5873,7 @@ msgstr "विभाजन %s"
 
 #: install_interactive.pm:188
 #, c-format
-msgid "Resizing Windows partition"
+msgid "Resizing Microsoft Windows® partition"
 msgstr "विण्डो विभाजन का पुनः आकारीकरण किया जा रहा है"
 
 #: install_interactive.pm:193
@@ -5880,7 +5888,7 @@ msgstr "पुनः आकारीकरण के लिए कोई फ़ै�
 
 #: install_interactive.pm:213
 #, c-format
-msgid "Remove Windows(TM)"
+msgid "Remove Microsoft Windows®"
 msgstr "विण्डो (TM) को हटायें"
 
 #: install_interactive.pm:213
@@ -6234,7 +6242,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Congratulations, installation is complete.\n"
-"Remove the boot media and press return to reboot.\n"
+"Remove the boot media and press Enter to reboot.\n"
 "\n"
 "\n"
 "For information on fixes which are available for this release of Mandriva "
@@ -15810,7 +15818,7 @@ msgstr ""
 
 #: share/advertising/26.pl:3
 #, c-format
-msgid "How to maintain your system up-to-date?"
+msgid "How to keep your system up-to-date?"
 msgstr ""
 
 #: share/advertising/intel.pl:3
diff --git a/perl-install/share/po/hr.po b/perl-install/share/po/hr.po
index ac0a20da9..5840d1737 100644
--- a/perl-install/share/po/hr.po
+++ b/perl-install/share/po/hr.po
@@ -2542,7 +2542,7 @@ msgstr "Nova veličina u MB: "
 #, c-format
 msgid ""
 "To ensure data integrity after resizing the partition(s), \n"
-"filesystem checks will be run on your next boot into Windows(TM)"
+"filesystem checks will be run on your next boot into Microsoft Windows®"
 msgstr ""
 
 #: diskdrake/interactive.pm:851
@@ -4578,7 +4578,7 @@ msgstr "Koristi postojeće particije"
 
 #: help.pm:374 install_interactive.pm:137
 #, c-format
-msgid "Use the free space on the Windows partition"
+msgid "Use the free space on the Microsoft Windows® partition"
 msgstr "Iskoristi slobodan prostor na Windows particiji"
 
 #: help.pm:374
@@ -5966,8 +5966,8 @@ msgstr "Nema postojećih particija koje bih mogao upotrijebiti"
 
 #: install_interactive.pm:114
 #, c-format
-msgid "Use the Windows partition for loopback"
-msgstr "Koristi Windows particiju za loopback"
+msgid "Use the Microsoft Windows® partition for loopback"
+msgstr "Koristi Microsoft Windows® particiju za loopback"
 
 #: install_interactive.pm:117
 #, c-format
@@ -6012,17 +6012,18 @@ msgstr ""
 
 #: install_interactive.pm:156
 #, fuzzy, c-format
-msgid "Computing the size of the Windows partition"
-msgstr "Iskoristi slobodan prostor na Windows particiji"
+msgid "Computing the size of the Microsoft Windows® partition"
+msgstr "Iskoristi slobodan prostor na Microsoft Windows® particiji"
 
 #: install_interactive.pm:163
 #, c-format
 msgid ""
-"Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
-"installation."
+"Your Microsoft Windows® partition is too fragmented. Please reboot your "
+"computer under Microsoft Windows®, run the ``defrag'' utility, then restart "
+"the Mandriva Linux installation."
 msgstr ""
-"Vaša Windows particija je prefragmentirana, molim pokrenite ``defrag'' prvo."
+"Vaša Microsoft Windows® particija je prefragmentirana, molim pokrenite "
+"``defrag'' prvo."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_interactive.pm:166
@@ -6030,28 +6031,38 @@ msgstr ""
 msgid ""
 "WARNING!\n"
 "\n"
-"DrakX will now resize your Windows partition. Be careful: this\n"
-"operation is dangerous. If you have not already done so, you\n"
-"first need to exit the installation, run \"chkdsk c:\" from a\n"
-"Command Prompt under Windows (beware, running graphical program\n"
-"\"scandisk\" is not enough, be sure to use \"chkdsk\" in a\n"
-"Command Prompt!), optionally run defrag, then restart the\n"
-"installation. You should also backup your data.\n"
-"When sure, press Ok."
+"\n"
+"Your Microsoft Windows® partition will be now resized.\n"
+"\n"
+"\n"
+"Be careful: this operation is dangerous. If you have not already done so, "
+"you first need to exit the installation, run \"chkdsk c:\" from a Command "
+"Prompt under Microsoft Windows® (beware, running graphical program \"scandisk"
+"\" is not enough, be sure to use \"chkdsk\" in a Command Prompt!), "
+"optionally run defrag, then restart the installation. You should also backup "
+"your data.\n"
+"\n"
+"\n"
+"When sure, press %s."
 msgstr ""
 "UPOZORENJE!\n"
 "\n"
-"DrakX sada mora promijeniti veličinu vaše Windows particije\n"
-"Budite vrlo oprezni budući da je ova operacija\n"
-"izuzetno opasna. Ukoliko još niste mijenjali veličinu particije molim\n"
-"izađite prvo iz instalacije, pokrenite scandisk pod Windowsima (opcionalno "
-"pokrenite defrag), tada ponovno pokrenite instalaciju.\n"
-"Također preporučljivo je da sačuvate vaše podatke (napravite backup).\n"
-"Kada ste sigurni da želite nastaviti, pritisnite U redu."
+"\n"
+"DrakX sada mora promijeniti veličinu vaše Windows particije.\n"
+"\n"
+"\n"
+"Budite vrlo oprezni budući da je ova operacija izuzetno opasna. Ukoliko još "
+"niste mijenjali veličinu particije molim izađite prvo iz instalacije, "
+"pokrenite scandisk pod Windowsima (opcionalno pokrenite defrag), tada "
+"ponovno pokrenite instalaciju. Također preporučljivo je da sačuvate vaše "
+"podatke (napravite backup).\n"
+"\n"
+"\n"
+"Kada ste sigurni da želite nastaviti, pritisnite %s."
 
 #: install_interactive.pm:178
 #, c-format
-msgid "Which size do you want to keep for Windows on"
+msgid "Which size do you want to keep for Microsoft Windows® on"
 msgstr "Koliku veličinu želite zadržati za windowse"
 
 #: install_interactive.pm:179
@@ -6061,8 +6072,8 @@ msgstr "particija %s"
 
 #: install_interactive.pm:188
 #, c-format
-msgid "Resizing Windows partition"
-msgstr "Izračunavam granice Windows datotečnog sustava"
+msgid "Resizing Microsoft Windows® partition"
+msgstr "Izračunavam granice Microsoft Windows® datotečnog sustava"
 
 #: install_interactive.pm:193
 #, c-format
@@ -6078,7 +6089,7 @@ msgstr ""
 
 #: install_interactive.pm:213
 #, c-format
-msgid "Remove Windows(TM)"
+msgid "Remove Microsoft Windows®"
 msgstr "Ukloni Windowse(TM)"
 
 #: install_interactive.pm:213
@@ -6451,7 +6462,7 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "Congratulations, installation is complete.\n"
-"Remove the boot media and press return to reboot.\n"
+"Remove the boot media and press Enter to reboot.\n"
 "\n"
 "\n"
 "For information on fixes which are available for this release of Mandriva "
@@ -15936,7 +15947,7 @@ msgstr ""
 
 #: share/advertising/26.pl:3
 #, c-format
-msgid "How to maintain your system up-to-date?"
+msgid "How to keep your system up-to-date?"
 msgstr ""
 
 #: share/advertising/intel.pl:3
diff --git a/perl-install/share/po/hu.po b/perl-install/share/po/hu.po
index c8ed8a5b0..4feb54eeb 100644
--- a/perl-install/share/po/hu.po
+++ b/perl-install/share/po/hu.po
@@ -2624,7 +2624,7 @@ msgstr "Az új méret (MB-ban): "
 #, c-format
 msgid ""
 "To ensure data integrity after resizing the partition(s), \n"
-"filesystem checks will be run on your next boot into Windows(TM)"
+"filesystem checks will be run on your next boot into Microsoft Windows®"
 msgstr ""
 "Az adatok épségének biztosítása érdekében a legközelebbi Windows-"
 "indításnál \n"
@@ -4782,7 +4782,7 @@ msgstr "Már létező partíció használata"
 
 #: help.pm:374 install_interactive.pm:137
 #, c-format
-msgid "Use the free space on the Windows partition"
+msgid "Use the free space on the Microsoft Windows® partition"
 msgstr "A windowsos partíción levő szabad hely felhasználása"
 
 #: help.pm:374
@@ -6329,7 +6329,7 @@ msgstr "Nincs olyan már létező partíció, amit használhatnék"
 
 #: install_interactive.pm:114
 #, c-format
-msgid "Use the Windows partition for loopback"
+msgid "Use the Microsoft Windows® partition for loopback"
 msgstr "A loopback-hez a windowsos partíció használata"
 
 #: install_interactive.pm:117
@@ -6373,19 +6373,19 @@ msgstr ""
 
 #: install_interactive.pm:156
 #, c-format
-msgid "Computing the size of the Windows partition"
+msgid "Computing the size of the Microsoft Windows® partition"
 msgstr "A windowsos partíció méretének meghatározása"
 
 #: install_interactive.pm:163
 #, c-format
 msgid ""
-"Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
-"installation."
+"Your Microsoft Windows® partition is too fragmented. Please reboot your "
+"computer under Microsoft Windows®, run the ``defrag'' utility, then restart "
+"the Mandriva Linux installation."
 msgstr ""
-"A windowsos partíció túlzottan töredezett. Indítsa újra a gépet Windowsszal, "
-"majd futtassa a \"defrag\" programot. Ennek végeztével indítsa el újra a "
-"Mandriva Linux telepítését."
+"A windowsos partíció túlzottan töredezett. Indítsa újra a gépet Microsoft "
+"Windows®szal, majd futtassa a \"defrag\" programot. Ennek végeztével indítsa "
+"el újra a Mandriva Linux telepítését."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_interactive.pm:166
@@ -6393,31 +6393,41 @@ msgstr ""
 msgid ""
 "WARNING!\n"
 "\n"
-"DrakX will now resize your Windows partition. Be careful: this\n"
-"operation is dangerous. If you have not already done so, you\n"
-"first need to exit the installation, run \"chkdsk c:\" from a\n"
-"Command Prompt under Windows (beware, running graphical program\n"
-"\"scandisk\" is not enough, be sure to use \"chkdsk\" in a\n"
-"Command Prompt!), optionally run defrag, then restart the\n"
-"installation. You should also backup your data.\n"
-"When sure, press Ok."
+"\n"
+"Your Microsoft Windows® partition will be now resized.\n"
+"\n"
+"\n"
+"Be careful: this operation is dangerous. If you have not already done so, "
+"you first need to exit the installation, run \"chkdsk c:\" from a Command "
+"Prompt under Microsoft Windows® (beware, running graphical program \"scandisk"
+"\" is not enough, be sure to use \"chkdsk\" in a Command Prompt!), "
+"optionally run defrag, then restart the installation. You should also backup "
+"your data.\n"
+"\n"
+"\n"
+"When sure, press %s."
 msgstr ""
 "FIGYELEM!\n"
 "\n"
-"A telepítő most átméretezi a windowsos partíciót. Ez a művelet veszélyes.\n"
-"Ha még nem tette meg, adjon ki egy \"chkdsk c:\" parancsot egy windowsos\n"
-"parancssorból (a \"scandisk\" nevű grafikus program futtatása nem "
-"elegendő).\n"
-"Esetleg futtassa le a \"defrag\" programot is Windows alatt. Ezeknek a\n"
-"végrehajtásához természetesen ki kell lépnie a telepítőből.\n"
-"Lehetőleg mentse le az adatokat, mielőtt újra elindítaná a telepítőt.\n"
-"Ha biztos abban, hogy folytatni szeretné a telepítést, nyomja meg az \"OK\"-"
+"\n"
+"A telepítő most átméretezi a windowsos partíciót.\n"
+"\n"
+"\n"
+"Ez a művelet veszélyes. Ha még nem tette meg, adjon ki egy \"chkdsk c:\" "
+"parancsot egy windowsos parancssorból (a \"scandisk\" nevű grafikus program "
+"futtatása nem elegendő). Esetleg futtassa le a \"defrag\" programot is "
+"Windows alatt. Ezeknek a végrehajtásához természetesen ki kell lépnie a "
+"telepítőből. Lehetőleg mentse le az adatokat, mielőtt újra elindítaná a "
+"telepítőt.\n"
+"\n"
+"\n"
+"Ha biztos abban, hogy folytatni szeretné a telepítést, nyomja meg az \"%s\"-"
 "t."
 
 #: install_interactive.pm:178
 #, c-format
-msgid "Which size do you want to keep for Windows on"
-msgstr "Mekkora helyet szeretne fenntartani a Windowsnak itt:"
+msgid "Which size do you want to keep for Microsoft Windows® on"
+msgstr "Mekkora helyet szeretne fenntartani a Microsoft Windows®nak itt:"
 
 #: install_interactive.pm:179
 #, c-format
@@ -6426,8 +6436,8 @@ msgstr "%s partíció"
 
 #: install_interactive.pm:188
 #, c-format
-msgid "Resizing Windows partition"
-msgstr "Windowsos partíció átméretezése"
+msgid "Resizing Microsoft Windows® partition"
+msgstr "Microsoft Windows®os partíció átméretezése"
 
 #: install_interactive.pm:193
 #, c-format
@@ -6441,8 +6451,8 @@ msgstr "Nincs átméretezhető FAT partíció, vagy nincs elég hely"
 
 #: install_interactive.pm:213
 #, c-format
-msgid "Remove Windows(TM)"
-msgstr "A Windows(TM) eltávolítása"
+msgid "Remove Microsoft Windows®"
+msgstr "A Microsoft Windows® eltávolítása"
 
 #: install_interactive.pm:213
 #, fuzzy, c-format
@@ -6845,7 +6855,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Congratulations, installation is complete.\n"
-"Remove the boot media and press return to reboot.\n"
+"Remove the boot media and press Enter to reboot.\n"
 "\n"
 "\n"
 "For information on fixes which are available for this release of Mandriva "
@@ -16820,7 +16830,7 @@ msgstr "Hogyan lehet csatlakozni a Mandriva Linux közösségéhez?"
 
 #: share/advertising/26.pl:3
 #, c-format
-msgid "How to maintain your system up-to-date?"
+msgid "How to keep your system up-to-date?"
 msgstr "Hogyan lehet naprakész állapotban tartani a rendszert?"
 
 #: share/advertising/intel.pl:3
diff --git a/perl-install/share/po/id.po b/perl-install/share/po/id.po
index fb7a904f4..fd97ed87a 100644
--- a/perl-install/share/po/id.po
+++ b/perl-install/share/po/id.po
@@ -2618,7 +2618,7 @@ msgstr "Ukuran baru dalam MB: "
 #, c-format
 msgid ""
 "To ensure data integrity after resizing the partition(s), \n"
-"filesystem checks will be run on your next boot into Windows(TM)"
+"filesystem checks will be run on your next boot into Microsoft Windows®"
 msgstr ""
 "Untuk memastikan integritas data setelah ukuran partisi berubah,\n"
 "pengujian sistem file akan dilakukan pada boot berikut dalam Windows(TM)"
@@ -4801,7 +4801,7 @@ msgstr "Gunakan partisi yang sudah ada"
 
 #: help.pm:374 install_interactive.pm:137
 #, c-format
-msgid "Use the free space on the Windows partition"
+msgid "Use the free space on the Microsoft Windows® partition"
 msgstr "Gunakan ruang kosong pada partisi windows"
 
 #: help.pm:374
@@ -6308,8 +6308,8 @@ msgstr "Tidak ada partisi yang bisa digunakan"
 
 #: install_interactive.pm:114
 #, c-format
-msgid "Use the Windows partition for loopback"
-msgstr "Gunakan partisi Windows untuk loopback"
+msgid "Use the Microsoft Windows® partition for loopback"
+msgstr "Gunakan partisi Microsoft Windows® untuk loopback"
 
 #: install_interactive.pm:117
 #, c-format
@@ -6352,18 +6352,19 @@ msgstr ""
 
 #: install_interactive.pm:156
 #, c-format
-msgid "Computing the size of the Windows partition"
-msgstr "Menghitung ukuran partisi Windows"
+msgid "Computing the size of the Microsoft Windows® partition"
+msgstr "Menghitung ukuran partisi Microsoft Windows®"
 
 #: install_interactive.pm:163
 #, c-format
 msgid ""
-"Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
-"installation."
+"Your Microsoft Windows® partition is too fragmented. Please reboot your "
+"computer under Microsoft Windows®, run the ``defrag'' utility, then restart "
+"the Mandriva Linux installation."
 msgstr ""
-"Partisi Windows Anda terlalu terfragmen. Harap reboot komputer Anda pada "
-"Windows, jalankan utilitas ``defrag'', lalu ulangi installasi Mandriva Linux."
+"Partisi Microsoft Windows® Anda terlalu terfragmen. Harap reboot komputer "
+"Anda pada Microsoft Windows®, jalankan utilitas ``defrag'', lalu ulangi "
+"installasi Mandriva Linux."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_interactive.pm:166
@@ -6371,31 +6372,40 @@ msgstr ""
 msgid ""
 "WARNING!\n"
 "\n"
-"DrakX will now resize your Windows partition. Be careful: this\n"
-"operation is dangerous. If you have not already done so, you\n"
-"first need to exit the installation, run \"chkdsk c:\" from a\n"
-"Command Prompt under Windows (beware, running graphical program\n"
-"\"scandisk\" is not enough, be sure to use \"chkdsk\" in a\n"
-"Command Prompt!), optionally run defrag, then restart the\n"
-"installation. You should also backup your data.\n"
-"When sure, press Ok."
+"\n"
+"Your Microsoft Windows® partition will be now resized.\n"
+"\n"
+"\n"
+"Be careful: this operation is dangerous. If you have not already done so, "
+"you first need to exit the installation, run \"chkdsk c:\" from a Command "
+"Prompt under Microsoft Windows® (beware, running graphical program \"scandisk"
+"\" is not enough, be sure to use \"chkdsk\" in a Command Prompt!), "
+"optionally run defrag, then restart the installation. You should also backup "
+"your data.\n"
+"\n"
+"\n"
+"When sure, press %s."
 msgstr ""
 "PERINGATAN!\n"
 "\n"
+"\n"
 "DrakX sekarang akan mengubah ukuran partisi Windows Anda.\n"
-"Hati-hati: proses ini amat berbahaya. Bila Anda belum pernah\n"
-"melakukannya, Anda harus keluar dari proses installasi ini,\n"
-"lalu reboot ke windows jalankan \"chkdsk c:\" dari Command\n"
-"Prompt (hati-hati, menjalankan program grafis \"scandisk\"\n"
-"tidaklah cukup, pastikan menggunakan \"chkdsk\" dari Command\n"
-"Prompt!), juga defrag, lalu ulangi installasi. Anda juga\n"
-"harus membackup data Anda.\n"
-"Jika yakin, tekan Ok."
+"\n"
+"\n"
+"Hati-hati: proses ini amat berbahaya. Bila Anda belum pernah melakukannya, "
+"Anda harus keluar dari proses installasi ini, lalu reboot ke windows "
+"jalankan \"chkdsk c:\" dari Command Prompt (hati-hati, menjalankan program "
+"grafis \"scandisk\"\n"
+"tidaklah cukup, pastikan menggunakan \"chkdsk\" dari Command Prompt!), juga "
+"defrag, lalu ulangi installasi. Anda juga harus membackup data Anda.\n"
+"\n"
+"\n"
+"Jika yakin, tekan %s."
 
 #: install_interactive.pm:178
 #, c-format
-msgid "Which size do you want to keep for Windows on"
-msgstr "Ukuran mana yang hendak Anda gunakan untuk Windows"
+msgid "Which size do you want to keep for Microsoft Windows® on"
+msgstr "Ukuran mana yang hendak Anda gunakan untuk Microsoft Windows®"
 
 #: install_interactive.pm:179
 #, c-format
@@ -6404,8 +6414,8 @@ msgstr "partisi %s"
 
 #: install_interactive.pm:188
 #, c-format
-msgid "Resizing Windows partition"
-msgstr "Mengubah ukuran partisi Windows"
+msgid "Resizing Microsoft Windows® partition"
+msgstr "Mengubah ukuran partisi Microsoft Windows®"
 
 #: install_interactive.pm:193
 #, c-format
@@ -6420,8 +6430,8 @@ msgstr ""
 
 #: install_interactive.pm:213
 #, c-format
-msgid "Remove Windows(TM)"
-msgstr "Hapus Windows(TM)"
+msgid "Remove Microsoft Windows®"
+msgstr "Hapus Microsoft Windows®"
 
 #: install_interactive.pm:213
 #, c-format
@@ -6804,7 +6814,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Congratulations, installation is complete.\n"
-"Remove the boot media and press return to reboot.\n"
+"Remove the boot media and press Enter to reboot.\n"
 "\n"
 "\n"
 "For information on fixes which are available for this release of Mandriva "
@@ -16819,7 +16829,7 @@ msgstr "Bagaimana bergabung dengan komunitas Mandriva Linux?"
 
 #: share/advertising/26.pl:3
 #, c-format
-msgid "How to maintain your system up-to-date?"
+msgid "How to keep your system up-to-date?"
 msgstr "Bagaimana menjaga sistem Anda up-to-date?"
 
 #: share/advertising/intel.pl:3
diff --git a/perl-install/share/po/is.po b/perl-install/share/po/is.po
index 79cbc90d6..904a06bdd 100644
--- a/perl-install/share/po/is.po
+++ b/perl-install/share/po/is.po
@@ -2603,7 +2603,7 @@ msgstr "Ný stærð í MB: "
 #, c-format
 msgid ""
 "To ensure data integrity after resizing the partition(s), \n"
-"filesystem checks will be run on your next boot into Windows(TM)"
+"filesystem checks will be run on your next boot into Microsoft Windows®"
 msgstr ""
 "Til að staðfesta að gögn séu í lagi eftir að disksneiðum hefur verið \n"
 "breytt verður að keyra diskaprófun þegar þú ræsir Windows(tm) næst"
@@ -4740,7 +4740,7 @@ msgstr "Nota núverandi disksneið"
 
 #: help.pm:374 install_interactive.pm:137
 #, c-format
-msgid "Use the free space on the Windows partition"
+msgid "Use the free space on the Microsoft Windows® partition"
 msgstr "Nota laust pláss á Windows disksneiðinni"
 
 #: help.pm:374
@@ -6250,8 +6250,8 @@ msgstr "það eru engar núverandi disksneiðar til að nota"
 
 #: install_interactive.pm:114
 #, c-format
-msgid "Use the Windows partition for loopback"
-msgstr "Nota Windows disksneiðina fyrir sýndardisk"
+msgid "Use the Microsoft Windows® partition for loopback"
+msgstr "Nota Microsoft Windows® disksneiðina fyrir sýndardisk"
 
 #: install_interactive.pm:117
 #, c-format
@@ -6297,19 +6297,19 @@ msgstr ""
 
 #: install_interactive.pm:156
 #, c-format
-msgid "Computing the size of the Windows partition"
-msgstr "Reikna stærð Windows disksneiðar"
+msgid "Computing the size of the Microsoft Windows® partition"
+msgstr "Reikna stærð Microsoft Windows® disksneiðar"
 
 #: install_interactive.pm:163
 #, c-format
 msgid ""
-"Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
-"installation."
+"Your Microsoft Windows® partition is too fragmented. Please reboot your "
+"computer under Microsoft Windows®, run the ``defrag'' utility, then restart "
+"the Mandriva Linux installation."
 msgstr ""
-"Windows disk-sneiðin þín er of sundurslitin. Vinsamlega endurræstu tölvuna "
-"þín undir Windows, keyrðu ``defrag'' forritið, endurræstu síðan Mandriva "
-"Linux uppsetninguna."
+"Microsoft Windows® disk-sneiðin þín er of sundurslitin. Vinsamlega "
+"endurræstu tölvuna þín undir Microsoft Windows®, keyrðu ``defrag'' forritið, "
+"endurræstu síðan Mandriva Linux uppsetninguna."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_interactive.pm:166
@@ -6317,31 +6317,40 @@ msgstr ""
 msgid ""
 "WARNING!\n"
 "\n"
-"DrakX will now resize your Windows partition. Be careful: this\n"
-"operation is dangerous. If you have not already done so, you\n"
-"first need to exit the installation, run \"chkdsk c:\" from a\n"
-"Command Prompt under Windows (beware, running graphical program\n"
-"\"scandisk\" is not enough, be sure to use \"chkdsk\" in a\n"
-"Command Prompt!), optionally run defrag, then restart the\n"
-"installation. You should also backup your data.\n"
-"When sure, press Ok."
+"\n"
+"Your Microsoft Windows® partition will be now resized.\n"
+"\n"
+"\n"
+"Be careful: this operation is dangerous. If you have not already done so, "
+"you first need to exit the installation, run \"chkdsk c:\" from a Command "
+"Prompt under Microsoft Windows® (beware, running graphical program \"scandisk"
+"\" is not enough, be sure to use \"chkdsk\" in a Command Prompt!), "
+"optionally run defrag, then restart the installation. You should also backup "
+"your data.\n"
+"\n"
+"\n"
+"When sure, press %s."
 msgstr ""
 "AÐVÖRUN\n"
 "\n"
-"DrakX ætlar nú að breyta stærð Windows sneiðarinnar. Athugið:\n"
-"Þetta getur verið hættulegt. Ef þú ert ekki búin(n) að því, þá\n"
+"\n"
+"DrakX ætlar nú að breyta stærð Windows sneiðarinnar.\n"
+"\n"
+"\n"
+"Athugið: Þetta getur verið hættulegt. Ef þú ert ekki búin(n) að því, þá "
 "ættir þú fyrst að hætta við uppsetninguna, keyra \"chkdsk c:\"\n"
-"frá skipanalínunni (DOS)\n"
-"(Varúð: það er ekki nóg að keyra grafíska forritið \"scandisk\",\n"
-"verið viss um að nota \"chkdisk\" úr skipanalínunni!),\n"
-"Þið gætuð einnig keyrt defrag. Endurræsið síðan uppsetninguna.\n"
-"Þú ættir einnig að taka afrit af gögnunum þínum.\n"
-"Þegar þú ert viss, sláðu á \"Í lagi\" til að halda áfram."
+"frá skipanalínunni (DOS) (Varúð: það er ekki nóg að keyra grafíska forritið "
+"\"scandisk\", verið viss um að nota \"chkdisk\" úr skipanalínunni!), Þið "
+"gætuð einnig keyrt defrag. Endurræsið síðan uppsetninguna. Þú ættir einnig "
+"að taka afrit af gögnunum þínum.\n"
+"\n"
+"\n"
+"Þegar þú ert viss, sláðu á \"%s\" til að halda áfram."
 
 #: install_interactive.pm:178
 #, c-format
-msgid "Which size do you want to keep for Windows on"
-msgstr "Hvaða stærð viltu skilja eftir fyrir Windows á"
+msgid "Which size do you want to keep for Microsoft Windows® on"
+msgstr "Hvaða stærð viltu skilja eftir fyrir Microsoft Windows® á"
 
 #: install_interactive.pm:179
 #, c-format
@@ -6350,8 +6359,8 @@ msgstr "disksneið %s"
 
 #: install_interactive.pm:188
 #, c-format
-msgid "Resizing Windows partition"
-msgstr "Breyta stærð Windows skráakerfis"
+msgid "Resizing Microsoft Windows® partition"
+msgstr "Breyta stærð Microsoft Windows® skráakerfis"
 
 #: install_interactive.pm:193
 #, c-format
@@ -6365,8 +6374,8 @@ msgstr "Það er engin FAT disksneið til að breyta stærð á (eða ekki nóg
 
 #: install_interactive.pm:213
 #, c-format
-msgid "Remove Windows(TM)"
-msgstr "Fjarlægja Windows(TM)"
+msgid "Remove Microsoft Windows®"
+msgstr "Fjarlægja Microsoft Windows®"
 
 #: install_interactive.pm:213
 #, fuzzy, c-format
@@ -6733,7 +6742,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Congratulations, installation is complete.\n"
-"Remove the boot media and press return to reboot.\n"
+"Remove the boot media and press Enter to reboot.\n"
 "\n"
 "\n"
 "For information on fixes which are available for this release of Mandriva "
@@ -16520,7 +16529,7 @@ msgstr "Hvernig á að taka þátt í Mandriva hópvinnunni?"
 
 #: share/advertising/26.pl:3
 #, c-format
-msgid "How to maintain your system up-to-date?"
+msgid "How to keep your system up-to-date?"
 msgstr "Hvernig á að viðhalda kerfinu uppfærðu?"
 
 #: share/advertising/intel.pl:3
diff --git a/perl-install/share/po/it.po b/perl-install/share/po/it.po
index ebb61060f..687818ee6 100644
--- a/perl-install/share/po/it.po
+++ b/perl-install/share/po/it.po
@@ -2629,7 +2629,7 @@ msgstr "Nuova dimensione in MB: "
 #, c-format
 msgid ""
 "To ensure data integrity after resizing the partition(s), \n"
-"filesystem checks will be run on your next boot into Windows(TM)"
+"filesystem checks will be run on your next boot into Microsoft Windows®"
 msgstr ""
 "Per assicurare l'integrità dei dati dopo aver ridimensionato partizioni,\n"
 "saranno eseguiti dei controlli sul filesystem al prossimo riavvio di Windows"
@@ -4819,7 +4819,7 @@ msgstr "Usa partizioni esistenti"
 
 #: help.pm:374 install_interactive.pm:137
 #, c-format
-msgid "Use the free space on the Windows partition"
+msgid "Use the free space on the Microsoft Windows® partition"
 msgstr "Usa lo spazio libero della partizione Windows"
 
 #: help.pm:374
@@ -6431,8 +6431,8 @@ msgstr "Non esiste già una partizione da usare"
 
 #: install_interactive.pm:114
 #, c-format
-msgid "Use the Windows partition for loopback"
-msgstr "Usa la partizione Windows per loopback"
+msgid "Use the Microsoft Windows® partition for loopback"
+msgstr "Usa la partizione Microsoft Windows® per loopback"
 
 #: install_interactive.pm:117
 #, c-format
@@ -6476,19 +6476,19 @@ msgstr ""
 
 #: install_interactive.pm:156
 #, c-format
-msgid "Computing the size of the Windows partition"
-msgstr "Sto calcolando la dimensione della partizione Windows"
+msgid "Computing the size of the Microsoft Windows® partition"
+msgstr "Sto calcolando la dimensione della partizione Microsoft Windows®"
 
 #: install_interactive.pm:163
 #, c-format
 msgid ""
-"Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
-"installation."
+"Your Microsoft Windows® partition is too fragmented. Please reboot your "
+"computer under Microsoft Windows®, run the ``defrag'' utility, then restart "
+"the Mandriva Linux installation."
 msgstr ""
-"La partizione Windows è troppo frammentata. Bisogna riavviare il computer "
-"sotto Windows, lanciare \"defrag\" e poi ricominciare l'installazione di "
-"Mandriva Linux."
+"La partizione Microsoft Windows® è troppo frammentata. Bisogna riavviare il "
+"computer sotto Microsoft Windows®, lanciare \"defrag\" e poi ricominciare "
+"l'installazione di Mandriva Linux."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_interactive.pm:166
@@ -6496,30 +6496,40 @@ msgstr ""
 msgid ""
 "WARNING!\n"
 "\n"
-"DrakX will now resize your Windows partition. Be careful: this\n"
-"operation is dangerous. If you have not already done so, you\n"
-"first need to exit the installation, run \"chkdsk c:\" from a\n"
-"Command Prompt under Windows (beware, running graphical program\n"
-"\"scandisk\" is not enough, be sure to use \"chkdsk\" in a\n"
-"Command Prompt!), optionally run defrag, then restart the\n"
-"installation. You should also backup your data.\n"
-"When sure, press Ok."
+"\n"
+"Your Microsoft Windows® partition will be now resized.\n"
+"\n"
+"\n"
+"Be careful: this operation is dangerous. If you have not already done so, "
+"you first need to exit the installation, run \"chkdsk c:\" from a Command "
+"Prompt under Microsoft Windows® (beware, running graphical program \"scandisk"
+"\" is not enough, be sure to use \"chkdsk\" in a Command Prompt!), "
+"optionally run defrag, then restart the installation. You should also backup "
+"your data.\n"
+"\n"
+"\n"
+"When sure, press %s."
 msgstr ""
 "ATTENZIONE!\n"
 "\n"
-"DrakX ora ridimensionerà la partizione Windows. Sii prudente: questa\n"
-"operazione è pericolosa. Se non lo hai già fatto, devi uscire dalla\n"
-"installazione e lanciare \"chkdsk c:\" da riga di comando sotto Windows\n"
-"(attenzione, l'uso del comando grafico \"scandisk\" non è sufficiente. Devi\n"
-"assolutamente lanciare \"chkdsk\" da linea di comando!). Se vuoi lancia\n"
-"anche defrag. Poi puoi riavviare l'installazione. È consigliato anche un\n"
-"backup dei dati.\n"
-"Quando sei sicuro, premi OK."
+"\n"
+"DrakX ora ridimensionerà la partizione Windows.\n"
+"\n"
+"\n"
+"Sii prudente: questa operazione è pericolosa. Se non lo hai già fatto, devi "
+"uscire dalla installazione e lanciare \"chkdsk c:\" da riga di comando sotto "
+"Windows (attenzione, l'uso del comando grafico \"scandisk\" non è "
+"sufficiente. Devi assolutamente lanciare \"chkdsk\" da linea di comando!). "
+"Se vuoi lancia anche defrag. Poi puoi riavviare l'installazione. È "
+"consigliato anche un backup dei dati.\n"
+"\n"
+"\n"
+"Quando sei sicuro, premi %s."
 
 #: install_interactive.pm:178
 #, c-format
-msgid "Which size do you want to keep for Windows on"
-msgstr "Quanto spazio devo lasciare per Windows sulla "
+msgid "Which size do you want to keep for Microsoft Windows® on"
+msgstr "Quanto spazio devo lasciare per Microsoft Windows® sulla "
 
 #: install_interactive.pm:179
 #, c-format
@@ -6528,8 +6538,8 @@ msgstr "partizione %s"
 
 #: install_interactive.pm:188
 #, c-format
-msgid "Resizing Windows partition"
-msgstr "Sto ridimensionando la partizione Windows"
+msgid "Resizing Microsoft Windows® partition"
+msgstr "Sto ridimensionando la partizione Microsoft Windows®"
 
 #: install_interactive.pm:193
 #, c-format
@@ -6545,8 +6555,8 @@ msgstr ""
 
 #: install_interactive.pm:213
 #, c-format
-msgid "Remove Windows(TM)"
-msgstr "Rimuovi Windows(TM)"
+msgid "Remove Microsoft Windows®"
+msgstr "Rimuovi Microsoft Windows®"
 
 #: install_interactive.pm:213
 #, fuzzy, c-format
@@ -6912,7 +6922,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Congratulations, installation is complete.\n"
-"Remove the boot media and press return to reboot.\n"
+"Remove the boot media and press Enter to reboot.\n"
 "\n"
 "\n"
 "For information on fixes which are available for this release of Mandriva "
@@ -16787,7 +16797,7 @@ msgstr "Come far parte della \"community\" di Mandriva Linux ?"
 
 #: share/advertising/26.pl:3
 #, c-format
-msgid "How to maintain your system up-to-date?"
+msgid "How to keep your system up-to-date?"
 msgstr "Come mantenere il sistema aggiornato?"
 
 #: share/advertising/intel.pl:3
diff --git a/perl-install/share/po/ja.po b/perl-install/share/po/ja.po
index fb3c3612e..0138f018b 100644
--- a/perl-install/share/po/ja.po
+++ b/perl-install/share/po/ja.po
@@ -2590,7 +2590,7 @@ msgstr "新しいサイズ(MB): "
 #, c-format
 msgid ""
 "To ensure data integrity after resizing the partition(s), \n"
-"filesystem checks will be run on your next boot into Windows(TM)"
+"filesystem checks will be run on your next boot into Microsoft Windows®"
 msgstr ""
 "パーティションリサイズ後のデータの完全性を確認するため、\n"
 "次回のWindows(TM)起動時にファイルシステムチェックが実行されます。"
@@ -4680,7 +4680,7 @@ msgstr "既存のパーティションを使う"
 
 #: help.pm:374 install_interactive.pm:137
 #, c-format
-msgid "Use the free space on the Windows partition"
+msgid "Use the free space on the Microsoft Windows® partition"
 msgstr "Windowsパーティションの空き領域を使う"
 
 #: help.pm:374
@@ -6145,8 +6145,8 @@ msgstr "使用できるパーティションがありません"
 
 #: install_interactive.pm:114
 #, c-format
-msgid "Use the Windows partition for loopback"
-msgstr "ループバックにWindowsパーティションを使う"
+msgid "Use the Microsoft Windows® partition for loopback"
+msgstr "ループバックにMicrosoft Windows®パーティションを使う"
 
 #: install_interactive.pm:117
 #, c-format
@@ -6190,17 +6190,18 @@ msgstr ""
 
 #: install_interactive.pm:156
 #, c-format
-msgid "Computing the size of the Windows partition"
-msgstr "Windowsパーティションのサイズを計算"
+msgid "Computing the size of the Microsoft Windows® partition"
+msgstr "Microsoft Windows®パーティションのサイズを計算"
 
 #: install_interactive.pm:163
 #, c-format
 msgid ""
-"Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
-"installation."
+"Your Microsoft Windows® partition is too fragmented. Please reboot your "
+"computer under Microsoft Windows®, run the ``defrag'' utility, then restart "
+"the Mandriva Linux installation."
 msgstr ""
-"Windowsパーティションが断片化しすぎています。再起動してWindowsを立ち上げ、\n"
+"Microsoft Windows®パーティションが断片化しすぎています。再起動してMicrosoft "
+"Windows®を立ち上げ、\n"
 "デフラグを実行してください。その後再起動してMandriva Linuxをインストール\n"
 "してください。"
 
@@ -6210,29 +6211,38 @@ msgstr ""
 msgid ""
 "WARNING!\n"
 "\n"
-"DrakX will now resize your Windows partition. Be careful: this\n"
-"operation is dangerous. If you have not already done so, you\n"
-"first need to exit the installation, run \"chkdsk c:\" from a\n"
-"Command Prompt under Windows (beware, running graphical program\n"
-"\"scandisk\" is not enough, be sure to use \"chkdsk\" in a\n"
-"Command Prompt!), optionally run defrag, then restart the\n"
-"installation. You should also backup your data.\n"
-"When sure, press Ok."
+"\n"
+"Your Microsoft Windows® partition will be now resized.\n"
+"\n"
+"\n"
+"Be careful: this operation is dangerous. If you have not already done so, "
+"you first need to exit the installation, run \"chkdsk c:\" from a Command "
+"Prompt under Microsoft Windows® (beware, running graphical program \"scandisk"
+"\" is not enough, be sure to use \"chkdsk\" in a Command Prompt!), "
+"optionally run defrag, then restart the installation. You should also backup "
+"your data.\n"
+"\n"
+"\n"
+"When sure, press %s."
 msgstr ""
 "警告\n"
 "\n"
+"\n"
 "DrakXはこれからWindowsパーティションのサイズを変更します。\n"
-"これは危険な操作です。事前にWindowsのコマンドプロンプトで\n"
-"\"chkdsk c:\"を実行してください。\"scandisk\"では不十分です。\n"
-"必ず\"chkdsk\"を実行してください。必須ではありませんが、\n"
-"デフラグも実行し、改めてインストールを開始してください。\n"
-"データのバックアップも忘れずに作成しておいてください。\n"
-"よろしければOKを押してください。"
+"\n"
+"\n"
+"これは危険な操作です。事前にWindowsのコマンドプロンプトで \"chkdsk c:\"を実行"
+"してください。\"scandisk\"では不十分です。 必ず\"chkdsk\"を実行してください。"
+"必須ではありませんが、 デフラグも実行し、改めてインストールを開始してくださ"
+"い。 データのバックアップも忘れずに作成しておいてください。\n"
+"\n"
+"\n"
+"よろしければ%sを押してください。"
 
 #: install_interactive.pm:178
 #, c-format
-msgid "Which size do you want to keep for Windows on"
-msgstr "Windows用に残しておくサイズを指定してください"
+msgid "Which size do you want to keep for Microsoft Windows® on"
+msgstr "Microsoft Windows®用に残しておくサイズを指定してください"
 
 #: install_interactive.pm:179
 #, c-format
@@ -6241,8 +6251,8 @@ msgstr "パーティション %s"
 
 #: install_interactive.pm:188
 #, c-format
-msgid "Resizing Windows partition"
-msgstr "Windowsパーティションのリサイズ"
+msgid "Resizing Microsoft Windows® partition"
+msgstr "Microsoft Windows®パーティションのリサイズ"
 
 #: install_interactive.pm:193
 #, c-format
@@ -6256,8 +6266,8 @@ msgstr "リサイズするFATパーティションがありません(または�
 
 #: install_interactive.pm:213
 #, c-format
-msgid "Remove Windows(TM)"
-msgstr "Windows(TM)を削除"
+msgid "Remove Microsoft Windows®"
+msgstr "Microsoft Windows®を削除"
 
 #: install_interactive.pm:213
 #, fuzzy, c-format
@@ -6596,7 +6606,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Congratulations, installation is complete.\n"
-"Remove the boot media and press return to reboot.\n"
+"Remove the boot media and press Enter to reboot.\n"
 "\n"
 "\n"
 "For information on fixes which are available for this release of Mandriva "
@@ -16319,7 +16329,7 @@ msgstr ""
 
 #: share/advertising/26.pl:3
 #, c-format
-msgid "How to maintain your system up-to-date?"
+msgid "How to keep your system up-to-date?"
 msgstr ""
 
 #: share/advertising/intel.pl:3
diff --git a/perl-install/share/po/ko.po b/perl-install/share/po/ko.po
index ffd12a7e0..8288b7169 100644
--- a/perl-install/share/po/ko.po
+++ b/perl-install/share/po/ko.po
@@ -2469,7 +2469,7 @@ msgstr "새로운 용량(MB):"
 #, c-format
 msgid ""
 "To ensure data integrity after resizing the partition(s), \n"
-"filesystem checks will be run on your next boot into Windows(TM)"
+"filesystem checks will be run on your next boot into Microsoft Windows®"
 msgstr ""
 
 #: diskdrake/interactive.pm:851
@@ -4341,7 +4341,7 @@ msgstr "기존의 파티션 사용"
 
 #: help.pm:374 install_interactive.pm:137
 #, c-format
-msgid "Use the free space on the Windows partition"
+msgid "Use the free space on the Microsoft Windows® partition"
 msgstr "윈도우즈 파티션의 빈 공간 사용하세요."
 
 #: help.pm:374
@@ -5606,7 +5606,7 @@ msgstr "사용할 기존의 파티션이 없습니다."
 
 #: install_interactive.pm:114
 #, c-format
-msgid "Use the Windows partition for loopback"
+msgid "Use the Microsoft Windows® partition for loopback"
 msgstr "윈도우즈 파티션을 루프백으로 사용"
 
 #: install_interactive.pm:117
@@ -5652,15 +5652,15 @@ msgstr ""
 
 #: install_interactive.pm:156
 #, fuzzy, c-format
-msgid "Computing the size of the Windows partition"
+msgid "Computing the size of the Microsoft Windows® partition"
 msgstr "윈도우즈 파티션의 빈 공간 사용하세요."
 
 #: install_interactive.pm:163
 #, c-format
 msgid ""
-"Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
-"installation."
+"Your Microsoft Windows® partition is too fragmented. Please reboot your "
+"computer under Microsoft Windows®, run the ``defrag'' utility, then restart "
+"the Mandriva Linux installation."
 msgstr ""
 "윈도우즈 파티션이 심하게 조각나 있습니다. 먼저 ``디스크 조각 모음''을 하세요."
 
@@ -5670,26 +5670,36 @@ msgstr ""
 msgid ""
 "WARNING!\n"
 "\n"
-"DrakX will now resize your Windows partition. Be careful: this\n"
-"operation is dangerous. If you have not already done so, you\n"
-"first need to exit the installation, run \"chkdsk c:\" from a\n"
-"Command Prompt under Windows (beware, running graphical program\n"
-"\"scandisk\" is not enough, be sure to use \"chkdsk\" in a\n"
-"Command Prompt!), optionally run defrag, then restart the\n"
-"installation. You should also backup your data.\n"
-"When sure, press Ok."
+"\n"
+"Your Microsoft Windows® partition will be now resized.\n"
+"\n"
+"\n"
+"Be careful: this operation is dangerous. If you have not already done so, "
+"you first need to exit the installation, run \"chkdsk c:\" from a Command "
+"Prompt under Microsoft Windows® (beware, running graphical program \"scandisk"
+"\" is not enough, be sure to use \"chkdsk\" in a Command Prompt!), "
+"optionally run defrag, then restart the installation. You should also backup "
+"your data.\n"
+"\n"
+"\n"
+"When sure, press %s."
 msgstr ""
 "경고!\n"
 "\n"
-"드레이크X가 이제 윈도우즈 파티션의 크기를 조정할 것입니다. 이 작동은 \n"
-"위험합니다. 아직 시작하지 않았다면, 설치를 중단하고 윈도우즈에서\n"
-"디스크검사」(가능하다면 또한 「디스크 조각모음」)를 실행한 후에,\n"
-"설치를 다시 시작하세요. 또한 데이터도 백업해 두세요.\n"
-"준비됐으면, 「확인」을 누르세요."
+"\n"
+"드레이크X가 이제 윈도우즈 파티션의 크기를 조정할 것입니다.\n"
+"\n"
+"\n"
+"이 작동은  위험합니다. 아직 시작하지 않았다면, 설치를 중단하고 윈도우즈에서 "
+"디스크검사」(가능하다면 또한 「디스크 조각모음」)를 실행한 후에, 설치를 다시 "
+"시작하세요. 또한 데이터도 백업해 두세요.\n"
+"\n"
+"\n"
+"준비됐으면, 「%s」을 누르세요."
 
 #: install_interactive.pm:178
 #, c-format
-msgid "Which size do you want to keep for Windows on"
+msgid "Which size do you want to keep for Microsoft Windows® on"
 msgstr "윈도우즈용으로 어느 용량을 유지하시겠습니까?"
 
 #: install_interactive.pm:179
@@ -5699,7 +5709,7 @@ msgstr "파티션 %s"
 
 #: install_interactive.pm:188
 #, c-format
-msgid "Resizing Windows partition"
+msgid "Resizing Microsoft Windows® partition"
 msgstr "윈도우즈 파일 시스템의 범위 계산중"
 
 #: install_interactive.pm:193
@@ -5716,8 +5726,8 @@ msgstr ""
 
 #: install_interactive.pm:213
 #, c-format
-msgid "Remove Windows(TM)"
-msgstr "윈도우즈(TM) 제거"
+msgid "Remove Microsoft Windows®"
+msgstr "윈도우즈™ 제거"
 
 #: install_interactive.pm:213
 #, fuzzy, c-format
@@ -5948,7 +5958,7 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "Congratulations, installation is complete.\n"
-"Remove the boot media and press return to reboot.\n"
+"Remove the boot media and press Enter to reboot.\n"
 "\n"
 "\n"
 "For information on fixes which are available for this release of Mandriva "
@@ -15195,7 +15205,7 @@ msgstr ""
 
 #: share/advertising/26.pl:3
 #, c-format
-msgid "How to maintain your system up-to-date?"
+msgid "How to keep your system up-to-date?"
 msgstr ""
 
 #: share/advertising/intel.pl:3
diff --git a/perl-install/share/po/ky.po b/perl-install/share/po/ky.po
index 08cdda486..4d82d2bec 100644
--- a/perl-install/share/po/ky.po
+++ b/perl-install/share/po/ky.po
@@ -2617,7 +2617,7 @@ msgstr "Жаңы көлөмү (Мб): "
 #, c-format
 msgid ""
 "To ensure data integrity after resizing the partition(s), \n"
-"filesystem checks will be run on your next boot into Windows(TM)"
+"filesystem checks will be run on your next boot into Microsoft Windows®"
 msgstr ""
 "Көлөмүн өзгөрткөн соң бөлүмдүн(дөрдүн) бүтүндүгүн\n"
 "камсыздоо үчүн, Windows(TM) кийинки жүктөлгөндө\n"
@@ -4746,7 +4746,7 @@ msgstr "Бар бөлүмдү колдонуу"
 
 #: help.pm:374 install_interactive.pm:137
 #, c-format
-msgid "Use the free space on the Windows partition"
+msgid "Use the free space on the Microsoft Windows® partition"
 msgstr "Windows бөлүмүндөгү бош орунду колдонуу"
 
 #: help.pm:374
@@ -5874,7 +5874,7 @@ msgstr ""
 
 #: install_interactive.pm:114
 #, c-format
-msgid "Use the Windows partition for loopback"
+msgid "Use the Microsoft Windows® partition for loopback"
 msgstr ""
 
 #: install_interactive.pm:117
@@ -5916,15 +5916,15 @@ msgstr ""
 
 #: install_interactive.pm:156
 #, c-format
-msgid "Computing the size of the Windows partition"
+msgid "Computing the size of the Microsoft Windows® partition"
 msgstr ""
 
 #: install_interactive.pm:163
 #, c-format
 msgid ""
-"Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
-"installation."
+"Your Microsoft Windows® partition is too fragmented. Please reboot your "
+"computer under Microsoft Windows®, run the ``defrag'' utility, then restart "
+"the Mandriva Linux installation."
 msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
@@ -5933,19 +5933,24 @@ msgstr ""
 msgid ""
 "WARNING!\n"
 "\n"
-"DrakX will now resize your Windows partition. Be careful: this\n"
-"operation is dangerous. If you have not already done so, you\n"
-"first need to exit the installation, run \"chkdsk c:\" from a\n"
-"Command Prompt under Windows (beware, running graphical program\n"
-"\"scandisk\" is not enough, be sure to use \"chkdsk\" in a\n"
-"Command Prompt!), optionally run defrag, then restart the\n"
-"installation. You should also backup your data.\n"
-"When sure, press Ok."
+"\n"
+"Your Microsoft Windows® partition will be now resized.\n"
+"\n"
+"\n"
+"Be careful: this operation is dangerous. If you have not already done so, "
+"you first need to exit the installation, run \"chkdsk c:\" from a Command "
+"Prompt under Microsoft Windows® (beware, running graphical program \"scandisk"
+"\" is not enough, be sure to use \"chkdsk\" in a Command Prompt!), "
+"optionally run defrag, then restart the installation. You should also backup "
+"your data.\n"
+"\n"
+"\n"
+"When sure, press %s."
 msgstr ""
 
 #: install_interactive.pm:178
 #, c-format
-msgid "Which size do you want to keep for Windows on"
+msgid "Which size do you want to keep for Microsoft Windows® on"
 msgstr ""
 
 #: install_interactive.pm:179
@@ -5955,7 +5960,7 @@ msgstr ""
 
 #: install_interactive.pm:188
 #, c-format
-msgid "Resizing Windows partition"
+msgid "Resizing Microsoft Windows® partition"
 msgstr ""
 
 #: install_interactive.pm:193
@@ -5970,7 +5975,7 @@ msgstr ""
 
 #: install_interactive.pm:213
 #, c-format
-msgid "Remove Windows(TM)"
+msgid "Remove Microsoft Windows®"
 msgstr ""
 
 #: install_interactive.pm:213
@@ -6199,7 +6204,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Congratulations, installation is complete.\n"
-"Remove the boot media and press return to reboot.\n"
+"Remove the boot media and press Enter to reboot.\n"
 "\n"
 "\n"
 "For information on fixes which are available for this release of Mandriva "
@@ -15145,7 +15150,7 @@ msgstr ""
 
 #: share/advertising/26.pl:3
 #, c-format
-msgid "How to maintain your system up-to-date?"
+msgid "How to keep your system up-to-date?"
 msgstr ""
 
 #: share/advertising/intel.pl:3
diff --git a/perl-install/share/po/lt.po b/perl-install/share/po/lt.po
index 205ad569a..dadd01d7e 100644
--- a/perl-install/share/po/lt.po
+++ b/perl-install/share/po/lt.po
@@ -2467,7 +2467,7 @@ msgstr "Dydis (MB): "
 #, c-format
 msgid ""
 "To ensure data integrity after resizing the partition(s), \n"
-"filesystem checks will be run on your next boot into Windows(TM)"
+"filesystem checks will be run on your next boot into Microsoft Windows®"
 msgstr ""
 
 #: diskdrake/interactive.pm:851
@@ -4288,7 +4288,7 @@ msgstr "Naudoti esamą skirsnį"
 
 #: help.pm:374 install_interactive.pm:137
 #, c-format
-msgid "Use the free space on the Windows partition"
+msgid "Use the free space on the Microsoft Windows® partition"
 msgstr "Naudoti laisvą vietą Windows skirsnyje"
 
 #: help.pm:374
@@ -5497,8 +5497,8 @@ msgstr "Nėra jokio skirsnio, tinkamo naudojimui"
 
 #: install_interactive.pm:114
 #, c-format
-msgid "Use the Windows partition for loopback"
-msgstr "Naudoti Windows skirsnį loopback'ui"
+msgid "Use the Microsoft Windows® partition for loopback"
+msgstr "Naudoti Microsoft Windows® skirsnį loopback'ui"
 
 #: install_interactive.pm:117
 #, c-format
@@ -5544,17 +5544,18 @@ msgstr ""
 
 #: install_interactive.pm:156
 #, fuzzy, c-format
-msgid "Computing the size of the Windows partition"
-msgstr "Naudoti laisvą vietą Windows skirsnyje"
+msgid "Computing the size of the Microsoft Windows® partition"
+msgstr "Naudoti laisvą vietą Microsoft Windows® skirsnyje"
 
 #: install_interactive.pm:163
 #, c-format
 msgid ""
-"Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
-"installation."
+"Your Microsoft Windows® partition is too fragmented. Please reboot your "
+"computer under Microsoft Windows®, run the ``defrag'' utility, then restart "
+"the Mandriva Linux installation."
 msgstr ""
-"Tavo Windows skirsnis yra pernelyg fragmentuotas, pirma paleisk „defrag“"
+"Tavo Microsoft Windows® skirsnis yra pernelyg fragmentuotas, pirma paleisk "
+"„defrag“"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_interactive.pm:166
@@ -5562,29 +5563,38 @@ msgstr ""
 msgid ""
 "WARNING!\n"
 "\n"
-"DrakX will now resize your Windows partition. Be careful: this\n"
-"operation is dangerous. If you have not already done so, you\n"
-"first need to exit the installation, run \"chkdsk c:\" from a\n"
-"Command Prompt under Windows (beware, running graphical program\n"
-"\"scandisk\" is not enough, be sure to use \"chkdsk\" in a\n"
-"Command Prompt!), optionally run defrag, then restart the\n"
-"installation. You should also backup your data.\n"
-"When sure, press Ok."
+"\n"
+"Your Microsoft Windows® partition will be now resized.\n"
+"\n"
+"\n"
+"Be careful: this operation is dangerous. If you have not already done so, "
+"you first need to exit the installation, run \"chkdsk c:\" from a Command "
+"Prompt under Microsoft Windows® (beware, running graphical program \"scandisk"
+"\" is not enough, be sure to use \"chkdsk\" in a Command Prompt!), "
+"optionally run defrag, then restart the installation. You should also backup "
+"your data.\n"
+"\n"
+"\n"
+"When sure, press %s."
 msgstr ""
 "PERSPĖJIMAS!\n"
 "\n"
-"DrakX dabar pakeis tavo Windows skirsnio dydį. Būk atsargus: šis veiksmas\n"
-"yra pavojingas. Jeigu to dar nepadarei, dabar pats laikas išeiti iš "
-"įdiegimo,\n"
-"paleisti scandisk iš Windows (nepakenktų ir defrag paleisti), o tada iš "
-"naujo\n"
-"pradėti įdiegimą. Taip pat turėtum pasidaryti atsarginę duomenų kopiją.\n"
-"Kai viskas sutvarkyta, spausk Gerai."
+"\n"
+"DrakX dabar pakeis tavo Windows skirsnio dydį.\n"
+"\n"
+"\n"
+"Būk atsargus: šis veiksmas yra pavojingas. Jeigu to dar nepadarei, dabar "
+"pats laikas išeiti iš įdiegimo, paleisti scandisk iš Windows (nepakenktų ir "
+"defrag paleisti), o tada iš naujo pradėti įdiegimą. Taip pat turėtum "
+"pasidaryti atsarginę duomenų kopiją.\n"
+"\n"
+"\n"
+"Kai viskas sutvarkyta, spausk %s."
 
 #: install_interactive.pm:178
 #, c-format
-msgid "Which size do you want to keep for Windows on"
-msgstr "Kokį dydį norėtum palikti Windows'ams"
+msgid "Which size do you want to keep for Microsoft Windows® on"
+msgstr "Kokį dydį norėtum palikti Microsoft Windows®'ams"
 
 #: install_interactive.pm:179
 #, c-format
@@ -5593,8 +5603,8 @@ msgstr "skirsnyje %s"
 
 #: install_interactive.pm:188
 #, c-format
-msgid "Resizing Windows partition"
-msgstr "Skaičiuojami Windows bylų sistemos rėžiai"
+msgid "Resizing Microsoft Windows® partition"
+msgstr "Skaičiuojami Microsoft Windows® bylų sistemos rėžiai"
 
 #: install_interactive.pm:193
 #, c-format
@@ -5611,8 +5621,8 @@ msgstr ""
 
 #: install_interactive.pm:213
 #, c-format
-msgid "Remove Windows(TM)"
-msgstr "Išmesti Windows(TM)"
+msgid "Remove Microsoft Windows®"
+msgstr "Išmesti Microsoft Windows®"
 
 #: install_interactive.pm:213
 #, fuzzy, c-format
@@ -5871,7 +5881,7 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "Congratulations, installation is complete.\n"
-"Remove the boot media and press return to reboot.\n"
+"Remove the boot media and press Enter to reboot.\n"
 "\n"
 "\n"
 "For information on fixes which are available for this release of Mandriva "
@@ -15009,7 +15019,7 @@ msgstr ""
 
 #: share/advertising/26.pl:3
 #, c-format
-msgid "How to maintain your system up-to-date?"
+msgid "How to keep your system up-to-date?"
 msgstr ""
 
 #: share/advertising/intel.pl:3
diff --git a/perl-install/share/po/ltg.po b/perl-install/share/po/ltg.po
index bae8bd189..d6e85f0f8 100644
--- a/perl-install/share/po/ltg.po
+++ b/perl-install/share/po/ltg.po
@@ -2544,7 +2544,7 @@ msgstr "Jauns izmārs MB: "
 #, c-format
 msgid ""
 "To ensure data integrity after resizing the partition(s), \n"
-"filesystem checks will be run on your next boot into Windows(TM)"
+"filesystem checks will be run on your next boot into Microsoft Windows®"
 msgstr ""
 
 #: diskdrake/interactive.pm:851
@@ -4394,7 +4394,7 @@ msgstr "Izmantot jau esošu sadaļu"
 
 #: help.pm:374 install_interactive.pm:137
 #, c-format
-msgid "Use the free space on the Windows partition"
+msgid "Use the free space on the Microsoft Windows® partition"
 msgstr "Izmontuot Windows sadalis breivū vītu"
 
 #: help.pm:374
@@ -5615,8 +5615,8 @@ msgstr "Nav nivīnys sadalis, kū varātu izmontuot"
 
 #: install_interactive.pm:114
 #, c-format
-msgid "Use the Windows partition for loopback"
-msgstr "Izmontuot Windows sadaļu prīkš loopback"
+msgid "Use the Microsoft Windows® partition for loopback"
+msgstr "Izmontuot Microsoft Windows® sadaļu prīkš loopback"
 
 #: install_interactive.pm:117
 #, c-format
@@ -5661,18 +5661,19 @@ msgstr ""
 
 #: install_interactive.pm:156
 #, fuzzy, c-format
-msgid "Computing the size of the Windows partition"
-msgstr "Izmantot Windows sadaļas brīvo vietu"
+msgid "Computing the size of the Microsoft Windows® partition"
+msgstr "Izmantot Microsoft Windows® sadaļas brīvo vietu"
 
 #: install_interactive.pm:163
 #, c-format
 msgid ""
-"Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
-"installation."
+"Your Microsoft Windows® partition is too fragmented. Please reboot your "
+"computer under Microsoft Windows®, run the ``defrag'' utility, then restart "
+"the Mandriva Linux installation."
 msgstr ""
-"Windows sadaļa ir puoruok fragmenteita. Vyspyrms nu Windows vidis palaidit "
-"``defrag'' i tod atsuocit Mandriva Linux instaleišonu."
+"Microsoft Windows® sadaļa ir puoruok fragmenteita. Vyspyrms nu Microsoft "
+"Windows® vidis palaidit ``defrag'' i tod atsuocit Mandriva Linux "
+"instaleišonu."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_interactive.pm:166
@@ -5680,28 +5681,38 @@ msgstr ""
 msgid ""
 "WARNING!\n"
 "\n"
-"DrakX will now resize your Windows partition. Be careful: this\n"
-"operation is dangerous. If you have not already done so, you\n"
-"first need to exit the installation, run \"chkdsk c:\" from a\n"
-"Command Prompt under Windows (beware, running graphical program\n"
-"\"scandisk\" is not enough, be sure to use \"chkdsk\" in a\n"
-"Command Prompt!), optionally run defrag, then restart the\n"
-"installation. You should also backup your data.\n"
-"When sure, press Ok."
+"\n"
+"Your Microsoft Windows® partition will be now resized.\n"
+"\n"
+"\n"
+"Be careful: this operation is dangerous. If you have not already done so, "
+"you first need to exit the installation, run \"chkdsk c:\" from a Command "
+"Prompt under Microsoft Windows® (beware, running graphical program \"scandisk"
+"\" is not enough, be sure to use \"chkdsk\" in a Command Prompt!), "
+"optionally run defrag, then restart the installation. You should also backup "
+"your data.\n"
+"\n"
+"\n"
+"When sure, press %s."
 msgstr ""
 "BRĪDINĀJUMS!\n"
 "\n"
-"Tagad DrakX izmainīs Windows sadaļas izmēru. Esiet\n"
-"uzmanīgs: šī darbība ir bīstama. Ja jūs to vēl neesat\n"
-"izdarījis, jums vispirms ir jāpārtrauc instalēšana, no\n"
-"Windows jāpalaiž scandisk (ieteicams palaist arī defrag),\n"
-"tad atkārtoti jāsāk instalēšana. Vajadzētu izveidot arī\n"
-"datu rezerves kopiju. Kad esat pārliecināts, nospiediet Labi."
+"\n"
+"Tagad DrakX izmainīs Windows sadaļas izmēru.\n"
+"\n"
+"\n"
+"Esiet uzmanīgs: šī darbība ir bīstama. Ja jūs to vēl neesat izdarījis, jums "
+"vispirms ir jāpārtrauc instalēšana, no Windows jāpalaiž scandisk (ieteicams "
+"palaist arī defrag), tad atkārtoti jāsāk instalēšana. Vajadzētu izveidot arī "
+"datu rezerves kopiju.\n"
+"\n"
+"\n"
+"Kad esat pārliecināts, nospiediet %s."
 
 #: install_interactive.pm:178
 #, c-format
-msgid "Which size do you want to keep for Windows on"
-msgstr "Kaidu apjūmu gribit atstuot prīkš Windows iz"
+msgid "Which size do you want to keep for Microsoft Windows® on"
+msgstr "Kaidu apjūmu gribit atstuot prīkš Microsoft Windows® iz"
 
 #: install_interactive.pm:179
 #, c-format
@@ -5710,8 +5721,8 @@ msgstr "sadaļa %s"
 
 #: install_interactive.pm:188
 #, c-format
-msgid "Resizing Windows partition"
-msgstr "Mainu Windows sadalis izmāru"
+msgid "Resizing Microsoft Windows® partition"
+msgstr "Mainu Microsoft Windows® sadalis izmāru"
 
 #: install_interactive.pm:193
 #, c-format
@@ -5727,8 +5738,8 @@ msgstr ""
 
 #: install_interactive.pm:213
 #, c-format
-msgid "Remove Windows(TM)"
-msgstr "Nūjimt Windows(TM)"
+msgid "Remove Microsoft Windows®"
+msgstr "Nūjimt Microsoft Windows®"
 
 #: install_interactive.pm:213
 #, fuzzy, c-format
@@ -5992,7 +6003,7 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "Congratulations, installation is complete.\n"
-"Remove the boot media and press return to reboot.\n"
+"Remove the boot media and press Enter to reboot.\n"
 "\n"
 "\n"
 "For information on fixes which are available for this release of Mandriva "
@@ -15333,7 +15344,7 @@ msgstr ""
 
 #: share/advertising/26.pl:3
 #, c-format
-msgid "How to maintain your system up-to-date?"
+msgid "How to keep your system up-to-date?"
 msgstr ""
 
 #: share/advertising/intel.pl:3
diff --git a/perl-install/share/po/lv.po b/perl-install/share/po/lv.po
index c6999036b..ced8d3986 100644
--- a/perl-install/share/po/lv.po
+++ b/perl-install/share/po/lv.po
@@ -2504,7 +2504,7 @@ msgstr "Jauns izmērs MB: "
 #, c-format
 msgid ""
 "To ensure data integrity after resizing the partition(s), \n"
-"filesystem checks will be run on your next boot into Windows(TM)"
+"filesystem checks will be run on your next boot into Microsoft Windows®"
 msgstr ""
 
 #: diskdrake/interactive.pm:851
@@ -4353,7 +4353,7 @@ msgstr "Izmantot jau esošu sadaļu"
 
 #: help.pm:374 install_interactive.pm:137
 #, c-format
-msgid "Use the free space on the Windows partition"
+msgid "Use the free space on the Microsoft Windows® partition"
 msgstr "Izmantot Windows sadaļas brīvo vietu"
 
 #: help.pm:374
@@ -5574,8 +5574,8 @@ msgstr "Nav nevienas sadaļas, ko varētu izmantot"
 
 #: install_interactive.pm:114
 #, c-format
-msgid "Use the Windows partition for loopback"
-msgstr "Izmantot Windows sadaļu priekš loopback"
+msgid "Use the Microsoft Windows® partition for loopback"
+msgstr "Izmantot Microsoft Windows® sadaļu priekš loopback"
 
 #: install_interactive.pm:117
 #, c-format
@@ -5620,18 +5620,19 @@ msgstr ""
 
 #: install_interactive.pm:156
 #, fuzzy, c-format
-msgid "Computing the size of the Windows partition"
-msgstr "Izmantot Windows sadaļas brīvo vietu"
+msgid "Computing the size of the Microsoft Windows® partition"
+msgstr "Izmantot Microsoft Windows® sadaļas brīvo vietu"
 
 #: install_interactive.pm:163
 #, c-format
 msgid ""
-"Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
-"installation."
+"Your Microsoft Windows® partition is too fragmented. Please reboot your "
+"computer under Microsoft Windows®, run the ``defrag'' utility, then restart "
+"the Mandriva Linux installation."
 msgstr ""
-"Windows sadaļa ir pārāk fragmentēta. Vispirms no Windows vides palaidiet "
-"``defrag'' un tad atsāciet Mandriva Linux instalēšanu."
+"Microsoft Windows® sadaļa ir pārāk fragmentēta. Vispirms no Microsoft "
+"Windows® vides palaidiet ``defrag'' un tad atsāciet Mandriva Linux "
+"instalēšanu."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_interactive.pm:166
@@ -5639,27 +5640,37 @@ msgstr ""
 msgid ""
 "WARNING!\n"
 "\n"
-"DrakX will now resize your Windows partition. Be careful: this\n"
-"operation is dangerous. If you have not already done so, you\n"
-"first need to exit the installation, run \"chkdsk c:\" from a\n"
-"Command Prompt under Windows (beware, running graphical program\n"
-"\"scandisk\" is not enough, be sure to use \"chkdsk\" in a\n"
-"Command Prompt!), optionally run defrag, then restart the\n"
-"installation. You should also backup your data.\n"
-"When sure, press Ok."
+"\n"
+"Your Microsoft Windows® partition will be now resized.\n"
+"\n"
+"\n"
+"Be careful: this operation is dangerous. If you have not already done so, "
+"you first need to exit the installation, run \"chkdsk c:\" from a Command "
+"Prompt under Microsoft Windows® (beware, running graphical program \"scandisk"
+"\" is not enough, be sure to use \"chkdsk\" in a Command Prompt!), "
+"optionally run defrag, then restart the installation. You should also backup "
+"your data.\n"
+"\n"
+"\n"
+"When sure, press %s."
 msgstr ""
 "BRĪDINĀJUMS!\n"
 "\n"
-"Tagad DrakX izmainīs Windows sadaļas izmēru. Esiet\n"
-"uzmanīgs: šī darbība ir bīstama. Ja jūs to vēl neesat\n"
-"izdarījis, jums vispirms ir jāpārtrauc instalēšana, no\n"
-"Windows jāpalaiž scandisk (ieteicams palaist arī defrag),\n"
-"tad atkārtoti jāsāk instalēšana. Vajadzētu izveidot arī\n"
-"datu rezerves kopiju. Kad esat pārliecināts, nospiediet Labi."
+"\n"
+"Tagad DrakX izmainīs Windows sadaļas izmēru.\n"
+"\n"
+"\n"
+"Esiet uzmanīgs: šī darbība ir bīstama. Ja jūs to vēl neesat izdarījis, jums "
+"vispirms ir jāpārtrauc instalēšana, no Windows jāpalaiž scandisk (ieteicams "
+"palaist arī defrag), tad atkārtoti jāsāk instalēšana. Vajadzētu izveidot arī "
+"datu rezerves kopiju.\n"
+"\n"
+"\n"
+"Kad esat pārliecināts, nospiediet %s."
 
 #: install_interactive.pm:178
 #, c-format
-msgid "Which size do you want to keep for Windows on"
+msgid "Which size do you want to keep for Microsoft Windows® on"
 msgstr "Kādu apjomu vēlaties atstāt priekš windows uz"
 
 #: install_interactive.pm:179
@@ -5669,8 +5680,8 @@ msgstr "sadaļa %s"
 
 #: install_interactive.pm:188
 #, c-format
-msgid "Resizing Windows partition"
-msgstr "Mainu Windows sadaļas izmēru"
+msgid "Resizing Microsoft Windows® partition"
+msgstr "Mainu Microsoft Windows® sadaļas izmēru"
 
 #: install_interactive.pm:193
 #, c-format
@@ -5686,8 +5697,8 @@ msgstr ""
 
 #: install_interactive.pm:213
 #, c-format
-msgid "Remove Windows(TM)"
-msgstr "Noņemt Windows(TM)"
+msgid "Remove Microsoft Windows®"
+msgstr "Noņemt Microsoft Windows®"
 
 #: install_interactive.pm:213
 #, fuzzy, c-format
@@ -5944,7 +5955,7 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "Congratulations, installation is complete.\n"
-"Remove the boot media and press return to reboot.\n"
+"Remove the boot media and press Enter to reboot.\n"
 "\n"
 "\n"
 "For information on fixes which are available for this release of Mandriva "
@@ -15262,7 +15273,7 @@ msgstr ""
 
 #: share/advertising/26.pl:3
 #, c-format
-msgid "How to maintain your system up-to-date?"
+msgid "How to keep your system up-to-date?"
 msgstr ""
 
 #: share/advertising/intel.pl:3
diff --git a/perl-install/share/po/mk.po b/perl-install/share/po/mk.po
index 4612a54ce..24fa492a0 100644
--- a/perl-install/share/po/mk.po
+++ b/perl-install/share/po/mk.po
@@ -2562,7 +2562,7 @@ msgstr "Нова големина во МБ: "
 #, c-format
 msgid ""
 "To ensure data integrity after resizing the partition(s), \n"
-"filesystem checks will be run on your next boot into Windows(TM)"
+"filesystem checks will be run on your next boot into Microsoft Windows®"
 msgstr ""
 
 #: diskdrake/interactive.pm:851
@@ -4722,7 +4722,7 @@ msgstr "Користи ја постоечката партиција"
 
 #: help.pm:374 install_interactive.pm:137
 #, c-format
-msgid "Use the free space on the Windows partition"
+msgid "Use the free space on the Microsoft Windows® partition"
 msgstr "Користи го празниот простор на Windows партицијата"
 
 #: help.pm:374
@@ -6146,8 +6146,8 @@ msgstr "Не постои партиција за да може да се кор
 
 #: install_interactive.pm:114
 #, c-format
-msgid "Use the Windows partition for loopback"
-msgstr "Користи ја Windows партицијата за loopback"
+msgid "Use the Microsoft Windows® partition for loopback"
+msgstr "Користи ја Microsoft Windows® партицијата за loopback"
 
 #: install_interactive.pm:117
 #, c-format
@@ -6192,19 +6192,20 @@ msgstr ""
 
 #: install_interactive.pm:156
 #, c-format
-msgid "Computing the size of the Windows partition"
-msgstr "Пресметување на големината на Windows партицијата"
+msgid "Computing the size of the Microsoft Windows® partition"
+msgstr "Пресметување на големината на Microsoft Windows® партицијата"
 
 #: install_interactive.pm:163
 #, c-format
 msgid ""
-"Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
-"installation."
+"Your Microsoft Windows® partition is too fragmented. Please reboot your "
+"computer under Microsoft Windows®, run the ``defrag'' utility, then restart "
+"the Mandriva Linux installation."
 msgstr ""
-"Вашата Windows партиција е премногу фрагментирана. Рестартирајте го "
-"компјутерот, подигнете го под Windows, вклучете ја алатката \"defrag\", и "
-"потоа повторно подигнете ја инсталациската постапка на Мадрак Линукс."
+"Вашата Microsoft Windows® партиција е премногу фрагментирана. Рестартирајте "
+"го компјутерот, подигнете го под Microsoft Windows®, вклучете ја алатката "
+"\"defrag\", и потоа повторно подигнете ја инсталациската постапка на Мадрак "
+"Линукс."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_interactive.pm:166
@@ -6212,30 +6213,39 @@ msgstr ""
 msgid ""
 "WARNING!\n"
 "\n"
-"DrakX will now resize your Windows partition. Be careful: this\n"
-"operation is dangerous. If you have not already done so, you\n"
-"first need to exit the installation, run \"chkdsk c:\" from a\n"
-"Command Prompt under Windows (beware, running graphical program\n"
-"\"scandisk\" is not enough, be sure to use \"chkdsk\" in a\n"
-"Command Prompt!), optionally run defrag, then restart the\n"
-"installation. You should also backup your data.\n"
-"When sure, press Ok."
+"\n"
+"Your Microsoft Windows® partition will be now resized.\n"
+"\n"
+"\n"
+"Be careful: this operation is dangerous. If you have not already done so, "
+"you first need to exit the installation, run \"chkdsk c:\" from a Command "
+"Prompt under Microsoft Windows® (beware, running graphical program \"scandisk"
+"\" is not enough, be sure to use \"chkdsk\" in a Command Prompt!), "
+"optionally run defrag, then restart the installation. You should also backup "
+"your data.\n"
+"\n"
+"\n"
+"When sure, press %s."
 msgstr ""
 "ПРЕДУПРЕДУВАЊЕ!\n"
 "\n"
+"\n"
 "DrakX сега ќе ја зголемува/намалува Вашата Windows партиција.\n"
-"Внимавајте: оваа операција е опасна. Ако веќе тоа не сте го\n"
-"сториле, треба да излезете од инсталацијава, да извршите\n"
-"\"scandisk\" под Windows (и, дополнително, ако сакате, \"defrag\"),\n"
-"и потоа повторно да ја вклучите инсталациската постапка на\n"
-"Мандрива Линукс. Исто така, би требало да имате и бекап на \n"
-"Вашите податоци.\n"
-"Ако сте сигурни, притиснете \"Во ред\""
+"\n"
+"\n"
+"Внимавајте: оваа операција е опасна. Ако веќе тоа не сте го сториле, треба "
+"да излезете од инсталацијава, да извршите \"scandisk\" под Windows (и, "
+"дополнително, ако сакате, \"defrag\"), и потоа повторно да ја вклучите "
+"инсталациската постапка на Мандрива Линукс. Исто така, би требало да имате и "
+"бекап на  Вашите податоци.\n"
+"\n"
+"\n"
+"Ако сте сигурни, притиснете \"%s\""
 
 #: install_interactive.pm:178
 #, c-format
-msgid "Which size do you want to keep for Windows on"
-msgstr "Колкава големина да остане за Windows на"
+msgid "Which size do you want to keep for Microsoft Windows® on"
+msgstr "Колкава големина да остане за Microsoft Windows® на"
 
 #: install_interactive.pm:179
 #, c-format
@@ -6244,8 +6254,8 @@ msgstr "партиција %s"
 
 #: install_interactive.pm:188
 #, c-format
-msgid "Resizing Windows partition"
-msgstr "Зголемување/намалување на Windows партиција"
+msgid "Resizing Microsoft Windows® partition"
+msgstr "Зголемување/намалување на Microsoft Windows® партиција"
 
 #: install_interactive.pm:193
 #, c-format
@@ -6261,8 +6271,8 @@ msgstr ""
 
 #: install_interactive.pm:213
 #, c-format
-msgid "Remove Windows(TM)"
-msgstr "Отстрани го Windows(TM)"
+msgid "Remove Microsoft Windows®"
+msgstr "Отстрани го Microsoft Windows®"
 
 #: install_interactive.pm:213
 #, fuzzy, c-format
@@ -6617,7 +6627,7 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "Congratulations, installation is complete.\n"
-"Remove the boot media and press return to reboot.\n"
+"Remove the boot media and press Enter to reboot.\n"
 "\n"
 "\n"
 "For information on fixes which are available for this release of Mandriva "
@@ -16230,7 +16240,7 @@ msgstr ""
 
 #: share/advertising/26.pl:3
 #, c-format
-msgid "How to maintain your system up-to-date?"
+msgid "How to keep your system up-to-date?"
 msgstr ""
 
 #: share/advertising/intel.pl:3
diff --git a/perl-install/share/po/mn.po b/perl-install/share/po/mn.po
index 990189b84..d7e2ea81b 100644
--- a/perl-install/share/po/mn.po
+++ b/perl-install/share/po/mn.po
@@ -2431,7 +2431,7 @@ msgstr "Шинэ хэмжээ МБ-р."
 #, fuzzy, c-format
 msgid ""
 "To ensure data integrity after resizing the partition(s), \n"
-"filesystem checks will be run on your next boot into Windows(TM)"
+"filesystem checks will be run on your next boot into Microsoft Windows®"
 msgstr "тийш с Цонхнууд"
 
 #: diskdrake/interactive.pm:851
@@ -4149,7 +4149,7 @@ msgstr ""
 
 #: help.pm:374 install_interactive.pm:137
 #, fuzzy, c-format
-msgid "Use the free space on the Windows partition"
+msgid "Use the free space on the Microsoft Windows® partition"
 msgstr "Цонхнууд"
 
 #: help.pm:374
@@ -5213,7 +5213,7 @@ msgstr "Энд хэрэглэх ямар нэгэн хуваалт алга"
 
 #: install_interactive.pm:114
 #, fuzzy, c-format
-msgid "Use the Windows partition for loopback"
+msgid "Use the Microsoft Windows® partition for loopback"
 msgstr "Цонхнууд"
 
 #: install_interactive.pm:117
@@ -5255,15 +5255,15 @@ msgstr "бол"
 
 #: install_interactive.pm:156
 #, fuzzy, c-format
-msgid "Computing the size of the Windows partition"
+msgid "Computing the size of the Microsoft Windows® partition"
 msgstr "хэмжээ аас Цонхнууд"
 
 #: install_interactive.pm:163
 #, fuzzy, c-format
 msgid ""
-"Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
-"installation."
+"Your Microsoft Windows® partition is too fragmented. Please reboot your "
+"computer under Microsoft Windows®, run the ``defrag'' utility, then restart "
+"the Mandriva Linux installation."
 msgstr "Цонхнууд бол Цонхнууд."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
@@ -5272,19 +5272,24 @@ msgstr "Цонхнууд бол Цонхнууд."
 msgid ""
 "WARNING!\n"
 "\n"
-"DrakX will now resize your Windows partition. Be careful: this\n"
-"operation is dangerous. If you have not already done so, you\n"
-"first need to exit the installation, run \"chkdsk c:\" from a\n"
-"Command Prompt under Windows (beware, running graphical program\n"
-"\"scandisk\" is not enough, be sure to use \"chkdsk\" in a\n"
-"Command Prompt!), optionally run defrag, then restart the\n"
-"installation. You should also backup your data.\n"
-"When sure, press Ok."
+"\n"
+"Your Microsoft Windows® partition will be now resized.\n"
+"\n"
+"\n"
+"Be careful: this operation is dangerous. If you have not already done so, "
+"you first need to exit the installation, run \"chkdsk c:\" from a Command "
+"Prompt under Microsoft Windows® (beware, running graphical program \"scandisk"
+"\" is not enough, be sure to use \"chkdsk\" in a Command Prompt!), "
+"optionally run defrag, then restart the installation. You should also backup "
+"your data.\n"
+"\n"
+"\n"
+"When sure, press %s."
 msgstr "АНХААРУУЛГА г Цонхнууд бол вы Хийгдсэн вы Цонхнууд Та Ок."
 
 #: install_interactive.pm:178
 #, fuzzy, c-format
-msgid "Which size do you want to keep for Windows on"
+msgid "Which size do you want to keep for Microsoft Windows® on"
 msgstr "хэмжээ вы Цонхнууд"
 
 #: install_interactive.pm:179
@@ -5294,7 +5299,7 @@ msgstr ""
 
 #: install_interactive.pm:188
 #, fuzzy, c-format
-msgid "Resizing Windows partition"
+msgid "Resizing Microsoft Windows® partition"
 msgstr "Цонхнууд"
 
 #: install_interactive.pm:193
@@ -5309,7 +5314,7 @@ msgstr "бол үгүй зүүн"
 
 #: install_interactive.pm:213
 #, c-format
-msgid "Remove Windows(TM)"
+msgid "Remove Microsoft Windows®"
 msgstr "Виндоусыг (ХТ) устгах"
 
 #: install_interactive.pm:213
@@ -5540,7 +5545,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Congratulations, installation is complete.\n"
-"Remove the boot media and press return to reboot.\n"
+"Remove the boot media and press Enter to reboot.\n"
 "\n"
 "\n"
 "For information on fixes which are available for this release of Mandriva "
@@ -14615,7 +14620,7 @@ msgstr ""
 
 #: share/advertising/26.pl:3
 #, c-format
-msgid "How to maintain your system up-to-date?"
+msgid "How to keep your system up-to-date?"
 msgstr ""
 
 #: share/advertising/intel.pl:3
diff --git a/perl-install/share/po/ms.po b/perl-install/share/po/ms.po
index c5c08c061..43f540c63 100644
--- a/perl-install/share/po/ms.po
+++ b/perl-install/share/po/ms.po
@@ -2442,7 +2442,7 @@ msgstr "(Saiz maks %s MB)"
 #, fuzzy, c-format
 msgid ""
 "To ensure data integrity after resizing the partition(s), \n"
-"filesystem checks will be run on your next boot into Windows(TM)"
+"filesystem checks will be run on your next boot into Microsoft Windows®"
 msgstr "Kepada on Tetingkap"
 
 #: diskdrake/interactive.pm:851
@@ -4172,7 +4172,7 @@ msgstr "Guna partisyen sedia ada (onpart)"
 
 #: help.pm:374 install_interactive.pm:137
 #, fuzzy, c-format
-msgid "Use the free space on the Windows partition"
+msgid "Use the free space on the Microsoft Windows® partition"
 msgstr "on Tetingkap"
 
 #: help.pm:374
@@ -5246,7 +5246,7 @@ msgstr "tidak"
 
 #: install_interactive.pm:114
 #, fuzzy, c-format
-msgid "Use the Windows partition for loopback"
+msgid "Use the Microsoft Windows® partition for loopback"
 msgstr "Tetingkap"
 
 #: install_interactive.pm:117
@@ -5288,15 +5288,15 @@ msgstr "ralat"
 
 #: install_interactive.pm:156
 #, fuzzy, c-format
-msgid "Computing the size of the Windows partition"
+msgid "Computing the size of the Microsoft Windows® partition"
 msgstr "Kemasukan Tidak Sah bagi Saiz Partisyen"
 
 #: install_interactive.pm:163
 #, fuzzy, c-format
 msgid ""
-"Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
-"installation."
+"Your Microsoft Windows® partition is too fragmented. Please reboot your "
+"computer under Microsoft Windows®, run the ``defrag'' utility, then restart "
+"the Mandriva Linux installation."
 msgstr "Tetingkap Tetingkap ulanghidup."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
@@ -5305,19 +5305,24 @@ msgstr "Tetingkap Tetingkap ulanghidup."
 msgid ""
 "WARNING!\n"
 "\n"
-"DrakX will now resize your Windows partition. Be careful: this\n"
-"operation is dangerous. If you have not already done so, you\n"
-"first need to exit the installation, run \"chkdsk c:\" from a\n"
-"Command Prompt under Windows (beware, running graphical program\n"
-"\"scandisk\" is not enough, be sure to use \"chkdsk\" in a\n"
-"Command Prompt!), optionally run defrag, then restart the\n"
-"installation. You should also backup your data.\n"
-"When sure, press Ok."
+"\n"
+"Your Microsoft Windows® partition will be now resized.\n"
+"\n"
+"\n"
+"Be careful: this operation is dangerous. If you have not already done so, "
+"you first need to exit the installation, run \"chkdsk c:\" from a Command "
+"Prompt under Microsoft Windows® (beware, running graphical program \"scandisk"
+"\" is not enough, be sure to use \"chkdsk\" in a Command Prompt!), "
+"optionally run defrag, then restart the installation. You should also backup "
+"your data.\n"
+"\n"
+"\n"
+"When sure, press %s."
 msgstr "AMARAN Tetingkap siap Tetingkap dan ulanghidup Ok."
 
 #: install_interactive.pm:178
 #, fuzzy, c-format
-msgid "Which size do you want to keep for Windows on"
+msgid "Which size do you want to keep for Microsoft Windows® on"
 msgstr "Tetingkap"
 
 #: install_interactive.pm:179
@@ -5327,7 +5332,7 @@ msgstr "Partisyen"
 
 #: install_interactive.pm:188
 #, fuzzy, c-format
-msgid "Resizing Windows partition"
+msgid "Resizing Microsoft Windows® partition"
 msgstr "Edit partisyen: /dev/%s"
 
 #: install_interactive.pm:193
@@ -5342,7 +5347,7 @@ msgstr "tidak"
 
 #: install_interactive.pm:213
 #, fuzzy, c-format
-msgid "Remove Windows(TM)"
+msgid "Remove Microsoft Windows®"
 msgstr "Pelayan Fail Windows"
 
 #: install_interactive.pm:213
@@ -5575,7 +5580,7 @@ msgstr "dalam dan dan dalam on on Masuk dan dan"
 #, fuzzy, c-format
 msgid ""
 "Congratulations, installation is complete.\n"
-"Remove the boot media and press return to reboot.\n"
+"Remove the boot media and press Enter to reboot.\n"
 "\n"
 "\n"
 "For information on fixes which are available for this release of Mandriva "
@@ -14556,7 +14561,7 @@ msgstr ""
 
 #: share/advertising/26.pl:3
 #, c-format
-msgid "How to maintain your system up-to-date?"
+msgid "How to keep your system up-to-date?"
 msgstr ""
 
 #: share/advertising/intel.pl:3
diff --git a/perl-install/share/po/mt.po b/perl-install/share/po/mt.po
index 055c45b22..5fb9120a2 100644
--- a/perl-install/share/po/mt.po
+++ b/perl-install/share/po/mt.po
@@ -2604,7 +2604,7 @@ msgstr "Daqs ġdid f'MB: "
 #, c-format
 msgid ""
 "To ensure data integrity after resizing the partition(s), \n"
-"filesystem checks will be run on your next boot into Windows(TM)"
+"filesystem checks will be run on your next boot into Microsoft Windows®"
 msgstr ""
 "Biex tassigura l-integrità tad-data wara li tibdel id-daqs tal-partizzjoni"
 "(jiet),\n"
@@ -4717,7 +4717,7 @@ msgstr "Uża partizzjoni eżistenti"
 
 #: help.pm:374 install_interactive.pm:137
 #, c-format
-msgid "Use the free space on the Windows partition"
+msgid "Use the free space on the Microsoft Windows® partition"
 msgstr "Uża l-ispazju vojt fil-partizzjoni tal-Windows"
 
 #: help.pm:374
@@ -6249,8 +6249,8 @@ msgstr "M'hemmx partizzjonijiet eżistenti x'nuża"
 
 #: install_interactive.pm:114
 #, c-format
-msgid "Use the Windows partition for loopback"
-msgstr "Uża l-partizzjoni tal-Windows għal loopback"
+msgid "Use the Microsoft Windows® partition for loopback"
+msgstr "Uża l-partizzjoni tal-Microsoft Windows® għal loopback"
 
 #: install_interactive.pm:117
 #, c-format
@@ -6296,18 +6296,18 @@ msgstr ""
 
 #: install_interactive.pm:156
 #, c-format
-msgid "Computing the size of the Windows partition"
-msgstr "Qed jiġi kalkulat id-daqs tal-partizzjoni Windows"
+msgid "Computing the size of the Microsoft Windows® partition"
+msgstr "Qed jiġi kalkulat id-daqs tal-partizzjoni Microsoft Windows®"
 
 #: install_interactive.pm:163
 #, c-format
 msgid ""
-"Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
-"installation."
+"Your Microsoft Windows® partition is too fragmented. Please reboot your "
+"computer under Microsoft Windows®, run the ``defrag'' utility, then restart "
+"the Mandriva Linux installation."
 msgstr ""
-"Il-partizzjoni tal-Windows hija mgerfxa wisq. Jekk jogħġbok ħaddem \"defrag"
-"\"."
+"Il-partizzjoni tal-Microsoft Windows® hija mgerfxa wisq. Jekk jogħġbok "
+"ħaddem \"defrag\"."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_interactive.pm:166
@@ -6315,29 +6315,38 @@ msgstr ""
 msgid ""
 "WARNING!\n"
 "\n"
-"DrakX will now resize your Windows partition. Be careful: this\n"
-"operation is dangerous. If you have not already done so, you\n"
-"first need to exit the installation, run \"chkdsk c:\" from a\n"
-"Command Prompt under Windows (beware, running graphical program\n"
-"\"scandisk\" is not enough, be sure to use \"chkdsk\" in a\n"
-"Command Prompt!), optionally run defrag, then restart the\n"
-"installation. You should also backup your data.\n"
-"When sure, press Ok."
+"\n"
+"Your Microsoft Windows® partition will be now resized.\n"
+"\n"
+"\n"
+"Be careful: this operation is dangerous. If you have not already done so, "
+"you first need to exit the installation, run \"chkdsk c:\" from a Command "
+"Prompt under Microsoft Windows® (beware, running graphical program \"scandisk"
+"\" is not enough, be sure to use \"chkdsk\" in a Command Prompt!), "
+"optionally run defrag, then restart the installation. You should also backup "
+"your data.\n"
+"\n"
+"\n"
+"When sure, press %s."
 msgstr ""
 "TWISSIJA!\n"
 "\n"
-"DrakX issa se jbiddel id-daqs tal-partizzjoni Windows. Oqgħod\n"
-"attent: dan il-proċess huwa perikoluż. Jekk għadek m'għamiltx dan,\n"
-"jaqbillek l-ewwel toħroġ mill-proċess tal-installazzjoni, tħaddem\n"
-"\"scandisk\" mill-\"command prompt\" tal-Windows u idejalment \n"
-"anke \"defrag\", u mbagħad terġa' tibda l-installazzjoni. Int \n"
-"rakkomandat ukoll li tieħu kopja tas-sigurtà tal-informazzjoni \n"
-"importanti.\n"
-"Meta tkun ċert, agħfas Ok."
+"\n"
+"DrakX issa se jbiddel id-daqs tal-partizzjoni Windows.\n"
+"\n"
+"\n"
+"Oqgħod attent: dan il-proċess huwa perikoluż. Jekk għadek m'għamiltx dan, "
+"jaqbillek l-ewwel toħroġ mill-proċess tal-installazzjoni, tħaddem \"scandisk"
+"\" mill-\"command prompt\" tal-Windows u idejalment  anke \"defrag\", u "
+"mbagħad terġa' tibda l-installazzjoni. Int  rakkomandat ukoll li tieħu kopja "
+"tas-sigurtà tal-informazzjoni  importanti.\n"
+"\n"
+"\n"
+"Meta tkun ċert, agħfas %s."
 
 #: install_interactive.pm:178
 #, c-format
-msgid "Which size do you want to keep for Windows on"
+msgid "Which size do you want to keep for Microsoft Windows® on"
 msgstr "X'daqs trid iżżomm għall-windows fuq"
 
 #: install_interactive.pm:179
@@ -6347,8 +6356,8 @@ msgstr "partizzjoni %s"
 
 #: install_interactive.pm:188
 #, c-format
-msgid "Resizing Windows partition"
-msgstr "Qed nikkalkula l-limiti tal-filesystem tal-Windows"
+msgid "Resizing Microsoft Windows® partition"
+msgstr "Qed nikkalkula l-limiti tal-filesystem tal-Microsoft Windows®"
 
 #: install_interactive.pm:193
 #, c-format
@@ -6364,8 +6373,8 @@ msgstr ""
 
 #: install_interactive.pm:213
 #, c-format
-msgid "Remove Windows(TM)"
-msgstr "Neħħi l-Windows(TM)"
+msgid "Remove Microsoft Windows®"
+msgstr "Neħħi l-Microsoft Windows®"
 
 #: install_interactive.pm:213
 #, fuzzy, c-format
@@ -6636,7 +6645,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Congratulations, installation is complete.\n"
-"Remove the boot media and press return to reboot.\n"
+"Remove the boot media and press Enter to reboot.\n"
 "\n"
 "\n"
 "For information on fixes which are available for this release of Mandriva "
@@ -16390,7 +16399,7 @@ msgstr ""
 
 #: share/advertising/26.pl:3
 #, c-format
-msgid "How to maintain your system up-to-date?"
+msgid "How to keep your system up-to-date?"
 msgstr ""
 
 #: share/advertising/intel.pl:3
diff --git a/perl-install/share/po/nb.po b/perl-install/share/po/nb.po
index 594e3d120..fb281e30f 100644
--- a/perl-install/share/po/nb.po
+++ b/perl-install/share/po/nb.po
@@ -2621,7 +2621,7 @@ msgstr "Ny størrelse i MB: "
 #, c-format
 msgid ""
 "To ensure data integrity after resizing the partition(s), \n"
-"filesystem checks will be run on your next boot into Windows(TM)"
+"filesystem checks will be run on your next boot into Microsoft Windows®"
 msgstr ""
 "For å sikre dataintegritet etter at partisjonen(e) har blitt endret, \n"
 "vil kontroll av filsystemene kjøres neste gang du starter Windows(TM)"
@@ -4796,7 +4796,7 @@ msgstr "Bruk eksisterende partisjon"
 
 #: help.pm:374 install_interactive.pm:137
 #, c-format
-msgid "Use the free space on the Windows partition"
+msgid "Use the free space on the Microsoft Windows® partition"
 msgstr "Bruk den ledige plassen på Windows-partisjonen"
 
 #: help.pm:374
@@ -6365,8 +6365,8 @@ msgstr "Det finnes ingen eksisterende partisjon som kan brukes"
 
 #: install_interactive.pm:114
 #, c-format
-msgid "Use the Windows partition for loopback"
-msgstr "Bruk Windows-partisjonen for loopback"
+msgid "Use the Microsoft Windows® partition for loopback"
+msgstr "Bruk Microsoft Windows®-partisjonen for loopback"
 
 #: install_interactive.pm:117
 #, c-format
@@ -6411,19 +6411,19 @@ msgstr ""
 
 #: install_interactive.pm:156
 #, c-format
-msgid "Computing the size of the Windows partition"
-msgstr "Beregner den ledige plassen på Windows-partisjonen"
+msgid "Computing the size of the Microsoft Windows® partition"
+msgstr "Beregner den ledige plassen på Microsoft Windows®-partisjonen"
 
 #: install_interactive.pm:163
 #, c-format
 msgid ""
-"Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
-"installation."
+"Your Microsoft Windows® partition is too fragmented. Please reboot your "
+"computer under Microsoft Windows®, run the ``defrag'' utility, then restart "
+"the Mandriva Linux installation."
 msgstr ""
-"Windows-partisjonen din er for fragmentert. Start maskinen din på nytt til "
-"Windows, kjør ``defrag''-verktøyet, så start Mandriva Linux-installasjonen "
-"på nytt."
+"Microsoft Windows®-partisjonen din er for fragmentert. Start maskinen din på "
+"nytt til Microsoft Windows®, kjør ``defrag''-verktøyet, så start Mandriva "
+"Linux-installasjonen på nytt."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_interactive.pm:166
@@ -6431,30 +6431,39 @@ msgstr ""
 msgid ""
 "WARNING!\n"
 "\n"
-"DrakX will now resize your Windows partition. Be careful: this\n"
-"operation is dangerous. If you have not already done so, you\n"
-"first need to exit the installation, run \"chkdsk c:\" from a\n"
-"Command Prompt under Windows (beware, running graphical program\n"
-"\"scandisk\" is not enough, be sure to use \"chkdsk\" in a\n"
-"Command Prompt!), optionally run defrag, then restart the\n"
-"installation. You should also backup your data.\n"
-"When sure, press Ok."
+"\n"
+"Your Microsoft Windows® partition will be now resized.\n"
+"\n"
+"\n"
+"Be careful: this operation is dangerous. If you have not already done so, "
+"you first need to exit the installation, run \"chkdsk c:\" from a Command "
+"Prompt under Microsoft Windows® (beware, running graphical program \"scandisk"
+"\" is not enough, be sure to use \"chkdsk\" in a Command Prompt!), "
+"optionally run defrag, then restart the installation. You should also backup "
+"your data.\n"
+"\n"
+"\n"
+"When sure, press %s."
 msgstr ""
 "ADVARSEL!\n"
 "\n"
-"DrakX vil nå endre størrelsen på Windows-partisjonen din. Vær\n"
-"forsiktig: denne operasjonen er farlig. Hvis du ikke allerede har\n"
-"gjort det, bør du først kjøre \"chkdsk c:\" fra en kommandolinje under\n"
-"Windows (vær oppmerksom på at å kjøre et grafisk program som \"scandisk\"\n"
-"ikke er nok, vær sikker på å kjøre \"chkdsk\" i en kommandolinje!), og det\n"
+"\n"
+"DrakX vil nå endre størrelsen på Windows-partisjonen din.\n"
+"\n"
+"\n"
+"Vær forsiktig: denne operasjonen er farlig. Hvis du ikke allerede har gjort "
+"det, bør du først kjøre \"chkdsk c:\" fra en kommandolinje under Windows "
+"(vær oppmerksom på at å kjøre et grafisk program som \"scandisk\"\n"
+"ikke er nok, vær sikker på å kjøre \"chkdsk\" i en kommandolinje!), og det "
 "anbefales også å defragmentere, etter det så restart installasjonen. Du "
-"burde\n"
-"også ta sikkerhetskopi av dine data.\n"
-"Når du er sikker, trykk Ok."
+"burde også ta sikkerhetskopi av dine data.\n"
+"\n"
+"\n"
+"Når du er sikker, trykk %s."
 
 #: install_interactive.pm:178
 #, c-format
-msgid "Which size do you want to keep for Windows on"
+msgid "Which size do you want to keep for Microsoft Windows® on"
 msgstr "Hvilken størrelse ønsker du å beholde vinduer på?"
 
 #: install_interactive.pm:179
@@ -6464,8 +6473,8 @@ msgstr "partisjon %s"
 
 #: install_interactive.pm:188
 #, c-format
-msgid "Resizing Windows partition"
-msgstr "Beregner Windows-filsystemgrense"
+msgid "Resizing Microsoft Windows® partition"
+msgstr "Beregner Microsoft Windows®-filsystemgrense"
 
 #: install_interactive.pm:193
 #, c-format
@@ -6481,8 +6490,8 @@ msgstr ""
 
 #: install_interactive.pm:213
 #, c-format
-msgid "Remove Windows(TM)"
-msgstr "Fjern Windows(TM)"
+msgid "Remove Microsoft Windows®"
+msgstr "Fjern Microsoft Windows®"
 
 #: install_interactive.pm:213
 #, fuzzy, c-format
@@ -6861,7 +6870,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Congratulations, installation is complete.\n"
-"Remove the boot media and press return to reboot.\n"
+"Remove the boot media and press Enter to reboot.\n"
 "\n"
 "\n"
 "For information on fixes which are available for this release of Mandriva "
@@ -16701,7 +16710,7 @@ msgstr ""
 
 #: share/advertising/26.pl:3
 #, c-format
-msgid "How to maintain your system up-to-date?"
+msgid "How to keep your system up-to-date?"
 msgstr ""
 
 #: share/advertising/intel.pl:3
diff --git a/perl-install/share/po/nl.po b/perl-install/share/po/nl.po
index ee4ab63a6..7de7f88b2 100644
--- a/perl-install/share/po/nl.po
+++ b/perl-install/share/po/nl.po
@@ -2631,7 +2631,7 @@ msgstr "Nieuwe grootte in MB: "
 #, c-format
 msgid ""
 "To ensure data integrity after resizing the partition(s), \n"
-"filesystem checks will be run on your next boot into Windows(TM)"
+"filesystem checks will be run on your next boot into Microsoft Windows®"
 msgstr ""
 "Om de data-integriteit na het aanpassen van de partitiegrootte(s)\n"
 "te garanderen, zal het bestandssysteem worden gecontroleerd\n"
@@ -4812,7 +4812,7 @@ msgstr "Een bestaande partitie gebruiken"
 
 #: help.pm:374 install_interactive.pm:137
 #, c-format
-msgid "Use the free space on the Windows partition"
+msgid "Use the free space on the Microsoft Windows® partition"
 msgstr "Gebruik de vrije ruimte op de Windows partitie"
 
 #: help.pm:374
@@ -6381,8 +6381,8 @@ msgstr "Er is geen bestaande partitie om te gebruiken"
 
 #: install_interactive.pm:114
 #, c-format
-msgid "Use the Windows partition for loopback"
-msgstr "Gebruik de Windows partitie voor loopback "
+msgid "Use the Microsoft Windows® partition for loopback"
+msgstr "Gebruik de Microsoft Windows® partitie voor loopback "
 
 #: install_interactive.pm:117
 #, c-format
@@ -6427,19 +6427,19 @@ msgstr ""
 
 #: install_interactive.pm:156
 #, c-format
-msgid "Computing the size of the Windows partition"
-msgstr "Bezig met berekenen grootte van Windows-partitie"
+msgid "Computing the size of the Microsoft Windows® partition"
+msgstr "Bezig met berekenen grootte van Microsoft Windows®-partitie"
 
 #: install_interactive.pm:163
 #, c-format
 msgid ""
-"Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
-"installation."
+"Your Microsoft Windows® partition is too fragmented. Please reboot your "
+"computer under Microsoft Windows®, run the ``defrag'' utility, then restart "
+"the Mandriva Linux installation."
 msgstr ""
-"Uw Windows-partitie is te gefragmenteerd. Start uw computer opnieuw op onder "
-"Windows, gebruik het ``defrag''-hulpprogramma, en herstart vervolgens de "
-"installatie van Mandriva Linux."
+"Uw Microsoft Windows®-partitie is te gefragmenteerd. Start uw computer "
+"opnieuw op onder Microsoft Windows®, gebruik het ``defrag''-hulpprogramma, "
+"en herstart vervolgens de installatie van Mandriva Linux."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_interactive.pm:166
@@ -6447,32 +6447,41 @@ msgstr ""
 msgid ""
 "WARNING!\n"
 "\n"
-"DrakX will now resize your Windows partition. Be careful: this\n"
-"operation is dangerous. If you have not already done so, you\n"
-"first need to exit the installation, run \"chkdsk c:\" from a\n"
-"Command Prompt under Windows (beware, running graphical program\n"
-"\"scandisk\" is not enough, be sure to use \"chkdsk\" in a\n"
-"Command Prompt!), optionally run defrag, then restart the\n"
-"installation. You should also backup your data.\n"
-"When sure, press Ok."
+"\n"
+"Your Microsoft Windows® partition will be now resized.\n"
+"\n"
+"\n"
+"Be careful: this operation is dangerous. If you have not already done so, "
+"you first need to exit the installation, run \"chkdsk c:\" from a Command "
+"Prompt under Microsoft Windows® (beware, running graphical program \"scandisk"
+"\" is not enough, be sure to use \"chkdsk\" in a Command Prompt!), "
+"optionally run defrag, then restart the installation. You should also backup "
+"your data.\n"
+"\n"
+"\n"
+"When sure, press %s."
 msgstr ""
 "WAARSCHUWING!\n"
 "\n"
-"DrakX zal nu de grootte van uw Windows-partitie aanpassen. Wees\n"
-"voorzichtig: deze operatie is gevaarlijk. Als u dit niet reeds\n"
-"gedaan heeft, dient u eerst de installatie af te breken, \n"
-"\"chkdsk c:\" uit te voeren vanuit een Opdrachtaanwijzing onder\n"
-"Windows (kijk uit, het draaien van het grafische programma \"scandisk\"\n"
-"is niet genoeg, zorg ervoor dat u \"chkdsk\" in een opdrachtaanwijzing\n"
-"gebruikt!), eventueel defrag uit te voeren, en daarna de\n"
-"installatie opnieuw te starten. Maakt u ook een reservekopie\n"
-"van uw gegevens.\n"
-"Wanneer u zeker van uw zaak bent, klik dan OK."
+"\n"
+"DrakX zal nu de grootte van uw Windows-partitie aanpassen.\n"
+"\n"
+"\n"
+"Wees voorzichtig: deze operatie is gevaarlijk. Als u dit niet reeds gedaan "
+"heeft, dient u eerst de installatie af te breken,  \"chkdsk c:\" uit te "
+"voeren vanuit een Opdrachtaanwijzing onder Windows (kijk uit, het draaien "
+"van het grafische programma \"scandisk\" is niet genoeg, zorg ervoor dat u "
+"\"chkdsk\" in een opdrachtaanwijzing gebruikt!), eventueel defrag uit te "
+"voeren, en daarna de installatie opnieuw te starten. Maakt u ook een "
+"reservekopie van uw gegevens.\n"
+"\n"
+"\n"
+"Wanneer u zeker van uw zaak bent, klik dan %s."
 
 #: install_interactive.pm:178
 #, c-format
-msgid "Which size do you want to keep for Windows on"
-msgstr "Welke grootte wilt u behouden voor Windows op"
+msgid "Which size do you want to keep for Microsoft Windows® on"
+msgstr "Welke grootte wilt u behouden voor Microsoft Windows® op"
 
 #: install_interactive.pm:179
 #, c-format
@@ -6481,8 +6490,8 @@ msgstr "partitie %s"
 
 #: install_interactive.pm:188
 #, c-format
-msgid "Resizing Windows partition"
-msgstr "Bezig met grootte aanpassen van Windows-partitie"
+msgid "Resizing Microsoft Windows® partition"
+msgstr "Bezig met grootte aanpassen van Microsoft Windows®-partitie"
 
 #: install_interactive.pm:193
 #, c-format
@@ -6498,8 +6507,8 @@ msgstr ""
 
 #: install_interactive.pm:213
 #, c-format
-msgid "Remove Windows(TM)"
-msgstr "Windows(TM) verwijderen"
+msgid "Remove Microsoft Windows®"
+msgstr "Microsoft Windows® verwijderen"
 
 #: install_interactive.pm:213
 #, fuzzy, c-format
@@ -6898,7 +6907,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Congratulations, installation is complete.\n"
-"Remove the boot media and press return to reboot.\n"
+"Remove the boot media and press Enter to reboot.\n"
 "\n"
 "\n"
 "For information on fixes which are available for this release of Mandriva "
@@ -16810,7 +16819,7 @@ msgstr "Hoe sluit u zich aan bij de Mandriva Linux-community?"
 
 #: share/advertising/26.pl:3
 #, c-format
-msgid "How to maintain your system up-to-date?"
+msgid "How to keep your system up-to-date?"
 msgstr "Hoe houdt u uw systeem actueel?"
 
 #: share/advertising/intel.pl:3
diff --git a/perl-install/share/po/nn.po b/perl-install/share/po/nn.po
index 02e9b9a5a..71e2c602e 100644
--- a/perl-install/share/po/nn.po
+++ b/perl-install/share/po/nn.po
@@ -2593,7 +2593,7 @@ msgstr "Ny storleik i MiB: "
 #, c-format
 msgid ""
 "To ensure data integrity after resizing the partition(s), \n"
-"filesystem checks will be run on your next boot into Windows(TM)"
+"filesystem checks will be run on your next boot into Microsoft Windows®"
 msgstr ""
 "For å sikra dataintegritet på partisjonen/-ane\n"
 "vert det køyrt filsystemkontroll neste gongar du startar Windows™"
@@ -4701,7 +4701,7 @@ msgstr "Bruk gammal partisjon"
 
 #: help.pm:374 install_interactive.pm:137
 #, c-format
-msgid "Use the free space on the Windows partition"
+msgid "Use the free space on the Microsoft Windows® partition"
 msgstr "Bruk ledig plass på Windows-partisjon"
 
 #: help.pm:374
@@ -5957,8 +5957,8 @@ msgstr "Det finst ingen gammal partisjon å bruka"
 
 #: install_interactive.pm:114
 #, c-format
-msgid "Use the Windows partition for loopback"
-msgstr "Bruk Windows-partisjonen til filmontering"
+msgid "Use the Microsoft Windows® partition for loopback"
+msgstr "Bruk Microsoft Windows®-partisjonen til filmontering"
 
 #: install_interactive.pm:117
 #, c-format
@@ -6003,18 +6003,19 @@ msgstr ""
 
 #: install_interactive.pm:156
 #, c-format
-msgid "Computing the size of the Windows partition"
-msgstr "Reknar ut storleik på Windows-partisjon"
+msgid "Computing the size of the Microsoft Windows® partition"
+msgstr "Reknar ut storleik på Microsoft Windows®-partisjon"
 
 #: install_interactive.pm:163
 #, c-format
 msgid ""
-"Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
-"installation."
+"Your Microsoft Windows® partition is too fragmented. Please reboot your "
+"computer under Microsoft Windows®, run the ``defrag'' utility, then restart "
+"the Mandriva Linux installation."
 msgstr ""
-"Windows-partisjonen for fragmentert. Start maskina på nytt under Windows, og "
-"køyr defragmenteringsverktøyet. Prøv så å installera Mandriva Linux på nytt."
+"Microsoft Windows®-partisjonen for fragmentert. Start maskina på nytt under "
+"Microsoft Windows®, og køyr defragmenteringsverktøyet. Prøv så å installera "
+"Mandriva Linux på nytt."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_interactive.pm:166
@@ -6022,30 +6023,39 @@ msgstr ""
 msgid ""
 "WARNING!\n"
 "\n"
-"DrakX will now resize your Windows partition. Be careful: this\n"
-"operation is dangerous. If you have not already done so, you\n"
-"first need to exit the installation, run \"chkdsk c:\" from a\n"
-"Command Prompt under Windows (beware, running graphical program\n"
-"\"scandisk\" is not enough, be sure to use \"chkdsk\" in a\n"
-"Command Prompt!), optionally run defrag, then restart the\n"
-"installation. You should also backup your data.\n"
-"When sure, press Ok."
+"\n"
+"Your Microsoft Windows® partition will be now resized.\n"
+"\n"
+"\n"
+"Be careful: this operation is dangerous. If you have not already done so, "
+"you first need to exit the installation, run \"chkdsk c:\" from a Command "
+"Prompt under Microsoft Windows® (beware, running graphical program \"scandisk"
+"\" is not enough, be sure to use \"chkdsk\" in a Command Prompt!), "
+"optionally run defrag, then restart the installation. You should also backup "
+"your data.\n"
+"\n"
+"\n"
+"When sure, press %s."
 msgstr ""
 "ÅTVARING!\n"
 "\n"
+"\n"
 "Du er no i ferd med å endra storleiken på Windows-partisjonen.\n"
-"Dette er ein farleg operasjon. Om du ikkje allereie har gjort det, bør\n"
-"du avslutta installasjonen, køyra «chkdsk c:» frå kommandolinja i\n"
-"Windows (det grafiske programmet «scandisk» er ikkje nok), etterfølgt\n"
-"av defragmentering, og starta installasjonen på nytt. Du bør òg ta\n"
-"ein reservekopi av alle data.\n"
 "\n"
-"Trykk «OK» når du er klar."
+"\n"
+"Dette er ein farleg operasjon. Om du ikkje allereie har gjort det, bør du "
+"avslutta installasjonen, køyra «chkdsk c:» frå kommandolinja i Windows (det "
+"grafiske programmet «scandisk» er ikkje nok), etterfølgt av defragmentering, "
+"og starta installasjonen på nytt. Du bør òg ta ein reservekopi av alle "
+"data.\n"
+"\n"
+"\n"
+"Trykk «%s» når du er klar."
 
 #: install_interactive.pm:178
 #, c-format
-msgid "Which size do you want to keep for Windows on"
-msgstr "Kva storleik vil du behalda for Windows på"
+msgid "Which size do you want to keep for Microsoft Windows® on"
+msgstr "Kva storleik vil du behalda for Microsoft Windows® på"
 
 #: install_interactive.pm:179
 #, c-format
@@ -6054,8 +6064,8 @@ msgstr "partisjon %s"
 
 #: install_interactive.pm:188
 #, c-format
-msgid "Resizing Windows partition"
-msgstr "Endrar storleik på Windows-partisjon"
+msgid "Resizing Microsoft Windows® partition"
+msgstr "Endrar storleik på Microsoft Windows®-partisjon"
 
 #: install_interactive.pm:193
 #, c-format
@@ -6071,7 +6081,7 @@ msgstr ""
 
 #: install_interactive.pm:213
 #, c-format
-msgid "Remove Windows(TM)"
+msgid "Remove Microsoft Windows®"
 msgstr "Fjern Windows™"
 
 #: install_interactive.pm:213
@@ -6309,7 +6319,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Congratulations, installation is complete.\n"
-"Remove the boot media and press return to reboot.\n"
+"Remove the boot media and press Enter to reboot.\n"
 "\n"
 "\n"
 "For information on fixes which are available for this release of Mandriva "
@@ -16060,7 +16070,7 @@ msgstr "Korleis verta med i Mandriva Linux-samfunnet?"
 
 #: share/advertising/26.pl:3
 #, c-format
-msgid "How to maintain your system up-to-date?"
+msgid "How to keep your system up-to-date?"
 msgstr "Korleis halda systemet oppdatert?"
 
 #: share/advertising/intel.pl:3