On Sun, Apr 03, 2005 at 02:45:30PM +0200, Jens Seidel wrote:
> PS: Ich habe selber noch Mal einen Patch angehangen, welcher im
> deutschen Teil /zur Zeit/zurzeit/ und im englischen s/a LCD/an LCD/ und
> inbesondere s/can not/cannot/ korrigiert.
> Es wäre schön, wenn du dies einchecken könntest.
Und jetzt habe ich ihn wirklich angehangen ...
Index: installer/build/boot/m68k/vme-tftplilo.conf
===================================================================
--- installer/build/boot/m68k/vme-tftplilo.conf (Revision 26530)
+++ installer/build/boot/m68k/vme-tftplilo.conf (Arbeitskopie)
@@ -1,5 +1,5 @@
##------------------------------------------------------------------------##
-# Debain GNU/Linux tftplilo.conf Installation and Boot configuration.
+# Debian GNU/Linux tftplilo.conf Installation and Boot configuration.
#
##------------------------------------------------------------------------##
Index: installer/build/boot/m68k/amiga/cv64.txt
===================================================================
--- installer/build/boot/m68k/amiga/cv64.txt (Revision 26530)
+++ installer/build/boot/m68k/amiga/cv64.txt (Arbeitskopie)
@@ -47,7 +47,7 @@
Window size default button selected; same size as selected mode
Once you have AmigaDOS booted with the selected graphics mode, you
-boot into Linux using 'amiboot', Lilo can NOT be used. Here is an example
+boot into Linux using 'amiboot', Lilo CANNOT be used. Here is an example
for using the mode 640x480 with 8 bits/pixel:
amiboot -v -k vmlinux root=/dev/sda1 video=cyberfb:640x480-8
The "-v" option prevents reseting of the graphics board so the AmigaDOS
Index: installer/debian/changelog
===================================================================
--- installer/debian/changelog (Revision 26530)
+++ installer/debian/changelog (Arbeitskopie)
@@ -1556,7 +1556,7 @@
- pkg-lists/mirror_udeb: lists for a partial mirror suitable for the CDs
- Drop pump-udeb (netboot on alpha, s390 and sparc) in favour of
dhcp-client-udeb
- - debain/control: added Build-Depends: mkisofs
+ - debian/control: added Build-Depends: mkisofs
- daily-build: changed to copy last days images and rsync new ones
- daily-build: don't let the builder wait for logs, use tee
- No discover for mips/mipsel
Index: installer/doc/manual/da/preparing/pre-install-bios-setup.xml
===================================================================
--- installer/doc/manual/da/preparing/pre-install-bios-setup.xml
(Revision 26530)
+++ installer/doc/manual/da/preparing/pre-install-bios-setup.xml
(Arbeitskopie)
@@ -139,7 +139,7 @@
<sect3><title>More than 64 MB RAM</title>
<para>
-The Linux Kernel can not always detect what amount of RAM you have. If
+The Linux Kernel cannot always detect what amount of RAM you have. If
this is the case please look at <xref linkend="boot-parms"/>.
</para>
Index: installer/doc/manual/de/install-methods/usb-setup/i386.xml
===================================================================
--- installer/doc/manual/de/install-methods/usb-setup/i386.xml (Revision 26530)
+++ installer/doc/manual/de/install-methods/usb-setup/i386.xml (Arbeitskopie)
@@ -5,7 +5,7 @@
<title>Partitionieren eines USB-Sticks auf &arch-title;-Systemen</title>
<para>
-Wir werden hier erlÃâutern, wie Sie den Memory-Stick einrichten, sodass nur
+Wir werden hier erlÃâutern, wie Sie den Memory-Stick einrichten, so dass nur
die erste Partition genutzt wird statt des kompletten USB-Speichers.
</para><note><para>
Index: installer/doc/manual/de/install-methods/usb-setup/powerpc.xml
===================================================================
--- installer/doc/manual/de/install-methods/usb-setup/powerpc.xml
(Revision 26530)
+++ installer/doc/manual/de/install-methods/usb-setup/powerpc.xml
(Arbeitskopie)
@@ -6,7 +6,7 @@
<para>
Die meisten USB-Sticks sind nicht derart vorkonfiguriert, dass OpenFirmware
-davon booten kann, sodass Sie den Stick neu partitionieren mÃÅssen.
+davon booten kann, so dass Sie den Stick neu partitionieren mÃÅssen.
Auf Mac-Systemen fÃÅhren Sie <userinput>mac-fdisk /dev/sda</userinput> aus,
erzeugen mit dem <userinput>i</userinput>-Befehl eine neue Partitionstabelle
und dann eine neue Partition des Typs Apple_Bootstrap (mit dem
@@ -48,7 +48,7 @@
Hier wieder die Warnung, den richtigen GerÃâtenamen zu verwenden.
Die Partition darf fÃÅr diese Prozedur nicht anderweitig ins Dateisystem
eingehÃângt sein. Es wird hierbei der Bootloader auf die Partition
geschrieben
-und mittels der HFS-Programme passend gekennzeichnet, sodass OpenFirmware ihn
startet.
+und mittels der HFS-Programme passend gekennzeichnet, so dass OpenFirmware ihn
startet.
Nachdem dies erledigt ist, sollten die restliche Vorbereitungen am USB-Stick
mit
den normalen Unix-Programmen vorgenommen werden.
Index: installer/doc/manual/de/partitioning/partition/alpha.xml
===================================================================
--- installer/doc/manual/de/partitioning/partition/alpha.xml (Revision 26530)
+++ installer/doc/manual/de/partitioning/partition/alpha.xml (Arbeitskopie)
@@ -36,7 +36,7 @@
</para><para>
Weil <command>aboot</command> in die ersten paar Sektoren der Festplatte
-geschrieben wird (zur Zeit braucht es ungefÃâhr 70 Kilobytes bzw. 150
+geschrieben wird (zurzeit braucht es ungefÃâhr 70 Kilobytes bzw. 150
Sektoren), <emphasis>mÃÅssen</emphasis> Sie auÃÂerdem dafÃÅr genug freien
Platz am Anfang der Festplatte freilassen. FrÃÅher wurde vorgeschlagen, dass
Sie
eine kleine unformatierte Partition am Anfang der Festplatte erstellen. Aus
Index: installer/doc/manual/de/boot-installer/m68k.xml
===================================================================
--- installer/doc/manual/de/boot-installer/m68k.xml (Revision 26530)
+++ installer/doc/manual/de/boot-installer/m68k.xml (Arbeitskopie)
@@ -359,7 +359,7 @@
</para><para>
-Das Starten von einer Boot-Floppy wird zur Zeit nur auf Atari und VME
+Das Starten von einer Boot-Floppy wird zurzeit nur auf Atari und VME
(auf VME benÃÂtigen Sie ein SCSI-Floppy-Laufwerk) unterstÃÅtzt.
</para>
Index: installer/doc/manual/en/appendix/example-preseed.xml
===================================================================
--- installer/doc/manual/en/appendix/example-preseed.xml (Revision 26530)
+++ installer/doc/manual/en/appendix/example-preseed.xml (Arbeitskopie)
@@ -328,7 +328,7 @@
# Monitor autodetection is recommended.
xserver-xfree86 xserver-xfree86/autodetect_monitor boolean true
-# Uncomment if you have a LCD display.
+# Uncomment if you have an LCD display.
#xserver-xfree86 xserver-xfree86/config/monitor/lcd boolean true
# X has three configuration paths for the monitor. Here's how to preseed
# the "medium" path, which is always available. The "simple" path may not
Index: installer/doc/manual/en/boot-installer/i386.xml
===================================================================
--- installer/doc/manual/en/boot-installer/i386.xml (Revision 26530)
+++ installer/doc/manual/en/boot-installer/i386.xml (Arbeitskopie)
@@ -234,7 +234,7 @@
</para><para>
-For installing from a LS-120 drive (ATAPI version) with a set of
+For installing from an LS-120 drive (ATAPI version) with a set of
floppies, you need to specify the virtual location for the floppy
device. This is done with the <emphasis>root=</emphasis> boot
argument, giving the device that the ide-floppy driver maps the device
Index: installer/doc/manual/eu/preparing/pre-install-bios-setup.xml
===================================================================
--- installer/doc/manual/eu/preparing/pre-install-bios-setup.xml
(Revision 26530)
+++ installer/doc/manual/eu/preparing/pre-install-bios-setup.xml
(Arbeitskopie)
@@ -163,7 +163,7 @@
<sect3><title>More than 64 MB RAM</title>
<para>
-The Linux Kernel can not always detect what amount of RAM you have. If
+The Linux Kernel cannot always detect what amount of RAM you have. If
this is the case please look at <xref linkend="boot-parms"/>.
</para>
Index: installer/doc/manual/it/preparing/pre-install-bios-setup.xml
===================================================================
--- installer/doc/manual/it/preparing/pre-install-bios-setup.xml
(Revision 26530)
+++ installer/doc/manual/it/preparing/pre-install-bios-setup.xml
(Arbeitskopie)
@@ -139,7 +139,7 @@
<sect3><title>More than 64 MB RAM</title>
<para>
-The Linux Kernel can not always detect what amount of RAM you have. If
+The Linux Kernel cannot always detect what amount of RAM you have. If
this is the case please look at <xref linkend="boot-parms"/>.
</para>
Index: packages/cdebconf/configure
===================================================================
--- packages/cdebconf/configure (Revision 26530)
+++ packages/cdebconf/configure (Arbeitskopie)
@@ -487,9 +487,9 @@
fi
if test ! -r $srcdir/$ac_unique_file; then
if test "$ac_srcdir_defaulted" = yes; then
- { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2;
exit 1; }
+ { echo "configure: error: cannot find sources in $ac_confdir or .." 1>&2;
exit 1; }
else
- { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
+ { echo "configure: error: cannot find sources in $srcdir" 1>&2; exit 1; }
fi
fi
srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
@@ -553,7 +553,7 @@
fi
done
if test -z "$ac_aux_dir"; then
- { echo "configure: error: can not find install-sh or install.sh in .
$srcdir/." 1>&2; exit 1; }
+ { echo "configure: error: cannot find install-sh or install.sh in .
$srcdir/." 1>&2; exit 1; }
fi
ac_config_guess=$ac_aux_dir/config.guess
ac_config_sub=$ac_aux_dir/config.sub
Index: packages/po/et.po
===================================================================
--- packages/po/et.po (Revision 26530)
+++ packages/po/et.po (Arbeitskopie)
@@ -1540,7 +1540,7 @@
msgid ""
"Please enter the directory in which the mirror of the Debian archive is "
"located."
-msgstr "Palun sisesta kataloog, kus Debaini arhiivi peegeldus asub."
+msgstr "Palun sisesta kataloog, kus Debiani arhiivi peegeldus asub."
#. Type: string
#. Description
Index: packages/po/de.po
===================================================================
--- packages/po/de.po (Revision 26530)
+++ packages/po/de.po (Arbeitskopie)
@@ -1261,7 +1261,7 @@
"Your network is probably not using the DHCP protocol. Alternatively, the "
"DHCP server may be slow or some network hardware is not working properly."
msgstr ""
-"Ihr Netzwerk benutzt mÃÂglicherweise nicht das DHCP-Protokoll. Desweiteren "
+"Ihr Netzwerk benutzt mÃÂglicherweise nicht das DHCP-Protokoll. Des Weiteren
"
"kÃÂnnte der DHCP-Server sehr langsam sein oder die Netzwerk-Hardware
arbeitet "
"nicht korrekt."
@@ -2133,7 +2133,7 @@
"debian-boot@lists.debian.org with information."
msgstr ""
"Das Partitionierungsprogramm hat nicht genug Informationen ÃÅber den
Standard-"
-"Typ der Partitionstabelle Ihrer Architektur. Bitte senden Sie eine Email "
+"Typ der Partitionstabelle Ihrer Architektur. Bitte senden Sie eine E-Mail "
"mit mehr Informationen an [EMAIL PROTECTED]"
#. Type: boolean
@@ -2888,7 +2888,7 @@
#. Choices
#: ../partman-basicfilesystems.templates:64
msgid "/home - user home directories"
-msgstr "/home - Heimatverzeichnisse der Benutzer"
+msgstr "/home - Home-Verzeichnisse der Benutzer"
# ../partman-basicfile systems.templates:61
#. Type: select
Index: packages/kbd-chooser/usb-kbd.c
===================================================================
--- packages/kbd-chooser/usb-kbd.c (Revision 26530)
+++ packages/kbd-chooser/usb-kbd.c (Arbeitskopie)
@@ -54,7 +54,7 @@
* If the USB keyboard vendor is Apple, set PRESENT = TRUE.
* For other keyboard vendors and if architecture is i386 or powerpc
(prep and chrp),
* force the installer to display the list of AT keymaps. This is
needed because, for
- * 2.6 kernels, we can not assume that a AT connector will be detected
in at-kbd.c.
+ * 2.6 kernels, we cannot assume that a AT connector will be detected
in at-kbd.c.
*/
kbd_t *p;
usb_data *data;
Index: packages/partman/partman-palo/init.d/palo
===================================================================
--- packages/partman/partman-palo/init.d/palo (Revision 26530)
+++ packages/partman/partman-palo/init.d/palo (Arbeitskopie)
@@ -23,7 +23,7 @@
while { read_line flag; [ "$flag" ]; }; do
if [ "$flag" = palo ]; then
palo=yes
- # can not break here
+ # cannot break here
fi
done
close_dialog
Index: packages/partman/partman-lvm/init.d/lvm
===================================================================
--- packages/partman/partman-lvm/init.d/lvm (Revision 26530)
+++ packages/partman/partman-lvm/init.d/lvm (Arbeitskopie)
@@ -44,7 +44,7 @@
while { read_line flag; [ "$flag" ]; }; do
if [ "$flag" = lvm ]; then
lvm=yes
- # can not break here
+ # cannot break here
fi
done
close_dialog
Index: packages/partman/partman-lvm/undo.d/lvm
===================================================================
--- packages/partman/partman-lvm/undo.d/lvm (Revision 26530)
+++ packages/partman/partman-lvm/undo.d/lvm (Arbeitskopie)
@@ -36,7 +36,7 @@
while { read_line flag; [ "$flag" ]; }; do
if [ "$flag" = lvm ]; then
lvm=yes
- # can not break here
+ # cannot break here
fi
done
close_dialog
Index: packages/partman/partman-newworld/init.d/newworld
===================================================================
--- packages/partman/partman-newworld/init.d/newworld (Revision 26530)
+++ packages/partman/partman-newworld/init.d/newworld (Arbeitskopie)
@@ -23,7 +23,7 @@
while { read_line flag; [ "$flag" ]; }; do
if [ "$flag" = boot ]; then
newworld=yes
- # can not break here
+ # cannot break here
fi
done
close_dialog
Index: packages/partman/partman/debian/changelog
===================================================================
--- packages/partman/partman/debian/changelog (Revision 26530)
+++ packages/partman/partman/debian/changelog (Arbeitskopie)
@@ -101,7 +101,7 @@
- parted_server.c (command_get_resize_range): do not consider file
systems longer than the containing partition
- parted_server.c (command_get_resize_range): do not give resize range
- for file systems we can not resize
+ for file systems we cannot resize
- parted_server.c: new commands VIRTUAL_RESIZE_PARTITION and
GET_VIRTUAL_RESIZE_RANGE. They are undocumented and hopefully will
exist only temporary to resize NTFS partition.
@@ -702,7 +702,7 @@
Thanks to Thiemo Seufer, Nicholas Breen and Maitland Bottoms,
closes: #220990, #238363, #239648.
- do not provide partitioned-harddrives on mips (parted recognises but
- can not edit properly dvh disk labels
+ cannot edit properly dvh disk labels
- change the main-menu number of partman on mips from 49 to 44: use
partitioner to partition harddrives but partman instead of partconf
- definitions.sh (partition_tree_choices): shorten the indent of the
@@ -1079,7 +1079,7 @@
it, to allow for database preseeding.
- Stop using non-breaking spaces, using new space escape code in
recent cdebconf. Fixes display on non-framebuffer terminal.
- (Anton Zinoviev: I reenabled non-breaking spaces as I can not use
+ (Anton Zinoviev: I reenabled non-breaking spaces as I cannot use
escaped spaces. Properly setup non-framebuffer terminal must be
able to display non-break spaces.)
- Enhance confirm_new_label template text.
@@ -1198,7 +1198,7 @@
- parted_server.c (command_get_resize_range): add
deactivate_exception_handler
- parted_server.c (resize_partition): add check for the case when
- there is a file system but it can not be opened
+ there is a file system but it cannot be opened
- debian/templates: state that `partition the storage devices' is an
alternative partitioner rather than additional partitioning step in
the installer process
Index: packages/partman/partman-efi/init.d/efi
===================================================================
--- packages/partman/partman-efi/init.d/efi (Revision 26530)
+++ packages/partman/partman-efi/init.d/efi (Arbeitskopie)
@@ -23,7 +23,7 @@
while { read_line flag; [ "$flag" ]; }; do
if [ "$flag" = boot ]; then
efi=yes
- # can not break here
+ # cannot break here
fi
done
close_dialog
Index: packages/partman/partman-prep/update.d/prep
===================================================================
--- packages/partman/partman-prep/update.d/prep (Revision 26530)
+++ packages/partman/partman-prep/update.d/prep (Arbeitskopie)
@@ -56,7 +56,7 @@
# The following is a hack and will be removed in future versions of
-# partman. It ensures that the prep partition can not be used for
+# partman. It ensures that the prep partition cannot be used for
# some regular file system.
if [ "$method" = prep ]; then
if [ -f $id/format ]; then
Index: packages/partman/partman-prep/init.d/prep
===================================================================
--- packages/partman/partman-prep/init.d/prep (Revision 26530)
+++ packages/partman/partman-prep/init.d/prep (Arbeitskopie)
@@ -23,7 +23,7 @@
while { read_line flag; [ "$flag" ]; }; do
if [ "$flag" = prep ]; then
prep=yes
- # can not break here
+ # cannot break here
fi
done
close_dialog
Index: packages/partman/partman-partitioning/debian/changelog
===================================================================
--- packages/partman/partman-partitioning/debian/changelog (Revision 26530)
+++ packages/partman/partman-partitioning/debian/changelog (Arbeitskopie)
@@ -83,7 +83,7 @@
* Anton Zinoviev
- active_partition/resize/choices: do not show "Size: ..." for
- partitions we can not resize
+ partitions we cannot resize
- active_partition/resize/do_option: tell the user if the resize
operation is impossible
- active_partition/resize/do_option: disable_swap before resize
Index: packages/autopartkit/configure.ac
===================================================================
--- packages/autopartkit/configure.ac (Revision 26530)
+++ packages/autopartkit/configure.ac (Arbeitskopie)
@@ -9,7 +9,7 @@
AC_PROG_INSTALL
if test "$GCC" = yes; then
- # Can not use -ansi, need 'long long'
+ # Cannot use -ansi, need 'long long'
# -ansi \
for flag in \
-pedantic \
Index: packages/udpkg/configure
===================================================================
--- packages/udpkg/configure (Revision 26530)
+++ packages/udpkg/configure (Arbeitskopie)
@@ -481,9 +481,9 @@
fi
if test ! -r $srcdir/$ac_unique_file; then
if test "$ac_srcdir_defaulted" = yes; then
- { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2;
exit 1; }
+ { echo "configure: error: cannot find sources in $ac_confdir or .." 1>&2;
exit 1; }
else
- { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
+ { echo "configure: error: cannot find sources in $srcdir" 1>&2; exit 1; }
fi
fi
srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
@@ -547,7 +547,7 @@
fi
done
if test -z "$ac_aux_dir"; then
- { echo "configure: error: can not find install-sh or install.sh in .
$srcdir/." 1>&2; exit 1; }
+ { echo "configure: error: cannot find install-sh or install.sh in .
$srcdir/." 1>&2; exit 1; }
fi
ac_config_guess=$ac_aux_dir/config.guess
ac_config_sub=$ac_aux_dir/config.sub
