# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1307998607 -7200
# Node ID 44c43c726cdb874c3d1cfd6cae2ee3995601641e
# Parent  1d296888e4ce0f23f05cef27f617be987fd12d3e
ssfs-server gettext -e seems to mees up pot file

diff -r 1d296888e4ce -r 44c43c726cdb po/server/ssfs-server.pot
--- a/po/server/ssfs-server.pot	Mon Jun 13 22:50:44 2011 +0200
+++ b/po/server/ssfs-server.pot	Mon Jun 13 22:56:47 2011 +0200
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: Ssfs Client 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-13 22:47+0200\n"
+"POT-Creation-Date: 2011-06-13 22:56+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -143,109 +143,150 @@
 msgid "Ssfs vdisk is already mounted:"
 msgstr ""
 
-#: ssfs-server:162 ssfs-server:169 ssfs-server:176 ssfs-server:177
-#: ssfs-server:178 ssfs-server:186 ssfs-server:188 ssfs-server:217
-#: ssfs-server:219 ssfs-server:229 ssfs-server:231 ssfs-server:333
-#: ssfs-server:349 ssfs-server:352
-msgid "-e"
+#: ssfs-server:162 ssfs-server:187
+msgid "Checking:"
+msgstr ""
+
+#: ssfs-server:169
+msgid "WARNING: No config file"
 msgstr ""
 
 #: ssfs-server:173
 msgid "Users:"
 msgstr ""
 
-#: ssfs-server:199
+#: ssfs-server:176 ssfs-server:218
+msgid "Missing user login name."
+msgstr ""
+
+#: ssfs-server:177
+msgid "Missing user id."
+msgstr ""
+
+#: ssfs-server:178
+msgid "Missing user password."
+msgstr ""
+
+#: ssfs-server:189
+msgid "Exiting, user already exists:"
+msgstr ""
+
+#: ssfs-server:200
 msgid "Checking vdisk chroot:"
 msgstr ""
 
-#: ssfs-server:207
+#: ssfs-server:208
 msgid "Cleaning home and creating: Sync/..."
 msgstr ""
 
-#: ssfs-server:209
+#: ssfs-server:210
 msgid "Changing mode on user home: 0700..."
 msgstr ""
 
-#: ssfs-server:223
+#: ssfs-server:221
+msgid "Deleting user:"
+msgstr ""
+
+#: ssfs-server:225
 msgid "Removing all files in:"
 msgstr ""
 
-#: ssfs-server:225
+#: ssfs-server:227
 msgid "Removing user config:"
 msgstr ""
 
-#: ssfs-server:238
+#: ssfs-server:232
+msgid "Changing root to:"
+msgstr ""
+
+#: ssfs-server:235
+msgid "Back to the host system:"
+msgstr ""
+
+#: ssfs-server:242
 msgid "Adding note to:"
 msgstr ""
 
-#: ssfs-server:245
+#: ssfs-server:249
 msgid "A chroot already exists in:"
 msgstr ""
 
-#: ssfs-server:249
+#: ssfs-server:253
 msgid "Missing package ssfs-busybox"
 msgstr ""
 
-#: ssfs-server:253
+#: ssfs-server:257
 msgid "Creating Sshs vdisk minimal chroot"
 msgstr ""
 
-#: ssfs-server:259
+#: ssfs-server:263
 msgid "Creating virtual disk:"
 msgstr ""
 
-#: ssfs-server:262
+#: ssfs-server:266
 msgid "Creating ext3 filesystem..."
 msgstr ""
 
-#: ssfs-server:269
+#: ssfs-server:273
 msgid "Creating base files..."
 msgstr ""
 
-#: ssfs-server:285
+#: ssfs-server:289
 msgid "Installing Ssfs root filesystem..."
 msgstr ""
 
-#: ssfs-server:289
+#: ssfs-server:293
 msgid "Setting files permissions..."
 msgstr ""
 
-#: ssfs-server:297
+#: ssfs-server:301
 msgid "Installing Glibc libraries..."
 msgstr ""
 
-#: ssfs-server:304
+#: ssfs-server:308
 msgid "Installing Ssfs SHell..."
 msgstr ""
 
-#: ssfs-server:310
+#: ssfs-server:314
 msgid "Creating the list of files... "
 msgstr ""
 
-#: ssfs-server:325
+#: ssfs-server:329
 msgid "Vdisk used space:"
 msgstr ""
 
-#: ssfs-server:335
+#: ssfs-server:337
+msgid "Checking Ssfs virtual disk"
+msgstr ""
+
+#: ssfs-server:339
 msgid "Virtual disk     : "
 msgstr ""
 
-#: ssfs-server:336
+#: ssfs-server:340
 msgid "Filesystem usage : "
 msgstr ""
 
-#: ssfs-server:337
+#: ssfs-server:341
 msgid "Remounting vdisk read/only before e2fsck -p..."
 msgstr ""
 
-#: ssfs-server:340
+#: ssfs-server:344
 msgid "Remounting vdisk read/write..."
 msgstr ""
 
-#: ssfs-server:361
+#: ssfs-server:353
+msgid "No chroot found in:"
+msgstr ""
+
+#: ssfs-server:357
+msgid "Cleaning virtual disk\\n"
+msgstr ""
+
+#: ssfs-server:366
 msgid "Skipping:"
 msgstr ""
 
-#: ssfs-server:363
+#: ssfs-server:368
 msgid "Removing:"
 msgstr ""
diff -r 1d296888e4ce -r 44c43c726cdb po/ssfs/ssfs.pot
--- a/po/ssfs/ssfs.pot	Mon Jun 13 22:50:44 2011 +0200
+++ b/po/ssfs/ssfs.pot	Mon Jun 13 22:56:47 2011 +0200
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: Ssfs Client 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-13 22:47+0200\n"
+"POT-Creation-Date: 2011-06-13 22:56+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff -r 1d296888e4ce -r 44c43c726cdb ssfs-server
--- a/ssfs-server	Mon Jun 13 22:50:44 2011 +0200
+++ b/ssfs-server	Mon Jun 13 22:56:47 2011 +0200
@@ -159,33 +159,34 @@
 
 case "$1" in
 	users)
-		gettext -e "\nChecking:"; echo " /etc/passwd"
+		echo "" && gettext "Checking:"; echo " /etc/passwd"
 		fgrep "Ssfs User" /etc/passwd | while read line
 		do
 			login=$(echo $line | cut -d ":" -f 1)
 			home="$root/home/$login"
 			usage=$(du -sm $home | awk '{print $1}')
 			config=$SSFS_USERS/$login.conf
-			. $config || gettext -e "WARNING: No config file\n"
+			. $config || gettext "WARNING: No config file"
 			user_info
 		done 
 		users=$(ls $SSFS_USERS | wc -l)
 		gettext "Users:"; echo -e " $users\n" ;;
 	adduser)
 		# Add a Ssfs user to the system with $HOME in chroot.
-		[ -z "$login" ] && gettext -e "Missing user login name.\n" && exit 0
-		[ -z "$id" ] && gettext -e "Missing user id.\n" && exit 0
-		[ -z "$pass" ] && gettext -e "Missing user password.\n" && exit 0
+		[ -z "$login" ] && gettext "Missing user login name." && exit 0
+		[ -z "$id" ] && gettext "Missing user id." && exit 0
+		[ -z "$pass" ] && gettext "Missing user password." && exit 0
 		user_paths
 
 		# We need chroot command allowed for users to chroot them on SSH
 		# login. Ssfs users have /bin/ssfs-sh as SHell.
 		grep -q ^chroot /etc/busybox.conf ||
 			echo 'chroot = ssx root.root' >> /etc/busybox.conf
-		
-		gettext -e "\nChecking:"; echo " /etc/passwd"
+
+		echo ""
+		gettext "Checking:"; echo " /etc/passwd"
 		if grep ^$login: /etc/passwd; then
-			gettext -e "Exiting, user already exists:"
+			gettext "Exiting, user already exists:"
 			echo -e " $login\n" && exit 0
 		fi
 		
@@ -214,9 +215,10 @@
 		[ ! -d "$SSFS_USERS" ] && mkdir -p $SSFS_USERS
 		user_config ;;
 	deluser)
-		[ -z "$login" ] && gettext -e "Missing user login name.\n" && exit 0
+		[ -z "$login" ] && gettext "Missing user login name." && exit 0
 		user_paths
-		gettext -e "\nDeleting user:"; echo -n " $login..."
+		echo ""
+		gettext "Deleting user:"; echo -n " $login..."
 		sed -i /^$login:/d $root/etc/passwd
 		sed -i /^$login:/d $root/etc/group
 		deluser $login || status && status
@@ -226,9 +228,11 @@
 		rm -rf $config && status
 		echo "" ;;
 	chroot)
-		gettext -e "\nChanging root to:"; echo -e " $root\n"
+		echo ""
+		gettext "Changing root to:"; echo -e " $root\n"
 		chroot $root
-		gettext -e "\nBack to the host system:"
+		echo ""
+		gettext "Back to the host system:"
 		echo -e " $(hostname)\n" ;;
 	note)
 		# Admin notes for users and displayed on the web interface.
@@ -330,7 +334,7 @@
 	check-vdisk)
 		# Check vdisk with e2fsck.
 		echo ""
-		gettext -e "Checking Ssfs virtual disk\n"
+		gettext "Checking Ssfs virtual disk"; echo
 		separator
 		gettext "Virtual disk     : "; du -sh $vdisk
 		gettext "Filesystem usage : "; du -sh $root
@@ -346,10 +350,11 @@
 	clean-vdisk)
 		# clean up the vdisk storage chroot.
 		if [ ! -d "$root/bin" ] || [ ! -d "$root/lib" ]; then
-			gettext -e "No chroot found in:"; echo " $root"
+			gettext "No chroot found in:"; echo " $root"
 			exit 0
 		fi
-		gettext -e "\nCleaning virtual disk\n"
+		echo ""
+		gettext "Cleaning virtual disk\n"
 		separator
 		echo "Chroot path: $root"
 		cd $root