flavors-stable rev 162

Tiny edits
author Paul Issott <paul@slitaz.org>
date Fri Mar 23 21:42:52 2012 +0000 (2012-03-23)
parents bf3afcc6c794
children 7759794c5a07
files dolibarr/distro.sh proxy/distro.sh proxy/rootfs/usr/bin/tazctl
line diff
     1.1 --- a/dolibarr/distro.sh	Thu Mar 22 12:11:23 2012 +0100
     1.2 +++ b/dolibarr/distro.sh	Fri Mar 23 21:42:52 2012 +0000
     1.3 @@ -1,5 +1,5 @@
     1.4  #!/bin/sh
     1.5 -# distro.sh, changet set for slitaz-dolibarr
     1.6 +# distro.sh, changeset for slitaz-dolibarr
     1.7  #
     1.8  # Eric Joseph-Alexandre <erjo@slitaz.org>
     1.9  
    1.10 @@ -95,9 +95,9 @@
    1.11  sed -i 's/tazweb/midori/' $ROOTFS/etc/lxpanel/original/panels/panel 
    1.12  
    1.13  #~ 
    1.14 -# fix perms (don(t know why)
    1.15 +# fix perms (don't know why)
    1.16  chmod 755 $ROOTFS/etc/mysql.d/*
    1.17  
    1.18 -# Add shorcut on the Desktop
    1.19 +# Add shortcut on the Desktop
    1.20  cp $ROOTFS/usr/share/applications/dolibarr.desktop $ROOTFS/etc/skel/Desktop
    1.21  #cp $ROOTFS/usr/share/applications/phpmyadmin.desktop $ROOTFS/etc/skel/Desktop
     2.1 --- a/proxy/distro.sh	Thu Mar 22 12:11:23 2012 +0100
     2.2 +++ b/proxy/distro.sh	Fri Mar 23 21:42:52 2012 +0000
     2.3 @@ -1,5 +1,5 @@
     2.4  #!/bin/sh
     2.5 -# distro.sh, changet set for slitaz-dolibarr
     2.6 +# distro.sh, changeset for slitaz-dolibarr
     2.7  #
     2.8  # Eric Joseph-Alexandre <erjo@slitaz.org>
     2.9  
    2.10 @@ -89,5 +89,5 @@
    2.11  sed -i 's/tazweb/midori/' $ROOTFS/etc/lxpanel/default/panels/panel  
    2.12  sed -i 's/tazweb/midori/' $ROOTFS/etc/lxpanel/original/panels/panel 
    2.13  
    2.14 -# Add shorcut on the Desktop
    2.15 +# Add shortcut on the Desktop
    2.16  #cp $ROOTFS/usr/share/applications/dolibarr.desktop $ROOTFS/etc/skel/Desktop
     3.1 --- a/proxy/rootfs/usr/bin/tazctl	Thu Mar 22 12:11:23 2012 +0100
     3.2 +++ b/proxy/rootfs/usr/bin/tazctl	Fri Mar 23 21:42:52 2012 +0000
     3.3 @@ -95,7 +95,7 @@
     3.4       	 --backtitle "$backtitle" --extra-button --extra-label "${BTN_DHCP:-Use DHCP server}"\
     3.5        	--form "Here is a possible piece of a configuration program." \
     3.6  		15 55 0 \
     3.7 -    	"IP Adress:" 1 1 "$IP" 1 20 20 0 \
     3.8 +    	"IP Address:" 1 1 "$IP" 1 20 20 0 \
     3.9      	"Network mask:"      2 1 "$NETMASK"  2 20  20 0 \
    3.10      	"Default gateway:"      3 1 "$GATEWAY"  3 20  20 0 \
    3.11      	"DNS server(s):"     4 1 "$DNS_SERVER" 4 20 20 0 \
    3.12 @@ -139,10 +139,10 @@
    3.13   	until [ $ret -eq 1 ];do
    3.14      	$DIALOG --title "$MENU_TITLE" \
    3.15          	--backtitle "$BACKTITLE" --clear \
    3.16 -        	--cancel-label "Quitter" \
    3.17 +        	--cancel-label "Quit" \
    3.18          	--colors \
    3.19          	--menu "$TAZ_CMD_MSG" 15 50 40\
    3.20 -        	"adress"  	"  Network settings" \
    3.21 +        	"address"  	"  Network settings" \
    3.22          	"hostname"  	"  Set your hostname" \
    3.23          	2> $OUT
    3.24      	ret=$?
    3.25 @@ -163,8 +163,8 @@
    3.26  	PASSWORD=`$DIALOG --backtitle "$BACKTITLE" --title "Set password" --clear \
    3.27   		--separate-widget "$SEP" \
    3.28   		--insecure --passwordbox "Enter new password for user below: \n\n" 10 50 \
    3.29 -		--title "Confirme password" \
    3.30 -        --insecure --passwordbox "Confirme new password for user below: \n\n"	10 50 2>&1 1>&3`
    3.31 +		--title "Confirm password" \
    3.32 +        --insecure --passwordbox "Confirm new password for user below: \n\n"	10 50 2>&1 1>&3`
    3.33  	ret=$?
    3.34  	exec 3>&-
    3.35  	if [ -z "${PASSWORD}" ]; then
    3.36 @@ -173,7 +173,7 @@
    3.37  		PASS1="$(echo $PASSWORD | cut -d ' ' -f1)"
    3.38  		PASS2="$(echo $PASSWORD | cut -d ' ' -f2)"
    3.39  		if [ "$PASS1" != "$PASS2" ]; then
    3.40 -			msg "Passwords don't match.\nNothing change."
    3.41 +			msg "Passwords don't match.\nNothing changed."
    3.42  		else
    3.43  			echo  "root:$PASS1" | chpasswd
    3.44  		fi
    3.45 @@ -189,12 +189,12 @@
    3.46  until [ $retval -eq 1 ];do
    3.47  	$DIALOG --title "$MENU_TITLE" \
    3.48  		--backtitle "$BACKTITLE" --clear \
    3.49 -		--cancel-label "Quitter" \
    3.50 +		--cancel-label "Quit" \
    3.51  		--colors \
    3.52  		--menu "$TAZ_CMD_MSG" 15 50 40\
    3.53  		"keymap"  		"  Keyboard mapping" \
    3.54  		"locale"      	"  Language setting" \
    3.55 -		"network"   	"  Netwok configuration" \
    3.56 +		"network"   	"  Network configuration" \
    3.57  		"password" 		"  Change root password" \
    3.58  		2> $OUT
    3.59