SliTaz Repositories

     1.1 --- a/tazpkg-convert	Wed Dec 03 19:00:15 2014 +0100
     1.2 +++ b/tazpkg-convert	Sat Dec 13 16:31:09 2014 +0200
     1.3 @@ -26,10 +26,10 @@
     1.4  show_unresolved_lib()
     1.5  {
     1.6  	if [ -s $TMP_DIR/unresolved ]; then
     1.7 -		echo -e "BUGS=\"`gettext \"No dependency for\"`" >> $1
     1.8 +		echo -e "BUGS=\"$(_n 'No dependency for:')" >> $1
     1.9  		sort < $TMP_DIR/unresolved | uniq | \
    1.10  		while read file; do
    1.11 -			_ 'WARNING: unknown dependency for $lib'
    1.12 +			_ 'WARNING: unknown dependency for %s' $lib
    1.13  			echo -n " $file" >> $1
    1.14  		done
    1.15  		echo "\"" >> $1
    1.16 @@ -84,7 +84,7 @@
    1.17  		tazpkg pack $file
    1.18  		mv $TMP_DIR/$file.tazpkg $TOP_DIR
    1.19  	else
    1.20 -		_ '$PACKAGE_FILE does not look like an upkg package!'
    1.21 +		_ 'File "%s" does not look like %s package!' $PACKAGE_FILE 'upkg'
    1.22  	fi
    1.23  	cd $TOP_DIR
    1.24  	rm -rf $TMP_DIR
    1.25 @@ -202,7 +202,7 @@
    1.26  		mv $TMP_DIR/$file.tazpkg .
    1.27  		;;
    1.28  	*)
    1.29 -		_ 'Invalid target: $target (expected i386)'
    1.30 +		_ 'Invalid target: %s (expected i386)' $target
    1.31  		;;
    1.32  	esac
    1.33  	rm -rf $TMP_DIR
    1.34 @@ -241,7 +241,7 @@
    1.35  		tazpkg pack $file
    1.36  		mv $file.tazpkg $TOP_DIR
    1.37  	else
    1.38 -		_ '$PACKAGE_FILE does not look like an Archlinux/Alpine package!'
    1.39 +		_ 'File "%s" does not look like %s package!' $PACKAGE_FILE 'Archlinux/Alpine'
    1.40  	fi
    1.41  	cd $TOP_DIR
    1.42  	rm -rf $TMP_DIR
    1.43 @@ -309,7 +309,7 @@
    1.44  {
    1.45  	[ -n "$(which unsquashfs)" ] || tazpkg get-install squashfs 
    1.46  	if ! unsquashfs -l $PACKAGE_FILE | grep -q squashfs-root/pet.specs$ ; then
    1.47 -		_ '$PACKAGE_FILE does not look like a Puppy package!'
    1.48 +		_ 'File "%s" does not look like %s package!' $PACKAGE_FILE 'Puppy'
    1.49  		return 1
    1.50  	fi
    1.51  	mkdir -p $TMP_DIR 
    1.52 @@ -344,7 +344,7 @@
    1.53  {
    1.54  	[ -n "$(which unsquashfs)" ] || tazpkg get-install squashfs 
    1.55  	if ! unsquashfs -l $PACKAGE_FILE | grep -q squashfs-root/var/log/removed_scripts ; then
    1.56 -		_ '$PACKAGE_FILE does not look like a Slax package!'
    1.57 +		_ 'File "%s" does not look like %s package!' $PACKAGE_FILE 'Slax'
    1.58  		return 1
    1.59  	fi
    1.60  	mkdir -p $TMP_DIR 
    1.61 @@ -424,7 +424,7 @@
    1.62  		tazpkg pack $file
    1.63  		mv $file.tazpkg $TOP_DIR
    1.64  	else
    1.65 -		_ '$PACKAGE_FILE does not look like a Slackware package!'
    1.66 +		_ 'File "%s" does not look like %s package!' $PACKAGE_FILE 'Slackware'
    1.67  	fi
    1.68  	cd $TOP_DIR
    1.69  	rm -rf $TMP_DIR
    1.70 @@ -479,7 +479,7 @@
    1.71  		mv $file.tazpkg $TOP_DIR
    1.72  		;;
    1.73  	*)
    1.74 -		_ 'Invalid target: $target (expected i386)'
    1.75 +		_ 'Invalid target: %s (expected i386)' $target
    1.76  		;;
    1.77  	esac
    1.78  	cd $TOP_DIR
    1.79 @@ -530,8 +530,8 @@
    1.80  	# rpm2cpio can't extract some new RPMs
    1.81  	if [ $? == 1 ]; then
    1.82  		if [ ! -e $INSTALLED/p7zip-full/receipt ]; then
    1.83 -			boldify $(_ 'Unable to extract the RPM using standard tools (rpm2cpio).')
    1.84 -			_n "Do you want to install 'p7zip-full' package"; confirm
    1.85 +			boldify "$(_ 'Unable to extract the RPM using standard tools (rpm2cpio).')"
    1.86 +			confirm "$(_n 'Do you want to install "%s" package? (y/N)' 'p7zip-full')"
    1.87  			if [ $? = 0 ]; then
    1.88  				tazpkg -gi p7zip-full
    1.89  			else
    1.90 @@ -570,7 +570,7 @@
    1.91  	HOST_ARCH="$(xbpstag architecture)"
    1.92  	case "$HOST_ARCH" in
    1.93  	i686)	HOST_ARCH="i486" ;;
    1.94 -	*)	echo "Arch $HOST_ARCH not supported."
    1.95 +	*)	_ 'Arch "%s" not supported.' $HOST_ARCH
    1.96  		HOST_ARCH=
    1.97  	esac
    1.98