* @license GNU General Public License, version 2 (GPL-2.0) * * For full copyright and license information, please see * the docs/CREDITS.txt file. * */ namespace phpbb\textreparser; abstract class row_based_plugin extends base { /** * @var \phpbb\db\driver\driver_interface */ protected $db; /** * @var string */ protected $table; /** * Constructor * * @param \phpbb\db\driver\driver_interface $db Database connection * @param string $table */ public function __construct(\phpbb\db\driver\driver_interface $db, $table) { $this->db = $db; $this->table = $table; } /** * Return the name of the column that correspond to each field * * @return array */ abstract public function get_columns(); /** * {@inheritdoc} */ public function get_max_id() { $columns = $this->get_columns(); $sql = 'SELECT MAX(' . $columns['id'] . ') AS max_id FROM ' . $this->table; $result = $this->db->sql_query($sql); $max_id = (int) $this->db->sql_fetchfield('max_id'); $this->db->sql_freeresult($result); return $max_id; } /** * {@inheritdoc} */ protected function get_records_by_range($min_id, $max_id) { $sql = $this->get_records_by_range_query($min_id, $max_id); $result = $this->db->sql_query($sql); $records = $this->db->sql_fetchrowset($result); $this->db->sql_freeresult($result); return $records; } /** * Generate the query that retrieves all records for given range * * @param integer $min_id Lower bound * @param integer $max_id Upper bound * @return string SQL query */ protected function get_records_by_range_query($min_id, $max_id) { $columns = $this->get_columns(); $fields = array(); foreach ($columns as $field_name => $column_name) { if ($column_name === $field_name) { $fields[] = $column_name; } else { $fields[] = $column_name . ' AS ' . $field_name; } } $sql = 'SELECT ' . implode(', ', $fields) . ' FROM ' . $this->table . ' WHERE ' . $columns['id'] . ' BETWEEN ' . $min_id . ' AND ' . $max_id; return $sql; } /** * {@inheritdoc} */ protected function save_record(array $record) { $columns = $this->get_columns(); $sql = 'UPDATE ' . $this->table . ' SET ' . $columns['text'] . " = '" . $this->db->sql_escape($record['text']) . "' WHERE " . $columns['id'] . ' = ' . $record['id']; $this->db->sql_query($sql); } } ranch Mageia Installer and base platform for many utilitiesThierry Vignaud [tv]
summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPablo Saratxaga <pablo@mandriva.com>2005-12-15 11:53:31 +0000
committerPablo Saratxaga <pablo@mandriva.com>2005-12-15 11:53:31 +0000
commitf10c7ca0c9ad20da6600ddbea7d73801a2bc150e (patch)
tree891bbbcbddfc0b9866a7ae7878f34cb1f715b25a /perl-install
parent3823802f049a9845e125d306cc39819bbe3ff0c1 (diff)
downloaddrakx-f10c7ca0c9ad20da6600ddbea7d73801a2bc150e.tar
drakx-f10c7ca0c9ad20da6600ddbea7d73801a2bc150e.tar.gz
drakx-f10c7ca0c9ad20da6600ddbea7d73801a2bc150e.tar.bz2
drakx-f10c7ca0c9ad20da6600ddbea7d73801a2bc150e.tar.xz
drakx-f10c7ca0c9ad20da6600ddbea7d73801a2bc150e.zip
updated pot file
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/share/po/DrakX.pot628
-rw-r--r--perl-install/share/po/af.po78
-rw-r--r--perl-install/share/po/am.po49
-rw-r--r--perl-install/share/po/ar.po65
-rw-r--r--perl-install/share/po/az.po77
-rw-r--r--perl-install/share/po/be.po56
-rw-r--r--perl-install/share/po/bg.po72
-rw-r--r--perl-install/share/po/bn.po63
-rw-r--r--perl-install/share/po/br.po71
-rw-r--r--perl-install/share/po/bs.po81
-rw-r--r--perl-install/share/po/ca.po84
-rw-r--r--perl-install/share/po/cs.po83
-rw-r--r--perl-install/share/po/cy.po79
-rw-r--r--perl-install/share/po/da.po77
-rw-r--r--perl-install/share/po/de.po78
-rw-r--r--perl-install/share/po/el.po76
-rw-r--r--perl-install/share/po/eo.po63
-rw-r--r--perl-install/share/po/es.po84
-rw-r--r--perl-install/share/po/et.po78
-rw-r--r--perl-install/share/po/eu.po80
-rw-r--r--perl-install/share/po/fa.po68
-rw-r--r--perl-install/share/po/fi.po83
-rw-r--r--perl-install/share/po/fr.po76
-rw-r--r--perl-install/share/po/fur.po47
-rw-r--r--perl-install/share/po/ga.po47
-rw-r--r--perl-install/share/po/gl.po82
-rw-r--r--perl-install/share/po/he.po60
-rw-r--r--perl-install/share/po/hi.po64
-rw-r--r--perl-install/share/po/hr.po73
-rw-r--r--perl-install/share/po/hu.po78
-rw-r--r--perl-install/share/po/id.po80
-rw-r--r--perl-install/share/po/is.po81
-rw-r--r--perl-install/share/po/it.po82
-rw-r--r--perl-install/share/po/ja.po74
-rw-r--r--perl-install/share/po/ko.po62
-rw-r--r--perl-install/share/po/ky.po45
-rw-r--r--perl-install/share/po/lt.po76
-rw-r--r--perl-install/share/po/ltg.po77
-rw-r--r--perl-install/share/po/lv.po75
-rw-r--r--perl-install/share/po/mk.po80
-rw-r--r--perl-install/share/po/mn.po45
-rw-r--r--perl-install/share/po/ms.po45
-rw-r--r--perl-install/share/po/mt.po77
-rw-r--r--perl-install/share/po/nb.po79
-rw-r--r--perl-install/share/po/nl.po85
-rw-r--r--perl-install/share/po/nn.po74
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