[d-i-commits] r32164 - trunk/packages/po

Wed Nov 16 01:47:16 UTC 2005

Author: bubulle
Date: 2005-11-16 01:45:44 +0000 (Wed, 16 Nov 2005)
New Revision: 32164

Modified:
   trunk/packages/po/ar.po
   trunk/packages/po/be.po
   trunk/packages/po/bg.po
   trunk/packages/po/bn.po
   trunk/packages/po/bs.po
   trunk/packages/po/ca.po
   trunk/packages/po/cs.po
   trunk/packages/po/cy.po
   trunk/packages/po/da.po
   trunk/packages/po/de.po
   trunk/packages/po/el.po
   trunk/packages/po/eo.po
   trunk/packages/po/es.po
   trunk/packages/po/et.po
   trunk/packages/po/eu.po
   trunk/packages/po/fa.po
   trunk/packages/po/fi.po
   trunk/packages/po/fr.po
   trunk/packages/po/ga.po
   trunk/packages/po/gl.po
   trunk/packages/po/he.po
   trunk/packages/po/hi.po
   trunk/packages/po/hr.po
   trunk/packages/po/hu.po
   trunk/packages/po/id.po
   trunk/packages/po/is.po
   trunk/packages/po/it.po
   trunk/packages/po/ja.po
   trunk/packages/po/ko.po
   trunk/packages/po/ku.po
   trunk/packages/po/lt.po
   trunk/packages/po/lv.po
   trunk/packages/po/mg.po
   trunk/packages/po/mk.po
   trunk/packages/po/nb.po
   trunk/packages/po/nl.po
   trunk/packages/po/nn.po
   trunk/packages/po/pa_IN.po
   trunk/packages/po/pl.po
   trunk/packages/po/pt.po
   trunk/packages/po/pt_BR.po
   trunk/packages/po/ro.po
   trunk/packages/po/ru.po
   trunk/packages/po/se.po
   trunk/packages/po/sk.po
   trunk/packages/po/sl.po
   trunk/packages/po/sq.po
   trunk/packages/po/sr.po
   trunk/packages/po/sv.po
   trunk/packages/po/template.pot
   trunk/packages/po/tl.po
   trunk/packages/po/tr.po
   trunk/packages/po/uk.po
   trunk/packages/po/vi.po
   trunk/packages/po/wo.po
   trunk/packages/po/xh.po
   trunk/packages/po/zh_CN.po
   trunk/packages/po/zh_TW.po
Log:
[l10n] [l10n-sync] Updated packages/po/* with general template.pot

Modified: trunk/packages/po/ar.po
===================================================================

--- trunk/packages/po/ar.po	2005-11-16 01:40:18 UTC (rev 32163)
+++ trunk/packages/po/ar.po	2005-11-16 01:45:44 UTC (rev 32164)
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: debian-installer_packages_po\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-15 08:03+0000\n"
+"POT-Creation-Date: 2005-11-16 01:33+0000\n"
 "PO-Revision-Date: 2005-10-13 16:59+0300\n"
 "Last-Translator: Ossama M. Khayat <okhayat at yahoo.com>\n"
 "Language-Team: Arabic <support at arabeyes.org>\n"
@@ -1911,32 +1911,34 @@
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#. These are choices of actions so this is, at least in English,
+#. an infinitive form
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 msgid "Retry"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 #, fuzzy
 msgid "Change mirror"
 msgstr "Ø¥Ø¹Ø§Ø¯Ø© Ø§Ù„Ù…ØØ§ÙˆÙ„Ø©, ØªØºÙŠÙŠØ± Ø§Ù„Ù…Ø±Ø¢Ø©, Ø¥Ù„ØºØ§Ø¡"
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../mdcfg-utils.templates:122
+#: ../net-retriever.templates:5 ../mdcfg-utils.templates:122
 msgid "Cancel"
 msgstr "Ø¥Ù„ØºØ§Ø¡"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:31
+#: ../net-retriever.templates:7 ../apt-mirror-setup.templates:33
 msgid "Downloading a file failed:"
 msgstr "ÙØ´Ù„ ØªØÙ…ÙŠÙ„ Ù…Ù„Ù:"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5
+#: ../net-retriever.templates:7
 msgid ""
 "The installer failed to download a file from the mirror. This may be a "
 "problem with your network, or with the mirror. You can choose to retry the "
@@ -2633,15 +2635,16 @@
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:101
-msgid "Desktop machine"
-msgstr "Ø¬Ù‡Ø§Ø² Ù„Ø³Ø·Ø Ø§Ù„Ù…ÙƒØªØ¨"
+#, fuzzy
+msgid "Separate /home partition"
+msgstr "ØªÙ†Ø³ÙŠÙ‚ Ø§Ù„Ø¬Ø²Ø¡"
 
 #. Type: text
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:106
-msgid "Multi-user workstation"
-msgstr "Ù…ØØ·Ù‘Ø© Ø¹Ù…Ù„ Ø¨Ø¹Ø¯Ù‘Ø© Ù…Ø³ØªØ®Ø¯Ù…ÙŠÙ†"
+msgid "Separate /home, /usr, /var, and /tmp partitions"
+msgstr ""
 
 #. Type: boolean
 #. Description
@@ -5305,14 +5308,14 @@
 
 #. Type: select
 #. Choices
-#: ../apt-mirror-setup.templates:30
+#: ../apt-mirror-setup.templates:32
 #, fuzzy
 msgid "Ignore"
 msgstr "Ø¨Ø¯ÙˆÙ†"
 
 #. Type: select
 #. Description
-#: ../apt-mirror-setup.templates:31
+#: ../apt-mirror-setup.templates:33
 #, fuzzy
 msgid ""
 "The installer failed to access the mirror. This may be a problem with your "
@@ -10935,6 +10938,12 @@
 msgid "Configure the base system before rebooting"
 msgstr "ØªÙ‡ÙŠØ¦Ø© Ø§Ù„Ù†Ø¸Ø§Ù… Ø§Ù„Ø£Ø³Ø§Ø³ÙŠ Ù‚Ø¨Ù„ Ø¥Ø¹Ø§Ø¯Ø© Ø§Ù„Ø¥Ù‚Ù„Ø§Ø¹"
 
+#~ msgid "Desktop machine"
+#~ msgstr "Ø¬Ù‡Ø§Ø² Ù„Ø³Ø·Ø Ø§Ù„Ù…ÙƒØªØ¨"
+
+#~ msgid "Multi-user workstation"
+#~ msgstr "Ù…ØØ·Ù‘Ø© Ø¹Ù…Ù„ Ø¨Ø¹Ø¯Ù‘Ø© Ù…Ø³ØªØ®Ø¯Ù…ÙŠÙ†"
+
 #, fuzzy
 #~ msgid "Retry, Change mirror, Ignore"
 #~ msgstr "Ø¥Ø¹Ø§Ø¯Ø© Ø§Ù„Ù…ØØ§ÙˆÙ„Ø©, ØªØºÙŠÙŠØ± Ø§Ù„Ù…Ø±Ø¢Ø©, Ø¥Ù„ØºØ§Ø¡"

Modified: trunk/packages/po/be.po
===================================================================
--- trunk/packages/po/be.po	2005-11-16 01:40:18 UTC (rev 32163)
+++ trunk/packages/po/be.po	2005-11-16 01:45:44 UTC (rev 32164)
@@ -12,7 +12,7 @@
 msgstr ""
 "Project-Id-Version: be\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-15 08:03+0000\n"
+"POT-Creation-Date: 2005-11-16 01:33+0000\n"
 "PO-Revision-Date: 2005-04-09 14:08+0300\n"
 "Last-Translator: Andrei Darashenka <adorosh2 at it.org.by>\n"
 "Language-Team: Byelarusian <be at li.org>\n"
@@ -1802,32 +1802,34 @@
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#. These are choices of actions so this is, at least in English,
+#. an infinitive form
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 msgid "Retry"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 #, fuzzy
 msgid "Change mirror"
 msgstr "Ð—Ð½Ð¾Ñž, Ð—Ð¼ÑÐ½Ñ–Ñ†ÑŒ Ð»ÑŽÑÑ‚ÑÑ€ÐºÑƒ, ÐÐ´Ð¼ÑÐ½Ñ–Ñ†ÑŒ"
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../mdcfg-utils.templates:122
+#: ../net-retriever.templates:5 ../mdcfg-utils.templates:122
 msgid "Cancel"
 msgstr "ÐÐ´Ð¼ÑÐ½Ñ–Ñ†ÑŒ"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:31
+#: ../net-retriever.templates:7 ../apt-mirror-setup.templates:33
 msgid "Downloading a file failed:"
 msgstr "ÐÐµ Ð°Ñ‚Ñ€Ñ‹Ð¼Ð°Ð»Ð°ÑÑ Ð·Ð°Ð³Ñ€ÑƒÐ·Ñ–Ñ†ÑŒ Ñ„Ð°Ð¹Ð»:"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5
+#: ../net-retriever.templates:7
 msgid ""
 "The installer failed to download a file from the mirror. This may be a "
 "problem with your network, or with the mirror. You can choose to retry the "
@@ -2483,14 +2485,15 @@
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:101
-msgid "Desktop machine"
-msgstr ""
+#, fuzzy
+msgid "Separate /home partition"
+msgstr "Ð’Ñ‹Ð´Ð°Ð»Ñ–Ñ†ÑŒ"
 
 #. Type: text
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:106
-msgid "Multi-user workstation"
+msgid "Separate /home, /usr, /var, and /tmp partitions"
 msgstr ""
 
 #. Type: boolean
@@ -5107,14 +5110,14 @@
 
 #. Type: select
 #. Choices
-#: ../apt-mirror-setup.templates:30
+#: ../apt-mirror-setup.templates:32
 #, fuzzy
 msgid "Ignore"
 msgstr "Ð°Ð´ÑÑƒÑ‚Ð½Ñ–Ñ‡Ð°Ðµ"
 
 #. Type: select
 #. Description
-#: ../apt-mirror-setup.templates:31
+#: ../apt-mirror-setup.templates:33
 msgid ""
 "The installer failed to access the mirror. This may be a problem with your "
 "network, or with the mirror. You can choose to retry the download, select a "

Modified: trunk/packages/po/bg.po
===================================================================
--- trunk/packages/po/bg.po	2005-11-16 01:40:18 UTC (rev 32163)
+++ trunk/packages/po/bg.po	2005-11-16 01:45:44 UTC (rev 32164)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-15 08:03+0000\n"
+"POT-Creation-Date: 2005-11-16 01:33+0000\n"
 "PO-Revision-Date: 2005-11-02 15:01+0200\n"
 "Last-Translator:  Ognyan Kulev <ogi at fmi.uni-sofia.bg>\n"
 "Language-Team: Bulgarian <dict at fsa-bg.org>\n"
@@ -1976,32 +1976,34 @@
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#. These are choices of actions so this is, at least in English,
+#. an infinitive form
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 msgid "Retry"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 #, fuzzy
 msgid "Change mirror"
 msgstr "ÐžÐ¿Ð¸Ñ‚ Ð¾Ñ‚Ð½Ð¾Ð²Ð¾, Ð¡Ð¼ÑÐ½Ð° Ð½Ð° Ð¾Ð³Ð»ÐµÐ´Ð°Ð»ÐµÐ½ ÑÑŠÑ€Ð²ÑŠÑ€, ÐŸÑ€ÐµÐºÑŠÑÐ²Ð°Ð½Ðµ"
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../mdcfg-utils.templates:122
+#: ../net-retriever.templates:5 ../mdcfg-utils.templates:122
 msgid "Cancel"
 msgstr "ÐŸÑ€ÐµÐºÑŠÑÐ²Ð°Ð½Ðµ"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:31
+#: ../net-retriever.templates:7 ../apt-mirror-setup.templates:33
 msgid "Downloading a file failed:"
 msgstr "Ð“Ñ€ÐµÑˆÐºÐ° Ð¿Ñ€Ð¸ Ð¸Ð·Ñ‚ÐµÐ³Ð»ÑÐ½ÐµÑ‚Ð¾ Ð½Ð° Ñ„Ð°Ð¹Ð»:"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5
+#: ../net-retriever.templates:7
 msgid ""
 "The installer failed to download a file from the mirror. This may be a "
 "problem with your network, or with the mirror. You can choose to retry the "
@@ -2719,15 +2721,16 @@
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:101
-msgid "Desktop machine"
-msgstr "ÐœÐ°ÑˆÐ¸Ð½Ð° Ð·Ð° Ñ€Ð°Ð±Ð¾Ñ‚ÐµÐ½ Ð¿Ð»Ð¾Ñ‚"
+#, fuzzy
+msgid "Separate /home partition"
+msgstr "Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚Ð¸Ñ€Ð°Ð½Ðµ Ð½Ð° Ð´ÑÐ»Ð°"
 
 #. Type: text
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:106
-msgid "Multi-user workstation"
-msgstr "ÐœÐ½Ð¾Ð³Ð¾Ð¿Ð¾Ñ‚Ñ€ÐµÐ±Ð¸Ñ‚ÐµÐ»ÑÐºÐ° Ñ€Ð°Ð±Ð¾Ñ‚Ð½Ð° ÑÑ‚Ð°Ð½Ñ†Ð¸Ñ"
+msgid "Separate /home, /usr, /var, and /tmp partitions"
+msgstr ""
 
 #. Type: boolean
 #. Description
@@ -5463,14 +5466,14 @@
 
 #. Type: select
 #. Choices
-#: ../apt-mirror-setup.templates:30
+#: ../apt-mirror-setup.templates:32
 #, fuzzy
 msgid "Ignore"
 msgstr "Ð½ÑÐ¼Ð°"
 
 #. Type: select
 #. Description
-#: ../apt-mirror-setup.templates:31
+#: ../apt-mirror-setup.templates:33
 #, fuzzy
 msgid ""
 "The installer failed to access the mirror. This may be a problem with your "
@@ -11302,6 +11305,12 @@
 msgid "Configure the base system before rebooting"
 msgstr "ÐšÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð¸Ñ€Ð°Ð½Ðµ Ð½Ð° Ð¾ÑÐ½Ð¾Ð²Ð½Ð°Ñ‚Ð° ÑÐ¸ÑÑ‚ÐµÐ¼Ð° Ð¿Ñ€ÐµÐ´Ð¸ Ñ€ÐµÑÑ‚Ð°Ñ€Ñ‚Ð¸Ñ€Ð°Ð½ÐµÑ‚Ð¾"
 
+#~ msgid "Desktop machine"
+#~ msgstr "ÐœÐ°ÑˆÐ¸Ð½Ð° Ð·Ð° Ñ€Ð°Ð±Ð¾Ñ‚ÐµÐ½ Ð¿Ð»Ð¾Ñ‚"
+
+#~ msgid "Multi-user workstation"
+#~ msgstr "ÐœÐ½Ð¾Ð³Ð¾Ð¿Ð¾Ñ‚Ñ€ÐµÐ±Ð¸Ñ‚ÐµÐ»ÑÐºÐ° Ñ€Ð°Ð±Ð¾Ñ‚Ð½Ð° ÑÑ‚Ð°Ð½Ñ†Ð¸Ñ"
+
 #, fuzzy
 #~ msgid "Retry, Change mirror, Ignore"
 #~ msgstr "ÐžÐ¿Ð¸Ñ‚ Ð¾Ñ‚Ð½Ð¾Ð²Ð¾, Ð¡Ð¼ÑÐ½Ð° Ð½Ð° Ð¾Ð³Ð»ÐµÐ´Ð°Ð»ÐµÐ½ ÑÑŠÑ€Ð²ÑŠÑ€, ÐŸÑ€ÐµÐºÑŠÑÐ²Ð°Ð½Ðµ"

Modified: trunk/packages/po/bn.po
===================================================================
--- trunk/packages/po/bn.po	2005-11-16 01:40:18 UTC (rev 32163)
+++ trunk/packages/po/bn.po	2005-11-16 01:45:44 UTC (rev 32164)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-15 08:03+0000\n"
+"POT-Creation-Date: 2005-11-16 01:33+0000\n"
 "PO-Revision-Date: 2005-10-28 13:29+0530\n"
 "Last-Translator: Baishampayan Ghose <b.ghose at gnu.org.in>\n"
 "Language-Team: Bangla <core at BengaLinux.Org>\n"
@@ -1966,32 +1966,34 @@
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#. These are choices of actions so this is, at least in English,
+#. an infinitive form
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 msgid "Retry"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 #, fuzzy
 msgid "Change mirror"
 msgstr "à¦ªà§à¦¨à¦ƒà¦ªà§à¦°à¦šà§‡à¦·à§à¦Ÿà¦¾ à¦šà¦¾à¦²à¦¾à¦¨, à¦®à¦¿à¦°à¦° à¦ªà¦°à¦¿à¦¬à¦°à§à¦¤à¦¨ à¦•à¦°à§à¦¨, à¦¬à¦¾à¦¤à¦¿à¦² à¦•à¦°à§à¦¨"
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../mdcfg-utils.templates:122
+#: ../net-retriever.templates:5 ../mdcfg-utils.templates:122
 msgid "Cancel"
 msgstr "à¦¬à¦¾à¦¤à¦¿à¦² à¦•à¦°à§à¦¨"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:31
+#: ../net-retriever.templates:7 ../apt-mirror-setup.templates:33
 msgid "Downloading a file failed:"
 msgstr "à¦«à¦¾à¦‡à¦² à¦¡à¦¾à¦‰à¦¨à¦²à§‹à¦¡ à¦¬à§à¦¯à¦°à§à¦¥ à¦¹à§Ÿà§‡à¦›à§‡:"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5
+#: ../net-retriever.templates:7
 msgid ""
 "The installer failed to download a file from the mirror. This may be a "
 "problem with your network, or with the mirror. You can choose to retry the "
@@ -2702,15 +2704,16 @@
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:101
-msgid "Desktop machine"
-msgstr "à¦¡à§‡à¦¸à§à¦•à¦Ÿà¦ª à¦®à§‡à¦¶à¦¿à¦¨"
+#, fuzzy
+msgid "Separate /home partition"
+msgstr "à¦ªà¦¾à¦°à§à¦Ÿà¦¿à¦¶à¦¨à¦Ÿà¦¿ à¦«à¦°à¦®à§à¦¯à¦¾à¦Ÿ à¦•à¦°à§‹"
 
 #. Type: text
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:106
-msgid "Multi-user workstation"
-msgstr "à¦®à¦¾à¦²à§à¦Ÿà¦¿-à¦‡à¦‰à¦œà¦¾à¦° à¦“à§Ÿà¦¾à¦°à§à¦•à¦¸à§à¦Ÿà§‡à¦¶à¦¨"
+msgid "Separate /home, /usr, /var, and /tmp partitions"
+msgstr ""
 
 #. Type: boolean
 #. Description
@@ -5451,14 +5454,14 @@
 
 #. Type: select
 #. Choices
-#: ../apt-mirror-setup.templates:30
+#: ../apt-mirror-setup.templates:32
 #, fuzzy
 msgid "Ignore"
 msgstr "à¦à¦•à¦Ÿà¦¿à¦“ à¦¨à§Ÿ"
 
 #. Type: select
 #. Description
-#: ../apt-mirror-setup.templates:31
+#: ../apt-mirror-setup.templates:33
 #, fuzzy
 msgid ""
 "The installer failed to access the mirror. This may be a problem with your "
@@ -11234,6 +11237,12 @@
 msgid "Configure the base system before rebooting"
 msgstr "à¦°à¦¿à¦¬à§à¦Ÿ à¦•à¦°à¦¾à¦° à¦ªà§‚à¦°à§à¦¬à§‡ à¦®à§‚à¦² à¦¸à¦¿à¦¸à§à¦Ÿà§‡à¦®à¦•à§‡ à¦•à¦¨à¦«à¦¿à¦—à¦¾à¦° à¦•à¦°à§à¦¨"
 
+#~ msgid "Desktop machine"
+#~ msgstr "à¦¡à§‡à¦¸à§à¦•à¦Ÿà¦ª à¦®à§‡à¦¶à¦¿à¦¨"
+
+#~ msgid "Multi-user workstation"
+#~ msgstr "à¦®à¦¾à¦²à§à¦Ÿà¦¿-à¦‡à¦‰à¦œà¦¾à¦° à¦“à§Ÿà¦¾à¦°à§à¦•à¦¸à§à¦Ÿà§‡à¦¶à¦¨"
+
 #, fuzzy
 #~ msgid "Retry, Change mirror, Ignore"
 #~ msgstr "à¦ªà§à¦¨à¦ƒà¦ªà§à¦°à¦šà§‡à¦·à§à¦Ÿà¦¾ à¦šà¦¾à¦²à¦¾à¦¨, à¦®à¦¿à¦°à¦° à¦ªà¦°à¦¿à¦¬à¦°à§à¦¤à¦¨ à¦•à¦°à§à¦¨, à¦¬à¦¾à¦¤à¦¿à¦² à¦•à¦°à§à¦¨"

Modified: trunk/packages/po/bs.po
===================================================================
--- trunk/packages/po/bs.po	2005-11-16 01:40:18 UTC (rev 32163)
+++ trunk/packages/po/bs.po	2005-11-16 01:45:44 UTC (rev 32164)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-15 08:03+0000\n"
+"POT-Creation-Date: 2005-11-16 01:33+0000\n"
 "PO-Revision-Date: 2005-03-28 21:47CET\n"
 "Last-Translator: Safir Å eÄ‡eroviÄ‡ <sapphire at linux.org.ba>\n"
 "Language-Team: Bosnian <lokal at linux.org.ba>\n"
@@ -1956,32 +1956,34 @@
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#. These are choices of actions so this is, at least in English,
+#. an infinitive form
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 msgid "Retry"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 #, fuzzy
 msgid "Change mirror"
 msgstr "Ponovi, Promijeni mirror, Obustavi"
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../mdcfg-utils.templates:122
+#: ../net-retriever.templates:5 ../mdcfg-utils.templates:122
 msgid "Cancel"
 msgstr "PoniÅ¡ti"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:31
+#: ../net-retriever.templates:7 ../apt-mirror-setup.templates:33
 msgid "Downloading a file failed:"
 msgstr "Preuzimanje datoteke nije uspjelo:"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5
+#: ../net-retriever.templates:7
 msgid ""
 "The installer failed to download a file from the mirror. This may be a "
 "problem with your network, or with the mirror. You can choose to retry the "
@@ -2697,15 +2699,16 @@
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:101
-msgid "Desktop machine"
-msgstr "Desktop maÅ¡ina"
+#, fuzzy
+msgid "Separate /home partition"
+msgstr "formatiraj particiju"
 
 #. Type: text
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:106
-msgid "Multi-user workstation"
-msgstr "ViÅ¡ekorisniÄka radna stanica"
+msgid "Separate /home, /usr, /var, and /tmp partitions"
+msgstr ""
 
 #. Type: boolean
 #. Description
@@ -5484,14 +5487,14 @@
 
 #. Type: select
 #. Choices
-#: ../apt-mirror-setup.templates:30
+#: ../apt-mirror-setup.templates:32
 #, fuzzy
 msgid "Ignore"
 msgstr "nijedno"
 
 #. Type: select
 #. Description
-#: ../apt-mirror-setup.templates:31
+#: ../apt-mirror-setup.templates:33
 #, fuzzy
 msgid ""
 "The installer failed to access the mirror. This may be a problem with your "
@@ -11270,6 +11273,12 @@
 msgid "Configure the base system before rebooting"
 msgstr "Podesi osnovni sistem prije ponovnog podizanja"
 
+#~ msgid "Desktop machine"
+#~ msgstr "Desktop maÅ¡ina"
+
+#~ msgid "Multi-user workstation"
+#~ msgstr "ViÅ¡ekorisniÄka radna stanica"
+
 #, fuzzy
 #~ msgid "Retry, Change mirror, Ignore"
 #~ msgstr "Ponovi, Promijeni mirror, Obustavi"

Modified: trunk/packages/po/ca.po
===================================================================
--- trunk/packages/po/ca.po	2005-11-16 01:40:18 UTC (rev 32163)
+++ trunk/packages/po/ca.po	2005-11-16 01:45:44 UTC (rev 32164)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: debian-installer 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-15 08:03+0000\n"
+"POT-Creation-Date: 2005-11-16 01:33+0000\n"
 "PO-Revision-Date: 2005-09-24 18:38+0300\n"
 "Last-Translator: Guillem Jover <guillem at debian.org>\n"
 "Language-Team: Catalan <debian-l10n-catalan at lists.debian.org>\n"
@@ -1980,32 +1980,34 @@
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#. These are choices of actions so this is, at least in English,
+#. an infinitive form
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 msgid "Retry"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 #, fuzzy
 msgid "Change mirror"
 msgstr "Reintenta, Canvia de rÃ¨plica, CancelÂ·la"
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../mdcfg-utils.templates:122
+#: ../net-retriever.templates:5 ../mdcfg-utils.templates:122
 msgid "Cancel"
 msgstr "CancelÂ·la"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:31
+#: ../net-retriever.templates:7 ../apt-mirror-setup.templates:33
 msgid "Downloading a file failed:"
 msgstr "La descÃ rrega d'un fitxer ha fallat:"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5
+#: ../net-retriever.templates:7
 msgid ""
 "The installer failed to download a file from the mirror. This may be a "
 "problem with your network, or with the mirror. You can choose to retry the "
@@ -2725,15 +2727,16 @@
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:101
-msgid "Desktop machine"
-msgstr "Ordinador d'escriptori"
+#, fuzzy
+msgid "Separate /home partition"
+msgstr "formata la particiÃ³"
 
 #. Type: text
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:106
-msgid "Multi-user workstation"
-msgstr "EstaciÃ³ de treball multiusuari"
+msgid "Separate /home, /usr, /var, and /tmp partitions"
+msgstr ""
 
 #. Type: boolean
 #. Description
@@ -5478,14 +5481,14 @@
 
 #. Type: select
 #. Choices
-#: ../apt-mirror-setup.templates:30
+#: ../apt-mirror-setup.templates:32
 #, fuzzy
 msgid "Ignore"
 msgstr "cap"
 
 #. Type: select
 #. Description
-#: ../apt-mirror-setup.templates:31
+#: ../apt-mirror-setup.templates:33
 #, fuzzy
 msgid ""
 "The installer failed to access the mirror. This may be a problem with your "
@@ -11270,6 +11273,12 @@
 msgid "Configure the base system before rebooting"
 msgstr "Configura el sistema base abans de rearrencar"
 
+#~ msgid "Desktop machine"
+#~ msgstr "Ordinador d'escriptori"
+
+#~ msgid "Multi-user workstation"
+#~ msgstr "EstaciÃ³ de treball multiusuari"
+
 #, fuzzy
 #~ msgid "Retry, Change mirror, Ignore"
 #~ msgstr "Reintenta, Canvia de rÃ¨plica, CancelÂ·la"

Modified: trunk/packages/po/cs.po
===================================================================
--- trunk/packages/po/cs.po	2005-11-16 01:40:18 UTC (rev 32163)
+++ trunk/packages/po/cs.po	2005-11-16 01:45:44 UTC (rev 32164)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-15 08:03+0000\n"
+"POT-Creation-Date: 2005-11-16 01:33+0000\n"
 "PO-Revision-Date: 2005-11-15 11:46+0100\n"
 "Last-Translator:  Miroslav Kure <kurem at debian.cz>\n"
 "Language-Team:  Czech <provoz at debian.cz>\n"
@@ -1937,31 +1937,33 @@
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#. These are choices of actions so this is, at least in English,
+#. an infinitive form
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 msgid "Retry"
 msgstr "Opakovat"
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 msgid "Change mirror"
 msgstr "ZmÄ›nit zrcadlo"
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../mdcfg-utils.templates:122
+#: ../net-retriever.templates:5 ../mdcfg-utils.templates:122
 msgid "Cancel"
 msgstr "ZruÅ¡it"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:31
+#: ../net-retriever.templates:7 ../apt-mirror-setup.templates:33
 msgid "Downloading a file failed:"
 msgstr "StaÅ¾enÃ souboru selhalo:"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5
+#: ../net-retriever.templates:7
 msgid ""
 "The installer failed to download a file from the mirror. This may be a "
 "problem with your network, or with the mirror. You can choose to retry the "
@@ -2670,15 +2672,16 @@
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:101
-msgid "Desktop machine"
-msgstr "DesktopovÃ½ poÄÃtaÄ"
+#, fuzzy
+msgid "Separate /home partition"
+msgstr "formÃ¡tovat oblast"
 
 #. Type: text
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:106
-msgid "Multi-user workstation"
-msgstr "VÃceuÅ¾ivatelskÃ¡ pracovnÃ stanice"
+msgid "Separate /home, /usr, /var, and /tmp partitions"
+msgstr ""
 
 #. Type: boolean
 #. Description
@@ -5339,8 +5342,7 @@
 msgid ""
 "An attempt to configure apt to install additional packages from the CD "
 "failed."
-msgstr ""
-"Pokus o nastavenÃ aptu, aby instaloval dalÅ¡Ã balÃÄky z CD, selhal."
+msgstr "Pokus o nastavenÃ aptu, aby instaloval dalÅ¡Ã balÃÄky z CD, selhal."
 
 #. Type: text
 #. Description
@@ -5403,13 +5405,13 @@
 
 #. Type: select
 #. Choices
-#: ../apt-mirror-setup.templates:30
+#: ../apt-mirror-setup.templates:32
 msgid "Ignore"
 msgstr "Ignorovat"
 
 #. Type: select
 #. Description
-#: ../apt-mirror-setup.templates:31
+#: ../apt-mirror-setup.templates:33
 msgid ""
 "The installer failed to access the mirror. This may be a problem with your "
 "network, or with the mirror. You can choose to retry the download, select a "
@@ -5476,8 +5478,8 @@
 "testing as that contained in the release, it includes newer versions of some "
 "applications which may provide useful features."
 msgstr ""
-"NÄ›kterÃ½ software byl pÅ™enesen z vÃ½vojovÃ© vÄ›tve a upraven tak, aby pracoval "
-"v tÃ©to verzi distribuce. PÅ™estoÅ¾e tento software neproÅ¡el stejnÄ› dÅ¯kladnÃ½m "
+"NÄ›kterÃ½ software byl pÅ™enesen z vÃ½vojovÃ© vÄ›tve a upraven tak, aby pracoval v "
+"tÃ©to verzi distribuce. PÅ™estoÅ¾e tento software neproÅ¡el stejnÄ› dÅ¯kladnÃ½m "
 "testovÃ¡nÃm jako ostatnÃ balÃÄky, obsahuje novÄ›jÅ¡Ã verze nÄ›kterÃ½ch aplikacÃ, "
 "kterÃ© mohou obsahovat novÃ© uÅ¾iteÄnÃ© vlastnosti."
 
@@ -11147,6 +11149,12 @@
 msgid "Configure the base system before rebooting"
 msgstr "Nastavit zÃ¡kladnÃ systÃ©m jeÅ¡tÄ› pÅ™ed restartem"
 
+#~ msgid "Desktop machine"
+#~ msgstr "DesktopovÃ½ poÄÃtaÄ"
+
+#~ msgid "Multi-user workstation"
+#~ msgstr "VÃceuÅ¾ivatelskÃ¡ pracovnÃ stanice"
+
 #~ msgid "Retry, Change mirror, Ignore"
 #~ msgstr "Opakovat, ZmÄ›nit zrcadlo, Ignorovat"
 

Modified: trunk/packages/po/cy.po
===================================================================
--- trunk/packages/po/cy.po	2005-11-16 01:40:18 UTC (rev 32163)
+++ trunk/packages/po/cy.po	2005-11-16 01:45:44 UTC (rev 32164)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-15 08:03+0000\n"
+"POT-Creation-Date: 2005-11-16 01:33+0000\n"
 "PO-Revision-Date: 2005-03-08 07:46+0000\n"
 "Last-Translator: Dafydd Harries <daf at muse.19inch.net>\n"
 "Language-Team: Welsh <daf at muse.19inch.net>\n"
@@ -1981,32 +1981,34 @@
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#. These are choices of actions so this is, at least in English,
+#. an infinitive form
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 msgid "Retry"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 #, fuzzy
 msgid "Change mirror"
 msgstr "Ailgeisio, Newid drych, Diddymu"
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../mdcfg-utils.templates:122
+#: ../net-retriever.templates:5 ../mdcfg-utils.templates:122
 msgid "Cancel"
 msgstr "Diddymu"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:31
+#: ../net-retriever.templates:7 ../apt-mirror-setup.templates:33
 msgid "Downloading a file failed:"
 msgstr "Methodd lawrlwytho ffeil:"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5
+#: ../net-retriever.templates:7
 msgid ""
 "The installer failed to download a file from the mirror. This may be a "
 "problem with your network, or with the mirror. You can choose to retry the "
@@ -2725,15 +2727,16 @@
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:101
-msgid "Desktop machine"
-msgstr "Peiriant penbwrdd"
+#, fuzzy
+msgid "Separate /home partition"
+msgstr "fformadu'r rhaniad"
 
 #. Type: text
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:106
-msgid "Multi-user workstation"
-msgstr "System aml-ddefnyddiwr"
+msgid "Separate /home, /usr, /var, and /tmp partitions"
+msgstr ""
 
 #. Type: boolean
 #. Description
@@ -5482,14 +5485,14 @@
 
 #. Type: select
 #. Choices
-#: ../apt-mirror-setup.templates:30
+#: ../apt-mirror-setup.templates:32
 #, fuzzy
 msgid "Ignore"
 msgstr "dim"
 
 #. Type: select
 #. Description
-#: ../apt-mirror-setup.templates:31
+#: ../apt-mirror-setup.templates:33
 #, fuzzy
 msgid ""
 "The installer failed to access the mirror. This may be a problem with your "
@@ -11278,6 +11281,12 @@
 msgid "Configure the base system before rebooting"
 msgstr "Cyflunio'r system sail cyn ailfÅµtio"
 
+#~ msgid "Desktop machine"
+#~ msgstr "Peiriant penbwrdd"
+
+#~ msgid "Multi-user workstation"
+#~ msgstr "System aml-ddefnyddiwr"
+
 #, fuzzy
 #~ msgid "Retry, Change mirror, Ignore"
 #~ msgstr "Ailgeisio, Newid drych, Diddymu"

Modified: trunk/packages/po/da.po
===================================================================
--- trunk/packages/po/da.po	2005-11-16 01:40:18 UTC (rev 32163)
+++ trunk/packages/po/da.po	2005-11-16 01:45:44 UTC (rev 32164)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-15 08:03+0000\n"
+"POT-Creation-Date: 2005-11-16 01:33+0000\n"
 "PO-Revision-Date: 2005-11-09 23:29+0100\n"
 "Last-Translator: Claus Hindsgaul <claus_h at image.dk>\n"
 "Language-Team: Danish <dansk at klid.dk>\n"
@@ -1956,32 +1956,34 @@
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#. These are choices of actions so this is, at least in English,
+#. an infinitive form
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 msgid "Retry"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 #, fuzzy
 msgid "Change mirror"
 msgstr "Prøv igen, Skift filspejl, Afbryd"
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../mdcfg-utils.templates:122
+#: ../net-retriever.templates:5 ../mdcfg-utils.templates:122
 msgid "Cancel"
 msgstr "Afbryd"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:31
+#: ../net-retriever.templates:7 ../apt-mirror-setup.templates:33
 msgid "Downloading a file failed:"
 msgstr "Det lykkedes ikke at hente en fil:"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5
+#: ../net-retriever.templates:7
 msgid ""
 "The installer failed to download a file from the mirror. This may be a "
 "problem with your network, or with the mirror. You can choose to retry the "
@@ -2699,15 +2701,16 @@
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:101
-msgid "Desktop machine"
-msgstr "Desktop-maskine"
+#, fuzzy
+msgid "Separate /home partition"
+msgstr "formatér partitionen"
 
 #. Type: text
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:106
-msgid "Multi-user workstation"
-msgstr "Flerbruger-arbejdsstation"
+msgid "Separate /home, /usr, /var, and /tmp partitions"
+msgstr ""
 
 #. Type: boolean
 #. Description
@@ -5431,14 +5434,14 @@
 
 #. Type: select
 #. Choices
-#: ../apt-mirror-setup.templates:30
+#: ../apt-mirror-setup.templates:32
 #, fuzzy
 msgid "Ignore"
 msgstr "intet"
 
 #. Type: select
 #. Description
-#: ../apt-mirror-setup.templates:31
+#: ../apt-mirror-setup.templates:33
 #, fuzzy
 msgid ""
 "The installer failed to access the mirror. This may be a problem with your "
@@ -11218,6 +11221,12 @@
 msgid "Configure the base system before rebooting"
 msgstr "Sæt basissystemet op før genstart"
 
+#~ msgid "Desktop machine"
+#~ msgstr "Desktop-maskine"
+
+#~ msgid "Multi-user workstation"
+#~ msgstr "Flerbruger-arbejdsstation"
+
 #, fuzzy
 #~ msgid "Retry, Change mirror, Ignore"
 #~ msgstr "Prøv igen, Skift filspejl, Afbryd"

Modified: trunk/packages/po/de.po
===================================================================
--- trunk/packages/po/de.po	2005-11-16 01:40:18 UTC (rev 32163)
+++ trunk/packages/po/de.po	2005-11-16 01:45:44 UTC (rev 32164)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-15 08:03+0000\n"
+"POT-Creation-Date: 2005-11-16 01:33+0000\n"
 "PO-Revision-Date: 2005-11-05 17:29+0100\n"
 "Last-Translator: Jens Seidel <jensseidel at users.sf.net>\n"
 "Language-Team: Debian German <debian-l10n-german at lists.debian.org>\n"
@@ -1999,32 +1999,34 @@
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#. These are choices of actions so this is, at least in English,
+#. an infinitive form
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 msgid "Retry"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 #, fuzzy
 msgid "Change mirror"
 msgstr "Wiederholen, Spiegelserver wechseln, Abbrechen"
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../mdcfg-utils.templates:122
+#: ../net-retriever.templates:5 ../mdcfg-utils.templates:122
 msgid "Cancel"
 msgstr "Abbrechen"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:31
+#: ../net-retriever.templates:7 ../apt-mirror-setup.templates:33
 msgid "Downloading a file failed:"
 msgstr "Datei-Download schlug fehl:"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5
+#: ../net-retriever.templates:7
 msgid ""
 "The installer failed to download a file from the mirror. This may be a "
 "problem with your network, or with the mirror. You can choose to retry the "
@@ -2747,15 +2749,16 @@
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:101
-msgid "Desktop machine"
-msgstr "Desktop-Computer"
+#, fuzzy
+msgid "Separate /home partition"
+msgstr "Partition formatieren"
 
 #. Type: text
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:106
-msgid "Multi-user workstation"
-msgstr "Mehrbenutzer-Arbeitsplatzrechner"
+msgid "Separate /home, /usr, /var, and /tmp partitions"
+msgstr ""
 
 #. Type: boolean
 #. Description
@@ -5520,14 +5523,14 @@
 
 #. Type: select
 #. Choices
-#: ../apt-mirror-setup.templates:30
+#: ../apt-mirror-setup.templates:32
 #, fuzzy
 msgid "Ignore"
 msgstr "Keiner"
 
 #. Type: select
 #. Description
-#: ../apt-mirror-setup.templates:31
+#: ../apt-mirror-setup.templates:33
 #, fuzzy
 msgid ""
 "The installer failed to access the mirror. This may be a problem with your "
@@ -11430,6 +11433,12 @@
 msgid "Configure the base system before rebooting"
 msgstr "Basissystem vor einem Neustart konfigurieren"
 
+#~ msgid "Desktop machine"
+#~ msgstr "Desktop-Computer"
+
+#~ msgid "Multi-user workstation"
+#~ msgstr "Mehrbenutzer-Arbeitsplatzrechner"
+
 #, fuzzy
 #~ msgid "Retry, Change mirror, Ignore"
 #~ msgstr "Wiederholen, Spiegelserver wechseln, Abbrechen"

Modified: trunk/packages/po/el.po
===================================================================
--- trunk/packages/po/el.po	2005-11-16 01:40:18 UTC (rev 32163)
+++ trunk/packages/po/el.po	2005-11-16 01:45:44 UTC (rev 32164)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: el\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-15 08:03+0000\n"
+"POT-Creation-Date: 2005-11-16 01:33+0000\n"
 "PO-Revision-Date: 2005-09-15 21:29EEST\n"
 "Last-Translator: Greek Translation Team <debian-l10n-greek at lists.debian."
 "org>\n"
@@ -2013,32 +2013,34 @@
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#. These are choices of actions so this is, at least in English,
+#. an infinitive form
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 msgid "Retry"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 #, fuzzy
 msgid "Change mirror"
 msgstr "ÎÎÎ± Ï€ÏÎ¿ÏƒÏ€Î¬Î¸ÎµÎ¹Î±, Î‘Î»Î»Î±Î³Î® ÎºÎ±Ï„Î¿Ï€Ï„ÏÎ¹ÏƒÏ„Î®, Î‘ÎºÏÏÏ‰ÏƒÎ·"
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../mdcfg-utils.templates:122
+#: ../net-retriever.templates:5 ../mdcfg-utils.templates:122
 msgid "Cancel"
 msgstr "Î‘ÎºÏÏÏ‰ÏƒÎ·"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:31
+#: ../net-retriever.templates:7 ../apt-mirror-setup.templates:33
 msgid "Downloading a file failed:"
 msgstr "Î‘Ï€ÎÏ„Ï…Ï‡Îµ Î· Î¼ÎµÏ„Î±Ï†ÏŒÏÏ„Ï‰ÏƒÎ· ÎµÎ½ÏŒÏ‚ Î±ÏÏ‡ÎµÎ¯Î¿Ï…:"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5
+#: ../net-retriever.templates:7
 msgid ""
 "The installer failed to download a file from the mirror. This may be a "
 "problem with your network, or with the mirror. You can choose to retry the "
@@ -2762,15 +2764,16 @@
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:101
-msgid "Desktop machine"
-msgstr "Î£Ï„Î±Î¸Î¼ÏŒÏ‚ ÎµÏÎ³Î±ÏƒÎ¯Î±Ï‚ (Desktop)"
+#, fuzzy
+msgid "Separate /home partition"
+msgstr "Î´Î¹Î±Î¼ÏŒÏÏ†Ï‰ÏƒÎ· Ï„Î¿Ï… Ï„Î¼Î®Î¼Î±Ï„Î¿Ï‚"
 
 #. Type: text
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:106
-msgid "Multi-user workstation"
-msgstr "Î Î¿Î»Ï…Ï‡ÏÎ·ÏƒÏ„Î¹ÎºÏŒÏ‚ ÏƒÏ„Î±Î¸Î¼ÏŒÏ‚ ÎµÏÎ³Î±ÏƒÎ¯Î±Ï‚"
+msgid "Separate /home, /usr, /var, and /tmp partitions"
+msgstr ""
 
 #. Type: boolean
 #. Description
@@ -5532,14 +5535,14 @@
 
 #. Type: select
 #. Choices
-#: ../apt-mirror-setup.templates:30
+#: ../apt-mirror-setup.templates:32
 #, fuzzy
 msgid "Ignore"
 msgstr "ÎºÎ±Î¼Î¯Î±"
 
 #. Type: select
 #. Description
-#: ../apt-mirror-setup.templates:31
+#: ../apt-mirror-setup.templates:33
 #, fuzzy
 msgid ""
 "The installer failed to access the mirror. This may be a problem with your "
@@ -11425,6 +11428,12 @@
 msgid "Configure the base system before rebooting"
 msgstr "Î¡ÏÎ¸Î¼Î¹ÏƒÎ· Ï„Î¿Ï… Î²Î±ÏƒÎ¹ÎºÎ¿Ï ÏƒÏ…ÏƒÏ„Î®Î¼Î±Ï„Î¿Ï‚ Ï€ÏÎ¹Î½ Ï„Î·Î½ ÎµÎºÎºÎ¯Î½Î·ÏƒÎ·"
 
+#~ msgid "Desktop machine"
+#~ msgstr "Î£Ï„Î±Î¸Î¼ÏŒÏ‚ ÎµÏÎ³Î±ÏƒÎ¯Î±Ï‚ (Desktop)"
+
+#~ msgid "Multi-user workstation"
+#~ msgstr "Î Î¿Î»Ï…Ï‡ÏÎ·ÏƒÏ„Î¹ÎºÏŒÏ‚ ÏƒÏ„Î±Î¸Î¼ÏŒÏ‚ ÎµÏÎ³Î±ÏƒÎ¯Î±Ï‚"
+
 #, fuzzy
 #~ msgid "Retry, Change mirror, Ignore"
 #~ msgstr "ÎÎÎ± Ï€ÏÎ¿ÏƒÏ€Î¬Î¸ÎµÎ¹Î±, Î‘Î»Î»Î±Î³Î® ÎºÎ±Ï„Î¿Ï€Ï„ÏÎ¹ÏƒÏ„Î®, Î‘ÎºÏÏÏ‰ÏƒÎ·"

Modified: trunk/packages/po/eo.po
===================================================================
--- trunk/packages/po/eo.po	2005-11-16 01:40:18 UTC (rev 32163)
+++ trunk/packages/po/eo.po	2005-11-16 01:45:44 UTC (rev 32164)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: eo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-15 08:03+0000\n"
+"POT-Creation-Date: 2005-11-16 01:33+0000\n"
 "PO-Revision-Date: 2005-07-18 21:00+0200\n"
 "Last-Translator: Serge Leblanc <serge.leblanc at wanadoo.fr>\n"
 "Language-Team: Esperanto <debian-l10n-esperanto at lists.debian.org>\n"
@@ -1948,32 +1948,34 @@
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#. These are choices of actions so this is, at least in English,
+#. an infinitive form
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 msgid "Retry"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 #, fuzzy
 msgid "Change mirror"
 msgstr "Reprovu, ÅœanÄu spegularkivo, Forgesu"
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../mdcfg-utils.templates:122
+#: ../net-retriever.templates:5 ../mdcfg-utils.templates:122
 msgid "Cancel"
 msgstr "Nuligi"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:31
+#: ../net-retriever.templates:7 ../apt-mirror-setup.templates:33
 msgid "Downloading a file failed:"
 msgstr "ElÅutado de la dosiero malsukcesas :"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5
+#: ../net-retriever.templates:7
 msgid ""
 "The installer failed to download a file from the mirror. This may be a "
 "problem with your network, or with the mirror. You can choose to retry the "
@@ -2679,15 +2681,16 @@
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:101
-msgid "Desktop machine"
-msgstr "Labortabla komputilo"
+#, fuzzy
+msgid "Separate /home partition"
+msgstr "formatu subdiskon"
 
 #. Type: text
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:106
-msgid "Multi-user workstation"
-msgstr "Multuzanta laborstacio"
+msgid "Separate /home, /usr, /var, and /tmp partitions"
+msgstr ""
 
 #. Type: boolean
 #. Description
@@ -5422,14 +5425,14 @@
 
 #. Type: select
 #. Choices
-#: ../apt-mirror-setup.templates:30
+#: ../apt-mirror-setup.templates:32
 #, fuzzy
 msgid "Ignore"
 msgstr "neniu"
 
 #. Type: select
 #. Description
-#: ../apt-mirror-setup.templates:31
+#: ../apt-mirror-setup.templates:33
 #, fuzzy
 msgid ""
 "The installer failed to access the mirror. This may be a problem with your "
@@ -10856,6 +10859,12 @@
 msgid "Configure the base system before rebooting"
 msgstr "Akomodi la bazan sistemon antaÅ ol reÅargi"
 
+#~ msgid "Desktop machine"
+#~ msgstr "Labortabla komputilo"
+
+#~ msgid "Multi-user workstation"
+#~ msgstr "Multuzanta laborstacio"
+
 #, fuzzy
 #~ msgid "Retry, Change mirror, Ignore"
 #~ msgstr "Reprovu, ÅœanÄu spegularkivo, Forgesu"

Modified: trunk/packages/po/es.po
===================================================================
--- trunk/packages/po/es.po	2005-11-16 01:40:18 UTC (rev 32163)
+++ trunk/packages/po/es.po	2005-11-16 01:45:44 UTC (rev 32164)
@@ -33,7 +33,7 @@
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-15 08:03+0000\n"
+"POT-Creation-Date: 2005-11-16 01:33+0000\n"
 "PO-Revision-Date: 2005-11-16 02:28+0100\n"
 "Last-Translator: Javier FernÃ¡ndez-Sanguino PeÃ±a <jfs at debian.org>\n"
 "Language-Team:  Debian Spanish <debian-l10n-spanish at lists.debian.org>\n"
@@ -2015,31 +2015,33 @@
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#. These are choices of actions so this is, at least in English,
+#. an infinitive form
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 msgid "Retry"
 msgstr "Reintentar"
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 msgid "Change mirror"
 msgstr "Cambiar de rÃ©plica"
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../mdcfg-utils.templates:122
+#: ../net-retriever.templates:5 ../mdcfg-utils.templates:122
 msgid "Cancel"
 msgstr "Cancelar"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:31
+#: ../net-retriever.templates:7 ../apt-mirror-setup.templates:33
 msgid "Downloading a file failed:"
 msgstr "FallÃ³ la descarga de un fichero:"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5
+#: ../net-retriever.templates:7
 msgid ""
 "The installer failed to download a file from the mirror. This may be a "
 "problem with your network, or with the mirror. You can choose to retry the "
@@ -2759,15 +2761,16 @@
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:101
-msgid "Desktop machine"
-msgstr "Equipo de ofimÃ¡tica"
+#, fuzzy
+msgid "Separate /home partition"
+msgstr "formatear la particiÃ³n"
 
 #. Type: text
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:106
-msgid "Multi-user workstation"
-msgstr "EstaciÃ³n de trabajo multiusuario"
+msgid "Separate /home, /usr, /var, and /tmp partitions"
+msgstr ""
 
 #. Type: boolean
 #. Description
@@ -5461,7 +5464,10 @@
 "The security updates on ${SECURITY_HOST} couldn't be accessed, so those "
 "updates will not be made available to you at this time. You should "
 "investigate this later."
-msgstr "No se pudo acceder a las actualizaciones de seguridad de ${SECURITY_HOST} por lo que no estarÃ¡n disponibles en este punto. DeberÃa investigar este problema mÃ¡s adelante."
+msgstr ""
+"No se pudo acceder a las actualizaciones de seguridad de ${SECURITY_HOST} "
+"por lo que no estarÃ¡n disponibles en este punto. DeberÃa investigar este "
+"problema mÃ¡s adelante."
 
 #. Type: error
 #. Description
@@ -5469,7 +5475,9 @@
 msgid ""
 "Commented out entries for ${SECURITY_HOST} have been added to the /etc/apt/"
 "sources.list file."
-msgstr "Se han aÃ±adido entradas comentadas para ${SECURITY_HOST} en el archivo /etc/apt/sources.list."
+msgstr ""
+"Se han aÃ±adido entradas comentadas para ${SECURITY_HOST} en el archivo /etc/"
+"apt/sources.list."
 
 #. Type: text
 #. Description
@@ -5489,7 +5497,9 @@
 msgid ""
 "An attempt to configure apt to install additional packages from the CD "
 "failed."
-msgstr "Ha fallado el intento de configurar apt para instalar paquetes adicionales del CD."
+msgstr ""
+"Ha fallado el intento de configurar apt para instalar paquetes adicionales "
+"del CD."
 
 #. Type: text
 #. Description
@@ -5553,19 +5563,23 @@
 
 #. Type: select
 #. Choices
-#: ../apt-mirror-setup.templates:30
+#: ../apt-mirror-setup.templates:32
 msgid "Ignore"
 msgstr "Ignorar"
 
 #. Type: select
 #. Description
-#: ../apt-mirror-setup.templates:31
+#: ../apt-mirror-setup.templates:33
 msgid ""
 "The installer failed to access the mirror. This may be a problem with your "
 "network, or with the mirror. You can choose to retry the download, select a "
 "different mirror, or ignore the problem and continue without all the "
 "packages from this mirror."
-msgstr "Se produjo un fallo al acceder a la rÃ©plica. Esto puede deberse a un problema en la red o con la rÃ©plica. Puede elegir reintentar la descarga, seleccionar otra rÃ©plica o ignorar el problema y continuar sin todos los paquetes de esta rÃ©plica."
+msgstr ""
+"Se produjo un fallo al acceder a la rÃ©plica. Esto puede deberse a un "
+"problema en la red o con la rÃ©plica. Puede elegir reintentar la descarga, "
+"seleccionar otra rÃ©plica o ignorar el problema y continuar sin todos los "
+"paquetes de esta rÃ©plica."
 
 #. Type: boolean
 #. Description
@@ -5582,7 +5596,12 @@
 "is not a part of the main distribution, standard package management tools "
 "can be used to install it. This software has varying licenses which may "
 "prevent you from using, modifying, or sharing it."
-msgstr "Algunos programas no-libres estÃ¡n disponibles en formato paquetizado. Se pueden utilizar las herramientas de gestiÃ³n de paquetes estÃ¡ndar para instalarlos aunque estos programas no forman parte de la distribuciÃ³n principal. Estos programas tienen licencias varias que pueden impedir que lo utilice, modifique o comparta."
+msgstr ""
+"Algunos programas no-libres estÃ¡n disponibles en formato paquetizado. Se "
+"pueden utilizar las herramientas de gestiÃ³n de paquetes estÃ¡ndar para "
+"instalarlos aunque estos programas no forman parte de la distribuciÃ³n "
+"principal. Estos programas tienen licencias varias que pueden impedir que lo "
+"utilice, modifique o comparta."
 
 #. Type: boolean
 #. Description
@@ -5598,7 +5617,11 @@
 "Some additional software is available in packaged form. This software is "
 "free and, though it is not a part of the main distribution, standard package "
 "management tools can be used to install it."
-msgstr "Algunos programas adicionales estÃ¡n disponibles en formato paquetizado. Se pueden utilizar las herramientas de gestiÃ³n de paquetes estÃ¡ndar para instalarlos aunque estos programas no forman parte de la distribuciÃ³n principal. Estos programas son libres."
+msgstr ""
+"Algunos programas adicionales estÃ¡n disponibles en formato paquetizado. Se "
+"pueden utilizar las herramientas de gestiÃ³n de paquetes estÃ¡ndar para "
+"instalarlos aunque estos programas no forman parte de la distribuciÃ³n "
+"principal. Estos programas son libres."
 
 #. Type: boolean
 #. Description
@@ -5615,7 +5638,12 @@
 "this release. Although this software has not gone through such complete "
 "testing as that contained in the release, it includes newer versions of some "
 "applications which may provide useful features."
-msgstr "Algunos programas han sido migrados a versiones mÃ¡s recientes utilizando la rama de desarrollo para que funcionen en esta versiÃ³n. Estos programas incluyen versones mÃ¡s nuevas de aplicaciones que pueden ofrecer funcionalidades interesantes aunque no han pasado pruebas tan completas como los que contiene esta versiÃ³n."
+msgstr ""
+"Algunos programas han sido migrados a versiones mÃ¡s recientes utilizando la "
+"rama de desarrollo para que funcionen en esta versiÃ³n. Estos programas "
+"incluyen versones mÃ¡s nuevas de aplicaciones que pueden ofrecer "
+"funcionalidades interesantes aunque no han pasado pruebas tan completas como "
+"los que contiene esta versiÃ³n."
 
 #. Type: select
 #. Choices
@@ -11451,6 +11479,12 @@
 msgid "Configure the base system before rebooting"
 msgstr "Configure el sistema base antes de reiniciar"
 
+#~ msgid "Desktop machine"
+#~ msgstr "Equipo de ofimÃ¡tica"
+
+#~ msgid "Multi-user workstation"
+#~ msgstr "EstaciÃ³n de trabajo multiusuario"
+
 #~ msgid "Retry, Change mirror, Ignore"
 #~ msgstr "Reintentar, Cambiar de rÃ©plica, Ignorar"
 

Modified: trunk/packages/po/et.po
===================================================================
--- trunk/packages/po/et.po	2005-11-16 01:40:18 UTC (rev 32163)
+++ trunk/packages/po/et.po	2005-11-16 01:45:44 UTC (rev 32164)
@@ -13,7 +13,7 @@
 msgstr ""
 "Project-Id-Version: et\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-15 08:03+0000\n"
+"POT-Creation-Date: 2005-11-16 01:33+0000\n"
 "PO-Revision-Date: 2005-06-08 11:11+0300\n"
 "Last-Translator: Siim PÃµder <windo at windowlicker.dyn.ee>\n"
 "Language-Team: Eesti <linuxiabi at hot.ee>\n"
@@ -1973,32 +1973,34 @@
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#. These are choices of actions so this is, at least in English,
+#. an infinitive form
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 msgid "Retry"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 #, fuzzy
 msgid "Change mirror"
 msgstr "Proovi uuesti, Vaheta peegeldus, Loobu"
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../mdcfg-utils.templates:122
+#: ../net-retriever.templates:5 ../mdcfg-utils.templates:122
 msgid "Cancel"
 msgstr "Loobu"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:31
+#: ../net-retriever.templates:7 ../apt-mirror-setup.templates:33
 msgid "Downloading a file failed:"
 msgstr "Faili laadimine nurjus:"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5
+#: ../net-retriever.templates:7
 msgid ""
 "The installer failed to download a file from the mirror. This may be a "
 "problem with your network, or with the mirror. You can choose to retry the "
@@ -2707,15 +2709,16 @@
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:101
-msgid "Desktop machine"
-msgstr "Lauaarvuti"
+#, fuzzy
+msgid "Separate /home partition"
+msgstr "formaadi partitsioon"
 
 #. Type: text
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:106
-msgid "Multi-user workstation"
-msgstr "Mitme kasutaja tÃ¶Ã¶jaam"
+msgid "Separate /home, /usr, /var, and /tmp partitions"
+msgstr ""
 
 #. Type: boolean
 #. Description
@@ -5445,14 +5448,14 @@
 
 #. Type: select
 #. Choices
-#: ../apt-mirror-setup.templates:30
+#: ../apt-mirror-setup.templates:32
 #, fuzzy
 msgid "Ignore"
 msgstr "pole"
 
 #. Type: select
 #. Description
-#: ../apt-mirror-setup.templates:31
+#: ../apt-mirror-setup.templates:33
 #, fuzzy
 msgid ""
 "The installer failed to access the mirror. This may be a problem with your "
@@ -11200,6 +11203,12 @@
 msgid "Configure the base system before rebooting"
 msgstr "Seadista alussÃ¼steem enne taaskÃ¤ivitamist"
 
+#~ msgid "Desktop machine"
+#~ msgstr "Lauaarvuti"
+
+#~ msgid "Multi-user workstation"
+#~ msgstr "Mitme kasutaja tÃ¶Ã¶jaam"
+
 #, fuzzy
 #~ msgid "Retry, Change mirror, Ignore"
 #~ msgstr "Proovi uuesti, Vaheta peegeldus, Loobu"

Modified: trunk/packages/po/eu.po
===================================================================
--- trunk/packages/po/eu.po	2005-11-16 01:40:18 UTC (rev 32163)
+++ trunk/packages/po/eu.po	2005-11-16 01:45:44 UTC (rev 32164)
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: eu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-15 08:03+0000\n"
+"POT-Creation-Date: 2005-11-16 01:33+0000\n"
 "PO-Revision-Date: 2005-11-15 22:25+0100\n"
 "Last-Translator: Piarres Beobide <pi at beobide.net>\n"
 "Language-Team: librezale.org <librezale at librezale.org>\n"
@@ -371,7 +371,8 @@
 #. Description
 #: ../localechooser.templates-in:124
 msgid "You may choose additional locales to be installed from this list."
-msgstr "Instalatzeko lokal gehigarriak aukeratu beharko zenituzke zerrenda honetatik."
+msgstr ""
+"Instalatzeko lokal gehigarriak aukeratu beharko zenituzke zerrenda honetatik."
 
 #. Type: text
 #. Description
@@ -480,7 +481,8 @@
 #. Description
 #: ../cdrom-detect.templates:4
 msgid "Load CD-ROM drivers from a driver floppy?"
-msgstr "CD-ROM kontrolatzaileak kontrolatzaileko disketetik kargatu nahi dituzu?"
+msgstr ""
+"CD-ROM kontrolatzaileak kontrolatzaileko disketetik kargatu nahi dituzu?"
 
 #. Type: boolean
 #. Description
@@ -1482,7 +1484,8 @@
 #. Description
 #: ../netcfg-dhcp.templates:23
 msgid "No DHCP client was found. This package requires pump or dhcp-client."
-msgstr "Ez da DHCP bezerorik aurkitu. Pakete honek ponpa edo dhcp bezeroa behar du."
+msgstr ""
+"Ez da DHCP bezerorik aurkitu. Pakete honek ponpa edo dhcp bezeroa behar du."
 
 #. Type: error
 #. Description
@@ -1503,7 +1506,8 @@
 #. Choices
 #: ../netcfg-dhcp.templates:33
 msgid "Retry network autoconfiguration with a DHCP hostname"
-msgstr "Saiatu berriro sarea DHCP ostalari-izenarekin automatikoki konfiguratzen"
+msgstr ""
+"Saiatu berriro sarea DHCP ostalari-izenarekin automatikoki konfiguratzen"
 
 #. Type: select
 #. Choices
@@ -1712,7 +1716,8 @@
 #. Type: error
 #. Description
 #: ../netcfg-static.templates:44
-msgid "You may have made an error entering your IP address, netmask and/or gateway."
+msgid ""
+"You may have made an error entering your IP address, netmask and/or gateway."
 msgstr "Gaizki sartu duzu IP helbidea, sare-maskara eta/edo atebidea."
 
 #. Type: boolean
@@ -1853,7 +1858,8 @@
 #. Type: string
 #. Description
 #: ../choose-mirror.templates.http-in:29 ../choose-mirror.templates.ftp-in:29
-msgid "Please enter the hostname of the mirror from which Debian will be downloaded."
+msgid ""
+"Please enter the hostname of the mirror from which Debian will be downloaded."
 msgstr "Sartu Debian deskargatzeko erabiliko den ispiluaren ostalari-izena."
 
 #. Type: string
@@ -1957,31 +1963,33 @@
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#. These are choices of actions so this is, at least in English,
+#. an infinitive form
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 msgid "Retry"
 msgstr "Berriz saiatu"
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 msgid "Change mirror"
 msgstr "Ispilua aldatu"
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../mdcfg-utils.templates:122
+#: ../net-retriever.templates:5 ../mdcfg-utils.templates:122
 msgid "Cancel"
 msgstr "Utzi"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:31
+#: ../net-retriever.templates:7 ../apt-mirror-setup.templates:33
 msgid "Downloading a file failed:"
 msgstr "Ezin izan da fitxategia deskargatu:"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5
+#: ../net-retriever.templates:7
 msgid ""
 "The installer failed to download a file from the mirror. This may be a "
 "problem with your network, or with the mirror. You can choose to retry the "
@@ -2028,7 +2036,8 @@
 #. Description
 #: ../floppy-retriever.templates:8
 msgid "Cannot read floppy, or not a driver floppy. Retry?"
-msgstr "Ezin da ez disketea, ez kontrolatzailearen disketea irakurri. Berriro saiatu?"
+msgstr ""
+"Ezin da ez disketea, ez kontrolatzailearen disketea irakurri. Berriro saiatu?"
 
 #. Type: boolean
 #. Description
@@ -2205,7 +2214,8 @@
 #. Description
 #: ../partman-base.templates:58
 msgid "Note that you will be able to undo this operation later if you wish."
-msgstr "Kontuan izan nahi izanez gero eragiketa hau geroago desegin dezakezula."
+msgstr ""
+"Kontuan izan nahi izanez gero eragiketa hau geroago desegin dezakezula."
 
 #. Type: boolean
 #. Description
@@ -2253,8 +2263,10 @@
 #. Type: boolean
 #. Description
 #: ../partman-base.templates:82
-msgid "No partition table changes and no creation of file systems have been planned."
-msgstr "Ez da partizio taula aldaketarik ez fitxategi sistema sorketarik planifikatu."
+msgid ""
+"No partition table changes and no creation of file systems have been planned."
+msgstr ""
+"Ez da partizio taula aldaketarik ez fitxategi sistema sorketarik planifikatu."
 
 #. Type: boolean
 #. Description
@@ -2688,21 +2700,23 @@
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:96
 msgid "All files in one partition (recommended for new users)"
-msgstr "Fitxategi guztiak partizio batean (erabiltzaile berrientzat gomendatua)"
+msgstr ""
+"Fitxategi guztiak partizio batean (erabiltzaile berrientzat gomendatua)"
 
 #. Type: text
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:101
-msgid "Desktop machine"
-msgstr "Mahaigaineko makina"
+#, fuzzy
+msgid "Separate /home partition"
+msgstr "formateatu partizioa"
 
 #. Type: text
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:106
-msgid "Multi-user workstation"
-msgstr "Hainbat erabiltzailerentzako lanpostua"
+msgid "Separate /home, /usr, /var, and /tmp partitions"
+msgstr ""
 
 #. Type: boolean
 #. Description
@@ -2822,7 +2836,8 @@
 msgid ""
 "Before the copy operation takes place, the changes have to be written to "
 "disk."
-msgstr "Kopiatzeko eragiketa egin baino lehen, aldaketak diskoan idatzi behar dira."
+msgstr ""
+"Kopiatzeko eragiketa egin baino lehen, aldaketak diskoan idatzi behar dira."
 
 #. Type: boolean
 #. Description
@@ -3104,7 +3119,8 @@
 #. Type: text
 #. Description
 #: ../partman-basicfilesystems.templates:3
-msgid "Checking the ${TYPE} file system in partition #${PARTITION} of ${DEVICE}..."
+msgid ""
+"Checking the ${TYPE} file system in partition #${PARTITION} of ${DEVICE}..."
 msgstr ""
 "${DEVICE} gailuko #${PARTITION} partizioan ${TYPE} fitxategi-sistema "
 "egiaztatzen ..."
@@ -3229,8 +3245,10 @@
 #. Type: error
 #. Description
 #: ../partman-basicfilesystems.templates:59
-msgid "The creation of swap space in partition #${PARTITION} of ${DEVICE} failed."
-msgstr "Ezin izan da swap lekua sortu ${DEVICE} gailuko #${PARTITION} partizioan."
+msgid ""
+"The creation of swap space in partition #${PARTITION} of ${DEVICE} failed."
+msgstr ""
+"Ezin izan da swap lekua sortu ${DEVICE} gailuko #${PARTITION} partizioan."
 
 #. Type: boolean
 #. Description
@@ -3383,7 +3401,8 @@
 #. Description
 #: ../partman-basicfilesystems.templates:97 ../partman-ext2r0.templates:40
 msgid "Mount points must start with \"/\". They cannot contain spaces."
-msgstr "Muntatze-puntuek \"/\" izan behar dute hasieran. Ezin dute zuriunerik eduki."
+msgstr ""
+"Muntatze-puntuek \"/\" izan behar dute hasieran. Ezin dute zuriunerik eduki."
 
 #. Type: string
 #. Description
@@ -3612,7 +3631,8 @@
 #: ../partman-reiserfs.templates:44 ../partman-jfs.templates:44
 #: ../partman-xfs.templates:44 ../partman-ext2r0.templates:55
 msgid "nosuid - ignore set-user-identifier or set-group-identifier bits"
-msgstr "nosuid - ez ikusi egin set-user-identifier edo set-group-identifier bitei"
+msgstr ""
+"nosuid - ez ikusi egin set-user-identifier edo set-group-identifier bitei"
 
 #. Type: multiselect
 #. Choices
@@ -3705,7 +3725,8 @@
 #. Type: text
 #. Description
 #: ../partman-ext3.templates:3
-msgid "Checking the ext3 file system in partition #${PARTITION} of ${DEVICE}..."
+msgid ""
+"Checking the ext3 file system in partition #${PARTITION} of ${DEVICE}..."
 msgstr ""
 "ext3 fitxategi-sistema egiaztatzen ${DEVICE} gailuko #${PARTITION} "
 "partizioan..."
@@ -3735,7 +3756,8 @@
 #. Type: error
 #. Description
 #: ../partman-ext3.templates:16
-msgid "The ext3 file system creation in partition #${PARTITION} of ${DEVICE} failed."
+msgid ""
+"The ext3 file system creation in partition #${PARTITION} of ${DEVICE} failed."
 msgstr ""
 "Ezin izan da ext3 fitxategi-sistema sortu ${DEVICE} gailuko #${PARTITION} "
 "partizioan."
@@ -3767,7 +3789,8 @@
 #. Type: text
 #. Description
 #: ../partman-reiserfs.templates:3
-msgid "Checking the ReiserFS file system in partition #${PARTITION} of ${DEVICE}..."
+msgid ""
+"Checking the ReiserFS file system in partition #${PARTITION} of ${DEVICE}..."
 msgstr ""
 "ReiserFS fitxategi-sistema egiaztatzen ${DEVICE} gailuko #${PARTITION} "
 "partizioan..."
@@ -3816,7 +3839,8 @@
 #. in single-byte languages)
 #: ../partman-reiserfs.templates:44
 msgid "notail - disable packing of files into the file system tree"
-msgstr "notail - desgaitu fitxategiak paketatzea fitxategi-sistemaren zuhaitzean"
+msgstr ""
+"notail - desgaitu fitxategiak paketatzea fitxategi-sistemaren zuhaitzean"
 
 #. Type: text
 #. Description
@@ -3853,7 +3877,8 @@
 #. Type: error
 #. Description
 #: ../partman-jfs.templates:16
-msgid "The jfs file system creation in partition #${PARTITION} of ${DEVICE} failed."
+msgid ""
+"The jfs file system creation in partition #${PARTITION} of ${DEVICE} failed."
 msgstr ""
 "Ezin izan da jfs fitxategi-sistema sortu ${DEVICE} gailuko #${PARTITION} "
 "partizioan."
@@ -3927,7 +3952,8 @@
 #. Type: boolean
 #. Description
 #: ../partman-jfs.templates:70
-msgid "You should use another file system, such as ext3, for the /boot partition."
+msgid ""
+"You should use another file system, such as ext3, for the /boot partition."
 msgstr ""
 "Bete fitxategi sistema bat, ext3 antzerakoa, erabili beharko zenuke /boot "
 "partiziorako."
@@ -3953,7 +3979,8 @@
 #. Type: error
 #. Description
 #: ../partman-xfs.templates:16
-msgid "The xfs file system creation in partition #${PARTITION} of ${DEVICE} failed."
+msgid ""
+"The xfs file system creation in partition #${PARTITION} of ${DEVICE} failed."
 msgstr ""
 "Ezin izan da xfs fitxategi-sistema sortu ${DEVICE} gailuko #${PARTITION} "
 "partizioan."
@@ -4485,8 +4512,10 @@
 #. The English text to translate for this list of timezones is:
 #. Godthab, Danmarkshavn, Scoresbysund, Thule
 #: ../common.templates:164
-msgid "America/Godthab, America/Danmarkshavn, America/Scoresbysund, America/Thule"
-msgstr "Amerika/Godthab, Amerika/Danmarkshavn, Amerika/Scoresbysund, Amerika/Thule"
+msgid ""
+"America/Godthab, America/Danmarkshavn, America/Scoresbysund, America/Thule"
+msgstr ""
+"Amerika/Godthab, Amerika/Danmarkshavn, Amerika/Scoresbysund, Amerika/Thule"
 
 #. Type: select
 #. Choices
@@ -4837,7 +4866,8 @@
 #. Type: error
 #. Description
 #: ../base-installer.templates:37
-msgid "The debootstrap program exited with an error (return value ${EXITCODE})."
+msgid ""
+"The debootstrap program exited with an error (return value ${EXITCODE})."
 msgstr ""
 "debootstrap programa errore batekin irten da (itzulitako balioa: "
 "${EXITCODE})."
@@ -5259,7 +5289,8 @@
 #. Description
 #: ../base-installer.templates:291
 msgid "Installing extra packages - retrieving and installing ${SUBST0}..."
-msgstr "Pakete gehigarriak instalatzen - ${SUBST0} eskuratzen eta instalatzen..."
+msgstr ""
+"Pakete gehigarriak instalatzen - ${SUBST0} eskuratzen eta instalatzen..."
 
 #. Type: text
 #. Description
@@ -5419,26 +5450,28 @@
 #. Type: boolean
 #. Description
 #: ../apt-mirror-setup.templates:19 ../apt-mirror-setup.templates-ubuntu:28
-msgid "Please choose whether you want this software to be made available to you."
-msgstr "Mesedez aukeratu ezazu software hau eskuragarri izan nahi duzun ala ez."
+msgid ""
+"Please choose whether you want this software to be made available to you."
+msgstr ""
+"Mesedez aukeratu ezazu software hau eskuragarri izan nahi duzun ala ez."
 
 #. Type: select
 #. Choices
-#: ../apt-mirror-setup.templates:30
+#: ../apt-mirror-setup.templates:32
 msgid "Ignore"
 msgstr "alde batetara utzi"
 
 #. Type: select
 #. Description
-#: ../apt-mirror-setup.templates:31
+#: ../apt-mirror-setup.templates:33
 msgid ""
 "The installer failed to access the mirror. This may be a problem with your "
 "network, or with the mirror. You can choose to retry the download, select a "
 "different mirror, or ignore the problem and continue without all the "
 "packages from this mirror."
 msgstr ""
-"Instalatzaileak huts egin du ispilura konektatzerakoan. Arazoa egon "
-"liteke sarearekin edo ispiluarekin. Berriro deskargatzen, beste ispilu bat "
+"Instalatzaileak huts egin du ispilura konektatzerakoan. Arazoa egon liteke "
+"sarearekin edo ispiluarekin. Berriro deskargatzen, beste ispilu bat "
 "hautatzen edo utzi eta ispilu honetako pakete guztiak gabe aurrera jarraitu "
 "dezakezu."
 
@@ -5586,7 +5619,8 @@
 #. Must fit within 80 characters.
 #: ../cdebconf-newt-udeb.templates:21
 msgid "<Tab> moves between items; <Space> selects; <Enter> activates buttons"
-msgstr "<Tab> elementuetan mugitzeko; <Zuriunea> hautatzeko; <Sartu> aktibatzeko"
+msgstr ""
+"<Tab> elementuetan mugitzeko; <Zuriunea> hautatzeko; <Sartu> aktibatzeko"
 
 #. Type: text
 #. Description
@@ -5766,7 +5800,8 @@
 #. Type: note
 #. Description
 #: ../nobootloader.templates:8
-msgid "Alternatively, you will be able to boot the kernel manually by entering :"
+msgid ""
+"Alternatively, you will be able to boot the kernel manually by entering :"
 msgstr "Bestela, nukleoa eskuz abiaraz dezakezu hau sartuz:"
 
 #. Type: note
@@ -5863,7 +5898,8 @@
 msgid ""
 "The following other operating systems have been detected on this computer: "
 "${OS_LIST}"
-msgstr "Beste sistema eragile hauek atzeman dira ordenagailu honetan: ${OS_LIST}"
+msgstr ""
+"Beste sistema eragile hauek atzeman dira ordenagailu honetan: ${OS_LIST}"
 
 #. Type: boolean
 #. Description
@@ -5883,7 +5919,8 @@
 #. Description
 #: ../grub-installer.templates:16
 msgid "Install the GRUB boot loader to the master boot record?"
-msgstr "GRUB abioko kargatzailea abioko erregistro maisuan instalatu nahi duzu?"
+msgstr ""
+"GRUB abioko kargatzailea abioko erregistro maisuan instalatu nahi duzu?"
 
 #. Type: boolean
 #. Description
@@ -6341,7 +6378,8 @@
 #. Description
 #: ../partman-newworld.templates:14
 msgid "The NewWorld boot partition must be at least 819200 bytes in size."
-msgstr "NewWorld abioko partizioak gutxienez 819200 byteko tamaina izan behar du."
+msgstr ""
+"NewWorld abioko partizioak gutxienez 819200 byteko tamaina izan behar du."
 
 #. Type: text
 #. Description
@@ -6704,7 +6742,8 @@
 #: ../quik-installer.templates:131 ../yaboot-installer.templates:88
 #: ../vmelilo-installer.templates:33
 msgid "Please check the system log or the output on the third console (tty3)."
-msgstr "Egiaztatu sistemaren egunkaria edo irteera hirugarren kontsolan (tty3)."
+msgstr ""
+"Egiaztatu sistemaren egunkaria edo irteera hirugarren kontsolan (tty3)."
 
 #. Type: error
 #. Description
@@ -6873,7 +6912,8 @@
 #. Type: note
 #. Description
 #: ../yaboot-installer.templates:97
-msgid "Alternatively, you will be able to boot the system manually by entering:"
+msgid ""
+"Alternatively, you will be able to boot the system manually by entering:"
 msgstr ""
 "Bestela, sistema eskuz berrabiarazteko gaitasuna izango duzuhonako hau "
 "sartuaz:"
@@ -6991,7 +7031,8 @@
 #. Type: error
 #. Description
 #: ../preseed-common.templates:45
-msgid "Execution of preseeded command \"${COMMAND}\" failed with exit code ${CODE}."
+msgid ""
+"Execution of preseeded command \"${COMMAND}\" failed with exit code ${CODE}."
 msgstr ""
 "Ezin izan da aurrez konfiguratutako \"${COMMAND}\" komandoa exekutatu, "
 "irteera-kodea: ${CODE}."
@@ -7090,7 +7131,8 @@
 #. Description
 #: ../rescue-mode.templates:34
 msgid "No usable shell was found on your root file system (${DEVICE})."
-msgstr "Ez da shell erabilgarririk aurkitu zure erro fitxategi sisteman (${DEVICE})."
+msgstr ""
+"Ez da shell erabilgarririk aurkitu zure erro fitxategi sisteman (${DEVICE})."
 
 #. Type: note
 #. Description
@@ -7244,7 +7286,8 @@
 #. Description
 #: ../iso-scan.templates:62
 msgid "Please do a network install instead, or reboot and fix the ISO image."
-msgstr "Horren ordez, egin sareko instalazioa, edo berrabiarazi eta doitu ISO irudia."
+msgstr ""
+"Horren ordez, egin sareko instalazioa, edo berrabiarazi eta doitu ISO irudia."
 
 #. Type: note
 #. Description
@@ -7374,7 +7417,8 @@
 #. Description
 #: ../save-logs.templates:42
 msgid "Log files and debug info will be copied into this floppy."
-msgstr "Erregstro fitxategiak eta arazpen argibideakdiskete horretan kopiatuko dira."
+msgstr ""
+"Erregstro fitxategiak eta arazpen argibideakdiskete horretan kopiatuko dira."
 
 #. Type: note
 #. Description
@@ -7417,7 +7461,8 @@
 #. Description
 #: ../cdrom-checker.templates:4
 msgid "Warning: this check depends on your hardware and may take some time."
-msgstr "Kontuz: egiaztapen hau zure hardwarearen araberakoa da eta luze jo dezake."
+msgstr ""
+"Kontuz: egiaztapen hau zure hardwarearen araberakoa da eta luze jo dezake."
 
 #. Type: note
 #. Description
@@ -7431,7 +7476,8 @@
 msgid ""
 "Please insert one of the official Debian CD-ROMs into the drive before "
 "continuing."
-msgstr "Jarraitu baino lehen, sartu Debian-en CD-ROM ofizialetako bat unitatean."
+msgstr ""
+"Jarraitu baino lehen, sartu Debian-en CD-ROM ofizialetako bat unitatean."
 
 #. Type: error
 #. Description
@@ -7490,7 +7536,8 @@
 #. Description
 #: ../cdrom-checker.templates:34
 msgid "The CD-ROM integrity test was successful. The CD-ROM is valid."
-msgstr "CD-ROMaren integritate-testa behar bezala egin da. CD-ROMa baliozkoa da."
+msgstr ""
+"CD-ROMaren integritate-testa behar bezala egin da. CD-ROMa baliozkoa da."
 
 #. Type: error
 #. Description
@@ -7526,7 +7573,8 @@
 msgid ""
 "Please make sure you have inserted the Debian boot CD-ROM  to continue with "
 "the installation."
-msgstr "Ziurtatu Debian-en abioko CD-ROMa sartu duzula instalatzen jarraitzeko."
+msgstr ""
+"Ziurtatu Debian-en abioko CD-ROMa sartu duzula instalatzen jarraitzeko."
 
 #. Type: text
 #. Description
@@ -7720,7 +7768,8 @@
 #. Description
 #: ../network-console.templates:73
 msgid "The fingerprint of this SSH server's host key is: ${fingerprint}"
-msgstr "SSH zerbitzariaren ostalari-gako honen hatz-marka hau da: ${fingerprint}"
+msgstr ""
+"SSH zerbitzariaren ostalari-gako honen hatz-marka hau da: ${fingerprint}"
 
 #. Type: note
 #. Description
@@ -7873,7 +7922,8 @@
 #. Description
 #: ../elilo-installer.templates:37
 msgid "Running \"/usr/sbin/elilo\" failed with error code \"${ERRCODE}\"."
-msgstr "Ezin izan da \"/usr/sbin/elilo\" exekutatu, errore-kodea: \"${ERRCODE}\"."
+msgstr ""
+"Ezin izan da \"/usr/sbin/elilo\" exekutatu, errore-kodea: \"${ERRCODE}\"."
 
 #. Type: boolean
 #. Description
@@ -7908,7 +7958,8 @@
 #. Description
 #: ../aboot-installer.templates:22
 msgid "Install /boot on a disk with an unsupported partition table?"
-msgstr "/boot onartzen ez den partizio-taula duen disko batean instalatu nahi duzu?"
+msgstr ""
+"/boot onartzen ez den partizio-taula duen disko batean instalatu nahi duzu?"
 
 #. Type: boolean
 #. Description
@@ -8582,8 +8633,10 @@
 #. Type: select
 #. Description
 #: ../mdcfg-utils.templates:18
-msgid "Please select one of the proposed actions to configure multidisk devices."
-msgstr "Hautatu proposatutako ekintzetako bat multidisk gailuak konfiguratzeko."
+msgid ""
+"Please select one of the proposed actions to configure multidisk devices."
+msgstr ""
+"Hautatu proposatutako ekintzetako bat multidisk gailuak konfiguratzeko."
 
 #. Type: error
 #. Description
@@ -8767,7 +8820,8 @@
 msgid ""
 "You have chosen to create a RAID0 array. Please choose the active devices in "
 "this array."
-msgstr "RAID0 array bat sortzea erabaki duzu. Aukeratu array honetako gailu aktiboak."
+msgstr ""
+"RAID0 array bat sortzea erabaki duzu. Aukeratu array honetako gailu aktiboak."
 
 #. Type: multiselect
 #. Description
@@ -8865,7 +8919,8 @@
 msgid ""
 "Please confirm whether you really want to delete the following multidisk "
 "device:"
-msgstr "Berretsi disko-anitzen gailu hauek benetan ezabatu nahi dituzun ala ez:"
+msgstr ""
+"Berretsi disko-anitzen gailu hauek benetan ezabatu nahi dituzun ala ez:"
 
 #. Type: boolean
 #. Description
@@ -9063,7 +9118,8 @@
 #. Type: error
 #. Description
 #: ../lvmcfg-utils.templates:69
-msgid "The selected volume group name is already in use. Please choose another name."
+msgid ""
+"The selected volume group name is already in use. Please choose another name."
 msgstr ""
 "Hautatutako bolumen-taldearen izena lehendik erabilita dago. Aukeratu beste "
 "izen bat."
@@ -9175,7 +9231,8 @@
 #. Type: error
 #. Description
 #: ../lvmcfg-utils.templates:127
-msgid "No physical volumes were selected. Extension of the volume group was aborted."
+msgid ""
+"No physical volumes were selected. Extension of the volume group was aborted."
 msgstr ""
 "Ez da bolumen fisikorik hautatu. Bolumen-taldea hedatzea bertan behera utzi "
 "da."
@@ -9254,7 +9311,8 @@
 msgid ""
 "The physical volume ${PARTITION} could not be removed from the selected  "
 "volume group."
-msgstr "Ezin izan da ${PARTITION} bolumen fisikoa kendu hautatutako bolumen-taldetik."
+msgstr ""
+"Ezin izan da ${PARTITION} bolumen fisikoa kendu hautatutako bolumen-taldetik."
 
 #. Type: error
 #. Description
@@ -9389,7 +9447,8 @@
 #. Type: error
 #. Description
 #: ../lvmcfg-utils.templates:240
-msgid "No logical volume has been found.  Please create a logical volume first."
+msgid ""
+"No logical volume has been found.  Please create a logical volume first."
 msgstr "Ez da bolumen-logikorik aurkitu. Lehenbizi, sortu bolumen logiko bat."
 
 #. Type: select
@@ -9479,7 +9538,8 @@
 #. Description
 #: ../partman-md.templates:12
 msgid "Write the changes to the storage devices and configure RAID?"
-msgstr "Aldaketak biltegiratze-gailuetan idaztea eta RAID konfiguratzea nahi duzu?"
+msgstr ""
+"Aldaketak biltegiratze-gailuetan idaztea eta RAID konfiguratzea nahi duzu?"
 
 #. Type: boolean
 #. Description
@@ -9495,7 +9555,8 @@
 #. Description
 #: ../partman-md.templates:27
 msgid "Keep current partition layout and configure RAID?"
-msgstr "Uneko partizio-eskema bere horretan uztea eta RAID konfiguratzea nahi duzu?"
+msgstr ""
+"Uneko partizio-eskema bere horretan uztea eta RAID konfiguratzea nahi duzu?"
 
 #. Type: boolean
 #. Description
@@ -9554,7 +9615,8 @@
 #. Description
 #: ../partman-lvm.templates:23
 msgid "Keep current partition layout and configure LVM?"
-msgstr "Uneko partizio-eskema bere horretan uztea eta LVM konfiguratzea nahi duzu?"
+msgstr ""
+"Uneko partizio-eskema bere horretan uztea eta LVM konfiguratzea nahi duzu?"
 
 #. Type: boolean
 #. Description
@@ -10104,7 +10166,8 @@
 #. Type: error
 #. Description
 #: ../partman-crypto.templates:273
-msgid "Please go back and choose a non-encrypted partition for the root filesystem."
+msgid ""
+"Please go back and choose a non-encrypted partition for the root filesystem."
 msgstr ""
 "Mesedez atzera jo eta enkriptazio gabeko partizio bat aukeratu erro "
 "fitxategi sistemarentzat."
@@ -10291,7 +10354,8 @@
 #. Type: boolean
 #. Description
 #: ../partconf.templates:68
-msgid "Since the partitions have already been mounted, you cannot do any changes."
+msgid ""
+"Since the partitions have already been mounted, you cannot do any changes."
 msgstr "Partizioak muntatu direnez, ezin duzu aldaketarik egin."
 
 #. Type: error
@@ -10416,8 +10480,10 @@
 #. Type: error
 #. Description
 #: ../partconf.templates:126
-msgid "An error occurred when the ${FS} file system was created on ${PARTITION}."
-msgstr "Errorea gertatu da ${PARTITION}(e)n ${FS} fitxategi-sistema sortu denean."
+msgid ""
+"An error occurred when the ${FS} file system was created on ${PARTITION}."
+msgstr ""
+"Errorea gertatu da ${PARTITION}(e)n ${FS} fitxategi-sistema sortu denean."
 
 #. Type: error
 #. Description
@@ -10717,7 +10783,8 @@
 #. Description
 #: ../autopartkit.templates:94
 msgid "Creating '${FSTYPE}' storage space on '${MOUNTPOINT}'"
-msgstr "Biltegiratzeko lekua '${FSTYPE}' sortzea '${MOUNTPOINT}' muntatze-puntuan"
+msgstr ""
+"Biltegiratzeko lekua '${FSTYPE}' sortzea '${MOUNTPOINT}' muntatze-puntuan"
 
 #. Type: text
 #. Description
@@ -10749,8 +10816,10 @@
 #. Type: select
 #. Choices
 #: ../s390-netdevice.templates:6
-msgid "lcs: qeth: OSA-2 Token Ring/Ethernet or OSA-Express Fast Ethernet (non-QDIO)"
-msgstr "lcs: qeth: OSA-2 Token Ring/Ethernet edo OSA-Express Fast Ethernet (ez-QDIO)"
+msgid ""
+"lcs: qeth: OSA-2 Token Ring/Ethernet or OSA-Express Fast Ethernet (non-QDIO)"
+msgstr ""
+"lcs: qeth: OSA-2 Token Ring/Ethernet edo OSA-Express Fast Ethernet (ez-QDIO)"
 
 #. Type: select
 #. Choices
@@ -10762,7 +10831,8 @@
 #. Choices
 #: ../s390-netdevice.templates:6
 msgid "iucv: Inter-User Communication Vehicle - available for VM guests only"
-msgstr "iucv: erabiltzailearteko komunikazioa - VM bezeroentzat bakarrik gaiturik"
+msgstr ""
+"iucv: erabiltzailearteko komunikazioa - VM bezeroentzat bakarrik gaiturik"
 
 #. Type: select
 #. Description
@@ -11125,7 +11195,8 @@
 #. Description
 #: ../s390-dasd.templates:36
 msgid "WARNING: All data on this disk will be IRREVERSIBLY LOST!"
-msgstr "ABISUA: Diskoko datu guztiak berreskuratzeko aukerarik gabe GALDUKO dira!"
+msgstr ""
+"ABISUA: Diskoko datu guztiak berreskuratzeko aukerarik gabe GALDUKO dira!"
 
 #. Type: text
 #. Description
@@ -11167,3 +11238,8 @@
 msgid "Configure the base system before rebooting"
 msgstr "Konfiguratu oinarri-sistema berrabiarazi baino lehen"
 
+#~ msgid "Desktop machine"
+#~ msgstr "Mahaigaineko makina"
+
+#~ msgid "Multi-user workstation"
+#~ msgstr "Hainbat erabiltzailerentzako lanpostua"

Modified: trunk/packages/po/fa.po
===================================================================
--- trunk/packages/po/fa.po	2005-11-16 01:40:18 UTC (rev 32163)
+++ trunk/packages/po/fa.po	2005-11-16 01:45:44 UTC (rev 32164)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: fa\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-15 08:03+0000\n"
+"POT-Creation-Date: 2005-11-16 01:33+0000\n"
 "PO-Revision-Date: 2005-07-31 18:31+0430\n"
 "Last-Translator: Arash Bijanzadeh\n"
 "Language-Team:  <fa at li.org>\n"
@@ -1956,32 +1956,34 @@
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#. These are choices of actions so this is, at least in English,
+#. an infinitive form
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 msgid "Retry"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 #, fuzzy
 msgid "Change mirror"
 msgstr "ØªÙ„Ø§Ø´ Ù…Ø¬Ø¯Ø¯, ØªØ¹ÙˆÛŒØ¶ Ø³Ø§ÛŒØª Ø¨Ø§Ø²ØªØ§Ø¨, Ù„ØºÙˆ"
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../mdcfg-utils.templates:122
+#: ../net-retriever.templates:5 ../mdcfg-utils.templates:122
 msgid "Cancel"
 msgstr "Ù„ØºÙˆ"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:31
+#: ../net-retriever.templates:7 ../apt-mirror-setup.templates:33
 msgid "Downloading a file failed:"
 msgstr "Ø¨Ø§Ø±Ú¯ÛŒØ±ÛŒ ÛŒÚ© Ù¾Ø±ÙˆÙ†Ø¯Ù‡ Ø´Ú©Ø³Øª Ø®ÙˆØ±Ø¯:"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5
+#: ../net-retriever.templates:7
 msgid ""
 "The installer failed to download a file from the mirror. This may be a "
 "problem with your network, or with the mirror. You can choose to retry the "
@@ -2687,15 +2689,16 @@
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:101
-msgid "Desktop machine"
-msgstr "Ú©Ø§Ù…Ù¾ÛŒÙˆØªØ± Ø±ÙˆÙ…ÛŒØ²ÛŒ"
+#, fuzzy
+msgid "Separate /home partition"
+msgstr "Ø§ÛŒÙ† Ù¾Ø§Ø±ØªÛŒØ´Ù† Ø±Ø§ Ù‚Ø§Ù„Ø¨ Ø¨Ù†Ø¯ÛŒ Ú©Ù†"
 
 #. Type: text
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:106
-msgid "Multi-user workstation"
-msgstr " Ø³ÛŒØ³ØªÙ… Ú†Ù†Ø¯ Ú©Ø§Ø±Ø¨Ø±Ù‡"
+msgid "Separate /home, /usr, /var, and /tmp partitions"
+msgstr ""
 
 #. Type: boolean
 #. Description
@@ -5419,14 +5422,14 @@
 
 #. Type: select
 #. Choices
-#: ../apt-mirror-setup.templates:30
+#: ../apt-mirror-setup.templates:32
 #, fuzzy
 msgid "Ignore"
 msgstr "Ù‡ÛŒÚ†Ú©Ø¯Ø§Ù…"
 
 #. Type: select
 #. Description
-#: ../apt-mirror-setup.templates:31
+#: ../apt-mirror-setup.templates:33
 #, fuzzy
 msgid ""
 "The installer failed to access the mirror. This may be a problem with your "
@@ -11164,6 +11167,12 @@
 msgid "Configure the base system before rebooting"
 msgstr "ØªÙ†Ø¸ÛŒÙ… Ø³ÛŒØ³ØªÙ… Ù¾Ø§ÛŒÙ‡ Ù‚Ø¨Ù„ Ø§Ø² Ø¨Ø§Ø²Ø±ÙˆØ´Ù† Ú©Ø±Ø¯Ù†"
 
+#~ msgid "Desktop machine"
+#~ msgstr "Ú©Ø§Ù…Ù¾ÛŒÙˆØªØ± Ø±ÙˆÙ…ÛŒØ²ÛŒ"
+
+#~ msgid "Multi-user workstation"
+#~ msgstr " Ø³ÛŒØ³ØªÙ… Ú†Ù†Ø¯ Ú©Ø§Ø±Ø¨Ø±Ù‡"
+
 #, fuzzy
 #~ msgid "Retry, Change mirror, Ignore"
 #~ msgstr "ØªÙ„Ø§Ø´ Ù…Ø¬Ø¯Ø¯, ØªØ¹ÙˆÛŒØ¶ Ø³Ø§ÛŒØª Ø¨Ø§Ø²ØªØ§Ø¨, Ù„ØºÙˆ"

Modified: trunk/packages/po/fi.po
===================================================================
--- trunk/packages/po/fi.po	2005-11-16 01:40:18 UTC (rev 32163)
+++ trunk/packages/po/fi.po	2005-11-16 01:45:44 UTC (rev 32164)
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-15 08:03+0000\n"
+"POT-Creation-Date: 2005-11-16 01:33+0000\n"
 "PO-Revision-Date: 2005-04-06 17:27+0300\n"
 "Last-Translator: Tapio Lehtonen <tale at debian.org>\n"
 "Language-Team: Finnish <debian-l10n-finnish at lists.debian.org>\n"
@@ -1966,32 +1966,34 @@
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#. These are choices of actions so this is, at least in English,
+#. an infinitive form
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 msgid "Retry"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 #, fuzzy
 msgid "Change mirror"
 msgstr "YritÃ¤ uudelleen, vaihda asennuspalvelinta, peru"
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../mdcfg-utils.templates:122
+#: ../net-retriever.templates:5 ../mdcfg-utils.templates:122
 msgid "Cancel"
 msgstr "Peru"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:31
+#: ../net-retriever.templates:7 ../apt-mirror-setup.templates:33
 msgid "Downloading a file failed:"
 msgstr "Tiedoston noutaminen epÃ¤onnistui:"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5
+#: ../net-retriever.templates:7
 msgid ""
 "The installer failed to download a file from the mirror. This may be a "
 "problem with your network, or with the mirror. You can choose to retry the "
@@ -2705,15 +2707,16 @@
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:101
-msgid "Desktop machine"
-msgstr "PÃ¶ytÃ¤kone"
+#, fuzzy
+msgid "Separate /home partition"
+msgstr "Alusta osio"
 
 #. Type: text
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:106
-msgid "Multi-user workstation"
-msgstr "Monen kÃ¤yttÃ¤jÃ¤n tyÃ¶asema"
+msgid "Separate /home, /usr, /var, and /tmp partitions"
+msgstr ""
 
 #. Type: boolean
 #. Description
@@ -5468,14 +5471,14 @@
 
 #. Type: select
 #. Choices
-#: ../apt-mirror-setup.templates:30
+#: ../apt-mirror-setup.templates:32
 #, fuzzy
 msgid "Ignore"
 msgstr "ei mikÃ¤Ã¤n"
 
 #. Type: select
 #. Description
-#: ../apt-mirror-setup.templates:31
+#: ../apt-mirror-setup.templates:33
 #, fuzzy
 msgid ""
 "The installer failed to access the mirror. This may be a problem with your "
@@ -11243,6 +11246,12 @@
 msgid "Configure the base system before rebooting"
 msgstr "SÃ¤Ã¤dÃ¤ perusjÃ¤rjestelmÃ¤ ennen uudelleenkÃ¤ynnistystÃ¤"
 
+#~ msgid "Desktop machine"
+#~ msgstr "PÃ¶ytÃ¤kone"
+
+#~ msgid "Multi-user workstation"
+#~ msgstr "Monen kÃ¤yttÃ¤jÃ¤n tyÃ¶asema"
+
 #, fuzzy
 #~ msgid "Retry, Change mirror, Ignore"
 #~ msgstr "YritÃ¤ uudelleen, vaihda asennuspalvelinta, peru"

Modified: trunk/packages/po/fr.po
===================================================================
--- trunk/packages/po/fr.po	2005-11-16 01:40:18 UTC (rev 32163)
+++ trunk/packages/po/fr.po	2005-11-16 01:45:44 UTC (rev 32164)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-15 08:03+0000\n"
+"POT-Creation-Date: 2005-11-16 01:33+0000\n"
 "PO-Revision-Date: 2005-11-15 09:18+0100\n"
 "Last-Translator: Christian Perrier <bubulle at debian.org>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -137,7 +137,8 @@
 msgid ""
 "If you have not finished the install, your system may be left in an unusable "
 "state."
-msgstr "Si l'installation n'est pas terminée, votre système peut être inutilisable."
+msgstr ""
+"Si l'installation n'est pas terminée, votre système peut être inutilisable."
 
 #. Type: text
 #. Description
@@ -494,7 +495,8 @@
 #. Description
 #: ../cdrom-detect.templates:4
 msgid "Load CD-ROM drivers from a driver floppy?"
-msgstr "Faut-il charger les pilotes de cédéroms depuis une disquette de pilotes ?"
+msgstr ""
+"Faut-il charger les pilotes de cédéroms depuis une disquette de pilotes ?"
 
 #. Type: boolean
 #. Description
@@ -519,7 +521,8 @@
 #. Description
 #: ../cdrom-detect.templates:19
 msgid "Manually select a CD-ROM module and device?"
-msgstr "Voulez-vous choisir le module et le périphérique du lecteur de cédéroms ?"
+msgstr ""
+"Voulez-vous choisir le module et le périphérique du lecteur de cédéroms ?"
 
 #. Type: boolean
 #. Description
@@ -1742,7 +1745,8 @@
 #. Type: error
 #. Description
 #: ../netcfg-static.templates:44
-msgid "You may have made an error entering your IP address, netmask and/or gateway."
+msgid ""
+"You may have made an error entering your IP address, netmask and/or gateway."
 msgstr ""
 "Il se peut que vous ayez mal indiqué l'adresse IP, le masque-réseau ou la "
 "passerelle."
@@ -1876,7 +1880,8 @@
 #. Description
 #: ../choose-mirror.templates.http-in:20 ../choose-mirror.templates.ftp-in:20
 msgid "Usually, ftp.<your country code>.debian.org is a good choice."
-msgstr "Généralement, ftp.<le_code_de_votre pays>.debian.org est un choix pertinent."
+msgstr ""
+"Généralement, ftp.<le_code_de_votre pays>.debian.org est un choix pertinent."
 
 #. Type: string
 #. Description
@@ -1887,7 +1892,8 @@
 #. Type: string
 #. Description
 #: ../choose-mirror.templates.http-in:29 ../choose-mirror.templates.ftp-in:29
-msgid "Please enter the hostname of the mirror from which Debian will be downloaded."
+msgid ""
+"Please enter the hostname of the mirror from which Debian will be downloaded."
 msgstr ""
 "Veuillez indiquer le nom du miroir Debian à partir duquel se fera le "
 "téléchargement."
@@ -1999,31 +2005,33 @@
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#. These are choices of actions so this is, at least in English,
+#. an infinitive form
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 msgid "Retry"
 msgstr "Réessayer"
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 msgid "Change mirror"
 msgstr "Changer de miroir"
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../mdcfg-utils.templates:122
+#: ../net-retriever.templates:5 ../mdcfg-utils.templates:122
 msgid "Cancel"
 msgstr "Annuler"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:31
+#: ../net-retriever.templates:7 ../apt-mirror-setup.templates:33
 msgid "Downloading a file failed:"
 msgstr "Échec du téléchargement d'un fichier :"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5
+#: ../net-retriever.templates:7
 msgid ""
 "The installer failed to download a file from the mirror. This may be a "
 "problem with your network, or with the mirror. You can choose to retry the "
@@ -2299,7 +2307,8 @@
 #. Type: boolean
 #. Description
 #: ../partman-base.templates:82
-msgid "No partition table changes and no creation of file systems have been planned."
+msgid ""
+"No partition table changes and no creation of file systems have been planned."
 msgstr ""
 "Aucune modification des tables de partitions et aucune création de systèmes "
 "de fichiers n'ont été planifiées."
@@ -2743,15 +2752,16 @@
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:101
-msgid "Desktop machine"
-msgstr "Ordinateur de bureau"
+#, fuzzy
+msgid "Separate /home partition"
+msgstr "Formater la partition"
 
 #. Type: text
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:106
-msgid "Multi-user workstation"
-msgstr "Station de travail multiutilisateur"
+msgid "Separate /home, /usr, /var, and /tmp partitions"
+msgstr ""
 
 #. Type: boolean
 #. Description
@@ -2923,7 +2933,8 @@
 #. Description
 #: ../partman-partitioning.templates:43
 msgid "Write the changes to disk and resize the partition?"
-msgstr "Écrire les changements sur les disques et redimensionner la partition ?"
+msgstr ""
+"Écrire les changements sur les disques et redimensionner la partition ?"
 
 #. Type: boolean
 #. Description
@@ -3159,7 +3170,8 @@
 #. Type: text
 #. Description
 #: ../partman-basicfilesystems.templates:3
-msgid "Checking the ${TYPE} file system in partition #${PARTITION} of ${DEVICE}..."
+msgid ""
+"Checking the ${TYPE} file system in partition #${PARTITION} of ${DEVICE}..."
 msgstr ""
 "Contrôle du système de fichiers ${TYPE} sur la partition n° ${PARTITION} de "
 "${DEVICE}..."
@@ -3289,7 +3301,8 @@
 #. Type: error
 #. Description
 #: ../partman-basicfilesystems.templates:59
-msgid "The creation of swap space in partition #${PARTITION} of ${DEVICE} failed."
+msgid ""
+"The creation of swap space in partition #${PARTITION} of ${DEVICE} failed."
 msgstr ""
 "La création de l'espace d'échange sur la partition n° ${PARTITION} de "
 "${DEVICE} a échoué."
@@ -3767,7 +3780,8 @@
 #. Type: text
 #. Description
 #: ../partman-ext3.templates:3
-msgid "Checking the ext3 file system in partition #${PARTITION} of ${DEVICE}..."
+msgid ""
+"Checking the ext3 file system in partition #${PARTITION} of ${DEVICE}..."
 msgstr ""
 "Contrôle du système de fichiers ext3 sur la partition n° ${PARTITION} de "
 "${DEVICE}..."
@@ -3797,7 +3811,8 @@
 #. Type: error
 #. Description
 #: ../partman-ext3.templates:16
-msgid "The ext3 file system creation in partition #${PARTITION} of ${DEVICE} failed."
+msgid ""
+"The ext3 file system creation in partition #${PARTITION} of ${DEVICE} failed."
 msgstr ""
 "La création du système de fichiers ext3 dans la partition n° ${PARTITION} de "
 "${DEVICE} a échoué."
@@ -3829,7 +3844,8 @@
 #. Type: text
 #. Description
 #: ../partman-reiserfs.templates:3
-msgid "Checking the ReiserFS file system in partition #${PARTITION} of ${DEVICE}..."
+msgid ""
+"Checking the ReiserFS file system in partition #${PARTITION} of ${DEVICE}..."
 msgstr ""
 "Contrôle du système de fichiers ReiserFS sur la partition n° ${PARTITION} de "
 "${DEVICE}..."
@@ -3915,7 +3931,8 @@
 #. Type: error
 #. Description
 #: ../partman-jfs.templates:16
-msgid "The jfs file system creation in partition #${PARTITION} of ${DEVICE} failed."
+msgid ""
+"The jfs file system creation in partition #${PARTITION} of ${DEVICE} failed."
 msgstr ""
 "La création du système de fichiers JFS dans la partition n° ${PARTITION} de "
 "${DEVICE} a échoué."
@@ -3948,7 +3965,8 @@
 #. Description
 #: ../partman-jfs.templates:61
 msgid "Use unrecommended JFS root file system?"
-msgstr "Faut-il utiliser un système de fichiers JFS pour la racine (déconseillé) ?"
+msgstr ""
+"Faut-il utiliser un système de fichiers JFS pour la racine (déconseillé) ?"
 
 #. Type: boolean
 #. Description
@@ -3991,7 +4009,8 @@
 #. Type: boolean
 #. Description
 #: ../partman-jfs.templates:70
-msgid "You should use another file system, such as ext3, for the /boot partition."
+msgid ""
+"You should use another file system, such as ext3, for the /boot partition."
 msgstr ""
 "Vous devriez utiliser un autre système de fichiers, par exemple ext3, pour "
 "la partition /boot."
@@ -4017,7 +4036,8 @@
 #. Type: error
 #. Description
 #: ../partman-xfs.templates:16
-msgid "The xfs file system creation in partition #${PARTITION} of ${DEVICE} failed."
+msgid ""
+"The xfs file system creation in partition #${PARTITION} of ${DEVICE} failed."
 msgstr ""
 "La création du système de fichiers XFS dans la partition n° ${PARTITION} de "
 "${DEVICE} a échoué."
@@ -4552,7 +4572,8 @@
 #. The English text to translate for this list of timezones is:
 #. Godthab, Danmarkshavn, Scoresbysund, Thule
 #: ../common.templates:164
-msgid "America/Godthab, America/Danmarkshavn, America/Scoresbysund, America/Thule"
+msgid ""
+"America/Godthab, America/Danmarkshavn, America/Scoresbysund, America/Thule"
 msgstr ""
 "Godthab (cas général), Danmarkshavn (côte Est - Nord de Scoresbysund), "
 "Scoresbysund - Ittoqqortoormiit, Thule - Pituffik"
@@ -4590,7 +4611,8 @@
 #. Tarawa (Gilbert Islands), Enderbury (Phoenix Islands), Kiritimati (Line Islands)
 #: ../common.templates:196
 msgid "Pacific/Tarawa, Pacific/Enderbury, Pacific/Kiritimati"
-msgstr "Tarawa (îles Gilbert), Enderbury (îles Phoenix), Kiritimati (îles Line)"
+msgstr ""
+"Tarawa (îles Gilbert), Enderbury (îles Phoenix), Kiritimati (îles Line)"
 
 #. Type: select
 #. Choices
@@ -4834,7 +4856,8 @@
 #. Description
 #: ../base-installer.templates:4
 msgid "Proceed with installation to unclean target?"
-msgstr "Faut-il installer le système de base par-dessus l'ancienne installation ?"
+msgstr ""
+"Faut-il installer le système de base par-dessus l'ancienne installation ?"
 
 #. Type: boolean
 #. Description
@@ -4916,7 +4939,8 @@
 #. Type: error
 #. Description
 #: ../base-installer.templates:37
-msgid "The debootstrap program exited with an error (return value ${EXITCODE})."
+msgid ""
+"The debootstrap program exited with an error (return value ${EXITCODE})."
 msgstr ""
 "Le programme debootstrap s'est terminé avec une erreur (valeur de retour "
 "${EXITCODE})."
@@ -5515,18 +5539,19 @@
 #. Type: boolean
 #. Description
 #: ../apt-mirror-setup.templates:19 ../apt-mirror-setup.templates-ubuntu:28
-msgid "Please choose whether you want this software to be made available to you."
+msgid ""
+"Please choose whether you want this software to be made available to you."
 msgstr "Veuillez indiquer si vous souhaitez avoir accès à ces logiciels."
 
 #. Type: select
 #. Choices
-#: ../apt-mirror-setup.templates:30
+#: ../apt-mirror-setup.templates:32
 msgid "Ignore"
 msgstr "Ignorer"
 
 #. Type: select
 #. Description
-#: ../apt-mirror-setup.templates:31
+#: ../apt-mirror-setup.templates:33
 msgid ""
 "The installer failed to access the mirror. This may be a problem with your "
 "network, or with the mirror. You can choose to retry the download, select a "
@@ -5883,7 +5908,8 @@
 #. Type: note
 #. Description
 #: ../nobootloader.templates:8
-msgid "Alternatively, you will be able to boot the kernel manually by entering :"
+msgid ""
+"Alternatively, you will be able to boot the kernel manually by entering :"
 msgstr "Le noyau pourra également être démarré manuellement avec :"
 
 #. Type: note
@@ -6446,7 +6472,8 @@
 #. Description
 #: ../lilo-installer.templates:89
 msgid "Running \"/sbin/lilo\" failed with error code \"${ERRCODE}\"."
-msgstr "L'exécution de « /sbin/lilo » a échoué avec le code d'erreur « ${ERRCODE} »."
+msgstr ""
+"L'exécution de « /sbin/lilo » a échoué avec le code d'erreur « ${ERRCODE} »."
 
 #. Type: text
 #. Description
@@ -7025,7 +7052,8 @@
 #. Type: note
 #. Description
 #: ../yaboot-installer.templates:97
-msgid "Alternatively, you will be able to boot the system manually by entering:"
+msgid ""
+"Alternatively, you will be able to boot the system manually by entering:"
 msgstr "Le noyau pourra également être démarré manuellement avec :"
 
 #. Type: note
@@ -7141,7 +7169,8 @@
 #. Type: error
 #. Description
 #: ../preseed-common.templates:45
-msgid "Execution of preseeded command \"${COMMAND}\" failed with exit code ${CODE}."
+msgid ""
+"Execution of preseeded command \"${COMMAND}\" failed with exit code ${CODE}."
 msgstr ""
 "L'exécution de la commande préconfigurée (« ${COMMAND} ») a échoué avec le "
 "code d'erreur ${CODE}."
@@ -8360,7 +8389,8 @@
 #. Description
 #: ../silo-installer.templates:11
 msgid "Running \"/sbin/silo\" failed with error code \"${ERRCODE}\"."
-msgstr "L'exécution de « /sbin/silo » a échoué avec le code d'erreur « ${ERRCODE} »."
+msgstr ""
+"L'exécution de « /sbin/silo » a échoué avec le code d'erreur « ${ERRCODE} »."
 
 #. Type: note
 #. Description
@@ -8794,7 +8824,8 @@
 #. Type: select
 #. Description
 #: ../mdcfg-utils.templates:18
-msgid "Please select one of the proposed actions to configure multidisk devices."
+msgid ""
+"Please select one of the proposed actions to configure multidisk devices."
 msgstr ""
 "Veuillez choisir l'une des actions proposées afin de configurer les "
 "périphériques multidisque."
@@ -9288,7 +9319,8 @@
 #. Description
 #: ../lvmcfg-utils.templates:63
 msgid "No name for the volume group has been entered.  Please enter a name."
-msgstr "Aucun nom n'a été choisi pour ce groupe de volumes. Veuillez choisir un nom."
+msgstr ""
+"Aucun nom n'a été choisi pour ce groupe de volumes. Veuillez choisir un nom."
 
 #. Type: error
 #. Description
@@ -9299,7 +9331,8 @@
 #. Type: error
 #. Description
 #: ../lvmcfg-utils.templates:69
-msgid "The selected volume group name is already in use. Please choose another name."
+msgid ""
+"The selected volume group name is already in use. Please choose another name."
 msgstr ""
 "Le nom choisi pour ce groupe de volumes existe déjà. Veuillez choisir un "
 "autre nom."
@@ -9413,7 +9446,8 @@
 #. Type: error
 #. Description
 #: ../lvmcfg-utils.templates:127
-msgid "No physical volumes were selected. Extension of the volume group was aborted."
+msgid ""
+"No physical volumes were selected. Extension of the volume group was aborted."
 msgstr ""
 "Aucun volume physique n'a été choisi. L'extension du groupe de volumes a été "
 "abandonnée."
@@ -9555,7 +9589,8 @@
 #. Description
 #: ../lvmcfg-utils.templates:199
 msgid "No name for the logical volume has been entered.  Please enter a name."
-msgstr "Aucun nom n'a été choisi pour le volume logique. Veuillez choisir un nom."
+msgstr ""
+"Aucun nom n'a été choisi pour le volume logique. Veuillez choisir un nom."
 
 #. Type: error
 #. Description
@@ -9611,7 +9646,8 @@
 #. Description
 #: ../lvmcfg-utils.templates:228
 msgid "No volume group has been found for deleting a logical volume."
-msgstr "Aucun groupe de volumes n'a été trouvé pour supprimer un volume logique."
+msgstr ""
+"Aucun groupe de volumes n'a été trouvé pour supprimer un volume logique."
 
 #. Type: select
 #. Description
@@ -9638,7 +9674,8 @@
 #. Type: error
 #. Description
 #: ../lvmcfg-utils.templates:240
-msgid "No logical volume has been found.  Please create a logical volume first."
+msgid ""
+"No logical volume has been found.  Please create a logical volume first."
 msgstr "Aucun volume logique n'a été trouvé. Veuillez d'abord en créer un."
 
 #. Type: select
@@ -10036,7 +10073,8 @@
 #. Description
 #: ../partman-crypto.templates:126
 msgid "Write the changes to disks and configure encrypted volumes?"
-msgstr "Écrire les modifications sur les disques et configurer les volumes chiffrés ?"
+msgstr ""
+"Écrire les modifications sur les disques et configurer les volumes chiffrés ?"
 
 #. Type: boolean
 #. Description
@@ -10081,7 +10119,8 @@
 #. Description
 #: ../partman-crypto.templates:149
 msgid "An error occurred while configuring encrypted volumes."
-msgstr "Une erreur s'est produite lors de la configuration des volumes chiffrés."
+msgstr ""
+"Une erreur s'est produite lors de la configuration des volumes chiffrés."
 
 #. Type: error
 #. Description
@@ -10184,7 +10223,8 @@
 #. Description
 #: ../partman-crypto.templates:198
 msgid "You need to choose a passphrase to encrypt ${DEVICE}."
-msgstr "Vous devez choisir une phrase secrète pour le chiffrement de ${DEVICE}."
+msgstr ""
+"Vous devez choisir une phrase secrète pour le chiffrement de ${DEVICE}."
 
 #. Type: password
 #. Description
@@ -10287,7 +10327,8 @@
 #. Description
 #: ../partman-crypto.templates:239
 msgid "The encryption key for ${DEVICE} is now being created. (${PROGRESS})"
-msgstr "La clé de chiffrement pour ${DEVICE} est en cours de création (${PROGRESS})."
+msgstr ""
+"La clé de chiffrement pour ${DEVICE} est en cours de création (${PROGRESS})."
 
 #. Type: string
 #. Description
@@ -10369,7 +10410,8 @@
 #. Type: error
 #. Description
 #: ../partman-crypto.templates:273
-msgid "Please go back and choose a non-encrypted partition for the root filesystem."
+msgid ""
+"Please go back and choose a non-encrypted partition for the root filesystem."
 msgstr ""
 "Veuillez revenir en arrière et choisir une partition non chiffrée pour le "
 "système de fichiers racine."
@@ -10561,7 +10603,8 @@
 #. Type: boolean
 #. Description
 #: ../partconf.templates:68
-msgid "Since the partitions have already been mounted, you cannot do any changes."
+msgid ""
+"Since the partitions have already been mounted, you cannot do any changes."
 msgstr ""
 "Comme les partitions ont déjà été montées, vous ne pouvez effectuer aucune "
 "modification."
@@ -10645,7 +10688,8 @@
 #. Description
 #: ../partconf.templates:102
 msgid "File systems will be created and partitions mounted."
-msgstr "Les systèmes de fichiers seront créés et les partitions seront montées."
+msgstr ""
+"Les systèmes de fichiers seront créés et les partitions seront montées."
 
 #. Type: boolean
 #. Description
@@ -10694,7 +10738,8 @@
 #. Type: error
 #. Description
 #: ../partconf.templates:126
-msgid "An error occurred when the ${FS} file system was created on ${PARTITION}."
+msgid ""
+"An error occurred when the ${FS} file system was created on ${PARTITION}."
 msgstr ""
 "Une erreur s'est produite pendant la création du système de fichiers ${FS} "
 "sur ${PARTITION}."
@@ -10709,7 +10754,8 @@
 #. Description
 #: ../partconf.templates:134
 msgid "An error occurred when ${PARTITION} was mounted on ${MOUNT}."
-msgstr "Une erreur s'est produite lors du montage de ${PARTITION} sur ${MOUNT}."
+msgstr ""
+"Une erreur s'est produite lors du montage de ${PARTITION} sur ${MOUNT}."
 
 #. Type: error
 #. Description
@@ -10744,7 +10790,8 @@
 #. Description
 #: ../partitioner.templates:4
 msgid "Please choose one of the listed disks, to create partitions on it."
-msgstr "Veuillez choisir l'un des disques affichés, pour y créer des partitions."
+msgstr ""
+"Veuillez choisir l'un des disques affichés, pour y créer des partitions."
 
 #. Type: error
 #. Description
@@ -10953,7 +11000,8 @@
 #. Description
 #: ../autopartkit.templates:69
 msgid "Here is some debug information. The value of ${variable} is:"
-msgstr "Voici quelques informations de débogage. La valeur de ${variable} est :"
+msgstr ""
+"Voici quelques informations de débogage. La valeur de ${variable} est :"
 
 #. Type: note
 #. Description
@@ -11036,7 +11084,8 @@
 #. Type: select
 #. Choices
 #: ../s390-netdevice.templates:6
-msgid "lcs: qeth: OSA-2 Token Ring/Ethernet or OSA-Express Fast Ethernet (non-QDIO)"
+msgid ""
+"lcs: qeth: OSA-2 Token Ring/Ethernet or OSA-Express Fast Ethernet (non-QDIO)"
 msgstr ""
 "lcs : qeth : OSA-2 Token Ring/Ethernet ou OSA-Express Fast Ethernet (non-"
 "QDIO)"
@@ -11466,3 +11515,8 @@
 msgid "Configure the base system before rebooting"
 msgstr "Configurer le système de base avant de redémarrer"
 
+#~ msgid "Desktop machine"
+#~ msgstr "Ordinateur de bureau"
+
+#~ msgid "Multi-user workstation"
+#~ msgstr "Station de travail multiutilisateur"

Modified: trunk/packages/po/ga.po
===================================================================
--- trunk/packages/po/ga.po	2005-11-16 01:40:18 UTC (rev 32163)
+++ trunk/packages/po/ga.po	2005-11-16 01:45:44 UTC (rev 32164)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-15 08:03+0000\n"
+"POT-Creation-Date: 2005-11-16 01:33+0000\n"
 "PO-Revision-Date: 2004-09-15 12:24+0200\n"
 "Last-Translator:  <>\n"
 "Language-Team: Debian L10n Irish <debian-l10n-irish at lists.debian.org>\n"
@@ -1744,31 +1744,33 @@
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#. These are choices of actions so this is, at least in English,
+#. an infinitive form
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 msgid "Retry"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 msgid "Change mirror"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../mdcfg-utils.templates:122
+#: ../net-retriever.templates:5 ../mdcfg-utils.templates:122
 msgid "Cancel"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:31
+#: ../net-retriever.templates:7 ../apt-mirror-setup.templates:33
 msgid "Downloading a file failed:"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5
+#: ../net-retriever.templates:7
 msgid ""
 "The installer failed to download a file from the mirror. This may be a "
 "problem with your network, or with the mirror. You can choose to retry the "
@@ -2418,14 +2420,14 @@
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:101
-msgid "Desktop machine"
+msgid "Separate /home partition"
 msgstr ""
 
 #. Type: text
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:106
-msgid "Multi-user workstation"
+msgid "Separate /home, /usr, /var, and /tmp partitions"
 msgstr ""
 
 #. Type: boolean
@@ -4979,13 +4981,13 @@
 
 #. Type: select
 #. Choices
-#: ../apt-mirror-setup.templates:30
+#: ../apt-mirror-setup.templates:32
 msgid "Ignore"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../apt-mirror-setup.templates:31
+#: ../apt-mirror-setup.templates:33
 msgid ""
 "The installer failed to access the mirror. This may be a problem with your "
 "network, or with the mirror. You can choose to retry the download, select a "

Modified: trunk/packages/po/gl.po
===================================================================
--- trunk/packages/po/gl.po	2005-11-16 01:40:18 UTC (rev 32163)
+++ trunk/packages/po/gl.po	2005-11-16 01:45:44 UTC (rev 32164)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-15 08:03+0000\n"
+"POT-Creation-Date: 2005-11-16 01:33+0000\n"
 "PO-Revision-Date: 2005-11-15 16:11+0100\n"
 "Last-Translator: Jacobo Tarrio <jtarrio at debian.org>\n"
 "Language-Team: Galego <trasno at ceu.fi.udc.es>\n"
@@ -1962,31 +1962,33 @@
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#. These are choices of actions so this is, at least in English,
+#. an infinitive form
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 msgid "Retry"
 msgstr "Volver tentalo"
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 msgid "Change mirror"
 msgstr "Cambiar a rÃ©plica"
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../mdcfg-utils.templates:122
+#: ../net-retriever.templates:5 ../mdcfg-utils.templates:122
 msgid "Cancel"
 msgstr "Cancelar"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:31
+#: ../net-retriever.templates:7 ../apt-mirror-setup.templates:33
 msgid "Downloading a file failed:"
 msgstr "Non se puido descargar un ficheiro:"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5
+#: ../net-retriever.templates:7
 msgid ""
 "The installer failed to download a file from the mirror. This may be a "
 "problem with your network, or with the mirror. You can choose to retry the "
@@ -2707,15 +2709,16 @@
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:101
-msgid "Desktop machine"
-msgstr "MÃ¡quina de escritorio"
+#, fuzzy
+msgid "Separate /home partition"
+msgstr "formatar a particiÃ³n"
 
 #. Type: text
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:106
-msgid "Multi-user workstation"
-msgstr "EstaciÃ³n de traballo multiusuario"
+msgid "Separate /home, /usr, /var, and /tmp partitions"
+msgstr ""
 
 #. Type: boolean
 #. Description
@@ -5470,13 +5473,13 @@
 
 #. Type: select
 #. Choices
-#: ../apt-mirror-setup.templates:30
+#: ../apt-mirror-setup.templates:32
 msgid "Ignore"
 msgstr "Ignorar"
 
 #. Type: select
 #. Description
-#: ../apt-mirror-setup.templates:31
+#: ../apt-mirror-setup.templates:33
 msgid ""
 "The installer failed to access the mirror. This may be a problem with your "
 "network, or with the mirror. You can choose to retry the download, select a "
@@ -11302,6 +11305,12 @@
 msgid "Configure the base system before rebooting"
 msgstr "Configurar o sistema base antes de reiniciar"
 
+#~ msgid "Desktop machine"
+#~ msgstr "MÃ¡quina de escritorio"
+
+#~ msgid "Multi-user workstation"
+#~ msgstr "EstaciÃ³n de traballo multiusuario"
+
 #, fuzzy
 #~ msgid "Retry, Change mirror, Ignore"
 #~ msgstr "Volver tentar, Cambiar rÃ©plica, Cancelar"

Modified: trunk/packages/po/he.po
===================================================================
--- trunk/packages/po/he.po	2005-11-16 01:40:18 UTC (rev 32163)
+++ trunk/packages/po/he.po	2005-11-16 01:45:44 UTC (rev 32164)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-15 08:03+0000\n"
+"POT-Creation-Date: 2005-11-16 01:33+0000\n"
 "PO-Revision-Date: 2005-07-12 19:37+0300\n"
 "Last-Translator: Lior Kaplan <webmaster at guides.co.il>\n"
 "Language-Team: Debian l10n Hebrew <webmaster at guides.co.il>\n"
@@ -1914,32 +1914,34 @@
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#. These are choices of actions so this is, at least in English,
+#. an infinitive form
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 msgid "Retry"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 #, fuzzy
 msgid "Change mirror"
 msgstr "× ×¡×” ×ž×—×“×©, ×©× ×” ××ª×¨ ×ž×¨××”, ×‘×˜×œ"
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../mdcfg-utils.templates:122
+#: ../net-retriever.templates:5 ../mdcfg-utils.templates:122
 msgid "Cancel"
 msgstr "×‘×˜×œ"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:31
+#: ../net-retriever.templates:7 ../apt-mirror-setup.templates:33
 msgid "Downloading a file failed:"
 msgstr "×”×•×¨×“×ª ×§×•×‘×¥ × ×›×©×œ×”:"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5
+#: ../net-retriever.templates:7
 msgid ""
 "The installer failed to download a file from the mirror. This may be a "
 "problem with your network, or with the mirror. You can choose to retry the "
@@ -2631,15 +2633,16 @@
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:101
-msgid "Desktop machine"
-msgstr "×ž×—×©×‘ ×©×•×œ×—× ×™"
+#, fuzzy
+msgid "Separate /home partition"
+msgstr "×”×›× ×ª ×ž×—×™×¦×” ×œ×¢×‘×•×“×” (×¤×•×¨×ž×˜)"
 
 #. Type: text
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:106
-msgid "Multi-user workstation"
-msgstr "×ª×—× ×ª ×¢×‘×•×“×” ×ž×¨×•×‘×ª ×ž×©×ª×ž×©×™×"
+msgid "Separate /home, /usr, /var, and /tmp partitions"
+msgstr ""
 
 #. Type: boolean
 #. Description
@@ -5360,14 +5363,14 @@
 
 #. Type: select
 #. Choices
-#: ../apt-mirror-setup.templates:30
+#: ../apt-mirror-setup.templates:32
 #, fuzzy
 msgid "Ignore"
 msgstr "×œ×œ×"
 
 #. Type: select
 #. Description
-#: ../apt-mirror-setup.templates:31
+#: ../apt-mirror-setup.templates:33
 #, fuzzy
 msgid ""
 "The installer failed to access the mirror. This may be a problem with your "
@@ -11000,6 +11003,12 @@
 msgid "Configure the base system before rebooting"
 msgstr "×”×’×“×¨ ××ª ×ž×¢×¨×›×ª ×”×‘×¡×™×¡ ×œ×¤× ×™ ××ª×—×•×œ"
 
+#~ msgid "Desktop machine"
+#~ msgstr "×ž×—×©×‘ ×©×•×œ×—× ×™"
+
+#~ msgid "Multi-user workstation"
+#~ msgstr "×ª×—× ×ª ×¢×‘×•×“×” ×ž×¨×•×‘×ª ×ž×©×ª×ž×©×™×"
+
 #, fuzzy
 #~ msgid "Retry, Change mirror, Ignore"
 #~ msgstr "× ×¡×” ×ž×—×“×©, ×©× ×” ××ª×¨ ×ž×¨××”, ×‘×˜×œ"

Modified: trunk/packages/po/hi.po
===================================================================
--- trunk/packages/po/hi.po	2005-11-16 01:40:18 UTC (rev 32163)
+++ trunk/packages/po/hi.po	2005-11-16 01:45:44 UTC (rev 32164)
@@ -21,7 +21,7 @@
 msgstr ""
 "Project-Id-Version: debian-installer_packages_po\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-15 08:03+0000\n"
+"POT-Creation-Date: 2005-11-16 01:33+0000\n"
 "PO-Revision-Date: 2005-10-28 21:48+0530\n"
 "Last-Translator: Nishant Sharma <me at nishants.net>\n"
 "Language-Team:  <en at li.org>\n"
@@ -1909,32 +1909,34 @@
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#. These are choices of actions so this is, at least in English,
+#. an infinitive form
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 msgid "Retry"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 #, fuzzy
 msgid "Change mirror"
 msgstr "à¤«à¤¿à¤° à¤¸à¥‡ à¤•à¥‹à¤¶à¤¿à¤¶ à¤•à¤°à¥‡à¤‚, à¤®à¤¿à¤°à¤° à¤¬à¤¦à¤²à¥‡à¤‚, à¤°à¤¦à¥à¤¦ à¤•à¤°à¥‡à¤‚"
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../mdcfg-utils.templates:122
+#: ../net-retriever.templates:5 ../mdcfg-utils.templates:122
 msgid "Cancel"
 msgstr "à¤°à¤¦à¥à¤¦ à¤•à¤°à¥‡à¤‚"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:31
+#: ../net-retriever.templates:7 ../apt-mirror-setup.templates:33
 msgid "Downloading a file failed:"
 msgstr "à¤«à¤¼à¤¾à¤‡à¤² à¤¡à¤¾à¤‰à¤¨à¤²à¥‹à¤¡ à¤•à¤°à¤¨à¥‡ à¤®à¥‡à¤‚ à¤…à¤¸à¤«à¤²à¤ƒ"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5
+#: ../net-retriever.templates:7
 msgid ""
 "The installer failed to download a file from the mirror. This may be a "
 "problem with your network, or with the mirror. You can choose to retry the "
@@ -2600,15 +2602,16 @@
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:101
-msgid "Desktop machine"
-msgstr "à¤¡à¥‡à¤¸à¥à¤•à¤Ÿà¥‰à¤ª à¤®à¤¶à¥€à¤¨"
+#, fuzzy
+msgid "Separate /home partition"
+msgstr "à¤ªà¤¾à¤°à¥à¤Ÿà¥€à¤¶à¤¨ à¤«à¥‰à¤°à¥à¤®à¥‡à¤Ÿ à¤•à¤°à¥‡à¤‚"
 
 #. Type: text
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:106
-msgid "Multi-user workstation"
-msgstr "à¤¬à¤¹à¥-à¤‰à¤ªà¤¯à¥‹à¤•à¥à¤¤à¤¾ à¤µà¤°à¥à¤•à¤¸à¥à¤Ÿà¥‡à¤¶à¤¨"
+msgid "Separate /home, /usr, /var, and /tmp partitions"
+msgstr ""
 
 #. Type: boolean
 #. Description
@@ -5205,14 +5208,14 @@
 
 #. Type: select
 #. Choices
-#: ../apt-mirror-setup.templates:30
+#: ../apt-mirror-setup.templates:32
 #, fuzzy
 msgid "Ignore"
 msgstr "à¤•à¥à¤› à¤¨à¤¹à¥€à¤‚"
 
 #. Type: select
 #. Description
-#: ../apt-mirror-setup.templates:31
+#: ../apt-mirror-setup.templates:33
 msgid ""
 "The installer failed to access the mirror. This may be a problem with your "
 "network, or with the mirror. You can choose to retry the download, select a "
@@ -10433,6 +10436,12 @@
 msgid "Configure the base system before rebooting"
 msgstr ""
 
+#~ msgid "Desktop machine"
+#~ msgstr "à¤¡à¥‡à¤¸à¥à¤•à¤Ÿà¥‰à¤ª à¤®à¤¶à¥€à¤¨"
+
+#~ msgid "Multi-user workstation"
+#~ msgstr "à¤¬à¤¹à¥-à¤‰à¤ªà¤¯à¥‹à¤•à¥à¤¤à¤¾ à¤µà¤°à¥à¤•à¤¸à¥à¤Ÿà¥‡à¤¶à¤¨"
+
 #, fuzzy
 #~ msgid "Retry, Change mirror, Ignore"
 #~ msgstr "à¤«à¤¿à¤° à¤¸à¥‡ à¤•à¥‹à¤¶à¤¿à¤¶ à¤•à¤°à¥‡à¤‚, à¤®à¤¿à¤°à¤° à¤¬à¤¦à¤²à¥‡à¤‚, à¤°à¤¦à¥à¤¦ à¤•à¤°à¥‡à¤‚"

Modified: trunk/packages/po/hr.po
===================================================================
--- trunk/packages/po/hr.po	2005-11-16 01:40:18 UTC (rev 32163)
+++ trunk/packages/po/hr.po	2005-11-16 01:45:44 UTC (rev 32164)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: Debian-installer 1st-stage master file HR\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-15 08:03+0000\n"
+"POT-Creation-Date: 2005-11-16 01:33+0000\n"
 "PO-Revision-Date: 2005-03-05 21:51+0100\n"
 "Last-Translator: Krunoslav Gernhard <kruno at linux.hr>\n"
 "Language-Team: Croatian <lokalizacija at linux.hr>\n"
@@ -1943,32 +1943,34 @@
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#. These are choices of actions so this is, at least in English,
+#. an infinitive form
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 msgid "Retry"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 #, fuzzy
 msgid "Change mirror"
 msgstr "Poku¹aj iznova, Promijeni zrcalnik, Otka¾i"
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../mdcfg-utils.templates:122
+#: ../net-retriever.templates:5 ../mdcfg-utils.templates:122
 msgid "Cancel"
 msgstr "Otka¾i"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:31
+#: ../net-retriever.templates:7 ../apt-mirror-setup.templates:33
 msgid "Downloading a file failed:"
 msgstr "Skidanje datoteke neuspjelo"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5
+#: ../net-retriever.templates:7
 msgid ""
 "The installer failed to download a file from the mirror. This may be a "
 "problem with your network, or with the mirror. You can choose to retry the "
@@ -2683,15 +2685,16 @@
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:101
-msgid "Desktop machine"
-msgstr "Kuæno raèunalo"
+#, fuzzy
+msgid "Separate /home partition"
+msgstr "formatiraj particiju"
 
 #. Type: text
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:106
-msgid "Multi-user workstation"
-msgstr "Vi¹ekorisnièka radna stanica"
+msgid "Separate /home, /usr, /var, and /tmp partitions"
+msgstr ""
 
 #. Type: boolean
 #. Description
@@ -5439,14 +5442,14 @@
 
 #. Type: select
 #. Choices
-#: ../apt-mirror-setup.templates:30
+#: ../apt-mirror-setup.templates:32
 #, fuzzy
 msgid "Ignore"
 msgstr "nijedan"
 
 #. Type: select
 #. Description
-#: ../apt-mirror-setup.templates:31
+#: ../apt-mirror-setup.templates:33
 #, fuzzy
 msgid ""
 "The installer failed to access the mirror. This may be a problem with your "
@@ -11173,6 +11176,12 @@
 msgid "Configure the base system before rebooting"
 msgstr "Podesite osnovni sustav prije novog podizanja"
 
+#~ msgid "Desktop machine"
+#~ msgstr "Kuæno raèunalo"
+
+#~ msgid "Multi-user workstation"
+#~ msgstr "Vi¹ekorisnièka radna stanica"
+
 #, fuzzy
 #~ msgid "Retry, Change mirror, Ignore"
 #~ msgstr "Poku¹aj iznova, Promijeni zrcalnik, Otka¾i"

Modified: trunk/packages/po/hu.po
===================================================================
--- trunk/packages/po/hu.po	2005-11-16 01:40:18 UTC (rev 32163)
+++ trunk/packages/po/hu.po	2005-11-16 01:45:44 UTC (rev 32164)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-15 08:03+0000\n"
+"POT-Creation-Date: 2005-11-16 01:33+0000\n"
 "PO-Revision-Date: 2005-05-13 18:04+0100\n"
 "Last-Translator: VEROK Istvan <vi at fsf.hu>\n"
 "Language-Team: Debian L10n Hungarian <debian-l10n-hungarian at lists.debian>\n"
@@ -1984,32 +1984,34 @@
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#. These are choices of actions so this is, at least in English,
+#. an infinitive form
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 msgid "Retry"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 #, fuzzy
 msgid "Change mirror"
 msgstr "Ãšjra, MÃ¡sik tÃ¼kÃ¶r, MÃ©gsem"
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../mdcfg-utils.templates:122
+#: ../net-retriever.templates:5 ../mdcfg-utils.templates:122
 msgid "Cancel"
 msgstr "MÃ©gsem"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:31
+#: ../net-retriever.templates:7 ../apt-mirror-setup.templates:33
 msgid "Downloading a file failed:"
 msgstr "FÃ¡jlletÃ¶ltÃ©s meghiÃºsult:"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5
+#: ../net-retriever.templates:7
 msgid ""
 "The installer failed to download a file from the mirror. This may be a "
 "problem with your network, or with the mirror. You can choose to retry the "
@@ -2734,15 +2736,16 @@
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:101
-msgid "Desktop machine"
-msgstr "Otthoni vagy irodai gÃ©p"
+#, fuzzy
+msgid "Separate /home partition"
+msgstr "partÃciÃ³ formattÃ¡lÃ¡sa"
 
 #. Type: text
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:106
-msgid "Multi-user workstation"
-msgstr "TÃ¶bbfelhasznÃ¡lÃ³s munkaÃ¡llomÃ¡s"
+msgid "Separate /home, /usr, /var, and /tmp partitions"
+msgstr ""
 
 #. Type: boolean
 #. Description
@@ -5511,14 +5514,14 @@
 
 #. Type: select
 #. Choices
-#: ../apt-mirror-setup.templates:30
+#: ../apt-mirror-setup.templates:32
 #, fuzzy
 msgid "Ignore"
 msgstr "semmi"
 
 #. Type: select
 #. Description
-#: ../apt-mirror-setup.templates:31
+#: ../apt-mirror-setup.templates:33
 #, fuzzy
 msgid ""
 "The installer failed to access the mirror. This may be a problem with your "
@@ -11342,6 +11345,12 @@
 msgid "Configure the base system before rebooting"
 msgstr "Az alaprendszer konfigurÃ¡lÃ¡sa ÃºjraindÃtÃ¡s elÅ‘tt"
 
+#~ msgid "Desktop machine"
+#~ msgstr "Otthoni vagy irodai gÃ©p"
+
+#~ msgid "Multi-user workstation"
+#~ msgstr "TÃ¶bbfelhasznÃ¡lÃ³s munkaÃ¡llomÃ¡s"
+
 #, fuzzy
 #~ msgid "Retry, Change mirror, Ignore"
 #~ msgstr "Ãšjra, MÃ¡sik tÃ¼kÃ¶r, MÃ©gsem"

Modified: trunk/packages/po/id.po
===================================================================
--- trunk/packages/po/id.po	2005-11-16 01:40:18 UTC (rev 32163)
+++ trunk/packages/po/id.po	2005-11-16 01:45:44 UTC (rev 32164)
@@ -14,7 +14,7 @@
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-15 08:03+0000\n"
+"POT-Creation-Date: 2005-11-16 01:33+0000\n"
 "PO-Revision-Date: 2005-07-08 00:05+0700\n"
 "Last-Translator: Arief S Fitrianto <arief at gurame.fisika.ui.ac.id>\n"
 "Language-Team: Debian Indonesia Team <debian-l10n-id at gurame.fisika.ui.ac."
@@ -1965,32 +1965,34 @@
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#. These are choices of actions so this is, at least in English,
+#. an infinitive form
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 msgid "Retry"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 #, fuzzy
 msgid "Change mirror"
 msgstr "Ulangi, Ubah mirror, Batal"
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../mdcfg-utils.templates:122
+#: ../net-retriever.templates:5 ../mdcfg-utils.templates:122
 msgid "Cancel"
 msgstr "Batal"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:31
+#: ../net-retriever.templates:7 ../apt-mirror-setup.templates:33
 msgid "Downloading a file failed:"
 msgstr "Download berkas gagal:"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5
+#: ../net-retriever.templates:7
 msgid ""
 "The installer failed to download a file from the mirror. This may be a "
 "problem with your network, or with the mirror. You can choose to retry the "
@@ -2708,15 +2710,16 @@
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:101
-msgid "Desktop machine"
-msgstr "Mesin desktop"
+#, fuzzy
+msgid "Separate /home partition"
+msgstr "format partisi ini"
 
 #. Type: text
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:106
-msgid "Multi-user workstation"
-msgstr "Stasiun kerja banyak pengguna"
+msgid "Separate /home, /usr, /var, and /tmp partitions"
+msgstr ""
 
 #. Type: boolean
 #. Description
@@ -5451,14 +5454,14 @@
 
 #. Type: select
 #. Choices
-#: ../apt-mirror-setup.templates:30
+#: ../apt-mirror-setup.templates:32
 #, fuzzy
 msgid "Ignore"
 msgstr "Tak ada"
 
 #. Type: select
 #. Description
-#: ../apt-mirror-setup.templates:31
+#: ../apt-mirror-setup.templates:33
 #, fuzzy
 msgid ""
 "The installer failed to access the mirror. This may be a problem with your "
@@ -11227,6 +11230,12 @@
 msgid "Configure the base system before rebooting"
 msgstr "Mengonfigurasi sistem dasar sebelum reboot"
 
+#~ msgid "Desktop machine"
+#~ msgstr "Mesin desktop"
+
+#~ msgid "Multi-user workstation"
+#~ msgstr "Stasiun kerja banyak pengguna"
+
 #, fuzzy
 #~ msgid "Retry, Change mirror, Ignore"
 #~ msgstr "Ulangi, Ubah mirror, Batal"

Modified: trunk/packages/po/is.po
===================================================================
--- trunk/packages/po/is.po	2005-11-16 01:40:18 UTC (rev 32163)
+++ trunk/packages/po/is.po	2005-11-16 01:45:44 UTC (rev 32164)
@@ -1058,7 +1058,7 @@
 msgstr ""
 "Project-Id-Version: debian-installer_packages_tzsetup_debian_po.pot\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-15 08:03+0000\n"
+"POT-Creation-Date: 2005-11-16 01:33+0000\n"
 "PO-Revision-Date: 2005-11-07 23:26+0000\n"
 "Last-Translator: David Steinn Geirsson <davidgeirs at gmail.com>\n"
 "Language-Team: Icelandic <debian-user-icelandic at lists.debian.org>\n"
@@ -3236,32 +3236,34 @@
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#. These are choices of actions so this is, at least in English,
+#. an infinitive form
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 msgid "Retry"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 #, fuzzy
 msgid "Change mirror"
 msgstr "PrÃ³fa aftur, Skipta um pakkaspegil, HÃ¦tta viÃ°"
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../mdcfg-utils.templates:122
+#: ../net-retriever.templates:5 ../mdcfg-utils.templates:122
 msgid "Cancel"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:31
+#: ../net-retriever.templates:7 ../apt-mirror-setup.templates:33
 msgid "Downloading a file failed:"
 msgstr "Ekki tÃ³kst aÃ° nÃ¡ Ã skrÃ¡:"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5
+#: ../net-retriever.templates:7
 msgid ""
 "The installer failed to download a file from the mirror. This may be a "
 "problem with your network, or with the mirror. You can choose to retry the "
@@ -3956,15 +3958,16 @@
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:101
-msgid "Desktop machine"
-msgstr "BorÃ°tÃ¶lva"
+#, fuzzy
+msgid "Separate /home partition"
+msgstr "Keyri upp disksneiÃ°iforritiÃ°"
 
 #. Type: text
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:106
-msgid "Multi-user workstation"
-msgstr "FjÃ¶lnotenda vinnustÃ¶Ã°"
+msgid "Separate /home, /usr, /var, and /tmp partitions"
+msgstr ""
 
 #. Type: boolean
 #. Description
@@ -6584,13 +6587,13 @@
 
 #. Type: select
 #. Choices
-#: ../apt-mirror-setup.templates:30
+#: ../apt-mirror-setup.templates:32
 msgid "Ignore"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../apt-mirror-setup.templates:31
+#: ../apt-mirror-setup.templates:33
 #, fuzzy
 msgid ""
 "The installer failed to access the mirror. This may be a problem with your "
@@ -12010,6 +12013,12 @@
 msgid "Configure the base system before rebooting"
 msgstr "Stilla grunnkerfiÃ° Ã¡Ã°ur en endurrÃ¦sing hefst"
 
+#~ msgid "Desktop machine"
+#~ msgstr "BorÃ°tÃ¶lva"
+
+#~ msgid "Multi-user workstation"
+#~ msgstr "FjÃ¶lnotenda vinnustÃ¶Ã°"
+
 #, fuzzy
 #~ msgid "Retry, Change mirror, Ignore"
 #~ msgstr "PrÃ³fa aftur, Skipta um pakkaspegil, HÃ¦tta viÃ°"

Modified: trunk/packages/po/it.po
===================================================================
--- trunk/packages/po/it.po	2005-11-16 01:40:18 UTC (rev 32163)
+++ trunk/packages/po/it.po	2005-11-16 01:45:44 UTC (rev 32164)
@@ -20,7 +20,7 @@
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-15 08:03+0000\n"
+"POT-Creation-Date: 2005-11-16 01:33+0000\n"
 "PO-Revision-Date: 2005-11-12 17:47+0100\n"
 "Last-Translator: Giuseppe Sacco <eppesuig at debian.org>\n"
 "Language-Team:   Italian <debian-l10n-italian at lists.debian.org>\n"
@@ -1991,32 +1991,34 @@
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#. These are choices of actions so this is, at least in English,
+#. an infinitive form
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 msgid "Retry"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 #, fuzzy
 msgid "Change mirror"
 msgstr "Riprova, Cambia mirror, Annulla"
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../mdcfg-utils.templates:122
+#: ../net-retriever.templates:5 ../mdcfg-utils.templates:122
 msgid "Cancel"
 msgstr "Annulla"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:31
+#: ../net-retriever.templates:7 ../apt-mirror-setup.templates:33
 msgid "Downloading a file failed:"
 msgstr "Impossibile scaricare un file:"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5
+#: ../net-retriever.templates:7
 msgid ""
 "The installer failed to download a file from the mirror. This may be a "
 "problem with your network, or with the mirror. You can choose to retry the "
@@ -2737,15 +2739,16 @@
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:101
-msgid "Desktop machine"
-msgstr "Computer desktop"
+#, fuzzy
+msgid "Separate /home partition"
+msgstr "formattare la partizione"
 
 #. Type: text
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:106
-msgid "Multi-user workstation"
-msgstr "Sistema multi utente"
+msgid "Separate /home, /usr, /var, and /tmp partitions"
+msgstr ""
 
 #. Type: boolean
 #. Description
@@ -5503,14 +5506,14 @@
 
 #. Type: select
 #. Choices
-#: ../apt-mirror-setup.templates:30
+#: ../apt-mirror-setup.templates:32
 #, fuzzy
 msgid "Ignore"
 msgstr "nessuno"
 
 #. Type: select
 #. Description
-#: ../apt-mirror-setup.templates:31
+#: ../apt-mirror-setup.templates:33
 #, fuzzy
 msgid ""
 "The installer failed to access the mirror. This may be a problem with your "
@@ -11354,6 +11357,12 @@
 msgid "Configure the base system before rebooting"
 msgstr "Configura il sistema di base prima di riavviare"
 
+#~ msgid "Desktop machine"
+#~ msgstr "Computer desktop"
+
+#~ msgid "Multi-user workstation"
+#~ msgstr "Sistema multi utente"
+
 #, fuzzy
 #~ msgid "Retry, Change mirror, Ignore"
 #~ msgstr "Riprova, Cambia mirror, Annulla"

Modified: trunk/packages/po/ja.po
===================================================================
--- trunk/packages/po/ja.po	2005-11-16 01:40:18 UTC (rev 32163)
+++ trunk/packages/po/ja.po	2005-11-16 01:45:44 UTC (rev 32164)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-15 08:03+0000\n"
+"POT-Creation-Date: 2005-11-16 01:33+0000\n"
 "PO-Revision-Date: 2005-11-10 15:51+0900\n"
 "Last-Translator:  Kenshi Muto <kmuto at debian.org>\n"
 "Language-Team: Debian L10n Japanese <debian-l10n-japanese at lists.debian.org>\n"
@@ -1957,32 +1957,34 @@
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#. These are choices of actions so this is, at least in English,
+#. an infinitive form
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 msgid "Retry"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 #, fuzzy
 msgid "Change mirror"
 msgstr "å†è©¦è¡Œ, ãƒŸãƒ©ãƒ¼ã®å¤‰æ›´, ã‚ãƒ£ãƒ³ã‚»ãƒ«"
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../mdcfg-utils.templates:122
+#: ../net-retriever.templates:5 ../mdcfg-utils.templates:122
 msgid "Cancel"
 msgstr "ã‚ãƒ£ãƒ³ã‚»ãƒ«"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:31
+#: ../net-retriever.templates:7 ../apt-mirror-setup.templates:33
 msgid "Downloading a file failed:"
 msgstr "ãƒ•ã‚¡ã‚¤ãƒ«ã®ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ä¸ã«å¤±æ•—ã—ã¾ã—ãŸ:"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5
+#: ../net-retriever.templates:7
 msgid ""
 "The installer failed to download a file from the mirror. This may be a "
 "problem with your network, or with the mirror. You can choose to retry the "
@@ -2697,15 +2699,16 @@
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:101
-msgid "Desktop machine"
-msgstr "ãƒ‡ã‚¹ã‚¯ãƒˆãƒƒãƒ—ãƒžã‚·ãƒ³"
+#, fuzzy
+msgid "Separate /home partition"
+msgstr "ãƒ‘ãƒ¼ãƒ†ã‚£ã‚·ãƒ§ãƒ³ã®åˆæœŸåŒ–"
 
 #. Type: text
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:106
-msgid "Multi-user workstation"
-msgstr "ãƒžãƒ«ãƒãƒ¦ãƒ¼ã‚¶ãƒ¯ãƒ¼ã‚¯ã‚¹ãƒ†ãƒ¼ã‚·ãƒ§ãƒ³"
+msgid "Separate /home, /usr, /var, and /tmp partitions"
+msgstr ""
 
 #. Type: boolean
 #. Description
@@ -5452,14 +5455,14 @@
 
 #. Type: select
 #. Choices
-#: ../apt-mirror-setup.templates:30
+#: ../apt-mirror-setup.templates:32
 #, fuzzy
 msgid "Ignore"
 msgstr "ãªã—"
 
 #. Type: select
 #. Description
-#: ../apt-mirror-setup.templates:31
+#: ../apt-mirror-setup.templates:33
 #, fuzzy
 msgid ""
 "The installer failed to access the mirror. This may be a problem with your "
@@ -11251,6 +11254,12 @@
 msgid "Configure the base system before rebooting"
 msgstr "å†èµ·å‹•å‰ã«ãƒ™ãƒ¼ã‚¹ã‚·ã‚¹ãƒ†ãƒ ã‚’è¨å®š"
 
+#~ msgid "Desktop machine"
+#~ msgstr "ãƒ‡ã‚¹ã‚¯ãƒˆãƒƒãƒ—ãƒžã‚·ãƒ³"
+
+#~ msgid "Multi-user workstation"
+#~ msgstr "ãƒžãƒ«ãƒãƒ¦ãƒ¼ã‚¶ãƒ¯ãƒ¼ã‚¯ã‚¹ãƒ†ãƒ¼ã‚·ãƒ§ãƒ³"
+
 #, fuzzy
 #~ msgid "Retry, Change mirror, Ignore"
 #~ msgstr "å†è©¦è¡Œ, ãƒŸãƒ©ãƒ¼ã®å¤‰æ›´, ã‚ãƒ£ãƒ³ã‚»ãƒ«"

Modified: trunk/packages/po/ko.po
===================================================================
--- trunk/packages/po/ko.po	2005-11-16 01:40:18 UTC (rev 32163)
+++ trunk/packages/po/ko.po	2005-11-16 01:45:44 UTC (rev 32164)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-15 08:03+0000\n"
+"POT-Creation-Date: 2005-11-16 01:33+0000\n"
 "PO-Revision-Date: 2005-11-02 00:21+0900\n"
 "Last-Translator:  Sunjae park <darehanl at gmail.com>\n"
 "Language-Team:  Korean <debian-l10n-korean at lists.debian.org>\n"
@@ -1924,32 +1924,34 @@
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#. These are choices of actions so this is, at least in English,
+#. an infinitive form
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 msgid "Retry"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 #, fuzzy
 msgid "Change mirror"
 msgstr "ë‹¤ì‹œ ì‹œë„, ë¯¸ëŸ¬ ë°”ê¾¸ê¸°, ì·¨ì†Œ"
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../mdcfg-utils.templates:122
+#: ../net-retriever.templates:5 ../mdcfg-utils.templates:122
 msgid "Cancel"
 msgstr "ì·¨ì†Œ"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:31
+#: ../net-retriever.templates:7 ../apt-mirror-setup.templates:33
 msgid "Downloading a file failed:"
 msgstr "íŒŒì¼ ë‚´ë ¤ ë°›ê¸°ê°€ ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤:"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5
+#: ../net-retriever.templates:7
 msgid ""
 "The installer failed to download a file from the mirror. This may be a "
 "problem with your network, or with the mirror. You can choose to retry the "
@@ -2651,15 +2653,16 @@
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:101
-msgid "Desktop machine"
-msgstr "ë°ìŠ¤í¬íƒ‘ ì»´í“¨í„°"
+#, fuzzy
+msgid "Separate /home partition"
+msgstr "íŒŒí‹°ì…˜ í¬ë§·"
 
 #. Type: text
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:106
-msgid "Multi-user workstation"
-msgstr "ì—¬ëŸ¬ì‚¬ëžŒì´ ì“°ëŠ” ì›Œí¬ìŠ¤í…Œì´ì…˜"
+msgid "Separate /home, /usr, /var, and /tmp partitions"
+msgstr ""
 
 #. Type: boolean
 #. Description
@@ -5387,14 +5390,14 @@
 
 #. Type: select
 #. Choices
-#: ../apt-mirror-setup.templates:30
+#: ../apt-mirror-setup.templates:32
 #, fuzzy
 msgid "Ignore"
 msgstr "ì—†ìŒ"
 
 #. Type: select
 #. Description
-#: ../apt-mirror-setup.templates:31
+#: ../apt-mirror-setup.templates:33
 #, fuzzy
 msgid ""
 "The installer failed to access the mirror. This may be a problem with your "
@@ -11082,6 +11085,12 @@
 msgid "Configure the base system before rebooting"
 msgstr "ë‹¤ì‹œ ì‹œìž‘í•˜ê¸° ì „ì— ë² ì´ìŠ¤ ì‹œìŠ¤í…œ ì„¤ì •"
 
+#~ msgid "Desktop machine"
+#~ msgstr "ë°ìŠ¤í¬íƒ‘ ì»´í“¨í„°"
+
+#~ msgid "Multi-user workstation"
+#~ msgstr "ì—¬ëŸ¬ì‚¬ëžŒì´ ì“°ëŠ” ì›Œí¬ìŠ¤í…Œì´ì…˜"
+
 #, fuzzy
 #~ msgid "Retry, Change mirror, Ignore"
 #~ msgstr "ë‹¤ì‹œ ì‹œë„, ë¯¸ëŸ¬ ë°”ê¾¸ê¸°, ì·¨ì†Œ"

Modified: trunk/packages/po/ku.po
===================================================================
--- trunk/packages/po/ku.po	2005-11-16 01:40:18 UTC (rev 32163)
+++ trunk/packages/po/ku.po	2005-11-16 01:45:44 UTC (rev 32164)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-15 08:03+0000\n"
+"POT-Creation-Date: 2005-11-16 01:33+0000\n"
 "PO-Revision-Date: 2005-09-02 11:55+0200\n"
 "Last-Translator: Erdal Ronahi <erdal.ronahi at gmail.com, pckurd at hotmail.com>\n"
 "Language-Team: Kurdish <gnu-ku-wergerandin at lists.sourceforge.net>\n"
@@ -1772,32 +1772,34 @@
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#. These are choices of actions so this is, at least in English,
+#. an infinitive form
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 msgid "Retry"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 #, fuzzy
 msgid "Change mirror"
 msgstr "CarekÃ® din, NeynÃ®kÃª biguherÃ®ne, Betal"
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../mdcfg-utils.templates:122
+#: ../net-retriever.templates:5 ../mdcfg-utils.templates:122
 msgid "Cancel"
 msgstr "Betal"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:31
+#: ../net-retriever.templates:7 ../apt-mirror-setup.templates:33
 msgid "Downloading a file failed:"
 msgstr "Daxistian dosiyekÃª serneket:"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5
+#: ../net-retriever.templates:7
 msgid ""
 "The installer failed to download a file from the mirror. This may be a "
 "problem with your network, or with the mirror. You can choose to retry the "
@@ -2460,15 +2462,16 @@
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:101
-msgid "Desktop machine"
-msgstr "MakÃ®nayÃª sermasÃª"
+#, fuzzy
+msgid "Separate /home partition"
+msgstr "dabeÅŸÃª format bike"
 
 #. Type: text
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:106
-msgid "Multi-user workstation"
-msgstr "Workstation ji bo gelek bikarhÃªneran"
+msgid "Separate /home, /usr, /var, and /tmp partitions"
+msgstr ""
 
 #. Type: boolean
 #. Description
@@ -5046,14 +5049,14 @@
 
 #. Type: select
 #. Choices
-#: ../apt-mirror-setup.templates:30
+#: ../apt-mirror-setup.templates:32
 #, fuzzy
 msgid "Ignore"
 msgstr "tune"
 
 #. Type: select
 #. Description
-#: ../apt-mirror-setup.templates:31
+#: ../apt-mirror-setup.templates:33
 msgid ""
 "The installer failed to access the mirror. This may be a problem with your "
 "network, or with the mirror. You can choose to retry the download, select a "
@@ -10310,6 +10313,12 @@
 msgid "Configure the base system before rebooting"
 msgstr ""
 
+#~ msgid "Desktop machine"
+#~ msgstr "MakÃ®nayÃª sermasÃª"
+
+#~ msgid "Multi-user workstation"
+#~ msgstr "Workstation ji bo gelek bikarhÃªneran"
+
 #, fuzzy
 #~ msgid "Retry, Change mirror, Ignore"
 #~ msgstr "CarekÃ® din, NeynÃ®kÃª biguherÃ®ne, Betal"

Modified: trunk/packages/po/lt.po
===================================================================
--- trunk/packages/po/lt.po	2005-11-16 01:40:18 UTC (rev 32163)
+++ trunk/packages/po/lt.po	2005-11-16 01:45:44 UTC (rev 32164)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-15 08:03+0000\n"
+"POT-Creation-Date: 2005-11-16 01:33+0000\n"
 "PO-Revision-Date: 2005-10-19 23:50+0300\n"
 "Last-Translator: KÄ™stutis BiliÅ«nas <kebil at kaunas.init.lt>\n"
 "Language-Team: Lithuanian <komp_lt at konferencijos.lt>\n"
@@ -1966,32 +1966,34 @@
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#. These are choices of actions so this is, at least in English,
+#. an infinitive form
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 msgid "Retry"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 #, fuzzy
 msgid "Change mirror"
 msgstr "Kartoti, Pakeisti \"veidrodÄ¯\", Atsisakyti"
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../mdcfg-utils.templates:122
+#: ../net-retriever.templates:5 ../mdcfg-utils.templates:122
 msgid "Cancel"
 msgstr "Atsisakyti"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:31
+#: ../net-retriever.templates:7 ../apt-mirror-setup.templates:33
 msgid "Downloading a file failed:"
 msgstr "Veiksmas Ä¯vykus failo atsisiuntimo klaidai:"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5
+#: ../net-retriever.templates:7
 msgid ""
 "The installer failed to download a file from the mirror. This may be a "
 "problem with your network, or with the mirror. You can choose to retry the "
@@ -2707,15 +2709,16 @@
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:101
-msgid "Desktop machine"
-msgstr "Stalinis (desktop) kompiuteris"
+#, fuzzy
+msgid "Separate /home partition"
+msgstr "disko skirsnio formatavimas"
 
 #. Type: text
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:106
-msgid "Multi-user workstation"
-msgstr "Daugelio naudotojÅ³ (multi-user) systema (workstation)"
+msgid "Separate /home, /usr, /var, and /tmp partitions"
+msgstr ""
 
 #. Type: boolean
 #. Description
@@ -5457,14 +5460,14 @@
 
 #. Type: select
 #. Choices
-#: ../apt-mirror-setup.templates:30
+#: ../apt-mirror-setup.templates:32
 #, fuzzy
 msgid "Ignore"
 msgstr "joks"
 
 #. Type: select
 #. Description
-#: ../apt-mirror-setup.templates:31
+#: ../apt-mirror-setup.templates:33
 #, fuzzy
 msgid ""
 "The installer failed to access the mirror. This may be a problem with your "
@@ -11275,6 +11278,12 @@
 msgid "Configure the base system before rebooting"
 msgstr "BazinÄ—s sistemos konfigÅ«ravimas prieÅ¡ perkrovimÄ…"
 
+#~ msgid "Desktop machine"
+#~ msgstr "Stalinis (desktop) kompiuteris"
+
+#~ msgid "Multi-user workstation"
+#~ msgstr "Daugelio naudotojÅ³ (multi-user) systema (workstation)"
+
 #, fuzzy
 #~ msgid "Retry, Change mirror, Ignore"
 #~ msgstr "Kartoti, Pakeisti \"veidrodÄ¯\", Atsisakyti"

Modified: trunk/packages/po/lv.po
===================================================================
--- trunk/packages/po/lv.po	2005-11-16 01:40:18 UTC (rev 32163)
+++ trunk/packages/po/lv.po	2005-11-16 01:45:44 UTC (rev 32164)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-15 08:03+0000\n"
+"POT-Creation-Date: 2005-11-16 01:33+0000\n"
 "PO-Revision-Date: 2004-10-26 08:41+0200\n"
 "Last-Translator: Aigars Mahinovs <aigarius at debian.org>\n"
 "Language-Team: Latvian <locale at laka.lv>\n"
@@ -1860,32 +1860,34 @@
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#. These are choices of actions so this is, at least in English,
+#. an infinitive form
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 msgid "Retry"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 #, fuzzy
 msgid "Change mirror"
 msgstr "AtkÄrtot, NomainÄ«t serveri, PÄrtraukt"
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../mdcfg-utils.templates:122
+#: ../net-retriever.templates:5 ../mdcfg-utils.templates:122
 msgid "Cancel"
 msgstr "Atcelt"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:31
+#: ../net-retriever.templates:7 ../apt-mirror-setup.templates:33
 msgid "Downloading a file failed:"
 msgstr "Faila lejupielÄde neizdevÄs:"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5
+#: ../net-retriever.templates:7
 msgid ""
 "The installer failed to download a file from the mirror. This may be a "
 "problem with your network, or with the mirror. You can choose to retry the "
@@ -2559,14 +2561,15 @@
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:101
-msgid "Desktop machine"
-msgstr ""
+#, fuzzy
+msgid "Separate /home partition"
+msgstr "formatÄ“t partÄ«ciju"
 
 #. Type: text
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:106
-msgid "Multi-user workstation"
+msgid "Separate /home, /usr, /var, and /tmp partitions"
 msgstr ""
 
 #. Type: boolean
@@ -5166,13 +5169,13 @@
 
 #. Type: select
 #. Choices
-#: ../apt-mirror-setup.templates:30
+#: ../apt-mirror-setup.templates:32
 msgid "Ignore"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../apt-mirror-setup.templates:31
+#: ../apt-mirror-setup.templates:33
 #, fuzzy
 msgid ""
 "The installer failed to access the mirror. This may be a problem with your "

Modified: trunk/packages/po/mg.po
===================================================================
--- trunk/packages/po/mg.po	2005-11-16 01:40:18 UTC (rev 32163)
+++ trunk/packages/po/mg.po	2005-11-16 01:45:44 UTC (rev 32164)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: mg\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-15 08:03+0000\n"
+"POT-Creation-Date: 2005-11-16 01:33+0000\n"
 "PO-Revision-Date: 2005-03-30 17:30+0200\n"
 "Last-Translator: Jaonary Rabarisoa <mpandikateny at linuxmg.org>\n"
 "Language-Team: Malagasy <mpandikateny at linuxmg.org>\n"
@@ -1937,32 +1937,34 @@
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#. These are choices of actions so this is, at least in English,
+#. an infinitive form
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 msgid "Retry"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 #, fuzzy
 msgid "Change mirror"
 msgstr "Averina, Ovaina ny fitaratra, Ajanona"
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../mdcfg-utils.templates:122
+#: ../net-retriever.templates:5 ../mdcfg-utils.templates:122
 msgid "Cancel"
 msgstr "Ajanony"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:31
+#: ../net-retriever.templates:7 ../apt-mirror-setup.templates:33
 msgid "Downloading a file failed:"
 msgstr "Tsy nahomby ny fandrotsahana rakitra iray:"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5
+#: ../net-retriever.templates:7
 msgid ""
 "The installer failed to download a file from the mirror. This may be a "
 "problem with your network, or with the mirror. You can choose to retry the "
@@ -2665,15 +2667,16 @@
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:101
-msgid "Desktop machine"
-msgstr "Milina desktop"
+#, fuzzy
+msgid "Separate /home partition"
+msgstr "formateo ny fizarana"
 
 #. Type: text
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:106
-msgid "Multi-user workstation"
-msgstr "Milina fiasana ho an'olona maro"
+msgid "Separate /home, /usr, /var, and /tmp partitions"
+msgstr ""
 
 #. Type: boolean
 #. Description
@@ -5390,14 +5393,14 @@
 
 #. Type: select
 #. Choices
-#: ../apt-mirror-setup.templates:30
+#: ../apt-mirror-setup.templates:32
 #, fuzzy
 msgid "Ignore"
 msgstr "Tsy misy"
 
 #. Type: select
 #. Description
-#: ../apt-mirror-setup.templates:31
+#: ../apt-mirror-setup.templates:33
 #, fuzzy
 msgid ""
 "The installer failed to access the mirror. This may be a problem with your "
@@ -10950,6 +10953,12 @@
 msgid "Configure the base system before rebooting"
 msgstr "Tefeo ny system fototra alohan'ny hamelomana milina indray"
 
+#~ msgid "Desktop machine"
+#~ msgstr "Milina desktop"
+
+#~ msgid "Multi-user workstation"
+#~ msgstr "Milina fiasana ho an'olona maro"
+
 #, fuzzy
 #~ msgid "Retry, Change mirror, Ignore"
 #~ msgstr "Averina, Ovaina ny fitaratra, Ajanona"

Modified: trunk/packages/po/mk.po
===================================================================
--- trunk/packages/po/mk.po	2005-11-16 01:40:18 UTC (rev 32163)
+++ trunk/packages/po/mk.po	2005-11-16 01:45:44 UTC (rev 32164)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: mk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-15 08:03+0000\n"
+"POT-Creation-Date: 2005-11-16 01:33+0000\n"
 "PO-Revision-Date: 2005-10-09 15:30+0200\n"
 "Last-Translator: Georgi Stanojevski <glisha at gmail.com>\n"
 "Language-Team: Macedonian <ossm-members at hedona.on.net.mk>\n"
@@ -1956,32 +1956,34 @@
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#. These are choices of actions so this is, at least in English,
+#. an infinitive form
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 msgid "Retry"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 #, fuzzy
 msgid "Change mirror"
 msgstr "ÐŸÐ¾Ð²Ñ‚Ð¾Ñ€Ð½Ð¾, Ð¡Ð¼ÐµÐ½Ð¸ Ð°Ð»Ñ‚ÐµÑ€Ð½Ð°Ñ‚Ð¸Ð²ÐµÐ½ ÑÐµÑ€Ð²ÐµÑ€, ÐžÑ‚ÐºÐ°Ð¶Ð¸"
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../mdcfg-utils.templates:122
+#: ../net-retriever.templates:5 ../mdcfg-utils.templates:122
 msgid "Cancel"
 msgstr "ÐžÑ‚ÐºÐ°Ð¶Ð¸"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:31
+#: ../net-retriever.templates:7 ../apt-mirror-setup.templates:33
 msgid "Downloading a file failed:"
 msgstr "ÐŸÑ€ÐµÐ·ÐµÐ¼Ð°ÑšÐµ Ð½Ð° Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ° Ð½Ðµ ÑƒÑÐ¿ÐµÐ°:"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5
+#: ../net-retriever.templates:7
 msgid ""
 "The installer failed to download a file from the mirror. This may be a "
 "problem with your network, or with the mirror. You can choose to retry the "
@@ -2697,15 +2699,16 @@
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:101
-msgid "Desktop machine"
-msgstr "Ð”ÐµÑÐºÑ‚Ð¾Ð¿ Ð¼Ð°ÑˆÐ¸Ð½Ð°"
+#, fuzzy
+msgid "Separate /home partition"
+msgstr "Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚Ð¸Ñ€Ð°Ñ˜ Ñ˜Ð° Ð¿Ð°Ñ€Ñ‚Ð¸Ñ†Ð¸Ñ˜Ð°Ñ‚Ð°"
 
 #. Type: text
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:106
-msgid "Multi-user workstation"
-msgstr "ÐŸÐ¾Ð²ÐµÑœÐµ ÐºÐ¾Ñ€Ð¸ÑÐ½Ð¸Ñ‡ÐºÐ° Ñ€Ð°Ð±Ð¾Ñ‚Ð½Ð° ÑÑ‚Ð°Ð½Ð¸Ñ†Ð°"
+msgid "Separate /home, /usr, /var, and /tmp partitions"
+msgstr ""
 
 #. Type: boolean
 #. Description
@@ -5453,14 +5456,14 @@
 
 #. Type: select
 #. Choices
-#: ../apt-mirror-setup.templates:30
+#: ../apt-mirror-setup.templates:32
 #, fuzzy
 msgid "Ignore"
 msgstr "Ð½ÐµÐ¼Ð°"
 
 #. Type: select
 #. Description
-#: ../apt-mirror-setup.templates:31
+#: ../apt-mirror-setup.templates:33
 #, fuzzy
 msgid ""
 "The installer failed to access the mirror. This may be a problem with your "
@@ -11261,6 +11264,12 @@
 msgid "Configure the base system before rebooting"
 msgstr "ÐšÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð¸Ñ€Ð°Ñ˜ Ð³Ð¾ Ð±Ð°Ð·Ð½Ð¸Ð¾Ñ‚ ÑÐ¸ÑÑ‚ÐµÐ¼ Ð¿Ñ€ÐµÐ´ Ñ€ÐµÑÐµÑ‚Ð¸Ñ€Ð°ÑšÐµÑ‚Ð¾"
 
+#~ msgid "Desktop machine"
+#~ msgstr "Ð”ÐµÑÐºÑ‚Ð¾Ð¿ Ð¼Ð°ÑˆÐ¸Ð½Ð°"
+
+#~ msgid "Multi-user workstation"
+#~ msgstr "ÐŸÐ¾Ð²ÐµÑœÐµ ÐºÐ¾Ñ€Ð¸ÑÐ½Ð¸Ñ‡ÐºÐ° Ñ€Ð°Ð±Ð¾Ñ‚Ð½Ð° ÑÑ‚Ð°Ð½Ð¸Ñ†Ð°"
+
 #, fuzzy
 #~ msgid "Retry, Change mirror, Ignore"
 #~ msgstr "ÐŸÐ¾Ð²Ñ‚Ð¾Ñ€Ð½Ð¾, Ð¡Ð¼ÐµÐ½Ð¸ Ð°Ð»Ñ‚ÐµÑ€Ð½Ð°Ñ‚Ð¸Ð²ÐµÐ½ ÑÐµÑ€Ð²ÐµÑ€, ÐžÑ‚ÐºÐ°Ð¶Ð¸"

Modified: trunk/packages/po/nb.po
===================================================================
--- trunk/packages/po/nb.po	2005-11-16 01:40:18 UTC (rev 32163)
+++ trunk/packages/po/nb.po	2005-11-16 01:45:44 UTC (rev 32164)
@@ -14,7 +14,7 @@
 msgstr ""
 "Project-Id-Version: nb\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-15 08:03+0000\n"
+"POT-Creation-Date: 2005-11-16 01:33+0000\n"
 "PO-Revision-Date: 2005-11-15 13:48+0100\n"
 "Last-Translator: BjÃ¸rn Steensrud <bjornst at powertech.no>\n"
 "Language-Team: Norwegian BokmÃ¥l <i18n-nb at lister.ping.uio.no>\n"
@@ -132,7 +132,8 @@
 msgid ""
 "If you have not finished the install, your system may be left in an unusable "
 "state."
-msgstr "Hvis du ikke fullfÃ¸rte installasjonen, sÃ¥ kan systemet ditt vÃ¦re ubrukelig."
+msgstr ""
+"Hvis du ikke fullfÃ¸rte installasjonen, sÃ¥ kan systemet ditt vÃ¦re ubrukelig."
 
 #. Type: text
 #. Description
@@ -724,7 +725,8 @@
 msgid ""
 "No Ethernet card was detected. If you know the name of the driver needed by "
 "your Ethernet card, you can select it from the list."
-msgstr "Fant ikke et nettverskort. Velg fra listen om driveren til kortet er kjent."
+msgstr ""
+"Fant ikke et nettverskort. Velg fra listen om driveren til kortet er kjent."
 
 #. Type: boolean
 #. Description
@@ -1127,7 +1129,8 @@
 msgid ""
 "If your WEP key is in the format of a passphrase, prefix it with "
 "'s:' (without quotes)."
-msgstr "Hvis WEP-nÃ¸kkelen har format som et passord, skriv inn Â«s:Â» foran passordet."
+msgstr ""
+"Hvis WEP-nÃ¸kkelen har format som et passord, skriv inn Â«s:Â» foran passordet."
 
 #. Type: string
 #. Description
@@ -1135,7 +1138,8 @@
 msgid ""
 "Of course, if there is no WEP key for your wireless network, leave this "
 "field blank."
-msgstr "Hvis det trÃ¥dlÃ¸se nettverket ikke har noen WEP-nÃ¸kkel, sÃ¥ la feltet stÃ¥ tomt."
+msgstr ""
+"Hvis det trÃ¥dlÃ¸se nettverket ikke har noen WEP-nÃ¸kkel, sÃ¥ la feltet stÃ¥ tomt."
 
 #. Type: error
 #. Description
@@ -1287,7 +1291,8 @@
 #. below the 65 columns limit (which means 65 characters for most languages)
 #: ../netcfg-common.templates:121
 msgid "Infrastructure (Managed) network, Ad-hoc network (Peer to peer)"
-msgstr "Infrastruktur (HÃ¥ndtert) nettverk, Ad-hoc-nettverk (mellom datamaskiner)"
+msgstr ""
+"Infrastruktur (HÃ¥ndtert) nettverk, Ad-hoc-nettverk (mellom datamaskiner)"
 
 #. Type: select
 #. Description
@@ -1699,7 +1704,8 @@
 #. Type: error
 #. Description
 #: ../netcfg-static.templates:44
-msgid "You may have made an error entering your IP address, netmask and/or gateway."
+msgid ""
+"You may have made an error entering your IP address, netmask and/or gateway."
 msgstr ""
 "Du kan ha oppgitt feil IP-adresse, nettmaske og/eller adresse til "
 "standardruter."
@@ -1842,7 +1848,8 @@
 #. Type: string
 #. Description
 #: ../choose-mirror.templates.http-in:29 ../choose-mirror.templates.ftp-in:29
-msgid "Please enter the hostname of the mirror from which Debian will be downloaded."
+msgid ""
+"Please enter the hostname of the mirror from which Debian will be downloaded."
 msgstr "Skriv inn navnet pÃ¥ den apt-kilden du vil laste ned Debian fra."
 
 #. Type: string
@@ -1949,31 +1956,33 @@
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#. These are choices of actions so this is, at least in English,
+#. an infinitive form
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 msgid "Retry"
 msgstr "PrÃ¸v igjen"
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 msgid "Change mirror"
 msgstr "Bytt speil"
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../mdcfg-utils.templates:122
+#: ../net-retriever.templates:5 ../mdcfg-utils.templates:122
 msgid "Cancel"
 msgstr "Avbryt"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:31
+#: ../net-retriever.templates:7 ../apt-mirror-setup.templates:33
 msgid "Downloading a file failed:"
 msgstr "Klarte ikke Ã¥ laste ned fila:"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5
+#: ../net-retriever.templates:7
 msgid ""
 "The installer failed to download a file from the mirror. This may be a "
 "problem with your network, or with the mirror. You can choose to retry the "
@@ -2247,7 +2256,8 @@
 #. Type: boolean
 #. Description
 #: ../partman-base.templates:82
-msgid "No partition table changes and no creation of file systems have been planned."
+msgid ""
+"No partition table changes and no creation of file systems have been planned."
 msgstr ""
 "Det er ingen endringer i partisjonstabellen og ingen nye filsystem stÃ¥r for "
 "tur til Ã¥ bli opprettet."
@@ -2338,7 +2348,8 @@
 msgid ""
 "You are editing partition #${PARTITION} of ${DEVICE}. ${OTHERINFO} "
 "${DESTROYED}"
-msgstr "Du endrer pÃ¥ partisjon #${PARTITION} pÃ¥ ${DEVICE}. ${OTHERINFO} ${DESTROYED}"
+msgstr ""
+"Du endrer pÃ¥ partisjon #${PARTITION} pÃ¥ ${DEVICE}. ${OTHERINFO} ${DESTROYED}"
 
 #. Type: text
 #. Description
@@ -2687,15 +2698,16 @@
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:101
-msgid "Desktop machine"
-msgstr "Skrivebordsmaskin"
+#, fuzzy
+msgid "Separate /home partition"
+msgstr "formater partisjonen"
 
 #. Type: text
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:106
-msgid "Multi-user workstation"
-msgstr "Flerbrukermaskin"
+msgid "Separate /home, /usr, /var, and /tmp partitions"
+msgstr ""
 
 #. Type: boolean
 #. Description
@@ -2855,7 +2867,8 @@
 #. Description
 #: ../partman-partitioning.templates:38
 msgid "Because of an unknown reason it is impossible to resize this partition."
-msgstr "Av ukjent grunn er det ikke mulig Ã¥ endre stÃ¸rrelsen pÃ¥ denne partisjonen."
+msgstr ""
+"Av ukjent grunn er det ikke mulig Ã¥ endre stÃ¸rrelsen pÃ¥ denne partisjonen."
 
 #. Type: boolean
 #. Description
@@ -3096,8 +3109,10 @@
 #. Type: text
 #. Description
 #: ../partman-basicfilesystems.templates:3
-msgid "Checking the ${TYPE} file system in partition #${PARTITION} of ${DEVICE}..."
-msgstr "Sjekker ${TYPE}-filsystemet pÃ¥ partisjon #${PARTITION} pÃ¥ ${DEVICE} ..."
+msgid ""
+"Checking the ${TYPE} file system in partition #${PARTITION} of ${DEVICE}..."
+msgstr ""
+"Sjekker ${TYPE}-filsystemet pÃ¥ partisjon #${PARTITION} pÃ¥ ${DEVICE} ..."
 
 #. Type: text
 #. Description
@@ -3125,7 +3140,8 @@
 #. Description
 #: ../partman-basicfilesystems.templates:19
 msgid "Formatting swap space in partition #${PARTITION} of ${DEVICE}..."
-msgstr "Formater mellomlageromrÃ¥det pÃ¥ partisjonen #${PARTITION} pÃ¥ ${DEVICE} ..."
+msgstr ""
+"Formater mellomlageromrÃ¥det pÃ¥ partisjonen #${PARTITION} pÃ¥ ${DEVICE} ..."
 
 #. Type: boolean
 #. Description
@@ -3217,7 +3233,8 @@
 #. Type: error
 #. Description
 #: ../partman-basicfilesystems.templates:59
-msgid "The creation of swap space in partition #${PARTITION} of ${DEVICE} failed."
+msgid ""
+"The creation of swap space in partition #${PARTITION} of ${DEVICE} failed."
 msgstr ""
 "Klarte ikke Ã¥ opprette et mellomlager pÃ¥ partisjon #${PARTITION} pÃ¥ "
 "${DEVICE}."
@@ -3692,7 +3709,8 @@
 #. Type: text
 #. Description
 #: ../partman-ext3.templates:3
-msgid "Checking the ext3 file system in partition #${PARTITION} of ${DEVICE}..."
+msgid ""
+"Checking the ext3 file system in partition #${PARTITION} of ${DEVICE}..."
 msgstr "Sjekker ext3-filsystemet pÃ¥ partisjon #${PARTITION} pÃ¥ ${DEVICE} ..."
 
 #. Type: boolean
@@ -3720,7 +3738,8 @@
 #. Type: error
 #. Description
 #: ../partman-ext3.templates:16
-msgid "The ext3 file system creation in partition #${PARTITION} of ${DEVICE} failed."
+msgid ""
+"The ext3 file system creation in partition #${PARTITION} of ${DEVICE} failed."
 msgstr ""
 "Klarte ikke Ã¥ opprette et ext3-filsystemet pÃ¥ partisjon #${PARTITION} pÃ¥ "
 "${DEVICE}."
@@ -3752,7 +3771,8 @@
 #. Type: text
 #. Description
 #: ../partman-reiserfs.templates:3
-msgid "Checking the ReiserFS file system in partition #${PARTITION} of ${DEVICE}..."
+msgid ""
+"Checking the ReiserFS file system in partition #${PARTITION} of ${DEVICE}..."
 msgstr "Sjekker ReiserFS-filsystemet pÃ¥ partisjon ${PARTITION} av ${DEVICE}..."
 
 #. Type: boolean
@@ -3834,7 +3854,8 @@
 #. Type: error
 #. Description
 #: ../partman-jfs.templates:16
-msgid "The jfs file system creation in partition #${PARTITION} of ${DEVICE} failed."
+msgid ""
+"The jfs file system creation in partition #${PARTITION} of ${DEVICE} failed."
 msgstr ""
 "Klarte ikke Ã¥ opprette et jfs-filsystemet pÃ¥ partisjon ${PARTITION} av "
 "${DEVICE}."
@@ -3908,8 +3929,10 @@
 #. Type: boolean
 #. Description
 #: ../partman-jfs.templates:70
-msgid "You should use another file system, such as ext3, for the /boot partition."
-msgstr "Du burde bruke et annet filsystem, som f.eks. ext3, for /boot-partisjonen."
+msgid ""
+"You should use another file system, such as ext3, for the /boot partition."
+msgstr ""
+"Du burde bruke et annet filsystem, som f.eks. ext3, for /boot-partisjonen."
 
 #. Type: text
 #. Description
@@ -3930,7 +3953,8 @@
 #. Type: error
 #. Description
 #: ../partman-xfs.templates:16
-msgid "The xfs file system creation in partition #${PARTITION} of ${DEVICE} failed."
+msgid ""
+"The xfs file system creation in partition #${PARTITION} of ${DEVICE} failed."
 msgstr ""
 "Klarte ikke Ã¥ opprette et xfs-filsystemet pÃ¥ partisjon ${PARTITION} av "
 "${DEVICE}."
@@ -4459,7 +4483,8 @@
 #. The English text to translate for this list of timezones is:
 #. Godthab, Danmarkshavn, Scoresbysund, Thule
 #: ../common.templates:164
-msgid "America/Godthab, America/Danmarkshavn, America/Scoresbysund, America/Thule"
+msgid ""
+"America/Godthab, America/Danmarkshavn, America/Scoresbysund, America/Thule"
 msgstr "GodthÃ¥b, Danmarkshavn, Scoresbysund, Thule"
 
 #. Type: select
@@ -4655,7 +4680,8 @@
 msgid ""
 "US/Eastern, US/Central, US/Mountain, US/Pacific, US/Alaska, US/Hawaii, US/"
 "East-Indiana, US/Samoa"
-msgstr "Eastern, Central, Mountain, Pacific, Alaska, Hawaii, Ã˜stre Indiana, Samosa"
+msgstr ""
+"Eastern, Central, Mountain, Pacific, Alaska, Hawaii, Ã˜stre Indiana, Samosa"
 
 #. Type: select
 #. Description
@@ -4807,7 +4833,8 @@
 #. Type: error
 #. Description
 #: ../base-installer.templates:37
-msgid "The debootstrap program exited with an error (return value ${EXITCODE})."
+msgid ""
+"The debootstrap program exited with an error (return value ${EXITCODE})."
 msgstr "Debootstrap avsluttet med en feil (returverdi ${EXITCODE})."
 
 #. Type: error
@@ -4846,7 +4873,8 @@
 msgid ""
 "An error was returned while trying to install the kernel into the target "
 "system."
-msgstr "Det oppsto en feil under forsÃ¸ket pÃ¥ Ã¥ installere en kjerne til mÃ¥lsystemet."
+msgstr ""
+"Det oppsto en feil under forsÃ¸ket pÃ¥ Ã¥ installere en kjerne til mÃ¥lsystemet."
 
 #. Type: error
 #. Description
@@ -5336,7 +5364,8 @@
 msgid ""
 "An attempt to configure apt to install additional packages from the CD "
 "failed."
-msgstr "Et forsÃ¸k pÃ¥ Ã¥ sette opp apt til Ã¥ installere flere pakker fra CD mislyktes."
+msgstr ""
+"Et forsÃ¸k pÃ¥ Ã¥ sette opp apt til Ã¥ installere flere pakker fra CD mislyktes."
 
 #. Type: text
 #. Description
@@ -5394,28 +5423,29 @@
 #. Type: boolean
 #. Description
 #: ../apt-mirror-setup.templates:19 ../apt-mirror-setup.templates-ubuntu:28
-msgid "Please choose whether you want this software to be made available to you."
+msgid ""
+"Please choose whether you want this software to be made available to you."
 msgstr "Velg om du vil ha muligheten til Ã¥ installere slike programmer."
 
 #. Type: select
 #. Choices
-#: ../apt-mirror-setup.templates:30
+#: ../apt-mirror-setup.templates:32
 msgid "Ignore"
 msgstr "Ignorer"
 
 #. Type: select
 #. Description
-#: ../apt-mirror-setup.templates:31
+#: ../apt-mirror-setup.templates:33
 msgid ""
 "The installer failed to access the mirror. This may be a problem with your "
 "network, or with the mirror. You can choose to retry the download, select a "
 "different mirror, or ignore the problem and continue without all the "
 "packages from this mirror."
 msgstr ""
-"Installeringsprogrammet klarte ikke Ã¥ fÃ¥ kontakt med speilet. "
-"Feilen kan skyldes nettverket ditt eller speilet. Du kan prÃ¸ve Ã¥ laste ned "
-"fila pÃ¥ nytt, velge et annet speil, eller ikke bry deg om problemet og "
-"fortsette uten alle pakkene fra dette speilet."
+"Installeringsprogrammet klarte ikke Ã¥ fÃ¥ kontakt med speilet. Feilen kan "
+"skyldes nettverket ditt eller speilet. Du kan prÃ¸ve Ã¥ laste ned fila pÃ¥ "
+"nytt, velge et annet speil, eller ikke bry deg om problemet og fortsette "
+"uten alle pakkene fra dette speilet."
 
 #. Type: boolean
 #. Description
@@ -5751,7 +5781,8 @@
 #. Type: note
 #. Description
 #: ../nobootloader.templates:8
-msgid "Alternatively, you will be able to boot the kernel manually by entering :"
+msgid ""
+"Alternatively, you will be able to boot the kernel manually by entering :"
 msgstr "Eller du kan starte kjernen manuelt ved Ã¥ taste:"
 
 #. Type: note
@@ -5851,7 +5882,8 @@
 msgid ""
 "The following other operating systems have been detected on this computer: "
 "${OS_LIST}"
-msgstr "FÃ¸lgende andre operativsystemer er funnet pÃ¥ denne maskinen: ${OS_LIST}"
+msgstr ""
+"FÃ¸lgende andre operativsystemer er funnet pÃ¥ denne maskinen: ${OS_LIST}"
 
 #. Type: boolean
 #. Description
@@ -5871,7 +5903,8 @@
 #. Description
 #: ../grub-installer.templates:16
 msgid "Install the GRUB boot loader to the master boot record?"
-msgstr "Vil du installere oppstartslasteren Grub pÃ¥ hovedoppstartssporet (MBR)?"
+msgstr ""
+"Vil du installere oppstartslasteren Grub pÃ¥ hovedoppstartssporet (MBR)?"
 
 #. Type: boolean
 #. Description
@@ -6192,7 +6225,8 @@
 msgid ""
 "The path ${path} does not represent a partition or hard disk device. Please "
 "try again."
-msgstr "Stien ${path} angir ikke en partisjon eller harddisk-enhet. PrÃ¸v igjen."
+msgstr ""
+"Stien ${path} angir ikke en partisjon eller harddisk-enhet. PrÃ¸v igjen."
 
 #. Type: text
 #. Description
@@ -6862,7 +6896,8 @@
 #. Type: note
 #. Description
 #: ../yaboot-installer.templates:97
-msgid "Alternatively, you will be able to boot the system manually by entering:"
+msgid ""
+"Alternatively, you will be able to boot the system manually by entering:"
 msgstr "Eller du kan starte systemet manuelt ved Ã¥ taste:"
 
 #. Type: note
@@ -6978,7 +7013,8 @@
 #. Type: error
 #. Description
 #: ../preseed-common.templates:45
-msgid "Execution of preseeded command \"${COMMAND}\" failed with exit code ${CODE}."
+msgid ""
+"Execution of preseeded command \"${COMMAND}\" failed with exit code ${CODE}."
 msgstr ""
 "KjÃ¸ring av forhÃ¥ndsinnstilt kommando Â«${COMMAND}Â» mislyktes med returkoden "
 "${CODE}."
@@ -7046,7 +7082,8 @@
 msgid ""
 "The device you entered for your root file system (${DEVICE}) does not exist. "
 "Please try again."
-msgstr "Enheten du oppgav som ditt rotfilsystem (${DEVICE}) finnes ikke. PrÃ¸v igjen."
+msgstr ""
+"Enheten du oppgav som ditt rotfilsystem (${DEVICE}) finnes ikke. PrÃ¸v igjen."
 
 #. Type: error
 #. Description
@@ -7358,7 +7395,8 @@
 #. Description
 #: ../save-logs.templates:42
 msgid "Log files and debug info will be copied into this floppy."
-msgstr "Loggfiler og feilsÃ¸kingsinformasjon blir kopiert inn pÃ¥ denne disketten."
+msgstr ""
+"Loggfiler og feilsÃ¸kingsinformasjon blir kopiert inn pÃ¥ denne disketten."
 
 #. Type: note
 #. Description
@@ -7419,7 +7457,8 @@
 msgid ""
 "Please insert one of the official Debian CD-ROMs into the drive before "
 "continuing."
-msgstr "Sett inn en av de offisielle Debian-CD-platene i stasjonen fÃ¸r du fortsetter."
+msgstr ""
+"Sett inn en av de offisielle Debian-CD-platene i stasjonen fÃ¸r du fortsetter."
 
 #. Type: error
 #. Description
@@ -7719,7 +7758,8 @@
 msgid ""
 "Please check this carefully against the fingerprint reported by your SSH "
 "client."
-msgstr "Sjekk denne ordentlig mot fingeravtrykket rapportert fra din SSH-klient."
+msgstr ""
+"Sjekk denne ordentlig mot fingeravtrykket rapportert fra din SSH-klient."
 
 #. Type: boolean
 #. Description
@@ -8380,7 +8420,8 @@
 #. Description
 #: ../sibyl-installer.templates:4
 msgid "SiByl boot loader installation failed.  Continue anyway?"
-msgstr "Klarte ikke Ã¥ installere oppstartslasteren SiByl. Vil du fortsette allikevel?"
+msgstr ""
+"Klarte ikke Ã¥ installere oppstartslasteren SiByl. Vil du fortsette allikevel?"
 
 #. Type: boolean
 #. Description
@@ -8578,7 +8619,8 @@
 #. Type: select
 #. Description
 #: ../mdcfg-utils.templates:18
-msgid "Please select one of the proposed actions to configure multidisk devices."
+msgid ""
+"Please select one of the proposed actions to configure multidisk devices."
 msgstr "Velg en av de fÃ¸lgende handlingene for Ã¥ sette opp multidisk-enheter."
 
 #. Type: error
@@ -9060,8 +9102,10 @@
 #. Type: error
 #. Description
 #: ../lvmcfg-utils.templates:69
-msgid "The selected volume group name is already in use. Please choose another name."
-msgstr "Et annet gruppert dataomrÃ¥de bruker dette navnet, du mÃ¥ velge et annet navn."
+msgid ""
+"The selected volume group name is already in use. Please choose another name."
+msgstr ""
+"Et annet gruppert dataomrÃ¥de bruker dette navnet, du mÃ¥ velge et annet navn."
 
 #. Type: error
 #. Description
@@ -9170,7 +9214,8 @@
 #. Type: error
 #. Description
 #: ../lvmcfg-utils.templates:127
-msgid "No physical volumes were selected. Extension of the volume group was aborted."
+msgid ""
+"No physical volumes were selected. Extension of the volume group was aborted."
 msgstr ""
 "Ingen fysiske dataomrÃ¥der ble valgt. Avbryter utvidelsen av et gruppert "
 "dataomrÃ¥de."
@@ -9307,7 +9352,8 @@
 #. Description
 #: ../lvmcfg-utils.templates:199
 msgid "No name for the logical volume has been entered.  Please enter a name."
-msgstr "Det er ikke oppgitt noe navn for det logiske dataomrÃ¥det. Skriv inn et navn."
+msgstr ""
+"Det er ikke oppgitt noe navn for det logiske dataomrÃ¥det. Skriv inn et navn."
 
 #. Type: error
 #. Description
@@ -9392,7 +9438,8 @@
 #. Type: error
 #. Description
 #: ../lvmcfg-utils.templates:240
-msgid "No logical volume has been found.  Please create a logical volume first."
+msgid ""
+"No logical volume has been found.  Please create a logical volume first."
 msgstr "Fant intet logisk dataomrÃ¥de. Opprett et logisk dataomrÃ¥de fÃ¸rst."
 
 #. Type: select
@@ -9782,7 +9829,8 @@
 #. Description
 #: ../partman-crypto.templates:126
 msgid "Write the changes to disks and configure encrypted volumes?"
-msgstr "Vil du skrive endringene til harddiskene og sette opp krypterte dataomrÃ¥der?"
+msgstr ""
+"Vil du skrive endringene til harddiskene og sette opp krypterte dataomrÃ¥der?"
 
 #. Type: boolean
 #. Description
@@ -10108,7 +10156,8 @@
 #. Type: error
 #. Description
 #: ../partman-crypto.templates:273
-msgid "Please go back and choose a non-encrypted partition for the root filesystem."
+msgid ""
+"Please go back and choose a non-encrypted partition for the root filesystem."
 msgstr "GÃ¥ tilbake og velg en ukryptert partisjon til rot-filsystemet."
 
 #. Type: boolean
@@ -10165,7 +10214,8 @@
 msgid ""
 "No usable file systems were found. You may need to load additional kernel "
 "modules."
-msgstr "Fant ingen brukbare filsystemer. Du mÃ¥ kanskje laste inn flere kjernemoduler."
+msgstr ""
+"Fant ingen brukbare filsystemer. Du mÃ¥ kanskje laste inn flere kjernemoduler."
 
 #. Type: select
 #. Choices
@@ -10291,8 +10341,10 @@
 #. Type: boolean
 #. Description
 #: ../partconf.templates:68
-msgid "Since the partitions have already been mounted, you cannot do any changes."
-msgstr "Siden partisjonene allerede er montert, kan du ikke gjÃ¸re noen endringer."
+msgid ""
+"Since the partitions have already been mounted, you cannot do any changes."
+msgstr ""
+"Siden partisjonene allerede er montert, kan du ikke gjÃ¸re noen endringer."
 
 #. Type: error
 #. Description
@@ -10343,7 +10395,8 @@
 #. Description
 #: ../partconf.templates:90
 msgid "Mounting a partition on ${MOUNT} makes no sense. Please change this."
-msgstr "Det gir ingen mening Ã¥ montere en partisjon pÃ¥ ${MOUNT}. Du mÃ¥ endre dette."
+msgstr ""
+"Det gir ingen mening Ã¥ montere en partisjon pÃ¥ ${MOUNT}. Du mÃ¥ endre dette."
 
 #. Type: error
 #. Description
@@ -10416,7 +10469,8 @@
 #. Type: error
 #. Description
 #: ../partconf.templates:126
-msgid "An error occurred when the ${FS} file system was created on ${PARTITION}."
+msgid ""
+"An error occurred when the ${FS} file system was created on ${PARTITION}."
 msgstr "En feil oppstod da filsystemet ${FS} ble opprettet pÃ¥ ${PARTITION}."
 
 #. Type: error
@@ -10478,7 +10532,8 @@
 msgid ""
 "Unable to find any disk in your system. Maybe some kernel modules need to be "
 "loaded."
-msgstr "Fant ingen harddisker pÃ¥ systemet. Kanskje du mÃ¥ laste flere kjernemoduler."
+msgstr ""
+"Fant ingen harddisker pÃ¥ systemet. Kanskje du mÃ¥ laste flere kjernemoduler."
 
 #. Type: error
 #. Description
@@ -10545,7 +10600,8 @@
 #. Description
 #: ../autopartkit.templates:24
 msgid "Really use the automatic partitioning tool?"
-msgstr "Er du sikker pÃ¥ at du vil bruke det automatiske partisjoneringsverktÃ¸yet?"
+msgstr ""
+"Er du sikker pÃ¥ at du vil bruke det automatiske partisjoneringsverktÃ¸yet?"
 
 #. Type: boolean
 #. Description
@@ -10747,7 +10803,8 @@
 #. Type: select
 #. Choices
 #: ../s390-netdevice.templates:6
-msgid "lcs: qeth: OSA-2 Token Ring/Ethernet or OSA-Express Fast Ethernet (non-QDIO)"
+msgid ""
+"lcs: qeth: OSA-2 Token Ring/Ethernet or OSA-Express Fast Ethernet (non-QDIO)"
 msgstr ""
 "lcs: qeth: OSA-2-Token Ring/Ethernet eller OSA-Express Fast Ethernet (ikke-"
 "QDIO)"
@@ -11127,7 +11184,8 @@
 #. Description
 #: ../s390-dasd.templates:36
 msgid "WARNING: All data on this disk will be IRREVERSIBLY LOST!"
-msgstr "ADVARSEL: All informasjonen pÃ¥ denne harddisken vil GÃ… FULLSTENDIG TAPT!"
+msgstr ""
+"ADVARSEL: All informasjonen pÃ¥ denne harddisken vil GÃ… FULLSTENDIG TAPT!"
 
 #. Type: text
 #. Description
@@ -11168,480 +11226,506 @@
 msgid "Configure the base system before rebooting"
 msgstr "Sett opp grunnsystemet fÃ¸r omstart"
 
-msgid "Retry, Change mirror, Ignore"
-msgstr "PrÃ¸v igjen, Endre speil, Ignorer"
+#~ msgid "Desktop machine"
+#~ msgstr "Skrivebordsmaskin"
 
-msgid ""
-"After encrypted volumes have been configured, no additional changes to the "
-"partitions in the discs containing encrypted volumes are allowed. Please "
-"decide if you are satisfied with the current partitioning scheme in these "
-"disks before continuing."
-msgstr ""
-"NÃ¥r krypterte dataomrÃ¥der er satt opp, kan man ikke gjÃ¸re flere endringer pÃ¥ "
-"partisjonene pÃ¥ enhetene som inneholder krypterte dataomrÃ¥der. Sjekk at du "
-"er fornÃ¸yd med partisjonsoppsettet pÃ¥ disse enhetene fÃ¸r du fortsetter."
+#~ msgid "Multi-user workstation"
+#~ msgstr "Flerbrukermaskin"
 
-msgid "Configure the network using dynamic addressing (DHCP)"
-msgstr "Sett opp nettverket med dynamisk adressering (DHCP)"
+#~ msgid "Retry, Change mirror, Ignore"
+#~ msgstr "PrÃ¸v igjen, Endre speil, Ignorer"
 
-msgid "Use free space for the Logical Volume Manager"
-msgstr "Bruk ledig plass for logiske dataomrÃ¥der (LVM)"
+#~ msgid ""
+#~ "After encrypted volumes have been configured, no additional changes to "
+#~ "the partitions in the discs containing encrypted volumes are allowed. "
+#~ "Please decide if you are satisfied with the current partitioning scheme "
+#~ "in these disks before continuing."
+#~ msgstr ""
+#~ "NÃ¥r krypterte dataomrÃ¥der er satt opp, kan man ikke gjÃ¸re flere endringer "
+#~ "pÃ¥ partisjonene pÃ¥ enhetene som inneholder krypterte dataomrÃ¥der. Sjekk "
+#~ "at du er fornÃ¸yd med partisjonsoppsettet pÃ¥ disse enhetene fÃ¸r du "
+#~ "fortsetter."
 
-msgid "Mount options can tune the behaviour of the file system."
-msgstr "Monteringsvalg kan justere filsystemets oppfÃ¸rsel."
+#~ msgid "Configure the network using dynamic addressing (DHCP)"
+#~ msgstr "Sett opp nettverket med dynamisk adressering (DHCP)"
 
-msgid "Base system configuration"
-msgstr "Oppsett av grunnsystemet"
+#~ msgid "Use free space for the Logical Volume Manager"
+#~ msgstr "Bruk ledig plass for logiske dataomrÃ¥der (LVM)"
 
-msgid "This is the base system configuration menu."
-msgstr "Dette er oppsettsmenyen for grunnsystemet."
+#~ msgid "Mount options can tune the behaviour of the file system."
+#~ msgstr "Monteringsvalg kan justere filsystemets oppfÃ¸rsel."
 
-msgid "Welcome to your newly installed system!"
-msgstr "Velkommen til ditt nyinstallerte system!"
+#~ msgid "Base system configuration"
+#~ msgstr "Oppsett av grunnsystemet"
 
-msgid ""
-"This program will now walk you through the process of setting up your newly "
-"installed system. It will start with the basics -- time zone selection, "
-"setting a root password and adding a user, and then progress to installing "
-"additional software to tune this new system to your needs."
-msgstr ""
-"Dette programmet vil nÃ¥ fÃ¸re deg gjennom installasjonen av det nye systemet. "
-"Programmet starter med det helt grunnleggende: valg av tidssone, Ã¥ lage et "
-"root-passord og Ã¥ legge til en bruker. NÃ¥r det er gjort, vil programmet "
-"installere flere programmer slik at det nye systemet har det som trengs."
+#~ msgid "This is the base system configuration menu."
+#~ msgstr "Dette er oppsettsmenyen for grunnsystemet."
 
-msgid "Use a PPP connection to install the system?"
-msgstr "Vil du bruke en PPP-forbindelse for Ã¥ installere systemet?"
+#~ msgid "Welcome to your newly installed system!"
+#~ msgstr "Velkommen til ditt nyinstallerte system!"
 
-msgid ""
-"This system does not seem to be currently connected to the internet. Even if "
-"you plan to install from CD, it is wise to download at least security "
-"updates from the internet."
-msgstr ""
-"Det ser ikke ut til at systemet er koblet til Internett nÃ¥. Selv om du har "
-"tenkt Ã¥ installere fra CD, er det lurt i det minste Ã¥ laste ned "
-"sikkerhetsoppdateringer fra Internett."
+#~ msgid ""
+#~ "This program will now walk you through the process of setting up your "
+#~ "newly installed system. It will start with the basics -- time zone "
+#~ "selection, setting a root password and adding a user, and then progress "
+#~ "to installing additional software to tune this new system to your needs."
+#~ msgstr ""
+#~ "Dette programmet vil nÃ¥ fÃ¸re deg gjennom installasjonen av det nye "
+#~ "systemet. Programmet starter med det helt grunnleggende: valg av "
+#~ "tidssone, Ã¥ lage et root-passord og Ã¥ legge til en bruker. NÃ¥r det er "
+#~ "gjort, vil programmet installere flere programmer slik at det nye "
+#~ "systemet har det som trengs."
 
-msgid ""
-"If you have an account on an Internet Services Provider (ISP), and you want "
-"to use it during the install, you may configure the PPP service now, and "
-"open a PPP connection to your ISP."
-msgstr ""
-"Hvis du har en konto hos en Internett-leverandÃ¸r, og du vil bruke den til Ã¥ "
-"sette opp systemet med pakker du henter fra Internett, kan du sette opp PPP-"
-"tjenesten nÃ¥, og Ã¥pne en PPP-forbindelse til din Internett-leverandÃ¸r."
+#~ msgid "Use a PPP connection to install the system?"
+#~ msgstr "Vil du bruke en PPP-forbindelse for Ã¥ installere systemet?"
 
-msgid "Thank you for choosing Debian!"
-msgstr "Takk for at du valgte Debian!"
+#~ msgid ""
+#~ "This system does not seem to be currently connected to the internet. Even "
+#~ "if you plan to install from CD, it is wise to download at least security "
+#~ "updates from the internet."
+#~ msgstr ""
+#~ "Det ser ikke ut til at systemet er koblet til Internett nÃ¥. Selv om du "
+#~ "har tenkt Ã¥ installere fra CD, er det lurt i det minste Ã¥ laste ned "
+#~ "sikkerhetsoppdateringer fra Internett."
 
-msgid ""
-"Setup of your Debian system is complete. You may now login at the login: "
-"prompt."
-msgstr "Debian-oppsettet er nÃ¥ fullfÃ¸rt. Du kan nÃ¥ logge inn pÃ¥ kommandolinja."
+#~ msgid ""
+#~ "If you have an account on an Internet Services Provider (ISP), and you "
+#~ "want to use it during the install, you may configure the PPP service now, "
+#~ "and open a PPP connection to your ISP."
+#~ msgstr ""
+#~ "Hvis du har en konto hos en Internett-leverandÃ¸r, og du vil bruke den til "
+#~ "Ã¥ sette opp systemet med pakker du henter fra Internett, kan du sette opp "
+#~ "PPP-tjenesten nÃ¥, og Ã¥pne en PPP-forbindelse til din Internett-leverandÃ¸r."
 
-msgid ""
-"If you want to revisit this setup process at a later date, just run the base-"
-"config program."
-msgstr ""
-"Hvis du vil gjÃ¸re dette oppsettet pÃ¥ nytt en annen gang, sÃ¥ starter du "
-"programmet Â«base-configÂ»."
+#~ msgid "Thank you for choosing Debian!"
+#~ msgstr "Takk for at du valgte Debian!"
 
-msgid "System hostname:"
-msgstr "Vertsnavn for systemet:"
+#~ msgid ""
+#~ "Setup of your Debian system is complete. You may now login at the login: "
+#~ "prompt."
+#~ msgstr ""
+#~ "Debian-oppsettet er nÃ¥ fullfÃ¸rt. Du kan nÃ¥ logge inn pÃ¥ kommandolinja."
 
-msgid "Please enter your system hostname."
-msgstr "Skriv inn vertsnavnet for systemet ditt."
+#~ msgid ""
+#~ "If you want to revisit this setup process at a later date, just run the "
+#~ "base-config program."
+#~ msgstr ""
+#~ "Hvis du vil gjÃ¸re dette oppsettet pÃ¥ nytt en annen gang, sÃ¥ starter du "
+#~ "programmet Â«base-configÂ»."
 
-msgid ""
-"The hostname is a name that identifies your system to the network. If you "
-"don't know what your hostname should be, consult your network administrator. "
-"If you are setting up your own home network, you can make something up here."
-msgstr ""
-"Vertsnavnet er et navn som navngir systemet ditt overfor nettverket. Hvis du "
-"ikke vet hva vertsnavnet skal vÃ¦re, sÃ¥ kontakt nettverksadministratoren din. "
-"Hvis du setter opp ditt eget hjemmenett, kan du bare finne pÃ¥ noe her."
+#~ msgid "System hostname:"
+#~ msgstr "Vertsnavn for systemet:"
 
-msgid "Invalid hostname \"${HOSTNAME}\""
-msgstr "Maskinnavnet Â«${HOSTNAME}Â» er ugyldig"
+#~ msgid "Please enter your system hostname."
+#~ msgstr "Skriv inn vertsnavnet for systemet ditt."
 
-msgid ""
-"A valid hostname may contain period-separated parts containing only "
-"lowercase ASCII characters (a-z), the minus sign and numbers (0-9), be "
-"between 2 and 63 characters long, and each part cannot begin or end with a "
-"minus sign."
-msgstr ""
-"Et gyldig vertsnavn kan inneholde deler adskilt med punktum. Hver del kan "
-"bare inneholde smÃ¥ bokstaver fra a til z, sifrene 0-9 og minustegnet, mÃ¥ "
-"vÃ¦re mellom 2 og 63 tegn langt, og kan ikke begynne eller slutte med et "
-"minustegn."
+#~ msgid ""
+#~ "The hostname is a name that identifies your system to the network. If you "
+#~ "don't know what your hostname should be, consult your network "
+#~ "administrator. If you are setting up your own home network, you can make "
+#~ "something up here."
+#~ msgstr ""
+#~ "Vertsnavnet er et navn som navngir systemet ditt overfor nettverket. Hvis "
+#~ "du ikke vet hva vertsnavnet skal vÃ¦re, sÃ¥ kontakt "
+#~ "nettverksadministratoren din. Hvis du setter opp ditt eget hjemmenett, "
+#~ "kan du bare finne pÃ¥ noe her."
 
-msgid "Do you want to start the graphical display manager?"
-msgstr "Vil du starte den grafiske skjermbehandleren?"
+#~ msgid "Invalid hostname \"${HOSTNAME}\""
+#~ msgstr "Maskinnavnet Â«${HOSTNAME}Â» er ugyldig"
 
-msgid ""
-"The graphical display manager makes it possible to log in using a graphical "
-"environment."
-msgstr "Den grafiske skjermbehandleren gjÃ¸r det mulig Ã¥ logge inn i et grafisk miljÃ¸."
+#~ msgid ""
+#~ "A valid hostname may contain period-separated parts containing only "
+#~ "lowercase ASCII characters (a-z), the minus sign and numbers (0-9), be "
+#~ "between 2 and 63 characters long, and each part cannot begin or end with "
+#~ "a minus sign."
+#~ msgstr ""
+#~ "Et gyldig vertsnavn kan inneholde deler adskilt med punktum. Hver del kan "
+#~ "bare inneholde smÃ¥ bokstaver fra a til z, sifrene 0-9 og minustegnet, mÃ¥ "
+#~ "vÃ¦re mellom 2 og 63 tegn langt, og kan ikke begynne eller slutte med et "
+#~ "minustegn."
 
-msgid "Load preseed file"
-msgstr "Last inn fila med forhÃ¥ndsoppsettet"
+#~ msgid "Do you want to start the graphical display manager?"
+#~ msgstr "Vil du starte den grafiske skjermbehandleren?"
 
-msgid "Display introductory message"
-msgstr "Vis oppstartsmelding"
+#~ msgid ""
+#~ "The graphical display manager makes it possible to log in using a "
+#~ "graphical environment."
+#~ msgstr ""
+#~ "Den grafiske skjermbehandleren gjÃ¸r det mulig Ã¥ logge inn i et grafisk "
+#~ "miljÃ¸."
 
-msgid "Configure the keyboard"
-msgstr "Sett opp tastaturet"
+#~ msgid "Load preseed file"
+#~ msgstr "Last inn fila med forhÃ¥ndsoppsettet"
 
-msgid "Set up users and passwords"
-msgstr "Sett opp brukere og passord"
+#~ msgid "Display introductory message"
+#~ msgstr "Vis oppstartsmelding"
 
-msgid "Set the hostname"
-msgstr "Velg vertsnavn"
+#~ msgid "Configure the keyboard"
+#~ msgstr "Sett opp tastaturet"
 
-msgid "Configure and enable ppp"
-msgstr "Sett opp og skru pÃ¥ PPP"
+#~ msgid "Set up users and passwords"
+#~ msgstr "Sett opp brukere og passord"
 
-msgid "Select and install packages"
-msgstr "Velg og installer pakker"
+#~ msgid "Set the hostname"
+#~ msgstr "Velg vertsnavn"
 
-msgid "Configure the Mail Transfer Agent"
-msgstr "Sett opp programmet som overfÃ¸rer e-post"
+#~ msgid "Configure and enable ppp"
+#~ msgstr "Sett opp og skru pÃ¥ PPP"
 
-msgid "Finish configuring the base system"
-msgstr "FullfÃ¸r oppsettet av grunnsystemet"
+#~ msgid "Select and install packages"
+#~ msgstr "Velg og installer pakker"
 
-msgid "Exit the base system configuration"
-msgstr "Avslutt oppsett av grunnsystemet"
+#~ msgid "Configure the Mail Transfer Agent"
+#~ msgstr "Sett opp programmet som overfÃ¸rer e-post"
 
-msgid "Configure timezone"
-msgstr "Sett opp tidssonen"
+#~ msgid "Finish configuring the base system"
+#~ msgstr "FullfÃ¸r oppsettet av grunnsystemet"
 
-msgid "stable, unstable, testing"
-msgstr "stabil, ustabil, testing"
+#~ msgid "Exit the base system configuration"
+#~ msgstr "Avslutt oppsett av grunnsystemet"
 
-msgid "Debian distribution to use:"
-msgstr "Velg den Debian-distribusjonen du vil ha:"
+#~ msgid "Configure timezone"
+#~ msgstr "Sett opp tidssonen"
 
-msgid "Please choose which version of Debian you wish to install."
-msgstr "Velg hvilken Debian-versjon du Ã¸nsker Ã¥ installere."
+#~ msgid "stable, unstable, testing"
+#~ msgstr "stabil, ustabil, testing"
 
-msgid ""
-"If you need to use a HTTP proxy to access the outside world, please enter "
-"the proxy information here. Otherwise, leave this blank."
-msgstr ""
-"Hvis du har behov for en http-mellomtjener for Ã¥ fÃ¥ tilgang til omverdenen, "
-"sÃ¥ skriv inn rett informasjon her. Ellers lar du bare feltet stÃ¥ tomt."
+#~ msgid "Debian distribution to use:"
+#~ msgstr "Velg den Debian-distribusjonen du vil ha:"
 
-msgid ""
-"The proxy information should be the standard form of \"http://[[user][:pass]"
-"@]host[:port]\""
-msgstr ""
-"NÃ¥r du skriver inn informasjon om tjeneren, mÃ¥ du bruke den skrivemÃ¥ten som "
-"er standard: Â«http://[[user][:pass]@]host[:port]Â»"
+#~ msgid "Please choose which version of Debian you wish to install."
+#~ msgstr "Velg hvilken Debian-versjon du Ã¸nsker Ã¥ installere."
 
-msgid "cdrom, http, ftp, filesystem, edit sources list by hand"
-msgstr "cdrom, http, ftp, filsystem, endre pakkelista (sources list) for hÃ¥nd"
+#~ msgid ""
+#~ "If you need to use a HTTP proxy to access the outside world, please enter "
+#~ "the proxy information here. Otherwise, leave this blank."
+#~ msgstr ""
+#~ "Hvis du har behov for en http-mellomtjener for Ã¥ fÃ¥ tilgang til "
+#~ "omverdenen, sÃ¥ skriv inn rett informasjon her. Ellers lar du bare feltet "
+#~ "stÃ¥ tomt."
 
-msgid "Archive access method for apt:"
-msgstr "Forbindelse til apt:"
+#~ msgid ""
+#~ "The proxy information should be the standard form of \"http://[[user][:"
+#~ "pass]@]host[:port]\""
+#~ msgstr ""
+#~ "NÃ¥r du skriver inn informasjon om tjeneren, mÃ¥ du bruke den skrivemÃ¥ten "
+#~ "som er standard: Â«http://[[user][:pass]@]host[:port]Â»"
 
-msgid ""
-"Please choose the method that apt (the package management tool) should use "
-"to access the package archive."
-msgstr ""
-"Velg hvilken metode apt (pakkehÃ¥ndteringsverktÃ¸yet) skal bruke for Ã¥ lese "
-"fra pakkearkivet."
+#~ msgid "cdrom, http, ftp, filesystem, edit sources list by hand"
+#~ msgstr ""
+#~ "cdrom, http, ftp, filsystem, endre pakkelista (sources list) for hÃ¥nd"
 
-msgid ""
-"For example if you have an installation CD, select \"cdrom\", while if you "
-"plan to install from a mirror on the network, choose \"ftp\" or \"http\"."
-msgstr ""
-"Hvis du f.eks har en installasjons-CD kan du velge Â«cdromÂ», og hvis du vil "
-"installere fra en kilde pÃ¥ nettet kan du velge Â«ftpÂ» eller Â«httpÂ»."
+#~ msgid "Archive access method for apt:"
+#~ msgstr "Forbindelse til apt:"
 
-msgid "${note}"
-msgstr "${note}"
+#~ msgid ""
+#~ "Please choose the method that apt (the package management tool) should "
+#~ "use to access the package archive."
+#~ msgstr ""
+#~ "Velg hvilken metode apt (pakkehÃ¥ndteringsverktÃ¸yet) skal bruke for Ã¥ lese "
+#~ "fra pakkearkivet."
 
-msgid "Mirror country:"
-msgstr "Speil-land:"
+#~ msgid ""
+#~ "For example if you have an installation CD, select \"cdrom\", while if "
+#~ "you plan to install from a mirror on the network, choose \"ftp\" or \"http"
+#~ "\"."
+#~ msgstr ""
+#~ "Hvis du f.eks har en installasjons-CD kan du velge Â«cdromÂ», og hvis du "
+#~ "vil installere fra en kilde pÃ¥ nettet kan du velge Â«ftpÂ» eller Â«httpÂ»."
 
-msgid ""
-"Select the country the mirror should be in. You should use a mirror in your "
-"country or region if you do not know which mirror has the best Internet "
-"connection to you."
-msgstr ""
-"Velg landet kilden skal vÃ¦re i. Du bÃ¸r bruke en kilde i det landet eller "
-"omrÃ¥det du er i, bortsett i fra nÃ¥r du vet hvilken kilde som har best "
-"Internett-forbindelse til deg."
+#~ msgid "${note}"
+#~ msgstr "${note}"
 
-msgid "Choose the mirror to use:"
-msgstr "Velg hvilken kilde du vil bruke:"
+#~ msgid "Mirror country:"
+#~ msgstr "Speil-land:"
 
-msgid ""
-"Select the mirror that apt should use. You should select a mirror that is "
-"close to you on the net."
-msgstr ""
-"Velg den apt-kilden du vil bruke. Du bÃ¸r velge en kilde som har kortest "
-"mulig vei til deg over nettet."
+#~ msgid ""
+#~ "Select the country the mirror should be in. You should use a mirror in "
+#~ "your country or region if you do not know which mirror has the best "
+#~ "Internet connection to you."
+#~ msgstr ""
+#~ "Velg landet kilden skal vÃ¦re i. Du bÃ¸r bruke en kilde i det landet eller "
+#~ "omrÃ¥det du er i, bortsett i fra nÃ¥r du vet hvilken kilde som har best "
+#~ "Internett-forbindelse til deg."
 
-msgid "Mirror hostname:"
-msgstr "Vertsnavn til kilden:"
+#~ msgid "Choose the mirror to use:"
+#~ msgstr "Velg hvilken kilde du vil bruke:"
 
-msgid "Enter the hostname of the mirror from which packages will be downloaded."
-msgstr "Skriv inn navnet pÃ¥ den apt-kilden du vil laste ned pakker fra."
+#~ msgid ""
+#~ "Select the mirror that apt should use. You should select a mirror that is "
+#~ "close to you on the net."
+#~ msgstr ""
+#~ "Velg den apt-kilden du vil bruke. Du bÃ¸r velge en kilde som har kortest "
+#~ "mulig vei til deg over nettet."
 
-msgid "Mirror directory:"
-msgstr "Skriv inn navnet pÃ¥ katalogen:"
+#~ msgid "Mirror hostname:"
+#~ msgstr "Vertsnavn til kilden:"
 
-msgid "Enter the directory in which the mirror is located."
-msgstr "Skriv inn filbanen til den katalogen der kilden ligger pÃ¥ nettet."
+#~ msgid ""
+#~ "Enter the hostname of the mirror from which packages will be downloaded."
+#~ msgstr "Skriv inn navnet pÃ¥ den apt-kilden du vil laste ned pakker fra."
 
-msgid "The directory you entered does not exist."
-msgstr "Katalogen du skrev inn finnes ikke."
+#~ msgid "Mirror directory:"
+#~ msgstr "Skriv inn navnet pÃ¥ katalogen:"
 
-msgid "Mirror not found"
-msgstr "Fant ikke nettstedet"
+#~ msgid "Enter the directory in which the mirror is located."
+#~ msgstr "Skriv inn filbanen til den katalogen der kilden ligger pÃ¥ nettet."
 
-msgid ""
-"The directory you entered does not contain a subdirectory named \"dists\", "
-"so it doesn't seem to be a package mirror."
-msgstr ""
-"Katalogen du skrev inn inneholder ingen underkatalog som heter Â«distsÂ», sÃ¥ "
-"det ser ikke ut som om det er en pakkekilde."
+#~ msgid "The directory you entered does not exist."
+#~ msgstr "Katalogen du skrev inn finnes ikke."
 
-msgid "CD-ROM missing"
-msgstr "Mangler CD-ROM"
+#~ msgid "Mirror not found"
+#~ msgstr "Fant ikke nettstedet"
 
-msgid "Please insert a suitable CD."
-msgstr "Sett inn en egnet CD."
+#~ msgid ""
+#~ "The directory you entered does not contain a subdirectory named \"dists"
+#~ "\", so it doesn't seem to be a package mirror."
+#~ msgstr ""
+#~ "Katalogen du skrev inn inneholder ingen underkatalog som heter Â«distsÂ», "
+#~ "sÃ¥ det ser ikke ut som om det er en pakkekilde."
 
-msgid "CD-ROM device file:"
-msgstr "Skriv inn filbanen til CD-spilleren:"
+#~ msgid "CD-ROM missing"
+#~ msgstr "Mangler CD-ROM"
 
-msgid ""
-"This program was unable to auto-detect a CD-ROM drive, or there is no usable "
-"CD in the drive."
-msgstr ""
-"Programmet klarte ikke Ã¥ finne en CD-spiller automatisk, eller CD-spilleren "
-"inneholder feil CD."
+#~ msgid "Please insert a suitable CD."
+#~ msgstr "Sett inn en egnet CD."
 
-msgid ""
-"Enter the device file to use to access your CD-ROM, and place an "
-"installation CD in the drive."
-msgstr "Skriv inn filbanen til CD-stasjonen og legg inn en installasjons-CD."
+#~ msgid "CD-ROM device file:"
+#~ msgstr "Skriv inn filbanen til CD-spilleren:"
 
-msgid "Scan another CD?"
-msgstr "Har du flere CD-er Ã¥ lese fra?"
+#~ msgid ""
+#~ "This program was unable to auto-detect a CD-ROM drive, or there is no "
+#~ "usable CD in the drive."
+#~ msgstr ""
+#~ "Programmet klarte ikke Ã¥ finne en CD-spiller automatisk, eller CD-"
+#~ "spilleren inneholder feil CD."
 
-msgid ""
-"If you have another installation CD (for example, the second in a two CD "
-"set), you should insert and scan it now."
-msgstr ""
-"Hvis du har flere installasjons-CD-er (for eksempel CD nummer to i et CD-"
-"sett) sÃ¥ burde du sette den inn i CD-spilleren nÃ¥ og lese den av."
+#~ msgid ""
+#~ "Enter the device file to use to access your CD-ROM, and place an "
+#~ "installation CD in the drive."
+#~ msgstr ""
+#~ "Skriv inn filbanen til CD-stasjonen og legg inn en installasjons-CD."
 
-msgid "Failed to access the package archive"
-msgstr "Klarte ikke Ã¥ fÃ¥ kontakt med pakkearkivet"
+#~ msgid "Scan another CD?"
+#~ msgstr "Har du flere CD-er Ã¥ lese fra?"
 
-msgid ""
-"While trying to access the archive using the information you provided, the "
-"package management tool, apt, returned the following error. The questions "
-"will be asked again."
-msgstr ""
-"Da maskinen prÃ¸vde Ã¥ fÃ¥ tilgang til arkivet ved hjelp av informasjonen du "
-"ga, ga apt fÃ¸lgende feilmelding. Du fÃ¥r nÃ¥ de samme spÃ¸rsmÃ¥lene en gang til, "
-"prÃ¸v Ã¥ rette opp feilen."
+#~ msgid ""
+#~ "If you have another installation CD (for example, the second in a two CD "
+#~ "set), you should insert and scan it now."
+#~ msgstr ""
+#~ "Hvis du har flere installasjons-CD-er (for eksempel CD nummer to i et CD-"
+#~ "sett) sÃ¥ burde du sette den inn i CD-spilleren nÃ¥ og lese den av."
 
-msgid "Add another apt source?"
-msgstr "Vil du legge til flere apt-kilder?"
+#~ msgid "Failed to access the package archive"
+#~ msgstr "Klarte ikke Ã¥ fÃ¥ kontakt med pakkearkivet"
 
-msgid ""
-"${MESSAGE}. However, you may want to add another source to apt, so it can "
-"download packages from more than one location."
-msgstr ""
-"${MESSAGE}. Men du kan legge til en annen apt-kilde, slik at pakker kan "
-"lastes ned fra flere enn ett sted."
+#~ msgid ""
+#~ "While trying to access the archive using the information you provided, "
+#~ "the package management tool, apt, returned the following error. The "
+#~ "questions will be asked again."
+#~ msgstr ""
+#~ "Da maskinen prÃ¸vde Ã¥ fÃ¥ tilgang til arkivet ved hjelp av informasjonen du "
+#~ "ga, ga apt fÃ¸lgende feilmelding. Du fÃ¥r nÃ¥ de samme spÃ¸rsmÃ¥lene en gang "
+#~ "til, prÃ¸v Ã¥ rette opp feilen."
 
-msgid "edit, revert to backup"
-msgstr "rediger, gÃ¥ tilbake til den lagrede versjonen"
+#~ msgid "Add another apt source?"
+#~ msgstr "Vil du legge til flere apt-kilder?"
 
-msgid "What do you want to do?"
-msgstr "Hva vil du gjÃ¸re?"
+#~ msgid ""
+#~ "${MESSAGE}. However, you may want to add another source to apt, so it can "
+#~ "download packages from more than one location."
+#~ msgstr ""
+#~ "${MESSAGE}. Men du kan legge til en annen apt-kilde, slik at pakker kan "
+#~ "lastes ned fra flere enn ett sted."
 
-msgid ""
-"The entries you added in sources.list (the file defining package sources for "
-"apt) seem to be incorrect. Here is the error message from apt:"
-msgstr ""
-"OppfÃ¸ringene du la inn i pakkelista (sources list) ser ikke ut til Ã¥ vÃ¦re "
-"riktige. Apt ga fÃ¸lgende feilmelding:"
+#~ msgid "edit, revert to backup"
+#~ msgstr "rediger, gÃ¥ tilbake til den lagrede versjonen"
 
-msgid ""
-"A backup of the sources.list was made before you edited it. You may either "
-"revert to that backup or edit the existing file and fix it."
-msgstr ""
-"Maskinen har en tidligere kopi av pakkelista som ble lagret fÃ¸r du endret "
-"den. Du kan enten bruke den tidligere kopien, eller redigere pÃ¥ fila du har "
-"og rette feilen."
+#~ msgid "What do you want to do?"
+#~ msgstr "Hva vil du gjÃ¸re?"
 
-msgid "Use security updates from ${SECURITY_HOST}?"
-msgstr "Vil du bruke sikkerhetsoppdateringer fra ${SECURITY_HOST}?"
+#~ msgid ""
+#~ "The entries you added in sources.list (the file defining package sources "
+#~ "for apt) seem to be incorrect. Here is the error message from apt:"
+#~ msgstr ""
+#~ "OppfÃ¸ringene du la inn i pakkelista (sources list) ser ikke ut til Ã¥ vÃ¦re "
+#~ "riktige. Apt ga fÃ¸lgende feilmelding:"
 
-msgid ""
-"Timely security updates are available via the website ${SECURITY_HOST}. "
-"These updates may be tracked each time you upgrade your system. If you have "
-"a connection to the Internet, this is generally a good idea."
-msgstr ""
-"Sikkerhetsoppdateringer i rette tid tilbys via nettsiden ${SECURITY_HOST}. "
-"Disse oppdateringene kan sjekkes der hver gang du oppdaterer systemet. Hvis "
-"du er tilkoblet Internett er dette generelt sett en god idÃ©."
+#~ msgid ""
+#~ "A backup of the sources.list was made before you edited it. You may "
+#~ "either revert to that backup or edit the existing file and fix it."
+#~ msgstr ""
+#~ "Maskinen har en tidligere kopi av pakkelista som ble lagret fÃ¸r du endret "
+#~ "den. Du kan enten bruke den tidligere kopien, eller redigere pÃ¥ fila du "
+#~ "har og rette feilen."
 
-msgid "The error message returned by apt:"
-msgstr "Apt ga fÃ¸lgende feilmelding:"
+#~ msgid "Use security updates from ${SECURITY_HOST}?"
+#~ msgstr "Vil du bruke sikkerhetsoppdateringer fra ${SECURITY_HOST}?"
 
-msgid "${apt_error}"
-msgstr "${apt_error}"
+#~ msgid ""
+#~ "Timely security updates are available via the website ${SECURITY_HOST}. "
+#~ "These updates may be tracked each time you upgrade your system. If you "
+#~ "have a connection to the Internet, this is generally a good idea."
+#~ msgstr ""
+#~ "Sikkerhetsoppdateringer i rette tid tilbys via nettsiden "
+#~ "${SECURITY_HOST}. Disse oppdateringene kan sjekkes der hver gang du "
+#~ "oppdaterer systemet. Hvis du er tilkoblet Internett er dette generelt "
+#~ "sett en god idÃ©."
 
-msgid "There was a problem installing the selected software"
-msgstr "Det oppsto et problem under installasjonen av de valgte programmene"
+#~ msgid "The error message returned by apt:"
+#~ msgstr "Apt ga fÃ¸lgende feilmelding:"
 
-msgid ""
-"One or more packages failed to install. This may be due to bugs in the "
-"packages, or you may be out of disk space or experiencing some other problem."
-msgstr ""
-"Det oppsto en feil da en eller flere pakker skulle installeres. Dette kan "
-"skyldes feil ved pakkene, at harddisken er full eller et annet problem."
+#~ msgid "${apt_error}"
+#~ msgstr "${apt_error}"
 
-msgid ""
-"Simply trying to install those packages (or a slightly different set of "
-"packages) again may work around the problem, or at least move the "
-"installation process along a little further. If you want, you can go back to "
-"the package selection step, and try again."
-msgstr ""
-"Det kan hende det vil gÃ¥ hvis du installerer pakkene en gang til. (eventuelt "
-"velger litt andre pakker). I det minste kan dette fÃ¸re installasjonen et "
-"skritt videre. Hvis du vil, sÃ¥ kan du gÃ¥ tilbake til pakkevalget og prÃ¸ve "
-"igjen."
+#~ msgid "There was a problem installing the selected software"
+#~ msgstr "Det oppsto et problem under installasjonen av de valgte programmene"
 
-msgid ""
-"If you decide not to try again, bear in mind that some packages on your "
-"system will be in a broken state until you manually resolve the problem."
-msgstr ""
-"Hvis du bestemmer deg for ikke Ã¥ prÃ¸ve igjen, sÃ¥ vÃ¦r klar over at noen "
-"pakker pÃ¥ ditt system vil vÃ¦re Ã¸delagt helt til du lÃ¸ser problemet manuelt."
+#~ msgid ""
+#~ "One or more packages failed to install. This may be due to bugs in the "
+#~ "packages, or you may be out of disk space or experiencing some other "
+#~ "problem."
+#~ msgstr ""
+#~ "Det oppsto en feil da en eller flere pakker skulle installeres. Dette kan "
+#~ "skyldes feil ved pakkene, at harddisken er full eller et annet problem."
 
-msgid "Time zone configuration"
-msgstr "Oppsett av tidssone"
+#~ msgid ""
+#~ "Simply trying to install those packages (or a slightly different set of "
+#~ "packages) again may work around the problem, or at least move the "
+#~ "installation process along a little further. If you want, you can go back "
+#~ "to the package selection step, and try again."
+#~ msgstr ""
+#~ "Det kan hende det vil gÃ¥ hvis du installerer pakkene en gang til. "
+#~ "(eventuelt velger litt andre pakker). I det minste kan dette fÃ¸re "
+#~ "installasjonen et skritt videre. Hvis du vil, sÃ¥ kan du gÃ¥ tilbake til "
+#~ "pakkevalget og prÃ¸ve igjen."
 
-msgid "Is the hardware clock set to GMT?"
-msgstr "Er den fysiske klokka satt til GMT?"
+#~ msgid ""
+#~ "If you decide not to try again, bear in mind that some packages on your "
+#~ "system will be in a broken state until you manually resolve the problem."
+#~ msgstr ""
+#~ "Hvis du bestemmer deg for ikke Ã¥ prÃ¸ve igjen, sÃ¥ vÃ¦r klar over at noen "
+#~ "pakker pÃ¥ ditt system vil vÃ¦re Ã¸delagt helt til du lÃ¸ser problemet "
+#~ "manuelt."
 
-msgid ""
-"Unix system clocks are generally set to GMT (\"Greenwich Mean Time\", also "
-"known as \"Universal Coordinated Time\", or UTC). The operating system knows "
-"your time zone and converts system time into the local time. You can specify "
-"whether the hardware clock is set to either GMT (recommended for a Linux-"
-"only system) or local time (which may be more convenient for a system that "
-"also runs other operating systems or an off-the-shelf PC)."
-msgstr ""
-"Systemklokka pÃ¥ Unix-systemer settes vanligvis til GMT (Â«Greenwich Mean "
-"TimeÂ» eller UTC). Operativsystemet vet hvilken tidssone du er i, og gjÃ¸r om "
-"tiden i systemklokka til lokal tid. Du kan bestemme om den fysiske klokka "
-"skal bruke GMT (som er anbefalt for et rent Linux-system) eller om den skal "
-"bruke lokal tid. (Det siste kan passe bedre hvis du har flere "
-"operativsystemer pÃ¥ samme datamaskin)."
+#~ msgid "Time zone configuration"
+#~ msgstr "Oppsett av tidssone"
 
-msgid "The hardware clock says the time is now ${hwtime}."
-msgstr "Den fysiske klokka sier at klokka nÃ¥ er ${hwtime}."
+#~ msgid "Is the hardware clock set to GMT?"
+#~ msgstr "Er den fysiske klokka satt til GMT?"
 
-msgid "Do you want to change your current time zone?"
-msgstr "Vil du endre tidssonen?"
+#~ msgid ""
+#~ "Unix system clocks are generally set to GMT (\"Greenwich Mean Time\", "
+#~ "also known as \"Universal Coordinated Time\", or UTC). The operating "
+#~ "system knows your time zone and converts system time into the local time. "
+#~ "You can specify whether the hardware clock is set to either GMT "
+#~ "(recommended for a Linux-only system) or local time (which may be more "
+#~ "convenient for a system that also runs other operating systems or an off-"
+#~ "the-shelf PC)."
+#~ msgstr ""
+#~ "Systemklokka pÃ¥ Unix-systemer settes vanligvis til GMT (Â«Greenwich Mean "
+#~ "TimeÂ» eller UTC). Operativsystemet vet hvilken tidssone du er i, og gjÃ¸r "
+#~ "om tiden i systemklokka til lokal tid. Du kan bestemme om den fysiske "
+#~ "klokka skal bruke GMT (som er anbefalt for et rent Linux-system) eller om "
+#~ "den skal bruke lokal tid. (Det siste kan passe bedre hvis du har flere "
+#~ "operativsystemer pÃ¥ samme datamaskin)."
 
-msgid "Your current time zone is set to ${timezone}."
-msgstr "Din tidssone er nÃ¥ satt til ${timezone}."
+#~ msgid "The hardware clock says the time is now ${hwtime}."
+#~ msgstr "Den fysiske klokka sier at klokka nÃ¥ er ${hwtime}."
 
-msgid ""
-"Eastern, Central, Mountain, Pacific, Alaska, Hawaii, Aleutian, Arizona, East-"
-"Indiana, Indiana-Starke, Michigan, Samoa, other"
-msgstr ""
-"Ã˜stkysten, Sentral, FjellomrÃ¥det, Stillehavet, Alaska, Hawaii, Aleutane, "
-"Arizona, Ã˜st-Indiana, Indiana(-Starke), Michigan, Samoa, andre"
+#~ msgid "Do you want to change your current time zone?"
+#~ msgstr "Vil du endre tidssonen?"
 
-msgid "The following are common time zones in the United States of America."
-msgstr "FÃ¸lgende er vanlige tidssoner i de Forente statene (USA)."
+#~ msgid "Your current time zone is set to ${timezone}."
+#~ msgstr "Din tidssone er nÃ¥ satt til ${timezone}."
 
-msgid ""
-"Newfoundland, Atlantic, Eastern, Central, East-Saskatchewan, Saskatchewan, "
-"Mountain, Pacific, Yukon, other"
-msgstr ""
-"Newfoundland, Atlanterhavet, Ã˜stkysten, Sentral, Ã˜st-Saskatchewan, "
-"Saskatchewan, Fjellene, Stillehavet, Yukonterritoriet, andre"
+#~ msgid ""
+#~ "Eastern, Central, Mountain, Pacific, Alaska, Hawaii, Aleutian, Arizona, "
+#~ "East-Indiana, Indiana-Starke, Michigan, Samoa, other"
+#~ msgstr ""
+#~ "Ã˜stkysten, Sentral, FjellomrÃ¥det, Stillehavet, Alaska, Hawaii, Aleutane, "
+#~ "Arizona, Ã˜st-Indiana, Indiana(-Starke), Michigan, Samoa, andre"
 
-msgid "The following are common time zones in Canada."
-msgstr "FÃ¸lgende er vanlige tidssoner i Kanada."
+#~ msgid "The following are common time zones in the United States of America."
+#~ msgstr "FÃ¸lgende er vanlige tidssoner i de Forente statene (USA)."
 
-msgid ""
-"If you are in a different time zone, choose \"other\" to select from all "
-"available time zones."
-msgstr ""
-"Velg Â«andreÂ» om du er i en annen tidssone, du kan da velge mellom alle "
-"tilgjengelige soner."
+#~ msgid ""
+#~ "Newfoundland, Atlantic, Eastern, Central, East-Saskatchewan, "
+#~ "Saskatchewan, Mountain, Pacific, Yukon, other"
+#~ msgstr ""
+#~ "Newfoundland, Atlanterhavet, Ã˜stkysten, Sentral, Ã˜st-Saskatchewan, "
+#~ "Saskatchewan, Fjellene, Stillehavet, Yukonterritoriet, andre"
 
-msgid "Are you in the ${zone} time zone?"
-msgstr "Er du i ${zone}-tidssonen?"
+#~ msgid "The following are common time zones in Canada."
+#~ msgstr "FÃ¸lgende er vanlige tidssoner i Kanada."
 
-msgid "Based on your country, your time zone is probably ${zone}."
-msgstr "Ut fra landet er tidssonen sannsynligvis ${zone}."
+#~ msgid ""
+#~ "If you are in a different time zone, choose \"other\" to select from all "
+#~ "available time zones."
+#~ msgstr ""
+#~ "Velg Â«andreÂ» om du er i en annen tidssone, du kan da velge mellom alle "
+#~ "tilgjengelige soner."
 
-msgid "${choices}, other"
-msgstr "${choices}, andre"
+#~ msgid "Are you in the ${zone} time zone?"
+#~ msgstr "Er du i ${zone}-tidssonen?"
 
-msgid ""
-"Based on your country, you are probably in one of these time zones. If you "
-"are not, choose \"other\" to select from all available time zones."
-msgstr ""
-"Basert pÃ¥ landet er maskinen sannsynligvis i en av disse tidssonene. Om "
-"ikke, velg Â«andreÂ» der du kan velge blant alle de tilgjengelige tidssonene."
+#~ msgid "Based on your country, your time zone is probably ${zone}."
+#~ msgstr "Ut fra landet er tidssonen sannsynligvis ${zone}."
 
-msgid ""
-"Africa, America, US, Canada, Asia, Atlantic Ocean, Australia, Europe, Indian "
-"Ocean, Pacific Ocean, System V style time zones, None of the above"
-msgstr ""
-"Afrika, Amerika, USA, Canada, Asia, Atlanterhavet, Australia, Europa, Det "
-"indiske hav, Stillehavet, tidssoner av typen Â«System V styleÂ», ingen av disse"
+#~ msgid "${choices}, other"
+#~ msgstr "${choices}, andre"
 
-msgid "Area for your time zone:"
-msgstr "OmrÃ¥de tidssonen din er i:"
+#~ msgid ""
+#~ "Based on your country, you are probably in one of these time zones. If "
+#~ "you are not, choose \"other\" to select from all available time zones."
+#~ msgstr ""
+#~ "Basert pÃ¥ landet er maskinen sannsynligvis i en av disse tidssonene. Om "
+#~ "ikke, velg Â«andreÂ» der du kan velge blant alle de tilgjengelige "
+#~ "tidssonene."
 
-msgid "Pick the geographic area in which the time zone you desire is located."
-msgstr "Velg det geografiske omrÃ¥det der den tidssone du vil bruke befinner seg."
+#~ msgid ""
+#~ "Africa, America, US, Canada, Asia, Atlantic Ocean, Australia, Europe, "
+#~ "Indian Ocean, Pacific Ocean, System V style time zones, None of the above"
+#~ msgstr ""
+#~ "Afrika, Amerika, USA, Canada, Asia, Atlanterhavet, Australia, Europa, Det "
+#~ "indiske hav, Stillehavet, tidssoner av typen Â«System V styleÂ», ingen av "
+#~ "disse"
 
-msgid "Select a city or time zone:"
-msgstr "Velg en by eller en tidssone:"
+#~ msgid "Area for your time zone:"
+#~ msgstr "OmrÃ¥de tidssonen din er i:"
 
-msgid ""
-"Cities represent the time zone in which they are located, so you may choose "
-"any city in the desired time zone."
-msgstr ""
-"Byer representerer den tidssonen de ligger i, slik at du kan velge en "
-"hvilken som helst by som er i den tidssonen du vil bruke."
+#~ msgid ""
+#~ "Pick the geographic area in which the time zone you desire is located."
+#~ msgstr ""
+#~ "Velg det geografiske omrÃ¥det der den tidssone du vil bruke befinner seg."
 
-msgid "Here is your selected time zone information."
-msgstr "Her er det du har fortalt om din tidssone."
+#~ msgid "Select a city or time zone:"
+#~ msgstr "Velg en by eller en tidssone:"
 
-msgid ""
-" Local time is now:          ${tzdate}\n"
-" Universal Time is now:      ${utdate}\n"
-" Time zone is set to:        ${timezone}"
-msgstr ""
-" Din lokale tid er nÃ¥:          ${tzdate}\n"
-" GMT er nÃ¥:                         ${utdate}\n"
-" Tidssonen er satt til:        ${timezone}"
+#~ msgid ""
+#~ "Cities represent the time zone in which they are located, so you may "
+#~ "choose any city in the desired time zone."
+#~ msgstr ""
+#~ "Byer representerer den tidssonen de ligger i, slik at du kan velge en "
+#~ "hvilken som helst by som er i den tidssonen du vil bruke."
 
-msgid "If something looks wrong, you can go through the setup process again."
-msgstr ""
-"Hvis noe ser ut til Ã¥ vÃ¦re galt, sÃ¥ kan du gÃ¥ gjennom dette oppsettet en "
-"gang til."
+#~ msgid "Here is your selected time zone information."
+#~ msgstr "Her er det du har fortalt om din tidssone."
 
+#~ msgid ""
+#~ " Local time is now:          ${tzdate}\n"
+#~ " Universal Time is now:      ${utdate}\n"
+#~ " Time zone is set to:        ${timezone}"
+#~ msgstr ""
+#~ " Din lokale tid er nÃ¥:          ${tzdate}\n"
+#~ " GMT er nÃ¥:                         ${utdate}\n"
+#~ " Tidssonen er satt til:        ${timezone}"
+
+#~ msgid ""
+#~ "If something looks wrong, you can go through the setup process again."
+#~ msgstr ""
+#~ "Hvis noe ser ut til Ã¥ vÃ¦re galt, sÃ¥ kan du gÃ¥ gjennom dette oppsettet en "
+#~ "gang til."
+
 #~ msgid "Use universe software?"
 #~ msgstr "Bruk univers-programmer?"
-

Modified: trunk/packages/po/nl.po
===================================================================
--- trunk/packages/po/nl.po	2005-11-16 01:40:18 UTC (rev 32163)
+++ trunk/packages/po/nl.po	2005-11-16 01:45:44 UTC (rev 32164)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: nl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-15 08:03+0000\n"
+"POT-Creation-Date: 2005-11-16 01:33+0000\n"
 "PO-Revision-Date: 2005-11-03 15:46+0100\n"
 "Last-Translator: Bart Cornelis <cobaco at linux.be>\n"
 "Language-Team: Dutch <debian-l10n-dutch at lists.debian.org>\n"
@@ -1986,32 +1986,34 @@
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#. These are choices of actions so this is, at least in English,
+#. an infinitive form
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 msgid "Retry"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 #, fuzzy
 msgid "Change mirror"
 msgstr "Opnieuw proberen, Via andere spiegelserver, Annuleren"
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../mdcfg-utils.templates:122
+#: ../net-retriever.templates:5 ../mdcfg-utils.templates:122
 msgid "Cancel"
 msgstr "Annuleren"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:31
+#: ../net-retriever.templates:7 ../apt-mirror-setup.templates:33
 msgid "Downloading a file failed:"
 msgstr "Ophalen van een bestand is mislukt:"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5
+#: ../net-retriever.templates:7
 msgid ""
 "The installer failed to download a file from the mirror. This may be a "
 "problem with your network, or with the mirror. You can choose to retry the "
@@ -2734,15 +2736,16 @@
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:101
-msgid "Desktop machine"
-msgstr "Desktopmachine"
+#, fuzzy
+msgid "Separate /home partition"
+msgstr "de partitie formatteren"
 
 #. Type: text
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:106
-msgid "Multi-user workstation"
-msgstr "Werkstation met meerdere gebruikers"
+msgid "Separate /home, /usr, /var, and /tmp partitions"
+msgstr ""
 
 #. Type: boolean
 #. Description
@@ -5519,14 +5522,14 @@
 
 #. Type: select
 #. Choices
-#: ../apt-mirror-setup.templates:30
+#: ../apt-mirror-setup.templates:32
 #, fuzzy
 msgid "Ignore"
 msgstr "geen"
 
 #. Type: select
 #. Description
-#: ../apt-mirror-setup.templates:31
+#: ../apt-mirror-setup.templates:33
 #, fuzzy
 msgid ""
 "The installer failed to access the mirror. This may be a problem with your "
@@ -11405,6 +11408,12 @@
 msgid "Configure the base system before rebooting"
 msgstr "Basissysteem instellen alvorens te herstarten"
 
+#~ msgid "Desktop machine"
+#~ msgstr "Desktopmachine"
+
+#~ msgid "Multi-user workstation"
+#~ msgstr "Werkstation met meerdere gebruikers"
+
 #, fuzzy
 #~ msgid "Retry, Change mirror, Ignore"
 #~ msgstr "Opnieuw proberen, Via andere spiegelserver, Annuleren"

Modified: trunk/packages/po/nn.po
===================================================================
--- trunk/packages/po/nn.po	2005-11-16 01:40:18 UTC (rev 32163)
+++ trunk/packages/po/nn.po	2005-11-16 01:45:44 UTC (rev 32164)
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: nn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-15 08:03+0000\n"
+"POT-Creation-Date: 2005-11-16 01:33+0000\n"
 "PO-Revision-Date: 2005-10-15 20:16+0200\n"
 "Last-Translator: \n"
 "Language-Team: Norwegian Nynorsk <en at li.org>\n"
@@ -1964,32 +1964,34 @@
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#. These are choices of actions so this is, at least in English,
+#. an infinitive form
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 msgid "Retry"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 #, fuzzy
 msgid "Change mirror"
 msgstr "PrÃ¸v igjen, Endra nettarkiv, Avbryt"
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../mdcfg-utils.templates:122
+#: ../net-retriever.templates:5 ../mdcfg-utils.templates:122
 msgid "Cancel"
 msgstr "Avbryt"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:31
+#: ../net-retriever.templates:7 ../apt-mirror-setup.templates:33
 msgid "Downloading a file failed:"
 msgstr "Nedlasting av ei fil feila:"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5
+#: ../net-retriever.templates:7
 msgid ""
 "The installer failed to download a file from the mirror. This may be a "
 "problem with your network, or with the mirror. You can choose to retry the "
@@ -2704,15 +2706,16 @@
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:101
-msgid "Desktop machine"
-msgstr "Skrivebordsmaskin"
+#, fuzzy
+msgid "Separate /home partition"
+msgstr "formater partisjonen"
 
 #. Type: text
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:106
-msgid "Multi-user workstation"
-msgstr "Fleirbrukar arbeidsstasjon"
+msgid "Separate /home, /usr, /var, and /tmp partitions"
+msgstr ""
 
 #. Type: boolean
 #. Description
@@ -5435,14 +5438,14 @@
 
 #. Type: select
 #. Choices
-#: ../apt-mirror-setup.templates:30
+#: ../apt-mirror-setup.templates:32
 #, fuzzy
 msgid "Ignore"
 msgstr "Ingen"
 
 #. Type: select
 #. Description
-#: ../apt-mirror-setup.templates:31
+#: ../apt-mirror-setup.templates:33
 #, fuzzy
 msgid ""
 "The installer failed to access the mirror. This may be a problem with your "
@@ -11238,6 +11241,12 @@
 msgid "Configure the base system before rebooting"
 msgstr "Set opp grunnsystemet fÃ¸r omstart"
 
+#~ msgid "Desktop machine"
+#~ msgstr "Skrivebordsmaskin"
+
+#~ msgid "Multi-user workstation"
+#~ msgstr "Fleirbrukar arbeidsstasjon"
+
 #, fuzzy
 #~ msgid "Retry, Change mirror, Ignore"
 #~ msgstr "PrÃ¸v igjen, Endra nettarkiv, Avbryt"

Modified: trunk/packages/po/pa_IN.po
===================================================================
--- trunk/packages/po/pa_IN.po	2005-11-16 01:40:18 UTC (rev 32163)
+++ trunk/packages/po/pa_IN.po	2005-11-16 01:45:44 UTC (rev 32164)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: pa_IN\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-15 08:03+0000\n"
+"POT-Creation-Date: 2005-11-16 01:33+0000\n"
 "PO-Revision-Date: 2005-03-15 12:29+0530\n"
 "Last-Translator: Amanpreet Singh Alam <amanpreetalam at yahoo.com>\n"
 "Language-Team: Punjabi <fedora-trans-pa at redhat.com>\n"
@@ -1916,32 +1916,34 @@
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#. These are choices of actions so this is, at least in English,
+#. an infinitive form
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 msgid "Retry"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 #, fuzzy
 msgid "Change mirror"
 msgstr "à¨®à©à©œ-à¨•à©‹à¨¶à¨¿à¨¸, à¨ªà©à¨°à¨¤à©€à¨¬à¨¿à©°à¨¬ à¨¤à¨¬à¨¦à©€à¨², à¨°à©±à¨¦ à¨•à¨°à©‹"
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../mdcfg-utils.templates:122
+#: ../net-retriever.templates:5 ../mdcfg-utils.templates:122
 msgid "Cancel"
 msgstr "à¨°à©±à¨¦ à¨•à¨°à©‹"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:31
+#: ../net-retriever.templates:7 ../apt-mirror-setup.templates:33
 msgid "Downloading a file failed:"
 msgstr "à¨«à¨¾à¨‡à¨² à¨¡à¨¾à¨Šà¨¨à¨²à©‹à¨¡ à¨…à¨¸à¨«à¨²:"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5
+#: ../net-retriever.templates:7
 msgid ""
 "The installer failed to download a file from the mirror. This may be a "
 "problem with your network, or with the mirror. You can choose to retry the "
@@ -2638,15 +2640,16 @@
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:101
-msgid "Desktop machine"
-msgstr "à¨µà¨¿à¨¹à©œà¨¾ à¨®à¨¶à©€à¨¨"
+#, fuzzy
+msgid "Separate /home partition"
+msgstr "à¨à¨¾à¨— à¨«à¨¾à¨°à¨®à¨¿à¨Ÿ"
 
 #. Type: text
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:106
-msgid "Multi-user workstation"
-msgstr "à¨¬à¨¹à©-à¨‰à¨ªà¨à©‹à¨—à©€ à¨µà¨°à¨•-à¨¸à¨Ÿà©‡à¨¶à¨¨"
+msgid "Separate /home, /usr, /var, and /tmp partitions"
+msgstr ""
 
 #. Type: boolean
 #. Description
@@ -5341,14 +5344,14 @@
 
 #. Type: select
 #. Choices
-#: ../apt-mirror-setup.templates:30
+#: ../apt-mirror-setup.templates:32
 #, fuzzy
 msgid "Ignore"
 msgstr "à¨•à©‹à¨ˆ à¨¨à¨¹à©€à¨‚"
 
 #. Type: select
 #. Description
-#: ../apt-mirror-setup.templates:31
+#: ../apt-mirror-setup.templates:33
 #, fuzzy
 msgid ""
 "The installer failed to access the mirror. This may be a problem with your "
@@ -10979,6 +10982,12 @@
 msgid "Configure the base system before rebooting"
 msgstr "à¨®à©à©œ à¨šà¨²à¨¾à¨‰à¨£ à¨¤à©‹à¨‚ à¨ªà¨¹à¨¿à¨²à¨¾à¨‚ à¨®à©à©±à¨¢à¨²à¨¾ à¨¸à¨¿à¨¸à¨Ÿà¨® à¨¸à©°à¨°à¨šà¨¿à¨¤ à¨•à¨°à©‹"
 
+#~ msgid "Desktop machine"
+#~ msgstr "à¨µà¨¿à¨¹à©œà¨¾ à¨®à¨¶à©€à¨¨"
+
+#~ msgid "Multi-user workstation"
+#~ msgstr "à¨¬à¨¹à©-à¨‰à¨ªà¨à©‹à¨—à©€ à¨µà¨°à¨•-à¨¸à¨Ÿà©‡à¨¶à¨¨"
+
 #, fuzzy
 #~ msgid "Retry, Change mirror, Ignore"
 #~ msgstr "à¨®à©à©œ-à¨•à©‹à¨¶à¨¿à¨¸, à¨ªà©à¨°à¨¤à©€à¨¬à¨¿à©°à¨¬ à¨¤à¨¬à¨¦à©€à¨², à¨°à©±à¨¦ à¨•à¨°à©‹"

Modified: trunk/packages/po/pl.po
===================================================================
--- trunk/packages/po/pl.po	2005-11-16 01:40:18 UTC (rev 32163)
+++ trunk/packages/po/pl.po	2005-11-16 01:45:44 UTC (rev 32164)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-15 08:03+0000\n"
+"POT-Creation-Date: 2005-11-16 01:33+0000\n"
 "PO-Revision-Date: 2005-11-12 18:59+0100\n"
 "Last-Translator: Bartosz Fenski <fenio at debian.org>\n"
 "Language-Team: Polish <pddp at debian.linux.org.pl>\n"
@@ -1966,32 +1966,34 @@
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#. These are choices of actions so this is, at least in English,
+#. an infinitive form
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 msgid "Retry"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 #, fuzzy
 msgid "Change mirror"
 msgstr "Ponów, Zmieñ serwer lustrzany, Anuluj"
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../mdcfg-utils.templates:122
+#: ../net-retriever.templates:5 ../mdcfg-utils.templates:122
 msgid "Cancel"
 msgstr "Anuluj"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:31
+#: ../net-retriever.templates:7 ../apt-mirror-setup.templates:33
 msgid "Downloading a file failed:"
 msgstr "Pobieranie pliku nie powiod³o siê:"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5
+#: ../net-retriever.templates:7
 msgid ""
 "The installer failed to download a file from the mirror. This may be a "
 "problem with your network, or with the mirror. You can choose to retry the "
@@ -2706,15 +2708,16 @@
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:101
-msgid "Desktop machine"
-msgstr "Komputer biurkowy"
+#, fuzzy
+msgid "Separate /home partition"
+msgstr "formatuj partycjê"
 
 #. Type: text
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:106
-msgid "Multi-user workstation"
-msgstr "Wielou¿ytkownikowa stacja robocza"
+msgid "Separate /home, /usr, /var, and /tmp partitions"
+msgstr ""
 
 #. Type: boolean
 #. Description
@@ -5442,14 +5445,14 @@
 
 #. Type: select
 #. Choices
-#: ../apt-mirror-setup.templates:30
+#: ../apt-mirror-setup.templates:32
 #, fuzzy
 msgid "Ignore"
 msgstr "brak"
 
 #. Type: select
 #. Description
-#: ../apt-mirror-setup.templates:31
+#: ../apt-mirror-setup.templates:33
 #, fuzzy
 msgid ""
 "The installer failed to access the mirror. This may be a problem with your "
@@ -11201,6 +11204,12 @@
 msgid "Configure the base system before rebooting"
 msgstr "Konfiguruj system podstawowy przed ponownym uruchomieniem"
 
+#~ msgid "Desktop machine"
+#~ msgstr "Komputer biurkowy"
+
+#~ msgid "Multi-user workstation"
+#~ msgstr "Wielou¿ytkownikowa stacja robocza"
+
 #, fuzzy
 #~ msgid "Retry, Change mirror, Ignore"
 #~ msgstr "Ponów, Zmieñ serwer lustrzany, Anuluj"

Modified: trunk/packages/po/pt.po
===================================================================
--- trunk/packages/po/pt.po	2005-11-16 01:40:18 UTC (rev 32163)
+++ trunk/packages/po/pt.po	2005-11-16 01:45:44 UTC (rev 32164)
@@ -45,7 +45,7 @@
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-15 08:03+0000\n"
+"POT-Creation-Date: 2005-11-16 01:33+0000\n"
 "PO-Revision-Date: 2005-11-15 23:50+0000\n"
 "Last-Translator:  Miguel Figueiredo <elmig at debianpt.org>\n"
 "Language-Team:  Portuguese <traduz at debianpt.org>\n"
@@ -2016,31 +2016,33 @@
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#. These are choices of actions so this is, at least in English,
+#. an infinitive form
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 msgid "Retry"
 msgstr "Tentar novamente"
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 msgid "Change mirror"
 msgstr "Mudar de mirror"
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../mdcfg-utils.templates:122
+#: ../net-retriever.templates:5 ../mdcfg-utils.templates:122
 msgid "Cancel"
 msgstr "Cancelar"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:31
+#: ../net-retriever.templates:7 ../apt-mirror-setup.templates:33
 msgid "Downloading a file failed:"
 msgstr "Falhou o download de um ficheiro:"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5
+#: ../net-retriever.templates:7
 msgid ""
 "The installer failed to download a file from the mirror. This may be a "
 "problem with your network, or with the mirror. You can choose to retry the "
@@ -2759,15 +2761,16 @@
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:101
-msgid "Desktop machine"
-msgstr "MÃ¡quina de Desktop"
+#, fuzzy
+msgid "Separate /home partition"
+msgstr "formatar a partiÃ§Ã£o"
 
 #. Type: text
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:106
-msgid "Multi-user workstation"
-msgstr "EstaÃ§Ã£o de trabalho multi-utilizador"
+msgid "Separate /home, /usr, /var, and /tmp partitions"
+msgstr ""
 
 #. Type: boolean
 #. Description
@@ -5453,8 +5456,8 @@
 "An attempt to configure apt to install additional packages from the CD "
 "failed."
 msgstr ""
-"Falhou uma tentativa de configurar o apt para instalar pacotes adicionais "
-"a partir do CD."
+"Falhou uma tentativa de configurar o apt para instalar pacotes adicionais a "
+"partir do CD."
 
 #. Type: text
 #. Description
@@ -5517,23 +5520,23 @@
 
 #. Type: select
 #. Choices
-#: ../apt-mirror-setup.templates:30
+#: ../apt-mirror-setup.templates:32
 msgid "Ignore"
 msgstr "Ignorar"
 
 #. Type: select
 #. Description
-#: ../apt-mirror-setup.templates:31
+#: ../apt-mirror-setup.templates:33
 msgid ""
 "The installer failed to access the mirror. This may be a problem with your "
 "network, or with the mirror. You can choose to retry the download, select a "
 "different mirror, or ignore the problem and continue without all the "
 "packages from this mirror."
 msgstr ""
-"O instalador falhou o acesso ao mirror. Isto pode ser um problema com a "
-"sua rede, ou com o mirror. Pode escolher tentar novamente o download, "
-"escolher um mirror diferente, ou ignorar o problema e continuar sem os "
-"pacotes deste mirror."
+"O instalador falhou o acesso ao mirror. Isto pode ser um problema com a sua "
+"rede, ou com o mirror. Pode escolher tentar novamente o download, escolher "
+"um mirror diferente, ou ignorar o problema e continuar sem os pacotes deste "
+"mirror."
 
 #. Type: boolean
 #. Description
@@ -11387,6 +11390,12 @@
 msgid "Configure the base system before rebooting"
 msgstr "Configurar o sistema bÃ¡sico antes de reiniciar"
 
+#~ msgid "Desktop machine"
+#~ msgstr "MÃ¡quina de Desktop"
+
+#~ msgid "Multi-user workstation"
+#~ msgstr "EstaÃ§Ã£o de trabalho multi-utilizador"
+
 #, fuzzy
 #~ msgid "Retry, Change mirror, Ignore"
 #~ msgstr "Tentar de novo, Mudar de mirror, Cancelar"

Modified: trunk/packages/po/pt_BR.po
===================================================================
--- trunk/packages/po/pt_BR.po	2005-11-16 01:40:18 UTC (rev 32163)
+++ trunk/packages/po/pt_BR.po	2005-11-16 01:45:44 UTC (rev 32164)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-15 08:03+0000\n"
+"POT-Creation-Date: 2005-11-16 01:33+0000\n"
 "PO-Revision-Date: 2005-10-09 28:38-0300\n"
 "Last-Translator: AndrÃ© LuÃs Lopes <andrelop at debian.org>\n"
 "Language-Team:  Debia-BR Project <debian-l10n-portuguese at lists.debian.org>\n"
@@ -1997,32 +1997,34 @@
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#. These are choices of actions so this is, at least in English,
+#. an infinitive form
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 msgid "Retry"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 #, fuzzy
 msgid "Change mirror"
 msgstr "Tentar novamente, Mudar o espelho, Cancelar"
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../mdcfg-utils.templates:122
+#: ../net-retriever.templates:5 ../mdcfg-utils.templates:122
 msgid "Cancel"
 msgstr "Cancelar"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:31
+#: ../net-retriever.templates:7 ../apt-mirror-setup.templates:33
 msgid "Downloading a file failed:"
 msgstr "O download do arquivo falhou :"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5
+#: ../net-retriever.templates:7
 msgid ""
 "The installer failed to download a file from the mirror. This may be a "
 "problem with your network, or with the mirror. You can choose to retry the "
@@ -2744,15 +2746,16 @@
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:101
-msgid "Desktop machine"
-msgstr "MÃ¡quina Desktop"
+#, fuzzy
+msgid "Separate /home partition"
+msgstr "formatar a partiÃ§Ã£o"
 
 #. Type: text
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:106
-msgid "Multi-user workstation"
-msgstr "EstaÃ§Ã£o de trabalho multi-usuÃ¡rio"
+msgid "Separate /home, /usr, /var, and /tmp partitions"
+msgstr ""
 
 #. Type: boolean
 #. Description
@@ -5512,14 +5515,14 @@
 
 #. Type: select
 #. Choices
-#: ../apt-mirror-setup.templates:30
+#: ../apt-mirror-setup.templates:32
 #, fuzzy
 msgid "Ignore"
 msgstr "nenhum"
 
 #. Type: select
 #. Description
-#: ../apt-mirror-setup.templates:31
+#: ../apt-mirror-setup.templates:33
 #, fuzzy
 msgid ""
 "The installer failed to access the mirror. This may be a problem with your "
@@ -11426,6 +11429,12 @@
 msgid "Configure the base system before rebooting"
 msgstr "Configurar o sistema bÃ¡sico antes de reiniciar"
 
+#~ msgid "Desktop machine"
+#~ msgstr "MÃ¡quina Desktop"
+
+#~ msgid "Multi-user workstation"
+#~ msgstr "EstaÃ§Ã£o de trabalho multi-usuÃ¡rio"
+
 #, fuzzy
 #~ msgid "Retry, Change mirror, Ignore"
 #~ msgstr "Tentar novamente, Mudar o espelho, Cancelar"

Modified: trunk/packages/po/ro.po
===================================================================
--- trunk/packages/po/ro.po	2005-11-16 01:40:18 UTC (rev 32163)
+++ trunk/packages/po/ro.po	2005-11-16 01:45:44 UTC (rev 32164)
@@ -20,7 +20,7 @@
 msgstr ""
 "Project-Id-Version: ro\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-15 08:03+0000\n"
+"POT-Creation-Date: 2005-11-16 01:33+0000\n"
 "PO-Revision-Date: 2005-10-21 20:53+0300\n"
 "Last-Translator: Eddy PetriÅŸor <eddy.petrisor at gmail.com>\n"
 "Language-Team: Romanian <debian-l10n-romanian at lists.debian.org>\n"
@@ -1997,32 +1997,34 @@
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#. These are choices of actions so this is, at least in English,
+#. an infinitive form
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 msgid "Retry"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 #, fuzzy
 msgid "Change mirror"
 msgstr "ReÃ®ncearcÄƒ, SchimbÄƒ situl alternativ, AnuleazÄƒ"
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../mdcfg-utils.templates:122
+#: ../net-retriever.templates:5 ../mdcfg-utils.templates:122
 msgid "Cancel"
 msgstr "AnuleazÄƒ"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:31
+#: ../net-retriever.templates:7 ../apt-mirror-setup.templates:33
 msgid "Downloading a file failed:"
 msgstr "DescÄƒrcarea unui fiÅŸier a eÅŸuat:"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5
+#: ../net-retriever.templates:7
 msgid ""
 "The installer failed to download a file from the mirror. This may be a "
 "problem with your network, or with the mirror. You can choose to retry the "
@@ -2738,15 +2740,16 @@
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:101
-msgid "Desktop machine"
-msgstr "Calculator pentru mediu de birou"
+#, fuzzy
+msgid "Separate /home partition"
+msgstr "formateazÄƒ partiÅ£ia"
 
 #. Type: text
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:106
-msgid "Multi-user workstation"
-msgstr "StaÅ£ie de lucru multi-utilizator"
+msgid "Separate /home, /usr, /var, and /tmp partitions"
+msgstr ""
 
 #. Type: boolean
 #. Description
@@ -5511,14 +5514,14 @@
 
 #. Type: select
 #. Choices
-#: ../apt-mirror-setup.templates:30
+#: ../apt-mirror-setup.templates:32
 #, fuzzy
 msgid "Ignore"
 msgstr "nici unul"
 
 #. Type: select
 #. Description
-#: ../apt-mirror-setup.templates:31
+#: ../apt-mirror-setup.templates:33
 #, fuzzy
 msgid ""
 "The installer failed to access the mirror. This may be a problem with your "
@@ -11387,6 +11390,12 @@
 msgid "Configure the base system before rebooting"
 msgstr "Se configureazÄƒ sistemul de bazÄƒ Ã®nainte de repornire"
 
+#~ msgid "Desktop machine"
+#~ msgstr "Calculator pentru mediu de birou"
+
+#~ msgid "Multi-user workstation"
+#~ msgstr "StaÅ£ie de lucru multi-utilizator"
+
 #, fuzzy
 #~ msgid "Retry, Change mirror, Ignore"
 #~ msgstr "ReÃ®ncearcÄƒ, SchimbÄƒ situl alternativ, AnuleazÄƒ"

Modified: trunk/packages/po/ru.po
===================================================================
--- trunk/packages/po/ru.po	2005-11-16 01:40:18 UTC (rev 32163)
+++ trunk/packages/po/ru.po	2005-11-16 01:45:44 UTC (rev 32164)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-15 08:03+0000\n"
+"POT-Creation-Date: 2005-11-16 01:33+0000\n"
 "PO-Revision-Date: 2005-11-15 15:53+0300\n"
 "Last-Translator: Yuri Kozlov <kozlov.y at gmail.com>\n"
 "Language-Team: Russian <debian-l10n-russian at lists.debian.org>\n"
@@ -68,7 +68,8 @@
 msgid ""
 "This installation step depends on one or more other steps that have not yet "
 "been performed."
-msgstr "ÐÑ‚Ð¾Ñ‚ ÑÑ‚Ð°Ð¿ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸ Ñ‚Ñ€ÐµÐ±ÑƒÐµÑ‚ Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð¸Ñ Ð´Ñ€ÑƒÐ³Ð¾Ð³Ð¾, ÐµÑ‰Ñ‘ Ð½Ðµ Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð½Ð¾Ð³Ð¾ ÑÑ‚Ð°Ð¿Ð°."
+msgstr ""
+"ÐÑ‚Ð¾Ñ‚ ÑÑ‚Ð°Ð¿ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸ Ñ‚Ñ€ÐµÐ±ÑƒÐµÑ‚ Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð¸Ñ Ð´Ñ€ÑƒÐ³Ð¾Ð³Ð¾, ÐµÑ‰Ñ‘ Ð½Ðµ Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð½Ð¾Ð³Ð¾ ÑÑ‚Ð°Ð¿Ð°."
 
 #. Type: note
 #. Description
@@ -160,7 +161,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../anna.templates:15 ../anna.templates:22
+#: ../anna.templates:15
 msgid "Installer components to load:"
 msgstr "ÐšÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ñ‹ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ñ‹ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸, Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ñ‹Ðµ Ð´Ð»Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸:"
 
@@ -182,7 +183,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../anna.templates:15 ../anna.templates:22
+#: ../anna.templates:15
 msgid ""
 "Note that if you select a component that requires others, those components "
 "will also be loaded."
@@ -198,51 +199,43 @@
 msgid "Loading additional components"
 msgstr "Ð—Ð°Ð³Ñ€ÑƒÐ·ÐºÐ° Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ñ‹Ñ… ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ð¾Ð²"
 
-#. #-#-#-#-#  template.pot (debian-installer)  #-#-#-#-#
 #. Type: text
 #. Description
 #. (Progress bar)
 #. TRANSLATORS : keep short
-#. #-#-#-#-#  template.pot (debian-installer)  #-#-#-#-#
-#. Type: text
-#. Description
-#: ../anna.templates:35 ../anna.templates:38
+#: ../anna.templates:35
 msgid "Retrieving ${PACKAGE}"
 msgstr "ÐŸÐ¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ðµ ${PACKAGE}"
 
-#. #-#-#-#-#  template.pot (debian-installer)  #-#-#-#-#
 #. Type: text
 #. Description
 #. (Progress bar)
 #. TRANSLATORS : keep short
-#. #-#-#-#-#  template.pot (debian-installer)  #-#-#-#-#
-#. Type: text
-#. Description
-#: ../anna.templates:41 ../anna.templates:42
+#: ../anna.templates:41
 msgid "Unpacking ${PACKAGE}"
 msgstr "Ð Ð°ÑÐ¿Ð°ÐºÐ¾Ð²ÐºÐ° ${PACKAGE}"
 
 #. Type: error
 #. Description
-#: ../anna.templates:45 ../anna.templates:46
+#: ../anna.templates:45
 msgid "Failed to load installer component"
 msgstr "ÐÐµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ Ð·Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚ÑŒ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ñ‹ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸"
 
 #. Type: error
 #. Description
-#: ../anna.templates:45 ../anna.templates:46
+#: ../anna.templates:45
 msgid "Loading ${PACKAGE} failed for unknown reasons. Aborting."
 msgstr "ÐÐµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ Ð·Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚ÑŒ ${PACKAGE} Ð¿Ð¾ Ð½ÐµÐ¸Ð·Ð²ÐµÑÑ‚Ð½Ñ‹Ð¼ Ð¿Ñ€Ð¸Ñ‡Ð¸Ð½Ð°Ð¼. ÐžÑ‚Ð¼ÐµÐ½Ð°."
 
 #. Type: boolean
 #. Description
-#: ../anna.templates:51 ../anna.templates:52
+#: ../anna.templates:51
 msgid "Continue the install without loading kernel modules?"
 msgstr "ÐŸÑ€Ð¾Ð´Ð¾Ð»Ð¶Ð¸Ñ‚ÑŒ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÑƒ Ð±ÐµÐ· Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸ Ð¼Ð¾Ð´ÑƒÐ»ÐµÐ¹ ÑÐ´Ñ€Ð°?"
 
 #. Type: boolean
 #. Description
-#: ../anna.templates:51 ../anna.templates:52
+#: ../anna.templates:51
 msgid ""
 "No kernel modules were found. This probably is due to a mismatch between the "
 "kernel used by this version of the installer and the kernel version "
@@ -254,7 +247,7 @@
 
 #. Type: boolean
 #. Description
-#: ../anna.templates:51 ../anna.templates:52
+#: ../anna.templates:51
 msgid ""
 "If you're installing from a mirror, you can work around this problem by "
 "choosing to install a different version of Debian. The install will probably "
@@ -270,14 +263,14 @@
 #. However, translators are required to keep "Choose language"
 #. as an alternative separated by the "/" character
 #. Example (french): Choisir la langue/Choose language
-#: ../localechooser.templates-in:7 ../templates-in:43
+#: ../localechooser.templates-in:7
 msgid "Choose language"
 msgstr "Ð’Ñ‹Ð±Ð¾Ñ€ ÑÐ·Ñ‹ÐºÐ° / Choose language"
 
 #. Type: text
 #. Description
 #. Prebaseconfig progress bar item
-#: ../localechooser.templates-in:66 ../templates-in:35
+#: ../localechooser.templates-in:66
 msgid "Storing language..."
 msgstr "Ð—Ð°Ð¿Ð¸ÑÑŒ ÑÐ·Ñ‹ÐºÐ°..."
 
@@ -291,19 +284,19 @@
 
 #. Type: select
 #. Choices
-#: ../localechooser.templates-in:90 ../templates-in:22
+#: ../localechooser.templates-in:90
 msgid "${SHORTLIST}"
 msgstr "${SHORTLIST}"
 
 #. Type: select
 #. Choices
-#: ../localechooser.templates-in:90 ../countrylist:25 ../templates-in:22
+#: ../localechooser.templates-in:90
 msgid "other"
 msgstr "Ð´Ñ€ÑƒÐ³Ð°Ñ"
 
 #. Type: select
 #. Description
-#: ../localechooser.templates-in:91 ../templates-in:23
+#: ../localechooser.templates-in:91
 msgid "Choose a country, territory or area:"
 msgstr "Ð’Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ ÑÑ‚Ñ€Ð°Ð½Ñƒ, Ð¾Ð±Ð»Ð°ÑÑ‚ÑŒ Ð¸Ð»Ð¸ Ñ€ÐµÐ³Ð¸Ð¾Ð½:"
 
@@ -315,13 +308,9 @@
 "selected as default for your language ]"
 msgstr "RU"
 
-#. #-#-#-#-#  template.pot (debian-installer)  #-#-#-#-#
 #. Type: select
 #. Default
-#. #-#-#-#-#  template.pot (debian-installer)  #-#-#-#-#
-#. Type: select
-#. Description
-#: ../localechooser.templates-in:92 ../templates-in:23
+#: ../localechooser.templates-in:92
 msgid ""
 "Based on your language, you are probably located in one of these countries "
 "or regions."
@@ -383,14 +372,9 @@
 msgid "You may choose additional locales to be installed from this list."
 msgstr "Ð’Ñ‹ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð²Ñ‹Ð±Ñ€Ð°Ñ‚ÑŒ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾ ÑƒÑÑ‚Ð°Ð½Ð°Ð²Ð»Ð¸Ð²Ð°ÐµÐ¼Ñ‹Ðµ Ð»Ð¾ÐºÐ°Ð»Ð¸ Ð¸Ð· ÑÐ¿Ð¸ÑÐºÐ°."
 
-#. #-#-#-#-#  template.pot (debian-installer)  #-#-#-#-#
 #. Type: text
 #. Description
 #. Main menu item. Please keep below 55 columns
-#. #-#-#-#-#  template.pot (debian-installer)  #-#-#-#-#
-#. Type: text
-#. Description
-#. Main menu item
 #: ../kbd-chooser.templates-in:4
 msgid "Select a keyboard layout"
 msgstr "Ð’Ñ‹Ð±Ð¾Ñ€ Ñ€Ð°ÑÐºÐ»Ð°Ð´ÐºÐ¸ ÐºÐ»Ð°Ð²Ð¸Ð°Ñ‚ÑƒÑ€Ñ‹"
@@ -407,14 +391,10 @@
 msgid "Please choose the type of keyboard to configure."
 msgstr "Ð’Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ Ñ‚Ð¸Ð¿ Ð½Ð°ÑÑ‚Ñ€Ð°Ð¸Ð²Ð°ÐµÐ¼Ð¾Ð¹ ÐºÐ»Ð°Ð²Ð¸Ð°Ñ‚ÑƒÑ€Ñ‹."
 
-#. #-#-#-#-#  template.pot (debian-installer)  #-#-#-#-#
 #. Type: text
 #. Description
 #. Translators, this is a menu choice. MUST BE UNDER 65 COLUMNS
-#. #-#-#-#-#  template.pot (debian-installer)  #-#-#-#-#
-#. Type: text
-#. Description
-#: ../kbd-chooser.templates-in:30 ../kbd-chooser.templates-in:24
+#: ../kbd-chooser.templates-in:30
 msgid "No keyboard to configure"
 msgstr "ÐÐ°ÑÑ‚Ñ€Ð°Ð¸Ð²Ð°ÐµÐ¼Ð°Ñ ÐºÐ»Ð°Ð²Ð¸Ð°Ñ‚ÑƒÑ€Ð° Ð¾Ñ‚ÑÑƒÑ‚ÑÑ‚Ð²ÑƒÐµÑ‚"
 
@@ -423,111 +403,76 @@
 #. Translators, this is a menu choice. MUST BE UNDER 65 COLUMNS
 #: ../kbd-chooser.templates-in:35
 msgid "Do not configure keyboard; keep kernel keymap"
-msgstr "ÐÐµ Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÑÑ‚ÑŒ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÑƒ ÐºÐ»Ð°Ð²Ð¸Ð°Ñ‚ÑƒÑ€Ñ‹; Ð¾ÑÑ‚Ð°Ð²Ð¸Ñ‚ÑŒ Ñ€Ð°ÑÐºÐ»Ð°Ð´ÐºÑƒ, ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½ÑƒÑŽ ÑÐ´Ñ€Ð¾Ð¼"
+msgstr ""
+"ÐÐµ Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÑÑ‚ÑŒ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÑƒ ÐºÐ»Ð°Ð²Ð¸Ð°Ñ‚ÑƒÑ€Ñ‹; Ð¾ÑÑ‚Ð°Ð²Ð¸Ñ‚ÑŒ Ñ€Ð°ÑÐºÐ»Ð°Ð´ÐºÑƒ, ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½ÑƒÑŽ ÑÐ´Ñ€Ð¾Ð¼"
 
 #. Type: text
 #. Description
 #. Prebaseconfig progress bar item
-#: ../kbd-chooser.templates-in:40 ../kbd-chooser.templates-in:29
+#: ../kbd-chooser.templates-in:40
 msgid "Configuring keyboard ..."
 msgstr "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ° ÐºÐ»Ð°Ð²Ð¸Ð°Ñ‚ÑƒÑ€Ñ‹..."
 
-#. #-#-#-#-#  template.pot (debian-installer)  #-#-#-#-#
 #. Type: text
 #. Description
 #. Translators, this is a menu choice. MUST BE UNDER 65 COLUMNS
-#. #-#-#-#-#  template.pot (debian-installer)  #-#-#-#-#
-#. Type: text
-#. Description
-#: ../keyboard-at.templates:4 ../keyboard-at.templates:3
+#: ../keyboard-at.templates:4
 msgid "PC-style (AT or PS-2 connector) keyboard"
 msgstr "ÐšÐ»Ð°Ð²Ð¸Ð°Ñ‚ÑƒÑ€Ð° PC (Ñ€Ð°Ð·ÑŠÑ‘Ð¼ AT Ð¸Ð»Ð¸ PS-2)"
 
-#. #-#-#-#-#  template.pot (debian-installer)  #-#-#-#-#
 #. Type: text
 #. Description
 #. Translators, this is a menu choice. MUST BE UNDER 65 COLUMNS
-#. #-#-#-#-#  template.pot (debian-installer)  #-#-#-#-#
-#. Type: text
-#. Description
-#: ../keyboard-atari.templates:4 ../keyboard-atari.templates:3
+#: ../keyboard-atari.templates:4
 msgid "Atari keyboard"
 msgstr "ÐšÐ»Ð°Ð²Ð¸Ð°Ñ‚ÑƒÑ€Ð° Atari"
 
-#. #-#-#-#-#  template.pot (debian-installer)  #-#-#-#-#
 #. Type: text
 #. Description
 #. Translators, this is a menu choice. MUST BE UNDER 65 COLUMNS
-#. #-#-#-#-#  template.pot (debian-installer)  #-#-#-#-#
-#. Type: text
-#. Description
-#: ../keyboard-amiga.templates:4 ../keyboard-amiga.templates:3
+#: ../keyboard-amiga.templates:4
 msgid "Amiga keyboard"
 msgstr "ÐšÐ»Ð°Ð²Ð¸Ð°Ñ‚ÑƒÑ€Ð° Amiga"
 
-#. #-#-#-#-#  template.pot (debian-installer)  #-#-#-#-#
 #. Type: text
 #. Description
 #. Translators, this is a menu choice. MUST BE UNDER 65 COLUMNS
-#. #-#-#-#-#  template.pot (debian-installer)  #-#-#-#-#
-#. Type: text
-#. Description
-#: ../keyboard-acorn.templates:4 ../keyboard-acorn.templates:3
+#: ../keyboard-acorn.templates:4
 msgid "Acorn keyboard"
 msgstr "ÐšÐ»Ð°Ð²Ð¸Ð°Ñ‚ÑƒÑ€Ð° Acorn"
 
-#. #-#-#-#-#  template.pot (debian-installer)  #-#-#-#-#
 #. Type: text
 #. Description
 #. Translators, this is a menu choice. MUST BE UNDER 65 COLUMNS
-#. #-#-#-#-#  template.pot (debian-installer)  #-#-#-#-#
-#. Type: text
-#. Description
-#: ../keyboard-mac.templates:4 ../keyboard-mac.templates:3
+#: ../keyboard-mac.templates:4
 msgid "Mac keyboard"
 msgstr "ÐšÐ»Ð°Ð²Ð¸Ð°Ñ‚ÑƒÑ€Ð° Mac"
 
-#. #-#-#-#-#  template.pot (debian-installer)  #-#-#-#-#
 #. Type: text
 #. Description
 #. Translators, this is a menu choice. MUST BE UNDER 65 COLUMNS
-#. #-#-#-#-#  template.pot (debian-installer)  #-#-#-#-#
-#. Type: text
-#. Description
-#: ../keyboard-sparc.templates:4 ../keyboard-sparc.templates:3
+#: ../keyboard-sparc.templates:4
 msgid "Sun keyboard"
 msgstr "ÐšÐ»Ð°Ð²Ð¸Ð°Ñ‚ÑƒÑ€Ð° Sun"
 
-#. #-#-#-#-#  template.pot (debian-installer)  #-#-#-#-#
 #. Type: text
 #. Description
 #. Translators, this is a menu choice. MUST BE UNDER 65 COLUMNS
-#. #-#-#-#-#  template.pot (debian-installer)  #-#-#-#-#
-#. Type: text
-#. Description
-#: ../keyboard-usb.templates:4 ../keyboard-usb.templates:3
+#: ../keyboard-usb.templates:4
 msgid "USB keyboard"
 msgstr "ÐšÐ»Ð°Ð²Ð¸Ð°Ñ‚ÑƒÑ€Ð° USB"
 
-#. #-#-#-#-#  template.pot (debian-installer)  #-#-#-#-#
 #. Type: text
 #. Description
 #. Translators, this is a menu choice. MUST BE UNDER 65 COLUMNS
-#. #-#-#-#-#  template.pot (debian-installer)  #-#-#-#-#
-#. Type: text
-#. Description
-#: ../keyboard-dec.templates:4 ../keyboard-dec.templates:3
+#: ../keyboard-dec.templates:4
 msgid "DEC keyboard"
 msgstr "ÐšÐ»Ð°Ð²Ð¸Ð°Ñ‚ÑƒÑ€Ð° DEC"
 
-#. #-#-#-#-#  template.pot (debian-installer)  #-#-#-#-#
 #. Type: text
 #. Description
 #. Translators, this is a menu choice. MUST BE UNDER 65 COLUMNS
-#. #-#-#-#-#  template.pot (debian-installer)  #-#-#-#-#
-#. Type: text
-#. Description
-#: ../keyboard-hil.templates:4 ../keyboard-hil.templates:3
+#: ../keyboard-hil.templates:4
 msgid "HP HIL keyboard"
 msgstr "ÐšÐ»Ð°Ð²Ð¸Ð°Ñ‚ÑƒÑ€Ð° HP HIL"
 
@@ -724,24 +669,21 @@
 #. Type: select
 #. Choices
 #: ../cdrom-detect.templates:102 ../choose-mirror.templates-in:13
-#: ../iso-scan.templates:8 ../choose-mirror.templates:86
-#: ../cdrom-detect.templates:79 ../templates:8
+#: ../iso-scan.templates:8
 msgid "stable, testing, unstable"
 msgstr "ÑÑ‚Ð°Ð±Ð¸Ð»ÑŒÐ½Ð°Ñ (stable), Ñ‚ÐµÑÑ‚Ð¸Ñ€ÑƒÐµÐ¼Ð°Ñ (testing), Ð½ÐµÑÑ‚Ð°Ð±Ð¸Ð»ÑŒÐ½Ð°Ñ (unstable)"
 
 #. Type: select
 #. Description
 #: ../cdrom-detect.templates:103 ../choose-mirror.templates-in:14
-#: ../iso-scan.templates:9 ../choose-mirror.templates:87
-#: ../cdrom-detect.templates:80 ../templates:9
+#: ../iso-scan.templates:9
 msgid "Debian version to install:"
 msgstr "Ð£ÑÑ‚Ð°Ð½Ð°Ð²Ð»Ð¸Ð²Ð°ÐµÐ¼Ð°Ñ Ð²ÐµÑ€ÑÐ¸Ñ Debian:"
 
 #. Type: select
 #. Description
 #: ../cdrom-detect.templates:103 ../choose-mirror.templates-in:14
-#: ../iso-scan.templates:9 ../choose-mirror.templates:87
-#: ../cdrom-detect.templates:80 ../templates:9
+#: ../iso-scan.templates:9
 msgid ""
 "Debian comes in several flavors. Stable is well-tested and rarely changes. "
 "Unstable is untested and frequently changing. Testing is a middle ground, "
@@ -757,14 +699,14 @@
 #. Type: text
 #. Description
 #. Prebaseconfig progress bar item
-#: ../cdrom-detect.templates:116 ../cdrom-detect.templates:89
+#: ../cdrom-detect.templates:116
 msgid "Unmounting and ejecting CD-ROM..."
 msgstr "ÐžÑ‚Ð¼Ð¾Ð½Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ðµ Ð¸ Ð²Ñ‹Ð±Ñ€Ð¾Ñ ÐºÐ¾Ð¼Ð¿Ð°ÐºÑ‚-Ð´Ð¸ÑÐºÐ°..."
 
 #. Type: text
 #. Description
 #. Item in the main menu to select this package
-#: ../cdrom-detect.templates:121 ../cdrom-detect.templates:94
+#: ../cdrom-detect.templates:121
 msgid "Detect and mount CD-ROM"
 msgstr "ÐŸÐ¾Ð¸ÑÐº Ð¸ Ð¼Ð¾Ð½Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ðµ CD-ROM"
 
@@ -811,26 +753,26 @@
 
 #. Type: error
 #. Description
-#: ../ethdetect.templates:19 ../ethdetect.templates:31
+#: ../ethdetect.templates:19
 msgid "Ethernet card not found"
 msgstr "Ð¡ÐµÑ‚ÐµÐ²Ð°Ñ ÐºÐ°Ñ€Ñ‚Ð° Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½Ð°."
 
 #. Type: error
 #. Description
-#: ../ethdetect.templates:19 ../ethdetect.templates:31
+#: ../ethdetect.templates:19
 msgid "No Ethernet card was found on the system."
 msgstr "Ð’ ÑÐ¸ÑÑ‚ÐµÐ¼Ðµ Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾ Ð½Ð¸ Ð¾Ð´Ð½Ð¾Ð¹ ÑÐµÑ‚ÐµÐ²Ð¾Ð¹ ÐºÐ°Ñ€Ñ‚Ñ‹."
 
 #. Type: text
 #. Description
-#: ../ethdetect.templates:24 ../ethdetect.templates:40
+#: ../ethdetect.templates:24
 msgid "Detecting network hardware"
 msgstr "ÐžÐ¿Ñ€ÐµÐ´ÐµÐ»ÐµÐ½Ð¸Ðµ ÑÐµÑ‚ÐµÐ²Ð¾Ð³Ð¾ Ð¾Ð±Ð¾Ñ€ÑƒÐ´Ð¾Ð²Ð°Ð½Ð¸Ñ"
 
 #. Type: text
 #. Description
 #. Main menu item
-#: ../ethdetect.templates:29 ../ethdetect.templates:45
+#: ../ethdetect.templates:29
 msgid "Detect network hardware"
 msgstr "ÐžÐ¿Ñ€ÐµÐ´ÐµÐ»ÐµÐ½Ð¸Ðµ ÑÐµÑ‚ÐµÐ²Ð¾Ð¹ ÐºÐ°Ñ€Ñ‚Ñ‹"
 
@@ -843,7 +785,7 @@
 
 #. Type: text
 #. Description
-#: ../disk-detect.templates:8 ../hw-detect-full.templates:8
+#: ../disk-detect.templates:8
 msgid "Detecting disks and all other hardware"
 msgstr "ÐžÐ¿Ñ€ÐµÐ´ÐµÐ»ÐµÐ½Ð¸Ðµ Ð´Ð¸ÑÐºÐ¾Ð² Ð¸ Ð¿Ñ€Ð¾Ñ‡ÐµÐ³Ð¾ Ð¾Ð±Ð¾Ñ€ÑƒÐ´Ð¾Ð²Ð°Ð½Ð¸Ñ"
 
@@ -871,49 +813,49 @@
 
 #. Type: error
 #. Description
-#: ../disk-detect.templates:20 ../partman.templates:52
+#: ../disk-detect.templates:20
 msgid "No partitionable media"
 msgstr "ÐÐµÑ‚ ÑƒÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð², ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ðµ Ð¼Ð¾Ð¶Ð½Ð¾ Ñ€Ð°Ð·Ð¼ÐµÑ‚Ð¸Ñ‚ÑŒ"
 
 #. Type: error
 #. Description
-#: ../disk-detect.templates:20 ../partman.templates:52
+#: ../disk-detect.templates:20
 msgid "No partitionable media were found."
 msgstr "ÐÐµ Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾ ÑƒÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð², ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ðµ Ð¼Ð¾Ð¶Ð½Ð¾ Ñ€Ð°Ð·Ð¼ÐµÑ‚Ð¸Ñ‚ÑŒ."
 
 #. Type: error
 #. Description
-#: ../disk-detect.templates:20 ../partman.templates:52
+#: ../disk-detect.templates:20
 msgid "Please check that a hard disk is attached to this machine."
 msgstr "ÐŸÑ€Ð¾Ð²ÐµÑ€ÑŒÑ‚Ðµ, Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡Ñ‘Ð½ Ð»Ð¸ Ðº ÐºÐ¾Ð¼Ð¿ÑŒÑŽÑ‚ÐµÑ€Ñƒ Ð¶Ñ‘ÑÑ‚ÐºÐ¸Ð¹ Ð´Ð¸ÑÐº."
 
 #. Type: text
 #. Description
-#: ../hw-detect.templates:3 ../hw-detect.templates:13
+#: ../hw-detect.templates:3
 msgid "Detecting hardware, please wait..."
 msgstr "Ð˜Ð´ÐµÑ‚ Ð¿Ð¾Ð¸ÑÐº Ð¾Ð±Ð¾Ñ€ÑƒÐ´Ð¾Ð²Ð°Ð½Ð¸Ñ, Ð¿Ð¾Ð´Ð¾Ð¶Ð´Ð¸Ñ‚Ðµ..."
 
 #. Type: text
 #. Description
-#: ../hw-detect.templates:7 ../hw-detect.templates:17
+#: ../hw-detect.templates:7
 msgid "Loading module '${MODULE}' for '${CARDNAME}'..."
 msgstr "Ð—Ð°Ð³Ñ€ÑƒÐ¶Ð°ÐµÑ‚ÑÑ Ð¼Ð¾Ð´ÑƒÐ»ÑŒ '${MODULE}' Ð´Ð»Ñ ÑƒÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð²Ð° '${CARDNAME}'..."
 
 #. Type: text
 #. Description
-#: ../hw-detect.templates:11 ../hw-detect.templates:21
+#: ../hw-detect.templates:11
 msgid "Starting PC card services..."
 msgstr "Ð—Ð°Ð¿ÑƒÑÐºÐ°ÐµÑ‚ÑÑ Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶ÐºÐ° PC-ÐºÐ°Ñ€Ñ‚..."
 
 #. Type: multiselect
 #. Description
-#: ../hw-detect.templates:16 ../hw-detect.templates:26
+#: ../hw-detect.templates:16
 msgid "Modules to load:"
 msgstr "Ð—Ð°Ð³Ñ€ÑƒÐ¶Ð°ÐµÐ¼Ñ‹Ðµ Ð¼Ð¾Ð´ÑƒÐ»Ð¸:"
 
 #. Type: multiselect
 #. Description
-#: ../hw-detect.templates:16 ../hw-detect.templates:26
+#: ../hw-detect.templates:16
 msgid ""
 "The following Linux kernel modules were detected as matching your hardware. "
 "If you know some are unnecessary, or cause problems, you can choose not to "
@@ -926,13 +868,13 @@
 
 #. Type: boolean
 #. Description
-#: ../hw-detect.templates:25 ../hw-detect.templates:35
+#: ../hw-detect.templates:25
 msgid "Prompt for module parameters?"
 msgstr "Ð—Ð°Ð¿Ñ€Ð°ÑˆÐ¸Ð²Ð°Ñ‚ÑŒ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ñ‹ Ð¼Ð¾Ð´ÑƒÐ»ÐµÐ¹?"
 
 #. Type: boolean
 #. Description
-#: ../hw-detect.templates:25 ../hw-detect.templates:35
+#: ../hw-detect.templates:25
 msgid ""
 "Some modules accept load-time parameters to customize their operation. If "
 "you'd like, you can be prompted for module parameters as each module is "
@@ -943,13 +885,13 @@
 
 #. Type: boolean
 #. Description
-#: ../hw-detect.templates:33 ../hw-detect.templates:43
+#: ../hw-detect.templates:33
 msgid "Start PC card services?"
 msgstr "Ð—Ð°Ð¿ÑƒÑÑ‚Ð¸Ñ‚ÑŒ ÑÐµÑ€Ð²Ð¸ÑÑ‹ PC-ÐºÐ°Ñ€Ñ‚?"
 
 #. Type: boolean
 #. Description
-#: ../hw-detect.templates:33 ../hw-detect.templates:43
+#: ../hw-detect.templates:33
 msgid ""
 "This computer may have a PCMCIA interface. Please choose whether PC card "
 "services should be started in order to allow the use of PCMCIA cards."
@@ -959,13 +901,13 @@
 
 #. Type: string
 #. Description
-#: ../hw-detect.templates:40 ../hw-detect.templates:50
+#: ../hw-detect.templates:40
 msgid "PCMCIA resource range options:"
 msgstr "ÐŸÐ°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ñ‹ Ð´Ð¸Ð°Ð¿Ð°Ð·Ð¾Ð½Ð° Ñ€ÐµÑÑƒÑ€ÑÐ¾Ð² PCMCIA:"
 
 #. Type: string
 #. Description
-#: ../hw-detect.templates:40 ../hw-detect.templates:50
+#: ../hw-detect.templates:40
 msgid ""
 "Some PCMCIA hardware needs special resource configuration options in order "
 "to work, and can cause the computer to freeze otherwise. For example, some "
@@ -982,13 +924,13 @@
 
 #. Type: string
 #. Description
-#: ../hw-detect.templates:40 ../hw-detect.templates:50
+#: ../hw-detect.templates:40
 msgid "For most hardware, you do not need to specify anything here."
 msgstr "Ð”Ð»Ñ Ð±Ð¾Ð»ÑŒÑˆÐ¸Ð½ÑÑ‚Ð²Ð° ÑƒÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð² Ð·Ð´ÐµÑÑŒ Ð¼Ð¾Ð¶Ð½Ð¾ Ð½Ð¸Ñ‡ÐµÐ³Ð¾ Ð½Ðµ ÑƒÐºÐ°Ð·Ñ‹Ð²Ð°Ñ‚ÑŒ."
 
 #. Type: string
 #. Description
-#: ../hw-detect.templates:51 ../hw-detect.templates:61
+#: ../hw-detect.templates:51
 msgid ""
 "Some modules accept load-time parameters to customize their operation. These "
 "parameters are often I/O port and IRQ numbers that vary from machine to "
@@ -1002,19 +944,19 @@
 
 #. Type: string
 #. Description
-#: ../hw-detect.templates:51 ../hw-detect.templates:61
+#: ../hw-detect.templates:51
 msgid "If you don't know what to enter, leave it blank."
 msgstr "Ð•ÑÐ»Ð¸ Ð’Ñ‹ Ð½Ðµ Ð·Ð½Ð°ÐµÑ‚Ðµ Ñ‡Ñ‚Ð¾ Ð²Ð²ÐµÑÑ‚Ð¸ -- Ð¾ÑÑ‚Ð°Ð²ÑŒÑ‚Ðµ Ð¿Ð¾Ð»Ðµ Ð¿ÑƒÑÑ‚Ñ‹Ð¼."
 
 #. Type: string
 #. Description
-#: ../hw-detect.templates:61 ../ethdetect.templates:11
+#: ../hw-detect.templates:61
 msgid "Additional parameters for module ${MODULE}:"
 msgstr "Ð’Ð²ÐµÐ´Ð¸Ñ‚Ðµ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ñ‹Ðµ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ñ‹ Ð´Ð»Ñ Ð¼Ð¾Ð´ÑƒÐ»Ñ ${MODULE}:"
 
 #. Type: string
 #. Description
-#: ../hw-detect.templates:61 ../ethdetect.templates:11
+#: ../hw-detect.templates:61
 msgid ""
 "The module ${MODULE} failed to load. You may need to pass parameters to the "
 "module to make it work; this is common with older hardware. These parameters "
@@ -1029,7 +971,7 @@
 
 #. Type: string
 #. Description
-#: ../hw-detect.templates:61 ../ethdetect.templates:11
+#: ../hw-detect.templates:61
 msgid ""
 "If you don't know what to enter, consult your documentation, or leave it "
 "blank to not load the module."
@@ -1039,8 +981,7 @@
 
 #. Type: error
 #. Description
-#: ../hw-detect.templates:73 ../ethdetect.templates:36
-#: ../hw-detect.templates:71
+#: ../hw-detect.templates:73
 msgid "Error while running '${CMD_LINE_PARAM}'"
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° Ð¿Ñ€Ð¸ Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ð¸ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ‹ '${CMD_LINE_PARAM}'"
 
@@ -1350,29 +1291,23 @@
 "Ð²Ñ‹ Ñ…Ð¾Ñ‚Ð¸Ñ‚Ðµ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ ÑÑ‚Ð¾Ñ‚ Ð¸Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹Ñ, Ð²ÐºÐ»ÑŽÑ‡Ð¸Ñ‚Ðµ ÐµÐ³Ð¾ Ð¿ÐµÑ€ÐµÐ´ Ñ‚ÐµÐ¼, ÐºÐ°Ðº "
 "Ð¿Ñ€Ð¾Ð´Ð¾Ð»Ð¶Ð¸Ñ‚ÑŒ."
 
-#. #-#-#-#-#  template.pot (debian-installer)  #-#-#-#-#
 #. Type: select
 #. Choices
 #. Note to translators : Please keep your translations of the choices
 #. below the 65 columns limit (which means 65 characters for most languages)
-#. #-#-#-#-#  template.pot (debian-installer)  #-#-#-#-#
-#. Type: select
-#. Choices
-#. Note to translators : Please keep your translations of the choices
-#. below the 70 columns limit (which means 70 characters for most languages)
-#: ../netcfg-common.templates:121 ../netcfg-common.templates:112
+#: ../netcfg-common.templates:121
 msgid "Infrastructure (Managed) network, Ad-hoc network (Peer to peer)"
 msgstr "Ð£Ð¿Ñ€Ð°Ð²Ð»ÑÐµÐ¼Ð°Ñ ÑÐµÑ‚ÑŒ (Infrastructure), ÐŸÑ€ÑÐ¼Ð¾Ðµ ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ðµ (Ad hoc)"
 
 #. Type: select
 #. Description
-#: ../netcfg-common.templates:122 ../netcfg-common.templates:113
+#: ../netcfg-common.templates:122
 msgid "Wireless network kind:"
 msgstr "Ð¢Ð¸Ð¿ Ð±ÐµÑÐ¿Ñ€Ð¾Ð²Ð¾Ð´Ð½Ð¾Ð¹ ÑÐµÑ‚Ð¸:"
 
 #. Type: select
 #. Description
-#: ../netcfg-common.templates:122 ../netcfg-common.templates:113
+#: ../netcfg-common.templates:122
 msgid ""
 "Wireless networks are either managed or ad-hoc. If you use a real access "
 "point of some sort, your network is Managed. If another computer is your "
@@ -1386,43 +1321,43 @@
 
 #. Type: text
 #. Description
-#: ../netcfg-common.templates:129 ../netcfg-common.templates:120
+#: ../netcfg-common.templates:129
 msgid "Wireless network configuration"
 msgstr "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ° Ð±ÐµÑÐ¿Ñ€Ð¾Ð²Ð¾Ð´Ð½Ð¾Ð¹ ÑÐµÑ‚Ð¸"
 
 #. Type: text
 #. Description
-#: ../netcfg-common.templates:133 ../netcfg-common.templates:124
+#: ../netcfg-common.templates:133
 msgid "Searching for wireless access points ..."
 msgstr "ÐŸÐ¾Ð¸ÑÐº Ñ‚Ð¾Ñ‡ÐµÐº Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð° (access point) Ð±ÐµÑÐ¿Ñ€Ð¾Ð²Ð¾Ð´Ð½Ð¾Ð¹ ÑÐµÑ‚Ð¸..."
 
 #. Type: text
 #. Description
-#: ../netcfg-common.templates:143 ../netcfg-common.templates:134
+#: ../netcfg-common.templates:143
 msgid "<none>"
 msgstr "<Ð½Ð¸ Ð¾Ð´Ð¸Ð½ Ð¸Ð· Ð½Ð¸Ñ…>"
 
 #. Type: text
 #. Description
-#: ../netcfg-common.templates:147 ../netcfg-common.templates:138
+#: ../netcfg-common.templates:147
 msgid "Wireless ethernet (802.11x)"
 msgstr "Ð‘ÐµÑÐ¿Ñ€Ð¾Ð²Ð¾Ð´Ð½Ð°Ñ ÑÐµÑ‚ÑŒ (802.11x)"
 
 #. Type: text
 #. Description
-#: ../netcfg-common.templates:151 ../netcfg-common.templates:142
+#: ../netcfg-common.templates:151
 msgid "wireless"
 msgstr "Ð±ÐµÑÐ¿Ñ€Ð¾Ð²Ð¾Ð´Ð½Ð°Ñ"
 
 #. Type: text
 #. Description
-#: ../netcfg-common.templates:155 ../netcfg-common.templates:146
+#: ../netcfg-common.templates:155
 msgid "Ethernet or Fast Ethernet"
 msgstr "Ethernet Ð¸Ð»Ð¸ Fast Ethernet"
 
 #. Type: text
 #. Description
-#: ../netcfg-common.templates:159 ../netcfg-common.templates:150
+#: ../netcfg-common.templates:159
 msgid "Token Ring"
 msgstr "Token Ring"
 
@@ -1434,55 +1369,55 @@
 
 #. Type: text
 #. Description
-#: ../netcfg-common.templates:172 ../netcfg-common.templates:158
+#: ../netcfg-common.templates:172
 msgid "Serial-line IP"
 msgstr "IP Ð¿Ð¾ Ð¿Ð¾ÑÐ»ÐµÐ´Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒÐ½Ð¾Ð¹ Ð»Ð¸Ð½Ð¸Ð¸ (SLIP)"
 
 #. Type: text
 #. Description
-#: ../netcfg-common.templates:176 ../netcfg-common.templates:162
+#: ../netcfg-common.templates:176
 msgid "Parallel-port IP"
 msgstr "IP Ð¿Ð¾ Ð¿Ð°Ñ€Ð°Ð»Ð»ÐµÐ»ÑŒÐ½Ð¾Ð¹ Ð»Ð¸Ð½Ð¸Ð¸ (PLIP)"
 
 #. Type: text
 #. Description
-#: ../netcfg-common.templates:180 ../netcfg-common.templates:166
+#: ../netcfg-common.templates:180
 msgid "Point-to-Point Protocol"
 msgstr "ÐŸÑ€Ð¾Ñ‚Ð¾ÐºÐ¾Ð» PPP"
 
 #. Type: text
 #. Description
-#: ../netcfg-common.templates:184 ../netcfg-common.templates:170
+#: ../netcfg-common.templates:184
 msgid "IPv6-in-IPv4"
 msgstr "IPv6-in-IPv4"
 
 #. Type: text
 #. Description
-#: ../netcfg-common.templates:188 ../netcfg-common.templates:174
+#: ../netcfg-common.templates:188
 msgid "ISDN Point-to-Point Protocol"
 msgstr "ÐŸÑ€Ð¾Ñ‚Ð¾ÐºÐ¾Ð» ISDN PPP"
 
 #. Type: text
 #. Description
-#: ../netcfg-common.templates:192 ../netcfg-common.templates:178
+#: ../netcfg-common.templates:192
 msgid "Channel-to-channel"
 msgstr "Channel-to-channel (CTC)"
 
 #. Type: text
 #. Description
-#: ../netcfg-common.templates:196 ../netcfg-common.templates:182
+#: ../netcfg-common.templates:196
 msgid "Real channel-to-channel"
 msgstr "Ð ÐµÐ°Ð»ÑŒÐ½Ñ‹Ð¹ channel-to-channel"
 
 #. Type: text
 #. Description
-#: ../netcfg-common.templates:205 ../netcfg-common.templates:190
+#: ../netcfg-common.templates:205
 msgid "Inter-user communication vehicle"
 msgstr "ÐœÐµÐ¶Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒÑÐºÐ°Ñ ÑÐ²ÑÐ·ÑŒ (IUCV)"
 
 #. Type: text
 #. Description
-#: ../netcfg-common.templates:209 ../netcfg-common.templates:194
+#: ../netcfg-common.templates:209
 msgid "Unknown interface"
 msgstr "ÐÐµÐ¸Ð·Ð²ÐµÑÑ‚Ð½Ñ‹Ð¹ Ð¸Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹Ñ"
 
@@ -1496,7 +1431,7 @@
 #. Type: text
 #. Description
 #. Item in the main menu to select this package
-#: ../netcfg-common.templates:219 ../netcfg-common.templates:204
+#: ../netcfg-common.templates:219
 msgid "Configure the network"
 msgstr "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¸Ñ‚ÑŒ ÑÐµÑ‚ÑŒ"
 
@@ -1561,54 +1496,49 @@
 msgid "The DHCP configuration process will be aborted."
 msgstr "ÐŸÑ€Ð¾Ñ†ÐµÑÑ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ Ð¿Ð¾ DHCP Ð±Ñ‹Ð» Ð¿Ñ€ÐµÑ€Ð²Ð°Ð½."
 
-#. #-#-#-#-#  template.pot (debian-installer)  #-#-#-#-#
 #. Type: select
 #. Choices
 #. Note to translators : Please keep your translations of the choices
 #. below a 65 columns limit (which means 65 characters
 #. in single-byte languages)
-#. #-#-#-#-#  template.pot (debian-installer)  #-#-#-#-#
-#. Type: select
-#. Choices
-#. Note to translators : Please keep your translations of the choices
-#. below the 70 columns limit (which means 70 characters for most languages)
-#: ../netcfg-dhcp.templates:33 ../netcfg-dhcp.templates:32
+#: ../netcfg-dhcp.templates:33
 msgid "Retry network autoconfiguration"
 msgstr "ÐŸÐ¾Ð²Ñ‚Ð¾Ñ€Ð¸Ñ‚ÑŒ Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡ÐµÑÐºÑƒÑŽ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÑƒ ÑÐµÑ‚Ð¸"
 
 #. Type: select
 #. Choices
-#: ../netcfg-dhcp.templates:33 ../netcfg-dhcp.templates:32
+#: ../netcfg-dhcp.templates:33
 msgid "Retry network autoconfiguration with a DHCP hostname"
-msgstr "ÐŸÐ¾Ð²Ñ‚Ð¾Ñ€Ð¸Ñ‚ÑŒ Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡ÐµÑÐºÑƒÑŽ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÑƒ ÑÐµÑ‚Ð¸ Ð¿Ð¾ DHCP Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð½Ñ‹Ð¼ Ð¸Ð¼ÐµÐ½ÐµÐ¼ ÐºÐ¾Ð¼Ð¿ÑŒÑŽÑ‚ÐµÑ€Ð°"
+msgstr ""
+"ÐŸÐ¾Ð²Ñ‚Ð¾Ñ€Ð¸Ñ‚ÑŒ Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡ÐµÑÐºÑƒÑŽ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÑƒ ÑÐµÑ‚Ð¸ Ð¿Ð¾ DHCP Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð½Ñ‹Ð¼ Ð¸Ð¼ÐµÐ½ÐµÐ¼ ÐºÐ¾Ð¼Ð¿ÑŒÑŽÑ‚ÐµÑ€Ð°"
 
 #. Type: select
 #. Choices
-#: ../netcfg-dhcp.templates:33 ../netcfg-dhcp.templates:32
+#: ../netcfg-dhcp.templates:33
 msgid "Configure network manually"
 msgstr "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¸Ñ‚ÑŒ ÑÐµÑ‚ÑŒ Ð²Ñ€ÑƒÑ‡Ð½ÑƒÑŽ"
 
 #. Type: select
 #. Choices
-#: ../netcfg-dhcp.templates:33 ../netcfg-dhcp.templates:32
+#: ../netcfg-dhcp.templates:33
 msgid "${wifireconf}"
 msgstr "${wifireconf}"
 
 #. Type: select
 #. Choices
-#: ../netcfg-dhcp.templates:33 ../netcfg-dhcp.templates:32
+#: ../netcfg-dhcp.templates:33
 msgid "Do not configure the network at this time"
 msgstr "ÐŸÑ€Ð¾Ð¿ÑƒÑÑ‚Ð¸Ñ‚ÑŒ Ð¿Ð¾ÐºÐ° Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÑƒ ÑÐµÑ‚Ð¸"
 
 #. Type: select
 #. Description
-#: ../netcfg-dhcp.templates:35 ../netcfg-dhcp.templates:34
+#: ../netcfg-dhcp.templates:35
 msgid "Network configuration method:"
 msgstr "ÐœÐµÑ‚Ð¾Ð´ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ ÑÐµÑ‚Ð¸:"
 
 #. Type: select
 #. Description
-#: ../netcfg-dhcp.templates:35 ../netcfg-dhcp.templates:34
+#: ../netcfg-dhcp.templates:35
 msgid ""
 "From here you can choose to retry DHCP network autoconfiguration (which may "
 "succeed if your DHCP server takes a long time to respond) or to configure "
@@ -1624,13 +1554,13 @@
 
 #. Type: note
 #. Description
-#: ../netcfg-dhcp.templates:45 ../netcfg-dhcp.templates:44
+#: ../netcfg-dhcp.templates:45
 msgid "Network autoconfiguration failed"
 msgstr "Ð¡Ð±Ð¾Ð¹ Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡ÐµÑÐºÐ¾Ð¹ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ ÑÐµÑ‚Ð¸"
 
 #. Type: note
 #. Description
-#: ../netcfg-dhcp.templates:45 ../netcfg-dhcp.templates:44
+#: ../netcfg-dhcp.templates:45
 msgid ""
 "Your network is probably not using the DHCP protocol. Alternatively, the "
 "DHCP server may be slow or some network hardware is not working properly."
@@ -1641,7 +1571,7 @@
 
 #. Type: boolean
 #. Description
-#: ../netcfg-dhcp.templates:51 ../netcfg-dhcp.templates:50
+#: ../netcfg-dhcp.templates:51
 msgid "Continue without a default route?"
 msgstr "ÐŸÑ€Ð¾Ð´Ð¾Ð»Ð¶Ð¸Ñ‚ÑŒ Ð±ÐµÐ· Ð¿ÑƒÑ‚Ð¸ Ð¿Ð¾ ÑƒÐ¼Ð¾Ð»Ñ‡Ð°Ð½Ð¸ÑŽ?"
 
@@ -1663,7 +1593,7 @@
 
 #. Type: boolean
 #. Description
-#: ../netcfg-dhcp.templates:51 ../netcfg-dhcp.templates:50
+#: ../netcfg-dhcp.templates:51
 msgid ""
 "If you are unsure, you should not continue without a default route: contact "
 "your local network administrator about this problem."
@@ -1673,7 +1603,7 @@
 
 #. Type: text
 #. Description
-#: ../netcfg-dhcp.templates:63 ../netcfg-dhcp.templates:62
+#: ../netcfg-dhcp.templates:63
 msgid "Reconfigure the wireless network"
 msgstr "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ° Ð±ÐµÑÐ¿Ñ€Ð¾Ð²Ð¾Ð´Ð½Ð¾Ð¹ ÑÐµÑ‚Ð¸"
 
@@ -1789,8 +1719,10 @@
 #. Type: error
 #. Description
 #: ../netcfg-static.templates:44
-msgid "You may have made an error entering your IP address, netmask and/or gateway."
-msgstr "Ð’Ñ‹ Ð¼Ð¾Ð³Ð»Ð¸ Ð¾ÑˆÐ¸Ð±Ð¸Ñ‚ÑŒÑÑ Ð¿Ñ€Ð¸ Ð²Ð²Ð¾Ð´Ðµ Ð²Ð°ÑˆÐµÐ³Ð¾ IP Ð°Ð´Ñ€ÐµÑÐ°, Ð¼Ð°ÑÐºÐ¸ Ð¿Ð¾Ð´ÑÐµÑ‚Ð¸ Ð¸Ð»Ð¸ ÑˆÐ»ÑŽÐ·Ð°."
+msgid ""
+"You may have made an error entering your IP address, netmask and/or gateway."
+msgstr ""
+"Ð’Ñ‹ Ð¼Ð¾Ð³Ð»Ð¸ Ð¾ÑˆÐ¸Ð±Ð¸Ñ‚ÑŒÑÑ Ð¿Ñ€Ð¸ Ð²Ð²Ð¾Ð´Ðµ Ð²Ð°ÑˆÐµÐ³Ð¾ IP Ð°Ð´Ñ€ÐµÑÐ°, Ð¼Ð°ÑÐºÐ¸ Ð¿Ð¾Ð´ÑÐµÑ‚Ð¸ Ð¸Ð»Ð¸ ÑˆÐ»ÑŽÐ·Ð°."
 
 #. Type: boolean
 #. Description
@@ -1831,25 +1763,25 @@
 
 #. Type: text
 #. Description
-#: ../choose-mirror.templates-in:26 ../choose-mirror.templates:95
+#: ../choose-mirror.templates-in:26
 msgid "Checking the Debian archive mirror"
 msgstr "ÐŸÑ€Ð¾Ð²ÐµÑ€ÐºÐ° Ð·ÐµÑ€ÐºÐ°Ð»Ð° Ð°Ñ€Ñ…Ð¸Ð²Ð° Debian"
 
 #. Type: text
 #. Description
-#: ../choose-mirror.templates-in:30 ../choose-mirror.templates:99
+#: ../choose-mirror.templates-in:30
 msgid "Downloading the Release file..."
 msgstr "Ð—Ð°Ð³Ñ€ÑƒÐ·ÐºÐ° Ñ„Ð°Ð¹Ð»Ð° Release..."
 
 #. Type: error
 #. Description
-#: ../choose-mirror.templates-in:34 ../choose-mirror.templates:103
+#: ../choose-mirror.templates-in:34
 msgid "Bad archive mirror"
 msgstr "ÐŸÑ€Ð¾Ð±Ð»ÐµÐ¼Ð° Ñ Ð·ÐµÑ€ÐºÐ°Ð»Ð¾Ð¼ Ð°Ñ€Ñ…Ð¸Ð²Ð° Debian"
 
 #. Type: error
 #. Description
-#: ../choose-mirror.templates-in:34 ../choose-mirror.templates:103
+#: ../choose-mirror.templates-in:34
 msgid ""
 "The specified Debian archive mirror is either not available, or does not "
 "have a valid Release file on it. Please try a different mirror."
@@ -1860,19 +1792,13 @@
 #. Type: text
 #. Description
 #. main-menu
-#: ../choose-mirror.templates-in:41 ../choose-mirror.templates:110
+#: ../choose-mirror.templates-in:41
 msgid "Choose a mirror of the Debian archive"
 msgstr "Ð’Ñ‹Ð±Ð¾Ñ€ Ð·ÐµÑ€ÐºÐ°Ð»Ð° Ð°Ñ€Ñ…Ð¸Ð²Ð° Debian"
 
-#. #-#-#-#-#  template.pot (debian-installer)  #-#-#-#-#
 #. Type: select
 #. Choices
-#. #-#-#-#-#  template.pot (debian-installer)  #-#-#-#-#
-#. Type: select
-#. Choices
-#. [NOTE] Translate the ISO country codes below into localised country names.
 #: ../choose-mirror.templates.http-in:5 ../choose-mirror.templates.ftp-in:5
-#: ../choose-mirror.templates:128
 msgid "enter information manually"
 msgstr "Ð²Ð²ÐµÑÑ‚Ð¸ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸ÑŽ Ð²Ñ€ÑƒÑ‡Ð½ÑƒÑŽ"
 
@@ -1882,21 +1808,19 @@
 #. to one of those listed above, e.g. msgstr "GB".  Square brackets are
 #. ignored and appear here only to distinguish this msgid from the same
 #. one in the Choices field.
-#: ../choose-mirror.templates.http-in:10 ../choose-mirror.templates:120
+#: ../choose-mirror.templates.http-in:10
 msgid "US[ Default value for http]"
 msgstr "RU"
 
 #. Type: select
 #. Description
 #: ../choose-mirror.templates.http-in:11 ../choose-mirror.templates.ftp-in:11
-#: ../choose-mirror.templates:134
 msgid "Debian archive mirror country:"
 msgstr "Ð¡Ñ‚Ñ€Ð°Ð½Ð° Ð·ÐµÑ€ÐºÐ°Ð»Ð° Ð°Ñ€Ñ…Ð¸Ð²Ð° Debian:"
 
 #. Type: select
 #. Description
 #: ../choose-mirror.templates.http-in:11 ../choose-mirror.templates.ftp-in:11
-#: ../choose-mirror.templates:134
 msgid ""
 "The goal is to find a mirror of the Debian archive that is close to you on "
 "the network -- be aware that nearby countries, or even your own, may not be "
@@ -1909,14 +1833,12 @@
 #. Type: select
 #. Description
 #: ../choose-mirror.templates.http-in:20 ../choose-mirror.templates.ftp-in:20
-#: ../choose-mirror.templates:55
 msgid "Debian archive mirror:"
 msgstr "Ð—ÐµÑ€ÐºÐ°Ð»Ð¾ Ð°Ñ€Ñ…Ð¸Ð²Ð° Debian:"
 
 #. Type: select
 #. Description
 #: ../choose-mirror.templates.http-in:20 ../choose-mirror.templates.ftp-in:20
-#: ../choose-mirror.templates:55
 msgid ""
 "Please select a Debian archive mirror. You should use a mirror in your "
 "country or region if you do not know which mirror has the best Internet "
@@ -1928,22 +1850,20 @@
 #. Type: select
 #. Description
 #: ../choose-mirror.templates.http-in:20 ../choose-mirror.templates.ftp-in:20
-#: ../choose-mirror.templates:55
 msgid "Usually, ftp.<your country code>.debian.org is a good choice."
 msgstr "ÐžÐ±Ñ‹Ñ‡Ð½Ð¾ ftp.<ÐºÐ¾Ð´ Ð²Ð°ÑˆÐµÐ¹ ÑÑ‚Ñ€Ð°Ð½Ñ‹>.debian.org ÑÐ²Ð»ÑÐµÑ‚ÑÑ Ñ…Ð¾Ñ€Ð¾ÑˆÐ¸Ð¼ Ð²Ñ‹Ð±Ð¾Ñ€Ð¾Ð¼."
 
 #. Type: string
 #. Description
 #: ../choose-mirror.templates.http-in:29 ../choose-mirror.templates.ftp-in:29
-#: ../choose-mirror.templates:64
 msgid "Debian archive mirror hostname:"
 msgstr "Ð˜Ð¼Ñ Ð·ÐµÑ€ÐºÐ°Ð»Ð° Ð°Ñ€Ñ…Ð¸Ð²Ð° Debian:"
 
 #. Type: string
 #. Description
 #: ../choose-mirror.templates.http-in:29 ../choose-mirror.templates.ftp-in:29
-#: ../choose-mirror.templates:32
-msgid "Please enter the hostname of the mirror from which Debian will be downloaded."
+msgid ""
+"Please enter the hostname of the mirror from which Debian will be downloaded."
 msgstr "Ð’Ð²ÐµÐ´Ð¸Ñ‚Ðµ Ð¸Ð¼Ñ Ð·ÐµÑ€ÐºÐ°Ð»Ð°, Ñ ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ð³Ð¾ Ð±ÑƒÐ´ÐµÑ‚ Ð·Ð°Ð³Ñ€ÑƒÐ¶ÐµÐ½ Debian."
 
 #. Type: string
@@ -1957,14 +1877,12 @@
 #. Type: string
 #. Description
 #: ../choose-mirror.templates.http-in:39 ../choose-mirror.templates.ftp-in:39
-#: ../choose-mirror.templates:71
 msgid "Debian archive mirror directory:"
 msgstr "ÐšÐ°Ñ‚Ð°Ð»Ð¾Ð³ Ð·ÐµÑ€ÐºÐ°Ð»Ð° Ð°Ñ€Ñ…Ð¸Ð²Ð° Debian:"
 
 #. Type: string
 #. Description
 #: ../choose-mirror.templates.http-in:39 ../choose-mirror.templates.ftp-in:39
-#: ../choose-mirror.templates:71
 msgid ""
 "Please enter the directory in which the mirror of the Debian archive is "
 "located."
@@ -1972,13 +1890,13 @@
 
 #. Type: string
 #. Description
-#: ../choose-mirror.templates.http-in:45 ../choose-mirror.templates:44
+#: ../choose-mirror.templates.http-in:45
 msgid "HTTP proxy information (blank for none):"
 msgstr "Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾ HTTP-Ð¿Ñ€Ð¾ÐºÑÐ¸ (ÐµÑÐ»Ð¸ Ð¿Ñ€Ð¾ÐºÑÐ¸ Ð½ÐµÑ‚ -- Ð½Ðµ Ð·Ð°Ð¿Ð¾Ð»Ð½ÑÐ¹Ñ‚Ðµ):"
 
 #. Type: string
 #. Description
-#: ../choose-mirror.templates.http-in:45 ../choose-mirror.templates:44
+#: ../choose-mirror.templates.http-in:45
 msgid ""
 "If you need to use a HTTP proxy to access the outside world, enter the proxy "
 "information here. Otherwise, leave this blank."
@@ -2002,13 +1920,13 @@
 #. to one of those listed above, e.g. msgstr "GB".  Square brackets are
 #. ignored and appear here only to distinguish this msgid from the same
 #. one in the Choices field.
-#: ../choose-mirror.templates.ftp-in:10 ../choose-mirror.templates:133
+#: ../choose-mirror.templates.ftp-in:10
 msgid "US[ Default value for ftp]"
 msgstr "RU"
 
 #. Type: string
 #. Description
-#: ../choose-mirror.templates.ftp-in:45 ../choose-mirror.templates:77
+#: ../choose-mirror.templates.ftp-in:45
 msgid "FTP proxy information (blank for none):"
 msgstr "Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾ FTP-Ð¿Ñ€Ð¾ÐºÑÐ¸ (Ð¾ÑÑ‚Ð°Ð²ÑŒÑ‚Ðµ Ð¿Ð¾Ð»Ðµ Ð¿ÑƒÑÑ‚Ñ‹Ð¼, ÐµÑÐ»Ð¸ Ð¿Ñ€Ð¾ÐºÑÐ¸ Ð½ÐµÑ‚):"
 
@@ -2047,33 +1965,33 @@
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#. These are choices of actions so this is, at least in English,
+#. an infinitive form
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 msgid "Retry"
 msgstr "ÐŸÐ¾Ð²Ñ‚Ð¾Ñ€Ð¸Ñ‚ÑŒ"
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 msgid "Change mirror"
 msgstr "Ð¡Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ Ð·ÐµÑ€ÐºÐ°Ð»Ð¾ Ð°Ñ€Ñ…Ð¸Ð²Ð°"
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../mdcfg-utils.templates:122
-#: ../mdcfg-utils.templates:119
+#: ../net-retriever.templates:5 ../mdcfg-utils.templates:122
 msgid "Cancel"
 msgstr "ÐžÑ‚Ð¼ÐµÐ½Ð°"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:31
-#: ../templates:5
+#: ../net-retriever.templates:7 ../apt-mirror-setup.templates:33
 msgid "Downloading a file failed:"
 msgstr "ÐÐµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ Ð·Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚ÑŒ Ñ„Ð°Ð¹Ð»:"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5 ../templates:5
+#: ../net-retriever.templates:7
 msgid ""
 "The installer failed to download a file from the mirror. This may be a "
 "problem with your network, or with the mirror. You can choose to retry the "
@@ -2112,19 +2030,19 @@
 
 #. Type: text
 #. Description
-#: ../floppy-retriever.templates:3 ../templates:3
+#: ../floppy-retriever.templates:3
 msgid "Scanning the floppy"
 msgstr "ÐÐ½Ð°Ð»Ð¸Ð· Ð´Ð¸ÑÐºÐµÑ‚Ñ‹"
 
 #. Type: boolean
 #. Description
-#: ../floppy-retriever.templates:8 ../templates:17
+#: ../floppy-retriever.templates:8
 msgid "Cannot read floppy, or not a driver floppy. Retry?"
 msgstr "ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¿Ñ€Ð¾Ñ‡ÐµÑÑ‚ÑŒ Ð´Ð¸ÑÐºÐµÑ‚Ñƒ, Ð»Ð¸Ð±Ð¾ Ð½Ð° Ð½ÐµÐ¹ Ð½ÐµÑ‚ Ð´Ñ€Ð°Ð¹Ð²ÐµÑ€Ð¾Ð². ÐŸÐ¾Ð²Ñ‚Ð¾Ñ€Ð¸Ñ‚ÑŒ?"
 
 #. Type: boolean
 #. Description
-#: ../floppy-retriever.templates:8 ../templates:17
+#: ../floppy-retriever.templates:8
 msgid ""
 "There was a problem reading data from the floppy disk. Please make sure that "
 "the right floppy is in the drive. If you continue to have trouble, you may "
@@ -2171,13 +2089,13 @@
 
 #. Type: select
 #. Choices
-#: ../mountfloppy.templates:3 ../templates:7
+#: ../mountfloppy.templates:3
 msgid "Cancel, ${DEVS}"
 msgstr "ÐžÑ‚Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ, ${DEVS}"
 
 #. Type: select
 #. Description
-#: ../mountfloppy.templates:4 ../templates:8
+#: ../mountfloppy.templates:4
 msgid "Select your floppy device:"
 msgstr "Ð’Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ Ð²Ð°Ñˆ Ð´Ð¸ÑÐºÐ¾Ð²Ð¾Ð´:"
 
@@ -2196,25 +2114,25 @@
 
 #. Type: text
 #. Description
-#: ../partman-base.templates:3 ../partman.templates:3
+#: ../partman-base.templates:3
 msgid "Starting up the partitioner"
 msgstr "Ð—Ð°Ð¿ÑƒÑÐº Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ñ‹ Ñ€Ð°Ð·Ð¼ÐµÑ‚ÐºÐ¸"
 
 #. Type: text
 #. Description
-#: ../partman-base.templates:11 ../partman.templates:11
+#: ../partman-base.templates:11
 msgid "Scanning disks..."
 msgstr "ÐŸÑ€Ð¾ÑÐ¼Ð¾Ñ‚Ñ€ Ð´Ð¸ÑÐºÐ¾Ð²..."
 
 #. Type: text
 #. Description
-#: ../partman-base.templates:15 ../partman.templates:15
+#: ../partman-base.templates:15
 msgid "Detecting file systems..."
 msgstr "ÐžÐ¿Ñ€ÐµÐ´ÐµÐ»ÐµÐ½Ð¸Ðµ Ñ„Ð°Ð¹Ð»Ð¾Ð²Ñ‹Ñ… ÑÐ¸ÑÑ‚ÐµÐ¼..."
 
 #. Type: boolean
 #. Description
-#: ../partman-base.templates:31 ../partman.templates:31
+#: ../partman-base.templates:31
 msgid ""
 "This partitioner doesn't have information about the default type of the "
 "partition tables on your architecture.  Please send an e-mail message to "
@@ -2226,7 +2144,7 @@
 
 #. Type: boolean
 #. Description
-#: ../partman-base.templates:31 ../partman.templates:31
+#: ../partman-base.templates:31
 msgid ""
 "Please note that if the type of the partition table is unsupported by "
 "libparted, then this partitioner will not work properly."
@@ -2236,13 +2154,13 @@
 
 #. Type: boolean
 #. Description
-#: ../partman-base.templates:42 ../partman.templates:42
+#: ../partman-base.templates:42
 msgid "Continue with partitioning?"
 msgstr "ÐŸÑ€Ð¾Ð´Ð¾Ð»Ð¶Ð¸Ñ‚ÑŒ Ñ€Ð°Ð·Ð¼ÐµÑ‚ÐºÑƒ?"
 
 #. Type: boolean
 #. Description
-#: ../partman-base.templates:42 ../partman.templates:42
+#: ../partman-base.templates:42
 msgid ""
 "This partitioner is based on the library libparted which doesn't have "
 "support for the partition tables used on your architecture.  It is strongly "
@@ -2254,7 +2172,7 @@
 
 #. Type: boolean
 #. Description
-#: ../partman-base.templates:42 ../partman.templates:42
+#: ../partman-base.templates:42
 msgid ""
 "If you can, please help to add support for your partition table type to "
 "libparted."
@@ -2264,7 +2182,7 @@
 
 #. Type: select
 #. Description
-#: ../partman-base.templates:53 ../partman.templates:60
+#: ../partman-base.templates:53
 msgid ""
 "This is an overview of your currently configured partitions and mount "
 "points. Select a partition to modify its settings (file system, mount point, "
@@ -2278,13 +2196,13 @@
 
 #. Type: boolean
 #. Description
-#: ../partman-base.templates:58 ../partman.templates:65
+#: ../partman-base.templates:58
 msgid "Create new empty partition table on this device?"
 msgstr "Ð¡Ð¾Ð·Ð´Ð°Ñ‚ÑŒ Ð½Ð¾Ð²ÑƒÑŽ Ð¿ÑƒÑÑ‚ÑƒÑŽ Ñ‚Ð°Ð±Ð»Ð¸Ñ†Ñƒ Ñ€Ð°Ð·Ð´ÐµÐ»Ð¾Ð² Ð½Ð° ÑÑ‚Ð¾Ð¼ ÑƒÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð²Ðµ?"
 
 #. Type: boolean
 #. Description
-#: ../partman-base.templates:58 ../partman.templates:65
+#: ../partman-base.templates:58
 msgid ""
 "You have selected an entire device to partition. If you proceed with "
 "creating a new partition table on the device, then all current partitions "
@@ -2295,19 +2213,19 @@
 
 #. Type: boolean
 #. Description
-#: ../partman-base.templates:58 ../partman.templates:65
+#: ../partman-base.templates:58
 msgid "Note that you will be able to undo this operation later if you wish."
 msgstr "ÐŸÑ€Ð¸Ð¼ÐµÑ‡Ð°Ð½Ð¸Ðµ: Ð¿Ñ€Ð¸ Ð¶ÐµÐ»Ð°Ð½Ð¸Ð¸ Ð²Ñ‹ ÑÐ¼Ð¾Ð¶ÐµÑ‚Ðµ Ð¾Ñ‚Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ ÑÑ‚Ð¸ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ."
 
 #. Type: boolean
 #. Description
-#: ../partman-base.templates:68 ../partman.templates:75
+#: ../partman-base.templates:68
 msgid "Write a new empty partition table?"
 msgstr "Ð¡Ð¾Ð·Ð´Ð°Ñ‚ÑŒ Ð½Ð¾Ð²ÑƒÑŽ Ð¿ÑƒÑÑ‚ÑƒÑŽ Ñ‚Ð°Ð±Ð»Ð¸Ñ†Ñƒ Ñ€Ð°Ð·Ð´ÐµÐ»Ð¾Ð²?"
 
 #. Type: boolean
 #. Description
-#: ../partman-base.templates:68 ../partman.templates:75
+#: ../partman-base.templates:68
 msgid ""
 "Because of limitations in the current implementation of the Sun partition "
 "tables in libparted, the newly created partition table has to be written to "
@@ -2318,7 +2236,7 @@
 
 #. Type: boolean
 #. Description
-#: ../partman-base.templates:68 ../partman.templates:75
+#: ../partman-base.templates:68
 msgid ""
 "You will NOT be able to undo this operation later and all existing data on "
 "the disk will be irreversibly removed."
@@ -2328,7 +2246,7 @@
 
 #. Type: boolean
 #. Description
-#: ../partman-base.templates:68 ../partman.templates:75
+#: ../partman-base.templates:68
 msgid ""
 "Confirm whether you actually want to create a new partition table and write "
 "it to disk."
@@ -2338,19 +2256,21 @@
 
 #. Type: boolean
 #. Description
-#: ../partman-base.templates:82 ../partman.templates:89
+#: ../partman-base.templates:82
 msgid "Continue with the installation?"
 msgstr "ÐŸÑ€Ð¾Ð´Ð¾Ð»Ð¶Ð¸Ñ‚ÑŒ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÑƒ?"
 
 #. Type: boolean
 #. Description
-#: ../partman-base.templates:82 ../partman.templates:89
-msgid "No partition table changes and no creation of file systems have been planned."
-msgstr "Ð¢Ð°Ð±Ð»Ð¸Ñ†Ð° Ñ€Ð°Ð·Ð´ÐµÐ»Ð¾Ð² Ð½Ðµ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð° Ð¸ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ðµ Ñ„Ð°Ð¹Ð»Ð¾Ð²Ñ‹Ñ… ÑÐ¸ÑÑ‚ÐµÐ¼ Ð½Ðµ Ð·Ð°Ð¿Ð»Ð°Ð½Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¾."
+#: ../partman-base.templates:82
+msgid ""
+"No partition table changes and no creation of file systems have been planned."
+msgstr ""
+"Ð¢Ð°Ð±Ð»Ð¸Ñ†Ð° Ñ€Ð°Ð·Ð´ÐµÐ»Ð¾Ð² Ð½Ðµ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð° Ð¸ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ðµ Ñ„Ð°Ð¹Ð»Ð¾Ð²Ñ‹Ñ… ÑÐ¸ÑÑ‚ÐµÐ¼ Ð½Ðµ Ð·Ð°Ð¿Ð»Ð°Ð½Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¾."
 
 #. Type: boolean
 #. Description
-#: ../partman-base.templates:82 ../partman.templates:89
+#: ../partman-base.templates:82
 msgid ""
 "If you plan on using already created file systems, be aware that existing "
 "files may prevent the successful installation of the base system."
@@ -2361,7 +2281,7 @@
 
 #. Type: boolean
 #. Description
-#: ../partman-base.templates:91 ../partman.templates:98
+#: ../partman-base.templates:91
 msgid "Write the changes to disks?"
 msgstr "Ð—Ð°Ð¿Ð¸ÑÐ°Ñ‚ÑŒ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð½Ð° Ð´Ð¸ÑÐº?"
 
@@ -2377,7 +2297,7 @@
 
 #. Type: boolean
 #. Description
-#: ../partman-base.templates:91 ../partman.templates:98
+#: ../partman-base.templates:91
 msgid ""
 "WARNING: This will destroy all data on any partitions you have removed as "
 "well as on the partitions that are going to be formatted."
@@ -2389,50 +2309,49 @@
 #. Description
 #: ../partman-base.templates:91 ../partman-md.templates:12
 #: ../partman-lvm.templates:8 ../partman-crypto.templates:126
-#: ../partman.templates:98
 msgid "${ITEMS}"
 msgstr "${ITEMS}"
 
 #. Type: text
 #. Description
-#: ../partman-base.templates:102 ../partman.templates:109
+#: ../partman-base.templates:102
 msgid "The following partitions are going to be formatted:"
 msgstr "Ð¡Ð»ÐµÐ´ÑƒÑŽÑ‰Ð¸Ðµ Ñ€Ð°Ð·Ð´ÐµÐ»Ñ‹ Ð±ÑƒÐ´ÑƒÑ‚ Ð¾Ñ‚Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ñ‹:"
 
 #. Type: text
 #. Description
 #. for example: "partition #6 of IDE0 master as ext3 journaling file system"
-#: ../partman-base.templates:107 ../partman.templates:114
+#: ../partman-base.templates:107
 msgid "partition #${PARTITION} of ${DEVICE} as ${TYPE}"
 msgstr "Ñ€Ð°Ð·Ð´ÐµÐ» #${PARTITION} Ð½Ð° ÑƒÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð²Ðµ ${DEVICE} ÐºÐ°Ðº ${TYPE}"
 
 #. Type: text
 #. Description
-#: ../partman-base.templates:111 ../partman.templates:118
+#: ../partman-base.templates:111
 msgid "The partition tables of the following devices are changed:"
 msgstr "ÐÐ° ÑÑ‚Ð¸Ñ… ÑƒÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð²Ð°Ñ… Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ñ‹ Ñ‚Ð°Ð±Ð»Ð¸Ñ†Ñ‹ Ñ€Ð°Ð·Ð´ÐµÐ»Ð¾Ð²:"
 
 #. Type: select
 #. Description
-#: ../partman-base.templates:116 ../partman.templates:123
+#: ../partman-base.templates:116
 msgid "What to do with this device:"
 msgstr "Ð§Ñ‚Ð¾ Ð´ÐµÐ»Ð°Ñ‚ÑŒ Ñ Ð²Ñ‹Ð±Ñ€Ð°Ð½Ð½Ñ‹Ð¼ ÑƒÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð²Ð¾Ð¼: "
 
 #. Type: select
 #. Description
-#: ../partman-base.templates:121 ../partman.templates:128
+#: ../partman-base.templates:121
 msgid "How to use this free space:"
 msgstr "Ð§Ñ‚Ð¾ Ð´ÐµÐ»Ð°Ñ‚ÑŒ ÑÐ¾ ÑÐ²Ð¾Ð±Ð¾Ð´Ð½Ñ‹Ð¼ Ð¿Ñ€Ð¾ÑÑ‚Ñ€Ð°Ð½ÑÑ‚Ð²Ð¾Ð¼: "
 
 #. Type: select
 #. Description
-#: ../partman-base.templates:126 ../partman.templates:133
+#: ../partman-base.templates:126
 msgid "Partition settings:"
 msgstr "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ Ñ€Ð°Ð·Ð´ÐµÐ»Ð°:"
 
 #. Type: select
 #. Description
-#: ../partman-base.templates:126 ../partman.templates:133
+#: ../partman-base.templates:126
 msgid ""
 "You are editing partition #${PARTITION} of ${DEVICE}. ${OTHERINFO} "
 "${DESTROYED}"
@@ -2442,80 +2361,80 @@
 
 #. Type: text
 #. Description
-#: ../partman-base.templates:131 ../partman.templates:138
+#: ../partman-base.templates:131
 msgid "This partition is formatted with the ${FILESYSTEM}."
 msgstr "ÐÐ° ÑÑ‚Ð¾Ð¼ Ñ€Ð°Ð·Ð´ÐµÐ»Ðµ Ð½Ð°Ñ…Ð¾Ð´Ð¸Ñ‚ÑÑ Ñ„Ð°Ð¹Ð»Ð¾Ð²Ð°Ñ ÑÐ¸ÑÑ‚ÐµÐ¼Ð° Ñ‚Ð¸Ð¿Ð° ${FILESYSTEM}."
 
 #. Type: text
 #. Description
-#: ../partman-base.templates:135 ../partman.templates:142
+#: ../partman-base.templates:135
 msgid "No existing file system was detected in this partition."
 msgstr "ÐÐ° ÑÑ‚Ð¾Ð¼ Ñ€Ð°Ð·Ð´ÐµÐ»Ðµ Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾ Ñ„Ð°Ð¹Ð»Ð¾Ð²Ñ‹Ñ… ÑÐ¸ÑÑ‚ÐµÐ¼."
 
 #. Type: text
 #. Description
-#: ../partman-base.templates:139 ../partman.templates:146
+#: ../partman-base.templates:139
 msgid "All data in it WILL BE DESTROYED!"
 msgstr "Ð’ÑÐµ Ð´Ð°Ð½Ð½Ñ‹Ðµ Ð½Ð° Ð½Ñ‘Ð¼ Ð‘Ð£Ð”Ð£Ð¢ Ð£ÐÐ˜Ð§Ð¢ÐžÐ–Ð•ÐÐ«!"
 
 #. Type: note
 #. Description
-#: ../partman-base.templates:143 ../partman.templates:150
+#: ../partman-base.templates:143
 msgid "The partition starts from ${FROMCHS} and ends at ${TOCHS}."
 msgstr "Ð Ð°Ð·Ð´ÐµÐ» Ð½Ð°Ñ‡Ð¸Ð½Ð°ÐµÑ‚ÑÑ Ñ ${FROMCHS} Ð¸ Ð·Ð°ÐºÐ°Ð½Ñ‡Ð¸Ð²Ð°ÐµÑ‚ÑÑ Ð½Ð° ${TOCHS}."
 
 #. Type: note
 #. Description
-#: ../partman-base.templates:147 ../partman.templates:154
+#: ../partman-base.templates:147
 msgid "The free space starts from ${FROMCHS} and ends at ${TOCHS}."
-msgstr "Ð¡Ð²Ð¾Ð±Ð¾Ð´Ð½Ð¾Ðµ Ð¿Ñ€Ð¾ÑÑ‚Ñ€Ð°Ð½ÑÑ‚Ð²Ð¾ Ð½Ð°Ñ‡Ð¸Ð½Ð°ÐµÑ‚ÑÑ Ñ ${FROMCHS} Ð¸ Ð·Ð°ÐºÐ°Ð½Ñ‡Ð¸Ð²Ð°ÐµÑ‚ÑÑ Ð½Ð° ${TOCHS}."
+msgstr ""
+"Ð¡Ð²Ð¾Ð±Ð¾Ð´Ð½Ð¾Ðµ Ð¿Ñ€Ð¾ÑÑ‚Ñ€Ð°Ð½ÑÑ‚Ð²Ð¾ Ð½Ð°Ñ‡Ð¸Ð½Ð°ÐµÑ‚ÑÑ Ñ ${FROMCHS} Ð¸ Ð·Ð°ÐºÐ°Ð½Ñ‡Ð¸Ð²Ð°ÐµÑ‚ÑÑ Ð½Ð° ${TOCHS}."
 
 #. Type: text
 #. Description
 #: ../partman-base.templates:151 ../partman-auto.templates:3
-#: ../partman.templates:158
 msgid "Please wait..."
 msgstr "ÐŸÐ¾Ð´Ð¾Ð¶Ð´Ð¸Ñ‚Ðµ..."
 
 #. Type: text
 #. Description
-#: ../partman-base.templates:155 ../partman.templates:162
+#: ../partman-base.templates:155
 msgid "Partitions formatting"
 msgstr "Ð¤Ð¾Ñ€Ð¼Ð°Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ðµ Ñ€Ð°Ð·Ð´ÐµÐ»Ð¾Ð²"
 
 #. Type: text
 #. Description
-#: ../partman-base.templates:159 ../partman.templates:166
+#: ../partman-base.templates:159
 msgid "Processing..."
 msgstr "ÐžÐ±Ñ€Ð°Ð±Ð¾Ñ‚ÐºÐ°..."
 
 #. Type: text
 #. Description
-#: ../partman-base.templates:171 ../partman.templates:178
+#: ../partman-base.templates:171
 msgid "Done setting up the partition"
 msgstr "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ° Ñ€Ð°Ð·Ð´ÐµÐ»Ð° Ð·Ð°ÐºÐ¾Ð½Ñ‡ÐµÐ½Ð°"
 
 #. Type: text
 #. Description
-#: ../partman-base.templates:175 ../partman.templates:182
+#: ../partman-base.templates:175
 msgid "Finish partitioning and write changes to disk"
 msgstr "Ð—Ð°ÐºÐ¾Ð½Ñ‡Ð¸Ñ‚ÑŒ Ñ€Ð°Ð·Ð¼ÐµÑ‚ÐºÑƒ Ð¸ Ð·Ð°Ð¿Ð¸ÑÐ°Ñ‚ÑŒ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð½Ð° Ð´Ð¸ÑÐº"
 
 #. Type: text
 #. Description
-#: ../partman-base.templates:179 ../partman.templates:186
+#: ../partman-base.templates:179
 msgid "Undo changes to partitions"
 msgstr "ÐžÑ‚Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ñ€Ð°Ð·Ð´ÐµÐ»Ð¾Ð²"
 
 #. Type: text
 #. Description
-#: ../partman-base.templates:183 ../partman.templates:190
+#: ../partman-base.templates:183
 msgid "Show Cylinder/Head/Sector information"
 msgstr "ÐŸÐ¾ÐºÐ°Ð·Ð°Ñ‚ÑŒ Ð³ÐµÐ¾Ð¼ÐµÑ‚Ñ€Ð¸ÑŽ Ð´Ð¸ÑÐºÐ° (C/H/S)"
 
 #. Type: text
 #. Description
-#: ../partman-base.templates:187 ../partman.templates:194
+#: ../partman-base.templates:187
 #, no-c-format
 msgid "Dump partition info in %s"
 msgstr "Ð¡Ð¾Ñ…Ñ€Ð°Ð½Ð¸Ñ‚ÑŒ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸ÑŽ Ð¾ Ñ€Ð°Ð·Ð´ÐµÐ»Ðµ Ð² %s"
@@ -2523,35 +2442,35 @@
 #. Type: text
 #. Description
 #. Keep short
-#: ../partman-base.templates:192 ../partman.templates:199
+#: ../partman-base.templates:192
 msgid "FREE SPACE"
 msgstr "Ð¡Ð’ÐžÐ‘ÐžÐ”ÐÐžÐ• ÐœÐ•Ð¡Ð¢Ðž"
 
 #. Type: text
 #. Description
 #. "unusable free space".  No more than 8 symbols.
-#: ../partman-base.templates:197 ../partman.templates:204
+#: ../partman-base.templates:197
 msgid "unusable"
 msgstr "Ð½ÐµÐ¸ÑÐ¿Ð¾Ð»."
 
 #. Type: text
 #. Description
 #. "primary partition".  No more than 8 symbols.
-#: ../partman-base.templates:202 ../partman.templates:209
+#: ../partman-base.templates:202
 msgid "primary"
 msgstr "Ð¿ÐµÑ€Ð²Ð¸Ñ‡Ð½."
 
 #. Type: text
 #. Description
 #. "logical partition".  No more than 8 symbols.
-#: ../partman-base.templates:207 ../partman.templates:214
+#: ../partman-base.templates:207
 msgid "logical"
 msgstr "Ð»Ð¾Ð³Ð¸Ñ‡ÐµÑ."
 
 #. Type: text
 #. Description
 #. "primary or logical".  No more than 8 symbols.
-#: ../partman-base.templates:212 ../partman.templates:219
+#: ../partman-base.templates:212
 msgid "pri/log"
 msgstr "Ð¿ÐµÑ€Ð²/Ð»Ð¾Ð³"
 
@@ -2562,7 +2481,7 @@
 #. %s.
 #. No %s
 #. N. %s
-#: ../partman-base.templates:221 ../partman.templates:228
+#: ../partman-base.templates:221
 #, no-c-format
 msgid "#%s"
 msgstr "#%s"
@@ -2570,7 +2489,7 @@
 #. Type: text
 #. Description
 #. For example IDE0 master (hda)
-#: ../partman-base.templates:226 ../partman.templates:233
+#: ../partman-base.templates:226
 #, no-c-format
 msgid "IDE%s master (%s)"
 msgstr "ÐžÑÐ½Ð¾Ð²Ð½Ð¾Ð¹ Ð´Ð¸ÑÐº IDE%s (%s)"
@@ -2578,7 +2497,7 @@
 #. Type: text
 #. Description
 #. For example IDE1 slave (hdd)
-#: ../partman-base.templates:231 ../partman.templates:238
+#: ../partman-base.templates:231
 #, no-c-format
 msgid "IDE%s slave (%s)"
 msgstr "ÐŸÐ¾Ð´Ñ‡Ð¸Ð½Ñ‘Ð½Ð½Ñ‹Ð¹ Ð´Ð¸ÑÐº IDE%s (%s)"
@@ -2586,7 +2505,7 @@
 #. Type: text
 #. Description
 #. For example IDE1 master, partition #5 (hdc5)
-#: ../partman-base.templates:236 ../partman.templates:243
+#: ../partman-base.templates:236
 #, no-c-format
 msgid "IDE%s master, partition #%s (%s)"
 msgstr "ÐžÑÐ½Ð¾Ð²Ð½Ð¾Ð¹ Ð´Ð¸ÑÐº IDE%s, Ñ€Ð°Ð·Ð´ÐµÐ» #%s (%s)"
@@ -2594,35 +2513,35 @@
 #. Type: text
 #. Description
 #. For example IDE2 slave, partition #5 (hdf5)
-#: ../partman-base.templates:241 ../partman.templates:248
+#: ../partman-base.templates:241
 #, no-c-format
 msgid "IDE%s slave, partition #%s (%s)"
 msgstr "ÐŸÐ¾Ð´Ñ‡Ð¸Ð½ÐµÐ½Ð½Ñ‹Ð¹ Ð´Ð¸ÑÐº IDE%s, Ñ€Ð°Ð·Ð´ÐµÐ» #%s (%s)"
 
 #. Type: text
 #. Description
-#: ../partman-base.templates:245 ../partman.templates:252
+#: ../partman-base.templates:245
 #, no-c-format
 msgid "SCSI%s (%s,%s,%s) (%s)"
 msgstr "SCSI%s (%s,%s,%s) (%s)"
 
 #. Type: text
 #. Description
-#: ../partman-base.templates:249 ../partman.templates:256
+#: ../partman-base.templates:249
 #, no-c-format
 msgid "SCSI%s (%s,%s,%s), partition #%s (%s)"
 msgstr "SCSI%s (%s,%s,%s), Ñ€Ð°Ð·Ð´ÐµÐ» #%s (%s)"
 
 #. Type: text
 #. Description
-#: ../partman-base.templates:253 ../partman.templates:260
+#: ../partman-base.templates:253
 #, no-c-format
 msgid "RAID%s device #%s"
 msgstr "RAID%s ÑƒÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð²Ð¾ #%s"
 
 #. Type: text
 #. Description
-#: ../partman-base.templates:257 ../partman.templates:264
+#: ../partman-base.templates:257
 #, no-c-format
 msgid "LVM VG %s, LV %s"
 msgstr "LVM VG %s, LV %s"
@@ -2636,14 +2555,14 @@
 
 #. Type: text
 #. Description
-#: ../partman-base.templates:265 ../partman.templates:268
+#: ../partman-base.templates:265
 msgid "Cancel this menu"
 msgstr "ÐžÑ‚Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ ÑÑ‚Ð¾ Ð¼ÐµÐ½ÑŽ"
 
 #. Type: text
 #. Description
 #. Main menu entry
-#: ../partman-base.templates:270 ../partman.templates:273
+#: ../partman-base.templates:270
 msgid "Partition disks"
 msgstr "Ð Ð°Ð·Ð¼ÐµÑ‚ÐºÐ° Ð´Ð¸ÑÐºÐ¾Ð²"
 
@@ -2740,107 +2659,75 @@
 "Ð¿Ñ€Ð¾ÑÑ‚Ñ€Ð°Ð½ÑÑ‚Ð²Ð¾ Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ. Ð¡ÐºÐ¾Ñ€ÐµÐµ Ð²ÑÐµÐ³Ð¾, Ð² Ñ‚Ð°Ð±Ð»Ð¸Ñ†Ðµ Ñ€Ð°Ð·Ð´ÐµÐ»Ð¾Ð² ÑÐ»Ð¸ÑˆÐºÐ¾Ð¼ "
 "Ð¼Ð½Ð¾Ð³Ð¾ (Ð¿ÐµÑ€Ð²Ð¸Ñ‡Ð½Ñ‹Ñ…) Ñ€Ð°Ð·Ð´ÐµÐ»Ð¾Ð²."
 
-#. #-#-#-#-#  template.pot (debian-installer)  #-#-#-#-#
 #. Type: text
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
-#. #-#-#-#-#  template.pot (debian-installer)  #-#-#-#-#
-#. Type: text
-#. Description
-#: ../partman-auto.templates:68 ../partman-auto.templates:67
+#: ../partman-auto.templates:68
 msgid "Guided partitioning"
 msgstr "ÐÐ²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡ÐµÑÐºÐ°Ñ Ñ€Ð°Ð·Ð¼ÐµÑ‚ÐºÐ°"
 
-#. #-#-#-#-#  template.pot (debian-installer)  #-#-#-#-#
 #. Type: text
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
-#. #-#-#-#-#  template.pot (debian-installer)  #-#-#-#-#
-#. Type: text
-#. Description
-#: ../partman-auto.templates:73 ../partman-auto.templates:71
+#: ../partman-auto.templates:73
 msgid "Use the largest continuous free space"
 msgstr "Ð˜ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ ÑÐ°Ð¼Ð¾Ðµ Ð±Ð¾Ð»ÑŒÑˆÐ¾Ðµ Ð½ÐµÐ¿Ñ€ÐµÑ€Ñ‹Ð²Ð½Ð¾Ðµ ÑÐ²Ð¾Ð±Ð¾Ð´Ð½Ð¾Ðµ Ð¼ÐµÑÑ‚Ð¾"
 
-#. #-#-#-#-#  template.pot (debian-installer)  #-#-#-#-#
 #. Type: text
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #. The string replacing ${DEVICE} may be very long, so make your translation
 #. as short as possible and keep the variable AT THE END
 #. for example "Erase entire disk: IDE0 master - Maxtor 46L489"
-#. #-#-#-#-#  template.pot (debian-installer)  #-#-#-#-#
-#. Type: text
-#. Description
-#. for example "Erase entire disk: IDE0 master - Maxtor 46L489"
-#: ../partman-auto.templates:81 ../partman-auto.templates:76
+#: ../partman-auto.templates:81
 msgid "Erase entire disk: ${DEVICE}"
 msgstr "Ð¡Ñ‚ÐµÑ€ÐµÑ‚ÑŒ Ð²ÐµÑÑŒ Ð´Ð¸ÑÐº: ${DEVICE}"
 
-#. #-#-#-#-#  template.pot (debian-installer)  #-#-#-#-#
 #. Type: text
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
-#. #-#-#-#-#  template.pot (debian-installer)  #-#-#-#-#
-#. Type: text
-#. Description
-#: ../partman-auto.templates:86 ../partman-auto.templates:80
+#: ../partman-auto.templates:86
 msgid "Manually edit partition table"
 msgstr "Ð˜Ð·Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ Ñ‚Ð°Ð±Ð»Ð¸Ñ†Ñƒ Ñ€Ð°Ð·Ð´ÐµÐ»Ð¾Ð² Ð²Ñ€ÑƒÑ‡Ð½ÑƒÑŽ"
 
-#. #-#-#-#-#  template.pot (debian-installer)  #-#-#-#-#
 #. Type: text
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
-#. #-#-#-#-#  template.pot (debian-installer)  #-#-#-#-#
-#. Type: text
-#. Description
-#: ../partman-auto.templates:91 ../partman-auto.templates:84
+#: ../partman-auto.templates:91
 msgid "Automatically partition the free space"
 msgstr "ÐÐ²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡ÐµÑÐºÐ¸ Ñ€Ð°Ð·Ð¼ÐµÑ‚Ð¸Ñ‚ÑŒ ÑÐ²Ð¾Ð±Ð¾Ð´Ð½Ð¾Ðµ Ð¼ÐµÑÑ‚Ð¾"
 
-#. #-#-#-#-#  template.pot (debian-installer)  #-#-#-#-#
 #. Type: text
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
-#. #-#-#-#-#  template.pot (debian-installer)  #-#-#-#-#
-#. Type: text
-#. Description
-#: ../partman-auto.templates:96 ../partman-auto.templates:88
+#: ../partman-auto.templates:96
 msgid "All files in one partition (recommended for new users)"
 msgstr "Ð’ÑÐµ Ñ„Ð°Ð¹Ð»Ñ‹ Ð² Ð¾Ð´Ð½Ð¾Ð¼ Ñ€Ð°Ð·Ð´ÐµÐ»Ðµ (Ñ€ÐµÐºÐ¾Ð¼ÐµÐ½Ð´ÑƒÐµÑ‚ÑÑ Ð´Ð»Ñ Ð½Ð¾Ð²Ñ‹Ñ… Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹)"
 
-#. #-#-#-#-#  template.pot (debian-installer)  #-#-#-#-#
 #. Type: text
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
-#. #-#-#-#-#  template.pot (debian-installer)  #-#-#-#-#
-#. Type: text
-#. Description
-#: ../partman-auto.templates:101 ../partman-auto.templates:92
-msgid "Desktop machine"
-msgstr "ÐÐ°ÑÑ‚Ð¾Ð»ÑŒÐ½Ð°Ñ Ð¼Ð°ÑˆÐ¸Ð½Ð°"
+#: ../partman-auto.templates:101
+#, fuzzy
+msgid "Separate /home partition"
+msgstr "Ð¾Ñ‚Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ñ€Ð°Ð·Ð´ÐµÐ»"
 
-#. #-#-#-#-#  template.pot (debian-installer)  #-#-#-#-#
 #. Type: text
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
-#. #-#-#-#-#  template.pot (debian-installer)  #-#-#-#-#
-#. Type: text
-#. Description
-#: ../partman-auto.templates:106 ../partman-auto.templates:96
-msgid "Multi-user workstation"
-msgstr "ÐœÐ½Ð¾Ð³Ð¾Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒÑÐºÐ°Ñ ÑÐ¸ÑÑ‚ÐµÐ¼Ð°"
+#: ../partman-auto.templates:106
+msgid "Separate /home, /usr, /var, and /tmp partitions"
+msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../partman-basicmethods.templates:3 ../templates:3
+#: ../partman-basicmethods.templates:3
 msgid "Go back to the menu?"
 msgstr "Ð’ÐµÑ€Ð½ÑƒÑ‚ÑŒÑÑ Ð½Ð°Ð·Ð°Ð´ Ð² Ð¼ÐµÐ½ÑŽ?"
 
 #. Type: boolean
 #. Description
-#: ../partman-basicmethods.templates:3 ../templates:3
+#: ../partman-basicmethods.templates:3
 msgid "No file system is specified for partition #${PARTITION} of ${DEVICE}."
 msgstr ""
 "ÐÐµ ÑƒÐºÐ°Ð·Ð°Ð½Ð¾ Ñ„Ð°Ð¹Ð»Ð¾Ð²Ð¾Ð¹ ÑÐ¸ÑÑ‚ÐµÐ¼Ñ‹ Ð´Ð»Ñ Ñ€Ð°Ð·Ð´ÐµÐ»Ð° #${PARTITION} Ð½Ð° ÑƒÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð²Ðµ "
@@ -2848,7 +2735,7 @@
 
 #. Type: boolean
 #. Description
-#: ../partman-basicmethods.templates:3 ../templates:3
+#: ../partman-basicmethods.templates:3
 msgid ""
 "If you do not go back to the partitioning menu and assign a file system to "
 "this partition, it won't be used at all."
@@ -2858,65 +2745,65 @@
 
 #. Type: text
 #. Description
-#: ../partman-basicmethods.templates:11 ../templates:11
+#: ../partman-basicmethods.templates:11
 msgid "do not use the partition"
 msgstr "Ð½Ðµ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ Ñ€Ð°Ð·Ð´ÐµÐ»"
 
 #. Type: text
 #. Description
 #. up to 25 character positions
-#: ../partman-basicmethods.templates:16 ../templates:16
+#: ../partman-basicmethods.templates:16
 msgid "Format the partition:"
 msgstr "Ð¤Ð¾Ñ€Ð¼Ð°Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ñ€Ð°Ð·Ð´ÐµÐ»"
 
 #. Type: text
 #. Description
-#: ../partman-basicmethods.templates:20 ../templates:20
+#: ../partman-basicmethods.templates:20
 msgid "yes, format it"
 msgstr "Ð´Ð°, Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ"
 
 #. Type: text
 #. Description
-#: ../partman-basicmethods.templates:24 ../templates:24
+#: ../partman-basicmethods.templates:24
 msgid "no, keep existing data"
 msgstr "Ð½ÐµÑ‚, ÑÐ¾Ñ…Ñ€Ð°Ð½Ð¸Ñ‚ÑŒ ÑÑƒÑ‰ÐµÑÑ‚Ð²ÑƒÑŽÑ‰Ð¸Ðµ Ð´Ð°Ð½Ð½Ñ‹Ðµ"
 
 #. Type: text
 #. Description
-#: ../partman-basicmethods.templates:28 ../templates:28
+#: ../partman-basicmethods.templates:28
 msgid "do not use"
 msgstr "Ð½Ðµ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ"
 
 #. Type: text
 #. Description
 #. short variant of `do not use the partition'
-#: ../partman-basicmethods.templates:33 ../templates:33
+#: ../partman-basicmethods.templates:33
 msgid "unused"
 msgstr "Ð½Ðµ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐµÑ‚ÑÑ"
 
 #. Type: text
 #. Description
-#: ../partman-basicmethods.templates:37 ../templates:37
+#: ../partman-basicmethods.templates:37
 msgid "format the partition"
 msgstr "Ð¾Ñ‚Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ñ€Ð°Ð·Ð´ÐµÐ»"
 
 #. Type: text
 #. Description
 #. short variant of `format the partition'
-#: ../partman-basicmethods.templates:42 ../templates:42
+#: ../partman-basicmethods.templates:42
 msgid "format"
 msgstr "Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ"
 
 #. Type: text
 #. Description
-#: ../partman-basicmethods.templates:46 ../templates:46
+#: ../partman-basicmethods.templates:46
 msgid "keep and use the existing data"
 msgstr "ÑÐ¾Ñ…Ñ€Ð°Ð½Ð¸Ñ‚ÑŒ Ð¸ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ ÑÑƒÑ‰ÐµÑÑ‚Ð²ÑƒÑŽÑ‰Ð¸Ðµ Ð´Ð°Ð½Ð½Ñ‹Ðµ"
 
 #. Type: text
 #. Description
 #. short variant of `keep and use the existing format'
-#: ../partman-basicmethods.templates:51 ../templates:51
+#: ../partman-basicmethods.templates:51
 msgid "keep"
 msgstr "Ð¾ÑÑ‚Ð°Ð²Ð¸Ñ‚ÑŒ"
 
@@ -3006,7 +2893,8 @@
 msgid ""
 "Before the resize operation takes place, the changes have to be written to "
 "disk."
-msgstr "ÐŸÐµÑ€ÐµÐ´ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸ÐµÐ¼ Ñ€Ð°Ð·Ð¼ÐµÑ€Ð° Ñ€Ð°Ð·Ð´ÐµÐ»Ð¾Ð², Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð´Ð¾Ð»Ð¶Ð½Ñ‹ Ð±Ñ‹Ñ‚ÑŒ Ð·Ð°Ð¿Ð¸ÑÐ°Ð½Ñ‹ Ð½Ð° Ð´Ð¸ÑÐº."
+msgstr ""
+"ÐŸÐµÑ€ÐµÐ´ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸ÐµÐ¼ Ñ€Ð°Ð·Ð¼ÐµÑ€Ð° Ñ€Ð°Ð·Ð´ÐµÐ»Ð¾Ð², Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð´Ð¾Ð»Ð¶Ð½Ñ‹ Ð±Ñ‹Ñ‚ÑŒ Ð·Ð°Ð¿Ð¸ÑÐ°Ð½Ñ‹ Ð½Ð° Ð´Ð¸ÑÐº."
 
 #. Type: boolean
 #. Description
@@ -3230,7 +3118,8 @@
 #. Type: text
 #. Description
 #: ../partman-basicfilesystems.templates:3
-msgid "Checking the ${TYPE} file system in partition #${PARTITION} of ${DEVICE}..."
+msgid ""
+"Checking the ${TYPE} file system in partition #${PARTITION} of ${DEVICE}..."
 msgstr ""
 "ÐŸÑ€Ð¾Ð²ÐµÑ€ÐºÐ° Ñ„Ð°Ð¹Ð»Ð¾Ð²Ð¾Ð¹ ÑÐ¸ÑÑ‚ÐµÐ¼Ñ‹ ${TYPE} Ð½Ð° Ñ€Ð°Ð·Ð´ÐµÐ»Ðµ #${PARTITION} ÑƒÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð²Ð° "
 "${DEVICE}..."
@@ -3239,7 +3128,8 @@
 #. Description
 #: ../partman-basicfilesystems.templates:7
 msgid "Checking the swap space in partition #${PARTITION} of ${DEVICE}..."
-msgstr "ÐŸÑ€Ð¾Ð²ÐµÑ€ÐºÐ° Ñ€Ð°Ð·Ð´ÐµÐ»Ð° Ð¿Ð¾Ð´ÐºÐ°Ñ‡ÐºÐ¸ (Ñ€Ð°Ð·Ð´ÐµÐ» #${PARTITION} ÑƒÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð²Ð° ${DEVICE})..."
+msgstr ""
+"ÐŸÑ€Ð¾Ð²ÐµÑ€ÐºÐ° Ñ€Ð°Ð·Ð´ÐµÐ»Ð° Ð¿Ð¾Ð´ÐºÐ°Ñ‡ÐºÐ¸ (Ñ€Ð°Ð·Ð´ÐµÐ» #${PARTITION} ÑƒÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð²Ð° ${DEVICE})..."
 
 #. Type: text
 #. Description
@@ -3263,7 +3153,8 @@
 #. Description
 #: ../partman-basicfilesystems.templates:19
 msgid "Formatting swap space in partition #${PARTITION} of ${DEVICE}..."
-msgstr "Ð¡Ð¾Ð·Ð´Ð°Ð½Ð¸Ðµ Ñ€Ð°Ð·Ð´ÐµÐ»Ð° Ð¿Ð¾Ð´ÐºÐ°Ñ‡ÐºÐ¸ Ð² Ñ€Ð°Ð·Ð´ÐµÐ»Ðµ #${PARTITION} ÑƒÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð²Ð° ${DEVICE}..."
+msgstr ""
+"Ð¡Ð¾Ð·Ð´Ð°Ð½Ð¸Ðµ Ñ€Ð°Ð·Ð´ÐµÐ»Ð° Ð¿Ð¾Ð´ÐºÐ°Ñ‡ÐºÐ¸ Ð² Ñ€Ð°Ð·Ð´ÐµÐ»Ðµ #${PARTITION} ÑƒÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð²Ð° ${DEVICE}..."
 
 #. Type: boolean
 #. Description
@@ -3279,7 +3170,7 @@
 #. Description
 #: ../partman-basicfilesystems.templates:32 ../partman-ext3.templates:7
 #: ../partman-reiserfs.templates:7 ../partman-jfs.templates:7
-#: ../partman-xfs.templates:7 ../partman-ext2r0.templates:7 ../templates:7
+#: ../partman-xfs.templates:7 ../partman-ext2r0.templates:7
 msgid "Go back to the menu and correct errors?"
 msgstr "Ð’ÐµÑ€Ð½ÑƒÑ‚ÑŒÑÑ Ð² Ð¼ÐµÐ½ÑŽ Ð¸ Ð¸ÑÐ¿Ñ€Ð°Ð²Ð¸Ñ‚ÑŒ Ð¾ÑˆÐ¸Ð±ÐºÐ¸?"
 
@@ -3334,14 +3225,12 @@
 #: ../partman-basicfilesystems.templates:53 ../partman-ext3.templates:16
 #: ../partman-reiserfs.templates:16 ../partman-jfs.templates:16
 #: ../partman-xfs.templates:16 ../partman-ext2r0.templates:16
-#: ../partman-basicfilesystems.templates:41 ../templates:16
 msgid "Failed to create a file system"
 msgstr "ÐÐµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ ÑÐ¾Ð·Ð´Ð°Ñ‚ÑŒ Ñ„Ð°Ð¹Ð»Ð¾Ð²ÑƒÑŽ ÑÐ¸ÑÑ‚ÐµÐ¼Ñƒ"
 
 #. Type: error
 #. Description
 #: ../partman-basicfilesystems.templates:53
-#: ../partman-basicfilesystems.templates:41
 msgid ""
 "The ${TYPE} file system creation in partition #${PARTITION} of ${DEVICE} "
 "failed."
@@ -3352,30 +3241,28 @@
 #. Type: error
 #. Description
 #: ../partman-basicfilesystems.templates:59
-#: ../partman-basicfilesystems.templates:47
 msgid "Failed to create a swap space"
 msgstr "ÐÐµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ ÑÐ¾Ð·Ð´Ð°Ñ‚ÑŒ Ñ€Ð°Ð·Ð´ÐµÐ» Ð¿Ð¾Ð´ÐºÐ°Ñ‡ÐºÐ¸"
 
 #. Type: error
 #. Description
 #: ../partman-basicfilesystems.templates:59
-#: ../partman-basicfilesystems.templates:47
-msgid "The creation of swap space in partition #${PARTITION} of ${DEVICE} failed."
-msgstr "ÐÐµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ ÑÐ¾Ð·Ð´Ð°Ñ‚ÑŒ Ñ€Ð°Ð·Ð´ÐµÐ» Ð¿Ð¾Ð´ÐºÐ°Ñ‡ÐºÐ¸ #${PARTITION} Ð½Ð° ÑƒÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð²Ðµ ${DEVICE}."
+msgid ""
+"The creation of swap space in partition #${PARTITION} of ${DEVICE} failed."
+msgstr ""
+"ÐÐµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ ÑÐ¾Ð·Ð´Ð°Ñ‚ÑŒ Ñ€Ð°Ð·Ð´ÐµÐ» Ð¿Ð¾Ð´ÐºÐ°Ñ‡ÐºÐ¸ #${PARTITION} Ð½Ð° ÑƒÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð²Ðµ ${DEVICE}."
 
 #. Type: boolean
 #. Description
 #: ../partman-basicfilesystems.templates:64 ../partman-ext3.templates:22
 #: ../partman-reiserfs.templates:22 ../partman-jfs.templates:22
 #: ../partman-xfs.templates:22 ../partman-ext2r0.templates:22
-#: ../partman-basicfilesystems.templates:52 ../templates:22
 msgid "Do you want to return to the partitioning menu?"
 msgstr "Ð¥Ð¾Ñ‚Ð¸Ñ‚Ðµ Ð²ÐµÑ€Ð½ÑƒÑ‚ÑŒÑÑ Ð² Ð¼ÐµÐ½ÑŽ Ñ€Ð°Ð·Ð¼ÐµÑ‚ÐºÐ¸?"
 
 #. Type: boolean
 #. Description
 #: ../partman-basicfilesystems.templates:64
-#: ../partman-basicfilesystems.templates:52
 msgid ""
 "No mount point is assigned for ${FILESYSTEM} file system in partition #"
 "${PARTITION} of ${DEVICE}."
@@ -3388,7 +3275,6 @@
 #: ../partman-basicfilesystems.templates:64 ../partman-ext3.templates:22
 #: ../partman-reiserfs.templates:22 ../partman-jfs.templates:22
 #: ../partman-xfs.templates:22 ../partman-ext2r0.templates:22
-#: ../partman-basicfilesystems.templates:52 ../templates:22
 msgid ""
 "If you do not go back to the partitioning menu and assign a mount point from "
 "there, this partition will not be used at all."
@@ -3414,129 +3300,108 @@
 "${MOUNTPOINT}, Ñ‚Ð°Ðº ÐºÐ°Ðº Ð¾Ð½Ð° Ð½Ðµ ÑÐ²Ð»ÑÐµÑ‚ÑÑ Ð¿Ð¾Ð»Ð½Ð¾Ñ„ÑƒÐ½ÐºÑ†Ð¸Ð¾Ð½Ð°Ð»ÑŒÐ½Ð¾Ð¹ Ñ„Ð°Ð¹Ð»Ð¾Ð²Ð¾Ð¹ ÑÐ¸ÑÑ‚ÐµÐ¼Ð¾Ð¹ "
 "Unix. Ð’Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ Ð´Ñ€ÑƒÐ³ÑƒÑŽ Ñ„Ð°Ð¹Ð»Ð¾Ð²ÑƒÑŽ ÑÐ¸ÑÑ‚ÐµÐ¼Ñƒ, Ð½Ð°Ð¿Ñ€Ð¸Ð¼ÐµÑ€ ${EXT2}."
 
-#. #-#-#-#-#  template.pot (debian-installer)  #-#-#-#-#
 #. Type: select
 #. Choices
 #. Note to translators : Please keep your translations of the choices
 #. below a 65 columns limit (which means 65 characters
 #. in single-byte languages) including the initial path
-#. #-#-#-#-#  template.pot (debian-installer)  #-#-#-#-#
-#. Type: select
-#. Choices
 #: ../partman-basicfilesystems.templates:83
-#: ../partman-basicfilesystems.templates:61
 msgid "/ - the root file system"
 msgstr "/ -- ÐºÐ¾Ñ€Ð½ÐµÐ²Ð°Ñ Ñ„Ð°Ð¹Ð»Ð¾Ð²Ð°Ñ ÑÐ¸ÑÑ‚ÐµÐ¼Ð° (root file system)"
 
 #. Type: select
 #. Choices
 #: ../partman-basicfilesystems.templates:83
-#: ../partman-basicfilesystems.templates:61
 msgid "/boot - static files of the boot loader"
 msgstr "/boot -- ÑÑ‚Ð°Ñ‚Ð¸Ñ‡ÐµÑÐºÐ¸Ðµ Ñ„Ð°Ð¹Ð»Ñ‹ ÑÐ¸ÑÑ‚ÐµÐ¼Ð½Ð¾Ð³Ð¾ Ð·Ð°Ð³Ñ€ÑƒÐ·Ñ‡Ð¸ÐºÐ°"
 
 #. Type: select
 #. Choices
 #: ../partman-basicfilesystems.templates:83
-#: ../partman-basicfilesystems.templates:61
 msgid "/home - user home directories"
 msgstr "/home -- Ð´Ð¾Ð¼Ð°ÑˆÐ½Ð¸Ðµ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³Ð¸ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹"
 
 #. Type: select
 #. Choices
 #: ../partman-basicfilesystems.templates:83
-#: ../partman-basicfilesystems.templates:61
 msgid "/tmp - temporary files"
 msgstr "/tmp -- Ð²Ñ€ÐµÐ¼ÐµÐ½Ð½Ñ‹Ðµ Ñ„Ð°Ð¹Ð»Ñ‹"
 
 #. Type: select
 #. Choices
 #: ../partman-basicfilesystems.templates:83
-#: ../partman-basicfilesystems.templates:61
 msgid "/usr - static data"
 msgstr "/usr -- ÑÑ‚Ð°Ñ‚Ð¸Ñ‡Ð½Ñ‹Ðµ Ð´Ð°Ð½Ð½Ñ‹Ðµ"
 
 #. Type: select
 #. Choices
 #: ../partman-basicfilesystems.templates:83
-#: ../partman-basicfilesystems.templates:61
 msgid "/var - variable data"
 msgstr "/var -- Ð¸Ð·Ð¼ÐµÐ½ÑÐµÐ¼Ñ‹Ðµ Ð´Ð°Ð½Ð½Ñ‹Ðµ"
 
 #. Type: select
 #. Choices
 #: ../partman-basicfilesystems.templates:83
-#: ../partman-basicfilesystems.templates:61
 msgid "/srv - data for services provided by this system"
 msgstr "/srv -- Ð´Ð°Ð½Ð½Ñ‹Ðµ ÑÐµÑ€Ð²Ð¸ÑÐ¾Ð², Ð¿Ñ€ÐµÐ´Ð¾ÑÑ‚Ð°Ð²Ð»ÑÐµÐ¼Ñ‹Ñ… ÑÐ¸ÑÑ‚ÐµÐ¼Ð¾Ð¹"
 
 #. Type: select
 #. Choices
 #: ../partman-basicfilesystems.templates:83
-#: ../partman-basicfilesystems.templates:61
 msgid "/opt - add-on application software packages"
 msgstr "/opt -- Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ñ‹Ðµ Ð¿Ð°ÐºÐµÑ‚Ñ‹ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð½Ð¾Ð³Ð¾ Ð¾Ð±ÐµÑÐ¿ÐµÑ‡ÐµÐ½Ð¸Ñ"
 
 #. Type: select
 #. Choices
 #: ../partman-basicfilesystems.templates:83
-#: ../partman-basicfilesystems.templates:61
 msgid "/usr/local - local hierarchy"
 msgstr "/usr/local -- Ð»Ð¾ÐºÐ°Ð»ÑŒÐ½Ñ‹Ðµ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³Ð¸"
 
 #. Type: select
 #. Choices
 #: ../partman-basicfilesystems.templates:88
-#: ../partman-basicfilesystems.templates:66
 msgid "/dos"
 msgstr "/dos"
 
 #. Type: select
 #. Choices
 #: ../partman-basicfilesystems.templates:88
-#: ../partman-basicfilesystems.templates:66
 msgid "/windows"
 msgstr "/windows"
 
 #. Type: select
 #. Choices
 #: ../partman-basicfilesystems.templates:88
-#: ../partman-basicfilesystems.templates:66
 msgid "Enter manually"
 msgstr "Ð’Ð²ÐµÑÑ‚Ð¸ Ð²Ñ€ÑƒÑ‡Ð½ÑƒÑŽ"
 
 #. Type: select
 #. Choices
 #: ../partman-basicfilesystems.templates:88
-#: ../partman-basicfilesystems.templates:66
 msgid "Do not mount it"
 msgstr "ÐÐµ Ð¼Ð¾Ð½Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ ÑÑ‚Ð¾Ñ‚ Ñ€Ð°Ð·Ð´ÐµÐ»"
 
 #. Type: string
 #. Description
 #: ../partman-basicfilesystems.templates:93 ../partman-ext2r0.templates:36
-#: ../partman-basicfilesystems.templates:71 ../templates:36
 msgid "Mount point for this partition:"
 msgstr "Ð¢Ð¾Ñ‡ÐºÐ° Ð¼Ð¾Ð½Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ ÑÑ‚Ð¾Ð³Ð¾ Ñ€Ð°Ð·Ð´ÐµÐ»Ð°:"
 
 #. Type: error
 #. Description
 #: ../partman-basicfilesystems.templates:97 ../partman-ext2r0.templates:40
-#: ../partman-basicfilesystems.templates:75 ../templates:40
 msgid "Invalid mount point"
 msgstr "ÐÐµÐ²ÐµÑ€Ð½Ð°Ñ Ñ‚Ð¾Ñ‡ÐºÐ° Ð¼Ð¾Ð½Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ"
 
 #. Type: error
 #. Description
 #: ../partman-basicfilesystems.templates:97 ../partman-ext2r0.templates:40
-#: ../partman-basicfilesystems.templates:75 ../templates:40
 msgid "The mount point you entered is invalid."
 msgstr "Ð£ÐºÐ°Ð·Ð°Ð½Ð½Ð°Ñ Ð²Ð°Ð¼Ð¸ Ñ‚Ð¾Ñ‡ÐºÐ° Ð¼Ð¾Ð½Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ‚ Ð±Ñ‹Ñ‚ÑŒ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð°."
 
 #. Type: error
 #. Description
 #: ../partman-basicfilesystems.templates:97 ../partman-ext2r0.templates:40
-#: ../partman-basicfilesystems.templates:75 ../templates:40
 msgid "Mount points must start with \"/\". They cannot contain spaces."
 msgstr ""
 "Ð¢Ð¾Ñ‡ÐºÐ¸ Ð¼Ð¾Ð½Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð´Ð¾Ð»Ð¶Ð½Ñ‹ Ð½Ð°Ñ‡Ð¸Ð½Ð°Ñ‚ÑŒÑÑ Ñ ÑÐ¸Ð¼Ð²Ð¾Ð»Ð° \"/\". ÐžÐ½Ð¸ Ð½Ðµ Ð¼Ð¾Ð³ÑƒÑ‚ ÑÐ¾Ð´ÐµÑ€Ð¶Ð°Ñ‚ÑŒ "
@@ -3545,14 +3410,12 @@
 #. Type: string
 #. Description
 #: ../partman-basicfilesystems.templates:104
-#: ../partman-basicfilesystems.templates:82
 msgid "Label for the file system in this partition:"
 msgstr "ÐœÐµÑ‚ÐºÐ° Ñ„Ð°Ð¹Ð»Ð¾Ð²Ð¾Ð¹ ÑÐ¸ÑÑ‚ÐµÐ¼Ñ‹ ÑÑ‚Ð¾Ð³Ð¾ Ñ€Ð°Ð·Ð´ÐµÐ»Ð°:"
 
 #. Type: text
 #. Description
 #: ../partman-basicfilesystems.templates:108
-#: ../partman-basicfilesystems.templates:86
 msgid "Format the swap area:"
 msgstr "Ð¤Ð¾Ñ€Ð¼Ð°Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ñ€Ð°Ð·Ð´ÐµÐ» Ð¿Ð¾Ð´ÐºÐ°Ñ‡ÐºÐ¸:"
 
@@ -3560,7 +3423,6 @@
 #. Description
 #. In the following context: "Format the partition: yes"
 #: ../partman-basicfilesystems.templates:113
-#: ../partman-basicfilesystems.templates:91
 msgid "yes"
 msgstr "Ð´Ð°"
 
@@ -3568,7 +3430,6 @@
 #. Description
 #. In the following context: "Format the partition: no"
 #: ../partman-basicfilesystems.templates:118
-#: ../partman-basicfilesystems.templates:96
 msgid "no"
 msgstr "Ð½ÐµÑ‚"
 
@@ -3576,7 +3437,6 @@
 #. Description
 #. label of file system
 #: ../partman-basicfilesystems.templates:123
-#: ../partman-basicfilesystems.templates:101
 msgid "Label:"
 msgstr "ÐœÐµÑ‚ÐºÐ°:"
 
@@ -3584,22 +3444,20 @@
 #. Description
 #. Up to 24 character positions
 #: ../partman-basicfilesystems.templates:133
-#: ../partman-basicfilesystems.templates:111
 msgid "Reserved blocks:"
 msgstr "Ð—Ð°Ñ€ÐµÐ·ÐµÑ€Ð²Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ñ‹Ðµ Ð±Ð»Ð¾ÐºÐ¸:"
 
 #. Type: string
 #. Description
 #: ../partman-basicfilesystems.templates:137
-#: ../partman-basicfilesystems.templates:115
 msgid "Percentage of the file system blocks reserved for the super-user:"
-msgstr "ÐŸÑ€Ð¾Ñ†ÐµÐ½Ñ‚ Ð±Ð»Ð¾ÐºÐ¾Ð² Ñ„Ð°Ð¹Ð»Ð¾Ð²Ð¾Ð¹ ÑÐ¸ÑÑ‚ÐµÐ¼Ñ‹, Ð·Ð°Ñ€ÐµÐ·ÐµÑ€Ð²Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ñ‹Ñ… Ð´Ð»Ñ ÑÑƒÐ¿ÐµÑ€Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ:"
+msgstr ""
+"ÐŸÑ€Ð¾Ñ†ÐµÐ½Ñ‚ Ð±Ð»Ð¾ÐºÐ¾Ð² Ñ„Ð°Ð¹Ð»Ð¾Ð²Ð¾Ð¹ ÑÐ¸ÑÑ‚ÐµÐ¼Ñ‹, Ð·Ð°Ñ€ÐµÐ·ÐµÑ€Ð²Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ñ‹Ñ… Ð´Ð»Ñ ÑÑƒÐ¿ÐµÑ€Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ:"
 
 #. Type: text
 #. Description
 #. Up to 25 character positions
 #: ../partman-basicfilesystems.templates:142
-#: ../partman-basicfilesystems.templates:120
 msgid "Typical usage:"
 msgstr "ÐžÐ±Ñ‹Ñ‡Ð½Ð¾Ðµ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ:"
 
@@ -3607,21 +3465,18 @@
 #. Description
 #. In the following context: "Typical usage: standard"
 #: ../partman-basicfilesystems.templates:147
-#: ../partman-basicfilesystems.templates:125
 msgid "standard"
 msgstr "ÑÑ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚"
 
 #. Type: select
 #. Description
 #: ../partman-basicfilesystems.templates:155
-#: ../partman-basicfilesystems.templates:133
 msgid "Typical usage of this partition:"
 msgstr "ÐžÐ±Ñ‹Ñ‡Ð½Ð¾Ðµ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ ÑÑ‚Ð¾Ð³Ð¾ Ñ€Ð°Ð·Ð´ÐµÐ»Ð°:"
 
 #. Type: select
 #. Description
 #: ../partman-basicfilesystems.templates:155
-#: ../partman-basicfilesystems.templates:133
 msgid ""
 "Please specify how the file system is going to be used, so that optimal file "
 "system parameters can be chosen for that use."
@@ -3632,7 +3487,6 @@
 #. Type: select
 #. Description
 #: ../partman-basicfilesystems.templates:155
-#: ../partman-basicfilesystems.templates:133
 msgid ""
 "standard = standard parameters, news = one inode per 4KB block, largefile = "
 "one inode per megabyte, largefile4 = one inode per 4 megabytes."
@@ -3662,8 +3516,7 @@
 #. This is an item in the menu "Partition settings"
 #: ../partman-basicfilesystems.templates:167 ../partman-ext3.templates:32
 #: ../partman-reiserfs.templates:32 ../partman-jfs.templates:32
-#: ../partman-xfs.templates:32 ../partman-basicfilesystems.templates:145
-#: ../templates:32
+#: ../partman-xfs.templates:32
 msgid "Mount point:"
 msgstr "Ð¢Ð¾Ñ‡ÐºÐ° Ð¼Ð¾Ð½Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ:"
 
@@ -3671,14 +3524,12 @@
 #. Description
 #. In the following context: "Mount point: none"
 #: ../partman-basicfilesystems.templates:172
-#: ../partman-basicfilesystems.templates:150
 msgid "none"
 msgstr "Ð¾Ñ‚ÑÑƒÑ‚ÑÑ‚Ð²ÑƒÐµÑ‚"
 
 #. Type: text
 #. Description
 #: ../partman-basicfilesystems.templates:176
-#: ../partman-basicfilesystems.templates:154
 msgid "Ext2 file system"
 msgstr "Ð¤Ð°Ð¹Ð»Ð¾Ð²Ð°Ñ ÑÐ¸ÑÑ‚ÐµÐ¼Ð° Ext2"
 
@@ -3686,14 +3537,12 @@
 #. Description
 #. Short file system name (untranslatable in many languages)
 #: ../partman-basicfilesystems.templates:181
-#: ../partman-basicfilesystems.templates:159
 msgid "ext2"
 msgstr "ext2"
 
 #. Type: text
 #. Description
 #: ../partman-basicfilesystems.templates:185
-#: ../partman-basicfilesystems.templates:163
 msgid "FAT16 file system"
 msgstr "Ð¤Ð°Ð¹Ð»Ð¾Ð²Ð°Ñ ÑÐ¸ÑÑ‚ÐµÐ¼Ð° FAT16"
 
@@ -3701,14 +3550,12 @@
 #. Description
 #. Short file system name (untranslatable in many languages)
 #: ../partman-basicfilesystems.templates:190
-#: ../partman-basicfilesystems.templates:168
 msgid "fat16"
 msgstr "fat16"
 
 #. Type: text
 #. Description
 #: ../partman-basicfilesystems.templates:194
-#: ../partman-basicfilesystems.templates:172
 msgid "FAT32 file system"
 msgstr "Ð¤Ð°Ð¹Ð»Ð¾Ð²Ð°Ñ ÑÐ¸ÑÑ‚ÐµÐ¼Ð° FAT32"
 
@@ -3716,14 +3563,12 @@
 #. Description
 #. Short file system name (untranslatable in many languages)
 #: ../partman-basicfilesystems.templates:199
-#: ../partman-basicfilesystems.templates:177
 msgid "fat32"
 msgstr "fat32"
 
 #. Type: text
 #. Description
 #: ../partman-basicfilesystems.templates:212
-#: ../partman-basicfilesystems.templates:190
 msgid "swap area"
 msgstr "Ñ€Ð°Ð·Ð´ÐµÐ» Ð¿Ð¾Ð´ÐºÐ°Ñ‡ÐºÐ¸"
 
@@ -3731,11 +3576,9 @@
 #. Description
 #. Short variant of `swap space'
 #: ../partman-basicfilesystems.templates:217
-#: ../partman-basicfilesystems.templates:195
 msgid "swap"
 msgstr "Ð¿Ð¾Ð´Ðº"
 
-#. #-#-#-#-#  template.pot (debian-installer)  #-#-#-#-#
 #. #-#-#-#-#  templates.pot (PACKAGE VERSION)  #-#-#-#-#
 #. Type: multiselect
 #. Choices
@@ -3769,13 +3612,9 @@
 #. Note to translators : Please keep your translations of the choices
 #. below a 65 columns limit (which means 65 characters
 #. in single-byte languages)
-#. #-#-#-#-#  template.pot (debian-installer)  #-#-#-#-#
-#. Type: multiselect
-#. Choices
 #: ../partman-basicfilesystems.templates:228 ../partman-ext3.templates:44
 #: ../partman-reiserfs.templates:44 ../partman-jfs.templates:44
 #: ../partman-xfs.templates:44 ../partman-ext2r0.templates:55
-#: ../partman-basicfilesystems.templates:203 ../templates:41 ../templates:52
 msgid "noatime - do not update inode access times at each access"
 msgstr ""
 "noatime -- Ð½Ðµ Ð¾Ð±Ð½Ð¾Ð²Ð»ÑÑ‚ÑŒ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸ÑŽ Ð¾ Ð²Ñ€ÐµÐ¼ÐµÐ½Ð¸ Ð¿Ð¾ÑÐ»ÐµÐ´Ð½ÐµÐ³Ð¾ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð° Ð¿Ñ€Ð¸ ÐºÐ°Ð¶Ð´Ð¾Ð¼ "
@@ -3786,7 +3625,6 @@
 #: ../partman-basicfilesystems.templates:228 ../partman-ext3.templates:44
 #: ../partman-reiserfs.templates:44 ../partman-jfs.templates:44
 #: ../partman-xfs.templates:44 ../partman-ext2r0.templates:55
-#: ../partman-basicfilesystems.templates:203 ../templates:41 ../templates:52
 msgid "nodev - do not support character or block special devices"
 msgstr ""
 "nodev -- Ð±ÐµÐ· Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶ÐºÐ¸ Ð±Ð»Ð¾ÐºÐ¾Ð²Ñ‹Ñ… (block device) Ð¸ ÑÐ¸Ð¼Ð²Ð¾Ð»ÑŒÐ½Ñ‹Ñ… (character "
@@ -3797,7 +3635,6 @@
 #: ../partman-basicfilesystems.templates:228 ../partman-ext3.templates:44
 #: ../partman-reiserfs.templates:44 ../partman-jfs.templates:44
 #: ../partman-xfs.templates:44 ../partman-ext2r0.templates:55
-#: ../partman-basicfilesystems.templates:203 ../templates:41 ../templates:52
 msgid "nosuid - ignore set-user-identifier or set-group-identifier bits"
 msgstr "nosuid -- Ð¸Ð³Ð½Ð¾Ñ€Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ð±Ð¸Ñ‚Ñ‹ SUID Ð¸ SGID"
 
@@ -3806,7 +3643,6 @@
 #: ../partman-basicfilesystems.templates:228 ../partman-ext3.templates:44
 #: ../partman-reiserfs.templates:44 ../partman-jfs.templates:44
 #: ../partman-xfs.templates:44 ../partman-ext2r0.templates:55
-#: ../partman-basicfilesystems.templates:203 ../templates:41 ../templates:52
 msgid "noexec - do not allow execution of any binaries"
 msgstr "noexec -- Ð·Ð°Ð¿Ñ€ÐµÑ‚Ð¸Ñ‚ÑŒ Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ðµ Ð»ÑŽÐ±Ñ‹Ñ… Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼"
 
@@ -3814,8 +3650,7 @@
 #. Choices
 #: ../partman-basicfilesystems.templates:228 ../partman-ext3.templates:44
 #: ../partman-reiserfs.templates:44 ../partman-xfs.templates:44
-#: ../partman-ext2r0.templates:55 ../partman-basicfilesystems.templates:203
-#: ../templates:41 ../templates:52
+#: ../partman-ext2r0.templates:55
 msgid "usrquota - user disk quota accounting enabled"
 msgstr "usrquota -- Ñ€Ð°Ð·Ñ€ÐµÑˆÐ¸Ñ‚ÑŒ ÑƒÑ‡Ñ‘Ñ‚ Ð´Ð¸ÑÐºÐ¾Ð²Ñ‹Ñ… ÐºÐ²Ð¾Ñ‚ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹"
 
@@ -3823,8 +3658,7 @@
 #. Choices
 #: ../partman-basicfilesystems.templates:228 ../partman-ext3.templates:44
 #: ../partman-reiserfs.templates:44 ../partman-xfs.templates:44
-#: ../partman-ext2r0.templates:55 ../partman-basicfilesystems.templates:203
-#: ../templates:41 ../templates:52
+#: ../partman-ext2r0.templates:55
 msgid "grpquota - group disk quota accounting enabled"
 msgstr "grpquota -- Ñ€Ð°Ð·Ñ€ÐµÑˆÐ¸Ñ‚ÑŒ ÑƒÑ‡Ñ‘Ñ‚ Ð´Ð¸ÑÐºÐ¾Ð²Ñ‹Ñ… ÐºÐ²Ð¾Ñ‚ Ð³Ñ€ÑƒÐ¿Ð¿"
 
@@ -3833,9 +3667,9 @@
 #: ../partman-basicfilesystems.templates:228 ../partman-ext3.templates:44
 #: ../partman-reiserfs.templates:44
 msgid "user_xattr - support user extended attributes"
-msgstr "user_xattr -- Ð²ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶ÐºÑƒ Ñ€Ð°ÑÑˆÐ¸Ñ€ÐµÐ½Ð½Ñ‹Ñ… Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒÑÐºÐ¸Ñ… Ð°Ñ‚Ñ€Ð¸Ð±ÑƒÑ‚Ð¾Ð²"
+msgstr ""
+"user_xattr -- Ð²ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶ÐºÑƒ Ñ€Ð°ÑÑˆÐ¸Ñ€ÐµÐ½Ð½Ñ‹Ñ… Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒÑÐºÐ¸Ñ… Ð°Ñ‚Ñ€Ð¸Ð±ÑƒÑ‚Ð¾Ð²"
 
-#. #-#-#-#-#  template.pot (debian-installer)  #-#-#-#-#
 #. #-#-#-#-#  templates.pot (PACKAGE VERSION)  #-#-#-#-#
 #. Type: multiselect
 #. Choices
@@ -3857,13 +3691,9 @@
 #. #-#-#-#-#  templates.pot (PACKAGE VERSION)  #-#-#-#-#
 #. Type: multiselect
 #. Choices
-#. #-#-#-#-#  template.pot (debian-installer)  #-#-#-#-#
-#. Type: multiselect
-#. Choices
 #: ../partman-basicfilesystems.templates:237 ../partman-ext3.templates:44
 #: ../partman-reiserfs.templates:44 ../partman-jfs.templates:44
 #: ../partman-xfs.templates:44 ../partman-ext2r0.templates:55
-#: ../partman-basicfilesystems.templates:209 ../templates:41 ../templates:52
 msgid "ro - mount the file system read-only"
 msgstr "ro -- Ð¼Ð¾Ð½Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ñ„Ð°Ð¹Ð»Ð¾Ð²ÑƒÑŽ ÑÐ¸ÑÑ‚ÐµÐ¼Ñƒ Ð² Ñ€ÐµÐ¶Ð¸Ð¼Ðµ 'Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ð´Ð»Ñ Ñ‡Ñ‚ÐµÐ½Ð¸Ñ'"
 
@@ -3872,7 +3702,6 @@
 #: ../partman-basicfilesystems.templates:237 ../partman-ext3.templates:44
 #: ../partman-reiserfs.templates:44 ../partman-jfs.templates:44
 #: ../partman-xfs.templates:44 ../partman-ext2r0.templates:55
-#: ../partman-basicfilesystems.templates:209 ../templates:41 ../templates:52
 msgid "sync - all input/output activities occur synchronously"
 msgstr ""
 "sync -- Ð²ÑÐµ Ð¿Ñ€Ð¾Ñ†ÐµÑÑÑ‹ Ð²Ð²Ð¾Ð´Ð°-Ð²Ñ‹Ð²Ð¾Ð´Ð° Ñ„Ð°Ð¹Ð»Ð¾Ð²Ð¾Ð¹ ÑÐ¸ÑÑ‚ÐµÐ¼Ðµ Ð±ÑƒÐ´ÑƒÑ‚ Ð¿Ñ€Ð¾Ð¸ÑÑ…Ð¾Ð´Ð¸Ñ‚ÑŒ "
@@ -3881,7 +3710,6 @@
 #. Type: multiselect
 #. Choices
 #: ../partman-basicfilesystems.templates:237
-#: ../partman-basicfilesystems.templates:209
 msgid "quiet - changing owner and permissions does not return errors"
 msgstr "quiet -- ÑÐ¼ÐµÐ½Ð° Ð²Ð»Ð°Ð´ÐµÐ»ÑŒÑ†Ð° Ð¸ Ð¿Ñ€Ð°Ð² Ð½Ðµ Ð²Ð¾Ð·Ð²Ñ€Ð°Ñ‰Ð°ÐµÑ‚ Ð¾ÑˆÐ¸Ð±Ð¾Ðº"
 
@@ -3890,7 +3718,6 @@
 #: ../partman-basicfilesystems.templates:238 ../partman-ext3.templates:45
 #: ../partman-reiserfs.templates:45 ../partman-jfs.templates:45
 #: ../partman-xfs.templates:45 ../partman-ext2r0.templates:56
-#: ../partman-basicfilesystems.templates:210 ../templates:42 ../templates:53
 msgid "Mount options:"
 msgstr "ÐŸÐ°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ñ‹ Ð¼Ð¾Ð½Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ:"
 
@@ -3898,22 +3725,23 @@
 #. Description
 #: ../partman-basicfilesystems.templates:238 ../partman-ext3.templates:45
 #: ../partman-reiserfs.templates:45 ../partman-jfs.templates:45
-#: ../partman-xfs.templates:45 ../partman-ext2r0.templates:56 ../templates:42
-#: ../templates:53
+#: ../partman-xfs.templates:45 ../partman-ext2r0.templates:56
 msgid "Mount options can tune the behavior of the file system."
-msgstr "ÐŸÐ°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ñ‹ Ð¼Ð¾Ð½Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¿Ð¾Ð·Ð²Ð¾Ð»ÑÑŽÑ‚ Ð¿Ð¾Ð´ÑÑ‚Ñ€Ð¾Ð¸Ñ‚ÑŒ Ð¿Ð¾Ð²ÐµÐ´ÐµÐ½Ð¸Ðµ Ñ„Ð°Ð¹Ð»Ð¾Ð²Ð¾Ð¹ ÑÐ¸ÑÑ‚ÐµÐ¼Ñ‹."
+msgstr ""
+"ÐŸÐ°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ñ‹ Ð¼Ð¾Ð½Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¿Ð¾Ð·Ð²Ð¾Ð»ÑÑŽÑ‚ Ð¿Ð¾Ð´ÑÑ‚Ñ€Ð¾Ð¸Ñ‚ÑŒ Ð¿Ð¾Ð²ÐµÐ´ÐµÐ½Ð¸Ðµ Ñ„Ð°Ð¹Ð»Ð¾Ð²Ð¾Ð¹ ÑÐ¸ÑÑ‚ÐµÐ¼Ñ‹."
 
 #. Type: text
 #. Description
-#: ../partman-ext3.templates:3 ../templates:3
-msgid "Checking the ext3 file system in partition #${PARTITION} of ${DEVICE}..."
+#: ../partman-ext3.templates:3
+msgid ""
+"Checking the ext3 file system in partition #${PARTITION} of ${DEVICE}..."
 msgstr ""
 "ÐŸÑ€Ð¾Ð²ÐµÑ€ÐºÐ° Ñ„Ð°Ð¹Ð»Ð¾Ð²Ð¾Ð¹ ÑÐ¸ÑÑ‚ÐµÐ¼Ñ‹ ext3 Ð½Ð° Ñ€Ð°Ð·Ð´ÐµÐ»Ðµ #${PARTITION} ÑƒÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð²Ð° "
 "${DEVICE}..."
 
 #. Type: boolean
 #. Description
-#: ../partman-ext3.templates:7 ../templates:7
+#: ../partman-ext3.templates:7
 msgid ""
 "The test of the file system with type ext3 in partition #${PARTITION} of "
 "${DEVICE} found uncorrected errors."
@@ -3925,7 +3753,7 @@
 #. Description
 #: ../partman-ext3.templates:7 ../partman-reiserfs.templates:7
 #: ../partman-jfs.templates:7 ../partman-xfs.templates:7
-#: ../partman-ext2r0.templates:7 ../templates:7
+#: ../partman-ext2r0.templates:7
 msgid ""
 "If you do not go back to the partitioning menu and correct these errors, the "
 "partition will not be used at all."
@@ -3935,15 +3763,16 @@
 
 #. Type: error
 #. Description
-#: ../partman-ext3.templates:16 ../templates:16
-msgid "The ext3 file system creation in partition #${PARTITION} of ${DEVICE} failed."
+#: ../partman-ext3.templates:16
+msgid ""
+"The ext3 file system creation in partition #${PARTITION} of ${DEVICE} failed."
 msgstr ""
 "ÐÐµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ ÑÐ¾Ð·Ð´Ð°Ñ‚ÑŒ Ñ„Ð°Ð¹Ð»Ð¾Ð²ÑƒÑŽ ÑÐ¸ÑÑ‚ÐµÐ¼Ñƒ ext3 Ð½Ð° Ñ€Ð°Ð·Ð´ÐµÐ»Ðµ #${PARTITION} ÑƒÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð²Ð° "
 "${DEVICE}."
 
 #. Type: boolean
 #. Description
-#: ../partman-ext3.templates:22 ../templates:22
+#: ../partman-ext3.templates:22
 msgid ""
 "No mount point is assigned for the ext3 file system in partition #"
 "${PARTITION} of ${DEVICE}."
@@ -3954,28 +3783,29 @@
 #. Type: text
 #. Description
 #. File system name
-#: ../partman-ext3.templates:51 ../templates:48
+#: ../partman-ext3.templates:51
 msgid "Ext3 journaling file system"
 msgstr "Ð–ÑƒÑ€Ð½Ð°Ð»Ð¸Ñ€ÑƒÐµÐ¼Ð°Ñ Ñ„Ð°Ð¹Ð»Ð¾Ð²Ð°Ñ ÑÐ¸ÑÑ‚ÐµÐ¼Ð° Ext3"
 
 #. Type: text
 #. Description
 #. Short file system name (untranslatable in many languages)
-#: ../partman-ext3.templates:56 ../templates:53
+#: ../partman-ext3.templates:56
 msgid "ext3"
 msgstr "ext3"
 
 #. Type: text
 #. Description
-#: ../partman-reiserfs.templates:3 ../templates:3
-msgid "Checking the ReiserFS file system in partition #${PARTITION} of ${DEVICE}..."
+#: ../partman-reiserfs.templates:3
+msgid ""
+"Checking the ReiserFS file system in partition #${PARTITION} of ${DEVICE}..."
 msgstr ""
 "ÐŸÑ€Ð¾Ð²ÐµÑ€ÐºÐ° Ñ„Ð°Ð¹Ð»Ð¾Ð²Ð¾Ð¹ ÑÐ¸ÑÑ‚ÐµÐ¼Ñ‹ ReiserFS Ð½Ð° Ñ€Ð°Ð·Ð´ÐµÐ»Ðµ #${PARTITION} ÑƒÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð²Ð° "
 "${DEVICE}..."
 
 #. Type: boolean
 #. Description
-#: ../partman-reiserfs.templates:7 ../templates:7
+#: ../partman-reiserfs.templates:7
 msgid ""
 "The test of the file system with type ReiserFS in partition #${PARTITION} of "
 "${DEVICE} found uncorrected errors."
@@ -3985,7 +3815,7 @@
 
 #. Type: error
 #. Description
-#: ../partman-reiserfs.templates:16 ../templates:16
+#: ../partman-reiserfs.templates:16
 msgid ""
 "The ReiserFS file system creation in partition #${PARTITION} of ${DEVICE} "
 "failed."
@@ -3995,7 +3825,7 @@
 
 #. Type: boolean
 #. Description
-#: ../partman-reiserfs.templates:22 ../templates:22
+#: ../partman-reiserfs.templates:22
 msgid ""
 "No mount point is assigned for the ReiserFS file system in partition #"
 "${PARTITION} of ${DEVICE}."
@@ -4006,40 +3836,36 @@
 #. Type: text
 #. Description
 #. File system name (untranslatable in many languages)
-#: ../partman-reiserfs.templates:37 ../templates:37
+#: ../partman-reiserfs.templates:37
 msgid "ReiserFS"
 msgstr "ReiserFS"
 
-#. #-#-#-#-#  template.pot (debian-installer)  #-#-#-#-#
 #. Type: multiselect
 #. Choices
 #. Note to translators : Please keep your translations of the choices
 #. below a 65 columns limit (which means 65 characters
 #. in single-byte languages)
-#. #-#-#-#-#  template.pot (debian-installer)  #-#-#-#-#
-#. Type: multiselect
-#. Choices
-#: ../partman-reiserfs.templates:44 ../templates:41
+#: ../partman-reiserfs.templates:44
 msgid "notail - disable packing of files into the file system tree"
 msgstr "notail - Ð·Ð°Ð¿Ñ€ÐµÑ‚Ð¸Ñ‚ÑŒ ÑƒÐ¿Ð°ÐºÐ¾Ð²ÐºÑƒ Ñ„Ð°Ð¹Ð»Ð¾Ð² Ð² Ð´ÐµÑ€ÐµÐ²Ðµ Ñ„Ð°Ð¹Ð»Ð¾Ð²Ð¾Ð¹ ÑÐ¸ÑÑ‚ÐµÐ¼Ñ‹"
 
 #. Type: text
 #. Description
 #. File system name
-#: ../partman-reiserfs.templates:51 ../templates:48
+#: ../partman-reiserfs.templates:51
 msgid "ReiserFS journaling file system"
 msgstr "Ð–ÑƒÑ€Ð½Ð°Ð»Ð¸Ñ€ÑƒÐµÐ¼Ð°Ñ Ñ„Ð°Ð¹Ð»Ð¾Ð²Ð°Ñ ÑÐ¸ÑÑ‚ÐµÐ¼Ð° ReiserFS"
 
 #. Type: text
 #. Description
 #. Short file system name (untranslatable in many languages)
-#: ../partman-reiserfs.templates:56 ../templates:53
+#: ../partman-reiserfs.templates:56
 msgid "reiserfs"
 msgstr "reiserfs"
 
 #. Type: text
 #. Description
-#: ../partman-jfs.templates:3 ../templates:3
+#: ../partman-jfs.templates:3
 msgid "Checking the jfs file system in partition #${PARTITION} of ${DEVICE}..."
 msgstr ""
 "ÐŸÑ€Ð¾Ð²ÐµÑ€ÐºÐ° Ñ„Ð°Ð¹Ð»Ð¾Ð²Ð¾Ð¹ ÑÐ¸ÑÑ‚ÐµÐ¼Ñ‹ jfs Ð½Ð° Ñ€Ð°Ð·Ð´ÐµÐ»Ðµ #${PARTITION} ÑƒÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð²Ð° "
@@ -4047,7 +3873,7 @@
 
 #. Type: boolean
 #. Description
-#: ../partman-jfs.templates:7 ../templates:7
+#: ../partman-jfs.templates:7
 msgid ""
 "The test of the file system with type jfs in partition #${PARTITION} of "
 "${DEVICE} found uncorrected errors."
@@ -4057,15 +3883,16 @@
 
 #. Type: error
 #. Description
-#: ../partman-jfs.templates:16 ../templates:16
-msgid "The jfs file system creation in partition #${PARTITION} of ${DEVICE} failed."
+#: ../partman-jfs.templates:16
+msgid ""
+"The jfs file system creation in partition #${PARTITION} of ${DEVICE} failed."
 msgstr ""
 "ÐÐµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ ÑÐ¾Ð·Ð´Ð°Ñ‚ÑŒ Ñ„Ð°Ð¹Ð»Ð¾Ð²ÑƒÑŽ ÑÐ¸ÑÑ‚ÐµÐ¼Ñƒ jfs Ð½Ð° Ñ€Ð°Ð·Ð´ÐµÐ»Ðµ #${PARTITION} ÑƒÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð²Ð° "
 "${DEVICE}."
 
 #. Type: boolean
 #. Description
-#: ../partman-jfs.templates:22 ../templates:22
+#: ../partman-jfs.templates:22
 msgid ""
 "No mount point is assigned for the jfs file system in partition #"
 "${PARTITION} of ${DEVICE}."
@@ -4076,22 +3903,23 @@
 #. Type: text
 #. Description
 #. File system name
-#: ../partman-jfs.templates:51 ../templates:48
+#: ../partman-jfs.templates:51
 msgid "JFS journaling file system"
 msgstr "Ð–ÑƒÑ€Ð½Ð°Ð»Ð¸Ñ€ÑƒÐµÐ¼Ð°Ñ Ñ„Ð°Ð¹Ð»Ð¾Ð²Ð°Ñ ÑÐ¸ÑÑ‚ÐµÐ¼Ð° JFS"
 
 #. Type: text
 #. Description
 #. Short file system name (untranslatable in many languages)
-#: ../partman-jfs.templates:56 ../templates:53
+#: ../partman-jfs.templates:56
 msgid "jfs"
 msgstr "jfs"
 
 #. Type: boolean
 #. Description
-#: ../partman-jfs.templates:61 ../templates:58
+#: ../partman-jfs.templates:61
 msgid "Use unrecommended JFS root file system?"
-msgstr "Ð˜ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ Ð½ÐµÑ€ÐµÐºÐ¾Ð¼ÐµÐ½Ð´Ð¾Ð²Ð°Ð½Ð½ÑƒÑŽ JFS Ð² ÐºÐ°Ñ‡ÐµÑÑ‚Ð²Ðµ ÐºÐ¾Ñ€Ð½ÐµÐ²Ð¾Ð¹ Ñ„Ð°Ð¹Ð»Ð¾Ð²Ð¾Ð¹ ÑÐ¸ÑÑ‚ÐµÐ¼Ñ‹?"
+msgstr ""
+"Ð˜ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ Ð½ÐµÑ€ÐµÐºÐ¾Ð¼ÐµÐ½Ð´Ð¾Ð²Ð°Ð½Ð½ÑƒÑŽ JFS Ð² ÐºÐ°Ñ‡ÐµÑÑ‚Ð²Ðµ ÐºÐ¾Ñ€Ð½ÐµÐ²Ð¾Ð¹ Ñ„Ð°Ð¹Ð»Ð¾Ð²Ð¾Ð¹ ÑÐ¸ÑÑ‚ÐµÐ¼Ñ‹?"
 
 #. Type: boolean
 #. Description
@@ -4105,7 +3933,7 @@
 
 #. Type: boolean
 #. Description
-#: ../partman-jfs.templates:61 ../templates:58
+#: ../partman-jfs.templates:61
 msgid ""
 "You should use a small /boot partition with another file system, such as "
 "ext3."
@@ -4115,7 +3943,7 @@
 
 #. Type: boolean
 #. Description
-#: ../partman-jfs.templates:70 ../templates:67
+#: ../partman-jfs.templates:70
 msgid "Use unrecommended JFS /boot file system?"
 msgstr "Ð˜ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ Ð½ÐµÑ€ÐµÐºÐ¾Ð¼ÐµÐ½Ð´ÑƒÐµÐ¼ÑƒÑŽ Ñ„Ð°Ð¹Ð»Ð¾Ð²ÑƒÑŽ ÑÐ¸ÑÑ‚ÐµÐ¼Ñƒ JFS Ð´Ð»Ñ /boot?"
 
@@ -4131,13 +3959,15 @@
 
 #. Type: boolean
 #. Description
-#: ../partman-jfs.templates:70 ../templates:67
-msgid "You should use another file system, such as ext3, for the /boot partition."
-msgstr "Ð”Ð»Ñ Ñ€Ð°Ð·Ð´ÐµÐ»Ð° /boot Ð½ÑƒÐ¶Ð½Ð¾ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ Ð´Ñ€ÑƒÐ³ÑƒÑŽ Ñ„Ð°Ð¹Ð»Ð¾Ð²ÑƒÑŽ ÑÐ¸ÑÑ‚ÐµÐ¼Ñƒ, Ð½Ð°Ð¿Ñ€Ð¸Ð¼ÐµÑ€ ext3."
+#: ../partman-jfs.templates:70
+msgid ""
+"You should use another file system, such as ext3, for the /boot partition."
+msgstr ""
+"Ð”Ð»Ñ Ñ€Ð°Ð·Ð´ÐµÐ»Ð° /boot Ð½ÑƒÐ¶Ð½Ð¾ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ Ð´Ñ€ÑƒÐ³ÑƒÑŽ Ñ„Ð°Ð¹Ð»Ð¾Ð²ÑƒÑŽ ÑÐ¸ÑÑ‚ÐµÐ¼Ñƒ, Ð½Ð°Ð¿Ñ€Ð¸Ð¼ÐµÑ€ ext3."
 
 #. Type: text
 #. Description
-#: ../partman-xfs.templates:3 ../templates:3
+#: ../partman-xfs.templates:3
 msgid "Checking the xfs file system in partition #${PARTITION} of ${DEVICE}..."
 msgstr ""
 "ÐŸÑ€Ð¾Ð²ÐµÑ€ÐºÐ° Ñ„Ð°Ð¹Ð»Ð¾Ð²Ð¾Ð¹ ÑÐ¸ÑÑ‚ÐµÐ¼Ñ‹ xfs Ð½Ð° Ñ€Ð°Ð·Ð´ÐµÐ»Ðµ #${PARTITION} ÑƒÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð²Ð° "
@@ -4145,7 +3975,7 @@
 
 #. Type: boolean
 #. Description
-#: ../partman-xfs.templates:7 ../templates:7
+#: ../partman-xfs.templates:7
 msgid ""
 "The test of the file system with type xfs in partition #${PARTITION} of "
 "${DEVICE} found uncorrected errors."
@@ -4155,15 +3985,16 @@
 
 #. Type: error
 #. Description
-#: ../partman-xfs.templates:16 ../templates:16
-msgid "The xfs file system creation in partition #${PARTITION} of ${DEVICE} failed."
+#: ../partman-xfs.templates:16
+msgid ""
+"The xfs file system creation in partition #${PARTITION} of ${DEVICE} failed."
 msgstr ""
 "ÐÐµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ ÑÐ¾Ð·Ð´Ð°Ñ‚ÑŒ Ñ„Ð°Ð¹Ð»Ð¾Ð²ÑƒÑŽ ÑÐ¸ÑÑ‚ÐµÐ¼Ñƒ xfs Ð½Ð° Ñ€Ð°Ð·Ð´ÐµÐ»Ðµ #${PARTITION} ÑƒÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð²Ð° "
 "${DEVICE}."
 
 #. Type: boolean
 #. Description
-#: ../partman-xfs.templates:22 ../templates:22
+#: ../partman-xfs.templates:22
 msgid ""
 "No mount point is assigned for the xfs file system in partition #"
 "${PARTITION} of ${DEVICE}."
@@ -4174,20 +4005,20 @@
 #. Type: text
 #. Description
 #. File system name
-#: ../partman-xfs.templates:51 ../templates:48
+#: ../partman-xfs.templates:51
 msgid "XFS journaling file system"
 msgstr "Ð–ÑƒÑ€Ð½Ð°Ð»Ð¸Ñ€ÑƒÐµÐ¼Ð°Ñ Ñ„Ð°Ð¹Ð»Ð¾Ð²Ð°Ñ ÑÐ¸ÑÑ‚ÐµÐ¼Ð° XFS"
 
 #. Type: text
 #. Description
 #. Short file system name (untranslatable in many languages)
-#: ../partman-xfs.templates:56 ../templates:53
+#: ../partman-xfs.templates:56
 msgid "xfs"
 msgstr "xfs"
 
 #. Type: text
 #. Description
-#: ../partman-ext2r0.templates:3 ../templates:3
+#: ../partman-ext2r0.templates:3
 msgid ""
 "Checking the ext2 (revision 0) file system in partition #${PARTITION} of "
 "${DEVICE}..."
@@ -4197,7 +4028,7 @@
 
 #. Type: boolean
 #. Description
-#: ../partman-ext2r0.templates:7 ../templates:7
+#: ../partman-ext2r0.templates:7
 msgid ""
 "The test of the file system with type ext2 (revision 0) in partition #"
 "${PARTITION} of ${DEVICE} found uncorrected errors."
@@ -4207,7 +4038,7 @@
 
 #. Type: error
 #. Description
-#: ../partman-ext2r0.templates:16 ../templates:16
+#: ../partman-ext2r0.templates:16
 msgid ""
 "The ext2 (revision 0) file system creation in partition #${PARTITION} of "
 "${DEVICE} failed."
@@ -4217,7 +4048,7 @@
 
 #. Type: boolean
 #. Description
-#: ../partman-ext2r0.templates:22 ../templates:22
+#: ../partman-ext2r0.templates:22
 msgid ""
 "No mount point is assigned for the ext2 (revision 0) file system in "
 "partition #${PARTITION} of ${DEVICE}."
@@ -4227,27 +4058,27 @@
 
 #. Type: select
 #. Choices
-#: ../partman-ext2r0.templates:31 ../templates:31
+#: ../partman-ext2r0.templates:31
 msgid "/, /boot, Enter manually, Do not mount it"
 msgstr "/, /boot, Ð’Ð²ÐµÑÑ‚Ð¸ Ð²Ñ€ÑƒÑ‡Ð½ÑƒÑŽ, ÐÐµ Ð¼Ð¾Ð½Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ ÑÑ‚Ð¾Ñ‚ Ñ€Ð°Ð·Ð´ÐµÐ»"
 
 #. Type: text
 #. Description
 #. File system name
-#: ../partman-ext2r0.templates:62 ../templates:59
+#: ../partman-ext2r0.templates:62
 msgid "old Ext2 (revision 0) file system"
 msgstr "Ð¡Ñ‚Ð°Ñ€Ð°Ñ Ñ„Ð°Ð¹Ð»Ð¾Ð²Ð°Ñ ÑÐ¸ÑÑ‚ÐµÐ¼Ð° Ext2 (Ð¼Ð¾Ð´Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ñ 0)"
 
 #. Type: text
 #. Description
 #. Short file system name (untranslatable in many languages)
-#: ../partman-ext2r0.templates:67 ../templates:64
+#: ../partman-ext2r0.templates:67
 msgid "ext2r0"
 msgstr "ext2r0"
 
 #. Type: boolean
 #. Description
-#: ../partman-ext2r0.templates:71 ../templates:68
+#: ../partman-ext2r0.templates:71
 msgid ""
 "Your boot partition has not been configured with the old ext2 (revision 0) "
 "file system.  This is needed by your machine in order to boot.  Please go "
@@ -4259,7 +4090,7 @@
 
 #. Type: boolean
 #. Description
-#: ../partman-ext2r0.templates:82 ../templates:79
+#: ../partman-ext2r0.templates:82
 msgid ""
 "Your boot partition is not located on the first primary partition of your "
 "hard disk.  This is needed by your machine in order to boot.  Please go back "
@@ -4271,13 +4102,13 @@
 
 #. Type: boolean
 #. Description
-#: ../partman-ext2r0.templates:93 ../templates:90
+#: ../partman-ext2r0.templates:93
 msgid "Go back to the menu and correct this problem?"
 msgstr "Ð’ÐµÑ€Ð½ÑƒÑ‚ÑŒÑÑ Ð² Ð¼ÐµÐ½ÑŽ Ð¸ Ð¸ÑÐ¿Ñ€Ð°Ð²Ð¸Ñ‚ÑŒ ÑÑ‚Ñƒ Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ñƒ?"
 
 #. Type: boolean
 #. Description
-#: ../partman-ext2r0.templates:93 ../templates:90
+#: ../partman-ext2r0.templates:93
 msgid ""
 "Your root partition is not a primary partition of your hard disk.  This is "
 "needed by your machine in order to boot.  Please go back and use a primary "
@@ -4289,7 +4120,7 @@
 
 #. Type: boolean
 #. Description
-#: ../partman-ext2r0.templates:93 ../templates:90
+#: ../partman-ext2r0.templates:93
 msgid ""
 "If you do not go back to the partitioning menu and correct this error, the "
 "partition will be used as is.  This means that you may not be able to boot "
@@ -4312,13 +4143,13 @@
 
 #. Type: note
 #. Description
-#: ../partman-target.templates:3 ../templates:3
+#: ../partman-target.templates:3
 msgid "Select a free space to create partitions in it."
 msgstr "Ð’Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ ÑÐ²Ð¾Ð±Ð¾Ð´Ð½Ð¾Ðµ Ð¿Ñ€Ð¾ÑÑ‚Ñ€Ð°Ð½ÑÑ‚Ð²Ð¾, Ð² ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ð¼ Ð±ÑƒÐ´ÑƒÑ‚ ÑÐ¾Ð·Ð´Ð°Ð½Ñ‹ Ñ€Ð°Ð·Ð´ÐµÐ»Ñ‹."
 
 #. Type: note
 #. Description
-#: ../partman-target.templates:3 ../templates:3
+#: ../partman-target.templates:3
 msgid ""
 "Select a device to remove all partitions in it and create a new empty "
 "partition table."
@@ -4356,7 +4187,7 @@
 
 #. Type: note
 #. Description
-#: ../partman-target.templates:3 ../templates:3
+#: ../partman-target.templates:3
 msgid ""
 "In general you will want to format the partition with a newly created file "
 "system.  NOTE: all data in the partition will be irreversibly deleted.  If "
@@ -4372,7 +4203,7 @@
 
 #. Type: note
 #. Description
-#: ../partman-target.templates:3 ../templates:3
+#: ../partman-target.templates:3
 msgid "${ARCHITECTURE_HELP}"
 msgstr "${ARCHITECTURE_HELP}"
 
@@ -4407,13 +4238,13 @@
 
 #. Type: error
 #. Description
-#: ../partman-target.templates:42 ../templates:44
+#: ../partman-target.templates:42
 msgid "Identical mount points for two file systems"
 msgstr "ÐžÐ´Ð¸Ð½Ð°ÐºÐ¾Ð²Ñ‹Ðµ Ñ‚Ð¾Ñ‡ÐºÐ¸ Ð¼Ð¾Ð½Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð´Ð»Ñ Ð´Ð²ÑƒÑ… Ñ„Ð°Ð¹Ð»Ð¾Ð²Ñ‹Ñ… ÑÐ¸ÑÑ‚ÐµÐ¼"
 
 #. Type: error
 #. Description
-#: ../partman-target.templates:42 ../templates:44
+#: ../partman-target.templates:42
 msgid ""
 "Two file systems are assigned the same mount point (${MOUNTPOINT}): ${PART1} "
 "and ${PART2}."
@@ -4423,37 +4254,37 @@
 
 #. Type: error
 #. Description
-#: ../partman-target.templates:42 ../templates:44
+#: ../partman-target.templates:42
 msgid "Please correct this by changing mount points."
 msgstr "ÐŸÐ¾Ð¶Ð°Ð»ÑƒÐ¹ÑÑ‚Ð°, Ð¿Ð¾Ð¿Ñ€Ð°Ð²ÑŒÑ‚Ðµ Ñ‚Ð¾Ñ‡ÐºÐ¸ Ð¼Ð¾Ð½Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ."
 
 #. Type: error
 #. Description
-#: ../partman-target.templates:50 ../templates:52
+#: ../partman-target.templates:50
 msgid "No root file system"
 msgstr "ÐÐµÑ‚ ÐºÐ¾Ñ€Ð½ÐµÐ²Ð¾Ð¹ Ñ„Ð°Ð¹Ð»Ð¾Ð²Ð¾Ð¹ ÑÐ¸ÑÑ‚ÐµÐ¼Ñ‹ (root file system)"
 
 #. Type: error
 #. Description
-#: ../partman-target.templates:50 ../templates:52
+#: ../partman-target.templates:50
 msgid "No root file system is defined."
 msgstr "ÐšÐ¾Ñ€Ð½ÐµÐ²Ð°Ñ Ñ„Ð°Ð¹Ð»Ð¾Ð²Ð°Ñ ÑÐ¸ÑÑ‚ÐµÐ¼Ð° Ð½Ðµ Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»ÐµÐ½Ð°."
 
 #. Type: error
 #. Description
-#: ../partman-target.templates:50 ../templates:52
+#: ../partman-target.templates:50
 msgid "Please correct this from the partitioning menu."
 msgstr "Ð˜ÑÐ¿Ñ€Ð°Ð²ÑŒÑ‚Ðµ ÑÑ‚Ð¾ Ð¸Ð· Ð¼ÐµÐ½ÑŽ Ñ€Ð°Ð·Ð¼ÐµÑ‚ÐºÐ¸."
 
 #. Type: boolean
 #. Description
-#: ../partman-target.templates:57 ../templates:59
+#: ../partman-target.templates:57
 msgid "Do you want to resume partitioning?"
 msgstr "Ð¥Ð¾Ñ‚Ð¸Ñ‚Ðµ Ð»Ð¸ Ð²Ñ‹ Ð¿Ñ€Ð¾Ð´Ð¾Ð»Ð¶Ð¸Ñ‚ÑŒ Ñ€Ð°Ð·Ð¼ÐµÑ‚ÐºÑƒ?"
 
 #. Type: boolean
 #. Description
-#: ../partman-target.templates:57 ../templates:59
+#: ../partman-target.templates:57
 msgid ""
 "The attempt to mount a file system with type ${TYPE} in ${DEVICE} at "
 "${MOUNTPOINT} failed."
@@ -4463,43 +4294,43 @@
 
 #. Type: boolean
 #. Description
-#: ../partman-target.templates:57 ../templates:59
+#: ../partman-target.templates:57
 msgid "You may resume partitioning from the partitioning menu."
 msgstr "ÐŸÑ€Ð¾Ð´Ð¾Ð»Ð¶Ð¸Ñ‚ÑŒ Ñ€Ð°Ð·Ð¼ÐµÑ‚ÐºÑƒ Ð¼Ð¾Ð¶Ð½Ð¾ Ð¸Ð· Ð³Ð»Ð°Ð²Ð½Ð¾Ð³Ð¾ Ð¼ÐµÐ½ÑŽ Ñ€Ð°Ð·Ð¼ÐµÑ‚ÐºÐ¸."
 
 #. Type: select
 #. Description
-#: ../partman-target.templates:66 ../templates:68
+#: ../partman-target.templates:66
 msgid "File system for this partition:"
 msgstr "Ð’Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ Ñ„Ð°Ð¹Ð»Ð¾Ð²ÑƒÑŽ ÑÐ¸ÑÑ‚ÐµÐ¼Ñƒ Ð´Ð»Ñ ÑÑ‚Ð¾Ð³Ð¾ Ñ€Ð°Ð·Ð´ÐµÐ»Ð°:"
 
 #. Type: select
 #. Description
-#: ../partman-target.templates:71 ../templates:73
+#: ../partman-target.templates:71
 msgid "How to use this partition:"
 msgstr "ÐŸÑ€Ð¸Ð½Ñ†Ð¸Ð¿ Ð¿Ñ€Ð¸Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ ÑÑ‚Ð¾Ð³Ð¾ Ñ€Ð°Ð·Ð´ÐµÐ»Ð°:"
 
 #. Type: text
 #. Description
-#: ../partman-target.templates:75 ../templates:77
+#: ../partman-target.templates:75
 msgid "File system:"
 msgstr "Ð¤Ð°Ð¹Ð»Ð¾Ð²Ð°Ñ ÑÐ¸ÑÑ‚ÐµÐ¼Ð°:"
 
 #. Type: text
 #. Description
-#: ../partman-target.templates:79 ../templates:81
+#: ../partman-target.templates:79
 msgid "Use as:"
 msgstr "Ð˜ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ ÐºÐ°Ðº:"
 
 #. Type: text
 #. Description
-#: ../partman-target.templates:83 ../templates:85
+#: ../partman-target.templates:83
 msgid "no file system"
 msgstr "Ð½ÐµÑ‚ Ñ„Ð°Ð¹Ð»Ð¾Ð²Ð¾Ð¹ ÑÐ¸ÑÑ‚ÐµÐ¼Ñ‹"
 
 #. Type: text
 #. Description
-#: ../partman-target.templates:87 ../templates:89
+#: ../partman-target.templates:87
 msgid "Help on partitioning"
 msgstr "Ð¡Ð¿Ñ€Ð°Ð²ÐºÐ° Ð¿Ð¾ Ñ€Ð°Ð·Ð¼ÐµÑ‚ÐºÐµ"
 
@@ -4681,7 +4512,8 @@
 #. The English text to translate for this list of timezones is:
 #. Godthab, Danmarkshavn, Scoresbysund, Thule
 #: ../common.templates:164
-msgid "America/Godthab, America/Danmarkshavn, America/Scoresbysund, America/Thule"
+msgid ""
+"America/Godthab, America/Danmarkshavn, America/Scoresbysund, America/Thule"
 msgstr "Ð“Ð¾Ñ‚Ñ…Ð¾Ð±, Ð”ÐµÐ½Ð¼Ð°Ñ€ÐºÑˆÐ°Ð²Ð½, Ð¡ÐºÐ¾Ñ€ÐµÑÐ±Ð¸ÑÑƒÐ½Ð´, Ð¢ÑƒÐ»Ðµ"
 
 #. Type: select
@@ -5019,57 +4851,58 @@
 
 #. Type: error
 #. Description
-#: ../base-installer.templates:30 ../base-installer.templates:32
+#: ../base-installer.templates:30
 msgid "Failed to install the base system"
 msgstr "ÐÐµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ Ð±Ð°Ð·Ð¾Ð²ÑƒÑŽ ÑÐ¸ÑÑ‚ÐµÐ¼Ñƒ"
 
 #. Type: error
 #. Description
-#: ../base-installer.templates:30 ../base-installer.templates:32
+#: ../base-installer.templates:30
 msgid "The base system installation into /target/ failed."
 msgstr "ÐÐµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ Ð±Ð°Ð·Ð¾Ð²ÑƒÑŽ ÑÐ¸ÑÑ‚ÐµÐ¼Ñƒ Ð² ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³ /target/."
 
 #. Type: error
 #. Description
-#: ../base-installer.templates:37 ../base-installer.templates:39
-msgid "The debootstrap program exited with an error (return value ${EXITCODE})."
+#: ../base-installer.templates:37
+msgid ""
+"The debootstrap program exited with an error (return value ${EXITCODE})."
 msgstr ""
 "ÐŸÑ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð° debootstrap Ð·Ð°Ð²ÐµÑ€ÑˆÐ¸Ð»Ð° ÑÐ²Ð¾ÑŽ Ñ€Ð°Ð±Ð¾Ñ‚Ñƒ Ð¸Ð·-Ð·Ð° Ð¾ÑˆÐ¸Ð±ÐºÐ¸ (ÐºÐ¾Ð´ Ð¾ÑˆÐ¸Ð±ÐºÐ¸ "
 "${EXITCODE})."
 
 #. Type: error
 #. Description
-#: ../base-installer.templates:44 ../base-installer.templates:46
+#: ../base-installer.templates:44
 msgid "Base system installation error"
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸ Ð±Ð°Ð·Ð¾Ð²Ð¾Ð¹ ÑÐ¸ÑÑ‚ÐµÐ¼Ñ‹"
 
 #. Type: error
 #. Description
-#: ../base-installer.templates:44 ../base-installer.templates:46
+#: ../base-installer.templates:44
 msgid "The debootstrap program exited abnormally."
 msgstr "ÐŸÑ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð° debootstrap Ð·Ð°Ð²ÐµÑ€ÑˆÐ¸Ð»Ð°ÑÑŒ Ð°Ð²Ð°Ñ€Ð¸Ð¹Ð½Ð¾."
 
 #. Type: error
 #. Description
-#: ../base-installer.templates:51 ../base-installer.templates:53
+#: ../base-installer.templates:51
 msgid "The following error occurred:"
 msgstr "ÐŸÑ€Ð¾Ð¸Ð·Ð¾ÑˆÐ»Ð° ÑÐ»ÐµÐ´ÑƒÑŽÑ‰Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°:"
 
 #. Type: error
 #. Description
-#: ../base-installer.templates:51 ../base-installer.templates:53
+#: ../base-installer.templates:51
 msgid "${ERROR}"
 msgstr "${ERROR}"
 
 #. Type: error
 #. Description
-#: ../base-installer.templates:60 ../base-installer.templates:67
+#: ../base-installer.templates:60
 msgid "Unable to install the selected kernel"
 msgstr "ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ Ð²Ñ‹Ð±Ñ€Ð°Ð½Ð½Ð¾Ðµ ÑÐ´Ñ€Ð¾"
 
 #. Type: error
 #. Description
-#: ../base-installer.templates:60 ../base-installer.templates:67
+#: ../base-installer.templates:60
 msgid ""
 "An error was returned while trying to install the kernel into the target "
 "system."
@@ -5077,7 +4910,7 @@
 
 #. Type: error
 #. Description
-#: ../base-installer.templates:60 ../base-installer.templates:67
+#: ../base-installer.templates:60
 msgid "Kernel package: '${KERNEL}'."
 msgstr "ÐŸÐ°ÐºÐµÑ‚ Ñ ÑÐ´Ñ€Ð¾Ð¼: '${KERNEL}'."
 
@@ -5089,13 +4922,13 @@
 
 #. Type: select
 #. Description
-#: ../base-installer.templates:71 ../base-installer.templates:78
+#: ../base-installer.templates:71
 msgid "Kernel to install:"
 msgstr "Ð¯Ð´Ñ€Ð¾ Ð´Ð»Ñ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸:"
 
 #. Type: select
 #. Description
-#: ../base-installer.templates:71 ../base-installer.templates:78
+#: ../base-installer.templates:71
 msgid ""
 "The list shows the available kernels. Please choose one of them in order to "
 "make the system bootable from the hard drive."
@@ -5109,15 +4942,12 @@
 msgid "Continue without installing a kernel?"
 msgstr "ÐŸÑ€Ð¾Ð´Ð¾Ð»Ð¶Ð¸Ñ‚ÑŒ Ð±ÐµÐ· ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸ ÑÐ´Ñ€Ð°?"
 
-#. #-#-#-#-#  template.pot (debian-installer)  #-#-#-#-#
 #. Type: boolean
 #. Description
-#. #-#-#-#-#  template.pot (debian-installer)  #-#-#-#-#
-#. Type: error
-#. Description
-#: ../base-installer.templates:78 ../base-installer.templates:84
+#: ../base-installer.templates:78
 msgid "No installable kernel was found in the defined APT sources."
-msgstr "Ð’ Ð·Ð°Ð´Ð°Ð½Ð½Ñ‹Ñ… Ð¸ÑÑ‚Ð¾Ñ‡Ð½Ð¸ÐºÐ°Ñ… APT Ð½Ðµ Ð±Ñ‹Ð»Ð¾ Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾ ÑÐ´Ñ€Ð°, Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ð¾Ð³Ð¾ Ð´Ð»Ñ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸."
+msgstr ""
+"Ð’ Ð·Ð°Ð´Ð°Ð½Ð½Ñ‹Ñ… Ð¸ÑÑ‚Ð¾Ñ‡Ð½Ð¸ÐºÐ°Ñ… APT Ð½Ðµ Ð±Ñ‹Ð»Ð¾ Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾ ÑÐ´Ñ€Ð°, Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ð¾Ð³Ð¾ Ð´Ð»Ñ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸."
 
 #. Type: boolean
 #. Description
@@ -5141,7 +4971,8 @@
 #. Description
 #: ../base-installer.templates:87
 msgid "The installer cannot find a suitable kernel package to install."
-msgstr "ÐŸÑ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ðµ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐµ Ð½Ðµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ Ð½Ð°Ð¹Ñ‚Ð¸ Ð¿Ð¾Ð´Ñ…Ð¾Ð´ÑÑ‰Ð¸Ð¹ Ð¿Ð°ÐºÐµÑ‚ Ñ ÑÐ´Ñ€Ð¾Ð¼ Ð´Ð»Ñ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸."
+msgstr ""
+"ÐŸÑ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ðµ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐµ Ð½Ðµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ Ð½Ð°Ð¹Ñ‚Ð¸ Ð¿Ð¾Ð´Ñ…Ð¾Ð´ÑÑ‰Ð¸Ð¹ Ð¿Ð°ÐºÐµÑ‚ Ñ ÑÐ´Ñ€Ð¾Ð¼ Ð´Ð»Ñ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸."
 
 #. Type: error
 #. Description
@@ -5167,7 +4998,7 @@
 
 #. Type: error
 #. Description
-#: ../base-installer.templates:100 ../base-installer.templates:111
+#: ../base-installer.templates:100
 msgid "Failed getting Release file ${SUBST0}."
 msgstr "ÐÐµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ Ð¿Ð¾Ð»ÑƒÑ‡Ð¸Ñ‚ÑŒ Ñ„Ð°Ð¹Ð» Release ${SUBST0}."
 
@@ -5185,19 +5016,19 @@
 
 #. Type: error
 #. Description
-#: ../base-installer.templates:115 ../base-installer.templates:116
+#: ../base-installer.templates:115
 msgid "Invalid Release file: no valid components."
 msgstr "ÐÐµÐ²ÐµÑ€Ð½Ñ‹Ð¹ Ñ„Ð°Ð¹Ð» Release: Ð½ÐµÑ‚ Ð´Ð¾Ð¿ÑƒÑÑ‚Ð¸Ð¼Ñ‹Ñ… ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ð¾Ð²."
 
 #. Type: error
 #. Description
-#: ../base-installer.templates:120 ../base-installer.templates:121
+#: ../base-installer.templates:120
 msgid "Invalid Release file: no entry for ${SUBST0}."
 msgstr "ÐÐµÐ²ÐµÑ€Ð½Ñ‹Ð¹ Ñ„Ð°Ð¹Ð» Release: Ð¾Ñ‚ÑÑƒÑ‚ÑÑ‚Ð²ÑƒÐµÑ‚ Ð¾Ð¿Ð¸ÑÐ°Ð½Ð¸Ðµ Ð´Ð»Ñ ${SUBST0}."
 
 #. Type: error
 #. Description
-#: ../base-installer.templates:125 ../base-installer.templates:131
+#: ../base-installer.templates:125
 msgid "Debootstrap Error"
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° Debootstrap"
 
@@ -5230,14 +5061,13 @@
 #. Type: text
 #. Description
 #: ../base-installer.templates:142 ../apt-setup-udeb.templates:15
-#: ../prebaseconfig.templates:12 ../base-installer.templates:144
-#: ../templates:12
+#: ../prebaseconfig.templates:12
 msgid "Running ${SCRIPT}..."
 msgstr "Ð—Ð°Ð¿ÑƒÑÐº ${SCRIPT}..."
 
 #. Type: text
 #. Description
-#: ../base-installer.templates:146 ../base-installer.templates:152
+#: ../base-installer.templates:146
 msgid "Retrieving Release file"
 msgstr "ÐŸÐ¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ðµ Ñ„Ð°Ð¹Ð»Ð° Release"
 
@@ -5249,13 +5079,13 @@
 
 #. Type: text
 #. Description
-#: ../base-installer.templates:154 ../base-installer.templates:156
+#: ../base-installer.templates:154
 msgid "Finding package sizes"
 msgstr "ÐžÐ¿Ñ€ÐµÐ´ÐµÐ»ÐµÐ½Ð¸Ðµ Ñ€Ð°Ð·Ð¼ÐµÑ€Ð¾Ð² Ð¿Ð°ÐºÐµÑ‚Ð¾Ð²"
 
 #. Type: text
 #. Description
-#: ../base-installer.templates:158 ../base-installer.templates:160
+#: ../base-installer.templates:158
 msgid "Retrieving Packages files"
 msgstr "ÐŸÐ¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ðµ Ñ„Ð°Ð¹Ð»Ð¾Ð² Packages"
 
@@ -5267,19 +5097,19 @@
 
 #. Type: text
 #. Description
-#: ../base-installer.templates:166 ../base-installer.templates:164
+#: ../base-installer.templates:166
 msgid "Retrieving packages"
 msgstr "ÐŸÐ¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ðµ Ð¿Ð°ÐºÐµÑ‚Ð¾Ð²"
 
 #. Type: text
 #. Description
-#: ../base-installer.templates:170 ../base-installer.templates:168
+#: ../base-installer.templates:170
 msgid "Extracting packages"
 msgstr "Ð Ð°ÑÐ¿Ð°ÐºÐ¾Ð²ÐºÐ° Ð¿Ð°ÐºÐµÑ‚Ð¾Ð²"
 
 #. Type: text
 #. Description
-#: ../base-installer.templates:174 ../base-installer.templates:172
+#: ../base-installer.templates:174
 msgid "Installing the base system"
 msgstr "Ð£ÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ° Ð±Ð°Ð·Ð¾Ð²Ð¾Ð¹ ÑÐ¸ÑÑ‚ÐµÐ¼Ñ‹"
 
@@ -5315,25 +5145,25 @@
 
 #. Type: text
 #. Description
-#: ../base-installer.templates:198 ../base-installer.templates:176
+#: ../base-installer.templates:198
 msgid "${SECTION}: ${INFO}..."
 msgstr "${SECTION}: ${INFO}..."
 
 #. Type: text
 #. Description
-#: ../base-installer.templates:202 ../base-installer.templates:180
+#: ../base-installer.templates:202
 msgid "Validating ${SUBST0}..."
 msgstr "ÐŸÑ€Ð¾Ð²ÐµÑ€ÐºÐ° ${SUBST0}..."
 
 #. Type: text
 #. Description
-#: ../base-installer.templates:206 ../base-installer.templates:184
+#: ../base-installer.templates:206
 msgid "Retrieving ${SUBST0}..."
 msgstr "ÐŸÐ¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ðµ ${SUBST0}..."
 
 #. Type: text
 #. Description
-#: ../base-installer.templates:210 ../base-installer.templates:188
+#: ../base-installer.templates:210
 msgid "Extracting ${SUBST0}..."
 msgstr "Ð˜Ð·Ð²Ð»ÐµÑ‡ÐµÐ½Ð¸Ðµ ${SUBST0}..."
 
@@ -5381,25 +5211,25 @@
 
 #. Type: text
 #. Description
-#: ../base-installer.templates:242 ../base-installer.templates:196
+#: ../base-installer.templates:242
 msgid "Installing core packages..."
 msgstr "Ð£ÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ° Ð¾ÑÐ½Ð¾Ð²Ð½Ñ‹Ñ… (core) Ð¿Ð°ÐºÐµÑ‚Ð¾Ð²..."
 
 #. Type: text
 #. Description
-#: ../base-installer.templates:246 ../base-installer.templates:200
+#: ../base-installer.templates:246
 msgid "Unpacking required packages..."
 msgstr "Ð Ð°ÑÐ¿Ð°ÐºÐ¾Ð²ÐºÐ° Ð½ÐµÐ¾Ð±Ñ…Ð¾Ð´Ð¸Ð¼Ñ‹Ñ… (required) Ð¿Ð°ÐºÐµÑ‚Ð¾Ð²..."
 
 #. Type: text
 #. Description
-#: ../base-installer.templates:250 ../base-installer.templates:204
+#: ../base-installer.templates:250
 msgid "Configuring required packages..."
 msgstr "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ° Ð½ÐµÐ¾Ð±Ñ…Ð¾Ð´Ð¸Ð¼Ñ‹Ñ… (required) Ð¿Ð°ÐºÐµÑ‚Ð¾Ð²..."
 
 #. Type: text
 #. Description
-#: ../base-installer.templates:254 ../base-installer.templates:208
+#: ../base-installer.templates:254
 msgid "Installing base packages..."
 msgstr "Ð£ÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ° Ð±Ð°Ð·Ð¾Ð²Ñ‹Ñ… (base) Ð¿Ð°ÐºÐµÑ‚Ð¾Ð²..."
 
@@ -5417,7 +5247,7 @@
 
 #. Type: text
 #. Description
-#: ../base-installer.templates:266 ../base-installer.templates:212
+#: ../base-installer.templates:266
 msgid "Base system installed successfully."
 msgstr "Ð£ÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ° Ð±Ð°Ð·Ð¾Ð²Ð¾Ð¹ ÑÐ¸ÑÑ‚ÐµÐ¼Ñ‹ Ð¿Ñ€Ð¾ÑˆÐ»Ð° ÑƒÑÐ¿ÐµÑˆÐ½Ð¾."
 
@@ -5441,68 +5271,64 @@
 
 #. Type: text
 #. Description
-#: ../base-installer.templates:279 ../base-installer.templates:216
+#: ../base-installer.templates:279
 msgid "Configuring APT sources..."
 msgstr "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ° Ð¸ÑÑ‚Ð¾Ñ‡Ð½Ð¸ÐºÐ¾Ð² APT..."
 
 #. Type: text
 #. Description
-#: ../base-installer.templates:283 ../base-installer.templates:220
+#: ../base-installer.templates:283
 msgid "Updating the list of available packages..."
 msgstr "ÐžÐ±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ðµ ÑÐ¿Ð¸ÑÐºÐ° Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ñ‹Ñ… Ð¿Ð°ÐºÐµÑ‚Ð¾Ð²..."
 
 #. Type: text
 #. Description
-#: ../base-installer.templates:287 ../base-installer.templates:224
+#: ../base-installer.templates:287
 msgid "Installing extra packages..."
 msgstr "Ð£ÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ° Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ñ‹Ñ… (extra) Ð¿Ð°ÐºÐµÑ‚Ð¾Ð²..."
 
 #. Type: text
 #. Description
-#: ../base-installer.templates:291 ../base-installer.templates:228
+#: ../base-installer.templates:291
 msgid "Installing extra packages - retrieving and installing ${SUBST0}..."
-msgstr "Ð£ÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ° Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ñ‹Ñ… (extra) Ð¿Ð°ÐºÐµÑ‚Ð¾Ð² - Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ðµ Ð¸ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ° ${SUBST0}..."
+msgstr ""
+"Ð£ÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ° Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ñ‹Ñ… (extra) Ð¿Ð°ÐºÐµÑ‚Ð¾Ð² - Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ðµ Ð¸ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ° ${SUBST0}..."
 
 #. Type: text
 #. Description
-#: ../base-installer.templates:295 ../base-installer.templates:232
+#: ../base-installer.templates:295
 msgid "Creating device files..."
 msgstr "Ð¡Ð¾Ð·Ð´Ð°Ð½Ð¸Ðµ Ñ„Ð°Ð¹Ð»Ð¾Ð² ÑƒÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð²..."
 
 #. Type: text
 #. Description
-#: ../base-installer.templates:299 ../base-installer.templates:236
+#: ../base-installer.templates:299
 msgid "Selecting the kernel to install..."
 msgstr "Ð’Ñ‹Ð±Ð¾Ñ€ ÑÐ´Ñ€Ð° Ð´Ð»Ñ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸..."
 
 #. Type: text
 #. Description
-#: ../base-installer.templates:303 ../base-installer.templates:240
+#: ../base-installer.templates:303
 msgid "Installing the kernel..."
 msgstr "Ð£ÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ° ÑÐ´Ñ€Ð°..."
 
 #. Type: text
 #. Description
-#: ../base-installer.templates:307 ../base-installer.templates:244
+#: ../base-installer.templates:307
 msgid "Installing the kernel - retrieving and installing ${SUBST0}..."
 msgstr "Ð£ÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ° ÑÐ´Ñ€Ð° - Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ðµ Ð¸ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ° ${SUBST0}..."
 
 #. Type: text
 #. Description
-#: ../base-installer.templates:311 ../base-installer.templates:248
+#: ../base-installer.templates:311
 msgid "Installing the PCMCIA modules"
 msgstr "Ð£ÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ° Ð¼Ð¾Ð´ÑƒÐ»ÐµÐ¹ PCMCIA"
 
-#. #-#-#-#-#  template.pot (debian-installer)  #-#-#-#-#
 #. Type: text
 #. Description
 #. Item in the main menu to select this package
 #. TRANSLATORS: <65 columns
-#. #-#-#-#-#  template.pot (debian-installer)  #-#-#-#-#
-#. Type: text
-#. Description
-#. Item in the main menu to select this package
-#: ../base-installer.templates:317 ../base-installer.templates:253
+#: ../base-installer.templates:317
 msgid "Install the base system"
 msgstr "Ð£ÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ° Ð±Ð°Ð·Ð¾Ð²Ð¾Ð¹ ÑÐ¸ÑÑ‚ÐµÐ¼Ñ‹"
 
@@ -5542,9 +5368,9 @@
 "updates will not be made available to you at this time. You should "
 "investigate this later."
 msgstr ""
-"ÐžÐ±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð±ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾ÑÑ‚Ð¸ Ñ ${SECURITY_HOST} Ð½ÐµÐ´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ñ‹, "
-"Ð¿Ð¾ÑÑ‚Ð¾Ð¼Ñƒ Ð² Ð´Ð°Ð½Ð½Ñ‹Ð¹ Ð¼Ð¾Ð¼ÐµÐ½Ñ‚ Ð½Ð¸Ñ‡ÐµÐ³Ð¾ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¾ Ð½Ðµ Ð±ÑƒÐ´ÐµÑ‚. ÐŸÐ¾Ð·Ð¶Ðµ, Ð²Ð°Ð¼ "
-"Ð»ÑƒÑ‡ÑˆÐµ Ð²Ñ‹ÑÑÐ½Ð¸Ñ‚ÑŒ Ð¿Ð¾Ñ‡ÐµÐ¼Ñƒ ÑÑ‚Ð¾ Ð¿Ñ€Ð¾Ð¸Ð·Ð¾ÑˆÐ»Ð¾."
+"ÐžÐ±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð±ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾ÑÑ‚Ð¸ Ñ ${SECURITY_HOST} Ð½ÐµÐ´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ñ‹, Ð¿Ð¾ÑÑ‚Ð¾Ð¼Ñƒ Ð² Ð´Ð°Ð½Ð½Ñ‹Ð¹ "
+"Ð¼Ð¾Ð¼ÐµÐ½Ñ‚ Ð½Ð¸Ñ‡ÐµÐ³Ð¾ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¾ Ð½Ðµ Ð±ÑƒÐ´ÐµÑ‚. ÐŸÐ¾Ð·Ð¶Ðµ, Ð²Ð°Ð¼ Ð»ÑƒÑ‡ÑˆÐµ Ð²Ñ‹ÑÑÐ½Ð¸Ñ‚ÑŒ Ð¿Ð¾Ñ‡ÐµÐ¼Ñƒ ÑÑ‚Ð¾ "
+"Ð¿Ñ€Ð¾Ð¸Ð·Ð¾ÑˆÐ»Ð¾."
 
 #. Type: error
 #. Description
@@ -5553,8 +5379,8 @@
 "Commented out entries for ${SECURITY_HOST} have been added to the /etc/apt/"
 "sources.list file."
 msgstr ""
-"Ð’Ñ‹Ð¿Ð¾Ð»ÐµÐ½Ð¾ Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ðµ Ð·Ð°ÐºÐ¾Ð¼Ð¼ÐµÐ½Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ñ‹Ñ… Ð·Ð°Ð¿Ð¸ÑÐµÐ¹ Ð´Ð»Ñ ${SECURITY_HOST} "
-"Ð² Ñ„Ð°Ð¹Ð» /etc/apt/sources.list."
+"Ð’Ñ‹Ð¿Ð¾Ð»ÐµÐ½Ð¾ Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ðµ Ð·Ð°ÐºÐ¾Ð¼Ð¼ÐµÐ½Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ñ‹Ñ… Ð·Ð°Ð¿Ð¸ÑÐµÐ¹ Ð´Ð»Ñ ${SECURITY_HOST} Ð² Ñ„Ð°Ð¹Ð» /"
+"etc/apt/sources.list."
 
 #. Type: text
 #. Description
@@ -5575,8 +5401,8 @@
 "An attempt to configure apt to install additional packages from the CD "
 "failed."
 msgstr ""
-"ÐÐµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ Ð²Ñ‹Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÑŒ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÑƒ apt Ð´Ð»Ñ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ñ‹Ñ… Ð¿Ð°ÐºÐµÑ‚Ð¾Ð² "
-"Ñ ÐºÐ¾Ð¼Ð¿Ð°ÐºÑ‚-Ð´Ð¸ÑÐºÐ°."
+"ÐÐµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ Ð²Ñ‹Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÑŒ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÑƒ apt Ð´Ð»Ñ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ñ‹Ñ… Ð¿Ð°ÐºÐµÑ‚Ð¾Ð² Ñ "
+"ÐºÐ¾Ð¼Ð¿Ð°ÐºÑ‚-Ð´Ð¸ÑÐºÐ°."
 
 #. Type: text
 #. Description
@@ -5599,10 +5425,10 @@
 "to install it. This software has varying licenses which may prevent you from "
 "using, modifying, or sharing it."
 msgstr ""
-"Ð’ Ð²Ð¸Ð´Ðµ Ð¿Ð°ÐºÐµÑ‚Ð¾Ð² Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ð¾ Ð½ÐµÑÐ²Ð¾Ð±Ð¾Ð´Ð½Ð¾Ðµ ÐŸÐž. Ð¥Ð¾Ñ‚Ñ, Ð¾Ð½Ð¾ Ð½Ðµ ÑÐ²Ð»ÑÐµÑ‚ÑÑ "
-"Ñ‡Ð°ÑÑ‚ÑŒÑŽ Ð¾ÑÐ½Ð¾Ð²Ð½Ð¾Ð³Ð¾ Ð´Ð¸ÑÑ‚Ñ€Ð¸Ð±ÑƒÑ‚Ð¸Ð²Ð°, Ð´Ð»Ñ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸ Ð¼Ð¾Ð¶Ð½Ð¾ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ "
-"ÑÑ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ñ‹Ðµ ÑƒÑ‚Ð¸Ð»Ð¸Ñ‚Ñ‹. Ð”Ð°Ð½Ð½Ð¾Ðµ ÐŸÐž Ð¸Ð¼ÐµÐµÑ‚ Ñ€Ð°Ð·Ð»Ð¸Ñ‡Ð½Ñ‹Ðµ Ð»Ð¸Ñ†ÐµÐ½Ð·Ð¸Ð¸, ÑÐ¾Ð³Ð»Ð°ÑÐ½Ð¾ "
-"ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ð¼ Ð²Ð°Ð¼ Ð¸Ð½Ð¾Ð³Ð´Ð° Ð½ÐµÐ»ÑŒÐ·Ñ ÐµÐ³Ð¾ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ, Ð¸Ð·Ð¼ÐµÐ½ÑÑ‚ÑŒ Ð¸Ð»Ð¸ Ñ€Ð°ÑÐ¿Ñ€Ð¾ÑÑ‚Ñ€Ð°Ð½ÑÑ‚ÑŒ."
+"Ð’ Ð²Ð¸Ð´Ðµ Ð¿Ð°ÐºÐµÑ‚Ð¾Ð² Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ð¾ Ð½ÐµÑÐ²Ð¾Ð±Ð¾Ð´Ð½Ð¾Ðµ ÐŸÐž. Ð¥Ð¾Ñ‚Ñ, Ð¾Ð½Ð¾ Ð½Ðµ ÑÐ²Ð»ÑÐµÑ‚ÑÑ Ñ‡Ð°ÑÑ‚ÑŒÑŽ "
+"Ð¾ÑÐ½Ð¾Ð²Ð½Ð¾Ð³Ð¾ Ð´Ð¸ÑÑ‚Ñ€Ð¸Ð±ÑƒÑ‚Ð¸Ð²Ð°, Ð´Ð»Ñ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸ Ð¼Ð¾Ð¶Ð½Ð¾ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ ÑÑ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ñ‹Ðµ "
+"ÑƒÑ‚Ð¸Ð»Ð¸Ñ‚Ñ‹. Ð”Ð°Ð½Ð½Ð¾Ðµ ÐŸÐž Ð¸Ð¼ÐµÐµÑ‚ Ñ€Ð°Ð·Ð»Ð¸Ñ‡Ð½Ñ‹Ðµ Ð»Ð¸Ñ†ÐµÐ½Ð·Ð¸Ð¸, ÑÐ¾Ð³Ð»Ð°ÑÐ½Ð¾ ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ð¼ Ð²Ð°Ð¼ Ð¸Ð½Ð¾Ð³Ð´Ð° "
+"Ð½ÐµÐ»ÑŒÐ·Ñ ÐµÐ³Ð¾ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ, Ð¸Ð·Ð¼ÐµÐ½ÑÑ‚ÑŒ Ð¸Ð»Ð¸ Ñ€Ð°ÑÐ¿Ñ€Ð¾ÑÑ‚Ñ€Ð°Ð½ÑÑ‚ÑŒ."
 
 #. Type: boolean
 #. Description
@@ -5625,25 +5451,26 @@
 "software is not a part of Debian, but standard Debian tools can be used to "
 "install it."
 msgstr ""
-"Ð’ Ð²Ð¸Ð´Ðµ Ð¿Ð°ÐºÐµÑ‚Ð¾Ð² Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ð¾ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾Ðµ ÐŸÐž. Ð¥Ð¾Ñ‚Ñ, Ð¾Ð½Ð¾ Ð¸ ÑÐ²Ð¾Ð±Ð¾Ð´Ð½Ð¾Ðµ, "
-"Ð¾Ð½Ð¾ Ð·Ð°Ð²Ð¸ÑÐ¸Ñ‚ Ð¾Ñ‚ Ð½ÐµÑÐ²Ð¾Ð±Ð¾Ð´Ð½Ð¾Ð³Ð¾ ÐŸÐž. ÐžÐ½Ð¾ Ð½Ðµ ÑÐ²Ð»ÑÐµÑ‚ÑÑ Ñ‡Ð°ÑÑ‚ÑŒÑŽ Ð¾ÑÐ½Ð¾Ð²Ð½Ð¾Ð³Ð¾ "
-"Ð´Ð¸ÑÑ‚Ñ€Ð¸Ð±ÑƒÑ‚Ð¸Ð²Ð°, Ð½Ð¾ Ð´Ð»Ñ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸ Ð¼Ð¾Ð¶Ð½Ð¾ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ ÑÑ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ñ‹Ðµ ÑƒÑ‚Ð¸Ð»Ð¸Ñ‚Ñ‹."
+"Ð’ Ð²Ð¸Ð´Ðµ Ð¿Ð°ÐºÐµÑ‚Ð¾Ð² Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ð¾ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾Ðµ ÐŸÐž. Ð¥Ð¾Ñ‚Ñ, Ð¾Ð½Ð¾ Ð¸ ÑÐ²Ð¾Ð±Ð¾Ð´Ð½Ð¾Ðµ, Ð¾Ð½Ð¾ "
+"Ð·Ð°Ð²Ð¸ÑÐ¸Ñ‚ Ð¾Ñ‚ Ð½ÐµÑÐ²Ð¾Ð±Ð¾Ð´Ð½Ð¾Ð³Ð¾ ÐŸÐž. ÐžÐ½Ð¾ Ð½Ðµ ÑÐ²Ð»ÑÐµÑ‚ÑÑ Ñ‡Ð°ÑÑ‚ÑŒÑŽ Ð¾ÑÐ½Ð¾Ð²Ð½Ð¾Ð³Ð¾ Ð´Ð¸ÑÑ‚Ñ€Ð¸Ð±ÑƒÑ‚Ð¸Ð²Ð°, "
+"Ð½Ð¾ Ð´Ð»Ñ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸ Ð¼Ð¾Ð¶Ð½Ð¾ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ ÑÑ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ñ‹Ðµ ÑƒÑ‚Ð¸Ð»Ð¸Ñ‚Ñ‹."
 
 #. Type: boolean
 #. Description
 #: ../apt-mirror-setup.templates:19 ../apt-mirror-setup.templates-ubuntu:28
-msgid "Please choose whether you want this software to be made available to you."
+msgid ""
+"Please choose whether you want this software to be made available to you."
 msgstr "ÐÑƒÐ¶Ð½Ð¾ Ð»Ð¸ ÑÐ´ÐµÐ»Ð°Ñ‚ÑŒ Ð´Ð°Ð½Ð½Ð¾Ðµ ÐŸÐž Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ñ‹Ð¼?"
 
 #. Type: select
 #. Choices
-#: ../apt-mirror-setup.templates:30
+#: ../apt-mirror-setup.templates:32
 msgid "Ignore"
 msgstr "Ð˜Ð³Ð½Ð¾Ñ€Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ"
 
 #. Type: select
 #. Description
-#: ../apt-mirror-setup.templates:31
+#: ../apt-mirror-setup.templates:33
 msgid ""
 "The installer failed to access the mirror. This may be a problem with your "
 "network, or with the mirror. You can choose to retry the download, select a "
@@ -5671,10 +5498,10 @@
 "can be used to install it. This software has varying licenses which may "
 "prevent you from using, modifying, or sharing it."
 msgstr ""
-"Ð’ Ð²Ð¸Ð´Ðµ Ð¿Ð°ÐºÐµÑ‚Ð¾Ð² Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ð¾ Ð½ÐµÑÐ²Ð¾Ð±Ð¾Ð´Ð½Ð¾Ðµ ÐŸÐž. Ð¥Ð¾Ñ‚Ñ, Ð¾Ð½Ð¾ Ð½Ðµ ÑÐ²Ð»ÑÐµÑ‚ÑÑ "
-"Ñ‡Ð°ÑÑ‚ÑŒÑŽ Ð¾ÑÐ½Ð¾Ð²Ð½Ð¾Ð³Ð¾ Ð´Ð¸ÑÑ‚Ñ€Ð¸Ð±ÑƒÑ‚Ð¸Ð²Ð°, Ð´Ð»Ñ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸ Ð¼Ð¾Ð¶Ð½Ð¾ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ "
-"ÑÑ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ñ‹Ðµ ÑƒÑ‚Ð¸Ð»Ð¸Ñ‚Ñ‹. Ð”Ð°Ð½Ð½Ð¾Ðµ ÐŸÐž Ð¸Ð¼ÐµÐµÑ‚ Ñ€Ð°Ð·Ð»Ð¸Ñ‡Ð½Ñ‹Ðµ Ð»Ð¸Ñ†ÐµÐ½Ð·Ð¸Ð¸, ÑÐ¾Ð³Ð»Ð°ÑÐ½Ð¾ "
-"ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ð¼ Ð²Ð°Ð¼ Ð¸Ð½Ð¾Ð³Ð´Ð° Ð½ÐµÐ»ÑŒÐ·Ñ ÐµÐ³Ð¾ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ, Ð¸Ð·Ð¼ÐµÐ½ÑÑ‚ÑŒ Ð¸Ð»Ð¸ Ñ€Ð°ÑÐ¿Ñ€Ð¾ÑÑ‚Ñ€Ð°Ð½ÑÑ‚ÑŒ."
+"Ð’ Ð²Ð¸Ð´Ðµ Ð¿Ð°ÐºÐµÑ‚Ð¾Ð² Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ð¾ Ð½ÐµÑÐ²Ð¾Ð±Ð¾Ð´Ð½Ð¾Ðµ ÐŸÐž. Ð¥Ð¾Ñ‚Ñ, Ð¾Ð½Ð¾ Ð½Ðµ ÑÐ²Ð»ÑÐµÑ‚ÑÑ Ñ‡Ð°ÑÑ‚ÑŒÑŽ "
+"Ð¾ÑÐ½Ð¾Ð²Ð½Ð¾Ð³Ð¾ Ð´Ð¸ÑÑ‚Ñ€Ð¸Ð±ÑƒÑ‚Ð¸Ð²Ð°, Ð´Ð»Ñ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸ Ð¼Ð¾Ð¶Ð½Ð¾ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ ÑÑ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ñ‹Ðµ "
+"ÑƒÑ‚Ð¸Ð»Ð¸Ñ‚Ñ‹. Ð”Ð°Ð½Ð½Ð¾Ðµ ÐŸÐž Ð¸Ð¼ÐµÐµÑ‚ Ñ€Ð°Ð·Ð»Ð¸Ñ‡Ð½Ñ‹Ðµ Ð»Ð¸Ñ†ÐµÐ½Ð·Ð¸Ð¸, ÑÐ¾Ð³Ð»Ð°ÑÐ½Ð¾ ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ð¼ Ð²Ð°Ð¼ Ð¸Ð½Ð¾Ð³Ð´Ð° "
+"Ð½ÐµÐ»ÑŒÐ·Ñ ÐµÐ³Ð¾ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ, Ð¸Ð·Ð¼ÐµÐ½ÑÑ‚ÑŒ Ð¸Ð»Ð¸ Ñ€Ð°ÑÐ¿Ñ€Ð¾ÑÑ‚Ñ€Ð°Ð½ÑÑ‚ÑŒ."
 
 #. Type: boolean
 #. Description
@@ -5691,9 +5518,9 @@
 "free and, though it is not a part of the main distribution, standard package "
 "management tools can be used to install it."
 msgstr ""
-"Ð’ Ð²Ð¸Ð´Ðµ Ð¿Ð°ÐºÐµÑ‚Ð¾Ð² Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ð¾ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾Ðµ ÐŸÐž. ÐžÐ½Ð¾ Ð±ÐµÑÐ¿Ð»Ð°Ñ‚Ð½Ð¾Ðµ Ð¸, Ñ…Ð¾Ñ‚Ñ, "
-"Ð¾Ð½Ð¾ Ð½Ðµ ÑÐ²Ð»ÑÐµÑ‚ÑÑ Ñ‡Ð°ÑÑ‚ÑŒÑŽ Ð¾ÑÐ½Ð¾Ð²Ð½Ð¾Ð³Ð¾ Ð´Ð¸ÑÑ‚Ñ€Ð¸Ð±ÑƒÑ‚Ð¸Ð²Ð°, Ð´Ð»Ñ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸ "
-"Ð¼Ð¾Ð¶Ð½Ð¾ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ ÑÑ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ñ‹Ðµ ÑƒÑ‚Ð¸Ð»Ð¸Ñ‚Ñ‹."
+"Ð’ Ð²Ð¸Ð´Ðµ Ð¿Ð°ÐºÐµÑ‚Ð¾Ð² Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ð¾ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾Ðµ ÐŸÐž. ÐžÐ½Ð¾ Ð±ÐµÑÐ¿Ð»Ð°Ñ‚Ð½Ð¾Ðµ Ð¸, Ñ…Ð¾Ñ‚Ñ, Ð¾Ð½Ð¾ Ð½Ðµ "
+"ÑÐ²Ð»ÑÐµÑ‚ÑÑ Ñ‡Ð°ÑÑ‚ÑŒÑŽ Ð¾ÑÐ½Ð¾Ð²Ð½Ð¾Ð³Ð¾ Ð´Ð¸ÑÑ‚Ñ€Ð¸Ð±ÑƒÑ‚Ð¸Ð²Ð°, Ð´Ð»Ñ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸ Ð¼Ð¾Ð¶Ð½Ð¾ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ "
+"ÑÑ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ñ‹Ðµ ÑƒÑ‚Ð¸Ð»Ð¸Ñ‚Ñ‹."
 
 #. Type: boolean
 #. Description
@@ -5711,10 +5538,10 @@
 "testing as that contained in the release, it includes newer versions of some "
 "applications which may provide useful features."
 msgstr ""
-"ÐÐµÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ðµ ÐŸÐž Ð±Ñ‹Ð»Ð¾ Ð¿ÐµÑ€ÐµÐ½ÐµÑÐµÐ½Ð¾ Ð¸Ð· Ñ€Ð°Ð·Ñ€Ð°Ð±Ð°Ñ‚Ñ‹Ð²Ð°ÐµÐ¼Ð¾Ð¹ Ð²ÐµÑ€ÑÐ¸Ð¸ Ð² ÑÑ‚Ð¾Ñ‚ Ð²Ñ‹Ð¿ÑƒÑÐº. "
-"Ð¥Ð¾Ñ‚Ñ, Ð´Ð°Ð½Ð½Ð¾Ðµ ÐŸÐž Ð½Ðµ Ð¿Ñ€Ð¾ÑˆÐ»Ð¾ Ñ‚Ð°ÐºÐ¾Ð³Ð¾ Ð¿Ð¾Ð»Ð½Ð¾Ð³Ð¾ Ñ‚ÐµÑÑ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ, ÐºÐ°Ðº Ð¾ÑÑ‚Ð°Ð»ÑŒÐ½Ð¾Ðµ Ð² Ð²Ñ‹Ð¿ÑƒÑÐºÐµ, Ð¾Ð½Ð¾ "
-"Ð²ÐºÐ»ÑŽÑ‡Ð°ÐµÑ‚ Ð½Ð¾Ð²Ñ‹Ðµ Ð²ÐµÑ€ÑÐ¸Ð¸ Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ñ… Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ð¹, ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ðµ Ð¼Ð¾Ð³ÑƒÑ‚ Ð¾Ð±Ð»Ð°Ð´Ð°Ñ‚ÑŒ Ð½ÑƒÐ¶Ð½Ñ‹Ð¼Ð¸ "
-"ÑÐ²Ð¾Ð¹ÑÑ‚Ð²Ð°Ð¼Ð¸."
+"ÐÐµÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ðµ ÐŸÐž Ð±Ñ‹Ð»Ð¾ Ð¿ÐµÑ€ÐµÐ½ÐµÑÐµÐ½Ð¾ Ð¸Ð· Ñ€Ð°Ð·Ñ€Ð°Ð±Ð°Ñ‚Ñ‹Ð²Ð°ÐµÐ¼Ð¾Ð¹ Ð²ÐµÑ€ÑÐ¸Ð¸ Ð² ÑÑ‚Ð¾Ñ‚ Ð²Ñ‹Ð¿ÑƒÑÐº. Ð¥Ð¾Ñ‚Ñ, "
+"Ð´Ð°Ð½Ð½Ð¾Ðµ ÐŸÐž Ð½Ðµ Ð¿Ñ€Ð¾ÑˆÐ»Ð¾ Ñ‚Ð°ÐºÐ¾Ð³Ð¾ Ð¿Ð¾Ð»Ð½Ð¾Ð³Ð¾ Ñ‚ÐµÑÑ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ, ÐºÐ°Ðº Ð¾ÑÑ‚Ð°Ð»ÑŒÐ½Ð¾Ðµ Ð² Ð²Ñ‹Ð¿ÑƒÑÐºÐµ, "
+"Ð¾Ð½Ð¾ Ð²ÐºÐ»ÑŽÑ‡Ð°ÐµÑ‚ Ð½Ð¾Ð²Ñ‹Ðµ Ð²ÐµÑ€ÑÐ¸Ð¸ Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ñ… Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ð¹, ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ðµ Ð¼Ð¾Ð³ÑƒÑ‚ Ð¾Ð±Ð»Ð°Ð´Ð°Ñ‚ÑŒ "
+"Ð½ÑƒÐ¶Ð½Ñ‹Ð¼Ð¸ ÑÐ²Ð¾Ð¹ÑÑ‚Ð²Ð°Ð¼Ð¸."
 
 #. Type: select
 #. Choices
@@ -5809,7 +5636,8 @@
 #. Must fit within 80 characters.
 #: ../cdebconf-newt-udeb.templates:21
 msgid "<Tab> moves between items; <Space> selects; <Enter> activates buttons"
-msgstr "<Tab> Ð¿ÐµÑ€ÐµÑ…Ð¾Ð´ Ð¼ÐµÐ¶Ð´Ñƒ ÑÐ»ÐµÐ¼ÐµÐ½Ñ‚Ð°Ð¼Ð¸; <Space> Ð²Ñ‹Ð´ÐµÐ»ÐµÐ½Ð¸Ðµ; <Enter> Ð°ÐºÑ‚Ð¸Ð²Ð°Ñ†Ð¸Ñ ÐºÐ½Ð¾Ð¿Ð¾Ðº"
+msgstr ""
+"<Tab> Ð¿ÐµÑ€ÐµÑ…Ð¾Ð´ Ð¼ÐµÐ¶Ð´Ñƒ ÑÐ»ÐµÐ¼ÐµÐ½Ñ‚Ð°Ð¼Ð¸; <Space> Ð²Ñ‹Ð´ÐµÐ»ÐµÐ½Ð¸Ðµ; <Enter> Ð°ÐºÑ‚Ð¸Ð²Ð°Ñ†Ð¸Ñ ÐºÐ½Ð¾Ð¿Ð¾Ðº"
 
 #. Type: text
 #. Description
@@ -5887,26 +5715,25 @@
 #. #-#-#-#-#  templates.pot (PACKAGE VERSION)  #-#-#-#-#
 #. Type: note
 #. Description
-#: ../prebaseconfig.templates:4 ../network-console.templates:64 ../templates:4
-#: ../network-console.templates:55
+#: ../prebaseconfig.templates:4 ../network-console.templates:64
 msgid "Finish the installation"
 msgstr "Ð—Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð¸Ðµ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸"
 
 #. Type: text
 #. Description
-#: ../prebaseconfig.templates:8 ../templates:8
+#: ../prebaseconfig.templates:8
 msgid "Finishing the installation"
 msgstr "Ð—Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð¸Ðµ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ñ‹ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸"
 
 #. Type: text
 #. Description
-#: ../prebaseconfig.templates:16 ../templates:16
+#: ../prebaseconfig.templates:16
 msgid "Configuring network..."
 msgstr "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ° ÑÐµÑ‚Ð¸..."
 
 #. Type: text
 #. Description
-#: ../prebaseconfig.templates:20 ../templates:20
+#: ../prebaseconfig.templates:20
 msgid "Setting up frame buffer..."
 msgstr "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ° ÐºÐ°Ð´Ñ€Ð¾Ð²Ð¾Ð³Ð¾ Ð±ÑƒÑ„ÐµÑ€Ð° (frame buffer)..."
 
@@ -5918,13 +5745,13 @@
 
 #. Type: text
 #. Description
-#: ../prebaseconfig.templates:28 ../templates:24
+#: ../prebaseconfig.templates:28
 msgid "Preparing for base-config..."
 msgstr "ÐŸÐ¾Ð´Ð³Ð¾Ñ‚Ð¾Ð²ÐºÐ° Ð´Ð»Ñ base-config..."
 
 #. Type: text
 #. Description
-#: ../prebaseconfig.templates:32 ../templates:32
+#: ../prebaseconfig.templates:32
 msgid "Unmounting file systems..."
 msgstr "Ð Ð°Ð·Ð¼Ð¾Ð½Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ðµ Ñ„Ð°Ð¹Ð»Ð¾Ð²Ñ‹Ñ… ÑÐ¸ÑÑ‚ÐµÐ¼..."
 
@@ -5936,7 +5763,7 @@
 
 #. Type: note
 #. Description
-#: ../prebaseconfig.templates:40 ../templates:40
+#: ../prebaseconfig.templates:40
 msgid "Installation complete"
 msgstr "Ð£ÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ° Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð°"
 
@@ -5991,7 +5818,8 @@
 #. Type: note
 #. Description
 #: ../nobootloader.templates:8
-msgid "Alternatively, you will be able to boot the kernel manually by entering :"
+msgid ""
+"Alternatively, you will be able to boot the kernel manually by entering :"
 msgstr "Ð˜Ð»Ð¸ Ð²Ñ‹ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð·Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚ÑŒ ÑÐ´Ñ€Ð¾ Ð²Ñ€ÑƒÑ‡Ð½ÑƒÑŽ Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ ÐºÐ¾Ð¼Ð°Ð½Ð´:"
 
 #. Type: note
@@ -6089,7 +5917,8 @@
 msgid ""
 "The following other operating systems have been detected on this computer: "
 "${OS_LIST}"
-msgstr "ÐÐ° ÑÑ‚Ð¾Ð¼ ÐºÐ¾Ð¼Ð¿ÑŒÑŽÑ‚ÐµÑ€Ðµ Ð±Ñ‹Ð»Ð¸ Ð½Ð°Ð¹Ð´ÐµÐ½Ñ‹ ÑÐ»ÐµÐ´ÑƒÑŽÑ‰Ð¸Ðµ Ð¾Ð¿ÐµÑ€Ð°Ñ†Ð¸Ð¾Ð½Ð½Ñ‹Ðµ ÑÐ¸ÑÑ‚ÐµÐ¼Ñ‹: ${OS_LIST}"
+msgstr ""
+"ÐÐ° ÑÑ‚Ð¾Ð¼ ÐºÐ¾Ð¼Ð¿ÑŒÑŽÑ‚ÐµÑ€Ðµ Ð±Ñ‹Ð»Ð¸ Ð½Ð°Ð¹Ð´ÐµÐ½Ñ‹ ÑÐ»ÐµÐ´ÑƒÑŽÑ‰Ð¸Ðµ Ð¾Ð¿ÐµÑ€Ð°Ñ†Ð¸Ð¾Ð½Ð½Ñ‹Ðµ ÑÐ¸ÑÑ‚ÐµÐ¼Ñ‹: ${OS_LIST}"
 
 #. Type: boolean
 #. Description
@@ -6154,7 +5983,6 @@
 "Ð½ÐµÑ€ÐµÐ´ÐºÐ¾ Ð·Ð°ÐºÐ°Ð½Ñ‡Ð¸Ð²Ð°ÐµÑ‚ÑÑ Ð½ÐµÑƒÐ´Ð°Ñ‡Ð½Ð¾ Ð¸Ð»Ð¸ Ð·Ð°Ð²Ð¸ÑÐ°Ð½Ð¸ÐµÐ¼ ÐºÐ¾Ð¼Ð¿ÑŒÑŽÑ‚ÐµÑ€Ð°. Ð’ ÑÑ‚Ð¾Ð¹ ÑÐ¸Ñ‚ÑƒÐ°Ñ†Ð¸Ð¸ "
 "Ñ€ÐµÐºÐ¾Ð¼ÐµÐ½Ð´ÑƒÐµÑ‚ÑÑ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ Ð·Ð°Ð³Ñ€ÑƒÐ·Ñ‡Ð¸Ðº LILO."
 
-#. #-#-#-#-#  template.pot (debian-installer)  #-#-#-#-#
 #. #-#-#-#-#  templates.pot (PACKAGE VERSION)  #-#-#-#-#
 #. Type: string
 #. Description
@@ -6164,21 +5992,8 @@
 #. #-#-#-#-#  templates.pot (PACKAGE VERSION)  #-#-#-#-#
 #. Type: select
 #. Description
-#. #-#-#-#-#  template.pot (debian-installer)  #-#-#-#-#
-#. #-#-#-#-#  templates.pot (PACKAGE VERSION)  #-#-#-#-#
-#. Type: string
-#. Description
-#. #-#-#-#-#  templates.pot (PACKAGE VERSION)  #-#-#-#-#
-#. Type: select
-#. Description
-#. #-#-#-#-#  templates.pot (PACKAGE VERSION)  #-#-#-#-#
-#. Type: select
-#. Description
-#. #-#-#-#-#  templates.pot (PACKAGE VERSION)  #-#-#-#-#
-#. Type: string
-#. Description
 #: ../grub-installer.templates:35 ../yaboot-installer.templates:45
-#: ../aboot-installer.templates:12 ../palo-installer.templates:3
+#: ../aboot-installer.templates:12
 msgid "Device for boot loader installation:"
 msgstr "Ð£ÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð²Ð¾ Ð´Ð»Ñ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸ ÑÐ¸ÑÑ‚ÐµÐ¼Ð½Ð¾Ð³Ð¾ Ð·Ð°Ð³Ñ€ÑƒÐ·Ñ‡Ð¸ÐºÐ°:"
 
@@ -6256,13 +6071,13 @@
 
 #. Type: boolean
 #. Description
-#: ../grub-installer.templates:73 ../grub-installer.templates:55
+#: ../grub-installer.templates:73
 msgid "GRUB installation failed.  Continue anyway?"
 msgstr "Ð£ÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ° GRUB Ð·Ð°Ð²ÐµÑ€ÑˆÐ¸Ð»Ð°ÑÑŒ Ð½ÐµÑƒÐ´Ð°Ñ‡Ð½Ð¾. ÐŸÑ€Ð¾Ð´Ð¾Ð»Ð¶Ð¸Ñ‚ÑŒ ?"
 
 #. Type: boolean
 #. Description
-#: ../grub-installer.templates:73 ../grub-installer.templates:55
+#: ../grub-installer.templates:73
 msgid ""
 "The grub package failed to install into /target/.  Installing GRUB as a boot "
 "loader is a required step.  The install problem might however be unrelated "
@@ -6275,99 +6090,95 @@
 
 #. Type: error
 #. Description
-#: ../grub-installer.templates:80 ../grub-installer.templates:62
+#: ../grub-installer.templates:80
 msgid "Unable to install GRUB in ${BOOTDEV}"
 msgstr "ÐÐµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ GRUB Ð½Ð° ${BOOTDEV}"
 
 #. Type: error
 #. Description
-#: ../grub-installer.templates:80 ../grub-installer.templates:62
+#: ../grub-installer.templates:80
 msgid "Executing 'grub-install ${BOOTDEV}' failed."
 msgstr "ÐÐµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ Ð²Ñ‹Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÑŒ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñƒ 'grub-install ${BOOTDEV}'."
 
 #. Type: error
 #. Description
-#: ../grub-installer.templates:87 ../grub-installer.templates:69
+#: ../grub-installer.templates:87
 msgid "Unable to configure GRUB"
 msgstr "ÐÐµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¸Ñ‚ÑŒ GRUB"
 
 #. Type: error
 #. Description
-#: ../grub-installer.templates:87 ../grub-installer.templates:69
+#: ../grub-installer.templates:87
 msgid "Executing 'update-grub' failed."
 msgstr "ÐÐµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ Ð²Ñ‹Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÑŒ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñƒ 'update-grub'."
 
 #. Type: error
 #. Description
-#: ../grub-installer.templates:87 ../grub-installer.templates:69
+#: ../grub-installer.templates:87
 msgid "This is a fatal error."
 msgstr "ÐÑ‚Ð¾ Ð½ÐµÐ¸ÑÐ¿Ñ€Ð°Ð²Ð¸Ð¼Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°."
 
 #. Type: text
 #. Description
-#: ../grub-installer.templates:94 ../grub-installer.templates:76
+#: ../grub-installer.templates:94
 msgid "Installing GRUB boot loader"
 msgstr "Ð£ÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ° ÑÐ¸ÑÑ‚ÐµÐ¼Ð½Ð¾Ð³Ð¾ Ð·Ð°Ð³Ñ€ÑƒÐ·Ñ‡Ð¸ÐºÐ° GRUB"
 
 #. Type: text
 #. Description
-#: ../grub-installer.templates:98 ../grub-installer.templates:80
+#: ../grub-installer.templates:98
 msgid "Looking for other operating systems..."
 msgstr "ÐŸÐ¾Ð¸ÑÐº Ð´Ñ€ÑƒÐ³Ð¸Ñ… Ð¾Ð¿ÐµÑ€Ð°Ñ†Ð¸Ð¾Ð½Ð½Ñ‹Ñ… ÑÐ¸ÑÑ‚ÐµÐ¼..."
 
 #. Type: text
 #. Description
-#: ../grub-installer.templates:102 ../grub-installer.templates:84
+#: ../grub-installer.templates:102
 msgid "Installing the 'grub' package..."
 msgstr "Ð£ÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ° Ð¿Ð°ÐºÐµÑ‚Ð° 'grub'..."
 
 #. Type: text
 #. Description
-#: ../grub-installer.templates:106 ../grub-installer.templates:88
+#: ../grub-installer.templates:106
 msgid "Determining GRUB boot device..."
 msgstr "ÐžÐ¿Ñ€ÐµÐ´ÐµÐ»ÐµÐ½Ð¸Ðµ Ð·Ð°Ð³Ñ€ÑƒÐ·Ð¾Ñ‡Ð½Ð¾Ð³Ð¾ ÑƒÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð²Ð° Ð´Ð»Ñ GRUB..."
 
 #. Type: text
 #. Description
-#: ../grub-installer.templates:110 ../grub-installer.templates:92
+#: ../grub-installer.templates:110
 msgid "Running \"grub-install ${BOOTDEV}\"..."
 msgstr "Ð—Ð°Ð¿ÑƒÑÐº \"grub-install ${BOOTDEV}\"..."
 
 #. Type: text
 #. Description
-#: ../grub-installer.templates:114 ../grub-installer.templates:96
+#: ../grub-installer.templates:114
 msgid "Running \"update-grub\"..."
 msgstr "Ð—Ð°Ð¿ÑƒÑÐº \"update-grub\"..."
 
 #. Type: text
 #. Description
-#: ../grub-installer.templates:118 ../grub-installer.templates:100
+#: ../grub-installer.templates:118
 msgid "Updating /etc/kernel-img.conf..."
 msgstr "ÐžÐ±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ðµ /etc/kernel-img.conf..."
 
 #. Type: text
 #. Description
 #. Main menu item
-#: ../grub-installer.templates:123 ../grub-installer.templates:105
+#: ../grub-installer.templates:123
 msgid "Install the GRUB boot loader on a hard disk"
 msgstr "Ð£ÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ° Ð·Ð°Ð³Ñ€ÑƒÐ·Ñ‡Ð¸ÐºÐ° GRUB Ð½Ð° Ð¶Ñ‘ÑÑ‚ÐºÐ¸Ð¹ Ð´Ð¸ÑÐº"
 
-#. #-#-#-#-#  template.pot (debian-installer)  #-#-#-#-#
 #. Type: select
 #. Choices
 #. Note to translators : Please keep your translations of the choices
 #. below a 65 columns limit (which means 65 characters
 #. in single-byte languages)
-#. #-#-#-#-#  template.pot (debian-installer)  #-#-#-#-#
-#. Type: select
-#. Choices
-#: ../lilo-installer.templates:6 ../lilo-installer.templates:3
+#: ../lilo-installer.templates:6
 msgid "${disc}: Master Boot Record"
 msgstr "${disc}: Ð² Ð³Ð»Ð°Ð²Ð½ÑƒÑŽ Ð·Ð°Ð³Ñ€ÑƒÐ·Ð¾Ñ‡Ð½ÑƒÑŽ Ð·Ð°Ð¿Ð¸ÑÑŒ (MBR)"
 
 #. Type: select
 #. Choices
-#: ../lilo-installer.templates:6 ../lilo-installer.templates:3
+#: ../lilo-installer.templates:6
 msgid "${part}: new Debian partition"
 msgstr "${part}: Ð² Ð½Ð¾Ð²Ñ‹Ð¹ Ñ€Ð°Ð·Ð´ÐµÐ» Debian"
 
@@ -6387,7 +6198,7 @@
 
 #. Type: select
 #. Description
-#: ../lilo-installer.templates:7 ../lilo-installer.templates:4
+#: ../lilo-installer.templates:7
 msgid "If unsure, install LILO into the Master Boot Record."
 msgstr ""
 "Ð•ÑÐ»Ð¸ Ð²Ñ‹ Ð½Ðµ Ð·Ð½Ð°ÐµÑ‚Ðµ, Ñ‡Ñ‚Ð¾ Ð²Ñ‹Ð±Ñ€Ð°Ñ‚ÑŒ &mdash; ÑƒÑÑ‚Ð°Ð½Ð°Ð²Ð»Ð¸Ð²Ð°Ð¹Ñ‚Ðµ LILO Ð² Ð³Ð»Ð°Ð²Ð½ÑƒÑŽ "
@@ -6404,7 +6215,7 @@
 
 #. Type: select
 #. Choices
-#: ../lilo-installer.templates:20 ../lilo-installer.templates:3
+#: ../lilo-installer.templates:20
 msgid "Other choice (Advanced)"
 msgstr "Ð’ Ð´Ñ€ÑƒÐ³Ð¾Ðµ Ð¼ÐµÑÑ‚Ð¾ (Ð Ð°ÑÑˆÐ¸Ñ€ÐµÐ½Ð½Ñ‹Ð¹ Ñ€ÐµÐ¶Ð¸Ð¼)"
 
@@ -6420,7 +6231,7 @@
 
 #. Type: string
 #. Description
-#: ../lilo-installer.templates:29 ../lilo-installer.templates:15
+#: ../lilo-installer.templates:29
 msgid "LILO installation target:"
 msgstr "ÐŸÑ€Ð¾Ð¸Ð·Ð²ÐµÑÑ‚Ð¸ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÑƒ LILO:"
 
@@ -6439,57 +6250,58 @@
 
 #. Type: error
 #. Description
-#: ../lilo-installer.templates:37 ../lilo-installer.templates:23
+#: ../lilo-installer.templates:37
 msgid "Invalid partition name"
 msgstr "ÐÐµÐ²ÐµÑ€Ð½Ð¾Ðµ Ð¸Ð¼Ñ Ñ€Ð°Ð·Ð´ÐµÐ»Ð°"
 
 #. Type: error
 #. Description
-#: ../lilo-installer.templates:37 ../lilo-installer.templates:23
+#: ../lilo-installer.templates:37
 msgid ""
 "The path ${path} does not represent a partition or hard disk device. Please "
 "try again."
-msgstr "ÐŸÑƒÑ‚ÑŒ ${path} Ð½Ðµ ÑÐ²Ð»ÑÐµÑ‚ÑÑ Ð¶Ñ‘ÑÑ‚ÐºÐ¸Ð¼ Ð´Ð¸ÑÐºÐ¾Ð¼ Ð¸Ð»Ð¸ Ñ€Ð°Ð·Ð´ÐµÐ»Ð¾Ð¼. ÐŸÐ¾Ð¿Ñ€Ð¾Ð±ÑƒÐ¹Ñ‚Ðµ ÐµÑ‰Ñ‘ Ñ€Ð°Ð·."
+msgstr ""
+"ÐŸÑƒÑ‚ÑŒ ${path} Ð½Ðµ ÑÐ²Ð»ÑÐµÑ‚ÑÑ Ð¶Ñ‘ÑÑ‚ÐºÐ¸Ð¼ Ð´Ð¸ÑÐºÐ¾Ð¼ Ð¸Ð»Ð¸ Ñ€Ð°Ð·Ð´ÐµÐ»Ð¾Ð¼. ÐŸÐ¾Ð¿Ñ€Ð¾Ð±ÑƒÐ¹Ñ‚Ðµ ÐµÑ‰Ñ‘ Ñ€Ð°Ð·."
 
 #. Type: text
 #. Description
-#: ../lilo-installer.templates:43 ../lilo-installer.templates:29
+#: ../lilo-installer.templates:43
 msgid "Installing LILO..."
 msgstr "Ð£ÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ° LILO ..."
 
 #. Type: text
 #. Description
-#: ../lilo-installer.templates:47 ../lilo-installer.templates:33
+#: ../lilo-installer.templates:47
 msgid "Activating partition ${bootdev}"
 msgstr "ÐÐºÑ‚Ð¸Ð²Ð°Ñ†Ð¸Ñ Ñ€Ð°Ð·Ð´ÐµÐ»Ð° ${bootdev}"
 
 #. Type: text
 #. Description
-#: ../lilo-installer.templates:51 ../lilo-installer.templates:37
+#: ../lilo-installer.templates:51
 msgid "Creating lilo.conf"
 msgstr "Ð¡Ð¾Ð·Ð´Ð°Ð½Ð¸Ðµ Ñ„Ð°Ð¹Ð»Ð° lilo.conf"
 
 #. Type: text
 #. Description
-#: ../lilo-installer.templates:55 ../lilo-installer.templates:41
+#: ../lilo-installer.templates:55
 msgid "Installing the LILO package"
 msgstr "Ð£ÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ° Ð¿Ð°ÐºÐµÑ‚Ð° LILO"
 
 #. Type: text
 #. Description
-#: ../lilo-installer.templates:59 ../lilo-installer.templates:45
+#: ../lilo-installer.templates:59
 msgid "Running LILO for ${bootdev}"
 msgstr "Ð—Ð°Ð¿ÑƒÑÐº LILO Ð´Ð»Ñ ${bootdev}"
 
 #. Type: note
 #. Description
-#: ../lilo-installer.templates:63 ../lilo-installer.templates:49
+#: ../lilo-installer.templates:63
 msgid "LILO configured to use a serial console"
 msgstr "LILO Ð½Ð°ÑÑ‚Ñ€Ð¾ÐµÐ½ Ð½Ð° Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ ÐºÐ¾Ð½ÑÐ¾Ð»Ð¸ Ð½Ð° Ð¿Ð¾ÑÐ»ÐµÐ´Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒÐ½Ð¾Ð¼ Ð¿Ð¾Ñ€Ñ‚Ñƒ"
 
 #. Type: note
 #. Description
-#: ../lilo-installer.templates:63 ../lilo-installer.templates:49
+#: ../lilo-installer.templates:63
 msgid ""
 "LILO is configured to use serial port ${PORT} as the console. The serial "
 "port speed is set to ${SPEED}."
@@ -6499,7 +6311,7 @@
 
 #. Type: boolean
 #. Description
-#: ../lilo-installer.templates:70 ../lilo-installer.templates:56
+#: ../lilo-installer.templates:70
 msgid "Would you like to make this partition active?"
 msgstr "Ð¥Ð¾Ñ‚Ð¸Ñ‚Ðµ Ð»Ð¸ Ð²Ñ‹ Ð¿Ð¾Ð¼ÐµÑ‚Ð¸Ñ‚ÑŒ Ñ€Ð°Ð·Ð´ÐµÐ» ÐºÐ°Ðº Ð°ÐºÑ‚Ð¸Ð²Ð½Ñ‹Ð¹?"
 
@@ -6528,13 +6340,13 @@
 
 #. Type: boolean
 #. Description
-#: ../lilo-installer.templates:82 ../lilo-installer.templates:68
+#: ../lilo-installer.templates:82
 msgid "LILO installation failed.  Continue anyway?"
 msgstr "ÐÐµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ LILO. ÐŸÑ€Ð¾Ð´Ð¾Ð»Ð¶Ð¸Ñ‚ÑŒ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÑƒ?"
 
 #. Type: boolean
 #. Description
-#: ../lilo-installer.templates:82 ../lilo-installer.templates:68
+#: ../lilo-installer.templates:82
 msgid ""
 "The lilo package failed to install into /target/.  Installing LILO as a boot "
 "loader is a required step.  The install problem might however be unrelated "
@@ -6547,26 +6359,26 @@
 
 #. Type: error
 #. Description
-#: ../lilo-installer.templates:89 ../lilo-installer.templates:75
+#: ../lilo-installer.templates:89
 msgid "LILO installation failed"
 msgstr "ÐÐµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ LILO"
 
 #. Type: error
 #. Description
-#: ../lilo-installer.templates:89 ../lilo-installer.templates:75
+#: ../lilo-installer.templates:89
 msgid "Running \"/sbin/lilo\" failed with error code \"${ERRCODE}\"."
 msgstr "ÐŸÑ€Ð¸ Ð·Ð°Ð¿ÑƒÑÐºÐµ \"/sbin/lilo\" Ð¿Ñ€Ð¾Ð¸Ð·Ð¾ÑˆÐ»Ð° Ð¾ÑˆÐ¸Ð±ÐºÐ° Ð½Ð¾Ð¼ÐµÑ€ ${ERRCODE}."
 
 #. Type: text
 #. Description
 #. Main menu item
-#: ../lilo-installer.templates:95 ../lilo-installer.templates:81
+#: ../lilo-installer.templates:95
 msgid "Install the LILO boot loader on a hard disk"
 msgstr "Ð£ÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ° Ð·Ð°Ð³Ñ€ÑƒÐ·Ñ‡Ð¸ÐºÐ° LILO Ð½Ð° Ð¶Ñ‘ÑÑ‚ÐºÐ¸Ð¹ Ð´Ð¸ÑÐº"
 
 #. Type: boolean
 #. Description
-#: ../partman-newworld.templates:7 ../templates:7
+#: ../partman-newworld.templates:7
 msgid ""
 "No NewWorld boot partition was found. The yaboot boot loader requires an "
 "Apple_Bootstrap partition at least 819200 bytes in size, using the HFS "
@@ -6579,24 +6391,22 @@
 #. Type: boolean
 #. Description
 #: ../partman-newworld.templates:14 ../partman-prep.templates:20
-#: ../partman-palo.templates:12 ../partman-efi.templates:11 ../templates:16
-#: ../templates:14
+#: ../partman-palo.templates:12 ../partman-efi.templates:11
 msgid "Go back to the menu and resume partitioning?"
 msgstr "Ð’ÐµÑ€Ð½ÑƒÑ‚ÑŒÑÑ Ð² Ð¼ÐµÐ½ÑŽ Ð¸ Ð¿Ñ€Ð¾Ð´Ð¾Ð»Ð¶Ð¸Ñ‚ÑŒ Ñ€Ð°Ð·Ð¼ÐµÑ‚ÐºÑƒ?"
 
 #. Type: boolean
 #. Description
-#: ../partman-newworld.templates:14 ../templates:14
+#: ../partman-newworld.templates:14
 msgid "The NewWorld boot partition must be at least 819200 bytes in size."
 msgstr "Ð—Ð°Ð³Ñ€ÑƒÐ·Ð¾Ñ‡Ð½Ñ‹Ð¹ Ñ€Ð°Ð·Ð´ÐµÐ» NewWorld Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð±Ñ‹Ñ‚ÑŒ Ð½Ðµ Ð¼ÐµÐ½ÐµÐµ 819200 Ð±Ð°Ð¹Ñ‚."
 
 #. Type: text
 #. Description
-#: ../partman-newworld.templates:26 ../templates:26
+#: ../partman-newworld.templates:26
 msgid "NewWorld boot partition"
 msgstr "Ð—Ð°Ð³Ñ€ÑƒÐ·Ð¾Ñ‡Ð½Ñ‹Ð¹ Ñ€Ð°Ð·Ð´ÐµÐ» NewWorld"
 
-#. #-#-#-#-#  template.pot (debian-installer)  #-#-#-#-#
 #. #-#-#-#-#  templates.pot (PACKAGE VERSION)  #-#-#-#-#
 #. Type: text
 #. Description
@@ -6607,27 +6417,21 @@
 #. Description
 #. short variant of 'PALO boot partition'
 #. Up to 10 character positions
-#. #-#-#-#-#  template.pot (debian-installer)  #-#-#-#-#
-#. Type: text
-#. Description
-#. short variant of 'NewWorld boot partition'
-#. Up to 10 character positions
 #: ../partman-newworld.templates:32 ../partman-palo.templates:23
-#: ../templates:32
 msgid "boot"
 msgstr "Ð·Ð°Ð³Ñ€"
 
 #. Type: text
 #. Description
 #. File system name
-#: ../partman-newworld.templates:37 ../templates:37
+#: ../partman-newworld.templates:37
 msgid "HFS Macintosh file system"
 msgstr "Ð¤Ð°Ð¹Ð»Ð¾Ð²Ð°Ñ ÑÐ¸ÑÑ‚ÐµÐ¼Ð° HFS Macintosh"
 
 #. Type: text
 #. Description
 #. Short file system name (untranslatable in many languages)
-#: ../partman-newworld.templates:42 ../templates:42
+#: ../partman-newworld.templates:42
 msgid "hfs"
 msgstr "hfs"
 
@@ -6700,7 +6504,6 @@
 #. Description
 #: ../quik-installer.templates:23 ../yaboot-installer.templates:33
 #: ../prep-installer.templates:32 ../vmelilo-installer.templates:23
-#: ../templates:23
 msgid "No root partition found"
 msgstr "ÐÐµ Ð½Ð°Ð¹Ð´ÐµÐ½ ÐºÐ¾Ñ€Ð½ÐµÐ²Ð¾Ð¹ Ñ€Ð°Ð·Ð´ÐµÐ»"
 
@@ -6708,7 +6511,6 @@
 #. Description
 #: ../quik-installer.templates:23 ../yaboot-installer.templates:33
 #: ../prep-installer.templates:32 ../vmelilo-installer.templates:23
-#: ../templates:23
 msgid ""
 "No partition is mounted as your new root partition. You must mount a root "
 "partition first."
@@ -6861,44 +6663,44 @@
 
 #. Type: text
 #. Description
-#: ../quik-installer.templates:94 ../quik-installer.templates:88
+#: ../quik-installer.templates:94
 msgid "Installing quik into bootstrap partition"
 msgstr "Ð£ÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ° quik Ð² Ñ€Ð°Ð·Ð´ÐµÐ» Ð½Ð°Ñ‡Ð°Ð»ÑŒÐ½Ð¾Ð¹ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸"
 
 #. Type: error
 #. Description
 #: ../quik-installer.templates:98 ../yaboot-installer.templates:72
-#: ../vmelilo-installer.templates:46 ../quik-installer.templates:92
+#: ../vmelilo-installer.templates:46
 msgid "Failed to install boot loader"
 msgstr "ÐÐµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ ÑÐ¸ÑÑ‚ÐµÐ¼Ð½Ñ‹Ð¹ Ð·Ð°Ð³Ñ€ÑƒÐ·Ñ‡Ð¸Ðº"
 
 #. Type: error
 #. Description
-#: ../quik-installer.templates:98 ../quik-installer.templates:92
+#: ../quik-installer.templates:98
 msgid "The installation of the quik boot loader failed."
 msgstr "Ð£ÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ° ÑÐ¸ÑÑ‚ÐµÐ¼Ð½Ð¾Ð³Ð¾ Ð·Ð°Ð³Ñ€ÑƒÐ·Ñ‡Ð¸ÐºÐ° quik Ð·Ð°Ð²ÐµÑ€ÑˆÐ¸Ð»Ð°ÑÑŒ Ð½ÐµÑƒÐ´Ð°Ñ‡Ð½Ð¾."
 
 #. Type: error
 #. Description
-#: ../quik-installer.templates:98 ../quik-installer.templates:92
+#: ../quik-installer.templates:98
 msgid "Warning: your system may be unbootable!"
 msgstr "ÐŸÑ€ÐµÐ´ÑƒÐ¿Ñ€ÐµÐ¶Ð´ÐµÐ½Ð¸Ðµ: Ð²Ð°ÑˆÐ° ÑÐ¸ÑÑ‚ÐµÐ¼Ð° Ð¼Ð¾Ð¶ÐµÑ‚ Ð¿ÐµÑ€ÐµÑÑ‚Ð°Ñ‚ÑŒ Ð·Ð°Ð³Ñ€ÑƒÐ¶Ð°Ñ‚ÑŒÑÑ!"
 
 #. Type: text
 #. Description
-#: ../quik-installer.templates:107 ../quik-installer.templates:101
+#: ../quik-installer.templates:107
 msgid "Setting up OpenFirmware"
 msgstr "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ° OpenFirmware"
 
 #. Type: error
 #. Description
-#: ../quik-installer.templates:111 ../quik-installer.templates:105
+#: ../quik-installer.templates:111
 msgid "Unable to configure OpenFirmware"
 msgstr "ÐÐµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¸Ñ‚ÑŒ OpenFirmware"
 
 #. Type: error
 #. Description
-#: ../quik-installer.templates:111 ../quik-installer.templates:105
+#: ../quik-installer.templates:111
 msgid ""
 "Setting the OpenFirmware boot-device variable failed. You will have to "
 "configure OpenFirmware yourself to boot."
@@ -6909,13 +6711,13 @@
 #. Type: error
 #. Description
 #. This error may not be fatal, depending on the exact type of Mac.
-#: ../quik-installer.templates:118 ../quik-installer.templates:112
+#: ../quik-installer.templates:118
 msgid "Problem configuring OpenFirmware"
 msgstr "ÐŸÑ€Ð¾Ð±Ð»ÐµÐ¼Ð° Ð¿Ñ€Ð¸ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐµ OpenFirmware"
 
 #. Type: error
 #. Description
-#: ../quik-installer.templates:118 ../quik-installer.templates:112
+#: ../quik-installer.templates:118
 msgid ""
 "Setting the OpenFirmware boot-command variable failed. You may have "
 "intermittent boot failures."
@@ -6925,13 +6727,13 @@
 
 #. Type: note
 #. Description
-#: ../quik-installer.templates:124 ../quik-installer.templates:118
+#: ../quik-installer.templates:124
 msgid "Successfully installed quik"
 msgstr "quik ÑƒÑÐ¿ÐµÑˆÐ½Ð¾ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½"
 
 #. Type: note
 #. Description
-#: ../quik-installer.templates:124 ../quik-installer.templates:118
+#: ../quik-installer.templates:124
 msgid "The quik boot loader was successfully installed."
 msgstr "Ð¡Ð¸ÑÑ‚ÐµÐ¼Ð½Ñ‹Ð¹ Ð·Ð°Ð³Ñ€ÑƒÐ·Ñ‡Ð¸Ðº quik ÑƒÑÐ¿ÐµÑˆÐ½Ð¾ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½."
 
@@ -6945,37 +6747,33 @@
 #. Type: error
 #. Description
 #: ../quik-installer.templates:131 ../yaboot-installer.templates:88
-#: ../quik-installer.templates:125
 msgid "Failed to mount /target/proc"
 msgstr "ÐÐµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ ÑÐ¼Ð¾Ð½Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ /target/proc"
 
 #. Type: error
 #. Description
 #: ../quik-installer.templates:131 ../yaboot-installer.templates:88
-#: ../quik-installer.templates:125
 msgid "Mounting the proc file system on /target/proc failed."
 msgstr "ÐÐµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ ÑÐ¼Ð¾Ð½Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ñ„Ð°Ð¹Ð»Ð¾Ð²ÑƒÑŽ ÑÐ¸ÑÑ‚ÐµÐ¼Ñƒ proc Ð² /target/proc."
 
 #. Type: error
 #. Description
 #: ../quik-installer.templates:131 ../yaboot-installer.templates:88
-#: ../vmelilo-installer.templates:33 ../quik-installer.templates:125
-#: ../templates:46
+#: ../vmelilo-installer.templates:33
 msgid "Please check the system log or the output on the third console (tty3)."
 msgstr "ÐŸÑ€Ð¾Ð²ÐµÑ€ÑŒÑ‚Ðµ ÑÐ¸ÑÑ‚ÐµÐ¼Ð½Ñ‹Ð¹ Ð¶ÑƒÑ€Ð½Ð°Ð» Ð¸Ð»Ð¸ ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð½Ð° Ñ‚Ñ€ÐµÑ‚ÑŒÐµÐ¹ ÐºÐ¾Ð½ÑÐ¾Ð»Ð¸ (tty3)."
 
 #. Type: error
 #. Description
 #: ../quik-installer.templates:131 ../yaboot-installer.templates:88
-#: ../vmelilo-installer.templates:46 ../quik-installer.templates:125
-#: ../templates:46
+#: ../vmelilo-installer.templates:46
 msgid "Warning: Your system may be unbootable!"
 msgstr "ÐžÑÑ‚Ð¾Ñ€Ð¾Ð¶Ð½Ð¾! Ð’Ð°ÑˆÐ° ÑÐ¸ÑÑ‚ÐµÐ¼Ð° Ð¼Ð¾Ð¶ÐµÑ‚ Ð¿ÐµÑ€ÐµÑÑ‚Ð°Ñ‚ÑŒ Ð·Ð°Ð³Ñ€ÑƒÐ¶Ð°Ñ‚ÑŒÑÑ!"
 
 #. Type: text
 #. Description
 #. Main menu item
-#: ../quik-installer.templates:141 ../quik-installer.templates:135
+#: ../quik-installer.templates:141
 msgid "Install quik on a hard disk"
 msgstr "Ð£ÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ° quik Ð½Ð° Ð¶Ñ‘ÑÑ‚ÐºÐ¸Ð¹ Ð´Ð¸ÑÐº"
 
@@ -7133,7 +6931,8 @@
 #. Type: note
 #. Description
 #: ../yaboot-installer.templates:97
-msgid "Alternatively, you will be able to boot the system manually by entering:"
+msgid ""
+"Alternatively, you will be able to boot the system manually by entering:"
 msgstr "Ð˜Ð»Ð¸ Ð²Ñ‹ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð·Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚ÑŒ ÑÐ¸ÑÑ‚ÐµÐ¼Ñƒ Ð²Ñ€ÑƒÑ‡Ð½ÑƒÑŽ Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ ÐºÐ¾Ð¼Ð°Ð½Ð´:"
 
 #. Type: note
@@ -7145,7 +6944,7 @@
 #. Type: text
 #. Description
 #. Main menu item
-#: ../yaboot-installer.templates:120 ../yaboot-installer.templates:98
+#: ../yaboot-installer.templates:120
 msgid "Install yaboot on a hard disk"
 msgstr "Ð£ÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ° yaboot Ð½Ð° Ð¶Ñ‘ÑÑ‚ÐºÐ¸Ð¹ Ð´Ð¸ÑÐº"
 
@@ -7210,13 +7009,13 @@
 
 #. Type: error
 #. Description
-#: ../preseed-common.templates:3 ../common.templates:3
+#: ../preseed-common.templates:3
 msgid "Failed to retrieve the preconfiguration file"
 msgstr "ÐÐµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ Ð¿Ð¾Ð»ÑƒÑ‡Ð¸Ñ‚ÑŒ Ñ„Ð°Ð¹Ð» Ð¿Ñ€ÐµÐ´Ð²Ð°Ñ€Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾Ð¹ ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ð¸"
 
 #. Type: error
 #. Description
-#: ../preseed-common.templates:3 ../common.templates:3
+#: ../preseed-common.templates:3
 msgid ""
 "The file needed for preconfiguration could not be retrieved from "
 "${LOCATION}. The installation will proceed in non-automated mode."
@@ -7226,13 +7025,13 @@
 
 #. Type: error
 #. Description
-#: ../preseed-common.templates:9 ../common.templates:9
+#: ../preseed-common.templates:9
 msgid "Failed to load the preconfiguration file"
 msgstr "ÐÐµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ Ð·Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚ÑŒ Ñ„Ð°Ð¹Ð» Ð¿Ñ€ÐµÐ´Ð²Ð°Ñ€Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾Ð¹ ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ð¸"
 
 #. Type: error
 #. Description
-#: ../preseed-common.templates:9 ../common.templates:9
+#: ../preseed-common.templates:9
 msgid ""
 "The installer failed to load the preconfiguration file from ${LOCATION}. The "
 "file may be corrupt."
@@ -7242,14 +7041,15 @@
 
 #. Type: error
 #. Description
-#: ../preseed-common.templates:45 ../common.templates:35
+#: ../preseed-common.templates:45
 msgid "Failed to run preseeded command"
 msgstr "ÐÐµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ Ð²Ñ‹Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÑŒ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñƒ Ð°Ð²Ñ‚Ð¾Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸"
 
 #. Type: error
 #. Description
-#: ../preseed-common.templates:45 ../common.templates:35
-msgid "Execution of preseeded command \"${COMMAND}\" failed with exit code ${CODE}."
+#: ../preseed-common.templates:45
+msgid ""
+"Execution of preseeded command \"${COMMAND}\" failed with exit code ${CODE}."
 msgstr ""
 "Ð’Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ðµ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ‹ Ð°Ð²Ñ‚Ð¾Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ (\"${COMMAND}\") Ð·Ð°Ð²ÐµÑ€ÑˆÐ¸Ð»Ð¾ÑÑŒ Ð½ÐµÑƒÐ´Ð°Ñ‡Ð½Ð¾ Ñ "
 "ÐºÐ¾Ð´Ð¾Ð¼ Ð¾ÑˆÐ¸Ð±ÐºÐ¸ ${CODE}."
@@ -7414,43 +7214,43 @@
 #. Type: text
 #. Description
 #. Main menu item
-#: ../iso-scan.templates:4 ../templates:4
+#: ../iso-scan.templates:4
 msgid "Scan hard drives for an installer ISO image"
 msgstr "ÐŸÐ¾Ð¸ÑÐº ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¾Ñ‡Ð½Ñ‹Ñ… ISO-Ð¾Ð±Ñ€Ð°Ð·Ð¾Ð² Ð½Ð° Ð¶Ñ‘ÑÑ‚ÐºÐ¾Ð¼ Ð´Ð¸ÑÐºÐµ"
 
 #. Type: text
 #. Description
-#: ../iso-scan.templates:21 ../templates:17
+#: ../iso-scan.templates:21
 msgid "Detecting hardware to find hard drives"
 msgstr "ÐŸÐ¾Ð¸ÑÐº Ð¶Ñ‘ÑÑ‚ÐºÐ¸Ñ… Ð´Ð¸ÑÐºÐ¾Ð²"
 
 #. Type: text
 #. Description
-#: ../iso-scan.templates:25 ../templates:21
+#: ../iso-scan.templates:25
 msgid "Searching drives for an installer ISO image"
 msgstr "ÐŸÐ¾Ð¸ÑÐº ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¾Ñ‡Ð½Ñ‹Ñ… ISO-Ð¾Ð±Ñ€Ð°Ð·Ð¾Ð² Ð½Ð° Ð½Ð¾ÑÐ¸Ñ‚ÐµÐ»ÑÑ…"
 
 #. Type: text
 #. Description
-#: ../iso-scan.templates:29 ../templates:25
+#: ../iso-scan.templates:29
 msgid "Mounting ${DRIVE}..."
 msgstr "ÐœÐ¾Ð½Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ðµ ${DRIVE} ..."
 
 #. Type: text
 #. Description
-#: ../iso-scan.templates:33 ../templates:29
+#: ../iso-scan.templates:33
 msgid "Scanning ${DRIVE} (in ${DIRECTORY})..."
 msgstr "Ð¡ÐºÐ°Ð½Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ðµ ${DRIVE} (Ð² ${DIRECTORY}) ..."
 
 #. Type: boolean
 #. Description
-#: ../iso-scan.templates:38 ../templates:34
+#: ../iso-scan.templates:38
 msgid "Do full disk search for installer ISO image?"
 msgstr "Ð˜ÑÐºÐ°Ñ‚ÑŒ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¾Ñ‡Ð½Ñ‹Ðµ ISO-Ð¾Ð±Ñ€Ð°Ð·Ñ‹ Ð¿Ð¾ Ð²ÑÐµÐ¼Ñƒ Ð´Ð¸ÑÐºÑƒ?"
 
 #. Type: boolean
 #. Description
-#: ../iso-scan.templates:38 ../templates:34
+#: ../iso-scan.templates:38
 msgid ""
 "The quick scan for installer ISO images, which looks only in common places, "
 "did not find an installer ISO image. It's possible that a more thorough "
@@ -7462,7 +7262,7 @@
 
 #. Type: error
 #. Description
-#: ../iso-scan.templates:46 ../templates:42
+#: ../iso-scan.templates:46
 msgid ""
 "No installer ISO images were found. If you downloaded the ISO image, it may "
 "have a bad filename (not ending in \".iso\"), or it may be on a file system "
@@ -7476,13 +7276,13 @@
 
 #. Type: error
 #. Description
-#: ../iso-scan.templates:54 ../templates:50
+#: ../iso-scan.templates:54
 msgid "Failed to find an installer ISO image"
 msgstr "ÐÐµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ Ð½Ð°Ð¹Ñ‚Ð¸ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¾Ñ‡Ð½Ñ‹Ð¹ ISO-Ð¾Ð±Ñ€Ð°Ð·"
 
 #. Type: error
 #. Description
-#: ../iso-scan.templates:54 ../templates:50
+#: ../iso-scan.templates:54
 msgid ""
 "While one or more possible ISO images were found, they could not be mounted. "
 "The ISO image you downloaded may be corrupt."
@@ -7492,13 +7292,13 @@
 
 #. Type: error
 #. Description
-#: ../iso-scan.templates:62 ../templates:58
+#: ../iso-scan.templates:62
 msgid "No installer ISO image found"
 msgstr "ÐÐµ Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾ Ð½Ð¸ Ð¾Ð´Ð½Ð¾Ð³Ð¾ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¾Ñ‡Ð½Ð¾Ð³Ð¾ ISO-Ð¾Ð±Ñ€Ð°Ð·Ð°"
 
 #. Type: error
 #. Description
-#: ../iso-scan.templates:62 ../templates:58
+#: ../iso-scan.templates:62
 msgid ""
 "While one or more possible ISO images were found, they did not look like "
 "valid installer ISO images."
@@ -7508,7 +7308,7 @@
 
 #. Type: error
 #. Description
-#: ../iso-scan.templates:62 ../templates:58
+#: ../iso-scan.templates:62
 msgid "Please do a network install instead, or reboot and fix the ISO image."
 msgstr ""
 "Ð’Ñ‹ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð»Ð¸Ð±Ð¾ Ð¿Ñ€Ð¾Ð²ÐµÑÑ‚Ð¸ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÑƒ Ð¸Ð· ÑÐµÑ‚Ð¸, Ð»Ð¸Ð±Ð¾ Ð¿ÐµÑ€ÐµÐ·Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚ÑŒÑÑ Ð¸ Ð¸ÑÐ¿Ñ€Ð°Ð²Ð¸Ñ‚ÑŒ "
@@ -7516,13 +7316,13 @@
 
 #. Type: note
 #. Description
-#: ../iso-scan.templates:70 ../templates:66
+#: ../iso-scan.templates:70
 msgid "Successfully mounted ${SUITE} installer ISO image"
 msgstr "Ð£ÑÐ¿ÐµÑˆÐ½Ð¾ ÑÐ¼Ð¾Ð½Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¾Ñ‡Ð½Ñ‹Ð¹ ISO Ð¾Ð±Ñ€Ð°Ð· ${SUITE}"
 
 #. Type: note
 #. Description
-#: ../iso-scan.templates:70 ../templates:66
+#: ../iso-scan.templates:70
 msgid ""
 "The ISO file ${FILENAME} on ${DEVICE} (${SUITE}) will be used as the "
 "installation ISO image."
@@ -7540,7 +7340,7 @@
 #. Type: text
 #. Description
 #. Main menu item
-#: ../save-logs.templates:4 ../bugreporter-udeb.templates:4
+#: ../save-logs.templates:4
 msgid "Save debug logs"
 msgstr "Ð¡Ð¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ðµ Ñ„Ð°Ð¹Ð»Ð¾Ð² Ð¶ÑƒÑ€Ð½Ð°Ð»Ð° Ñ Ð¾Ñ‚Ð»Ð°Ð´Ð¾Ñ‡Ð½Ð¾Ð¹ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸ÐµÐ¹"
 
@@ -7554,7 +7354,8 @@
 #. Description
 #: ../save-logs.templates:9
 msgid "How should the debug logs be saved or transferred?"
-msgstr "ÐšÑƒÐ´Ð° Ð½ÑƒÐ¶Ð½Ð¾ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²Ð¸Ñ‚ÑŒ Ð¸Ð»Ð¸ ÑÐ¾Ñ…Ñ€Ð°Ð½Ð¸Ñ‚ÑŒ Ñ„Ð°Ð¹Ð»Ñ‹ Ð¶ÑƒÑ€Ð½Ð°Ð»Ð° Ñ Ð¾Ñ‚Ð»Ð°Ð´Ð¾Ñ‡Ð½Ð¾Ð¹ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸ÐµÐ¹ ?"
+msgstr ""
+"ÐšÑƒÐ´Ð° Ð½ÑƒÐ¶Ð½Ð¾ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²Ð¸Ñ‚ÑŒ Ð¸Ð»Ð¸ ÑÐ¾Ñ…Ñ€Ð°Ð½Ð¸Ñ‚ÑŒ Ñ„Ð°Ð¹Ð»Ñ‹ Ð¶ÑƒÑ€Ð½Ð°Ð»Ð° Ñ Ð¾Ñ‚Ð»Ð°Ð´Ð¾Ñ‡Ð½Ð¾Ð¹ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸ÐµÐ¹ ?"
 
 #. Type: select
 #. Description
@@ -7571,7 +7372,8 @@
 #. Description
 #: ../save-logs.templates:16
 msgid "Directory in which to save debug logs:"
-msgstr "ÐšÐ°Ñ‚Ð°Ð»Ð¾Ð³, Ð² ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ð¹ Ð±ÑƒÐ´ÑƒÑ‚ ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ñ‹ Ñ„Ð°Ð¹Ð»Ñ‹ Ð¶ÑƒÑ€Ð½Ð°Ð»Ð° Ñ Ð¾Ñ‚Ð»Ð°Ð´Ð¾Ñ‡Ð½Ð¾Ð¹ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸ÐµÐ¹:"
+msgstr ""
+"ÐšÐ°Ñ‚Ð°Ð»Ð¾Ð³, Ð² ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ð¹ Ð±ÑƒÐ´ÑƒÑ‚ ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ñ‹ Ñ„Ð°Ð¹Ð»Ñ‹ Ð¶ÑƒÑ€Ð½Ð°Ð»Ð° Ñ Ð¾Ñ‚Ð»Ð°Ð´Ð¾Ñ‡Ð½Ð¾Ð¹ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸ÐµÐ¹:"
 
 #. Type: string
 #. Description
@@ -7633,7 +7435,7 @@
 
 #. Type: note
 #. Description
-#: ../save-logs.templates:42 ../bugreporter-udeb.templates:8
+#: ../save-logs.templates:42
 msgid "Insert formatted floppy in drive"
 msgstr "Ð’ÑÑ‚Ð°Ð²ÑŒÑ‚Ðµ Ð¾Ñ‚Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½ÑƒÑŽ Ð´Ð¸ÑÐºÐµÑ‚Ñƒ Ð² Ð´Ð¸ÑÐºÐ¾Ð²Ð¾Ð´"
 
@@ -7641,7 +7443,8 @@
 #. Description
 #: ../save-logs.templates:42
 msgid "Log files and debug info will be copied into this floppy."
-msgstr "Ð¤Ð°Ð¹Ð»Ñ‹ Ð¶ÑƒÑ€Ð½Ð°Ð»Ð° Ð¸ Ð¾Ñ‚Ð»Ð°Ð´Ð¾Ñ‡Ð½Ð°Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð±ÑƒÐ´ÑƒÑ‚ ÑÐºÐ¾Ð¿Ð¸Ñ€Ð¾Ð²Ð°Ð½Ñ‹ Ð½Ð° ÑÑ‚Ñƒ Ð´Ð¸ÑÐºÐµÑ‚Ñƒ."
+msgstr ""
+"Ð¤Ð°Ð¹Ð»Ñ‹ Ð¶ÑƒÑ€Ð½Ð°Ð»Ð° Ð¸ Ð¾Ñ‚Ð»Ð°Ð´Ð¾Ñ‡Ð½Ð°Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð±ÑƒÐ´ÑƒÑ‚ ÑÐºÐ¾Ð¿Ð¸Ñ€Ð¾Ð²Ð°Ð½Ñ‹ Ð½Ð° ÑÑ‚Ñƒ Ð´Ð¸ÑÐºÐµÑ‚Ñƒ."
 
 #. Type: note
 #. Description
@@ -7672,19 +7475,19 @@
 #. Type: text
 #. Description
 #. Prebaseconfig progress bar item
-#: ../save-logs.templates:57 ../bugreporter-udeb.templates:25
+#: ../save-logs.templates:57
 msgid "Gathering information for installation report..."
 msgstr "Ð¡Ð±Ð¾Ñ€ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ð¸ Ð´Ð»Ñ Ð¾Ñ‚Ñ‡ÐµÑ‚Ð° Ð¾Ð± ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐµ..."
 
 #. Type: boolean
 #. Description
-#: ../cdrom-checker.templates:4 ../templates:4
+#: ../cdrom-checker.templates:4
 msgid "Check CD-ROM integrity?"
 msgstr "ÐŸÑ€Ð¾Ð²ÐµÑ€Ð¸Ñ‚ÑŒ Ñ†ÐµÐ»Ð¾ÑÑ‚Ð½Ð¾ÑÑ‚ÑŒ ÐºÐ¾Ð¼Ð¿Ð°ÐºÑ‚-Ð´Ð¸ÑÐºÐ°?"
 
 #. Type: boolean
 #. Description
-#: ../cdrom-checker.templates:4 ../templates:4
+#: ../cdrom-checker.templates:4
 msgid "Warning: this check depends on your hardware and may take some time."
 msgstr ""
 "ÐŸÑ€ÐµÐ´ÑƒÐ¿Ñ€ÐµÐ¶Ð´ÐµÐ½Ð¸Ðµ: Ð¿Ñ€Ð¾Ð´Ð¾Ð»Ð¶Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾ÑÑ‚ÑŒ Ð¿Ñ€Ð¾Ð²ÐµÑ€ÐºÐ¸ Ð·Ð°Ð²Ð¸ÑÐ¸Ñ‚ Ð¾Ñ‚ Ð²Ð°ÑˆÐµÐ¹ Ð°Ð¿Ð¿Ð°Ñ€Ð°Ñ‚ÑƒÑ€Ñ‹ Ð¸ "
@@ -7692,13 +7495,13 @@
 
 #. Type: note
 #. Description
-#: ../cdrom-checker.templates:9 ../templates:9
+#: ../cdrom-checker.templates:9
 msgid "Insert a Debian CD-ROM"
 msgstr "Ð’ÑÑ‚Ð°Ð²ÑŒÑ‚Ðµ ÐºÐ¾Ð¼Ð¿Ð°ÐºÑ‚-Ð´Ð¸ÑÐº Debian"
 
 #. Type: note
 #. Description
-#: ../cdrom-checker.templates:9 ../templates:9
+#: ../cdrom-checker.templates:9
 msgid ""
 "Please insert one of the official Debian CD-ROMs into the drive before "
 "continuing."
@@ -7708,13 +7511,13 @@
 
 #. Type: error
 #. Description
-#: ../cdrom-checker.templates:15 ../templates:15
+#: ../cdrom-checker.templates:15
 msgid "Failed to mount CD-ROM"
 msgstr "ÐÐµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ ÑÐ¼Ð¾Ð½Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ ÐºÐ¾Ð¼Ð¿Ð°ÐºÑ‚-Ð´Ð¸ÑÐº"
 
 #. Type: error
 #. Description
-#: ../cdrom-checker.templates:15 ../templates:15
+#: ../cdrom-checker.templates:15
 msgid ""
 "The CD-ROM ${CDROM} could not be mounted correctly. Please check the media "
 "and cables, and try it again."
@@ -7724,13 +7527,13 @@
 
 #. Type: error
 #. Description
-#: ../cdrom-checker.templates:21 ../templates:21
+#: ../cdrom-checker.templates:21
 msgid "No valid Debian CD-ROM"
 msgstr "ÐÑ‚Ð¾ Ð½Ðµ ÐºÐ¾Ð¼Ð¿Ð°ÐºÑ‚-Ð´Ð¸ÑÐº Debian"
 
 #. Type: error
 #. Description
-#: ../cdrom-checker.templates:21 ../templates:21
+#: ../cdrom-checker.templates:21
 msgid ""
 "The CD-ROM you have inserted is not a valid Debian CD-ROM. Please change the "
 "disk."
@@ -7738,20 +7541,16 @@
 "Ð’ÑÑ‚Ð°Ð²Ð»ÐµÐ½Ð½Ñ‹Ð¹ Ð²Ð°Ð¼Ð¸ ÐºÐ¾Ð¼Ð¿Ð°ÐºÑ‚-Ð´Ð¸ÑÐº Ð½Ðµ ÑÐ²Ð»ÑÐµÑ‚ÑÑ ÐºÐ¾Ð¼Ð¿Ð°ÐºÑ‚-Ð´Ð¸ÑÐºÐ¾Ð¼ Debian. Ð¡Ð¼ÐµÐ½Ð¸Ñ‚Ðµ "
 "Ð´Ð¸ÑÐº."
 
-#. #-#-#-#-#  template.pot (debian-installer)  #-#-#-#-#
 #. Type: error
 #. Description
 #. TRANSLATORS: MD5 is a file name, don't translate it.
-#. #-#-#-#-#  template.pot (debian-installer)  #-#-#-#-#
-#. Type: error
-#. Description
-#: ../cdrom-checker.templates:28 ../templates:27
+#: ../cdrom-checker.templates:28
 msgid "Failed to open checksum file"
 msgstr "ÐÐµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚ÑŒ Ñ„Ð°Ð¹Ð» Ñ ÐºÐ¾Ð½Ñ‚Ñ€Ð¾Ð»ÑŒÐ½Ñ‹Ð¼Ð¸ ÑÑƒÐ¼Ð¼Ð°Ð¼Ð¸."
 
 #. Type: error
 #. Description
-#: ../cdrom-checker.templates:28 ../templates:27
+#: ../cdrom-checker.templates:28
 msgid ""
 "Opening the MD5 file on the CD-ROM failed. This file contains the checksums "
 "of the files located on the CD-ROM."
@@ -7761,13 +7560,13 @@
 
 #. Type: note
 #. Description
-#: ../cdrom-checker.templates:34 ../templates:33
+#: ../cdrom-checker.templates:34
 msgid "Integrity test successful"
 msgstr "ÐŸÑ€Ð¾Ð²ÐµÑ€ÐºÐ° Ñ†ÐµÐ»Ð¾ÑÑ‚Ð½Ð¾ÑÑ‚Ð¸ Ð·Ð°ÐºÐ¾Ð½Ñ‡Ð¸Ð»Ð°ÑÑŒ ÑƒÑÐ¿ÐµÑˆÐ½Ð¾"
 
 #. Type: note
 #. Description
-#: ../cdrom-checker.templates:34 ../templates:33
+#: ../cdrom-checker.templates:34
 msgid "The CD-ROM integrity test was successful. The CD-ROM is valid."
 msgstr ""
 "ÐŸÑ€Ð¾Ð²ÐµÑ€ÐºÐ° Ñ†ÐµÐ»Ð¾ÑÑ‚Ð½Ð¾ÑÑ‚Ð¸ ÐºÐ¾Ð¼Ð¿Ð°ÐºÑ‚-Ð´Ð¸ÑÐºÐ° Ð·Ð°ÐºÐ¾Ð½Ñ‡Ð¸Ð»Ð°ÑÑŒ ÑƒÑÐ¿ÐµÑˆÐ½Ð¾. ÐšÐ¾Ð¼Ð¿Ð°ÐºÑ‚-Ð´Ð¸ÑÐº "
@@ -7775,13 +7574,13 @@
 
 #. Type: error
 #. Description
-#: ../cdrom-checker.templates:39 ../templates:38
+#: ../cdrom-checker.templates:39
 msgid "Integrity test failed"
 msgstr "ÐŸÑ€Ð¾Ð²ÐµÑ€ÐºÐ° Ñ†ÐµÐ»Ð¾ÑÑ‚Ð½Ð¾ÑÑ‚Ð¸ Ð·Ð°ÐºÐ¾Ð½Ñ‡Ð¸Ð»Ð°ÑÑŒ Ð½ÐµÑƒÐ´Ð°Ñ‡Ð½Ð¾"
 
 #. Type: error
 #. Description
-#: ../cdrom-checker.templates:39 ../templates:38
+#: ../cdrom-checker.templates:39
 msgid ""
 "The ${FILE} file failed the MD5 checksum verification. Your CD-ROM or this "
 "file may have been corrupted."
@@ -7791,19 +7590,19 @@
 
 #. Type: boolean
 #. Description
-#: ../cdrom-checker.templates:46 ../templates:45
+#: ../cdrom-checker.templates:46
 msgid "Check the integrity of another CD-ROM?"
 msgstr "ÐŸÑ€Ð¾Ð²ÐµÑ€Ð¸Ñ‚ÑŒ Ñ†ÐµÐ»Ð¾ÑÑ‚Ð½Ð¾ÑÑ‚ÑŒ Ð´Ñ€ÑƒÐ³Ð¾Ð³Ð¾ ÐºÐ¾Ð¼Ð¿Ð°ÐºÑ‚-Ð´Ð¸ÑÐºÐ°?"
 
 #. Type: note
 #. Description
-#: ../cdrom-checker.templates:50 ../templates:49
+#: ../cdrom-checker.templates:50
 msgid "Insert Debian boot CD-ROM"
 msgstr "Ð’ÑÑ‚Ð°Ð²ÑŒÑ‚Ðµ Ð·Ð°Ð³Ñ€ÑƒÐ·Ð¾Ñ‡Ð½Ñ‹Ð¹ ÐºÐ¾Ð¼Ð¿Ð°ÐºÑ‚-Ð´Ð¸ÑÐº Debian"
 
 #. Type: note
 #. Description
-#: ../cdrom-checker.templates:50 ../templates:49
+#: ../cdrom-checker.templates:50
 msgid ""
 "Please make sure you have inserted the Debian boot CD-ROM  to continue with "
 "the installation."
@@ -7813,26 +7612,21 @@
 
 #. Type: text
 #. Description
-#: ../cdrom-checker.templates:56 ../templates:55
+#: ../cdrom-checker.templates:56
 msgid "Checking CD-ROM integrity"
 msgstr "ÐŸÑ€Ð¾Ð²ÐµÑ€ÐºÐ° Ñ†ÐµÐ»Ð¾ÑÑ‚Ð½Ð¾ÑÑ‚Ð¸ ÐºÐ¾Ð¼Ð¿Ð°ÐºÑ‚-Ð´Ð¸ÑÐºÐ°"
 
 #. Type: text
 #. Description
-#: ../cdrom-checker.templates:60 ../templates:59
+#: ../cdrom-checker.templates:60
 msgid "Checking file: ${FILE}"
 msgstr "ÐŸÑ€Ð¾Ð²ÐµÑ€ÐºÐ° Ñ„Ð°Ð¹Ð»Ð°: ${FILE}"
 
-#. #-#-#-#-#  template.pot (debian-installer)  #-#-#-#-#
 #. Type: text
 #. Description
 #. Main menu item
 #. Translators: keep it under 65 columns
-#. #-#-#-#-#  template.pot (debian-installer)  #-#-#-#-#
-#. Type: text
-#. Description
-#. Main menu item
-#: ../cdrom-checker.templates:66 ../templates:64
+#: ../cdrom-checker.templates:66
 msgid "Check the CD-ROM(s) integrity"
 msgstr "ÐŸÑ€Ð¾Ð²ÐµÑ€ÐºÐ° Ñ†ÐµÐ»Ð¾ÑÑ‚Ð½Ð¾ÑÑ‚Ð¸ ÐºÐ¾Ð¼Ð¿Ð°ÐºÑ‚-Ð´Ð¸ÑÐºÐ°(Ð¾Ð²)"
 
@@ -7842,28 +7636,24 @@
 msgid "Continue installation remotely using SSH"
 msgstr "ÐŸÑ€Ð¾Ð´Ð¾Ð»Ð¶ÐµÐ½Ð¸Ðµ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸ Ñ‡ÐµÑ€ÐµÐ· SSH"
 
-#. #-#-#-#-#  template.pot (debian-installer)  #-#-#-#-#
 #. Type: select
 #. Choices
 #. Note to translators : Please keep your translations of the choices
 #. below a 65 columns limit (which means 65 characters
 #. in single-byte languages)
-#. #-#-#-#-#  template.pot (debian-installer)  #-#-#-#-#
-#. Type: select
-#. Choices
-#: ../network-console.templates:12 ../network-console.templates:9
+#: ../network-console.templates:12
 msgid "Start menu, Start shell"
 msgstr "Ð’Ñ‹Ð·Ð²Ð°Ñ‚ÑŒ Ð¼ÐµÐ½ÑŽ, Ð—Ð°Ð¿ÑƒÑÑ‚Ð¸Ñ‚ÑŒ Ð¾Ð±Ð¾Ð»Ð¾Ñ‡ÐºÑƒ"
 
 #. Type: select
 #. Description
-#: ../network-console.templates:14 ../network-console.templates:11
+#: ../network-console.templates:14
 msgid "Network console option:"
 msgstr "ÐžÐ¿Ñ†Ð¸Ð¸ ÑÐµÑ‚ÐµÐ²Ð¾Ð¹ ÐºÐ¾Ð½ÑÐ¾Ð»Ð¸:"
 
 #. Type: select
 #. Description
-#: ../network-console.templates:14 ../network-console.templates:11
+#: ../network-console.templates:14
 msgid ""
 "This is the network console for the Debian installer. From here, you may "
 "start the Debian installer main menu, or execute an interactive shell."
@@ -7873,25 +7663,25 @@
 
 #. Type: select
 #. Description
-#: ../network-console.templates:14 ../network-console.templates:11
+#: ../network-console.templates:14
 msgid "To return to this menu, you will need to log in again."
 msgstr "Ð§Ñ‚Ð¾Ð±Ñ‹ Ð²ÐµÑ€Ð½ÑƒÑ‚ÑŒÑÑ Ð² ÑÑ‚Ð¾ Ð¼ÐµÐ½ÑŽ, Ð²Ð°Ð¼ Ð¿Ð¾Ð½Ð°Ð´Ð¾Ð±Ð¸Ñ‚ÑÑ Ð²Ð½Ð¾Ð²ÑŒ Ð²Ð¾Ð¹Ñ‚Ð¸ Ð² ÑÐ¸ÑÑ‚ÐµÐ¼Ñƒ."
 
 #. Type: text
 #. Description
-#: ../network-console.templates:23 ../network-console.templates:20
+#: ../network-console.templates:23
 msgid "Generating SSH host key"
 msgstr "Ð“ÐµÐ½ÐµÑ€Ð¸Ñ€ÑƒÐµÑ‚ÑÑ SSH-ÐºÐ»ÑŽÑ‡ ÐºÐ¾Ð¼Ð¿ÑŒÑŽÑ‚ÐµÑ€Ð°"
 
 #. Type: password
 #. Description
-#: ../network-console.templates:27 ../network-console.templates:24
+#: ../network-console.templates:27
 msgid "Remote installation password:"
 msgstr "ÐŸÐ°Ñ€Ð¾Ð»ÑŒ Ð´Ð»Ñ ÑƒÐ´Ð°Ð»Ñ‘Ð½Ð½Ð¾Ð¹ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸:"
 
 #. Type: password
 #. Description
-#: ../network-console.templates:27 ../network-console.templates:24
+#: ../network-console.templates:27
 msgid ""
 "You need to set a password for remote access to the Debian installer. A "
 "malicious or unqualified user with access to the installer can have "
@@ -7907,7 +7697,7 @@
 
 #. Type: password
 #. Description
-#: ../network-console.templates:27 ../network-console.templates:24
+#: ../network-console.templates:27
 msgid ""
 "This password is used only by the Debian installer, and will be discarded "
 "once you finished the installation."
@@ -7917,13 +7707,13 @@
 
 #. Type: password
 #. Description
-#: ../network-console.templates:40 ../network-console.templates:37
+#: ../network-console.templates:40
 msgid "Password confirmation:"
 msgstr "ÐŸÐ¾Ð´Ñ‚Ð²ÐµÑ€Ð¶Ð´ÐµÐ½Ð¸Ðµ Ð¿Ð°Ñ€Ð¾Ð»Ñ:"
 
 #. Type: password
 #. Description
-#: ../network-console.templates:40 ../network-console.templates:37
+#: ../network-console.templates:40
 msgid ""
 "Please enter the same remote installation password again to verify that you "
 "have typed it correctly."
@@ -7933,13 +7723,13 @@
 
 #. Type: text
 #. Description
-#: ../network-console.templates:46 ../network-console.templates:43
+#: ../network-console.templates:46
 msgid "Password empty"
 msgstr "ÐŸÑƒÑÑ‚Ð¾Ð¹ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ"
 
 #. Type: text
 #. Description
-#: ../network-console.templates:46 ../network-console.templates:43
+#: ../network-console.templates:46
 msgid ""
 "You seem to have entered an empty remote installation password. That is not "
 "secure. Please enter a password again."
@@ -7949,13 +7739,13 @@
 
 #. Type: note
 #. Description
-#: ../network-console.templates:52 ../network-console.templates:49
+#: ../network-console.templates:52
 msgid "Password mismatch"
 msgstr "ÐŸÐ°Ñ€Ð¾Ð»Ð¸ Ð½Ðµ ÑÐ¾Ð²Ð¿Ð°Ð´Ð°ÑŽÑ‚"
 
 #. Type: note
 #. Description
-#: ../network-console.templates:52 ../network-console.templates:49
+#: ../network-console.templates:52
 msgid ""
 "The two passwords you entered were not the same. Please enter a password "
 "again."
@@ -7963,7 +7753,7 @@
 
 #. Type: note
 #. Description
-#: ../network-console.templates:58 ../network-console.templates:55
+#: ../network-console.templates:58
 msgid ""
 "To finish the installation, please start the newly installed system and use "
 "an SSH client to log in as the \"installer\" user."
@@ -7993,13 +7783,13 @@
 
 #. Type: note
 #. Description
-#: ../network-console.templates:73 ../network-console.templates:61
+#: ../network-console.templates:73
 msgid "Start SSH"
 msgstr "Ð—Ð°Ð¿ÑƒÑÐº SSH"
 
 #. Type: note
 #. Description
-#: ../network-console.templates:73 ../network-console.templates:61
+#: ../network-console.templates:73
 msgid ""
 "To continue the installation, please use an SSH client to log in as the "
 "\"installer\" user."
@@ -8009,17 +7799,18 @@
 
 #. Type: note
 #. Description
-#: ../network-console.templates:73 ../network-console.templates:61
+#: ../network-console.templates:73
 msgid "The fingerprint of this SSH server's host key is: ${fingerprint}"
 msgstr "ÐŸÐ¾Ð´Ð¿Ð¸ÑÑŒ (fingerprint) host-ÐºÐ»ÑŽÑ‡Ð° ÑÑ‚Ð¾Ð³Ð¾ SSH-ÑÐµÑ€Ð²ÐµÑ€Ð°: ${fingerprint}"
 
 #. Type: note
 #. Description
-#: ../network-console.templates:73 ../network-console.templates:61
+#: ../network-console.templates:73
 msgid ""
 "Please check this carefully against the fingerprint reported by your SSH "
 "client."
-msgstr "Ð¢Ñ‰Ð°Ñ‚ÐµÐ»ÑŒÐ½Ð¾ ÑÐ²ÐµÑ€ÑŒÑ‚Ðµ ÑÑ‚Ñƒ Ð¿Ð¾Ð´Ð¿Ð¸ÑÑŒ Ñ Ñ‚Ð¾Ð¹, ÐºÐ¾Ñ‚Ð¾Ñ€ÑƒÑŽ Ð¿Ð¾ÐºÐ°Ð·Ñ‹Ð²Ð°ÐµÑ‚ Ð²Ð°Ñˆ SSH-ÐºÐ»Ð¸ÐµÐ½Ñ‚."
+msgstr ""
+"Ð¢Ñ‰Ð°Ñ‚ÐµÐ»ÑŒÐ½Ð¾ ÑÐ²ÐµÑ€ÑŒÑ‚Ðµ ÑÑ‚Ñƒ Ð¿Ð¾Ð´Ð¿Ð¸ÑÑŒ Ñ Ñ‚Ð¾Ð¹, ÐºÐ¾Ñ‚Ð¾Ñ€ÑƒÑŽ Ð¿Ð¾ÐºÐ°Ð·Ñ‹Ð²Ð°ÐµÑ‚ Ð²Ð°Ñˆ SSH-ÐºÐ»Ð¸ÐµÐ½Ñ‚."
 
 #. Type: boolean
 #. Description
@@ -8035,7 +7826,7 @@
 
 #. Type: text
 #. Description
-#: ../partman-palo.templates:17 ../templates:7
+#: ../partman-palo.templates:17
 msgid "PALO boot partition"
 msgstr "Ð·Ð°Ð³Ñ€ÑƒÐ·Ð¾Ñ‡Ð½Ñ‹Ð¹ Ñ€Ð°Ð·Ð´ÐµÐ» PALO"
 
@@ -8165,7 +7956,8 @@
 #. Description
 #: ../elilo-installer.templates:37
 msgid "Running \"/usr/sbin/elilo\" failed with error code \"${ERRCODE}\"."
-msgstr "Ð—Ð°Ð¿ÑƒÑÐº \"/sbin/elilo\" Ð·Ð°Ð²ÐµÑ€ÑˆÐ¸Ð»ÑÑ Ð½ÐµÑƒÐ´Ð°Ñ‡ÐµÐ¹. ÐšÐ¾Ð´ Ð²Ð¾Ð·Ð²Ñ€Ð°Ñ‚Ð° - \"${ERRCODE}\"."
+msgstr ""
+"Ð—Ð°Ð¿ÑƒÑÐº \"/sbin/elilo\" Ð·Ð°Ð²ÐµÑ€ÑˆÐ¸Ð»ÑÑ Ð½ÐµÑƒÐ´Ð°Ñ‡ÐµÐ¹. ÐšÐ¾Ð´ Ð²Ð¾Ð·Ð²Ñ€Ð°Ñ‚Ð° - \"${ERRCODE}\"."
 
 #. Type: boolean
 #. Description
@@ -8202,7 +7994,7 @@
 
 #. Type: boolean
 #. Description
-#: ../aboot-installer.templates:22 ../silo-installer.templates:51
+#: ../aboot-installer.templates:22
 msgid "Install /boot on a disk with an unsupported partition table?"
 msgstr "Ð£ÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ /boot Ð½Ð° Ð´Ð¸ÑÐº Ñ Ð½ÐµÐ¿Ð¾Ð´Ð´ÐµÑ€Ð¶Ð¸Ð²Ð°ÐµÐ¼Ð¾Ð¹ Ñ‚Ð°Ð±Ð»Ð¸Ñ†ÐµÐ¹ Ñ€Ð°Ð·Ð´ÐµÐ»Ð¾Ð²?"
 
@@ -8224,7 +8016,7 @@
 
 #. Type: boolean
 #. Description
-#: ../aboot-installer.templates:32 ../silo-installer.templates:38
+#: ../aboot-installer.templates:32
 msgid "Use unsupported file system type for /boot?"
 msgstr "Ð˜ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ Ð½ÐµÐ¿Ð¾Ð´Ð´ÐµÑ€Ð¶Ð¸Ð²Ð°ÐµÐ¼Ñ‹Ð¹ Ñ‚Ð¸Ð¿ Ñ„Ð°Ð¹Ð»Ð¾Ð²Ð¾Ð¹ ÑÐ¸ÑÑ‚ÐµÐ¼Ñ‹ Ð´Ð»Ñ /boot?"
 
@@ -8356,25 +8148,25 @@
 
 #. Type: text
 #. Description
-#: ../vmelilo-installer.templates:3 ../templates:3
+#: ../vmelilo-installer.templates:3
 msgid "Installing vmelilo"
 msgstr "Ð£ÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ° vmelilo"
 
 #. Type: text
 #. Description
-#: ../vmelilo-installer.templates:7 ../templates:7
+#: ../vmelilo-installer.templates:7
 msgid "Installing vmelilo boot loader"
 msgstr "Ð£ÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ° ÑÐ¸ÑÑ‚ÐµÐ¼Ð½Ð¾Ð³Ð¾ Ð·Ð°Ð³Ñ€ÑƒÐ·Ñ‡Ð¸ÐºÐ° vmelilo"
 
 #. Type: boolean
 #. Description
-#: ../vmelilo-installer.templates:12 ../templates:12
+#: ../vmelilo-installer.templates:12
 msgid "vmelilo installation failed.  Continue anyway?"
 msgstr "ÐÐµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ vmelilo. ÐŸÑ€Ð¾Ð´Ð¾Ð»Ð¶Ð¸Ñ‚ÑŒ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÑƒ?"
 
 #. Type: boolean
 #. Description
-#: ../vmelilo-installer.templates:12 ../templates:12
+#: ../vmelilo-installer.templates:12
 msgid ""
 "The vmelilo package failed to install into /target/.  Installing vmelilo as "
 "a boot loader is a required step.  The install problem might however be "
@@ -8387,44 +8179,44 @@
 
 #. Type: text
 #. Description
-#: ../vmelilo-installer.templates:19 ../templates:19
+#: ../vmelilo-installer.templates:19
 msgid "Looking for root partition..."
 msgstr "ÐŸÐ¾Ð¸ÑÐº ÐºÐ¾Ñ€Ð½ÐµÐ²Ð¾Ð³Ð¾ Ñ€Ð°Ð·Ð´ÐµÐ»Ð°..."
 
 #. Type: text
 #. Description
-#: ../vmelilo-installer.templates:29 ../templates:29
+#: ../vmelilo-installer.templates:29
 msgid "Creating vmelilo configuration..."
 msgstr "Ð¡Ð¾Ð·Ð´Ð°Ð½Ð¸Ðµ ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ð¸ vmelilo..."
 
 #. Type: error
 #. Description
-#: ../vmelilo-installer.templates:33 ../templates:33
+#: ../vmelilo-installer.templates:33
 msgid "Failed to create vmelilo configuration"
 msgstr "ÐÐµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ ÑÐ¾Ð·Ð´Ð°Ñ‚ÑŒ ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸ÑŽ vmelilo"
 
 #. Type: error
 #. Description
-#: ../vmelilo-installer.templates:33 ../templates:33
+#: ../vmelilo-installer.templates:33
 msgid "The creation of the vmelilo configuration file failed."
 msgstr "ÐÐµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ ÑÐ¾Ð·Ð´Ð°Ñ‚ÑŒ Ñ„Ð°Ð¹Ð» ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ð¸ vmelilo."
 
 #. Type: text
 #. Description
-#: ../vmelilo-installer.templates:42 ../templates:42
+#: ../vmelilo-installer.templates:42
 msgid "Installing vmelilo into bootstrap partition..."
 msgstr "Ð£ÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ° vmelilo Ð½Ð° Ð·Ð°Ð³Ñ€ÑƒÐ·Ð¾Ñ‡Ð½Ñ‹Ð¹ Ñ€Ð°Ð·Ð´ÐµÐ»..."
 
 #. Type: error
 #. Description
-#: ../vmelilo-installer.templates:46 ../templates:46
+#: ../vmelilo-installer.templates:46
 msgid "The installation of the vmelilo boot loader failed."
 msgstr "Ð£ÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ° ÑÐ¸ÑÑ‚ÐµÐ¼Ð½Ð¾Ð³Ð¾ Ð·Ð°Ð³Ñ€ÑƒÐ·Ñ‡Ð¸ÐºÐ° vmelilo Ð·Ð°Ð²ÐµÑ€ÑˆÐ¸Ð»Ð°ÑÑŒ Ð½ÐµÑƒÐ´Ð°Ñ‡Ð½Ð¾."
 
 #. Type: text
 #. Description
 #. Main menu item
-#: ../vmelilo-installer.templates:56 ../templates:56
+#: ../vmelilo-installer.templates:56
 msgid "Install the vmelilo boot loader on a hard disk"
 msgstr "Ð£ÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ° Ð·Ð°Ð³Ñ€ÑƒÐ·Ñ‡Ð¸ÐºÐ° vmelilo Ð½Ð° Ð¶Ñ‘ÑÑ‚ÐºÐ¸Ð¹ Ð´Ð¸ÑÐº"
 
@@ -8627,7 +8419,6 @@
 "Ð±Ñ‹Ñ‚ÑŒ Ð½Ðµ ÑÐ²ÑÐ·Ð°Ð½Ð° Ñ Arcboot, Ñ‚Ð°Ðº Ñ‡Ñ‚Ð¾ Ð¿Ñ€Ð¾Ð´Ð¾Ð»Ð¶ÐµÐ½Ð¸Ðµ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸ Ð¼Ð¾Ð¶ÐµÑ‚ Ð¾ÐºÐ°Ð·Ð°Ñ‚ÑŒÑÑ "
 "Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ñ‹Ð¼."
 
-#. #-#-#-#-#  template.pot (debian-installer)  #-#-#-#-#
 #. Type: note
 #. Description
 #. Note to translators : please leave the paragraphs with
@@ -8635,16 +8426,13 @@
 #. Do NOT translate anything there
 #. but just copy the msgid to msgstr
 #. "Stop for Maintenance" should also be left in English
-#. #-#-#-#-#  template.pot (debian-installer)  #-#-#-#-#
-#. Type: note
-#. Description
-#: ../arcboot-installer.templates:34 ../arcboot-installer.templates:29
+#: ../arcboot-installer.templates:34
 msgid "Setting PROM variables for Arcboot"
 msgstr "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ° Ð¿ÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ñ‹Ñ… PROM Ð´Ð»Ñ Arcboot"
 
 #. Type: note
 #. Description
-#: ../arcboot-installer.templates:34 ../arcboot-installer.templates:29
+#: ../arcboot-installer.templates:34
 msgid ""
 "If this is the first Linux installation on this machine, or if the hard "
 "drives have been repartitioned, some variables need to be set in the PROM "
@@ -8656,7 +8444,7 @@
 
 #. Type: note
 #. Description
-#: ../arcboot-installer.templates:34 ../arcboot-installer.templates:29
+#: ../arcboot-installer.templates:34
 msgid ""
 "At the end of this installation stage, the system will reboot.  After this, "
 "enter the command monitor from the \"Stop for Maintenance\" option, and "
@@ -8668,7 +8456,7 @@
 
 #. Type: note
 #. Description
-#: ../arcboot-installer.templates:34 ../arcboot-installer.templates:29
+#: ../arcboot-installer.templates:34
 msgid ""
 "   setenv SystemPartition scsi(${BOOTBUS})disk(${BOOTID})rdisk(${BOOTLUN})"
 "partition(8)\n"
@@ -8686,13 +8474,13 @@
 
 #. Type: boolean
 #. Description
-#: ../sibyl-installer.templates:4 ../templates:4
+#: ../sibyl-installer.templates:4
 msgid "SiByl boot loader installation failed.  Continue anyway?"
 msgstr "ÐÐµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ ÑÐ¸ÑÑ‚ÐµÐ¼Ð½Ñ‹Ð¹ Ð·Ð°Ð³Ñ€ÑƒÐ·Ñ‡Ð¸Ðº SiByl. ÐŸÑ€Ð¾Ð´Ð¾Ð»Ð¶Ð¸Ñ‚ÑŒ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÑƒ?"
 
 #. Type: boolean
 #. Description
-#: ../sibyl-installer.templates:4 ../templates:4
+#: ../sibyl-installer.templates:4
 msgid ""
 "The SiByl package failed to install into /target/.  Installing SiByl as a "
 "boot loader is a required step.  The install problem might however be "
@@ -8705,44 +8493,44 @@
 
 #. Type: text
 #. Description
-#: ../sibyl-installer.templates:11 ../templates:11
+#: ../sibyl-installer.templates:11
 msgid "Installing the SiByl boot loader"
 msgstr "Ð£ÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ° ÑÐ¸ÑÑ‚ÐµÐ¼Ð½Ð¾Ð³Ð¾ Ð·Ð°Ð³Ñ€ÑƒÐ·Ñ‡Ð¸ÐºÐ° SiByl"
 
 #. Type: text
 #. Description
-#: ../sibyl-installer.templates:15 ../templates:15
+#: ../sibyl-installer.templates:15
 msgid "Installing the SiByl package"
 msgstr "Ð£ÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ° Ð¿Ð°ÐºÐµÑ‚Ð° SiByl"
 
 #. Type: text
 #. Description
-#: ../sibyl-installer.templates:19 ../templates:19
+#: ../sibyl-installer.templates:19
 msgid "Creating SiByl configuration"
 msgstr "Ð¡Ð¾Ð·Ð´Ð°Ð½Ð¸Ðµ ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ð¸ SiByl"
 
 #. Type: text
 #. Description
 #. Main menu item
-#: ../sibyl-installer.templates:24 ../templates:24
+#: ../sibyl-installer.templates:24
 msgid "Install the SiByl boot loader on a hard disk"
 msgstr "Ð£ÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ° Ð·Ð°Ð³Ñ€ÑƒÐ·Ñ‡Ð¸ÐºÐ° SiByl Ð½Ð° Ð¶Ñ‘ÑÑ‚ÐºÐ¸Ð¹ Ð´Ð¸ÑÐº"
 
 #. Type: text
 #. Description
-#: ../sibyl-installer.templates:28 ../templates:28
+#: ../sibyl-installer.templates:28
 msgid "SiByl boot partition"
 msgstr "Ð—Ð°Ð³Ñ€ÑƒÐ·Ð¾Ñ‡Ð½Ñ‹Ð¹ Ñ€Ð°Ð·Ð´ÐµÐ» SiByl"
 
 #. Type: boolean
 #. Description
-#: ../colo-installer.templates:4 ../templates:4
+#: ../colo-installer.templates:4
 msgid "Cobalt boot loader installation failed.  Continue anyway?"
 msgstr "Ð£ÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ° Cobalt Ð½Ðµ ÑƒÐ´Ð°Ð»Ð°ÑÑŒ. ÐŸÑ€Ð¾Ð´Ð¾Ð»Ð¶Ð¸Ñ‚ÑŒ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÑƒ?"
 
 #. Type: boolean
 #. Description
-#: ../colo-installer.templates:4 ../templates:4
+#: ../colo-installer.templates:4
 msgid ""
 "The CoLo package failed to install into /target/.  Installing CoLo as a boot "
 "loader is a required step.  The install problem might however be unrelated "
@@ -8755,26 +8543,26 @@
 
 #. Type: text
 #. Description
-#: ../colo-installer.templates:11 ../templates:11
+#: ../colo-installer.templates:11
 msgid "Installing the Cobalt boot loader"
 msgstr "Ð£ÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ° ÑÐ¸ÑÑ‚ÐµÐ¼Ð½Ð¾Ð³Ð¾ Ð·Ð°Ð³Ñ€ÑƒÐ·Ñ‡Ð¸ÐºÐ° Cobalt"
 
 #. Type: text
 #. Description
-#: ../colo-installer.templates:15 ../templates:15
+#: ../colo-installer.templates:15
 msgid "Installing the CoLo package"
 msgstr "Ð£ÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ° Ð¿Ð°ÐºÐµÑ‚Ð° CoLo"
 
 #. Type: text
 #. Description
-#: ../colo-installer.templates:19 ../templates:19
+#: ../colo-installer.templates:19
 msgid "Creating CoLo configuration"
 msgstr "Ð¡Ð¾Ð·Ð´Ð°Ð½Ð¸Ðµ ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ð¸ CoLo"
 
 #. Type: text
 #. Description
 #. Main menu item
-#: ../colo-installer.templates:24 ../templates:24
+#: ../colo-installer.templates:24
 msgid "Install the Cobalt boot loader on a hard disk"
 msgstr "Ð£ÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ° Ð·Ð°Ð³Ñ€ÑƒÐ·Ñ‡Ð¸ÐºÐ° Cobalt Ð½Ð° Ð¶Ñ‘ÑÑ‚ÐºÐ¸Ð¹ Ð´Ð¸ÑÐº"
 
@@ -8853,58 +8641,56 @@
 "Ð¢ÐµÐºÑƒÑ‰Ð°Ñ ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ ÑÐ´Ñ€Ð° Ð½Ðµ Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶Ð¸Ð²Ð°ÐµÑ‚ multidisk ÑƒÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð²Ð°. ÐžÐ±Ñ‹Ñ‡Ð½Ð¾ ÑÑ‚Ð° "
 "Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ð° Ñ€ÐµÑˆÐ°ÐµÑ‚ÑÑ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¾Ð¹ Ð½ÐµÐ¾Ð±Ñ…Ð¾Ð´Ð¸Ð¼Ñ‹Ñ… Ð¼Ð¾Ð´ÑƒÐ»ÐµÐ¹ ÑÐ´Ñ€Ð°."
 
-#. #-#-#-#-#  template.pot (debian-installer)  #-#-#-#-#
 #. Type: select
 #. Choices
 #. Note to translators : Please keep your translations of the choices
 #. below a 65 columns limit (which means 65 characters
 #. in single-byte languages)
-#. #-#-#-#-#  template.pot (debian-installer)  #-#-#-#-#
-#. Type: select
-#. Choices
-#: ../mdcfg-utils.templates:17 ../mdcfg-utils.templates:14
+#: ../mdcfg-utils.templates:17
 msgid "Create MD device"
 msgstr "Ð¡Ð¾Ð·Ð´Ð°Ñ‚ÑŒ MD ÑƒÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð²Ð¾"
 
 #. Type: select
 #. Choices
-#: ../mdcfg-utils.templates:17 ../mdcfg-utils.templates:14
+#: ../mdcfg-utils.templates:17
 msgid "Delete MD device"
 msgstr "Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ MD ÑƒÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð²Ð¾"
 
 #. Type: select
 #. Choices
-#: ../mdcfg-utils.templates:17 ../mdcfg-utils.templates:14
+#: ../mdcfg-utils.templates:17
 msgid "Finish"
 msgstr "Ð—Ð°ÐºÐ¾Ð½Ñ‡Ð¸Ñ‚ÑŒ"
 
 #. Type: select
 #. Description
-#: ../mdcfg-utils.templates:18 ../mdcfg-utils.templates:15
+#: ../mdcfg-utils.templates:18
 msgid "Multidisk configuration actions"
 msgstr "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ° Multidisk"
 
 #. Type: select
 #. Description
-#: ../mdcfg-utils.templates:18 ../mdcfg-utils.templates:15
+#: ../mdcfg-utils.templates:18
 msgid "This is the Multidisk (MD) and software RAID configuration menu."
 msgstr "ÐÑ‚Ð¾ Ð¼ÐµÐ½ÑŽ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ Multidisk (MD) Ð¸ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð½Ð¾Ð³Ð¾ RAID."
 
 #. Type: select
 #. Description
-#: ../mdcfg-utils.templates:18 ../mdcfg-utils.templates:15
-msgid "Please select one of the proposed actions to configure multidisk devices."
-msgstr "Ð’Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ Ð¾Ð´Ð½Ð¾ Ð¸Ð· Ð¿Ñ€ÐµÐ´Ð»Ð°Ð³Ð°ÐµÐ¼Ñ‹Ñ… Ð´ÐµÐ¹ÑÑ‚Ð²Ð¸Ð¹ Ð´Ð»Ñ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ multidisk ÑƒÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð²."
+#: ../mdcfg-utils.templates:18
+msgid ""
+"Please select one of the proposed actions to configure multidisk devices."
+msgstr ""
+"Ð’Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ Ð¾Ð´Ð½Ð¾ Ð¸Ð· Ð¿Ñ€ÐµÐ´Ð»Ð°Ð³Ð°ÐµÐ¼Ñ‹Ñ… Ð´ÐµÐ¹ÑÑ‚Ð²Ð¸Ð¹ Ð´Ð»Ñ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ multidisk ÑƒÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð²."
 
 #. Type: error
 #. Description
-#: ../mdcfg-utils.templates:25 ../mdcfg-utils.templates:22
+#: ../mdcfg-utils.templates:25
 msgid "No RAID partitions available"
 msgstr "ÐÐµÑ‚ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ñ‹Ñ… RAID-Ñ€Ð°Ð·Ð´ÐµÐ»Ð¾Ð²"
 
 #. Type: error
 #. Description
-#: ../mdcfg-utils.templates:25 ../mdcfg-utils.templates:22
+#: ../mdcfg-utils.templates:25
 msgid ""
 "No unused partitions of the type \"Linux RAID Autodetect\" are available. "
 "Please create such a partition, or delete an already used multidisk device "
@@ -8916,7 +8702,7 @@
 
 #. Type: error
 #. Description
-#: ../mdcfg-utils.templates:25 ../mdcfg-utils.templates:22
+#: ../mdcfg-utils.templates:25
 msgid ""
 "If you have such partitions, they might contain actual file systems, and are "
 "therefore not available for use by this configuration utility."
@@ -8926,13 +8712,13 @@
 
 #. Type: error
 #. Description
-#: ../mdcfg-utils.templates:35 ../mdcfg-utils.templates:32
+#: ../mdcfg-utils.templates:35
 msgid "Not enough RAID partitions available"
 msgstr "ÐÐµÐ´Ð¾ÑÑ‚Ð°Ñ‚Ð¾Ñ‡Ð½Ð¾ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ñ‹Ñ… RAID-Ñ€Ð°Ð·Ð´ÐµÐ»Ð¾Ð²"
 
 #. Type: error
 #. Description
-#: ../mdcfg-utils.templates:35 ../mdcfg-utils.templates:32
+#: ../mdcfg-utils.templates:35
 msgid ""
 "There are not enough RAID partitions available for your selected "
 "configuration.  You have ${NUM_PART} RAID partitions available but your "
@@ -8944,43 +8730,43 @@
 
 #. Type: select
 #. Choices
-#: ../mdcfg-utils.templates:42 ../mdcfg-utils.templates:39
+#: ../mdcfg-utils.templates:42
 msgid "RAID0"
 msgstr "RAID0"
 
 #. Type: select
 #. Choices
-#: ../mdcfg-utils.templates:42 ../mdcfg-utils.templates:39
+#: ../mdcfg-utils.templates:42
 msgid "RAID1"
 msgstr "RAID1"
 
 #. Type: select
 #. Choices
-#: ../mdcfg-utils.templates:42 ../mdcfg-utils.templates:39
+#: ../mdcfg-utils.templates:42
 msgid "RAID5"
 msgstr "RAID5"
 
 #. Type: select
 #. Description
-#: ../mdcfg-utils.templates:43 ../mdcfg-utils.templates:40
+#: ../mdcfg-utils.templates:43
 msgid "Multidisk device type:"
 msgstr "Ð¢Ð¸Ð¿ Multidisk ÑƒÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð²Ð°:"
 
 #. Type: select
 #. Description
-#: ../mdcfg-utils.templates:43 ../mdcfg-utils.templates:40
+#: ../mdcfg-utils.templates:43
 msgid "Please choose the type of the multidisk device to be created."
 msgstr "Ð’Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ Ñ‚Ð¸Ð¿ ÑÐ¾Ð·Ð´Ð°Ð²Ð°ÐµÐ¼Ð¾Ð³Ð¾ multidisk ÑƒÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð²Ð°."
 
 #. Type: string
 #. Description
-#: ../mdcfg-utils.templates:48 ../mdcfg-utils.templates:45
+#: ../mdcfg-utils.templates:48
 msgid "Number of active devices for the RAID1 array:"
 msgstr "Ð§Ð¸ÑÐ»Ð¾ Ð°ÐºÑ‚Ð¸Ð²Ð½Ñ‹Ñ… Ñ€Ð°Ð·Ð´ÐµÐ»Ð¾Ð² Ð´Ð»Ñ RAID1 Ð¼Ð°ÑÑÐ¸Ð²Ð°:"
 
 #. Type: string
 #. Description
-#: ../mdcfg-utils.templates:48 ../mdcfg-utils.templates:45
+#: ../mdcfg-utils.templates:48
 msgid ""
 "The RAID1 array will consist of both active and spare partitions. The active "
 "partitions are those used, while the spare devices will only be used if one "
@@ -8992,31 +8778,31 @@
 
 #. Type: string
 #. Description
-#: ../mdcfg-utils.templates:57 ../mdcfg-utils.templates:54
+#: ../mdcfg-utils.templates:57
 msgid "Number of spare devices for the RAID1 array:"
 msgstr "Ð§Ð¸ÑÐ»Ð¾ Ñ€ÐµÐ·ÐµÑ€Ð²Ð½Ñ‹Ñ… Ñ€Ð°Ð·Ð´ÐµÐ»Ð¾Ð² Ð´Ð»Ñ RAID1 Ð¼Ð°ÑÑÐ¸Ð²Ð°:"
 
 #. Type: multiselect
 #. Description
-#: ../mdcfg-utils.templates:62 ../mdcfg-utils.templates:59
+#: ../mdcfg-utils.templates:62
 msgid "Spare devices for the RAID1 multidisk device:"
 msgstr "Ð ÐµÐ·ÐµÑ€Ð²Ð½Ñ‹Ðµ Ñ€Ð°Ð·Ð´ÐµÐ»Ñ‹ Ð´Ð»Ñ RAID1 multidisk ÑƒÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð²Ð°:"
 
 #. Type: multiselect
 #. Description
-#: ../mdcfg-utils.templates:62 ../mdcfg-utils.templates:59
+#: ../mdcfg-utils.templates:62
 msgid "You have chosen to create an RAID1 array with ${COUNT} spare devices."
 msgstr "Ð’Ñ‹ Ð²Ñ‹Ð±Ñ€Ð°Ð»Ð¸ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ðµ RAID1 Ð¼Ð°ÑÑÐ¸Ð²Ð° Ñ ${COUNT} Ñ€ÐµÐ·ÐµÑ€Ð²Ð½Ñ‹Ð¼Ð¸ ÑƒÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð²Ð°Ð¼Ð¸."
 
 #. Type: string
 #. Description
-#: ../mdcfg-utils.templates:72 ../mdcfg-utils.templates:69
+#: ../mdcfg-utils.templates:72
 msgid "Number of active devices for the RAID5 array:"
 msgstr "Ð§Ð¸ÑÐ»Ð¾ Ð°ÐºÑ‚Ð¸Ð²Ð½Ñ‹Ñ… Ñ€Ð°Ð·Ð´ÐµÐ»Ð¾Ð² Ð´Ð»Ñ RAID5 Ð¼Ð°ÑÑÐ¸Ð²Ð°:"
 
 #. Type: string
 #. Description
-#: ../mdcfg-utils.templates:72 ../mdcfg-utils.templates:69
+#: ../mdcfg-utils.templates:72
 msgid ""
 "The RAID5 array will consist of both active and spare partitions. The active "
 "partitions are those used, while the spare devices will only be used if one "
@@ -9030,31 +8816,31 @@
 
 #. Type: string
 #. Description
-#: ../mdcfg-utils.templates:72 ../mdcfg-utils.templates:69
+#: ../mdcfg-utils.templates:72
 msgid "NOTE: this setting cannot be changed later."
 msgstr "Ð’ÐÐ˜ÐœÐÐÐ˜Ð•: Ð¸Ð·Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ ÑÑ‚Ñƒ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÑƒ Ð¿Ð¾Ñ‚Ð¾Ð¼ Ð±ÑƒÐ´ÐµÑ‚ Ð½ÐµÐ»ÑŒÐ·Ñ."
 
 #. Type: string
 #. Description
-#: ../mdcfg-utils.templates:82 ../mdcfg-utils.templates:79
+#: ../mdcfg-utils.templates:82
 msgid "Number of spare devices for the RAID5 array:"
 msgstr "Ð§Ð¸ÑÐ»Ð¾ Ñ€ÐµÐ·ÐµÑ€Ð²Ð½Ñ‹Ñ… Ñ€Ð°Ð·Ð´ÐµÐ»Ð¾Ð² Ð´Ð»Ñ Ð¼Ð°ÑÑÐ¸Ð²Ð° RAID5:"
 
 #. Type: multiselect
 #. Description
-#: ../mdcfg-utils.templates:87 ../mdcfg-utils.templates:84
+#: ../mdcfg-utils.templates:87
 msgid "Spare devices for the RAID5 multidisk device:"
 msgstr "Ð ÐµÐ·ÐµÑ€Ð²Ð½Ñ‹Ðµ Ñ€Ð°Ð·Ð´ÐµÐ»Ñ‹ Ð´Ð»Ñ RAID5 multidisk ÑƒÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð²Ð°:"
 
 #. Type: multiselect
 #. Description
-#: ../mdcfg-utils.templates:87 ../mdcfg-utils.templates:84
+#: ../mdcfg-utils.templates:87
 msgid "You have chosen to create an RAID5 array with ${COUNT} spare devices."
 msgstr "Ð’Ñ‹ Ð²Ñ‹Ð±Ñ€Ð°Ð»Ð¸ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ðµ RAID5 Ð¼Ð°ÑÑÐ¸Ð²Ð° Ñ ${COUNT} Ñ€ÐµÐ·ÐµÑ€Ð²Ð½Ñ‹Ð¼Ð¸ ÑƒÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð²Ð°Ð¼Ð¸."
 
 #. Type: multiselect
 #. Description
-#: ../mdcfg-utils.templates:87 ../mdcfg-utils.templates:84
+#: ../mdcfg-utils.templates:87
 msgid ""
 "Please choose which partitions will be used as spare devices. You may choose "
 "up to ${COUNT} partitions. If you choose less than ${COUNT} devices, the "
@@ -9068,45 +8854,46 @@
 
 #. Type: multiselect
 #. Description
-#: ../mdcfg-utils.templates:98 ../mdcfg-utils.templates:95
+#: ../mdcfg-utils.templates:98
 msgid "Active devices for the RAID0 multidisk device:"
 msgstr "ÐÐºÑ‚Ð¸Ð²Ð½Ñ‹Ðµ Ñ€Ð°Ð·Ð´ÐµÐ»Ñ‹ Ð´Ð»Ñ RAID0 multidisk ÑƒÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð²Ð°:"
 
 #. Type: multiselect
 #. Description
-#: ../mdcfg-utils.templates:98 ../mdcfg-utils.templates:95
+#: ../mdcfg-utils.templates:98
 msgid ""
 "You have chosen to create a RAID0 array. Please choose the active devices in "
 "this array."
-msgstr "Ð’Ñ‹ Ð²Ñ‹Ð±Ñ€Ð°Ð»Ð¸ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ðµ Ð¼Ð°ÑÑÐ¸Ð²Ð° RAID0. Ð£ÐºÐ°Ð¶Ð¸Ñ‚Ðµ Ð°ÐºÑ‚Ð¸Ð²Ð½Ñ‹Ðµ Ñ€Ð°Ð·Ð´ÐµÐ»Ñ‹ Ð² ÑÑ‚Ð¾Ð¼ Ð¼Ð°ÑÑÐ¸Ð²Ðµ."
+msgstr ""
+"Ð’Ñ‹ Ð²Ñ‹Ð±Ñ€Ð°Ð»Ð¸ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ðµ Ð¼Ð°ÑÑÐ¸Ð²Ð° RAID0. Ð£ÐºÐ°Ð¶Ð¸Ñ‚Ðµ Ð°ÐºÑ‚Ð¸Ð²Ð½Ñ‹Ðµ Ñ€Ð°Ð·Ð´ÐµÐ»Ñ‹ Ð² ÑÑ‚Ð¾Ð¼ Ð¼Ð°ÑÑÐ¸Ð²Ðµ."
 
 #. Type: multiselect
 #. Description
-#: ../mdcfg-utils.templates:105 ../mdcfg-utils.templates:102
+#: ../mdcfg-utils.templates:105
 msgid "Active devices for the RAID1 multidisk device:"
 msgstr "ÐÐºÑ‚Ð¸Ð²Ð½Ñ‹Ðµ Ñ€Ð°Ð·Ð´ÐµÐ»Ñ‹ Ð´Ð»Ñ RAID1 multidisk ÑƒÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð²Ð°:"
 
 #. Type: multiselect
 #. Description
-#: ../mdcfg-utils.templates:105 ../mdcfg-utils.templates:102
+#: ../mdcfg-utils.templates:105
 msgid "You have chosen to create an RAID1 array with ${COUNT} active devices."
 msgstr "Ð’Ñ‹ Ð²Ñ‹Ð±Ñ€Ð°Ð»Ð¸ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ðµ RAID1 Ð¼Ð°ÑÑÐ¸Ð²Ð° Ñ ${COUNT} Ð°ÐºÑ‚Ð¸Ð²Ð½Ñ‹Ð¼Ð¸ Ñ€Ð°Ð·Ð´ÐµÐ»Ð°Ð¼Ð¸."
 
 #. Type: multiselect
 #. Description
-#: ../mdcfg-utils.templates:114 ../mdcfg-utils.templates:111
+#: ../mdcfg-utils.templates:114
 msgid "Active devices for the RAID5 multidisk device:"
 msgstr "ÐÐºÑ‚Ð¸Ð²Ð½Ñ‹Ðµ Ñ€Ð°Ð·Ð´ÐµÐ»Ñ‹ Ð´Ð»Ñ RAID5 multidisk ÑƒÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð²Ð°:"
 
 #. Type: multiselect
 #. Description
-#: ../mdcfg-utils.templates:114 ../mdcfg-utils.templates:111
+#: ../mdcfg-utils.templates:114
 msgid "You have chosen to create an RAID5 array with ${COUNT} active devices."
 msgstr "Ð’Ñ‹ Ð²Ñ‹Ð±Ñ€Ð°Ð»Ð¸ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ðµ RAID5 Ð¼Ð°ÑÑÐ¸Ð²Ð° Ñ ${COUNT} Ð°ÐºÑ‚Ð¸Ð²Ð½Ñ‹Ð¼Ð¸ Ñ€Ð°Ð·Ð´ÐµÐ»Ð°Ð¼Ð¸."
 
 #. Type: multiselect
 #. Description
-#: ../mdcfg-utils.templates:114 ../mdcfg-utils.templates:111
+#: ../mdcfg-utils.templates:114
 msgid ""
 "Please choose which partitions are active devices. You must select exactly "
 "${COUNT} partitions."
@@ -9116,13 +8903,13 @@
 
 #. Type: select
 #. Description
-#: ../mdcfg-utils.templates:123 ../mdcfg-utils.templates:120
+#: ../mdcfg-utils.templates:123
 msgid "Multidisk device to be deleted:"
 msgstr "Multidisk ÑƒÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð²Ð¾, ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ðµ Ð±ÑƒÐ´ÐµÑ‚ ÑƒÐ´Ð°Ð»ÐµÐ½Ð¾:"
 
 #. Type: select
 #. Description
-#: ../mdcfg-utils.templates:123 ../mdcfg-utils.templates:120
+#: ../mdcfg-utils.templates:123
 msgid ""
 "Deleting a multidisk device will stop it and clear the superblock of all its "
 "components."
@@ -9132,7 +8919,7 @@
 
 #. Type: select
 #. Description
-#: ../mdcfg-utils.templates:123 ../mdcfg-utils.templates:120
+#: ../mdcfg-utils.templates:123
 msgid ""
 "Please note this will not immediately allow you to reuse the partitions or "
 "devices in a new multidisk device. The array will however be unusable after "
@@ -9144,7 +8931,7 @@
 
 #. Type: select
 #. Description
-#: ../mdcfg-utils.templates:123 ../mdcfg-utils.templates:120
+#: ../mdcfg-utils.templates:123
 msgid ""
 "If you select a device for deletion, you will get some information about it "
 "and you will be given the option of aborting this operation."
@@ -9154,25 +8941,25 @@
 
 #. Type: error
 #. Description
-#: ../mdcfg-utils.templates:136 ../mdcfg-utils.templates:133
+#: ../mdcfg-utils.templates:136
 msgid "No multidisk devices available"
 msgstr "ÐÐµÑ‚ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ñ‹Ñ… multidisk ÑƒÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð²"
 
 #. Type: error
 #. Description
-#: ../mdcfg-utils.templates:136 ../mdcfg-utils.templates:133
+#: ../mdcfg-utils.templates:136
 msgid "No multidisk devices are available for deletion."
 msgstr "ÐÐµÑ‚ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ñ‹Ñ… Ð´Ð»Ñ ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ multidisk ÑƒÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð²."
 
 #. Type: boolean
 #. Description
-#: ../mdcfg-utils.templates:142 ../mdcfg-utils.templates:139
+#: ../mdcfg-utils.templates:142
 msgid "Really delete this multidisk device?"
 msgstr "Ð’Ñ‹ Ð´ÐµÐ¹ÑÑ‚Ð²Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾ Ñ…Ð¾Ñ‚Ð¸Ñ‚Ðµ ÑƒÐ´Ð°Ð»Ð¸Ñ‚ÑŒ ÑÑ‚Ð¾ multidisk ÑƒÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð²Ð¾?"
 
 #. Type: boolean
 #. Description
-#: ../mdcfg-utils.templates:142 ../mdcfg-utils.templates:139
+#: ../mdcfg-utils.templates:142
 msgid ""
 "Please confirm whether you really want to delete the following multidisk "
 "device:"
@@ -9180,7 +8967,7 @@
 
 #. Type: boolean
 #. Description
-#: ../mdcfg-utils.templates:142 ../mdcfg-utils.templates:139
+#: ../mdcfg-utils.templates:142
 msgid ""
 " Device:            ${DEVICE}\n"
 " Type:              ${TYPE}\n"
@@ -9192,7 +8979,7 @@
 
 #. Type: boolean
 #. Description
-#: ../mdcfg-utils.templates:142 ../mdcfg-utils.templates:139
+#: ../mdcfg-utils.templates:142
 msgid "${DEVICES}"
 msgstr "${DEVICES}"
 
@@ -9203,7 +8990,7 @@
 #. #-#-#-#-#  templates.pot (PACKAGE VERSION)  #-#-#-#-#
 #. Type: text
 #. Description
-#: ../lvmcfg.templates:4 ../partman-lvm.templates:3 ../templates:4
+#: ../lvmcfg.templates:4 ../partman-lvm.templates:3
 msgid "Configure the Logical Volume Manager"
 msgstr "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ° Ð¼ÐµÐ½ÐµÐ´Ð¶ÐµÑ€Ð° Ð»Ð¾Ð³Ð¸Ñ‡ÐµÑÐºÐ¸Ñ… Ñ‚Ð¾Ð¼Ð¾Ð² (LVM)"
 
@@ -9219,9 +9006,9 @@
 msgid ""
 "${COUNT} existing volume groups have been found. Please indicate whether you "
 "want to activate them."
-msgstr "ÐÐ°Ð¹Ð´ÐµÐ½Ð¾ ${COUNT} Ð³Ñ€ÑƒÐ¿Ð¿ Ñ‚Ð¾Ð¼Ð¾Ð². Ð£ÐºÐ°Ð¶Ð¸Ñ‚Ðµ, ÐºÐ°ÐºÐ¸Ðµ Ð¸Ð· Ð½Ð¸Ñ… Ð²Ñ‹ Ñ…Ð¾Ñ‚Ð¸Ñ‚Ðµ Ð°ÐºÑ‚Ð¸Ð²Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ."
+msgstr ""
+"ÐÐ°Ð¹Ð´ÐµÐ½Ð¾ ${COUNT} Ð³Ñ€ÑƒÐ¿Ð¿ Ñ‚Ð¾Ð¼Ð¾Ð². Ð£ÐºÐ°Ð¶Ð¸Ñ‚Ðµ, ÐºÐ°ÐºÐ¸Ðµ Ð¸Ð· Ð½Ð¸Ñ… Ð²Ñ‹ Ñ…Ð¾Ñ‚Ð¸Ñ‚Ðµ Ð°ÐºÑ‚Ð¸Ð²Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ."
 
-#. #-#-#-#-#  template.pot (debian-installer)  #-#-#-#-#
 #. Type: select
 #. Choices
 #. LVM main menu choices
@@ -9230,35 +9017,28 @@
 #. Please keep your translations of the choices
 #. below a 65 columns limit (which means 65 characters
 #. in single-byte languages) including the initial path
-#. #-#-#-#-#  template.pot (debian-installer)  #-#-#-#-#
-#. Type: select
-#. Choices
-#. LVM main menu choices
-#. Translators : please use infinitive form or the equivalent
-#. in your language
-#: ../lvmcfg-utils.templates:16 ../lvmcfg-utils.templates:13
+#: ../lvmcfg-utils.templates:16
 msgid "Modify volume groups (VG)"
 msgstr "Ð˜Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ðµ Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹ Ñ‚Ð¾Ð¼Ð¾Ð² (VG)"
 
 #. Type: select
 #. Choices
-#: ../lvmcfg-utils.templates:16 ../lvmcfg-utils.templates:13
+#: ../lvmcfg-utils.templates:16
 msgid "Modify logical volumes (LV)"
 msgstr "Ð˜Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ðµ Ð»Ð¾Ð³Ð¸Ñ‡ÐµÑÐºÐ¸Ñ… Ñ‚Ð¾Ð¼Ð¾Ð² (LV)"
 
 #. Type: select
 #. Description
-#: ../lvmcfg-utils.templates:17 ../lvmcfg-utils.templates:14
+#: ../lvmcfg-utils.templates:17
 msgid "LVM configuration action:"
 msgstr "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ° LVM:"
 
 #. Type: select
 #. Description
-#: ../lvmcfg-utils.templates:17 ../lvmcfg-utils.templates:14
+#: ../lvmcfg-utils.templates:17
 msgid "This is the Logical Volume Manager configuration menu."
 msgstr "ÐÑ‚Ð¾ Ð¼ÐµÐ½ÑŽ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ Ð¼ÐµÐ½ÐµÐ´Ð¶ÐµÑ€Ð° Ð»Ð¾Ð³Ð¸Ñ‡ÐµÑÐºÐ¸Ñ… Ñ‚Ð¾Ð¼Ð¾Ð²."
 
-#. #-#-#-#-#  template.pot (debian-installer)  #-#-#-#-#
 #. Type: select
 #. Choices
 #. Volume groups configuration menu choices
@@ -9267,41 +9047,34 @@
 #. Please keep your translations of the choices
 #. below a 65 columns limit (which means 65 characters
 #. in single-byte languages) including the initial path
-#. #-#-#-#-#  template.pot (debian-installer)  #-#-#-#-#
-#. Type: select
-#. Choices
-#. Volume groups configuration menu choices
-#. Translators : please use infinitive form or the equivalent
-#. in your language
-#: ../lvmcfg-utils.templates:28 ../lvmcfg-utils.templates:22
+#: ../lvmcfg-utils.templates:28
 msgid "Create volume groups"
 msgstr "Ð¡Ð¾Ð·Ð´Ð°Ñ‚ÑŒ Ð³Ñ€ÑƒÐ¿Ð¿Ñƒ Ñ‚Ð¾Ð¼Ð¾Ð²"
 
 #. Type: select
 #. Choices
-#: ../lvmcfg-utils.templates:28 ../lvmcfg-utils.templates:22
+#: ../lvmcfg-utils.templates:28
 msgid "Delete volume groups"
 msgstr "Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ Ð³Ñ€ÑƒÐ¿Ð¿Ñƒ Ñ‚Ð¾Ð¼Ð¾Ð²"
 
 #. Type: select
 #. Choices
-#: ../lvmcfg-utils.templates:28 ../lvmcfg-utils.templates:22
+#: ../lvmcfg-utils.templates:28
 msgid "Extend volume groups"
 msgstr "Ð Ð°ÑÑˆÐ¸Ñ€Ð¸Ñ‚ÑŒ Ð³Ñ€ÑƒÐ¿Ð¿Ñƒ Ñ‚Ð¾Ð¼Ð¾Ð²"
 
 #. Type: select
 #. Choices
-#: ../lvmcfg-utils.templates:28 ../lvmcfg-utils.templates:22
+#: ../lvmcfg-utils.templates:28
 msgid "Reduce volume groups"
 msgstr "Ð£Ð¼ÐµÐ½ÑŒÑˆÐ¸Ñ‚ÑŒ Ð³Ñ€ÑƒÐ¿Ð¿Ñƒ Ñ‚Ð¾Ð¼Ð¾Ð²"
 
 #. Type: select
 #. Description
-#: ../lvmcfg-utils.templates:29 ../lvmcfg-utils.templates:23
+#: ../lvmcfg-utils.templates:29
 msgid "Volume groups configuration action:"
 msgstr "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ° Ð³Ñ€ÑƒÐ¿Ð¿ Ñ‚Ð¾Ð¼Ð¾Ð²:"
 
-#. #-#-#-#-#  template.pot (debian-installer)  #-#-#-#-#
 #. Type: select
 #. Choices
 #. Logical volumes configuration menu choices
@@ -9310,61 +9083,55 @@
 #. Please keep your translations of the choices
 #. below a 65 columns limit (which means 65 characters
 #. in single-byte languages) including the initial path
-#. #-#-#-#-#  template.pot (debian-installer)  #-#-#-#-#
-#. Type: select
-#. Choices
-#. Logical volumes configuration menu choices
-#. Translators : please use infinitive form or the equivalent
-#. in your language
-#: ../lvmcfg-utils.templates:39 ../lvmcfg-utils.templates:30
+#: ../lvmcfg-utils.templates:39
 msgid "Create logical volumes"
 msgstr "Ð¡Ð¾Ð·Ð´Ð°Ð½Ð¸Ðµ Ð»Ð¾Ð³Ð¸Ñ‡ÐµÑÐºÐ¸Ñ… Ñ‚Ð¾Ð¼Ð¾Ð²"
 
 #. Type: select
 #. Choices
-#: ../lvmcfg-utils.templates:39 ../lvmcfg-utils.templates:30
+#: ../lvmcfg-utils.templates:39
 msgid "Delete logical volumes"
 msgstr "Ð£Ð´Ð°Ð»ÐµÐ½Ð¸Ðµ Ð»Ð¾Ð³Ð¸Ñ‡ÐµÑÐºÐ¸Ñ… Ñ‚Ð¾Ð¼Ð¾Ð²"
 
 #. Type: select
 #. Choices
-#: ../lvmcfg-utils.templates:39 ../lvmcfg-utils.templates:30
+#: ../lvmcfg-utils.templates:39
 msgid "Leave"
 msgstr "Ð’Ñ‹Ñ…Ð¾Ð´"
 
 #. Type: select
 #. Description
-#: ../lvmcfg-utils.templates:40 ../lvmcfg-utils.templates:31
+#: ../lvmcfg-utils.templates:40
 msgid "Logical volumes configuration action:"
 msgstr "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ° Ð»Ð¾Ð³Ð¸Ñ‡ÐµÑÐºÐ¸Ñ… Ñ‚Ð¾Ð¼Ð¾Ð²:"
 
 #. Type: multiselect
 #. Description
-#: ../lvmcfg-utils.templates:45 ../lvmcfg-utils.templates:36
+#: ../lvmcfg-utils.templates:45
 msgid "Devices for the new volume group:"
 msgstr "Ð£ÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð²Ð° Ð´Ð»Ñ Ð½Ð¾Ð²Ð¾Ð¹ Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹ Ñ‚Ð¾Ð¼Ð¾Ð²:"
 
 #. Type: multiselect
 #. Description
-#: ../lvmcfg-utils.templates:45 ../lvmcfg-utils.templates:36
+#: ../lvmcfg-utils.templates:45
 msgid "Please select the devices for the new volume group."
 msgstr "Ð’Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ ÑƒÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð²Ð° Ð´Ð»Ñ Ð½Ð¾Ð²Ð¾Ð¹ Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹ Ñ‚Ð¾Ð¼Ð¾Ð²."
 
 #. Type: string
 #. Description
-#: ../lvmcfg-utils.templates:52 ../lvmcfg-utils.templates:43
+#: ../lvmcfg-utils.templates:52
 msgid "Volume group name:"
 msgstr "ÐÐ°Ð·Ð²Ð°Ð½Ð¸Ðµ Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹ Ñ‚Ð¾Ð¼Ð¾Ð²:"
 
 #. Type: string
 #. Description
-#: ../lvmcfg-utils.templates:52 ../lvmcfg-utils.templates:43
+#: ../lvmcfg-utils.templates:52
 msgid "Please enter the name you would like to use for the new volume group."
 msgstr "Ð’Ð²ÐµÐ´Ð¸Ñ‚Ðµ Ð½Ð°Ð·Ð²Ð°Ð½Ð¸Ðµ, ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ðµ Ð²Ñ‹ Ñ…Ð¾Ñ‚Ð¸Ñ‚Ðµ Ð´Ð°Ñ‚ÑŒ Ð½Ð¾Ð²Ð¾Ð¹ Ð³Ñ€ÑƒÐ¿Ð¿Ðµ Ñ‚Ð¾Ð¼Ð¾Ð²."
 
 #. Type: error
 #. Description
-#: ../lvmcfg-utils.templates:57 ../lvmcfg-utils.templates:48
+#: ../lvmcfg-utils.templates:57
 msgid ""
 "No physical volumes were selected. The creation of a new volume group was "
 "aborted."
@@ -9372,37 +9139,39 @@
 
 #. Type: error
 #. Description
-#: ../lvmcfg-utils.templates:63 ../lvmcfg-utils.templates:54
+#: ../lvmcfg-utils.templates:63
 msgid "No volume group name entered"
 msgstr "ÐÐµ Ð·Ð°Ð´Ð°Ð½Ð¾ Ð½Ð°Ð·Ð²Ð°Ð½Ð¸Ðµ Ð³Ñ€ÑƒÐ¿Ð¿Ðµ Ñ‚Ð¾Ð¼Ð¾Ð²"
 
 #. Type: error
 #. Description
-#: ../lvmcfg-utils.templates:63 ../lvmcfg-utils.templates:54
+#: ../lvmcfg-utils.templates:63
 msgid "No name for the volume group has been entered.  Please enter a name."
 msgstr "ÐÐµ Ð·Ð°Ð´Ð°Ð½Ð¾ Ð½Ð°Ð·Ð²Ð°Ð½Ð¸Ðµ Ð³Ñ€ÑƒÐ¿Ð¿Ðµ Ñ‚Ð¾Ð¼Ð¾Ð². Ð’Ð²ÐµÐ´Ð¸Ñ‚Ðµ Ð½Ð°Ð·Ð²Ð°Ð½Ð¸Ðµ."
 
 #. Type: error
 #. Description
-#: ../lvmcfg-utils.templates:69 ../lvmcfg-utils.templates:60
+#: ../lvmcfg-utils.templates:69
 msgid "Volume group name already in use"
 msgstr "Ð¢Ð°ÐºÐ¾Ðµ Ð½Ð°Ð·Ð²Ð°Ð½Ð¸Ðµ Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹ Ñ‚Ð¾Ð¼Ð¾Ð² ÑƒÐ¶Ðµ ÑÑƒÑ‰ÐµÑÑ‚Ð²ÑƒÐµÑ‚"
 
 #. Type: error
 #. Description
-#: ../lvmcfg-utils.templates:69 ../lvmcfg-utils.templates:60
-msgid "The selected volume group name is already in use. Please choose another name."
-msgstr "Ð£ÐºÐ°Ð·Ð°Ð½Ð½Ð¾Ðµ Ð½Ð°Ð·Ð²Ð°Ð½Ð¸Ðµ Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹ Ñ‚Ð¾Ð¼Ð¾Ð² ÑƒÐ¶Ðµ ÑÑƒÑ‰ÐµÑÑ‚Ð²ÑƒÐµÑ‚. Ð’Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ Ð´Ñ€ÑƒÐ³Ð¾Ðµ Ð½Ð°Ð·Ð²Ð°Ð½Ð¸Ðµ."
+#: ../lvmcfg-utils.templates:69
+msgid ""
+"The selected volume group name is already in use. Please choose another name."
+msgstr ""
+"Ð£ÐºÐ°Ð·Ð°Ð½Ð½Ð¾Ðµ Ð½Ð°Ð·Ð²Ð°Ð½Ð¸Ðµ Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹ Ñ‚Ð¾Ð¼Ð¾Ð² ÑƒÐ¶Ðµ ÑÑƒÑ‰ÐµÑÑ‚Ð²ÑƒÐµÑ‚. Ð’Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ Ð´Ñ€ÑƒÐ³Ð¾Ðµ Ð½Ð°Ð·Ð²Ð°Ð½Ð¸Ðµ."
 
 #. Type: error
 #. Description
-#: ../lvmcfg-utils.templates:75 ../lvmcfg-utils.templates:66
+#: ../lvmcfg-utils.templates:75
 msgid "Volume group name overlaps with device name"
 msgstr "ÐÐ°Ð·Ð²Ð°Ð½Ð¸Ðµ Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹ Ñ‚Ð¾Ð¼Ð¾Ð² ÑƒÐ¶Ðµ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐµÑ‚ÑÑ ÐºÐ°Ðº Ð½Ð°Ð·Ð²Ð°Ð½Ð¸Ðµ ÑƒÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð²Ð°"
 
 #. Type: error
 #. Description
-#: ../lvmcfg-utils.templates:75 ../lvmcfg-utils.templates:66
+#: ../lvmcfg-utils.templates:75
 msgid ""
 "The selected volume group name overlaps with an existing device name. Please "
 "choose another name."
@@ -9412,43 +9181,43 @@
 
 #. Type: select
 #. Description
-#: ../lvmcfg-utils.templates:82 ../lvmcfg-utils.templates:73
+#: ../lvmcfg-utils.templates:82
 msgid "Volume group to delete:"
 msgstr "Ð“Ñ€ÑƒÐ¿Ð¿Ð° Ñ‚Ð¾Ð¼Ð¾Ð² Ð´Ð»Ñ ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ:"
 
 #. Type: select
 #. Description
-#: ../lvmcfg-utils.templates:82 ../lvmcfg-utils.templates:73
+#: ../lvmcfg-utils.templates:82
 msgid "Please select the volume group you wish to delete."
 msgstr "Ð’Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ Ð³Ñ€ÑƒÐ¿Ð¿Ñƒ Ñ‚Ð¾Ð¼Ð¾Ð² Ð´Ð»Ñ ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ."
 
 #. Type: error
 #. Description
-#: ../lvmcfg-utils.templates:87 ../lvmcfg-utils.templates:78
+#: ../lvmcfg-utils.templates:87
 msgid "The volume group may have already been deleted."
 msgstr "ÐÑ‚Ð° Ð³Ñ€ÑƒÐ¿Ð¿Ð° Ñ‚Ð¾Ð¼Ð¾Ð² Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ ÑƒÐ¶Ðµ ÑƒÐ´Ð°Ð»ÐµÐ½Ð°."
 
 #. Type: boolean
 #. Description
-#: ../lvmcfg-utils.templates:95 ../lvmcfg-utils.templates:86
+#: ../lvmcfg-utils.templates:95
 msgid "Really delete the volume group?"
 msgstr "Ð’Ñ‹ Ð´ÐµÐ¹ÑÑ‚Ð²Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾ Ñ…Ð¾Ñ‚Ð¸Ñ‚Ðµ ÑƒÐ´Ð°Ð»Ð¸Ñ‚ÑŒ Ð³Ñ€ÑƒÐ¿Ð¿Ñƒ Ñ‚Ð¾Ð¼Ð¾Ð²?"
 
 #. Type: boolean
 #. Description
-#: ../lvmcfg-utils.templates:95 ../lvmcfg-utils.templates:86
+#: ../lvmcfg-utils.templates:95
 msgid "Please confirm the ${VG} volume group removal."
 msgstr "ÐŸÐ¾Ð´Ñ‚Ð²ÐµÑ€Ð´Ð¸Ñ‚Ðµ ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ðµ Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹ Ñ‚Ð¾Ð¼Ð¾Ð² ${VG}."
 
 #. Type: error
 #. Description
-#: ../lvmcfg-utils.templates:100 ../lvmcfg-utils.templates:91
+#: ../lvmcfg-utils.templates:100
 msgid "Error while deleting volume group"
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° Ð¿Ñ€Ð¸ ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ð¸ Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹ Ñ‚Ð¾Ð¼Ð¾Ð²"
 
 #. Type: error
 #. Description
-#: ../lvmcfg-utils.templates:100 ../lvmcfg-utils.templates:91
+#: ../lvmcfg-utils.templates:100
 msgid ""
 "The selected volume group could not be deleted. One or more logical volumes "
 "may currently be in use."
@@ -9458,105 +9227,107 @@
 
 #. Type: error
 #. Description
-#: ../lvmcfg-utils.templates:106 ../lvmcfg-utils.templates:97
+#: ../lvmcfg-utils.templates:106
 msgid "No volume group can be deleted."
 msgstr "Ð“Ñ€ÑƒÐ¿Ð¿Ð° Ñ‚Ð¾Ð¼Ð¾Ð² Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ‚ Ð±Ñ‹Ñ‚ÑŒ ÑƒÐ´Ð°Ð»ÐµÐ½Ð°."
 
 #. Type: select
 #. Description
-#: ../lvmcfg-utils.templates:114 ../lvmcfg-utils.templates:105
+#: ../lvmcfg-utils.templates:114
 msgid "Volume group to extend:"
 msgstr "Ð“Ñ€ÑƒÐ¿Ð¿Ð° Ñ‚Ð¾Ð¼Ð¾Ð² Ð´Ð»Ñ Ñ€Ð°ÑÑˆÐ¸Ñ€ÐµÐ½Ð¸Ñ:"
 
 #. Type: select
 #. Description
-#: ../lvmcfg-utils.templates:114 ../lvmcfg-utils.templates:105
+#: ../lvmcfg-utils.templates:114
 msgid "Please select the volume group you wish to extend."
 msgstr "Ð’Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ Ð³Ñ€ÑƒÐ¿Ð¿Ñƒ Ñ‚Ð¾Ð¼Ð¾Ð² Ð´Ð»Ñ Ñ€Ð°ÑÑˆÐ¸Ñ€ÐµÐ½Ð¸Ñ."
 
 #. Type: multiselect
 #. Description
-#: ../lvmcfg-utils.templates:120 ../lvmcfg-utils.templates:111
+#: ../lvmcfg-utils.templates:120
 msgid "Devices to add to the volume group:"
 msgstr "Ð£ÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð²Ð° Ð´Ð»Ñ Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð² Ð³Ñ€ÑƒÐ¿Ð¿Ñƒ Ñ‚Ð¾Ð¼Ð¾Ð²:"
 
 #. Type: multiselect
 #. Description
-#: ../lvmcfg-utils.templates:120 ../lvmcfg-utils.templates:111
+#: ../lvmcfg-utils.templates:120
 msgid "Please select the devices you wish to add to the volume group."
 msgstr "Ð’Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ ÑƒÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð²Ð° Ð´Ð»Ñ Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð² Ð³Ñ€ÑƒÐ¿Ð¿Ñƒ Ñ‚Ð¾Ð¼Ð¾Ð²."
 
 #. Type: multiselect
 #. Description
-#: ../lvmcfg-utils.templates:120 ../lvmcfg-utils.templates:111
+#: ../lvmcfg-utils.templates:120
 msgid "You can select one or more devices."
 msgstr "Ð’Ñ‹ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð²Ñ‹Ð±Ñ€Ð°Ñ‚ÑŒ Ð¾Ð´Ð½Ð¾ Ð¸Ð»Ð¸ Ð½ÐµÑÐºÐ¾Ð»ÑŒÐºÐ¾ ÑƒÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð²."
 
 #. Type: error
 #. Description
-#: ../lvmcfg-utils.templates:127 ../lvmcfg-utils.templates:118
+#: ../lvmcfg-utils.templates:127
 msgid "No physical volumes selected"
 msgstr "Ð¤Ð¸Ð·Ð¸Ñ‡ÐµÑÐºÐ¸Ðµ Ñ‚Ð¾Ð¼Ð° Ð½Ðµ Ð²Ñ‹Ð±Ñ€Ð°Ð½Ñ‹"
 
 #. Type: error
 #. Description
-#: ../lvmcfg-utils.templates:127 ../lvmcfg-utils.templates:118
-msgid "No physical volumes were selected. Extension of the volume group was aborted."
+#: ../lvmcfg-utils.templates:127
+msgid ""
+"No physical volumes were selected. Extension of the volume group was aborted."
 msgstr "Ð¤Ð¸Ð·Ð¸Ñ‡ÐµÑÐºÐ¸Ðµ Ñ‚Ð¾Ð¼Ð° Ð½Ðµ Ð±Ñ‹Ð»Ð¸ Ð²Ñ‹Ð±Ñ€Ð°Ð½Ñ‹. Ð Ð°ÑÑˆÐ¸Ñ€ÐµÐ½Ð¸Ðµ Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹ Ñ‚Ð¾Ð¼Ð¾Ð² Ð¿Ñ€ÐµÑ€Ð²Ð°Ð½Ð¾."
 
 #. Type: error
 #. Description
-#: ../lvmcfg-utils.templates:133 ../lvmcfg-utils.templates:124
+#: ../lvmcfg-utils.templates:133
 msgid "Error while extending volume group"
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° Ð¿Ñ€Ð¸ Ñ€Ð°ÑÑˆÐ¸Ñ€ÐµÐ½Ð¸Ð¸ Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹ Ñ‚Ð¾Ð¼Ð¾Ð²"
 
 #. Type: error
 #. Description
-#: ../lvmcfg-utils.templates:133 ../lvmcfg-utils.templates:124
+#: ../lvmcfg-utils.templates:133
 msgid ""
 "The physical volume ${PARTITION} could not be added to the selected volume "
 "group."
-msgstr "ÐÐµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ Ð´Ð¾Ð±Ð°Ð²Ð¸Ñ‚ÑŒ Ñ„Ð¸Ð·Ð¸Ñ‡ÐµÑÐºÐ¸Ð¹ Ñ‚Ð¾Ð¼ ${PARTITION} Ð² Ð²Ñ‹Ð±Ñ€Ð°Ð½Ð½ÑƒÑŽ Ð³Ñ€ÑƒÐ¿Ð¿Ñƒ Ñ‚Ð¾Ð¼Ð¾Ð²."
+msgstr ""
+"ÐÐµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ Ð´Ð¾Ð±Ð°Ð²Ð¸Ñ‚ÑŒ Ñ„Ð¸Ð·Ð¸Ñ‡ÐµÑÐºÐ¸Ð¹ Ñ‚Ð¾Ð¼ ${PARTITION} Ð² Ð²Ñ‹Ð±Ñ€Ð°Ð½Ð½ÑƒÑŽ Ð³Ñ€ÑƒÐ¿Ð¿Ñƒ Ñ‚Ð¾Ð¼Ð¾Ð²."
 
 #. Type: error
 #. Description
-#: ../lvmcfg-utils.templates:139 ../lvmcfg-utils.templates:130
+#: ../lvmcfg-utils.templates:139
 msgid "No volume group has been found."
 msgstr "Ð“Ñ€ÑƒÐ¿Ð¿Ð° Ñ‚Ð¾Ð¼Ð¾Ð² Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½Ð°."
 
 #. Type: error
 #. Description
-#: ../lvmcfg-utils.templates:139 ../lvmcfg-utils.templates:130
+#: ../lvmcfg-utils.templates:139
 msgid "No volume group can be reduced."
 msgstr "Ð“Ñ€ÑƒÐ¿Ð¿Ð° Ñ‚Ð¾Ð¼Ð¾Ð² Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ‚ Ð±Ñ‹Ñ‚ÑŒ ÑÐ¾ÐºÑ€Ð°Ñ‰ÐµÐ½Ð°."
 
 #. Type: select
 #. Description
-#: ../lvmcfg-utils.templates:147 ../lvmcfg-utils.templates:138
+#: ../lvmcfg-utils.templates:147
 msgid "Volume group to reduce:"
 msgstr "Ð“Ñ€ÑƒÐ¿Ð¿Ð° Ñ‚Ð¾Ð¼Ð¾Ð² Ð´Ð»Ñ ÑÐ¾ÐºÑ€Ð°Ñ‰ÐµÐ½Ð¸Ñ:"
 
 #. Type: select
 #. Description
-#: ../lvmcfg-utils.templates:147 ../lvmcfg-utils.templates:138
+#: ../lvmcfg-utils.templates:147
 msgid "Please select the volume group you wish to reduce."
 msgstr "Ð’Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ Ð³Ñ€ÑƒÐ¿Ð¿Ñƒ Ñ‚Ð¾Ð¼Ð¾Ð² Ð´Ð»Ñ ÑÐ¾ÐºÑ€Ð°Ñ‰ÐµÐ½Ð¸Ñ."
 
 #. Type: select
 #. Description
-#: ../lvmcfg-utils.templates:153 ../lvmcfg-utils.templates:144
+#: ../lvmcfg-utils.templates:153
 msgid "Device to remove from volume group:"
 msgstr "Ð£ÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð²Ð° Ð´Ð»Ñ ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ Ð¸Ð· Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹ Ñ‚Ð¾Ð¼Ð¾Ð²:"
 
 #. Type: select
 #. Description
-#: ../lvmcfg-utils.templates:153 ../lvmcfg-utils.templates:144
+#: ../lvmcfg-utils.templates:153
 msgid "Please select the device you wish to remove from the volume group."
 msgstr "Ð’Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ ÑƒÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð²Ð° Ð´Ð»Ñ ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ Ð¸Ð· Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹ Ñ‚Ð¾Ð¼Ð¾Ð²."
 
 #. Type: error
 #. Description
-#: ../lvmcfg-utils.templates:158 ../lvmcfg-utils.templates:149
+#: ../lvmcfg-utils.templates:158
 msgid ""
 "The selected volume group (${VG}) could not be reduced. There is only one  "
 "physical volume attached. Please delete the volume group instead."
@@ -9566,21 +9337,22 @@
 
 #. Type: error
 #. Description
-#: ../lvmcfg-utils.templates:164 ../lvmcfg-utils.templates:155
+#: ../lvmcfg-utils.templates:164
 msgid "Error while reducing volume group"
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° Ð¿Ñ€Ð¸ ÑÐ¾ÐºÑ€Ð°Ñ‰ÐµÐ½Ð¸Ð¸ Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹ Ñ‚Ð¾Ð¼Ð¾Ð²"
 
 #. Type: error
 #. Description
-#: ../lvmcfg-utils.templates:164 ../lvmcfg-utils.templates:155
+#: ../lvmcfg-utils.templates:164
 msgid ""
 "The physical volume ${PARTITION} could not be removed from the selected  "
 "volume group."
-msgstr "ÐÐµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ ÑƒÐ´Ð°Ð»Ð¸Ñ‚ÑŒ Ñ„Ð¸Ð·Ð¸Ñ‡ÐµÑÐºÐ¸Ð¹ Ñ‚Ð¾Ð¼ ${PARTITION} Ð¸Ð· Ð²Ñ‹Ð±Ñ€Ð°Ð½Ð½Ð¾Ð¹ Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹ Ñ‚Ð¾Ð¼Ð¾Ð²."
+msgstr ""
+"ÐÐµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ ÑƒÐ´Ð°Ð»Ð¸Ñ‚ÑŒ Ñ„Ð¸Ð·Ð¸Ñ‡ÐµÑÐºÐ¸Ð¹ Ñ‚Ð¾Ð¼ ${PARTITION} Ð¸Ð· Ð²Ñ‹Ð±Ñ€Ð°Ð½Ð½Ð¾Ð¹ Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹ Ñ‚Ð¾Ð¼Ð¾Ð²."
 
 #. Type: error
 #. Description
-#: ../lvmcfg-utils.templates:174 ../lvmcfg-utils.templates:165
+#: ../lvmcfg-utils.templates:174
 msgid ""
 "No volume groups were found for creating a new logical volume.  Please "
 "create more physical volumes and volume groups."
@@ -9590,7 +9362,7 @@
 
 #. Type: error
 #. Description
-#: ../lvmcfg-utils.templates:180 ../lvmcfg-utils.templates:171
+#: ../lvmcfg-utils.templates:180
 msgid ""
 "No free volume groups were found for creating a new logical volume. Please "
 "create more physical volumes and volume groups, or reduce an existing volume "
@@ -9602,19 +9374,19 @@
 
 #. Type: string
 #. Description
-#: ../lvmcfg-utils.templates:187 ../lvmcfg-utils.templates:178
+#: ../lvmcfg-utils.templates:187
 msgid "Logical volume name:"
 msgstr "ÐÐ°Ð·Ð²Ð°Ð½Ð¸Ðµ Ð»Ð¾Ð³Ð¸Ñ‡ÐµÑÐºÐ¾Ð³Ð¾ Ñ‚Ð¾Ð¼Ð°:"
 
 #. Type: string
 #. Description
-#: ../lvmcfg-utils.templates:187 ../lvmcfg-utils.templates:178
+#: ../lvmcfg-utils.templates:187
 msgid "Please enter the name you would like to use for the new logical volume."
 msgstr "Ð’Ð²ÐµÐ´Ð¸Ñ‚Ðµ Ð½Ð°Ð·Ð²Ð°Ð½Ð¸Ðµ, ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ðµ Ð²Ñ‹ Ñ…Ð¾Ñ‚Ð¸Ñ‚Ðµ Ð´Ð°Ñ‚ÑŒ Ð½Ð¾Ð²Ð¾Ð¼Ñƒ Ð»Ð¾Ð³Ð¸Ñ‡ÐµÑÐºÐ¾Ð¼Ñƒ Ñ‚Ð¾Ð¼Ñƒ."
 
 #. Type: select
 #. Description
-#: ../lvmcfg-utils.templates:193 ../lvmcfg-utils.templates:184
+#: ../lvmcfg-utils.templates:193
 msgid ""
 "Please select the volume group where the new logical volume should be "
 "created."
@@ -9622,19 +9394,19 @@
 
 #. Type: error
 #. Description
-#: ../lvmcfg-utils.templates:199 ../lvmcfg-utils.templates:190
+#: ../lvmcfg-utils.templates:199
 msgid "No logical volume name entered"
 msgstr "ÐÐµ Ð·Ð°Ð´Ð°Ð½Ð¾ Ð½Ð°Ð·Ð²Ð°Ð½Ð¸Ðµ Ð»Ð¾Ð³Ð¸Ñ‡ÐµÑÐºÐ¾Ð³Ð¾ Ñ‚Ð¾Ð¼Ð°"
 
 #. Type: error
 #. Description
-#: ../lvmcfg-utils.templates:199 ../lvmcfg-utils.templates:190
+#: ../lvmcfg-utils.templates:199
 msgid "No name for the logical volume has been entered.  Please enter a name."
 msgstr "ÐÐµ Ð·Ð°Ð´Ð°Ð½Ð¾ Ð½Ð°Ð·Ð²Ð°Ð½Ð¸Ðµ Ð»Ð¾Ð³Ð¸Ñ‡ÐµÑÐºÐ¾Ð³Ð¾ Ñ‚Ð¾Ð¼Ð°. Ð’Ð²ÐµÐ´Ð¸Ñ‚Ðµ Ð½Ð°Ð·Ð²Ð°Ð½Ð¸Ðµ."
 
 #. Type: error
 #. Description
-#: ../lvmcfg-utils.templates:205 ../lvmcfg-utils.templates:196
+#: ../lvmcfg-utils.templates:205
 msgid ""
 "The name ${LV} is already in use by another logical volume on the same "
 "volume group (${VG})."
@@ -9644,13 +9416,13 @@
 
 #. Type: string
 #. Description
-#: ../lvmcfg-utils.templates:211 ../lvmcfg-utils.templates:202
+#: ../lvmcfg-utils.templates:211
 msgid "Logical volume size:"
 msgstr "Ð Ð°Ð·Ð¼ÐµÑ€ Ð»Ð¾Ð³Ð¸Ñ‡ÐµÑÐºÐ¾Ð³Ð¾ Ñ‚Ð¾Ð¼Ð°:"
 
 #. Type: string
 #. Description
-#: ../lvmcfg-utils.templates:211 ../lvmcfg-utils.templates:202
+#: ../lvmcfg-utils.templates:211
 msgid ""
 "Please enter the size of the new logical volume. The size may be entered in "
 "the following formats: 10K (Kilobytes), 10M (Megabytes), 10G (Gigabytes), "
@@ -9662,13 +9434,13 @@
 
 #. Type: error
 #. Description
-#: ../lvmcfg-utils.templates:218 ../lvmcfg-utils.templates:209
+#: ../lvmcfg-utils.templates:218
 msgid "Error while creating a new logical volume"
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° Ð¿Ñ€Ð¸ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ð¸ Ð½Ð¾Ð²Ð¾Ð³Ð¾ Ð»Ð¾Ð³Ð¸Ñ‡ÐµÑÐºÐ¾Ð³Ð¾ Ñ‚Ð¾Ð¼Ð°."
 
 #. Type: error
 #. Description
-#: ../lvmcfg-utils.templates:218 ../lvmcfg-utils.templates:209
+#: ../lvmcfg-utils.templates:218
 msgid ""
 "Unable to create a new logical volume (${LV}) on ${VG} with the new size "
 "${SIZE}."
@@ -9678,25 +9450,25 @@
 
 #. Type: error
 #. Description
-#: ../lvmcfg-utils.templates:228 ../lvmcfg-utils.templates:219
+#: ../lvmcfg-utils.templates:228
 msgid "No volume group found"
 msgstr "Ð“Ñ€ÑƒÐ¿Ð¿Ð° Ñ‚Ð¾Ð¼Ð¾Ð² Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½Ð°"
 
 #. Type: error
 #. Description
-#: ../lvmcfg-utils.templates:228 ../lvmcfg-utils.templates:219
+#: ../lvmcfg-utils.templates:228
 msgid "No volume group has been found for deleting a logical volume."
 msgstr "ÐÐµ Ð½Ð°Ð¹Ð´ÐµÐ½Ð° Ð³Ñ€ÑƒÐ¿Ð¿Ð° Ñ‚Ð¾Ð¼Ð¾Ð² Ð¸Ð· ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ð¹ Ð½ÑƒÐ¶Ð½Ð¾ ÑƒÐ´Ð°Ð»Ð¸Ñ‚ÑŒ Ð»Ð¾Ð³Ð¸Ñ‡ÐµÑÐºÐ¸Ð¹ Ñ‚Ð¾Ð¼."
 
 #. Type: select
 #. Description
-#: ../lvmcfg-utils.templates:234 ../lvmcfg-utils.templates:225
+#: ../lvmcfg-utils.templates:234
 msgid "Volume group:"
 msgstr "Ð“Ñ€ÑƒÐ¿Ð¿Ð° Ñ‚Ð¾Ð¼Ð¾Ð²:"
 
 #. Type: select
 #. Description
-#: ../lvmcfg-utils.templates:234 ../lvmcfg-utils.templates:225
+#: ../lvmcfg-utils.templates:234
 msgid ""
 "Please select the volume group which contains the logical volume to be "
 "deleted."
@@ -9704,43 +9476,44 @@
 
 #. Type: error
 #. Description
-#: ../lvmcfg-utils.templates:240 ../lvmcfg-utils.templates:231
+#: ../lvmcfg-utils.templates:240
 msgid "No logical volume found"
 msgstr "Ð›Ð¾Ð³Ð¸Ñ‡ÐµÑÐºÐ¸Ð¹ Ñ‚Ð¾Ð¼ Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½"
 
 #. Type: error
 #. Description
-#: ../lvmcfg-utils.templates:240 ../lvmcfg-utils.templates:231
-msgid "No logical volume has been found.  Please create a logical volume first."
+#: ../lvmcfg-utils.templates:240
+msgid ""
+"No logical volume has been found.  Please create a logical volume first."
 msgstr "ÐÐµ Ð½Ð°Ð¹Ð´ÐµÐ½ Ð»Ð¾Ð³Ð¸Ñ‡ÐµÑÐºÐ¸Ð¹ Ñ‚Ð¾Ð¼. Ð¡Ð½Ð°Ñ‡Ð°Ð»Ð° ÑÐ¾Ð·Ð´Ð°Ð¹Ñ‚Ðµ Ð»Ð¾Ð³Ð¸Ñ‡ÐµÑÐºÐ¸Ð¹ Ñ‚Ð¾Ð¼."
 
 #. Type: select
 #. Description
-#: ../lvmcfg-utils.templates:246 ../lvmcfg-utils.templates:237
+#: ../lvmcfg-utils.templates:246
 msgid "Logical volume:"
 msgstr "Ð›Ð¾Ð³Ð¸Ñ‡ÐµÑÐºÐ¸Ð¹ Ñ‚Ð¾Ð¼:"
 
 #. Type: select
 #. Description
-#: ../lvmcfg-utils.templates:246 ../lvmcfg-utils.templates:237
+#: ../lvmcfg-utils.templates:246
 msgid "Please select the logical volume to be deleted on ${VG}."
 msgstr "Ð’Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ Ð»Ð¾Ð³Ð¸Ñ‡ÐµÑÐºÐ¸Ð¹ Ñ‚Ð¾Ð¼ Ð´Ð»Ñ ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ Ð¸Ð· Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹ ${VG}."
 
 #. Type: error
 #. Description
-#: ../lvmcfg-utils.templates:251 ../lvmcfg-utils.templates:242
+#: ../lvmcfg-utils.templates:251
 msgid "Error while deleting the logical volume"
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° Ð¿Ñ€Ð¸ ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ð¸ Ð»Ð¾Ð³Ð¸Ñ‡ÐµÑÐºÐ¾Ð³Ð¾ Ñ‚Ð¾Ð¼Ð°"
 
 #. Type: error
 #. Description
-#: ../lvmcfg-utils.templates:251 ../lvmcfg-utils.templates:242
+#: ../lvmcfg-utils.templates:251
 msgid "The logical volume (${LV}) on ${VG} could not be deleted."
 msgstr "ÐÐµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ ÑƒÐ´Ð°Ð»Ð¸Ñ‚ÑŒ Ð»Ð¾Ð³Ð¸Ñ‡ÐµÑÐºÐ¸Ð¹ Ñ‚Ð¾Ð¼ (${LV}) Ð¸Ð· Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹ ${VG}."
 
 #. Type: error
 #. Description
-#: ../lvmcfg-utils.templates:251 ../lvmcfg-utils.templates:242
+#: ../lvmcfg-utils.templates:251
 msgid ""
 "Please check the error log on the third console for more information. You "
 "can switch to the third virtual console (VT3) by pressing Alt-F3, and you "
@@ -9752,13 +9525,13 @@
 
 #. Type: error
 #. Description
-#: ../lvmcfg-utils.templates:260 ../lvmcfg-utils.templates:251
+#: ../lvmcfg-utils.templates:260
 msgid "No usable physical volumes found"
 msgstr "ÐÐµ Ð½Ð°Ð¹Ð´ÐµÐ½Ñ‹ Ð¿Ð¾Ð´Ñ…Ð¾Ð´ÑÑ‰Ð¸Ðµ Ñ„Ð¸Ð·Ð¸Ñ‡ÐµÑÐºÐ¸Ðµ Ñ‚Ð¾Ð¼Ð° "
 
 #. Type: error
 #. Description
-#: ../lvmcfg-utils.templates:260 ../lvmcfg-utils.templates:251
+#: ../lvmcfg-utils.templates:260
 msgid ""
 "No physical volumes (i.e. partitions) were found in your system. All "
 "physical volumes may already be in use. You may also need to load some "
@@ -9770,13 +9543,13 @@
 
 #. Type: error
 #. Description
-#: ../lvmcfg-utils.templates:267 ../lvmcfg-utils.templates:258
+#: ../lvmcfg-utils.templates:267
 msgid "Logical Volume Manager not available"
 msgstr "ÐœÐµÐ½ÐµÐ´Ð¶ÐµÑ€ Ð»Ð¾Ð³Ð¸Ñ‡ÐµÑÐºÐ¸Ñ… Ñ‚Ð¾Ð¼Ð¾Ð² Ð½Ðµ Ð´Ð¾ÑÑ‚ÑƒÐ¿ÐµÐ½"
 
 #. Type: error
 #. Description
-#: ../lvmcfg-utils.templates:267 ../lvmcfg-utils.templates:258
+#: ../lvmcfg-utils.templates:267
 msgid ""
 "The current kernel doesn't support the Logical Volume Manager. You may need "
 "to load the lvm-mod module."
@@ -10295,7 +10068,8 @@
 #. Description
 #: ../partman-crypto.templates:218
 msgid "The two passphrases you entered were not the same. Please try again."
-msgstr "Ð”Ð²Ðµ ÐºÐ»ÑŽÑ‡ÐµÐ²Ñ‹Ðµ Ñ„Ñ€Ð°Ð·Ñ‹, ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ðµ Ð²Ñ‹ Ð²Ð²ÐµÐ»Ð¸, Ð½Ðµ ÑÐ¾Ð²Ð¿Ð°Ð´Ð°ÑŽÑ‚. ÐŸÐ¾Ð¿Ñ€Ð¾Ð±ÑƒÐ¹Ñ‚Ðµ ÐµÑ‰Ñ‘ Ñ€Ð°Ð·."
+msgstr ""
+"Ð”Ð²Ðµ ÐºÐ»ÑŽÑ‡ÐµÐ²Ñ‹Ðµ Ñ„Ñ€Ð°Ð·Ñ‹, ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ðµ Ð²Ñ‹ Ð²Ð²ÐµÐ»Ð¸, Ð½Ðµ ÑÐ¾Ð²Ð¿Ð°Ð´Ð°ÑŽÑ‚. ÐŸÐ¾Ð¿Ñ€Ð¾Ð±ÑƒÐ¹Ñ‚Ðµ ÐµÑ‰Ñ‘ Ñ€Ð°Ð·."
 
 #. Type: note
 #. Description
@@ -10426,8 +10200,10 @@
 #. Type: error
 #. Description
 #: ../partman-crypto.templates:273
-msgid "Please go back and choose a non-encrypted partition for the root filesystem."
-msgstr "Ð’ÐµÑ€Ð½Ð¸Ñ‚ÐµÑÑŒ Ð¸ Ð²Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ Ð´Ð»Ñ ÐºÐ¾Ñ€Ð½ÐµÐ²Ð¾Ð¹ Ñ„Ð°Ð¹Ð»Ð¾Ð²Ð¾Ð¹ ÑÐ¸ÑÑ‚ÐµÐ¼Ñ‹ Ñ€Ð°Ð·Ð´ÐµÐ» Ð±ÐµÐ· ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ."
+msgid ""
+"Please go back and choose a non-encrypted partition for the root filesystem."
+msgstr ""
+"Ð’ÐµÑ€Ð½Ð¸Ñ‚ÐµÑÑŒ Ð¸ Ð²Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ Ð´Ð»Ñ ÐºÐ¾Ñ€Ð½ÐµÐ²Ð¾Ð¹ Ñ„Ð°Ð¹Ð»Ð¾Ð²Ð¾Ð¹ ÑÐ¸ÑÑ‚ÐµÐ¼Ñ‹ Ñ€Ð°Ð·Ð´ÐµÐ» Ð±ÐµÐ· ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ."
 
 #. Type: boolean
 #. Description
@@ -10522,16 +10298,12 @@
 "ÐŸÐ¾ÐºÐ°Ð·Ð°Ð½Ð° Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ: Ð¸Ð¼Ñ ÑƒÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð²Ð°, Ñ€Ð°Ð·Ð¼ÐµÑ€, Ñ„Ð°Ð¹Ð»Ð¾Ð²Ð°Ñ ÑÐ¸ÑÑ‚ÐµÐ¼Ð°, Ñ‚Ð¾Ñ‡ÐºÐ° "
 "Ð¼Ð¾Ð½Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ."
 
-#. #-#-#-#-#  template.pot (debian-installer)  #-#-#-#-#
 #. Type: select
 #. Choices
 #. Note to translators : Please keep your translations of the choices
 #. below a 65 columns limit (which means 65 characters
 #. in single-byte languages)
-#. #-#-#-#-#  template.pot (debian-installer)  #-#-#-#-#
-#. Type: select
-#. Choices
-#: ../partconf.templates:29 ../partconf.templates:26
+#: ../partconf.templates:29
 msgid "Leave the file system intact, ${FSCHOICES}, Create swap space"
 msgstr ""
 "ÐžÑÑ‚Ð°Ð²Ð¸Ñ‚ÑŒ Ñ„Ð°Ð¹Ð»Ð¾Ð²ÑƒÑŽ ÑÐ¸ÑÑ‚ÐµÐ¼Ñƒ Ð±ÐµÐ· Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹, ${FSCHOICES}, Ð¡Ð¾Ð·Ð´Ð°Ñ‚ÑŒ Ñ€Ð°Ð·Ð´ÐµÐ» "
@@ -10539,7 +10311,7 @@
 
 #. Type: select
 #. Description
-#: ../partconf.templates:31 ../partconf.templates:28
+#: ../partconf.templates:31
 msgid ""
 "This partition seems to already have a file system (${FSTYPE}). You can "
 "choose to leave this file system intact, create a new file system, or create "
@@ -10549,29 +10321,25 @@
 "Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð¾ÑÑ‚Ð°Ð²Ð¸Ñ‚ÑŒ Ñ„Ð°Ð¹Ð»Ð¾Ð²ÑƒÑŽ ÑÐ¸ÑÑ‚ÐµÐ¼Ñƒ Ð±ÐµÐ· Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹, ÑÐ¾Ð·Ð´Ð°Ñ‚ÑŒ Ñ„Ð°Ð¹Ð»Ð¾Ð²ÑƒÑŽ ÑÐ¸ÑÑ‚ÐµÐ¼Ñƒ Ð¸Ð»Ð¸ "
 "ÑÐ¾Ð·Ð´Ð°Ñ‚ÑŒ Ñ€Ð°Ð·Ð´ÐµÐ» Ð¿Ð¾Ð´ÐºÐ°Ñ‡ÐºÐ¸."
 
-#. #-#-#-#-#  template.pot (debian-installer)  #-#-#-#-#
 #. Type: select
 #. Choices
 #. Note to translators : Please keep your translations of each choice
 #. (separated by commas)
 #. below a 65 columns limit (which means 65 characters
 #. in single-byte languages)
-#. #-#-#-#-#  template.pot (debian-installer)  #-#-#-#-#
-#. Type: select
-#. Choices
-#: ../partconf.templates:42 ../partconf.templates:35
+#: ../partconf.templates:42
 msgid "${FSCHOICES}, Create swap space"
 msgstr "${FSCHOICES}, Ð¡Ð¾Ð·Ð´Ð°Ñ‚ÑŒ Ñ€Ð°Ð·Ð´ÐµÐ» Ð¿Ð¾Ð´ÐºÐ°Ñ‡ÐºÐ¸"
 
 #. Type: select
 #. Description
-#: ../partconf.templates:44 ../partconf.templates:37
+#: ../partconf.templates:44
 msgid "Action on ${PARTITION}:"
 msgstr "Ð”ÐµÐ¹ÑÑ‚Ð²Ð¸Ñ Ð´Ð»Ñ ${PARTITION}:"
 
 #. Type: select
 #. Description
-#: ../partconf.templates:44 ../partconf.templates:37
+#: ../partconf.templates:44
 msgid ""
 "This partition does not seem to have a file system. You can create a file "
 "system or swap space on it."
@@ -10579,23 +10347,19 @@
 "ÐšÐ°Ð¶ÐµÑ‚ÑÑ, ÑÑ‚Ð¾Ñ‚ Ñ€Ð°Ð·Ð´ÐµÐ» Ð½Ðµ Ð¸Ð¼ÐµÐµÑ‚ Ñ„Ð°Ð¹Ð»Ð¾Ð²Ð¾Ð¹ ÑÐ¸ÑÑ‚ÐµÐ¼Ñ‹. Ð’Ñ‹ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ ÑÐ¾Ð·Ð´Ð°Ñ‚ÑŒ Ð½Ð° Ð½ÐµÐ¼ "
 "Ñ„Ð°Ð¹Ð»Ð¾Ð²ÑƒÑŽ ÑÐ¸ÑÑ‚ÐµÐ¼Ñƒ Ð¸Ð»Ð¸ Ñ€Ð°Ð·Ð´ÐµÐ» Ð¿Ð¾Ð´ÐºÐ°Ñ‡ÐºÐ¸."
 
-#. #-#-#-#-#  template.pot (debian-installer)  #-#-#-#-#
 #. Type: select
 #. Choices
 #. Note to translators : Please keep your translations of each choice
 #. (separated by commas)
 #. below a 65 columns limit (which means 65 characters
 #. in single-byte languages)
-#. #-#-#-#-#  template.pot (debian-installer)  #-#-#-#-#
-#. Type: select
-#. Choices
-#: ../partconf.templates:54 ../partconf.templates:43
+#: ../partconf.templates:54
 msgid "/, /usr, /boot, /home, /var, /tmp, Don't mount it, Enter manually"
 msgstr "/, /usr, /boot, /home, /var, /tmp, ÐÐµ Ð¼Ð¾Ð½Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ, Ð’Ð²ÐµÑÑ‚Ð¸ Ð²Ñ€ÑƒÑ‡Ð½ÑƒÑŽ"
 
 #. Type: select
 #. Description
-#: ../partconf.templates:55 ../partconf.templates:44
+#: ../partconf.templates:55
 msgid ""
 "When a partition is mounted, it is available to the users of the system. You "
 "always need a root (\"/\") partition, and it's often good to have a separate "
@@ -10606,37 +10370,38 @@
 
 #. Type: string
 #. Description
-#: ../partconf.templates:62 ../partconf.templates:51
+#: ../partconf.templates:62
 msgid "Mount point for ${PARTITION}:"
 msgstr "Ð¢Ð¾Ñ‡ÐºÐ° Ð¼Ð¾Ð½Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð´Ð»Ñ ${PARTITION}:"
 
 #. Type: string
 #. Description
-#: ../partconf.templates:62 ../partconf.templates:51
+#: ../partconf.templates:62
 msgid "Please enter where the partition should be mounted."
 msgstr "Ð£ÐºÐ°Ð¶Ð¸Ñ‚Ðµ, Ð³Ð´Ðµ Ð¼Ð¾Ð½Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ñ€Ð°Ð·Ð´ÐµÐ»."
 
 #. Type: boolean
 #. Description
-#: ../partconf.templates:68 ../partconf.templates:57
+#: ../partconf.templates:68
 msgid "Do you want to unmount the partitions so you can make changes?"
 msgstr "Ð’Ñ‹ Ñ…Ð¾Ñ‚Ð¸Ñ‚Ðµ Ñ€Ð°Ð·Ð¼Ð¾Ð½Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ñ€Ð°Ð·Ð´ÐµÐ»Ñ‹, Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð¸Ð¼ÐµÑ‚ÑŒ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑ‚ÑŒ Ð¸Ð·Ð¼ÐµÐ½ÑÑ‚ÑŒ Ð¸Ñ…?"
 
 #. Type: boolean
 #. Description
-#: ../partconf.templates:68 ../partconf.templates:57
-msgid "Since the partitions have already been mounted, you cannot do any changes."
+#: ../partconf.templates:68
+msgid ""
+"Since the partitions have already been mounted, you cannot do any changes."
 msgstr "Ð¢Ð°Ðº ÐºÐ°Ðº Ñ€Ð°Ð·Ð´ÐµÐ»Ñ‹ ÑƒÐ¶Ðµ ÑÐ¼Ð¾Ð½Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ñ‹, Ð¸Ð·Ð¼ÐµÐ½ÑÑ‚ÑŒ Ð¸Ñ… Ð½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾."
 
 #. Type: error
 #. Description
-#: ../partconf.templates:74 ../partconf.templates:63
+#: ../partconf.templates:74
 msgid "Failed to unmount partitions"
 msgstr "ÐÐµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ Ñ€Ð°Ð·Ð¼Ð¾Ð½Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ñ€Ð°Ð·Ð´ÐµÐ»Ñ‹"
 
 #. Type: error
 #. Description
-#: ../partconf.templates:74 ../partconf.templates:63
+#: ../partconf.templates:74
 msgid ""
 "An error occurred while unmounting the partitions. The partition "
 "configuration process is aborted."
@@ -10646,46 +10411,47 @@
 
 #. Type: text
 #. Description
-#: ../partconf.templates:80 ../partconf.templates:69
+#: ../partconf.templates:80
 #, no-c-format
 msgid "Create %s file system"
 msgstr "Ð¡Ð¾Ð·Ð´Ð°Ñ‚ÑŒ Ñ„Ð°Ð¹Ð»Ð¾Ð²ÑƒÑŽ ÑÐ¸ÑÑ‚ÐµÐ¼Ñƒ %s"
 
 #. Type: error
 #. Description
-#: ../partconf.templates:84 ../partconf.templates:73
+#: ../partconf.templates:84
 msgid "No root partition (/)"
 msgstr "ÐÐµÑ‚ ÐºÐ¾Ñ€Ð½ÐµÐ²Ð¾Ð³Ð¾ Ñ€Ð°Ð·Ð´ÐµÐ»Ð° (/)"
 
 #. Type: error
 #. Description
-#: ../partconf.templates:84 ../partconf.templates:73
+#: ../partconf.templates:84
 msgid ""
 "You need a root partition. Please assign a partition to the root mount point "
 "before continuing."
-msgstr "Ð’Ð°Ð¼ Ð½ÑƒÐ¶ÐµÐ½ ÐºÐ¾Ñ€Ð½ÐµÐ²Ð¾Ð¹ Ñ€Ð°Ð·Ð´ÐµÐ». ÐÐ°Ð·Ð½Ð°Ñ‡ÑŒÑ‚Ðµ ÐºÐ¾Ñ€Ð½ÐµÐ²Ð¾Ð¹ Ñ€Ð°Ð·Ð´ÐµÐ», Ð¿Ñ€ÐµÐ¶Ð´Ðµ Ñ‡ÐµÐ¼ Ð¿Ñ€Ð¾Ð´Ð¾Ð»Ð¶Ð°Ñ‚ÑŒ."
+msgstr ""
+"Ð’Ð°Ð¼ Ð½ÑƒÐ¶ÐµÐ½ ÐºÐ¾Ñ€Ð½ÐµÐ²Ð¾Ð¹ Ñ€Ð°Ð·Ð´ÐµÐ». ÐÐ°Ð·Ð½Ð°Ñ‡ÑŒÑ‚Ðµ ÐºÐ¾Ñ€Ð½ÐµÐ²Ð¾Ð¹ Ñ€Ð°Ð·Ð´ÐµÐ», Ð¿Ñ€ÐµÐ¶Ð´Ðµ Ñ‡ÐµÐ¼ Ð¿Ñ€Ð¾Ð´Ð¾Ð»Ð¶Ð°Ñ‚ÑŒ."
 
 #. Type: error
 #. Description
-#: ../partconf.templates:90 ../partconf.templates:79
+#: ../partconf.templates:90
 msgid "Partition assigned to ${MOUNT}"
 msgstr "Ð’Ñ‹ Ð½Ð°Ð·Ð½Ð°Ñ‡Ð¸Ð»Ð¸ Ð´Ð»Ñ Ð¼Ð¾Ð½Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ñ€Ð°Ð·Ð´ÐµÐ»Ð° ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³ ${MOUNT}"
 
 #. Type: error
 #. Description
-#: ../partconf.templates:90 ../partconf.templates:79
+#: ../partconf.templates:90
 msgid "Mounting a partition on ${MOUNT} makes no sense. Please change this."
 msgstr "ÐÐµ Ð¸Ð¼ÐµÐµÑ‚ ÑÐ¼Ñ‹ÑÐ»Ð° Ð¼Ð¾Ð½Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ñ€Ð°Ð·Ð´ÐµÐ» Ð² ${MOUNT}. Ð˜Ð·Ð¼ÐµÐ½Ð¸Ñ‚Ðµ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸."
 
 #. Type: error
 #. Description
-#: ../partconf.templates:95 ../partconf.templates:84
+#: ../partconf.templates:95
 msgid "Several partitions assigned to ${MOUNT}"
 msgstr "Ð’Ñ‹ Ð½Ð°Ð·Ð½Ð°Ñ‡Ð¸Ð»Ð¸ Ð¼Ð¾Ð½Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ðµ Ð½ÐµÑÐºÐ¾Ð»ÑŒÐºÐ¸Ñ… Ñ€Ð°Ð·Ð´ÐµÐ»Ð¾Ð² Ð² ${MOUNT}"
 
 #. Type: error
 #. Description
-#: ../partconf.templates:95 ../partconf.templates:84
+#: ../partconf.templates:95
 msgid ""
 "You cannot assign several partitions to the same mount point. Please change "
 "all but one of them."
@@ -10695,19 +10461,19 @@
 
 #. Type: boolean
 #. Description
-#: ../partconf.templates:102 ../partconf.templates:91
+#: ../partconf.templates:102
 msgid "Ready to create file systems and mount partitions?"
 msgstr "Ð’ÑÐµ Ð³Ð¾Ñ‚Ð¾Ð²Ð¾ Ð´Ð»Ñ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ñ„Ð°Ð¹Ð»Ð¾Ð²Ñ‹Ñ… ÑÐ¸ÑÑ‚ÐµÐ¼ Ð¸ Ð¼Ð¾Ð½Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ñ€Ð°Ð·Ð´ÐµÐ»Ð¾Ð²?"
 
 #. Type: boolean
 #. Description
-#: ../partconf.templates:102 ../partconf.templates:91
+#: ../partconf.templates:102
 msgid "File systems will be created and partitions mounted."
 msgstr "Ð‘ÑƒÐ´ÑƒÑ‚ ÑÐ¾Ð·Ð´Ð°Ð½Ñ‹ Ñ„Ð°Ð¹Ð»Ð¾Ð²Ñ‹Ðµ ÑÐ¸ÑÑ‚ÐµÐ¼Ñ‹ Ð¸ ÑÐ¼Ð¾Ð½Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ñ‹ Ñ€Ð°Ð·Ð´ÐµÐ»Ñ‹."
 
 #. Type: boolean
 #. Description
-#: ../partconf.templates:102 ../partconf.templates:91
+#: ../partconf.templates:102
 msgid ""
 "WARNING: This will destroy all data on the partitions you have assigned file "
 "systems to."
@@ -10717,55 +10483,56 @@
 
 #. Type: error
 #. Description
-#: ../partconf.templates:110 ../partconf.templates:99
+#: ../partconf.templates:110
 msgid "Failed to create swap space on ${PARTITION}"
 msgstr "ÐÐµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ ÑÐ¾Ð·Ð´Ð°Ñ‚ÑŒ Ñ€Ð°Ð·Ð´ÐµÐ» Ð¿Ð¾Ð´ÐºÐ°Ñ‡ÐºÐ¸ Ð½Ð° ${PARTITION}"
 
 #. Type: error
 #. Description
-#: ../partconf.templates:110 ../partconf.templates:99
+#: ../partconf.templates:110
 msgid "An error occurred when the swap space was created on ${PARTITION}."
 msgstr "ÐŸÑ€Ð¸ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ð¸ Ñ€Ð°Ð·Ð´ÐµÐ»Ð° Ð¿Ð¾Ð´ÐºÐ°Ñ‡ÐºÐ¸ Ð½Ð° ${PARTITION} Ð¿Ñ€Ð¾Ð¸Ð·Ð¾ÑˆÐ»Ð° Ð¾ÑˆÐ¸Ð±ÐºÐ°. "
 
 #. Type: error
 #. Description
-#: ../partconf.templates:118 ../partconf.templates:107
+#: ../partconf.templates:118
 msgid "Failed to activate the swap space on ${PARTITION}"
 msgstr "ÐÐµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ Ð°ÐºÑ‚Ð¸Ð²Ð¸Ð·Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ñ€Ð°Ð·Ð´ÐµÐ» Ð¿Ð¾Ð´ÐºÐ°Ñ‡ÐºÐ¸ Ð½Ð° ${PARTITION}"
 
 #. Type: error
 #. Description
-#: ../partconf.templates:118 ../partconf.templates:107
+#: ../partconf.templates:118
 msgid "An error occurred when the swap space on ${PARTITION} was activated."
 msgstr "ÐŸÑ€Ð¸ Ð°ÐºÑ‚Ð¸Ð²Ð°Ñ†Ð¸Ð¸ Ñ€Ð°Ð·Ð´ÐµÐ»Ð° Ð¿Ð¾Ð´ÐºÐ°Ñ‡ÐºÐ¸ Ð½Ð° ${PARTITION} Ð¿Ñ€Ð¾Ð¸Ð·Ð¾ÑˆÐ»Ð° Ð¾ÑˆÐ¸Ð±ÐºÐ°. "
 
 #. Type: error
 #. Description
-#: ../partconf.templates:126 ../partconf.templates:115
+#: ../partconf.templates:126
 msgid "Failed to create ${FS} file system on ${PARTITION}"
 msgstr "ÐÐµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ ÑÐ¾Ð·Ð´Ð°Ñ‚ÑŒ Ñ„Ð°Ð¹Ð»Ð¾Ð²ÑƒÑŽ ÑÐ¸ÑÑ‚ÐµÐ¼Ñƒ ${FS} Ð½Ð° ${PARTITION}"
 
 #. Type: error
 #. Description
-#: ../partconf.templates:126 ../partconf.templates:115
-msgid "An error occurred when the ${FS} file system was created on ${PARTITION}."
+#: ../partconf.templates:126
+msgid ""
+"An error occurred when the ${FS} file system was created on ${PARTITION}."
 msgstr "ÐŸÑ€Ð¸ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ð¸ Ñ„Ð°Ð¹Ð»Ð¾Ð²Ð¾Ð¹ ÑÐ¸ÑÑ‚ÐµÐ¼Ñ‹ ${FS} Ð½Ð° ${PARTITION} Ð¿Ñ€Ð¾Ð¸Ð·Ð¾ÑˆÐ»Ð° Ð¾ÑˆÐ¸Ð±ÐºÐ°. "
 
 #. Type: error
 #. Description
-#: ../partconf.templates:134 ../partconf.templates:123
+#: ../partconf.templates:134
 msgid "Failed to mount ${PARTITION} on ${MOUNT}"
 msgstr "ÐÐµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ ÑÐ¼Ð¾Ð½Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ ${PARTITION} Ð² ${MOUNT}"
 
 #. Type: error
 #. Description
-#: ../partconf.templates:134 ../partconf.templates:123
+#: ../partconf.templates:134
 msgid "An error occurred when ${PARTITION} was mounted on ${MOUNT}."
 msgstr "ÐŸÑ€Ð¸ Ð¼Ð¾Ð½Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ð¸ ${PARTITION} Ð² ${MOUNT} Ð¿Ñ€Ð¾Ð¸Ð·Ð¾ÑˆÐ»Ð° Ð¾ÑˆÐ¸Ð±ÐºÐ°. "
 
 #. Type: error
 #. Description
-#: ../partconf.templates:134 ../partconf.templates:123
+#: ../partconf.templates:134
 msgid ""
 "Please check the error log on the third console or /var/log/messages for "
 "more information."
@@ -10774,37 +10541,37 @@
 #. Type: text
 #. Description
 #. Main menu item
-#: ../partconf.templates:143 ../partconf.templates:132
+#: ../partconf.templates:143
 msgid "Configure and mount partitions"
 msgstr "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ° Ð¸ Ð¼Ð¾Ð½Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ðµ Ñ€Ð°Ð·Ð´ÐµÐ»Ð¾Ð²"
 
 #. Type: select
 #. Choices
-#: ../partitioner.templates:3 ../templates:3
+#: ../partitioner.templates:3
 msgid "${DISCS}, Finish"
 msgstr "${DISCS}, Ð—Ð°Ð²ÐµÑ€ÑˆÐ¸Ñ‚ÑŒ"
 
 #. Type: select
 #. Description
-#: ../partitioner.templates:4 ../templates:4
+#: ../partitioner.templates:4
 msgid "Disk to partition:"
 msgstr "Ð’Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ Ð´Ð¸ÑÐº Ð´Ð»Ñ Ñ€Ð°Ð·Ð¼ÐµÑ‚ÐºÐ¸:"
 
 #. Type: select
 #. Description
-#: ../partitioner.templates:4 ../templates:4
+#: ../partitioner.templates:4
 msgid "Please choose one of the listed disks, to create partitions on it."
 msgstr "Ð”Ð»Ñ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ñ€Ð°Ð·Ð´ÐµÐ»Ð¾Ð² Ð²Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ Ð¾Ð´Ð¸Ð½ Ð¸Ð· ÑÑ‚Ð¸Ñ… Ð´Ð¸ÑÐºÐ¾Ð²."
 
 #. Type: error
 #. Description
-#: ../partitioner.templates:9 ../templates:9
+#: ../partitioner.templates:9
 msgid "No disk found"
 msgstr "Ð”Ð¸ÑÐº Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½"
 
 #. Type: error
 #. Description
-#: ../partitioner.templates:9 ../templates:9
+#: ../partitioner.templates:9
 msgid ""
 "Unable to find any disk in your system. Maybe some kernel modules need to be "
 "loaded."
@@ -10814,26 +10581,26 @@
 
 #. Type: error
 #. Description
-#: ../partitioner.templates:15 ../templates:15
+#: ../partitioner.templates:15
 msgid "Partitioning error"
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° Ð¿Ñ€Ð¸ Ñ€Ð°Ð±Ð¾Ñ‚Ðµ Ñ Ñ€Ð°Ð·Ð´ÐµÐ»Ð¾Ð¼"
 
 #. Type: error
 #. Description
-#: ../partitioner.templates:15 ../templates:15
+#: ../partitioner.templates:15
 msgid "Failed to partition the disk ${DISC}."
 msgstr "ÐÐµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ ÑÐ¾Ð·Ð´Ð°Ñ‚ÑŒ Ñ€Ð°Ð·Ð´ÐµÐ» Ð½Ð° Ð´Ð¸ÑÐºÐµ ${DISC}."
 
 #. Type: text
 #. Description
 #. Main menu item
-#: ../partitioner.templates:21 ../templates:21
+#: ../partitioner.templates:21
 msgid "Partition a hard drive"
 msgstr "Ð Ð°Ð·Ð¼ÐµÑ‚ÐºÐ° Ð¶Ñ‘ÑÑ‚ÐºÐ¾Ð³Ð¾ Ð´Ð¸ÑÐºÐ°"
 
 #. Type: select
 #. Description
-#: ../autopartkit.templates:4 ../templates:4
+#: ../autopartkit.templates:4
 msgid ""
 "Please choose the disk which has the free space required (column Free) to "
 "install Debian GNU/Linux. If there's not enough free space, space can be "
@@ -10847,25 +10614,26 @@
 
 #. Type: select
 #. Description
-#: ../autopartkit.templates:4 ../templates:4
+#: ../autopartkit.templates:4
 msgid " Device   Model               Size   Free   FreeFAT NbPart"
-msgstr " Ð”Ð¸ÑÐº     ÐœÐ¾Ð´ÐµÐ»ÑŒ              Ð Ð°Ð·Ð¼ÐµÑ€ Ð¡Ð²Ð¾Ð±.  ÐÐ° FAT  ÐšÐ¾Ð»Ð¸Ñ‡ÐµÑÑ‚Ð²Ð¾ Ñ€Ð°Ð·Ð´ÐµÐ»Ð¾Ð²"
+msgstr ""
+" Ð”Ð¸ÑÐº     ÐœÐ¾Ð´ÐµÐ»ÑŒ              Ð Ð°Ð·Ð¼ÐµÑ€ Ð¡Ð²Ð¾Ð±.  ÐÐ° FAT  ÐšÐ¾Ð»Ð¸Ñ‡ÐµÑÑ‚Ð²Ð¾ Ñ€Ð°Ð·Ð´ÐµÐ»Ð¾Ð²"
 
 #. Type: select
 #. Description
-#: ../autopartkit.templates:4 ../templates:4
+#: ../autopartkit.templates:4
 msgid "${TABLE}"
 msgstr "${TABLE}"
 
 #. Type: string
 #. Description
-#: ../autopartkit.templates:17 ../templates:17
+#: ../autopartkit.templates:17
 msgid "Device to partition:"
 msgstr "Ð Ð°Ð·Ð¼ÐµÑ‡Ð°ÐµÐ¼Ð¾Ðµ ÑƒÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð²Ð¾:"
 
 #. Type: string
 #. Description
-#: ../autopartkit.templates:17 ../templates:17
+#: ../autopartkit.templates:17
 msgid ""
 "No disk was automatically detected.  Please enter the path to the device "
 "file for the disk you want to partition."
@@ -10875,13 +10643,14 @@
 
 #. Type: boolean
 #. Description
-#: ../autopartkit.templates:24 ../templates:24
+#: ../autopartkit.templates:24
 msgid "Really use the automatic partitioning tool?"
-msgstr "Ð’Ñ‹ Ð´ÐµÐ¹ÑÑ‚Ð²Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾ Ñ…Ð¾Ñ‚Ð¸Ñ‚Ðµ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ ÑƒÑ‚Ð¸Ð»Ð¸Ñ‚Ñƒ Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡ÐµÑÐºÐ¾Ð¹ Ñ€Ð°Ð·Ð¼ÐµÑ‚ÐºÐ¸ Ð´Ð¸ÑÐºÐ°?"
+msgstr ""
+"Ð’Ñ‹ Ð´ÐµÐ¹ÑÑ‚Ð²Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾ Ñ…Ð¾Ñ‚Ð¸Ñ‚Ðµ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ ÑƒÑ‚Ð¸Ð»Ð¸Ñ‚Ñƒ Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡ÐµÑÐºÐ¾Ð¹ Ñ€Ð°Ð·Ð¼ÐµÑ‚ÐºÐ¸ Ð´Ð¸ÑÐºÐ°?"
 
 #. Type: boolean
 #. Description
-#: ../autopartkit.templates:24 ../templates:24
+#: ../autopartkit.templates:24
 msgid ""
 "This will destroy the partition table on all disks in the machine. REPEAT: "
 "THIS WILL WIPE CLEAN ALL HARD DISKS IN THE MACHINE! If you have important "
@@ -10902,25 +10671,25 @@
 
 #. Type: error
 #. Description
-#: ../autopartkit.templates:33 ../templates:33
+#: ../autopartkit.templates:33
 msgid "You may be able to continue. Here is some more information:"
 msgstr "Ð’ÐµÑ€Ð¾ÑÑ‚Ð½Ð¾, Ð²Ñ‹ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð¿Ñ€Ð¾Ð´Ð¾Ð»Ð¶Ð¸Ñ‚ÑŒ. Ð”Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾Ð± Ð¾ÑˆÐ¸Ð±ÐºÐµ:"
 
 #. Type: error
 #. Description
-#: ../autopartkit.templates:33 ../templates:33
+#: ../autopartkit.templates:33
 msgid "${error}"
 msgstr "${error}"
 
 #. Type: note
 #. Description
-#: ../autopartkit.templates:40 ../templates:40
+#: ../autopartkit.templates:40
 msgid "Automatic partitioning impossible"
 msgstr "ÐÐ²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡ÐµÑÐºÐ°Ñ Ñ€Ð°Ð·Ð¼ÐµÑ‚ÐºÐ° Ð½Ð° Ñ€Ð°Ð·Ð´ÐµÐ»Ñ‹ Ð½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð°"
 
 #. Type: note
 #. Description
-#: ../autopartkit.templates:40 ../templates:40
+#: ../autopartkit.templates:40
 msgid ""
 "This version of the autopartitioner cannot handle the partitioning of the "
 "selected disk. It may partition only an empty disk or a disk with no more "
@@ -10934,7 +10703,7 @@
 
 #. Type: note
 #. Description
-#: ../autopartkit.templates:40 ../templates:40
+#: ../autopartkit.templates:40
 msgid ""
 "If you want to continue the installation process, switch to the second "
 "console (ALT+F2), partition the disk as you like using parted and the other "
@@ -10950,7 +10719,7 @@
 
 #. Type: note
 #. Description
-#: ../autopartkit.templates:40 ../templates:40
+#: ../autopartkit.templates:40
 msgid ""
 "You can also consider launching this program again but selecting another "
 "disk."
@@ -10960,13 +10729,13 @@
 
 #. Type: error
 #. Description
-#: ../autopartkit.templates:58 ../templates:58
+#: ../autopartkit.templates:58
 msgid "Not enough space on disk"
 msgstr "ÐÐµÐ´Ð¾ÑÑ‚Ð°Ñ‚Ð¾Ñ‡Ð½Ð¾ Ð¼ÐµÑÑ‚Ð° Ð½Ð° Ð´Ð¸ÑÐºÐµ"
 
 #. Type: error
 #. Description
-#: ../autopartkit.templates:58 ../templates:58
+#: ../autopartkit.templates:58
 msgid ""
 "The autopartitioner makes some assumptions about partition sizes, and "
 "because of that it requires at least 3GB of free space. The free space on "
@@ -10978,7 +10747,7 @@
 
 #. Type: error
 #. Description
-#: ../autopartkit.templates:58 ../templates:58
+#: ../autopartkit.templates:58
 msgid ""
 "If you really want to install, you'll have to free some space. You may also "
 "launch this program again and select another disk with more free space."
@@ -10989,31 +10758,31 @@
 
 #. Type: note
 #. Description
-#: ../autopartkit.templates:69 ../templates:69
+#: ../autopartkit.templates:69
 msgid "Debug information about ${variable}"
 msgstr "ÐžÑ‚Ð»Ð°Ð´Ð¾Ñ‡Ð½Ð°Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾ ${variable}"
 
 #. Type: note
 #. Description
-#: ../autopartkit.templates:69 ../templates:69
+#: ../autopartkit.templates:69
 msgid "Here is some debug information. The value of ${variable} is:"
 msgstr "Ð’Ð¾Ñ‚ Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ð¾Ñ‚Ð»Ð°Ð´Ð¾Ñ‡Ð½Ð°Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ. Ð—Ð½Ð°Ñ‡ÐµÐ½Ð¸Ðµ ${variable}:"
 
 #. Type: note
 #. Description
-#: ../autopartkit.templates:69 ../templates:69
+#: ../autopartkit.templates:69
 msgid "${value}"
 msgstr "${value}"
 
 #. Type: note
 #. Description
-#: ../autopartkit.templates:76 ../templates:76
+#: ../autopartkit.templates:76
 msgid "Successful partitioning"
 msgstr "Ð Ð°Ð·Ð¼ÐµÑ‚ÐºÐ° Ð½Ð° Ñ€Ð°Ð·Ð´ÐµÐ»Ñ‹ ÑƒÐ´Ð°Ñ‡Ð½Ð¾ Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð°"
 
 #. Type: note
 #. Description
-#: ../autopartkit.templates:76 ../templates:76
+#: ../autopartkit.templates:76
 msgid ""
 "The required partitions have been created and mounted on /target. You can "
 "now continue the installation process."
@@ -11023,13 +10792,13 @@
 
 #. Type: text
 #. Description
-#: ../autopartkit.templates:83 ../templates:83
+#: ../autopartkit.templates:83
 msgid "File containing the requested partition table:"
 msgstr "Ð¤Ð°Ð¹Ð», ÑÐ¾Ð´ÐµÑ€Ð¶Ð°Ñ‰Ð¸Ð¹ Ñ‚Ñ€ÐµÐ±ÑƒÐµÐ¼ÑƒÑŽ Ñ‚Ð°Ð±Ð»Ð¸Ñ†Ñƒ Ñ€Ð°Ð·Ð´ÐµÐ»Ð¾Ð²:"
 
 #. Type: text
 #. Description
-#: ../autopartkit.templates:83 ../templates:83
+#: ../autopartkit.templates:83
 msgid ""
 "The automatic partitioning will be created using the partitions and sizes "
 "specified in this file."
@@ -11040,31 +10809,31 @@
 #. Type: text
 #. Description
 #. Item in the main menu to select this package
-#: ../autopartkit.templates:90 ../templates:90
+#: ../autopartkit.templates:90
 msgid "Automatically partition hard drives"
 msgstr "ÐÐ²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡ÐµÑÐºÐ°Ñ Ñ€Ð°Ð·Ð¼ÐµÑ‚ÐºÐ° Ð¶Ñ‘ÑÑ‚ÐºÐ¸Ñ… Ð´Ð¸ÑÐºÐ¾Ð²"
 
 #. Type: text
 #. Description
-#: ../autopartkit.templates:94 ../templates:94
+#: ../autopartkit.templates:94
 msgid "Creating '${FSTYPE}' storage space on '${MOUNTPOINT}'"
 msgstr "Ð¡Ð¾Ð·Ð´Ð°Ð½Ð¸Ðµ '${FSTYPE}' Ñ€Ð°Ð·Ð´ÐµÐ»Ð° Ð½Ð° '${MOUNTPOINT}'"
 
 #. Type: text
 #. Description
-#: ../autopartkit.templates:98 ../templates:98
+#: ../autopartkit.templates:98
 msgid "Estimated time left: ${HOURS} hour(s) ${MINUTES} minute(s)"
 msgstr "Ð’Ñ€ÐµÐ¼Ñ Ð´Ð¾ Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð¸Ñ: ${HOURS} Ñ‡. ${MINUTES} Ð¼Ð¸Ð½. "
 
 #. Type: text
 #. Description
-#: ../autopartkit.templates:102 ../templates:102
+#: ../autopartkit.templates:102
 msgid "Estimated time left: ${MINUTES} minute(s)"
 msgstr "Ð’Ñ€ÐµÐ¼Ñ Ð´Ð¾ Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð¸Ñ: ${MINUTES} Ð¼Ð¸Ð½. "
 
 #. Type: text
 #. Description
-#: ../autopartkit.templates:106 ../templates:106
+#: ../autopartkit.templates:106
 msgid "Estimated time left: less than 1 minute"
 msgstr "Ð’Ñ€ÐµÐ¼Ñ Ð´Ð¾ Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð¸Ñ: Ð¼ÐµÐ½ÑŒÑˆÐµ Ð¼Ð¸Ð½ÑƒÑ‚Ñ‹"
 
@@ -11080,8 +10849,10 @@
 #. Type: select
 #. Choices
 #: ../s390-netdevice.templates:6
-msgid "lcs: qeth: OSA-2 Token Ring/Ethernet or OSA-Express Fast Ethernet (non-QDIO)"
-msgstr "lcs: qeth: OSA-2 Token Ring/Ethernet Ð¸Ð»Ð¸ OSA-Express Fast Ethernet (Ð½Ðµ-QDIO)"
+msgid ""
+"lcs: qeth: OSA-2 Token Ring/Ethernet or OSA-Express Fast Ethernet (non-QDIO)"
+msgstr ""
+"lcs: qeth: OSA-2 Token Ring/Ethernet Ð¸Ð»Ð¸ OSA-Express Fast Ethernet (Ð½Ðµ-QDIO)"
 
 #. Type: select
 #. Choices
@@ -11093,17 +10864,18 @@
 #. Choices
 #: ../s390-netdevice.templates:6
 msgid "iucv: Inter-User Communication Vehicle - available for VM guests only"
-msgstr "iucv: Inter-User Communication Vehicle - Ð´Ð¾ÑÑ‚ÑƒÐ¿ÐµÐ½ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ð´Ð»Ñ Ð³Ð¾ÑÑ‚ÐµÐ²Ñ‹Ñ… VM"
+msgstr ""
+"iucv: Inter-User Communication Vehicle - Ð´Ð¾ÑÑ‚ÑƒÐ¿ÐµÐ½ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ð´Ð»Ñ Ð³Ð¾ÑÑ‚ÐµÐ²Ñ‹Ñ… VM"
 
 #. Type: select
 #. Description
-#: ../s390-netdevice.templates:7 ../s390-netdevice.templates:4
+#: ../s390-netdevice.templates:7
 msgid "Network device type:"
 msgstr "Ð¢Ð¸Ð¿ ÑÐµÑ‚ÐµÐ²Ð¾Ð³Ð¾ ÑƒÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð²Ð°:"
 
 #. Type: select
 #. Description
-#: ../s390-netdevice.templates:7 ../s390-netdevice.templates:4
+#: ../s390-netdevice.templates:7
 msgid ""
 "Please choose the type of your primary network interface that you will need "
 "for installing the Debian system (via NFS or HTTP). Only the listed devices "
@@ -11115,13 +10887,13 @@
 
 #. Type: select
 #. Description
-#: ../s390-netdevice.templates:15 ../s390-netdevice.templates:12
+#: ../s390-netdevice.templates:15
 msgid "CTC device:"
 msgstr "Ð£ÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð²Ð¾ CTC:"
 
 #. Type: select
 #. Description
-#: ../s390-netdevice.templates:15 ../s390-netdevice.templates:12
+#: ../s390-netdevice.templates:15
 msgid ""
 "The following device numbers might belong to CTC or ESCON connections, but "
 "please note that OSA-2 or OSA-Express cards might also be listed here."
@@ -11131,7 +10903,7 @@
 
 #. Type: boolean
 #. Description
-#: ../s390-netdevice.templates:22 ../s390-netdevice.templates:19
+#: ../s390-netdevice.templates:22
 msgid ""
 "The configured parameters are:\n"
 " read channel  = ${device_read}\n"
@@ -11145,25 +10917,25 @@
 
 #. Type: error
 #. Description
-#: ../s390-netdevice.templates:30 ../s390-netdevice.templates:27
+#: ../s390-netdevice.templates:30
 msgid "No CTC or ESCON connections"
 msgstr "ÐÐµ Ð¾Ð±Ð½Ð°Ñ€ÑƒÐ¶ÐµÐ½Ð¾ ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ð¹ CTC Ð¸Ð»Ð¸ ESCON"
 
 #. Type: error
 #. Description
-#: ../s390-netdevice.templates:30 ../s390-netdevice.templates:27
+#: ../s390-netdevice.templates:30
 msgid "Please make sure that you have set them up correctly."
 msgstr "Ð£Ð±ÐµÐ´Ð¸Ñ‚ÐµÑÑŒ, Ñ‡Ñ‚Ð¾ Ð²Ñ‹ ÐºÐ¾Ñ€Ñ€ÐµÐºÑ‚Ð½Ð¾ Ð¸Ñ… Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¸Ð»Ð¸."
 
 #. Type: select
 #. Description
-#: ../s390-netdevice.templates:37 ../s390-netdevice.templates:34
+#: ../s390-netdevice.templates:37
 msgid "Protocol for this connection:"
 msgstr "ÐŸÑ€Ð¾Ñ‚Ð¾ÐºÐ¾Ð» Ð´Ð»Ñ ÑÑ‚Ð¾Ð³Ð¾ ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ:"
 
 #. Type: select
 #. Description
-#: ../s390-netdevice.templates:42 ../s390-netdevice.templates:39
+#: ../s390-netdevice.templates:42
 msgid ""
 "The following device numbers might belong to OSA-2 or OSA-Express cards, but "
 "please note that CTC/ESCON devices might also be listed here."
@@ -11174,7 +10946,7 @@
 
 #. Type: boolean
 #. Description
-#: ../s390-netdevice.templates:49 ../s390-netdevice.templates:46
+#: ../s390-netdevice.templates:49
 msgid ""
 "The configured parameters are:\n"
 " read channel  = ${device_read}\n"
@@ -11188,13 +10960,13 @@
 
 #. Type: error
 #. Description
-#: ../s390-netdevice.templates:57 ../s390-netdevice.templates:54
+#: ../s390-netdevice.templates:57
 msgid "No OSA-2 or OSA-Express cards"
 msgstr "ÐšÐ°Ñ€Ñ‚Ñ‹ OSA-2 Ð¸Ð»Ð¸ OSA-Express Ð½Ðµ Ð¾Ð±Ð½Ð°Ñ€ÑƒÐ¶ÐµÐ½Ñ‹"
 
 #. Type: error
 #. Description
-#: ../s390-netdevice.templates:57 ../s390-netdevice.templates:54
+#: ../s390-netdevice.templates:57
 msgid ""
 "If you are running VM please make sure that your card is attached to this "
 "guest. If you want to use HiperSockets or an OSA-Express card in QDIO mode "
@@ -11206,19 +10978,19 @@
 
 #. Type: select
 #. Description
-#: ../s390-netdevice.templates:66 ../s390-netdevice.templates:63
+#: ../s390-netdevice.templates:66
 msgid "Device:"
 msgstr "Ð£ÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð²Ð¾:"
 
 #. Type: select
 #. Description
-#: ../s390-netdevice.templates:66 ../s390-netdevice.templates:63
+#: ../s390-netdevice.templates:66
 msgid "Please select the OSA-Express QDIO / HiperSockets device."
 msgstr "Ð’Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ ÑƒÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð²Ð¾ OSA-Express QDIO / HiperSockets."
 
 #. Type: boolean
 #. Description
-#: ../s390-netdevice.templates:72 ../s390-netdevice.templates:69
+#: ../s390-netdevice.templates:72
 msgid ""
 "The configured parameters are:\n"
 " read channel  = ${device_read}\n"
@@ -11236,13 +11008,13 @@
 
 #. Type: error
 #. Description
-#: ../s390-netdevice.templates:82 ../s390-netdevice.templates:79
+#: ../s390-netdevice.templates:82
 msgid "No OSA-Express QDIO cards / HiperSockets"
 msgstr "ÐšÐ°Ñ€Ñ‚Ñ‹ OSA-Express QDIO / HiperSockets Ð½Ðµ Ð¾Ð±Ð½Ð°Ñ€ÑƒÐ¶ÐµÐ½Ñ‹"
 
 #. Type: error
 #. Description
-#: ../s390-netdevice.templates:82 ../s390-netdevice.templates:79
+#: ../s390-netdevice.templates:82
 msgid ""
 "No OSA-Express QDIO cards / HiperSockets were detected. If you are running "
 "VM please make sure that your card is attached to this guest. If you want to "
@@ -11256,13 +11028,13 @@
 
 #. Type: string
 #. Description
-#: ../s390-netdevice.templates:90 ../s390-netdevice.templates:87
+#: ../s390-netdevice.templates:90
 msgid "Portname:"
 msgstr "Ð˜Ð¼Ñ Ð¿Ð¾Ñ€Ñ‚Ð°:"
 
 #. Type: string
 #. Description
-#: ../s390-netdevice.templates:90 ../s390-netdevice.templates:87
+#: ../s390-netdevice.templates:90
 msgid ""
 "Please enter the portname of your OSA-Express card. This name must be 1 to 8 "
 "characters long and must be equal on all systems accessing the same card."
@@ -11273,7 +11045,7 @@
 
 #. Type: string
 #. Description
-#: ../s390-netdevice.templates:90 ../s390-netdevice.templates:87
+#: ../s390-netdevice.templates:90
 msgid ""
 "Leave it empty if you want to use HiperSockets. This parameter is required "
 "for cards with microcode level 2.10 or later or when you want to share a "
@@ -11285,31 +11057,31 @@
 
 #. Type: string
 #. Description
-#: ../s390-netdevice.templates:90 ../s390-netdevice.templates:87
+#: ../s390-netdevice.templates:90
 msgid "The name will automatically be converted to uppercase."
 msgstr "Ð˜Ð¼Ñ Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡ÐµÑÐºÐ¸ Ð±ÑƒÐ´ÐµÑ‚ Ð¿ÐµÑ€ÐµÐ²ÐµÐ´ÐµÐ½Ð¾ Ð² Ð²ÐµÑ€Ñ…Ð½Ð¸Ð¹ Ñ€ÐµÐ³Ð¸ÑÑ‚Ñ€."
 
 #. Type: string
 #. Description
-#: ../s390-netdevice.templates:104 ../s390-netdevice.templates:101
+#: ../s390-netdevice.templates:104
 msgid "Port:"
 msgstr "ÐŸÐ¾Ñ€Ñ‚:"
 
 #. Type: string
 #. Description
-#: ../s390-netdevice.templates:104 ../s390-netdevice.templates:101
+#: ../s390-netdevice.templates:104
 msgid "Please enter a relative port for this connection."
 msgstr "Ð£ÐºÐ°Ð¶Ð¸Ñ‚Ðµ Ð¾Ñ‚Ð½Ð¾ÑÐ¸Ñ‚ÐµÐ»ÑŒÐ½Ñ‹Ð¹ Ð¿Ð¾Ñ€Ñ‚ Ð´Ð»Ñ ÑÑ‚Ð¾Ð³Ð¾ ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ."
 
 #. Type: boolean
 #. Description
-#: ../s390-netdevice.templates:110 ../s390-netdevice.templates:107
+#: ../s390-netdevice.templates:110
 msgid "Do you accept this configuration?"
 msgstr "Ð’ÐµÑ€Ð½Ñ‹ Ð»Ð¸ ÑÑ‚Ð¸ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸?"
 
 #. Type: boolean
 #. Description
-#: ../s390-netdevice.templates:110 ../s390-netdevice.templates:107
+#: ../s390-netdevice.templates:110
 msgid ""
 "The configured parameter is:\n"
 " peer  = ${peer}"
@@ -11319,19 +11091,19 @@
 
 #. Type: string
 #. Description
-#: ../s390-netdevice.templates:116 ../s390-netdevice.templates:113
+#: ../s390-netdevice.templates:116
 msgid "VM peer:"
 msgstr "Ð¡Ð²ÑÐ·ÑŒ Ñ VM:"
 
 #. Type: string
 #. Description
-#: ../s390-netdevice.templates:116 ../s390-netdevice.templates:113
+#: ../s390-netdevice.templates:116
 msgid "Please enter the name of the VM peer you want to connect to."
 msgstr "Ð’Ð²ÐµÐ´Ð¸Ñ‚Ðµ Ð¸Ð¼Ñ ÑÐ²ÑÐ·Ð¸ Ñ VM, ÐºÐ¾Ñ‚Ð¾Ñ€ÑƒÑŽ Ð²Ñ‹ Ñ…Ð¾Ñ‚Ð¸Ñ‚Ðµ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ. "
 
 #. Type: string
 #. Description
-#: ../s390-netdevice.templates:116 ../s390-netdevice.templates:113
+#: ../s390-netdevice.templates:116
 msgid ""
 "If you want to connect to multiple peers, separate the names by colons, e."
 "g.  tcpip:linux1."
@@ -11341,7 +11113,7 @@
 
 #. Type: string
 #. Description
-#: ../s390-netdevice.templates:116 ../s390-netdevice.templates:113
+#: ../s390-netdevice.templates:116
 msgid ""
 "The standard TCP/IP server name on VM is TCPIP; on VIF it's $TCPIP. Note: "
 "IUCV must be enabled in the VM user directory for this driver to work and it "
@@ -11354,7 +11126,7 @@
 #. Type: text
 #. Description
 #. Main menu item
-#: ../s390-netdevice.templates:130 ../s390-netdevice.templates:127
+#: ../s390-netdevice.templates:130
 msgid "Configure the network device"
 msgstr "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ° ÑÐµÑ‚ÐµÐ²Ð¾Ð¹ ÐºÐ°Ñ€Ñ‚Ñ‹"
 
@@ -11499,1302 +11271,849 @@
 msgid "Configure the base system before rebooting"
 msgstr "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ° Ð±Ð°Ð·Ð¾Ð²Ð¾Ð¹ ÑÐ¸ÑÑ‚ÐµÐ¼Ñ‹ Ð² chroot-Ð¾ÐºÑ€ÑƒÐ¶ÐµÐ½Ð¸Ð¸"
 
-#. Type: text
-#. Description
-#. Main menu entry
-#: ../templates-in:38
-msgid "Choose country or region"
-msgstr "Ð’Ñ‹Ð±Ð¾Ñ€ ÑÑ‚Ñ€Ð°Ð½Ñ‹ Ð¸Ð»Ð¸ Ñ€ÐµÐ³Ð¸Ð¾Ð½Ð°"
+#~ msgid "Desktop machine"
+#~ msgstr "ÐÐ°ÑÑ‚Ð¾Ð»ÑŒÐ½Ð°Ñ Ð¼Ð°ÑˆÐ¸Ð½Ð°"
 
-#: ../countrylist:15
-msgid "North America"
-msgstr "Ð¡ÐµÐ²ÐµÑ€Ð½Ð°Ñ ÐÐ¼ÐµÑ€Ð¸ÐºÐ°"
+#~ msgid "Multi-user workstation"
+#~ msgstr "ÐœÐ½Ð¾Ð³Ð¾Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒÑÐºÐ°Ñ ÑÐ¸ÑÑ‚ÐµÐ¼Ð°"
 
-#: ../countrylist:16
-msgid "Central America"
-msgstr "Ð¦ÐµÐ½Ñ‚Ñ€Ð°Ð»ÑŒÐ½Ð°Ñ ÐÐ¼ÐµÑ€Ð¸ÐºÐ°"
+#~ msgid "Choose country or region"
+#~ msgstr "Ð’Ñ‹Ð±Ð¾Ñ€ ÑÑ‚Ñ€Ð°Ð½Ñ‹ Ð¸Ð»Ð¸ Ñ€ÐµÐ³Ð¸Ð¾Ð½Ð°"
 
-#: ../countrylist:17
-msgid "South America"
-msgstr "Ð®Ð¶Ð½Ð°Ñ ÐÐ¼ÐµÑ€Ð¸ÐºÐ°"
+#~ msgid "North America"
+#~ msgstr "Ð¡ÐµÐ²ÐµÑ€Ð½Ð°Ñ ÐÐ¼ÐµÑ€Ð¸ÐºÐ°"
 
-#: ../countrylist:18
-msgid "Caribbean"
-msgstr "ÐšÐ°Ñ€Ð¸Ð±ÑÐºÐ¸Ðµ Ð¾ÑÑ‚Ñ€Ð¾Ð²Ð°"
+#~ msgid "Central America"
+#~ msgstr "Ð¦ÐµÐ½Ñ‚Ñ€Ð°Ð»ÑŒÐ½Ð°Ñ ÐÐ¼ÐµÑ€Ð¸ÐºÐ°"
 
-#: ../countrylist:19
-msgid "Europe"
-msgstr "Ð•Ð²Ñ€Ð¾Ð¿Ð°"
+#~ msgid "South America"
+#~ msgstr "Ð®Ð¶Ð½Ð°Ñ ÐÐ¼ÐµÑ€Ð¸ÐºÐ°"
 
-#: ../countrylist:20
-msgid "Asia"
-msgstr "ÐÐ·Ð¸Ñ"
+#~ msgid "Caribbean"
+#~ msgstr "ÐšÐ°Ñ€Ð¸Ð±ÑÐºÐ¸Ðµ Ð¾ÑÑ‚Ñ€Ð¾Ð²Ð°"
 
-#: ../countrylist:21
-msgid "Africa"
-msgstr "ÐÑ„Ñ€Ð¸ÐºÐ°"
+#~ msgid "Europe"
+#~ msgstr "Ð•Ð²Ñ€Ð¾Ð¿Ð°"
 
-#: ../countrylist:22
-msgid "Indian Ocean"
-msgstr "Ð˜Ð½Ð´Ð¸Ð¹ÑÐºÐ¸Ð¹ Ð¾ÐºÐµÐ°Ð½"
+#~ msgid "Asia"
+#~ msgstr "ÐÐ·Ð¸Ñ"
 
-#: ../countrylist:23
-msgid "Oceania"
-msgstr "ÐžÐºÐµÐ°Ð½Ð¸Ñ"
+#~ msgid "Africa"
+#~ msgstr "ÐÑ„Ñ€Ð¸ÐºÐ°"
 
-#: ../countrylist:24
-msgid "Antarctica"
-msgstr "ÐÐ½Ñ‚Ð°Ñ€ÐºÑ‚Ð¸Ð´Ð°"
+#~ msgid "Indian Ocean"
+#~ msgstr "Ð˜Ð½Ð´Ð¸Ð¹ÑÐºÐ¸Ð¹ Ð¾ÐºÐµÐ°Ð½"
 
-#. Type: boolean
-#. Description
-#: ../ethdetect.templates:24
-msgid "Load network drivers from a driver floppy?"
-msgstr "Ð—Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚ÑŒ Ð´Ñ€Ð°Ð¹Ð²ÐµÑ€Ñ‹ ÑÐµÑ‚Ð¸ Ñ Ð´Ð¸ÑÐºÐµÑ‚Ñ‹?"
+#~ msgid "Oceania"
+#~ msgstr "ÐžÐºÐµÐ°Ð½Ð¸Ñ"
 
-#. Type: boolean
-#. Description
-#: ../ethdetect.templates:24
-msgid ""
-"No Ethernet card was detected. For some Ethernet cards you may need to load "
-"additional network drivers from a driver floppy. If you have such a floppy "
-"available now, put it in the drive before continuing."
-msgstr ""
-"Ð¡ÐµÑ‚ÐµÐ²Ñ‹Ñ… ÐºÐ°Ñ€Ñ‚ Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾. Ð”Ð»Ñ Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ñ… ÑÐµÑ‚ÐµÐ²Ñ‹Ñ… ÐºÐ°Ñ€Ñ‚ Ð²Ð°Ð¼ Ð¼Ð¾Ð¶ÐµÑ‚ Ð¿Ð¾Ñ‚Ñ€ÐµÐ±Ð¾Ð²Ð°Ñ‚ÑŒÑÑ "
-"Ð·Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚ÑŒ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ñ‹Ðµ Ð´Ñ€Ð°Ð¹Ð²ÐµÑ€Ñ‹ Ñ Ð´Ð¸ÑÐºÐµÑ‚Ñ‹. Ð•ÑÐ»Ð¸ Ñƒ Ð²Ð°Ñ ÐµÑÑ‚ÑŒ Ñ‚Ð°ÐºÐ°Ñ Ð´Ð¸ÑÐºÐµÑ‚Ð°, "
-"Ð²ÑÑ‚Ð°Ð²ÑŒÑ‚Ðµ ÐµÑ‘ Ð² Ð´Ð¸ÑÐºÐ¾Ð²Ð¾Ð´."
+#~ msgid "Antarctica"
+#~ msgstr "ÐÐ½Ñ‚Ð°Ñ€ÐºÑ‚Ð¸Ð´Ð°"
 
-#. Type: text
-#. Description
-#. Main menu item
-#: ../hw-detect-full.templates:4
-msgid "Detect hardware"
-msgstr "ÐžÐ¿Ñ€ÐµÐ´ÐµÐ»ÐµÐ½Ð¸Ðµ Ð¾Ð±Ð¾Ñ€ÑƒÐ´Ð¾Ð²Ð°Ð½Ð¸Ñ"
+#~ msgid "Load network drivers from a driver floppy?"
+#~ msgstr "Ð—Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚ÑŒ Ð´Ñ€Ð°Ð¹Ð²ÐµÑ€Ñ‹ ÑÐµÑ‚Ð¸ Ñ Ð´Ð¸ÑÐºÐµÑ‚Ñ‹?"
 
-#. Type: note
-#. Description
-#: ../hw-detect.templates:3
-msgid "Unable to load some modules"
-msgstr "ÐÐµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ Ð·Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚ÑŒ Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ðµ Ð¼Ð¾Ð´ÑƒÐ»Ð¸"
+#~ msgid ""
+#~ "No Ethernet card was detected. For some Ethernet cards you may need to "
+#~ "load additional network drivers from a driver floppy. If you have such a "
+#~ "floppy available now, put it in the drive before continuing."
+#~ msgstr ""
+#~ "Ð¡ÐµÑ‚ÐµÐ²Ñ‹Ñ… ÐºÐ°Ñ€Ñ‚ Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾. Ð”Ð»Ñ Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ñ… ÑÐµÑ‚ÐµÐ²Ñ‹Ñ… ÐºÐ°Ñ€Ñ‚ Ð²Ð°Ð¼ Ð¼Ð¾Ð¶ÐµÑ‚ "
+#~ "Ð¿Ð¾Ñ‚Ñ€ÐµÐ±Ð¾Ð²Ð°Ñ‚ÑŒÑÑ Ð·Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚ÑŒ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ñ‹Ðµ Ð´Ñ€Ð°Ð¹Ð²ÐµÑ€Ñ‹ Ñ Ð´Ð¸ÑÐºÐµÑ‚Ñ‹. Ð•ÑÐ»Ð¸ Ñƒ Ð²Ð°Ñ "
+#~ "ÐµÑÑ‚ÑŒ Ñ‚Ð°ÐºÐ°Ñ Ð´Ð¸ÑÐºÐµÑ‚Ð°, Ð²ÑÑ‚Ð°Ð²ÑŒÑ‚Ðµ ÐµÑ‘ Ð² Ð´Ð¸ÑÐºÐ¾Ð²Ð¾Ð´."
 
-#. Type: note
-#. Description
-#: ../hw-detect.templates:3
-msgid ""
-"Linux kernel modules needed to drive some of your hardware are not available "
-"yet. Simply proceeding with the install may make these modules available "
-"later."
-msgstr ""
-"ÐœÐ¾Ð´ÑƒÐ»Ð¸ ÑÐ´Ñ€Ð°, Ð½ÐµÐ¾Ð±Ñ…Ð¾Ð´Ð¸Ð¼Ñ‹Ðµ Ð´Ð»Ñ Ñ€Ð°Ð±Ð¾Ñ‚Ñ‹ Ñ Ð²Ð°ÑˆÐ¸Ð¼ Ð¾Ð±Ð¾Ñ€ÑƒÐ´Ð¾Ð²Ð°Ð½Ð¸ÐµÐ¼, ÐµÑ‰Ñ‘ Ð½ÐµÐ´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ñ‹. "
-"ÐžÐ½Ð¸ Ð¼Ð¾Ð³ÑƒÑ‚ ÑÑ‚Ð°Ñ‚ÑŒ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ñ‹Ð¼Ð¸ Ð² Ð¿Ñ€Ð¾Ñ†ÐµÑÑÐµ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸."
+#~ msgid "Detect hardware"
+#~ msgstr "ÐžÐ¿Ñ€ÐµÐ´ÐµÐ»ÐµÐ½Ð¸Ðµ Ð¾Ð±Ð¾Ñ€ÑƒÐ´Ð¾Ð²Ð°Ð½Ð¸Ñ"
 
-#. Type: note
-#. Description
-#: ../hw-detect.templates:3
-msgid ""
-"The unavailable modules, and the devices that need them are: "
-"${MISSING_MODULES_LIST}"
-msgstr ""
-"ÐžÑ‚ÑÑƒÑ‚ÑÑ‚Ð²ÑƒÑŽÑ‰Ð¸Ðµ Ð¼Ð¾Ð´ÑƒÐ»Ð¸ Ð¸ ÑƒÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð²Ð°, ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ð¼ Ð¾Ð½Ð¸ Ð½ÑƒÐ¶Ð½Ñ‹: "
-"${MISSING_MODULES_LIST} "
+#~ msgid "Unable to load some modules"
+#~ msgstr "ÐÐµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ Ð·Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚ÑŒ Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ðµ Ð¼Ð¾Ð´ÑƒÐ»Ð¸"
 
-#. Type: select
-#. Description
-#: ../netcfg-common.templates:32
-msgid ""
-"Your system has multiple network interfaces. Choose the one to use as the "
-"primary network interface while installing Debian. If possible, the first "
-"connected network interface found has been selected."
-msgstr ""
-"ÐÐ° Ð²Ð°ÑˆÐµÐ¼ ÐºÐ¾Ð¼Ð¿ÑŒÑŽÑ‚ÐµÑ€Ðµ Ð¾Ð±Ð½Ð°Ñ€ÑƒÐ¶ÐµÐ½Ð¾ Ð½ÐµÑÐºÐ¾Ð»ÑŒÐºÐ¾ ÑÐµÑ‚ÐµÐ²Ñ‹Ñ… Ð¸Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹ÑÐ¾Ð². Ð’Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ Ñ‚Ð¾Ñ‚, "
-"ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ð¹ Ð±ÑƒÐ´ÐµÑ‚ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½ ÐºÐ°Ðº Ð¾ÑÐ½Ð¾Ð²Ð½Ð¾Ð¹ Ð²Ð¾ Ð²Ñ€ÐµÐ¼Ñ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸ Debian. ÐŸÐµÑ€Ð²Ñ‹Ð¹ "
-"Ð½Ð°Ð¹Ð´Ñ‘Ð½Ð½Ñ‹Ð¹ Ð¸Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹Ñ ÑÐµÐ¹Ñ‡Ð°Ñ Ð¿Ð¾Ð´ÑÐ²ÐµÑ‡ÐµÐ½."
+#~ msgid ""
+#~ "Linux kernel modules needed to drive some of your hardware are not "
+#~ "available yet. Simply proceeding with the install may make these modules "
+#~ "available later."
+#~ msgstr ""
+#~ "ÐœÐ¾Ð´ÑƒÐ»Ð¸ ÑÐ´Ñ€Ð°, Ð½ÐµÐ¾Ð±Ñ…Ð¾Ð´Ð¸Ð¼Ñ‹Ðµ Ð´Ð»Ñ Ñ€Ð°Ð±Ð¾Ñ‚Ñ‹ Ñ Ð²Ð°ÑˆÐ¸Ð¼ Ð¾Ð±Ð¾Ñ€ÑƒÐ´Ð¾Ð²Ð°Ð½Ð¸ÐµÐ¼, ÐµÑ‰Ñ‘ "
+#~ "Ð½ÐµÐ´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ñ‹. ÐžÐ½Ð¸ Ð¼Ð¾Ð³ÑƒÑ‚ ÑÑ‚Ð°Ñ‚ÑŒ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ñ‹Ð¼Ð¸ Ð² Ð¿Ñ€Ð¾Ñ†ÐµÑÑÐµ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸."
 
-#. Type: text
-#. Description
-#: ../netcfg-common.templates:154
-msgid "Arcnet"
-msgstr "Arcnet"
+#~ msgid ""
+#~ "The unavailable modules, and the devices that need them are: "
+#~ "${MISSING_MODULES_LIST}"
+#~ msgstr ""
+#~ "ÐžÑ‚ÑÑƒÑ‚ÑÑ‚Ð²ÑƒÑŽÑ‰Ð¸Ðµ Ð¼Ð¾Ð´ÑƒÐ»Ð¸ Ð¸ ÑƒÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð²Ð°, ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ð¼ Ð¾Ð½Ð¸ Ð½ÑƒÐ¶Ð½Ñ‹: "
+#~ "${MISSING_MODULES_LIST} "
 
-#. Type: text
-#. Description
-#: ../netcfg-common.templates:186
-msgid "Hypersocket"
-msgstr "Hypersocket"
+#~ msgid ""
+#~ "Your system has multiple network interfaces. Choose the one to use as the "
+#~ "primary network interface while installing Debian. If possible, the first "
+#~ "connected network interface found has been selected."
+#~ msgstr ""
+#~ "ÐÐ° Ð²Ð°ÑˆÐµÐ¼ ÐºÐ¾Ð¼Ð¿ÑŒÑŽÑ‚ÐµÑ€Ðµ Ð¾Ð±Ð½Ð°Ñ€ÑƒÐ¶ÐµÐ½Ð¾ Ð½ÐµÑÐºÐ¾Ð»ÑŒÐºÐ¾ ÑÐµÑ‚ÐµÐ²Ñ‹Ñ… Ð¸Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹ÑÐ¾Ð². Ð’Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ "
+#~ "Ñ‚Ð¾Ñ‚, ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ð¹ Ð±ÑƒÐ´ÐµÑ‚ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½ ÐºÐ°Ðº Ð¾ÑÐ½Ð¾Ð²Ð½Ð¾Ð¹ Ð²Ð¾ Ð²Ñ€ÐµÐ¼Ñ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸ Debian. "
+#~ "ÐŸÐµÑ€Ð²Ñ‹Ð¹ Ð½Ð°Ð¹Ð´Ñ‘Ð½Ð½Ñ‹Ð¹ Ð¸Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹Ñ ÑÐµÐ¹Ñ‡Ð°Ñ Ð¿Ð¾Ð´ÑÐ²ÐµÑ‡ÐµÐ½."
 
-#. Type: text
-#. Description
-#. base-installer progress bar item
-#: ../netcfg-common.templates:199
-msgid "Configuring network ..."
-msgstr "Ð˜Ð´Ñ‘Ñ‚ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ° ÑÐµÑ‚Ð¸..."
+#~ msgid "Arcnet"
+#~ msgstr "Arcnet"
 
-#. Type: boolean
-#. Description
-#: ../netcfg-dhcp.templates:50
-msgid ""
-"The network autoconfiguration was successful. However, no default route was "
-"set: the system does not know how to communicate with hosts on the Internet. "
-"This will make it impossible to continue with the installation unless you "
-"have the first official Debian CD-ROM, a 'Netinst' CD-ROM, or packages "
-"available on the local network."
-msgstr ""
-"ÐÐ²Ñ‚Ð¾Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ° ÑÐµÑ‚Ð¸ Ð¿Ñ€Ð¾ÑˆÐ»Ð° ÑƒÑÐ¿ÐµÑˆÐ½Ð¾. ÐžÐ´Ð½Ð°ÐºÐ¾, Ð¿ÑƒÑ‚ÑŒ Ð¿Ð¾ ÑƒÐ¼Ð¾Ð»Ñ‡Ð°Ð½Ð¸ÑŽ (default route) "
-"Ð½Ðµ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½: ÑÐ¸ÑÑ‚ÐµÐ¼Ð° Ð½Ðµ Ð·Ð½Ð°ÐµÑ‚, ÐºÐ°Ðº ÑÐ²ÑÐ·Ð°Ñ‚ÑŒÑÑ Ñ Ð¼Ð°ÑˆÐ¸Ð½Ð°Ð¼Ð¸ Ð² Ð˜Ð½Ñ‚ÐµÑ€Ð½ÐµÑ‚Ðµ. ÐÑ‚Ð¾ "
-"Ð¼Ð¾Ð¶ÐµÑ‚ ÑÐ´ÐµÐ»Ð°Ñ‚ÑŒ Ð¿Ñ€Ð¾Ð´Ð¾Ð»Ð¶ÐµÐ½Ð¸Ðµ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸ Ð½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ñ‹Ð¼, ÐµÑÐ»Ð¸ Ñƒ Ð²Ð°Ñ Ð½ÐµÑ‚ Ð¿ÐµÑ€Ð²Ð¾Ð³Ð¾ "
-"Ð¾Ñ„Ð¸Ñ†Ð¸Ð°Ð»ÑŒÐ½Ð¾Ð³Ð¾ ÐºÐ¾Ð¼Ð¿Ð°ÐºÑ‚-Ð´Ð¸ÑÐºÐ° Debian, Ð´Ð¸ÑÐºÐ° 'Netinst', Ð¸Ð»Ð¸ Ð¿Ð°ÐºÐµÑ‚Ð¾Ð², Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ñ‹Ñ… "
-"Ð¿Ð¾ Ð»Ð¾ÐºÐ°Ð»ÑŒÐ½Ð¾Ð¹ ÑÐµÑ‚Ð¸."
+#~ msgid "Hypersocket"
+#~ msgstr "Hypersocket"
 
-#. Type: text
-#. Description
-#. Item in the main menu to select this package
-#: ../netcfg-dhcp.templates:67
-msgid "Configure the network using dynamic addressing (DHCP)"
-msgstr "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ° ÑÐµÑ‚Ð¸ Ñ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸ÐµÐ¼ Ð¿Ñ€Ð¾Ñ‚Ð¾ÐºÐ¾Ð»Ð° Ð´Ð¸Ð½Ð°Ð¼Ð¸Ñ‡ÐµÑÐºÐ¾Ð¹ Ð°Ð´Ñ€ÐµÑÐ°Ñ†Ð¸Ð¸ (DHCP)"
+#~ msgid "Configuring network ..."
+#~ msgstr "Ð˜Ð´Ñ‘Ñ‚ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ° ÑÐµÑ‚Ð¸..."
 
-#. Type: select
-#. Description
-#: ../choose-mirror.templates:15
-msgid "Protocol for files download:"
-msgstr "ÐŸÑ€Ð¾Ñ‚Ð¾ÐºÐ¾Ð» Ð´Ð»Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸ Ñ„Ð°Ð¹Ð»Ð¾Ð²:"
+#~ msgid ""
+#~ "The network autoconfiguration was successful. However, no default route "
+#~ "was set: the system does not know how to communicate with hosts on the "
+#~ "Internet. This will make it impossible to continue with the installation "
+#~ "unless you have the first official Debian CD-ROM, a 'Netinst' CD-ROM, or "
+#~ "packages available on the local network."
+#~ msgstr ""
+#~ "ÐÐ²Ñ‚Ð¾Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ° ÑÐµÑ‚Ð¸ Ð¿Ñ€Ð¾ÑˆÐ»Ð° ÑƒÑÐ¿ÐµÑˆÐ½Ð¾. ÐžÐ´Ð½Ð°ÐºÐ¾, Ð¿ÑƒÑ‚ÑŒ Ð¿Ð¾ ÑƒÐ¼Ð¾Ð»Ñ‡Ð°Ð½Ð¸ÑŽ (default "
+#~ "route) Ð½Ðµ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½: ÑÐ¸ÑÑ‚ÐµÐ¼Ð° Ð½Ðµ Ð·Ð½Ð°ÐµÑ‚, ÐºÐ°Ðº ÑÐ²ÑÐ·Ð°Ñ‚ÑŒÑÑ Ñ Ð¼Ð°ÑˆÐ¸Ð½Ð°Ð¼Ð¸ Ð² "
+#~ "Ð˜Ð½Ñ‚ÐµÑ€Ð½ÐµÑ‚Ðµ. ÐÑ‚Ð¾ Ð¼Ð¾Ð¶ÐµÑ‚ ÑÐ´ÐµÐ»Ð°Ñ‚ÑŒ Ð¿Ñ€Ð¾Ð´Ð¾Ð»Ð¶ÐµÐ½Ð¸Ðµ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸ Ð½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ñ‹Ð¼, ÐµÑÐ»Ð¸ Ñƒ "
+#~ "Ð²Ð°Ñ Ð½ÐµÑ‚ Ð¿ÐµÑ€Ð²Ð¾Ð³Ð¾ Ð¾Ñ„Ð¸Ñ†Ð¸Ð°Ð»ÑŒÐ½Ð¾Ð³Ð¾ ÐºÐ¾Ð¼Ð¿Ð°ÐºÑ‚-Ð´Ð¸ÑÐºÐ° Debian, Ð´Ð¸ÑÐºÐ° 'Netinst', Ð¸Ð»Ð¸ "
+#~ "Ð¿Ð°ÐºÐµÑ‚Ð¾Ð², Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ñ‹Ñ… Ð¿Ð¾ Ð»Ð¾ÐºÐ°Ð»ÑŒÐ½Ð¾Ð¹ ÑÐµÑ‚Ð¸."
 
-#. Type: select
-#. Description
-#: ../choose-mirror.templates:15
-msgid ""
-"Please select the file download protocol. If unsure, select \"http\"; it is "
-"less prone to problems involving firewalls."
-msgstr ""
-"Ð’Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ Ð¿Ñ€Ð¾Ñ‚Ð¾ÐºÐ¾Ð» Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸ Ñ„Ð°Ð¹Ð»Ð¾Ð². Ð•ÑÐ»Ð¸ Ð½Ðµ Ð·Ð½Ð°ÐµÑ‚Ðµ, Ñ‡Ñ‚Ð¾ Ð²Ñ‹Ð±Ñ€Ð°Ñ‚ÑŒ -- Ð²Ñ‹Ð±Ð¸Ñ€Ð°Ð¹Ñ‚Ðµ "
-"\"http\", ÑÑ‚Ð¾Ñ‚ Ð¿Ñ€Ð¾Ñ‚Ð¾ÐºÐ¾Ð» Ñ€Ð°Ð±Ð¾Ñ‚Ð°ÐµÑ‚ Ð»ÑƒÑ‡ÑˆÐµ Ð¾ÑÑ‚Ð°Ð»ÑŒÐ½Ñ‹Ñ… Ð¿Ñ€Ð¸ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ð¸ "
-"Ð¼ÐµÐ¶ÑÐµÑ‚ÐµÐ²Ñ‹Ñ… ÑÐºÑ€Ð°Ð½Ð¾Ð²."
+#~ msgid "Configure the network using dynamic addressing (DHCP)"
+#~ msgstr ""
+#~ "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ° ÑÐµÑ‚Ð¸ Ñ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸ÐµÐ¼ Ð¿Ñ€Ð¾Ñ‚Ð¾ÐºÐ¾Ð»Ð° Ð´Ð¸Ð½Ð°Ð¼Ð¸Ñ‡ÐµÑÐºÐ¾Ð¹ Ð°Ð´Ñ€ÐµÑÐ°Ñ†Ð¸Ð¸ (DHCP)"
 
-#. Type: string
-#. Description
-#: ../choose-mirror.templates:44
-msgid ""
-"The proxy information should be given in the standard form of \"http://"
-"[[user][:pass]@]host[:port]/\""
-msgstr ""
-"Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸ÑŽ Ð¾ Ð¿Ñ€Ð¾ÐºÑÐ¸ ÑÐ»ÐµÐ´ÑƒÐµÑ‚ Ð²Ð²Ð¾Ð´Ð¸Ñ‚ÑŒ Ð² ÑÑ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ð¾Ð¼ Ð²Ð¸Ð´Ðµ \"http://"
-"[[Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒ][:Ð¿Ð°Ñ€Ð¾Ð»ÑŒ]@]ÑƒÐ·ÐµÐ»[:Ð¿Ð¾Ñ€Ñ‚]/\""
+#~ msgid "Protocol for files download:"
+#~ msgstr "ÐŸÑ€Ð¾Ñ‚Ð¾ÐºÐ¾Ð» Ð´Ð»Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸ Ñ„Ð°Ð¹Ð»Ð¾Ð²:"
 
-#. Type: string
-#. Description
-#: ../choose-mirror.templates:64
-msgid ""
-"Please enter the network name of the host from which Debian will be "
-"downloaded."
-msgstr "Ð’Ð²ÐµÐ´Ð¸Ñ‚Ðµ ÑÐµÑ‚ÐµÐ²Ð¾Ðµ Ð¸Ð¼Ñ ÑƒÐ·Ð»Ð°, Ñ ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ð³Ð¾ Ð±ÑƒÐ´ÐµÑ‚ Ð·Ð°Ð³Ñ€ÑƒÐ¶ÐµÐ½ Debian."
+#~ msgid ""
+#~ "Please select the file download protocol. If unsure, select \"http\"; it "
+#~ "is less prone to problems involving firewalls."
+#~ msgstr ""
+#~ "Ð’Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ Ð¿Ñ€Ð¾Ñ‚Ð¾ÐºÐ¾Ð» Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸ Ñ„Ð°Ð¹Ð»Ð¾Ð². Ð•ÑÐ»Ð¸ Ð½Ðµ Ð·Ð½Ð°ÐµÑ‚Ðµ, Ñ‡Ñ‚Ð¾ Ð²Ñ‹Ð±Ñ€Ð°Ñ‚ÑŒ -- "
+#~ "Ð²Ñ‹Ð±Ð¸Ñ€Ð°Ð¹Ñ‚Ðµ \"http\", ÑÑ‚Ð¾Ñ‚ Ð¿Ñ€Ð¾Ñ‚Ð¾ÐºÐ¾Ð» Ñ€Ð°Ð±Ð¾Ñ‚Ð°ÐµÑ‚ Ð»ÑƒÑ‡ÑˆÐµ Ð¾ÑÑ‚Ð°Ð»ÑŒÐ½Ñ‹Ñ… Ð¿Ñ€Ð¸ "
+#~ "Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ð¸ Ð¼ÐµÐ¶ÑÐµÑ‚ÐµÐ²Ñ‹Ñ… ÑÐºÑ€Ð°Ð½Ð¾Ð²."
 
-#. Type: string
-#. Description
-#: ../choose-mirror.templates:77
-msgid ""
-"If you need to use a FTP proxy to access the outside world, please enter the "
-"proxy information here. Otherwise, leave this blank."
-msgstr ""
-"Ð•ÑÐ»Ð¸ Ð²Ð°Ð¼ Ð½ÐµÐ¾Ð±Ñ…Ð¾Ð´Ð¸Ð¼Ð¾ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ FTP-Ð¿Ñ€Ð¾ÐºÑÐ¸ Ð´Ð»Ñ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð° Ðº Ð²Ð½ÐµÑˆÐ½ÐµÐ¼Ñƒ Ð¼Ð¸Ñ€Ñƒ, "
-"Ð²Ð²ÐµÐ´Ð¸Ñ‚Ðµ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸ÑŽ Ð¾ Ð¿Ñ€Ð¾ÐºÑÐ¸. Ð•ÑÐ»Ð¸ Ð½ÐµÑ‚ -- Ð¾ÑÑ‚Ð°Ð²ÑŒÑ‚Ðµ Ð¿Ð¾Ð»Ðµ Ð¿ÑƒÑÑ‚Ñ‹Ð¼."
+#~ msgid ""
+#~ "The proxy information should be given in the standard form of \"http://"
+#~ "[[user][:pass]@]host[:port]/\""
+#~ msgstr ""
+#~ "Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸ÑŽ Ð¾ Ð¿Ñ€Ð¾ÐºÑÐ¸ ÑÐ»ÐµÐ´ÑƒÐµÑ‚ Ð²Ð²Ð¾Ð´Ð¸Ñ‚ÑŒ Ð² ÑÑ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ð¾Ð¼ Ð²Ð¸Ð´Ðµ \"http://"
+#~ "[[Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒ][:Ð¿Ð°Ñ€Ð¾Ð»ÑŒ]@]ÑƒÐ·ÐµÐ»[:Ð¿Ð¾Ñ€Ñ‚]/\""
 
-#. Type: string
-#. Description
-#: ../choose-mirror.templates:77
-msgid ""
-"The proxy information should be the standard form of \"http://[[user][:pass]"
-"@]host[:port]/\"."
-msgstr ""
-"Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸ÑŽ Ð¾ Ð¿Ñ€Ð¾ÐºÑÐ¸ ÑÐ»ÐµÐ´ÑƒÐµÑ‚ Ð²Ð²Ð¾Ð´Ð¸Ñ‚ÑŒ Ð² ÑÑ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ð¾Ð¼ Ð²Ð¸Ð´Ðµ \"http://"
-"[[Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒ][:Ð¿Ð°Ñ€Ð¾Ð»ÑŒ]@]ÑƒÐ·ÐµÐ»[:Ð¿Ð¾Ñ€Ñ‚]/\""
+#~ msgid ""
+#~ "Please enter the network name of the host from which Debian will be "
+#~ "downloaded."
+#~ msgstr "Ð’Ð²ÐµÐ´Ð¸Ñ‚Ðµ ÑÐµÑ‚ÐµÐ²Ð¾Ðµ Ð¸Ð¼Ñ ÑƒÐ·Ð»Ð°, Ñ ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ð³Ð¾ Ð±ÑƒÐ´ÐµÑ‚ Ð·Ð°Ð³Ñ€ÑƒÐ¶ÐµÐ½ Debian."
 
-#. Type: select
-#. Choices
-#: ../choose-mirror.templates:115
-msgid "AR"
-msgstr "AR (ÐÑ€Ð³ÐµÐ½Ñ‚Ð¸Ð½Ð°)"
+#~ msgid ""
+#~ "If you need to use a FTP proxy to access the outside world, please enter "
+#~ "the proxy information here. Otherwise, leave this blank."
+#~ msgstr ""
+#~ "Ð•ÑÐ»Ð¸ Ð²Ð°Ð¼ Ð½ÐµÐ¾Ð±Ñ…Ð¾Ð´Ð¸Ð¼Ð¾ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ FTP-Ð¿Ñ€Ð¾ÐºÑÐ¸ Ð´Ð»Ñ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð° Ðº Ð²Ð½ÐµÑˆÐ½ÐµÐ¼Ñƒ Ð¼Ð¸Ñ€Ñƒ, "
+#~ "Ð²Ð²ÐµÐ´Ð¸Ñ‚Ðµ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸ÑŽ Ð¾ Ð¿Ñ€Ð¾ÐºÑÐ¸. Ð•ÑÐ»Ð¸ Ð½ÐµÑ‚ -- Ð¾ÑÑ‚Ð°Ð²ÑŒÑ‚Ðµ Ð¿Ð¾Ð»Ðµ Ð¿ÑƒÑÑ‚Ñ‹Ð¼."
 
-#. Type: select
-#. Choices
-#: ../choose-mirror.templates:115
-msgid "CO"
-msgstr "CO (ÐšÐ¾Ð»ÑƒÐ¼Ð±Ð¸Ñ)"
+#~ msgid ""
+#~ "The proxy information should be the standard form of \"http://[[user][:"
+#~ "pass]@]host[:port]/\"."
+#~ msgstr ""
+#~ "Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸ÑŽ Ð¾ Ð¿Ñ€Ð¾ÐºÑÐ¸ ÑÐ»ÐµÐ´ÑƒÐµÑ‚ Ð²Ð²Ð¾Ð´Ð¸Ñ‚ÑŒ Ð² ÑÑ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ð¾Ð¼ Ð²Ð¸Ð´Ðµ \"http://"
+#~ "[[Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒ][:Ð¿Ð°Ñ€Ð¾Ð»ÑŒ]@]ÑƒÐ·ÐµÐ»[:Ð¿Ð¾Ñ€Ñ‚]/\""
 
-#. Type: select
-#. Choices
-#: ../choose-mirror.templates:115
-msgid "IL"
-msgstr "IL (Ð˜Ð·Ñ€Ð°Ð¸Ð»ÑŒ)"
+#~ msgid "AR"
+#~ msgstr "AR (ÐÑ€Ð³ÐµÐ½Ñ‚Ð¸Ð½Ð°)"
 
-#. Type: select
-#. Choices
-#: ../choose-mirror.templates:115
-msgid "MA"
-msgstr "MA (ÐœÐ°Ñ€Ð¾ÐºÐºÐ¾)"
+#~ msgid "CO"
+#~ msgstr "CO (ÐšÐ¾Ð»ÑƒÐ¼Ð±Ð¸Ñ)"
 
-#. Type: select
-#. Choices
-#: ../choose-mirror.templates:115
-msgid "NI"
-msgstr "NI (ÐÐ¸ÐºÐ°Ñ€Ð°Ð³ÑƒÐ°)"
+#~ msgid "IL"
+#~ msgstr "IL (Ð˜Ð·Ñ€Ð°Ð¸Ð»ÑŒ)"
 
-#. Type: select
-#. Choices
-#: ../choose-mirror.templates:128
-msgid "AT"
-msgstr "AT (ÐÐ²ÑÑ‚Ñ€Ð¸Ñ)"
+#~ msgid "MA"
+#~ msgstr "MA (ÐœÐ°Ñ€Ð¾ÐºÐºÐ¾)"
 
-#. Type: select
-#. Choices
-#: ../choose-mirror.templates:128
-msgid "AU"
-msgstr "AU (ÐÐ²ÑÑ‚Ñ€Ð°Ð»Ð¸Ñ)"
+#~ msgid "NI"
+#~ msgstr "NI (ÐÐ¸ÐºÐ°Ñ€Ð°Ð³ÑƒÐ°)"
 
-#. Type: select
-#. Choices
-#: ../choose-mirror.templates:128
-msgid "BE"
-msgstr "BE (Ð‘ÐµÐ»ÑŒÐ³Ð¸Ñ)"
+#~ msgid "AT"
+#~ msgstr "AT (ÐÐ²ÑÑ‚Ñ€Ð¸Ñ)"
 
-#. Type: select
-#. Choices
-#: ../choose-mirror.templates:128
-msgid "BG"
-msgstr "BG (Ð‘Ð¾Ð»Ð³Ð°Ñ€Ð¸Ñ)"
+#~ msgid "AU"
+#~ msgstr "AU (ÐÐ²ÑÑ‚Ñ€Ð°Ð»Ð¸Ñ)"
 
-#. Type: select
-#. Choices
-#: ../choose-mirror.templates:128
-msgid "BR"
-msgstr "BR (Ð‘Ñ€Ð°Ð·Ð¸Ð»Ð¸Ñ)"
+#~ msgid "BE"
+#~ msgstr "BE (Ð‘ÐµÐ»ÑŒÐ³Ð¸Ñ)"
 
-#. Type: select
-#. Choices
-#: ../choose-mirror.templates:128
-msgid "BY"
-msgstr "BY (Ð‘ÐµÐ»Ð°Ñ€ÑƒÑÑŒ)"
+#~ msgid "BG"
+#~ msgstr "BG (Ð‘Ð¾Ð»Ð³Ð°Ñ€Ð¸Ñ)"
 
-#. Type: select
-#. Choices
-#: ../choose-mirror.templates:128
-msgid "CA"
-msgstr "CA (ÐšÐ°Ð½Ð°Ð´Ð°)"
+#~ msgid "BR"
+#~ msgstr "BR (Ð‘Ñ€Ð°Ð·Ð¸Ð»Ð¸Ñ)"
 
-#. Type: select
-#. Choices
-#: ../choose-mirror.templates:128
-msgid "CH"
-msgstr "CH (Ð¨Ð²ÐµÐ¹Ñ†Ð°Ñ€Ð¸Ñ)"
+#~ msgid "BY"
+#~ msgstr "BY (Ð‘ÐµÐ»Ð°Ñ€ÑƒÑÑŒ)"
 
-#. Type: select
-#. Choices
-#: ../choose-mirror.templates:128
-msgid "CL"
-msgstr "CL (Ð§Ð¸Ð»Ð¸)"
+#~ msgid "CA"
+#~ msgstr "CA (ÐšÐ°Ð½Ð°Ð´Ð°)"
 
-#. Type: select
-#. Choices
-#: ../choose-mirror.templates:128
-msgid "CN"
-msgstr "CN (ÐšÐ¸Ñ‚Ð°Ð¹)"
+#~ msgid "CH"
+#~ msgstr "CH (Ð¨Ð²ÐµÐ¹Ñ†Ð°Ñ€Ð¸Ñ)"
 
-#. Type: select
-#. Choices
-#: ../choose-mirror.templates:128
-msgid "CR"
-msgstr "CR (ÐšÐ¾ÑÑ‚Ð°-Ð Ð¸ÐºÐ°)"
+#~ msgid "CL"
+#~ msgstr "CL (Ð§Ð¸Ð»Ð¸)"
 
-#. Type: select
-#. Choices
-#: ../choose-mirror.templates:128
-msgid "CZ"
-msgstr "CZ (Ð§ÐµÑ…Ð¸Ñ)"
+#~ msgid "CN"
+#~ msgstr "CN (ÐšÐ¸Ñ‚Ð°Ð¹)"
 
-#. Type: select
-#. Choices
-#: ../choose-mirror.templates:128
-msgid "DE"
-msgstr "DE (Ð“ÐµÑ€Ð¼Ð°Ð½Ð¸Ñ)"
+#~ msgid "CR"
+#~ msgstr "CR (ÐšÐ¾ÑÑ‚Ð°-Ð Ð¸ÐºÐ°)"
 
-#. Type: select
-#. Choices
-#: ../choose-mirror.templates:128
-msgid "DK"
-msgstr "DK (Ð”Ð°Ð½Ð¸Ñ)"
+#~ msgid "CZ"
+#~ msgstr "CZ (Ð§ÐµÑ…Ð¸Ñ)"
 
-#. Type: select
-#. Choices
-#: ../choose-mirror.templates:128
-msgid "EE"
-msgstr "EE (ÐÑÑ‚Ð¾Ð½Ð¸Ñ)"
+#~ msgid "DE"
+#~ msgstr "DE (Ð“ÐµÑ€Ð¼Ð°Ð½Ð¸Ñ)"
 
-#. Type: select
-#. Choices
-#: ../choose-mirror.templates:128
-msgid "ES"
-msgstr "ES (Ð˜ÑÐ¿Ð°Ð½Ð¸Ñ)"
+#~ msgid "DK"
+#~ msgstr "DK (Ð”Ð°Ð½Ð¸Ñ)"
 
-#. Type: select
-#. Choices
-#: ../choose-mirror.templates:128
-msgid "FI"
-msgstr "FI (Ð¤Ð¸Ð½Ð»ÑÐ½Ð´Ð¸Ñ)"
+#~ msgid "EE"
+#~ msgstr "EE (ÐÑÑ‚Ð¾Ð½Ð¸Ñ)"
 
-#. Type: select
-#. Choices
-#: ../choose-mirror.templates:128
-msgid "FR"
-msgstr "FR (Ð¤Ñ€Ð°Ð½Ñ†Ð¸Ñ)"
+#~ msgid "ES"
+#~ msgstr "ES (Ð˜ÑÐ¿Ð°Ð½Ð¸Ñ)"
 
-#. Type: select
-#. Choices
-#: ../choose-mirror.templates:128
-msgid "GB"
-msgstr "GB (Ð’ÐµÐ»Ð¸ÐºÐ¾Ð±Ñ€Ð¸Ñ‚Ð°Ð½Ð¸Ñ)"
+#~ msgid "FI"
+#~ msgstr "FI (Ð¤Ð¸Ð½Ð»ÑÐ½Ð´Ð¸Ñ)"
 
-#. Type: select
-#. Choices
-#: ../choose-mirror.templates:128
-msgid "GR"
-msgstr "GR (Ð“Ñ€ÐµÑ†Ð¸Ñ)"
+#~ msgid "FR"
+#~ msgstr "FR (Ð¤Ñ€Ð°Ð½Ñ†Ð¸Ñ)"
 
-#. Type: select
-#. Choices
-#: ../choose-mirror.templates:128
-msgid "HK"
-msgstr "HK (Ð“Ð¾Ð½ÐºÐ¾Ð½Ð³)"
+#~ msgid "GB"
+#~ msgstr "GB (Ð’ÐµÐ»Ð¸ÐºÐ¾Ð±Ñ€Ð¸Ñ‚Ð°Ð½Ð¸Ñ)"
 
-#. Type: select
-#. Choices
-#: ../choose-mirror.templates:128
-msgid "HR"
-msgstr "HR (Ð¥Ð¾Ñ€Ð²Ð°Ñ‚Ð¸Ñ)"
+#~ msgid "GR"
+#~ msgstr "GR (Ð“Ñ€ÐµÑ†Ð¸Ñ)"
 
-#. Type: select
-#. Choices
-#: ../choose-mirror.templates:128
-msgid "HU"
-msgstr "HU (Ð’ÐµÐ½Ð³Ñ€Ð¸Ñ)"
+#~ msgid "HK"
+#~ msgstr "HK (Ð“Ð¾Ð½ÐºÐ¾Ð½Ð³)"
 
-#. Type: select
-#. Choices
-#: ../choose-mirror.templates:128
-msgid "ID"
-msgstr "ID (Ð˜Ð½Ð´Ð¾Ð½ÐµÐ·Ð¸Ñ)"
+#~ msgid "HR"
+#~ msgstr "HR (Ð¥Ð¾Ñ€Ð²Ð°Ñ‚Ð¸Ñ)"
 
-#. Type: select
-#. Choices
-#: ../choose-mirror.templates:128
-msgid "IE"
-msgstr "IE (Ð˜Ñ€Ð»Ð°Ð½Ð´Ð¸Ñ)"
+#~ msgid "HU"
+#~ msgstr "HU (Ð’ÐµÐ½Ð³Ñ€Ð¸Ñ)"
 
-#. Type: select
-#. Choices
-#: ../choose-mirror.templates:128
-msgid "IN"
-msgstr "IN (Ð˜Ð½Ð´Ð¸Ñ)"
+#~ msgid "ID"
+#~ msgstr "ID (Ð˜Ð½Ð´Ð¾Ð½ÐµÐ·Ð¸Ñ)"
 
-#. Type: select
-#. Choices
-#: ../choose-mirror.templates:128
-msgid "IS"
-msgstr "IS (Ð˜ÑÐ»Ð°Ð½Ð´Ð¸Ñ)"
+#~ msgid "IE"
+#~ msgstr "IE (Ð˜Ñ€Ð»Ð°Ð½Ð´Ð¸Ñ)"
 
-#. Type: select
-#. Choices
-#: ../choose-mirror.templates:128
-msgid "IT"
-msgstr "IT (Ð˜Ñ‚Ð°Ð»Ð¸Ñ)"
+#~ msgid "IN"
+#~ msgstr "IN (Ð˜Ð½Ð´Ð¸Ñ)"
 
-#. Type: select
-#. Choices
-#: ../choose-mirror.templates:128
-msgid "JP"
-msgstr "JP (Ð¯Ð¿Ð¾Ð½Ð¸Ñ)"
+#~ msgid "IS"
+#~ msgstr "IS (Ð˜ÑÐ»Ð°Ð½Ð´Ð¸Ñ)"
 
-#. Type: select
-#. Choices
-#: ../choose-mirror.templates:128
-msgid "KR"
-msgstr "KR (Ð®Ð¶Ð½Ð°Ñ ÐšÐ¾Ñ€ÐµÑ)"
+#~ msgid "IT"
+#~ msgstr "IT (Ð˜Ñ‚Ð°Ð»Ð¸Ñ)"
 
-#. Type: select
-#. Choices
-#: ../choose-mirror.templates:128
-msgid "LT"
-msgstr "LT (Ð›Ð¸Ñ‚Ð²Ð°)"
+#~ msgid "JP"
+#~ msgstr "JP (Ð¯Ð¿Ð¾Ð½Ð¸Ñ)"
 
-#. Type: select
-#. Choices
-#: ../choose-mirror.templates:128
-msgid "LU"
-msgstr "LU (Ð›ÑŽÐºÑÐµÐ¼Ð±ÑƒÑ€Ð³)"
+#~ msgid "KR"
+#~ msgstr "KR (Ð®Ð¶Ð½Ð°Ñ ÐšÐ¾Ñ€ÐµÑ)"
 
-#. Type: select
-#. Choices
-#: ../choose-mirror.templates:128
-msgid "LV"
-msgstr "LV (Ð›Ð°Ñ‚Ð²Ð¸Ñ)"
+#~ msgid "LT"
+#~ msgstr "LT (Ð›Ð¸Ñ‚Ð²Ð°)"
 
-#. Type: select
-#. Choices
-#: ../choose-mirror.templates:128
-msgid "MX"
-msgstr "MX (ÐœÐµÐºÑÐ¸ÐºÐ°)"
+#~ msgid "LU"
+#~ msgstr "LU (Ð›ÑŽÐºÑÐµÐ¼Ð±ÑƒÑ€Ð³)"
 
-#. Type: select
-#. Choices
-#: ../choose-mirror.templates:128
-msgid "NL"
-msgstr "NL (ÐÐ¸Ð´ÐµÑ€Ð»Ð°Ð½Ð´Ñ‹)"
+#~ msgid "LV"
+#~ msgstr "LV (Ð›Ð°Ñ‚Ð²Ð¸Ñ)"
 
-#. Type: select
-#. Choices
-#: ../choose-mirror.templates:128
-msgid "NO"
-msgstr "NO (ÐÐ¾Ñ€Ð²ÐµÐ³Ð¸Ñ)"
+#~ msgid "MX"
+#~ msgstr "MX (ÐœÐµÐºÑÐ¸ÐºÐ°)"
 
-#. Type: select
-#. Choices
-#: ../choose-mirror.templates:128
-msgid "NZ"
-msgstr "NZ (ÐÐ¾Ð²Ð°Ñ Ð—ÐµÐ»Ð°Ð½Ð´Ð¸Ñ)"
+#~ msgid "NL"
+#~ msgstr "NL (ÐÐ¸Ð´ÐµÑ€Ð»Ð°Ð½Ð´Ñ‹)"
 
-#. Type: select
-#. Choices
-#: ../choose-mirror.templates:128
-msgid "PL"
-msgstr "PL (ÐŸÐ¾Ð»ÑŒÑˆÐ°)"
+#~ msgid "NO"
+#~ msgstr "NO (ÐÐ¾Ñ€Ð²ÐµÐ³Ð¸Ñ)"
 
-#. Type: select
-#. Choices
-#: ../choose-mirror.templates:128
-msgid "PT"
-msgstr "PT (ÐŸÐ¾Ñ€Ñ‚ÑƒÐ³Ð°Ð»Ð¸Ñ)"
+#~ msgid "NZ"
+#~ msgstr "NZ (ÐÐ¾Ð²Ð°Ñ Ð—ÐµÐ»Ð°Ð½Ð´Ð¸Ñ)"
 
-#. Type: select
-#. Choices
-#: ../choose-mirror.templates:128
-msgid "RO"
-msgstr "RO (Ð ÑƒÐ¼Ñ‹Ð½Ð¸Ñ)"
+#~ msgid "PL"
+#~ msgstr "PL (ÐŸÐ¾Ð»ÑŒÑˆÐ°)"
 
-#. Type: select
-#. Choices
-#: ../choose-mirror.templates:128
-msgid "RU"
-msgstr "RU (Ð Ð¾ÑÑÐ¸Ñ)"
+#~ msgid "PT"
+#~ msgstr "PT (ÐŸÐ¾Ñ€Ñ‚ÑƒÐ³Ð°Ð»Ð¸Ñ)"
 
-#. Type: select
-#. Choices
-#: ../choose-mirror.templates:128
-msgid "SE"
-msgstr "SE (Ð¨Ð²ÐµÑ†Ð¸Ñ)"
+#~ msgid "RO"
+#~ msgstr "RO (Ð ÑƒÐ¼Ñ‹Ð½Ð¸Ñ)"
 
-#. Type: select
-#. Choices
-#: ../choose-mirror.templates:128
-msgid "SG"
-msgstr "SG (Ð¡Ð¸Ð½Ð³Ð°Ð¿ÑƒÑ€)"
+#~ msgid "RU"
+#~ msgstr "RU (Ð Ð¾ÑÑÐ¸Ñ)"
 
-#. Type: select
-#. Choices
-#: ../choose-mirror.templates:128
-msgid "SI"
-msgstr "SI (Ð¡Ð»Ð¾Ð²ÐµÐ½Ð¸Ñ)"
+#~ msgid "SE"
+#~ msgstr "SE (Ð¨Ð²ÐµÑ†Ð¸Ñ)"
 
-#. Type: select
-#. Choices
-#: ../choose-mirror.templates:128
-msgid "SK"
-msgstr "SK (Ð¡Ð»Ð¾Ð²Ð°ÐºÐ¸Ñ)"
+#~ msgid "SG"
+#~ msgstr "SG (Ð¡Ð¸Ð½Ð³Ð°Ð¿ÑƒÑ€)"
 
-#. Type: select
-#. Choices
-#: ../choose-mirror.templates:128
-msgid "TH"
-msgstr "TH (Ð¢Ð°Ð¸Ð»Ð°Ð½Ð´)"
+#~ msgid "SI"
+#~ msgstr "SI (Ð¡Ð»Ð¾Ð²ÐµÐ½Ð¸Ñ)"
 
-#. Type: select
-#. Choices
-#: ../choose-mirror.templates:128
-msgid "TR"
-msgstr "TR (Ð¢ÑƒÑ€Ñ†Ð¸Ñ)"
+#~ msgid "SK"
+#~ msgstr "SK (Ð¡Ð»Ð¾Ð²Ð°ÐºÐ¸Ñ)"
 
-#. Type: select
-#. Choices
-#: ../choose-mirror.templates:128
-msgid "TW"
-msgstr "TW (Ð¢Ð°Ð¹Ð²Ð°Ð½ÑŒ)"
+#~ msgid "TH"
+#~ msgstr "TH (Ð¢Ð°Ð¸Ð»Ð°Ð½Ð´)"
 
-#. Type: select
-#. Choices
-#: ../choose-mirror.templates:128
-msgid "UA"
-msgstr "UA (Ð£ÐºÑ€Ð°Ð¸Ð½Ð°)"
+#~ msgid "TR"
+#~ msgstr "TR (Ð¢ÑƒÑ€Ñ†Ð¸Ñ)"
 
-#. Type: select
-#. Choices
-#: ../choose-mirror.templates:128
-msgid "US"
-msgstr "US (Ð¡Ð¨Ð)"
+#~ msgid "TW"
+#~ msgstr "TW (Ð¢Ð°Ð¹Ð²Ð°Ð½ÑŒ)"
 
-#. Type: select
-#. Choices
-#: ../choose-mirror.templates:128
-msgid "ZA"
-msgstr "ZA (Ð®ÐÐ )"
+#~ msgid "UA"
+#~ msgstr "UA (Ð£ÐºÑ€Ð°Ð¸Ð½Ð°)"
 
-#. Type: select
-#. Choices
-#: ../templates:3
-msgid "Retry, Change mirror, Cancel"
-msgstr "ÐŸÐ¾Ð²Ñ‚Ð¾Ñ€Ð¸Ñ‚ÑŒ, Ð¡Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ Ð·ÐµÑ€ÐºÐ°Ð»Ð¾, ÐžÑ‚Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ"
+#~ msgid "US"
+#~ msgstr "US (Ð¡Ð¨Ð)"
 
-#. Type: boolean
-#. Description
-#: ../templates:4
-msgid "Failed to copy file from CDROM. Retry?"
-msgstr "ÐÐµ ÑƒÐ´Ð°Ñ‘Ñ‚ÑÑ ÑÐºÐ¾Ð¿Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ñ„Ð°Ð¹Ð» Ñ ÐºÐ¾Ð¼Ð¿Ð°ÐºÑ‚-Ð´Ð¸ÑÐºÐ°. ÐŸÐ¾Ð²Ñ‚Ð¾Ñ€Ð¸Ñ‚ÑŒ Ð¿Ð¾Ð¿Ñ‹Ñ‚ÐºÑƒ?"
+#~ msgid "ZA"
+#~ msgstr "ZA (Ð®ÐÐ )"
 
-#. Type: boolean
-#. Description
-#: ../templates:4
-msgid ""
-"There was a problem reading data from the CDROM. Please make sure it is in "
-"the drive. If retrying does not work, you should check the integrity of your "
-"CDROM."
-msgstr ""
-"ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ ÑÑ‡Ð¸Ñ‚Ð°Ñ‚ÑŒ Ð´Ð°Ð½Ð½Ñ‹Ðµ Ñ ÐºÐ¾Ð¼Ð¿Ð°ÐºÑ‚-Ð´Ð¸ÑÐºÐ°. Ð£Ð±ÐµÐ´Ð¸Ñ‚ÐµÑÑŒ, Ñ‡Ñ‚Ð¾ Ð´Ð¸ÑÐº Ð²ÑÑ‚Ð°Ð²Ð»ÐµÐ½ Ð² "
-"Ð¿Ñ€Ð¸Ð²Ð¾Ð´ CD-ROM. Ð•ÑÐ»Ð¸ Ð´Ð°Ð»ÑŒÐ½ÐµÐ¹ÑˆÐ¸Ðµ Ð¿Ð¾Ð¿Ñ‹Ñ‚ÐºÐ¸ Ð½Ð¸ Ðº Ñ‡ÐµÐ¼Ñƒ Ð½Ðµ Ð¿Ñ€Ð¸Ð²ÐµÐ´ÑƒÑ‚, Ð²Ð°Ð¼ ÑÐ»ÐµÐ´ÑƒÐµÑ‚ "
-"Ð¿Ñ€Ð¾Ð²ÐµÑ€Ð¸Ñ‚ÑŒ Ñ†ÐµÐ»Ð¾ÑÑ‚Ð½Ð¾ÑÑ‚ÑŒ Ð´Ð°Ð½Ð½Ñ‹Ñ… Ð½Ð° ÐºÐ¾Ð¼Ð¿Ð°ÐºÑ‚-Ð´Ð¸ÑÐºÐµ."
+#~ msgid "Retry, Change mirror, Cancel"
+#~ msgstr "ÐŸÐ¾Ð²Ñ‚Ð¾Ñ€Ð¸Ñ‚ÑŒ, Ð¡Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ Ð·ÐµÑ€ÐºÐ°Ð»Ð¾, ÐžÑ‚Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ"
 
-#. Type: boolean
-#. Description
-#: ../partman.templates:98
-msgid "If you continue, the changes listed below will be written to the disks."
-msgstr "Ð•ÑÐ»Ð¸ Ð²Ñ‹ Ð¿Ñ€Ð¾Ð´Ð¾Ð»Ð¶Ð¸Ñ‚Ðµ, Ñ‚Ð¾ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ñ‚Ð°Ð±Ð»Ð¸Ñ†Ñ‹ Ñ€Ð°Ð·Ð´ÐµÐ»Ð¾Ð² Ð±ÑƒÐ´ÑƒÑ‚ Ð·Ð°Ð¿Ð¸ÑÐ°Ð½Ñ‹ Ð½Ð° Ð´Ð¸ÑÐº."
+#~ msgid "Failed to copy file from CDROM. Retry?"
+#~ msgstr "ÐÐµ ÑƒÐ´Ð°Ñ‘Ñ‚ÑÑ ÑÐºÐ¾Ð¿Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ñ„Ð°Ð¹Ð» Ñ ÐºÐ¾Ð¼Ð¿Ð°ÐºÑ‚-Ð´Ð¸ÑÐºÐ°. ÐŸÐ¾Ð²Ñ‚Ð¾Ñ€Ð¸Ñ‚ÑŒ Ð¿Ð¾Ð¿Ñ‹Ñ‚ÐºÑƒ?"
 
-#. Type: multiselect
-#. Description
-#: ../partman-basicfilesystems.templates:210 ../templates:42
-msgid "Mount options can tune the behaviour of the file system."
-msgstr "ÐŸÐ°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ñ‹ Ð¼Ð¾Ð½Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¿Ð¾Ð·Ð²Ð¾Ð»ÑÑŽÑ‚ Ð¿Ð¾Ð´ÑÑ‚Ñ€Ð¾Ð¸Ñ‚ÑŒ Ð¿Ð¾Ð²ÐµÐ´ÐµÐ½Ð¸Ðµ Ñ„Ð°Ð¹Ð»Ð¾Ð²Ð¾Ð¹ ÑÐ¸ÑÑ‚ÐµÐ¼Ñ‹."
+#~ msgid ""
+#~ "There was a problem reading data from the CDROM. Please make sure it is "
+#~ "in the drive. If retrying does not work, you should check the integrity "
+#~ "of your CDROM."
+#~ msgstr ""
+#~ "ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ ÑÑ‡Ð¸Ñ‚Ð°Ñ‚ÑŒ Ð´Ð°Ð½Ð½Ñ‹Ðµ Ñ ÐºÐ¾Ð¼Ð¿Ð°ÐºÑ‚-Ð´Ð¸ÑÐºÐ°. Ð£Ð±ÐµÐ´Ð¸Ñ‚ÐµÑÑŒ, Ñ‡Ñ‚Ð¾ Ð´Ð¸ÑÐº Ð²ÑÑ‚Ð°Ð²Ð»ÐµÐ½ Ð² "
+#~ "Ð¿Ñ€Ð¸Ð²Ð¾Ð´ CD-ROM. Ð•ÑÐ»Ð¸ Ð´Ð°Ð»ÑŒÐ½ÐµÐ¹ÑˆÐ¸Ðµ Ð¿Ð¾Ð¿Ñ‹Ñ‚ÐºÐ¸ Ð½Ð¸ Ðº Ñ‡ÐµÐ¼Ñƒ Ð½Ðµ Ð¿Ñ€Ð¸Ð²ÐµÐ´ÑƒÑ‚, Ð²Ð°Ð¼ ÑÐ»ÐµÐ´ÑƒÐµÑ‚ "
+#~ "Ð¿Ñ€Ð¾Ð²ÐµÑ€Ð¸Ñ‚ÑŒ Ñ†ÐµÐ»Ð¾ÑÑ‚Ð½Ð¾ÑÑ‚ÑŒ Ð´Ð°Ð½Ð½Ñ‹Ñ… Ð½Ð° ÐºÐ¾Ð¼Ð¿Ð°ÐºÑ‚-Ð´Ð¸ÑÐºÐµ."
 
-#. Type: select
-#. Description
-#: ../anna.templates:4
-msgid "Retriever to use:"
-msgstr "Ð˜ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ retriever Ð´Ð»Ñ:"
+#~ msgid ""
+#~ "If you continue, the changes listed below will be written to the disks."
+#~ msgstr ""
+#~ "Ð•ÑÐ»Ð¸ Ð²Ñ‹ Ð¿Ñ€Ð¾Ð´Ð¾Ð»Ð¶Ð¸Ñ‚Ðµ, Ñ‚Ð¾ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ñ‚Ð°Ð±Ð»Ð¸Ñ†Ñ‹ Ñ€Ð°Ð·Ð´ÐµÐ»Ð¾Ð² Ð±ÑƒÐ´ÑƒÑ‚ Ð·Ð°Ð¿Ð¸ÑÐ°Ð½Ñ‹ Ð½Ð° Ð´Ð¸ÑÐº."
 
-#. Type: select
-#. Description
-#: ../anna.templates:4
-msgid "The retriever is responsible for fetching installer components to be loaded."
-msgstr ""
-"Retriever Ð¾Ñ‚Ð²ÐµÑ‡Ð°ÐµÑ‚ Ð·Ð° Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ðµ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ñ‹ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸, ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ðµ Ð±ÑƒÐ´ÑƒÑ‚ "
-"Ð·Ð°Ð³Ñ€ÑƒÐ¶ÐµÐ½Ñ‹."
+#~ msgid "Mount options can tune the behaviour of the file system."
+#~ msgstr ""
+#~ "ÐŸÐ°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ñ‹ Ð¼Ð¾Ð½Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¿Ð¾Ð·Ð²Ð¾Ð»ÑÑŽÑ‚ Ð¿Ð¾Ð´ÑÑ‚Ñ€Ð¾Ð¸Ñ‚ÑŒ Ð¿Ð¾Ð²ÐµÐ´ÐµÐ½Ð¸Ðµ Ñ„Ð°Ð¹Ð»Ð¾Ð²Ð¾Ð¹ ÑÐ¸ÑÑ‚ÐµÐ¼Ñ‹."
 
-#. Type: multiselect
-#. Description
-#: ../anna.templates:11
-msgid ""
-"Most things you will need will be loaded automatically. The listed installer "
-"components all have low priority and are probably not necessary, but may be "
-"interesting to some users."
-msgstr ""
-"Ð‘Ð¾Ð»ÑŒÑˆÐ¸Ð½ÑÑ‚Ð²Ð¾ Ð½ÑƒÐ¶Ð½Ñ‹Ñ… Ð²Ð°Ð¼ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ð¾Ð² Ð±ÑƒÐ´ÑƒÑ‚ Ð·Ð°Ð³Ñ€ÑƒÐ¶ÐµÐ½Ñ‹ Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡ÐµÑÐºÐ¸. "
-"ÐŸÐµÑ€ÐµÑ‡Ð¸ÑÐ»ÐµÐ½Ð½Ñ‹Ðµ Ð·Ð´ÐµÑÑŒ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ñ‹ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ñ‹ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸ Ð¸Ð¼ÐµÑŽÑ‚ Ð½Ð¸Ð·ÐºÐ¸Ð¹ Ð¿Ñ€Ð¸Ð¾Ñ€Ð¸Ñ‚ÐµÑ‚ Ð¸, "
-"Ð²ÐµÑ€Ð¾ÑÑ‚Ð½ÐµÐµ Ð²ÑÐµÐ³Ð¾, Ð² Ð½Ð¸Ñ… Ð½ÐµÑ‚ Ð½ÐµÐ¾Ð±Ñ…Ð¾Ð´Ð¸Ð¼Ð¾ÑÑ‚Ð¸, Ð½Ð¾ Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ð¼ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑÐ¼ Ð¾Ð½Ð¸ "
-"Ð¼Ð¾Ð³ÑƒÑ‚ Ð¿Ð¾Ð½Ð°Ð´Ð¾Ð±Ð¸Ñ‚ÑŒÑÑ."
+#~ msgid "Retriever to use:"
+#~ msgstr "Ð˜ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ retriever Ð´Ð»Ñ:"
 
-#. Type: multiselect
-#. Description
-#: ../anna.templates:22
-msgid ""
-"To save memory, not all of the installer modules will be loaded by default. "
-"The listed installer components are not all necessary for a basic install, "
-"but you may need some of them, especially certain kernel modules, so look "
-"through the list carefully and select the components you need."
-msgstr ""
-"Ð¡ Ñ†ÐµÐ»ÑŒÑŽ ÑÐºÐ¾Ð½Ð¾Ð¼Ð¸Ð¸ Ð¾Ð¿ÐµÑ€Ð°Ñ‚Ð¸Ð²Ð½Ð¾Ð¹ Ð¿Ð°Ð¼ÑÑ‚Ð¸, Ð½Ðµ Ð²ÑÐµ Ð¼Ð¾Ð´ÑƒÐ»Ð¸ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ñ‹ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸ "
-"Ð·Ð°Ð³Ñ€ÑƒÐ¶Ð°ÑŽÑ‚ÑÑ Ð¿Ð¾ ÑƒÐ¼Ð¾Ð»Ñ‡Ð°Ð½Ð¸ÑŽ. Ð”Ð°Ð½Ð½Ñ‹Ðµ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ñ‹ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ñ‹ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸ Ð² "
-"Ð±Ð¾Ð»ÑŒÑˆÐ¸Ð½ÑÑ‚Ð²Ðµ ÑÐ»ÑƒÑ‡Ð°ÐµÐ² Ð½Ðµ Ñ‚Ñ€ÐµÐ±ÑƒÑŽÑ‚ÑÑ, Ð½Ð¾ Ð²Ð°Ð¼ Ð¼Ð¾Ð³ÑƒÑ‚ Ð¿Ð¾Ð½Ð°Ð´Ð¾Ð±Ð¸Ñ‚ÑŒÑÑ Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ðµ Ð¸Ð· "
-"Ð½Ð¸Ñ…, Ð¾ÑÐ¾Ð±ÐµÐ½Ð½Ð¾ Ð¼Ð¾Ð´ÑƒÐ»Ð¸ ÑÐ´Ñ€Ð°, Ð¿Ð¾ÑÑ‚Ð¾Ð¼Ñƒ Ð¿Ñ€Ð¾ÑÐ¼Ð¾Ñ‚Ñ€Ð¸Ñ‚Ðµ ÑÐ¿Ð¸ÑÐ¾Ðº Ð¸ Ð²Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ Ð½ÑƒÐ¶Ð½Ñ‹Ðµ Ð²Ð°Ð¼ "
-"ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ñ‹."
+#~ msgid ""
+#~ "The retriever is responsible for fetching installer components to be "
+#~ "loaded."
+#~ msgstr ""
+#~ "Retriever Ð¾Ñ‚Ð²ÐµÑ‡Ð°ÐµÑ‚ Ð·Ð° Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ðµ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ñ‹ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸, ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ðµ "
+#~ "Ð±ÑƒÐ´ÑƒÑ‚ Ð·Ð°Ð³Ñ€ÑƒÐ¶ÐµÐ½Ñ‹."
 
-#. Type: text
-#. Description
-#. (Progress bar) title displayed when loading udebs
-#: ../anna.templates:34
-msgid "Loading components of the Debian installer"
-msgstr "Ð—Ð°Ð³Ñ€ÑƒÐ·ÐºÐ° ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ð¾Ð² Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ñ‹ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸ Debian"
+#~ msgid ""
+#~ "Most things you will need will be loaded automatically. The listed "
+#~ "installer components all have low priority and are probably not "
+#~ "necessary, but may be interesting to some users."
+#~ msgstr ""
+#~ "Ð‘Ð¾Ð»ÑŒÑˆÐ¸Ð½ÑÑ‚Ð²Ð¾ Ð½ÑƒÐ¶Ð½Ñ‹Ñ… Ð²Ð°Ð¼ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ð¾Ð² Ð±ÑƒÐ´ÑƒÑ‚ Ð·Ð°Ð³Ñ€ÑƒÐ¶ÐµÐ½Ñ‹ Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡ÐµÑÐºÐ¸. "
+#~ "ÐŸÐµÑ€ÐµÑ‡Ð¸ÑÐ»ÐµÐ½Ð½Ñ‹Ðµ Ð·Ð´ÐµÑÑŒ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ñ‹ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ñ‹ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸ Ð¸Ð¼ÐµÑŽÑ‚ Ð½Ð¸Ð·ÐºÐ¸Ð¹ Ð¿Ñ€Ð¸Ð¾Ñ€Ð¸Ñ‚ÐµÑ‚ "
+#~ "Ð¸, Ð²ÐµÑ€Ð¾ÑÑ‚Ð½ÐµÐµ Ð²ÑÐµÐ³Ð¾, Ð² Ð½Ð¸Ñ… Ð½ÐµÑ‚ Ð½ÐµÐ¾Ð±Ñ…Ð¾Ð´Ð¸Ð¼Ð¾ÑÑ‚Ð¸, Ð½Ð¾ Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ð¼ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑÐ¼ "
+#~ "Ð¾Ð½Ð¸ Ð¼Ð¾Ð³ÑƒÑ‚ Ð¿Ð¾Ð½Ð°Ð´Ð¾Ð±Ð¸Ñ‚ÑŒÑÑ."
 
-#. Type: text
-#. Description
-#. Main menu item
-#: ../load-installer.templates:4
-msgid "Load installer components"
-msgstr "Ð—Ð°Ð³Ñ€ÑƒÐ·ÐºÐ° ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ð¾Ð² Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ñ‹ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸"
+#~ msgid ""
+#~ "To save memory, not all of the installer modules will be loaded by "
+#~ "default. The listed installer components are not all necessary for a "
+#~ "basic install, but you may need some of them, especially certain kernel "
+#~ "modules, so look through the list carefully and select the components you "
+#~ "need."
+#~ msgstr ""
+#~ "Ð¡ Ñ†ÐµÐ»ÑŒÑŽ ÑÐºÐ¾Ð½Ð¾Ð¼Ð¸Ð¸ Ð¾Ð¿ÐµÑ€Ð°Ñ‚Ð¸Ð²Ð½Ð¾Ð¹ Ð¿Ð°Ð¼ÑÑ‚Ð¸, Ð½Ðµ Ð²ÑÐµ Ð¼Ð¾Ð´ÑƒÐ»Ð¸ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ñ‹ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸ "
+#~ "Ð·Ð°Ð³Ñ€ÑƒÐ¶Ð°ÑŽÑ‚ÑÑ Ð¿Ð¾ ÑƒÐ¼Ð¾Ð»Ñ‡Ð°Ð½Ð¸ÑŽ. Ð”Ð°Ð½Ð½Ñ‹Ðµ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ñ‹ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ñ‹ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸ Ð² "
+#~ "Ð±Ð¾Ð»ÑŒÑˆÐ¸Ð½ÑÑ‚Ð²Ðµ ÑÐ»ÑƒÑ‡Ð°ÐµÐ² Ð½Ðµ Ñ‚Ñ€ÐµÐ±ÑƒÑŽÑ‚ÑÑ, Ð½Ð¾ Ð²Ð°Ð¼ Ð¼Ð¾Ð³ÑƒÑ‚ Ð¿Ð¾Ð½Ð°Ð´Ð¾Ð±Ð¸Ñ‚ÑŒÑÑ Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ðµ Ð¸Ð· "
+#~ "Ð½Ð¸Ñ…, Ð¾ÑÐ¾Ð±ÐµÐ½Ð½Ð¾ Ð¼Ð¾Ð´ÑƒÐ»Ð¸ ÑÐ´Ñ€Ð°, Ð¿Ð¾ÑÑ‚Ð¾Ð¼Ñƒ Ð¿Ñ€Ð¾ÑÐ¼Ð¾Ñ‚Ñ€Ð¸Ñ‚Ðµ ÑÐ¿Ð¸ÑÐ¾Ðº Ð¸ Ð²Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ Ð½ÑƒÐ¶Ð½Ñ‹Ðµ "
+#~ "Ð²Ð°Ð¼ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ñ‹."
 
-#. Type: boolean
-#. Description
-#: ../base-installer.templates:4
-msgid ""
-"The target file system contains files from a past installation. These files "
-"could break the installation process or cause a broken system to be "
-"installed."
-msgstr ""
-"Ð¦ÐµÐ»ÐµÐ²Ð°Ñ Ñ„Ð°Ð¹Ð»Ð¾Ð²Ð°Ñ ÑÐ¸ÑÑ‚ÐµÐ¼Ð° ÑÐ¾Ð´ÐµÑ€Ð¶Ð¸Ñ‚ Ñ„Ð°Ð¹Ð»Ñ‹ Ð¾Ñ‚ Ð¿Ñ€ÐµÐ´Ñ‹Ð´ÑƒÑ‰ÐµÐ¹ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸. ÐÑ‚Ð¸ Ñ„Ð°Ð¹Ð»Ñ‹ "
-"Ð¼Ð¾Ð³ÑƒÑ‚ Ð¿Ð¾Ð¼ÐµÑˆÐ°Ñ‚ÑŒ Ð¿Ñ€Ð¾Ñ†ÐµÑÑÑƒ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸ Ð¸Ð»Ð¸ Ð¿Ñ€Ð¸Ð²ÐµÑÑ‚Ð¸ Ðº Ñ‚Ð¾Ð¼Ñƒ, Ñ‡Ñ‚Ð¾ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ð°Ñ "
-"ÑÐ¸ÑÑ‚ÐµÐ¼Ð° Ð¾ÐºÐ°Ð¶ÐµÑ‚ÑÑ Ð½ÐµÑ€Ð°Ð±Ð¾Ñ‚Ð¾ÑÐ¿Ð¾ÑÐ¾Ð±Ð½Ð¾Ð¹."
+#~ msgid "Loading components of the Debian installer"
+#~ msgstr "Ð—Ð°Ð³Ñ€ÑƒÐ·ÐºÐ° ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ð¾Ð² Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ñ‹ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸ Debian"
 
-#. Type: error
-#. Description
-#: ../base-installer.templates:11
-msgid "Cannot install Debian"
-msgstr "ÐÐµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ Debian"
+#~ msgid "Load installer components"
+#~ msgstr "Ð—Ð°Ð³Ñ€ÑƒÐ·ÐºÐ° ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ð¾Ð² Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ñ‹ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸"
 
-#. Type: error
-#. Description
-#: ../base-installer.templates:11
-msgid ""
-"The installer cannot figure out how to install Debian. No installable CD-ROM "
-"was found and no valid mirror was configured."
-msgstr ""
-"ÐŸÑ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð° ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸ Ð½Ðµ ÑÐ¼Ð¾Ð³Ð»Ð° Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»Ð¸Ñ‚ÑŒ ÐºÐ°Ðº ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ Debian. ÐÐµ Ð±Ñ‹Ð»Ð¾ "
-"Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¾Ñ‡Ð½Ñ‹Ñ… Ð´Ð¸ÑÐºÐ¾Ð² CD-ROM Ð¸ Ð½Ðµ Ð±Ñ‹Ð»Ð¾ Ð½Ð°ÑÑ‚Ñ€Ð¾ÐµÐ½Ð¾ Ñ€Ð°Ð±Ð¾Ñ‡Ð¸Ñ… ÑÐµÑ€Ð²ÐµÑ€Ð¾Ð²-"
-"Ð·ÐµÑ€ÐºÐ°Ð»."
+#~ msgid ""
+#~ "The target file system contains files from a past installation. These "
+#~ "files could break the installation process or cause a broken system to be "
+#~ "installed."
+#~ msgstr ""
+#~ "Ð¦ÐµÐ»ÐµÐ²Ð°Ñ Ñ„Ð°Ð¹Ð»Ð¾Ð²Ð°Ñ ÑÐ¸ÑÑ‚ÐµÐ¼Ð° ÑÐ¾Ð´ÐµÑ€Ð¶Ð¸Ñ‚ Ñ„Ð°Ð¹Ð»Ñ‹ Ð¾Ñ‚ Ð¿Ñ€ÐµÐ´Ñ‹Ð´ÑƒÑ‰ÐµÐ¹ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸. ÐÑ‚Ð¸ "
+#~ "Ñ„Ð°Ð¹Ð»Ñ‹ Ð¼Ð¾Ð³ÑƒÑ‚ Ð¿Ð¾Ð¼ÐµÑˆÐ°Ñ‚ÑŒ Ð¿Ñ€Ð¾Ñ†ÐµÑÑÑƒ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸ Ð¸Ð»Ð¸ Ð¿Ñ€Ð¸Ð²ÐµÑÑ‚Ð¸ Ðº Ñ‚Ð¾Ð¼Ñƒ, Ñ‡Ñ‚Ð¾ "
+#~ "ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ð°Ñ ÑÐ¸ÑÑ‚ÐµÐ¼Ð° Ð¾ÐºÐ°Ð¶ÐµÑ‚ÑÑ Ð½ÐµÑ€Ð°Ð±Ð¾Ñ‚Ð¾ÑÐ¿Ð¾ÑÐ¾Ð±Ð½Ð¾Ð¹."
 
-#. Type: error
-#. Description
-#: ../base-installer.templates:23
-msgid ""
-"The installation to the target file system has been canceled, as the target "
-"file system contains files from a past installation, which could break the "
-"installation process or cause a broken system to be installed. You should go "
-"back and erase or format the target file system before proceeding with the "
-"install."
-msgstr ""
-"Ð£ÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ° Ð² Ñ†ÐµÐ»ÐµÐ²ÑƒÑŽ Ñ„Ð°Ð¹Ð»Ð¾Ð²ÑƒÑŽ ÑÐ¸ÑÑ‚ÐµÐ¼Ñƒ Ð±Ñ‹Ð»Ð° Ð¾Ñ‚Ð¼ÐµÐ½ÐµÐ½Ð°, Ñ‚Ð°Ðº ÐºÐ°Ðº Ð¾Ð½Ð° ÑÐ¾Ð´ÐµÑ€Ð¶Ð¸Ñ‚ "
-"Ñ„Ð°Ð¹Ð»Ñ‹ Ð¾Ñ‚ Ð¿Ñ€ÐµÐ´Ñ‹Ð´ÑƒÑ‰ÐµÐ¹ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸, Ñ‡Ñ‚Ð¾ Ð¼Ð¾Ð¶ÐµÑ‚ Ð¿Ð¾Ð¼ÐµÑˆÐ°Ñ‚ÑŒ Ð¿Ñ€Ð¾Ñ†ÐµÑÑÑƒ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸ Ð¸Ð»Ð¸ "
-"Ð¿Ñ€Ð¸Ð²ÐµÑÑ‚Ð¸ Ðº Ñ‚Ð¾Ð¼Ñƒ, Ñ‡Ñ‚Ð¾ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ð°Ñ ÑÐ¸ÑÑ‚ÐµÐ¼Ð° Ð¾ÐºÐ°Ð¶ÐµÑ‚ÑÑ Ð½ÐµÑ€Ð°Ð±Ð¾Ñ‚Ð¾ÑÐ¿Ð¾ÑÐ¾Ð±Ð½Ð¾Ð¹. Ð’Ñ‹ "
-"Ð´Ð¾Ð»Ð¶Ð½Ñ‹ Ð²ÐµÑ€Ð½ÑƒÑ‚ÑŒÑÑ Ð¸ ÑÑ‚ÐµÑ€ÐµÑ‚ÑŒ Ð¸Ð»Ð¸ Ð¾Ñ‚Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ñ†ÐµÐ»ÐµÐ²ÑƒÑŽ Ñ„Ð°Ð¹Ð»Ð¾Ð²ÑƒÑŽ ÑÐ¸ÑÑ‚ÐµÐ¼Ñƒ "
-"Ð¿ÐµÑ€ÐµÐ´ Ð¿Ñ€Ð¾Ð´Ð¾Ð»Ð¶ÐµÐ½Ð¸ÐµÐ¼ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸."
+#~ msgid "Cannot install Debian"
+#~ msgstr "ÐÐµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ Debian"
 
-#. Type: error
-#. Description
-#: ../base-installer.templates:62
-msgid "Unable to install a kernel"
-msgstr "ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ ÑÐ´Ñ€Ð¾."
+#~ msgid ""
+#~ "The installer cannot figure out how to install Debian. No installable CD-"
+#~ "ROM was found and no valid mirror was configured."
+#~ msgstr ""
+#~ "ÐŸÑ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð° ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸ Ð½Ðµ ÑÐ¼Ð¾Ð³Ð»Ð° Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»Ð¸Ñ‚ÑŒ ÐºÐ°Ðº ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ Debian. ÐÐµ Ð±Ñ‹Ð»Ð¾ "
+#~ "Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¾Ñ‡Ð½Ñ‹Ñ… Ð´Ð¸ÑÐºÐ¾Ð² CD-ROM Ð¸ Ð½Ðµ Ð±Ñ‹Ð»Ð¾ Ð½Ð°ÑÑ‚Ñ€Ð¾ÐµÐ½Ð¾ Ñ€Ð°Ð±Ð¾Ñ‡Ð¸Ñ… ÑÐµÑ€Ð²ÐµÑ€Ð¾Ð²-"
+#~ "Ð·ÐµÑ€ÐºÐ°Ð»."
 
-#. Type: error
-#. Description
-#: ../base-installer.templates:62
-msgid "No kernel package is selected for installation."
-msgstr "ÐÐµ Ð²Ñ‹Ð±Ñ€Ð°Ð½ Ð¿Ð°ÐºÐµÑ‚ Ñ ÑÐ´Ñ€Ð¾Ð¼ Ð´Ð»Ñ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸."
+#~ msgid ""
+#~ "The installation to the target file system has been canceled, as the "
+#~ "target file system contains files from a past installation, which could "
+#~ "break the installation process or cause a broken system to be installed. "
+#~ "You should go back and erase or format the target file system before "
+#~ "proceeding with the install."
+#~ msgstr ""
+#~ "Ð£ÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ° Ð² Ñ†ÐµÐ»ÐµÐ²ÑƒÑŽ Ñ„Ð°Ð¹Ð»Ð¾Ð²ÑƒÑŽ ÑÐ¸ÑÑ‚ÐµÐ¼Ñƒ Ð±Ñ‹Ð»Ð° Ð¾Ñ‚Ð¼ÐµÐ½ÐµÐ½Ð°, Ñ‚Ð°Ðº ÐºÐ°Ðº Ð¾Ð½Ð° ÑÐ¾Ð´ÐµÑ€Ð¶Ð¸Ñ‚ "
+#~ "Ñ„Ð°Ð¹Ð»Ñ‹ Ð¾Ñ‚ Ð¿Ñ€ÐµÐ´Ñ‹Ð´ÑƒÑ‰ÐµÐ¹ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸, Ñ‡Ñ‚Ð¾ Ð¼Ð¾Ð¶ÐµÑ‚ Ð¿Ð¾Ð¼ÐµÑˆÐ°Ñ‚ÑŒ Ð¿Ñ€Ð¾Ñ†ÐµÑÑÑƒ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸ Ð¸Ð»Ð¸ "
+#~ "Ð¿Ñ€Ð¸Ð²ÐµÑÑ‚Ð¸ Ðº Ñ‚Ð¾Ð¼Ñƒ, Ñ‡Ñ‚Ð¾ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ð°Ñ ÑÐ¸ÑÑ‚ÐµÐ¼Ð° Ð¾ÐºÐ°Ð¶ÐµÑ‚ÑÑ Ð½ÐµÑ€Ð°Ð±Ð¾Ñ‚Ð¾ÑÐ¿Ð¾ÑÐ¾Ð±Ð½Ð¾Ð¹. Ð’Ñ‹ "
+#~ "Ð´Ð¾Ð»Ð¶Ð½Ñ‹ Ð²ÐµÑ€Ð½ÑƒÑ‚ÑŒÑÑ Ð¸ ÑÑ‚ÐµÑ€ÐµÑ‚ÑŒ Ð¸Ð»Ð¸ Ð¾Ñ‚Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ñ†ÐµÐ»ÐµÐ²ÑƒÑŽ Ñ„Ð°Ð¹Ð»Ð¾Ð²ÑƒÑŽ ÑÐ¸ÑÑ‚ÐµÐ¼Ñƒ "
+#~ "Ð¿ÐµÑ€ÐµÐ´ Ð¿Ñ€Ð¾Ð´Ð¾Ð»Ð¶ÐµÐ½Ð¸ÐµÐ¼ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸."
 
-#. Type: error
-#. Description
-#: ../base-installer.templates:84
-msgid "No installable kernel found"
-msgstr "ÐÐµ Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾ ÑÐ´Ñ€Ð°, Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ð¾Ð³Ð¾ Ð´Ð»Ñ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸"
+#~ msgid "Unable to install a kernel"
+#~ msgstr "ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ ÑÐ´Ñ€Ð¾."
 
-#. Type: error
-#. Description
-#: ../base-installer.templates:84
-msgid "The current default kernel package is '${KERNEL}'."
-msgstr "Ð¢ÐµÐºÑƒÑ‰Ð¸Ð¼ Ð¿Ð°ÐºÐµÑ‚Ð¾Ð¼ Ñ ÑÐ´Ñ€Ð¾Ð¼ Ð¿Ð¾ ÑƒÐ¼Ð¾Ð»Ñ‡Ð°Ð½Ð¸ÑŽ ÑÐ²Ð»ÑÐµÑ‚ÑÑ '${KERNEL}'."
+#~ msgid "No kernel package is selected for installation."
+#~ msgstr "ÐÐµ Ð²Ñ‹Ð±Ñ€Ð°Ð½ Ð¿Ð°ÐºÐµÑ‚ Ñ ÑÐ´Ñ€Ð¾Ð¼ Ð´Ð»Ñ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸."
 
-#. Type: error
-#. Description
-#: ../base-installer.templates:84
-msgid "You may try to continue though this rather strange error is probably fatal."
-msgstr ""
-"ÐœÐ¾Ð¶ÐµÑ‚Ðµ Ð¿Ð¾Ð¿Ñ‹Ñ‚Ð°Ñ‚ÑŒÑÑ Ð¿Ñ€Ð¾Ð´Ð¾Ð»Ð¶Ð¸Ñ‚ÑŒ, Ð½Ð¾ ÑÑ‚Ð¾ Ð¾Ñ‡ÐµÐ½ÑŒ ÑÑ‚Ñ€Ð°Ð½Ð½Ð°Ñ Ð¸, Ð²ÐµÑ€Ð¾ÑÑ‚Ð½Ð¾, "
-"Ð½ÐµÑƒÑÑ‚Ñ€Ð°Ð½Ð¸Ð¼Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°."
+#~ msgid "No installable kernel found"
+#~ msgstr "ÐÐµ Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾ ÑÐ´Ñ€Ð°, Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ð¾Ð³Ð¾ Ð´Ð»Ñ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸"
 
-#. Type: error
-#. Description
-#: ../base-installer.templates:93
-msgid "Unable to install initrd-tools"
-msgstr "ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ initrd-tools"
+#~ msgid "The current default kernel package is '${KERNEL}'."
+#~ msgstr "Ð¢ÐµÐºÑƒÑ‰Ð¸Ð¼ Ð¿Ð°ÐºÐµÑ‚Ð¾Ð¼ Ñ ÑÐ´Ñ€Ð¾Ð¼ Ð¿Ð¾ ÑƒÐ¼Ð¾Ð»Ñ‡Ð°Ð½Ð¸ÑŽ ÑÐ²Ð»ÑÐµÑ‚ÑÑ '${KERNEL}'."
 
-#. Type: error
-#. Description
-#: ../base-installer.templates:93
-msgid ""
-"An error was returned while trying to install the initrd-tools package  onto "
-"the target system."
-msgstr "ÐŸÑ€Ð¾Ð¸Ð·Ð¾ÑˆÐ»Ð° Ð¾ÑˆÐ¸Ð±ÐºÐ° Ð²Ð¾ Ð²Ñ€ÐµÐ¼Ñ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸ Ð¿Ð°ÐºÐµÑ‚Ð° initrd-tools Ð½Ð° Ñ†ÐµÐ»ÐµÐ²Ð¾Ð¹ Ñ€Ð°Ð·Ð´ÐµÐ»."
+#~ msgid ""
+#~ "You may try to continue though this rather strange error is probably "
+#~ "fatal."
+#~ msgstr ""
+#~ "ÐœÐ¾Ð¶ÐµÑ‚Ðµ Ð¿Ð¾Ð¿Ñ‹Ñ‚Ð°Ñ‚ÑŒÑÑ Ð¿Ñ€Ð¾Ð´Ð¾Ð»Ð¶Ð¸Ñ‚ÑŒ, Ð½Ð¾ ÑÑ‚Ð¾ Ð¾Ñ‡ÐµÐ½ÑŒ ÑÑ‚Ñ€Ð°Ð½Ð½Ð°Ñ Ð¸, Ð²ÐµÑ€Ð¾ÑÑ‚Ð½Ð¾, "
+#~ "Ð½ÐµÑƒÑÑ‚Ñ€Ð°Ð½Ð¸Ð¼Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°."
 
-#. Type: error
-#. Description
-#: ../base-installer.templates:93
-msgid "Check /var/log/messages or see virtual console 3 for the details."
-msgstr "ÐŸÐ¾Ð´Ñ€Ð¾Ð±Ð½Ð¾ÑÑ‚Ð¸ ÑÐ¼Ð¾Ñ‚Ñ€Ð¸Ñ‚Ðµ Ð² /var/log/messages Ð¸Ð»Ð¸ Ð½Ð° ÐºÐ¾Ð½ÑÐ¾Ð»Ð¸ 3."
+#~ msgid "Unable to install initrd-tools"
+#~ msgstr "ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ initrd-tools"
 
-#. Type: error
-#. Description
-#: ../base-installer.templates:101
-msgid "${SUBST0} was not pre-downloaded."
-msgstr "${SUBST0} Ð½Ðµ Ð±Ñ‹Ð» Ð¿Ñ€ÐµÐ´Ð²Ð°Ñ€Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾ Ð·Ð°Ð³Ñ€ÑƒÐ¶ÐµÐ½."
+#~ msgid ""
+#~ "An error was returned while trying to install the initrd-tools package  "
+#~ "onto the target system."
+#~ msgstr ""
+#~ "ÐŸÑ€Ð¾Ð¸Ð·Ð¾ÑˆÐ»Ð° Ð¾ÑˆÐ¸Ð±ÐºÐ° Ð²Ð¾ Ð²Ñ€ÐµÐ¼Ñ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸ Ð¿Ð°ÐºÐµÑ‚Ð° initrd-tools Ð½Ð° Ñ†ÐµÐ»ÐµÐ²Ð¾Ð¹ Ñ€Ð°Ð·Ð´ÐµÐ»."
 
-#. Type: error
-#. Description
-#: ../base-installer.templates:106
-msgid "Unknown location ${SUBST0}."
-msgstr "ÐÐµÐ¸Ð·Ð²ÐµÑÑ‚Ð½Ñ‹Ð¹ Ð°Ð´Ñ€ÐµÑ ${SUBST0}."
+#~ msgid "Check /var/log/messages or see virtual console 3 for the details."
+#~ msgstr "ÐŸÐ¾Ð´Ñ€Ð¾Ð±Ð½Ð¾ÑÑ‚Ð¸ ÑÐ¼Ð¾Ñ‚Ñ€Ð¸Ñ‚Ðµ Ð² /var/log/messages Ð¸Ð»Ð¸ Ð½Ð° ÐºÐ¾Ð½ÑÐ¾Ð»Ð¸ 3."
 
-#. Type: error
-#. Description
-#: ../base-installer.templates:126
-msgid "Couldn't download ${SUBST0}."
-msgstr "ÐÐµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ Ð·Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚ÑŒ ${SUBST0}."
+#~ msgid "${SUBST0} was not pre-downloaded."
+#~ msgstr "${SUBST0} Ð½Ðµ Ð±Ñ‹Ð» Ð¿Ñ€ÐµÐ´Ð²Ð°Ñ€Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾ Ð·Ð°Ð³Ñ€ÑƒÐ¶ÐµÐ½."
 
-#. Type: error
-#. Description
-#: ../base-installer.templates:131
-msgid "Interrupt caught... Exiting."
-msgstr "ÐŸÐ¾Ð»ÑƒÑ‡ÐµÐ½ ÑÐ¸Ð³Ð½Ð°Ð» Ð¿Ñ€ÐµÑ€Ñ‹Ð²Ð°Ð½Ð¸Ñ... Ð’Ñ‹Ñ…Ð¾Ð´."
+#~ msgid "Unknown location ${SUBST0}."
+#~ msgstr "ÐÐµÐ¸Ð·Ð²ÐµÑÑ‚Ð½Ñ‹Ð¹ Ð°Ð´Ñ€ÐµÑ ${SUBST0}."
 
-#. Type: text
-#. Description
-#: ../base-installer.templates:136
-msgid "Installing the Debian base system"
-msgstr "Ð£ÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ° Ð±Ð°Ð·Ð¾Ð²Ð¾Ð¹ ÑÐ¸ÑÑ‚ÐµÐ¼Ñ‹ Debian"
+#~ msgid "Couldn't download ${SUBST0}."
+#~ msgstr "ÐÐµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ Ð·Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚ÑŒ ${SUBST0}."
 
-#. Type: text
-#. Description
-#: ../base-installer.templates:140
-msgid "Preparing to install the Debian base system..."
-msgstr "ÐŸÐ¾Ð´Ð³Ð¾Ñ‚Ð¾Ð²ÐºÐ° Ðº ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐµ Ð±Ð°Ð·Ð¾Ð²Ð¾Ð¹ ÑÐ¸ÑÑ‚ÐµÐ¼Ñ‹ Debian..."
+#~ msgid "Interrupt caught... Exiting."
+#~ msgstr "ÐŸÐ¾Ð»ÑƒÑ‡ÐµÐ½ ÑÐ¸Ð³Ð½Ð°Ð» Ð¿Ñ€ÐµÑ€Ñ‹Ð²Ð°Ð½Ð¸Ñ... Ð’Ñ‹Ñ…Ð¾Ð´."
 
-#. Type: text
-#. Description
-#: ../base-installer.templates:148
-msgid "Checking the target file system"
-msgstr "ÐŸÑ€Ð¾Ð²ÐµÑ€ÐºÐ° Ñ†ÐµÐ»ÐµÐ²Ð¾Ð¹ Ñ„Ð°Ð¹Ð»Ð¾Ð²Ð¾Ð¹ ÑÐ¸ÑÑ‚ÐµÐ¼Ñ‹"
+#~ msgid "Installing the Debian base system"
+#~ msgstr "Ð£ÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ° Ð±Ð°Ð·Ð¾Ð²Ð¾Ð¹ ÑÐ¸ÑÑ‚ÐµÐ¼Ñ‹ Debian"
 
-#. Type: text
-#. Description
-#: ../base-installer.templates:192
-msgid "Checking package size: ${SUBST0}..."
-msgstr "ÐŸÑ€Ð¾Ð²ÐµÑ€ÐºÐ° Ñ€Ð°Ð·Ð¼ÐµÑ€Ð° Ð¿Ð°ÐºÐµÑ‚Ð°: ${SUBST0}..."
+#~ msgid "Preparing to install the Debian base system..."
+#~ msgstr "ÐŸÐ¾Ð´Ð³Ð¾Ñ‚Ð¾Ð²ÐºÐ° Ðº ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐµ Ð±Ð°Ð·Ð¾Ð²Ð¾Ð¹ ÑÐ¸ÑÑ‚ÐµÐ¼Ñ‹ Debian..."
 
-#. Type: boolean
-#. Description
-#: ../grub-installer.templates:4
-msgid ""
-"If all of your operating systems are listed above, then it should be safe to "
-"install the boot loader to the master boot record of your first hard drive. "
-"When your computer boots, you will be able to choose to load one of these "
-"operating systems or your new Debian system."
-msgstr ""
-"Ð•ÑÐ»Ð¸ Ð²Ñ‹ÑˆÐµ ÑƒÐºÐ°Ð·Ð°Ð½Ñ‹ Ð²ÑÐµ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ‹Ðµ Ð¾Ð¿ÐµÑ€Ð°Ñ†Ð¸Ð¾Ð½Ð½Ñ‹Ðµ ÑÐ¸ÑÑ‚ÐµÐ¼Ñ‹, Ñ‚Ð¾ Ð¼Ð¾Ð¶Ð½Ð¾ ÑÐ¿Ð¾ÐºÐ¾Ð¹Ð½Ð¾ "
-"ÑƒÑÑ‚Ð°Ð½Ð°Ð²Ð»Ð¸Ð²Ð°Ñ‚ÑŒ Ð·Ð°Ð³Ñ€ÑƒÐ·Ñ‡Ð¸Ðº Ð² Ð³Ð»Ð°Ð²Ð½ÑƒÑŽ Ð·Ð°Ð³Ñ€ÑƒÐ·Ð¾Ñ‡Ð½ÑƒÑŽ Ð·Ð°Ð¿Ð¸ÑÑŒ Ð²Ð°ÑˆÐµÐ³Ð¾ Ð¶Ñ‘ÑÑ‚ÐºÐ¾Ð³Ð¾ Ð´Ð¸ÑÐºÐ°. "
-"ÐŸÑ€Ð¸ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐµ ÐºÐ¾Ð¼Ð¿ÑŒÑŽÑ‚ÐµÑ€Ð° Ð²Ñ‹ ÑÐ¼Ð¾Ð¶ÐµÑ‚Ðµ Ð²Ñ‹Ð±Ñ€Ð°Ñ‚ÑŒ, ÐºÐ°ÐºÑƒÑŽ Ð¸Ð· ÑÑ‚Ð¸Ñ… ÑÐ¸ÑÑ‚ÐµÐ¼ Ð²Ñ‹ Ñ…Ð¾Ñ‚Ð¸Ñ‚Ðµ "
-"Ð·Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚ÑŒ."
+#~ msgid "Checking the target file system"
+#~ msgstr "ÐŸÑ€Ð¾Ð²ÐµÑ€ÐºÐ° Ñ†ÐµÐ»ÐµÐ²Ð¾Ð¹ Ñ„Ð°Ð¹Ð»Ð¾Ð²Ð¾Ð¹ ÑÐ¸ÑÑ‚ÐµÐ¼Ñ‹"
 
-#. Type: boolean
-#. Description
-#: ../grub-installer.templates:16
-msgid ""
-"It seems that this installation of Debian is the only operating system on "
-"this computer. If so, it should be safe to install the GRUB boot loader to "
-"the master boot record of your first hard drive."
-msgstr ""
-"ÐŸÐ¾Ñ…Ð¾Ð¶Ðµ, Ñ‡Ñ‚Ð¾ Debian Ð±ÑƒÐ´ÐµÑ‚ ÐµÐ´Ð¸Ð½ÑÑ‚Ð²ÐµÐ½Ð½Ð¾Ð¹ Ð¾Ð¿ÐµÑ€Ð°Ñ†Ð¸Ð¾Ð½Ð½Ð¾Ð¹ ÑÐ¸ÑÑ‚ÐµÐ¼Ð¾Ð¹ Ð½Ð° ÑÑ‚Ð¾Ð¼ "
-"ÐºÐ¾Ð¼Ð¿ÑŒÑŽÑ‚ÐµÑ€Ðµ. Ð•ÑÐ»Ð¸ ÑÑ‚Ð¾ Ð´ÐµÐ¹ÑÑ‚Ð²Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾ Ñ‚Ð°Ðº, Ñ‚Ð¾ Ð¼Ð¾Ð¶Ð½Ð¾ ÑÐ¿Ð¾ÐºÐ¾Ð¹Ð½Ð¾ ÑƒÑÑ‚Ð°Ð½Ð°Ð²Ð»Ð¸Ð²Ð°Ñ‚ÑŒ "
-"Ð·Ð°Ð³Ñ€ÑƒÐ·Ñ‡Ð¸Ðº GRUB Ð² Ð³Ð»Ð°Ð²Ð½ÑƒÑŽ Ð·Ð°Ð³Ñ€ÑƒÐ·Ð¾Ñ‡Ð½ÑƒÑŽ Ð·Ð°Ð¿Ð¸ÑÑŒ Ð¿ÐµÑ€Ð²Ð¾Ð³Ð¾ Ð¶Ñ‘ÑÑ‚ÐºÐ¾Ð³Ð¾ Ð´Ð¸ÑÐºÐ°."
+#~ msgid "Checking package size: ${SUBST0}..."
+#~ msgstr "ÐŸÑ€Ð¾Ð²ÐµÑ€ÐºÐ° Ñ€Ð°Ð·Ð¼ÐµÑ€Ð° Ð¿Ð°ÐºÐµÑ‚Ð°: ${SUBST0}..."
 
-#. Type: boolean
-#. Description
-#: ../grub-installer.templates:29
-msgid "Install the GRUB bootloader to XFS file system?"
-msgstr "Ð£ÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ ÑÐ¸ÑÑ‚ÐµÐ¼Ð½Ñ‹Ð¹ Ð·Ð°Ð³Ñ€ÑƒÐ·Ñ‡Ð¸Ðº GRUB Ð½Ð° Ñ„Ð°Ð¹Ð»Ð¾Ð²ÑƒÑŽ ÑÐ¸ÑÑ‚ÐµÐ¼Ñƒ XFS?"
+#~ msgid ""
+#~ "If all of your operating systems are listed above, then it should be safe "
+#~ "to install the boot loader to the master boot record of your first hard "
+#~ "drive. When your computer boots, you will be able to choose to load one "
+#~ "of these operating systems or your new Debian system."
+#~ msgstr ""
+#~ "Ð•ÑÐ»Ð¸ Ð²Ñ‹ÑˆÐµ ÑƒÐºÐ°Ð·Ð°Ð½Ñ‹ Ð²ÑÐµ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ‹Ðµ Ð¾Ð¿ÐµÑ€Ð°Ñ†Ð¸Ð¾Ð½Ð½Ñ‹Ðµ ÑÐ¸ÑÑ‚ÐµÐ¼Ñ‹, Ñ‚Ð¾ Ð¼Ð¾Ð¶Ð½Ð¾ "
+#~ "ÑÐ¿Ð¾ÐºÐ¾Ð¹Ð½Ð¾ ÑƒÑÑ‚Ð°Ð½Ð°Ð²Ð»Ð¸Ð²Ð°Ñ‚ÑŒ Ð·Ð°Ð³Ñ€ÑƒÐ·Ñ‡Ð¸Ðº Ð² Ð³Ð»Ð°Ð²Ð½ÑƒÑŽ Ð·Ð°Ð³Ñ€ÑƒÐ·Ð¾Ñ‡Ð½ÑƒÑŽ Ð·Ð°Ð¿Ð¸ÑÑŒ Ð²Ð°ÑˆÐµÐ³Ð¾ "
+#~ "Ð¶Ñ‘ÑÑ‚ÐºÐ¾Ð³Ð¾ Ð´Ð¸ÑÐºÐ°. ÐŸÑ€Ð¸ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐµ ÐºÐ¾Ð¼Ð¿ÑŒÑŽÑ‚ÐµÑ€Ð° Ð²Ñ‹ ÑÐ¼Ð¾Ð¶ÐµÑ‚Ðµ Ð²Ñ‹Ð±Ñ€Ð°Ñ‚ÑŒ, ÐºÐ°ÐºÑƒÑŽ Ð¸Ð· ÑÑ‚Ð¸Ñ… "
+#~ "ÑÐ¸ÑÑ‚ÐµÐ¼ Ð²Ñ‹ Ñ…Ð¾Ñ‚Ð¸Ñ‚Ðµ Ð·Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚ÑŒ."
 
-#. Type: boolean
-#. Description
-#: ../grub-installer.templates:29
-msgid ""
-"The GRUB bootloader installation often fails or hangs when /boot is on a XFS "
-"file system. Using LILO in this situation is recommended."
-msgstr ""
-"Ð•ÑÐ»Ð¸ /boot Ñ€Ð°ÑÐ¿Ð¾Ð»Ð¾Ð¶ÐµÐ½ Ð² Ñ„Ð°Ð¹Ð»Ð¾Ð²Ð¾Ð¹ ÑÐ¸ÑÑ‚ÐµÐ¼Ðµ XFS, Ñ‚Ð¾ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ° Ð·Ð°Ð³Ñ€ÑƒÐ·Ñ‡Ð¸ÐºÐ° GRUB "
-"Ð½ÐµÑ€ÐµÐ´ÐºÐ¾ Ð·Ð°ÐºÐ°Ð½Ñ‡Ð¸Ð²Ð°ÐµÑ‚ÑÑ Ð½ÐµÑƒÐ´Ð°Ñ‡Ð½Ð¾ Ð¸Ð»Ð¸ Ð·Ð°Ð²Ð¸ÑÐ°Ð½Ð¸ÐµÐ¼ ÐºÐ¾Ð¼Ð¿ÑŒÑŽÑ‚ÐµÑ€Ð°. Ð’ ÑÑ‚Ð¾Ð¹ ÑÐ¸Ñ‚ÑƒÐ°Ñ†Ð¸Ð¸ "
-"Ñ€ÐµÐºÐ¾Ð¼ÐµÐ½Ð´ÑƒÐµÑ‚ÑÑ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ Ð·Ð°Ð³Ñ€ÑƒÐ·Ñ‡Ð¸Ðº LILO."
+#~ msgid ""
+#~ "It seems that this installation of Debian is the only operating system on "
+#~ "this computer. If so, it should be safe to install the GRUB boot loader "
+#~ "to the master boot record of your first hard drive."
+#~ msgstr ""
+#~ "ÐŸÐ¾Ñ…Ð¾Ð¶Ðµ, Ñ‡Ñ‚Ð¾ Debian Ð±ÑƒÐ´ÐµÑ‚ ÐµÐ´Ð¸Ð½ÑÑ‚Ð²ÐµÐ½Ð½Ð¾Ð¹ Ð¾Ð¿ÐµÑ€Ð°Ñ†Ð¸Ð¾Ð½Ð½Ð¾Ð¹ ÑÐ¸ÑÑ‚ÐµÐ¼Ð¾Ð¹ Ð½Ð° ÑÑ‚Ð¾Ð¼ "
+#~ "ÐºÐ¾Ð¼Ð¿ÑŒÑŽÑ‚ÐµÑ€Ðµ. Ð•ÑÐ»Ð¸ ÑÑ‚Ð¾ Ð´ÐµÐ¹ÑÑ‚Ð²Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾ Ñ‚Ð°Ðº, Ñ‚Ð¾ Ð¼Ð¾Ð¶Ð½Ð¾ ÑÐ¿Ð¾ÐºÐ¾Ð¹Ð½Ð¾ ÑƒÑÑ‚Ð°Ð½Ð°Ð²Ð»Ð¸Ð²Ð°Ñ‚ÑŒ "
+#~ "Ð·Ð°Ð³Ñ€ÑƒÐ·Ñ‡Ð¸Ðº GRUB Ð² Ð³Ð»Ð°Ð²Ð½ÑƒÑŽ Ð·Ð°Ð³Ñ€ÑƒÐ·Ð¾Ñ‡Ð½ÑƒÑŽ Ð·Ð°Ð¿Ð¸ÑÑŒ Ð¿ÐµÑ€Ð²Ð¾Ð³Ð¾ Ð¶Ñ‘ÑÑ‚ÐºÐ¾Ð³Ð¾ Ð´Ð¸ÑÐºÐ°."
 
-#. Type: string
-#. Description
-#: ../grub-installer.templates:35
-msgid ""
-"You need to make the newly installed Debian system bootable, by installing "
-"the GRUB bootloader on a bootable device. The usual way to do this is to "
-"install GRUB on the master boot record of your first hard drive. If you "
-"prefer, you can install GRUB elsewhere on the drive, or to another drive, or "
-"even to a floppy."
-msgstr ""
-"ÐŸÑ€Ð¸ÑˆÐ»Ð¾ Ð²Ñ€ÐµÐ¼Ñ Ð½Ð°ÑƒÑ‡Ð¸Ñ‚ÑŒ Ð²Ð°ÑˆÑƒ ÑÐ²ÐµÐ¶ÐµÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½ÑƒÑŽ ÑÐ¸ÑÑ‚ÐµÐ¼Ñƒ Debian Ð·Ð°Ð³Ñ€ÑƒÐ¶Ð°Ñ‚ÑŒÑÑ. Ð”Ð»Ñ "
-"ÑÑ‚Ð¾Ð³Ð¾ Ð½Ð° Ð·Ð°Ð³Ñ€ÑƒÐ·Ð¾Ñ‡Ð½Ð¾Ðµ ÑƒÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð²Ð¾ Ð±ÑƒÐ´ÐµÑ‚ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½ Ð·Ð°Ð³Ñ€ÑƒÐ·Ñ‡Ð¸Ðº GRUB. ÐžÐ±Ñ‹Ñ‡Ð½Ð¾ Ð¾Ð½ "
-"ÑƒÑÑ‚Ð°Ð½Ð°Ð²Ð»Ð¸Ð²Ð°ÐµÑ‚ÑÑ Ð² Ð³Ð»Ð°Ð²Ð½ÑƒÑŽ Ð·Ð°Ð³Ñ€ÑƒÐ·Ð¾Ñ‡Ð½ÑƒÑŽ Ð·Ð°Ð¿Ð¸ÑÑŒ (MBR, Master Boot Record) "
-"Ð¿ÐµÑ€Ð²Ð¾Ð³Ð¾ Ð¶Ñ‘ÑÑ‚ÐºÐ¾Ð³Ð¾ Ð´Ð¸ÑÐºÐ°. ÐŸÑ€Ð¸ Ð¶ÐµÐ»Ð°Ð½Ð¸Ð¸ Ð¼Ð¾Ð¶Ð½Ð¾ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ GRUB Ð² ÐºÐ°ÐºÐ¾Ðµ-Ð»Ð¸Ð±Ð¾ "
-"Ð´Ñ€ÑƒÐ³Ð¾Ðµ Ð¼ÐµÑÑ‚Ð¾ Ð½Ð° Ð´Ð¸ÑÐºÐµ, Ð»Ð¸Ð±Ð¾ Ð½Ð° Ð´Ñ€ÑƒÐ³Ð¾Ð¹ Ð´Ð¸ÑÐº, Ð»Ð¸Ð±Ð¾ Ð²Ð¾Ð¾Ð±Ñ‰Ðµ Ð½Ð° Ð´Ð¸ÑÐºÐµÑ‚Ñƒ."
+#~ msgid "Install the GRUB bootloader to XFS file system?"
+#~ msgstr "Ð£ÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ ÑÐ¸ÑÑ‚ÐµÐ¼Ð½Ñ‹Ð¹ Ð·Ð°Ð³Ñ€ÑƒÐ·Ñ‡Ð¸Ðº GRUB Ð½Ð° Ñ„Ð°Ð¹Ð»Ð¾Ð²ÑƒÑŽ ÑÐ¸ÑÑ‚ÐµÐ¼Ñƒ XFS?"
 
-#. Type: text
-#. Description
-#: ../templates:28
-msgid "Saving installation logs to /var/log/debian-installer/..."
-msgstr "Ð—Ð°Ð¿Ð¸ÑÑŒ Ð¿Ñ€Ð¾Ñ‚Ð¾ÐºÐ¾Ð»Ð° ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸ Ð² /var/log/debian-installer/..."
+#~ msgid ""
+#~ "The GRUB bootloader installation often fails or hangs when /boot is on a "
+#~ "XFS file system. Using LILO in this situation is recommended."
+#~ msgstr ""
+#~ "Ð•ÑÐ»Ð¸ /boot Ñ€Ð°ÑÐ¿Ð¾Ð»Ð¾Ð¶ÐµÐ½ Ð² Ñ„Ð°Ð¹Ð»Ð¾Ð²Ð¾Ð¹ ÑÐ¸ÑÑ‚ÐµÐ¼Ðµ XFS, Ñ‚Ð¾ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ° Ð·Ð°Ð³Ñ€ÑƒÐ·Ñ‡Ð¸ÐºÐ° "
+#~ "GRUB Ð½ÐµÑ€ÐµÐ´ÐºÐ¾ Ð·Ð°ÐºÐ°Ð½Ñ‡Ð¸Ð²Ð°ÐµÑ‚ÑÑ Ð½ÐµÑƒÐ´Ð°Ñ‡Ð½Ð¾ Ð¸Ð»Ð¸ Ð·Ð°Ð²Ð¸ÑÐ°Ð½Ð¸ÐµÐ¼ ÐºÐ¾Ð¼Ð¿ÑŒÑŽÑ‚ÐµÑ€Ð°. Ð’ ÑÑ‚Ð¾Ð¹ "
+#~ "ÑÐ¸Ñ‚ÑƒÐ°Ñ†Ð¸Ð¸ Ñ€ÐµÐºÐ¾Ð¼ÐµÐ½Ð´ÑƒÐµÑ‚ÑÑ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ Ð·Ð°Ð³Ñ€ÑƒÐ·Ñ‡Ð¸Ðº LILO."
 
-#. Type: text
-#. Description
-#: ../templates:36
-msgid "Rebooting into your new Debian system..."
-msgstr "ÐŸÐµÑ€ÐµÐ·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ° Ð² Ð²Ð°ÑˆÑƒ Ð½Ð¾Ð²ÑƒÑŽ ÑÐ¸ÑÑ‚ÐµÐ¼Ñƒ Debian..."
+#~ msgid ""
+#~ "You need to make the newly installed Debian system bootable, by "
+#~ "installing the GRUB bootloader on a bootable device. The usual way to do "
+#~ "this is to install GRUB on the master boot record of your first hard "
+#~ "drive. If you prefer, you can install GRUB elsewhere on the drive, or to "
+#~ "another drive, or even to a floppy."
+#~ msgstr ""
+#~ "ÐŸÑ€Ð¸ÑˆÐ»Ð¾ Ð²Ñ€ÐµÐ¼Ñ Ð½Ð°ÑƒÑ‡Ð¸Ñ‚ÑŒ Ð²Ð°ÑˆÑƒ ÑÐ²ÐµÐ¶ÐµÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½ÑƒÑŽ ÑÐ¸ÑÑ‚ÐµÐ¼Ñƒ Debian Ð·Ð°Ð³Ñ€ÑƒÐ¶Ð°Ñ‚ÑŒÑÑ. "
+#~ "Ð”Ð»Ñ ÑÑ‚Ð¾Ð³Ð¾ Ð½Ð° Ð·Ð°Ð³Ñ€ÑƒÐ·Ð¾Ñ‡Ð½Ð¾Ðµ ÑƒÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð²Ð¾ Ð±ÑƒÐ´ÐµÑ‚ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½ Ð·Ð°Ð³Ñ€ÑƒÐ·Ñ‡Ð¸Ðº GRUB. "
+#~ "ÐžÐ±Ñ‹Ñ‡Ð½Ð¾ Ð¾Ð½ ÑƒÑÑ‚Ð°Ð½Ð°Ð²Ð»Ð¸Ð²Ð°ÐµÑ‚ÑÑ Ð² Ð³Ð»Ð°Ð²Ð½ÑƒÑŽ Ð·Ð°Ð³Ñ€ÑƒÐ·Ð¾Ñ‡Ð½ÑƒÑŽ Ð·Ð°Ð¿Ð¸ÑÑŒ (MBR, Master Boot "
+#~ "Record) Ð¿ÐµÑ€Ð²Ð¾Ð³Ð¾ Ð¶Ñ‘ÑÑ‚ÐºÐ¾Ð³Ð¾ Ð´Ð¸ÑÐºÐ°. ÐŸÑ€Ð¸ Ð¶ÐµÐ»Ð°Ð½Ð¸Ð¸ Ð¼Ð¾Ð¶Ð½Ð¾ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ GRUB Ð² ÐºÐ°ÐºÐ¾Ðµ-"
+#~ "Ð»Ð¸Ð±Ð¾ Ð´Ñ€ÑƒÐ³Ð¾Ðµ Ð¼ÐµÑÑ‚Ð¾ Ð½Ð° Ð´Ð¸ÑÐºÐµ, Ð»Ð¸Ð±Ð¾ Ð½Ð° Ð´Ñ€ÑƒÐ³Ð¾Ð¹ Ð´Ð¸ÑÐº, Ð»Ð¸Ð±Ð¾ Ð²Ð¾Ð¾Ð±Ñ‰Ðµ Ð½Ð° Ð´Ð¸ÑÐºÐµÑ‚Ñƒ."
 
-#. Type: note
-#. Description
-#: ../templates:40
-msgid ""
-"Installation is complete, so it is time to boot into your new Debian system. "
-"Make sure to remove the installation media (CD-ROM, floppies), so that your "
-"system boots from the disk to which Debian was installed."
-msgstr ""
-"Ð£ÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ° Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð°, Ð¿Ñ€Ð¸ÑˆÐ»Ð¾ Ð²Ñ€ÐµÐ¼Ñ Ð² Ð¿ÐµÑ€Ð²Ñ‹Ð¹ Ñ€Ð°Ð· Ð·Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚ÑŒ Ð²Ð°ÑˆÑƒ Ð½Ð¾Ð²ÑƒÑŽ ÑÐ¸ÑÑ‚ÐµÐ¼Ñƒ "
-"Debian. Ð£Ð±ÐµÐ´Ð¸Ñ‚ÐµÑÑŒ, Ñ‡Ñ‚Ð¾ Ð½Ð¾ÑÐ¸Ñ‚ÐµÐ»Ð¸, Ñ ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ñ… Ð¿Ñ€Ð¾Ð¸Ð·Ð²Ð¾Ð´Ð¸Ð»Ð°ÑÑŒ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ° (ÐºÐ¾Ð¼Ð¿Ð°ÐºÑ‚-"
-"Ð´Ð¸ÑÐºÐ¸, Ð³Ð¸Ð±ÐºÐ¸Ðµ Ð´Ð¸ÑÐºÐ¸), Ð¸Ð·Ð²Ð»ÐµÑ‡ÐµÐ½Ñ‹, Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð²Ð°ÑˆÐ° ÑÐ¸ÑÑ‚ÐµÐ¼Ð° Ð·Ð°Ð³Ñ€ÑƒÐ·Ð¸Ð»Ð°ÑÑŒ Ñ Ð´Ð¸ÑÐºÐ°, Ð½Ð° "
-"ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ð¹ Ð±Ñ‹Ð»Ð° Ð¿Ñ€Ð¾Ð¸Ð·Ð²ÐµÐ´ÐµÐ½Ð° ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ° Debian."
+#~ msgid "Saving installation logs to /var/log/debian-installer/..."
+#~ msgstr "Ð—Ð°Ð¿Ð¸ÑÑŒ Ð¿Ñ€Ð¾Ñ‚Ð¾ÐºÐ¾Ð»Ð° ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸ Ð² /var/log/debian-installer/..."
 
-#. Type: error
-#. Description
-#: ../cdrom-detect.templates:72
-msgid "Non-Debian CD-ROM detected"
-msgstr "Ð£ÑÑ‚Ð°Ð½Ð¾Ð²Ð¾Ñ‡Ð½Ñ‹Ð¹ CD Debian Ð½Ðµ Ð¾Ð±Ð½Ð°Ñ€ÑƒÐ¶ÐµÐ½"
+#~ msgid "Rebooting into your new Debian system..."
+#~ msgstr "ÐŸÐµÑ€ÐµÐ·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ° Ð² Ð²Ð°ÑˆÑƒ Ð½Ð¾Ð²ÑƒÑŽ ÑÐ¸ÑÑ‚ÐµÐ¼Ñƒ Debian..."
 
-#. Type: error
-#. Description
-#: ../cdrom-detect.templates:72
-msgid "The CD-ROM drive contains a non-Debian CD."
-msgstr "Ð”Ð¸ÑÐº Ð² ÑƒÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð²Ðµ Ñ‡Ñ‚ÐµÐ½Ð¸Ñ CD-ROM Ð½Ðµ ÑÐ²Ð»ÑÐµÑ‚ÑÑ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¾Ñ‡Ð½Ñ‹Ð¼ CD Debian."
+#~ msgid ""
+#~ "Installation is complete, so it is time to boot into your new Debian "
+#~ "system. Make sure to remove the installation media (CD-ROM, floppies), so "
+#~ "that your system boots from the disk to which Debian was installed."
+#~ msgstr ""
+#~ "Ð£ÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ° Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð°, Ð¿Ñ€Ð¸ÑˆÐ»Ð¾ Ð²Ñ€ÐµÐ¼Ñ Ð² Ð¿ÐµÑ€Ð²Ñ‹Ð¹ Ñ€Ð°Ð· Ð·Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚ÑŒ Ð²Ð°ÑˆÑƒ Ð½Ð¾Ð²ÑƒÑŽ "
+#~ "ÑÐ¸ÑÑ‚ÐµÐ¼Ñƒ Debian. Ð£Ð±ÐµÐ´Ð¸Ñ‚ÐµÑÑŒ, Ñ‡Ñ‚Ð¾ Ð½Ð¾ÑÐ¸Ñ‚ÐµÐ»Ð¸, Ñ ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ñ… Ð¿Ñ€Ð¾Ð¸Ð·Ð²Ð¾Ð´Ð¸Ð»Ð°ÑÑŒ "
+#~ "ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ° (ÐºÐ¾Ð¼Ð¿Ð°ÐºÑ‚-Ð´Ð¸ÑÐºÐ¸, Ð³Ð¸Ð±ÐºÐ¸Ðµ Ð´Ð¸ÑÐºÐ¸), Ð¸Ð·Ð²Ð»ÐµÑ‡ÐµÐ½Ñ‹, Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð²Ð°ÑˆÐ° ÑÐ¸ÑÑ‚ÐµÐ¼Ð° "
+#~ "Ð·Ð°Ð³Ñ€ÑƒÐ·Ð¸Ð»Ð°ÑÑŒ Ñ Ð´Ð¸ÑÐºÐ°, Ð½Ð° ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ð¹ Ð±Ñ‹Ð»Ð° Ð¿Ñ€Ð¾Ð¸Ð·Ð²ÐµÐ´ÐµÐ½Ð° ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ° Debian."
 
-#. Type: error
-#. Description
-#: ../cdrom-detect.templates:72
-msgid "Please insert a Debian CD to continue with the installation."
-msgstr "Ð’ÑÑ‚Ð°Ð²ÑŒÑ‚Ðµ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¾Ñ‡Ð½Ñ‹Ð¹ CD Debian Ð´Ð»Ñ Ð¿Ñ€Ð¾Ð´Ð¾Ð»Ð¶ÐµÐ½Ð¸Ñ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸."
+#~ msgid "Non-Debian CD-ROM detected"
+#~ msgstr "Ð£ÑÑ‚Ð°Ð½Ð¾Ð²Ð¾Ñ‡Ð½Ñ‹Ð¹ CD Debian Ð½Ðµ Ð¾Ð±Ð½Ð°Ñ€ÑƒÐ¶ÐµÐ½"
 
-#. Type: note
-#. Description
-#: ../quik-installer.templates:118 ../yaboot-installer.templates:81
-msgid "The system is now ready to boot the new Debian GNU/Linux system."
-msgstr "Ð¢ÐµÐ¿ÐµÑ€ÑŒ ÑÐ¸ÑÑ‚ÐµÐ¼Ð° Ð³Ð¾Ñ‚Ð¾Ð²Ð° Ðº Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐµ Debian GNU/Linux."
+#~ msgid "The CD-ROM drive contains a non-Debian CD."
+#~ msgstr "Ð”Ð¸ÑÐº Ð² ÑƒÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð²Ðµ Ñ‡Ñ‚ÐµÐ½Ð¸Ñ CD-ROM Ð½Ðµ ÑÐ²Ð»ÑÐµÑ‚ÑÑ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¾Ñ‡Ð½Ñ‹Ð¼ CD Debian."
 
-#. Type: error
-#. Description
-#: ../yaboot-installer.templates:72 ../templates:46
-msgid "Failed to install bootloader"
-msgstr "ÐÐµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ ÑÐ¸ÑÑ‚ÐµÐ¼Ð½Ñ‹Ð¹ Ð·Ð°Ð³Ñ€ÑƒÐ·Ñ‡Ð¸Ðº"
+#~ msgid "Please insert a Debian CD to continue with the installation."
+#~ msgstr "Ð’ÑÑ‚Ð°Ð²ÑŒÑ‚Ðµ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¾Ñ‡Ð½Ñ‹Ð¹ CD Debian Ð´Ð»Ñ Ð¿Ñ€Ð¾Ð´Ð¾Ð»Ð¶ÐµÐ½Ð¸Ñ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸."
 
-#. Type: boolean
-#. Description
-#: ../aboot-installer.templates:45
-msgid ""
-"Your /boot directory is located on a disk that has no space for the aboot "
-"bootloader.  To install aboot, you must have a special aboot partition at "
-"the beginning of your disk."
-msgstr ""
-"ÐšÐ°Ñ‚Ð°Ð»Ð¾Ð³ /boot Ð½Ð°Ñ…Ð¾Ð´Ð¸Ñ‚ÑÑ Ð½Ð° Ð´Ð¸ÑÐºÐµ, Ð½Ð° ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ð¼ Ð½ÐµÑ‚ ÑÐ²Ð¾Ð±Ð¾Ð´Ð½Ð¾Ð³Ð¾ Ð¼ÐµÑÑ‚Ð° Ð´Ð»Ñ "
-"ÑÐ¸ÑÑ‚ÐµÐ¼Ð½Ð¾Ð³Ð¾ Ð·Ð°Ð³Ñ€ÑƒÐ·Ñ‡Ð¸ÐºÐ° aboot. Ð”Ð»Ñ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸ aboot, Ð²Ñ‹ Ð´Ð¾Ð»Ð¶Ð½Ñ‹ Ð¸Ð¼ÐµÑ‚ÑŒ "
-"ÑÐ¿ÐµÑ†Ð¸Ð°Ð»ÑŒÐ½Ñ‹Ð¹ Ñ€Ð°Ð·Ð´ÐµÐ» aboot Ð² Ð½Ð°Ñ‡Ð°Ð»Ðµ Ð´Ð¸ÑÐºÐ°."
+#~ msgid "The system is now ready to boot the new Debian GNU/Linux system."
+#~ msgstr "Ð¢ÐµÐ¿ÐµÑ€ÑŒ ÑÐ¸ÑÑ‚ÐµÐ¼Ð° Ð³Ð¾Ñ‚Ð¾Ð²Ð° Ðº Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐµ Debian GNU/Linux."
 
-#. Type: string
-#. Description
-#: ../palo-installer.templates:3
-msgid ""
-"PALO should install the boot block on a bootable device. This is usually the "
-"first hard drive, but could be in a partition if you want to use another "
-"boot manager as the primary boot manager."
-msgstr ""
-"PALO Ð´Ð¾Ð»Ð¶ÐµÐ½ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ Ð·Ð°Ð³Ñ€ÑƒÐ·Ð¾Ñ‡Ð½Ñ‹Ð¹ Ð±Ð»Ð¾Ðº Ð½Ð° Ð·Ð°Ð³Ñ€ÑƒÐ·Ð¾Ñ‡Ð½Ð¾Ðµ ÑƒÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð²Ð¾. ÐžÐ±Ñ‹Ñ‡Ð½Ð¾ "
-"ÑÑ‚Ð¾ Ð¿ÐµÑ€Ð²Ñ‹Ð¹ Ð¶Ñ‘ÑÑ‚ÐºÐ¸Ð¹ Ð´Ð¸ÑÐº, Ð½Ð¾ Ð¸Ð¼ Ð¼Ð¾Ð¶ÐµÑ‚ Ð±Ñ‹Ñ‚ÑŒ Ð¸ Ð¾Ð´Ð¸Ð½ Ð¸Ð· Ñ€Ð°Ð·Ð´ÐµÐ»Ð¾Ð² Ð´Ð¸ÑÐºÐ°, ÐµÑÐ»Ð¸ Ð²Ñ‹ "
-"Ñ…Ð¾Ñ‚Ð¸Ñ‚Ðµ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ Ð´Ñ€ÑƒÐ³Ð¾Ð¹ Ð¼ÐµÐ½ÐµÐ´Ð¶ÐµÑ€ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸ Ð² ÐºÐ°Ñ‡ÐµÑÑ‚Ð²Ðµ Ð¾ÑÐ½Ð¾Ð²Ð½Ð¾Ð³Ð¾."
+#~ msgid "Failed to install bootloader"
+#~ msgstr "ÐÐµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ ÑÐ¸ÑÑ‚ÐµÐ¼Ð½Ñ‹Ð¹ Ð·Ð°Ð³Ñ€ÑƒÐ·Ñ‡Ð¸Ðº"
 
-#. Type: note
-#. Description
-#: ../arcboot-installer.templates:29 ../nobootloader.templates:30
-msgid ""
-"You will only need to do this once.  Afterwards, enter the \"boot\" command "
-"or reboot the system to proceed to the next Debian installation stage."
-msgstr ""
-"ÐÑ‚Ð¾ Ð½ÐµÐ¾Ð±Ñ…Ð¾Ð´Ð¸Ð¼Ð¾ ÑÐ´ÐµÐ»Ð°Ñ‚ÑŒ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ð¾Ð´Ð¸Ð½ Ñ€Ð°Ð·. ÐŸÐ¾ÑÐ»Ðµ ÑÑ‚Ð¾Ð³Ð¾, Ð²Ð²ÐµÐ´Ð¸Ñ‚Ðµ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñƒ \"boot"
-"\" Ð¸Ð»Ð¸ Ð¿ÐµÑ€ÐµÐ·Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚Ðµ ÑÐ¸ÑÑ‚ÐµÐ¼Ñƒ, Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð¿ÐµÑ€ÐµÐ¹Ñ‚Ð¸ Ðº ÑÐ»ÐµÐ´ÑƒÑŽÑ‰ÐµÐ¼Ñƒ ÑÑ‚Ð°Ð¿Ñƒ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸ "
-"Debian."
+#~ msgid ""
+#~ "Your /boot directory is located on a disk that has no space for the aboot "
+#~ "bootloader.  To install aboot, you must have a special aboot partition at "
+#~ "the beginning of your disk."
+#~ msgstr ""
+#~ "ÐšÐ°Ñ‚Ð°Ð»Ð¾Ð³ /boot Ð½Ð°Ñ…Ð¾Ð´Ð¸Ñ‚ÑÑ Ð½Ð° Ð´Ð¸ÑÐºÐµ, Ð½Ð° ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ð¼ Ð½ÐµÑ‚ ÑÐ²Ð¾Ð±Ð¾Ð´Ð½Ð¾Ð³Ð¾ Ð¼ÐµÑÑ‚Ð° Ð´Ð»Ñ "
+#~ "ÑÐ¸ÑÑ‚ÐµÐ¼Ð½Ð¾Ð³Ð¾ Ð·Ð°Ð³Ñ€ÑƒÐ·Ñ‡Ð¸ÐºÐ° aboot. Ð”Ð»Ñ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸ aboot, Ð²Ñ‹ Ð´Ð¾Ð»Ð¶Ð½Ñ‹ Ð¸Ð¼ÐµÑ‚ÑŒ "
+#~ "ÑÐ¿ÐµÑ†Ð¸Ð°Ð»ÑŒÐ½Ñ‹Ð¹ Ñ€Ð°Ð·Ð´ÐµÐ» aboot Ð² Ð½Ð°Ñ‡Ð°Ð»Ðµ Ð´Ð¸ÑÐºÐ°."
 
-#. Type: note
-#. Description
-#: ../silo-installer.templates:16
-msgid ""
-"The SILO bootloader has been successfully installed on your new Debian boot "
-"partition, and your system should now be able to boot itself."
-msgstr ""
-"Ð¡Ð¸ÑÑ‚ÐµÐ¼Ð½Ñ‹Ð¹ Ð·Ð°Ð³Ñ€ÑƒÐ·Ñ‡Ð¸Ðº SILO Ð±Ñ‹Ð» ÑƒÑÐ¿ÐµÑˆÐ½Ð¾ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½ Ð½Ð° Ð²Ð°Ñˆ Ð½Ð¾Ð²Ñ‹Ð¹ Ð·Ð°Ð³Ñ€ÑƒÐ·Ð¾Ñ‡Ð½Ñ‹Ð¹ "
-"Ñ€Ð°Ð·Ð´ÐµÐ» Debian, Ð¸ Ñ‚ÐµÐ¿ÐµÑ€ÑŒ Ð²Ð°ÑˆÐ° ÑÐ¸ÑÑ‚ÐµÐ¼Ð° ÑÐ¿Ð¾ÑÐ¾Ð±Ð½Ð° Ð·Ð°Ð³Ñ€ÑƒÐ¶Ð°Ñ‚ÑŒÑÑ."
+#~ msgid ""
+#~ "PALO should install the boot block on a bootable device. This is usually "
+#~ "the first hard drive, but could be in a partition if you want to use "
+#~ "another boot manager as the primary boot manager."
+#~ msgstr ""
+#~ "PALO Ð´Ð¾Ð»Ð¶ÐµÐ½ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ Ð·Ð°Ð³Ñ€ÑƒÐ·Ð¾Ñ‡Ð½Ñ‹Ð¹ Ð±Ð»Ð¾Ðº Ð½Ð° Ð·Ð°Ð³Ñ€ÑƒÐ·Ð¾Ñ‡Ð½Ð¾Ðµ ÑƒÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð²Ð¾. ÐžÐ±Ñ‹Ñ‡Ð½Ð¾ "
+#~ "ÑÑ‚Ð¾ Ð¿ÐµÑ€Ð²Ñ‹Ð¹ Ð¶Ñ‘ÑÑ‚ÐºÐ¸Ð¹ Ð´Ð¸ÑÐº, Ð½Ð¾ Ð¸Ð¼ Ð¼Ð¾Ð¶ÐµÑ‚ Ð±Ñ‹Ñ‚ÑŒ Ð¸ Ð¾Ð´Ð¸Ð½ Ð¸Ð· Ñ€Ð°Ð·Ð´ÐµÐ»Ð¾Ð² Ð´Ð¸ÑÐºÐ°, ÐµÑÐ»Ð¸ "
+#~ "Ð²Ñ‹ Ñ…Ð¾Ñ‚Ð¸Ñ‚Ðµ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ Ð´Ñ€ÑƒÐ³Ð¾Ð¹ Ð¼ÐµÐ½ÐµÐ´Ð¶ÐµÑ€ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸ Ð² ÐºÐ°Ñ‡ÐµÑÑ‚Ð²Ðµ Ð¾ÑÐ½Ð¾Ð²Ð½Ð¾Ð³Ð¾."
 
-#. Type: boolean
-#. Description
-#: ../silo-installer.templates:28
-msgid ""
-"To be bootable from the PROM, silo and the kernel it loads must be installed "
-"on a disk which uses Sun disklabels for its partition table.  Your /boot "
-"directory is not located on such a disk.  If you proceed, you will not be "
-"able to boot your system using SILO, and will need to boot it some other way."
-msgstr ""
-"Ð”Ð»Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸ Ð¸Ð· PROM, silo Ð¸ ÑÐ´Ñ€Ð¾ Ð´Ð¾Ð»Ð¶Ð½Ñ‹ Ð±Ñ‹Ñ‚ÑŒ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ñ‹ Ð½Ð° Ð´Ð¸ÑÐº, "
-"Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑŽÑ‰ÐµÐ¼ Ñ‚Ð°Ð±Ð»Ð¸Ñ†Ñƒ Ñ€Ð°Ð·Ð´ÐµÐ»Ð¾Ð² Sun disklabels. Ð’Ð°Ñˆ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³ /boot Ð½Ðµ "
-"Ñ€Ð°ÑÐ¿Ð¾Ð»Ð¾Ð¶ÐµÐ½ Ð½Ð° Ñ‚Ð°ÐºÐ¾Ð¼ Ð´Ð¸ÑÐºÐµ. Ð•ÑÐ»Ð¸ Ð²Ñ‹ Ð¿Ñ€Ð¾Ð´Ð¾Ð»Ð¶Ð¸Ñ‚Ðµ, Ñ‚Ð¾ Ð½Ðµ ÑÐ¼Ð¾Ð¶ÐµÑ‚Ðµ Ð·Ð°Ð³Ñ€ÑƒÐ¶Ð°Ñ‚ÑŒ "
-"ÑÐ¸ÑÑ‚ÐµÐ¼Ñƒ Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ SILO, Ð¸ Ð´Ð»Ñ Ð·Ð°Ð¿ÑƒÑÐºÐ° Ð¿Ñ€Ð¸Ð´Ñ‘Ñ‚ÑÑ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ Ð´Ñ€ÑƒÐ³Ð¾Ð¹ ÑÐ¿Ð¾ÑÐ¾Ð±."
+#~ msgid ""
+#~ "You will only need to do this once.  Afterwards, enter the \"boot\" "
+#~ "command or reboot the system to proceed to the next Debian installation "
+#~ "stage."
+#~ msgstr ""
+#~ "ÐÑ‚Ð¾ Ð½ÐµÐ¾Ð±Ñ…Ð¾Ð´Ð¸Ð¼Ð¾ ÑÐ´ÐµÐ»Ð°Ñ‚ÑŒ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ð¾Ð´Ð¸Ð½ Ñ€Ð°Ð·. ÐŸÐ¾ÑÐ»Ðµ ÑÑ‚Ð¾Ð³Ð¾, Ð²Ð²ÐµÐ´Ð¸Ñ‚Ðµ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñƒ "
+#~ "\"boot\" Ð¸Ð»Ð¸ Ð¿ÐµÑ€ÐµÐ·Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚Ðµ ÑÐ¸ÑÑ‚ÐµÐ¼Ñƒ, Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð¿ÐµÑ€ÐµÐ¹Ñ‚Ð¸ Ðº ÑÐ»ÐµÐ´ÑƒÑŽÑ‰ÐµÐ¼Ñƒ ÑÑ‚Ð°Ð¿Ñƒ "
+#~ "ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸ Debian."
 
-#. Type: boolean
-#. Description
-#: ../silo-installer.templates:38
-msgid ""
-"SILO requires /boot to be located on an ext2 or ext3 partition on a bootable "
-"device.  This means that either the root partition must be an ext2 file "
-"system, or you must have a separate ext2 partition mounted at /boot."
-msgstr ""
-"Ð”Ð»Ñ SILO Ñ‚Ñ€ÐµÐ±ÑƒÐµÑ‚ÑÑ, Ñ‡Ñ‚Ð¾Ð±Ñ‹ /boot Ð½Ð°Ñ…Ð¾Ð´Ð¸Ð»ÑÑ Ð½Ð° Ð·Ð°Ð³Ñ€ÑƒÐ·Ð¾Ñ‡Ð½Ð¾Ð¼ ÑƒÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð²Ðµ Ð² "
-"Ñ€Ð°Ð·Ð´ÐµÐ»Ðµ Ñ Ñ„Ð°Ð¹Ð»Ð¾Ð²Ð¾Ð¹ ÑÐ¸ÑÑ‚ÐµÐ¼Ð¾Ð¹ ext2 Ð¸Ð»Ð¸ ext3. Ð”Ñ€ÑƒÐ³Ð¸Ð¼Ð¸ ÑÐ»Ð¾Ð²Ð°Ð¼Ð¸, Ð¸Ð»Ð¸ ÐºÐ¾Ñ€Ð½ÐµÐ²Ð¾Ð¹ "
-"Ñ€Ð°Ð·Ð´ÐµÐ» Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð¸Ð¼ÐµÑ‚ÑŒ Ñ„Ð°Ð¹Ð»Ð¾Ð²ÑƒÑŽ ÑÐ¸ÑÑ‚ÐµÐ¼Ñƒ ext2, Ð¸Ð»Ð¸ Ð½ÑƒÐ¶Ð½Ð¾ ÑÐ¾Ð·Ð´Ð°Ñ‚ÑŒ Ð¾Ñ‚Ð´ÐµÐ»ÑŒÐ½Ñ‹Ð¹ "
-"Ñ€Ð°Ð·Ð´ÐµÐ» ext2 Ð´Ð»Ñ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³Ð° /boot."
+#~ msgid ""
+#~ "The SILO bootloader has been successfully installed on your new Debian "
+#~ "boot partition, and your system should now be able to boot itself."
+#~ msgstr ""
+#~ "Ð¡Ð¸ÑÑ‚ÐµÐ¼Ð½Ñ‹Ð¹ Ð·Ð°Ð³Ñ€ÑƒÐ·Ñ‡Ð¸Ðº SILO Ð±Ñ‹Ð» ÑƒÑÐ¿ÐµÑˆÐ½Ð¾ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½ Ð½Ð° Ð²Ð°Ñˆ Ð½Ð¾Ð²Ñ‹Ð¹ Ð·Ð°Ð³Ñ€ÑƒÐ·Ð¾Ñ‡Ð½Ñ‹Ð¹ "
+#~ "Ñ€Ð°Ð·Ð´ÐµÐ» Debian, Ð¸ Ñ‚ÐµÐ¿ÐµÑ€ÑŒ Ð²Ð°ÑˆÐ° ÑÐ¸ÑÑ‚ÐµÐ¼Ð° ÑÐ¿Ð¾ÑÐ¾Ð±Ð½Ð° Ð·Ð°Ð³Ñ€ÑƒÐ¶Ð°Ñ‚ÑŒÑÑ."
 
-#. Type: boolean
-#. Description
-#: ../silo-installer.templates:38
-msgid ""
-"Currently, /boot is located on a partition of type ${PARTTYPE}.  If you keep "
-"this setting, you will not be able to boot your Debian system using SILO."
-msgstr ""
-"Ð’ Ð½Ð°ÑÑ‚Ð¾ÑÑ‰Ð¸Ð¹ Ð¼Ð¾Ð¼ÐµÐ½Ñ‚ /boot Ñ€Ð°ÑÐ¿Ð¾Ð»Ð¾Ð¶ÐµÐ½ Ð² Ñ€Ð°Ð·Ð´ÐµÐ»Ðµ Ñ Ñ‚Ð¸Ð¿Ð¾Ð¼ ${PARTTYPE}. Ð•ÑÐ»Ð¸ Ð²Ñ‹ "
-"Ð½Ðµ Ð¸ÑÐ¿Ñ€Ð°Ð²Ð¸Ñ‚Ðµ ÑÑ‚Ð¾Ð³Ð¾, Ñ‚Ð¾ SILO Ð½Ðµ ÑÐ¼Ð¾Ð¶ÐµÑ‚ Ð·Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚ÑŒ Debian."
+#~ msgid ""
+#~ "To be bootable from the PROM, silo and the kernel it loads must be "
+#~ "installed on a disk which uses Sun disklabels for its partition table.  "
+#~ "Your /boot directory is not located on such a disk.  If you proceed, you "
+#~ "will not be able to boot your system using SILO, and will need to boot it "
+#~ "some other way."
+#~ msgstr ""
+#~ "Ð”Ð»Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸ Ð¸Ð· PROM, silo Ð¸ ÑÐ´Ñ€Ð¾ Ð´Ð¾Ð»Ð¶Ð½Ñ‹ Ð±Ñ‹Ñ‚ÑŒ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ñ‹ Ð½Ð° Ð´Ð¸ÑÐº, "
+#~ "Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑŽÑ‰ÐµÐ¼ Ñ‚Ð°Ð±Ð»Ð¸Ñ†Ñƒ Ñ€Ð°Ð·Ð´ÐµÐ»Ð¾Ð² Sun disklabels. Ð’Ð°Ñˆ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³ /boot Ð½Ðµ "
+#~ "Ñ€Ð°ÑÐ¿Ð¾Ð»Ð¾Ð¶ÐµÐ½ Ð½Ð° Ñ‚Ð°ÐºÐ¾Ð¼ Ð´Ð¸ÑÐºÐµ. Ð•ÑÐ»Ð¸ Ð²Ñ‹ Ð¿Ñ€Ð¾Ð´Ð¾Ð»Ð¶Ð¸Ñ‚Ðµ, Ñ‚Ð¾ Ð½Ðµ ÑÐ¼Ð¾Ð¶ÐµÑ‚Ðµ Ð·Ð°Ð³Ñ€ÑƒÐ¶Ð°Ñ‚ÑŒ "
+#~ "ÑÐ¸ÑÑ‚ÐµÐ¼Ñƒ Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ SILO, Ð¸ Ð´Ð»Ñ Ð·Ð°Ð¿ÑƒÑÐºÐ° Ð¿Ñ€Ð¸Ð´Ñ‘Ñ‚ÑÑ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ Ð´Ñ€ÑƒÐ³Ð¾Ð¹ ÑÐ¿Ð¾ÑÐ¾Ð±."
 
-#. Type: boolean
-#. Description
-#: ../silo-installer.templates:51
-msgid ""
-"You are using a 32-bit SPARC machine. On many of these, it is unlikely that "
-"Debian will boot if /boot resides in a partition that extends past the first "
-"1024 cylinders of the hard disk. /boot currently resides in a partition that "
-"extends to cylinder ${CYL}. You should change this by reducing the size of "
-"the partition or creating a separate, smaller partition just for /boot."
-msgstr ""
-"Ð’Ñ‹ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐµÑ‚Ðµ Ð¼Ð°ÑˆÐ¸Ð½Ñƒ Ñ 32-Ð±Ð¸Ñ‚Ð½Ñ‹Ð¼ Ð¿Ñ€Ð¾Ñ†ÐµÑÑÐ¾Ñ€Ð¾Ð¼ SPARC. ÐÐ° Ð±Ð¾Ð»ÑŒÑˆÐ¸Ð½ÑÑ‚Ð²Ðµ Ñ‚Ð°ÐºÐ¸Ñ… "
-"Ð¼Ð°ÑˆÐ¸Ð½ Debian ÑÐºÐ¾Ñ€ÐµÐµ Ð²ÑÐµÐ³Ð¾ Ð½Ðµ Ð·Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚ÑÑ, ÐµÑÐ»Ð¸ /boot Ñ€Ð°ÑÐ¿Ð¾Ð»Ð¾Ð¶ÐµÐ½ Ð² Ñ€Ð°Ð·Ð´ÐµÐ»Ðµ, "
-"ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ð¹ Ð²Ñ‹Ñ…Ð¾Ð´Ð¸Ñ‚ Ð·Ð° Ð¿Ñ€ÐµÐ´ÐµÐ»Ñ‹ Ð¿ÐµÑ€Ð²Ñ‹Ñ… 1024 Ñ†Ð¸Ð»Ð¸Ð½Ð´Ñ€Ð¾Ð² Ð¶Ñ‘ÑÑ‚ÐºÐ¾Ð³Ð¾ Ð´Ð¸ÑÐºÐ°. Ð¡ÐµÐ¹Ñ‡Ð°Ñ "
-"Ñ€Ð°Ð·Ð´ÐµÐ», Ð½Ð° ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ð¼ Ñ€Ð°ÑÐ¿Ð¾Ð»Ð¾Ð¶ÐµÐ½ /boot, Ð´Ð¾ÑÑ‚Ð¸Ð³Ð°ÐµÑ‚ Ñ†Ð¸Ð»Ð¸Ð½Ð´Ñ€Ð° ${CYL}. ÐÑ‚Ð¾ Ð½Ð°Ð´Ð¾ "
-"Ð¸ÑÐ¿Ñ€Ð°Ð²Ð¸Ñ‚ÑŒ Ð»Ð¸Ð±Ð¾ ÑƒÐ¼ÐµÐ½ÑŒÑˆÐ¸Ð² Ñ€Ð°Ð·Ð¼ÐµÑ€ Ñ€Ð°Ð·Ð´ÐµÐ»Ð°, Ð»Ð¸Ð±Ð¾ ÑÐ¾Ð·Ð´Ð°Ð² Ð¾Ñ‚Ð´ÐµÐ»ÑŒÐ½Ñ‹Ð¹ Ð½ÐµÐ±Ð¾Ð»ÑŒÑˆÐ¾Ð¹ "
-"Ñ€Ð°Ð·Ð´ÐµÐ» ÑÐ¿ÐµÑ†Ð¸Ð°Ð»ÑŒÐ½Ð¾ Ð´Ð»Ñ /boot."
+#~ msgid ""
+#~ "SILO requires /boot to be located on an ext2 or ext3 partition on a "
+#~ "bootable device.  This means that either the root partition must be an "
+#~ "ext2 file system, or you must have a separate ext2 partition mounted at /"
+#~ "boot."
+#~ msgstr ""
+#~ "Ð”Ð»Ñ SILO Ñ‚Ñ€ÐµÐ±ÑƒÐµÑ‚ÑÑ, Ñ‡Ñ‚Ð¾Ð±Ñ‹ /boot Ð½Ð°Ñ…Ð¾Ð´Ð¸Ð»ÑÑ Ð½Ð° Ð·Ð°Ð³Ñ€ÑƒÐ·Ð¾Ñ‡Ð½Ð¾Ð¼ ÑƒÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð²Ðµ Ð² "
+#~ "Ñ€Ð°Ð·Ð´ÐµÐ»Ðµ Ñ Ñ„Ð°Ð¹Ð»Ð¾Ð²Ð¾Ð¹ ÑÐ¸ÑÑ‚ÐµÐ¼Ð¾Ð¹ ext2 Ð¸Ð»Ð¸ ext3. Ð”Ñ€ÑƒÐ³Ð¸Ð¼Ð¸ ÑÐ»Ð¾Ð²Ð°Ð¼Ð¸, Ð¸Ð»Ð¸ ÐºÐ¾Ñ€Ð½ÐµÐ²Ð¾Ð¹ "
+#~ "Ñ€Ð°Ð·Ð´ÐµÐ» Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð¸Ð¼ÐµÑ‚ÑŒ Ñ„Ð°Ð¹Ð»Ð¾Ð²ÑƒÑŽ ÑÐ¸ÑÑ‚ÐµÐ¼Ñƒ ext2, Ð¸Ð»Ð¸ Ð½ÑƒÐ¶Ð½Ð¾ ÑÐ¾Ð·Ð´Ð°Ñ‚ÑŒ Ð¾Ñ‚Ð´ÐµÐ»ÑŒÐ½Ñ‹Ð¹ "
+#~ "Ñ€Ð°Ð·Ð´ÐµÐ» ext2 Ð´Ð»Ñ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³Ð° /boot."
 
-#. Type: select
-#. Description
-#: ../lilo-installer.templates:4
-msgid ""
-"The LILO program needs to be installed to make your new Debian system "
-"bootable. By installing it onto your disk's Master Boot Record, LILO will "
-"take complete control of the boot process, but if you want to use a "
-"different boot manager, just install LILO on the new Debian partition "
-"instead."
-msgstr ""
-"Ð§Ñ‚Ð¾Ð±Ñ‹ Ð²Ð°ÑˆÐ° Ð½Ð¾Ð²Ð°Ñ ÑÐ¸ÑÑ‚ÐµÐ¼Ð° Debian ÑÐ¼Ð¾Ð³Ð»Ð° Ð·Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚ÑŒÑÑ, Ð½ÑƒÐ¶Ð½Ð¾ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ "
-"Ð·Ð°Ð³Ñ€ÑƒÐ·Ñ‡Ð¸Ðº LILO. Ð£ÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ° LILO Ð² Ð³Ð»Ð°Ð²Ð½ÑƒÑŽ Ð·Ð°Ð³Ñ€ÑƒÐ·Ð¾Ñ‡Ð½ÑƒÑŽ Ð·Ð°Ð¿Ð¸ÑÑŒ (MBR) Ð´Ð¸ÑÐºÐ° "
-"ÑÐ´ÐµÐ»Ð°ÐµÑ‚ LILO Ð¾ÑÐ½Ð¾Ð²Ð½Ñ‹Ð¼ Ð·Ð°Ð³Ñ€ÑƒÐ·Ñ‡Ð¸ÐºÐ¾Ð¼ Ð½Ð° Ð²Ð°ÑˆÐµÐ¼ ÐºÐ¾Ð¼Ð¿ÑŒÑŽÑ‚ÐµÑ€Ðµ. Ð•ÑÐ»Ð¸ Ð²Ñ‹ Ñ…Ð¾Ñ‚Ð¸Ñ‚Ðµ "
-"Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ Ð´Ñ€ÑƒÐ³Ð¾Ð¹ Ð·Ð°Ð³Ñ€ÑƒÐ·Ñ‡Ð¸Ðº, ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚Ðµ LILO Ð² Ñ€Ð°Ð·Ð´ÐµÐ», Ð² ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ð¹ Ð²Ñ‹ "
-"ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ð»Ð¸ Debian."
+#~ msgid ""
+#~ "Currently, /boot is located on a partition of type ${PARTTYPE}.  If you "
+#~ "keep this setting, you will not be able to boot your Debian system using "
+#~ "SILO."
+#~ msgstr ""
+#~ "Ð’ Ð½Ð°ÑÑ‚Ð¾ÑÑ‰Ð¸Ð¹ Ð¼Ð¾Ð¼ÐµÐ½Ñ‚ /boot Ñ€Ð°ÑÐ¿Ð¾Ð»Ð¾Ð¶ÐµÐ½ Ð² Ñ€Ð°Ð·Ð´ÐµÐ»Ðµ Ñ Ñ‚Ð¸Ð¿Ð¾Ð¼ ${PARTTYPE}. Ð•ÑÐ»Ð¸ "
+#~ "Ð²Ñ‹ Ð½Ðµ Ð¸ÑÐ¿Ñ€Ð°Ð²Ð¸Ñ‚Ðµ ÑÑ‚Ð¾Ð³Ð¾, Ñ‚Ð¾ SILO Ð½Ðµ ÑÐ¼Ð¾Ð¶ÐµÑ‚ Ð·Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚ÑŒ Debian."
 
-#. Type: string
-#. Description
-#: ../lilo-installer.templates:15
-msgid ""
-"Please enter the partition or disk which LILO should be installed onto. "
-"Devfs style names, such as those that start with /dev/ide, /dev/scsi, and /"
-"dev/discs are accepted, as well as traditional names, such as /dev/hda or /"
-"dev/sda."
-msgstr ""
-"Ð£ÐºÐ°Ð¶Ð¸Ñ‚Ðµ, Ð² ÐºÐ°ÐºÐ¾Ð¹ Ñ€Ð°Ð·Ð´ÐµÐ» Ð½ÑƒÐ¶Ð½Ð¾ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ LILO. Ð’Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ñ‹ Ð¸Ð¼ÐµÐ½Ð° Ð² ÑÑ‚Ð¸Ð»Ðµ Devfs "
-"(Ñ‚Ð¾ ÐµÑÑ‚ÑŒ Ð½Ð°Ñ‡Ð¸Ð½Ð°ÑŽÑ‰Ð¸ÐµÑÑ Ñ /dev/ide, /dev/scsi, Ð¸ /dev/discs) Ð¸ Ñ‚Ñ€Ð°Ð´Ð¸Ñ†Ð¸Ð¾Ð½Ð½Ñ‹Ðµ "
-"Ð¸Ð¼ÐµÐ½Ð° (Ñ‚Ð°ÐºÐ¸Ðµ ÐºÐ°Ðº /dev/hda Ð¸Ð»Ð¸ /dev/sda)."
+#~ msgid ""
+#~ "You are using a 32-bit SPARC machine. On many of these, it is unlikely "
+#~ "that Debian will boot if /boot resides in a partition that extends past "
+#~ "the first 1024 cylinders of the hard disk. /boot currently resides in a "
+#~ "partition that extends to cylinder ${CYL}. You should change this by "
+#~ "reducing the size of the partition or creating a separate, smaller "
+#~ "partition just for /boot."
+#~ msgstr ""
+#~ "Ð’Ñ‹ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐµÑ‚Ðµ Ð¼Ð°ÑˆÐ¸Ð½Ñƒ Ñ 32-Ð±Ð¸Ñ‚Ð½Ñ‹Ð¼ Ð¿Ñ€Ð¾Ñ†ÐµÑÑÐ¾Ñ€Ð¾Ð¼ SPARC. ÐÐ° Ð±Ð¾Ð»ÑŒÑˆÐ¸Ð½ÑÑ‚Ð²Ðµ Ñ‚Ð°ÐºÐ¸Ñ… "
+#~ "Ð¼Ð°ÑˆÐ¸Ð½ Debian ÑÐºÐ¾Ñ€ÐµÐµ Ð²ÑÐµÐ³Ð¾ Ð½Ðµ Ð·Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚ÑÑ, ÐµÑÐ»Ð¸ /boot Ñ€Ð°ÑÐ¿Ð¾Ð»Ð¾Ð¶ÐµÐ½ Ð² Ñ€Ð°Ð·Ð´ÐµÐ»Ðµ, "
+#~ "ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ð¹ Ð²Ñ‹Ñ…Ð¾Ð´Ð¸Ñ‚ Ð·Ð° Ð¿Ñ€ÐµÐ´ÐµÐ»Ñ‹ Ð¿ÐµÑ€Ð²Ñ‹Ñ… 1024 Ñ†Ð¸Ð»Ð¸Ð½Ð´Ñ€Ð¾Ð² Ð¶Ñ‘ÑÑ‚ÐºÐ¾Ð³Ð¾ Ð´Ð¸ÑÐºÐ°. Ð¡ÐµÐ¹Ñ‡Ð°Ñ "
+#~ "Ñ€Ð°Ð·Ð´ÐµÐ», Ð½Ð° ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ð¼ Ñ€Ð°ÑÐ¿Ð¾Ð»Ð¾Ð¶ÐµÐ½ /boot, Ð´Ð¾ÑÑ‚Ð¸Ð³Ð°ÐµÑ‚ Ñ†Ð¸Ð»Ð¸Ð½Ð´Ñ€Ð° ${CYL}. ÐÑ‚Ð¾ Ð½Ð°Ð´Ð¾ "
+#~ "Ð¸ÑÐ¿Ñ€Ð°Ð²Ð¸Ñ‚ÑŒ Ð»Ð¸Ð±Ð¾ ÑƒÐ¼ÐµÐ½ÑŒÑˆÐ¸Ð² Ñ€Ð°Ð·Ð¼ÐµÑ€ Ñ€Ð°Ð·Ð´ÐµÐ»Ð°, Ð»Ð¸Ð±Ð¾ ÑÐ¾Ð·Ð´Ð°Ð² Ð¾Ñ‚Ð´ÐµÐ»ÑŒÐ½Ñ‹Ð¹ Ð½ÐµÐ±Ð¾Ð»ÑŒÑˆÐ¾Ð¹ "
+#~ "Ñ€Ð°Ð·Ð´ÐµÐ» ÑÐ¿ÐµÑ†Ð¸Ð°Ð»ÑŒÐ½Ð¾ Ð´Ð»Ñ /boot."
 
-#. Type: boolean
-#. Description
-#: ../lilo-installer.templates:56
-msgid ""
-"You have chosen to install LILO on a partition that is not the active one. "
-"If this partition is not marked active, then LILO will not be loaded by the "
-"bootloader.  This may cause you to be unable to boot into the system that is "
-"being installed."
-msgstr ""
-"Ð Ð°Ð·Ð´ÐµÐ», Ð½Ð° ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ð¹ Ð²Ñ‹ Ñ€ÐµÑˆÐ¸Ð»Ð¸ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ LILO, Ð½Ðµ Ð¿Ð¾Ð¼ÐµÑ‡ÐµÐ½ ÐºÐ°Ðº Ð°ÐºÑ‚Ð¸Ð²Ð½Ñ‹Ð¹. ÐÑ‚Ð¾ "
-"Ð·Ð½Ð°Ñ‡Ð¸Ñ‚, Ñ‡Ñ‚Ð¾ LILO Ð½Ðµ Ð¿Ð¾Ð»ÑƒÑ‡Ð¸Ñ‚ ÑƒÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¸ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐµ Ð¸, ÑÐºÐ¾Ñ€ÐµÐµ Ð²ÑÐµÐ³Ð¾, Ð²Ð°Ð¼ Ð½Ðµ "
-"ÑƒÐ´Ð°ÑÑ‚ÑÑ Ð·Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚ÑŒ ÑÐ¸ÑÑ‚ÐµÐ¼Ñƒ, ÐºÐ¾Ñ‚Ð¾Ñ€ÑƒÑŽ Ð²Ñ‹ ÑÐµÐ¹Ñ‡Ð°Ñ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ð»Ð¸."
+#~ msgid ""
+#~ "The LILO program needs to be installed to make your new Debian system "
+#~ "bootable. By installing it onto your disk's Master Boot Record, LILO will "
+#~ "take complete control of the boot process, but if you want to use a "
+#~ "different boot manager, just install LILO on the new Debian partition "
+#~ "instead."
+#~ msgstr ""
+#~ "Ð§Ñ‚Ð¾Ð±Ñ‹ Ð²Ð°ÑˆÐ° Ð½Ð¾Ð²Ð°Ñ ÑÐ¸ÑÑ‚ÐµÐ¼Ð° Debian ÑÐ¼Ð¾Ð³Ð»Ð° Ð·Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚ÑŒÑÑ, Ð½ÑƒÐ¶Ð½Ð¾ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ "
+#~ "Ð·Ð°Ð³Ñ€ÑƒÐ·Ñ‡Ð¸Ðº LILO. Ð£ÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ° LILO Ð² Ð³Ð»Ð°Ð²Ð½ÑƒÑŽ Ð·Ð°Ð³Ñ€ÑƒÐ·Ð¾Ñ‡Ð½ÑƒÑŽ Ð·Ð°Ð¿Ð¸ÑÑŒ (MBR) Ð´Ð¸ÑÐºÐ° "
+#~ "ÑÐ´ÐµÐ»Ð°ÐµÑ‚ LILO Ð¾ÑÐ½Ð¾Ð²Ð½Ñ‹Ð¼ Ð·Ð°Ð³Ñ€ÑƒÐ·Ñ‡Ð¸ÐºÐ¾Ð¼ Ð½Ð° Ð²Ð°ÑˆÐµÐ¼ ÐºÐ¾Ð¼Ð¿ÑŒÑŽÑ‚ÐµÑ€Ðµ. Ð•ÑÐ»Ð¸ Ð²Ñ‹ Ñ…Ð¾Ñ‚Ð¸Ñ‚Ðµ "
+#~ "Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ Ð´Ñ€ÑƒÐ³Ð¾Ð¹ Ð·Ð°Ð³Ñ€ÑƒÐ·Ñ‡Ð¸Ðº, ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚Ðµ LILO Ð² Ñ€Ð°Ð·Ð´ÐµÐ», Ð² ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ð¹ Ð²Ñ‹ "
+#~ "ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ð»Ð¸ Debian."
 
-#. Type: boolean
-#. Description
-#: ../lilo-installer.templates:56
-msgid ""
-"You should make this partition active unless you have another bootloader "
-"that will allow you to access your new Linux installation."
-msgstr ""
-"Ð’Ð°Ð¼ Ð»ÑƒÑ‡ÑˆÐµ Ð¿Ð¾Ð¼ÐµÑ‚Ð¸Ñ‚ÑŒ Ñ€Ð°Ð·Ð´ÐµÐ» ÐºÐ°Ðº Ð°ÐºÑ‚Ð¸Ð²Ð½Ñ‹Ð¹, ÐµÑÐ»Ð¸ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ð²Ñ‹ Ð½Ðµ ÑÐ¾Ð±Ð¸Ñ€Ð°ÐµÑ‚ÐµÑÑŒ "
-"Ð·Ð°Ð³Ñ€ÑƒÐ¶Ð°Ñ‚ÑŒ Debian Ð¿Ñ€Ð¸ Ð¿Ð¾Ð¼Ð¾Ñ‰Ð¸ ÐºÐ°ÐºÐ¾Ð³Ð¾-Ñ‚Ð¾ Ð´Ñ€ÑƒÐ³Ð¾Ð³Ð¾ Ð·Ð°Ð³Ñ€ÑƒÐ·Ñ‡Ð¸ÐºÐ°."
+#~ msgid ""
+#~ "Please enter the partition or disk which LILO should be installed onto. "
+#~ "Devfs style names, such as those that start with /dev/ide, /dev/scsi, "
+#~ "and /dev/discs are accepted, as well as traditional names, such as /dev/"
+#~ "hda or /dev/sda."
+#~ msgstr ""
+#~ "Ð£ÐºÐ°Ð¶Ð¸Ñ‚Ðµ, Ð² ÐºÐ°ÐºÐ¾Ð¹ Ñ€Ð°Ð·Ð´ÐµÐ» Ð½ÑƒÐ¶Ð½Ð¾ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ LILO. Ð’Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ñ‹ Ð¸Ð¼ÐµÐ½Ð° Ð² ÑÑ‚Ð¸Ð»Ðµ "
+#~ "Devfs (Ñ‚Ð¾ ÐµÑÑ‚ÑŒ Ð½Ð°Ñ‡Ð¸Ð½Ð°ÑŽÑ‰Ð¸ÐµÑÑ Ñ /dev/ide, /dev/scsi, Ð¸ /dev/discs) Ð¸ "
+#~ "Ñ‚Ñ€Ð°Ð´Ð¸Ñ†Ð¸Ð¾Ð½Ð½Ñ‹Ðµ Ð¸Ð¼ÐµÐ½Ð° (Ñ‚Ð°ÐºÐ¸Ðµ ÐºÐ°Ðº /dev/hda Ð¸Ð»Ð¸ /dev/sda)."
 
-#. Type: select
-#. Choices
-#: ../s390-netdevice.templates:3
-msgid ""
-"ctc: Channel to Channel (CTC) or ESCON connection, lcs: qeth: OSA-2 Token "
-"Ring/Ethernet or OSA-Express Fast Ethernet (non-QDIO), qeth: OSA-Express in "
-"QDIO mode / HiperSockets, iucv: Inter-User Communication Vehicle - available "
-"for VM guests only"
-msgstr ""
-"CTC: ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ðµ Channel to Channel (CTC) Ð¸Ð»Ð¸ ESCON, lcs: qeth: OSA-2 Token "
-"Ring/Ethernet Ð¸Ð»Ð¸ OSA-Express Fast Ethernet (Ð½Ðµ-QDIO), qeth: OSA-Express Ð² "
-"Ñ€ÐµÐ¶Ð¸Ð¼Ðµ QDIO / HiperSockets, iucv: Inter-User Communication Vehicle - "
-"Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ð¾ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ð´Ð»Ñ Ð³Ð¾ÑÑ‚ÐµÐ²Ñ‹Ñ… Ð¾Ð¿ÐµÑ€Ð°Ñ†Ð¸Ð¾Ð½Ð½Ñ‹Ñ… ÑÐ¸ÑÑ‚ÐµÐ¼ Ð² VM"
+#~ msgid ""
+#~ "You have chosen to install LILO on a partition that is not the active "
+#~ "one. If this partition is not marked active, then LILO will not be loaded "
+#~ "by the bootloader.  This may cause you to be unable to boot into the "
+#~ "system that is being installed."
+#~ msgstr ""
+#~ "Ð Ð°Ð·Ð´ÐµÐ», Ð½Ð° ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ð¹ Ð²Ñ‹ Ñ€ÐµÑˆÐ¸Ð»Ð¸ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ LILO, Ð½Ðµ Ð¿Ð¾Ð¼ÐµÑ‡ÐµÐ½ ÐºÐ°Ðº Ð°ÐºÑ‚Ð¸Ð²Ð½Ñ‹Ð¹. "
+#~ "ÐÑ‚Ð¾ Ð·Ð½Ð°Ñ‡Ð¸Ñ‚, Ñ‡Ñ‚Ð¾ LILO Ð½Ðµ Ð¿Ð¾Ð»ÑƒÑ‡Ð¸Ñ‚ ÑƒÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¸ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐµ Ð¸, ÑÐºÐ¾Ñ€ÐµÐµ Ð²ÑÐµÐ³Ð¾, "
+#~ "Ð²Ð°Ð¼ Ð½Ðµ ÑƒÐ´Ð°ÑÑ‚ÑÑ Ð·Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚ÑŒ ÑÐ¸ÑÑ‚ÐµÐ¼Ñƒ, ÐºÐ¾Ñ‚Ð¾Ñ€ÑƒÑŽ Ð²Ñ‹ ÑÐµÐ¹Ñ‡Ð°Ñ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ð»Ð¸."
 
-#. Type: note
-#. Description
-#: ../bugreporter-udeb.templates:8
-msgid "Log files and configuration info will be copied into this floppy."
-msgstr "ÐÐ° ÑÑ‚Ñƒ Ð´Ð¸ÑÐºÐµÑ‚Ñƒ Ð±ÑƒÐ´ÑƒÑ‚ ÑÐºÐ¾Ð¿Ð¸Ñ€Ð¾Ð²Ð°Ð½Ñ‹ Ñ„Ð°Ð¹Ð»Ñ‹ Ð¶ÑƒÑ€Ð½Ð°Ð»Ð° Ð¸ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾ ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ð¸."
+#~ msgid ""
+#~ "You should make this partition active unless you have another bootloader "
+#~ "that will allow you to access your new Linux installation."
+#~ msgstr ""
+#~ "Ð’Ð°Ð¼ Ð»ÑƒÑ‡ÑˆÐµ Ð¿Ð¾Ð¼ÐµÑ‚Ð¸Ñ‚ÑŒ Ñ€Ð°Ð·Ð´ÐµÐ» ÐºÐ°Ðº Ð°ÐºÑ‚Ð¸Ð²Ð½Ñ‹Ð¹, ÐµÑÐ»Ð¸ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ð²Ñ‹ Ð½Ðµ ÑÐ¾Ð±Ð¸Ñ€Ð°ÐµÑ‚ÐµÑÑŒ "
+#~ "Ð·Ð°Ð³Ñ€ÑƒÐ¶Ð°Ñ‚ÑŒ Debian Ð¿Ñ€Ð¸ Ð¿Ð¾Ð¼Ð¾Ñ‰Ð¸ ÐºÐ°ÐºÐ¾Ð³Ð¾-Ñ‚Ð¾ Ð´Ñ€ÑƒÐ³Ð¾Ð³Ð¾ Ð·Ð°Ð³Ñ€ÑƒÐ·Ñ‡Ð¸ÐºÐ°."
 
-#. Type: note
-#. Description
-#: ../bugreporter-udeb.templates:8
-msgid ""
-"The information will also be stored in /var/log/debian-installer/ on the "
-"installed system, and on a floppy if the floppy device was found."
-msgstr ""
-"ÐÑ‚Ð° Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð±ÑƒÐ´ÐµÑ‚ Ñ‚Ð°ÐºÐ¶Ðµ Ð·Ð°Ð¿Ð¸ÑÐ°Ð½Ð° Ð² ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³ /var/log/debian-installer/ Ð² "
-"ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ð¾Ð¹ ÑÐ¸ÑÑ‚ÐµÐ¼Ðµ Ð¸ Ð½Ð° Ð´Ð¸ÑÐºÐµÑ‚Ñƒ, ÐµÑÐ»Ð¸ Ð´Ð¸ÑÐºÐ¾Ð²Ð¾Ð´ Ð±Ñ‹Ð» Ð½Ð°Ð¹Ð´ÐµÐ½."
+#~ msgid ""
+#~ "ctc: Channel to Channel (CTC) or ESCON connection, lcs: qeth: OSA-2 Token "
+#~ "Ring/Ethernet or OSA-Express Fast Ethernet (non-QDIO), qeth: OSA-Express "
+#~ "in QDIO mode / HiperSockets, iucv: Inter-User Communication Vehicle - "
+#~ "available for VM guests only"
+#~ msgstr ""
+#~ "CTC: ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ðµ Channel to Channel (CTC) Ð¸Ð»Ð¸ ESCON, lcs: qeth: OSA-2 "
+#~ "Token Ring/Ethernet Ð¸Ð»Ð¸ OSA-Express Fast Ethernet (Ð½Ðµ-QDIO), qeth: OSA-"
+#~ "Express Ð² Ñ€ÐµÐ¶Ð¸Ð¼Ðµ QDIO / HiperSockets, iucv: Inter-User Communication "
+#~ "Vehicle - Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ð¾ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ð´Ð»Ñ Ð³Ð¾ÑÑ‚ÐµÐ²Ñ‹Ñ… Ð¾Ð¿ÐµÑ€Ð°Ñ†Ð¸Ð¾Ð½Ð½Ñ‹Ñ… ÑÐ¸ÑÑ‚ÐµÐ¼ Ð² VM"
 
-#. Type: note
-#. Description
-#: ../bugreporter-udeb.templates:16
-msgid "Unable to find any floppy device"
-msgstr "Ð”Ð¸ÑÐºÐ¾Ð²Ð¾Ð´ Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½"
+#~ msgid "Log files and configuration info will be copied into this floppy."
+#~ msgstr ""
+#~ "ÐÐ° ÑÑ‚Ñƒ Ð´Ð¸ÑÐºÐµÑ‚Ñƒ Ð±ÑƒÐ´ÑƒÑ‚ ÑÐºÐ¾Ð¿Ð¸Ñ€Ð¾Ð²Ð°Ð½Ñ‹ Ñ„Ð°Ð¹Ð»Ñ‹ Ð¶ÑƒÑ€Ð½Ð°Ð»Ð° Ð¸ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾ "
+#~ "ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ð¸."
 
-#. Type: note
-#. Description
-#: ../bugreporter-udeb.templates:16
-msgid ""
-"No floppy device was found. If this computer has a floppy drive, it is "
-"probably a bug in the bugreporter-udeb package that got you here."
-msgstr ""
-"Ð”Ð¸ÑÐºÐ¾Ð²Ð¾Ð´ Ð½Ðµ Ð±Ñ‹Ð» Ð½Ð°Ð¹Ð´ÐµÐ½. Ð•ÑÐ»Ð¸ ÑÑ‚Ð¾Ñ‚ ÐºÐ¾Ð¼Ð¿ÑŒÑŽÑ‚ÐµÑ€ Ð¾ÑÐ½Ð°Ñ‰Ñ‘Ð½ Ð´Ð¸ÑÐºÐ¾Ð²Ð¾Ð´Ð¾Ð¼, Ñ‚Ð¾, "
-"Ð²ÐµÑ€Ð¾ÑÑ‚Ð½ÐµÐµ Ð²ÑÐµÐ³Ð¾, Ð²Ñ‹ Ð½Ð°ÑˆÐ»Ð¸ Ð¾ÑˆÐ¸Ð±ÐºÑƒ Ð² Ð¿Ð°ÐºÐµÑ‚Ðµ bugreporter-udeb."
+#~ msgid ""
+#~ "The information will also be stored in /var/log/debian-installer/ on the "
+#~ "installed system, and on a floppy if the floppy device was found."
+#~ msgstr ""
+#~ "ÐÑ‚Ð° Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð±ÑƒÐ´ÐµÑ‚ Ñ‚Ð°ÐºÐ¶Ðµ Ð·Ð°Ð¿Ð¸ÑÐ°Ð½Ð° Ð² ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³ /var/log/debian-installer/ "
+#~ "Ð² ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ð¾Ð¹ ÑÐ¸ÑÑ‚ÐµÐ¼Ðµ Ð¸ Ð½Ð° Ð´Ð¸ÑÐºÐµÑ‚Ñƒ, ÐµÑÐ»Ð¸ Ð´Ð¸ÑÐºÐ¾Ð²Ð¾Ð´ Ð±Ñ‹Ð» Ð½Ð°Ð¹Ð´ÐµÐ½."
 
-#. Type: note
-#. Description
-#: ../bugreporter-udeb.templates:16
-msgid "Note: USB floppies are not supported at the moment."
-msgstr "ÐŸÑ€Ð¸Ð¼ÐµÑ‡Ð°Ð½Ð¸Ðµ: USB-Ð´Ð¸ÑÐºÐ¾Ð²Ð¾Ð´Ñ‹ Ð¿Ð¾ÐºÐ° Ð½Ðµ Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶Ð¸Ð²Ð°ÑŽÑ‚ÑÑ"
+#~ msgid "Unable to find any floppy device"
+#~ msgstr "Ð”Ð¸ÑÐºÐ¾Ð²Ð¾Ð´ Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½"
 
-#. Type: note
-#. Description
-#: ../nobootloader.templates:8
-msgid ""
-"Some variables need to be set in the Pegasos OpenFirmware in order for your "
-"system to boot Debian automatically.  At the end of the installation, the "
-"system will reboot.  At the Pegasos OpenFirmware prompt, set the following "
-"OpenFirmware variables to enable auto-booting:"
-msgstr ""
-"Ð”Ð»Ñ Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡ÐµÑÐºÐ¾Ð³Ð¾ Ð·Ð°Ð¿ÑƒÑÐºÐ° Debian Ñ‚Ñ€ÐµÐ±ÑƒÐµÑ‚ÑÑ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ðµ Ð¿ÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ñ‹Ðµ "
-"Ð² Pegasos OpenFirmware. Ð’ ÐºÐ¾Ð½Ñ†Ðµ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸, ÑÐ¸ÑÑ‚ÐµÐ¼Ð° Ð±ÑƒÐ´ÐµÑ‚ Ð¿ÐµÑ€ÐµÐ·Ð°Ð³Ñ€ÑƒÐ¶ÐµÐ½Ð°. Ð˜Ð· "
-"Ð¿Ñ€Ð¸Ð³Ð»Ð°ÑˆÐµÐ½Ð¸Ñ Pegasos OpenFirmware ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚Ðµ ÑÐ»ÐµÐ´ÑƒÑŽÑ‰Ð¸Ðµ Ð¿ÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ñ‹Ðµ Ð´Ð»Ñ "
-"Ð°Ð²Ñ‚Ð¾Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸:"
+#~ msgid ""
+#~ "No floppy device was found. If this computer has a floppy drive, it is "
+#~ "probably a bug in the bugreporter-udeb package that got you here."
+#~ msgstr ""
+#~ "Ð”Ð¸ÑÐºÐ¾Ð²Ð¾Ð´ Ð½Ðµ Ð±Ñ‹Ð» Ð½Ð°Ð¹Ð´ÐµÐ½. Ð•ÑÐ»Ð¸ ÑÑ‚Ð¾Ñ‚ ÐºÐ¾Ð¼Ð¿ÑŒÑŽÑ‚ÐµÑ€ Ð¾ÑÐ½Ð°Ñ‰Ñ‘Ð½ Ð´Ð¸ÑÐºÐ¾Ð²Ð¾Ð´Ð¾Ð¼, Ñ‚Ð¾, "
+#~ "Ð²ÐµÑ€Ð¾ÑÑ‚Ð½ÐµÐµ Ð²ÑÐµÐ³Ð¾, Ð²Ñ‹ Ð½Ð°ÑˆÐ»Ð¸ Ð¾ÑˆÐ¸Ð±ÐºÑƒ Ð² Ð¿Ð°ÐºÐµÑ‚Ðµ bugreporter-udeb."
 
-#. Type: note
-#. Description
-#: ../nobootloader.templates:30
-msgid ""
-"Some variables need to be set in the Netwinder NeTTrom firmware in order for "
-"your system to boot Debian automatically.  At the end of this installation "
-"stage, the system will reboot, and the firmware will attempt to autoboot.  "
-"You can abort this by pressing any key. You will then be dropped into the "
-"NeTTrom command system where you have to execute the following commands:"
-msgstr ""
-"Ð”Ð»Ñ Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡ÐµÑÐºÐ¾Ð³Ð¾ Ð·Ð°Ð¿ÑƒÑÐºÐ° Debian Ñ‚Ñ€ÐµÐ±ÑƒÐµÑ‚ÑÑ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ðµ Ð¿ÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ñ‹Ðµ "
-"Ð² Netwinder NeTTrom firmware. Ð’ ÐºÐ¾Ð½Ñ†Ðµ ÑÑ‚Ð¾Ð¹ ÑÑ‚Ð°Ð´Ð¸Ð¸ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸, ÑÐ¸ÑÑ‚ÐµÐ¼Ð° Ð±ÑƒÐ´ÐµÑ‚ "
-"Ð¿ÐµÑ€ÐµÐ·Ð°Ð³Ñ€ÑƒÐ¶ÐµÐ½Ð°, Ð¸ Ð±ÑƒÐ´ÐµÑ‚ Ð¿Ñ€Ð¾Ð¸Ð·Ð²ÐµÐ´ÐµÐ½Ð° Ð¿Ð¾Ð¿Ñ‹Ñ‚ÐºÐ° Ð°Ð²Ñ‚Ð¾Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸ Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ firmware."
-"Ð’Ñ‹ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð¾Ñ‚Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ ÑÑ‚Ð¾, Ð½Ð°Ð¶Ð°Ð² Ð»ÑŽÐ±ÑƒÑŽ ÐºÐ»Ð°Ð²Ð¸ÑˆÑƒ. Ð—Ð°Ñ‚ÐµÐ¼ Ð²Ñ‹ Ð¿Ð¾Ð¿Ð°Ð´Ñ‘Ñ‚Ðµ Ð² ÐºÐ¾Ð¼Ð°Ð½Ð´Ð½ÑƒÑŽ "
-"ÑÐ¸ÑÑ‚ÐµÐ¼Ñƒ NeTTrom, Ð³Ð´Ðµ Ð²Ñ‹Ð¿Ð¾Ð»Ð½Ð¸Ñ‚Ðµ ÑÐ»ÐµÐ´ÑƒÑŽÑ‰Ð¸Ðµ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ‹:"
+#~ msgid "Note: USB floppies are not supported at the moment."
+#~ msgstr "ÐŸÑ€Ð¸Ð¼ÐµÑ‡Ð°Ð½Ð¸Ðµ: USB-Ð´Ð¸ÑÐºÐ¾Ð²Ð¾Ð´Ñ‹ Ð¿Ð¾ÐºÐ° Ð½Ðµ Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶Ð¸Ð²Ð°ÑŽÑ‚ÑÑ"
 
-#. Type: note
-#. Description
-#: ../nobootloader.templates:50
-msgid ""
-"You will need to boot manually with the ${KERNEL} kernel on partition "
-"${BOOT} and ${ROOT} passed as kernel argument."
-msgstr ""
-"Ð’Ð°Ð¼ Ð¿Ñ€Ð¸Ð´ÐµÑ‚ÑÑ Ð·Ð°Ð³Ñ€ÑƒÐ¶Ð°Ñ‚ÑŒ ÑÐ´Ñ€Ð¾ ${KERNEL} Ð²Ñ€ÑƒÑ‡Ð½ÑƒÑŽ Ð¸ Ð¿ÐµÑ€ÐµÐ´Ð°Ñ‚ÑŒ ÐµÐ¼Ñƒ Ð² ÐºÐ°Ñ‡ÐµÑÑ‚Ð²Ðµ "
-"Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ð° ${BOOT} Ð¸ ${ROOT}."
+#~ msgid ""
+#~ "Some variables need to be set in the Pegasos OpenFirmware in order for "
+#~ "your system to boot Debian automatically.  At the end of the "
+#~ "installation, the system will reboot.  At the Pegasos OpenFirmware "
+#~ "prompt, set the following OpenFirmware variables to enable auto-booting:"
+#~ msgstr ""
+#~ "Ð”Ð»Ñ Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡ÐµÑÐºÐ¾Ð³Ð¾ Ð·Ð°Ð¿ÑƒÑÐºÐ° Debian Ñ‚Ñ€ÐµÐ±ÑƒÐµÑ‚ÑÑ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ðµ "
+#~ "Ð¿ÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ñ‹Ðµ Ð² Pegasos OpenFirmware. Ð’ ÐºÐ¾Ð½Ñ†Ðµ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸, ÑÐ¸ÑÑ‚ÐµÐ¼Ð° Ð±ÑƒÐ´ÐµÑ‚ "
+#~ "Ð¿ÐµÑ€ÐµÐ·Ð°Ð³Ñ€ÑƒÐ¶ÐµÐ½Ð°. Ð˜Ð· Ð¿Ñ€Ð¸Ð³Ð»Ð°ÑˆÐµÐ½Ð¸Ñ Pegasos OpenFirmware ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚Ðµ ÑÐ»ÐµÐ´ÑƒÑŽÑ‰Ð¸Ðµ "
+#~ "Ð¿ÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ñ‹Ðµ Ð´Ð»Ñ Ð°Ð²Ñ‚Ð¾Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸:"
 
-#. Type: boolean
-#. Description
-#: ../templates:58
-msgid ""
-"Your root file system is a JFS file system. This can cause problems with the "
-"bootloader used by default by this installer."
-msgstr ""
-"Ð’Ð°Ñˆ ÐºÐ¾Ñ€Ð½ÐµÐ²Ð¾Ð¹ Ñ€Ð°Ð·Ð´ÐµÐ» ÑÐ¾Ð´ÐµÑ€Ð¶Ð¸Ñ‚ Ñ„Ð°Ð¹Ð»Ð¾Ð²ÑƒÑŽ ÑÐ¸ÑÑ‚ÐµÐ¼Ñƒ JFS. ÐÑ‚Ð¾ Ð¼Ð¾Ð¶ÐµÑ‚ Ð²Ñ‹Ð·Ð²Ð°Ñ‚ÑŒ "
-"Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ñ‹ Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·Ñ‡Ð¸ÐºÐ¾Ð¼, ÑƒÑÑ‚Ð°Ð½Ð°Ð²Ð»Ð¸Ð²Ð°ÐµÐ¼Ñ‹Ð¼ Ð¿Ð¾ ÑƒÐ¼Ð¾Ð»Ñ‡Ð°Ð½Ð¸ÑŽ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð¾Ð¹ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸."
+#~ msgid ""
+#~ "Some variables need to be set in the Netwinder NeTTrom firmware in order "
+#~ "for your system to boot Debian automatically.  At the end of this "
+#~ "installation stage, the system will reboot, and the firmware will attempt "
+#~ "to autoboot.  You can abort this by pressing any key. You will then be "
+#~ "dropped into the NeTTrom command system where you have to execute the "
+#~ "following commands:"
+#~ msgstr ""
+#~ "Ð”Ð»Ñ Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡ÐµÑÐºÐ¾Ð³Ð¾ Ð·Ð°Ð¿ÑƒÑÐºÐ° Debian Ñ‚Ñ€ÐµÐ±ÑƒÐµÑ‚ÑÑ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ðµ "
+#~ "Ð¿ÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ñ‹Ðµ Ð² Netwinder NeTTrom firmware. Ð’ ÐºÐ¾Ð½Ñ†Ðµ ÑÑ‚Ð¾Ð¹ ÑÑ‚Ð°Ð´Ð¸Ð¸ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸, "
+#~ "ÑÐ¸ÑÑ‚ÐµÐ¼Ð° Ð±ÑƒÐ´ÐµÑ‚ Ð¿ÐµÑ€ÐµÐ·Ð°Ð³Ñ€ÑƒÐ¶ÐµÐ½Ð°, Ð¸ Ð±ÑƒÐ´ÐµÑ‚ Ð¿Ñ€Ð¾Ð¸Ð·Ð²ÐµÐ´ÐµÐ½Ð° Ð¿Ð¾Ð¿Ñ‹Ñ‚ÐºÐ° Ð°Ð²Ñ‚Ð¾Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸ Ñ "
+#~ "Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ firmware.Ð’Ñ‹ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð¾Ñ‚Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ ÑÑ‚Ð¾, Ð½Ð°Ð¶Ð°Ð² Ð»ÑŽÐ±ÑƒÑŽ ÐºÐ»Ð°Ð²Ð¸ÑˆÑƒ. Ð—Ð°Ñ‚ÐµÐ¼ Ð²Ñ‹ "
+#~ "Ð¿Ð¾Ð¿Ð°Ð´Ñ‘Ñ‚Ðµ Ð² ÐºÐ¾Ð¼Ð°Ð½Ð´Ð½ÑƒÑŽ ÑÐ¸ÑÑ‚ÐµÐ¼Ñƒ NeTTrom, Ð³Ð´Ðµ Ð²Ñ‹Ð¿Ð¾Ð»Ð½Ð¸Ñ‚Ðµ ÑÐ»ÐµÐ´ÑƒÑŽÑ‰Ð¸Ðµ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ‹:"
 
-#. Type: boolean
-#. Description
-#: ../templates:67
-msgid ""
-"You have mounted a JFS file system as /boot. This is likely to cause "
-"problems with the GRUB bootloader used by default by this installer; you "
-"might experience problems installing or booting GRUB."
-msgstr ""
-"Ð’Ñ‹ ÑÐ¼Ð¾Ð½Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð»Ð¸ Ñ„Ð°Ð¹Ð»Ð¾Ð²ÑƒÑŽ ÑÐ¸ÑÑ‚ÐµÐ¼Ñƒ JFS Ð² /boot. ÐÑ‚Ð¾, Ð¿Ð¾ Ð²ÑÐµÐ¹ Ð²ÐµÑ€Ð¾ÑÑ‚Ð½Ð¾ÑÑ‚Ð¸, "
-"Ð²Ñ‹Ð·Ð¾Ð²ÐµÑ‚ Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ñ‹ Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·Ñ‡Ð¸ÐºÐ¾Ð¼ GRUB, ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ð¹ ÑƒÑÑ‚Ð°Ð½Ð°Ð²Ð»Ð¸Ð²Ð°ÐµÑ‚ÑÑ Ð¿Ð¾ ÑƒÐ¼Ð¾Ð»Ñ‡Ð°Ð½Ð¸ÑŽ; Ñƒ "
-"Ð²Ð°Ñ Ð¼Ð¾Ð³ÑƒÑ‚ Ð²Ð¾Ð·Ð½Ð¸ÐºÐ½ÑƒÑ‚ÑŒ Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ñ‹ Ð¿Ñ€Ð¸ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐµ Ð¸Ð»Ð¸ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐµ GRUB."
+#~ msgid ""
+#~ "You will need to boot manually with the ${KERNEL} kernel on partition "
+#~ "${BOOT} and ${ROOT} passed as kernel argument."
+#~ msgstr ""
+#~ "Ð’Ð°Ð¼ Ð¿Ñ€Ð¸Ð´ÐµÑ‚ÑÑ Ð·Ð°Ð³Ñ€ÑƒÐ¶Ð°Ñ‚ÑŒ ÑÐ´Ñ€Ð¾ ${KERNEL} Ð²Ñ€ÑƒÑ‡Ð½ÑƒÑŽ Ð¸ Ð¿ÐµÑ€ÐµÐ´Ð°Ñ‚ÑŒ ÐµÐ¼Ñƒ Ð² ÐºÐ°Ñ‡ÐµÑÑ‚Ð²Ðµ "
+#~ "Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ð° ${BOOT} Ð¸ ${ROOT}."
 
-#. Type: note
-#. Description
-#: ../templates:3
-msgid ""
-"Partitioning a hard drive consists of dividing it to create the space needed "
-"to install your new Debian system.  You need to choose which partition(s) "
-"will be used for the installation of Debian."
-msgstr ""
-"Ð Ð°Ð·Ð¼ÐµÑ‚ÐºÐ° Ð´Ð¸ÑÐºÐ° Ð·Ð°ÐºÐ»ÑŽÑ‡Ð°ÐµÑ‚ÑÑ Ð² Ð²Ñ‹Ð´ÐµÐ»ÐµÐ½Ð¸Ð¸ Ð½Ð° Ð´Ð¸ÑÐºÐµ Ð¾Ð±Ð»Ð°ÑÑ‚Ð¸, Ñ‚Ñ€ÐµÐ±ÑƒÐµÐ¼Ð¾Ð¹ Ð´Ð»Ñ "
-"ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸ Debian. Ð’Ð°Ð¼ Ð½ÑƒÐ¶Ð½Ð¾ Ð²Ñ‹Ð±Ñ€Ð°Ñ‚ÑŒ ÐºÐ°ÐºÐ¾Ð¹(Ð¸Ðµ) Ñ€Ð°Ð·Ð´ÐµÐ»(Ñ‹) Ð±ÑƒÐ´ÐµÑ‚ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒÑÑ "
-"Ð´Ð»Ñ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸ Debian."
+#~ msgid ""
+#~ "Your root file system is a JFS file system. This can cause problems with "
+#~ "the bootloader used by default by this installer."
+#~ msgstr ""
+#~ "Ð’Ð°Ñˆ ÐºÐ¾Ñ€Ð½ÐµÐ²Ð¾Ð¹ Ñ€Ð°Ð·Ð´ÐµÐ» ÑÐ¾Ð´ÐµÑ€Ð¶Ð¸Ñ‚ Ñ„Ð°Ð¹Ð»Ð¾Ð²ÑƒÑŽ ÑÐ¸ÑÑ‚ÐµÐ¼Ñƒ JFS. ÐÑ‚Ð¾ Ð¼Ð¾Ð¶ÐµÑ‚ Ð²Ñ‹Ð·Ð²Ð°Ñ‚ÑŒ "
+#~ "Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ñ‹ Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·Ñ‡Ð¸ÐºÐ¾Ð¼, ÑƒÑÑ‚Ð°Ð½Ð°Ð²Ð»Ð¸Ð²Ð°ÐµÐ¼Ñ‹Ð¼ Ð¿Ð¾ ÑƒÐ¼Ð¾Ð»Ñ‡Ð°Ð½Ð¸ÑŽ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð¾Ð¹ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸."
 
-#. Type: note
-#. Description
-#: ../templates:3
-msgid ""
-"Select a partition to remove it or to specify how Debian is going to use "
-"it.  At a bare minimum, Debian needs one partition to contain the root of "
-"the file system (whose mount point is /).  Most people also feel that a "
-"separate swap partition is a necessity.  \"Swap\" is scratch space for an "
-"operating system, which allows the system to use disk storage as \"virtual "
-"memory\"."
-msgstr ""
-"Ð’Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ Ñ€Ð°Ð·Ð´ÐµÐ» Ð´Ð»Ñ ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ Ð¸Ð»Ð¸ Ñ‡Ñ‚Ð¾Ð±Ñ‹ ÑƒÐºÐ°Ð·Ð°Ñ‚ÑŒ, ÐºÐ°Ðº Debian Ð±ÑƒÐ´ÐµÑ‚ ÐµÐ³Ð¾ "
-"Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ. Debian ÐºÐ°Ðº Ð¼Ð¸Ð½Ð¸Ð¼ÑƒÐ¼ Ð½ÑƒÐ¶ÐµÐ½ Ð¾Ð´Ð¸Ð½ Ñ€Ð°Ð·Ð´ÐµÐ», ÑÐ¾Ð´ÐµÑ€Ð¶Ð°Ñ‰Ð¸Ð¹ Ñ‚.Ð½. ÐºÐ¾Ñ€ÐµÐ½ÑŒ "
-"Ñ„Ð°Ð¹Ð»Ð¾Ð²Ð¾Ð¹ ÑÐ¸ÑÑ‚ÐµÐ¼Ñ‹ (Ñ‚Ð¾Ñ‡ÐºÐ° Ð¼Ð¾Ð½Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ /). ÐœÐ½Ð¾Ð³Ð¸Ðµ ÑÑ‡Ð¸Ñ‚Ð°ÑŽÑ‚, Ñ‡Ñ‚Ð¾ Ñ‚Ð°ÐºÐ¶Ðµ Ð½ÑƒÐ¶ÐµÐ½ "
-"Ð¾Ñ‚Ð´ÐµÐ»ÑŒÐ½Ñ‹Ð¹ Ñ€Ð°Ð·Ð´ÐµÐ» Ð¿Ð¾Ð´ÐºÐ°Ñ‡ÐºÐ¸. \"ÐŸÐ¾Ð´ÐºÐ°Ñ‡ÐºÐ°\" -- Ð¼ÐµÑÑ‚Ð¾ Ð½Ð° Ð¶Ñ‘ÑÑ‚ÐºÐ¾Ð¼ Ð´Ð¸ÑÐºÐµ Ð±ÐµÐ· "
-"Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»Ñ‘Ð½Ð½Ð¾Ð¹ ÑÑ‚Ñ€ÑƒÐºÑ‚ÑƒÑ€Ñ‹, ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ðµ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐµÑ‚ÑÑ Ñ„Ð°Ð¹Ð»Ð¾Ð²Ð¾Ð¹ ÑÐ¸ÑÑ‚ÐµÐ¼Ð¾Ð¹ Ð² ÐºÐ°Ñ‡ÐµÑÑ‚Ð²Ðµ "
-"\"Ð²Ð¸Ñ€Ñ‚ÑƒÐ°Ð»ÑŒÐ½Ð¾Ð¹ Ð¿Ð°Ð¼ÑÑ‚Ð¸\" Ð½Ð° Ð¶Ñ‘ÑÑ‚ÐºÐ¾Ð¼ Ð´Ð¸ÑÐºÐµ."
+#~ msgid ""
+#~ "You have mounted a JFS file system as /boot. This is likely to cause "
+#~ "problems with the GRUB bootloader used by default by this installer; you "
+#~ "might experience problems installing or booting GRUB."
+#~ msgstr ""
+#~ "Ð’Ñ‹ ÑÐ¼Ð¾Ð½Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð»Ð¸ Ñ„Ð°Ð¹Ð»Ð¾Ð²ÑƒÑŽ ÑÐ¸ÑÑ‚ÐµÐ¼Ñƒ JFS Ð² /boot. ÐÑ‚Ð¾, Ð¿Ð¾ Ð²ÑÐµÐ¹ Ð²ÐµÑ€Ð¾ÑÑ‚Ð½Ð¾ÑÑ‚Ð¸, "
+#~ "Ð²Ñ‹Ð·Ð¾Ð²ÐµÑ‚ Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ñ‹ Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·Ñ‡Ð¸ÐºÐ¾Ð¼ GRUB, ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ð¹ ÑƒÑÑ‚Ð°Ð½Ð°Ð²Ð»Ð¸Ð²Ð°ÐµÑ‚ÑÑ Ð¿Ð¾ "
+#~ "ÑƒÐ¼Ð¾Ð»Ñ‡Ð°Ð½Ð¸ÑŽ; Ñƒ Ð²Ð°Ñ Ð¼Ð¾Ð³ÑƒÑ‚ Ð²Ð¾Ð·Ð½Ð¸ÐºÐ½ÑƒÑ‚ÑŒ Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ñ‹ Ð¿Ñ€Ð¸ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐµ Ð¸Ð»Ð¸ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐµ "
+#~ "GRUB."
 
-#. Type: note
-#. Description
-#: ../templates:3
-msgid ""
-"When the partition is already formatted you may choose to keep and use the "
-"existing data in the partition.  Partitions that will be used in this way "
-"are marked with \"${KEEP}\" in the main partitioning menu. NOTE: this "
-"installer doesn't allow you to install over an existing GNU/Linux system "
-"overwriting system files."
-msgstr ""
-"Ð•ÑÐ»Ð¸ Ñ€Ð°Ð·Ð´ÐµÐ» ÑƒÐ¶Ðµ ÑÐ¾Ð´ÐµÑ€Ð¶Ð¸Ñ‚ Ñ„Ð°Ð¹Ð»Ð¾Ð²ÑƒÑŽ ÑÐ¸ÑÑ‚ÐµÐ¼Ñƒ, Ð²Ñ‹ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð¾ÑÑ‚Ð°Ð²Ð¸Ñ‚ÑŒ Ð¸ "
-"Ð²Ð¾ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒÑÑ ÑƒÐ¶Ðµ ÑÑƒÑ‰ÐµÑÑ‚Ð²ÑƒÑŽÑ‰Ð¸Ð¼Ð¸ Ð² Ñ€Ð°Ð·Ð´ÐµÐ»Ðµ Ð´Ð°Ð½Ð½Ñ‹Ð¼Ð¸. ÐŸÐ¾Ð´Ð¾Ð±Ð½Ñ‹Ðµ Ñ€Ð°Ð·Ð´ÐµÐ»Ñ‹ "
-"Ð¿Ð¾Ð¼ÐµÑ‡ÐµÐ½Ñ‹ \"${KEEP}\" Ð² Ð³Ð»Ð°Ð²Ð½Ð¾Ð¼ Ð¼ÐµÐ½ÑŽ Ñ€Ð°Ð·Ð¼ÐµÑ‚ÐºÐ¸ Ð´Ð¸ÑÐºÐ¾Ð². Ð’ÐÐ˜ÐœÐÐÐ˜Ð•: Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð° "
-"ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸ Ð½Ðµ Ð¿Ð¾Ð·Ð²Ð¾Ð»ÑÐµÑ‚ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ ÑÐ¸ÑÑ‚ÐµÐ¼Ñƒ Ð¿Ð¾Ð²ÐµÑ€Ñ… ÑƒÐ¶Ðµ ÑÑƒÑ‰ÐµÑÑ‚Ð²ÑƒÑŽÑ‰ÐµÐ¹ Linux-"
-"ÑÐ¸ÑÑ‚ÐµÐ¼Ñ‹."
+#~ msgid ""
+#~ "Partitioning a hard drive consists of dividing it to create the space "
+#~ "needed to install your new Debian system.  You need to choose which "
+#~ "partition(s) will be used for the installation of Debian."
+#~ msgstr ""
+#~ "Ð Ð°Ð·Ð¼ÐµÑ‚ÐºÐ° Ð´Ð¸ÑÐºÐ° Ð·Ð°ÐºÐ»ÑŽÑ‡Ð°ÐµÑ‚ÑÑ Ð² Ð²Ñ‹Ð´ÐµÐ»ÐµÐ½Ð¸Ð¸ Ð½Ð° Ð´Ð¸ÑÐºÐµ Ð¾Ð±Ð»Ð°ÑÑ‚Ð¸, Ñ‚Ñ€ÐµÐ±ÑƒÐµÐ¼Ð¾Ð¹ Ð´Ð»Ñ "
+#~ "ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸ Debian. Ð’Ð°Ð¼ Ð½ÑƒÐ¶Ð½Ð¾ Ð²Ñ‹Ð±Ñ€Ð°Ñ‚ÑŒ ÐºÐ°ÐºÐ¾Ð¹(Ð¸Ðµ) Ñ€Ð°Ð·Ð´ÐµÐ»(Ñ‹) Ð±ÑƒÐ´ÐµÑ‚ "
+#~ "Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒÑÑ Ð´Ð»Ñ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸ Debian."
 
-#. Type: text
-#. Description
-#: ../templates:36
-msgid ""
-"In order to start your new Debian system, a so called boot loader is used.  "
-"It can be installed either in the master boot record of the first hard disk, "
-"or in a partition.  When the boot loader is installed in a partition, you "
-"must set the bootable flag for it. Such a partition will be marked with "
-"\"${BOOTABLE}\" in the main partitioning menu."
-msgstr ""
-"Ð§Ñ‚Ð¾Ð±Ñ‹ Ð·Ð°Ð¿ÑƒÑÑ‚Ð¸Ñ‚ÑŒ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½ÑƒÑŽ ÑÐ¸ÑÑ‚ÐµÐ¼Ñƒ Debian, Ð½ÐµÐ¾Ð±Ñ…Ð¾Ð´Ð¸Ð¼ Ñ‚Ð°Ðº Ð½Ð°Ð·Ñ‹Ð²Ð°ÐµÐ¼Ñ‹Ð¹ "
-"Ð·Ð°Ð³Ñ€ÑƒÐ·Ñ‡Ð¸Ðº. ÐžÐ½ Ð¼Ð¾Ð¶ÐµÑ‚ Ð±Ñ‹Ñ‚ÑŒ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½ Ð»Ð¸Ð±Ð¾ Ð² Ð³Ð»Ð°Ð²Ð½ÑƒÑŽ Ð·Ð°Ð³Ñ€ÑƒÐ·Ð¾Ñ‡Ð½ÑƒÑŽ Ð·Ð°Ð¿Ð¸ÑÑŒ "
-"Ð¿ÐµÑ€Ð²Ð¾Ð³Ð¾ Ð¶Ñ‘ÑÑ‚ÐºÐ¾Ð³Ð¾ Ð´Ð¸ÑÐºÐ°, Ð»Ð¸Ð±Ð¾ Ð² Ñ€Ð°Ð·Ð´ÐµÐ». ÐŸÑ€Ð¸ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐµ Ð² Ñ€Ð°Ð·Ð´ÐµÐ», Ð´Ð»Ñ ÑÑ‚Ð¾Ð³Ð¾ "
-"Ñ€Ð°Ð·Ð´ÐµÐ»Ð° Ð½ÑƒÐ¶Ð½Ð¾ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ Ð¼ÐµÑ‚ÐºÑƒ \"Ð·Ð°Ð³Ñ€ÑƒÐ·Ð¾Ñ‡Ð½Ñ‹Ð¹\". Ð’ Ñ‚Ð°ÐºÐ¾Ð¼ ÑÐ»ÑƒÑ‡Ð°Ðµ ÑÑ‚Ð¾Ñ‚ Ñ€Ð°Ð·Ð´ÐµÐ» "
-"Ð±ÑƒÐ´ÐµÑ‚ Ð¿Ð¾Ð¼ÐµÑ‡ÐµÐ½ \"${BOOTABLE}\" Ð² Ð³Ð»Ð°Ð²Ð½Ð¾Ð¼ Ð¼ÐµÐ½ÑŽ Ñ€Ð°Ð·Ð¼ÐµÑ‚ÐºÐ¸."
+#~ msgid ""
+#~ "Select a partition to remove it or to specify how Debian is going to use "
+#~ "it.  At a bare minimum, Debian needs one partition to contain the root of "
+#~ "the file system (whose mount point is /).  Most people also feel that a "
+#~ "separate swap partition is a necessity.  \"Swap\" is scratch space for an "
+#~ "operating system, which allows the system to use disk storage as "
+#~ "\"virtual memory\"."
+#~ msgstr ""
+#~ "Ð’Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ Ñ€Ð°Ð·Ð´ÐµÐ» Ð´Ð»Ñ ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ Ð¸Ð»Ð¸ Ñ‡Ñ‚Ð¾Ð±Ñ‹ ÑƒÐºÐ°Ð·Ð°Ñ‚ÑŒ, ÐºÐ°Ðº Debian Ð±ÑƒÐ´ÐµÑ‚ ÐµÐ³Ð¾ "
+#~ "Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ. Debian ÐºÐ°Ðº Ð¼Ð¸Ð½Ð¸Ð¼ÑƒÐ¼ Ð½ÑƒÐ¶ÐµÐ½ Ð¾Ð´Ð¸Ð½ Ñ€Ð°Ð·Ð´ÐµÐ», ÑÐ¾Ð´ÐµÑ€Ð¶Ð°Ñ‰Ð¸Ð¹ Ñ‚.Ð½. "
+#~ "ÐºÐ¾Ñ€ÐµÐ½ÑŒ Ñ„Ð°Ð¹Ð»Ð¾Ð²Ð¾Ð¹ ÑÐ¸ÑÑ‚ÐµÐ¼Ñ‹ (Ñ‚Ð¾Ñ‡ÐºÐ° Ð¼Ð¾Ð½Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ /). ÐœÐ½Ð¾Ð³Ð¸Ðµ ÑÑ‡Ð¸Ñ‚Ð°ÑŽÑ‚, Ñ‡Ñ‚Ð¾ Ñ‚Ð°ÐºÐ¶Ðµ "
+#~ "Ð½ÑƒÐ¶ÐµÐ½ Ð¾Ñ‚Ð´ÐµÐ»ÑŒÐ½Ñ‹Ð¹ Ñ€Ð°Ð·Ð´ÐµÐ» Ð¿Ð¾Ð´ÐºÐ°Ñ‡ÐºÐ¸. \"ÐŸÐ¾Ð´ÐºÐ°Ñ‡ÐºÐ°\" -- Ð¼ÐµÑÑ‚Ð¾ Ð½Ð° Ð¶Ñ‘ÑÑ‚ÐºÐ¾Ð¼ Ð´Ð¸ÑÐºÐµ "
+#~ "Ð±ÐµÐ· Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»Ñ‘Ð½Ð½Ð¾Ð¹ ÑÑ‚Ñ€ÑƒÐºÑ‚ÑƒÑ€Ñ‹, ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ðµ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐµÑ‚ÑÑ Ñ„Ð°Ð¹Ð»Ð¾Ð²Ð¾Ð¹ ÑÐ¸ÑÑ‚ÐµÐ¼Ð¾Ð¹ Ð² "
+#~ "ÐºÐ°Ñ‡ÐµÑÑ‚Ð²Ðµ \"Ð²Ð¸Ñ€Ñ‚ÑƒÐ°Ð»ÑŒÐ½Ð¾Ð¹ Ð¿Ð°Ð¼ÑÑ‚Ð¸\" Ð½Ð° Ð¶Ñ‘ÑÑ‚ÐºÐ¾Ð¼ Ð´Ð¸ÑÐºÐµ."
 
-#. Type: text
-#. Description
-#: ../templates:40
-msgid ""
-"In order to start your new Debian system, a so called boot loader is used.  "
-"It is installed in a boot partition.  You must set the bootable flag for the "
-"partition.  Such a partition will be marked with \"${BOOTABLE}\" in the main "
-"partitioning menu."
-msgstr ""
-"Ð§Ñ‚Ð¾Ð±Ñ‹ Ð·Ð°Ð¿ÑƒÑÑ‚Ð¸Ñ‚ÑŒ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½ÑƒÑŽ ÑÐ¸ÑÑ‚ÐµÐ¼Ñƒ Debian, Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐµÑ‚ÑÑ Ñ‚Ð°Ðº Ð½Ð°Ð·Ñ‹Ð²Ð°ÐµÐ¼Ñ‹Ð¹ "
-"Ð·Ð°Ð³Ñ€ÑƒÐ·Ñ‡Ð¸Ðº. Ð’Ñ‹ Ð´Ð¾Ð»Ð¶Ð½Ñ‹ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ Ð¼ÐµÑ‚ÐºÑƒ \"Ð·Ð°Ð³Ñ€ÑƒÐ·Ð¾Ñ‡Ð½Ñ‹Ð¹\" Ð½Ð° Ñ€Ð°Ð·Ð´ÐµÐ». ÐÑ‚Ð¾Ñ‚ Ñ€Ð°Ð·Ð´ÐµÐ» "
-"Ð±ÑƒÐ´ÐµÑ‚ Ð¿Ð¾Ð¼ÐµÑ‡ÐµÐ½ ÐºÐ°Ðº \"${BOOTABLE}\" Ð² Ð³Ð»Ð°Ð²Ð½Ð¾Ð¼ Ð¼ÐµÐ½ÑŽ Ñ€Ð°Ð·Ð¼ÐµÑ‚ÐºÐ¸."
+#~ msgid ""
+#~ "When the partition is already formatted you may choose to keep and use "
+#~ "the existing data in the partition.  Partitions that will be used in this "
+#~ "way are marked with \"${KEEP}\" in the main partitioning menu. NOTE: this "
+#~ "installer doesn't allow you to install over an existing GNU/Linux system "
+#~ "overwriting system files."
+#~ msgstr ""
+#~ "Ð•ÑÐ»Ð¸ Ñ€Ð°Ð·Ð´ÐµÐ» ÑƒÐ¶Ðµ ÑÐ¾Ð´ÐµÑ€Ð¶Ð¸Ñ‚ Ñ„Ð°Ð¹Ð»Ð¾Ð²ÑƒÑŽ ÑÐ¸ÑÑ‚ÐµÐ¼Ñƒ, Ð²Ñ‹ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð¾ÑÑ‚Ð°Ð²Ð¸Ñ‚ÑŒ Ð¸ "
+#~ "Ð²Ð¾ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒÑÑ ÑƒÐ¶Ðµ ÑÑƒÑ‰ÐµÑÑ‚Ð²ÑƒÑŽÑ‰Ð¸Ð¼Ð¸ Ð² Ñ€Ð°Ð·Ð´ÐµÐ»Ðµ Ð´Ð°Ð½Ð½Ñ‹Ð¼Ð¸. ÐŸÐ¾Ð´Ð¾Ð±Ð½Ñ‹Ðµ Ñ€Ð°Ð·Ð´ÐµÐ»Ñ‹ "
+#~ "Ð¿Ð¾Ð¼ÐµÑ‡ÐµÐ½Ñ‹ \"${KEEP}\" Ð² Ð³Ð»Ð°Ð²Ð½Ð¾Ð¼ Ð¼ÐµÐ½ÑŽ Ñ€Ð°Ð·Ð¼ÐµÑ‚ÐºÐ¸ Ð´Ð¸ÑÐºÐ¾Ð². Ð’ÐÐ˜ÐœÐÐÐ˜Ð•: Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð° "
+#~ "ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸ Ð½Ðµ Ð¿Ð¾Ð·Ð²Ð¾Ð»ÑÐµÑ‚ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ ÑÐ¸ÑÑ‚ÐµÐ¼Ñƒ Ð¿Ð¾Ð²ÐµÑ€Ñ… ÑƒÐ¶Ðµ ÑÑƒÑ‰ÐµÑÑ‚Ð²ÑƒÑŽÑ‰ÐµÐ¹ Linux-"
+#~ "ÑÐ¸ÑÑ‚ÐµÐ¼Ñ‹."
 
-#. Type: text
-#. Description
-#: ../templates:3
-msgid "Use the partition as a PALO boot partition"
-msgstr "Ð˜ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ Ñ€Ð°Ð·Ð´ÐµÐ» Ð² ÐºÐ°Ñ‡ÐµÑÑ‚Ð²Ðµ Ð·Ð°Ð³Ñ€ÑƒÐ·Ð¾Ñ‡Ð½Ð¾Ð³Ð¾ Ð´Ð»Ñ PALO"
+#~ msgid ""
+#~ "In order to start your new Debian system, a so called boot loader is "
+#~ "used.  It can be installed either in the master boot record of the first "
+#~ "hard disk, or in a partition.  When the boot loader is installed in a "
+#~ "partition, you must set the bootable flag for it. Such a partition will "
+#~ "be marked with \"${BOOTABLE}\" in the main partitioning menu."
+#~ msgstr ""
+#~ "Ð§Ñ‚Ð¾Ð±Ñ‹ Ð·Ð°Ð¿ÑƒÑÑ‚Ð¸Ñ‚ÑŒ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½ÑƒÑŽ ÑÐ¸ÑÑ‚ÐµÐ¼Ñƒ Debian, Ð½ÐµÐ¾Ð±Ñ…Ð¾Ð´Ð¸Ð¼ Ñ‚Ð°Ðº Ð½Ð°Ð·Ñ‹Ð²Ð°ÐµÐ¼Ñ‹Ð¹ "
+#~ "Ð·Ð°Ð³Ñ€ÑƒÐ·Ñ‡Ð¸Ðº. ÐžÐ½ Ð¼Ð¾Ð¶ÐµÑ‚ Ð±Ñ‹Ñ‚ÑŒ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½ Ð»Ð¸Ð±Ð¾ Ð² Ð³Ð»Ð°Ð²Ð½ÑƒÑŽ Ð·Ð°Ð³Ñ€ÑƒÐ·Ð¾Ñ‡Ð½ÑƒÑŽ Ð·Ð°Ð¿Ð¸ÑÑŒ "
+#~ "Ð¿ÐµÑ€Ð²Ð¾Ð³Ð¾ Ð¶Ñ‘ÑÑ‚ÐºÐ¾Ð³Ð¾ Ð´Ð¸ÑÐºÐ°, Ð»Ð¸Ð±Ð¾ Ð² Ñ€Ð°Ð·Ð´ÐµÐ». ÐŸÑ€Ð¸ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐµ Ð² Ñ€Ð°Ð·Ð´ÐµÐ», Ð´Ð»Ñ ÑÑ‚Ð¾Ð³Ð¾ "
+#~ "Ñ€Ð°Ð·Ð´ÐµÐ»Ð° Ð½ÑƒÐ¶Ð½Ð¾ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ Ð¼ÐµÑ‚ÐºÑƒ \"Ð·Ð°Ð³Ñ€ÑƒÐ·Ð¾Ñ‡Ð½Ñ‹Ð¹\". Ð’ Ñ‚Ð°ÐºÐ¾Ð¼ ÑÐ»ÑƒÑ‡Ð°Ðµ ÑÑ‚Ð¾Ñ‚ "
+#~ "Ñ€Ð°Ð·Ð´ÐµÐ» Ð±ÑƒÐ´ÐµÑ‚ Ð¿Ð¾Ð¼ÐµÑ‡ÐµÐ½ \"${BOOTABLE}\" Ð² Ð³Ð»Ð°Ð²Ð½Ð¾Ð¼ Ð¼ÐµÐ½ÑŽ Ñ€Ð°Ð·Ð¼ÐµÑ‚ÐºÐ¸."
 
-#. Type: boolean
-#. Description
-#: ../templates:11
-msgid "No palo partition is found."
-msgstr "palo Ñ€Ð°Ð·Ð´ÐµÐ»Ð° Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾."
+#~ msgid ""
+#~ "In order to start your new Debian system, a so called boot loader is "
+#~ "used.  It is installed in a boot partition.  You must set the bootable "
+#~ "flag for the partition.  Such a partition will be marked with "
+#~ "\"${BOOTABLE}\" in the main partitioning menu."
+#~ msgstr ""
+#~ "Ð§Ñ‚Ð¾Ð±Ñ‹ Ð·Ð°Ð¿ÑƒÑÑ‚Ð¸Ñ‚ÑŒ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½ÑƒÑŽ ÑÐ¸ÑÑ‚ÐµÐ¼Ñƒ Debian, Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐµÑ‚ÑÑ Ñ‚Ð°Ðº Ð½Ð°Ð·Ñ‹Ð²Ð°ÐµÐ¼Ñ‹Ð¹ "
+#~ "Ð·Ð°Ð³Ñ€ÑƒÐ·Ñ‡Ð¸Ðº. Ð’Ñ‹ Ð´Ð¾Ð»Ð¶Ð½Ñ‹ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ Ð¼ÐµÑ‚ÐºÑƒ \"Ð·Ð°Ð³Ñ€ÑƒÐ·Ð¾Ñ‡Ð½Ñ‹Ð¹\" Ð½Ð° Ñ€Ð°Ð·Ð´ÐµÐ». ÐÑ‚Ð¾Ñ‚ "
+#~ "Ñ€Ð°Ð·Ð´ÐµÐ» Ð±ÑƒÐ´ÐµÑ‚ Ð¿Ð¾Ð¼ÐµÑ‡ÐµÐ½ ÐºÐ°Ðº \"${BOOTABLE}\" Ð² Ð³Ð»Ð°Ð²Ð½Ð¾Ð¼ Ð¼ÐµÐ½ÑŽ Ñ€Ð°Ð·Ð¼ÐµÑ‚ÐºÐ¸."
 
-#. Type: boolean
-#. Description
-#: ../templates:16
-msgid "The palo partition must be in the first 2Mb."
-msgstr "Ð Ð°Ð·Ð´ÐµÐ» palo Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð±Ñ‹Ñ‚ÑŒ Ð² Ð¿Ñ€ÐµÐ´ÐµÐ»Ð°Ñ… Ð¿ÐµÑ€Ð²Ñ‹Ñ… Ð´Ð²ÑƒÑ… Ð¼ÐµÐ³Ð°Ð±Ð°Ð¹Ñ‚Ð¾Ð²."
+#~ msgid "Use the partition as a PALO boot partition"
+#~ msgstr "Ð˜ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ Ñ€Ð°Ð·Ð´ÐµÐ» Ð² ÐºÐ°Ñ‡ÐµÑÑ‚Ð²Ðµ Ð·Ð°Ð³Ñ€ÑƒÐ·Ð¾Ñ‡Ð½Ð¾Ð³Ð¾ Ð´Ð»Ñ PALO"
 
-#. Type: text
-#. Description
-#: ../partman-efi.templates:3
-msgid ""
-"In order to start your new Debian system, the firmware on your Itanium "
-"system loads the boot loader from its private EFI partition on the hard "
-"disk.  The boot loader then loads the operating system from that same "
-"partition.  An EFI partition has a FAT16 file system formatted on it and the "
-"bootable flag set. Most installations place the EFI partition on the first "
-"primary partition of the same hard disk that holds the root file system."
-msgstr ""
-"Ð”Ð»Ñ Ð·Ð°Ð¿ÑƒÑÐºÐ° Ð½Ð¾Ð²Ð¾Ð¹ ÑÐ¸ÑÑ‚ÐµÐ¼Ñ‹ Debian Ð½Ð° Ð¼Ð°ÑˆÐ¸Ð½Ð°Ñ… Itanium Ð¼Ð¸ÐºÑ€Ð¾Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð° Ð·Ð°Ð³Ñ€ÑƒÐ¶Ð°ÐµÑ‚ "
-"ÑÐ¸ÑÑ‚ÐµÐ¼Ð½Ñ‹Ð¹ Ð·Ð°Ð³Ñ€ÑƒÐ·Ñ‡Ð¸Ðº Ð¸Ð· ÑÐ²Ð¾ÐµÐ³Ð¾ ÑÐ¾Ð±ÑÑ‚Ð²ÐµÐ½Ð½Ð¾Ð³Ð¾ EFI Ñ€Ð°Ð·Ð´ÐµÐ»Ð° Ð¶Ñ‘ÑÑ‚ÐºÐ¾Ð³Ð¾ Ð´Ð¸ÑÐºÐ°. Ð—Ð°Ñ‚ÐµÐ¼ "
-"ÑÐ¸ÑÑ‚ÐµÐ¼Ð½Ñ‹Ð¹ Ð·Ð°Ð³Ñ€ÑƒÐ·Ñ‡Ð¸Ðº Ð·Ð°Ð³Ñ€ÑƒÐ¶Ð°ÐµÑ‚ Ð¾Ð¿ÐµÑ€Ð°Ñ†Ð¸Ð¾Ð½Ð½ÑƒÑŽ ÑÐ¸ÑÑ‚ÐµÐ¼Ñƒ Ñ ÑÑ‚Ð¾Ð³Ð¾ Ð¶Ðµ Ñ€Ð°Ð·Ð´ÐµÐ»Ð°. "
-"Ð Ð°Ð·Ð´ÐµÐ» EFI Ð¾Ñ‚Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½ Ð¿Ð¾Ð´ Ñ„Ð°Ð¹Ð»Ð¾Ð²ÑƒÑŽ ÑÐ¸ÑÑ‚ÐµÐ¼Ñƒ FAT16 Ð¸ Ð½Ð° Ð½Ñ‘Ð¼ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½ "
-"Ð·Ð°Ð³Ñ€ÑƒÐ·Ð¾Ñ‡Ð½Ñ‹Ð¹ Ñ„Ð»Ð°Ð³. Ð‘Ð¾Ð»ÑŒÑˆÐ¸Ð½ÑÑ‚Ð²Ð¾ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¾Ðº Ñ€Ð°Ð·Ð¼ÐµÑ‰Ð°ÑŽÑ‚ EFI Ñ€Ð°Ð·Ð´ÐµÐ» Ð² Ð¿ÐµÑ€Ð²Ñ‹Ð¹ "
-"Ð¿ÐµÑ€Ð²Ð¸Ñ‡Ð½Ñ‹Ð¹ Ñ€Ð°Ð·Ð´ÐµÐ» Ñ‚Ð¾Ð³Ð¾ Ð¶Ðµ Ð¶Ñ‘ÑÑ‚ÐºÐ¾Ð³Ð¾ Ð´Ð¸ÑÐºÐ°, Ð½Ð° ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ð¼ ÑÐ¾Ð´ÐµÑ€Ð¶Ð¸Ñ‚ÑÑ ÐºÐ¾Ñ€Ð½ÐµÐ²Ð°Ñ "
-"Ñ„Ð°Ð¹Ð»Ð¾Ð²Ð°Ñ ÑÐ¸ÑÑ‚ÐµÐ¼Ð°."
+#~ msgid "No palo partition is found."
+#~ msgstr "palo Ñ€Ð°Ð·Ð´ÐµÐ»Ð° Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾."
 
-#. Type: text
-#. Description
-#: ../partman-partitioning.templates:149
-msgid "Size:"
-msgstr "Ð Ð°Ð·Ð¼ÐµÑ€:"
+#~ msgid "The palo partition must be in the first 2Mb."
+#~ msgstr "Ð Ð°Ð·Ð´ÐµÐ» palo Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð±Ñ‹Ñ‚ÑŒ Ð² Ð¿Ñ€ÐµÐ´ÐµÐ»Ð°Ñ… Ð¿ÐµÑ€Ð²Ñ‹Ñ… Ð´Ð²ÑƒÑ… Ð¼ÐµÐ³Ð°Ð±Ð°Ð¹Ñ‚Ð¾Ð²."
 
-#. Type: error
-#. Description
-#: ../templates:33
-msgid "An error occured during the previous operation"
-msgstr "ÐŸÑ€Ð¸ Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ð¸ Ð¿Ñ€ÐµÐ´Ñ‹Ð´ÑƒÑ‰ÐµÐ¹ Ð¾Ð¿ÐµÑ€Ð°Ñ†Ð¸Ð¸ Ð¿Ñ€Ð¾Ð¸Ð·Ð¾ÑˆÐ»Ð° Ð¾ÑˆÐ¸Ð±ÐºÐ°"
+#~ msgid ""
+#~ "In order to start your new Debian system, the firmware on your Itanium "
+#~ "system loads the boot loader from its private EFI partition on the hard "
+#~ "disk.  The boot loader then loads the operating system from that same "
+#~ "partition.  An EFI partition has a FAT16 file system formatted on it and "
+#~ "the bootable flag set. Most installations place the EFI partition on the "
+#~ "first primary partition of the same hard disk that holds the root file "
+#~ "system."
+#~ msgstr ""
+#~ "Ð”Ð»Ñ Ð·Ð°Ð¿ÑƒÑÐºÐ° Ð½Ð¾Ð²Ð¾Ð¹ ÑÐ¸ÑÑ‚ÐµÐ¼Ñ‹ Debian Ð½Ð° Ð¼Ð°ÑˆÐ¸Ð½Ð°Ñ… Itanium Ð¼Ð¸ÐºÑ€Ð¾Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð° "
+#~ "Ð·Ð°Ð³Ñ€ÑƒÐ¶Ð°ÐµÑ‚ ÑÐ¸ÑÑ‚ÐµÐ¼Ð½Ñ‹Ð¹ Ð·Ð°Ð³Ñ€ÑƒÐ·Ñ‡Ð¸Ðº Ð¸Ð· ÑÐ²Ð¾ÐµÐ³Ð¾ ÑÐ¾Ð±ÑÑ‚Ð²ÐµÐ½Ð½Ð¾Ð³Ð¾ EFI Ñ€Ð°Ð·Ð´ÐµÐ»Ð° Ð¶Ñ‘ÑÑ‚ÐºÐ¾Ð³Ð¾ "
+#~ "Ð´Ð¸ÑÐºÐ°. Ð—Ð°Ñ‚ÐµÐ¼ ÑÐ¸ÑÑ‚ÐµÐ¼Ð½Ñ‹Ð¹ Ð·Ð°Ð³Ñ€ÑƒÐ·Ñ‡Ð¸Ðº Ð·Ð°Ð³Ñ€ÑƒÐ¶Ð°ÐµÑ‚ Ð¾Ð¿ÐµÑ€Ð°Ñ†Ð¸Ð¾Ð½Ð½ÑƒÑŽ ÑÐ¸ÑÑ‚ÐµÐ¼Ñƒ Ñ ÑÑ‚Ð¾Ð³Ð¾ "
+#~ "Ð¶Ðµ Ñ€Ð°Ð·Ð´ÐµÐ»Ð°. Ð Ð°Ð·Ð´ÐµÐ» EFI Ð¾Ñ‚Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½ Ð¿Ð¾Ð´ Ñ„Ð°Ð¹Ð»Ð¾Ð²ÑƒÑŽ ÑÐ¸ÑÑ‚ÐµÐ¼Ñƒ FAT16 Ð¸ Ð½Ð° Ð½Ñ‘Ð¼ "
+#~ "ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½ Ð·Ð°Ð³Ñ€ÑƒÐ·Ð¾Ñ‡Ð½Ñ‹Ð¹ Ñ„Ð»Ð°Ð³. Ð‘Ð¾Ð»ÑŒÑˆÐ¸Ð½ÑÑ‚Ð²Ð¾ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¾Ðº Ñ€Ð°Ð·Ð¼ÐµÑ‰Ð°ÑŽÑ‚ EFI Ñ€Ð°Ð·Ð´ÐµÐ» Ð² "
+#~ "Ð¿ÐµÑ€Ð²Ñ‹Ð¹ Ð¿ÐµÑ€Ð²Ð¸Ñ‡Ð½Ñ‹Ð¹ Ñ€Ð°Ð·Ð´ÐµÐ» Ñ‚Ð¾Ð³Ð¾ Ð¶Ðµ Ð¶Ñ‘ÑÑ‚ÐºÐ¾Ð³Ð¾ Ð´Ð¸ÑÐºÐ°, Ð½Ð° ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ð¼ ÑÐ¾Ð´ÐµÑ€Ð¶Ð¸Ñ‚ÑÑ "
+#~ "ÐºÐ¾Ñ€Ð½ÐµÐ²Ð°Ñ Ñ„Ð°Ð¹Ð»Ð¾Ð²Ð°Ñ ÑÐ¸ÑÑ‚ÐµÐ¼Ð°."
 
-#. Type: select
-#. Description
-#: ../templates:8
-msgid ""
-"No standard floppy drive was found. If you have a USB floppy drive or some "
-"other unusual type of floppy drive, select it from the list. Note that the "
-"list may also include drives that are not floppy drives. The installer will "
-"only try to read from the selected device."
-msgstr ""
-"Ð¡Ñ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ñ‹Ð¹ Ð´Ð¸ÑÐºÐ¾Ð²Ð¾Ð´ Ð½Ðµ Ð¾Ð±Ð½Ð°Ñ€ÑƒÐ¶ÐµÐ½. Ð•ÑÐ»Ð¸ Ñƒ Ð²Ð°Ñ \"Ð½ÐµÐ¾Ð±Ñ‹Ñ‡Ð½Ñ‹Ð¹\" Ð´Ð¸ÑÐºÐ¾Ð²Ð¾Ð´ "
-"(Ð½Ð°Ð¿Ñ€Ð¸Ð¼ÐµÑ€ Ð²Ð½ÐµÑˆÐ½Ð¸Ð¹ Ð½Ð° ÑˆÐ¸Ð½Ðµ USB), Ñ‚Ð¾ Ð²Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ ÐµÐ³Ð¾ Ð¸Ð· ÑÐ¿Ð¸ÑÐºÐ°. ÐžÐ±Ñ€Ð°Ñ‚Ð¸Ñ‚Ðµ Ð²Ð½Ð¸Ð¼Ð°Ð½Ð¸Ðµ "
-"Ð½Ð° Ñ‚Ð¾, Ñ‡Ñ‚Ð¾ Ð² ÑÐ¿Ð¸ÑÐºÐµ Ð¼Ð¾Ð³ÑƒÑ‚ Ð±Ñ‹Ñ‚ÑŒ ÑƒÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð²Ð°, ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ðµ Ð½Ðµ ÑÐ²Ð»ÑÑŽÑ‚ÑÑ Ð´Ð¸ÑÐºÐ¾Ð²Ð¾Ð´Ð°Ð¼Ð¸ "
-"ÐºÐ°Ðº Ñ‚Ð°ÐºÐ¾Ð²Ñ‹Ð¼Ð¸. Ð¡ ÑƒÐºÐ°Ð·Ð°Ð½Ð½Ð¾Ð³Ð¾ ÑƒÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð²Ð° Ð±ÑƒÐ´ÑƒÑ‚ Ð»Ð¸ÑˆÑŒ ÑÑ‡Ð¸Ñ‚Ð°Ð½Ñ‹ Ð´Ð°Ð½Ð½Ñ‹Ðµ, Ð·Ð°Ð¿Ð¸ÑÑŒ "
-"Ð¿Ñ€Ð¾Ð¸Ð·Ð²Ð¾Ð´Ð¸Ñ‚ÑŒÑÑ Ð½Ðµ Ð±ÑƒÐ´ÐµÑ‚!"
+#~ msgid "Size:"
+#~ msgstr "Ð Ð°Ð·Ð¼ÐµÑ€:"
 
+#~ msgid "An error occured during the previous operation"
+#~ msgstr "ÐŸÑ€Ð¸ Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ð¸ Ð¿Ñ€ÐµÐ´Ñ‹Ð´ÑƒÑ‰ÐµÐ¹ Ð¾Ð¿ÐµÑ€Ð°Ñ†Ð¸Ð¸ Ð¿Ñ€Ð¾Ð¸Ð·Ð¾ÑˆÐ»Ð° Ð¾ÑˆÐ¸Ð±ÐºÐ°"
+
+#~ msgid ""
+#~ "No standard floppy drive was found. If you have a USB floppy drive or "
+#~ "some other unusual type of floppy drive, select it from the list. Note "
+#~ "that the list may also include drives that are not floppy drives. The "
+#~ "installer will only try to read from the selected device."
+#~ msgstr ""
+#~ "Ð¡Ñ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ñ‹Ð¹ Ð´Ð¸ÑÐºÐ¾Ð²Ð¾Ð´ Ð½Ðµ Ð¾Ð±Ð½Ð°Ñ€ÑƒÐ¶ÐµÐ½. Ð•ÑÐ»Ð¸ Ñƒ Ð²Ð°Ñ \"Ð½ÐµÐ¾Ð±Ñ‹Ñ‡Ð½Ñ‹Ð¹\" Ð´Ð¸ÑÐºÐ¾Ð²Ð¾Ð´ "
+#~ "(Ð½Ð°Ð¿Ñ€Ð¸Ð¼ÐµÑ€ Ð²Ð½ÐµÑˆÐ½Ð¸Ð¹ Ð½Ð° ÑˆÐ¸Ð½Ðµ USB), Ñ‚Ð¾ Ð²Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ ÐµÐ³Ð¾ Ð¸Ð· ÑÐ¿Ð¸ÑÐºÐ°. ÐžÐ±Ñ€Ð°Ñ‚Ð¸Ñ‚Ðµ "
+#~ "Ð²Ð½Ð¸Ð¼Ð°Ð½Ð¸Ðµ Ð½Ð° Ñ‚Ð¾, Ñ‡Ñ‚Ð¾ Ð² ÑÐ¿Ð¸ÑÐºÐµ Ð¼Ð¾Ð³ÑƒÑ‚ Ð±Ñ‹Ñ‚ÑŒ ÑƒÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð²Ð°, ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ðµ Ð½Ðµ ÑÐ²Ð»ÑÑŽÑ‚ÑÑ "
+#~ "Ð´Ð¸ÑÐºÐ¾Ð²Ð¾Ð´Ð°Ð¼Ð¸ ÐºÐ°Ðº Ñ‚Ð°ÐºÐ¾Ð²Ñ‹Ð¼Ð¸. Ð¡ ÑƒÐºÐ°Ð·Ð°Ð½Ð½Ð¾Ð³Ð¾ ÑƒÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð²Ð° Ð±ÑƒÐ´ÑƒÑ‚ Ð»Ð¸ÑˆÑŒ ÑÑ‡Ð¸Ñ‚Ð°Ð½Ñ‹ "
+#~ "Ð´Ð°Ð½Ð½Ñ‹Ðµ, Ð·Ð°Ð¿Ð¸ÑÑŒ Ð¿Ñ€Ð¾Ð¸Ð·Ð²Ð¾Ð´Ð¸Ñ‚ÑŒÑÑ Ð½Ðµ Ð±ÑƒÐ´ÐµÑ‚!"

Modified: trunk/packages/po/se.po
===================================================================
--- trunk/packages/po/se.po	2005-11-16 01:40:18 UTC (rev 32163)
+++ trunk/packages/po/se.po	2005-11-16 01:45:44 UTC (rev 32164)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-15 08:03+0000\n"
+"POT-Creation-Date: 2005-11-16 01:33+0000\n"
 "PO-Revision-Date: 2004-09-15 12:11+0200\n"
 "Last-Translator:  <>\n"
 "Language-Team: Debian L10n Sami <debian-l10n-sami at lists.debian.org>\n"
@@ -1760,32 +1760,34 @@
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#. These are choices of actions so this is, at least in English,
+#. an infinitive form
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 msgid "Retry"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 #, fuzzy
 msgid "Change mirror"
 msgstr "SajÃ¡iduhttimin Äoahku"
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../mdcfg-utils.templates:122
+#: ../net-retriever.templates:5 ../mdcfg-utils.templates:122
 msgid "Cancel"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:31
+#: ../net-retriever.templates:7 ../apt-mirror-setup.templates:33
 msgid "Downloading a file failed:"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5
+#: ../net-retriever.templates:7
 msgid ""
 "The installer failed to download a file from the mirror. This may be a "
 "problem with your network, or with the mirror. You can choose to retry the "
@@ -2442,14 +2444,15 @@
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:101
-msgid "Desktop machine"
-msgstr ""
+#, fuzzy
+msgid "Separate /home partition"
+msgstr "Heivehus coahkkobirrasis"
 
 #. Type: text
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:106
-msgid "Multi-user workstation"
+msgid "Separate /home, /usr, /var, and /tmp partitions"
 msgstr ""
 
 #. Type: boolean
@@ -5075,13 +5078,13 @@
 
 #. Type: select
 #. Choices
-#: ../apt-mirror-setup.templates:30
+#: ../apt-mirror-setup.templates:32
 msgid "Ignore"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../apt-mirror-setup.templates:31
+#: ../apt-mirror-setup.templates:33
 msgid ""
 "The installer failed to access the mirror. This may be a problem with your "
 "network, or with the mirror. You can choose to retry the download, select a "

Modified: trunk/packages/po/sk.po
===================================================================
--- trunk/packages/po/sk.po	2005-11-16 01:40:18 UTC (rev 32163)
+++ trunk/packages/po/sk.po	2005-11-16 01:45:44 UTC (rev 32164)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-15 08:03+0000\n"
+"POT-Creation-Date: 2005-11-16 01:33+0000\n"
 "PO-Revision-Date: 2005-10-23 13:10+0200\n"
 "Last-Translator: Peter Mann <Peter.Mann at tuke.sk>\n"
 "Language-Team:  Slovak <sk-i18n at lists.linux.sk>\n"
@@ -1945,32 +1945,34 @@
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#. These are choices of actions so this is, at least in English,
+#. an infinitive form
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 msgid "Retry"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 #, fuzzy
 msgid "Change mirror"
 msgstr "ZopakovaÅ¥, ZmeniÅ¥ zdroj, ZruÅ¡iÅ¥"
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../mdcfg-utils.templates:122
+#: ../net-retriever.templates:5 ../mdcfg-utils.templates:122
 msgid "Cancel"
 msgstr "ZruÅ¡iÅ¥"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:31
+#: ../net-retriever.templates:7 ../apt-mirror-setup.templates:33
 msgid "Downloading a file failed:"
 msgstr "Stiahnutie sÃºboru zlyhalo:"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5
+#: ../net-retriever.templates:7
 msgid ""
 "The installer failed to download a file from the mirror. This may be a "
 "problem with your network, or with the mirror. You can choose to retry the "
@@ -2681,15 +2683,16 @@
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:101
-msgid "Desktop machine"
-msgstr "StolnÃ½ poÄÃtaÄ"
+#, fuzzy
+msgid "Separate /home partition"
+msgstr "formÃ¡tovaÅ¥ partÃciu"
 
 #. Type: text
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:106
-msgid "Multi-user workstation"
-msgstr "ViacpouÅ¾ÃvateÄ¾skÃ¡ pracovnÃ¡ stanica"
+msgid "Separate /home, /usr, /var, and /tmp partitions"
+msgstr ""
 
 #. Type: boolean
 #. Description
@@ -5413,14 +5416,14 @@
 
 #. Type: select
 #. Choices
-#: ../apt-mirror-setup.templates:30
+#: ../apt-mirror-setup.templates:32
 #, fuzzy
 msgid "Ignore"
 msgstr "Å¾iaden"
 
 #. Type: select
 #. Description
-#: ../apt-mirror-setup.templates:31
+#: ../apt-mirror-setup.templates:33
 #, fuzzy
 msgid ""
 "The installer failed to access the mirror. This may be a problem with your "
@@ -11166,6 +11169,12 @@
 msgid "Configure the base system before rebooting"
 msgstr "NastaviÅ¥ zÃ¡kladnÃ½ systÃ©m pred reÅ¡tartom"
 
+#~ msgid "Desktop machine"
+#~ msgstr "StolnÃ½ poÄÃtaÄ"
+
+#~ msgid "Multi-user workstation"
+#~ msgstr "ViacpouÅ¾ÃvateÄ¾skÃ¡ pracovnÃ¡ stanica"
+
 #, fuzzy
 #~ msgid "Retry, Change mirror, Ignore"
 #~ msgstr "ZopakovaÅ¥, ZmeniÅ¥ zdroj, ZruÅ¡iÅ¥"

Modified: trunk/packages/po/sl.po
===================================================================
--- trunk/packages/po/sl.po	2005-11-16 01:40:18 UTC (rev 32163)
+++ trunk/packages/po/sl.po	2005-11-16 01:45:44 UTC (rev 32164)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: sl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-15 08:03+0000\n"
+"POT-Creation-Date: 2005-11-16 01:33+0000\n"
 "PO-Revision-Date: 2005-07-23 08:50+0200\n"
 "Last-Translator: Jure ÄŒuhalev <gandalf at owca.info>\n"
 "Language-Team: SlovenÅ¡Äina <team at slo-tech.com>\n"
@@ -1967,32 +1967,34 @@
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#. These are choices of actions so this is, at least in English,
+#. an infinitive form
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 msgid "Retry"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 #, fuzzy
 msgid "Change mirror"
 msgstr "Poskusi ponovno, Zamenjaj zrcalni streÅ¾nik, Prekini"
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../mdcfg-utils.templates:122
+#: ../net-retriever.templates:5 ../mdcfg-utils.templates:122
 msgid "Cancel"
 msgstr "PrekliÄi"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:31
+#: ../net-retriever.templates:7 ../apt-mirror-setup.templates:33
 msgid "Downloading a file failed:"
 msgstr "Prenos datoteke ni uspel:"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5
+#: ../net-retriever.templates:7
 msgid ""
 "The installer failed to download a file from the mirror. This may be a "
 "problem with your network, or with the mirror. You can choose to retry the "
@@ -2704,15 +2706,16 @@
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:101
-msgid "Desktop machine"
-msgstr "Namizni stroj"
+#, fuzzy
+msgid "Separate /home partition"
+msgstr "formatiraj razdelek"
 
 #. Type: text
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:106
-msgid "Multi-user workstation"
-msgstr "VeÄ-uporabniÅ¡ki sistem"
+msgid "Separate /home, /usr, /var, and /tmp partitions"
+msgstr ""
 
 #. Type: boolean
 #. Description
@@ -5458,14 +5461,14 @@
 
 #. Type: select
 #. Choices
-#: ../apt-mirror-setup.templates:30
+#: ../apt-mirror-setup.templates:32
 #, fuzzy
 msgid "Ignore"
 msgstr "brez"
 
 #. Type: select
 #. Description
-#: ../apt-mirror-setup.templates:31
+#: ../apt-mirror-setup.templates:33
 #, fuzzy
 msgid ""
 "The installer failed to access the mirror. This may be a problem with your "
@@ -11230,6 +11233,12 @@
 msgid "Configure the base system before rebooting"
 msgstr "Nastavi osnovni sistem pred ponovnim zagonom"
 
+#~ msgid "Desktop machine"
+#~ msgstr "Namizni stroj"
+
+#~ msgid "Multi-user workstation"
+#~ msgstr "VeÄ-uporabniÅ¡ki sistem"
+
 #, fuzzy
 #~ msgid "Retry, Change mirror, Ignore"
 #~ msgstr "Poskusi ponovno, Zamenjaj zrcalni streÅ¾nik, Prekini"

Modified: trunk/packages/po/sq.po
===================================================================
--- trunk/packages/po/sq.po	2005-11-16 01:40:18 UTC (rev 32163)
+++ trunk/packages/po/sq.po	2005-11-16 01:45:44 UTC (rev 32164)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-15 08:03+0000\n"
+"POT-Creation-Date: 2005-11-16 01:33+0000\n"
 "PO-Revision-Date: 2005-06-23 19:48+0200\n"
 "Last-Translator:  Elian Myftiu <elian at alblinux.net>\n"
 "Language-Team: Debian L10n Albanian <debian-l10n-albanian at lists.debian.org>\n"
@@ -1972,32 +1972,34 @@
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#. These are choices of actions so this is, at least in English,
+#. an infinitive form
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 msgid "Retry"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 #, fuzzy
 msgid "Change mirror"
 msgstr "Riprovo, Ndrysho mirror, Anullo"
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../mdcfg-utils.templates:122
+#: ../net-retriever.templates:5 ../mdcfg-utils.templates:122
 msgid "Cancel"
 msgstr "Anullo"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:31
+#: ../net-retriever.templates:7 ../apt-mirror-setup.templates:33
 msgid "Downloading a file failed:"
 msgstr "Shkarkimi i njÃ« file dÃ«shtoi:"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5
+#: ../net-retriever.templates:7
 msgid ""
 "The installer failed to download a file from the mirror. This may be a "
 "problem with your network, or with the mirror. You can choose to retry the "
@@ -2709,15 +2711,16 @@
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:101
-msgid "Desktop machine"
-msgstr "Kompjuter tavoline (desktop)"
+#, fuzzy
+msgid "Separate /home partition"
+msgstr "formato ndarjen"
 
 #. Type: text
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:106
-msgid "Multi-user workstation"
-msgstr "Sistem shumÃ«-pÃ«rdorues"
+msgid "Separate /home, /usr, /var, and /tmp partitions"
+msgstr ""
 
 #. Type: boolean
 #. Description
@@ -5453,14 +5456,14 @@
 
 #. Type: select
 #. Choices
-#: ../apt-mirror-setup.templates:30
+#: ../apt-mirror-setup.templates:32
 #, fuzzy
 msgid "Ignore"
 msgstr "asnjÃ«"
 
 #. Type: select
 #. Description
-#: ../apt-mirror-setup.templates:31
+#: ../apt-mirror-setup.templates:33
 #, fuzzy
 msgid ""
 "The installer failed to access the mirror. This may be a problem with your "
@@ -11258,6 +11261,12 @@
 msgid "Configure the base system before rebooting"
 msgstr "Konfiguro sistemin bazÃ« pÃ«rpara rinisjes"
 
+#~ msgid "Desktop machine"
+#~ msgstr "Kompjuter tavoline (desktop)"
+
+#~ msgid "Multi-user workstation"
+#~ msgstr "Sistem shumÃ«-pÃ«rdorues"
+
 #, fuzzy
 #~ msgid "Retry, Change mirror, Ignore"
 #~ msgstr "Riprovo, Ndrysho mirror, Anullo"

Modified: trunk/packages/po/sr.po
===================================================================
--- trunk/packages/po/sr.po	2005-11-16 01:40:18 UTC (rev 32163)
+++ trunk/packages/po/sr.po	2005-11-16 01:45:44 UTC (rev 32164)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-15 08:03+0000\n"
+"POT-Creation-Date: 2005-11-16 01:33+0000\n"
 "PO-Revision-Date: 2004-09-15 12:16+0200\n"
 "Last-Translator:  <>\n"
 "Language-Team: Debian L10n Serbian <debian-l10n-serbian at lists.debian.org>\n"
@@ -1747,31 +1747,33 @@
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#. These are choices of actions so this is, at least in English,
+#. an infinitive form
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 msgid "Retry"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 msgid "Change mirror"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../mdcfg-utils.templates:122
+#: ../net-retriever.templates:5 ../mdcfg-utils.templates:122
 msgid "Cancel"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:31
+#: ../net-retriever.templates:7 ../apt-mirror-setup.templates:33
 msgid "Downloading a file failed:"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5
+#: ../net-retriever.templates:7
 msgid ""
 "The installer failed to download a file from the mirror. This may be a "
 "problem with your network, or with the mirror. You can choose to retry the "
@@ -2421,14 +2423,14 @@
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:101
-msgid "Desktop machine"
+msgid "Separate /home partition"
 msgstr ""
 
 #. Type: text
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:106
-msgid "Multi-user workstation"
+msgid "Separate /home, /usr, /var, and /tmp partitions"
 msgstr ""
 
 #. Type: boolean
@@ -4969,13 +4971,13 @@
 
 #. Type: select
 #. Choices
-#: ../apt-mirror-setup.templates:30
+#: ../apt-mirror-setup.templates:32
 msgid "Ignore"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../apt-mirror-setup.templates:31
+#: ../apt-mirror-setup.templates:33
 msgid ""
 "The installer failed to access the mirror. This may be a problem with your "
 "network, or with the mirror. You can choose to retry the download, select a "

Modified: trunk/packages/po/sv.po
===================================================================
--- trunk/packages/po/sv.po	2005-11-16 01:40:18 UTC (rev 32163)
+++ trunk/packages/po/sv.po	2005-11-16 01:45:44 UTC (rev 32164)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-15 08:03+0000\n"
+"POT-Creation-Date: 2005-11-16 01:33+0000\n"
 "PO-Revision-Date: 2005-11-15 08:39+0100\n"
 "Last-Translator: Daniel Nylander <po at danielnylander.se>\n"
 "Language-Team: Swedish <debian-boot at lists.debian.org>\n"
@@ -1963,32 +1963,34 @@
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#. These are choices of actions so this is, at least in English,
+#. an infinitive form
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 msgid "Retry"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 #, fuzzy
 msgid "Change mirror"
 msgstr "FÃ¶rsÃ¶k igen, Ã„ndra spegel, Avbryt"
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../mdcfg-utils.templates:122
+#: ../net-retriever.templates:5 ../mdcfg-utils.templates:122
 msgid "Cancel"
 msgstr "Avbryt"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:31
+#: ../net-retriever.templates:7 ../apt-mirror-setup.templates:33
 msgid "Downloading a file failed:"
 msgstr "HÃ¤mtningen av en fil misslyckades:"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5
+#: ../net-retriever.templates:7
 msgid ""
 "The installer failed to download a file from the mirror. This may be a "
 "problem with your network, or with the mirror. You can choose to retry the "
@@ -2705,15 +2707,16 @@
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:101
-msgid "Desktop machine"
-msgstr "Skrivbordsdator"
+#, fuzzy
+msgid "Separate /home partition"
+msgstr "formatera partitionen"
 
 #. Type: text
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:106
-msgid "Multi-user workstation"
-msgstr "Arbetsstation med flera anvÃ¤ndare"
+msgid "Separate /home, /usr, /var, and /tmp partitions"
+msgstr ""
 
 #. Type: boolean
 #. Description
@@ -5456,14 +5459,14 @@
 
 #. Type: select
 #. Choices
-#: ../apt-mirror-setup.templates:30
+#: ../apt-mirror-setup.templates:32
 #, fuzzy
 msgid "Ignore"
 msgstr "ingen"
 
 #. Type: select
 #. Description
-#: ../apt-mirror-setup.templates:31
+#: ../apt-mirror-setup.templates:33
 msgid ""
 "The installer failed to access the mirror. This may be a problem with your "
 "network, or with the mirror. You can choose to retry the download, select a "
@@ -11266,6 +11269,12 @@
 msgid "Configure the base system before rebooting"
 msgstr "Konfigurera grundsystemet innan omstart"
 
+#~ msgid "Desktop machine"
+#~ msgstr "Skrivbordsdator"
+
+#~ msgid "Multi-user workstation"
+#~ msgstr "Arbetsstation med flera anvÃ¤ndare"
+
 #~ msgid "Retry, Change mirror, Ignore"
 #~ msgstr "FÃ¶rsÃ¶k igen, Ã„ndra spegel, Ignorera"
 

Modified: trunk/packages/po/template.pot
===================================================================
--- trunk/packages/po/template.pot	2005-11-16 01:40:18 UTC (rev 32163)
+++ trunk/packages/po/template.pot	2005-11-16 01:45:44 UTC (rev 32164)
@@ -12,7 +12,7 @@
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-15 08:03+0000\n"
+"POT-Creation-Date: 2005-11-16 01:33+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -1749,31 +1749,33 @@
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#. These are choices of actions so this is, at least in English,
+#. an infinitive form
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 msgid "Retry"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 msgid "Change mirror"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../mdcfg-utils.templates:122
+#: ../net-retriever.templates:5 ../mdcfg-utils.templates:122
 msgid "Cancel"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:31
+#: ../net-retriever.templates:7 ../apt-mirror-setup.templates:33
 msgid "Downloading a file failed:"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5
+#: ../net-retriever.templates:7
 msgid ""
 "The installer failed to download a file from the mirror. This may be a "
 "problem with your network, or with the mirror. You can choose to retry the "
@@ -2423,14 +2425,14 @@
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:101
-msgid "Desktop machine"
+msgid "Separate /home partition"
 msgstr ""
 
 #. Type: text
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:106
-msgid "Multi-user workstation"
+msgid "Separate /home, /usr, /var, and /tmp partitions"
 msgstr ""
 
 #. Type: boolean
@@ -4971,13 +4973,13 @@
 
 #. Type: select
 #. Choices
-#: ../apt-mirror-setup.templates:30
+#: ../apt-mirror-setup.templates:32
 msgid "Ignore"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../apt-mirror-setup.templates:31
+#: ../apt-mirror-setup.templates:33
 msgid ""
 "The installer failed to access the mirror. This may be a problem with your "
 "network, or with the mirror. You can choose to retry the download, select a "

Modified: trunk/packages/po/tl.po
===================================================================
--- trunk/packages/po/tl.po	2005-11-16 01:40:18 UTC (rev 32163)
+++ trunk/packages/po/tl.po	2005-11-16 01:45:44 UTC (rev 32164)
@@ -14,7 +14,7 @@
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-15 08:03+0000\n"
+"POT-Creation-Date: 2005-11-16 01:33+0000\n"
 "PO-Revision-Date: 2005-11-08 23:50+0800\n"
 "Last-Translator: Eric Pareja <xenos at upm.edu.ph>\n"
 "Language-Team: Tagalog <debian-tl at banwa.upm.edu.ph>\n"
@@ -1992,32 +1992,34 @@
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#. These are choices of actions so this is, at least in English,
+#. an infinitive form
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 msgid "Retry"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 #, fuzzy
 msgid "Change mirror"
 msgstr "Subukan muli, Palitan ang mirror, Kanselahin"
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../mdcfg-utils.templates:122
+#: ../net-retriever.templates:5 ../mdcfg-utils.templates:122
 msgid "Cancel"
 msgstr "Kanselahin"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:31
+#: ../net-retriever.templates:7 ../apt-mirror-setup.templates:33
 msgid "Downloading a file failed:"
 msgstr "Bigo ang pagkuha ng isang talaksan:"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5
+#: ../net-retriever.templates:7
 msgid ""
 "The installer failed to download a file from the mirror. This may be a "
 "problem with your network, or with the mirror. You can choose to retry the "
@@ -2737,15 +2739,16 @@
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:101
-msgid "Desktop machine"
-msgstr "Makinang pangaraw-araw na gamit"
+#, fuzzy
+msgid "Separate /home partition"
+msgstr "iformat ang partisyon"
 
 #. Type: text
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:106
-msgid "Multi-user workstation"
-msgstr "Makinang gamit ng marami"
+msgid "Separate /home, /usr, /var, and /tmp partitions"
+msgstr ""
 
 #. Type: boolean
 #. Description
@@ -5493,14 +5496,14 @@
 
 #. Type: select
 #. Choices
-#: ../apt-mirror-setup.templates:30
+#: ../apt-mirror-setup.templates:32
 #, fuzzy
 msgid "Ignore"
 msgstr "wala"
 
 #. Type: select
 #. Description
-#: ../apt-mirror-setup.templates:31
+#: ../apt-mirror-setup.templates:33
 #, fuzzy
 msgid ""
 "The installer failed to access the mirror. This may be a problem with your "
@@ -11339,6 +11342,12 @@
 msgid "Configure the base system before rebooting"
 msgstr "Isaayos ang base system bago mag-reboot"
 
+#~ msgid "Desktop machine"
+#~ msgstr "Makinang pangaraw-araw na gamit"
+
+#~ msgid "Multi-user workstation"
+#~ msgstr "Makinang gamit ng marami"
+
 #, fuzzy
 #~ msgid "Retry, Change mirror, Ignore"
 #~ msgstr "Subukan muli, Palitan ang mirror, Kanselahin"

Modified: trunk/packages/po/tr.po
===================================================================
--- trunk/packages/po/tr.po	2005-11-16 01:40:18 UTC (rev 32163)
+++ trunk/packages/po/tr.po	2005-11-16 01:45:44 UTC (rev 32164)
@@ -12,7 +12,7 @@
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-15 08:03+0000\n"
+"POT-Creation-Date: 2005-11-16 01:33+0000\n"
 "PO-Revision-Date: 2005-11-08 08:26+0200\n"
 "Last-Translator: Recai OktaÅŸ <roktas at omu.edu.tr>\n"
 "Language-Team: Debian L10n Turkish <debian-l10n-turkish at lists.debian.org>\n"
@@ -1971,32 +1971,34 @@
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#. These are choices of actions so this is, at least in English,
+#. an infinitive form
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 msgid "Retry"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 #, fuzzy
 msgid "Change mirror"
 msgstr "Tekrar dene, BaÅŸka bir yansÄ± kullan, Ä°ptal et"
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../mdcfg-utils.templates:122
+#: ../net-retriever.templates:5 ../mdcfg-utils.templates:122
 msgid "Cancel"
 msgstr "Ä°ptal et"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:31
+#: ../net-retriever.templates:7 ../apt-mirror-setup.templates:33
 msgid "Downloading a file failed:"
 msgstr "Bir dosya baÅŸarÄ±yla indirilemedi:"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5
+#: ../net-retriever.templates:7
 msgid ""
 "The installer failed to download a file from the mirror. This may be a "
 "problem with your network, or with the mirror. You can choose to retry the "
@@ -2715,15 +2717,16 @@
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:101
-msgid "Desktop machine"
-msgstr "MasaÃ¼stÃ¼ makinesi"
+#, fuzzy
+msgid "Separate /home partition"
+msgstr "bÃ¶lÃ¼mÃ¼ biÃ§imlendir"
 
 #. Type: text
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:106
-msgid "Multi-user workstation"
-msgstr "Ã‡ok kullanÄ±cÄ±lÄ± iÅŸ istasyonu"
+msgid "Separate /home, /usr, /var, and /tmp partitions"
+msgstr ""
 
 #. Type: boolean
 #. Description
@@ -5470,14 +5473,14 @@
 
 #. Type: select
 #. Choices
-#: ../apt-mirror-setup.templates:30
+#: ../apt-mirror-setup.templates:32
 #, fuzzy
 msgid "Ignore"
 msgstr "hiÃ§biri"
 
 #. Type: select
 #. Description
-#: ../apt-mirror-setup.templates:31
+#: ../apt-mirror-setup.templates:33
 #, fuzzy
 msgid ""
 "The installer failed to access the mirror. This may be a problem with your "
@@ -11286,6 +11289,12 @@
 msgid "Configure the base system before rebooting"
 msgstr "Yeniden baÅŸlatmadan Ã¶nce temel sistemi yapÄ±landÄ±r"
 
+#~ msgid "Desktop machine"
+#~ msgstr "MasaÃ¼stÃ¼ makinesi"
+
+#~ msgid "Multi-user workstation"
+#~ msgstr "Ã‡ok kullanÄ±cÄ±lÄ± iÅŸ istasyonu"
+
 #, fuzzy
 #~ msgid "Retry, Change mirror, Ignore"
 #~ msgstr "Tekrar dene, BaÅŸka bir yansÄ± kullan, Ä°ptal et"

Modified: trunk/packages/po/uk.po
===================================================================
--- trunk/packages/po/uk.po	2005-11-16 01:40:18 UTC (rev 32163)
+++ trunk/packages/po/uk.po	2005-11-16 01:45:44 UTC (rev 32164)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: uk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-15 08:03+0000\n"
+"POT-Creation-Date: 2005-11-16 01:33+0000\n"
 "PO-Revision-Date: 2005-11-13 16:20+0200\n"
 "Last-Translator: Eugeniy Meshcheryakov <eugen at univ.kiev.ua>\n"
 "Language-Team: Ukrainian\n"
@@ -1966,32 +1966,34 @@
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#. These are choices of actions so this is, at least in English,
+#. an infinitive form
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 msgid "Retry"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 #, fuzzy
 msgid "Change mirror"
 msgstr "ÐŸÐ¾Ð²Ñ‚Ð¾Ñ€Ð¸Ñ‚Ð¸, Ð—Ð¼Ñ–Ð½Ð¸Ñ‚Ð¸ Ð´Ð·ÐµÑ€ÐºÐ°Ð»Ð¾, Ð¡ÐºÐ°ÑÑƒÐ²Ð°Ñ‚Ð¸"
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../mdcfg-utils.templates:122
+#: ../net-retriever.templates:5 ../mdcfg-utils.templates:122
 msgid "Cancel"
 msgstr "Ð¡ÐºÐ°ÑÑƒÐ²Ð°Ñ‚Ð¸"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:31
+#: ../net-retriever.templates:7 ../apt-mirror-setup.templates:33
 msgid "Downloading a file failed:"
 msgstr "ÐÐµ Ð²Ð´Ð°Ð»Ð¾ÑÑ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶Ð¸Ñ‚Ð¸ Ñ„Ð°Ð¹Ð»:"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5
+#: ../net-retriever.templates:7
 msgid ""
 "The installer failed to download a file from the mirror. This may be a "
 "problem with your network, or with the mirror. You can choose to retry the "
@@ -2707,15 +2709,16 @@
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:101
-msgid "Desktop machine"
-msgstr "ÐÐ°ÑÑ‚Ñ–Ð»ÑŒÐ½Ð¸Ð¹ ÐºÐ¾Ð¼Ð¿'ÑŽÑ‚ÐµÑ€"
+#, fuzzy
+msgid "Separate /home partition"
+msgstr "Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚ÑƒÐ²Ð°Ñ‚Ð¸ Ñ€Ð¾Ð·Ð´Ñ–Ð»"
 
 #. Type: text
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:106
-msgid "Multi-user workstation"
-msgstr "Ð‘Ð°Ð³Ð°Ñ‚Ð¾ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ†ÑŒÐºÐ° Ñ€Ð¾Ð±Ð¾Ñ‡Ð° ÑÑ‚Ð°Ð½Ñ†Ñ–Ñ"
+msgid "Separate /home, /usr, /var, and /tmp partitions"
+msgstr ""
 
 #. Type: boolean
 #. Description
@@ -5456,14 +5459,14 @@
 
 #. Type: select
 #. Choices
-#: ../apt-mirror-setup.templates:30
+#: ../apt-mirror-setup.templates:32
 #, fuzzy
 msgid "Ignore"
 msgstr "Ð²Ñ–Ð´ÑÑƒÑ‚Ð½Ñ"
 
 #. Type: select
 #. Description
-#: ../apt-mirror-setup.templates:31
+#: ../apt-mirror-setup.templates:33
 #, fuzzy
 msgid ""
 "The installer failed to access the mirror. This may be a problem with your "
@@ -11255,6 +11258,12 @@
 msgid "Configure the base system before rebooting"
 msgstr "ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ñ‚Ð¸ Ð±Ð°Ð·Ð¾Ð²Ñƒ ÑÐ¸ÑÑ‚ÐµÐ¼Ñƒ Ð´Ð¾ Ð¿ÐµÑ€ÐµÐ·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ"
 
+#~ msgid "Desktop machine"
+#~ msgstr "ÐÐ°ÑÑ‚Ñ–Ð»ÑŒÐ½Ð¸Ð¹ ÐºÐ¾Ð¼Ð¿'ÑŽÑ‚ÐµÑ€"
+
+#~ msgid "Multi-user workstation"
+#~ msgstr "Ð‘Ð°Ð³Ð°Ñ‚Ð¾ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ†ÑŒÐºÐ° Ñ€Ð¾Ð±Ð¾Ñ‡Ð° ÑÑ‚Ð°Ð½Ñ†Ñ–Ñ"
+
 #, fuzzy
 #~ msgid "Retry, Change mirror, Ignore"
 #~ msgstr "ÐŸÐ¾Ð²Ñ‚Ð¾Ñ€Ð¸Ñ‚Ð¸, Ð—Ð¼Ñ–Ð½Ð¸Ñ‚Ð¸ Ð´Ð·ÐµÑ€ÐºÐ°Ð»Ð¾, Ð¡ÐºÐ°ÑÑƒÐ²Ð°Ñ‚Ð¸"

Modified: trunk/packages/po/vi.po
===================================================================
--- trunk/packages/po/vi.po	2005-11-16 01:40:18 UTC (rev 32163)
+++ trunk/packages/po/vi.po	2005-11-16 01:45:44 UTC (rev 32164)
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: debian-installer Level 1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-15 08:03+0000\n"
+"POT-Creation-Date: 2005-11-16 01:33+0000\n"
 "PO-Revision-Date: 2005-08-21 14:21+0930\n"
 "Last-Translator: Clytie Siddall <clytie at riverland.net.au>\n"
 "Language-Team: Vietnamese <debian-l10n-vietnamese at lists.debian.org>\n"
@@ -2343,7 +2343,9 @@
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#. These are choices of actions so this is, at least in English,
+#. an infinitive form
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 msgid "Retry"
 msgstr ""
 
@@ -2351,7 +2353,7 @@
 # Choices
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 #, fuzzy
 msgid "Change mirror"
 msgstr "Thá» láº¡i, Äá»•i nhÃ¢n báº£n, ThÃ´i"
@@ -2360,7 +2362,7 @@
 # Choices
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../mdcfg-utils.templates:122
+#: ../net-retriever.templates:5 ../mdcfg-utils.templates:122
 msgid "Cancel"
 msgstr "ThÃ´i"
 
@@ -2368,13 +2370,13 @@
 # Description
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:31
+#: ../net-retriever.templates:7 ../apt-mirror-setup.templates:33
 msgid "Downloading a file failed:"
 msgstr "KhÃ´ng táº£i vá» táºp tin Ä‘Æ°á»£c:"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5
+#: ../net-retriever.templates:7
 msgid ""
 "The installer failed to download a file from the mirror. This may be a "
 "problem with your network, or with the mirror. You can choose to retry the "
@@ -3258,17 +3260,16 @@
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:101
-msgid "Desktop machine"
-msgstr "MÃ¡y vi tÃnh chuáº©n"
+#, fuzzy
+msgid "Separate /home partition"
+msgstr "Ä‘á»‹nh dáº¡ng phÃ¢n vÃ¹ng áº¥y"
 
-# Type: text
-# Description
 #. Type: text
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:106
-msgid "Multi-user workstation"
-msgstr "MÃ¡y tráº¡m Ä‘a ngÆ°á»i dÃ¹ng"
+msgid "Separate /home, /usr, /var, and /tmp partitions"
+msgstr ""
 
 # Type: boolean
 # Description
@@ -6392,14 +6393,14 @@
 # In the following context: "Mount point: none"
 #. Type: select
 #. Choices
-#: ../apt-mirror-setup.templates:30
+#: ../apt-mirror-setup.templates:32
 #, fuzzy
 msgid "Ignore"
 msgstr "khÃ´ng cÃ³"
 
 #. Type: select
 #. Description
-#: ../apt-mirror-setup.templates:31
+#: ../apt-mirror-setup.templates:33
 #, fuzzy
 msgid ""
 "The installer failed to access the mirror. This may be a problem with your "
@@ -13138,6 +13139,16 @@
 msgid "Configure the base system before rebooting"
 msgstr "Äá»‹nh cáº¥u hÃ¬nh há»‡ thá»‘ng cÆ¡ sá»Ÿ trÆ°á»›c khi khá»Ÿi Ä‘á»™ng láº¡i"
 
+# Type: text
+# Description
+#~ msgid "Desktop machine"
+#~ msgstr "MÃ¡y vi tÃnh chuáº©n"
+
+# Type: text
+# Description
+#~ msgid "Multi-user workstation"
+#~ msgstr "MÃ¡y tráº¡m Ä‘a ngÆ°á»i dÃ¹ng"
+
 # Type: select
 # Choices
 #, fuzzy

Modified: trunk/packages/po/wo.po
===================================================================
--- trunk/packages/po/wo.po	2005-11-16 01:40:18 UTC (rev 32163)
+++ trunk/packages/po/wo.po	2005-11-16 01:45:44 UTC (rev 32164)
@@ -14,7 +14,7 @@
 msgstr ""
 "Project-Id-Version: wo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-15 08:03+0000\n"
+"POT-Creation-Date: 2005-11-16 01:33+0000\n"
 "PO-Revision-Date: 2005-10-23 00:52+0000\n"
 "Last-Translator: Mouhamadou Mamoune Mbacke <mouhamadoumamoune at gmail.com>\n"
 "Language-Team: Wolof <debian-boot at lists.debian.org>\n"
@@ -1971,32 +1971,34 @@
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#. These are choices of actions so this is, at least in English,
+#. an infinitive form
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 msgid "Retry"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 #, fuzzy
 msgid "Change mirror"
 msgstr "JÃ©emaat, Soppi ab seetu, Bayyi"
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../mdcfg-utils.templates:122
+#: ../net-retriever.templates:5 ../mdcfg-utils.templates:122
 msgid "Cancel"
 msgstr "Neenal"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:31
+#: ../net-retriever.templates:7 ../apt-mirror-setup.templates:33
 msgid "Downloading a file failed:"
 msgstr "Sippi fiise bi antuwul:"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5
+#: ../net-retriever.templates:7
 msgid ""
 "The installer failed to download a file from the mirror. This may be a "
 "problem with your network, or with the mirror. You can choose to retry the "
@@ -2710,15 +2712,16 @@
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:101
-msgid "Desktop machine"
-msgstr "Kompiutar bu biro (Desktop)"
+#, fuzzy
+msgid "Separate /home partition"
+msgstr "formaate partisoÅ‹ bi"
 
 #. Type: text
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:106
-msgid "Multi-user workstation"
-msgstr "EstaasioÅ‹ u liggÃ©ey bu bare way jÃ«fandiku"
+msgid "Separate /home, /usr, /var, and /tmp partitions"
+msgstr ""
 
 #. Type: boolean
 #. Description
@@ -5463,14 +5466,14 @@
 
 #. Type: select
 #. Choices
-#: ../apt-mirror-setup.templates:30
+#: ../apt-mirror-setup.templates:32
 #, fuzzy
 msgid "Ignore"
 msgstr "benn"
 
 #. Type: select
 #. Description
-#: ../apt-mirror-setup.templates:31
+#: ../apt-mirror-setup.templates:33
 #, fuzzy
 msgid ""
 "The installer failed to access the mirror. This may be a problem with your "
@@ -11256,6 +11259,12 @@
 msgid "Configure the base system before rebooting"
 msgstr "Komfigure sistem u baas bi jÃ«kk nuy reboot"
 
+#~ msgid "Desktop machine"
+#~ msgstr "Kompiutar bu biro (Desktop)"
+
+#~ msgid "Multi-user workstation"
+#~ msgstr "EstaasioÅ‹ u liggÃ©ey bu bare way jÃ«fandiku"
+
 #, fuzzy
 #~ msgid "Retry, Change mirror, Ignore"
 #~ msgstr "JÃ©emaat, Soppi ab seetu, Bayyi"

Modified: trunk/packages/po/xh.po
===================================================================
--- trunk/packages/po/xh.po	2005-11-16 01:40:18 UTC (rev 32163)
+++ trunk/packages/po/xh.po	2005-11-16 01:45:44 UTC (rev 32164)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-15 08:03+0000\n"
+"POT-Creation-Date: 2005-11-16 01:33+0000\n"
 "PO-Revision-Date: 2005-06-13 14:08+0200\n"
 "Last-Translator: Canonical Ltd <translations at canonical.com>\n"
 "Language-Team: Xhosa <xh-translate at ubuntu.com>\n"
@@ -2019,32 +2019,34 @@
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#. These are choices of actions so this is, at least in English,
+#. an infinitive form
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 msgid "Retry"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 #, fuzzy
 msgid "Change mirror"
 msgstr "Zama kwakhona, Tshintsha isipili, Rhoxisa"
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../mdcfg-utils.templates:122
+#: ../net-retriever.templates:5 ../mdcfg-utils.templates:122
 msgid "Cancel"
 msgstr "Rhoxisa"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:31
+#: ../net-retriever.templates:7 ../apt-mirror-setup.templates:33
 msgid "Downloading a file failed:"
 msgstr "Ukulayisha ulwazi kwifayili akuphumelelanga:"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5
+#: ../net-retriever.templates:7
 msgid ""
 "The installer failed to download a file from the mirror. This may be a "
 "problem with your network, or with the mirror. You can choose to retry the "
@@ -2750,14 +2752,15 @@
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:101
-msgid "Desktop machine"
-msgstr ""
+#, fuzzy
+msgid "Separate /home partition"
+msgstr "lungiselela ukwahlulwa"
 
 #. Type: text
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:106
-msgid "Multi-user workstation"
+msgid "Separate /home, /usr, /var, and /tmp partitions"
 msgstr ""
 
 #. Type: boolean
@@ -5554,14 +5557,14 @@
 
 #. Type: select
 #. Choices
-#: ../apt-mirror-setup.templates:30
+#: ../apt-mirror-setup.templates:32
 #, fuzzy
 msgid "Ignore"
 msgstr "<azikho>"
 
 #. Type: select
 #. Description
-#: ../apt-mirror-setup.templates:31
+#: ../apt-mirror-setup.templates:33
 #, fuzzy
 msgid ""
 "The installer failed to access the mirror. This may be a problem with your "

Modified: trunk/packages/po/zh_CN.po
===================================================================
--- trunk/packages/po/zh_CN.po	2005-11-16 01:40:18 UTC (rev 32163)
+++ trunk/packages/po/zh_CN.po	2005-11-16 01:45:44 UTC (rev 32164)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-15 08:03+0000\n"
+"POT-Creation-Date: 2005-11-16 01:33+0000\n"
 "PO-Revision-Date: 2005-11-15 02:53-0600\n"
 "Last-Translator: Ming Hua <minghua at rice.edu>\n"
 "Language-Team: Debian Chinese [GB] <debian-chinese-gb at lists.debian.org>\n"
@@ -1880,31 +1880,33 @@
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#. These are choices of actions so this is, at least in English,
+#. an infinitive form
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 msgid "Retry"
 msgstr "é‡è¯•"
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 msgid "Change mirror"
 msgstr "æ”¹æ¢é•œåƒ"
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../mdcfg-utils.templates:122
+#: ../net-retriever.templates:5 ../mdcfg-utils.templates:122
 msgid "Cancel"
 msgstr "å–æ¶ˆ"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:31
+#: ../net-retriever.templates:7 ../apt-mirror-setup.templates:33
 msgid "Downloading a file failed:"
 msgstr "ä¸‹è½½æ–‡ä»¶å¤±è´¥ï¼š"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5
+#: ../net-retriever.templates:7
 msgid ""
 "The installer failed to download a file from the mirror. This may be a "
 "problem with your network, or with the mirror. You can choose to retry the "
@@ -2587,15 +2589,16 @@
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:101
-msgid "Desktop machine"
-msgstr "æ¡Œé¢ç”µè„‘"
+#, fuzzy
+msgid "Separate /home partition"
+msgstr "æ ¼å¼åŒ–åˆ†åŒº"
 
 #. Type: text
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:106
-msgid "Multi-user workstation"
-msgstr "å¤šç”¨æˆ·å·¥ä½œç«™"
+msgid "Separate /home, /usr, /var, and /tmp partitions"
+msgstr ""
 
 #. Type: boolean
 #. Description
@@ -5244,13 +5247,13 @@
 
 #. Type: select
 #. Choices
-#: ../apt-mirror-setup.templates:30
+#: ../apt-mirror-setup.templates:32
 msgid "Ignore"
 msgstr "å¿½ç•¥"
 
 #. Type: select
 #. Description
-#: ../apt-mirror-setup.templates:31
+#: ../apt-mirror-setup.templates:33
 msgid ""
 "The installer failed to access the mirror. This may be a problem with your "
 "network, or with the mirror. You can choose to retry the download, select a "
@@ -10751,6 +10754,12 @@
 msgid "Configure the base system before rebooting"
 msgstr "åœ¨é‡å¯å‰é…ç½®åŸºæœ¬ç³»ç»Ÿ"
 
+#~ msgid "Desktop machine"
+#~ msgstr "æ¡Œé¢ç”µè„‘"
+
+#~ msgid "Multi-user workstation"
+#~ msgstr "å¤šç”¨æˆ·å·¥ä½œç«™"
+
 #, fuzzy
 #~ msgid "Retry, Change mirror, Ignore"
 #~ msgstr "é‡è¯•, æ”¹æ¢é•œåƒ, å–æ¶ˆ"

Modified: trunk/packages/po/zh_TW.po
===================================================================
--- trunk/packages/po/zh_TW.po	2005-11-16 01:40:18 UTC (rev 32163)
+++ trunk/packages/po/zh_TW.po	2005-11-16 01:45:44 UTC (rev 32164)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-15 08:03+0000\n"
+"POT-Creation-Date: 2005-11-16 01:33+0000\n"
 "PO-Revision-Date: 2005-04-19 07:06+0800\n"
 "Last-Translator: Tetralet <tetralet at pchome.com.tw>\n"
 "Language-Team: Debian-user in Chinese [Big5] <debian-chinese-big5 at lists."
@@ -1910,32 +1910,34 @@
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#. These are choices of actions so this is, at least in English,
+#. an infinitive form
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 msgid "Retry"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../apt-mirror-setup.templates:30
+#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:32
 #, fuzzy
 msgid "Change mirror"
 msgstr "å†æ¬¡å˜—è©¦, æ›´æ›é¡åƒç«™, å–æ¶ˆ"
 
 #. Type: select
 #. Choices
-#: ../net-retriever.templates:3 ../mdcfg-utils.templates:122
+#: ../net-retriever.templates:5 ../mdcfg-utils.templates:122
 msgid "Cancel"
 msgstr "å–æ¶ˆ"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5 ../apt-mirror-setup.templates:31
+#: ../net-retriever.templates:7 ../apt-mirror-setup.templates:33
 msgid "Downloading a file failed:"
 msgstr "åœ¨ä¸‹è¼‰æª”æ¡ˆæ™‚å¤±æ•—äº†ï¼š"
 
 #. Type: select
 #. Description
-#: ../net-retriever.templates:5
+#: ../net-retriever.templates:7
 msgid ""
 "The installer failed to download a file from the mirror. This may be a "
 "problem with your network, or with the mirror. You can choose to retry the "
@@ -2626,15 +2628,16 @@
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:101
-msgid "Desktop machine"
-msgstr "æ¡Œé¢é›»è…¦"
+#, fuzzy
+msgid "Separate /home partition"
+msgstr "æ ¼å¼åŒ–æ¤åˆ†å‰²å€"
 
 #. Type: text
 #. Description
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:106
-msgid "Multi-user workstation"
-msgstr "å¤šä½¿ç”¨è€…å·¥ä½œç«™"
+msgid "Separate /home, /usr, /var, and /tmp partitions"
+msgstr ""
 
 #. Type: boolean
 #. Description
@@ -5307,14 +5310,14 @@
 
 #. Type: select
 #. Choices
-#: ../apt-mirror-setup.templates:30
+#: ../apt-mirror-setup.templates:32
 #, fuzzy
 msgid "Ignore"
 msgstr "ç„¡"
 
 #. Type: select
 #. Description
-#: ../apt-mirror-setup.templates:31
+#: ../apt-mirror-setup.templates:33
 #, fuzzy
 msgid ""
 "The installer failed to access the mirror. This may be a problem with your "
@@ -10901,6 +10904,12 @@
 msgid "Configure the base system before rebooting"
 msgstr "åœ¨é‡æ–°é–‹æ©Ÿä¹‹å‰è¨å®š Base System"
 
+#~ msgid "Desktop machine"
+#~ msgstr "æ¡Œé¢é›»è…¦"
+
+#~ msgid "Multi-user workstation"
+#~ msgstr "å¤šä½¿ç”¨è€…å·¥ä½œç«™"
+
 #, fuzzy
 #~ msgid "Retry, Change mirror, Ignore"
 #~ msgstr "å†æ¬¡å˜—è©¦, æ›´æ›é¡åƒç«™, å–æ¶ˆ"


