small english documentation fixes
Hi,
I have som general small updates to the english documentation and doc-check.
The attached patch changes som "Debian GNU/Linux" to &debian; and som "no"
and "yes" to &MSG-NO; and &MSG-YES;, so they get correctly replaced by
localised strings when translated.
Also, I created two new entities in defaults.ent:
&num-of-debian-developers; - the current number of developers. I raised the
number from 500 to 800, as claimed on www.debian.org.
&setlang-language-code-list; - the available language codes for the setlang
utility. (appearing in inst-methods.sgml)
I defined it as (including the brand new catalan support):
"ca cs da de eo es fi fr gl hr hu it ko ja pl pt ru sk sv tr zh_CN"
Claus
--
Claus Hindsgaul
Index: defaults.ent
===================================================================
RCS file: /cvs/debian-boot/boot-floppies/documentation/defaults.ent,v
retrieving revision 1.113
diff -u -r1.113 defaults.ent
--- defaults.ent 2001/11/11 23:25:16 1.113
+++ defaults.ent 2001/11/23 19:27:34
@@ -58,10 +58,15 @@
<![ %s390 [ <!entity arch-title "S/390" > ]]>
<!entity arch-title "lame arch with no title">
+<!-- available language codes for 'setlang [code]' -->
+<!entity setlang-language-code-list "ca cs da de eo es fi fr gl hr hu it ko ja pl pt ru sk sv tr zh_CN">
+
<!-- languages list; this is used for architecture-specific
language switches in urls.ent. Add as lanaguages are
added. -->
<!entity % lang-C "IGNORE">
+<!entity % lang-ca "IGNORE">
<!entity % lang-cs "IGNORE">
<!entity % lang-da "IGNORE">
<!entity % lang-de "IGNORE">
@@ -69,14 +74,19 @@
<!entity % lang-es "IGNORE">
<!entity % lang-fi "IGNORE">
<!entity % lang-fr "IGNORE">
+<!entity % lang-gl "IGNORE">
<!entity % lang-hr "IGNORE">
+<!entity % lang-hu "IGNORE">
<!entity % lang-it "IGNORE">
+<!entity % lang-ko "IGNORE">
<!entity % lang-ja "IGNORE">
<!entity % lang-pl "IGNORE">
<!entity % lang-pt "IGNORE">
<!entity % lang-ru "IGNORE">
<!entity % lang-sk "IGNORE">
<!entity % lang-sv "IGNORE">
+<!entity % lang-tr "IGNORE">
+<!entity % lang-zhCN "IGNORE">
<!-- negatives about architectures -->
@@ -137,6 +147,10 @@
<![ %powerpc [ <!entity num-of-distrib-pkgs "3600"> ]]>
<![ %sparc [ <!entity num-of-distrib-pkgs "3700"> ]]>
<!entity num-of-distrib-pkgs "3500">
+
+<!-- Number of current Debian developers -->
+<!-- Source www.debian.org/intro/about, 2001-11-21 -->
+<!entity num-of-debian-developers "800">
<!-- whether this architecture supports boot from CD -->
Index: doc-check
===================================================================
RCS file: /cvs/debian-boot/boot-floppies/documentation/doc-check,v
retrieving revision 1.6
diff -u -r1.6 doc-check
--- doc-check 2001/06/12 06:47:20 1.6
+++ doc-check 2001/11/23 19:27:34
@@ -61,7 +61,7 @@
return ($plrev, $enrev);
}
-@subdocs = ("administrivia", "appendix", "dbootstrap", "hardware", "inst-methods", "partitioning", "post-install", "preparing", "rescue-boot", "tech-info", "welcome");
+@subdocs = ("administrivia", "appendix", "hardware", "inst-methods", "partitioning", "post-install", "preparing", "rescue-boot", "tech-info", "welcome");
foreach $doc (@subdocs) {
my $plfname = "$lang/" . "$doc" . ".sgml";
Index: en/boot-new.sgml
===================================================================
RCS file: /cvs/debian-boot/boot-floppies/documentation/en/boot-new.sgml,v
retrieving revision 1.8
diff -u -r1.8 boot-new.sgml
--- en/boot-new.sgml 2001/10/30 17:57:38 1.8
+++ en/boot-new.sgml 2001/11/23 19:27:37
@@ -241,13 +241,13 @@
an alternate method of storing passwords on your system which is more
secure than the standard means (called ``crypt'').
<p>
-The default is ``no'', but if you do not require NIS support and are
-very concerned about security on this machine, you may say ``yes''.
+The default is &MSG-NO;, but if you do not require NIS support and are
+very concerned about security on this machine, you may say &MSG-YES;.
<sect id="base-config-shadow">Shadow Passwords
<p>
-Unless you said ``yes'' to MD5 passwords, the system will ask whether
+Unless you said &MSG-YES; to MD5 passwords, the system will ask whether
you want to enable shadow passwords. This is a system in which your
Linux system is made to be a bit more secure. In a system without
shadow passwords, passwords are stored (encrypted) in a world-readable
@@ -315,7 +315,7 @@
<p>
You will next be asked whether you wish to install the rest of the
system using PPP. If you are installing from CD-ROM and/or are
-connected directly to the network, you can safely say ``no'' and skip
+connected directly to the network, you can safely say &MSG-NO; and skip
this section.
<p>
If you do choose to configure PPP at this point, a program named
@@ -444,14 +444,14 @@
<p>
For any of the network package sources, you will be prompted whether
you wish to use ``non-US software''. You will generally wish to say
-``yes'', because otherwise you won't be able to install
+&MSG-YES;, because otherwise you won't be able to install
cryptographically secure software, such as the popular
<prgn>ssh</prgn> program.
<p>
Next you will be asked whether you wish to have any non-free software.
That refers to commercial software or any other software whose
licensing does not comply with the <url id="&url-dfsg;" name="Debian
-Free Software Guidelines">. It's fine to say ``yes'', but be careful
+Free Software Guidelines">. It's fine to say &MSG-YES;, but be careful
when installing such software, because you will need to ensure that
you are using the software in compliance with its license.
<p>
Index: en/inst-methods.sgml
===================================================================
RCS file: /cvs/debian-boot/boot-floppies/documentation/en/inst-methods.sgml,v
retrieving revision 1.79
diff -u -r1.79 inst-methods.sgml
--- en/inst-methods.sgml 2001/10/30 17:57:38 1.79
+++ en/inst-methods.sgml 2001/11/23 19:27:41
@@ -535,8 +535,7 @@
two-letter code of your language in lower case, for example
<tt>setlang pl</tt> to set the language to Polish. Currently these
language codes are available:
-
-<example>cs de eo es fi fr hr hu it ja pl pt ru sk sv tr</example>
+<example>&setlang-language-code-list;</example>
<![ %m68k [
<sect1>Writing Disk Images on Atari Systems
Index: en/welcome.sgml
===================================================================
RCS file: /cvs/debian-boot/boot-floppies/documentation/en/welcome.sgml,v
retrieving revision 1.29
diff -u -r1.29 welcome.sgml
--- en/welcome.sgml 2001/10/24 06:42:58 1.29
+++ en/welcome.sgml 2001/11/23 19:27:43
@@ -24,7 +24,7 @@
originally funded by the <url id="&url-fsf-intro;" name="Free Software
Foundation"> and influenced by the <url id="&url-gnu-intro;"
name="GNU"> philosophy, has grown over the years into an organization
-of around 500 <em>Debian Developers</em>.
+of around &num-of-debian-developers; <em>Debian Developers</em>.
<p>
Debian Developers are involved in a variety of activities, including
<url id="&url-debian-home;" name="Web"> and <url id="&url-debian-ftp;"
@@ -179,7 +179,7 @@
<sect id="getting-newest-inst">
<heading>Getting Debian</heading>
<p>
-For information on how to download Debian GNU/Linux from the Internet
+For information on how to download &debian; from the Internet
or from whom official Debian CDs can be purchased, see the <url
id="&url-debian-distrib;" name="distribution web page">. The <url
id="&url-debian-mirrors;" name="list of Debian mirrors"> contains a
Reply to: