From a4ef3dc7b00f1d9975b4f795ec425d2679785208 Mon Sep 17 00:00:00 2001
From: Filippo Bedendo Bordon <michiamophil@gmail.com>
Date: Tue, 21 Feb 2012 00:17:51 +0100
Subject: [PATCH] Completed italian translation

---
 po/it.po          | 94 +++++++++++++++++++++++++++++++++++++++++++++++
 src/usbinstall.py |  4 +-
 src/usbinstall.sh | 76 ++++++++++++++++++++------------------
 3 files changed, 136 insertions(+), 38 deletions(-)

diff --git a/po/it.po b/po/it.po
index 85a2174..9fe82b5 100644
--- a/po/it.po
+++ b/po/it.po
@@ -4,6 +4,7 @@ msgstr ""
 "Language: it\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 
+# (usbinstall.py)
 
 msgid "A file .cpio is required"
 msgstr "E' necessario scegliere un file per il boot"
@@ -97,3 +98,96 @@ msgstr "L'installazione è stata annullata"
 
 msgid "Are you sure to abort?"
 msgstr "Sei sicuro di voler annullare l'installazione?"
+
+msgid "Script Error"
+msgstr "Errore dallo script"
+
+# (usbinstall.sh)
+msgid "usbinstall: install openmamba into your usb key!"
+msgstr "Usbinstall: Scrivi openmamba su una chiavetta usb!"
+
+msgid "Usage: sudo usbinstall Arg1 Arg2 Arg3 [-y]"
+msgstr "Uso: sudo usbinstall Arg1 Arg2 Arg3 [-y]"
+
+msgid "Arg 1: Usb device path (e.g. /dev/sdc)"
+msgstr "Arg 1: Percorso della chiavetta usb (es. /dev/sdc)"
+
+msgid "Arg 3: Iso file (e.g. ~/openmamba-livecd-it-milestone2-2.0pre8.i586.iso)"
+msgstr "Arg 3: File Iso (es. ~/openmamba-livecd-it-milestone2-2.0pre8.i586.iso)"
+
+msgid "Arg 2: Cpio.gz file (e.g. ~/openmamba-bootusb-it-milestone2-2.0pre8.i586.cpio.gz)"
+msgstr "Arg 2: File Cpio.gz (es. ~/openmamba-bootusb-it-milestone2-2.0pre8.i586.cpio.gz)"
+		
+msgid "-y: install without asking confirmation [Be careful!]"
+msgstr "-y: Installa senza chiedere conferma [Attenzione!]"
+
+msgid "Error: usbinstall must be run as root"
+msgstr "Errore: Usbinstall deve essere avviato con i permessi di root"
+
+msgid "Warning: you haven't choosen a removable device ($1). Are you sure to continue? [yes/no]"
+msgstr "Attenzione: Non hai scelto un dispositivo rimovibile ($1). Vuoi continuare? [si/no]"
+
+msgid "Warning: You are going to format this device ($1). Are you sure to continue? [yes/no]"
+msgstr "Attenzione: Stai per formattare questo dispositivo ($1). Vuoi continuare? [si/no]"
+
+msgid "yes"
+msgstr "si"
+
+msgid "Error(Arg 1): \"$1\" isn't a block device"
+msgstr "Errore(Arg 1): \"$1\" non è un dispositivo a blocchi"
+
+msgid "Error(Arg 2): \"$2\" is not readable"
+msgstr "Errore(Arg 2): \"$2\" non è leggibile"
+
+msgid "Error(Arg 2): \"$2\" isn't a regular file"
+msgstr "Errore(Arg 2): \"$2\" non è un file regolare"
+
+msgid "Error(Arg 2): you must chose a cpio.gz file"
+msgstr "Errore(Arg 2): devi scegliere un file cpio.gz"
+
+msgid "Error(Arg 3): \"$3\" is not readable"
+msgstr "Errore(Arg 3): \"$3\" non è leggibile"
+
+msgid "Error(Arg 3): \"$3\" isn't a regular file"
+msgstr "Errore(Arg 3): \"$3\" non è un file regolare"
+
+msgid "Error(Arg 3): you must chose a iso file"
+msgstr "Errore(Arg 3): devi scegliere un file iso"
+
+msgid "Unmount usb device"
+msgstr "Smonto la chiavetta"
+
+msgid "Partitioning $SELECT_USB..."
+msgstr "Partizionamento della chiavetta ($SELECT_USB) in corso..."
+
+msgid "Formatting $SELECT_USB..."
+msgstr "Formattazione della chiavetta ($SELECT_USB) in corso..."
+
+msgid "Extracting bootusb archive..."
+msgstr "Estrazione dei file di boot in corso..."
+
+msgid "Writing bootloader..."
+msgstr "Scrittura del bootloader in corso..."
+
+msgid "Copying ISO..."
+msgstr "Copia del file iso di openmamba in corso..."
+
+msgid "Error:" 
+msgstr "Errore:"
+
+msgid "exit with error (see $LOGFILE)"
+msgstr "è terminato con un errore (vedi $LOGFILE)"
+
+
+msgid "Error: fail to umount the usb key (${SELECT_USB}1)"
+msgstr "Errore: impossibile smontare la chiavetta usb (${SELECT_USB}1)"
+
+msgid "Error: unable to found usb mount path"
+msgstr "Errore: impossibile trovare il punto di montaggio dell'usb"
+
+msgid "Error: Invalid bootusb archive" 
+msgstr "Errore: Archivio bootusb non valido"
+
+msgid "Done!"
+msgstr "Fatto!"
+
diff --git a/src/usbinstall.py b/src/usbinstall.py
index ccc64af..70f7f93 100755
--- a/src/usbinstall.py
+++ b/src/usbinstall.py
@@ -63,7 +63,7 @@ class create_window(QtGui.QDialog):
 		self.i_back.setGeometry(QtCore.QRect(10, 10, 480, 300))
 		# Description label
 		self.l_descr = QtGui.QLabel(self)
-		self.l_descr.setGeometry(QtCore.QRect(10, 317, 251, 31))
+		self.l_descr.setGeometry(QtCore.QRect(10, 317, 351, 31))
 		# Orizontal line
 		self.line = QtGui.QFrame(self)
 		self.line.setGeometry(QtCore.QRect(10, 350, 481, 20))
@@ -415,7 +415,7 @@ def end_with_success():
 def end_forced():
 	global process_sh, mainloop
 	mainloop.quit()
-	print _("Installation aborted")
+	#print _("Installation aborted")
 	app.exit(1)
 	
 
diff --git a/src/usbinstall.sh b/src/usbinstall.sh
index 05e635c..f76e4a0 100755
--- a/src/usbinstall.sh
+++ b/src/usbinstall.sh
@@ -23,7 +23,8 @@
 # 08/01/12 (michiamophil)
 #	* INITIAL-CHECK
 
-
+TEXTDOMAINDIR=/usr/share/locale/
+TEXTDOMAIN=usbinstall
 
 
 #=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~
@@ -117,12 +118,12 @@ function errorAndExit()
 
 function usage()
 {
-	echo "usbinstall: install openmamba into your usb key!"
-	echo -e "\tUsage: sudo usbinstall Arg1 Arg2 Arg3 [-y]"
-	echo -e "\tArg 1: Usb device path (e.g. /dev/sdc)"
-	echo -e "\tArg 2: Cpio.gz file (e.g. ~/openmamba-bootusb-it-milestone2-2.0pre8.i586.cpio.gz)"
-	echo -e "\tArg 3: Iso file (e.g. ~/openmamba-livecd-it-milestone2-2.0pre8.i586.iso)"
-	echo -e "\t-y: install without asking confirmation [Be careful!]"
+	echo $"usbinstall: install openmamba into your usb key!"
+	echo -e "\t"$"Usage: sudo usbinstall Arg1 Arg2 Arg3 [-y]"
+	echo -e "\t"$"Arg 1: Usb device path (e.g. /dev/sdc)"
+	echo -e "\t"$"Arg 2: Cpio.gz file (e.g. ~/openmamba-bootusb-it-milestone2-2.0pre8.i586.cpio.gz)"
+	echo -e "\t"$"Arg 3: Iso file (e.g. ~/openmamba-livecd-it-milestone2-2.0pre8.i586.iso)"
+	echo -e "\t"$"-y: install without asking confirmation [Be careful!]"
 }
 
 
@@ -147,7 +148,7 @@ fi
 
 # Check if usbinstall have root permission
 if [ "`id -u`" != 0 ]; then
-	errorAndExit "Error: usbinstall must be run as root" 1
+	errorAndExit $"Error: usbinstall must be run as root" 1
 fi
 
 # Check if Arg 1 is valid
@@ -157,19 +158,19 @@ if [ -b "$1" ]; then	# If is a block device
 	if [ "$ISKEY" = "true" ]; then	# If is a usb
 		export SELECT_USB=$1
 	else # If not, user can choose
-		echo "Warning: you haven't choosen a usb key ($1). Are you sure to continue? [yes/no]"
+		echo $"Warning: you haven't choosen a removable device ($1). Are you sure to continue? [yes/no]"
 		read KEY
 		case "$KEY" in
-			yes)
+			$yes)
 				export SELECT_USB=$1
 				;;
 			*)
-				errorAndExit "Installation aborted"
+				errorAndExit $"Installation aborted"
 				;;
 		esac
 	fi
 else
-	errorAndExit "Error(Arg 1): \"$1\" isn't a block device" 1
+	errorAndExit $"Error(Arg 1): \"$1\" isn't a block device" 1
 fi
 
 # Check if Arg 2 is valid
@@ -177,10 +178,10 @@ if [ -f "$2" ]; then	# Check if is a file
 	if [ -r "$2" ]; then	# Chek is is readable
 		export SELECT_BOOT=$2
 	else
-		errorAndExit "Error(Arg 2): \"$2\" is not readable" 1
+		errorAndExit $"Error(Arg 2): \"$2\" is not readable" 1
 	fi
 else
-	errorAndExit "Error(Arg 2): \"$2\" isn't a regular file" 1
+	errorAndExit $"Error(Arg 2): \"$2\" isn't a regular file" 1
 fi
 # Check if Arg 2 is a gz file
 if [ "${2##*.}" != "gz" ]; then
@@ -211,50 +212,51 @@ fi
 #=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~
 export LOGFILE=/var/log/usbinstall.log
 trap "[ \"$CPPID\" ] && kill -9 $CPPID" HUP INT QUIT ABRT KILL TERM
-set_status "Smonto la chiavetta"
+set_status $"Unmount usb device"
+echo $"Unmount usb device"
 
 DEVICEISMOUNTED=`dbus_properties_get_bool org.freedesktop.UDisks /org/freedesktop/UDisks/devices/${SELECT_USB/*\/}1 \
 org.freedesktop.UDisks.Device DeviceIsMounted`
 
 if [ "$DEVICEISMOUNTED" = "true" ]; then
    LANG=C udisks --unmount ${SELECT_USB}1 | grep failed && { 
-	errorAndExit "Error: fail to umount the usb key (${SELECT_USB}1)"
+	errorAndExit $"Error: fail to umount the usb key (${SELECT_USB}1)"
    }
 fi
 set_pbar 2
 
 # Prima di formattare :P
 if [ "$CONFIRM" = "1" ]; then
-	echo "Warning: You are going to format this device ($1). Are you sure to continue? [yes/no]"
+	echo $"Warning: You are going to format this device ($1). Are you sure to continue? [yes/no]"
 	read KEY
 		case "$KEY" in
-			yes)
+			$yes)
 				;;
 			*)
-				errorAndExit "Installation aborted"
+				errorAndExit $"Installation aborted"
 				;;
 		esac
 fi
 
-set_status "Partizionamento della chiavetta in corso..."
-echo "Partitioning $SELECT_USB..."
+set_status $"Partitioning $SELECT_USB..."
+echo $"Partitioning $SELECT_USB..."
 sudo fdisk $SELECT_USB < /usr/share/openmamba/usbinstall/fdisk_template &>$LOGFILE
 if [ "$?" != "0" ]; then
-   errorAndExit "Error: \"fdisk\" exit with error (see $LOGFILE)"
+   errorAndExit $"Error: \"fdisk\" exit with error (see $LOGFILE)"
 fi
 set_pbar 5
 
-set_status "Formattazione della chiavetta in corso..."
-echo "Formatting..."
+set_status $"Formatting $SELECT_USB..."
+echo $"Formatting $SELECT_USB..."
 sudo mkfs.ext3 ${SELECT_USB}1 -L openmamba_live &>>$LOGFILE
 if [ "$?" != "0" ]; then
-   errorAndExit "Error: \"mkfs.ext3\" exit with error (see $LOGFILE)"
+   errorAndExit $"Error:"" \"mkfs.ext3\" "$"exit with error (see $LOGFILE)"
 fi
 
 sleep 1
 LANG=C udisks --mount ${SELECT_USB}1 &>>$LOGFILE
 if [ "$?" != "0" ]; then
-   errorAndExit "Error: \"udisks --mount\" exit with error (see $LOGFILE)"
+   errorAndExit $"Error:"" \"udisks --mount\" "$"exit with error (see $LOGFILE)"
 fi
 set_pbar 30
 
@@ -264,27 +266,28 @@ MOUNTDIR=`dbus_properties_get_stringlist org.freedesktop.UDisks /org/freedesktop
 org.freedesktop.UDisks.Device DeviceMountPaths`
 
 if [ ! -d "$MOUNTDIR" ]; then
-   errorAndExit "Error: unable to find usb mount path"
+   errorAndExit $"Error: unable to found usb mount path"
 fi
 
-set_status "Estrazione del file di boot in corso..."
-echo "Extracting bootusb archive..."
+set_status $"Extracting bootusb archive..."
+echo $"Extracting bootusb archive..."
 pushd $MOUNTDIR >/dev/null
 sudo chmod 777 ./
 gunzip -c $SELECT_BOOT | cpio -i
 if [ ! -d "./boot" ]; then
-   errorAndExit "Error: Invalid bootusb archive"
+   errorAndExit $"Error: Invalid bootusb archive"
 fi
 set_pbar 38
 
-set_status "Scrittura del bootloader in corso..."
+set_status $"Writing bootloader..."
+echo $"Writing bootloader..."
 sudo extlinux --install boot
 sudo install-mbr -e 1 $SELECT_USB
 set_pbar 45
 
 
-set_status "Copia del file iso di openmamba in corso..."
-echo "Copying ISO..."
+set_status $"Copying ISO..."
+echo $"Copying ISO..."
 # Copy code
 ORIG_SIZE=`stat -c %s $SELECT_ISO`
 cp $SELECT_ISO ./ &
@@ -306,11 +309,12 @@ popd >/dev/null
 sync
 set_pbar 98
 
-set_status "Smonto la chiavetta"
+set_status $"Unmount usb device"
+echo $"Unmount usb device"
 LANG=C udisks --unmount ${SELECT_USB}1 |  grep failed && { 
-	errorAndExit "Error: fail to umount the usb key (${SELECT_USB}1)"
+	errorAndExit $"Error: fail to umount the usb key (${SELECT_USB}1)"
 }
 set_pbar 100
 exit_frontend ""
-echo "Done."
+echo $"Done!"
 #################################(INSTALLATION)######################################