Changeset 5102


Ignore:
Timestamp:
Jun 6, 2017, 5:37:59 PM (22 months ago)
Author:
jrpelegrina
Message:

Updated changelog. Fix some bugs in helpers

Location:
zero-center/trunk/fuentes
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • zero-center/trunk/fuentes/debian/changelog

    r4930 r5102  
     1zero-center (1:2.9.7) xenial; urgency=medium
     2
     3  * Fix some bugs in helpers
     4  * Add translations to zenity buttons
     5
     6 -- Juan Ramon Pelegrina <juapesai@hotmail.com>  Tue, 06 Jun 2017 17:35:58 +0200
     7
    18zero-center (1:2.9.6) xenial; urgency=medium
    29
  • zero-center/trunk/fuentes/install-files/usr/bin/zero-lliurex-axel

    r5095 r5102  
    99MSG_BUTTON_CANCEL=$(gettext "Cancel")
    1010MSG_DONWLOADING=$(gettext "Downloading")
     11MSG_FROM=$(gettext "from")
     12MSG_AT=$(gettext "at")
     13MSG_IN=$(gettext "in")
     14MSG_EXISTS_FILE=$(gettext "exists, you have to delete it before if you want to download it again")
    1115
    1216
     
    4751                        if [ -f "$2"/"$NAME_FILE" ] ; then
    4852                                echo "$2/$NAME_FILE exists, you have to delete it before if you want to download it again"
    49                                 zenity --error --text "$2/$NAME_FILE exists, you have to delete it before if you want to download it again" $ZEN_BUTTON_OK
     53                                #zenity --error --text "$2/$NAME_FILE exists, you have to delete it before if you want to download it again" $ZEN_BUTTON_OK
     54                                zenity --error --text "$2/$NAME_FILE $MSG_EXISTS_FILE" $ZEN_BUTTON_OK
    5055
    5156                                exit 1
     
    109114                                PERCENT=$( tail -1 /tmp/axel.log  2>/dev/null  | grep % | sed 's/[^0-9.]*\([0-9.]*\).*/\1/' )
    110115                                #Hacemos echo de los datos que necesita el zenity
    111                                 echo "#MSG_DONWLOADING $3 in $2 ...................$PERCENT%"
     116                                #echo "Downloading $3 in $2 ...................$PERCENT%"
     117                                echo "#$MSG_DONWLOADING $3 $MSG_IN $2 ...................$PERCENT%"
     118
    112119                                echo "$PERCENT"
    113120                                #por ultimo entubamos la salida al zenity progress para que nos muestre el resultado en pantalla
     
    164171                # Old instruction:
    165172                #( wget -O "$2"/"$3" "$1" 2>&1 | grep --line-buffered -o "[0-9]*%" | sed  -u -e 's/.* \([0-9]\+%\)\ \+\([0-9.]\+.\) \(.*\)/\1\n# Downloaded \1\ from "'$NAME'"  at \2\/s, ETA \3/' | zenity  --progress percentage=0 --auto-close --auto-kill --width 600 --title="Zero-Downloader-Helper" > /dev/null 2>&1  )|| rc=1
    166                 ( wget -O "$2"/"$3" "$1" 2>&1 |  sed -u 's/.*\ \([0-9]\+\)%\ \+\(.*\)$/\1\n'#$MSG_DONWLOADING' \1\% from "'$NAME'" at \2/' | zenity  --progress percentage=0 --auto-close --auto-kill --width 600 --title="Zero-Downloader-Helper" --text="$MSG_STARTING '$NAME'........." > /dev/null 2>&1  )|| rc=1
     173                ( wget -O "$2"/"$3" "$1" 2>&1 |  sed -u 's/.*\ \([0-9]\+\)%\ \+\(.*\)$/\1\n'#$MSG_DONWLOADING' \1\% '$MSG_FROM' "'$NAME'" '$MSG_AT' \2/' | zenity  --progress percentage=0 --auto-close --auto-kill --width 600 --title="Zero-Downloader-Helper" --text="$MSG_STARTING '$NAME'........." > /dev/null 2>&1  )|| rc=1
    167174
    168175                #Esta parte cancela el proceso del wget si se cancela la descarga en el zenity.
  • zero-center/trunk/fuentes/install-files/usr/bin/zero-lliurex-wget

    r5095 r5102  
    1010MSG_DONWLOADING=$(gettext "Downloading")
    1111MSG_FROM=$(gettext "from")
     12MSG_AT=$(gettext "at")
     13MSG_IN=$(gettext "in")
     14MSG_EXISTS_FILE=$(gettext "exists, you have to delete it before if you want to download it again")
    1215MSG_CHECKING=$(gettext "Cheking net parameters to download ")
    1316MSG_KEEP_CALM=$(gettext "please keep calm......... ")
     
    6366                        if [ -f "$2"/"$NAME_FILE" ] ; then
    6467                                echo "$2/$NAME_FILE exists, you have to delete it before if you want to download it again"
    65                                 zenity --error --text "$2/$NAME_FILE exists, you have to delete it before if you want to download it again" $ZEN_BUTTON_OK
     68                                zenity --error --text "$2/$NAME_FILE $MSG_EXISTS_FILE" $ZEN_BUTTON_OK
    6669                                exit 1
    6770                        else
     
    159162                # Old instruction:
    160163                #( wget -O "$2"/"$3" "$1" 2>&1 | grep --line-buffered -o "[0-9]*%" | sed  -u -e 's/.* \([0-9]\+%\)\ \+\([0-9.]\+.\) \(.*\)/\1\n# Downloaded \1\ from "'$NAME'"  at \2\/s, ETA \3/' | zenity  --progress percentage=0 --auto-close --auto-kill --width 600 --title="Zero-Downloader-Helper" > /dev/null 2>&1  )|| rc=1
    161                 ( wget -O "$2"/"$3" "$1" 2>&1 |  sed -u 's/.*\ \([0-9]\+\)%\ \+\(.*\)$/\1\n'#$MSG_DONWLOADING' \1\% '$MSG_FROM' "'$NAME'" at \2/' | zenity  --progress percentage=0 --auto-close --auto-kill --width 600 --title="Zero-Downloader-Helper" --text="$MSG_STARTING '$NAME' in '$2'........." $ZEN_BUTTON_CANCEL_OK > /dev/null 2>&1  )|| rc=1
     164                ( wget -O "$2"/"$3" "$1" 2>&1 |  sed -u 's/.*\ \([0-9]\+\)%\ \+\(.*\)$/\1\n'#$MSG_DONWLOADING' \1\% '$MSG_FROM' "'$NAME'" '$MSG_AT' \2/' | zenity  --progress percentage=0 --auto-close --auto-kill --width 600 --title="Zero-Downloader-Helper" --text="$MSG_STARTING '$NAME' $MSG_IN '$2'........." $ZEN_BUTTON_CANCEL_OK > /dev/null 2>&1  )|| rc=1
    162165
    163166                #Esta parte cancela el proceso del wget si se cancela la descarga en el zenity.
  • zero-center/trunk/fuentes/lliurex-po/zero-center/ca@valencia.po

    r5095 r5102  
    164164
    165165#: ../install-files/usr/bin/zero-lliurex-wget:12
     166#: ../install-files/usr/bin/zero-lliurex-axel:12
     167msgid "at"
     168msgstr "a"
     169
     170#: ../install-files/usr/bin/zero-lliurex-wget:13
     171#: ../install-files/usr/bin/zero-lliurex-axel:13
     172msgid "in"
     173msgstr "en"
     174
     175#: ../install-files/usr/bin/zero-lliurex-wget:14
     176#: ../install-files/usr/bin/zero-lliurex-axel:14
     177msgid "exists, you have to delete it before if you want to download it again"
     178msgstr "existix, heu d'esborrar-ho abans, si voleu tornar a descarregar-ho"
     179
     180#: ../install-files/usr/bin/zero-lliurex-wget:12
    166181msgid "Cheking net parameters to download "
    167182msgstr "Testejant els paràmetres de la xarxa per a descarregar "
  • zero-center/trunk/fuentes/lliurex-po/zero-center/es.po

    r5095 r5102  
    9595#: ../install-files/usr/bin/zero-reinstall-list:8
    9696msgid "has been INSTALLED in your system, and you can view the log in"
    97 msgstr "Ha sido Instalado en tu sistema, y tu puedes ver el log en"
     97msgstr "ha sido Instalado en tu sistema, y tu puedes ver el log en"
    9898
    9999#: ../install-files/usr/bin/zero-installer:10
    100100msgid "has NOT been INSTALLED in your system, and you can view the log in"
    101 msgstr "No ha sido instalado en tu sistema, y tu puedes ver el log en"
     101msgstr "no ha sido instalado en tu sistema, y tu puedes ver el log en"
    102102
    103103#: ../install-files/usr/bin/zero-installer:11
     
    125125#: ../install-files/usr/bin/zero-lliurex-wget:5
    126126msgid "Starting to download your file"
    127 msgstr "Comenzando a descargar tu fichero"
     127msgstr "Comenzando a descargar el fichero"
    128128
    129129#: ../install-files/usr/bin/zero-lliurex-axel:6
    130130#: ../install-files/usr/bin/zero-lliurex-wget:6
    131131msgid "Your dowloading has been cancelled about your file"
    132 msgstr "Tu descarga ha sido cancelada sobre el fichero"
     132msgstr "La descarga ha sido cancelada sobre el fichero"
    133133
    134134#: ../install-files/usr/bin/zero-lliurex-wget:7
    135135#: ../install-files/usr/bin/zero-lliurex-axel:7
    136136msgid "Your URL don't exists, imposible to download the file"
    137 msgstr "Tu url no existe, imposible descargar el fichero"
     137msgstr "La url no existe, imposible descargar el fichero"
    138138
    139139#: ../install-files/usr/bin/zero-lliurex-wget:8
     
    159159msgstr "de"
    160160
     161
     162#: ../install-files/usr/bin/zero-lliurex-wget:12
     163#: ../install-files/usr/bin/zero-lliurex-axel:12
     164msgid "at"
     165msgstr "a"
     166
     167#: ../install-files/usr/bin/zero-lliurex-wget:13
     168#: ../install-files/usr/bin/zero-lliurex-axel:13
     169msgid "in"
     170msgstr "en"
     171
     172#: ../install-files/usr/bin/zero-lliurex-wget:14
     173#: ../install-files/usr/bin/zero-lliurex-axel:14
     174msgid "exists, you have to delete it before if you want to download it again"
     175msgstr "existe, debes borrarlo antes, si quieres volver a descargarlo"
     176
    161177#: ../install-files/usr/bin/zero-lliurex-wget:12
    162178msgid "Cheking net parameters to download "
  • zero-center/trunk/fuentes/lliurex-po/zero-center/zero-center.pot

    r5095 r5102  
    158158
    159159#: ../install-files/usr/bin/zero-lliurex-wget:12
     160#: ../install-files/usr/bin/zero-lliurex-axel:12
     161msgid "at"
     162msgstr ""
     163
     164#: ../install-files/usr/bin/zero-lliurex-wget:13
     165#: ../install-files/usr/bin/zero-lliurex-axel:13
     166msgid "in"
     167msgstr ""
     168
     169#: ../install-files/usr/bin/zero-lliurex-wget:14
     170#: ../install-files/usr/bin/zero-lliurex-axel:14
     171msgid "exists, you have to delete it before if you want to download it again"
     172msgstr ""
     173
     174#: ../install-files/usr/bin/zero-lliurex-wget:12
    160175msgid "Cheking net parameters to download "
    161176msgstr ""
Note: See TracChangeset for help on using the changeset viewer.