# HG changeset patch
# User Mike D. Smith
# Date 1216449345 0
# Node ID db0e82bebc70408a9ae0ce97aba28cfbaee67ccc
# Parent 5de884166be48cdfec4376b460ce9d0587eb9b57
Fix spelling, typos, wording, etc.
diff -r 5de884166be4 -r db0e82bebc70 installer/en.msg
--- a/installer/en.msg Sat Jul 19 00:02:08 2008 +0000
+++ b/installer/en.msg Sat Jul 19 06:35:45 2008 +0000
@@ -1,4 +1,4 @@
-# slitaz-installer: French translation.
+# slitaz-installer: English translation.
# start_install
START_INSTALL_MSG="\n
@@ -18,7 +18,7 @@
ASK_FOR_MKFS_TARGET_DEV_MSG="\n
SliTaz will be installed on the partition : $TARGET_DEV\n\n
The next step lets you format the target partition into ext3. Ext3 is a robust, \
-stable and journalised filesystem. If the partition is already formated you \
+stable and journaled filesystem. If the partition is already formated you \
can skip this stage, if not just accept. Warning formating a partition will \
destroy all current data.\n\n
\Z2Do you wish to format the partition in ext3 ?\Zn"
@@ -26,13 +26,13 @@
# ask_for_hostname
ASK_FOR_HOSTNAME_MSG="\n
Hostname configuration allows you to specify the machine name. The hostname is used \
-internally to identify the host on the network. This value can be changed when \
+internally to identify the host on the network. This value can be changed after \
the system is installed.\n\n
\Z2Hostname:\Zn"
# grub_install
GRUB_INSTALL_MSG="\n
-You have now the option to install the GRUB bootloader which is capable of \
+You now have the option to install the GRUB bootloader which is capable of \
booting any kind of operating system. If you want to use an existing \
GRUB installation, skip this step and add the correct lines to your GRUB \
configuration file (menu.lst). Note that the SliTaz Installer creates a \
diff -r 5de884166be4 -r db0e82bebc70 installer/slitaz-installer
--- a/installer/slitaz-installer Sat Jul 19 00:02:08 2008 +0000
+++ b/installer/slitaz-installer Sat Jul 19 06:35:45 2008 +0000
@@ -3,7 +3,7 @@
#
# So this is SliTaz installer using dialog boxes. All the comments are in
# English but displayed messages are in French. The script starts with a
-# few main variables, then all the functions and then a sequece of functions.
+# few main variables, then all the functions and then a sequence of functions.
#
# (C) 2007-2008 SliTaz - GNU General Public License v3.
#
@@ -84,7 +84,7 @@
esac
}
-# Start install with basic informations.
+# Start install with basic information.
start_installer()
{
$DIALOG --title " Install or Upgrade " \
@@ -138,7 +138,7 @@
fi
}
-# Display a list of available partition.
+# Display a list of available partitions.
fdisk_list()
{
LIST_PARTITIONS=`fdisk -l | grep ^/dev | sed s/'e Win95'/'e'/g`
@@ -149,7 +149,7 @@
$LIST_PARTITIONS" 18 70
}
-# We need a partition to install (inputbox).
+# We need a partition to install to (inputbox).
ask_for_target_dev()
{
exec 3>&1
@@ -160,7 +160,7 @@
retval=$?
exec 3>&-
check_retval
- # Display list and comme back.
+ # Display list and come back.
if [ "$retval" = "3" ]; then
fdisk_list
ask_for_target_dev
@@ -170,7 +170,7 @@
ask_for_target_dev
fi
set_messages
- # Check if specified device exist in /proc/partitions.
+ # Check if specified device exists in /proc/partitions.
DEV_NAME=${TARGET_DEV#/dev/}
if cat /proc/partitions | grep -q $DEV_NAME; then
echo "ask_for_target_dev: $TARGET_DEV" >>$LOG
@@ -240,7 +240,7 @@
mount $TARGET_DEV $TARGET_ROOT >>$LOG 2>>$LOG
}
-# Ask for hostanme before installing files.
+# Ask for hostname before installing files.
ask_for_hostname()
{
exec 3>&1
@@ -285,7 +285,7 @@
sleep 2
}
-# Kernel is rename to standard vmlinuz-$VERSION.
+# Kernel is renamed to standard vmlinuz-$VERSION.
install_kernel()
{
mkdir -p $TARGET_ROOT/boot
@@ -327,7 +327,7 @@
# /etc/skel (60%)
gen_etc_skel()
{
- #Maybe we don't have /home/hacker directory
+ # Maybe we don't have /home/hacker directory
if [ -d $TARGET_ROOT/home/hacker ]; then
echo "XXX" && echo 60
echo -e "\nCopie des fichiers utilisateurs par défaut (/etc/skel)..."
@@ -350,7 +350,7 @@
pre_config_system()
{
cd $TARGET_ROOT
- # Restore backup of existing /home if exist.
+ # Restore backup of existing /home if exists.
# (created by prepare_target_dev)
if [ -d home.bak ]; then
echo "XXX" && echo 75
@@ -375,7 +375,7 @@
sleep 2
}
-# Determin GRUB partition number and GRUB disk number.
+# Determine GRUB partition number and GRUB disk number.
grub_config()
{
DISK_LETTER=${TARGET_DEV#/dev/[h-s]d}
@@ -390,7 +390,7 @@
fi
done
GRUB_ROOT="(hd${GRUB_DISK},${GRUB_PARTITION})"
- # Creat the target GRUB configuration.
+ # Create the target GRUB configuration.
mkdir -p $TARGET_ROOT/boot/grub
cat > $TARGET_ROOT/boot/grub/menu.lst << _EOF_
# /boot/grub/menu.lst: GRUB boot loader configuration.
@@ -586,7 +586,7 @@
retval=$?
exec 3>&-
check_retval
- # Display list and comme back.
+ # Display list and come back.
if [ "$retval" = "3" ]; then
fdisk_list
ask_for_upgrade_dev
@@ -595,7 +595,7 @@
if [ -z $UPGRADE_DEV ]; then
ask_for_upgrade_dev
fi
- # Check if specified device exist in /proc/partitions.
+ # Check if specified device exists in /proc/partitions.
DEV_NAME=${UPGRADE_DEV#/dev/}
if cat /proc/partitions | grep -q $DEV_NAME; then
echo "ask_for_target_dev: $TARGET_DEV" >>$LOG
@@ -650,8 +650,8 @@
do
case "$dir" in
boot)
- # Upgrade dont prompt for grub install, so backup and creat a
- # new grub menu.lst.
+ # Upgrade doesn't prompt for grub install, so backup and
+ # create a new grub menu.lst.
rm -rf $TARGET_ROOT/boot/vmlinuz-*
mv $TARGET_ROOT/boot/grub/menu.lst \
$TARGET_ROOT/boot/grub/menu.lst.bak 2>/dev/null
@@ -758,7 +758,7 @@
fi
done
- # Calculate the pourcent for one package and install.
+ # Calculate the percent for one package and install.
echo "XXX" && echo 50
echo -e "\nInstallation des éventuels paquets..."
echo "XXX"
@@ -777,7 +777,7 @@
echo "XXX"
# Log please.
echo "get-install: $pkg" >>$LOG
- # Get install package and anser yes in case of dependencies.
+ # Get install package and answer yes in case of dependencies.
pkgname=`grep ^$pkg /var/lib/tazpkg/packages.list`
tazpkg get $pkg >/dev/null 2>/dev/null
yes "" | tazpkg install $pkgname.tazpkg --root=$TARGET_ROOT >/dev/null 2>/dev/null
diff -r 5de884166be4 -r db0e82bebc70 lib/libmountbox
--- a/lib/libmountbox Sat Jul 19 00:02:08 2008 +0000
+++ b/lib/libmountbox Sat Jul 19 06:35:45 2008 +0000
@@ -1,7 +1,7 @@
#!/bin/sh
#
-# Libmountbox provide devices list in suitable format for GTK tree
-# and varius dialog boxes to mount, umount, etc.
+# Libmountbox provides devices list in suitable format for GTK tree
+# and various dialog boxes to mount, umount, etc.
#
# (C) 2008 - SliTaz GNU/Linux project.
#
@@ -10,7 +10,7 @@
usage()
{
echo -e "\nUsage: $0 command\n
-Outpout commads:
+Output commands:
list-mounted List all mounted devices in suitable GTK tree format.
list-umounted List all umounted in suitable GTK tree format.
@@ -19,7 +19,7 @@
umounted-fs-infos Display a umounted devices infos with actions.\n"
}
-# Format df -h output fot GTK tree.
+# Format df -h output for GTK tree.
mounted_fs_data()
{
SIZE=`echo $RES | cut -d " " -f 2`
@@ -56,7 +56,7 @@
else
BOOT="-"
fi
- # Skip swap, extended part and mounted.
+ # Skip swap, extended, and mounted partitions.
if echo $RES | grep -q "swap" || echo $RES | grep -q "Extended" ; then
continue
elif mount | grep -q "^$dev"; then
@@ -66,7 +66,7 @@
fi
done ;;
mounted-fs-infos)
- # Mounted fs infos and actions, rootfs or other fs.
+ # Mounted fs info and actions, rootfs or other fs.
#
if [ "$MOUNTED" == "/dev/root" ]; then
export MOUNTED_DEVICE="
@@ -136,7 +136,7 @@
gtkdialog --center --program=MOUNTED_DEVICE
fi ;;
umounted-fs-infos)
- # Mounted fs infos and actions, rootfs or other fs.
+ # Mounted fs info and actions, rootfs or other fs.
#
UUID=`blkid | grep ^$DEVICE | sed 's/.*UUID=\"\([^ ]*\)\".*/\1/'`
TYPE=`blkid | grep ^$DEVICE | sed 's/.*TYPE=\"\([^ ]*\)\".*/\1/'`
diff -r 5de884166be4 -r db0e82bebc70 rootcd/README
--- a/rootcd/README Sat Jul 19 00:02:08 2008 +0000
+++ b/rootcd/README Sat Jul 19 06:35:45 2008 +0000
@@ -33,9 +33,9 @@
English
-------
SliTaz is a micro GNU/Linux distro using BusyBox, a Linux kernel, and GNU
-free software. SliTaz also use goodies from the Debian project. The goal of
-SliTaz is to have a GNU/Linux distro working all in memory (RAM). SliTaz boot
-with Syslinux, provide more than 200 Linux commands, LightTPD web serveur,
+free software. SliTaz also uses goodies from the Debian project. The goal of
+SliTaz is to have a GNU/Linux distro working all in memory (RAM). SliTaz boots
+with Syslinux, provides more than 200 Linux commands, LightTPD web server,
SSH server/client powered by Dropbear, rescue tools, X system, and much more
{...}.
diff -r 5de884166be4 -r db0e82bebc70 rootcd/index.html
--- a/rootcd/index.html Sat Jul 19 00:02:08 2008 +0000
+++ b/rootcd/index.html Sat Jul 19 06:35:45 2008 +0000
@@ -35,7 +35,7 @@
Welcome on a SliTaz GNU/Linux cdrom, SliTaz is mostly documented in French,
but the full system is available in English. To boot SliTaz from a cdrom,
just burn the ISO image onto a blank disc. Then reboot your computer with
-the disc into your cdrom driver.
+the disc in your cdrom drive.