From: Christian Perrier <bubulle@debian.org>
Date: Wed, 29 Nov 2006 06:40:31 +0000 (+0100)
Subject: Imported Debian patch 3.7-7.1
X-Git-Tag: debian/3.7-7.1^0
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b560e6bc683d72652d37eb471e0bdd9300feba50;p=sash

Imported Debian patch 3.7-7.1
---

diff --git a/debian/changelog b/debian/changelog
index a1b06ff..fe1f4b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+sash (3.7-7.1) unstable; urgency=low
+
+  * Non-maintainer upload to fix longstanding l10n issues
+  * Rewrite templates to better fit the Developer's Reference recommendations
+    This also Closes: #368750
+  * Debconf translation updates:
+    - Swedish added. Closes: #338776
+    - French updated. Sent during the call for updates of the NMU campaign.
+    - Vietnamese updated. Sent during the call for updates of the NMU campaign.
+    - Dzongkha added. Sent during the call for updates of the NMU campaign.
+    - German added. Sent during the call for updates of the NMU campaign.
+    - Russian added. Sent during the call for updates of the NMU campaign.
+
+ -- Christian Perrier <bubulle@debian.org>  Wed, 29 Nov 2006 07:40:31 +0100
+
 sash (3.7-7) unstable; urgency=low
 
   * Remove /usr/doc/sash symlink if it exists.  (closes: #322797)
diff --git a/debian/po/cs.po b/debian/po/cs.po
index 893cc04..420d380 100644
--- a/debian/po/cs.po
+++ b/debian/po/cs.po
@@ -15,80 +15,84 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sash\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-10 03:11+0100\n"
-"PO-Revision-Date: 2005-02-09 20:46+0100\n"
+"POT-Creation-Date: 2006-12-03 12:55+0100\n"
+"PO-Revision-Date: 2006-11-29 19:31+0100\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
-"Language-Team: Czech <debian-l10n-czech@debian.org>\n"
+"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-2\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Type: boolean
 #. Description
-#: ../templates:4
+#: ../templates:1001
 msgid "Create sashroot account?"
-msgstr "Vytvoøit úèet sashroot?"
+msgstr "Vytvořit účet sashroot?"
 
 #. Type: boolean
 #. Description
-#: ../templates:4
+#: ../templates:1001
 msgid ""
-"Do you want to create a second root account with sash as its shell? The "
-"account name will be \"sashroot\"."
+"Please choose whether you want to create a second root account with sash as "
+"its shell. The account name will be 'sashroot'."
 msgstr ""
-"Chcete vytvoøit druhý rootovský úèet, je¾ bude jako shell pou¾ívat sash? "
-"Název úètu bude \"sashroot\"."
+"Zvolte, zda chcete vytvořit druhý rootovský účet, jež bude jako shell "
+"používat sash. Název účtu bude \"sashroot\"."
 
 #. Type: boolean
 #. Description
-#: ../templates:4
-msgid "Advantage: current root account is left untouched"
-msgstr "Výhoda: rootovského úètu se zmìna nedotkne"
+#: ../templates:1001
+msgid "Advantage: the current root account is left untouched;"
+msgstr "Výhoda: aktuálního rootovského účtu se změna nedotkne;"
 
 #. Type: boolean
 #. Description
-#: ../templates:4
-msgid "Disadvantage: you'd have two root accounts to keep track of"
-msgstr "Nevýhoda: musíte sledovat dva rootovské úèty"
+#: ../templates:1001
+msgid "Disadvantage: you'd have two root accounts to keep track of."
+msgstr "Nevýhoda: musíte sledovat dva rootovské účty."
 
 #. Type: boolean
 #. Description
-#: ../templates:15
+#: ../templates:2001
 msgid "Clone root password for sashroot?"
-msgstr "Naklovovat root heslo pro sashroot?"
+msgstr "Naklonovat root heslo pro sashroot?"
 
 #. Type: boolean
 #. Description
-#: ../templates:15
+#: ../templates:2001
 msgid ""
-"Do you want to make sashroot's password the same as root's password? Note "
-"that if you change the root password, sashroot's password will not be "
-"updated."
+"Please choose whether the password for the sashroot account should be the "
+"root account password. Note that if you change the root password later, "
+"sashroot's password will not be updated."
 msgstr ""
-"Chcete pro úèet sashroot pou¾ít stejné heslo, jako má root? Pokud pozdìji "
-"rootovo heslo zmìníte, zmìna se na úètu sashroot samozøejmì neprojeví."
+"Zvolte, zda chcete pro účet sashroot použít stejné heslo, jako má root. "
+"Pokud později rootovo heslo změníte, změna se na účtu sashroot samozřejmě "
+"neprojeví."
 
 #. Type: boolean
 #. Description
-#: ../templates:15
-msgid "Advantage: easy to remember"
-msgstr "Výhoda: jednodu¹e se pamatuje"
+#: ../templates:2001
+msgid "Advantage: this makes the password easy to remember;"
+msgstr "Výhoda: jednoduše se pamatuje;"
 
 #. Type: boolean
 #. Description
-#: ../templates:15
-msgid "Disadvantage: easy to remember"
-msgstr "Nevýhoda: jednodu¹e se pamatuje"
+#: ../templates:2001
+msgid ""
+"Disadvantage: the password being easy to remember, the overall security of "
+"your system is lowered."
+msgstr ""
+"Nevýhoda: heslo se jednoduše pamatuje, celková bezpečnost systému se sníží."
 
 #. Type: password
 #. Description
-#: ../templates:26
-msgid "Enter a password for sashroot"
-msgstr "Zadejte heslo úètu sashroot"
+#: ../templates:3001
+msgid "sashroot account password:"
+msgstr "Heslo účtu sashroot:"
 
 #. Type: password
 #. Description
-#: ../templates:26
+#: ../templates:3001
 msgid ""
 "Before proceeding, you need to set a password for 'sashroot'.  The password "
 "shouldn't be easy to guess, and it shouldn't be a word found in the "
@@ -96,62 +100,68 @@ msgid ""
 "middle name. A good password will contain a mixture of letters, numbers and "
 "punctuation and will be changed at regular intervals."
 msgstr ""
-"Pøed pokraèováním musíte nastavit heslo pro úèet 'sashroot'. Heslo by "
-"nemìlo být uhodnutelné a nemìlo by obsahovat slova ze slovníku, nebo "
-"údaje, které se dají jednodu¹e spojit s va¹í osobou. Dobré heslo obsahuje "
-"smìs písmen, èíslic a dal¹ích znakù a je pravidelnì mìnìno."
+"Před pokračováním musíte nastavit heslo pro účet 'sashroot'. Heslo by nemělo "
+"být uhodnutelné a nemělo by obsahovat slova ze slovníku, nebo údaje, které "
+"se dají jednoduše spojit s vaší osobou. Dobré heslo obsahuje směs písmen, "
+"číslic a dalších znaků a je pravidelně měněno."
 
 #. Type: password
 #. Description
-#: ../templates:26
+#: ../templates:3001
 msgid ""
-"Why such caution?  The sashroot account doesn't have the restrictions that "
-"normal user accounts have. A malicious or unqualified user with root access "
-"can have disastrous results."
+"The 'sashroot' account doesn't have the restrictions that normal user "
+"accounts have. A malicious or unqualified user with root access can have "
+"disastrous results."
 msgstr ""
-"Proè taková opatrnost? úèet sashroot nemá v systému ¾ádné omezení. "
-"Zlomyslný nebo neznalý u¾ivatel s rootovskými právy mù¾e v systému "
-"napáchat neuvìøitelné ¹kody."
+"Účet sashroot nemá v systému žádná omezení. Zlomyslný nebo neznalý uživatel "
+"s rootovskými právy může v systému napáchat neuvěřitelné škody."
 
 #. Type: password
 #. Description
-#: ../templates:26
+#: ../templates:3001
 msgid "Note that you will not be able to see the password as you type it."
-msgstr "Heslo se pøi psaní nezobrazuje."
+msgstr "Heslo se při psaní nezobrazuje."
 
 #. Type: boolean
 #. Description
-#: ../templates:42
+#: ../templates:4001
 msgid "Change root's shell?"
-msgstr "Zmìnit shell u¾ivatele root?"
+msgstr "Změnit shell uživatele root?"
 
 #. Type: boolean
 #. Description
-#: ../templates:42
-msgid "Do you want to change root's shell to sash?"
-msgstr "Chcete zmìnit shell u¾ivatele root na sash?"
+#: ../templates:4001
+msgid ""
+"Please choose whether you want the root account's shell changed to sash."
+msgstr "Rozhodněte se, zda chcete změnit shell uživatele root na sash."
 
 #. Type: boolean
 #. Description
-#: ../templates:48
+#: ../templates:5001
 msgid "Delete sashroot account?"
-msgstr "Smazat úèet sashroot?"
+msgstr "Smazat účet sashroot?"
 
 #. Type: boolean
 #. Description
-#: ../templates:48
-msgid "Do you want to remove the sashroot account?"
-msgstr "Chcete odstranit úèet sashroot?"
+#: ../templates:5001
+msgid "Please choose whether you want to remove the 'sashroot' account."
+msgstr "Rozhodněte se, zda chcete odstranit účet \"sashroot\"."
 
 #. Type: boolean
 #. Description
-#: ../templates:48
-msgid "Advantage: more secure, leaves less clutter on the system"
-msgstr "Výhoda: bezpeènìj¹í, zanechá v systému ménì nepoøádku"
+#: ../templates:5001
+msgid "Advantage: this is more secure and leaves less clutter on the system;"
+msgstr "Výhoda: bezpečnější, zanechá v systému méně nepořádku;"
 
 #. Type: boolean
 #. Description
-#: ../templates:48
-msgid "Disadvantage: may lose account customization (if any)"
+#: ../templates:5001
+msgid "Disadvantage: this may lose account customization (if any)."
 msgstr ""
-"Nevýhoda: mù¾ete ztratit rùzná pøizpùsobení úètu (pokud jste je provedli)"
+"Nevýhoda: můžete ztratit různá přizpůsobení účtu (pokud jste je provedli)."
+
+#~ msgid "Disadvantage: easy to remember"
+#~ msgstr "Nevýhoda: jednoduše se pamatuje"
+
+#~ msgid "Enter a password for sashroot"
+#~ msgstr "Zadejte heslo účtu sashroot"
diff --git a/debian/po/de.po b/debian/po/de.po
index 266f1bd..29e2137 100644
--- a/debian/po/de.po
+++ b/debian/po/de.po
@@ -1,3 +1,4 @@
+# translation of sash_3.7-4.1_de.po to German
 #
 #    Translators, if you are not familiar with the PO format, gettext
 #    documentation is worth reading, especially sections dedicated to
@@ -8,89 +9,93 @@
 #            /usr/share/doc/po-debconf/README-trans
 #         or http://www.debian.org/intl/l10n/po-debconf/README-trans#
 #    Developers do not need to manually edit POT or PO files.
-# Erik Schanze <mail@erikschanze.de>, 2004.
 #
+# Erik Schanze <eriks@debian.org>, 2004-2006.
 msgid ""
 msgstr ""
-"Project-Id-Version: sash_3.7-4_de\n"
+"Project-Id-Version: sash_3.7-4.1_de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-10 03:11+0100\n"
-"PO-Revision-Date: 2004-08-17 07:57+0200\n"
-"Last-Translator: Erik Schanze <mail@erikschanze.de>\n"
+"POT-Creation-Date: 2006-12-03 12:55+0100\n"
+"PO-Revision-Date: 2006-12-01 21:58+0100\n"
+"Last-Translator: Erik Schanze <eriks@debian.org>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.3.1\n"
+"X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
 #. Type: boolean
 #. Description
-#: ../templates:4
+#: ../templates:1001
 msgid "Create sashroot account?"
-msgstr "Zugang sashroot anlegen?"
+msgstr "Einen Zugang Sashroot anlegen?"
 
 #. Type: boolean
 #. Description
-#: ../templates:4
+#: ../templates:1001
 msgid ""
-"Do you want to create a second root account with sash as its shell? The "
-"account name will be \"sashroot\"."
+"Please choose whether you want to create a second root account with sash as "
+"its shell. The account name will be 'sashroot'."
 msgstr ""
-"Wollen Sie einen zweiten root-Zugang mit sash als Shell einrichten? Der "
-"Zugangsname wird \"sashroot\" sein."
+"Wollen Sie einen zweiten Root-Zugang mit Sash als Shell einrichten? Der "
+"Zugangsname wird »sashroot« sein."
 
 #. Type: boolean
 #. Description
-#: ../templates:4
-msgid "Advantage: current root account is left untouched"
-msgstr "Vorteil: der aktuelle root-Zugang bleibt unverändert"
+#: ../templates:1001
+msgid "Advantage: the current root account is left untouched;"
+msgstr "Vorteil: der aktuelle Root-Zugang bleibt unverändert;"
 
 #. Type: boolean
 #. Description
-#: ../templates:4
-msgid "Disadvantage: you'd have two root accounts to keep track of"
-msgstr "Nachteil: Sie müssen zwei root-Zugänge verwalten"
+#: ../templates:1001
+msgid "Disadvantage: you'd have two root accounts to keep track of."
+msgstr "Nachteil: Sie müssen zwei Root-Zugänge verwalten."
 
 #. Type: boolean
 #. Description
-#: ../templates:15
+#: ../templates:2001
 msgid "Clone root password for sashroot?"
-msgstr "Aktuelles root-Passwort auch für sashroot verwenden?"
+msgstr "Aktuelles Root-Passwort auch für Sashroot verwenden?"
 
 #. Type: boolean
 #. Description
-#: ../templates:15
+#: ../templates:2001
 msgid ""
-"Do you want to make sashroot's password the same as root's password? Note "
-"that if you change the root password, sashroot's password will not be "
-"updated."
+"Please choose whether the password for the sashroot account should be the "
+"root account password. Note that if you change the root password later, "
+"sashroot's password will not be updated."
 msgstr ""
-"Soll das Passwort für sashroot das gleiche sein, wie für root? Beachten Sie, "
-"wenn Sie das root-Passwort ändern, wird das sashroot-Passwort nicht "
+"Soll das Passwort für »sashroot« das gleiche sein, wie für Root? Beachten "
+"Sie, wenn Sie das Root-Passwort ändern, wird das Sashroot-Passwort nicht "
 "aktualisiert."
 
 #. Type: boolean
 #. Description
-#: ../templates:15
-msgid "Advantage: easy to remember"
-msgstr "Vorteil: einfach zu merken"
+#: ../templates:2001
+msgid "Advantage: this makes the password easy to remember;"
+msgstr "Vorteil: das Passwort ist einfach zu merken"
 
 #. Type: boolean
 #. Description
-#: ../templates:15
-msgid "Disadvantage: easy to remember"
-msgstr "Nachteil: einfach zu merken"
+#: ../templates:2001
+msgid ""
+"Disadvantage: the password being easy to remember, the overall security of "
+"your system is lowered."
+msgstr ""
+"Nachteil: je einfacher sich Passwörter merken lassen, desto unsicherer wird "
+"Ihr gesamtes System."
 
 #. Type: password
 #. Description
-#: ../templates:26
-msgid "Enter a password for sashroot"
-msgstr "Passwort für sashroot eingeben:"
+#: ../templates:3001
+msgid "sashroot account password:"
+msgstr "Passwort des Sashroot-Zugangs:"
 
 #. Type: password
 #. Description
-#: ../templates:26
+#: ../templates:3001
 msgid ""
 "Before proceeding, you need to set a password for 'sashroot'.  The password "
 "shouldn't be easy to guess, and it shouldn't be a word found in the "
@@ -98,63 +103,68 @@ msgid ""
 "middle name. A good password will contain a mixture of letters, numbers and "
 "punctuation and will be changed at regular intervals."
 msgstr ""
-"Bevor es weiter geht, müssen Sie für den Benutzer 'sashroot' ein Passwort "
-"eingeben.  Es sollte nicht leicht zu erraten und kein Wort aus einem Wörterbuch "
-"sein oder das einfach mit Ihnen in Verbindung gebracht werden kann, wie Ihr "
-"zweiter Vorname. Ein gutes Passwort besteht aus einer Mischung aus Buchstaben, "
-"Ziffern und Sonderzeichen und sollte regelmäßig geändert werden."
+"Bevor es weiter geht, müssen Sie für den Benutzer »sashroot« ein Passwort "
+"eingeben.  Es sollte nicht leicht zu erraten und kein Wort aus einem "
+"Wörterbuch sein oder das einfach mit Ihnen in Verbindung gebracht werden "
+"kann, wie Ihr zweiter Vorname. Ein gutes Passwort besteht aus einer Mischung "
+"aus Buchstaben, Ziffern und Sonderzeichen und sollte regelmäßig geändert "
+"werden."
 
 #. Type: password
 #. Description
-#: ../templates:26
+#: ../templates:3001
 msgid ""
-"Why such caution?  The sashroot account doesn't have the restrictions that "
-"normal user accounts have. A malicious or unqualified user with root access "
-"can have disastrous results."
+"The 'sashroot' account doesn't have the restrictions that normal user "
+"accounts have. A malicious or unqualified user with root access can have "
+"disastrous results."
 msgstr ""
-"Warum diese Vorsicht? Der Zugang sashroot hat keine Beschränkungen, wie ein "
-"normaler Benutzer. Ein böswilliger oder unqualifizierter Benutzer mit "
-"root-Zugang kann katastrophale Folgen haben."
+"Der Zugang »sashroot« hat keine Beschränkungen, wie ein normaler Benutzer. "
+"Ein böswilliger oder unberechtigter Benutzer mit Root-Zugang kann "
+"katastrophale Folgen haben."
 
 #. Type: password
 #. Description
-#: ../templates:26
+#: ../templates:3001
 msgid "Note that you will not be able to see the password as you type it."
 msgstr "Beachten Sie, dass das Passwort beim Eingeben nicht angezeigt wird."
 
 #. Type: boolean
 #. Description
-#: ../templates:42
+#: ../templates:4001
 msgid "Change root's shell?"
-msgstr "Die Shell des Benutzers root ändern?"
+msgstr "Die Shell des Benutzers Root ändern?"
 
 #. Type: boolean
 #. Description
-#: ../templates:42
-msgid "Do you want to change root's shell to sash?"
-msgstr "Soll die Shell des Benutzers root nach 'sash' geändert werden?"
+#: ../templates:4001
+msgid ""
+"Please choose whether you want the root account's shell changed to sash."
+msgstr ""
+"Bitte auswählen, ob die Shell des Benutzers Root nach »sash« geändert werden "
+"soll."
 
 #. Type: boolean
 #. Description
-#: ../templates:48
+#: ../templates:5001
 msgid "Delete sashroot account?"
-msgstr "Zugang sashroot löschen?"
+msgstr "Zugang »sashroot« löschen?"
 
 #. Type: boolean
 #. Description
-#: ../templates:48
-msgid "Do you want to remove the sashroot account?"
-msgstr "Soll der Zugang sashroot gelöscht werden?"
+#: ../templates:5001
+msgid "Please choose whether you want to remove the 'sashroot' account."
+msgstr "Bitte auswählen, ob der Zugang »sashroot« gelöscht werden soll."
 
 #. Type: boolean
 #. Description
-#: ../templates:48
-msgid "Advantage: more secure, leaves less clutter on the system"
-msgstr "Vorteil: sicherer, lässt weniger Reste im System"
+#: ../templates:5001
+msgid "Advantage: this is more secure and leaves less clutter on the system;"
+msgstr "Vorteil: das ist sicherer und hinterlässt weniger Reste im System;"
 
 #. Type: boolean
 #. Description
-#: ../templates:48
-msgid "Disadvantage: may lose account customization (if any)"
-msgstr "Nachteil: Anpassungen des Zugangs gehen verloren (wenn es welche gibt)"
-
+#: ../templates:5001
+msgid "Disadvantage: this may lose account customization (if any)."
+msgstr ""
+"Nachteil: Anpassungen des Zugangs können verloren gehen (wenn es welche "
+"gibt)."
diff --git a/debian/po/dz.po b/debian/po/dz.po
new file mode 100644
index 0000000..a6b81f1
--- /dev/null
+++ b/debian/po/dz.po
@@ -0,0 +1,170 @@
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: debian_extras/sash.po\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-12-03 12:55+0100\n"
+"PO-Revision-Date: 2006-11-30 15:23+0530\n"
+"Last-Translator: sonam pelden <sonaa_peldn@yahoo.com>\n"
+"Language-Team: dZongkha <pgeyleg@dit.gov.bt>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2;plural=(n!=1);\n"
+"X-Poedit-Language: Dzongkha\n"
+"X-Poedit-Country: Bhutan\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid "Create sashroot account?"
+msgstr "ཤུད་འཐེན་ཤེལ་ཕྲ་རྩ་བའི་རྩིས་ཐོ་འདི་གསར་བསྐྲུན་འབད་ད་ག?"
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid ""
+"Please choose whether you want to create a second root account with sash as "
+"its shell. The account name will be 'sashroot'."
+msgstr ""
+"འདི་གི་ཤལ་བཟུམ་སྦེ་ཤུད་འཐེན་ཤེལ་ཕྲ་དང་ཅིག་ཁར་  ཁྱོད་ཀྱིས་རྩ་བའི་རྩིས་ཐོ་གཉིས་པ་གཅིག་གསར་བསྐྲུན་འབད་ནི་"
+"ཨིན་ན་མེན་ན་འདི་  གདམ་ཁ་བརྐྱབ་གནང་།  རྩིས་ཐོའི་མིང་འདི་  'ཤུད་འཐེན་ཤེལ་ཕྲའི་རྩིས་ཐོ'  ཟེར་བཞག་འོང་"
+"།"
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid "Advantage: the current root account is left untouched;"
+msgstr "ཁེ་ཕན:  ད་ལྟོ་ཡོད་པའི་རྩ་བའི་རྩིས་ཐོ་འདི་མ་གནོད་པར་ཡོད;"
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid "Disadvantage: you'd have two root accounts to keep track of."
+msgstr "གནོད་པ:  རྗེས་ལམ་ཨཱོཕ་བཞག་ནི་དོན་ལུ་  ཁྱོད་ལུ་རྩ་བའི་རྩིས་ཐོ་གཉིས་ཡོདཔ་ཨིན།"
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid "Clone root password for sashroot?"
+msgstr "ཤུད་འཐེན་ཤེལ་ཕྲའི་རྩ་བའི་དོན་ལུ་  ངོ་འདྲ་བའི་རྩ་བའི་ཆོག་ཡིག་ཨིན་ན?"
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid ""
+"Please choose whether the password for the sashroot account should be the "
+"root account password. Note that if you change the root password later, "
+"sashroot's password will not be updated."
+msgstr ""
+"ཤུད་འཐེན་ཤེལ་ཕྲའི་རྩིས་ཐོ་གི་དོན་ལུ་  རྩ་བའི་རྩིས་ཐོའི་ཆོག་ཡིག་དགོཔ་ཨིན་ན་མེན་ན་  གདམ་ཁ་བརྐྱབ་གནང་།  "
+"ཁྱོད་ཀྱིས་རྩ་བའི་ཆོག་ཡིག་ཤུལ་མ་བསྒྱུར་བཅོས་འབད་བ་ཅིན་  ཤུད་འཐེན་ཤེལ་ཕྲའི་ཆོག་ཡིག་འདི་དུས་མཐུན་མ་བཟོ་"
+"བར་བཞག་འོང་།"
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid "Advantage: this makes the password easy to remember;"
+msgstr "ཁེ་ཕན:  དེ་གིས་ཆོག་ཡིག་སེམས་ཁར་ཉེས་ནི་ལུ་འཇམ་སམ་བཟོཝ་ཨིན།"
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid ""
+"Disadvantage: the password being easy to remember, the overall security of "
+"your system is lowered."
+msgstr ""
+"གནོད་པ:  ཆོག་ཡིག་འདི་སེམས་ཁར་ཉེས་ནི་འཇམ་ཏོག་ཏོ་ཡོདཔ་ལས་  ཁྱོད་རའི་སྤྱིར་བཏང་རིམ་ལུགས་ཀྱི་སྲུང་སྐྱོབ་"
+"འདི་ཉུང་སུ་བཟོ་ནུག།"
+
+#. Type: password
+#. Description
+#: ../templates:3001
+msgid "sashroot account password:"
+msgstr "ཤུད་འཐོན་ཤེལ་ཕྲ་ཨེསི་སའོནཊི་ཆོག་ཡིག:"
+
+#. Type: password
+#. Description
+#: ../templates:3001
+msgid ""
+"Before proceeding, you need to set a password for 'sashroot'.  The password "
+"shouldn't be easy to guess, and it shouldn't be a word found in the "
+"dictionary, or a word that could be easily associated with you, like your "
+"middle name. A good password will contain a mixture of letters, numbers and "
+"punctuation and will be changed at regular intervals."
+msgstr ""
+"འཕྲོ་མཐུད་མ་འབད་བའི་ཧེ་མར་  ཁྱོད་ཀྱིས་ 'ཤུད་འཐོན་ཤེལ་ཕྲ' གི་དོན་ལུ་  ཆོག་ཡིག་གཞི་སྒྲིག་འབད་དགོཔ་"
+"ཨིན།   ཆོག་ཡིག་འདི་ཕོག་ཚོད་དཔག་ཚུགས་མི་མེནཔ་དང་  མིང་ཚིག་འདི་ཚིག་མཛོད་ནང་འཐོབ་ཚུགས་མི་མ་ཡིན་པ་"
+"ཅིག་  ཡང་ན་  ཁྱོད་རའི་མིང་བར་མ་བཟུམ་སྦེ་  ཁྱོད་དང་ཅིག་ཁར་འཇམ་ཏོག་ཏོ་སྦེ་འབྲེལ་བ་མེད་མི་ཅིག་དགོ།  "
+"ཆོག་ཡིག་ལེགས་ཤོམ་དེ་གིས་  ཡི་གུ་ཚུ་  ཨང་གྲངས་ཚུ་དང་ཡིག་རྟགས་ཡོདཔ་དང་  དུས་རྒྱུན་བར་མཚམས་ཚུ་ལུ་"
+"བསྒྱུར་བཅོས་འགྱོཝ་ཨིན།"
+
+#. Type: password
+#. Description
+#: ../templates:3001
+msgid ""
+"The 'sashroot' account doesn't have the restrictions that normal user "
+"accounts have. A malicious or unqualified user with root access can have "
+"disastrous results."
+msgstr ""
+"སྤྱིར་བཏང་ལག་ལེན་པའི་རྩིས་ཐོ་ཚུ་ལུ་ཡོད་དོ་བཟུམ་སྦེ་  'ཤུད་འཐོན་ཤེལ་ཕྲ' རྩིས་ཐོ་དེ་ལུ་བཀག་དམ་མེདཔ་ཨིན།  "
+"རྩ་བའི་འཛུལ་སྤྱོད་འབད་མི་དང་ཅིག་ཁར་ཡོད་མི་གནོད་པ་  ཡང་ན་  ཁྱད་ཆོས་མ་ཚང་བའི་ལག་ལནེ་པ་དེ་གིས་  "
+"བསྐྱལ་ས་བསྐྱལ་བའི་གྲུབ་འབྲས་ཚུ་འབྱུངམ་ཨིན།"
+
+#. Type: password
+#. Description
+#: ../templates:3001
+msgid "Note that you will not be able to see the password as you type it."
+msgstr "ཁྱོད་ཀྱིས་ཡིག་དཔར་བརྐྱབ་པའི་བསྒང་  ཁྱོད་ཀྱིས་  ཆོག་ཡིག་མི་མཐོང་ནི་མས་ཟེར་དྲན་འཛིན་འབད།"
+
+#. Type: boolean
+#. Description
+#: ../templates:4001
+msgid "Change root's shell?"
+msgstr "རྩ་བའི་ཤལ་བསྒྱུར་བཅོས་འབད་ག?"
+
+#. Type: boolean
+#. Description
+#: ../templates:4001
+msgid ""
+"Please choose whether you want the root account's shell changed to sash."
+msgstr ""
+"ཁྱོད་ཀྱིས་རྩ་བའི་རྩིས་ཐོ་གི་ཤལ་འདི་   ཤུད་འཐོན་ཤེལ་ཕྲ་ལུ་བསྒྱུར་བཅོས་འབད་ནི་ཨིན་ན་མེན་ན་  གདམ་ཁ་བརྐྱབ་"
+"གནང་།"
+
+#. Type: boolean
+#. Description
+#: ../templates:5001
+msgid "Delete sashroot account?"
+msgstr "ཤུད་འཐོན་ཤེལ་ཕྲའི་རྩིས་ཐོ་འདི་བཏོན་གཏང་ག?"
+
+#. Type: boolean
+#. Description
+#: ../templates:5001
+msgid "Please choose whether you want to remove the 'sashroot' account."
+msgstr "'ཤུད་འཐོན་ཤེལ་ཕྲ'རྩིས་ཐོ་འདི་  ཁྱོད་ཀྱིས་རྩ་བསྐྲད་གཏང་ནི་ཨིན་ན་མེན་ན་གདམ་ཁ་བརྐྱབ་གནང་།"
+
+#. Type: boolean
+#. Description
+#: ../templates:5001
+msgid "Advantage: this is more secure and leaves less clutter on the system;"
+msgstr "ཁེ་ཕན:  འདི་ཉེན་ཁ་མེདཔ་དང་རིམ་ལུགས་གུར་ཟིང་ཆ་ཉུང་སུ་སྦེ་བཞགཔ་ཨིན;"
+
+#. Type: boolean
+#. Description
+#: ../templates:5001
+msgid "Disadvantage: this may lose account customization (if any)."
+msgstr "གནོད་པ:  དེ་གིས་རྩིས་ཐོའི་སྲོལ་སྒྲིག་(གང་རུང་ཅིག་ཡོད་པ་ཅིན)འདི་འཕྲོ་བརླག་འགྱོ་འོང་།"
diff --git a/debian/po/fr.po b/debian/po/fr.po
index f664f66..13feea6 100644
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -1,3 +1,4 @@
+# translation of fr.po to French
 #
 #    Translators, if you are not familiar with the PO format, gettext
 #    documentation is worth reading, especially sections dedicated to
@@ -11,61 +12,64 @@
 #
 #    Developers do not need to manually edit POT or PO files.
 #
+# Christian Perrier <bubulle@debian.org>, 2006.
 msgid ""
 msgstr ""
-"Project-Id-Version: sash\n"
-"POT-Creation-Date: 2004-02-10 03:11+0100\n"
-"PO-Revision-Date: 2004-02-12 19:13+0100\n"
+"Project-Id-Version: fr\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-12-03 12:55+0100\n"
+"PO-Revision-Date: 2006-11-29 08:08+0100\n"
 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
 
 #. Type: boolean
 #. Description
-#: ../templates:4
+#: ../templates:1001
 msgid "Create sashroot account?"
 msgstr "Faut-il créer un compte « sashroot » ?"
 
 #. Type: boolean
 #. Description
-#: ../templates:4
+#: ../templates:1001
 msgid ""
-"Do you want to create a second root account with sash as its shell? The "
-"account name will be \"sashroot\"."
+"Please choose whether you want to create a second root account with sash as "
+"its shell. The account name will be 'sashroot'."
 msgstr ""
-"Vous pouvez créer un deuxième compte de super-utilisateur, avec sash comme "
-"shell. L'identifiant utilisé sera « sashroot »."
+"Veuillez choisir si vous souhaitez créer un deuxième compte de super-"
+"utilisateur, avec sash comme shell. L'identifiant utilisé sera « sashroot »."
 
 #. Type: boolean
 #. Description
-#: ../templates:4
-msgid "Advantage: current root account is left untouched"
+#: ../templates:1001
+msgid "Advantage: the current root account is left untouched;"
 msgstr ""
 "Avantage : le compte normal du super-utilisateur (« root ») ne sera pas "
 "modifié."
 
 #. Type: boolean
 #. Description
-#: ../templates:4
-msgid "Disadvantage: you'd have two root accounts to keep track of"
+#: ../templates:1001
+msgid "Disadvantage: you'd have two root accounts to keep track of."
 msgstr ""
 "Inconvénient : vous devrez maintenir deux comptes de super-utilisateur."
 
 #. Type: boolean
 #. Description
-#: ../templates:15
+#: ../templates:2001
 msgid "Clone root password for sashroot?"
 msgstr "Faut-il utiliser le mot de passe de « root » pour « sashroot » ?"
 
 #. Type: boolean
 #. Description
-#: ../templates:15
+#: ../templates:2001
 msgid ""
-"Do you want to make sashroot's password the same as root's password? Note "
-"that if you change the root password, sashroot's password will not be "
-"updated."
+"Please choose whether the password for the sashroot account should be the "
+"root account password. Note that if you change the root password later, "
+"sashroot's password will not be updated."
 msgstr ""
 "Veuillez indiquer si vous voulez utiliser le même mot de passe pour ces deux "
 "identifiants. Si vous modifiez plus tard le mot de passe de « root », celui "
@@ -73,25 +77,29 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates:15
-msgid "Advantage: easy to remember"
-msgstr "Avantage : cela est simple à mémoriser."
+#: ../templates:2001
+msgid "Advantage: this makes the password easy to remember;"
+msgstr "Avantage : le mot de passe est simple à mémoriser."
 
 #. Type: boolean
 #. Description
-#: ../templates:15
-msgid "Disadvantage: easy to remember"
-msgstr "Inconvénient : cela est simple à mémoriser."
+#: ../templates:2001
+msgid ""
+"Disadvantage: the password being easy to remember, the overall security of "
+"your system is lowered."
+msgstr ""
+"Inconvénient : comme le mot de passe est simple à mémoriser, la sécurité de "
+"votre système est fragilisée."
 
 #. Type: password
 #. Description
-#: ../templates:26
-msgid "Enter a password for sashroot"
-msgstr "Mot de passe de « sashroot » :"
+#: ../templates:3001
+msgid "sashroot account password:"
+msgstr "Mot de passe de l'identifiant « sashroot » :"
 
 #. Type: password
 #. Description
-#: ../templates:26
+#: ../templates:3001
 msgid ""
 "Before proceeding, you need to set a password for 'sashroot'.  The password "
 "shouldn't be easy to guess, and it shouldn't be a word found in the "
@@ -108,20 +116,19 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../templates:26
+#: ../templates:3001
 msgid ""
-"Why such caution?  The sashroot account doesn't have the restrictions that "
-"normal user accounts have. A malicious or unqualified user with root access "
-"can have disastrous results."
+"The 'sashroot' account doesn't have the restrictions that normal user "
+"accounts have. A malicious or unqualified user with root access can have "
+"disastrous results."
 msgstr ""
-"Pourquoi tant de précautions ? Le compte « sashroot » n'a pas les "
-"limitations des comptes d'utilisateurs ordinaires. Un utilisateur "
-"malintentionné ou peu expérimenté qui aurait accès au compte du super-"
-"utilisateur peut provoquer des désastres."
+"Le compte « sashroot » n'a pas les limitations des comptes d'utilisateurs "
+"ordinaires. Un utilisateur malintentionné ou peu expérimenté qui aurait "
+"accès au compte du super-utilisateur peut provoquer des désastres."
 
 #. Type: password
 #. Description
-#: ../templates:26
+#: ../templates:3001
 msgid "Note that you will not be able to see the password as you type it."
 msgstr ""
 "Veuillez noter que le mot de passe ne sera pas affiché pendant que vous le "
@@ -129,41 +136,41 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates:42
+#: ../templates:4001
 msgid "Change root's shell?"
 msgstr "Faut-il changer le « shell » du super-utilisateur (« root ») ?"
 
 #. Type: boolean
 #. Description
-#: ../templates:42
-msgid "Do you want to change root's shell to sash?"
+#: ../templates:4001
+msgid ""
+"Please choose whether you want the root account's shell changed to sash."
 msgstr ""
 "Vous pouvez choisir d'utiliser sash comme processeur de commandes "
 "(« shell ») du super-utilisateur (compte « root »)."
 
 #. Type: boolean
 #. Description
-#: ../templates:48
+#: ../templates:5001
 msgid "Delete sashroot account?"
 msgstr "Faut-il supprimer le compte « sashroot » ?"
 
 #. Type: boolean
 #. Description
-#: ../templates:48
-msgid "Do you want to remove the sashroot account?"
+#: ../templates:5001
+msgid "Please choose whether you want to remove the 'sashroot' account."
 msgstr "Veuillez indiquer si vous souhaitez supprimer le compte « sashroot »."
 
 #. Type: boolean
 #. Description
-#: ../templates:48
-msgid "Advantage: more secure, leaves less clutter on the system"
-msgstr "Avantage : le système sera plus sûr et il ne restera pas de traces."
+#: ../templates:5001
+msgid "Advantage: this is more secure and leaves less clutter on the system;"
+msgstr "Avantage : le système sera plus sûr et il ne restera pas de traces ;"
 
 #. Type: boolean
 #. Description
-#: ../templates:48
-msgid "Disadvantage: may lose account customization (if any)"
+#: ../templates:5001
+msgid "Disadvantage: this may lose account customization (if any)."
 msgstr ""
 "Inconvénient : vous perdrez les personnalisations du compte, s'il en "
 "existait."
-
diff --git a/debian/po/ja.po b/debian/po/ja.po
index 3ebef2c..a524ed6 100644
--- a/debian/po/ja.po
+++ b/debian/po/ja.po
@@ -16,80 +16,85 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sash 3.7-4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-10 03:11+0100\n"
-"PO-Revision-Date: 2004-12-30 01:26+0900\n"
-"Last-Translator: Hideki Yamane <henrich@samba.gr.jp>\n"
+"POT-Creation-Date: 2006-12-03 12:55+0100\n"
+"PO-Revision-Date: 2006-11-29 21:37+0900\n"
+"Last-Translator: Hideki Yamane (Debian-JP) <henrich@debian.or.jp>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=EUC-JP\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Type: boolean
 #. Description
-#: ../templates:4
+#: ../templates:1001
 msgid "Create sashroot account?"
-msgstr "sashroot ¥¢¥«¥¦¥ó¥È¤òºîÀ®¤·¤Þ¤¹¤«?"
+msgstr "sashroot アカウントを作成しますか?"
 
 #. Type: boolean
 #. Description
-#: ../templates:4
+#: ../templates:1001
 msgid ""
-"Do you want to create a second root account with sash as its shell? The "
-"account name will be \"sashroot\"."
+"Please choose whether you want to create a second root account with sash as "
+"its shell. The account name will be 'sashroot'."
 msgstr ""
-"sash ¤ò shell ¤È¤·¤ÆÍøÍѤ¹¤ë¤â¤¦°ì¤Ä¤Î root ¥¢¥«¥¦¥ó¥È¤òºîÀ®¤·¤Þ¤¹¤«? ¤³¤Î¥¢"
-"¥«¥¦¥ó¥È¤Î̾Á°¤Ï \"sashroot\" ¤Ë¤Ê¤ê¤Þ¤¹¡£"
+"sash を shell として利用するもう一つの root アカウントを作成するかどうかを選"
+"んでください。このアカウントの名前は「sashroot」になります。"
 
 #. Type: boolean
 #. Description
-#: ../templates:4
-msgid "Advantage: current root account is left untouched"
-msgstr "ÍøÅÀ: ¸½ºß¤Î root ¥¢¥«¥¦¥ó¥È¤Ë¤Ä¤¤¤Æ²¿¤âÊѹ¹¤µ¤ì¤Ê¤¤"
+#: ../templates:1001
+msgid "Advantage: the current root account is left untouched;"
+msgstr "利点: 現在の root アカウントについて何も変更されない;"
 
 #. Type: boolean
 #. Description
-#: ../templates:4
-msgid "Disadvantage: you'd have two root accounts to keep track of"
-msgstr "·çÅÀ: 2 ¤Ä¤Î root ¥¢¥«¥¦¥ó¥È¤ò´ÉÍý¤¹¤ë¤³¤È¤Ë¤Ê¤ë"
+#: ../templates:1001
+msgid "Disadvantage: you'd have two root accounts to keep track of."
+msgstr "欠点: 2 つの root アカウントを管理することになる。"
 
 #. Type: boolean
 #. Description
-#: ../templates:15
+#: ../templates:2001
 msgid "Clone root password for sashroot?"
-msgstr "root ¤Î¥Ñ¥¹¥ï¡¼¥É¤ò sashroot ¤Ë¥³¥Ô¡¼¤·¤Þ¤¹¤«?"
+msgstr "root のパスワードを sashroot にコピーしますか?"
 
 #. Type: boolean
 #. Description
-#: ../templates:15
+#: ../templates:2001
 msgid ""
-"Do you want to make sashroot's password the same as root's password? Note "
-"that if you change the root password, sashroot's password will not be "
-"updated."
+"Please choose whether the password for the sashroot account should be the "
+"root account password. Note that if you change the root password later, "
+"sashroot's password will not be updated."
 msgstr ""
-"sashroot ¤Î¥Ñ¥¹¥ï¡¼¥É¤ò root ¤Î¥Ñ¥¹¥ï¡¼¥É¤ÈƱ¤¸¤Ë¤·¤Þ¤¹¤«? root ¥Ñ¥¹¥ï¡¼¥É¤ò"
-"Êѹ¹¤·¤Æ¤â sashroot ¤Î¥Ñ¥¹¥ï¡¼¥É¤Ï¹¹¿·¤µ¤ì¤Ê¤¤¤Î¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£"
+"sashroot のパスワードを root のパスワードと同じにするかどうかを選んでくださ"
+"い。後から root パスワードを変更しても sashroot のパスワードは更新されないの"
+"に注意しましょう。"
 
 #. Type: boolean
 #. Description
-#: ../templates:15
-msgid "Advantage: easy to remember"
-msgstr "ÍøÅÀ: ³Ð¤¨¤ä¤¹¤¤"
+#: ../templates:2001
+msgid "Advantage: this makes the password easy to remember;"
+msgstr "利点: パスワードを覚えやすくできる;"
 
 #. Type: boolean
 #. Description
-#: ../templates:15
-msgid "Disadvantage: easy to remember"
-msgstr "·çÅÀ: ³Ð¤¨¤ä¤¹¤¤"
+#: ../templates:2001
+msgid ""
+"Disadvantage: the password being easy to remember, the overall security of "
+"your system is lowered."
+msgstr ""
+"欠点: パスワードが覚えやすいものなので、システムのセキュリティは全体的には下"
+"がる。"
 
 #. Type: password
 #. Description
-#: ../templates:26
-msgid "Enter a password for sashroot"
-msgstr "sashroot ¤Î¥Ñ¥¹¥ï¡¼¥É¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤"
+#: ../templates:3001
+msgid "sashroot account password:"
+msgstr "sashroot アカウントパスワード:"
 
 #. Type: password
 #. Description
-#: ../templates:26
+#: ../templates:3001
 msgid ""
 "Before proceeding, you need to set a password for 'sashroot'.  The password "
 "shouldn't be easy to guess, and it shouldn't be a word found in the "
@@ -97,62 +102,69 @@ msgid ""
 "middle name. A good password will contain a mixture of letters, numbers and "
 "punctuation and will be changed at regular intervals."
 msgstr ""
-"³¹Ô¤¹¤ëÁ°¤Ë¡¢'sashroot' ¤Î¥Ñ¥¹¥ï¡¼¥É¤òÀßÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¥Ñ¥¹¥ï¡¼¥É¤Ï¿ä"
-"¬¤¬Íưפʤâ¤Î¤Ç¤¢¤Ã¤Æ¤Ï¤Ê¤é¤º¡¢¼­½ñ¤Ç¸«¤Ä¤«¤ë¤è¤¦¤Ê¸ÀÍդ䤢¤Ê¤¿¤Ë´Êñ¤Ë·ë¤Ó"
-"ÉÕ¤±¤é¤ì¤ë¤è¤¦¤Êñ¸ì (¤¿¤È¤¨¤Ð¤¢¤Ê¤¿¤Î¥ß¥É¥ë¥Í¡¼¥à) ¤Ç¤¢¤Ã¤Æ¤âÂÌÌܤǤ¹¡£Îɤ¤"
-"¥Ñ¥¹¥ï¡¼¥É¤Ï¡¢Ê¸»ú¡¦¿ô»ú¡¦µ­¹æ¤ò´Þ¤ó¤Ç¤ª¤ê¡¢Äê´üŪ¤ËÊѹ¹¤µ¤ì¤ë¤è¤¦¤Ê¤â¤Î¤Ç"
-"¤¹¡£"
+"続行する前に、'sashroot' のパスワードを設定する必要があります。パスワードは推"
+"測が容易なものであってはならず、辞書で見つかるような言葉やあなたに簡単に結び"
+"付けられるような単語 (たとえばあなたのミドルネーム) であっても駄目です。良い"
+"パスワードは、文字・数字・記号を含んでおり、定期的に変更されるようなもので"
+"す。"
 
 #. Type: password
 #. Description
-#: ../templates:26
+#: ../templates:3001
 msgid ""
-"Why such caution?  The sashroot account doesn't have the restrictions that "
-"normal user accounts have. A malicious or unqualified user with root access "
-"can have disastrous results."
+"The 'sashroot' account doesn't have the restrictions that normal user "
+"accounts have. A malicious or unqualified user with root access can have "
+"disastrous results."
 msgstr ""
-"¤Ê¤¼¤³¤Î¤è¤¦¤ÊÃí°Õ¤ò¤¹¤ë¤Î¤Ç¤·¤ç¤¦? sashroot ¥¢¥«¥¦¥ó¥È¤Ë¤Ï°ìÈ̥桼¥¶¥¢¥«¥¦¥ó"
-"¥È¤Î¤è¤¦¤ÊÀ©¸Â¤¬¤¢¤ê¤Þ¤»¤ó¡£°­°Õ¤ò¤â¤Ã¤Æ¤¤¤ë¡¢¤¢¤ë¤¤¤Ï»ñ³Ê¤Î¤Ê¤¤¥æ¡¼¥¶¤¬ "
-"root ¸¢¸Â¤ò½ê»ý¤·¤¿¾ì¹ç¡¢¤½¤ì¤ÏÈá»´¤Ê·ëËö¤ò¾·¤¯¤Î¤Ç¤¹¡£"
+"「sashroot」アカウントには一般ユーザアカウントのような制限がありません。悪意"
+"をもっている、あるいは資格のないユーザが root 権限を所持した場合、それは悲惨"
+"な結末を招きます。"
 
 #. Type: password
 #. Description
-#: ../templates:26
+#: ../templates:3001
 msgid "Note that you will not be able to see the password as you type it."
-msgstr "¥Ñ¥¹¥ï¡¼¥É¤Ï¡¢ÆþÎϤò¤·¤Æ¤â¸«¤ë¤³¤È¤Ï¤Ç¤­¤Ê¤¤¤Î¤ÇÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£"
+msgstr "パスワードは、入力をしても見ることはできないので注意してください。"
 
 #. Type: boolean
 #. Description
-#: ../templates:42
+#: ../templates:4001
 msgid "Change root's shell?"
-msgstr "root ¥æ¡¼¥¶¤Î shell ¤òÊѹ¹¤·¤Þ¤¹¤«?"
+msgstr "root ユーザの shell を変更しますか?"
 
 #. Type: boolean
 #. Description
-#: ../templates:42
-msgid "Do you want to change root's shell to sash?"
-msgstr "root ¥æ¡¼¥¶¤Î shell ¤ò sash ¤ËÊѹ¹¤·¤Þ¤¹¤«?"
+#: ../templates:4001
+msgid ""
+"Please choose whether you want the root account's shell changed to sash."
+msgstr "root ユーザの shell を sash に変更するかどうかを選んでください。"
 
 #. Type: boolean
 #. Description
-#: ../templates:48
+#: ../templates:5001
 msgid "Delete sashroot account?"
-msgstr "sashroot ¥¢¥«¥¦¥ó¥È¤òºï½ü¤·¤Þ¤¹¤«?"
+msgstr "sashroot アカウントを削除しますか?"
 
 #. Type: boolean
 #. Description
-#: ../templates:48
-msgid "Do you want to remove the sashroot account?"
-msgstr "sashroot ¥¢¥«¥¦¥ó¥È¤òºï½ü¤·¤Þ¤¹¤«?"
+#: ../templates:5001
+msgid "Please choose whether you want to remove the 'sashroot' account."
+msgstr "「sashroot」アカウントを削除するかどうかを選んでください。"
 
 #. Type: boolean
 #. Description
-#: ../templates:48
-msgid "Advantage: more secure, leaves less clutter on the system"
-msgstr "ÍøÅÀ: ¤è¤ê¥»¥­¥å¥¢¤Ë¤Ê¤ë¡¢¥·¥¹¥Æ¥à¤ò¿¾¯¤Ï¤­¤ì¤¤¤Ë¤Ç¤­¤ë"
+#: ../templates:5001
+msgid "Advantage: this is more secure and leaves less clutter on the system;"
+msgstr "利点: よりセキュアになる、システムを多少はきれいにできる;"
 
 #. Type: boolean
 #. Description
-#: ../templates:48
-msgid "Disadvantage: may lose account customization (if any)"
-msgstr "·çÅÀ: ¥¢¥«¥¦¥ó¥È¤ËÂФ¹¤ë (ÍÍ¡¹¤Ê) Êѹ¹¤¬¼º¤ï¤ì¤Þ¤¹"
+#: ../templates:5001
+msgid "Disadvantage: this may lose account customization (if any)."
+msgstr "欠点: アカウントに対する変更が (もしあれば) 失われます。"
+
+#~ msgid "Disadvantage: easy to remember"
+#~ msgstr "欠点: 覚えやすい"
+
+#~ msgid "Enter a password for sashroot"
+#~ msgstr "sashroot のパスワードを入力してください"
diff --git a/debian/po/ru.po b/debian/po/ru.po
new file mode 100644
index 0000000..78ffa4e
--- /dev/null
+++ b/debian/po/ru.po
@@ -0,0 +1,173 @@
+# translation of sash_debconf_ru.po to Russian
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans#
+#    Developers do not need to manually edit POT or PO files.
+#
+# Yuri Kozlov <kozlov.y@gmail.com>, 2006.
+msgid ""
+msgstr ""
+"Project-Id-Version: 3.7-7\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-12-03 12:55+0100\n"
+"PO-Revision-Date: 2006-12-05 13:42+0300\n"
+"Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n"
+"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid "Create sashroot account?"
+msgstr "Создать учётную запись sashroot?"
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid ""
+"Please choose whether you want to create a second root account with sash as "
+"its shell. The account name will be 'sashroot'."
+msgstr ""
+"Выберите, нужно ли создавать вторую учётную запись суперпользователя (root), "
+"у которой в качестве оболочки командной строки будет sash. Учётная запись "
+"будет называться 'sashroot'."
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid "Advantage: the current root account is left untouched;"
+msgstr ""
+"Преимущество: имеющаяся учётная запись суперпользователя не будет изменена;"
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid "Disadvantage: you'd have two root accounts to keep track of."
+msgstr ""
+"Недостаток: вам придётся следить за двумя учётными суперпользовательскими "
+"записями."
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid "Clone root password for sashroot?"
+msgstr "Создать для sashroot тот же пароль, что и у root?"
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid ""
+"Please choose whether the password for the sashroot account should be the "
+"root account password. Note that if you change the root password later, "
+"sashroot's password will not be updated."
+msgstr ""
+"Укажите, нужно ли создавать пароль для sashroot таким же что и у учётной "
+"записи root. Заметим, что если позже вы поменяете пароль для root, пароль "
+"для sashroot обновлён не будет."
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid "Advantage: this makes the password easy to remember;"
+msgstr "Преимущество: пароль легче запомнить;"
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid ""
+"Disadvantage: the password being easy to remember, the overall security of "
+"your system is lowered."
+msgstr ""
+"Недостаток: легко запоминающийся пароль в итоге понижает безопасность "
+"системы."
+
+#. Type: password
+#. Description
+#: ../templates:3001
+msgid "sashroot account password:"
+msgstr "Пароль для учётной записи sashroot:"
+
+#. Type: password
+#. Description
+#: ../templates:3001
+msgid ""
+"Before proceeding, you need to set a password for 'sashroot'.  The password "
+"shouldn't be easy to guess, and it shouldn't be a word found in the "
+"dictionary, or a word that could be easily associated with you, like your "
+"middle name. A good password will contain a mixture of letters, numbers and "
+"punctuation and will be changed at regular intervals."
+msgstr ""
+"Перед тем как продолжить, вам нужно задать пароль для 'sashroot'. Пароль не "
+"должен быть легко угадываемым, и не должен быть словом из словаря, или легко "
+"ассоциироваться с вами, например быть вашим отчеством. Хороший пароль "
+"состоит из букв, цифр и знаков препинания и должен регулярно меняться."
+
+#. Type: password
+#. Description
+#: ../templates:3001
+msgid ""
+"The 'sashroot' account doesn't have the restrictions that normal user "
+"accounts have. A malicious or unqualified user with root access can have "
+"disastrous results."
+msgstr ""
+"Для учётной записи 'sashroot' не существует ограничений, имеющихся у учётных "
+"записей обычных пользователей. Неквалифицированный или с недобрыми "
+"намерениями пользователь с правами суперпользователя может разрушить систему."
+
+#. Type: password
+#. Description
+#: ../templates:3001
+msgid "Note that you will not be able to see the password as you type it."
+msgstr "Заметим, что при вводе пароля ничего не отображается."
+
+#. Type: boolean
+#. Description
+#: ../templates:4001
+msgid "Change root's shell?"
+msgstr "Изменить оболочку командной строки для root?"
+
+#. Type: boolean
+#. Description
+#: ../templates:4001
+msgid ""
+"Please choose whether you want the root account's shell changed to sash."
+msgstr ""
+"Выберите, нужно ли сменить оболочку командной строки на sash для учётной "
+"записи root."
+
+#. Type: boolean
+#. Description
+#: ../templates:5001
+msgid "Delete sashroot account?"
+msgstr "Удалить учётную запись sashroot?"
+
+#. Type: boolean
+#. Description
+#: ../templates:5001
+msgid "Please choose whether you want to remove the 'sashroot' account."
+msgstr "Выберите, нужно ли удалить учётную запись 'sashroot'."
+
+#. Type: boolean
+#. Description
+#: ../templates:5001
+msgid "Advantage: this is more secure and leaves less clutter on the system;"
+msgstr "Преимущество: станет более безопасно и больше порядка в системе;"
+
+#. Type: boolean
+#. Description
+#: ../templates:5001
+msgid "Disadvantage: this may lose account customization (if any)."
+msgstr ""
+"Недостаток: может потеряться гибкость в настройке учётной записи (при "
+"наличии)."
diff --git a/debian/po/sv.po b/debian/po/sv.po
new file mode 100644
index 0000000..fff5e9d
--- /dev/null
+++ b/debian/po/sv.po
@@ -0,0 +1,172 @@
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: sash 3.7-7\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-12-03 12:55+0100\n"
+"PO-Revision-Date: 2006-11-29 21:23+0100\n"
+"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
+"Language-Team: Swedish <sv@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: swe\n"
+"X-Poedit-Country: swe\n"
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid "Create sashroot account?"
+msgstr "Skapa ett sashroot-konto?"
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid ""
+"Please choose whether you want to create a second root account with sash as "
+"its shell. The account name will be 'sashroot'."
+msgstr ""
+"Välj huruvida du vill skapa ett andra root-konto med sash som dess skal? "
+"Kontonamnet kommer att bli \"sashroot\"."
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid "Advantage: the current root account is left untouched;"
+msgstr "Fördel: nuvarande root-konto kommer inte att röras;"
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid "Disadvantage: you'd have two root accounts to keep track of."
+msgstr "Nackdel: du kommer att ha två root-konton att hålla reda på."
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid "Clone root password for sashroot?"
+msgstr "Klona root-lösenordet för sashroot?"
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid ""
+"Please choose whether the password for the sashroot account should be the "
+"root account password. Note that if you change the root password later, "
+"sashroot's password will not be updated."
+msgstr ""
+"Välj huruvida lösenordet för sashroot-kontot ska vara det samma som root-"
+"lösenordet. Observera att om du ändrar root-lösenordet kommer sashroot-"
+"lösenordet inte att uppdateras."
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid "Advantage: this makes the password easy to remember;"
+msgstr "Fördel: det här gör lösenordet lätt att komma ihåg;"
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid ""
+"Disadvantage: the password being easy to remember, the overall security of "
+"your system is lowered."
+msgstr ""
+"Nackdel: lösenordet är enkelt att komma ihåg, den generella säkerheten för "
+"ditt system sänks."
+
+#. Type: password
+#. Description
+#: ../templates:3001
+msgid "sashroot account password:"
+msgstr "Lösenord för shasroot-kontot:"
+
+#. Type: password
+#. Description
+#: ../templates:3001
+msgid ""
+"Before proceeding, you need to set a password for 'sashroot'.  The password "
+"shouldn't be easy to guess, and it shouldn't be a word found in the "
+"dictionary, or a word that could be easily associated with you, like your "
+"middle name. A good password will contain a mixture of letters, numbers and "
+"punctuation and will be changed at regular intervals."
+msgstr ""
+"Innan du fortsätter behöver du ställa in ett lösenord för \"sashroot\". "
+"Lösenordet bör inte vara lätt att gissa, det bör inte vara ett ord som finns "
+"i en ordbok eller ett ord som lätt kan associeras med dig, såsom ditt "
+"mellannamn. Ett bra lösenord innehåller en blandning av bokstäver, siffror "
+"och interpunktion och kommer att ändras med jämna mellanrum."
+
+#. Type: password
+#. Description
+#: ../templates:3001
+msgid ""
+"The 'sashroot' account doesn't have the restrictions that normal user "
+"accounts have. A malicious or unqualified user with root access can have "
+"disastrous results."
+msgstr ""
+"\"sashroot\"-kontot har inte de begränsningar som vanliga användarkonton "
+"har. En ondsint eller okvalificerad användare med root-tillgång kan få "
+"förödande konsekvenser."
+
+#. Type: password
+#. Description
+#: ../templates:3001
+msgid "Note that you will not be able to see the password as you type it."
+msgstr "Observera att du inte kommer att se lösenordet när du skriver in det."
+
+#. Type: boolean
+#. Description
+#: ../templates:4001
+msgid "Change root's shell?"
+msgstr "Ändra skal för root?"
+
+#. Type: boolean
+#. Description
+#: ../templates:4001
+msgid ""
+"Please choose whether you want the root account's shell changed to sash."
+msgstr "Välj huruvida du vill ändra root-kontots skal till sash."
+
+#. Type: boolean
+#. Description
+#: ../templates:5001
+msgid "Delete sashroot account?"
+msgstr "Ta bort \"sashroot\"-kontot?"
+
+#. Type: boolean
+#. Description
+#: ../templates:5001
+msgid "Please choose whether you want to remove the 'sashroot' account."
+msgstr "Välj huruvida du vill ta bort \"sashroot\"-kontot."
+
+#. Type: boolean
+#. Description
+#: ../templates:5001
+msgid "Advantage: this is more secure and leaves less clutter on the system;"
+msgstr ""
+"Fördel: det här är mer säkert och lämnar kvar mindre skräp på systemet;"
+
+#. Type: boolean
+#. Description
+#: ../templates:5001
+msgid "Disadvantage: this may lose account customization (if any)."
+msgstr "Nackdel: kan förlora kontoanpassningar (om de finns)."
+
+#~ msgid "Disadvantage: easy to remember"
+#~ msgstr "Nackdel: lätt att komma i håg"
+
+#~ msgid "Enter a password for sashroot"
+#~ msgstr "Ange ett lösenord för sashroot"
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index b66a2bb..f2ed410 100644
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-10 03:11+0100\n"
+"POT-Creation-Date: 2006-12-03 12:55+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -26,66 +26,68 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates:4
+#: ../templates:1001
 msgid "Create sashroot account?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates:4
+#: ../templates:1001
 msgid ""
-"Do you want to create a second root account with sash as its shell? The "
-"account name will be \"sashroot\"."
+"Please choose whether you want to create a second root account with sash as "
+"its shell. The account name will be 'sashroot'."
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates:4
-msgid "Advantage: current root account is left untouched"
+#: ../templates:1001
+msgid "Advantage: the current root account is left untouched;"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates:4
-msgid "Disadvantage: you'd have two root accounts to keep track of"
+#: ../templates:1001
+msgid "Disadvantage: you'd have two root accounts to keep track of."
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates:15
+#: ../templates:2001
 msgid "Clone root password for sashroot?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates:15
+#: ../templates:2001
 msgid ""
-"Do you want to make sashroot's password the same as root's password? Note "
-"that if you change the root password, sashroot's password will not be "
-"updated."
+"Please choose whether the password for the sashroot account should be the "
+"root account password. Note that if you change the root password later, "
+"sashroot's password will not be updated."
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates:15
-msgid "Advantage: easy to remember"
+#: ../templates:2001
+msgid "Advantage: this makes the password easy to remember;"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates:15
-msgid "Disadvantage: easy to remember"
+#: ../templates:2001
+msgid ""
+"Disadvantage: the password being easy to remember, the overall security of "
+"your system is lowered."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../templates:26
-msgid "Enter a password for sashroot"
+#: ../templates:3001
+msgid "sashroot account password:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../templates:26
+#: ../templates:3001
 msgid ""
 "Before proceeding, you need to set a password for 'sashroot'.  The password "
 "shouldn't be easy to guess, and it shouldn't be a word found in the "
@@ -96,51 +98,52 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../templates:26
+#: ../templates:3001
 msgid ""
-"Why such caution?  The sashroot account doesn't have the restrictions that "
-"normal user accounts have. A malicious or unqualified user with root access "
-"can have disastrous results."
+"The 'sashroot' account doesn't have the restrictions that normal user "
+"accounts have. A malicious or unqualified user with root access can have "
+"disastrous results."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../templates:26
+#: ../templates:3001
 msgid "Note that you will not be able to see the password as you type it."
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates:42
+#: ../templates:4001
 msgid "Change root's shell?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates:42
-msgid "Do you want to change root's shell to sash?"
+#: ../templates:4001
+msgid ""
+"Please choose whether you want the root account's shell changed to sash."
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates:48
+#: ../templates:5001
 msgid "Delete sashroot account?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates:48
-msgid "Do you want to remove the sashroot account?"
+#: ../templates:5001
+msgid "Please choose whether you want to remove the 'sashroot' account."
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates:48
-msgid "Advantage: more secure, leaves less clutter on the system"
+#: ../templates:5001
+msgid "Advantage: this is more secure and leaves less clutter on the system;"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates:48
-msgid "Disadvantage: may lose account customization (if any)"
+#: ../templates:5001
+msgid "Disadvantage: this may lose account customization (if any)."
 msgstr ""
diff --git a/debian/po/vi.po b/debian/po/vi.po
index 7ccb907..347bcf5 100644
--- a/debian/po/vi.po
+++ b/debian/po/vi.po
@@ -1,138 +1,155 @@
 # Vietnamese translation for sash.
-# Copyright © 2005 Free Software Foundation, Inc.
-# Clytie Siddall <clytie@riverland.net.au>, 2005.
+# Copyright © 2006 Free Software Foundation, Inc.
+# Clytie Siddall <clytie@riverland.net.au>, 2005-2006.
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: sash 3.7-5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-10 03:11+0100\n"
-"PO-Revision-Date: 2005-07-12 18:17+0930\n"
+"POT-Creation-Date: 2006-12-03 12:55+0100\n"
+"PO-Revision-Date: 2006-11-29 22:52+1030\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
-"Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
+"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
-"X-Generator: LocFactoryEditor 1.2.2\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: LocFactoryEditor 1.6fc1\n"
 
-#.Type: boolean
-#.Description
-#:../templates:4
+#. Type: boolean
+#. Description
+#: ../templates:1001
 msgid "Create sashroot account?"
 msgstr "Tạo tài khoản sashroot không?"
 
-#.Type: boolean
-#.Description
-#:../templates:4
+#. Type: boolean
+#. Description
+#: ../templates:1001
 msgid ""
-"Do you want to create a second root account with sash as its shell? The "
-"account name will be \"sashroot\"."
-msgstr "Bạn có muốn tạo một tài khoản người chủ (root) thứ hai dùng sash là hệ vỏ không? Tên tài khoản sẽ là «sashroot»."
-
-#.Type: boolean
-#.Description
-#:../templates:4
-msgid "Advantage: current root account is left untouched"
-msgstr "Lợi ích: không sửa đổi tài khoản người chủ hiện thời"
-
-#.Type: boolean
-#.Description
-#:../templates:4
-msgid "Disadvantage: you'd have two root accounts to keep track of"
-msgstr "Bất lợi: bạn cần phải theo dõi hai tài khoản người chủ"
-
-#.Type: boolean
-#.Description
-#:../templates:15
+"Please choose whether you want to create a second root account with sash as "
+"its shell. The account name will be 'sashroot'."
+msgstr ""
+"Hãy chọn nếu bạn muốn tạo một tài khoản người chủ thứ hai có sash như là "
+"trình bao. Tên tài khoản sẽ là « sashroot »."
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid "Advantage: the current root account is left untouched;"
+msgstr "Lợi: không sửa đổi tài khoản người chủ hiện thời;"
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid "Disadvantage: you'd have two root accounts to keep track of."
+msgstr "Hại: bạn cần theo dõi hai tài khoản người chủ."
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
 msgid "Clone root password for sashroot?"
-msgstr "Sao chép mật khẩu người chủ cho sashroot không?"
+msgstr "Nhân đôi mật khẩu người chủ cho sashroot không?"
 
-#.Type: boolean
-#.Description
-#:../templates:15
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid ""
+"Please choose whether the password for the sashroot account should be the "
+"root account password. Note that if you change the root password later, "
+"sashroot's password will not be updated."
+msgstr ""
+"Hãy chọn nếu mật khẩu của tài khoản sashroot cũng nên là mật khẩu của tài "
+"khoản người chủ. Ghi chú rằng nếu lúc sau bạn thay đổi mật khẩu người chủ, "
+"mật khẩu của sashroot sẽ không được cập nhật."
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid "Advantage: this makes the password easy to remember;"
+msgstr "Lợi: mật khẩu dễ nhớ ;"
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
 msgid ""
-"Do you want to make sashroot's password the same as root's password? Note "
-"that if you change the root password, sashroot's password will not be "
-"updated."
-msgstr "Bạn có muốn lập sashroot dùng cùng một mật khẩu với người chủ không? Hãy ghi chú rằng nếu bạn thay đổi mật khẩu người chủ, việc ấy sẽ không cập nhật mật khẩu của sashroot."
-
-#.Type: boolean
-#.Description
-#:../templates:15
-msgid "Advantage: easy to remember"
-msgstr "Lợi ích: dễ nhớ"
-
-#.Type: boolean
-#.Description
-#:../templates:15
-msgid "Disadvantage: easy to remember"
-msgstr "Bất lợi: dễ nhớ"
-
-#.Type: password
-#.Description
-#:../templates:26
-msgid "Enter a password for sashroot"
-msgstr "Hãy nhập mật khẫu cho sashroot"
-
-#.Type: password
-#.Description
-#:../templates:26
+"Disadvantage: the password being easy to remember, the overall security of "
+"your system is lowered."
+msgstr "Hại: mật khẩu dễ nhớ không phải là bảo mật mạnh."
+
+#. Type: password
+#. Description
+#: ../templates:3001
+msgid "sashroot account password:"
+msgstr "Mật khẩu tài khoản sashroot:"
+
+#. Type: password
+#. Description
+#: ../templates:3001
 msgid ""
 "Before proceeding, you need to set a password for 'sashroot'.  The password "
 "shouldn't be easy to guess, and it shouldn't be a word found in the "
 "dictionary, or a word that could be easily associated with you, like your "
 "middle name. A good password will contain a mixture of letters, numbers and "
 "punctuation and will be changed at regular intervals."
-msgstr "Trước khi tiếp tục, bạn cần phải lập một mật khẩu cho «sashroot». Đừng chọn một từ dễ đoán, một từ có trong từ điển nào, hay một từ liên quan đến bạn một cách dễ dàng, như tên đệm bạn. Mật khẩu tốt pha trộn chữ và số và chấm câu, và được thay đổi định kỳ."
-
-#.Type: password
-#.Description
-#:../templates:26
+msgstr ""
+"Trước khi tiếp tục, bạn cần phải đặt mật khẩu cho « sashroot ». Đừng chọn từ "
+"dễ đoán, từ nằm trong bất cứ từ điển nào, hay từ liên quan đến bạn một cách "
+"dễ dàng, như tên đệm của bạn. Mật khẩu mạnh chứa các chữ, số và chấm câu "
+"được trộn với nhau, và được thay đổi định kỳ."
+
+#. Type: password
+#. Description
+#: ../templates:3001
 msgid ""
-"Why such caution?  The sashroot account doesn't have the restrictions that "
-"normal user accounts have. A malicious or unqualified user with root access "
-"can have disastrous results."
-msgstr "Tại sao cẩn thận? Tài khoàn sashroot không được giới hạn như tài khoản người dùng bình thường. Một người dùng hiểm độc hay chưa được kinh nghiệm có truy cập người chủ thì có thể có kết quả tai hại."
-
-#.Type: password
-#.Description
-#:../templates:26
+"The 'sashroot' account doesn't have the restrictions that normal user "
+"accounts have. A malicious or unqualified user with root access can have "
+"disastrous results."
+msgstr ""
+"Tài khoản « sashroot » không bị hạn chế giống như tài khoản người dùng "
+"chuẩn. Người dùng hiểm độc có quyền truy cập của người chủ thì có thể làm "
+"hại rất nhiều."
+
+#. Type: password
+#. Description
+#: ../templates:3001
 msgid "Note that you will not be able to see the password as you type it."
-msgstr "Hãy ghi chú rằng bạn sẽ không thể thấy mật khẩu này khi gõ nó."
+msgstr "Ghi chú rằng bạn sẽ không thể thấy mật khẩu trong khi gõ."
 
-#.Type: boolean
-#.Description
-#:../templates:42
+#. Type: boolean
+#. Description
+#: ../templates:4001
 msgid "Change root's shell?"
-msgstr "Thay đổi hệ vỏ của người chủ không?"
+msgstr "Thay đổi trình bao của người chủ không?"
 
-#.Type: boolean
-#.Description
-#:../templates:42
-msgid "Do you want to change root's shell to sash?"
-msgstr "Bạn có muốn thay đổi hệ vỏ của người chủ thành sash không?"
+#. Type: boolean
+#. Description
+#: ../templates:4001
+msgid ""
+"Please choose whether you want the root account's shell changed to sash."
+msgstr ""
+"Hãy chọn nếu bạn muốn thay đổi trình bao (shell) của tài khoản người chủ "
+"thành « sash » hay không."
 
-#.Type: boolean
-#.Description
-#:../templates:48
+#. Type: boolean
+#. Description
+#: ../templates:5001
 msgid "Delete sashroot account?"
-msgstr "Xóa bỏ tài khoản sashroot không?"
-
-#.Type: boolean
-#.Description
-#:../templates:48
-msgid "Do you want to remove the sashroot account?"
-msgstr "Bạn có muốn loại bỏ tài khoản sashroot không?"
-
-#.Type: boolean
-#.Description
-#:../templates:48
-msgid "Advantage: more secure, leaves less clutter on the system"
-msgstr "Lợi ích: bảo mật hơn, sạch hơn trong hệ thống"
-
-#.Type: boolean
-#.Description
-#:../templates:48
-msgid "Disadvantage: may lose account customization (if any)"
-msgstr "Bất lợi: có thể mất sự tùy chỉnh tài khoản (nếu có)"
+msgstr "Xóa tài khoản sashroot không?"
+
+#. Type: boolean
+#. Description
+#: ../templates:5001
+msgid "Please choose whether you want to remove the 'sashroot' account."
+msgstr "Hãy chọn nếu bạn muốn gỡ bỏ tài khoản « sashroot » hay không."
+
+#. Type: boolean
+#. Description
+#: ../templates:5001
+msgid "Advantage: this is more secure and leaves less clutter on the system;"
+msgstr "Lợi: bảo mật hơn và để lại hệ thống sạch hơn;"
+
+#. Type: boolean
+#. Description
+#: ../templates:5001
+msgid "Disadvantage: this may lose account customization (if any)."
+msgstr "Hại: tài khoản có thể mất chi tiết tùy chỉnh (nếu có)."
diff --git a/debian/templates b/debian/templates
index 7dffdd7..4bf3a2d 100644
--- a/debian/templates
+++ b/debian/templates
@@ -2,35 +2,36 @@ Template: sash/create_sashroot
 Type: boolean
 Default: true
 _Description: Create sashroot account?
- Do you want to create a second root account with sash as its shell? The
- account name will be "sashroot".
+ Please choose whether you want to create a second root account with
+ sash as its shell. The account name will be 'sashroot'.
  .
- Advantage: current root account is left untouched
+ Advantage: the current root account is left untouched;
  .
- Disadvantage: you'd have two root accounts to keep track of
+ Disadvantage: you'd have two root accounts to keep track of.
 
 Template: sash/clone_root_passwd
 Type: boolean
 Default: true
 _Description: Clone root password for sashroot?
- Do you want to make sashroot's password the same as root's password? Note
- that if you change the root password, sashroot's password will not be
- updated.
+ Please choose whether the password for the sashroot account should be
+ the root account password. Note that if you change the root password later,
+ sashroot's password will not be updated.
  .
- Advantage: easy to remember
+ Advantage: this makes the password easy to remember;
  .
- Disadvantage: easy to remember
+ Disadvantage: the password being easy to remember, the overall
+ security of your system is lowered.
 
 Template: sash/sashroot_passwd
 Type: password
-_Description: Enter a password for sashroot
+_Description: sashroot account password:
  Before proceeding, you need to set a password for 'sashroot'.  The
  password shouldn't be easy to guess, and it shouldn't be a word found in
  the dictionary, or a word that could be easily associated with you, like
  your middle name. A good password will contain a mixture of letters,
  numbers and punctuation and will be changed at regular intervals.
  .
- Why such caution?  The sashroot account doesn't have the restrictions that
+ The 'sashroot' account doesn't have the restrictions that
  normal user accounts have. A malicious or unqualified user with root
  access can have disastrous results.
  .
@@ -40,14 +41,14 @@ Template: sash/change_root_shell
 Type: boolean
 Default: false
 _Description: Change root's shell?
- Do you want to change root's shell to sash?
+ Please choose whether you want the root account's shell changed to sash.
 
 Template: sash/delete_sashroot_on_remove
 Type: boolean
 Default: false
 _Description: Delete sashroot account?
- Do you want to remove the sashroot account?
+ Please choose whether you want to remove the 'sashroot' account.
  .
- Advantage: more secure, leaves less clutter on the system
+ Advantage: this is more secure and leaves less clutter on the system;
  .
- Disadvantage: may lose account customization (if any)
+ Disadvantage: this may lose account customization (if any).
diff --git a/debian/templates.old b/debian/templates.old
deleted file mode 100644
index bc48507..0000000
--- a/debian/templates.old
+++ /dev/null
@@ -1,54 +0,0 @@
-Template: sash/create_sashroot
-Type: boolean
-Default: true
-Description: Create sashroot account?
- Do you want to create a second root account with sash as its shell?
- The account name will be "sashroot".
- .
- Advantage: current root account is left untouched
- .
- Disadvantage: you'd have two root accounts to keep track of
-
-Template: sash/clone_root_passwd
-Type: boolean
-Default: true
-Description: Clone root password for sashroot?
- Do you want to make sashroot's password the same as root's password?
- Note that if you change the root password, sashroot's password will
- not be updated.
- .
- Advantage: easy to remember
- .
- Disadvantage: easy to remember
-
-Template: sash/sashroot_passwd
-Type: password
-Description: Enter a password for sashroot
- Before proceeding, you need to set a password for 'sashroot'.  The
- password shouldn't be easy to guess, and it shouldn't be a word found
- in the dictionary, or a word that could be easily associated with
- you, like your middle name. A good password will contain a mixture
- of letters, numbers and punctuation and will be changed at regular
- intervals.
- .
- Why such caution?  The sashroot account doesn't have the restrictions
- that normal user accounts have. A malicious or unqualified user with
- root access can have disastrous results.
- .
- Note that you will not be able to see the password as you type it.
-
-Template: sash/change_root_shell
-Type: boolean
-Default: false
-Description: Change root's shell?
- Do you want to change root's shell to sash?
-
-Template: sash/delete_sashroot_on_remove
-Type: boolean
-Default: false
-Description: Delete sashroot account?
- Do you want to remove the sashroot account?
- .
- Advantage: more secure, leaves less clutter on the system
- .
- Disadvantage: may lose account customization (if any)