base-config/debian/po templates.pot,1.8,1.9

[Joey Hess <joeyh@debian.org>]

Update of /cvs/debian-boot/base-config/debian/po
In directory gluck:/tmp/cvs-serv5869/debian/po

Modified Files:
	templates.pot 
Log Message:
Checking in my changes for version 2.0. This includes many file moves.


Index: templates.pot
===================================================================
RCS file: /cvs/debian-boot/base-config/debian/po/templates.pot,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- templates.pot	28 Oct 2003 00:32:38 -0000	1.8
+++ templates.pot	8 Dec 2003 23:17:14 -0000	1.9
@@ -16,7 +16,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-10-28 00:31+0100\n"
+"POT-Creation-Date: 2003-12-01 14:16-0500\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"
@@ -24,15 +24,21 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#. Type: select
+#. Description
+#: ../templates:4
+msgid "Base system configuration menu"
+msgstr ""
+
 #. Type: note
 #. Description
-#: ../templates:3
+#: ../templates:8
 msgid "Welcome to your new Debian system!"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates:3
+#: ../templates:8
 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, "
@@ -40,38 +46,30 @@
 "additional software to tune this new Debian system to your needs."
 msgstr ""
 
-#. Type: note
-#. Description
-#: ../templates:3
-msgid ""
-"If you want to revisit this setup process at a later date, just run /usr/"
-"sbin/base-config."
-msgstr ""
-
 #. Type: boolean
 #. Description
-#: ../templates:16
-msgid "Do you want to use a PPP connection to install the system?"
+#: ../templates:18
+msgid "Use a PPP connection to install the system?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates:16
+#: ../templates:18
 msgid ""
-"If you have an account on an ISP, and you want to use it to fetch the "
-"packages to install on the system from the Internet, you may configure the "
-"PPP service now, and open a PPP connection to your ISP."
+"If you have an account on an Internet Services Provider (ISP), and you want "
+"to use it to fetch the packages to install on the system from the Internet, "
+"you may configure the PPP service now, and open a PPP connection to your ISP."
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../templates:24
-msgid "Choose a program to run:"
+#: ../templates:27
+msgid "Software selection method:"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../templates:24
+#: ../templates:27
 msgid ""
 "You currently have a very minimal Debian system installed. You should "
 "probably choose more software to be installed to customize the computer for "
@@ -81,21 +79,21 @@
 
 #. Type: boolean
 #. Description
-#: ../templates:33
-msgid "Packages failed to install. Back up and try again?"
+#: ../templates:36
+msgid "Try again to install packages which failed to install?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates:33
+#: ../templates:36
 msgid ""
 "One or more packages failed to install. This is probably due to bugs in the "
-"packages. (Sorry; Debian's not perfect!)"
+"packages."
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates:33
+#: ../templates:36
 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 "
@@ -105,72 +103,66 @@
 
 #. Type: boolean
 #. Description
-#: ../templates:33
+#: ../templates:36
 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 ""
 
-#. Type: boolean
-#. Description
-#: ../templates:48
-msgid "Do you want me to close the PPP connection?"
-msgstr ""
-
-#. Type: boolean
+#. Type: note
 #. Description
-#: ../templates:48
-msgid ""
-"The installation is complete. I can close the PPP connection to your  ISP "
-"now or I can keep it open if you want."
+#: ../templates:50
+msgid "Thank you for choosing Debian!"
 msgstr ""
 
-#. Type: boolean
+#. Type: note
 #. Description
-#: ../templates:48
+#: ../templates:50
 msgid ""
-"If you decide to keep it open, remember to use 'poff' to close it when you "
-"finish."
+"Setup of your Debian system is complete. You may now login at the login: "
+"prompt."
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates:57
-msgid "Thank you for choosing Debian!"
+#: ../templates:50
+msgid ""
+"If you want to revisit this setup process at a later date, just run the base-"
+"config program."
 msgstr ""
 
-#. Type: note
+#. Type: string
 #. Description
-#: ../templates:57
-msgid "You may now login at the login: prompt."
+#: ../templates:59
+msgid "System hostname (including domain name):"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates:63
-msgid "Enter the system's hostname including domain name."
+#: ../templates:59
+msgid "Please enter your system hostname."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates:63
+#: ../templates:59
 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.  We recommend using the full qualified name, including "
+"something up here.  You should enter the fully qualified name, including "
 "domain name."
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates:72
-msgid "The hostname \"${HOSTNAME}\" is invalid."
+#: ../templates:70
+msgid "Invalid hostname \"${HOSTNAME}\""
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates:72
+#: ../templates:70
 msgid ""
 "A valid hostname may contain period-separated parts containing only "
 "alphanumeric characters and the minus sign, be between 2 and 63 characters "
@@ -179,18 +171,96 @@
 
 #. Type: boolean
 #. Description
-#: ../templates:80
+#: ../templates:78
 msgid "Do you want to start the graphical display manager?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates:80
+#: ../templates:78
 msgid ""
-"The graphical display manager make it possible to log in using a graphical "
+"The graphical display manager makes it possible to log in using a graphical "
 "environment."
 msgstr ""
 
+#. Type: title
+#. Description
+#: ../templates:84
+msgid "Read settings from the first stage installer"
+msgstr ""
+
+#. Type: title
+#. Description
+#: ../templates:88
+msgid "Display introductory message"
+msgstr ""
+
+#. Type: title
+#. Description
+#: ../templates:92
+msgid "Configure the keyboard"
+msgstr ""
+
+#. Type: title
+#. Description
+#: ../templates:96
+msgid "Configure timezone"
+msgstr ""
+
+#. Type: title
+#. Description
+#: ../templates:100
+msgid "Set up users and passwords"
+msgstr ""
+
+#. Type: title
+#. Description
+#: ../templates:104
+msgid "Set the hostname"
+msgstr ""
+
+#. Type: title
+#. Description
+#: ../templates:108
+msgid "Configure and enable ppp"
+msgstr ""
+
+#. Type: title
+#. Description
+#: ../templates:112
+msgid "Configure apt"
+msgstr ""
+
+#. Type: title
+#. Description
+#: ../templates:116
+msgid "Select packages to install"
+msgstr ""
+
+#. Type: title
+#. Description
+#: ../templates:120
+msgid "Install selected packages"
+msgstr ""
+
+#. Type: title
+#. Description
+#: ../templates:124
+msgid "Configure the Mail Transfer Agent"
+msgstr ""
+
+#. Type: title
+#. Descrption
+#: ../templates:128
+msgid "Finish the installation and log in."
+msgstr ""
+
+#. Type: title
+#. Description
+#: ../templates:132
+msgid "Execute a shell"
+msgstr ""
+
 #. Type: boolean
 #. Description
 #: ../../tzsetup.templates:4
@@ -238,7 +308,7 @@
 #. Type: select
 #. Description
 #: ../../tzsetup.templates:23
-msgid "What area is your desired time zone in?"
+msgid "Area for your time zone:"
 msgstr ""
 
 #. Type: select
@@ -264,7 +334,7 @@
 #. Type: boolean
 #. Description
 #: ../../tzsetup.templates:35
-msgid "Are you happy with your choices?"
+msgid "Is this information correct?"
 msgstr ""
 
 #. Type: boolean
@@ -291,55 +361,111 @@
 #. Type: select
 #. Choices
 #: ../../apt-setup.templates:3
-msgid "cdrom, http, ftp, filesystem, edit sources list by hand"
+msgid "stable, unstable, testing"
 msgstr ""
 
 #. Type: select
 #. Description
 #: ../../apt-setup.templates:5
-msgid "Choose the method apt should use to access the Debian archive:"
+msgid "Debian distribution to use:"
 msgstr ""
 
 #. Type: select
 #. Description
 #: ../../apt-setup.templates:5
 msgid ""
-"Apt can access the Debian archive in a variety of ways. Choose the access "
-"method apt should use. For example if you have a Debian cd, select \"cdrom"
-"\", while if you plan to install via a Debian mirror, choose \"ftp\" or "
-"\"http\"."
+"Debian comes in several flavors. Stable is well-tested and rarely changes. "
+"Unstable is untested and frequently changing. Testing is a middle ground, "
+"that receives many of the new versions from unstable if they are not too "
+"buggy."
 msgstr ""
 
 #. Type: select
 #. Description
 #: ../../apt-setup.templates:5
-msgid "${note}"
+msgid "Please choose which version of Debian you wish to install."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../../apt-setup.templates:15
+msgid "HTTP proxy information (blank for none):"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../../apt-setup.templates:15
+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 ""
+
+#. Type: string
+#. Description
+#: ../../apt-setup.templates:15
+msgid ""
+"The proxy information should be the standard form of \"http://[[user][:pass]";
+"@]host[:port]\""
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../../apt-setup.templates:24
+msgid "cdrom, http, ftp, filesystem, edit sources list by hand"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../../apt-setup.templates:17
-msgid "Select a country:"
+#: ../../apt-setup.templates:26
+msgid "Archive access method for apt:"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../../apt-setup.templates:17
+#: ../../apt-setup.templates:26
 msgid ""
-"Select the country the mirror should be in. The goal is to find a mirror "
-"that is close to you on the network -- be aware that near countries, or even "
-"your own, may not be the best choice."
+"Please choose the method apt (the Debian package management tool) should use "
+"to access the Debian archive."
 msgstr ""
 
 #. Type: select
 #. Description
 #: ../../apt-setup.templates:26
-msgid "Choose the Debian mirror to use:"
+msgid ""
+"For example if you have a Debian cd, select \"cdrom\", while if you plan to "
+"install via a Debian mirror, choose \"ftp\" or \"http\"."
 msgstr ""
 
 #. Type: select
 #. Description
 #: ../../apt-setup.templates:26
+msgid "${note}"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../../apt-setup.templates:40
+msgid "Mirror country:"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../../apt-setup.templates:40
+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 ""
+
+#. Type: select
+#. Description
+#: ../../apt-setup.templates:49
+msgid "Choose the Debian mirror to use:"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../../apt-setup.templates:49
 msgid ""
 "Select the Debian mirror apt should use. You should select a mirror that is "
 "close to you on the net."
@@ -347,43 +473,43 @@
 
 #. Type: string
 #. Description
-#: ../../apt-setup.templates:32
-msgid "Enter mirror hostname:"
+#: ../../apt-setup.templates:55
+msgid "Mirror hostname:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../../apt-setup.templates:32
-msgid "Enter the hostname of the Debian mirror you want to use."
+#: ../../apt-setup.templates:55
+msgid "Enter the hostname of the mirror from which Debian will be downloaded."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../../apt-setup.templates:38
-msgid "Enter mirror directory:"
+#: ../../apt-setup.templates:61
+msgid "Mirror directory:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../../apt-setup.templates:38
-msgid "Enter the directory the Debian mirror is located in."
+#: ../../apt-setup.templates:61
+msgid "Enter the directory in which the Debian mirror is located."
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../../apt-setup.templates:43
+#: ../../apt-setup.templates:66
 msgid "The directory you entered does not exist."
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../../apt-setup.templates:48
-msgid "Mirror not found."
+#: ../../apt-setup.templates:71
+msgid "Mirror not found"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../../apt-setup.templates:48
+#: ../../apt-setup.templates:71
 msgid ""
 "The directory you entered does not contain a subdirectory named \"dists\", "
 "so it doesn't seem to be a Debian mirror."
@@ -391,41 +517,47 @@
 
 #. Type: string
 #. Description
-#: ../../apt-setup.templates:54
-msgid "Enter CD ROM device file:"
+#: ../../apt-setup.templates:77
+msgid "CD-ROM device file:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../../apt-setup.templates:54
+#: ../../apt-setup.templates:77
 msgid ""
-"This program was unable to auto-detect a CD ROM drive, or there is no usable "
-"CD in the drive. Enter the device file to use to access your CD ROM, and "
-"place a Debian CD in the drive."
+"This program was unable to auto-detect a CD-ROM drive, or there is no usable "
+"CD in the drive."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../../apt-setup.templates:77
+msgid ""
+"Enter the device file to use to access your CD-ROM, and place a Debian CD in "
+"the drive."
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../../apt-setup.templates:61
-msgid "Bad CD"
+#: ../../apt-setup.templates:86
+msgid "Non-Debian CD-ROM detected"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../../apt-setup.templates:61
-msgid ""
-"Your CD drive was detected, but it does not seem to have a Debian CD in it."
+#: ../../apt-setup.templates:86
+msgid "The CD-ROM drive contains a non-Debian CD."
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../../apt-setup.templates:68
+#: ../../apt-setup.templates:92
 msgid "Scan another CD?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../../apt-setup.templates:68
+#: ../../apt-setup.templates:92
 msgid ""
 "If you have another Debian CD (for example, the second in a two CD set), you "
 "should insert and scan it now."
@@ -433,204 +565,183 @@
 
 #. Type: boolean
 #. Description
-#: ../../apt-setup.templates:75
+#: ../../apt-setup.templates:99
 msgid "Use non-free software?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../../apt-setup.templates:75
+#: ../../apt-setup.templates:99
 msgid ""
 "Some non-free software has been made to work with Debian. Though this "
 "software is not at all a part of Debian, standard Debian tools can be used "
 "to install it. This software has varying licenses which may prevent you from "
-"using, modifying, or sharing it. Do you want to have it available anyway?"
+"using, modifying, or sharing it."
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../../apt-setup.templates:85
+#: ../../apt-setup.templates:99
+msgid "Please choose whether you want to have it available anyway."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../../apt-setup.templates:110
 msgid "Use non-US software?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../../apt-setup.templates:85
+#: ../../apt-setup.templates:110
 msgid ""
 "Some software in Debian must be downloaded from sites outside the United "
 "States. This includes some cryptographic software, and some software with "
-"patent problems in the US. Do you want this software to be made available to "
-"you?"
+"patent problems in the US."
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../../apt-setup.templates:94
+#: ../../apt-setup.templates:121
 msgid "Use contrib software?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../../apt-setup.templates:94
+#: ../../apt-setup.templates:121
 msgid ""
 "Some additional software has been made to work with Debian. Though this "
 "software is free, it depends on non-free software for its operation. This "
 "software is not at all a part of Debian, but standard Debian tools can be "
-"used to install it. Would you like to have it available?"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../../apt-setup.templates:102
-msgid "stable, unstable, testing"
-msgstr ""
-
-#. Type: select
-#. Description
-#: ../../apt-setup.templates:104
-msgid "Select Debian distribution to use:"
+"used to install it."
 msgstr ""
 
-#. Type: select
+#. Type: boolean
 #. Description
-#: ../../apt-setup.templates:104
+#: ../../apt-setup.templates:121
 msgid ""
-"Debian comes in several flavors. Stable is well-tested and rarely changes. "
-"Unstable is untested and frequently changing. Testing is a middle ground, "
-"that receives many of the new versions from unstable if they are not too "
-"buggy. Which version of Debian do you wish to install?"
+"Please choose whether you want this software to be made available to you."
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../../apt-setup.templates:112
+#: ../../apt-setup.templates:131
 msgid "Failed to access the Debian archive"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../../apt-setup.templates:112
+#: ../../apt-setup.templates:131
 msgid ""
-"When I tried to access the debian archive using the information you "
-"provided, apt gave the following error. I will run through the questions "
-"again, try to correct the error."
+"While trying to access the debian archive using the information you "
+"provided, the Debian package management tool, apt, returned the following "
+"error. The questions will be asked again."
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../../apt-setup.templates:122
+#: ../../apt-setup.templates:141
 msgid "Add another apt source?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../../apt-setup.templates:122
+#: ../../apt-setup.templates:141
 msgid ""
-"Apt is now configured, and should be able to install Debian packages. "
-"However, you may want to add another source to apt, so it can download "
-"packages from more than one location."
+"The Debian package management tool, apt, is now configured, and should be "
+"able to install Debian packages.  However, you may want to add another "
+"source to apt, so it can download packages from more than one location."
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../../apt-setup.templates:129
+#: ../../apt-setup.templates:149
 msgid "edit, revert to backup"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../../apt-setup.templates:130
+#: ../../apt-setup.templates:150
 msgid "What do you want to do?"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../../apt-setup.templates:130
+#: ../../apt-setup.templates:150
 msgid ""
-"The entries you made in sources.list did not work. Here is the error message "
-"from apt:"
+"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 ""
 
 #. Type: select
 #. Description
-#: ../../apt-setup.templates:130
+#: ../../apt-setup.templates:150
 msgid ""
-"I have a backup of the sources.list from before you edited it. Should I "
-"revert to that backup, or would you like to edit the existing file and fix "
-"it?"
+"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 ""
 
 #. Type: note
 #. Description
-#: ../../apt-setup.templates:142
+#: ../../apt-setup.templates:161
 msgid "Cannot access non-US software."
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../../apt-setup.templates:142
+#: ../../apt-setup.templates:161
 msgid ""
-"I cannot access the Debian archive site that contains non-US software, so "
-"that software will not be made available to you. The error message I "
-"received from apt was:"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../../apt-setup.templates:151
-msgid "Enter http proxy information, or leave blank for none:"
+"The Debian archive site that contains non-US software couldn't be accessed, "
+"so that software will not be made available to you. The following error "
+"message was returned by apt:"
 msgstr ""
 
-#. Type: string
+#. Type: boolean
 #. Description
-#: ../../apt-setup.templates:151
-msgid ""
-"If you need to use a http proxy to access the outside world, enter the proxy "
-"information here. Otherwise, leave this blank."
+#: ../../apt-setup.templates:171
+msgid "Use security updates from security.debian.org?"
 msgstr ""
 
-#. Type: string
+#. Type: boolean
 #. Description
-#: ../../apt-setup.templates:151
+#: ../../apt-setup.templates:171
 msgid ""
-"When entering proxy information, use the standard form of \"http://[[user][:";
-"pass]@]host[:port]\""
+"Debian provides timely security updates via the website security.debian.org. "
+"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 ""
 
-#. Type: boolean
+#. Type: note
 #. Description
-#: ../../apt-setup.templates:161
-msgid "Use security updates from security.debian.org?"
+#: ../../apt-setup.templates:179
+msgid "Cannot access security updates"
 msgstr ""
 
-#. Type: boolean
+#. Type: note
 #. Description
-#: ../../apt-setup.templates:161
+#: ../../apt-setup.templates:179
 msgid ""
-"Debian provides timely security updates via the website http://security.";
-"debian.org/ . Should these updates be tracked each time you upgrade your "
-"system? If you are on the Internet, this is generally a good idea."
+"The security updates on security.debian.org couldn't be accessed, so those "
+"updates will not be made available to you at this time. You may want to "
+"investigate this later."
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../../apt-setup.templates:169
-msgid "Cannot access security updates."
+#: ../../apt-setup.templates:179
+msgid ""
+"Commented out entries for security.debian.org have been added to the bottom "
+"of the /etc/apt/sources.list file."
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../../apt-setup.templates:169
-msgid ""
-"I cannot access the security updates on security.debian.org, so those "
-"updates will not be made available to you at this time. You may want to "
-"investigate this later.. Commented out entries for security.debian.org have "
-"been added to the bottom of /etc/apt/sources.list . The error message I "
-"received from apt was:"
+#: ../../apt-setup.templates:179
+msgid "The error message returned by apt:"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../../apt-setup.templates:169
+#: ../../apt-setup.templates:179
 msgid "${apt_error}"
 msgstr ""