ssfs rev 76
ssfs-server gettext -e seems to mees up pot file
| author | Christophe Lincoln <pankso@slitaz.org> |
|---|---|
| date | Mon Jun 13 22:56:47 2011 +0200 (2011-06-13) |
| parents | 1d296888e4ce |
| children | 80448ddb1333 |
| files | po/server/ssfs-server.pot po/ssfs/ssfs.pot ssfs-server |
line diff
1.1 --- a/po/server/ssfs-server.pot Mon Jun 13 22:50:44 2011 +0200 1.2 +++ b/po/server/ssfs-server.pot Mon Jun 13 22:56:47 2011 +0200 1.3 @@ -8,7 +8,7 @@ 1.4 msgstr "" 1.5 "Project-Id-Version: Ssfs Client 1.0\n" 1.6 "Report-Msgid-Bugs-To: \n" 1.7 -"POT-Creation-Date: 2011-06-13 22:47+0200\n" 1.8 +"POT-Creation-Date: 2011-06-13 22:56+0200\n" 1.9 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 1.10 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 1.11 "Language-Team: LANGUAGE <LL@li.org>\n" 1.12 @@ -143,109 +143,150 @@ 1.13 msgid "Ssfs vdisk is already mounted:" 1.14 msgstr "" 1.15 1.16 -#: ssfs-server:162 ssfs-server:169 ssfs-server:176 ssfs-server:177 1.17 -#: ssfs-server:178 ssfs-server:186 ssfs-server:188 ssfs-server:217 1.18 -#: ssfs-server:219 ssfs-server:229 ssfs-server:231 ssfs-server:333 1.19 -#: ssfs-server:349 ssfs-server:352 1.20 -msgid "-e" 1.21 +#: ssfs-server:162 ssfs-server:187 1.22 +msgid "Checking:" 1.23 +msgstr "" 1.24 + 1.25 +#: ssfs-server:169 1.26 +msgid "WARNING: No config file" 1.27 msgstr "" 1.28 1.29 #: ssfs-server:173 1.30 msgid "Users:" 1.31 msgstr "" 1.32 1.33 -#: ssfs-server:199 1.34 +#: ssfs-server:176 ssfs-server:218 1.35 +msgid "Missing user login name." 1.36 +msgstr "" 1.37 + 1.38 +#: ssfs-server:177 1.39 +msgid "Missing user id." 1.40 +msgstr "" 1.41 + 1.42 +#: ssfs-server:178 1.43 +msgid "Missing user password." 1.44 +msgstr "" 1.45 + 1.46 +#: ssfs-server:189 1.47 +msgid "Exiting, user already exists:" 1.48 +msgstr "" 1.49 + 1.50 +#: ssfs-server:200 1.51 msgid "Checking vdisk chroot:" 1.52 msgstr "" 1.53 1.54 -#: ssfs-server:207 1.55 +#: ssfs-server:208 1.56 msgid "Cleaning home and creating: Sync/..." 1.57 msgstr "" 1.58 1.59 -#: ssfs-server:209 1.60 +#: ssfs-server:210 1.61 msgid "Changing mode on user home: 0700..." 1.62 msgstr "" 1.63 1.64 -#: ssfs-server:223 1.65 +#: ssfs-server:221 1.66 +msgid "Deleting user:" 1.67 +msgstr "" 1.68 + 1.69 +#: ssfs-server:225 1.70 msgid "Removing all files in:" 1.71 msgstr "" 1.72 1.73 -#: ssfs-server:225 1.74 +#: ssfs-server:227 1.75 msgid "Removing user config:" 1.76 msgstr "" 1.77 1.78 -#: ssfs-server:238 1.79 +#: ssfs-server:232 1.80 +msgid "Changing root to:" 1.81 +msgstr "" 1.82 + 1.83 +#: ssfs-server:235 1.84 +msgid "Back to the host system:" 1.85 +msgstr "" 1.86 + 1.87 +#: ssfs-server:242 1.88 msgid "Adding note to:" 1.89 msgstr "" 1.90 1.91 -#: ssfs-server:245 1.92 +#: ssfs-server:249 1.93 msgid "A chroot already exists in:" 1.94 msgstr "" 1.95 1.96 -#: ssfs-server:249 1.97 +#: ssfs-server:253 1.98 msgid "Missing package ssfs-busybox" 1.99 msgstr "" 1.100 1.101 -#: ssfs-server:253 1.102 +#: ssfs-server:257 1.103 msgid "Creating Sshs vdisk minimal chroot" 1.104 msgstr "" 1.105 1.106 -#: ssfs-server:259 1.107 +#: ssfs-server:263 1.108 msgid "Creating virtual disk:" 1.109 msgstr "" 1.110 1.111 -#: ssfs-server:262 1.112 +#: ssfs-server:266 1.113 msgid "Creating ext3 filesystem..." 1.114 msgstr "" 1.115 1.116 -#: ssfs-server:269 1.117 +#: ssfs-server:273 1.118 msgid "Creating base files..." 1.119 msgstr "" 1.120 1.121 -#: ssfs-server:285 1.122 +#: ssfs-server:289 1.123 msgid "Installing Ssfs root filesystem..." 1.124 msgstr "" 1.125 1.126 -#: ssfs-server:289 1.127 +#: ssfs-server:293 1.128 msgid "Setting files permissions..." 1.129 msgstr "" 1.130 1.131 -#: ssfs-server:297 1.132 +#: ssfs-server:301 1.133 msgid "Installing Glibc libraries..." 1.134 msgstr "" 1.135 1.136 -#: ssfs-server:304 1.137 +#: ssfs-server:308 1.138 msgid "Installing Ssfs SHell..." 1.139 msgstr "" 1.140 1.141 -#: ssfs-server:310 1.142 +#: ssfs-server:314 1.143 msgid "Creating the list of files... " 1.144 msgstr "" 1.145 1.146 -#: ssfs-server:325 1.147 +#: ssfs-server:329 1.148 msgid "Vdisk used space:" 1.149 msgstr "" 1.150 1.151 -#: ssfs-server:335 1.152 +#: ssfs-server:337 1.153 +msgid "Checking Ssfs virtual disk" 1.154 +msgstr "" 1.155 + 1.156 +#: ssfs-server:339 1.157 msgid "Virtual disk : " 1.158 msgstr "" 1.159 1.160 -#: ssfs-server:336 1.161 +#: ssfs-server:340 1.162 msgid "Filesystem usage : " 1.163 msgstr "" 1.164 1.165 -#: ssfs-server:337 1.166 +#: ssfs-server:341 1.167 msgid "Remounting vdisk read/only before e2fsck -p..." 1.168 msgstr "" 1.169 1.170 -#: ssfs-server:340 1.171 +#: ssfs-server:344 1.172 msgid "Remounting vdisk read/write..." 1.173 msgstr "" 1.174 1.175 -#: ssfs-server:361 1.176 +#: ssfs-server:353 1.177 +msgid "No chroot found in:" 1.178 +msgstr "" 1.179 + 1.180 +#: ssfs-server:357 1.181 +msgid "Cleaning virtual disk\\n" 1.182 +msgstr "" 1.183 + 1.184 +#: ssfs-server:366 1.185 msgid "Skipping:" 1.186 msgstr "" 1.187 1.188 -#: ssfs-server:363 1.189 +#: ssfs-server:368 1.190 msgid "Removing:" 1.191 msgstr ""
2.1 --- a/po/ssfs/ssfs.pot Mon Jun 13 22:50:44 2011 +0200 2.2 +++ b/po/ssfs/ssfs.pot Mon Jun 13 22:56:47 2011 +0200 2.3 @@ -8,7 +8,7 @@ 2.4 msgstr "" 2.5 "Project-Id-Version: Ssfs Client 1.0\n" 2.6 "Report-Msgid-Bugs-To: \n" 2.7 -"POT-Creation-Date: 2011-06-13 22:47+0200\n" 2.8 +"POT-Creation-Date: 2011-06-13 22:56+0200\n" 2.9 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 2.10 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 2.11 "Language-Team: LANGUAGE <LL@li.org>\n"
3.1 --- a/ssfs-server Mon Jun 13 22:50:44 2011 +0200 3.2 +++ b/ssfs-server Mon Jun 13 22:56:47 2011 +0200 3.3 @@ -159,33 +159,34 @@ 3.4 3.5 case "$1" in 3.6 users) 3.7 - gettext -e "\nChecking:"; echo " /etc/passwd" 3.8 + echo "" && gettext "Checking:"; echo " /etc/passwd" 3.9 fgrep "Ssfs User" /etc/passwd | while read line 3.10 do 3.11 login=$(echo $line | cut -d ":" -f 1) 3.12 home="$root/home/$login" 3.13 usage=$(du -sm $home | awk '{print $1}') 3.14 config=$SSFS_USERS/$login.conf 3.15 - . $config || gettext -e "WARNING: No config file\n" 3.16 + . $config || gettext "WARNING: No config file" 3.17 user_info 3.18 done 3.19 users=$(ls $SSFS_USERS | wc -l) 3.20 gettext "Users:"; echo -e " $users\n" ;; 3.21 adduser) 3.22 # Add a Ssfs user to the system with $HOME in chroot. 3.23 - [ -z "$login" ] && gettext -e "Missing user login name.\n" && exit 0 3.24 - [ -z "$id" ] && gettext -e "Missing user id.\n" && exit 0 3.25 - [ -z "$pass" ] && gettext -e "Missing user password.\n" && exit 0 3.26 + [ -z "$login" ] && gettext "Missing user login name." && exit 0 3.27 + [ -z "$id" ] && gettext "Missing user id." && exit 0 3.28 + [ -z "$pass" ] && gettext "Missing user password." && exit 0 3.29 user_paths 3.30 3.31 # We need chroot command allowed for users to chroot them on SSH 3.32 # login. Ssfs users have /bin/ssfs-sh as SHell. 3.33 grep -q ^chroot /etc/busybox.conf || 3.34 echo 'chroot = ssx root.root' >> /etc/busybox.conf 3.35 - 3.36 - gettext -e "\nChecking:"; echo " /etc/passwd" 3.37 + 3.38 + echo "" 3.39 + gettext "Checking:"; echo " /etc/passwd" 3.40 if grep ^$login: /etc/passwd; then 3.41 - gettext -e "Exiting, user already exists:" 3.42 + gettext "Exiting, user already exists:" 3.43 echo -e " $login\n" && exit 0 3.44 fi 3.45 3.46 @@ -214,9 +215,10 @@ 3.47 [ ! -d "$SSFS_USERS" ] && mkdir -p $SSFS_USERS 3.48 user_config ;; 3.49 deluser) 3.50 - [ -z "$login" ] && gettext -e "Missing user login name.\n" && exit 0 3.51 + [ -z "$login" ] && gettext "Missing user login name." && exit 0 3.52 user_paths 3.53 - gettext -e "\nDeleting user:"; echo -n " $login..." 3.54 + echo "" 3.55 + gettext "Deleting user:"; echo -n " $login..." 3.56 sed -i /^$login:/d $root/etc/passwd 3.57 sed -i /^$login:/d $root/etc/group 3.58 deluser $login || status && status 3.59 @@ -226,9 +228,11 @@ 3.60 rm -rf $config && status 3.61 echo "" ;; 3.62 chroot) 3.63 - gettext -e "\nChanging root to:"; echo -e " $root\n" 3.64 + echo "" 3.65 + gettext "Changing root to:"; echo -e " $root\n" 3.66 chroot $root 3.67 - gettext -e "\nBack to the host system:" 3.68 + echo "" 3.69 + gettext "Back to the host system:" 3.70 echo -e " $(hostname)\n" ;; 3.71 note) 3.72 # Admin notes for users and displayed on the web interface. 3.73 @@ -330,7 +334,7 @@ 3.74 check-vdisk) 3.75 # Check vdisk with e2fsck. 3.76 echo "" 3.77 - gettext -e "Checking Ssfs virtual disk\n" 3.78 + gettext "Checking Ssfs virtual disk"; echo 3.79 separator 3.80 gettext "Virtual disk : "; du -sh $vdisk 3.81 gettext "Filesystem usage : "; du -sh $root 3.82 @@ -346,10 +350,11 @@ 3.83 clean-vdisk) 3.84 # clean up the vdisk storage chroot. 3.85 if [ ! -d "$root/bin" ] || [ ! -d "$root/lib" ]; then 3.86 - gettext -e "No chroot found in:"; echo " $root" 3.87 + gettext "No chroot found in:"; echo " $root" 3.88 exit 0 3.89 fi 3.90 - gettext -e "\nCleaning virtual disk\n" 3.91 + echo "" 3.92 + gettext "Cleaning virtual disk\n" 3.93 separator 3.94 echo "Chroot path: $root" 3.95 cd $root