# 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.

Have fun!
diff -r 5de884166be4 -r db0e82bebc70 rootfs/etc/firewall.conf --- a/rootfs/etc/firewall.conf Sat Jul 19 00:02:08 2008 +0000 +++ b/rootfs/etc/firewall.conf Sat Jul 19 06:35:45 2008 +0000 @@ -18,10 +18,10 @@ iptables_rules() { -# Drop all input connexions. +# Drop all input connections. iptables -P INPUT DROP -# Accept all output connexions +# Accept all output connections. iptables -P OUTPUT ACCEPT # Accept input on localhost (127.0.0.1). diff -r 5de884166be4 -r db0e82bebc70 rootfs/etc/init.d/crond --- a/rootfs/etc/init.d/crond Sat Jul 19 00:02:08 2008 +0000 +++ b/rootfs/etc/init.d/crond Sat Jul 19 06:35:45 2008 +0000 @@ -1,5 +1,5 @@ #!/bin/sh -# /etc/init.d/crond: Start, stop and restart cron deamon on SliTaz, at boot +# /etc/init.d/crond: Start, stop and restart cron daemon on SliTaz, at boot # time or with the command line. # # To start daemon at boot time, just put the right name in the $RUN_DAEMONS diff -r 5de884166be4 -r db0e82bebc70 rootfs/etc/init.d/firewall --- a/rootfs/etc/init.d/firewall Sat Jul 19 00:02:08 2008 +0000 +++ b/rootfs/etc/init.d/firewall Sat Jul 19 06:35:45 2008 +0000 @@ -1,5 +1,5 @@ #!/bin/sh -# /etc/init.d/firewall - SliTaz firewall demon script using iptables. +# /etc/init.d/firewall - SliTaz firewall daemon script using iptables. # Config file is: /etc/firewall.conf # . /etc/init.d/rc.functions diff -r 5de884166be4 -r db0e82bebc70 rootfs/usr/share/applications/netbox.desktop --- a/rootfs/usr/share/applications/netbox.desktop Sat Jul 19 00:02:08 2008 +0000 +++ b/rootfs/usr/share/applications/netbox.desktop Sat Jul 19 06:35:45 2008 +0000 @@ -2,7 +2,7 @@ Encoding=UTF-8 Name=Netbox Configure networking Name[fr]=Netbox Configurer le réseau -Comment=Configure network interface anf host values +Comment=Configure network interface and host values Exec=subox netbox Icon=netbox.png Type=Application diff -r 5de884166be4 -r db0e82bebc70 rootfs/usr/share/examples/README --- a/rootfs/usr/share/examples/README Sat Jul 19 00:02:08 2008 +0000 +++ b/rootfs/usr/share/examples/README Sat Jul 19 06:35:45 2008 +0000 @@ -1,7 +1,7 @@ README - /usr/share/examples =============================================================================== -Like documentation, SliTaz provide some examples to help, learn how to use +Like documentation, SliTaz provides some examples to help learn how to use applications, configure the system or code you own programms. Local alias URL : http://localhost/examples/ diff -r 5de884166be4 -r db0e82bebc70 rootfs/usr/share/examples/etc/fstab --- a/rootfs/usr/share/examples/etc/fstab Sat Jul 19 00:02:08 2008 +0000 +++ b/rootfs/usr/share/examples/etc/fstab Sat Jul 19 06:35:45 2008 +0000 @@ -1,4 +1,4 @@ -# /etc/fstab: informations on static file system. +# /etc/fstab: information about static file systems. # proc /proc proc defaults 0 0 sysfs /sys sysfs defaults 0 0 diff -r 5de884166be4 -r db0e82bebc70 tinyutils/burnbox --- a/tinyutils/burnbox Sat Jul 19 00:02:08 2008 +0000 +++ b/tinyutils/burnbox Sat Jul 19 06:35:45 2008 +0000 @@ -27,7 +27,7 @@ ' -# We need at least devive, speed and ISO image path. +# We need at least device, speed and ISO image path. # export MOUNT_DIALOG=' diff -r 5de884166be4 -r db0e82bebc70 tinyutils/desktopbox --- a/tinyutils/desktopbox Sat Jul 19 00:02:08 2008 +0000 +++ b/tinyutils/desktopbox Sat Jul 19 06:35:45 2008 +0000 @@ -1,25 +1,25 @@ #! /bin/sh # -# Multi-call script provinding GTK boxes to manage a desktop following -# Freedesktop standars. +# Multi-call script providing GTK boxes to manage a desktop following +# Freedesktop standards. # # (C) GNU gpl v3 - SliTaz GNU/Linux 2008. # -VERSION=20080512 +VERSION=20080719 # Glade XML file path. GLADE_XML=/usr/share/slitaz-tools/glade -# Standards directories. +# Standard directories. mkdir -p $HOME/Desktop $HOME/.local/share/applications # Get the active locale (default to English). case $LANG in es*) lang="es" - NEW_FOLDER_LABEL="Creat a new folder on the desktop:" + NEW_FOLDER_LABEL="Create a new folder on the desktop:" FOLDER_ENTRY_MSG="dirname" - NEW_FILE_LABEL="Creat a new file on the desktop:" + NEW_FILE_LABEL="Create a new file on the desktop:" FILE_ENTRY_MSG="filename" ADD_ICON_LABEL="Add some desktop icons" DESKTOP_DIALOG_LABEL="Session logout, system shutdown or reboot" ;; @@ -33,9 +33,9 @@ DESKTOP_DIALOG_LABEL="Déconnexion, arrêt ou redémarrage du système" ;; *) lang="" - NEW_FOLDER_LABEL="Creat a new folder on the desktop:" + NEW_FOLDER_LABEL="Create a new folder on the desktop:" FOLDER_ENTRY_MSG="dirname" - NEW_FILE_LABEL="Creat a new file on the desktop:" + NEW_FILE_LABEL="Create a new file on the desktop:" FILE_ENTRY_MSG="filename" ADD_ICON_LABEL="Add some desktop icons" DESKTOP_DIALOG_LABEL="Session logout, system shutdown or reboot" ;; @@ -47,17 +47,17 @@ echo -e "\nSliTaz Freedesktop Box - Version: $VERSION\n \033[1mUsage: \033[0m `basename $0` command \033[1mCommands: \033[0m\n - new-folder Creat a new folder on the desktop with mkdir. - new-file Creat a new empty file or SHell script on the desktop. + new-folder Create a new folder on the desktop with mkdir. + new-file Create a new empty file or SHell script on the desktop. add-icons Add a system icon on the desktop. - calendar Display a calendard under mouse pointer. + calendar Display a calendar under mouse pointer. logout Prompt for X session exit or system halt/reboot.\n" } # Box commands. case $1 in new-folder) - # Creat a directory on the ~/desktop. + # Create a directory on the ~/Desktop. # DESKTOP_DIALOG=" @@ -92,7 +92,7 @@ ' export DESKTOP_DIALOG="${DESKTOP_DIALOG}${ACTIONS}" ;; new-file) - # Creat a file on the ~/desktop. + # Create a file on the ~/Desktop. # DESKTOP_DIALOG=" @@ -133,7 +133,7 @@ ' export DESKTOP_DIALOG="${DESKTOP_DIALOG}${ACTIONS}" ;; add-icons) - # Add a new icons on the ~/desktop from /usr/share/applications. + # Add new icons on the ~/Desktop from /usr/share/applications. # DESKTOP_DIALOG=" @@ -231,7 +231,7 @@ ' export DESKTOP_DIALOG=${DESKTOP_DIALOG}${ACTIONS} ;; *) - # Usage if executet from cmdline. + # Usage if executed from cmdline. # usage exit 0 ;; diff -r 5de884166be4 -r db0e82bebc70 tinyutils/gztazmod.sh --- a/tinyutils/gztazmod.sh Sat Jul 19 00:02:08 2008 +0000 +++ b/tinyutils/gztazmod.sh Sat Jul 19 06:35:45 2008 +0000 @@ -53,8 +53,8 @@ rm modules.dep status -# Remove tmp.dep to modules.dep. -echo -n "Removing tmp.dep to modules.dep... " +# Move tmp.dep to modules.dep. +echo -n "Moving tmp.dep to modules.dep... " mv tmp.dep modules.dep status diff -r 5de884166be4 -r db0e82bebc70 tinyutils/mktazdevs.sh --- a/tinyutils/mktazdevs.sh Sat Jul 19 00:02:08 2008 +0000 +++ b/tinyutils/mktazdevs.sh Sat Jul 19 06:35:45 2008 +0000 @@ -27,7 +27,7 @@ cd $1 status -# mMake usfull directories. +# Make useful directories. echo -n "Starting to build directories... " mkdir pts input net usb shm status @@ -99,7 +99,7 @@ mknod usb/hiddev6 c 180 102 # IDE HD devs. -# With a fiew concievable partitions, you can do +# With a few conceivable partitions, you can do # more of them yourself as you need 'em. # @@ -208,7 +208,7 @@ ln -snf /proc/self/fd/1 stdout ln -snf /proc/self/fd/2 stderr -# Changes permissions. +# Change permissions. # echo -n "Changing permissions on devices... " chmod 0666 ptmx diff -r 5de884166be4 -r db0e82bebc70 tinyutils/mountbox --- a/tinyutils/mountbox Sat Jul 19 00:02:08 2008 +0000 +++ b/tinyutils/mountbox Sat Jul 19 06:35:45 2008 +0000 @@ -5,7 +5,7 @@ # # (C) 2008 - SliTaz GNU/Linux project. # -VERSION=20080510 +VERSION=20080719 # Mountbox is only for root. if test $(id -u) != 0 ; then @@ -30,7 +30,7 @@ @@ -112,7 +112,7 @@ MAIN_DIALOG=${MAIN_DIALOG}${MOUNT_POINTS_ITEMS} done -# Actions buttons (moun, umount, eject, etc). +# Actions buttons (mount, umount, eject, etc). ACTIONS='