# HG changeset patch # User Aleksej Bobylev # Date 1378686424 -10800 # Node ID e232f0e1413a5ddc949c27bcfd2b2982fcb116e7 # Parent de13422f3a69940547b96c2ee7bc19e6c5c49d17 Current state, features stabilized and open for bugfixes and translations. diff -r de13422f3a69 -r e232f0e1413a Makefile --- a/Makefile Thu Jul 25 03:24:36 2013 +0300 +++ b/Makefile Mon Sep 09 03:27:04 2013 +0300 @@ -19,28 +19,29 @@ tools-pot: @echo -n "Generating SliTaz Tools pot file... " - @xgettext -o po/slitaz-tools/slitaz-tools.pot -L Shell \ + @xgettext -o po/slitaz-tools/slitaz-tools.pot -L Shell -k_ -k_n \ --package-name="SliTaz Tools" \ ./tinyutils/tazlocale ./tinyutils/tazkeymap ./tinyutils/setmixer \ - ./tinyutils/tazx ./tinyutils/decode ./tinyutils/terminal + ./tinyutils/tazx ./tinyutils/decode ./tinyutils/terminal \ + ./tinyutils/hwsetup @echo "done" boxes-pot: @echo -n "Generating SliTaz Boxes pot file... " - @xgettext -o po/slitaz-boxes/slitaz-boxes.pot -L Shell \ + @xgettext -o po/slitaz-boxes/slitaz-boxes.pot -L Shell -k_ -k_n \ --package-name="SliTaz Boxes" \ ./boxes/wifi-box ./boxes/burn-box ./boxes/scp-box @echo "done" tazbox-pot: @echo -n "Generating tazbox pot file... " - @xgettext -o po/tazbox/tazbox.pot -L Shell \ + @xgettext -o po/tazbox/tazbox.pot -L Shell -k -k_ -k_n \ --package-name="TazBox" ./tazbox/tazbox @echo "done" tazdrop-pot: @echo -n "Generating tazdrop pot file... " - @xgettext -o po/tazdrop/tazdrop.pot -L Shell \ + @xgettext -o po/tazdrop/tazdrop.pot -L Shell -k_ -k_n \ --package-name="TazDrop" ./tazdrop/tazdrop @echo "done" @@ -50,7 +51,7 @@ @for p in $(PROJECTS); do \ for l in $(LINGUAS); do \ if [ -f "po/$$p/$$l.po" ]; then \ - echo -e "Updating $$p $$l po file.\n"; \ + echo "Updating $$p $$l po file."; \ msgmerge -U po/$$p/$$l.po po/$$p/$$p.pot; \ fi; \ done; \ @@ -117,9 +118,12 @@ install -m 0755 -d $(DESTDIR)$(PREFIX)/share/locale install -m 0755 -d $(DESTDIR)$(PREFIX)/share/applications install -m 0755 -d $(DESTDIR)$(PREFIX)/share/pixmaps + install -m 0755 -d $(DESTDIR)$(PREFIX)/share/zoneinfo + install -m 0755 boxes/* $(DESTDIR)$(PREFIX)/bin install -m 0755 tazbox/tazbox $(DESTDIR)$(PREFIX)/bin install -m 0755 tinyutils/subox $(DESTDIR)$(PREFIX)/bin + install -m 0644 tazbox/iso3166-1.tab $(DESTDIR)$(PREFIX)/share/zoneinfo # Desktop files and icons. install -m 0644 applications/* $(DESTDIR)$(PREFIX)/share/applications @@ -134,7 +138,7 @@ done; # Gksu fake for pcmanfm. - cd $(DESTDIR)$(PREFIX)/bin && ln -s subox gksu + cd $(DESTDIR)$(PREFIX)/bin && ln -fs subox gksu clean: rm -rf po/mo diff -r de13422f3a69 -r e232f0e1413a README --- a/README Thu Jul 25 03:24:36 2013 +0300 +++ b/README Mon Sep 09 03:27:04 2013 +0300 @@ -6,7 +6,7 @@ configuration files designed to improve SliTaz. The tools were initially created to help people build their own distribution by following the SliTaz Cookbook; now the package mostly provides all the configuration tools and -all home-made GTK boxes such as subox, tazctrlbox, etc. +all home-made GTK boxes such as subox, tazbox, etc. The package also provides some scripts (firewall), desktop files with their icons, and the licenses and examples to help hackers or users understand and @@ -15,7 +15,7 @@ More tools information ----------------------- -You will find documentation in the doc/ folder and README files for some tools: +You will find README files for some tools: * tazbox/README * tazdrop/README diff -r de13422f3a69 -r e232f0e1413a applications/burn-box.desktop --- a/applications/burn-box.desktop Thu Jul 25 03:24:36 2013 +0300 +++ b/applications/burn-box.desktop Mon Sep 09 03:27:04 2013 +0300 @@ -8,5 +8,5 @@ Comment=Burn ISO images or audio tracks to CD or DVD Comment[ru]=Запись образа ISO или аудио-дорожек на CD или DVD Exec=burn-box -Icon=drive-optical +Icon=media-optical-burn Categories=GTK;Utility;AudioVideo;DiscBurning; diff -r de13422f3a69 -r e232f0e1413a applications/burn-iso.desktop --- a/applications/burn-iso.desktop Thu Jul 25 03:24:36 2013 +0300 +++ b/applications/burn-iso.desktop Mon Sep 09 03:27:04 2013 +0300 @@ -6,6 +6,6 @@ Name[pt_BR]=Gravador de Imagem ISO Name[ru]=Записать образ ISO Exec=burn-box --iso=%f -Icon=drive-optical +Icon=iso-image-burn NoDisplay=true MimeType=application/x-iso; diff -r de13422f3a69 -r e232f0e1413a applications/gpl-license.desktop --- a/applications/gpl-license.desktop Thu Jul 25 03:24:36 2013 +0300 +++ b/applications/gpl-license.desktop Mon Sep 09 03:27:04 2013 +0300 @@ -5,5 +5,5 @@ Name[pt_BR]=Licença Pública Geral GNU Name[ru]=Основная общественная лицензия GNU Exec=tazbox gpl -Icon=text-x-generic +Icon=text-x-readme Categories=System;Documentation; diff -r de13422f3a69 -r e232f0e1413a applications/passwd.desktop --- a/applications/passwd.desktop Thu Jul 25 03:24:36 2013 +0300 +++ b/applications/passwd.desktop Mon Sep 09 03:27:04 2013 +0300 @@ -4,7 +4,7 @@ Name[fr]=Mot de passe du compte Name[pt]=Mudar Senha de Usuário Name[pt_BR]=Mudar Senha de Usuário -Name[ru]=Пароль учетной записи +Name[ru]=Пароль учётной записи Exec=terminal -h -T Passwd -geometry 60x10 -e passwd -Icon=system-config-authentication +Icon=user_auth Categories=ConsoleOnly;Settings;DesktopSettings; diff -r de13422f3a69 -r e232f0e1413a applications/slitaz-logout.desktop --- a/applications/slitaz-logout.desktop Thu Jul 25 03:24:36 2013 +0300 +++ b/applications/slitaz-logout.desktop Mon Sep 09 03:27:04 2013 +0300 @@ -17,5 +17,5 @@ Name[zh_CN]=注销 Name[zh_TW]=登出 Exec=tazbox logout -Icon=slitaz-logout +Icon=system-log-out StartupNotify=false diff -r de13422f3a69 -r e232f0e1413a applications/tazbox-keymap.desktop --- a/applications/tazbox-keymap.desktop Thu Jul 25 03:24:36 2013 +0300 +++ b/applications/tazbox-keymap.desktop Mon Sep 09 03:27:04 2013 +0300 @@ -6,5 +6,5 @@ Name[pt_BR]=Mapa do Teclado Name[ru]=Раскладка клавиатуры Exec=tazbox su "tazbox keymap" -Icon=input-keyboard +Icon=preferences-desktop-keyboard Categories=GTK;Settings;DesktopSettings; diff -r de13422f3a69 -r e232f0e1413a applications/tazbox-locale.desktop --- a/applications/tazbox-locale.desktop Thu Jul 25 03:24:36 2013 +0300 +++ b/applications/tazbox-locale.desktop Mon Sep 09 03:27:04 2013 +0300 @@ -6,5 +6,5 @@ Name[pt_BR]=Linguagem do Sistema Name[ru]=Язык системы Exec=tazbox su "tazbox locale" -Icon=config-language +Icon=preferences-desktop-locale Categories=GTK;Settings;DesktopSettings; diff -r de13422f3a69 -r e232f0e1413a applications/tazbox-tz.desktop --- a/applications/tazbox-tz.desktop Thu Jul 25 03:24:36 2013 +0300 +++ b/applications/tazbox-tz.desktop Mon Sep 09 03:27:04 2013 +0300 @@ -6,5 +6,5 @@ Name[pt_BR]=Configuração de Zona Horária Name[ru]=Часовой пояс Exec=tazbox su "tazbox tz" -Icon=config-date +Icon=preferences-system-time Categories=GTK;Settings;DesktopSettings; diff -r de13422f3a69 -r e232f0e1413a boxes/burn-box --- a/boxes/burn-box Thu Jul 25 03:24:36 2013 +0300 +++ b/boxes/burn-box Mon Sep 09 03:27:04 2013 +0300 @@ -1,30 +1,27 @@ #!/bin/sh # # Burn-box a small front end to cdrkit powered by Yad/GTK. Keep the main -# window uncluttered and use a wizard to create audio/video/data cd/dvd. +# window uncluttered and use a wizard to create audio/video/data CD/DVD. # The main box lets users burn an ISO and audio files from a single directory. # -# Copyright (C) 2012 SliTaz GNU/Linux - BSD License +# Copyright (C) 2012-2013 SliTaz GNU/Linux - BSD License # # Author: Christophe Lincoln # . /lib/libtaz.sh +export TEXTDOMAIN='slitaz-boxes' # i18n # LibTaz parser and store options. Burn-box can be used with an ISO image # or an audio directory in option: burn-box --iso=/path/to/image.iso [ "$iso" ] || iso=" " [ "$audio" ] || audio="$HOME" -# Internal variables (we need a space before options). -boxopts="--height=300 --width=520 --window-icon=drive-cdrom" -options=" -eject -multi" -speed=$(fgrep "drive speed" /proc/sys/dev/cdrom/info | cut -f 3) -tmpdir=/tmp/$(basename $0) - -# Internationalization -. /usr/bin/gettext.sh -TEXTDOMAIN='slitaz-boxes' -export TEXTDOMAIN +# Internal variables +boxopts="--height=300 --width=620" +icon=media-optical-dvd-rw +options="-eject -multi" +speed=$(fgrep "drive speed" /proc/sys/dev/cdrom/info | cut -f3) +tmpdir=$(mktemp -d) # # Functions @@ -32,38 +29,42 @@ # Help and usage usage() { - cat << EOT + newline; _ 'Burn-box a small front end to cdrkit powered by Yad/GTK.' + newline; boldify $(_ 'Usage:') + echo " $(basename $0) [$(_n 'command')|$(_n 'option')] [$(_n 'file')]" -$(gettext "Usage:") $(basename $0) [command|option] [file] + newline; boldify $(_ 'Commands:') + optlist "\ +wodim-help|-wh $(_n 'Show all Wodim options') +iso|-i $(_n 'Burn an ISO image') +audio|-a $(_n 'Create and burn an audio CD') +blank $(_n 'Erase a RW disk')" -$(gettext "Commands:") - wodim-help|-wh $(gettext "Show all Wodim options") - iso|-i $(gettext "Burn an ISO image") - audio|-a $(gettext "Create and burn an audio CD") + newline; boldify $(_ 'Options:') + echo "\ + --iso=$(_n '/path/to/image.iso') + --audio=$(_n '/path/to/directory')" -$(gettext "Options:") - --iso=/path/to/image.iso - --audio=/path/to/directory - -$(gettext "Examples:") - $(basename $0) iso /path/to/image.iso - $(basename $0) --iso=/path/to/image.iso - -EOT + newline; boldify $(_ 'Examples:') + echo "\ + $(basename $0) iso $(_n '/path/to/image.iso') + $(basename $0) --iso=$(_n '/path/to/image.iso')" + newline } # Ouput a command to a Yad/GTK box. Usage: cmd | out --title="Title" --tail gtkout() { - yad --text-info $boxopts "$@" --margins=4 --button="gtk-close":1 + yad --window-icon=$icon $boxopts \ + --margins=4 --fontname=monospace \ + --text-info "$@" --button="gtk-close:1" } # Decode audio files with: decode [file] decode_audio() { - gettext "Decoding files from:"; echo " $audio" - rm -rf $tmpdir && mkdir -p $tmpdir + _ 'Decoding files from: $audio' for f in "$audio"/*.* do - [ "$debug" ] && echo "DEBUG: handling $f" + debug "handling $f" case "$f" in *.wav) cp -f "$f" $tmpdir ;; @@ -79,8 +80,9 @@ # Burn an ISO image. burn_iso() { - [ "${iso##*.}" != "iso" ] && \ - (gettext "Not an ISO image:"; echo " $iso") && exit 1 + if [ "${iso##*.}" != "iso" ]; then + _ 'Not an ISO image: "$iso"'; exit 1 + fi wodim -v speed=$speed $options "$iso" } @@ -95,19 +97,18 @@ # Main GUI box function with pure Yad spec burn_main() { - text="$(gettext "Burn ISO images and audio files [data in next releases]")" - yad --form $boxopts --title="Burn-box" \ - --image=application-x-cd-image --image-on-top \ - --text="$text" \ - --field="$(gettext "Drive speed:")" \ - --field="$(gettext "Wodim options:")" \ - --field="$(gettext "ISO image:")":FL \ - --field="$(gettext "Audio files:")":DIR \ - --button="$(gettext "Wodim help")":"$0 wodim-help" \ - --button="$(gettext "Blank CD")":"$0 blank" \ - --button="$(gettext "Burn")":0 \ - --button="gtk-close":1 \ - "$speed" "$options" "$iso" "$audio" + yad --title="$(_ 'Burn-box')" --window-icon=$icon $boxopts \ + --image=$icon --image-on-top \ + --text="$(_n 'Burn ISO images and audio files [data in next releases]')" \ + --form \ + --field="$(_n 'Drive speed:')" "$speed" \ + --field="$(_n 'Wodim options:')" " $options" \ + --field="$(_n 'ISO image:'):FL" "$iso" \ + --field="$(_n 'Audio files:'):DIR" "$audio" \ + --button="$(_n 'Wodim help'):$0 wodim-help" \ + --button="$(_n 'Blank CD'):$0 blank" \ + --button="$(_n 'Burn'):0" \ + --button="gtk-close:1" } # Main function @@ -121,20 +122,19 @@ *) exit 0 ;; esac - # Get value from $main - speed=$(echo $main | cut -d "|" -f 1 | cut -d "," -f 1) - options=$(echo $main | cut -d "|" -f 2) - iso=$(echo $main | cut -d "|" -f 3) - audio=$(echo $main | cut -d "|" -f 4) + # Get values from $main + eval $(echo $main | awk -F'|' \ + '{printf "speed=\"%s\" options=\"%s\" iso=\"%s\" audio=\"%s\"", $1, $2, $3, $4}') + speed=${speed%%,*} # first from comma separated list # Handle ISO image if [ "$iso" != "(null)" ]; then - burn_iso 2>&1 | gtkout --title="Burning ISO" --tail + burn_iso 2>&1 | gtkout --title="$(_n 'Burning ISO')" --tail fi # Handle Audio files. if [ "$audio" != "$HOME" ]; then - burn_audio 2>&1 | gtkout --title="Burning Audio" --tail + burn_audio 2>&1 | gtkout --title="$(_n 'Burning Audio')" --tail fi } @@ -143,13 +143,15 @@ # case "$1" in + -h|--help) + usage ;; wodim-help|-wh) - wodim --help 2>&1 | gtkout --title="Wodim Help" ;; + wodim --help 2>&1 | gtkout --title="$(_n 'Wodim Help')" ;; iso|-i) # Let burn an ISO from cmdline: burn-box -i /path/to/image.iso [ "$iso" == " " ] && iso="$2" if [ ! -f "$iso" ]; then - gettext "Missing ISO image"; echo " $iso" && exit 1 + _ 'Missing ISO image "$iso"'; exit 1 fi burn_iso ;; audio|-a) @@ -157,11 +159,11 @@ [ "$2" ] && audio="$2" [ "$audio" == "$HOME" ] && unset audio if [ ! -d "$audio" ]; then - gettext "Missing audio directory"; echo " $audio" && exit 1 + _ 'Missing audio directory "$audio"'; exit 1 fi burn_audio ;; blank) - wodim -v -blank=fast 2>&1 | gtkout --title="Wodim Blank" --tail ;; + wodim -v -blank=fast 2>&1 | gtkout --title="$(_n 'Blank disk')" --tail ;; ""|--*) burn ;; *) diff -r de13422f3a69 -r e232f0e1413a boxes/scp-box --- a/boxes/scp-box Thu Jul 25 03:24:36 2013 +0300 +++ b/boxes/scp-box Mon Sep 09 03:27:04 2013 +0300 @@ -2,19 +2,19 @@ # # SCP Box - Small front end to the secure file copy utility. # -# Copyright (C) 2008-2012 SliTaz GNU/Linux - BSD License +# Copyright (C) 2008-2013 SliTaz GNU/Linux - BSD License # # Author: Christophe Lincoln # . /lib/libtaz.sh +export TEXTDOMAIN='slitaz-boxes' # i18n [ "$file" ] || file="$HOME" [ "$dir" ] || dir="$HOME" # Internal variables (we need a space before options). config=$HOME/.config/scpbox -icon=/usr/share/pixmaps/slitaz-icon.png -term="xterm -geometry 80x16" +term="terminal -geometry 80x16" scpopts=" -r -P 22" # Make sure we have config files. @@ -31,46 +31,49 @@ usage() { cat << EOT -$(gettext "Usage:") $(basename $0) [command|option] +$(_ 'SCP Box - Small front end to the secure file copy utility.') -$(gettext "Commands:") - list-hosts $(gettext "List all known hosts") +$(boldify "$(_ 'Usage:')") + $(basename $0) [$(_n 'command')|$(_n 'option')] -$(gettext "Options:") - --file=/path/to/file - --dir=/path/to/directory +$(boldify "$(_ 'Commands:')") + list-hosts $(_n 'List all known hosts') -$(gettext "Examples:") - $(basename $0) --file=/path/to/file +$(boldify "$(_ 'Options:')") + --file=$(_n '/path/to/file') + --dir=$(_n '/path/to/directory') + +$(boldify "$(_ 'Examples:')") + $(basename $0) --file=$(_n '/path/to/file') EOT } # List last used hosts. list_hosts() { - for h in $(cat $config/hosts) - do + for h in $(cat $config/hosts); do echo -n "!$h" done } # Main GUI box function with pure Yad spec scpbox_main() { - text=$(gettext "Secure copy - Copy files remotely with scp") - yad --form --title="SCP Box" --window-icon=$icon \ - --image=folder-remote --image-on-top \ - --height=320 --width=500 --text="$text" \ - --field="$(gettext "User name:")" \ - --field="$(gettext "Hostname:")" \ - --field="$(gettext "Known hosts:")":CB \ - --field="$(gettext "Options:")" \ - --field="$(gettext "Local file:")":FL \ - --field="$(gettext "Local directory:")":DIR \ - --field="$(gettext "Remote path:")" \ - --button="$(gettext "Download")":2 \ - --button="$(gettext "Upload")":0 \ - --button="gtk-close":1 \ - "$USER" "" "$(list_hosts)" "$scpopts" "$file" "$dir" "" + icon=folder-remote + yad --title="$(_n 'SCP Box')" --window-icon=$icon \ + --width=400 \ + --image=$icon --image-on-top \ + --text="$(_n 'Secure copy - Copy files remotely with scp')" \ + --form \ + --field="$(_n 'User name:')" "$USER" \ + --field="$(_n 'Hostname:')" "" \ + --field="$(_n 'Known hosts:'):CB" "$(list_hosts)" \ + --field="$(_n 'Options:')" "$scpopts" \ + --field="$(_n 'Local file:'):FL" "$file" \ + --field="$(_n 'Local directory:'):DIR" "$dir" \ + --field="$(_n 'Remote path:')" "" \ + --button="$(_n 'Download'):2" \ + --button="$(_n 'Upload'):0" \ + --button="gtk-close:1" } # Main function @@ -93,7 +96,7 @@ host=$(echo $main | cut -d "|" -f 3) fi if [ "$host" == "(null)" ] || [ ! "$host" ]; then - echo "No host: exit" && exit 0 + echo "No host, exit"; exit 0 fi # Deal with --button values @@ -107,7 +110,7 @@ elif [ "$dir" != "$HOME" ]; then local="$dir" else - echo "No file: exit" && exit 0 + echo "No file, exit"; exit 0 fi cmd="scp $options $local $user@$host:$remote" [ "$debug" ] && echo "DEBUG: $cmd" @@ -116,7 +119,7 @@ # Download: we need a remote file. local=$(echo $main | cut -d "|" -f 6) if [ ! "$remote" ]; then - echo "No remote file: exit" && exit 0 + echo "No remote file, exit"; exit 0 fi cmd="scp $options $user@$host:$remote $local" [ "$debug" ] && echo "DEBUG: $cmd" @@ -131,12 +134,10 @@ # case "$1" in - list-hosts) - list_hosts ;; - ""|--*) - scpbox ;; - *) - usage ;; + -h|--help) usage ;; + list-hosts) list_hosts ;; + ""|--*) scpbox ;; + *) usage ;; esac exit 0 diff -r de13422f3a69 -r e232f0e1413a boxes/wifi-box --- a/boxes/wifi-box Thu Jul 25 03:24:36 2013 +0300 +++ b/boxes/wifi-box Mon Sep 09 03:27:04 2013 +0300 @@ -1,26 +1,24 @@ #!/bin/sh # -# Small Wifi utility to quickly connect to a network. Easy network connection is -# most important, this tool provides a quick way to connect or change wifi +# Small Wi-Fi utility to quickly connect to a network. Easy network connection +# is most important, this tool provides a quick way to connect or change Wi-Fi # settings while full network configuration is done in TazPanel. # -# Copyright (C) 2012 SliTaz GNU/Linux - GNU gpl v2 +# Copyright (C) 2012-2013 SliTaz GNU/Linux - GNU GPL v2 # -# Authors : Christophe Lincoln +# Authors: Christophe Lincoln # +. /lib/libtaz.sh +export TEXTDOMAIN='slitaz-boxes' #i18n -# Only for root. -if [ $(id -u) != 0 ]; then - exec tazbox su $(basename $0) $@ - exit 0 -fi +usage() { + newline; _ 'Small Wi-Fi utility to quickly connect to a network.' + newline; boldify "$(_ 'Usage:')" + echo " $(basename $0) [$(_ 'interface')]" + newline +} -# Internationalization -. /usr/bin/gettext.sh -TEXTDOMAIN='slitaz-boxes' -export TEXTDOMAIN - -# Start a wifi connection +# Start a Wi-Fi connection start_wifi() { sed -i \ -e s'/^DHCP=.*/DHCP="yes"/' \ @@ -32,35 +30,38 @@ /etc/init.d/network.sh start } -# Catch essids and format output for GTK tree. We get the list of +# Catch ESSIDs and format output for GTK tree. We get the list of # networks by Cell and without spaces. detect_wifi() { if [ -d /sys/class/net/$WIFI_INTERFACE/wireless ]; then ifconfig $WIFI_INTERFACE up - echo -e "any\nN/A\nnone\n-" + echo -e "$( _n 'any')\n$(_n 'N/A')\n$(_n 'none')\n$(_n '-')" for i in $(iwlist $WIFI_INTERFACE scan | sed s/"Cell "/Cell-/ | grep "Cell-" | awk '{print $1}') do scan=$(iwlist $WIFI_INTERFACE scan last | \ awk '/(Cell|ESS|Qual|Encry|IE: WPA|WPA2)/ {print}' | \ sed s/"Cell "/Cell-/ | grep -A 5 "$i") essid=$(echo $scan | cut -d '"' -f 2) + if echo "$scan" | grep -q Quality; then quality=$(echo $scan | sed 's/.*Quality=\([^ ]*\).*/\1/' | sed 's/.*Quality:\([^ ]*\).*/\1/') else - quality="-" + quality="$(_n '-')" fi + cryto=$(echo $scan | sed 's/.*key:\([^ ]*\).*/\1/') # Check encryption type if echo "$scan" | grep -q WPA*; then cryto="WPA" fi + # Connected or not connected... if ifconfig | grep -A 1 $WIFI_INTERFACE | \ grep -q inet && iwconfig $WIFI_INTERFACE | \ grep ESSID | grep -q -w "$essid"; then status=connected else - status="-" + status="$(_n '-')" fi echo -e "$essid\n$quality\n$cryto\n$status" @@ -71,14 +72,19 @@ # Prompt for password or connect connect_main() { case $keytype in + WPA) label="$(_n 'WPA Password:')" ;; + WEP) label="$(_n 'WEP Password:')" ;; + *) label= ;; + esac + case $keytype in WPA|WEP) - title=$(gettext "Wifi connection") - text=$(gettext "Connection to:") - yad --form --width=520 --height=140 \ - --center --on-top --window-icon="network-wireless" \ - --image="network-wireless" --image-on-top \ - --title="$title" --text="$text $essid" \ - --field="$keytype $(gettext "Password:"):H" ;; + icon=network-wireless + yad --title="$(_n 'Wi-Fi connection')" --window-icon=$icon \ + --width=520 --height=140 --on-top --center \ + --image=$icon --image-on-top \ + --text="$(_n 'Connection to:') $essid" \ + --form \ + --field="$label:H" ;; none) continue ;; *) exit 0 ;; esac @@ -105,16 +111,16 @@ # Main GUI box function with pure Yad spec wifi_main() { - title=$(gettext "Wifi network") - text=$(gettext "Connect to a wifi network \(Double click to connect\)") - detect_wifi | yad --list --width=520 --height=300 \ - --center --on-top --window-icon="network-wireless" \ - --image="network-wireless" --image-on-top \ - --title="$title" --text="$text" \ - --column "$(gettext "ESSID Name")" --column "$(gettext "Quality")" \ - --column "$(gettext "Encryption")" --column "$(gettext "Status")" \ - --button="Start wifi:4" --button="Stop wifi:3" \ - --button="Configuration:2" --button="gtk-close:1" + icon=network-wireless + detect_wifi | yad --title="$(_n 'Wi-Fi network')" --window-icon=$icon \ + --width=520 --height=300 --on-top --center \ + --image=$icon --image-on-top \ + --text="$(_n 'Connect to a Wi-Fi network (Double click to connect)')" \ + --list \ + --column "$(_n 'ESSID Name')" --column "$(_n 'Quality')" \ + --column "$(_n 'Encryption')" --column "$(_n 'Status')" \ + --button="$(_n 'Start Wi-Fi'):4" --button="$(_n 'Stop Wi-Fi'):3" \ + --button="gtk-preferences:2" --button="gtk-close:1" } # Main function @@ -142,9 +148,15 @@ # case "$1" in - usage|help|-*) - echo "$(gettext "Usage:") $(basename $0) [interface]" ;; + -h|--help|usage|help|-*) + usage ;; *) + # Only for root. + if [ $(id -u) != 0 ]; then + exec tazbox su $0 $@ + exit 0 + fi + . /etc/network.conf [ -n "$1" ] && WIFI_INTERFACE="$1" wifi ;; diff -r de13422f3a69 -r e232f0e1413a doc/style.css --- a/doc/style.css Thu Jul 25 03:24:36 2013 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,48 +0,0 @@ -/* CSS style for SliTaz Doc */ - -html { min-height: 102%; } -body { font: 13px sans-serif, vernada, arial; margin: 0; } -h1 { margin: 0; padding: 8px; color: #fff; font-size: 20px; } -h2 { color: #d66018; } h3 { color: #666; font-size: 140%; } -a:hover { text-decoration: none; } -img { border: 0pt none; vertical-align: middle; } -pre { - background-color: #f8f8f8; - border: 1px solid #ddd; - padding: 10px; - border-radius: 4px; -} - -#header { - background: #351a0a; - height: 40px; - border-bottom: 8px solid #d66018; -} - -#content { - margin: 40px 80px; - text-align: justify; -} - -#footer { - text-align: center; - padding: 20px; - border-top: 1px solid #ddd; -} - -/* Languages */ - -#lang { - float: right; - padding: 6px; - font-size: 11px; -} - -#lang a { - text-decoration: none; - padding: 0 2px; -} - -#lang a:hover { - text-decoration: underline; -} diff -r de13422f3a69 -r e232f0e1413a icons.list --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/icons.list Mon Sep 09 03:27:04 2013 +0300 @@ -0,0 +1,23 @@ +# slitaz-logout.desktop +system-log-out: menu +# burn-box.desktop +media-optical-burn: menu +# burn-iso.desktop +iso-image-burn: menu +# scp-box.desktop +folder-remote: menu +# wifi-box.desktop +network-wireless: menu +# gpl-license.desktop +text-x-readme: menu +# passwd.desktop +user_auth: menu +# tazbox-keymap.desktop +preferences-desktop-keyboard: menu +# tazbox-tz.desktop +preferences-system-time: menu +# tazbox-locale.desktop +preferences-desktop-locale: menu + +# burn-box +media-optical-dvd-rw: window big diff -r de13422f3a69 -r e232f0e1413a licenses/bsd.txt --- a/licenses/bsd.txt Thu Jul 25 03:24:36 2013 +0300 +++ b/licenses/bsd.txt Mon Sep 09 03:27:04 2013 +0300 @@ -1,4 +1,4 @@ -Copyright (c) The Regents of the University of California. +Copyright (c) SliTaz GNU/Linux, 2013. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -9,17 +9,17 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -3. Neither the name of the University nor the names of its contributors +3. Neither the name of the SliTaz GNU/Linux nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. -THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +THIS SOFTWARE IS PROVIDED BY THE SLITAZ GNU/LINUX AND CONTRIBUTORS ``AS IS'' +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +ARE DISCLAIMED. IN NO EVENT SHALL THE SLITAZ GNU/LINUX OR CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE +GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF diff -r de13422f3a69 -r e232f0e1413a oldstuff/images/netbox.png Binary file oldstuff/images/netbox.png has changed diff -r de13422f3a69 -r e232f0e1413a oldstuff/images/other.png Binary file oldstuff/images/other.png has changed diff -r de13422f3a69 -r e232f0e1413a oldstuff/images/slitaz-logout.png Binary file oldstuff/images/slitaz-logout.png has changed diff -r de13422f3a69 -r e232f0e1413a pixmaps/netbox.png Binary file pixmaps/netbox.png has changed diff -r de13422f3a69 -r e232f0e1413a pixmaps/other.png Binary file pixmaps/other.png has changed diff -r de13422f3a69 -r e232f0e1413a pixmaps/slitaz-logout.png Binary file pixmaps/slitaz-logout.png has changed diff -r de13422f3a69 -r e232f0e1413a po/slitaz-boxes/es_AR.po --- a/po/slitaz-boxes/es_AR.po Thu Jul 25 03:24:36 2013 +0300 +++ b/po/slitaz-boxes/es_AR.po Mon Sep 09 03:27:04 2013 +0300 @@ -1,13 +1,14 @@ # Spanish translations for SliTaz Boxes package. -# Copyright (C) 2012 SliTaz +# Copyright (C) 2013 SliTaz GNU/Linux # This file is distributed under the same license as the SliTaz Boxes package. # Lucas Gioia , 2011. +# Kevin Fabian Quintero , 2012. # msgid "" msgstr "" "Project-Id-Version: SliTaz Boxes\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-07-01 20:20+0000\n" +"POT-Creation-Date: 2013-09-06 02:11+0300\n" "PO-Revision-Date: 2012-06-11 18:44-0000\n" "Last-Translator: Kevin Fabian Quintero \n" "Language-Team: Argentinian\n" @@ -17,154 +18,258 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#: boxes/wifi-box:15 +msgid "Small Wi-Fi utility to quickly connect to a network." +msgstr "" + +#: boxes/wifi-box:16 boxes/burn-box:33 boxes/scp-box:36 +msgid "Usage:" +msgstr "Uso:" + +#: boxes/wifi-box:17 +msgid "interface" +msgstr "" + +#: boxes/wifi-box:38 +msgid "any" +msgstr "" + +#: boxes/wifi-box:38 +msgid "N/A" +msgstr "" + +#: boxes/wifi-box:38 +msgid "none" +msgstr "" + +#: boxes/wifi-box:38 boxes/wifi-box:49 boxes/wifi-box:64 +msgid "-" +msgstr "" + #: boxes/wifi-box:75 -msgid "Wifi connection" -msgstr "Conexión Wifi" +msgid "WPA Password:" +msgstr "WPA Contraseña:" #: boxes/wifi-box:76 +msgid "WEP Password:" +msgstr "WEP Contraseña:" + +#: boxes/wifi-box:82 +msgid "Wi-Fi connection" +msgstr "Conexión Wi-Fi" + +#: boxes/wifi-box:85 msgid "Connection to:" msgstr "Conectado a:" -#: boxes/wifi-box:81 -msgid "Password:" -msgstr "Contraseña:" +#: boxes/wifi-box:115 +msgid "Wi-Fi network" +msgstr "Red Wi-Fi" -#: boxes/wifi-box:108 -msgid "Wifi network" -msgstr "Red Wifi" +#: boxes/wifi-box:118 +msgid "Connect to a Wi-Fi network (Double click to connect)" +msgstr "Connectar a red Wi-Fi (Doble click para conectarse)" -#: boxes/wifi-box:109 -msgid "Connect to a wifi network \\(Double click to connect\\)" -msgstr "Connectar a red wifi \\(Doble click para conectarse\\)" +#: boxes/wifi-box:120 +msgid "ESSID Name" +msgstr "Nombre de ESSID" -#: boxes/wifi-box:114 -msgid "ESSID Name" -msgstr "Nombre de ESSID " - -#: boxes/wifi-box:114 +#: boxes/wifi-box:120 msgid "Quality" msgstr "Calidad" -#: boxes/wifi-box:115 +#: boxes/wifi-box:121 msgid "Encryption" msgstr "Cifrado" -#: boxes/wifi-box:115 +#: boxes/wifi-box:121 msgid "Status" msgstr "Estado" -#: boxes/wifi-box:146 boxes/burn-box:37 boxes/scp-box:34 -msgid "Usage:" -msgstr "Uso:" +#: boxes/wifi-box:122 +msgid "Start Wi-Fi" +msgstr "" -#: boxes/burn-box:39 boxes/scp-box:36 +#: boxes/wifi-box:122 +msgid "Stop Wi-Fi" +msgstr "" + +#: boxes/burn-box:32 +msgid "Burn-box a small front end to cdrkit powered by Yad/GTK." +msgstr "" + +#: boxes/burn-box:34 boxes/scp-box:37 +msgid "command" +msgstr "" + +#: boxes/burn-box:34 boxes/scp-box:37 +msgid "option" +msgstr "" + +#: boxes/burn-box:34 +msgid "file" +msgstr "" + +#: boxes/burn-box:36 boxes/scp-box:39 msgid "Commands:" msgstr "Comandos:" -#: boxes/burn-box:40 +#: boxes/burn-box:38 msgid "Show all Wodim options" msgstr "Mostrar todas las opciones de Wodim" -#: boxes/burn-box:41 +#: boxes/burn-box:39 msgid "Burn an ISO image" msgstr "Grabar una imagen ISO" -#: boxes/burn-box:42 +#: boxes/burn-box:40 msgid "Create and burn an audio CD" msgstr "Crear y grabar un CD de audio" -#: boxes/burn-box:44 boxes/scp-box:39 boxes/scp-box:66 +#: boxes/burn-box:41 +msgid "Erase a RW disk" +msgstr "" + +#: boxes/burn-box:43 boxes/scp-box:42 boxes/scp-box:70 msgid "Options:" msgstr "Opciónes:" -#: boxes/burn-box:48 boxes/scp-box:43 +#: boxes/burn-box:45 boxes/burn-box:50 boxes/burn-box:51 +msgid "/path/to/image.iso" +msgstr "" + +#: boxes/burn-box:46 boxes/scp-box:44 +msgid "/path/to/directory" +msgstr "" + +#: boxes/burn-box:48 boxes/scp-box:46 msgid "Examples:" msgstr "Ejemplos:" -#: boxes/burn-box:62 -msgid "Decoding files from:" -msgstr "Decodificación de archivos de:" +#: boxes/burn-box:64 +#, sh-format +msgid "Decoding files from: $audio" +msgstr "Decodificación de archivos de: $audio" -#: boxes/burn-box:83 -msgid "Not an ISO image:" -msgstr "No es una imagen ISO:" +#: boxes/burn-box:84 +#, sh-format +msgid "Not an ISO image: \"$iso\"" +msgstr "No es una imagen ISO: \"$iso\"" -#: boxes/burn-box:98 -msgid "Burn ISO images and audio files [data in next releases]" -msgstr "Grabar imágenes ISO y archivos de audio [de datos en próximas versiones]" +#: boxes/burn-box:100 +msgid "Burn-box" +msgstr "" #: boxes/burn-box:102 +msgid "Burn ISO images and audio files [data in next releases]" +msgstr "" +"Grabar imágenes ISO y archivos de audio [de datos en próximas versiones]" + +#: boxes/burn-box:104 msgid "Drive speed:" msgstr "Velocidad de la unidad:" -#: boxes/burn-box:103 +#: boxes/burn-box:105 msgid "Wodim options:" msgstr "Opciones de wodim:" -#: boxes/burn-box:104 +#: boxes/burn-box:106 msgid "ISO image:" msgstr "Imagen ISO:" -#: boxes/burn-box:105 +#: boxes/burn-box:107 msgid "Audio files:" msgstr "Archivos de audio:" -#: boxes/burn-box:106 +#: boxes/burn-box:108 msgid "Wodim help" msgstr "Ayuda de Wodim" -#: boxes/burn-box:107 +#: boxes/burn-box:109 msgid "Blank CD" msgstr "CD en blanco" -#: boxes/burn-box:108 +#: boxes/burn-box:110 msgid "Burn" msgstr "Grabar" -#: boxes/burn-box:152 -msgid "Missing ISO image" -msgstr "Falta la imagen ISO" +#: boxes/burn-box:132 +#, fuzzy +msgid "Burning ISO" +msgstr "Grabar una imagen ISO" -#: boxes/burn-box:160 -msgid "Missing audio directory" -msgstr "Falta el directorio de audio" +#: boxes/burn-box:137 +msgid "Burning Audio" +msgstr "" -#: boxes/scp-box:37 +#: boxes/burn-box:149 +#, fuzzy +msgid "Wodim Help" +msgstr "Ayuda de Wodim" + +#: boxes/burn-box:154 +#, sh-format +msgid "Missing ISO image \"$iso\"" +msgstr "Falta la imagen ISO \"$iso\"" + +#: boxes/burn-box:162 +#, sh-format +msgid "Missing audio directory \"$audio\"" +msgstr "Falta el directorio de audio \"$audio\"" + +#: boxes/burn-box:166 +#, fuzzy +msgid "Blank disk" +msgstr "CD en blanco" + +#: boxes/scp-box:34 +msgid "SCP Box - Small front end to the secure file copy utility." +msgstr "" + +#: boxes/scp-box:40 msgid "List all known hosts" msgstr "Listar todos los host conocidos" -#: boxes/scp-box:59 +#: boxes/scp-box:43 boxes/scp-box:47 +msgid "/path/to/file" +msgstr "" + +#: boxes/scp-box:62 +msgid "SCP Box" +msgstr "" + +#: boxes/scp-box:65 msgid "Secure copy - Copy files remotely with scp" msgstr "Copia segura - Copia de archivos de forma remota con scp" -#: boxes/scp-box:63 +#: boxes/scp-box:67 msgid "User name:" msgstr "Nombre de usuario:" -#: boxes/scp-box:64 +#: boxes/scp-box:68 msgid "Hostname:" msgstr "Nombre del equipo:" -#: boxes/scp-box:65 +#: boxes/scp-box:69 msgid "Known hosts:" msgstr "Hosts conocidos:" -#: boxes/scp-box:67 +#: boxes/scp-box:71 msgid "Local file:" msgstr "Archivo local:" -#: boxes/scp-box:68 +#: boxes/scp-box:72 msgid "Local directory:" msgstr "Directorio local:" -#: boxes/scp-box:69 +#: boxes/scp-box:73 msgid "Remote path:" msgstr "Ubicacion remota:" -#: boxes/scp-box:70 +#: boxes/scp-box:74 msgid "Download" msgstr "Descargar" -#: boxes/scp-box:71 +#: boxes/scp-box:75 msgid "Upload" msgstr "Cargar" diff -r de13422f3a69 -r e232f0e1413a po/slitaz-boxes/fr.po --- a/po/slitaz-boxes/fr.po Thu Jul 25 03:24:36 2013 +0300 +++ b/po/slitaz-boxes/fr.po Mon Sep 09 03:27:04 2013 +0300 @@ -1,13 +1,13 @@ -# French translations for PACKAGE package. -# Copyright (C) 2010 THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. +# French translations for SliTaz Boxes package. +# Copyright (C) 2013 SliTaz GNU/Linux +# This file is distributed under the same license as the SliTaz Boxes package. # Christophe Lincoln , 2010. # msgid "" msgstr "" -"Project-Id-Version: scpbox 20100314\n" +"Project-Id-Version: SliTaz Boxes\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-07-01 20:20+0000\n" +"POT-Creation-Date: 2013-09-06 02:11+0300\n" "PO-Revision-Date: 2012-05-02 16:00+0100\n" "Last-Translator: Christophe Lincoln \n" "Language-Team: French\n" @@ -17,162 +17,263 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" +#: boxes/wifi-box:15 +msgid "Small Wi-Fi utility to quickly connect to a network." +msgstr "" + +#: boxes/wifi-box:16 boxes/burn-box:33 boxes/scp-box:36 +msgid "Usage:" +msgstr "Utilisation:" + +#: boxes/wifi-box:17 +msgid "interface" +msgstr "" + +#: boxes/wifi-box:38 +msgid "any" +msgstr "" + +#: boxes/wifi-box:38 +msgid "N/A" +msgstr "" + +#: boxes/wifi-box:38 +msgid "none" +msgstr "" + +#: boxes/wifi-box:38 boxes/wifi-box:49 boxes/wifi-box:64 +msgid "-" +msgstr "" + #: boxes/wifi-box:75 -msgid "Wifi connection" -msgstr "Connection wifi" +msgid "WPA Password:" +msgstr "Mot de passe WPA:" #: boxes/wifi-box:76 +msgid "WEP Password:" +msgstr "Mot de passe WEP:" + +#: boxes/wifi-box:82 +msgid "Wi-Fi connection" +msgstr "Connection Wi-Fi" + +#: boxes/wifi-box:85 msgid "Connection to:" msgstr "Se connecter à:" -#: boxes/wifi-box:81 -msgid "Password:" -msgstr "Mot de passe:" +#: boxes/wifi-box:115 +msgid "Wi-Fi network" +msgstr "Réseaux Wi-Fi" -#: boxes/wifi-box:108 -msgid "Wifi network" -msgstr "Réseaux wifi" +#: boxes/wifi-box:118 +msgid "Connect to a Wi-Fi network (Double click to connect)" +msgstr "Connection à un réseau Wi-Fi (Double click pour se connecter)" -#: boxes/wifi-box:109 -msgid "Connect to a wifi network \\(Double click to connect\\)" -msgstr "" -"Connection à un réseau wifi \\(Double click pour se connecter\\)" - -#: boxes/wifi-box:114 +#: boxes/wifi-box:120 msgid "ESSID Name" msgstr "Nom ESSID" -#: boxes/wifi-box:114 +#: boxes/wifi-box:120 msgid "Quality" msgstr "Qualité" -#: boxes/wifi-box:115 +#: boxes/wifi-box:121 msgid "Encryption" msgstr "Cryptage" -#: boxes/wifi-box:115 +#: boxes/wifi-box:121 msgid "Status" msgstr "Statut" -#: boxes/wifi-box:146 boxes/burn-box:37 boxes/scp-box:34 -msgid "Usage:" -msgstr "Utilisation" +#: boxes/wifi-box:122 +msgid "Start Wi-Fi" +msgstr "" -#: boxes/burn-box:39 boxes/scp-box:36 +#: boxes/wifi-box:122 +msgid "Stop Wi-Fi" +msgstr "" + +#: boxes/burn-box:32 +msgid "Burn-box a small front end to cdrkit powered by Yad/GTK." +msgstr "" + +#: boxes/burn-box:34 boxes/scp-box:37 +msgid "command" +msgstr "" + +#: boxes/burn-box:34 boxes/scp-box:37 +msgid "option" +msgstr "" + +#: boxes/burn-box:34 +msgid "file" +msgstr "" + +#: boxes/burn-box:36 boxes/scp-box:39 msgid "Commands:" -msgstr "Commandes" +msgstr "Commandes:" -#: boxes/burn-box:40 +#: boxes/burn-box:38 msgid "Show all Wodim options" msgstr "Voir toutes les options de Wodim" -#: boxes/burn-box:41 +#: boxes/burn-box:39 msgid "Burn an ISO image" msgstr "Graver une image ISO" -#: boxes/burn-box:42 +#: boxes/burn-box:40 msgid "Create and burn an audio CD" msgstr "Crée et grave un CD audio" -#: boxes/burn-box:44 boxes/scp-box:39 boxes/scp-box:66 +#: boxes/burn-box:41 +msgid "Erase a RW disk" +msgstr "" + +#: boxes/burn-box:43 boxes/scp-box:42 boxes/scp-box:70 msgid "Options:" msgstr "Options:" -#: boxes/burn-box:48 boxes/scp-box:43 +#: boxes/burn-box:45 boxes/burn-box:50 boxes/burn-box:51 +msgid "/path/to/image.iso" +msgstr "" + +#: boxes/burn-box:46 boxes/scp-box:44 +msgid "/path/to/directory" +msgstr "" + +#: boxes/burn-box:48 boxes/scp-box:46 msgid "Examples:" msgstr "Exemples:" -#: boxes/burn-box:62 -msgid "Decoding files from:" -msgstr "Décodage des fichiers depuis:" +#: boxes/burn-box:64 +#, sh-format +msgid "Decoding files from: $audio" +msgstr "Décodage des fichiers depuis: $audio" -#: boxes/burn-box:83 -msgid "Not an ISO image:" -msgstr "Ceci n'est pas une image ISO:" +#: boxes/burn-box:84 +#, sh-format +msgid "Not an ISO image: \"$iso\"" +msgstr "Ceci n'est pas une image ISO: \"$iso\"" -#: boxes/burn-box:98 +#: boxes/burn-box:100 +#, fuzzy +msgid "Burn-box" +msgstr "Graver" + +#: boxes/burn-box:102 msgid "Burn ISO images and audio files [data in next releases]" msgstr "Graver des ISO et des fichiers audio [CD de données à venir]" -#: boxes/burn-box:102 +#: boxes/burn-box:104 msgid "Drive speed:" msgstr "Vitesse de gravure:" -#: boxes/burn-box:103 +#: boxes/burn-box:105 msgid "Wodim options:" msgstr "Options de Wodim" -#: boxes/burn-box:104 +#: boxes/burn-box:106 msgid "ISO image:" msgstr "Image ISO:" -#: boxes/burn-box:105 +#: boxes/burn-box:107 msgid "Audio files:" msgstr "Fichiers audio:" -#: boxes/burn-box:106 +#: boxes/burn-box:108 msgid "Wodim help" msgstr "Aide de Wodim" -#: boxes/burn-box:107 +#: boxes/burn-box:109 msgid "Blank CD" msgstr "Effacer le CD" -#: boxes/burn-box:108 +#: boxes/burn-box:110 msgid "Burn" msgstr "Graver" -#: boxes/burn-box:152 -msgid "Missing ISO image" -msgstr "Image ISO manquante" +#: boxes/burn-box:132 +msgid "Burning ISO" +msgstr "Graver une image ISO" -#: boxes/burn-box:160 -msgid "Missing audio directory" -msgstr "Le dossier audio est manquant" +#: boxes/burn-box:137 +msgid "Burning Audio" +msgstr "" -#: boxes/scp-box:37 +#: boxes/burn-box:149 +msgid "Wodim Help" +msgstr "Aide de Wodim" + +#: boxes/burn-box:154 +#, sh-format +msgid "Missing ISO image \"$iso\"" +msgstr "Image ISO \"$iso\" manquante" + +#: boxes/burn-box:162 +#, sh-format +msgid "Missing audio directory \"$audio\"" +msgstr "Le dossier audio \"$audio\" est manquant" + +#: boxes/burn-box:166 #, fuzzy +msgid "Blank disk" +msgstr "Effacer le CD" + +#: boxes/scp-box:34 +msgid "SCP Box - Small front end to the secure file copy utility." +msgstr "" + +#: boxes/scp-box:40 msgid "List all known hosts" msgstr "Liste tous les noms d'hôte connu" -#: boxes/scp-box:59 -#, fuzzy +#: boxes/scp-box:43 boxes/scp-box:47 +msgid "/path/to/file" +msgstr "" + +#: boxes/scp-box:62 +msgid "SCP Box" +msgstr "" + +#: boxes/scp-box:65 msgid "Secure copy - Copy files remotely with scp" msgstr "Copie sécurisée - Copie de fichiers distants avec scp" -#: boxes/scp-box:63 +#: boxes/scp-box:67 msgid "User name:" msgstr "Nom d'utilisateur:" -#: boxes/scp-box:64 +#: boxes/scp-box:68 msgid "Hostname:" msgstr "Nom d'hôte:" -#: boxes/scp-box:65 -#, fuzzy +#: boxes/scp-box:69 msgid "Known hosts:" msgstr "Hôtes connu:" -#: boxes/scp-box:67 +#: boxes/scp-box:71 msgid "Local file:" msgstr "Fichiers local:" -#: boxes/scp-box:68 +#: boxes/scp-box:72 msgid "Local directory:" msgstr "Dossier local:" -#: boxes/scp-box:69 +#: boxes/scp-box:73 msgid "Remote path:" -msgstr "Chemin distant" +msgstr "Chemin distant:" -#: boxes/scp-box:70 +#: boxes/scp-box:74 msgid "Download" msgstr "Télécharger" -#: boxes/scp-box:71 +#: boxes/scp-box:75 msgid "Upload" msgstr "Envoyer" +#~ msgid "Configuration" +#~ msgstr "Configuration" + #~ msgid "" #~ "\n" #~ "Copy files securely with scp from Dropbear SSH client/server.\n" @@ -182,9 +283,6 @@ #~ "Copie de fichiers distants et sécurisée avec scp de Dropbear\n" #~ "\t\t" -#~ msgid "Configuration" -#~ msgstr "Configuration" - #~ msgid "User :" #~ msgstr "Utilisateur :" diff -r de13422f3a69 -r e232f0e1413a po/slitaz-boxes/pl.po --- a/po/slitaz-boxes/pl.po Thu Jul 25 03:24:36 2013 +0300 +++ b/po/slitaz-boxes/pl.po Mon Sep 09 03:27:04 2013 +0300 @@ -1,5 +1,5 @@ # Polish translation for SliTaz Boxes package. -# Copyright (C) 2013 SliTaz +# Copyright (C) 2013 SliTaz GNU/Linux # This file is distributed under the same license as the SliTaz Boxes package. # Paweł Pyrczak , 2013. # @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: SliTaz Boxes\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-07-01 20:20+0000\n" +"POT-Creation-Date: 2013-09-06 02:11+0300\n" "PO-Revision-Date: 2013-07-23 12:35+0100\n" "Last-Translator: Paweł Pyrczak \n" "Language-Team: Paweł Pyrczak \n" @@ -15,160 +15,261 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Poedit-Language: Polish\n" "X-Poedit-Country: POLAND\n" "X-Poedit-SourceCharset: utf-8\n" +#: boxes/wifi-box:15 +msgid "Small Wi-Fi utility to quickly connect to a network." +msgstr "" + +#: boxes/wifi-box:16 boxes/burn-box:33 boxes/scp-box:36 +msgid "Usage:" +msgstr "Użycie:" + +#: boxes/wifi-box:17 +msgid "interface" +msgstr "" + +#: boxes/wifi-box:38 +msgid "any" +msgstr "" + +#: boxes/wifi-box:38 +msgid "N/A" +msgstr "" + +#: boxes/wifi-box:38 +msgid "none" +msgstr "" + +#: boxes/wifi-box:38 boxes/wifi-box:49 boxes/wifi-box:64 +msgid "-" +msgstr "" + #: boxes/wifi-box:75 -msgid "Wifi connection" -msgstr "Połączenie Wifi" +#, fuzzy +msgid "WPA Password:" +msgstr "Hasło WPA:" #: boxes/wifi-box:76 +#, fuzzy +msgid "WEP Password:" +msgstr "Hasło WEP:" + +#: boxes/wifi-box:82 +msgid "Wi-Fi connection" +msgstr "Połączenie Wi-Fi" + +#: boxes/wifi-box:85 msgid "Connection to:" msgstr "Połączenie z:" -#: boxes/wifi-box:81 -msgid "Password:" -msgstr "Hasło:" +#: boxes/wifi-box:115 +msgid "Wi-Fi network" +msgstr "Sieć Wi-Fi" -#: boxes/wifi-box:108 -msgid "Wifi network" -msgstr "Sieć Wifi" +#: boxes/wifi-box:118 +msgid "Connect to a Wi-Fi network (Double click to connect)" +msgstr "Połącz z siecią Wi-Fi (Podwójne kliknięcie aby połączyć)" -#: boxes/wifi-box:109 -msgid "Connect to a wifi network \\(Double click to connect\\)" -msgstr "Połącz z siecią Wifi \\(Podwójne kliknięcie aby połączyć\\)" - -#: boxes/wifi-box:114 +#: boxes/wifi-box:120 msgid "ESSID Name" msgstr "Nazwa ESSID" -#: boxes/wifi-box:114 +#: boxes/wifi-box:120 msgid "Quality" msgstr "Jakość" -#: boxes/wifi-box:115 +#: boxes/wifi-box:121 msgid "Encryption" msgstr "Szyfrowanie" -#: boxes/wifi-box:115 +#: boxes/wifi-box:121 msgid "Status" msgstr "Status" -#: boxes/wifi-box:146 boxes/burn-box:37 boxes/scp-box:34 -msgid "Usage:" -msgstr "Użycie:" +#: boxes/wifi-box:122 +msgid "Start Wi-Fi" +msgstr "" -#: boxes/burn-box:39 boxes/scp-box:36 +#: boxes/wifi-box:122 +msgid "Stop Wi-Fi" +msgstr "" + +#: boxes/burn-box:32 +msgid "Burn-box a small front end to cdrkit powered by Yad/GTK." +msgstr "" + +#: boxes/burn-box:34 boxes/scp-box:37 +msgid "command" +msgstr "" + +#: boxes/burn-box:34 boxes/scp-box:37 +msgid "option" +msgstr "" + +#: boxes/burn-box:34 +msgid "file" +msgstr "" + +#: boxes/burn-box:36 boxes/scp-box:39 msgid "Commands:" msgstr "Komendy:" -#: boxes/burn-box:40 +#: boxes/burn-box:38 msgid "Show all Wodim options" msgstr "Pokaż wszystkie opcje Wodim" -#: boxes/burn-box:41 +#: boxes/burn-box:39 msgid "Burn an ISO image" msgstr "Wypal obraz ISO" -#: boxes/burn-box:42 +#: boxes/burn-box:40 msgid "Create and burn an audio CD" msgstr "Utwórz i wypal płytę Audio CD" -#: boxes/burn-box:44 boxes/scp-box:39 boxes/scp-box:66 +#: boxes/burn-box:41 +msgid "Erase a RW disk" +msgstr "" + +#: boxes/burn-box:43 boxes/scp-box:42 boxes/scp-box:70 msgid "Options:" msgstr "Opcje:" -#: boxes/burn-box:48 boxes/scp-box:43 +#: boxes/burn-box:45 boxes/burn-box:50 boxes/burn-box:51 +msgid "/path/to/image.iso" +msgstr "" + +#: boxes/burn-box:46 boxes/scp-box:44 +msgid "/path/to/directory" +msgstr "" + +#: boxes/burn-box:48 boxes/scp-box:46 msgid "Examples:" msgstr "Przykłady:" -#: boxes/burn-box:62 -msgid "Decoding files from:" -msgstr "Dekodowanie plików z:" +#: boxes/burn-box:64 +#, sh-format +msgid "Decoding files from: $audio" +msgstr "Dekodowanie plików z: $audio" -#: boxes/burn-box:83 -msgid "Not an ISO image:" -msgstr "Niezgodny z formatem obrazu ISO:" +#: boxes/burn-box:84 +#, sh-format +msgid "Not an ISO image: \"$iso\"" +msgstr "Niezgodny z formatem obrazu ISO: \"$iso\"" -#: boxes/burn-box:98 +#: boxes/burn-box:100 +#, fuzzy +msgid "Burn-box" +msgstr "Wypal" + +#: boxes/burn-box:102 msgid "Burn ISO images and audio files [data in next releases]" msgstr "Wypal obraz ISO i pliki audio [dane w następnym wydaniu]" -#: boxes/burn-box:102 +#: boxes/burn-box:104 msgid "Drive speed:" msgstr "Prędkość napędu:" -#: boxes/burn-box:103 +#: boxes/burn-box:105 msgid "Wodim options:" msgstr "Opcje Wodim:" -#: boxes/burn-box:104 +#: boxes/burn-box:106 msgid "ISO image:" msgstr "Obraz ISO:" -#: boxes/burn-box:105 +#: boxes/burn-box:107 msgid "Audio files:" msgstr "Pliki audio:" -#: boxes/burn-box:106 +#: boxes/burn-box:108 msgid "Wodim help" msgstr "Pomoc Wodim" -#: boxes/burn-box:107 +#: boxes/burn-box:109 msgid "Blank CD" msgstr "Czysta płyta CD" -#: boxes/burn-box:108 +#: boxes/burn-box:110 msgid "Burn" msgstr "Wypal" -#: boxes/burn-box:152 -msgid "Missing ISO image" -msgstr "Brakujący obraz ISO" +#: boxes/burn-box:132 +msgid "Burning ISO" +msgstr "Wypal obraz ISO" -#: boxes/burn-box:160 -msgid "Missing audio directory" -msgstr "Brakujący katalog audio" +#: boxes/burn-box:137 +msgid "Burning Audio" +msgstr "" -#: boxes/scp-box:37 +#: boxes/burn-box:149 +msgid "Wodim Help" +msgstr "Pomoc Wodim" + +#: boxes/burn-box:154 +#, sh-format +msgid "Missing ISO image \"$iso\"" +msgstr "Brakujący obraz ISO \"$iso\"" + +#: boxes/burn-box:162 +#, sh-format +msgid "Missing audio directory \"$audio\"" +msgstr "Brakujący katalog audio \"$audio\"" + +#: boxes/burn-box:166 +msgid "Blank disk" +msgstr "Czysta płyta CD" + +#: boxes/scp-box:34 +msgid "SCP Box - Small front end to the secure file copy utility." +msgstr "" + +#: boxes/scp-box:40 msgid "List all known hosts" msgstr "Lista wszystkich znanych komputerów" -#: boxes/scp-box:59 +#: boxes/scp-box:43 boxes/scp-box:47 +msgid "/path/to/file" +msgstr "" + +#: boxes/scp-box:62 +msgid "SCP Box" +msgstr "" + +#: boxes/scp-box:65 msgid "Secure copy - Copy files remotely with scp" msgstr "Bezpieczna kopia - Kopiuj pliki zdalnie używając scp" -#: boxes/scp-box:63 +#: boxes/scp-box:67 msgid "User name:" msgstr "Nazwa użytkownika:" -#: boxes/scp-box:64 +#: boxes/scp-box:68 msgid "Hostname:" msgstr "Nazwa komputera:" -#: boxes/scp-box:65 +#: boxes/scp-box:69 msgid "Known hosts:" msgstr "Znane komputery:" -#: boxes/scp-box:67 +#: boxes/scp-box:71 msgid "Local file:" msgstr "Lokalny plik:" -#: boxes/scp-box:68 +#: boxes/scp-box:72 msgid "Local directory:" msgstr "Lokalny katalog:" -#: boxes/scp-box:69 +#: boxes/scp-box:73 msgid "Remote path:" msgstr "Zdalna ścieżka:" -#: boxes/scp-box:70 +#: boxes/scp-box:74 msgid "Download" msgstr "Pobierz" -#: boxes/scp-box:71 +#: boxes/scp-box:75 msgid "Upload" msgstr "Wyślij" - diff -r de13422f3a69 -r e232f0e1413a po/slitaz-boxes/pt_BR.po --- a/po/slitaz-boxes/pt_BR.po Thu Jul 25 03:24:36 2013 +0300 +++ b/po/slitaz-boxes/pt_BR.po Mon Sep 09 03:27:04 2013 +0300 @@ -1,13 +1,13 @@ -# Scpbox Portuguese translation. -# Copyright (C) 2010-2011 www.slitaz.org -# This file is distributed under the same license as the scpbox package. +# Portuguese translation for SliTaz Boxes package. +# Copyright (C) 2013 SliTaz GNU/Linux +# This file is distributed under the same license as the SliTaz Boxes package. # Claudinei Pereira , 2010. # msgid "" msgstr "" -"Project-Id-Version: scpbox\n" +"Project-Id-Version: SliTaz Boxes\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-07-01 20:20+0000\n" +"POT-Creation-Date: 2013-09-06 02:11+0300\n" "PO-Revision-Date: 2013-01-26 01:30-0300\n" "Last-Translator: Claudinei Pereira \n" "Language-Team: Portuguese \n" @@ -17,158 +17,261 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" +#: boxes/wifi-box:15 +msgid "Small Wi-Fi utility to quickly connect to a network." +msgstr "" + +#: boxes/wifi-box:16 boxes/burn-box:33 boxes/scp-box:36 +msgid "Usage:" +msgstr "Utilização:" + +#: boxes/wifi-box:17 +msgid "interface" +msgstr "" + +#: boxes/wifi-box:38 +msgid "any" +msgstr "" + +#: boxes/wifi-box:38 +msgid "N/A" +msgstr "" + +#: boxes/wifi-box:38 +msgid "none" +msgstr "" + +#: boxes/wifi-box:38 boxes/wifi-box:49 boxes/wifi-box:64 +msgid "-" +msgstr "" + #: boxes/wifi-box:75 -msgid "Wifi connection" -msgstr "Conexão wifi" +msgid "WPA Password:" +msgstr "WPA Senha:" #: boxes/wifi-box:76 +msgid "WEP Password:" +msgstr "WEP Senha:" + +#: boxes/wifi-box:82 +msgid "Wi-Fi connection" +msgstr "Conexão Wi-Fi" + +#: boxes/wifi-box:85 msgid "Connection to:" msgstr "Conectar a:" -#: boxes/wifi-box:81 -msgid "Password:" -msgstr "Senha:" +#: boxes/wifi-box:115 +msgid "Wi-Fi network" +msgstr "Rede Wi-Fi" -#: boxes/wifi-box:108 -msgid "Wifi network" -msgstr "Rede wifi" +#: boxes/wifi-box:118 +msgid "Connect to a Wi-Fi network (Double click to connect)" +msgstr "Conectar à rede Wi-Fi (Clique duplo para conectar)" -#: boxes/wifi-box:109 -msgid "Connect to a wifi network \\(Double click to connect\\)" -msgstr "Conectar à rede wifi \\(Clique duplo para conectar\\)" - -#: boxes/wifi-box:114 +#: boxes/wifi-box:120 msgid "ESSID Name" msgstr "ESSID da rede" -#: boxes/wifi-box:114 +#: boxes/wifi-box:120 msgid "Quality" msgstr "Qualidade" -#: boxes/wifi-box:115 +#: boxes/wifi-box:121 msgid "Encryption" msgstr "Encriptação" -#: boxes/wifi-box:115 +#: boxes/wifi-box:121 msgid "Status" msgstr "Status" -#: boxes/wifi-box:146 boxes/burn-box:37 boxes/scp-box:34 -msgid "Usage:" -msgstr "Utilização:" +#: boxes/wifi-box:122 +msgid "Start Wi-Fi" +msgstr "" -#: boxes/burn-box:39 boxes/scp-box:36 +#: boxes/wifi-box:122 +msgid "Stop Wi-Fi" +msgstr "" + +#: boxes/burn-box:32 +msgid "Burn-box a small front end to cdrkit powered by Yad/GTK." +msgstr "" + +#: boxes/burn-box:34 boxes/scp-box:37 +msgid "command" +msgstr "" + +#: boxes/burn-box:34 boxes/scp-box:37 +msgid "option" +msgstr "" + +#: boxes/burn-box:34 +msgid "file" +msgstr "" + +#: boxes/burn-box:36 boxes/scp-box:39 msgid "Commands:" -msgstr "Comandos" +msgstr "Comandos:" -#: boxes/burn-box:40 +#: boxes/burn-box:38 msgid "Show all Wodim options" msgstr "Mostrar todas as opções do Wodim" -#: boxes/burn-box:41 +#: boxes/burn-box:39 msgid "Burn an ISO image" msgstr "Gravar uma imagem ISO" -#: boxes/burn-box:42 +#: boxes/burn-box:40 msgid "Create and burn an audio CD" msgstr "Criar e gravar um CD de áudio" -#: boxes/burn-box:44 boxes/scp-box:39 boxes/scp-box:66 +#: boxes/burn-box:41 +msgid "Erase a RW disk" +msgstr "" + +#: boxes/burn-box:43 boxes/scp-box:42 boxes/scp-box:70 msgid "Options:" msgstr "Opções:" -#: boxes/burn-box:48 boxes/scp-box:43 +#: boxes/burn-box:45 boxes/burn-box:50 boxes/burn-box:51 +msgid "/path/to/image.iso" +msgstr "" + +#: boxes/burn-box:46 boxes/scp-box:44 +msgid "/path/to/directory" +msgstr "" + +#: boxes/burn-box:48 boxes/scp-box:46 msgid "Examples:" msgstr "Exemplos:" -#: boxes/burn-box:62 -msgid "Decoding files from:" -msgstr "Decodificando arquivos de:" +#: boxes/burn-box:64 +#, sh-format +msgid "Decoding files from: $audio" +msgstr "Decodificando arquivos de: $audio" -#: boxes/burn-box:83 -msgid "Not an ISO image:" -msgstr "Imagem ISO inválida:" +#: boxes/burn-box:84 +#, sh-format +msgid "Not an ISO image: \"$iso\"" +msgstr "Imagem ISO \"$iso\" inválida" -#: boxes/burn-box:98 +#: boxes/burn-box:100 +msgid "Burn-box" +msgstr "" + +#: boxes/burn-box:102 msgid "Burn ISO images and audio files [data in next releases]" msgstr "Gravar imagens ISO e arquivos de áudio (dados no próximo lançamento]" -#: boxes/burn-box:102 +#: boxes/burn-box:104 msgid "Drive speed:" msgstr "Velocidade do drive:" -#: boxes/burn-box:103 +#: boxes/burn-box:105 msgid "Wodim options:" msgstr "Opções do Wodim:" -#: boxes/burn-box:104 +#: boxes/burn-box:106 msgid "ISO image:" msgstr "Imagem ISO:" -#: boxes/burn-box:105 +#: boxes/burn-box:107 msgid "Audio files:" msgstr "Arquivos de áudio:" -#: boxes/burn-box:106 +#: boxes/burn-box:108 msgid "Wodim help" msgstr "Ajuda do Wodim" -#: boxes/burn-box:107 +#: boxes/burn-box:109 msgid "Blank CD" msgstr "CD em branco" -#: boxes/burn-box:108 +#: boxes/burn-box:110 msgid "Burn" msgstr "Gravar" -#: boxes/burn-box:152 -msgid "Missing ISO image" -msgstr "Imagem ISO não encontrada" +#: boxes/burn-box:132 +msgid "Burning ISO" +msgstr "Gravar uma imagem ISO" -#: boxes/burn-box:160 -msgid "Missing audio directory" -msgstr "Diretório com áudio não encontrado" +#: boxes/burn-box:137 +msgid "Burning Audio" +msgstr "" -#: boxes/scp-box:37 +#: boxes/burn-box:149 +msgid "Wodim Help" +msgstr "Ajuda do Wodim" + +#: boxes/burn-box:154 +#, sh-format +msgid "Missing ISO image \"$iso\"" +msgstr "Imagem ISO \"$iso\" não encontrada" + +#: boxes/burn-box:162 +#, sh-format +msgid "Missing audio directory \"$audio\"" +msgstr "Diretório com áudio \"$audio\" não encontrado" + +#: boxes/burn-box:166 +msgid "Blank disk" +msgstr "CD em branco" + +#: boxes/scp-box:34 +msgid "SCP Box - Small front end to the secure file copy utility." +msgstr "" + +#: boxes/scp-box:40 msgid "List all known hosts" msgstr "Listar hosts disponíveis" -#: boxes/scp-box:59 +#: boxes/scp-box:43 boxes/scp-box:47 +msgid "/path/to/file" +msgstr "" + +#: boxes/scp-box:62 +msgid "SCP Box" +msgstr "" + +#: boxes/scp-box:65 msgid "Secure copy - Copy files remotely with scp" msgstr "Cópia segura - Copia arquivos remotamente com o scp" -#: boxes/scp-box:63 +#: boxes/scp-box:67 msgid "User name:" msgstr "Nome de usuário:" -#: boxes/scp-box:64 +#: boxes/scp-box:68 msgid "Hostname:" msgstr "Nome do host:" -#: boxes/scp-box:65 +#: boxes/scp-box:69 msgid "Known hosts:" msgstr "Hosts conhecidos:" -#: boxes/scp-box:67 +#: boxes/scp-box:71 msgid "Local file:" msgstr "Arquivos locais:" -#: boxes/scp-box:68 +#: boxes/scp-box:72 msgid "Local directory:" msgstr "Diretório local:" -#: boxes/scp-box:69 +#: boxes/scp-box:73 msgid "Remote path:" msgstr "Caminho remoto:" -#: boxes/scp-box:70 +#: boxes/scp-box:74 msgid "Download" msgstr "Download" -#: boxes/scp-box:71 +#: boxes/scp-box:75 msgid "Upload" msgstr "Upload" +#~ msgid "Configuration" +#~ msgstr "Configuração" + #~ msgid "" #~ "\n" #~ "Copy files securely with scp from Dropbear SSH client/server.\n" @@ -178,9 +281,6 @@ #~ "Copie arquivos de forma segura com o scp do Cliente/Servidor Dropbear.\n" #~ "\t\t" -#~ msgid "Configuration" -#~ msgstr "Configuração" - #~ msgid "User :" #~ msgstr "Usuário :" diff -r de13422f3a69 -r e232f0e1413a po/slitaz-boxes/ru.po --- a/po/slitaz-boxes/ru.po Thu Jul 25 03:24:36 2013 +0300 +++ b/po/slitaz-boxes/ru.po Mon Sep 09 03:27:04 2013 +0300 @@ -1,14 +1,14 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. +# Russian translation for SliTaz Boxes package. +# Copyright (C) 2013 SliTaz GNU/Linux +# This file is distributed under the same license as the SliTaz Boxes package. # Aleksej Bobylev , 2012. # msgid "" msgstr "" "Project-Id-Version: SliTaz Boxes\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-07-01 20:20+0000\n" -"PO-Revision-Date: 2012-07-15 15:14-0000\n" +"POT-Creation-Date: 2013-09-06 02:11+0300\n" +"PO-Revision-Date: 2013-09-06 02:18+0300\n" "Last-Translator: Aleksej Bobylev \n" "Language-Team: \n" "Language: \n" @@ -18,161 +18,269 @@ "X-Poedit-Basepath: ../../\n" "X-Poedit-SearchPath-0: .\n" +#: boxes/wifi-box:15 +msgid "Small Wi-Fi utility to quickly connect to a network." +msgstr "Маленькая утилита для быстрого соединения с сетью Wi-Fi." + +#: boxes/wifi-box:16 +#: boxes/burn-box:33 +#: boxes/scp-box:36 +msgid "Usage:" +msgstr "Использование:" + +#: boxes/wifi-box:17 +msgid "interface" +msgstr "интерфейс" + +#: boxes/wifi-box:38 +msgid "any" +msgstr "любое" + +#: boxes/wifi-box:38 +msgid "N/A" +msgstr "недоступно" + +#: boxes/wifi-box:38 +msgid "none" +msgstr "нет" + +#: boxes/wifi-box:38 +#: boxes/wifi-box:49 +#: boxes/wifi-box:64 +msgid "-" +msgstr "—" + #: boxes/wifi-box:75 -msgid "Wifi connection" -msgstr "Соединение WiFi" +msgid "WPA Password:" +msgstr "Пароль WPA:" #: boxes/wifi-box:76 +msgid "WEP Password:" +msgstr "Пароль WEP:" + +#: boxes/wifi-box:82 +msgid "Wi-Fi connection" +msgstr "Соединение Wi-Fi" + +#: boxes/wifi-box:85 msgid "Connection to:" msgstr "Соединение с:" -#: boxes/wifi-box:81 -msgid "Password:" -msgstr "Пароль:" +#: boxes/wifi-box:115 +msgid "Wi-Fi network" +msgstr "Сеть Wi-Fi" -#: boxes/wifi-box:108 -msgid "Wifi network" -msgstr "Сеть WiFi" +#: boxes/wifi-box:118 +msgid "Connect to a Wi-Fi network (Double click to connect)" +msgstr "Соединиться с сетью Wi-Fi (двойной клик для соединения)" -#: boxes/wifi-box:109 -msgid "Connect to a wifi network \\(Double click to connect\\)" -msgstr "Соединиться с сетью WiFi \\(двойной клик для соединения\\)" +#: boxes/wifi-box:120 +msgid "ESSID Name" +msgstr "Имя (ESSID)" -#: boxes/wifi-box:114 -msgid "ESSID Name" -msgstr "Имя ESSID" - -#: boxes/wifi-box:114 +#: boxes/wifi-box:120 msgid "Quality" msgstr "Уровень сигнала" -#: boxes/wifi-box:115 +#: boxes/wifi-box:121 msgid "Encryption" msgstr "Шифрование" -#: boxes/wifi-box:115 +#: boxes/wifi-box:121 msgid "Status" msgstr "Состояние" -#: boxes/wifi-box:146 -#: boxes/burn-box:37 -#: boxes/scp-box:34 -msgid "Usage:" -msgstr "Использование:" +#: boxes/wifi-box:122 +msgid "Start Wi-Fi" +msgstr "Запустить Wi-Fi" -#: boxes/burn-box:39 -#: boxes/scp-box:36 +#: boxes/wifi-box:122 +msgid "Stop Wi-Fi" +msgstr "Остановить Wi-Fi" + +#: boxes/burn-box:32 +msgid "Burn-box a small front end to cdrkit powered by Yad/GTK." +msgstr "Burn-box — фронтенд для cdrkit, использующий Yad и GTK." + +#: boxes/burn-box:34 +#: boxes/scp-box:37 +msgid "command" +msgstr "команда" + +#: boxes/burn-box:34 +#: boxes/scp-box:37 +msgid "option" +msgstr "параметр" + +#: boxes/burn-box:34 +msgid "file" +msgstr "файл" + +#: boxes/burn-box:36 +#: boxes/scp-box:39 msgid "Commands:" msgstr "Команды:" -#: boxes/burn-box:40 +#: boxes/burn-box:38 msgid "Show all Wodim options" msgstr "Показать все параметры Wodim" -#: boxes/burn-box:41 +#: boxes/burn-box:39 msgid "Burn an ISO image" msgstr "Записать образ ISO" -#: boxes/burn-box:42 +#: boxes/burn-box:40 msgid "Create and burn an audio CD" msgstr "Создать и записать аудио-диск" -#: boxes/burn-box:44 -#: boxes/scp-box:39 -#: boxes/scp-box:66 +#: boxes/burn-box:41 +msgid "Erase a RW disk" +msgstr "Стереть RW-диск" + +#: boxes/burn-box:43 +#: boxes/scp-box:42 +#: boxes/scp-box:70 msgid "Options:" msgstr "Параметры:" +#: boxes/burn-box:45 +#: boxes/burn-box:50 +#: boxes/burn-box:51 +msgid "/path/to/image.iso" +msgstr "/путь/к/образу.iso" + +#: boxes/burn-box:46 +#: boxes/scp-box:44 +msgid "/path/to/directory" +msgstr "/путь/к/папке" + #: boxes/burn-box:48 -#: boxes/scp-box:43 +#: boxes/scp-box:46 msgid "Examples:" msgstr "Примеры:" -#: boxes/burn-box:62 -msgid "Decoding files from:" -msgstr "Обработка файлов из папки:" +#: boxes/burn-box:64 +#, sh-format +msgid "Decoding files from: $audio" +msgstr "Обработка файлов из папки: $audio" -#: boxes/burn-box:83 -msgid "Not an ISO image:" -msgstr "Не является образом ISO:" +#: boxes/burn-box:84 +#, sh-format +msgid "Not an ISO image: \"$iso\"" +msgstr "Файл «$iso» не является образом ISO" -#: boxes/burn-box:98 +#: boxes/burn-box:100 +msgid "Burn-box" +msgstr "Запись диска" + +#: boxes/burn-box:102 msgid "Burn ISO images and audio files [data in next releases]" msgstr "Запись образов ISO и аудио-файлов [запись данных пока недоступна]" -#: boxes/burn-box:102 +#: boxes/burn-box:104 msgid "Drive speed:" msgstr "Скорость привода:" -#: boxes/burn-box:103 +#: boxes/burn-box:105 msgid "Wodim options:" msgstr "Параметры Wodim:" -#: boxes/burn-box:104 +#: boxes/burn-box:106 msgid "ISO image:" msgstr "Образ ISO:" -#: boxes/burn-box:105 +#: boxes/burn-box:107 msgid "Audio files:" msgstr "Аудио-файлы:" -#: boxes/burn-box:106 +#: boxes/burn-box:108 msgid "Wodim help" msgstr "Справка Wodim" -#: boxes/burn-box:107 +#: boxes/burn-box:109 msgid "Blank CD" -msgstr "Чистый диск" +msgstr "Очистить диск" -#: boxes/burn-box:108 +#: boxes/burn-box:110 msgid "Burn" msgstr "Записать" -#: boxes/burn-box:152 -msgid "Missing ISO image" -msgstr "Отсутствует образ ISO" +#: boxes/burn-box:132 +msgid "Burning ISO" +msgstr "Запись образа ISO" -#: boxes/burn-box:160 -msgid "Missing audio directory" -msgstr "Отсутствует папка аудио" +#: boxes/burn-box:137 +msgid "Burning Audio" +msgstr "Запись аудио-диска" -#: boxes/scp-box:37 +#: boxes/burn-box:149 +msgid "Wodim Help" +msgstr "Справка Wodim" + +#: boxes/burn-box:154 +#, sh-format +msgid "Missing ISO image \"$iso\"" +msgstr "Образ ISO «$iso» не найден" + +#: boxes/burn-box:162 +#, sh-format +msgid "Missing audio directory \"$audio\"" +msgstr "Папка аудио «$audio» не найдена" + +#: boxes/burn-box:166 +msgid "Blank disk" +msgstr "Очистка диска" + +#: boxes/scp-box:34 +msgid "SCP Box - Small front end to the secure file copy utility." +msgstr "SCP Box — фронтенд для утилиты безопасного копирования файлов." + +#: boxes/scp-box:40 msgid "List all known hosts" msgstr "Список всех известных хостов" -#: boxes/scp-box:59 +#: boxes/scp-box:43 +#: boxes/scp-box:47 +msgid "/path/to/file" +msgstr "/путь/к/файлу" + +#: boxes/scp-box:62 +msgid "SCP Box" +msgstr "Диалог SCP" + +#: boxes/scp-box:65 msgid "Secure copy - Copy files remotely with scp" -msgstr "Безопасное копирование файлов удаленно с scp" +msgstr "Защищенное копирование файлов SCP" -#: boxes/scp-box:63 +#: boxes/scp-box:67 msgid "User name:" msgstr "Имя пользователя:" -#: boxes/scp-box:64 +#: boxes/scp-box:68 msgid "Hostname:" msgstr "Название хоста:" -#: boxes/scp-box:65 +#: boxes/scp-box:69 msgid "Known hosts:" msgstr "Известные хосты:" -#: boxes/scp-box:67 +#: boxes/scp-box:71 msgid "Local file:" msgstr "Локальный файл:" -#: boxes/scp-box:68 +#: boxes/scp-box:72 msgid "Local directory:" msgstr "Локальная папка:" -#: boxes/scp-box:69 +#: boxes/scp-box:73 msgid "Remote path:" msgstr "Удаленный путь:" -#: boxes/scp-box:70 +#: boxes/scp-box:74 msgid "Download" msgstr "Загрузить" -#: boxes/scp-box:71 +#: boxes/scp-box:75 msgid "Upload" msgstr "Выгрузить" diff -r de13422f3a69 -r e232f0e1413a po/slitaz-boxes/slitaz-boxes.pot --- a/po/slitaz-boxes/slitaz-boxes.pot Thu Jul 25 03:24:36 2013 +0300 +++ b/po/slitaz-boxes/slitaz-boxes.pot Mon Sep 09 03:27:04 2013 +0300 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: SliTaz Boxes\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-07-01 20:20+0000\n" +"POT-Creation-Date: 2013-09-06 02:11+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,154 +17,254 @@ "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" +#: boxes/wifi-box:15 +msgid "Small Wi-Fi utility to quickly connect to a network." +msgstr "" + +#: boxes/wifi-box:16 boxes/burn-box:33 boxes/scp-box:36 +msgid "Usage:" +msgstr "" + +#: boxes/wifi-box:17 +msgid "interface" +msgstr "" + +#: boxes/wifi-box:38 +msgid "any" +msgstr "" + +#: boxes/wifi-box:38 +msgid "N/A" +msgstr "" + +#: boxes/wifi-box:38 +msgid "none" +msgstr "" + +#: boxes/wifi-box:38 boxes/wifi-box:49 boxes/wifi-box:64 +msgid "-" +msgstr "" + #: boxes/wifi-box:75 -msgid "Wifi connection" +msgid "WPA Password:" msgstr "" #: boxes/wifi-box:76 +msgid "WEP Password:" +msgstr "" + +#: boxes/wifi-box:82 +msgid "Wi-Fi connection" +msgstr "" + +#: boxes/wifi-box:85 msgid "Connection to:" msgstr "" -#: boxes/wifi-box:81 -msgid "Password:" +#: boxes/wifi-box:115 +msgid "Wi-Fi network" msgstr "" -#: boxes/wifi-box:108 -msgid "Wifi network" +#: boxes/wifi-box:118 +msgid "Connect to a Wi-Fi network (Double click to connect)" msgstr "" -#: boxes/wifi-box:109 -msgid "Connect to a wifi network \\(Double click to connect\\)" -msgstr "" - -#: boxes/wifi-box:114 +#: boxes/wifi-box:120 msgid "ESSID Name" msgstr "" -#: boxes/wifi-box:114 +#: boxes/wifi-box:120 msgid "Quality" msgstr "" -#: boxes/wifi-box:115 +#: boxes/wifi-box:121 msgid "Encryption" msgstr "" -#: boxes/wifi-box:115 +#: boxes/wifi-box:121 msgid "Status" msgstr "" -#: boxes/wifi-box:146 boxes/burn-box:37 boxes/scp-box:34 -msgid "Usage:" +#: boxes/wifi-box:122 +msgid "Start Wi-Fi" msgstr "" -#: boxes/burn-box:39 boxes/scp-box:36 +#: boxes/wifi-box:122 +msgid "Stop Wi-Fi" +msgstr "" + +#: boxes/burn-box:32 +msgid "Burn-box a small front end to cdrkit powered by Yad/GTK." +msgstr "" + +#: boxes/burn-box:34 boxes/scp-box:37 +msgid "command" +msgstr "" + +#: boxes/burn-box:34 boxes/scp-box:37 +msgid "option" +msgstr "" + +#: boxes/burn-box:34 +msgid "file" +msgstr "" + +#: boxes/burn-box:36 boxes/scp-box:39 msgid "Commands:" msgstr "" -#: boxes/burn-box:40 +#: boxes/burn-box:38 msgid "Show all Wodim options" msgstr "" -#: boxes/burn-box:41 +#: boxes/burn-box:39 msgid "Burn an ISO image" msgstr "" -#: boxes/burn-box:42 +#: boxes/burn-box:40 msgid "Create and burn an audio CD" msgstr "" -#: boxes/burn-box:44 boxes/scp-box:39 boxes/scp-box:66 +#: boxes/burn-box:41 +msgid "Erase a RW disk" +msgstr "" + +#: boxes/burn-box:43 boxes/scp-box:42 boxes/scp-box:70 msgid "Options:" msgstr "" -#: boxes/burn-box:48 boxes/scp-box:43 +#: boxes/burn-box:45 boxes/burn-box:50 boxes/burn-box:51 +msgid "/path/to/image.iso" +msgstr "" + +#: boxes/burn-box:46 boxes/scp-box:44 +msgid "/path/to/directory" +msgstr "" + +#: boxes/burn-box:48 boxes/scp-box:46 msgid "Examples:" msgstr "" -#: boxes/burn-box:62 -msgid "Decoding files from:" +#: boxes/burn-box:64 +#, sh-format +msgid "Decoding files from: $audio" msgstr "" -#: boxes/burn-box:83 -msgid "Not an ISO image:" +#: boxes/burn-box:84 +#, sh-format +msgid "Not an ISO image: \"$iso\"" msgstr "" -#: boxes/burn-box:98 +#: boxes/burn-box:100 +msgid "Burn-box" +msgstr "" + +#: boxes/burn-box:102 msgid "Burn ISO images and audio files [data in next releases]" msgstr "" -#: boxes/burn-box:102 +#: boxes/burn-box:104 msgid "Drive speed:" msgstr "" -#: boxes/burn-box:103 +#: boxes/burn-box:105 msgid "Wodim options:" msgstr "" -#: boxes/burn-box:104 +#: boxes/burn-box:106 msgid "ISO image:" msgstr "" -#: boxes/burn-box:105 +#: boxes/burn-box:107 msgid "Audio files:" msgstr "" -#: boxes/burn-box:106 +#: boxes/burn-box:108 msgid "Wodim help" msgstr "" -#: boxes/burn-box:107 +#: boxes/burn-box:109 msgid "Blank CD" msgstr "" -#: boxes/burn-box:108 +#: boxes/burn-box:110 msgid "Burn" msgstr "" -#: boxes/burn-box:152 -msgid "Missing ISO image" +#: boxes/burn-box:132 +msgid "Burning ISO" msgstr "" -#: boxes/burn-box:160 -msgid "Missing audio directory" +#: boxes/burn-box:137 +msgid "Burning Audio" msgstr "" -#: boxes/scp-box:37 +#: boxes/burn-box:149 +msgid "Wodim Help" +msgstr "" + +#: boxes/burn-box:154 +#, sh-format +msgid "Missing ISO image \"$iso\"" +msgstr "" + +#: boxes/burn-box:162 +#, sh-format +msgid "Missing audio directory \"$audio\"" +msgstr "" + +#: boxes/burn-box:166 +msgid "Blank disk" +msgstr "" + +#: boxes/scp-box:34 +msgid "SCP Box - Small front end to the secure file copy utility." +msgstr "" + +#: boxes/scp-box:40 msgid "List all known hosts" msgstr "" -#: boxes/scp-box:59 +#: boxes/scp-box:43 boxes/scp-box:47 +msgid "/path/to/file" +msgstr "" + +#: boxes/scp-box:62 +msgid "SCP Box" +msgstr "" + +#: boxes/scp-box:65 msgid "Secure copy - Copy files remotely with scp" msgstr "" -#: boxes/scp-box:63 +#: boxes/scp-box:67 msgid "User name:" msgstr "" -#: boxes/scp-box:64 +#: boxes/scp-box:68 msgid "Hostname:" msgstr "" -#: boxes/scp-box:65 +#: boxes/scp-box:69 msgid "Known hosts:" msgstr "" -#: boxes/scp-box:67 +#: boxes/scp-box:71 msgid "Local file:" msgstr "" -#: boxes/scp-box:68 +#: boxes/scp-box:72 msgid "Local directory:" msgstr "" -#: boxes/scp-box:69 +#: boxes/scp-box:73 msgid "Remote path:" msgstr "" -#: boxes/scp-box:70 +#: boxes/scp-box:74 msgid "Download" msgstr "" -#: boxes/scp-box:71 +#: boxes/scp-box:75 msgid "Upload" msgstr "" diff -r de13422f3a69 -r e232f0e1413a po/slitaz-boxes/sv.po --- a/po/slitaz-boxes/sv.po Thu Jul 25 03:24:36 2013 +0300 +++ b/po/slitaz-boxes/sv.po Mon Sep 09 03:27:04 2013 +0300 @@ -1,5 +1,5 @@ # Swedish translations for SliTaz Boxes package. -# Copyright (C) 2012 SliTaz +# Copyright (C) 2013 SliTaz GNU/Linux # This file is distributed under the same license as the SliTaz Boxes package. # Emil Eklund , 2012. # @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: SliTaz Boxes\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-07-01 20:20+0000\n" +"POT-Creation-Date: 2013-09-06 02:11+0300\n" "PO-Revision-Date: 2012-07-12 02:30-0000\n" "Last-Translator: Emil Eklund \n" "Language-Team: Swedish\n" @@ -17,154 +17,254 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#: boxes/wifi-box:15 +msgid "Small Wi-Fi utility to quickly connect to a network." +msgstr "" + +#: boxes/wifi-box:16 boxes/burn-box:33 boxes/scp-box:36 +msgid "Usage:" +msgstr "Användning:" + +#: boxes/wifi-box:17 +msgid "interface" +msgstr "" + +#: boxes/wifi-box:38 +msgid "any" +msgstr "" + +#: boxes/wifi-box:38 +msgid "N/A" +msgstr "" + +#: boxes/wifi-box:38 +msgid "none" +msgstr "" + +#: boxes/wifi-box:38 boxes/wifi-box:49 boxes/wifi-box:64 +msgid "-" +msgstr "" + #: boxes/wifi-box:75 -msgid "Wifi connection" +msgid "WPA Password:" +msgstr "WPA Lösenord:" + +#: boxes/wifi-box:76 +msgid "WEP Password:" +msgstr "WEP Lösenord:" + +#: boxes/wifi-box:82 +msgid "Wi-Fi connection" msgstr "Trådlös anslutning" -#: boxes/wifi-box:76 +#: boxes/wifi-box:85 msgid "Connection to:" msgstr "Anslut till:" -#: boxes/wifi-box:81 -msgid "Password:" -msgstr "Lösenord:" - -#: boxes/wifi-box:108 -msgid "Wifi network" +#: boxes/wifi-box:115 +msgid "Wi-Fi network" msgstr "Trådlöst nätverk" -#: boxes/wifi-box:109 -msgid "Connect to a wifi network \\(Double click to connect\\)" -msgstr "Anslut till ett trådlöst nätverk \\(Dubbelklicka för att ansluta\\)" +#: boxes/wifi-box:118 +msgid "Connect to a Wi-Fi network (Double click to connect)" +msgstr "Anslut till ett trådlöst nätverk (Dubbelklicka för att ansluta)" -#: boxes/wifi-box:114 +#: boxes/wifi-box:120 msgid "ESSID Name" msgstr "ESSID Namn" -#: boxes/wifi-box:114 +#: boxes/wifi-box:120 msgid "Quality" msgstr "Kvalité" -#: boxes/wifi-box:115 +#: boxes/wifi-box:121 msgid "Encryption" msgstr "Kryptering" -#: boxes/wifi-box:115 +#: boxes/wifi-box:121 msgid "Status" msgstr "Status" -#: boxes/wifi-box:146 boxes/burn-box:37 boxes/scp-box:34 -msgid "Usage:" -msgstr "Användning:" +#: boxes/wifi-box:122 +msgid "Start Wi-Fi" +msgstr "" -#: boxes/burn-box:39 boxes/scp-box:36 +#: boxes/wifi-box:122 +msgid "Stop Wi-Fi" +msgstr "" + +#: boxes/burn-box:32 +msgid "Burn-box a small front end to cdrkit powered by Yad/GTK." +msgstr "" + +#: boxes/burn-box:34 boxes/scp-box:37 +msgid "command" +msgstr "" + +#: boxes/burn-box:34 boxes/scp-box:37 +msgid "option" +msgstr "" + +#: boxes/burn-box:34 +msgid "file" +msgstr "" + +#: boxes/burn-box:36 boxes/scp-box:39 msgid "Commands:" msgstr "Kommandon:" -#: boxes/burn-box:40 +#: boxes/burn-box:38 msgid "Show all Wodim options" msgstr "Visa alla Wodim val" -#: boxes/burn-box:41 +#: boxes/burn-box:39 msgid "Burn an ISO image" msgstr "Skriv en ISO avbildning" -#: boxes/burn-box:42 +#: boxes/burn-box:40 msgid "Create and burn an audio CD" msgstr "Skapa och skriv en ljud CD" -#: boxes/burn-box:44 boxes/scp-box:39 boxes/scp-box:66 +#: boxes/burn-box:41 +msgid "Erase a RW disk" +msgstr "" + +#: boxes/burn-box:43 boxes/scp-box:42 boxes/scp-box:70 msgid "Options:" msgstr "Val:" -#: boxes/burn-box:48 boxes/scp-box:43 +#: boxes/burn-box:45 boxes/burn-box:50 boxes/burn-box:51 +msgid "/path/to/image.iso" +msgstr "" + +#: boxes/burn-box:46 boxes/scp-box:44 +msgid "/path/to/directory" +msgstr "" + +#: boxes/burn-box:48 boxes/scp-box:46 msgid "Examples:" msgstr "Exempel:" -#: boxes/burn-box:62 -msgid "Decoding files from:" -msgstr "Avkodar filer från:" +#: boxes/burn-box:64 +#, sh-format +msgid "Decoding files from: $audio" +msgstr "Avkodar filer från: $audio" -#: boxes/burn-box:83 -msgid "Not an ISO image:" -msgstr "Inte en ISO bild:" +#: boxes/burn-box:84 +#, sh-format +msgid "Not an ISO image: \"$iso\"" +msgstr "Inte en ISO bild: \"$iso\"" -#: boxes/burn-box:98 +#: boxes/burn-box:100 +msgid "Burn-box" +msgstr "" + +#: boxes/burn-box:102 msgid "Burn ISO images and audio files [data in next releases]" msgstr "Skriv ISO bilder och ljudfiler [data i nästa utgåvan]" -#: boxes/burn-box:102 +#: boxes/burn-box:104 msgid "Drive speed:" msgstr "Hastighet:" -#: boxes/burn-box:103 +#: boxes/burn-box:105 msgid "Wodim options:" msgstr "Wodim val:" -#: boxes/burn-box:104 +#: boxes/burn-box:106 msgid "ISO image:" msgstr "ISO bild:" -#: boxes/burn-box:105 +#: boxes/burn-box:107 msgid "Audio files:" msgstr "Ljud filer:" -#: boxes/burn-box:106 +#: boxes/burn-box:108 msgid "Wodim help" msgstr "Wodim hjälp" -#: boxes/burn-box:107 +#: boxes/burn-box:109 msgid "Blank CD" msgstr "Blank CD" -#: boxes/burn-box:108 +#: boxes/burn-box:110 msgid "Burn" msgstr "Skriv" -#: boxes/burn-box:152 -msgid "Missing ISO image" -msgstr "Saknar ISO bild" +#: boxes/burn-box:132 +msgid "Burning ISO" +msgstr "Skriv en ISO avbildning" -#: boxes/burn-box:160 -msgid "Missing audio directory" -msgstr "Saknar ljud mapp" +#: boxes/burn-box:137 +msgid "Burning Audio" +msgstr "" -#: boxes/scp-box:37 +#: boxes/burn-box:149 +msgid "Wodim Help" +msgstr "Wodim hjälp" + +#: boxes/burn-box:154 +#, sh-format +msgid "Missing ISO image \"$iso\"" +msgstr "Saknar ISO bild \"$iso\"" + +#: boxes/burn-box:162 +#, sh-format +msgid "Missing audio directory \"$audio\"" +msgstr "Saknar ljud mapp \"$audio\"" + +#: boxes/burn-box:166 +msgid "Blank disk" +msgstr "Blank CD" + +#: boxes/scp-box:34 +msgid "SCP Box - Small front end to the secure file copy utility." +msgstr "" + +#: boxes/scp-box:40 msgid "List all known hosts" msgstr "Visar alla kända värdar" -#: boxes/scp-box:59 +#: boxes/scp-box:43 boxes/scp-box:47 +msgid "/path/to/file" +msgstr "" + +#: boxes/scp-box:62 +msgid "SCP Box" +msgstr "" + +#: boxes/scp-box:65 msgid "Secure copy - Copy files remotely with scp" msgstr "Säker kopia - Kopiera filer på avstånd med scp" -#: boxes/scp-box:63 +#: boxes/scp-box:67 msgid "User name:" msgstr "Användar namn:" -#: boxes/scp-box:64 +#: boxes/scp-box:68 msgid "Hostname:" msgstr "Värdnamn:" -#: boxes/scp-box:65 +#: boxes/scp-box:69 msgid "Known hosts:" msgstr "Kända värdar:" -#: boxes/scp-box:67 +#: boxes/scp-box:71 msgid "Local file:" msgstr "Lokal fil:" -#: boxes/scp-box:68 +#: boxes/scp-box:72 msgid "Local directory:" msgstr "Lokal mapp:" -#: boxes/scp-box:69 +#: boxes/scp-box:73 msgid "Remote path:" msgstr "Avlägsen väg:" -#: boxes/scp-box:70 +#: boxes/scp-box:74 msgid "Download" msgstr "Ladda ner" -#: boxes/scp-box:71 +#: boxes/scp-box:75 msgid "Upload" msgstr "Ladda upp" diff -r de13422f3a69 -r e232f0e1413a po/slitaz-tools/el.po --- a/po/slitaz-tools/el.po Thu Jul 25 03:24:36 2013 +0300 +++ b/po/slitaz-tools/el.po Mon Sep 09 03:27:04 2013 +0300 @@ -1,12 +1,12 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. +# Greek translations for SliTaz Tools package. +# Copyright (C) 2013 SliTaz GNU/Linux +# This file is distributed under the same license as the SliTaz Tools package. # Constantine Mousafiris , 2012. msgid "" msgstr "" "Project-Id-Version: SliTaz Tools\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-07-17 18:32+0300\n" +"POT-Creation-Date: 2013-09-06 02:11+0300\n" "PO-Revision-Date: 2012-12-18 22:06+0300\n" "Last-Translator: Constantine Mousafiris \n" "Language-Team: Kostis Mousafiris\n" @@ -17,38 +17,70 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Virtaal 0.5.2\n" -#: tinyutils/tazlocale:87 -msgid "Setting system locale to:" -msgstr "Ρύθμιση του locale στο:" - -#: tinyutils/tazlocale:101 +#: tinyutils/tazlocale:71 msgid "SliTaz language configuration" msgstr "Ρύθμιση γλώσσας του SliTaz" -#: tinyutils/tazlocale:120 +#: tinyutils/tazlocale:90 msgid "" "Please logout of your current session and login again to use new locale." msgstr "" "Παρακαλώ, αποσυνδεθείτε από την τρέχουσα συνεδρία σας και επανασυνδεθείτε, " "για να χρησιμοποιήσετε το νέο locale." -#: tinyutils/tazlocale:129 tinyutils/tazkeymap:47 -msgid "Config file :" -msgstr "Αρχείο ρυθμίσεων :" +#: tinyutils/tazlocale:92 tinyutils/tazkeymap:64 +msgid "Information" +msgstr "" -#: tinyutils/tazlocale:130 +#: tinyutils/tazlocale:100 +msgid "SliTaz GNU/Linux locale setting using dialog boxes." +msgstr "" + +#: tinyutils/tazlocale:102 tinyutils/decode:30 tinyutils/hwsetup:24 +msgid "Usage:" +msgstr "Χρήση:" + +#: tinyutils/tazlocale:102 tinyutils/decode:31 tinyutils/hwsetup:25 +msgid "option" +msgstr "" + +#: tinyutils/tazlocale:104 +msgid "Display locale selecting dialog if no option given." +msgstr "" + +#: tinyutils/tazlocale:106 tinyutils/hwsetup:40 +msgid "Options:" +msgstr "" + +#: tinyutils/tazlocale:107 +msgid "Show info about config file and current locale." +msgstr "" + +#: tinyutils/tazlocale:108 +msgid "Show list of available locales." +msgstr "" + +#: tinyutils/tazlocale:110 +msgid "Any other option treated as locale - set locale." +msgstr "" + +#: tinyutils/tazlocale:115 tinyutils/tazkeymap:42 +msgid "Config file:" +msgstr "Αρχείο ρυθμίσεων:" + +#: tinyutils/tazlocale:116 msgid "Current locale:" msgstr "Τρέχον locale:" -#: tinyutils/tazkeymap:48 +#: tinyutils/tazkeymap:43 msgid "Current keymap:" msgstr "Τρέχον keymap:" -#: tinyutils/tazkeymap:57 +#: tinyutils/tazkeymap:52 msgid "SliTaz keymap configuration" -msgstr "Ρύθμιση του keymap στο Slitaz" +msgstr "Ρύθμιση του keymap στο SliTaz" -#: tinyutils/tazkeymap:69 +#: tinyutils/tazkeymap:65 msgid "" "Please logout of your current session and login again to use new keyboard." msgstr "" @@ -63,110 +95,536 @@ msgid "Done" msgstr "Ολοκληρώθηκε" -#: tinyutils/tazx:32 -msgid "You must be root to configure X server." -msgstr "Πρέπει να είστε διαχειριστής συστήματος για να ρυθμίσετε τον X server." - -#: tinyutils/tazx:131 +#: tinyutils/tazx:122 msgid "Install Xorg" msgstr "Εγκατάσταση του Xorg" -#: tinyutils/tazx:133 +#: tinyutils/tazx:123 msgid "Tazx helps you to select your X driver." msgstr "Ο Tazx σας βοηθά να επιλέξετε τον οδηγό (driver) για το Χ." -#: tinyutils/tazx:168 +#: tinyutils/tazx:125 +msgid "driver" +msgstr "" + +#: tinyutils/tazx:126 +msgid "Quit" +msgstr "" + +#: tinyutils/tazx:155 +msgid "Configure X" +msgstr "" + +#: tinyutils/tazx:157 msgid "Tazx dialog helps you to configure your Xorg server." msgstr "" "Το παράθυρο διαλόγου του Tazx σας βοηθά να ρυθμίσετε τον διακομιστή Xorg." -#: tinyutils/tazx:169 +#: tinyutils/tazx:158 msgid "Window Manager:" msgstr "Διαχειριστής παραθύρων:" -#: tinyutils/tazx:170 +#: tinyutils/tazx:159 msgid "X server:" msgstr "Διακομιστής Χ:" -#: tinyutils/tazx:171 +#: tinyutils/tazx:160 msgid "Install or reconfigure Xorg" msgstr "Εγκατάσταση ή επαναρύθμιση του X org" -#: tinyutils/tazx:172 +#: tinyutils/tazx:161 msgid "Install TinyX server Xfbdev" msgstr "Εγκατάσταση του TinyX server Xfbdev" -#: tinyutils/tazx:173 +#: tinyutils/tazx:162 msgid "Quit Tazx utility" msgstr "Κλείστε το βοηθητικό πρόγραμμα Tazx" -#: tinyutils/decode:31 -msgid "Usage:" -msgstr "Χρήση:" - -#: tinyutils/decode:33 +#: tinyutils/decode:28 msgid "Decode audio and video files" msgstr "Αποκωδικοποίηση αρχείων ήχου και εικόνας" -#: tinyutils/decode:35 +#: tinyutils/decode:31 tinyutils/decode:36 +msgid "file" +msgstr "" + +#: tinyutils/decode:31 +msgid "URL" +msgstr "" + +#: tinyutils/decode:33 msgid "Examples:" msgstr "Παραδείγματα:" -#: tinyutils/decode:49 -msgid "Missing decoder :" -msgstr "Λείπει ο αποκωδικοποιητής:" +#: tinyutils/decode:35 +msgid "/path/to/files/*" +msgstr "" -#: tinyutils/decode:50 -msgid "Skipping file :" -msgstr "Γίνεται παράκαμψη του αρχείου :" +#: tinyutils/decode:47 +#, sh-format +msgid "Missing decoder: $dec" +msgstr "Λείπει ο αποκωδικοποιητής: $dec" -#: tinyutils/decode:54 -msgid "Decoding:" -msgstr "Γίνεται αποκωδικοποίηση:" +#: tinyutils/decode:48 tinyutils/decode:80 +#, sh-format +msgid "Skipping file: $name" +msgstr "Γίνεται παράκαμψη του αρχείου: $name" -#: tinyutils/decode:78 -msgid "Unsupported file:" -msgstr "Μη υποστηριζόμενο αρχείο:" +#: tinyutils/decode:51 +#, sh-format +msgid "Decoding: $name" +msgstr "Γίνεται αποκωδικοποίηση: $name" -#: tinyutils/decode:98 -msgid "No file:" -msgstr "Κανένα αρχείο:" +#: tinyutils/decode:60 +#, sh-format +msgid "No file: $file" +msgstr "Κανένα αρχείο: $file" -#: tinyutils/terminal:24 +#: tinyutils/decode:82 +#, sh-format +msgid "Unsupported file: $file" +msgstr "Μη υποστηριζόμενο αρχείο: $file" + +#: tinyutils/terminal:10 msgid "configurable SliTaz wrapper for terminal." msgstr "" -#: tinyutils/terminal:26 +#: tinyutils/terminal:12 msgid "Recognized options:" msgstr "" -#: tinyutils/terminal:27 +#: tinyutils/terminal:13 msgid "Print the version number" msgstr "" -#: tinyutils/terminal:28 +#: tinyutils/terminal:14 msgid "Print out this message" msgstr "" -#: tinyutils/terminal:29 +#: tinyutils/terminal:15 #, sh-format msgid "Width and height of terminal window ($GEOMETRY)" msgstr "" -#: tinyutils/terminal:30 +#: tinyutils/terminal:16 #, sh-format msgid "Title name for window (\"$TITLE\")" msgstr "" -#: tinyutils/terminal:31 -msgid "Dont't close terminal after command finished" +#: tinyutils/terminal:17 +msgid "Don't close terminal after command finished" msgstr "" -#: tinyutils/terminal:32 +#: tinyutils/terminal:18 msgid "Command to execute (must be last in line)" msgstr "" -#: tinyutils/terminal:35 +#: tinyutils/terminal:21 #, sh-format msgid "Help for $TERMINAL:" msgstr "" + +#: tinyutils/hwsetup:22 +msgid "SliTaz Setup configuration" +msgstr "" + +#: tinyutils/hwsetup:25 +msgid "command" +msgstr "" + +#: tinyutils/hwsetup:27 +msgid "Commands:" +msgstr "" + +#: tinyutils/hwsetup:29 +msgid "Print this short usage." +msgstr "" + +#: tinyutils/hwsetup:30 +msgid "Parallel and USB Printer setup." +msgstr "" + +#: tinyutils/hwsetup:31 +msgid "USB Scanner setup." +msgstr "" + +#: tinyutils/hwsetup:32 +msgid "Integrated and USB webcam setup." +msgstr "" + +#: tinyutils/hwsetup:33 +msgid "Digital Camera setup." +msgstr "" + +#: tinyutils/hwsetup:34 +msgid "Bluetooth setup." +msgstr "" + +#: tinyutils/hwsetup:35 +msgid "3g-modem setup." +msgstr "" + +#: tinyutils/hwsetup:36 +msgid "Start/stop firewall." +msgstr "" + +#: tinyutils/hwsetup:37 +msgid "Nvidia (non-free/free) setup." +msgstr "" + +#: tinyutils/hwsetup:38 +msgid "ATI (non-free/free) setup." +msgstr "" + +#: tinyutils/hwsetup:42 +msgid "install non-free packages (nvidia, ati)." +msgstr "" + +#: tinyutils/hwsetup:43 +msgid "auto-install optional dependencies." +msgstr "" + +#: tinyutils/hwsetup:44 +msgid "confirm before installing optional dependencies" +msgstr "" + +#: tinyutils/hwsetup:98 +#, sh-format +msgid "" +"Due to a lack of compatible hardware for troubleshooting, this $DEVICE " +"device has not been properly tested. Please report any success, failure, bug " +"to SliTaz Bug tracker or Forum." +msgstr "" + +#: tinyutils/hwsetup:107 +#, sh-format +msgid "Failed to setup $DEVICE" +msgstr "" + +#: tinyutils/hwsetup:117 +#, sh-format +msgid "Installing pkg: $pkg" +msgstr "" + +#: tinyutils/hwsetup:131 +#, sh-format +msgid "Would you like to install pkg: $pkg" +msgstr "" + +#: tinyutils/hwsetup:148 +#, sh-format +msgid "adding $user to $grp" +msgstr "" + +#: tinyutils/hwsetup:171 +msgid "Detected USB Device : Vendor : Product" +msgstr "" + +#: tinyutils/hwsetup:213 +msgid "Do you want to use hp-setup utility" +msgstr "" + +#: tinyutils/hwsetup:228 +#, sh-format +msgid "Verify $DEVICE Permissions" +msgstr "" + +#: tinyutils/hwsetup:229 +#, sh-format +msgid "Your $DEVICE must be in $grp group with rw-rw-rw- permissions" +msgstr "" + +#: tinyutils/hwsetup:250 +msgid "New udev rules are added by a package" +msgstr "" + +#: tinyutils/hwsetup:258 +msgid "Auto configuring Xorg..." +msgstr "" + +#: tinyutils/hwsetup:261 +msgid "Configuring Xorg..." +msgstr "" + +#: tinyutils/hwsetup:292 +msgid "Wvdial Box" +msgstr "" + +#: tinyutils/hwsetup:295 +msgid "Phone Number:" +msgstr "" + +#: tinyutils/hwsetup:296 +msgid "Username:" +msgstr "" + +#: tinyutils/hwsetup:297 +msgid "Password:" +msgstr "" + +#: tinyutils/hwsetup:298 +msgid "Pin (if required):" +msgstr "" + +#: tinyutils/hwsetup:299 +msgid "Modem:" +msgstr "" + +#: tinyutils/hwsetup:300 +msgid "Access Point Name (APN):" +msgstr "" + +#: tinyutils/hwsetup:301 +msgid "You must save your account info before dialing" +msgstr "" + +#: tinyutils/hwsetup:302 +msgid "Edit config file" +msgstr "" + +#: tinyutils/hwsetup:303 +msgid "Save Configuration" +msgstr "" + +#: tinyutils/hwsetup:304 +msgid "Dial Pin Once" +msgstr "" + +#: tinyutils/hwsetup:380 +msgid "Do you want to start cups" +msgstr "" + +#: tinyutils/hwsetup:388 +msgid "Starting cups using:" +msgstr "" + +#: tinyutils/hwsetup:407 +msgid "Do you want to start scanner" +msgstr "" + +#: tinyutils/hwsetup:415 +msgid "Following scanner commands may be of help:" +msgstr "" + +#: tinyutils/hwsetup:416 +msgid "to verify scanner has been found" +msgstr "" + +#: tinyutils/hwsetup:417 +msgid "scanner application" +msgstr "" + +#: tinyutils/hwsetup:436 +msgid "Would you like to test webcam" +msgstr "" + +#: tinyutils/hwsetup:443 +msgid "Would you like to test webcam by installing mplayer-svn" +msgstr "" + +#: tinyutils/hwsetup:450 +msgid "Webcam is set up; please use mplayer-svn/fswebcam/amsn/skype to view" +msgstr "" + +#: tinyutils/hwsetup:466 +msgid "Do you want to check if gphoto2 can talk to your camera" +msgstr "" + +#: tinyutils/hwsetup:471 +msgid "Do you want to test importing photos" +msgstr "" + +#: tinyutils/hwsetup:481 +msgid "Camera is set up; please use gphoto2 to import photos" +msgstr "" + +#: tinyutils/hwsetup:483 +#, sh-format +msgid "Quick start guide: $guide_url" +msgstr "" + +#: tinyutils/hwsetup:494 +msgid "Do you want to see if the bluetooth is working" +msgstr "" + +#: tinyutils/hwsetup:502 +msgid "Bluetooth interfaces" +msgstr "" + +#: tinyutils/hwsetup:510 tinyutils/hwsetup:527 +msgid "Following Bluetooth commands may be of help" +msgstr "" + +#: tinyutils/hwsetup:515 +msgid "checking local bluetooth devices..." +msgstr "" + +#: tinyutils/hwsetup:516 +msgid "scanning remote bluetooth devices..." +msgstr "" + +#: tinyutils/hwsetup:517 +msgid "pairing with remote bluetooth devices..." +msgstr "" + +#: tinyutils/hwsetup:520 tinyutils/hwsetup:541 +#, sh-format +msgid "You can manually edit the configuration files in $bt if need be" +msgstr "" + +#: tinyutils/hwsetup:534 +msgid "for starting bluetooth daemon" +msgstr "" + +#: tinyutils/hwsetup:536 +msgid "for checking local devices" +msgstr "" + +#: tinyutils/hwsetup:537 +msgid "for scanning remote devices" +msgstr "" + +#: tinyutils/hwsetup:538 +msgid "pairing with remote bluetooth devices" +msgstr "" + +#: tinyutils/hwsetup:552 +msgid "List detected devices" +msgstr "" + +#: tinyutils/hwsetup:556 +msgid "Detected Modem at:" +msgstr "" + +#: tinyutils/hwsetup:558 +msgid "Do you want to configure wvdial" +msgstr "" + +#: tinyutils/hwsetup:567 +#, sh-format +msgid "Edit $wc for phone number, login name, password and pin" +msgstr "" + +#: tinyutils/hwsetup:568 +#, sh-format +msgid "Add DNS adress of your provider in $rc" +msgstr "" + +#: tinyutils/hwsetup:577 +msgid "Setting IPTABLES_RULES to yes in /etc/slitaz/firewall.conf" +msgstr "" + +#: tinyutils/hwsetup:586 +msgid "Probing for open ports..." +msgstr "" + +#: tinyutils/hwsetup:590 +msgid "Adding firewall daemon to start automatically at boot" +msgstr "" + +#: tinyutils/hwsetup:607 +msgid "Do you want to configure X using non-free nvidia driver" +msgstr "" + +#: tinyutils/hwsetup:610 tinyutils/hwsetup:649 tinyutils/hwsetup:681 +#: tinyutils/hwsetup:714 +#, sh-format +msgid "Your previous config is in $xorg60" +msgstr "" + +#: tinyutils/hwsetup:611 tinyutils/hwsetup:650 +#, sh-format +msgid "If nvidia fails, you can remove $xorg55 to restore previous config." +msgstr "" + +#: tinyutils/hwsetup:618 +msgid "Adding to xorg.conf:" +msgstr "" + +#: tinyutils/hwsetup:623 tinyutils/hwsetup:659 +msgid "Checking if nvidia is working..." +msgstr "" + +#: tinyutils/hwsetup:627 +msgid "Configure nvidia settings:" +msgstr "" + +#: tinyutils/hwsetup:634 +msgid "test nvidia" +msgstr "" + +#: tinyutils/hwsetup:635 +msgid "Use: nvidia-settings utility to configure your settings if necessary" +msgstr "" + +#: tinyutils/hwsetup:646 +msgid "Do you want to configure X using free nvidia driver" +msgstr "" + +#: tinyutils/hwsetup:652 +#, sh-format +msgid "Create $xorg55short configured with nv driver." +msgstr "" + +#: tinyutils/hwsetup:678 +msgid "Do you want to configure X using non-free catalyst ATI (radeon) driver" +msgstr "" + +#: tinyutils/hwsetup:682 +#, sh-format +msgid "If ati fails, you can remove $xorg55 to restore previous config." +msgstr "" + +#: tinyutils/hwsetup:691 +msgid "Checking if ati catalyst is working..." +msgstr "" + +#: tinyutils/hwsetup:695 +msgid "Configuration:" +msgstr "Αρχείο ρυθμίσεων:" + +#: tinyutils/hwsetup:696 +msgid "" +"Use: aticonfig utility to generate a template configuration file if necessary" +msgstr "" + +#: tinyutils/hwsetup:711 +msgid "Do you want to configure X using free ATI (radeon) driver" +msgstr "" + +#: tinyutils/hwsetup:715 +#, sh-format +msgid "If ATI fails, you can remove $xorg55 to restore previous config." +msgstr "" + +#: tinyutils/hwsetup:717 +#, sh-format +msgid "Create $xorg55short configured with radeon driver." +msgstr "" + +#: tinyutils/hwsetup:723 +msgid "Checking if ATI radeon is working..." +msgstr "" + +#: tinyutils/hwsetup:739 +msgid "Bringing eth0 down..." +msgstr "" + +#: tinyutils/hwsetup:740 +msgid "Dialing..." +msgstr "" + +#: tinyutils/hwsetup:766 +msgid "The following optional packages can be installed:" +msgstr "" + +#: tinyutils/hwsetup:770 +msgid "Do you want to install all/few/no optional dependencies (all|few|N)? " +msgstr "" + +#~ msgid "You must be root to configure X server." +#~ msgstr "" +#~ "Πρέπει να είστε διαχειριστής συστήματος για να ρυθμίσετε τον X server." + +#~ msgid "Setting system locale to: $locale" +#~ msgstr "Ρύθμιση του locale στο: $locale" diff -r de13422f3a69 -r e232f0e1413a po/slitaz-tools/es_AR.po --- a/po/slitaz-tools/es_AR.po Thu Jul 25 03:24:36 2013 +0300 +++ b/po/slitaz-tools/es_AR.po Mon Sep 09 03:27:04 2013 +0300 @@ -1,53 +1,85 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. +# Spanish translations for SliTaz Tools package. +# Copyright (C) 2013 SliTaz GNU/Linux +# This file is distributed under the same license as the SliTaz Tools package. +# Lucas Gioia , 2011. # msgid "" msgstr "" "Project-Id-Version: SliTaz Tools\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-07-17 18:32+0300\n" +"POT-Creation-Date: 2013-09-06 02:11+0300\n" "PO-Revision-Date: 2011-08-11 00:08-0300\n" "Last-Translator: Lucas Gioia \n" -"Language-Team: LANGUAGE \n" +"Language-Team: \n" "Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: tinyutils/tazlocale:87 -msgid "Setting system locale to:" -msgstr "" - -#: tinyutils/tazlocale:101 +#: tinyutils/tazlocale:71 msgid "SliTaz language configuration" msgstr "SliTaz configuración del lenguaje" -#: tinyutils/tazlocale:120 +#: tinyutils/tazlocale:90 msgid "" "Please logout of your current session and login again to use new locale." msgstr "" "Por favor, cierre su sesión actual e iniciela nuevamente para usar un nuevo " "local." -#: tinyutils/tazlocale:129 tinyutils/tazkeymap:47 -msgid "Config file :" +#: tinyutils/tazlocale:92 tinyutils/tazkeymap:64 +msgid "Information" msgstr "" -#: tinyutils/tazlocale:130 +#: tinyutils/tazlocale:100 +msgid "SliTaz GNU/Linux locale setting using dialog boxes." +msgstr "" + +#: tinyutils/tazlocale:102 tinyutils/decode:30 tinyutils/hwsetup:24 +msgid "Usage:" +msgstr "" + +#: tinyutils/tazlocale:102 tinyutils/decode:31 tinyutils/hwsetup:25 +msgid "option" +msgstr "" + +#: tinyutils/tazlocale:104 +msgid "Display locale selecting dialog if no option given." +msgstr "" + +#: tinyutils/tazlocale:106 tinyutils/hwsetup:40 +msgid "Options:" +msgstr "" + +#: tinyutils/tazlocale:107 +msgid "Show info about config file and current locale." +msgstr "" + +#: tinyutils/tazlocale:108 +msgid "Show list of available locales." +msgstr "" + +#: tinyutils/tazlocale:110 +msgid "Any other option treated as locale - set locale." +msgstr "" + +#: tinyutils/tazlocale:115 tinyutils/tazkeymap:42 +msgid "Config file:" +msgstr "" + +#: tinyutils/tazlocale:116 msgid "Current locale:" msgstr "" -#: tinyutils/tazkeymap:48 +#: tinyutils/tazkeymap:43 msgid "Current keymap:" msgstr "" -#: tinyutils/tazkeymap:57 +#: tinyutils/tazkeymap:52 msgid "SliTaz keymap configuration" msgstr "SliTaz configuración de teclas" -#: tinyutils/tazkeymap:69 +#: tinyutils/tazkeymap:65 msgid "" "Please logout of your current session and login again to use new keyboard." msgstr "" @@ -62,114 +94,536 @@ msgid "Done" msgstr "Listo" -#: tinyutils/tazx:32 -msgid "You must be root to configure X server." -msgstr "Debes ser root para configurar el servidor X." - -#: tinyutils/tazx:131 +#: tinyutils/tazx:122 msgid "Install Xorg" msgstr "Instalar Xorg" -#: tinyutils/tazx:133 +#: tinyutils/tazx:123 msgid "Tazx helps you to select your X driver." msgstr "Tazx le ayudará a seleccionar su controlador X." -#: tinyutils/tazx:168 +#: tinyutils/tazx:125 +msgid "driver" +msgstr "" + +#: tinyutils/tazx:126 +msgid "Quit" +msgstr "" + +#: tinyutils/tazx:155 +msgid "Configure X" +msgstr "" + +#: tinyutils/tazx:157 #, fuzzy msgid "Tazx dialog helps you to configure your Xorg server." msgstr "Los diálogos Tazx le ayudarán a configurar su servidor Xorg." -#: tinyutils/tazx:169 +#: tinyutils/tazx:158 msgid "Window Manager:" msgstr "Gestor de ventanas:" -#: tinyutils/tazx:170 +#: tinyutils/tazx:159 msgid "X server:" msgstr "Servidor X:" -#: tinyutils/tazx:171 +#: tinyutils/tazx:160 msgid "Install or reconfigure Xorg" msgstr "Instalar o reconfigurar Xorg" -#: tinyutils/tazx:172 +#: tinyutils/tazx:161 msgid "Install TinyX server Xfbdev" msgstr "Instalar TinyX servidor Xfbdev" -#: tinyutils/tazx:173 +#: tinyutils/tazx:162 msgid "Quit Tazx utility" msgstr "Salir de la utilidad Tazx" +#: tinyutils/decode:28 +msgid "Decode audio and video files" +msgstr "" + +#: tinyutils/decode:31 tinyutils/decode:36 +msgid "file" +msgstr "" + #: tinyutils/decode:31 -msgid "Usage:" +msgid "URL" msgstr "" #: tinyutils/decode:33 -msgid "Decode audio and video files" +msgid "Examples:" msgstr "" #: tinyutils/decode:35 -msgid "Examples:" +msgid "/path/to/files/*" msgstr "" -#: tinyutils/decode:49 -msgid "Missing decoder :" +#: tinyutils/decode:47 +#, sh-format +msgid "Missing decoder: $dec" msgstr "" -#: tinyutils/decode:50 -msgid "Skipping file :" +#: tinyutils/decode:48 tinyutils/decode:80 +#, sh-format +msgid "Skipping file: $name" msgstr "" -#: tinyutils/decode:54 -msgid "Decoding:" +#: tinyutils/decode:51 +#, sh-format +msgid "Decoding: $name" msgstr "" -#: tinyutils/decode:78 -msgid "Unsupported file:" +#: tinyutils/decode:60 +#, sh-format +msgid "No file: $file" msgstr "" -#: tinyutils/decode:98 -msgid "No file:" +#: tinyutils/decode:82 +#, sh-format +msgid "Unsupported file: $file" msgstr "" -#: tinyutils/terminal:24 +#: tinyutils/terminal:10 msgid "configurable SliTaz wrapper for terminal." msgstr "" -#: tinyutils/terminal:26 +#: tinyutils/terminal:12 msgid "Recognized options:" msgstr "" -#: tinyutils/terminal:27 +#: tinyutils/terminal:13 msgid "Print the version number" msgstr "" -#: tinyutils/terminal:28 +#: tinyutils/terminal:14 msgid "Print out this message" msgstr "" -#: tinyutils/terminal:29 +#: tinyutils/terminal:15 #, sh-format msgid "Width and height of terminal window ($GEOMETRY)" msgstr "" -#: tinyutils/terminal:30 +#: tinyutils/terminal:16 #, sh-format msgid "Title name for window (\"$TITLE\")" msgstr "" -#: tinyutils/terminal:31 -msgid "Dont't close terminal after command finished" +#: tinyutils/terminal:17 +msgid "Don't close terminal after command finished" msgstr "" -#: tinyutils/terminal:32 +#: tinyutils/terminal:18 msgid "Command to execute (must be last in line)" msgstr "" -#: tinyutils/terminal:35 +#: tinyutils/terminal:21 #, sh-format msgid "Help for $TERMINAL:" msgstr "" +#: tinyutils/hwsetup:22 +msgid "SliTaz Setup configuration" +msgstr "" + +#: tinyutils/hwsetup:25 +msgid "command" +msgstr "" + +#: tinyutils/hwsetup:27 +msgid "Commands:" +msgstr "" + +#: tinyutils/hwsetup:29 +msgid "Print this short usage." +msgstr "" + +#: tinyutils/hwsetup:30 +msgid "Parallel and USB Printer setup." +msgstr "" + +#: tinyutils/hwsetup:31 +msgid "USB Scanner setup." +msgstr "" + +#: tinyutils/hwsetup:32 +msgid "Integrated and USB webcam setup." +msgstr "" + +#: tinyutils/hwsetup:33 +msgid "Digital Camera setup." +msgstr "" + +#: tinyutils/hwsetup:34 +msgid "Bluetooth setup." +msgstr "" + +#: tinyutils/hwsetup:35 +msgid "3g-modem setup." +msgstr "" + +#: tinyutils/hwsetup:36 +msgid "Start/stop firewall." +msgstr "" + +#: tinyutils/hwsetup:37 +msgid "Nvidia (non-free/free) setup." +msgstr "" + +#: tinyutils/hwsetup:38 +msgid "ATI (non-free/free) setup." +msgstr "" + +#: tinyutils/hwsetup:42 +msgid "install non-free packages (nvidia, ati)." +msgstr "" + +#: tinyutils/hwsetup:43 +msgid "auto-install optional dependencies." +msgstr "" + +#: tinyutils/hwsetup:44 +msgid "confirm before installing optional dependencies" +msgstr "" + +#: tinyutils/hwsetup:98 +#, sh-format +msgid "" +"Due to a lack of compatible hardware for troubleshooting, this $DEVICE " +"device has not been properly tested. Please report any success, failure, bug " +"to SliTaz Bug tracker or Forum." +msgstr "" + +#: tinyutils/hwsetup:107 +#, sh-format +msgid "Failed to setup $DEVICE" +msgstr "" + +#: tinyutils/hwsetup:117 +#, sh-format +msgid "Installing pkg: $pkg" +msgstr "" + +#: tinyutils/hwsetup:131 +#, sh-format +msgid "Would you like to install pkg: $pkg" +msgstr "" + +#: tinyutils/hwsetup:148 +#, sh-format +msgid "adding $user to $grp" +msgstr "" + +#: tinyutils/hwsetup:171 +msgid "Detected USB Device : Vendor : Product" +msgstr "" + +#: tinyutils/hwsetup:213 +msgid "Do you want to use hp-setup utility" +msgstr "" + +#: tinyutils/hwsetup:228 +#, sh-format +msgid "Verify $DEVICE Permissions" +msgstr "" + +#: tinyutils/hwsetup:229 +#, sh-format +msgid "Your $DEVICE must be in $grp group with rw-rw-rw- permissions" +msgstr "" + +#: tinyutils/hwsetup:250 +msgid "New udev rules are added by a package" +msgstr "" + +#: tinyutils/hwsetup:258 +msgid "Auto configuring Xorg..." +msgstr "" + +#: tinyutils/hwsetup:261 +msgid "Configuring Xorg..." +msgstr "" + +#: tinyutils/hwsetup:292 +msgid "Wvdial Box" +msgstr "" + +#: tinyutils/hwsetup:295 +msgid "Phone Number:" +msgstr "" + +#: tinyutils/hwsetup:296 +msgid "Username:" +msgstr "" + +#: tinyutils/hwsetup:297 +msgid "Password:" +msgstr "" + +#: tinyutils/hwsetup:298 +msgid "Pin (if required):" +msgstr "" + +#: tinyutils/hwsetup:299 +msgid "Modem:" +msgstr "" + +#: tinyutils/hwsetup:300 +msgid "Access Point Name (APN):" +msgstr "" + +#: tinyutils/hwsetup:301 +msgid "You must save your account info before dialing" +msgstr "" + +#: tinyutils/hwsetup:302 +msgid "Edit config file" +msgstr "" + +#: tinyutils/hwsetup:303 +msgid "Save Configuration" +msgstr "" + +#: tinyutils/hwsetup:304 +msgid "Dial Pin Once" +msgstr "" + +#: tinyutils/hwsetup:380 +msgid "Do you want to start cups" +msgstr "" + +#: tinyutils/hwsetup:388 +msgid "Starting cups using:" +msgstr "" + +#: tinyutils/hwsetup:407 +msgid "Do you want to start scanner" +msgstr "" + +#: tinyutils/hwsetup:415 +msgid "Following scanner commands may be of help:" +msgstr "" + +#: tinyutils/hwsetup:416 +msgid "to verify scanner has been found" +msgstr "" + +#: tinyutils/hwsetup:417 +msgid "scanner application" +msgstr "" + +#: tinyutils/hwsetup:436 +msgid "Would you like to test webcam" +msgstr "" + +#: tinyutils/hwsetup:443 +msgid "Would you like to test webcam by installing mplayer-svn" +msgstr "" + +#: tinyutils/hwsetup:450 +msgid "Webcam is set up; please use mplayer-svn/fswebcam/amsn/skype to view" +msgstr "" + +#: tinyutils/hwsetup:466 +msgid "Do you want to check if gphoto2 can talk to your camera" +msgstr "" + +#: tinyutils/hwsetup:471 +msgid "Do you want to test importing photos" +msgstr "" + +#: tinyutils/hwsetup:481 +msgid "Camera is set up; please use gphoto2 to import photos" +msgstr "" + +#: tinyutils/hwsetup:483 +#, sh-format +msgid "Quick start guide: $guide_url" +msgstr "" + +#: tinyutils/hwsetup:494 +msgid "Do you want to see if the bluetooth is working" +msgstr "" + +#: tinyutils/hwsetup:502 +msgid "Bluetooth interfaces" +msgstr "" + +#: tinyutils/hwsetup:510 tinyutils/hwsetup:527 +msgid "Following Bluetooth commands may be of help" +msgstr "" + +#: tinyutils/hwsetup:515 +msgid "checking local bluetooth devices..." +msgstr "" + +#: tinyutils/hwsetup:516 +msgid "scanning remote bluetooth devices..." +msgstr "" + +#: tinyutils/hwsetup:517 +msgid "pairing with remote bluetooth devices..." +msgstr "" + +#: tinyutils/hwsetup:520 tinyutils/hwsetup:541 +#, sh-format +msgid "You can manually edit the configuration files in $bt if need be" +msgstr "" + +#: tinyutils/hwsetup:534 +msgid "for starting bluetooth daemon" +msgstr "" + +#: tinyutils/hwsetup:536 +msgid "for checking local devices" +msgstr "" + +#: tinyutils/hwsetup:537 +msgid "for scanning remote devices" +msgstr "" + +#: tinyutils/hwsetup:538 +msgid "pairing with remote bluetooth devices" +msgstr "" + +#: tinyutils/hwsetup:552 +msgid "List detected devices" +msgstr "" + +#: tinyutils/hwsetup:556 +msgid "Detected Modem at:" +msgstr "" + +#: tinyutils/hwsetup:558 +msgid "Do you want to configure wvdial" +msgstr "" + +#: tinyutils/hwsetup:567 +#, sh-format +msgid "Edit $wc for phone number, login name, password and pin" +msgstr "" + +#: tinyutils/hwsetup:568 +#, sh-format +msgid "Add DNS adress of your provider in $rc" +msgstr "" + +#: tinyutils/hwsetup:577 +msgid "Setting IPTABLES_RULES to yes in /etc/slitaz/firewall.conf" +msgstr "" + +#: tinyutils/hwsetup:586 +msgid "Probing for open ports..." +msgstr "" + +#: tinyutils/hwsetup:590 +msgid "Adding firewall daemon to start automatically at boot" +msgstr "" + +#: tinyutils/hwsetup:607 +msgid "Do you want to configure X using non-free nvidia driver" +msgstr "" + +#: tinyutils/hwsetup:610 tinyutils/hwsetup:649 tinyutils/hwsetup:681 +#: tinyutils/hwsetup:714 +#, sh-format +msgid "Your previous config is in $xorg60" +msgstr "" + +#: tinyutils/hwsetup:611 tinyutils/hwsetup:650 +#, sh-format +msgid "If nvidia fails, you can remove $xorg55 to restore previous config." +msgstr "" + +#: tinyutils/hwsetup:618 +msgid "Adding to xorg.conf:" +msgstr "" + +#: tinyutils/hwsetup:623 tinyutils/hwsetup:659 +msgid "Checking if nvidia is working..." +msgstr "" + +#: tinyutils/hwsetup:627 +msgid "Configure nvidia settings:" +msgstr "" + +#: tinyutils/hwsetup:634 +msgid "test nvidia" +msgstr "" + +#: tinyutils/hwsetup:635 +msgid "Use: nvidia-settings utility to configure your settings if necessary" +msgstr "" + +#: tinyutils/hwsetup:646 +msgid "Do you want to configure X using free nvidia driver" +msgstr "" + +#: tinyutils/hwsetup:652 +#, sh-format +msgid "Create $xorg55short configured with nv driver." +msgstr "" + +#: tinyutils/hwsetup:678 +msgid "Do you want to configure X using non-free catalyst ATI (radeon) driver" +msgstr "" + +#: tinyutils/hwsetup:682 +#, sh-format +msgid "If ati fails, you can remove $xorg55 to restore previous config." +msgstr "" + +#: tinyutils/hwsetup:691 +msgid "Checking if ati catalyst is working..." +msgstr "" + +#: tinyutils/hwsetup:695 +msgid "Configuration:" +msgstr "" + +#: tinyutils/hwsetup:696 +msgid "" +"Use: aticonfig utility to generate a template configuration file if necessary" +msgstr "" + +#: tinyutils/hwsetup:711 +msgid "Do you want to configure X using free ATI (radeon) driver" +msgstr "" + +#: tinyutils/hwsetup:715 +#, sh-format +msgid "If ATI fails, you can remove $xorg55 to restore previous config." +msgstr "" + +#: tinyutils/hwsetup:717 +#, sh-format +msgid "Create $xorg55short configured with radeon driver." +msgstr "" + +#: tinyutils/hwsetup:723 +msgid "Checking if ATI radeon is working..." +msgstr "" + +#: tinyutils/hwsetup:739 +msgid "Bringing eth0 down..." +msgstr "" + +#: tinyutils/hwsetup:740 +msgid "Dialing..." +msgstr "" + +#: tinyutils/hwsetup:766 +msgid "The following optional packages can be installed:" +msgstr "" + +#: tinyutils/hwsetup:770 +msgid "Do you want to install all/few/no optional dependencies (all|few|N)? " +msgstr "" + +#~ msgid "You must be root to configure X server." +#~ msgstr "Debes ser root para configurar el servidor X." + #~ msgid "You must be root to run:" #~ msgstr "Debes ser root para correr:" diff -r de13422f3a69 -r e232f0e1413a po/slitaz-tools/fr.po --- a/po/slitaz-tools/fr.po Thu Jul 25 03:24:36 2013 +0300 +++ b/po/slitaz-tools/fr.po Mon Sep 09 03:27:04 2013 +0300 @@ -1,13 +1,13 @@ -# French translations for SliTaz package. -# Copyright (C) 2011 THE SliTaz'S COPYRIGHT HOLDER -# This file is distributed under the same license as the SliTaz package. -# Linux User , 2011. +# French translations for SliTaz Tools package. +# Copyright (C) 2013 SliTaz GNU/Linux +# This file is distributed under the same license as the SliTaz Tools package. +# Christophe Lincoln , 2011. # msgid "" msgstr "" "Project-Id-Version: SliTaz Tools\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-07-17 18:32+0300\n" +"POT-Creation-Date: 2013-09-06 02:11+0300\n" "PO-Revision-Date: 2012-04-30 14:10+0100\n" "Last-Translator: Christophe Lincoln \n" "Language-Team: French\n" @@ -17,38 +17,70 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: tinyutils/tazlocale:87 -msgid "Setting system locale to:" -msgstr "Paramétrage de la langue du système:" - -#: tinyutils/tazlocale:101 +#: tinyutils/tazlocale:71 msgid "SliTaz language configuration" msgstr "Configuration de la langue" -#: tinyutils/tazlocale:120 +#: tinyutils/tazlocale:90 msgid "" "Please logout of your current session and login again to use new locale." msgstr "" "Veuillez vous déloguer et vous reloguer une fois pour utiliser la nouvelle " "locale." -#: tinyutils/tazlocale:129 tinyutils/tazkeymap:47 -msgid "Config file :" -msgstr "Fichier de config:" +#: tinyutils/tazlocale:92 tinyutils/tazkeymap:64 +msgid "Information" +msgstr "" -#: tinyutils/tazlocale:130 +#: tinyutils/tazlocale:100 +msgid "SliTaz GNU/Linux locale setting using dialog boxes." +msgstr "" + +#: tinyutils/tazlocale:102 tinyutils/decode:30 tinyutils/hwsetup:24 +msgid "Usage:" +msgstr "Utilisation :" + +#: tinyutils/tazlocale:102 tinyutils/decode:31 tinyutils/hwsetup:25 +msgid "option" +msgstr "" + +#: tinyutils/tazlocale:104 +msgid "Display locale selecting dialog if no option given." +msgstr "" + +#: tinyutils/tazlocale:106 tinyutils/hwsetup:40 +msgid "Options:" +msgstr "" + +#: tinyutils/tazlocale:107 +msgid "Show info about config file and current locale." +msgstr "" + +#: tinyutils/tazlocale:108 +msgid "Show list of available locales." +msgstr "" + +#: tinyutils/tazlocale:110 +msgid "Any other option treated as locale - set locale." +msgstr "" + +#: tinyutils/tazlocale:115 tinyutils/tazkeymap:42 +msgid "Config file:" +msgstr "Fichier de config :" + +#: tinyutils/tazlocale:116 msgid "Current locale:" -msgstr "Locale actuelle :" +msgstr "Locale actuelle :" -#: tinyutils/tazkeymap:48 +#: tinyutils/tazkeymap:43 msgid "Current keymap:" -msgstr "Clavier actuel :" +msgstr "Clavier actuel :" -#: tinyutils/tazkeymap:57 +#: tinyutils/tazkeymap:52 msgid "SliTaz keymap configuration" msgstr "Configuration du clavier" -#: tinyutils/tazkeymap:69 +#: tinyutils/tazkeymap:65 msgid "" "Please logout of your current session and login again to use new keyboard." msgstr "" @@ -63,113 +95,538 @@ msgid "Done" msgstr "Fait" -#: tinyutils/tazx:32 -msgid "You must be root to configure X server." -msgstr "Vous devez être root pour configurer le serveur X." - -#: tinyutils/tazx:131 +#: tinyutils/tazx:122 msgid "Install Xorg" msgstr "Installer Xorg" -#: tinyutils/tazx:133 +#: tinyutils/tazx:123 msgid "Tazx helps you to select your X driver." msgstr "Tazx vous aide à séléctionner votre pilote Xorg." -#: tinyutils/tazx:168 +#: tinyutils/tazx:125 +msgid "driver" +msgstr "" + +#: tinyutils/tazx:126 +msgid "Quit" +msgstr "" + +#: tinyutils/tazx:155 +msgid "Configure X" +msgstr "" + +#: tinyutils/tazx:157 msgid "Tazx dialog helps you to configure your Xorg server." msgstr "Tazx vous aide à configurer votre serveur Xorg." -#: tinyutils/tazx:169 +#: tinyutils/tazx:158 msgid "Window Manager:" -msgstr "Gestionnaire de fenêtres:" +msgstr "Gestionnaire de fenêtres :" -#: tinyutils/tazx:170 +#: tinyutils/tazx:159 msgid "X server:" -msgstr "Serveur X:" +msgstr "Serveur X :" -#: tinyutils/tazx:171 +#: tinyutils/tazx:160 msgid "Install or reconfigure Xorg" msgstr "Installer ou reconfigurer Xorg" -#: tinyutils/tazx:172 +#: tinyutils/tazx:161 msgid "Install TinyX server Xfbdev" msgstr "Installer le serveur TinyX Xfbdev" -#: tinyutils/tazx:173 +#: tinyutils/tazx:162 msgid "Quit Tazx utility" msgstr "Quitter l'utilitaire Tazx" -#: tinyutils/decode:31 -msgid "Usage:" -msgstr "Utilisation:" - -#: tinyutils/decode:33 +#: tinyutils/decode:28 msgid "Decode audio and video files" msgstr "Décode les fichiers audio et video" +#: tinyutils/decode:31 tinyutils/decode:36 +msgid "file" +msgstr "" + +#: tinyutils/decode:31 +msgid "URL" +msgstr "" + +#: tinyutils/decode:33 +msgid "Examples:" +msgstr "Exemples :" + #: tinyutils/decode:35 -msgid "Examples:" -msgstr "Exemples:" +msgid "/path/to/files/*" +msgstr "" -#: tinyutils/decode:49 -msgid "Missing decoder :" -msgstr "Manque le décodeur:" +#: tinyutils/decode:47 +#, sh-format +msgid "Missing decoder: $dec" +msgstr "Manque le décodeur : $dec" -#: tinyutils/decode:50 -msgid "Skipping file :" -msgstr "Fichier ingoré :" +#: tinyutils/decode:48 tinyutils/decode:80 +#, sh-format +msgid "Skipping file: $name" +msgstr "Fichier ingoré : $name" -#: tinyutils/decode:54 -msgid "Decoding:" -msgstr "Décodage de:" +#: tinyutils/decode:51 +#, sh-format +msgid "Decoding: $name" +msgstr "Décodage de : $name" -#: tinyutils/decode:78 -msgid "Unsupported file:" -msgstr "Fichier pas supporté:" +#: tinyutils/decode:60 +#, sh-format +msgid "No file: $file" +msgstr "Pas de fichier : $file" -#: tinyutils/decode:98 -msgid "No file:" -msgstr "Pas de fichier:" +#: tinyutils/decode:82 +#, sh-format +msgid "Unsupported file: $file" +msgstr "Fichier pas supporté : $file" -#: tinyutils/terminal:24 +#: tinyutils/terminal:10 msgid "configurable SliTaz wrapper for terminal." msgstr "" -#: tinyutils/terminal:26 +#: tinyutils/terminal:12 msgid "Recognized options:" msgstr "" -#: tinyutils/terminal:27 +#: tinyutils/terminal:13 msgid "Print the version number" msgstr "" -#: tinyutils/terminal:28 +#: tinyutils/terminal:14 msgid "Print out this message" msgstr "" -#: tinyutils/terminal:29 +#: tinyutils/terminal:15 #, sh-format msgid "Width and height of terminal window ($GEOMETRY)" msgstr "" -#: tinyutils/terminal:30 +#: tinyutils/terminal:16 #, sh-format msgid "Title name for window (\"$TITLE\")" msgstr "" -#: tinyutils/terminal:31 -msgid "Dont't close terminal after command finished" +#: tinyutils/terminal:17 +msgid "Don't close terminal after command finished" msgstr "" -#: tinyutils/terminal:32 +#: tinyutils/terminal:18 msgid "Command to execute (must be last in line)" msgstr "" -#: tinyutils/terminal:35 +#: tinyutils/terminal:21 #, sh-format msgid "Help for $TERMINAL:" msgstr "" +#: tinyutils/hwsetup:22 +msgid "SliTaz Setup configuration" +msgstr "" + +#: tinyutils/hwsetup:25 +msgid "command" +msgstr "" + +#: tinyutils/hwsetup:27 +msgid "Commands:" +msgstr "" + +#: tinyutils/hwsetup:29 +msgid "Print this short usage." +msgstr "" + +#: tinyutils/hwsetup:30 +msgid "Parallel and USB Printer setup." +msgstr "" + +#: tinyutils/hwsetup:31 +msgid "USB Scanner setup." +msgstr "" + +#: tinyutils/hwsetup:32 +msgid "Integrated and USB webcam setup." +msgstr "" + +#: tinyutils/hwsetup:33 +msgid "Digital Camera setup." +msgstr "" + +#: tinyutils/hwsetup:34 +msgid "Bluetooth setup." +msgstr "" + +#: tinyutils/hwsetup:35 +msgid "3g-modem setup." +msgstr "" + +#: tinyutils/hwsetup:36 +msgid "Start/stop firewall." +msgstr "" + +#: tinyutils/hwsetup:37 +msgid "Nvidia (non-free/free) setup." +msgstr "" + +#: tinyutils/hwsetup:38 +msgid "ATI (non-free/free) setup." +msgstr "" + +#: tinyutils/hwsetup:42 +msgid "install non-free packages (nvidia, ati)." +msgstr "" + +#: tinyutils/hwsetup:43 +msgid "auto-install optional dependencies." +msgstr "" + +#: tinyutils/hwsetup:44 +msgid "confirm before installing optional dependencies" +msgstr "" + +#: tinyutils/hwsetup:98 +#, sh-format +msgid "" +"Due to a lack of compatible hardware for troubleshooting, this $DEVICE " +"device has not been properly tested. Please report any success, failure, bug " +"to SliTaz Bug tracker or Forum." +msgstr "" + +#: tinyutils/hwsetup:107 +#, sh-format +msgid "Failed to setup $DEVICE" +msgstr "" + +#: tinyutils/hwsetup:117 +#, sh-format +msgid "Installing pkg: $pkg" +msgstr "" + +#: tinyutils/hwsetup:131 +#, sh-format +msgid "Would you like to install pkg: $pkg" +msgstr "" + +#: tinyutils/hwsetup:148 +#, sh-format +msgid "adding $user to $grp" +msgstr "" + +#: tinyutils/hwsetup:171 +msgid "Detected USB Device : Vendor : Product" +msgstr "" + +#: tinyutils/hwsetup:213 +msgid "Do you want to use hp-setup utility" +msgstr "" + +#: tinyutils/hwsetup:228 +#, sh-format +msgid "Verify $DEVICE Permissions" +msgstr "" + +#: tinyutils/hwsetup:229 +#, sh-format +msgid "Your $DEVICE must be in $grp group with rw-rw-rw- permissions" +msgstr "" + +#: tinyutils/hwsetup:250 +msgid "New udev rules are added by a package" +msgstr "" + +#: tinyutils/hwsetup:258 +msgid "Auto configuring Xorg..." +msgstr "" + +#: tinyutils/hwsetup:261 +msgid "Configuring Xorg..." +msgstr "" + +#: tinyutils/hwsetup:292 +msgid "Wvdial Box" +msgstr "" + +#: tinyutils/hwsetup:295 +msgid "Phone Number:" +msgstr "" + +#: tinyutils/hwsetup:296 +msgid "Username:" +msgstr "" + +#: tinyutils/hwsetup:297 +msgid "Password:" +msgstr "" + +#: tinyutils/hwsetup:298 +msgid "Pin (if required):" +msgstr "" + +#: tinyutils/hwsetup:299 +msgid "Modem:" +msgstr "" + +#: tinyutils/hwsetup:300 +msgid "Access Point Name (APN):" +msgstr "" + +#: tinyutils/hwsetup:301 +msgid "You must save your account info before dialing" +msgstr "" + +#: tinyutils/hwsetup:302 +msgid "Edit config file" +msgstr "" + +#: tinyutils/hwsetup:303 +msgid "Save Configuration" +msgstr "" + +#: tinyutils/hwsetup:304 +msgid "Dial Pin Once" +msgstr "" + +#: tinyutils/hwsetup:380 +msgid "Do you want to start cups" +msgstr "" + +#: tinyutils/hwsetup:388 +msgid "Starting cups using:" +msgstr "" + +#: tinyutils/hwsetup:407 +msgid "Do you want to start scanner" +msgstr "" + +#: tinyutils/hwsetup:415 +msgid "Following scanner commands may be of help:" +msgstr "" + +#: tinyutils/hwsetup:416 +msgid "to verify scanner has been found" +msgstr "" + +#: tinyutils/hwsetup:417 +msgid "scanner application" +msgstr "" + +#: tinyutils/hwsetup:436 +msgid "Would you like to test webcam" +msgstr "" + +#: tinyutils/hwsetup:443 +msgid "Would you like to test webcam by installing mplayer-svn" +msgstr "" + +#: tinyutils/hwsetup:450 +msgid "Webcam is set up; please use mplayer-svn/fswebcam/amsn/skype to view" +msgstr "" + +#: tinyutils/hwsetup:466 +msgid "Do you want to check if gphoto2 can talk to your camera" +msgstr "" + +#: tinyutils/hwsetup:471 +msgid "Do you want to test importing photos" +msgstr "" + +#: tinyutils/hwsetup:481 +msgid "Camera is set up; please use gphoto2 to import photos" +msgstr "" + +#: tinyutils/hwsetup:483 +#, sh-format +msgid "Quick start guide: $guide_url" +msgstr "" + +#: tinyutils/hwsetup:494 +msgid "Do you want to see if the bluetooth is working" +msgstr "" + +#: tinyutils/hwsetup:502 +msgid "Bluetooth interfaces" +msgstr "" + +#: tinyutils/hwsetup:510 tinyutils/hwsetup:527 +msgid "Following Bluetooth commands may be of help" +msgstr "" + +#: tinyutils/hwsetup:515 +msgid "checking local bluetooth devices..." +msgstr "" + +#: tinyutils/hwsetup:516 +msgid "scanning remote bluetooth devices..." +msgstr "" + +#: tinyutils/hwsetup:517 +msgid "pairing with remote bluetooth devices..." +msgstr "" + +#: tinyutils/hwsetup:520 tinyutils/hwsetup:541 +#, sh-format +msgid "You can manually edit the configuration files in $bt if need be" +msgstr "" + +#: tinyutils/hwsetup:534 +msgid "for starting bluetooth daemon" +msgstr "" + +#: tinyutils/hwsetup:536 +msgid "for checking local devices" +msgstr "" + +#: tinyutils/hwsetup:537 +msgid "for scanning remote devices" +msgstr "" + +#: tinyutils/hwsetup:538 +msgid "pairing with remote bluetooth devices" +msgstr "" + +#: tinyutils/hwsetup:552 +msgid "List detected devices" +msgstr "" + +#: tinyutils/hwsetup:556 +msgid "Detected Modem at:" +msgstr "" + +#: tinyutils/hwsetup:558 +msgid "Do you want to configure wvdial" +msgstr "" + +#: tinyutils/hwsetup:567 +#, sh-format +msgid "Edit $wc for phone number, login name, password and pin" +msgstr "" + +#: tinyutils/hwsetup:568 +#, sh-format +msgid "Add DNS adress of your provider in $rc" +msgstr "" + +#: tinyutils/hwsetup:577 +msgid "Setting IPTABLES_RULES to yes in /etc/slitaz/firewall.conf" +msgstr "" + +#: tinyutils/hwsetup:586 +msgid "Probing for open ports..." +msgstr "" + +#: tinyutils/hwsetup:590 +msgid "Adding firewall daemon to start automatically at boot" +msgstr "" + +#: tinyutils/hwsetup:607 +msgid "Do you want to configure X using non-free nvidia driver" +msgstr "" + +#: tinyutils/hwsetup:610 tinyutils/hwsetup:649 tinyutils/hwsetup:681 +#: tinyutils/hwsetup:714 +#, sh-format +msgid "Your previous config is in $xorg60" +msgstr "" + +#: tinyutils/hwsetup:611 tinyutils/hwsetup:650 +#, sh-format +msgid "If nvidia fails, you can remove $xorg55 to restore previous config." +msgstr "" + +#: tinyutils/hwsetup:618 +msgid "Adding to xorg.conf:" +msgstr "" + +#: tinyutils/hwsetup:623 tinyutils/hwsetup:659 +msgid "Checking if nvidia is working..." +msgstr "" + +#: tinyutils/hwsetup:627 +msgid "Configure nvidia settings:" +msgstr "" + +#: tinyutils/hwsetup:634 +msgid "test nvidia" +msgstr "" + +#: tinyutils/hwsetup:635 +msgid "Use: nvidia-settings utility to configure your settings if necessary" +msgstr "" + +#: tinyutils/hwsetup:646 +msgid "Do you want to configure X using free nvidia driver" +msgstr "" + +#: tinyutils/hwsetup:652 +#, sh-format +msgid "Create $xorg55short configured with nv driver." +msgstr "" + +#: tinyutils/hwsetup:678 +msgid "Do you want to configure X using non-free catalyst ATI (radeon) driver" +msgstr "" + +#: tinyutils/hwsetup:682 +#, sh-format +msgid "If ati fails, you can remove $xorg55 to restore previous config." +msgstr "" + +#: tinyutils/hwsetup:691 +msgid "Checking if ati catalyst is working..." +msgstr "" + +#: tinyutils/hwsetup:695 +msgid "Configuration:" +msgstr "" + +#: tinyutils/hwsetup:696 +msgid "" +"Use: aticonfig utility to generate a template configuration file if necessary" +msgstr "" + +#: tinyutils/hwsetup:711 +msgid "Do you want to configure X using free ATI (radeon) driver" +msgstr "" + +#: tinyutils/hwsetup:715 +#, sh-format +msgid "If ATI fails, you can remove $xorg55 to restore previous config." +msgstr "" + +#: tinyutils/hwsetup:717 +#, sh-format +msgid "Create $xorg55short configured with radeon driver." +msgstr "" + +#: tinyutils/hwsetup:723 +msgid "Checking if ATI radeon is working..." +msgstr "" + +#: tinyutils/hwsetup:739 +msgid "Bringing eth0 down..." +msgstr "" + +#: tinyutils/hwsetup:740 +msgid "Dialing..." +msgstr "" + +#: tinyutils/hwsetup:766 +msgid "The following optional packages can be installed:" +msgstr "" + +#: tinyutils/hwsetup:770 +msgid "Do you want to install all/few/no optional dependencies (all|few|N)? " +msgstr "" + +#~ msgid "You must be root to configure X server." +#~ msgstr "Vous devez être root pour configurer le serveur X." + +#~ msgid "Setting system locale to: $locale" +#~ msgstr "Paramétrage de la langue du système : $locale" + #~ msgid "You must be root to run:" #~ msgstr "Vous devez être root pour lancer:" diff -r de13422f3a69 -r e232f0e1413a po/slitaz-tools/pl.po --- a/po/slitaz-tools/pl.po Thu Jul 25 03:24:36 2013 +0300 +++ b/po/slitaz-tools/pl.po Mon Sep 09 03:27:04 2013 +0300 @@ -1,5 +1,5 @@ -# Polish translation for SliTaz Tools package. -# Copyright (C) 2013 SliTaz +# Polish translations for SliTaz Tools package. +# Copyright (C) 2013 SliTaz GNU/Linux # This file is distributed under the same license as the SliTaz Tools package. # Paweł Pyrczak , 2013. # @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: SliTaz Tools\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-07-17 18:32+0300\n" +"POT-Creation-Date: 2013-09-06 02:11+0300\n" "PO-Revision-Date: 2013-07-23 12:35+0100\n" "Last-Translator: Paweł Pyrczak \n" "Language-Team: Paweł Pyrczak \n" @@ -15,42 +15,81 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " +"|| n%100>=20) ? 1 : 2);\n" "X-Poedit-Language: Polish\n" "X-Poedit-Country: POLAND\n" "X-Poedit-SourceCharset: utf-8\n" -#: tinyutils/tazlocale:87 -msgid "Setting system locale to:" -msgstr "Zmienianie ustawień regionalnych systemu na:" - -#: tinyutils/tazlocale:101 +#: tinyutils/tazlocale:71 msgid "SliTaz language configuration" msgstr "Konfiguracja języka SliTaz" -#: tinyutils/tazlocale:120 -msgid "Please logout of your current session and login again to use new locale." -msgstr "Proszę wyloguj się z aktualnej sesji i zaloguj ponownie aby używać nowych ustawień regionalnych." +#: tinyutils/tazlocale:90 +msgid "" +"Please logout of your current session and login again to use new locale." +msgstr "" +"Proszę wyloguj się z aktualnej sesji i zaloguj ponownie aby używać nowych " +"ustawień regionalnych." -#: tinyutils/tazlocale:129 tinyutils/tazkeymap:47 -msgid "Config file :" +#: tinyutils/tazlocale:92 tinyutils/tazkeymap:64 +msgid "Information" +msgstr "" + +#: tinyutils/tazlocale:100 +msgid "SliTaz GNU/Linux locale setting using dialog boxes." +msgstr "" + +#: tinyutils/tazlocale:102 tinyutils/decode:30 tinyutils/hwsetup:24 +msgid "Usage:" +msgstr "Użycie:" + +#: tinyutils/tazlocale:102 tinyutils/decode:31 tinyutils/hwsetup:25 +msgid "option" +msgstr "" + +#: tinyutils/tazlocale:104 +msgid "Display locale selecting dialog if no option given." +msgstr "" + +#: tinyutils/tazlocale:106 tinyutils/hwsetup:40 +msgid "Options:" +msgstr "" + +#: tinyutils/tazlocale:107 +msgid "Show info about config file and current locale." +msgstr "" + +#: tinyutils/tazlocale:108 +msgid "Show list of available locales." +msgstr "" + +#: tinyutils/tazlocale:110 +msgid "Any other option treated as locale - set locale." +msgstr "" + +#: tinyutils/tazlocale:115 tinyutils/tazkeymap:42 +msgid "Config file:" msgstr "Plik konfiguracyjny:" -#: tinyutils/tazlocale:130 +#: tinyutils/tazlocale:116 msgid "Current locale:" msgstr "Aktualne ustawienia regionalne:" -#: tinyutils/tazkeymap:48 +#: tinyutils/tazkeymap:43 msgid "Current keymap:" msgstr "Aktualny układ klawiatury:" -#: tinyutils/tazkeymap:57 +#: tinyutils/tazkeymap:52 msgid "SliTaz keymap configuration" msgstr "Konfiguracja układu klawiatury SliTaz" -#: tinyutils/tazkeymap:69 -msgid "Please logout of your current session and login again to use new keyboard." -msgstr "Proszę wyloguj się z aktualnej sesji i zaloguj ponownie aby używać nowego układu klawiatury." +#: tinyutils/tazkeymap:65 +msgid "" +"Please logout of your current session and login again to use new keyboard." +msgstr "" +"Proszę wyloguj się z aktualnej sesji i zaloguj ponownie aby używać nowego " +"układu klawiatury." #: tinyutils/setmixer:12 msgid "Setting default mixer volumes... " @@ -60,110 +99,534 @@ msgid "Done" msgstr "Zakończono" -#: tinyutils/tazx:32 -msgid "You must be root to configure X server." -msgstr "Aby konfigurować serwer X wymagane są uprawnienia administratora." - -#: tinyutils/tazx:131 +#: tinyutils/tazx:122 msgid "Install Xorg" msgstr "Zainstaluj Xorg" -#: tinyutils/tazx:133 +#: tinyutils/tazx:123 msgid "Tazx helps you to select your X driver." msgstr "Tazx pomaga w wybraniu właściwego sterownika X" -#: tinyutils/tazx:168 +#: tinyutils/tazx:125 +msgid "driver" +msgstr "" + +#: tinyutils/tazx:126 +msgid "Quit" +msgstr "" + +#: tinyutils/tazx:155 +msgid "Configure X" +msgstr "" + +#: tinyutils/tazx:157 msgid "Tazx dialog helps you to configure your Xorg server." msgstr "Dialog Tazx pomaga w konfiguracji serwera Xorg." -#: tinyutils/tazx:169 +#: tinyutils/tazx:158 msgid "Window Manager:" msgstr "Menadżer okien:" -#: tinyutils/tazx:170 +#: tinyutils/tazx:159 msgid "X server:" msgstr "Server X:" -#: tinyutils/tazx:171 +#: tinyutils/tazx:160 msgid "Install or reconfigure Xorg" msgstr "Zainstaluj i skonfiguruj Xorg" -#: tinyutils/tazx:172 +#: tinyutils/tazx:161 msgid "Install TinyX server Xfbdev" msgstr "Zainstaluj serwer TinyX Xfbdev" -#: tinyutils/tazx:173 +#: tinyutils/tazx:162 msgid "Quit Tazx utility" msgstr "Zamknij narzędzie Tazx" -#: tinyutils/decode:31 -msgid "Usage:" -msgstr "Użycie:" - -#: tinyutils/decode:33 +#: tinyutils/decode:28 msgid "Decode audio and video files" msgstr "Dekoduj pliki audio i video" -#: tinyutils/decode:35 +#: tinyutils/decode:31 tinyutils/decode:36 +msgid "file" +msgstr "" + +#: tinyutils/decode:31 +msgid "URL" +msgstr "" + +#: tinyutils/decode:33 msgid "Examples:" msgstr "Przykłady:" -#: tinyutils/decode:49 -msgid "Missing decoder :" -msgstr "Brakujący dekoder :" +#: tinyutils/decode:35 +msgid "/path/to/files/*" +msgstr "" -#: tinyutils/decode:50 -msgid "Skipping file :" -msgstr "Pomijanie pliku :" +#: tinyutils/decode:47 +#, sh-format +msgid "Missing decoder: $dec" +msgstr "Brakujący dekoder: $dec" -#: tinyutils/decode:54 -msgid "Decoding:" -msgstr "Dekodowanie:" +#: tinyutils/decode:48 tinyutils/decode:80 +#, sh-format +msgid "Skipping file: $name" +msgstr "Pomijanie pliku: $name" -#: tinyutils/decode:78 -msgid "Unsupported file:" -msgstr "Nieobsługiwany plik:" +#: tinyutils/decode:51 +#, sh-format +msgid "Decoding: $name" +msgstr "Dekodowanie: $name" -#: tinyutils/decode:98 -msgid "No file:" -msgstr "Brak pliku:" +#: tinyutils/decode:60 +#, sh-format +msgid "No file: $file" +msgstr "Brak pliku: $file" -#: tinyutils/terminal:24 +#: tinyutils/decode:82 +#, sh-format +msgid "Unsupported file: $file" +msgstr "Nieobsługiwany plik: $file" + +#: tinyutils/terminal:10 msgid "configurable SliTaz wrapper for terminal." msgstr "konfigurowalny wrapper SLiTaz dla terminala." -#: tinyutils/terminal:26 +#: tinyutils/terminal:12 msgid "Recognized options:" msgstr "Rozpoznane opcje:" -#: tinyutils/terminal:27 +#: tinyutils/terminal:13 msgid "Print the version number" msgstr "Wyświetl numer wersji" -#: tinyutils/terminal:28 +#: tinyutils/terminal:14 msgid "Print out this message" msgstr "Wyświetl tą wiadomość" -#: tinyutils/terminal:29 +#: tinyutils/terminal:15 #, sh-format msgid "Width and height of terminal window ($GEOMETRY)" msgstr "Szerokość i wysokość okna terminala ($GEOMETRY)" -#: tinyutils/terminal:30 +#: tinyutils/terminal:16 #, sh-format msgid "Title name for window (\"$TITLE\")" msgstr "Pasek tytułu dla okna (\"$TITLE\")" -#: tinyutils/terminal:31 -msgid "Dont't close terminal after command finished" +#: tinyutils/terminal:17 +msgid "Don't close terminal after command finished" msgstr "Proszę nie zamykać terminala po zakończeniu wykonywania polecenia" -#: tinyutils/terminal:32 +#: tinyutils/terminal:18 msgid "Command to execute (must be last in line)" msgstr "Polecenie do wykonania (musi być ostatnie w lini)" -#: tinyutils/terminal:35 +#: tinyutils/terminal:21 #, sh-format msgid "Help for $TERMINAL:" msgstr "Pomoc dla $TERMINAL:" +#: tinyutils/hwsetup:22 +msgid "SliTaz Setup configuration" +msgstr "" + +#: tinyutils/hwsetup:25 +msgid "command" +msgstr "" + +#: tinyutils/hwsetup:27 +msgid "Commands:" +msgstr "" + +#: tinyutils/hwsetup:29 +msgid "Print this short usage." +msgstr "" + +#: tinyutils/hwsetup:30 +msgid "Parallel and USB Printer setup." +msgstr "" + +#: tinyutils/hwsetup:31 +msgid "USB Scanner setup." +msgstr "" + +#: tinyutils/hwsetup:32 +msgid "Integrated and USB webcam setup." +msgstr "" + +#: tinyutils/hwsetup:33 +msgid "Digital Camera setup." +msgstr "" + +#: tinyutils/hwsetup:34 +msgid "Bluetooth setup." +msgstr "" + +#: tinyutils/hwsetup:35 +msgid "3g-modem setup." +msgstr "" + +#: tinyutils/hwsetup:36 +msgid "Start/stop firewall." +msgstr "" + +#: tinyutils/hwsetup:37 +msgid "Nvidia (non-free/free) setup." +msgstr "" + +#: tinyutils/hwsetup:38 +msgid "ATI (non-free/free) setup." +msgstr "" + +#: tinyutils/hwsetup:42 +msgid "install non-free packages (nvidia, ati)." +msgstr "" + +#: tinyutils/hwsetup:43 +msgid "auto-install optional dependencies." +msgstr "" + +#: tinyutils/hwsetup:44 +msgid "confirm before installing optional dependencies" +msgstr "" + +#: tinyutils/hwsetup:98 +#, sh-format +msgid "" +"Due to a lack of compatible hardware for troubleshooting, this $DEVICE " +"device has not been properly tested. Please report any success, failure, bug " +"to SliTaz Bug tracker or Forum." +msgstr "" + +#: tinyutils/hwsetup:107 +#, sh-format +msgid "Failed to setup $DEVICE" +msgstr "" + +#: tinyutils/hwsetup:117 +#, sh-format +msgid "Installing pkg: $pkg" +msgstr "" + +#: tinyutils/hwsetup:131 +#, sh-format +msgid "Would you like to install pkg: $pkg" +msgstr "" + +#: tinyutils/hwsetup:148 +#, sh-format +msgid "adding $user to $grp" +msgstr "" + +#: tinyutils/hwsetup:171 +msgid "Detected USB Device : Vendor : Product" +msgstr "" + +#: tinyutils/hwsetup:213 +msgid "Do you want to use hp-setup utility" +msgstr "" + +#: tinyutils/hwsetup:228 +#, sh-format +msgid "Verify $DEVICE Permissions" +msgstr "" + +#: tinyutils/hwsetup:229 +#, sh-format +msgid "Your $DEVICE must be in $grp group with rw-rw-rw- permissions" +msgstr "" + +#: tinyutils/hwsetup:250 +msgid "New udev rules are added by a package" +msgstr "" + +#: tinyutils/hwsetup:258 +msgid "Auto configuring Xorg..." +msgstr "" + +#: tinyutils/hwsetup:261 +msgid "Configuring Xorg..." +msgstr "" + +#: tinyutils/hwsetup:292 +msgid "Wvdial Box" +msgstr "" + +#: tinyutils/hwsetup:295 +msgid "Phone Number:" +msgstr "" + +#: tinyutils/hwsetup:296 +msgid "Username:" +msgstr "" + +#: tinyutils/hwsetup:297 +msgid "Password:" +msgstr "" + +#: tinyutils/hwsetup:298 +msgid "Pin (if required):" +msgstr "" + +#: tinyutils/hwsetup:299 +msgid "Modem:" +msgstr "" + +#: tinyutils/hwsetup:300 +msgid "Access Point Name (APN):" +msgstr "" + +#: tinyutils/hwsetup:301 +msgid "You must save your account info before dialing" +msgstr "" + +#: tinyutils/hwsetup:302 +msgid "Edit config file" +msgstr "" + +#: tinyutils/hwsetup:303 +msgid "Save Configuration" +msgstr "" + +#: tinyutils/hwsetup:304 +msgid "Dial Pin Once" +msgstr "" + +#: tinyutils/hwsetup:380 +msgid "Do you want to start cups" +msgstr "" + +#: tinyutils/hwsetup:388 +msgid "Starting cups using:" +msgstr "" + +#: tinyutils/hwsetup:407 +msgid "Do you want to start scanner" +msgstr "" + +#: tinyutils/hwsetup:415 +msgid "Following scanner commands may be of help:" +msgstr "" + +#: tinyutils/hwsetup:416 +msgid "to verify scanner has been found" +msgstr "" + +#: tinyutils/hwsetup:417 +msgid "scanner application" +msgstr "" + +#: tinyutils/hwsetup:436 +msgid "Would you like to test webcam" +msgstr "" + +#: tinyutils/hwsetup:443 +msgid "Would you like to test webcam by installing mplayer-svn" +msgstr "" + +#: tinyutils/hwsetup:450 +msgid "Webcam is set up; please use mplayer-svn/fswebcam/amsn/skype to view" +msgstr "" + +#: tinyutils/hwsetup:466 +msgid "Do you want to check if gphoto2 can talk to your camera" +msgstr "" + +#: tinyutils/hwsetup:471 +msgid "Do you want to test importing photos" +msgstr "" + +#: tinyutils/hwsetup:481 +msgid "Camera is set up; please use gphoto2 to import photos" +msgstr "" + +#: tinyutils/hwsetup:483 +#, sh-format +msgid "Quick start guide: $guide_url" +msgstr "" + +#: tinyutils/hwsetup:494 +msgid "Do you want to see if the bluetooth is working" +msgstr "" + +#: tinyutils/hwsetup:502 +msgid "Bluetooth interfaces" +msgstr "" + +#: tinyutils/hwsetup:510 tinyutils/hwsetup:527 +msgid "Following Bluetooth commands may be of help" +msgstr "" + +#: tinyutils/hwsetup:515 +msgid "checking local bluetooth devices..." +msgstr "" + +#: tinyutils/hwsetup:516 +msgid "scanning remote bluetooth devices..." +msgstr "" + +#: tinyutils/hwsetup:517 +msgid "pairing with remote bluetooth devices..." +msgstr "" + +#: tinyutils/hwsetup:520 tinyutils/hwsetup:541 +#, sh-format +msgid "You can manually edit the configuration files in $bt if need be" +msgstr "" + +#: tinyutils/hwsetup:534 +msgid "for starting bluetooth daemon" +msgstr "" + +#: tinyutils/hwsetup:536 +msgid "for checking local devices" +msgstr "" + +#: tinyutils/hwsetup:537 +msgid "for scanning remote devices" +msgstr "" + +#: tinyutils/hwsetup:538 +msgid "pairing with remote bluetooth devices" +msgstr "" + +#: tinyutils/hwsetup:552 +msgid "List detected devices" +msgstr "" + +#: tinyutils/hwsetup:556 +msgid "Detected Modem at:" +msgstr "" + +#: tinyutils/hwsetup:558 +msgid "Do you want to configure wvdial" +msgstr "" + +#: tinyutils/hwsetup:567 +#, sh-format +msgid "Edit $wc for phone number, login name, password and pin" +msgstr "" + +#: tinyutils/hwsetup:568 +#, sh-format +msgid "Add DNS adress of your provider in $rc" +msgstr "" + +#: tinyutils/hwsetup:577 +msgid "Setting IPTABLES_RULES to yes in /etc/slitaz/firewall.conf" +msgstr "" + +#: tinyutils/hwsetup:586 +msgid "Probing for open ports..." +msgstr "" + +#: tinyutils/hwsetup:590 +msgid "Adding firewall daemon to start automatically at boot" +msgstr "" + +#: tinyutils/hwsetup:607 +msgid "Do you want to configure X using non-free nvidia driver" +msgstr "" + +#: tinyutils/hwsetup:610 tinyutils/hwsetup:649 tinyutils/hwsetup:681 +#: tinyutils/hwsetup:714 +#, sh-format +msgid "Your previous config is in $xorg60" +msgstr "" + +#: tinyutils/hwsetup:611 tinyutils/hwsetup:650 +#, sh-format +msgid "If nvidia fails, you can remove $xorg55 to restore previous config." +msgstr "" + +#: tinyutils/hwsetup:618 +msgid "Adding to xorg.conf:" +msgstr "" + +#: tinyutils/hwsetup:623 tinyutils/hwsetup:659 +msgid "Checking if nvidia is working..." +msgstr "" + +#: tinyutils/hwsetup:627 +msgid "Configure nvidia settings:" +msgstr "" + +#: tinyutils/hwsetup:634 +msgid "test nvidia" +msgstr "" + +#: tinyutils/hwsetup:635 +msgid "Use: nvidia-settings utility to configure your settings if necessary" +msgstr "" + +#: tinyutils/hwsetup:646 +msgid "Do you want to configure X using free nvidia driver" +msgstr "" + +#: tinyutils/hwsetup:652 +#, sh-format +msgid "Create $xorg55short configured with nv driver." +msgstr "" + +#: tinyutils/hwsetup:678 +msgid "Do you want to configure X using non-free catalyst ATI (radeon) driver" +msgstr "" + +#: tinyutils/hwsetup:682 +#, sh-format +msgid "If ati fails, you can remove $xorg55 to restore previous config." +msgstr "" + +#: tinyutils/hwsetup:691 +msgid "Checking if ati catalyst is working..." +msgstr "" + +#: tinyutils/hwsetup:695 +msgid "Configuration:" +msgstr "" + +#: tinyutils/hwsetup:696 +msgid "" +"Use: aticonfig utility to generate a template configuration file if necessary" +msgstr "" + +#: tinyutils/hwsetup:711 +msgid "Do you want to configure X using free ATI (radeon) driver" +msgstr "" + +#: tinyutils/hwsetup:715 +#, sh-format +msgid "If ATI fails, you can remove $xorg55 to restore previous config." +msgstr "" + +#: tinyutils/hwsetup:717 +#, sh-format +msgid "Create $xorg55short configured with radeon driver." +msgstr "" + +#: tinyutils/hwsetup:723 +msgid "Checking if ATI radeon is working..." +msgstr "" + +#: tinyutils/hwsetup:739 +msgid "Bringing eth0 down..." +msgstr "" + +#: tinyutils/hwsetup:740 +msgid "Dialing..." +msgstr "" + +#: tinyutils/hwsetup:766 +msgid "The following optional packages can be installed:" +msgstr "" + +#: tinyutils/hwsetup:770 +msgid "Do you want to install all/few/no optional dependencies (all|few|N)? " +msgstr "" + +#~ msgid "You must be root to configure X server." +#~ msgstr "Aby konfigurować serwer X wymagane są uprawnienia administratora." + +#~ msgid "Setting system locale to: $locale" +#~ msgstr "Zmienianie ustawień regionalnych systemu na: $locale" diff -r de13422f3a69 -r e232f0e1413a po/slitaz-tools/pt_BR.po --- a/po/slitaz-tools/pt_BR.po Thu Jul 25 03:24:36 2013 +0300 +++ b/po/slitaz-tools/pt_BR.po Mon Sep 09 03:27:04 2013 +0300 @@ -1,13 +1,13 @@ -# SliTaz Tools Brazilian Portuguese translation -# Copyright (C) 2011 www.slitaz.org -# This file is distributed under the same license as the slitaz-tools package. +# Brazilian Portuguese translations for SliTaz Tools package. +# Copyright (C) 2013 SliTaz GNU/Linux +# This file is distributed under the same license as the SliTaz Tools package. # Claudinei Pereira , 2011. # msgid "" msgstr "" -"Project-Id-Version: slitaz-tools\n" +"Project-Id-Version: SliTaz Tools\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-07-17 18:32+0300\n" +"POT-Creation-Date: 2013-09-06 02:11+0300\n" "PO-Revision-Date: 2013-01-26 01:40-0300\n" "Last-Translator: Claudinei Pereira \n" "Language-Team: Portuguese \n" @@ -17,37 +17,69 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: tinyutils/tazlocale:87 -msgid "Setting system locale to:" -msgstr "Definido linguagem do sistema para:" - -#: tinyutils/tazlocale:101 +#: tinyutils/tazlocale:71 msgid "SliTaz language configuration" msgstr "Configuração de Linguagem do SliTaz" -#: tinyutils/tazlocale:120 +#: tinyutils/tazlocale:90 msgid "" "Please logout of your current session and login again to use new locale." msgstr "" "Finalize a sessão atual e faça login novamente para usar a nova linguagem." -#: tinyutils/tazlocale:129 tinyutils/tazkeymap:47 -msgid "Config file :" +#: tinyutils/tazlocale:92 tinyutils/tazkeymap:64 +msgid "Information" +msgstr "" + +#: tinyutils/tazlocale:100 +msgid "SliTaz GNU/Linux locale setting using dialog boxes." +msgstr "" + +#: tinyutils/tazlocale:102 tinyutils/decode:30 tinyutils/hwsetup:24 +msgid "Usage:" +msgstr "Utilização" + +#: tinyutils/tazlocale:102 tinyutils/decode:31 tinyutils/hwsetup:25 +msgid "option" +msgstr "" + +#: tinyutils/tazlocale:104 +msgid "Display locale selecting dialog if no option given." +msgstr "" + +#: tinyutils/tazlocale:106 tinyutils/hwsetup:40 +msgid "Options:" +msgstr "" + +#: tinyutils/tazlocale:107 +msgid "Show info about config file and current locale." +msgstr "" + +#: tinyutils/tazlocale:108 +msgid "Show list of available locales." +msgstr "" + +#: tinyutils/tazlocale:110 +msgid "Any other option treated as locale - set locale." +msgstr "" + +#: tinyutils/tazlocale:115 tinyutils/tazkeymap:42 +msgid "Config file:" msgstr "Arquivo de configuração:" -#: tinyutils/tazlocale:130 +#: tinyutils/tazlocale:116 msgid "Current locale:" msgstr "Linguagem atual:" -#: tinyutils/tazkeymap:48 +#: tinyutils/tazkeymap:43 msgid "Current keymap:" msgstr "Mapa de teclado atual:" -#: tinyutils/tazkeymap:57 +#: tinyutils/tazkeymap:52 msgid "SliTaz keymap configuration" msgstr "Configuraçao de Zona Horária do SliTaz" -#: tinyutils/tazkeymap:69 +#: tinyutils/tazkeymap:65 msgid "" "Please logout of your current session and login again to use new keyboard." msgstr "" @@ -62,113 +94,538 @@ msgid "Done" msgstr "Feito" -#: tinyutils/tazx:32 -msgid "You must be root to configure X server." -msgstr "Você deve ser root para configurar o servidor gráfico." - -#: tinyutils/tazx:131 +#: tinyutils/tazx:122 msgid "Install Xorg" msgstr "Instalar Xorg" -#: tinyutils/tazx:133 +#: tinyutils/tazx:123 msgid "Tazx helps you to select your X driver." msgstr "O Tazx ajuda a selecionar o driver gráfico." -#: tinyutils/tazx:168 +#: tinyutils/tazx:125 +msgid "driver" +msgstr "" + +#: tinyutils/tazx:126 +msgid "Quit" +msgstr "" + +#: tinyutils/tazx:155 +msgid "Configure X" +msgstr "" + +#: tinyutils/tazx:157 msgid "Tazx dialog helps you to configure your Xorg server." msgstr "A caixa de diálogo do Tazx ajuda a configurar o servidor gráfico." -#: tinyutils/tazx:169 +#: tinyutils/tazx:158 msgid "Window Manager:" msgstr "Gerenciador de janelas:" -#: tinyutils/tazx:170 +#: tinyutils/tazx:159 msgid "X server:" msgstr "Servidor gráfico:" -#: tinyutils/tazx:171 +#: tinyutils/tazx:160 msgid "Install or reconfigure Xorg" msgstr "Instale ou reconfigure o Xorg" -#: tinyutils/tazx:172 +#: tinyutils/tazx:161 msgid "Install TinyX server Xfbdev" msgstr "Instale o servidor gráfico leve Xfbdev" -#: tinyutils/tazx:173 +#: tinyutils/tazx:162 msgid "Quit Tazx utility" msgstr "Sair do utilitário Tazx" -#: tinyutils/decode:31 -msgid "Usage:" -msgstr "Utilização" - -#: tinyutils/decode:33 +#: tinyutils/decode:28 msgid "Decode audio and video files" msgstr "Decodifica arquivos de áudio e vídeo" -#: tinyutils/decode:35 +#: tinyutils/decode:31 tinyutils/decode:36 +msgid "file" +msgstr "" + +#: tinyutils/decode:31 +msgid "URL" +msgstr "" + +#: tinyutils/decode:33 msgid "Examples:" msgstr "Exemplos:" -#: tinyutils/decode:49 -msgid "Missing decoder :" -msgstr "Decodificador não encontrado:" +#: tinyutils/decode:35 +msgid "/path/to/files/*" +msgstr "" -#: tinyutils/decode:50 -msgid "Skipping file :" -msgstr "Ignorando arquivo:" +#: tinyutils/decode:47 +#, sh-format +msgid "Missing decoder: $dec" +msgstr "Decodificador não encontrado: $dec" -#: tinyutils/decode:54 -msgid "Decoding:" -msgstr "Decodificando:" +#: tinyutils/decode:48 tinyutils/decode:80 +#, sh-format +msgid "Skipping file: $name" +msgstr "Ignorando arquivo: $name" -#: tinyutils/decode:78 -msgid "Unsupported file:" -msgstr "Arquivo não suportado:" +#: tinyutils/decode:51 +#, sh-format +msgid "Decoding: $name" +msgstr "Decodificando: $name" -#: tinyutils/decode:98 -msgid "No file:" -msgstr "Nenhum arquivo:" +#: tinyutils/decode:60 +#, sh-format +msgid "No file: $file" +msgstr "Nenhum arquivo: $file" -#: tinyutils/terminal:24 +#: tinyutils/decode:82 +#, sh-format +msgid "Unsupported file: $file" +msgstr "Arquivo não suportado: $file" + +#: tinyutils/terminal:10 msgid "configurable SliTaz wrapper for terminal." msgstr "" -#: tinyutils/terminal:26 +#: tinyutils/terminal:12 msgid "Recognized options:" msgstr "" -#: tinyutils/terminal:27 +#: tinyutils/terminal:13 msgid "Print the version number" msgstr "" -#: tinyutils/terminal:28 +#: tinyutils/terminal:14 msgid "Print out this message" msgstr "" -#: tinyutils/terminal:29 +#: tinyutils/terminal:15 #, sh-format msgid "Width and height of terminal window ($GEOMETRY)" msgstr "" -#: tinyutils/terminal:30 +#: tinyutils/terminal:16 #, sh-format msgid "Title name for window (\"$TITLE\")" msgstr "" -#: tinyutils/terminal:31 -msgid "Dont't close terminal after command finished" +#: tinyutils/terminal:17 +msgid "Don't close terminal after command finished" msgstr "" -#: tinyutils/terminal:32 +#: tinyutils/terminal:18 msgid "Command to execute (must be last in line)" msgstr "" -#: tinyutils/terminal:35 +#: tinyutils/terminal:21 #, sh-format msgid "Help for $TERMINAL:" msgstr "" +#: tinyutils/hwsetup:22 +msgid "SliTaz Setup configuration" +msgstr "" + +#: tinyutils/hwsetup:25 +msgid "command" +msgstr "" + +#: tinyutils/hwsetup:27 +msgid "Commands:" +msgstr "" + +#: tinyutils/hwsetup:29 +msgid "Print this short usage." +msgstr "" + +#: tinyutils/hwsetup:30 +msgid "Parallel and USB Printer setup." +msgstr "" + +#: tinyutils/hwsetup:31 +msgid "USB Scanner setup." +msgstr "" + +#: tinyutils/hwsetup:32 +msgid "Integrated and USB webcam setup." +msgstr "" + +#: tinyutils/hwsetup:33 +msgid "Digital Camera setup." +msgstr "" + +#: tinyutils/hwsetup:34 +msgid "Bluetooth setup." +msgstr "" + +#: tinyutils/hwsetup:35 +msgid "3g-modem setup." +msgstr "" + +#: tinyutils/hwsetup:36 +msgid "Start/stop firewall." +msgstr "" + +#: tinyutils/hwsetup:37 +msgid "Nvidia (non-free/free) setup." +msgstr "" + +#: tinyutils/hwsetup:38 +msgid "ATI (non-free/free) setup." +msgstr "" + +#: tinyutils/hwsetup:42 +msgid "install non-free packages (nvidia, ati)." +msgstr "" + +#: tinyutils/hwsetup:43 +msgid "auto-install optional dependencies." +msgstr "" + +#: tinyutils/hwsetup:44 +msgid "confirm before installing optional dependencies" +msgstr "" + +#: tinyutils/hwsetup:98 +#, sh-format +msgid "" +"Due to a lack of compatible hardware for troubleshooting, this $DEVICE " +"device has not been properly tested. Please report any success, failure, bug " +"to SliTaz Bug tracker or Forum." +msgstr "" + +#: tinyutils/hwsetup:107 +#, sh-format +msgid "Failed to setup $DEVICE" +msgstr "" + +#: tinyutils/hwsetup:117 +#, sh-format +msgid "Installing pkg: $pkg" +msgstr "" + +#: tinyutils/hwsetup:131 +#, sh-format +msgid "Would you like to install pkg: $pkg" +msgstr "" + +#: tinyutils/hwsetup:148 +#, sh-format +msgid "adding $user to $grp" +msgstr "" + +#: tinyutils/hwsetup:171 +msgid "Detected USB Device : Vendor : Product" +msgstr "" + +#: tinyutils/hwsetup:213 +msgid "Do you want to use hp-setup utility" +msgstr "" + +#: tinyutils/hwsetup:228 +#, sh-format +msgid "Verify $DEVICE Permissions" +msgstr "" + +#: tinyutils/hwsetup:229 +#, sh-format +msgid "Your $DEVICE must be in $grp group with rw-rw-rw- permissions" +msgstr "" + +#: tinyutils/hwsetup:250 +msgid "New udev rules are added by a package" +msgstr "" + +#: tinyutils/hwsetup:258 +msgid "Auto configuring Xorg..." +msgstr "" + +#: tinyutils/hwsetup:261 +msgid "Configuring Xorg..." +msgstr "" + +#: tinyutils/hwsetup:292 +msgid "Wvdial Box" +msgstr "" + +#: tinyutils/hwsetup:295 +msgid "Phone Number:" +msgstr "" + +#: tinyutils/hwsetup:296 +msgid "Username:" +msgstr "" + +#: tinyutils/hwsetup:297 +msgid "Password:" +msgstr "" + +#: tinyutils/hwsetup:298 +msgid "Pin (if required):" +msgstr "" + +#: tinyutils/hwsetup:299 +msgid "Modem:" +msgstr "" + +#: tinyutils/hwsetup:300 +msgid "Access Point Name (APN):" +msgstr "" + +#: tinyutils/hwsetup:301 +msgid "You must save your account info before dialing" +msgstr "" + +#: tinyutils/hwsetup:302 +msgid "Edit config file" +msgstr "" + +#: tinyutils/hwsetup:303 +msgid "Save Configuration" +msgstr "" + +#: tinyutils/hwsetup:304 +msgid "Dial Pin Once" +msgstr "" + +#: tinyutils/hwsetup:380 +msgid "Do you want to start cups" +msgstr "" + +#: tinyutils/hwsetup:388 +msgid "Starting cups using:" +msgstr "" + +#: tinyutils/hwsetup:407 +msgid "Do you want to start scanner" +msgstr "" + +#: tinyutils/hwsetup:415 +msgid "Following scanner commands may be of help:" +msgstr "" + +#: tinyutils/hwsetup:416 +msgid "to verify scanner has been found" +msgstr "" + +#: tinyutils/hwsetup:417 +msgid "scanner application" +msgstr "" + +#: tinyutils/hwsetup:436 +msgid "Would you like to test webcam" +msgstr "" + +#: tinyutils/hwsetup:443 +msgid "Would you like to test webcam by installing mplayer-svn" +msgstr "" + +#: tinyutils/hwsetup:450 +msgid "Webcam is set up; please use mplayer-svn/fswebcam/amsn/skype to view" +msgstr "" + +#: tinyutils/hwsetup:466 +msgid "Do you want to check if gphoto2 can talk to your camera" +msgstr "" + +#: tinyutils/hwsetup:471 +msgid "Do you want to test importing photos" +msgstr "" + +#: tinyutils/hwsetup:481 +msgid "Camera is set up; please use gphoto2 to import photos" +msgstr "" + +#: tinyutils/hwsetup:483 +#, sh-format +msgid "Quick start guide: $guide_url" +msgstr "" + +#: tinyutils/hwsetup:494 +msgid "Do you want to see if the bluetooth is working" +msgstr "" + +#: tinyutils/hwsetup:502 +msgid "Bluetooth interfaces" +msgstr "" + +#: tinyutils/hwsetup:510 tinyutils/hwsetup:527 +msgid "Following Bluetooth commands may be of help" +msgstr "" + +#: tinyutils/hwsetup:515 +msgid "checking local bluetooth devices..." +msgstr "" + +#: tinyutils/hwsetup:516 +msgid "scanning remote bluetooth devices..." +msgstr "" + +#: tinyutils/hwsetup:517 +msgid "pairing with remote bluetooth devices..." +msgstr "" + +#: tinyutils/hwsetup:520 tinyutils/hwsetup:541 +#, sh-format +msgid "You can manually edit the configuration files in $bt if need be" +msgstr "" + +#: tinyutils/hwsetup:534 +msgid "for starting bluetooth daemon" +msgstr "" + +#: tinyutils/hwsetup:536 +msgid "for checking local devices" +msgstr "" + +#: tinyutils/hwsetup:537 +msgid "for scanning remote devices" +msgstr "" + +#: tinyutils/hwsetup:538 +msgid "pairing with remote bluetooth devices" +msgstr "" + +#: tinyutils/hwsetup:552 +msgid "List detected devices" +msgstr "" + +#: tinyutils/hwsetup:556 +msgid "Detected Modem at:" +msgstr "" + +#: tinyutils/hwsetup:558 +msgid "Do you want to configure wvdial" +msgstr "" + +#: tinyutils/hwsetup:567 +#, sh-format +msgid "Edit $wc for phone number, login name, password and pin" +msgstr "" + +#: tinyutils/hwsetup:568 +#, sh-format +msgid "Add DNS adress of your provider in $rc" +msgstr "" + +#: tinyutils/hwsetup:577 +msgid "Setting IPTABLES_RULES to yes in /etc/slitaz/firewall.conf" +msgstr "" + +#: tinyutils/hwsetup:586 +msgid "Probing for open ports..." +msgstr "" + +#: tinyutils/hwsetup:590 +msgid "Adding firewall daemon to start automatically at boot" +msgstr "" + +#: tinyutils/hwsetup:607 +msgid "Do you want to configure X using non-free nvidia driver" +msgstr "" + +#: tinyutils/hwsetup:610 tinyutils/hwsetup:649 tinyutils/hwsetup:681 +#: tinyutils/hwsetup:714 +#, sh-format +msgid "Your previous config is in $xorg60" +msgstr "" + +#: tinyutils/hwsetup:611 tinyutils/hwsetup:650 +#, sh-format +msgid "If nvidia fails, you can remove $xorg55 to restore previous config." +msgstr "" + +#: tinyutils/hwsetup:618 +msgid "Adding to xorg.conf:" +msgstr "" + +#: tinyutils/hwsetup:623 tinyutils/hwsetup:659 +msgid "Checking if nvidia is working..." +msgstr "" + +#: tinyutils/hwsetup:627 +msgid "Configure nvidia settings:" +msgstr "" + +#: tinyutils/hwsetup:634 +msgid "test nvidia" +msgstr "" + +#: tinyutils/hwsetup:635 +msgid "Use: nvidia-settings utility to configure your settings if necessary" +msgstr "" + +#: tinyutils/hwsetup:646 +msgid "Do you want to configure X using free nvidia driver" +msgstr "" + +#: tinyutils/hwsetup:652 +#, sh-format +msgid "Create $xorg55short configured with nv driver." +msgstr "" + +#: tinyutils/hwsetup:678 +msgid "Do you want to configure X using non-free catalyst ATI (radeon) driver" +msgstr "" + +#: tinyutils/hwsetup:682 +#, sh-format +msgid "If ati fails, you can remove $xorg55 to restore previous config." +msgstr "" + +#: tinyutils/hwsetup:691 +msgid "Checking if ati catalyst is working..." +msgstr "" + +#: tinyutils/hwsetup:695 +msgid "Configuration:" +msgstr "" + +#: tinyutils/hwsetup:696 +msgid "" +"Use: aticonfig utility to generate a template configuration file if necessary" +msgstr "" + +#: tinyutils/hwsetup:711 +msgid "Do you want to configure X using free ATI (radeon) driver" +msgstr "" + +#: tinyutils/hwsetup:715 +#, sh-format +msgid "If ATI fails, you can remove $xorg55 to restore previous config." +msgstr "" + +#: tinyutils/hwsetup:717 +#, sh-format +msgid "Create $xorg55short configured with radeon driver." +msgstr "" + +#: tinyutils/hwsetup:723 +msgid "Checking if ATI radeon is working..." +msgstr "" + +#: tinyutils/hwsetup:739 +msgid "Bringing eth0 down..." +msgstr "" + +#: tinyutils/hwsetup:740 +msgid "Dialing..." +msgstr "" + +#: tinyutils/hwsetup:766 +msgid "The following optional packages can be installed:" +msgstr "" + +#: tinyutils/hwsetup:770 +msgid "Do you want to install all/few/no optional dependencies (all|few|N)? " +msgstr "" + +#~ msgid "You must be root to configure X server." +#~ msgstr "Você deve ser root para configurar o servidor gráfico." + +#~ msgid "Setting system locale to: $locale" +#~ msgstr "Definido linguagem do sistema para: $locale" + #~ msgid "You must be root to run:" #~ msgstr "Você deve ser root para executar:" diff -r de13422f3a69 -r e232f0e1413a po/slitaz-tools/ru.po --- a/po/slitaz-tools/ru.po Thu Jul 25 03:24:36 2013 +0300 +++ b/po/slitaz-tools/ru.po Mon Sep 09 03:27:04 2013 +0300 @@ -1,51 +1,92 @@ -# Russian translations for SliTaz Tools. -# Copyright (C) 2013 SliTaz -# This file is distributed under the same license as the slitaz-tools package. +# Russian translations for SliTaz Tools package. +# Copyright (C) 2013 SliTaz GNU/Linux +# This file is distributed under the same license as the SliTaz Tools package. # Aleksej Bobylev , 2012. # msgid "" msgstr "" "Project-Id-Version: SliTaz Tools\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-07-17 18:32+0300\n" -"PO-Revision-Date: 2013-07-17 18:38+0300\n" +"POT-Creation-Date: 2013-08-31 15:34+0300\n" +"PO-Revision-Date: 2013-08-31 15:35+0300\n" "Last-Translator: Aleksej Bobylev \n" "Language-Team: \n" "Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: Russian\n" +"X-Poedit-Basepath: ../../\n" +"X-Poedit-SearchPath-0: .\n" -#: tinyutils/tazlocale:87 -msgid "Setting system locale to:" -msgstr "Установка системной локали:" - -#: tinyutils/tazlocale:101 +#: tinyutils/tazlocale:71 msgid "SliTaz language configuration" msgstr "Параметры языка SliTaz" -#: tinyutils/tazlocale:120 +#: tinyutils/tazlocale:90 msgid "Please logout of your current session and login again to use new locale." msgstr "Выйдите из системы и войдите повторно, чтобы использовать новую локаль." -#: tinyutils/tazlocale:129 -#: tinyutils/tazkeymap:47 -msgid "Config file :" -msgstr "Файл настроек :" +#: tinyutils/tazlocale:92 +#: tinyutils/tazkeymap:64 +msgid "Information" +msgstr "Информация" -#: tinyutils/tazlocale:130 +#: tinyutils/tazlocale:100 +msgid "SliTaz GNU/Linux locale setting using dialog boxes." +msgstr "Настройка локали SliTaz GNU/Linux с использованием dialog." + +#: tinyutils/tazlocale:102 +#: tinyutils/decode:30 +#: tinyutils/hwsetup:24 +msgid "Usage:" +msgstr "Использование:" + +#: tinyutils/tazlocale:102 +#: tinyutils/decode:31 +#: tinyutils/hwsetup:25 +msgid "option" +msgstr "параметр" + +#: tinyutils/tazlocale:104 +msgid "Display locale selecting dialog if no option given." +msgstr "При отсутствии параметров — показать диалог выбора локали." + +#: tinyutils/tazlocale:106 +#: tinyutils/hwsetup:40 +msgid "Options:" +msgstr "Параметры:" + +#: tinyutils/tazlocale:107 +msgid "Show info about config file and current locale." +msgstr "Информация о конфигурационном файле и текущей локали." + +#: tinyutils/tazlocale:108 +msgid "Show list of available locales." +msgstr "Список доступных локалей." + +#: tinyutils/tazlocale:110 +msgid "Any other option treated as locale - set locale." +msgstr "Любой другой параметр считается именем локали — установить локаль." + +#: tinyutils/tazlocale:115 +#: tinyutils/tazkeymap:42 +msgid "Config file:" +msgstr "Файл настроек:" + +#: tinyutils/tazlocale:116 msgid "Current locale:" -msgstr "Текущая локаль :" +msgstr "Текущая локаль:" -#: tinyutils/tazkeymap:48 +#: tinyutils/tazkeymap:43 msgid "Current keymap:" msgstr "Текущая раскладка:" -#: tinyutils/tazkeymap:57 +#: tinyutils/tazkeymap:52 msgid "SliTaz keymap configuration" msgstr "Параметры клавиатурной раскладки SliTaz" -#: tinyutils/tazkeymap:69 +#: tinyutils/tazkeymap:65 msgid "Please logout of your current session and login again to use new keyboard." msgstr "Выйдите из системы и войдите повторно, чтобы использовать новую раскладку клавиатуры." @@ -55,117 +96,565 @@ #: tinyutils/setmixer:53 msgid "Done" -msgstr "Сделано" +msgstr "Готово" -#: tinyutils/tazx:32 -msgid "You must be root to configure X server." -msgstr "Вы должны быть администратором для настройки X-сервера." - -#: tinyutils/tazx:131 +#: tinyutils/tazx:122 msgid "Install Xorg" msgstr "Установка Xorg" -#: tinyutils/tazx:133 +#: tinyutils/tazx:123 msgid "Tazx helps you to select your X driver." msgstr "Tazx поможет вам выбрать драйвер для X." -#: tinyutils/tazx:168 +#: tinyutils/tazx:125 +msgid "driver" +msgstr "драйвер" + +#: tinyutils/tazx:126 +msgid "Quit" +msgstr "Выход" + +#: tinyutils/tazx:155 +msgid "Configure X" +msgstr "Настройка XOrg" + +#: tinyutils/tazx:157 msgid "Tazx dialog helps you to configure your Xorg server." msgstr "Диалог Tazx поможет вам настроить сервер Xorg." -#: tinyutils/tazx:169 +#: tinyutils/tazx:158 msgid "Window Manager:" msgstr "Менеджер окон:" -#: tinyutils/tazx:170 +#: tinyutils/tazx:159 msgid "X server:" msgstr "X-сервер:" -#: tinyutils/tazx:171 +#: tinyutils/tazx:160 msgid "Install or reconfigure Xorg" msgstr "Установить или перенастроить Xorg" -#: tinyutils/tazx:172 +#: tinyutils/tazx:161 msgid "Install TinyX server Xfbdev" msgstr "Установить сервер TinyX: Xfbdev" -#: tinyutils/tazx:173 +#: tinyutils/tazx:162 msgid "Quit Tazx utility" msgstr "Выйти из утилиты Tazx" -#: tinyutils/decode:31 -msgid "Usage:" -msgstr "Использование:" - -#: tinyutils/decode:33 +#: tinyutils/decode:28 msgid "Decode audio and video files" msgstr "Преобразование файлов аудио и видео" -#: tinyutils/decode:35 +#: tinyutils/decode:31 +#: tinyutils/decode:36 +msgid "file" +msgstr "файл" + +#: tinyutils/decode:31 +msgid "URL" +msgstr "адрес" + +#: tinyutils/decode:33 msgid "Examples:" msgstr "Примеры:" -#: tinyutils/decode:49 -msgid "Missing decoder :" -msgstr "Отсутствует декодер :" +#: tinyutils/decode:35 +msgid "/path/to/files/*" +msgstr "/путь/к/файлам/*" -#: tinyutils/decode:50 -msgid "Skipping file :" -msgstr "Пропускается файл :" +#: tinyutils/decode:47 +#, sh-format +msgid "Missing decoder: $dec" +msgstr "Отсутствует декодер «$dec»" -#: tinyutils/decode:54 -msgid "Decoding:" -msgstr "Преобразуется:" +#: tinyutils/decode:48 +#: tinyutils/decode:80 +#, sh-format +msgid "Skipping file: $name" +msgstr "Файл «$name» не обработан" -#: tinyutils/decode:78 -msgid "Unsupported file:" -msgstr "Неподдерживаемый файл:" +#: tinyutils/decode:51 +#, sh-format +msgid "Decoding: $name" +msgstr "Преобразование «$name»" -#: tinyutils/decode:98 -msgid "No file:" -msgstr "Нет файла:" +#: tinyutils/decode:60 +#, sh-format +msgid "No file: $file" +msgstr "Файл «$file» отсутствует" -#: tinyutils/terminal:24 +#: tinyutils/decode:82 +#, sh-format +msgid "Unsupported file: $file" +msgstr "Файл «$file» не поддерживается" + +#: tinyutils/terminal:10 msgid "configurable SliTaz wrapper for terminal." msgstr "настраиваемая обёртка SliTaz для терминала." -#: tinyutils/terminal:26 +#: tinyutils/terminal:12 msgid "Recognized options:" msgstr "Поддерживаемые параметры:" -#: tinyutils/terminal:27 +#: tinyutils/terminal:13 msgid "Print the version number" msgstr "Информация о версии" -#: tinyutils/terminal:28 +#: tinyutils/terminal:14 msgid "Print out this message" msgstr "Вывести эту справку" -#: tinyutils/terminal:29 +#: tinyutils/terminal:15 #, sh-format msgid "Width and height of terminal window ($GEOMETRY)" msgstr "Ширина и высота окна терминала ($GEOMETRY)" -#: tinyutils/terminal:30 +#: tinyutils/terminal:16 #, sh-format msgid "Title name for window (\"$TITLE\")" msgstr "Заголовок окна (\"$TITLE\")" -#: tinyutils/terminal:31 -msgid "Dont't close terminal after command finished" +#: tinyutils/terminal:17 +msgid "Don't close terminal after command finished" msgstr "Не закрывать терминал после завершения команды" -#: tinyutils/terminal:32 +#: tinyutils/terminal:18 msgid "Command to execute (must be last in line)" msgstr "Выполнить команду (должна быть последней в строке)" -#: tinyutils/terminal:35 +#: tinyutils/terminal:21 #, sh-format msgid "Help for $TERMINAL:" msgstr "Справка программы $TERMINAL:" -#~ msgid "You must be root to run:" -#~ msgstr "Вы должны быть администратором, чтобы запустить:" +#: tinyutils/hwsetup:22 +msgid "SliTaz Setup configuration" +msgstr "Настройка оборудования SliTaz" -#~ msgid "Type su and root password to become super-user" -#~ msgstr "Введите «su» и пароль root, чтобы стать администратором" +#: tinyutils/hwsetup:25 +msgid "command" +msgstr "команда" + +#: tinyutils/hwsetup:27 +msgid "Commands:" +msgstr "Команды:" + +#: tinyutils/hwsetup:29 +msgid "Print this short usage." +msgstr "Вывести эту справку" + +#: tinyutils/hwsetup:30 +msgid "Parallel and USB Printer setup." +msgstr "Настройка параллельного принтера и USB-принтера" + +#: tinyutils/hwsetup:31 +msgid "USB Scanner setup." +msgstr "Настройка USB-принтера" + +#: tinyutils/hwsetup:32 +msgid "Integrated and USB webcam setup." +msgstr "Настройка встроенной камеры и USB-камеры" + +#: tinyutils/hwsetup:33 +msgid "Digital Camera setup." +msgstr "Настройка цифрового фотоаппарата" + +#: tinyutils/hwsetup:34 +msgid "Bluetooth setup." +msgstr "Настройка Bluetooth" + +#: tinyutils/hwsetup:35 +msgid "3g-modem setup." +msgstr "Настройка 3G-модема" + +#: tinyutils/hwsetup:36 +msgid "Start/stop firewall." +msgstr "Запуск/остановка брандмауэра" + +#: tinyutils/hwsetup:37 +msgid "Nvidia (non-free/free) setup." +msgstr "Настройка видео-карты Nvidia (свободные и несвободные драйверы)." + +#: tinyutils/hwsetup:38 +msgid "ATI (non-free/free) setup." +msgstr "Настройка видео-карты ATI (свободные и несвободные драйверы)." + +#: tinyutils/hwsetup:42 +msgid "install non-free packages (nvidia, ati)." +msgstr "устанавливать несвободные пакеты (для nvidia, ati)." + +#: tinyutils/hwsetup:43 +msgid "auto-install optional dependencies." +msgstr "автоматическая установка дополнительных зависимостей" + +#: tinyutils/hwsetup:44 +msgid "confirm before installing optional dependencies" +msgstr "подтверждать установку дополнительных зависимостей" + +#: tinyutils/hwsetup:98 +#, sh-format +msgid "Due to a lack of compatible hardware for troubleshooting, this $DEVICE device has not been properly tested. Please report any success, failure, bug to SliTaz Bug tracker or Forum." +msgstr "Ввиду отсутствия совместимого оборудования для диагностики, это устройство $DEVICE не было должным образом проверено. Сообщите о ваших успехах, неудачах, ошибках в баг-трекер SliTaz или на форум." + +#: tinyutils/hwsetup:107 +#, sh-format +msgid "Failed to setup $DEVICE" +msgstr "Не удалось настроить $DEVICE" + +#: tinyutils/hwsetup:117 +#, sh-format +msgid "Installing pkg: $pkg" +msgstr "Установка пакета «$pkg»" + +#: tinyutils/hwsetup:131 +#, sh-format +msgid "Would you like to install pkg: $pkg" +msgstr "Установить пакет «$pkg»" + +#: tinyutils/hwsetup:148 +#, sh-format +msgid "adding $user to $grp" +msgstr "добавление пользователя «$user» в группу «$grp»" + +#: tinyutils/hwsetup:171 +msgid "Detected USB Device : Vendor : Product" +msgstr "Обнаруженные устройства USB : Производитель : Изделие" + +#: tinyutils/hwsetup:213 +msgid "Do you want to use hp-setup utility" +msgstr "Использовать утилиту hp-setup" + +#: tinyutils/hwsetup:228 +#, sh-format +msgid "Verify $DEVICE Permissions" +msgstr "Проверка прав доступа «$DEVICE»" + +#: tinyutils/hwsetup:229 +#, sh-format +msgid "Your $DEVICE must be in $grp group with rw-rw-rw- permissions" +msgstr "Устройство «$DEVICE» должно принадлежать группе $grp и иметь права доступа rw-rw-rw-" + +#: tinyutils/hwsetup:250 +msgid "New udev rules are added by a package" +msgstr "Новые правила UDEV добавлены при установке пакета" + +#: tinyutils/hwsetup:258 +msgid "Auto configuring Xorg..." +msgstr "Авто-настройка XOrg…" + +#: tinyutils/hwsetup:261 +msgid "Configuring Xorg..." +msgstr "Настройка XOrg…" + +#: tinyutils/hwsetup:292 +msgid "Wvdial Box" +msgstr "Настроки wvdial" + +#: tinyutils/hwsetup:295 +msgid "Phone Number:" +msgstr "Номер телефона:" + +#: tinyutils/hwsetup:296 +msgid "Username:" +msgstr "Имя пользователя:" + +#: tinyutils/hwsetup:297 +msgid "Password:" +msgstr "Пароль:" + +#: tinyutils/hwsetup:298 +msgid "Pin (if required):" +msgstr "PIN (при необходимости):" + +#: tinyutils/hwsetup:299 +msgid "Modem:" +msgstr "Модем:" + +#: tinyutils/hwsetup:300 +msgid "Access Point Name (APN):" +msgstr "Точка доступа (APN):" + +#: tinyutils/hwsetup:301 +msgid "You must save your account info before dialing" +msgstr "Вы должны сохранить изменения перед набором номера" + +#: tinyutils/hwsetup:302 +msgid "Edit config file" +msgstr "Правка файла настроек" + +#: tinyutils/hwsetup:303 +msgid "Save Configuration" +msgstr "Сохранить параметры" + +#: tinyutils/hwsetup:304 +msgid "Dial Pin Once" +msgstr "Набрать PIN" + +#: tinyutils/hwsetup:380 +msgid "Do you want to start cups" +msgstr "Запустить CUPS" + +#: tinyutils/hwsetup:388 +msgid "Starting cups using:" +msgstr "Запуск cups используя:" + +#: tinyutils/hwsetup:407 +msgid "Do you want to start scanner" +msgstr "Запустить сканер" + +#: tinyutils/hwsetup:415 +msgid "Following scanner commands may be of help:" +msgstr "Следующие команды сканера могут пригодиться:" + +#: tinyutils/hwsetup:416 +msgid "to verify scanner has been found" +msgstr "убедиться, что сканер был обнаружен" + +#: tinyutils/hwsetup:417 +msgid "scanner application" +msgstr "приложение для работы со сканером" + +#: tinyutils/hwsetup:436 +msgid "Would you like to test webcam" +msgstr "Проверить веб-камеру" + +#: tinyutils/hwsetup:443 +msgid "Would you like to test webcam by installing mplayer-svn" +msgstr "Проверить веб-камеру, установив пакет mplayer-svn" + +#: tinyutils/hwsetup:450 +msgid "Webcam is set up; please use mplayer-svn/fswebcam/amsn/skype to view" +msgstr "Веб-камера настроена; запустите mplayer-svn, fswebcam, amsn или skype для проверки" + +#: tinyutils/hwsetup:466 +msgid "Do you want to check if gphoto2 can talk to your camera" +msgstr "Проверить, сможет ли gphoto2 получить ответ от вашего фотоаппарата" + +#: tinyutils/hwsetup:471 +msgid "Do you want to test importing photos" +msgstr "Проверить импорт фотографий" + +#: tinyutils/hwsetup:481 +msgid "Camera is set up; please use gphoto2 to import photos" +msgstr "Камера настроена; запустите gphoto2 для импорта фотографий" + +#: tinyutils/hwsetup:483 +#, sh-format +msgid "Quick start guide: $guide_url" +msgstr "Краткое руководство: $guide_url" + +#: tinyutils/hwsetup:494 +msgid "Do you want to see if the bluetooth is working" +msgstr "Убедиться, работает ли bluetooth" + +#: tinyutils/hwsetup:502 +msgid "Bluetooth interfaces" +msgstr "Интерфейсы Bluetooth" + +#: tinyutils/hwsetup:510 +#: tinyutils/hwsetup:527 +msgid "Following Bluetooth commands may be of help" +msgstr "Следующие команды Bluetooth могут пригодиться" + +#: tinyutils/hwsetup:515 +msgid "checking local bluetooth devices..." +msgstr "поиск оборудования Bluetooth…" + +#: tinyutils/hwsetup:516 +msgid "scanning remote bluetooth devices..." +msgstr "поиск устройств Bluetooth в зоне действия…" + +#: tinyutils/hwsetup:517 +msgid "pairing with remote bluetooth devices..." +msgstr "сопряжение с устройством Bluetooth…" + +#: tinyutils/hwsetup:520 +#: tinyutils/hwsetup:541 +#, sh-format +msgid "You can manually edit the configuration files in $bt if need be" +msgstr "Если понадобится, вы можете самостоятельно править файлы настроек в $bt" + +#: tinyutils/hwsetup:534 +msgid "for starting bluetooth daemon" +msgstr "для запуска службы Bluetooth" + +#: tinyutils/hwsetup:536 +msgid "for checking local devices" +msgstr "для проверки локальных устройств" + +#: tinyutils/hwsetup:537 +msgid "for scanning remote devices" +msgstr "для поиска устройств в зоне действия" + +#: tinyutils/hwsetup:538 +msgid "pairing with remote bluetooth devices" +msgstr "сопряжение с устройством Bluetooth" + +#: tinyutils/hwsetup:552 +msgid "List detected devices" +msgstr "Список найденных устройств" + +#: tinyutils/hwsetup:556 +msgid "Detected Modem at:" +msgstr "Обнаруженные модемы:" + +#: tinyutils/hwsetup:558 +msgid "Do you want to configure wvdial" +msgstr "Хотите ли вы настроить wvdial" + +#: tinyutils/hwsetup:567 +#, sh-format +msgid "Edit $wc for phone number, login name, password and pin" +msgstr "В файле $wc вы можете изменить номер дозвона, логин, пароль и PIN" + +#: tinyutils/hwsetup:568 +#, sh-format +msgid "Add DNS adress of your provider in $rc" +msgstr "Добавьте адрес DNS-сервера вашего провайдера в файл $rc" + +#: tinyutils/hwsetup:577 +msgid "Setting IPTABLES_RULES to yes in /etc/slitaz/firewall.conf" +msgstr "Установка значения «yes» переменной IPTABLES_RULES в файле /etc/slitaz/firewall.conf" + +#: tinyutils/hwsetup:586 +msgid "Probing for open ports..." +msgstr "Поиск открытых портов…" + +#: tinyutils/hwsetup:590 +msgid "Adding firewall daemon to start automatically at boot" +msgstr "Добавление службы брандмауэра в автоматический запуск при загрузке" + +#: tinyutils/hwsetup:607 +msgid "Do you want to configure X using non-free nvidia driver" +msgstr "Настроить XOrg, используя несвободный драйвер Nvidia" + +#: tinyutils/hwsetup:610 +#: tinyutils/hwsetup:649 +#: tinyutils/hwsetup:681 +#: tinyutils/hwsetup:714 +#, sh-format +msgid "Your previous config is in $xorg60" +msgstr "Предыдущие настройки находятся в файле $xorg60" + +#: tinyutils/hwsetup:611 +#: tinyutils/hwsetup:650 +#, sh-format +msgid "If nvidia fails, you can remove $xorg55 to restore previous config." +msgstr "Если драйвер ATI не будет корректно работать, вы можете удалить $xorg55, чтобы вернуться к предыдущим настройкам." + +#: tinyutils/hwsetup:618 +msgid "Adding to xorg.conf:" +msgstr "Добавление в xorg.conf:" + +#: tinyutils/hwsetup:623 +#: tinyutils/hwsetup:659 +msgid "Checking if nvidia is working..." +msgstr "Проверка того, что драйвер nvidia работает…" + +#: tinyutils/hwsetup:627 +msgid "Configure nvidia settings:" +msgstr "Настройка параметров драйвера nvidia:" + +#: tinyutils/hwsetup:634 +msgid "test nvidia" +msgstr "проверка Nvidia" + +#: tinyutils/hwsetup:635 +msgid "Use: nvidia-settings utility to configure your settings if necessary" +msgstr "При необходимости используйте утилиту nvidia-settings для настройки параметров" + +#: tinyutils/hwsetup:646 +msgid "Do you want to configure X using free nvidia driver" +msgstr "Настроить XOrg, используя свободный драйвер Nvidia" + +#: tinyutils/hwsetup:652 +#, sh-format +msgid "Create $xorg55short configured with nv driver." +msgstr "Создание файла «$xorg55short», содержащего настройки драйвера Radeon." + +#: tinyutils/hwsetup:678 +msgid "Do you want to configure X using non-free catalyst ATI (radeon) driver" +msgstr "Настроить XOrg, используя несвободный драйвер ATI Catalyst (Radeon)" + +#: tinyutils/hwsetup:682 +#, sh-format +msgid "If ati fails, you can remove $xorg55 to restore previous config." +msgstr "Если драйвер ATI не будет корректно работать, вы можете удалить $xorg55, чтобы вернуться к предыдущим настройкам." + +#: tinyutils/hwsetup:691 +msgid "Checking if ati catalyst is working..." +msgstr "Проверка того, что драйвер ATI Catalyst работает…" + +#: tinyutils/hwsetup:695 +msgid "Configuration:" +msgstr "Настройка:" + +#: tinyutils/hwsetup:696 +msgid "Use: aticonfig utility to generate a template configuration file if necessary" +msgstr "При необходимости используйте утилиту aticonfig для создания файла-шаблона настроек" + +#: tinyutils/hwsetup:711 +msgid "Do you want to configure X using free ATI (radeon) driver" +msgstr "Настроить XOrg, используя свободный драйвер ATI (Radeon)" + +#: tinyutils/hwsetup:715 +#, sh-format +msgid "If ATI fails, you can remove $xorg55 to restore previous config." +msgstr "Если драйвер ATI не будет корректно работать, вы можете удалить $xorg55, чтобы вернуться к предыдущим настройкам." + +#: tinyutils/hwsetup:717 +#, sh-format +msgid "Create $xorg55short configured with radeon driver." +msgstr "Создание файла «$xorg55short», содержащего настройки драйвера Radeon." + +#: tinyutils/hwsetup:723 +msgid "Checking if ATI radeon is working..." +msgstr "Проверка того, что драйвер ATI Radeon работает…" + +#: tinyutils/hwsetup:739 +msgid "Bringing eth0 down..." +msgstr "Отключение eth0…" + +#: tinyutils/hwsetup:740 +msgid "Dialing..." +msgstr "Набор номера…" + +#: tinyutils/hwsetup:766 +msgid "The following optional packages can be installed:" +msgstr "Могут быть установлены следующие дополнительные пакеты:" + +#: tinyutils/hwsetup:770 +msgid "Do you want to install all/few/no optional dependencies (all|few|N)? " +msgstr "Установить все (all), некоторые (few) или не устанавливать (no) зависимости? " + +#~ msgid "You must be root to configure X server." +#~ msgstr "Вы должны быть администратором для настройки X-сервера." + +#~ msgid "" +#~ "Your previous config is in /etc/X11/xorg.conf.d/60-Device.conf\n" +#~ "If nvidia fails, you can remove /etc/X11/xorg.conf.d/55-DeviceTweaks.conf " +#~ "to restore previous config." +#~ msgstr "" +#~ "Предыдущие настройки находятся в файле /etc/X11/xorg.conf.d/60-Device." +#~ "conf\n" +#~ "Если драйвер nvidia не будет корректно работать, вы можете удалить /etc/" +#~ "X11/xorg.conf.d/55-DeviceTweaks.conf, чтобы вернуться к предыдущим " +#~ "настройкам." + +#~ msgid "" +#~ "Quick start guide: http://www.gphoto.org/doc/manual/using-gphoto2.html" +#~ msgstr "" +#~ "Краткое руководство пользователя: http://www.gphoto.org/doc/manual/using-" +#~ "gphoto2.html" + +#~ msgid "You must be root to run $command with this option." +#~ msgstr "" +#~ "Вы должны быть администратором, чтобы запустить $command с этим " +#~ "параметром." + +#~ msgid "Please use 'su' and root password to become super-user." +#~ msgstr "Введите «su» и пароль root, чтобы стать администратором." + +#~ msgid "Setting system locale to: $locale" +#~ msgstr "Установка системной локали «$locale»" diff -r de13422f3a69 -r e232f0e1413a po/slitaz-tools/slitaz-tools.pot --- a/po/slitaz-tools/slitaz-tools.pot Thu Jul 25 03:24:36 2013 +0300 +++ b/po/slitaz-tools/slitaz-tools.pot Mon Sep 09 03:27:04 2013 +0300 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: SliTaz Tools\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-07-17 18:32+0300\n" +"POT-Creation-Date: 2013-09-06 02:11+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,36 +17,68 @@ "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: tinyutils/tazlocale:87 -msgid "Setting system locale to:" -msgstr "" - -#: tinyutils/tazlocale:101 +#: tinyutils/tazlocale:71 msgid "SliTaz language configuration" msgstr "" -#: tinyutils/tazlocale:120 +#: tinyutils/tazlocale:90 msgid "" "Please logout of your current session and login again to use new locale." msgstr "" -#: tinyutils/tazlocale:129 tinyutils/tazkeymap:47 -msgid "Config file :" +#: tinyutils/tazlocale:92 tinyutils/tazkeymap:64 +msgid "Information" msgstr "" -#: tinyutils/tazlocale:130 +#: tinyutils/tazlocale:100 +msgid "SliTaz GNU/Linux locale setting using dialog boxes." +msgstr "" + +#: tinyutils/tazlocale:102 tinyutils/decode:30 tinyutils/hwsetup:24 +msgid "Usage:" +msgstr "" + +#: tinyutils/tazlocale:102 tinyutils/decode:31 tinyutils/hwsetup:25 +msgid "option" +msgstr "" + +#: tinyutils/tazlocale:104 +msgid "Display locale selecting dialog if no option given." +msgstr "" + +#: tinyutils/tazlocale:106 tinyutils/hwsetup:40 +msgid "Options:" +msgstr "" + +#: tinyutils/tazlocale:107 +msgid "Show info about config file and current locale." +msgstr "" + +#: tinyutils/tazlocale:108 +msgid "Show list of available locales." +msgstr "" + +#: tinyutils/tazlocale:110 +msgid "Any other option treated as locale - set locale." +msgstr "" + +#: tinyutils/tazlocale:115 tinyutils/tazkeymap:42 +msgid "Config file:" +msgstr "" + +#: tinyutils/tazlocale:116 msgid "Current locale:" msgstr "" -#: tinyutils/tazkeymap:48 +#: tinyutils/tazkeymap:43 msgid "Current keymap:" msgstr "" -#: tinyutils/tazkeymap:57 +#: tinyutils/tazkeymap:52 msgid "SliTaz keymap configuration" msgstr "" -#: tinyutils/tazkeymap:69 +#: tinyutils/tazkeymap:65 msgid "" "Please logout of your current session and login again to use new keyboard." msgstr "" @@ -59,109 +91,528 @@ msgid "Done" msgstr "" -#: tinyutils/tazx:32 -msgid "You must be root to configure X server." -msgstr "" - -#: tinyutils/tazx:131 +#: tinyutils/tazx:122 msgid "Install Xorg" msgstr "" -#: tinyutils/tazx:133 +#: tinyutils/tazx:123 msgid "Tazx helps you to select your X driver." msgstr "" -#: tinyutils/tazx:168 +#: tinyutils/tazx:125 +msgid "driver" +msgstr "" + +#: tinyutils/tazx:126 +msgid "Quit" +msgstr "" + +#: tinyutils/tazx:155 +msgid "Configure X" +msgstr "" + +#: tinyutils/tazx:157 msgid "Tazx dialog helps you to configure your Xorg server." msgstr "" -#: tinyutils/tazx:169 +#: tinyutils/tazx:158 msgid "Window Manager:" msgstr "" -#: tinyutils/tazx:170 +#: tinyutils/tazx:159 msgid "X server:" msgstr "" -#: tinyutils/tazx:171 +#: tinyutils/tazx:160 msgid "Install or reconfigure Xorg" msgstr "" -#: tinyutils/tazx:172 +#: tinyutils/tazx:161 msgid "Install TinyX server Xfbdev" msgstr "" -#: tinyutils/tazx:173 +#: tinyutils/tazx:162 msgid "Quit Tazx utility" msgstr "" +#: tinyutils/decode:28 +msgid "Decode audio and video files" +msgstr "" + +#: tinyutils/decode:31 tinyutils/decode:36 +msgid "file" +msgstr "" + #: tinyutils/decode:31 -msgid "Usage:" +msgid "URL" msgstr "" #: tinyutils/decode:33 -msgid "Decode audio and video files" +msgid "Examples:" msgstr "" #: tinyutils/decode:35 -msgid "Examples:" +msgid "/path/to/files/*" msgstr "" -#: tinyutils/decode:49 -msgid "Missing decoder :" +#: tinyutils/decode:47 +#, sh-format +msgid "Missing decoder: $dec" msgstr "" -#: tinyutils/decode:50 -msgid "Skipping file :" +#: tinyutils/decode:48 tinyutils/decode:80 +#, sh-format +msgid "Skipping file: $name" msgstr "" -#: tinyutils/decode:54 -msgid "Decoding:" +#: tinyutils/decode:51 +#, sh-format +msgid "Decoding: $name" msgstr "" -#: tinyutils/decode:78 -msgid "Unsupported file:" +#: tinyutils/decode:60 +#, sh-format +msgid "No file: $file" msgstr "" -#: tinyutils/decode:98 -msgid "No file:" +#: tinyutils/decode:82 +#, sh-format +msgid "Unsupported file: $file" msgstr "" -#: tinyutils/terminal:24 +#: tinyutils/terminal:10 msgid "configurable SliTaz wrapper for terminal." msgstr "" -#: tinyutils/terminal:26 +#: tinyutils/terminal:12 msgid "Recognized options:" msgstr "" -#: tinyutils/terminal:27 +#: tinyutils/terminal:13 msgid "Print the version number" msgstr "" -#: tinyutils/terminal:28 +#: tinyutils/terminal:14 msgid "Print out this message" msgstr "" -#: tinyutils/terminal:29 +#: tinyutils/terminal:15 #, sh-format msgid "Width and height of terminal window ($GEOMETRY)" msgstr "" -#: tinyutils/terminal:30 +#: tinyutils/terminal:16 #, sh-format msgid "Title name for window (\"$TITLE\")" msgstr "" -#: tinyutils/terminal:31 -msgid "Dont't close terminal after command finished" +#: tinyutils/terminal:17 +msgid "Don't close terminal after command finished" msgstr "" -#: tinyutils/terminal:32 +#: tinyutils/terminal:18 msgid "Command to execute (must be last in line)" msgstr "" -#: tinyutils/terminal:35 +#: tinyutils/terminal:21 #, sh-format msgid "Help for $TERMINAL:" msgstr "" + +#: tinyutils/hwsetup:22 +msgid "SliTaz Setup configuration" +msgstr "" + +#: tinyutils/hwsetup:25 +msgid "command" +msgstr "" + +#: tinyutils/hwsetup:27 +msgid "Commands:" +msgstr "" + +#: tinyutils/hwsetup:29 +msgid "Print this short usage." +msgstr "" + +#: tinyutils/hwsetup:30 +msgid "Parallel and USB Printer setup." +msgstr "" + +#: tinyutils/hwsetup:31 +msgid "USB Scanner setup." +msgstr "" + +#: tinyutils/hwsetup:32 +msgid "Integrated and USB webcam setup." +msgstr "" + +#: tinyutils/hwsetup:33 +msgid "Digital Camera setup." +msgstr "" + +#: tinyutils/hwsetup:34 +msgid "Bluetooth setup." +msgstr "" + +#: tinyutils/hwsetup:35 +msgid "3g-modem setup." +msgstr "" + +#: tinyutils/hwsetup:36 +msgid "Start/stop firewall." +msgstr "" + +#: tinyutils/hwsetup:37 +msgid "Nvidia (non-free/free) setup." +msgstr "" + +#: tinyutils/hwsetup:38 +msgid "ATI (non-free/free) setup." +msgstr "" + +#: tinyutils/hwsetup:42 +msgid "install non-free packages (nvidia, ati)." +msgstr "" + +#: tinyutils/hwsetup:43 +msgid "auto-install optional dependencies." +msgstr "" + +#: tinyutils/hwsetup:44 +msgid "confirm before installing optional dependencies" +msgstr "" + +#: tinyutils/hwsetup:98 +#, sh-format +msgid "" +"Due to a lack of compatible hardware for troubleshooting, this $DEVICE " +"device has not been properly tested. Please report any success, failure, bug " +"to SliTaz Bug tracker or Forum." +msgstr "" + +#: tinyutils/hwsetup:107 +#, sh-format +msgid "Failed to setup $DEVICE" +msgstr "" + +#: tinyutils/hwsetup:117 +#, sh-format +msgid "Installing pkg: $pkg" +msgstr "" + +#: tinyutils/hwsetup:131 +#, sh-format +msgid "Would you like to install pkg: $pkg" +msgstr "" + +#: tinyutils/hwsetup:148 +#, sh-format +msgid "adding $user to $grp" +msgstr "" + +#: tinyutils/hwsetup:171 +msgid "Detected USB Device : Vendor : Product" +msgstr "" + +#: tinyutils/hwsetup:213 +msgid "Do you want to use hp-setup utility" +msgstr "" + +#: tinyutils/hwsetup:228 +#, sh-format +msgid "Verify $DEVICE Permissions" +msgstr "" + +#: tinyutils/hwsetup:229 +#, sh-format +msgid "Your $DEVICE must be in $grp group with rw-rw-rw- permissions" +msgstr "" + +#: tinyutils/hwsetup:250 +msgid "New udev rules are added by a package" +msgstr "" + +#: tinyutils/hwsetup:258 +msgid "Auto configuring Xorg..." +msgstr "" + +#: tinyutils/hwsetup:261 +msgid "Configuring Xorg..." +msgstr "" + +#: tinyutils/hwsetup:292 +msgid "Wvdial Box" +msgstr "" + +#: tinyutils/hwsetup:295 +msgid "Phone Number:" +msgstr "" + +#: tinyutils/hwsetup:296 +msgid "Username:" +msgstr "" + +#: tinyutils/hwsetup:297 +msgid "Password:" +msgstr "" + +#: tinyutils/hwsetup:298 +msgid "Pin (if required):" +msgstr "" + +#: tinyutils/hwsetup:299 +msgid "Modem:" +msgstr "" + +#: tinyutils/hwsetup:300 +msgid "Access Point Name (APN):" +msgstr "" + +#: tinyutils/hwsetup:301 +msgid "You must save your account info before dialing" +msgstr "" + +#: tinyutils/hwsetup:302 +msgid "Edit config file" +msgstr "" + +#: tinyutils/hwsetup:303 +msgid "Save Configuration" +msgstr "" + +#: tinyutils/hwsetup:304 +msgid "Dial Pin Once" +msgstr "" + +#: tinyutils/hwsetup:380 +msgid "Do you want to start cups" +msgstr "" + +#: tinyutils/hwsetup:388 +msgid "Starting cups using:" +msgstr "" + +#: tinyutils/hwsetup:407 +msgid "Do you want to start scanner" +msgstr "" + +#: tinyutils/hwsetup:415 +msgid "Following scanner commands may be of help:" +msgstr "" + +#: tinyutils/hwsetup:416 +msgid "to verify scanner has been found" +msgstr "" + +#: tinyutils/hwsetup:417 +msgid "scanner application" +msgstr "" + +#: tinyutils/hwsetup:436 +msgid "Would you like to test webcam" +msgstr "" + +#: tinyutils/hwsetup:443 +msgid "Would you like to test webcam by installing mplayer-svn" +msgstr "" + +#: tinyutils/hwsetup:450 +msgid "Webcam is set up; please use mplayer-svn/fswebcam/amsn/skype to view" +msgstr "" + +#: tinyutils/hwsetup:466 +msgid "Do you want to check if gphoto2 can talk to your camera" +msgstr "" + +#: tinyutils/hwsetup:471 +msgid "Do you want to test importing photos" +msgstr "" + +#: tinyutils/hwsetup:481 +msgid "Camera is set up; please use gphoto2 to import photos" +msgstr "" + +#: tinyutils/hwsetup:483 +#, sh-format +msgid "Quick start guide: $guide_url" +msgstr "" + +#: tinyutils/hwsetup:494 +msgid "Do you want to see if the bluetooth is working" +msgstr "" + +#: tinyutils/hwsetup:502 +msgid "Bluetooth interfaces" +msgstr "" + +#: tinyutils/hwsetup:510 tinyutils/hwsetup:527 +msgid "Following Bluetooth commands may be of help" +msgstr "" + +#: tinyutils/hwsetup:515 +msgid "checking local bluetooth devices..." +msgstr "" + +#: tinyutils/hwsetup:516 +msgid "scanning remote bluetooth devices..." +msgstr "" + +#: tinyutils/hwsetup:517 +msgid "pairing with remote bluetooth devices..." +msgstr "" + +#: tinyutils/hwsetup:520 tinyutils/hwsetup:541 +#, sh-format +msgid "You can manually edit the configuration files in $bt if need be" +msgstr "" + +#: tinyutils/hwsetup:534 +msgid "for starting bluetooth daemon" +msgstr "" + +#: tinyutils/hwsetup:536 +msgid "for checking local devices" +msgstr "" + +#: tinyutils/hwsetup:537 +msgid "for scanning remote devices" +msgstr "" + +#: tinyutils/hwsetup:538 +msgid "pairing with remote bluetooth devices" +msgstr "" + +#: tinyutils/hwsetup:552 +msgid "List detected devices" +msgstr "" + +#: tinyutils/hwsetup:556 +msgid "Detected Modem at:" +msgstr "" + +#: tinyutils/hwsetup:558 +msgid "Do you want to configure wvdial" +msgstr "" + +#: tinyutils/hwsetup:567 +#, sh-format +msgid "Edit $wc for phone number, login name, password and pin" +msgstr "" + +#: tinyutils/hwsetup:568 +#, sh-format +msgid "Add DNS adress of your provider in $rc" +msgstr "" + +#: tinyutils/hwsetup:577 +msgid "Setting IPTABLES_RULES to yes in /etc/slitaz/firewall.conf" +msgstr "" + +#: tinyutils/hwsetup:586 +msgid "Probing for open ports..." +msgstr "" + +#: tinyutils/hwsetup:590 +msgid "Adding firewall daemon to start automatically at boot" +msgstr "" + +#: tinyutils/hwsetup:607 +msgid "Do you want to configure X using non-free nvidia driver" +msgstr "" + +#: tinyutils/hwsetup:610 tinyutils/hwsetup:649 tinyutils/hwsetup:681 +#: tinyutils/hwsetup:714 +#, sh-format +msgid "Your previous config is in $xorg60" +msgstr "" + +#: tinyutils/hwsetup:611 tinyutils/hwsetup:650 +#, sh-format +msgid "If nvidia fails, you can remove $xorg55 to restore previous config." +msgstr "" + +#: tinyutils/hwsetup:618 +msgid "Adding to xorg.conf:" +msgstr "" + +#: tinyutils/hwsetup:623 tinyutils/hwsetup:659 +msgid "Checking if nvidia is working..." +msgstr "" + +#: tinyutils/hwsetup:627 +msgid "Configure nvidia settings:" +msgstr "" + +#: tinyutils/hwsetup:634 +msgid "test nvidia" +msgstr "" + +#: tinyutils/hwsetup:635 +msgid "Use: nvidia-settings utility to configure your settings if necessary" +msgstr "" + +#: tinyutils/hwsetup:646 +msgid "Do you want to configure X using free nvidia driver" +msgstr "" + +#: tinyutils/hwsetup:652 +#, sh-format +msgid "Create $xorg55short configured with nv driver." +msgstr "" + +#: tinyutils/hwsetup:678 +msgid "Do you want to configure X using non-free catalyst ATI (radeon) driver" +msgstr "" + +#: tinyutils/hwsetup:682 +#, sh-format +msgid "If ati fails, you can remove $xorg55 to restore previous config." +msgstr "" + +#: tinyutils/hwsetup:691 +msgid "Checking if ati catalyst is working..." +msgstr "" + +#: tinyutils/hwsetup:695 +msgid "Configuration:" +msgstr "" + +#: tinyutils/hwsetup:696 +msgid "" +"Use: aticonfig utility to generate a template configuration file if necessary" +msgstr "" + +#: tinyutils/hwsetup:711 +msgid "Do you want to configure X using free ATI (radeon) driver" +msgstr "" + +#: tinyutils/hwsetup:715 +#, sh-format +msgid "If ATI fails, you can remove $xorg55 to restore previous config." +msgstr "" + +#: tinyutils/hwsetup:717 +#, sh-format +msgid "Create $xorg55short configured with radeon driver." +msgstr "" + +#: tinyutils/hwsetup:723 +msgid "Checking if ATI radeon is working..." +msgstr "" + +#: tinyutils/hwsetup:739 +msgid "Bringing eth0 down..." +msgstr "" + +#: tinyutils/hwsetup:740 +msgid "Dialing..." +msgstr "" + +#: tinyutils/hwsetup:766 +msgid "The following optional packages can be installed:" +msgstr "" + +#: tinyutils/hwsetup:770 +msgid "Do you want to install all/few/no optional dependencies (all|few|N)? " +msgstr "" diff -r de13422f3a69 -r e232f0e1413a po/slitaz-tools/sv.po --- a/po/slitaz-tools/sv.po Thu Jul 25 03:24:36 2013 +0300 +++ b/po/slitaz-tools/sv.po Mon Sep 09 03:27:04 2013 +0300 @@ -1,5 +1,5 @@ # Swedish translations for SliTaz Tools package. -# Copyright (C) 2012 SliTaz +# Copyright (C) 2013 SliTaz GNU/Linux # This file is distributed under the same license as the SliTaz Tools package. # Emil Eklund , 2012. # @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: SliTaz Tools\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-07-01 20:20+0000\n" +"POT-Creation-Date: 2013-09-06 02:11+0300\n" "PO-Revision-Date: 2012-07-12 12:59-0000\n" "Last-Translator: Emil Eklund \n" "Language-Team: Swedish\n" @@ -17,38 +17,70 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: tinyutils/tazlocale:82 -msgid "Setting system locale to:" -msgstr "Ställer in systemspråket till:" - -#: tinyutils/tazlocale:96 +#: tinyutils/tazlocale:71 msgid "SliTaz language configuration" msgstr "Slitaz språk konfiguration" -#: tinyutils/tazlocale:115 +#: tinyutils/tazlocale:90 msgid "" "Please logout of your current session and login again to use new locale." msgstr "" "Var god logga ut från din nuvarande session och logga in igen för att " "använda det nya språket." -#: tinyutils/tazlocale:124 tinyutils/tazkeymap:47 -msgid "Config file :" +#: tinyutils/tazlocale:92 tinyutils/tazkeymap:64 +msgid "Information" +msgstr "" + +#: tinyutils/tazlocale:100 +msgid "SliTaz GNU/Linux locale setting using dialog boxes." +msgstr "" + +#: tinyutils/tazlocale:102 tinyutils/decode:30 tinyutils/hwsetup:24 +msgid "Usage:" +msgstr "Användning:" + +#: tinyutils/tazlocale:102 tinyutils/decode:31 tinyutils/hwsetup:25 +msgid "option" +msgstr "" + +#: tinyutils/tazlocale:104 +msgid "Display locale selecting dialog if no option given." +msgstr "" + +#: tinyutils/tazlocale:106 tinyutils/hwsetup:40 +msgid "Options:" +msgstr "" + +#: tinyutils/tazlocale:107 +msgid "Show info about config file and current locale." +msgstr "" + +#: tinyutils/tazlocale:108 +msgid "Show list of available locales." +msgstr "" + +#: tinyutils/tazlocale:110 +msgid "Any other option treated as locale - set locale." +msgstr "" + +#: tinyutils/tazlocale:115 tinyutils/tazkeymap:42 +msgid "Config file:" msgstr "Konfigurations fil:" -#: tinyutils/tazlocale:125 +#: tinyutils/tazlocale:116 msgid "Current locale:" msgstr "Nuvarande språk:" -#: tinyutils/tazkeymap:48 +#: tinyutils/tazkeymap:43 msgid "Current keymap:" msgstr "Nuvarande tangentbords layout:" -#: tinyutils/tazkeymap:57 +#: tinyutils/tazkeymap:52 msgid "SliTaz keymap configuration" msgstr "Slitaz tangentbords layout konfiguration" -#: tinyutils/tazkeymap:69 +#: tinyutils/tazkeymap:65 msgid "" "Please logout of your current session and login again to use new keyboard." msgstr "" @@ -63,70 +95,534 @@ msgid "Done" msgstr "Klar" -#: tinyutils/tazx:32 -msgid "You must be root to configure X server." -msgstr "Du måste vara root får att konfigurera X server" - -#: tinyutils/tazx:126 +#: tinyutils/tazx:122 msgid "Install Xorg" msgstr "Installera Xorg" -#: tinyutils/tazx:128 +#: tinyutils/tazx:123 msgid "Tazx helps you to select your X driver." msgstr "Tazx hjälper dig att välja din X drivrutin." -#: tinyutils/tazx:163 +#: tinyutils/tazx:125 +msgid "driver" +msgstr "" + +#: tinyutils/tazx:126 +msgid "Quit" +msgstr "" + +#: tinyutils/tazx:155 +msgid "Configure X" +msgstr "" + +#: tinyutils/tazx:157 msgid "Tazx dialog helps you to configure your Xorg server." msgstr "Tazx dialogen hjälper dig att konfigurera din Xorg server." -#: tinyutils/tazx:164 +#: tinyutils/tazx:158 msgid "Window Manager:" msgstr "Fönster hanterare:" -#: tinyutils/tazx:165 +#: tinyutils/tazx:159 msgid "X server:" msgstr "X server:" -#: tinyutils/tazx:166 +#: tinyutils/tazx:160 msgid "Install or reconfigure Xorg" msgstr "Installera eller omkonifigurera Xorg" -#: tinyutils/tazx:167 +#: tinyutils/tazx:161 msgid "Install TinyX server Xfbdev" msgstr "Installera TinyX server Xfbdev" -#: tinyutils/tazx:168 +#: tinyutils/tazx:162 msgid "Quit Tazx utility" msgstr "Avsluta Tazx verktyget" -#: tinyutils/decode:31 -msgid "Usage:" -msgstr "Användning:" - -#: tinyutils/decode:33 +#: tinyutils/decode:28 msgid "Decode audio and video files" msgstr "Avkoda ljud och video filer" -#: tinyutils/decode:35 +#: tinyutils/decode:31 tinyutils/decode:36 +msgid "file" +msgstr "" + +#: tinyutils/decode:31 +msgid "URL" +msgstr "" + +#: tinyutils/decode:33 msgid "Examples:" msgstr "Exempel:" -#: tinyutils/decode:49 -msgid "Missing decoder :" -msgstr "Saknar avkodare:" +#: tinyutils/decode:35 +msgid "/path/to/files/*" +msgstr "" -#: tinyutils/decode:50 -msgid "Skipping file :" -msgstr "Saknar fil :" +#: tinyutils/decode:47 +#, sh-format +msgid "Missing decoder: $dec" +msgstr "Saknar avkodare: $dec" -#: tinyutils/decode:54 -msgid "Decoding:" -msgstr "Avkodning:" +#: tinyutils/decode:48 tinyutils/decode:80 +#, sh-format +msgid "Skipping file: $name" +msgstr "Saknar fil: $name" -#: tinyutils/decode:78 -msgid "Unsupported file:" -msgstr "Ostödd filtyp:" +#: tinyutils/decode:51 +#, sh-format +msgid "Decoding: $name" +msgstr "Avkodning: $name" -#: tinyutils/decode:98 -msgid "No file:" -msgstr "Ingen fil:" +#: tinyutils/decode:60 +#, sh-format +msgid "No file: $file" +msgstr "Ingen fil: $file" + +#: tinyutils/decode:82 +#, sh-format +msgid "Unsupported file: $file" +msgstr "Ostödd filtyp: $file" + +#: tinyutils/terminal:10 +msgid "configurable SliTaz wrapper for terminal." +msgstr "" + +#: tinyutils/terminal:12 +msgid "Recognized options:" +msgstr "" + +#: tinyutils/terminal:13 +msgid "Print the version number" +msgstr "" + +#: tinyutils/terminal:14 +msgid "Print out this message" +msgstr "" + +#: tinyutils/terminal:15 +#, sh-format +msgid "Width and height of terminal window ($GEOMETRY)" +msgstr "" + +#: tinyutils/terminal:16 +#, sh-format +msgid "Title name for window (\"$TITLE\")" +msgstr "" + +#: tinyutils/terminal:17 +msgid "Don't close terminal after command finished" +msgstr "" + +#: tinyutils/terminal:18 +msgid "Command to execute (must be last in line)" +msgstr "" + +#: tinyutils/terminal:21 +#, sh-format +msgid "Help for $TERMINAL:" +msgstr "" + +#: tinyutils/hwsetup:22 +msgid "SliTaz Setup configuration" +msgstr "" + +#: tinyutils/hwsetup:25 +msgid "command" +msgstr "" + +#: tinyutils/hwsetup:27 +msgid "Commands:" +msgstr "" + +#: tinyutils/hwsetup:29 +msgid "Print this short usage." +msgstr "" + +#: tinyutils/hwsetup:30 +msgid "Parallel and USB Printer setup." +msgstr "" + +#: tinyutils/hwsetup:31 +msgid "USB Scanner setup." +msgstr "" + +#: tinyutils/hwsetup:32 +msgid "Integrated and USB webcam setup." +msgstr "" + +#: tinyutils/hwsetup:33 +msgid "Digital Camera setup." +msgstr "" + +#: tinyutils/hwsetup:34 +msgid "Bluetooth setup." +msgstr "" + +#: tinyutils/hwsetup:35 +msgid "3g-modem setup." +msgstr "" + +#: tinyutils/hwsetup:36 +msgid "Start/stop firewall." +msgstr "" + +#: tinyutils/hwsetup:37 +msgid "Nvidia (non-free/free) setup." +msgstr "" + +#: tinyutils/hwsetup:38 +msgid "ATI (non-free/free) setup." +msgstr "" + +#: tinyutils/hwsetup:42 +msgid "install non-free packages (nvidia, ati)." +msgstr "" + +#: tinyutils/hwsetup:43 +msgid "auto-install optional dependencies." +msgstr "" + +#: tinyutils/hwsetup:44 +msgid "confirm before installing optional dependencies" +msgstr "" + +#: tinyutils/hwsetup:98 +#, sh-format +msgid "" +"Due to a lack of compatible hardware for troubleshooting, this $DEVICE " +"device has not been properly tested. Please report any success, failure, bug " +"to SliTaz Bug tracker or Forum." +msgstr "" + +#: tinyutils/hwsetup:107 +#, sh-format +msgid "Failed to setup $DEVICE" +msgstr "" + +#: tinyutils/hwsetup:117 +#, sh-format +msgid "Installing pkg: $pkg" +msgstr "" + +#: tinyutils/hwsetup:131 +#, sh-format +msgid "Would you like to install pkg: $pkg" +msgstr "" + +#: tinyutils/hwsetup:148 +#, sh-format +msgid "adding $user to $grp" +msgstr "" + +#: tinyutils/hwsetup:171 +msgid "Detected USB Device : Vendor : Product" +msgstr "" + +#: tinyutils/hwsetup:213 +msgid "Do you want to use hp-setup utility" +msgstr "" + +#: tinyutils/hwsetup:228 +#, sh-format +msgid "Verify $DEVICE Permissions" +msgstr "" + +#: tinyutils/hwsetup:229 +#, sh-format +msgid "Your $DEVICE must be in $grp group with rw-rw-rw- permissions" +msgstr "" + +#: tinyutils/hwsetup:250 +msgid "New udev rules are added by a package" +msgstr "" + +#: tinyutils/hwsetup:258 +msgid "Auto configuring Xorg..." +msgstr "" + +#: tinyutils/hwsetup:261 +msgid "Configuring Xorg..." +msgstr "" + +#: tinyutils/hwsetup:292 +msgid "Wvdial Box" +msgstr "" + +#: tinyutils/hwsetup:295 +msgid "Phone Number:" +msgstr "" + +#: tinyutils/hwsetup:296 +msgid "Username:" +msgstr "" + +#: tinyutils/hwsetup:297 +msgid "Password:" +msgstr "" + +#: tinyutils/hwsetup:298 +msgid "Pin (if required):" +msgstr "" + +#: tinyutils/hwsetup:299 +msgid "Modem:" +msgstr "" + +#: tinyutils/hwsetup:300 +msgid "Access Point Name (APN):" +msgstr "" + +#: tinyutils/hwsetup:301 +msgid "You must save your account info before dialing" +msgstr "" + +#: tinyutils/hwsetup:302 +msgid "Edit config file" +msgstr "" + +#: tinyutils/hwsetup:303 +msgid "Save Configuration" +msgstr "" + +#: tinyutils/hwsetup:304 +msgid "Dial Pin Once" +msgstr "" + +#: tinyutils/hwsetup:380 +msgid "Do you want to start cups" +msgstr "" + +#: tinyutils/hwsetup:388 +msgid "Starting cups using:" +msgstr "" + +#: tinyutils/hwsetup:407 +msgid "Do you want to start scanner" +msgstr "" + +#: tinyutils/hwsetup:415 +msgid "Following scanner commands may be of help:" +msgstr "" + +#: tinyutils/hwsetup:416 +msgid "to verify scanner has been found" +msgstr "" + +#: tinyutils/hwsetup:417 +msgid "scanner application" +msgstr "" + +#: tinyutils/hwsetup:436 +msgid "Would you like to test webcam" +msgstr "" + +#: tinyutils/hwsetup:443 +msgid "Would you like to test webcam by installing mplayer-svn" +msgstr "" + +#: tinyutils/hwsetup:450 +msgid "Webcam is set up; please use mplayer-svn/fswebcam/amsn/skype to view" +msgstr "" + +#: tinyutils/hwsetup:466 +msgid "Do you want to check if gphoto2 can talk to your camera" +msgstr "" + +#: tinyutils/hwsetup:471 +msgid "Do you want to test importing photos" +msgstr "" + +#: tinyutils/hwsetup:481 +msgid "Camera is set up; please use gphoto2 to import photos" +msgstr "" + +#: tinyutils/hwsetup:483 +#, sh-format +msgid "Quick start guide: $guide_url" +msgstr "" + +#: tinyutils/hwsetup:494 +msgid "Do you want to see if the bluetooth is working" +msgstr "" + +#: tinyutils/hwsetup:502 +msgid "Bluetooth interfaces" +msgstr "" + +#: tinyutils/hwsetup:510 tinyutils/hwsetup:527 +msgid "Following Bluetooth commands may be of help" +msgstr "" + +#: tinyutils/hwsetup:515 +msgid "checking local bluetooth devices..." +msgstr "" + +#: tinyutils/hwsetup:516 +msgid "scanning remote bluetooth devices..." +msgstr "" + +#: tinyutils/hwsetup:517 +msgid "pairing with remote bluetooth devices..." +msgstr "" + +#: tinyutils/hwsetup:520 tinyutils/hwsetup:541 +#, sh-format +msgid "You can manually edit the configuration files in $bt if need be" +msgstr "" + +#: tinyutils/hwsetup:534 +msgid "for starting bluetooth daemon" +msgstr "" + +#: tinyutils/hwsetup:536 +msgid "for checking local devices" +msgstr "" + +#: tinyutils/hwsetup:537 +msgid "for scanning remote devices" +msgstr "" + +#: tinyutils/hwsetup:538 +msgid "pairing with remote bluetooth devices" +msgstr "" + +#: tinyutils/hwsetup:552 +msgid "List detected devices" +msgstr "" + +#: tinyutils/hwsetup:556 +msgid "Detected Modem at:" +msgstr "" + +#: tinyutils/hwsetup:558 +msgid "Do you want to configure wvdial" +msgstr "" + +#: tinyutils/hwsetup:567 +#, sh-format +msgid "Edit $wc for phone number, login name, password and pin" +msgstr "" + +#: tinyutils/hwsetup:568 +#, sh-format +msgid "Add DNS adress of your provider in $rc" +msgstr "" + +#: tinyutils/hwsetup:577 +msgid "Setting IPTABLES_RULES to yes in /etc/slitaz/firewall.conf" +msgstr "" + +#: tinyutils/hwsetup:586 +msgid "Probing for open ports..." +msgstr "" + +#: tinyutils/hwsetup:590 +msgid "Adding firewall daemon to start automatically at boot" +msgstr "" + +#: tinyutils/hwsetup:607 +msgid "Do you want to configure X using non-free nvidia driver" +msgstr "" + +#: tinyutils/hwsetup:610 tinyutils/hwsetup:649 tinyutils/hwsetup:681 +#: tinyutils/hwsetup:714 +#, sh-format +msgid "Your previous config is in $xorg60" +msgstr "" + +#: tinyutils/hwsetup:611 tinyutils/hwsetup:650 +#, sh-format +msgid "If nvidia fails, you can remove $xorg55 to restore previous config." +msgstr "" + +#: tinyutils/hwsetup:618 +msgid "Adding to xorg.conf:" +msgstr "" + +#: tinyutils/hwsetup:623 tinyutils/hwsetup:659 +msgid "Checking if nvidia is working..." +msgstr "" + +#: tinyutils/hwsetup:627 +msgid "Configure nvidia settings:" +msgstr "" + +#: tinyutils/hwsetup:634 +msgid "test nvidia" +msgstr "" + +#: tinyutils/hwsetup:635 +msgid "Use: nvidia-settings utility to configure your settings if necessary" +msgstr "" + +#: tinyutils/hwsetup:646 +msgid "Do you want to configure X using free nvidia driver" +msgstr "" + +#: tinyutils/hwsetup:652 +#, sh-format +msgid "Create $xorg55short configured with nv driver." +msgstr "" + +#: tinyutils/hwsetup:678 +msgid "Do you want to configure X using non-free catalyst ATI (radeon) driver" +msgstr "" + +#: tinyutils/hwsetup:682 +#, sh-format +msgid "If ati fails, you can remove $xorg55 to restore previous config." +msgstr "" + +#: tinyutils/hwsetup:691 +msgid "Checking if ati catalyst is working..." +msgstr "" + +#: tinyutils/hwsetup:695 +msgid "Configuration:" +msgstr "" + +#: tinyutils/hwsetup:696 +msgid "" +"Use: aticonfig utility to generate a template configuration file if necessary" +msgstr "" + +#: tinyutils/hwsetup:711 +msgid "Do you want to configure X using free ATI (radeon) driver" +msgstr "" + +#: tinyutils/hwsetup:715 +#, sh-format +msgid "If ATI fails, you can remove $xorg55 to restore previous config." +msgstr "" + +#: tinyutils/hwsetup:717 +#, sh-format +msgid "Create $xorg55short configured with radeon driver." +msgstr "" + +#: tinyutils/hwsetup:723 +msgid "Checking if ATI radeon is working..." +msgstr "" + +#: tinyutils/hwsetup:739 +msgid "Bringing eth0 down..." +msgstr "" + +#: tinyutils/hwsetup:740 +msgid "Dialing..." +msgstr "" + +#: tinyutils/hwsetup:766 +msgid "The following optional packages can be installed:" +msgstr "" + +#: tinyutils/hwsetup:770 +msgid "Do you want to install all/few/no optional dependencies (all|few|N)? " +msgstr "" + +#~ msgid "You must be root to configure X server." +#~ msgstr "Du måste vara root får att konfigurera X server" + +#~ msgid "Setting system locale to: $locale" +#~ msgstr "Ställer in systemspråket till: $locale" diff -r de13422f3a69 -r e232f0e1413a po/tazbox/el.po --- a/po/tazbox/el.po Thu Jul 25 03:24:36 2013 +0300 +++ b/po/tazbox/el.po Mon Sep 09 03:27:04 2013 +0300 @@ -1,5 +1,5 @@ -# Greek translations for TazBox package -# Copyright (C) 2012 SliTaz GNU/Linux +# Greek translations for TazBox package. +# Copyright (C) 2013 SliTaz GNU/Linux # This file is distributed under the same license as the TazBox package. # Constantine Mousafiris , 2012. # @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: TazBox\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-07-16 18:18+0300\n" +"POT-Creation-Date: 2013-09-06 02:11+0300\n" "PO-Revision-Date: 2012-11-23 11:30+0200\n" "Last-Translator: Constantine Mousafiris \n" "Language-Team: Kostis Mousafiris\n" @@ -16,207 +16,268 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: tazbox/tazbox:35 +#: tazbox/tazbox:28 +msgid "SliTaz tiny GUI boxes for the desktop" +msgstr "" + +#: tazbox/tazbox:30 msgid "Usage:" msgstr "Χρήση:" -#: tazbox/tazbox:37 +#: tazbox/tazbox:31 +msgid "command" +msgstr "" + +#: tazbox/tazbox:33 msgid "Commands:" msgstr "Εντολές:" -#: tazbox/tazbox:38 +#: tazbox/tazbox:35 msgid "Display this short help usage" msgstr "Εμφάνιση αυτής της σύντομης βοήθειας χρήσης" -#: tazbox/tazbox:39 +#: tazbox/tazbox:36 msgid "Execute a command as super-user" msgstr "Εκτέλεση μιας εντολής σαν υπερ-χρήστης" -#: tazbox/tazbox:40 +#: tazbox/tazbox:37 msgid "Desktop logout box with actions" msgstr "" "Παράθυρο διαλόγου για αποσύνδεση, στην επιφάνεια εργασίας, με ενέργειες" -#: tazbox/tazbox:41 +#: tazbox/tazbox:38 msgid "Pipe a command output into a GTK window" msgstr "Σωλήνωση (pipe) της εξόδου μίας εντολής σε ένα παράθυρο GTK" -#: tazbox/tazbox:42 -msgid "Pipe Wget output into a GTK window" -msgstr "Σωλήνωση (pipe) της εξόδου Wget σε ένα παράθυρο GTK" +#: tazbox/tazbox:39 +msgid "Pipe wget output into a GTK window" +msgstr "Σωλήνωση (pipe) της εξόδου wget σε ένα παράθυρο GTK" -#: tazbox/tazbox:43 +#: tazbox/tazbox:40 msgid "Configure system language (root)" msgstr "Ρύθμιση της γλώσσας συστήματος (root)" -#: tazbox/tazbox:44 +#: tazbox/tazbox:41 msgid "Configure system keymap (root)" msgstr "Ρύθμιση συμβόλων πληκτρολογίου (keymap) του συστήματος (root)" -#: tazbox/tazbox:45 +#: tazbox/tazbox:42 msgid "Configure system timezone (root)" msgstr "Ρύθμιση ζώνης ώρας (timezone) του συστήματος (root)" -#: tazbox/tazbox:46 +#: tazbox/tazbox:43 msgid "System initial setup (locale, keymap & timezone)" msgstr "Αρχική ρύθμιση (setup) συστήματος (locale, keymap, ζώνη ώρας)" -#: tazbox/tazbox:47 +#: tazbox/tazbox:44 msgid "Create a new file or folder on the desktop" msgstr "Δημιουργία νέου αρχείου ή καταλόγου, πάνω στην επιφάνεια εργασίας" -#: tazbox/tazbox:48 +#: tazbox/tazbox:45 msgid "Display icons of all installed applications" msgstr "Εμφάνιση εικονιδίων όλων των εγκατεστημένων εφαρμογών" -#: tazbox/tazbox:49 +#: tazbox/tazbox:46 msgid "Notify user with a desktop centered box" msgstr "" "Προειδοποίηση χρήστη με παράθυρο μηνύματος εστιασμένο στην επιφάνεια εργασίας" -#: tazbox/tazbox:50 +#: tazbox/tazbox:47 msgid "Configure SliTaz default applications" msgstr "" -#: tazbox/tazbox:57 -msgid "Slitaz admin password" +#: tazbox/tazbox:65 +msgid "SliTaz admin password" msgstr "Κωδικός πρόσβασης του διαχειριστή του SliTaz" -#: tazbox/tazbox:58 +#: tazbox/tazbox:68 msgid "Please enter root password (default root) to execute:" msgstr "" "Παρακαλώ εισάγετε τον κωδικό root (προεπιλεγμένου root) για να εκτελέσετε:" -#: tazbox/tazbox:64 +#: tazbox/tazbox:71 msgid "Password:" msgstr "Κωδικός πρόσβασης:" -#: tazbox/tazbox:65 +#: tazbox/tazbox:72 msgid "Autosave password" msgstr "Αυτόματη αποθήκευση κωδικού πρόσβασης" -#: tazbox/tazbox:69 +#: tazbox/tazbox:77 +msgid "Error" +msgstr "Σφάλμα" + +#: tazbox/tazbox:80 msgid "Error: wrong password!" msgstr "Σφάλμα: λάθος κωδικός πρόσβασης!" -#: tazbox/tazbox:91 -msgid "SliTaz Logout. Please choose an action:" -msgstr "Αποσύνδεση από το SliTaz. Παρακαλώ, επιλέξτε μια ενέργεια:" +#: tazbox/tazbox:87 +msgid "CANCEL" +msgstr "" -#: tazbox/tazbox:96 +#: tazbox/tazbox:94 +msgid "TazBox Output" +msgstr "" + +#: tazbox/tazbox:106 +msgid "SliTaz Logout" +msgstr "Αποσύνδεση από το SliTaz" + +#: tazbox/tazbox:109 +msgid "Please choose an action:" +msgstr "Παρακαλώ, επιλέξτε μια ενέργεια:" + +#: tazbox/tazbox:111 msgid "Close X session" msgstr "Κλείσιμο συνεδρίας του X" -#: tazbox/tazbox:97 +#: tazbox/tazbox:112 msgid "Reboot system" msgstr "Επανεκκίνηση συστήματος" -#: tazbox/tazbox:98 +#: tazbox/tazbox:113 msgid "Shutdown system" msgstr "Κλείσιμο συστήματος" -#: tazbox/tazbox:117 +#: tazbox/tazbox:133 msgid "SliTaz Initial Setup" msgstr "Αρχικές ρυθμίσεις του SliTaz" -#: tazbox/tazbox:118 +#: tazbox/tazbox:136 msgid "" -"\\nHere you can set your preferences\\nfor locale, keymap and " -"timezone.\\n\\n" +"Here you can set your preferences\\nfor locale, keymap and timezone." msgstr "" -"\\nΕδώ, μπορείτε να ορίσετε τις προτιμήσεις σας\\nγια το locale, το " -"keymap και τη ζώνη ώρας.\\n\\n" +"Εδώ, μπορείτε να ορίσετε τις προτιμήσεις σας\\nγια το locale, το keymap " +"και τη ζώνη ώρας." -#: tazbox/tazbox:124 +#: tazbox/tazbox:138 msgid "Locale" msgstr "" -#: tazbox/tazbox:125 tazbox/tazbox:182 +#: tazbox/tazbox:139 tazbox/tazbox:190 msgid "Keymap" msgstr "Αναπαράσταση συμβόλων πληκτρολογίου (keymap)" -#: tazbox/tazbox:126 +#: tazbox/tazbox:140 msgid "Timezone" msgstr "" -#: tazbox/tazbox:142 +#: tazbox/tazbox:160 +msgid "SliTaz locale" +msgstr "" + +#: tazbox/tazbox:163 msgid "Language configuration" msgstr "Ρύθμιση γλώσσας" -#: tazbox/tazbox:153 tazbox/tazbox:209 +#: tazbox/tazbox:164 tazbox/tazbox:214 msgid "Name" msgstr "Όνομα" -#: tazbox/tazbox:153 +#: tazbox/tazbox:164 msgid "Description" msgstr "Περιγραφή" -#: tazbox/tazbox:170 +#: tazbox/tazbox:186 +msgid "SliTaz keymap" +msgstr "" + +#: tazbox/tazbox:189 msgid "Keyboard configuration" msgstr "Ρύθμιση πληκτρολογίου" -#: tazbox/tazbox:182 +#: tazbox/tazbox:190 msgid "Type" msgstr "Τύπος" -#: tazbox/tazbox:199 +#: tazbox/tazbox:209 tazbox/tazbox:232 tazbox/tazbox:244 tazbox/tazbox:257 +msgid "SliTaz TZ" +msgstr "" + +#: tazbox/tazbox:212 tazbox/tazbox:235 tazbox/tazbox:247 tazbox/tazbox:260 msgid "TimeZone Configuration" msgstr "Ρύθμιση ζώνης ώρας" -#: tazbox/tazbox:223 +#: tazbox/tazbox:235 +msgid "Select country" +msgstr "" + +#: tazbox/tazbox:237 +msgid "Flag" +msgstr "" + +#: tazbox/tazbox:237 +msgid "Code" +msgstr "" + +#: tazbox/tazbox:237 +msgid "Country" +msgstr "" + +#: tazbox/tazbox:247 +msgid "Select time zone" +msgstr "" + +#: tazbox/tazbox:260 +msgid "Select location" +msgstr "" + +#: tazbox/tazbox:261 +msgid "Location/City" +msgstr "" + +#: tazbox/tazbox:285 +msgid "New file" +msgstr "Νέο αρχείο" + +#: tazbox/tazbox:288 msgid "Create a new file or folder on your desktop" msgstr "Δημιουργία νέου αρχείου ή καταλόγου, πάνω στην επιφάνεια εργασίας σας" -#: tazbox/tazbox:224 -msgid "New file" -msgstr "Νέο αρχείο" - -#: tazbox/tazbox:227 +#: tazbox/tazbox:289 msgid "File name" msgstr "Όνομα αρχείου" -#: tazbox/tazbox:228 +#: tazbox/tazbox:292 msgid "SHell script" msgstr "Σενάριο κελύφους (SHell script)" -#: tazbox/tazbox:229 +#: tazbox/tazbox:293 msgid "Folder" msgstr "Κατάλογος" -#: tazbox/tazbox:230 +#: tazbox/tazbox:295 msgid "File" msgstr "Αρχείο" -#: tazbox/tazbox:254 +#: tazbox/tazbox:319 msgid "All Applications" msgstr "Όλες οι εφαρμογές" -#: tazbox/tazbox:361 -#, fuzzy +#: tazbox/tazbox:450 msgid "SliTaz default applications" -msgstr "Όλες οι εφαρμογές" +msgstr "" -#: tazbox/tazbox:363 +#: tazbox/tazbox:452 msgid "SliTaz default applications configuration" msgstr "" -#: tazbox/tazbox:365 -#, fuzzy +#: tazbox/tazbox:454 msgid "File manager:" -msgstr "Όνομα αρχείου" +msgstr "" -#: tazbox/tazbox:366 +#: tazbox/tazbox:455 msgid "Web browser:" msgstr "" -#: tazbox/tazbox:367 +#: tazbox/tazbox:456 msgid "Text editor:" msgstr "" -#: tazbox/tazbox:368 +#: tazbox/tazbox:457 msgid "Terminal:" msgstr "" -#: tazbox/tazbox:369 +#: tazbox/tazbox:458 msgid "Window manager:" msgstr "" diff -r de13422f3a69 -r e232f0e1413a po/tazbox/es_AR.po --- a/po/tazbox/es_AR.po Thu Jul 25 03:24:36 2013 +0300 +++ b/po/tazbox/es_AR.po Mon Sep 09 03:27:04 2013 +0300 @@ -1,222 +1,282 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. +# Spanish translations for TazBox package. +# Copyright (C) 2013 SliTaz GNU/Linux +# This file is distributed under the same license as the TazBox package. +# Lucas Gioia , 2011 # msgid "" msgstr "" "Project-Id-Version: TazBox\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-07-16 18:18+0300\n" +"POT-Creation-Date: 2013-09-06 02:11+0300\n" "PO-Revision-Date: 2011-08-11 00:21-0300\n" "Last-Translator: Lucas Gioia \n" -"Language-Team: LANGUAGE \n" +"Language-Team: \n" "Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: tazbox/tazbox:35 +#: tazbox/tazbox:28 +msgid "SliTaz tiny GUI boxes for the desktop" +msgstr "" + +#: tazbox/tazbox:30 msgid "Usage:" msgstr "Uso:" -#: tazbox/tazbox:37 +#: tazbox/tazbox:31 +msgid "command" +msgstr "" + +#: tazbox/tazbox:33 msgid "Commands:" msgstr "Comandos:" -#: tazbox/tazbox:38 +#: tazbox/tazbox:35 msgid "Display this short help usage" msgstr "Muestra esta corta ayuda usando" -#: tazbox/tazbox:39 +#: tazbox/tazbox:36 msgid "Execute a command as super-user" msgstr "Ejecute un comando super-usuario" -#: tazbox/tazbox:40 +#: tazbox/tazbox:37 msgid "Desktop logout box with actions" msgstr "Caja en escritorio de cierre de sesión con acciónes" -#: tazbox/tazbox:41 +#: tazbox/tazbox:38 msgid "Pipe a command output into a GTK window" msgstr "" -#: tazbox/tazbox:42 -msgid "Pipe Wget output into a GTK window" +#: tazbox/tazbox:39 +msgid "Pipe wget output into a GTK window" msgstr "" -#: tazbox/tazbox:43 +#: tazbox/tazbox:40 msgid "Configure system language (root)" msgstr "Configurar el idioma del sistema (root)" -#: tazbox/tazbox:44 +#: tazbox/tazbox:41 msgid "Configure system keymap (root)" msgstr "Configurar el teclado del sistema (root)" -#: tazbox/tazbox:45 +#: tazbox/tazbox:42 msgid "Configure system timezone (root)" msgstr "Configurar la zona horaria (root)" -#: tazbox/tazbox:46 +#: tazbox/tazbox:43 msgid "System initial setup (locale, keymap & timezone)" msgstr "Configuración inicial del sistema (local, teclado & zona horaria)" -#: tazbox/tazbox:47 +#: tazbox/tazbox:44 msgid "Create a new file or folder on the desktop" msgstr "Crear un nuevo archivo o carpeta en el escritorio" -#: tazbox/tazbox:48 +#: tazbox/tazbox:45 #, fuzzy msgid "Display icons of all installed applications" msgstr "Íconos de todas las aplicaciónes instaladas." -#: tazbox/tazbox:49 +#: tazbox/tazbox:46 msgid "Notify user with a desktop centered box" msgstr "" -#: tazbox/tazbox:50 +#: tazbox/tazbox:47 msgid "Configure SliTaz default applications" msgstr "" -#: tazbox/tazbox:57 -msgid "Slitaz admin password" -msgstr "Slitaz contraseña de administrador" +#: tazbox/tazbox:65 +msgid "SliTaz admin password" +msgstr "SliTaz contraseña de administrador" -#: tazbox/tazbox:58 +#: tazbox/tazbox:68 msgid "Please enter root password (default root) to execute:" msgstr "" "Por favor, ingrese la contraseña root (por defecto: root) para ejecutar:" -#: tazbox/tazbox:64 +#: tazbox/tazbox:71 msgid "Password:" msgstr "Contraseña:" -#: tazbox/tazbox:65 +#: tazbox/tazbox:72 msgid "Autosave password" msgstr "Guardar contraseña" -#: tazbox/tazbox:69 +#: tazbox/tazbox:77 +msgid "Error" +msgstr "" + +#: tazbox/tazbox:80 msgid "Error: wrong password!" msgstr "Error: ¡contraseña incorrecta!" -#: tazbox/tazbox:91 -msgid "SliTaz Logout. Please choose an action:" -msgstr "SliTaz Logout. Por favor seleccione una acción:" +#: tazbox/tazbox:87 +msgid "CANCEL" +msgstr "" -#: tazbox/tazbox:96 +#: tazbox/tazbox:94 +msgid "TazBox Output" +msgstr "" + +#: tazbox/tazbox:106 +msgid "SliTaz Logout" +msgstr "SliTaz Logout" + +#: tazbox/tazbox:109 +msgid "Please choose an action:" +msgstr "Por favor seleccione una acción:" + +#: tazbox/tazbox:111 msgid "Close X session" msgstr "Cerrar sesión X" -#: tazbox/tazbox:97 +#: tazbox/tazbox:112 msgid "Reboot system" msgstr "Reiniciar sistema" -#: tazbox/tazbox:98 +#: tazbox/tazbox:113 msgid "Shutdown system" msgstr "Apagar el sistema" -#: tazbox/tazbox:117 +#: tazbox/tazbox:133 msgid "SliTaz Initial Setup" msgstr "SliTaz configuración inicial" -#: tazbox/tazbox:118 -#, fuzzy +#: tazbox/tazbox:136 msgid "" -"\\nHere you can set your preferences\\nfor locale, keymap and " -"timezone.\\n\\n" +"Here you can set your preferences\\nfor locale, keymap and timezone." msgstr "" -"\\nAquí puedes configurar tus preferencias \\nfor local, teclado, " -"zona horaria\\n\\n" +"Aquí puedes configurar tus preferencias \\nfor local, teclado, zona " +"horaria" -#: tazbox/tazbox:124 +#: tazbox/tazbox:138 msgid "Locale" msgstr "" -#: tazbox/tazbox:125 tazbox/tazbox:182 +#: tazbox/tazbox:139 tazbox/tazbox:190 msgid "Keymap" msgstr "Mapa de caracteres" -#: tazbox/tazbox:126 +#: tazbox/tazbox:140 msgid "Timezone" msgstr "" -#: tazbox/tazbox:142 +#: tazbox/tazbox:160 +msgid "SliTaz locale" +msgstr "" + +#: tazbox/tazbox:163 msgid "Language configuration" msgstr "Configuración del idioma" -#: tazbox/tazbox:153 tazbox/tazbox:209 +#: tazbox/tazbox:164 tazbox/tazbox:214 msgid "Name" msgstr "Nombre" -#: tazbox/tazbox:153 +#: tazbox/tazbox:164 msgid "Description" msgstr "Descripción" -#: tazbox/tazbox:170 +#: tazbox/tazbox:186 +msgid "SliTaz keymap" +msgstr "" + +#: tazbox/tazbox:189 msgid "Keyboard configuration" msgstr "Configuración del teclado" -#: tazbox/tazbox:182 +#: tazbox/tazbox:190 msgid "Type" msgstr "Tipo" -#: tazbox/tazbox:199 +#: tazbox/tazbox:209 tazbox/tazbox:232 tazbox/tazbox:244 tazbox/tazbox:257 +msgid "SliTaz TZ" +msgstr "" + +#: tazbox/tazbox:212 tazbox/tazbox:235 tazbox/tazbox:247 tazbox/tazbox:260 msgid "TimeZone Configuration" msgstr "Configuración de la zona horaria" -#: tazbox/tazbox:223 +#: tazbox/tazbox:235 +msgid "Select country" +msgstr "" + +#: tazbox/tazbox:237 +msgid "Flag" +msgstr "" + +#: tazbox/tazbox:237 +msgid "Code" +msgstr "" + +#: tazbox/tazbox:237 +msgid "Country" +msgstr "" + +#: tazbox/tazbox:247 +msgid "Select time zone" +msgstr "" + +#: tazbox/tazbox:260 +msgid "Select location" +msgstr "" + +#: tazbox/tazbox:261 +msgid "Location/City" +msgstr "" + +#: tazbox/tazbox:285 +msgid "New file" +msgstr "Nuevo archivo" + +#: tazbox/tazbox:288 msgid "Create a new file or folder on your desktop" msgstr "Crear un nuevo archivo o carpeta en su escritorio" -#: tazbox/tazbox:224 -msgid "New file" -msgstr "Nuevo archivo" - -#: tazbox/tazbox:227 +#: tazbox/tazbox:289 msgid "File name" msgstr "Nombre de archivo" -#: tazbox/tazbox:228 +#: tazbox/tazbox:292 msgid "SHell script" msgstr "Scripts SHell" -#: tazbox/tazbox:229 +#: tazbox/tazbox:293 msgid "Folder" msgstr "Carpeta" -#: tazbox/tazbox:230 +#: tazbox/tazbox:295 msgid "File" msgstr "Archivo" -#: tazbox/tazbox:254 +#: tazbox/tazbox:319 msgid "All Applications" msgstr "Todas las aplicaciónes" -#: tazbox/tazbox:361 -#, fuzzy +#: tazbox/tazbox:450 msgid "SliTaz default applications" -msgstr "Todas las aplicaciónes" +msgstr "" -#: tazbox/tazbox:363 +#: tazbox/tazbox:452 msgid "SliTaz default applications configuration" msgstr "" -#: tazbox/tazbox:365 -#, fuzzy +#: tazbox/tazbox:454 msgid "File manager:" -msgstr "Nombre de archivo" +msgstr "" -#: tazbox/tazbox:366 +#: tazbox/tazbox:455 msgid "Web browser:" msgstr "" -#: tazbox/tazbox:367 +#: tazbox/tazbox:456 msgid "Text editor:" msgstr "" -#: tazbox/tazbox:368 +#: tazbox/tazbox:457 msgid "Terminal:" msgstr "" -#: tazbox/tazbox:369 +#: tazbox/tazbox:458 msgid "Window manager:" msgstr "" diff -r de13422f3a69 -r e232f0e1413a po/tazbox/fr.po --- a/po/tazbox/fr.po Thu Jul 25 03:24:36 2013 +0300 +++ b/po/tazbox/fr.po Mon Sep 09 03:27:04 2013 +0300 @@ -1,5 +1,5 @@ # French translations for TazBox package. -# Copyright (C) 2011 SliTaz GNU/Linux +# Copyright (C) 2013 SliTaz GNU/Linux # This file is distributed under the same license as the TazBox package. # Christophe Lincoln , 2011. # @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: TazBox\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-07-16 18:18+0300\n" +"POT-Creation-Date: 2013-09-06 02:11+0300\n" "PO-Revision-Date: 2012-03-24 14:36+0100\n" "Last-Translator: Christophe Lincoln \n" "Language-Team: French\n" @@ -15,207 +15,268 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Poedit-Language: French\n" -#: tazbox/tazbox:35 +#: tazbox/tazbox:28 +msgid "SliTaz tiny GUI boxes for the desktop" +msgstr "" + +#: tazbox/tazbox:30 msgid "Usage:" msgstr "Utilisation:" -#: tazbox/tazbox:37 +#: tazbox/tazbox:31 +msgid "command" +msgstr "" + +#: tazbox/tazbox:33 msgid "Commands:" msgstr "Commandes:" -#: tazbox/tazbox:38 +#: tazbox/tazbox:35 msgid "Display this short help usage" msgstr "Affiche cette petite aide" -#: tazbox/tazbox:39 +#: tazbox/tazbox:36 msgid "Execute a command as super-user" msgstr "Lancer une commande super utilisateur" -#: tazbox/tazbox:40 +#: tazbox/tazbox:37 msgid "Desktop logout box with actions" msgstr "Boîte de déconnexion avec actions" -#: tazbox/tazbox:41 +#: tazbox/tazbox:38 msgid "Pipe a command output into a GTK window" msgstr "Rediriger une commande dans une fenêtre GTK" -#: tazbox/tazbox:42 -msgid "Pipe Wget output into a GTK window" -msgstr "Rediriger Wget dans une fenêtre GTK" +#: tazbox/tazbox:39 +msgid "Pipe wget output into a GTK window" +msgstr "Rediriger wget dans une fenêtre GTK" -#: tazbox/tazbox:43 +#: tazbox/tazbox:40 msgid "Configure system language (root)" msgstr "Configurer la langue du système (root)" -#: tazbox/tazbox:44 +#: tazbox/tazbox:41 msgid "Configure system keymap (root)" msgstr "Configurer le clavier du système (root)" -#: tazbox/tazbox:45 +#: tazbox/tazbox:42 msgid "Configure system timezone (root)" msgstr "Configurer la zone horaire (root)" -#: tazbox/tazbox:46 +#: tazbox/tazbox:43 msgid "System initial setup (locale, keymap & timezone)" msgstr "Réglage initiale du système (langue, clavier, zone horaire)" -#: tazbox/tazbox:47 +#: tazbox/tazbox:44 msgid "Create a new file or folder on the desktop" msgstr "Créer un nouveau fichier ou dossier sur le bureau" -#: tazbox/tazbox:48 +#: tazbox/tazbox:45 msgid "Display icons of all installed applications" msgstr "Icônes de toutes les applications installées" -#: tazbox/tazbox:49 +#: tazbox/tazbox:46 msgid "Notify user with a desktop centered box" msgstr "Notifie l'utilisateur avec une box centrée sur le bureau" -#: tazbox/tazbox:50 +#: tazbox/tazbox:47 msgid "Configure SliTaz default applications" msgstr "" -#: tazbox/tazbox:57 -msgid "Slitaz admin password" +#: tazbox/tazbox:65 +#, fuzzy +msgid "SliTaz admin password" msgstr "Mot de passe administrateur" -#: tazbox/tazbox:58 +#: tazbox/tazbox:68 msgid "Please enter root password (default root) to execute:" msgstr "Veuillez entre le mot de passe root (defaut root) pour exécuter:" -#: tazbox/tazbox:64 +#: tazbox/tazbox:71 msgid "Password:" msgstr "Mot de passe:" -#: tazbox/tazbox:65 +#: tazbox/tazbox:72 msgid "Autosave password" msgstr "Sauvegarder le mot de passe" -#: tazbox/tazbox:69 +#: tazbox/tazbox:77 +msgid "Error" +msgstr "Erreur" + +#: tazbox/tazbox:80 msgid "Error: wrong password!" msgstr "Erreur: mauvais mot de passe!" -#: tazbox/tazbox:91 -msgid "SliTaz Logout. Please choose an action:" -msgstr "Déconnexion. Veuillez choisir une action:" +#: tazbox/tazbox:87 +msgid "CANCEL" +msgstr "" -#: tazbox/tazbox:96 +#: tazbox/tazbox:94 +msgid "TazBox Output" +msgstr "" + +#: tazbox/tazbox:106 +msgid "SliTaz Logout" +msgstr "Déconnexion" + +#: tazbox/tazbox:109 +msgid "Please choose an action:" +msgstr "Veuillez choisir une action:" + +#: tazbox/tazbox:111 msgid "Close X session" msgstr "Fermer la session X" -#: tazbox/tazbox:97 +#: tazbox/tazbox:112 msgid "Reboot system" msgstr "Redémarrer le système" -#: tazbox/tazbox:98 +#: tazbox/tazbox:113 msgid "Shutdown system" msgstr "Eteindre le système" -#: tazbox/tazbox:117 +#: tazbox/tazbox:133 msgid "SliTaz Initial Setup" msgstr "Réglages initiale de SliTaz" -#: tazbox/tazbox:118 +#: tazbox/tazbox:136 msgid "" -"\\nHere you can set your preferences\\nfor locale, keymap and " -"timezone.\\n\\n" +"Here you can set your preferences\\nfor locale, keymap and timezone." msgstr "" -"\\nIci vous pouver régler vos préférences\\npour la langue, le " -"clavier et la zone horaire\\n\\n" +"Ici vous pouver régler vos préférences\\npour la langue, le clavier et la " +"zone horaire" -#: tazbox/tazbox:124 +#: tazbox/tazbox:138 msgid "Locale" msgstr "" -#: tazbox/tazbox:125 tazbox/tazbox:182 +#: tazbox/tazbox:139 tazbox/tazbox:190 msgid "Keymap" msgstr "Clavier" -#: tazbox/tazbox:126 +#: tazbox/tazbox:140 msgid "Timezone" msgstr "" -#: tazbox/tazbox:142 +#: tazbox/tazbox:160 +msgid "SliTaz locale" +msgstr "" + +#: tazbox/tazbox:163 msgid "Language configuration" msgstr "Configurer la langue" -#: tazbox/tazbox:153 tazbox/tazbox:209 +#: tazbox/tazbox:164 tazbox/tazbox:214 msgid "Name" msgstr "Nom" -#: tazbox/tazbox:153 +#: tazbox/tazbox:164 msgid "Description" msgstr "Description" -#: tazbox/tazbox:170 +#: tazbox/tazbox:186 +msgid "SliTaz keymap" +msgstr "" + +#: tazbox/tazbox:189 msgid "Keyboard configuration" msgstr "Configurer le clavier" -#: tazbox/tazbox:182 +#: tazbox/tazbox:190 msgid "Type" msgstr "Type" -#: tazbox/tazbox:199 +#: tazbox/tazbox:209 tazbox/tazbox:232 tazbox/tazbox:244 tazbox/tazbox:257 +msgid "SliTaz TZ" +msgstr "" + +#: tazbox/tazbox:212 tazbox/tazbox:235 tazbox/tazbox:247 tazbox/tazbox:260 msgid "TimeZone Configuration" msgstr "Configurer la zone horaire" -#: tazbox/tazbox:223 +#: tazbox/tazbox:235 +msgid "Select country" +msgstr "" + +#: tazbox/tazbox:237 +msgid "Flag" +msgstr "" + +#: tazbox/tazbox:237 +msgid "Code" +msgstr "" + +#: tazbox/tazbox:237 +msgid "Country" +msgstr "" + +#: tazbox/tazbox:247 +msgid "Select time zone" +msgstr "" + +#: tazbox/tazbox:260 +msgid "Select location" +msgstr "" + +#: tazbox/tazbox:261 +msgid "Location/City" +msgstr "" + +#: tazbox/tazbox:285 +msgid "New file" +msgstr "Nouveau fichier" + +#: tazbox/tazbox:288 msgid "Create a new file or folder on your desktop" msgstr "Créer un nouveau fichier ou dossier sur le bureau" -#: tazbox/tazbox:224 -msgid "New file" -msgstr "Nouveau fichier" - -#: tazbox/tazbox:227 +#: tazbox/tazbox:289 msgid "File name" msgstr "Nom du fichier" -#: tazbox/tazbox:228 +#: tazbox/tazbox:292 msgid "SHell script" msgstr "Script SHell" -#: tazbox/tazbox:229 +#: tazbox/tazbox:293 msgid "Folder" msgstr "Dossier" -#: tazbox/tazbox:230 +#: tazbox/tazbox:295 msgid "File" msgstr "Fichier" -#: tazbox/tazbox:254 +#: tazbox/tazbox:319 msgid "All Applications" msgstr "Toutes les applications" -#: tazbox/tazbox:361 -#, fuzzy +#: tazbox/tazbox:450 msgid "SliTaz default applications" -msgstr "Toutes les applications" +msgstr "" -#: tazbox/tazbox:363 +#: tazbox/tazbox:452 msgid "SliTaz default applications configuration" msgstr "" -#: tazbox/tazbox:365 -#, fuzzy +#: tazbox/tazbox:454 msgid "File manager:" -msgstr "Nom du fichier" +msgstr "" -#: tazbox/tazbox:366 +#: tazbox/tazbox:455 msgid "Web browser:" msgstr "" -#: tazbox/tazbox:367 +#: tazbox/tazbox:456 msgid "Text editor:" msgstr "" -#: tazbox/tazbox:368 +#: tazbox/tazbox:457 msgid "Terminal:" msgstr "" -#: tazbox/tazbox:369 +#: tazbox/tazbox:458 msgid "Window manager:" msgstr "" diff -r de13422f3a69 -r e232f0e1413a po/tazbox/pl.po --- a/po/tazbox/pl.po Thu Jul 25 03:24:36 2013 +0300 +++ b/po/tazbox/pl.po Mon Sep 09 03:27:04 2013 +0300 @@ -1,5 +1,5 @@ # Polish translation for TazBox package. -# Copyright (C) 2013 SliTaz +# Copyright (C) 2013 SliTaz GNU/Linux # This file is distributed under the same license as the TazBox package. # Paweł Pyrczak , 2013. # @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: TazBox\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-07-16 18:18+0300\n" +"POT-Creation-Date: 2013-09-06 02:11+0300\n" "PO-Revision-Date: 2013-07-23 12:35+0100\n" "Last-Translator: Paweł Pyrczak \n" "Language-Team: Paweł Pyrczak \n" @@ -15,212 +15,270 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Poedit-Language: Polish\n" "X-Poedit-Country: POLAND\n" "X-Poedit-SourceCharset: utf-8\n" -#: tazbox/tazbox:35 +#: tazbox/tazbox:28 +msgid "SliTaz tiny GUI boxes for the desktop" +msgstr "" + +#: tazbox/tazbox:30 msgid "Usage:" msgstr "Użycie:" -#: tazbox/tazbox:37 +#: tazbox/tazbox:31 +msgid "command" +msgstr "" + +#: tazbox/tazbox:33 msgid "Commands:" -msgstr "komendy:" +msgstr "Komendy:" -#: tazbox/tazbox:38 +#: tazbox/tazbox:35 msgid "Display this short help usage" msgstr "Pokazuje ten krótki opis użycia" -#: tazbox/tazbox:39 +#: tazbox/tazbox:36 msgid "Execute a command as super-user" msgstr "Wykonaj polecenie jako administrator" -#: tazbox/tazbox:40 +#: tazbox/tazbox:37 msgid "Desktop logout box with actions" msgstr "Okno wylogowania na pulpicie z opcjami do wyboru" -#: tazbox/tazbox:41 +#: tazbox/tazbox:38 msgid "Pipe a command output into a GTK window" msgstr "Przekieruj wyjście polecenia do okna GTK" -#: tazbox/tazbox:42 -msgid "Pipe Wget output into a GTK window" -msgstr "Przekieruj wyjście Wget do okna GTK" +#: tazbox/tazbox:39 +msgid "Pipe wget output into a GTK window" +msgstr "Przekieruj wyjście wget do okna GTK" -#: tazbox/tazbox:43 +#: tazbox/tazbox:40 msgid "Configure system language (root)" msgstr "Konfiguruje język systemu (root)" -#: tazbox/tazbox:44 +#: tazbox/tazbox:41 msgid "Configure system keymap (root)" msgstr "Konfiguruje układ klawiatury (root)" -#: tazbox/tazbox:45 +#: tazbox/tazbox:42 msgid "Configure system timezone (root)" msgstr "konfiguruje strefę czasową (root)" -#: tazbox/tazbox:46 +#: tazbox/tazbox:43 msgid "System initial setup (locale, keymap & timezone)" -msgstr "Początkowa konfiguracja systemu (język, ukłąd klawiatury i strefa czasowa)" +msgstr "" +"Początkowa konfiguracja systemu (język, ukłąd klawiatury i strefa czasowa)" -#: tazbox/tazbox:47 +#: tazbox/tazbox:44 msgid "Create a new file or folder on the desktop" msgstr "Tworzy nowy plik albo katalog na pulpicie" -#: tazbox/tazbox:48 +#: tazbox/tazbox:45 msgid "Display icons of all installed applications" msgstr "Wyświetla ikony wszystkich zainstalowanych aplikacji" -#: tazbox/tazbox:49 +#: tazbox/tazbox:46 msgid "Notify user with a desktop centered box" msgstr "Informuje użytkownika centralnie umieszczonym oknem na pulpicie" -#: tazbox/tazbox:50 +#: tazbox/tazbox:47 msgid "Configure SliTaz default applications" msgstr "Konfiguruje domyślne aplikacje SliTaz" -#: tazbox/tazbox:57 -msgid "Slitaz admin password" +#: tazbox/tazbox:65 +msgid "SliTaz admin password" msgstr "Hasło administratora SliTaz" -#: tazbox/tazbox:58 +#: tazbox/tazbox:68 msgid "Please enter root password (default root) to execute:" msgstr "Aby wykonać podaj hasło administratora (domyślnie root):" -#: tazbox/tazbox:64 +#: tazbox/tazbox:71 msgid "Password:" msgstr "Hasło:" -#: tazbox/tazbox:65 +#: tazbox/tazbox:72 msgid "Autosave password" msgstr "Zachowaj automatycznie hasło" -#: tazbox/tazbox:69 +#: tazbox/tazbox:77 +msgid "Error" +msgstr "Błąd" + +#: tazbox/tazbox:80 msgid "Error: wrong password!" msgstr "Błąd: błędne hasło!" -#: tazbox/tazbox:91 -msgid "SliTaz Logout. Please choose an action:" -msgstr "Wyloguj z SliTaz. Proszę wybrać polecenie:" +#: tazbox/tazbox:87 +msgid "CANCEL" +msgstr "" -#: tazbox/tazbox:96 +#: tazbox/tazbox:94 +msgid "TazBox Output" +msgstr "" + +#: tazbox/tazbox:106 +msgid "SliTaz Logout" +msgstr "Wyloguj z SliTaz" + +#: tazbox/tazbox:109 +msgid "Please choose an action:" +msgstr "Proszę wybrać polecenie:" + +#: tazbox/tazbox:111 msgid "Close X session" msgstr "Zamknij sesję X" -#: tazbox/tazbox:97 +#: tazbox/tazbox:112 msgid "Reboot system" msgstr "Restartuj system" -#: tazbox/tazbox:98 +#: tazbox/tazbox:113 msgid "Shutdown system" msgstr "Wyłącz system" -#: tazbox/tazbox:117 +#: tazbox/tazbox:133 msgid "SliTaz Initial Setup" msgstr "Wstęþna Konfiguracja SliTaz" -#: tazbox/tazbox:118 +#: tazbox/tazbox:136 msgid "" -"\\n" -"Here you can set your preferences\\n" -"for locale, keymap and timezone.\\n" -"\\n" +"Here you can set your preferences\\nfor locale, keymap and timezone." msgstr "" -"\\n" -"Tu można zmienić ustawienia dla języka,\\n" -"układu klawiatury i strefy czasowej.\\n" -"\\n" +"Tu można zmienić ustawienia dla języka,\\nukładu klawiatury i " +"strefy czasowej." -#: tazbox/tazbox:124 +#: tazbox/tazbox:138 msgid "Locale" msgstr "Ustawienia regionalne" -#: tazbox/tazbox:125 tazbox/tazbox:182 +#: tazbox/tazbox:139 tazbox/tazbox:190 msgid "Keymap" msgstr "Układ klawiatury" -#: tazbox/tazbox:126 +#: tazbox/tazbox:140 msgid "Timezone" msgstr "Strefa czasowa" -#: tazbox/tazbox:142 +#: tazbox/tazbox:160 +msgid "SliTaz locale" +msgstr "" + +#: tazbox/tazbox:163 msgid "Language configuration" msgstr "Konfiguracja języka" -#: tazbox/tazbox:153 tazbox/tazbox:209 +#: tazbox/tazbox:164 tazbox/tazbox:214 msgid "Name" msgstr "Nazwa" -#: tazbox/tazbox:153 +#: tazbox/tazbox:164 msgid "Description" msgstr "Opis" -#: tazbox/tazbox:170 +#: tazbox/tazbox:186 +msgid "SliTaz keymap" +msgstr "" + +#: tazbox/tazbox:189 msgid "Keyboard configuration" msgstr "Konfiguracja klawiatury" -#: tazbox/tazbox:182 +#: tazbox/tazbox:190 msgid "Type" msgstr "Typ" -#: tazbox/tazbox:199 +#: tazbox/tazbox:209 tazbox/tazbox:232 tazbox/tazbox:244 tazbox/tazbox:257 +msgid "SliTaz TZ" +msgstr "" + +#: tazbox/tazbox:212 tazbox/tazbox:235 tazbox/tazbox:247 tazbox/tazbox:260 msgid "TimeZone Configuration" msgstr "Konfiguracja Strefy Czasowej" -#: tazbox/tazbox:223 +#: tazbox/tazbox:235 +msgid "Select country" +msgstr "" + +#: tazbox/tazbox:237 +msgid "Flag" +msgstr "" + +#: tazbox/tazbox:237 +msgid "Code" +msgstr "" + +#: tazbox/tazbox:237 +msgid "Country" +msgstr "" + +#: tazbox/tazbox:247 +msgid "Select time zone" +msgstr "" + +#: tazbox/tazbox:260 +msgid "Select location" +msgstr "" + +#: tazbox/tazbox:261 +msgid "Location/City" +msgstr "" + +#: tazbox/tazbox:285 +msgid "New file" +msgstr "Nowy plik" + +#: tazbox/tazbox:288 msgid "Create a new file or folder on your desktop" msgstr "Tworzy nowy plik albo katalog na pulpicie" -#: tazbox/tazbox:224 -msgid "New file" -msgstr "Nowy plik" - -#: tazbox/tazbox:227 +#: tazbox/tazbox:289 msgid "File name" msgstr "Nazwa pliku:" -#: tazbox/tazbox:228 +#: tazbox/tazbox:292 msgid "SHell script" msgstr "Skrypt SHell" -#: tazbox/tazbox:229 +#: tazbox/tazbox:293 msgid "Folder" msgstr "Klatalog" -#: tazbox/tazbox:230 +#: tazbox/tazbox:295 msgid "File" msgstr "Plik" -#: tazbox/tazbox:254 +#: tazbox/tazbox:319 msgid "All Applications" msgstr "Wszystkie aplikacje" -#: tazbox/tazbox:361 +#: tazbox/tazbox:450 msgid "SliTaz default applications" msgstr "Domyślne aplikacjie SliTaz" -#: tazbox/tazbox:363 +#: tazbox/tazbox:452 msgid "SliTaz default applications configuration" msgstr "Domyślna konfiguracja aplikacji SliTaz" -#: tazbox/tazbox:365 +#: tazbox/tazbox:454 msgid "File manager:" msgstr "Menadżer plików:" -#: tazbox/tazbox:366 +#: tazbox/tazbox:455 msgid "Web browser:" msgstr "Przeglądarka internetowa:" -#: tazbox/tazbox:367 +#: tazbox/tazbox:456 msgid "Text editor:" msgstr "Edytor textowy:" -#: tazbox/tazbox:368 +#: tazbox/tazbox:457 msgid "Terminal:" msgstr "Terminal:" -#: tazbox/tazbox:369 +#: tazbox/tazbox:458 msgid "Window manager:" msgstr "Menadżer okien:" - diff -r de13422f3a69 -r e232f0e1413a po/tazbox/pt_BR.po --- a/po/tazbox/pt_BR.po Thu Jul 25 03:24:36 2013 +0300 +++ b/po/tazbox/pt_BR.po Mon Sep 09 03:27:04 2013 +0300 @@ -1,13 +1,13 @@ -# Tazbox Portuguese translation. -# Copyright (C) 2011 www.slitaz.org -# This file is distributed under the same license as the tazbox package. +# Portuguese translations for TazBox package. +# Copyright (C) 2013 SliTaz GNU/Linux +# This file is distributed under the same license as the TazBox package. # Claudinei Pereira , 2011. # msgid "" msgstr "" "Project-Id-Version: tazbox\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-07-16 18:18+0300\n" +"POT-Creation-Date: 2013-09-06 02:11+0300\n" "PO-Revision-Date: 2013-01-26 01:45-0300\n" "Last-Translator: Claudinei Pereira \n" "Language-Team: Portuguese \n" @@ -17,204 +17,265 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: tazbox/tazbox:35 +#: tazbox/tazbox:28 +msgid "SliTaz tiny GUI boxes for the desktop" +msgstr "" + +#: tazbox/tazbox:30 msgid "Usage:" msgstr "Utilização:" -#: tazbox/tazbox:37 +#: tazbox/tazbox:31 +msgid "command" +msgstr "" + +#: tazbox/tazbox:33 msgid "Commands:" msgstr "Comandos:" -#: tazbox/tazbox:38 +#: tazbox/tazbox:35 msgid "Display this short help usage" msgstr "Mostra esta utilização" -#: tazbox/tazbox:39 +#: tazbox/tazbox:36 msgid "Execute a command as super-user" msgstr "Executa um comando como super usuário" -#: tazbox/tazbox:40 +#: tazbox/tazbox:37 msgid "Desktop logout box with actions" msgstr "Caixa de logout do desktop com ações" -#: tazbox/tazbox:41 +#: tazbox/tazbox:38 msgid "Pipe a command output into a GTK window" msgstr "Concatena a saída de um comando em uma janela GTK" -#: tazbox/tazbox:42 -msgid "Pipe Wget output into a GTK window" +#: tazbox/tazbox:39 +msgid "Pipe wget output into a GTK window" msgstr "Concatena a saída do wget em uma janela GTK" -#: tazbox/tazbox:43 +#: tazbox/tazbox:40 msgid "Configure system language (root)" msgstr "Configura a linguagem do sistema (root)" -#: tazbox/tazbox:44 +#: tazbox/tazbox:41 msgid "Configure system keymap (root)" msgstr "Configura o mapa de teclado do sistema (root)" -#: tazbox/tazbox:45 +#: tazbox/tazbox:42 msgid "Configure system timezone (root)" msgstr "Configura a zona horária do sistema (root)" -#: tazbox/tazbox:46 +#: tazbox/tazbox:43 msgid "System initial setup (locale, keymap & timezone)" msgstr "Configuração inicial do sistema (locale, keymap & timezone)" -#: tazbox/tazbox:47 +#: tazbox/tazbox:44 msgid "Create a new file or folder on the desktop" msgstr "Cria um novo arquivo ou pasta na área de trabalho" -#: tazbox/tazbox:48 +#: tazbox/tazbox:45 msgid "Display icons of all installed applications" msgstr "Ícones de todos os aplicativos instalados." -#: tazbox/tazbox:49 +#: tazbox/tazbox:46 msgid "Notify user with a desktop centered box" msgstr "Notifica o usuário com uma caixa de mensagem em tela" -#: tazbox/tazbox:50 +#: tazbox/tazbox:47 msgid "Configure SliTaz default applications" msgstr "" -#: tazbox/tazbox:57 -msgid "Slitaz admin password" +#: tazbox/tazbox:65 +msgid "SliTaz admin password" msgstr "Senha de administração do SliTaz" -#: tazbox/tazbox:58 +#: tazbox/tazbox:68 msgid "Please enter root password (default root) to execute:" msgstr "Por favor insira a senha do root (por padrão 'root') para executar:" -#: tazbox/tazbox:64 +#: tazbox/tazbox:71 msgid "Password:" msgstr "Senha:" -#: tazbox/tazbox:65 +#: tazbox/tazbox:72 msgid "Autosave password" msgstr "Senha salva automaticamente" -#: tazbox/tazbox:69 +#: tazbox/tazbox:77 +msgid "Error" +msgstr "Erro" + +#: tazbox/tazbox:80 msgid "Error: wrong password!" msgstr "Erro: senha errada!" -#: tazbox/tazbox:91 -msgid "SliTaz Logout. Please choose an action:" -msgstr "Logout do SliTaz. Por favor escolha uma ação:" +#: tazbox/tazbox:87 +msgid "CANCEL" +msgstr "" -#: tazbox/tazbox:96 +#: tazbox/tazbox:94 +msgid "TazBox Output" +msgstr "" + +#: tazbox/tazbox:106 +msgid "SliTaz Logout" +msgstr "Logout do SliTaz" + +#: tazbox/tazbox:109 +msgid "Please choose an action:" +msgstr "Por favor escolha uma ação:" + +#: tazbox/tazbox:111 msgid "Close X session" msgstr "Fechar a sessão X" -#: tazbox/tazbox:97 +#: tazbox/tazbox:112 msgid "Reboot system" msgstr "Reiniciar o sistema" -#: tazbox/tazbox:98 +#: tazbox/tazbox:113 msgid "Shutdown system" msgstr "Desligar o sistema" -#: tazbox/tazbox:117 +#: tazbox/tazbox:133 msgid "SliTaz Initial Setup" msgstr "Configuração Inicial do SliTaz" -#: tazbox/tazbox:118 +#: tazbox/tazbox:136 msgid "" -"\\nHere you can set your preferences\\nfor locale, keymap and " -"timezone.\\n\\n" +"Here you can set your preferences\\nfor locale, keymap and timezone." msgstr "" -"\\nAqui você pode definir suas preferências\\npara localização, mapa " -"de teclado e zona horária\\n\\n" +"Aqui você pode definir suas preferências\\npara localização, mapa de " +"teclado e zona horária" -#: tazbox/tazbox:124 +#: tazbox/tazbox:138 msgid "Locale" msgstr "" -#: tazbox/tazbox:125 tazbox/tazbox:182 +#: tazbox/tazbox:139 tazbox/tazbox:190 msgid "Keymap" msgstr "Mapa de teclado" -#: tazbox/tazbox:126 +#: tazbox/tazbox:140 msgid "Timezone" msgstr "" -#: tazbox/tazbox:142 +#: tazbox/tazbox:160 +msgid "SliTaz locale" +msgstr "" + +#: tazbox/tazbox:163 msgid "Language configuration" msgstr "Configuração de linguagem" -#: tazbox/tazbox:153 tazbox/tazbox:209 +#: tazbox/tazbox:164 tazbox/tazbox:214 msgid "Name" msgstr "Nome" -#: tazbox/tazbox:153 +#: tazbox/tazbox:164 msgid "Description" msgstr "Descrição" -#: tazbox/tazbox:170 +#: tazbox/tazbox:186 +msgid "SliTaz keymap" +msgstr "" + +#: tazbox/tazbox:189 msgid "Keyboard configuration" msgstr "Configuração do teclado" -#: tazbox/tazbox:182 +#: tazbox/tazbox:190 msgid "Type" msgstr "Tipo" -#: tazbox/tazbox:199 +#: tazbox/tazbox:209 tazbox/tazbox:232 tazbox/tazbox:244 tazbox/tazbox:257 +msgid "SliTaz TZ" +msgstr "" + +#: tazbox/tazbox:212 tazbox/tazbox:235 tazbox/tazbox:247 tazbox/tazbox:260 msgid "TimeZone Configuration" msgstr "Configuração de zona horária" -#: tazbox/tazbox:223 +#: tazbox/tazbox:235 +msgid "Select country" +msgstr "" + +#: tazbox/tazbox:237 +msgid "Flag" +msgstr "" + +#: tazbox/tazbox:237 +msgid "Code" +msgstr "" + +#: tazbox/tazbox:237 +msgid "Country" +msgstr "" + +#: tazbox/tazbox:247 +msgid "Select time zone" +msgstr "" + +#: tazbox/tazbox:260 +msgid "Select location" +msgstr "" + +#: tazbox/tazbox:261 +msgid "Location/City" +msgstr "" + +#: tazbox/tazbox:285 +msgid "New file" +msgstr "Novo arquivo" + +#: tazbox/tazbox:288 msgid "Create a new file or folder on your desktop" msgstr "Cria novo arquivo ou pasta na área de trabalho" -#: tazbox/tazbox:224 -msgid "New file" -msgstr "Novo arquivo" - -#: tazbox/tazbox:227 +#: tazbox/tazbox:289 msgid "File name" msgstr "Nome do arquivo" -#: tazbox/tazbox:228 +#: tazbox/tazbox:292 msgid "SHell script" msgstr "SHell script" -#: tazbox/tazbox:229 +#: tazbox/tazbox:293 msgid "Folder" msgstr "Pasta" -#: tazbox/tazbox:230 +#: tazbox/tazbox:295 msgid "File" msgstr "Arquivo" -#: tazbox/tazbox:254 +#: tazbox/tazbox:319 msgid "All Applications" msgstr "Todos os aplicativos" -#: tazbox/tazbox:361 -#, fuzzy +#: tazbox/tazbox:450 msgid "SliTaz default applications" -msgstr "Todos os aplicativos" +msgstr "" -#: tazbox/tazbox:363 +#: tazbox/tazbox:452 msgid "SliTaz default applications configuration" msgstr "" -#: tazbox/tazbox:365 -#, fuzzy +#: tazbox/tazbox:454 msgid "File manager:" -msgstr "Nome do arquivo" +msgstr "" -#: tazbox/tazbox:366 +#: tazbox/tazbox:455 msgid "Web browser:" msgstr "" -#: tazbox/tazbox:367 +#: tazbox/tazbox:456 msgid "Text editor:" msgstr "" -#: tazbox/tazbox:368 +#: tazbox/tazbox:457 msgid "Terminal:" msgstr "" -#: tazbox/tazbox:369 +#: tazbox/tazbox:458 msgid "Window manager:" msgstr "" diff -r de13422f3a69 -r e232f0e1413a po/tazbox/ru.po --- a/po/tazbox/ru.po Thu Jul 25 03:24:36 2013 +0300 +++ b/po/tazbox/ru.po Mon Sep 09 03:27:04 2013 +0300 @@ -1,224 +1,284 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. +# Russian translation for TazBox package. +# Copyright (C) 2013 SliTaz GNU/Linux +# This file is distributed under the same license as the TazBox package. +# Aleksej Bobylev , 2013. # msgid "" msgstr "" "Project-Id-Version: TazBox\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-07-16 18:18+0300\n" -"PO-Revision-Date: 2013-07-16 18:18+0300\n" +"POT-Creation-Date: 2013-09-06 02:11+0300\n" +"PO-Revision-Date: 2013-09-04 10:50+0300\n" "Last-Translator: Aleksej Bobylev \n" -"Language-Team: LANGUAGE \n" +"Language-Team: \n" "Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: Russian\n" +"X-Poedit-Basepath: ../../\n" +"X-Poedit-SearchPath-0: .\n" -#: tazbox/tazbox:35 +#: tazbox/tazbox:28 +msgid "SliTaz tiny GUI boxes for the desktop" +msgstr "Маленькие диалоги SliTaz для рабочего стола" + +#: tazbox/tazbox:30 msgid "Usage:" msgstr "Использование:" -#: tazbox/tazbox:37 +#: tazbox/tazbox:31 +msgid "command" +msgstr "команда" + +#: tazbox/tazbox:33 msgid "Commands:" msgstr "Команды:" -#: tazbox/tazbox:38 +#: tazbox/tazbox:35 msgid "Display this short help usage" msgstr "Показать эту короткую справку об использовании" -#: tazbox/tazbox:39 +#: tazbox/tazbox:36 msgid "Execute a command as super-user" msgstr "Выполнить команду от имени администратора" -#: tazbox/tazbox:40 +#: tazbox/tazbox:37 msgid "Desktop logout box with actions" msgstr "Диалог выхода из системы с действиями" -#: tazbox/tazbox:41 +#: tazbox/tazbox:38 msgid "Pipe a command output into a GTK window" msgstr "Передать вывод команды в окно GTK" -#: tazbox/tazbox:42 -msgid "Pipe Wget output into a GTK window" -msgstr "Передать вывод Wget в окно GTK" +#: tazbox/tazbox:39 +msgid "Pipe wget output into a GTK window" +msgstr "Передать вывод wget в окно GTK" -#: tazbox/tazbox:43 +#: tazbox/tazbox:40 msgid "Configure system language (root)" msgstr "Настроить язык системы (root)" -#: tazbox/tazbox:44 +#: tazbox/tazbox:41 msgid "Configure system keymap (root)" msgstr "Настроить раскладку клавиатуры (root)" -#: tazbox/tazbox:45 +#: tazbox/tazbox:42 msgid "Configure system timezone (root)" msgstr "Настроить часовой пояс системы (root)" -#: tazbox/tazbox:46 +#: tazbox/tazbox:43 msgid "System initial setup (locale, keymap & timezone)" -msgstr "Начальные установки системы (локаль, раскладка клавиатуры и часовой пояс)" +msgstr "" +"Начальные установки системы (локаль, раскладка клавиатуры и часовой пояс)" -#: tazbox/tazbox:47 +#: tazbox/tazbox:44 msgid "Create a new file or folder on the desktop" msgstr "Создать файл или папку на рабочем столе" -#: tazbox/tazbox:48 +#: tazbox/tazbox:45 msgid "Display icons of all installed applications" msgstr "Список всех установленных приложений" -#: tazbox/tazbox:49 +#: tazbox/tazbox:46 msgid "Notify user with a desktop centered box" msgstr "Уведомить пользователя при помощи сообщения по центру экрана" -#: tazbox/tazbox:50 +#: tazbox/tazbox:47 msgid "Configure SliTaz default applications" msgstr "Настроить избранные приложения SliTaz" -#: tazbox/tazbox:57 -msgid "Slitaz admin password" +#: tazbox/tazbox:65 +msgid "SliTaz admin password" msgstr "Пароль администратора SliTaz" -#: tazbox/tazbox:58 +#: tazbox/tazbox:68 msgid "Please enter root password (default root) to execute:" msgstr "Введите пароль (по умолчанию — root) для выполнения:" -#: tazbox/tazbox:64 +#: tazbox/tazbox:71 msgid "Password:" msgstr "Пароль" -#: tazbox/tazbox:65 +#: tazbox/tazbox:72 msgid "Autosave password" msgstr "Автосохранение пароля" -#: tazbox/tazbox:69 +#: tazbox/tazbox:77 +msgid "Error" +msgstr "Ошибка" + +#: tazbox/tazbox:80 msgid "Error: wrong password!" msgstr "Ошибка: неверный пароль!" -#: tazbox/tazbox:91 -msgid "SliTaz Logout. Please choose an action:" -msgstr "Выход из системы SliTaz. Выберите действие:" +#: tazbox/tazbox:87 +msgid "CANCEL" +msgstr "ОТМЕНА" -#: tazbox/tazbox:96 +#: tazbox/tazbox:94 +msgid "TazBox Output" +msgstr "TazBox — вывод команды" + +#: tazbox/tazbox:106 +msgid "SliTaz Logout" +msgstr "Выход из системы SliTaz" + +#: tazbox/tazbox:109 +msgid "Please choose an action:" +msgstr "Выберите действие:" + +#: tazbox/tazbox:111 msgid "Close X session" msgstr "Закрыть сессию X" -#: tazbox/tazbox:97 +#: tazbox/tazbox:112 msgid "Reboot system" msgstr "Перезагрузка" -#: tazbox/tazbox:98 +#: tazbox/tazbox:113 msgid "Shutdown system" msgstr "Выключение" -#: tazbox/tazbox:117 +#: tazbox/tazbox:133 msgid "SliTaz Initial Setup" msgstr "Начальные установки SliTaz" -#: tazbox/tazbox:118 +#: tazbox/tazbox:136 msgid "" -"\\n" -"Here you can set your preferences\\n" -"for locale, keymap and timezone.\\n" -"\\n" +"Here you can set your preferences\\nfor locale, keymap and timezone." msgstr "" -"\\n" -"Здесь вы можете установить\\n" -"локаль, раскладку клавиатуры и часовой пояс.\\n" -"\\n" +"Здесь вы можете установить\\nлокаль, раскладку клавиатуры и часовой пояс." -#: tazbox/tazbox:124 +#: tazbox/tazbox:138 msgid "Locale" msgstr "Локаль" -#: tazbox/tazbox:125 -#: tazbox/tazbox:182 +#: tazbox/tazbox:139 tazbox/tazbox:190 msgid "Keymap" msgstr "Раскладка" -#: tazbox/tazbox:126 +#: tazbox/tazbox:140 msgid "Timezone" msgstr "Часовой пояс" -#: tazbox/tazbox:142 +#: tazbox/tazbox:160 +msgid "SliTaz locale" +msgstr "Локаль SliTaz" + +#: tazbox/tazbox:163 msgid "Language configuration" msgstr "Настройка языка" -#: tazbox/tazbox:153 -#: tazbox/tazbox:209 +#: tazbox/tazbox:164 tazbox/tazbox:214 msgid "Name" msgstr "Название" -#: tazbox/tazbox:153 +#: tazbox/tazbox:164 msgid "Description" msgstr "Описание" -#: tazbox/tazbox:170 +#: tazbox/tazbox:186 +msgid "SliTaz keymap" +msgstr "Раскладка клавиатурыь SliTaz" + +#: tazbox/tazbox:189 msgid "Keyboard configuration" msgstr "Настройка клавиатуры" -#: tazbox/tazbox:182 +#: tazbox/tazbox:190 msgid "Type" msgstr "Тип" -#: tazbox/tazbox:199 +#: tazbox/tazbox:209 tazbox/tazbox:232 tazbox/tazbox:244 tazbox/tazbox:257 +msgid "SliTaz TZ" +msgstr "Часовой пояс SliTaz" + +#: tazbox/tazbox:212 tazbox/tazbox:235 tazbox/tazbox:247 tazbox/tazbox:260 msgid "TimeZone Configuration" msgstr "Настройка часового пояса" -#: tazbox/tazbox:223 +#: tazbox/tazbox:235 +msgid "Select country" +msgstr "Выберите страну" + +#: tazbox/tazbox:237 +msgid "Flag" +msgstr "флаг" + +#: tazbox/tazbox:237 +msgid "Code" +msgstr "код" + +#: tazbox/tazbox:237 +msgid "Country" +msgstr "страна" + +#: tazbox/tazbox:247 +msgid "Select time zone" +msgstr "Выберите часовой пояс" + +#: tazbox/tazbox:260 +msgid "Select location" +msgstr "Выберите местоположение" + +#: tazbox/tazbox:261 +msgid "Location/City" +msgstr "местность/город" + +#: tazbox/tazbox:285 +msgid "New file" +msgstr "Новый файл" + +#: tazbox/tazbox:288 msgid "Create a new file or folder on your desktop" msgstr "Создать файл или папку на рабочем столе" -#: tazbox/tazbox:224 -msgid "New file" -msgstr "Новый файл" - -#: tazbox/tazbox:227 +#: tazbox/tazbox:289 msgid "File name" msgstr "Имя файла" -#: tazbox/tazbox:228 +#: tazbox/tazbox:292 msgid "SHell script" msgstr "Скрипт" -#: tazbox/tazbox:229 +#: tazbox/tazbox:293 msgid "Folder" msgstr "Папка" -#: tazbox/tazbox:230 +#: tazbox/tazbox:295 msgid "File" msgstr "Файл" -#: tazbox/tazbox:254 +#: tazbox/tazbox:319 msgid "All Applications" msgstr "Все приложения" -#: tazbox/tazbox:361 +#: tazbox/tazbox:450 msgid "SliTaz default applications" msgstr "Избранные приложения SliTaz" -#: tazbox/tazbox:363 +#: tazbox/tazbox:452 msgid "SliTaz default applications configuration" msgstr "Настройка избранных приложений SliTaz" -#: tazbox/tazbox:365 +#: tazbox/tazbox:454 msgid "File manager:" msgstr "Файловый менеджер:" -#: tazbox/tazbox:366 +#: tazbox/tazbox:455 msgid "Web browser:" msgstr "Браузер:" -#: tazbox/tazbox:367 +#: tazbox/tazbox:456 msgid "Text editor:" msgstr "Текстовый редактор:" -#: tazbox/tazbox:368 +#: tazbox/tazbox:457 msgid "Terminal:" msgstr "Терминал:" -#: tazbox/tazbox:369 +#: tazbox/tazbox:458 msgid "Window manager:" msgstr "Оконный менеджер:" - diff -r de13422f3a69 -r e232f0e1413a po/tazbox/sv.po --- a/po/tazbox/sv.po Thu Jul 25 03:24:36 2013 +0300 +++ b/po/tazbox/sv.po Mon Sep 09 03:27:04 2013 +0300 @@ -1,5 +1,5 @@ # Swedish translations for TazBox package. -# Copyright (C) 2012 SliTaz +# Copyright (C) 2013 SliTaz GNU/Linux # This file is distributed under the same license as the TazBox package. # Emil Eklund , 2012. # @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: TazBox\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-07-01 20:20+0000\n" +"POT-Creation-Date: 2013-09-06 02:11+0300\n" "PO-Revision-Date: 2012-07-12 13:14-0000\n" "Last-Translator: Emil Eklund \n" "Language-Team: Swedish\n" @@ -15,166 +15,266 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: tazbox/tazbox:35 +#: tazbox/tazbox:28 +msgid "SliTaz tiny GUI boxes for the desktop" +msgstr "" + +#: tazbox/tazbox:30 msgid "Usage:" msgstr "Användning:" -#: tazbox/tazbox:37 +#: tazbox/tazbox:31 +msgid "command" +msgstr "" + +#: tazbox/tazbox:33 msgid "Commands:" msgstr "Kommandon:" -#: tazbox/tazbox:38 +#: tazbox/tazbox:35 msgid "Display this short help usage" msgstr "Visa denna korta hjälp användningen" -#: tazbox/tazbox:39 +#: tazbox/tazbox:36 msgid "Execute a command as super-user" msgstr "Utför ett kommando som super-användare (root)" -#: tazbox/tazbox:40 +#: tazbox/tazbox:37 msgid "Desktop logout box with actions" msgstr "Skrivbords utloggnings box med alternativ." -#: tazbox/tazbox:41 +#: tazbox/tazbox:38 msgid "Pipe a command output into a GTK window" msgstr "Led ett kommando ut till ett GTK fönster" -#: tazbox/tazbox:42 -msgid "Pipe Wget output into a GTK window" -msgstr "Led Wget svar till ett GTK fönster" +#: tazbox/tazbox:39 +msgid "Pipe wget output into a GTK window" +msgstr "Led wget svar till ett GTK fönster" -#: tazbox/tazbox:43 +#: tazbox/tazbox:40 msgid "Configure system language (root)" msgstr "Konfigurera system språket (root)" -#: tazbox/tazbox:44 +#: tazbox/tazbox:41 msgid "Configure system keymap (root)" msgstr "Konfigurera systemets tangetbords layout (root)" -#: tazbox/tazbox:45 +#: tazbox/tazbox:42 msgid "Configure system timezone (root)" msgstr "Konfigurera systemets tidszon (root)" -#: tazbox/tazbox:46 +#: tazbox/tazbox:43 msgid "System initial setup (locale, keymap & timezone)" msgstr "Systemets första inställning (språk, tangentbords layout & tidszon" -#: tazbox/tazbox:47 +#: tazbox/tazbox:44 msgid "Create a new file or folder on the desktop" msgstr "Skapa en ny fil eller mapp på skrivbordet" -#: tazbox/tazbox:48 +#: tazbox/tazbox:45 msgid "Display icons of all installed applications" msgstr "Visa ikoner av alla installerade applicationer" -#: tazbox/tazbox:49 +#: tazbox/tazbox:46 msgid "Notify user with a desktop centered box" msgstr "Meddela användare med en centrerad meddelande box" -#: tazbox/tazbox:56 -msgid "Slitaz admin password" -msgstr "Slitaz administratör lösenord" +#: tazbox/tazbox:47 +msgid "Configure SliTaz default applications" +msgstr "" -#: tazbox/tazbox:57 +#: tazbox/tazbox:65 +msgid "SliTaz admin password" +msgstr "SliTaz administratör lösenord" + +#: tazbox/tazbox:68 msgid "Please enter root password (default root) to execute:" msgstr "Var god skriv in root lösenordet (standard: root) för att utföra:" -#: tazbox/tazbox:63 +#: tazbox/tazbox:71 msgid "Password:" msgstr "Lösenord:" -#: tazbox/tazbox:64 +#: tazbox/tazbox:72 msgid "Autosave password" msgstr "Autospara lösenord" -#: tazbox/tazbox:68 +#: tazbox/tazbox:77 +msgid "Error" +msgstr "Fel" + +#: tazbox/tazbox:80 msgid "Error: wrong password!" msgstr "Fel: felaktigt lösenord!" -#: tazbox/tazbox:90 -msgid "SliTaz Logout. Please choose an action:" -msgstr "SliTaz utloggning. Var god välj ett alternativ:" +#: tazbox/tazbox:87 +msgid "CANCEL" +msgstr "" -#: tazbox/tazbox:95 +#: tazbox/tazbox:94 +msgid "TazBox Output" +msgstr "" + +#: tazbox/tazbox:106 +msgid "SliTaz Logout" +msgstr "SliTaz utloggning" + +#: tazbox/tazbox:109 +msgid "Please choose an action:" +msgstr "Var god välj ett alternativ:" + +#: tazbox/tazbox:111 msgid "Close X session" msgstr "Stäng X sessionen" -#: tazbox/tazbox:96 +#: tazbox/tazbox:112 msgid "Reboot system" msgstr "Starta om systemet" -#: tazbox/tazbox:97 +#: tazbox/tazbox:113 msgid "Shutdown system" msgstr "Stäng av systemet" -#: tazbox/tazbox:116 +#: tazbox/tazbox:133 msgid "SliTaz Initial Setup" msgstr "SliTaz Första Inställning" -#: tazbox/tazbox:117 +#: tazbox/tazbox:136 msgid "" -"\\nHere you can set your preferences\\nfor locale, keymap and " -"timezone.\\n\\n" +"Here you can set your preferences\\nfor locale, keymap and timezone." msgstr "" -"\\n" -"Här kan du ställa dina inställningar\\n" -"för språk, tangentbord och tidszon.\\n" -"\\n" +"Här kan du ställa dina inställningar\\nför språk, tangentbord och " +"tidszon." -#: tazbox/tazbox:141 +#: tazbox/tazbox:138 +msgid "Locale" +msgstr "" + +#: tazbox/tazbox:139 tazbox/tazbox:190 +msgid "Keymap" +msgstr "Tangentbords layout" + +#: tazbox/tazbox:140 +msgid "Timezone" +msgstr "" + +#: tazbox/tazbox:160 +msgid "SliTaz locale" +msgstr "" + +#: tazbox/tazbox:163 msgid "Language configuration" msgstr "Språk konfiguration" -#: tazbox/tazbox:152 tazbox/tazbox:208 +#: tazbox/tazbox:164 tazbox/tazbox:214 msgid "Name" msgstr "Namn" -#: tazbox/tazbox:152 +#: tazbox/tazbox:164 msgid "Description" msgstr "Beskrivning" -#: tazbox/tazbox:169 +#: tazbox/tazbox:186 +msgid "SliTaz keymap" +msgstr "" + +#: tazbox/tazbox:189 msgid "Keyboard configuration" msgstr "Tangentbords inställning" -#: tazbox/tazbox:181 -msgid "Keymap" -msgstr "Tangentbords layout" - -#: tazbox/tazbox:181 +#: tazbox/tazbox:190 msgid "Type" msgstr "Typ" -#: tazbox/tazbox:198 +#: tazbox/tazbox:209 tazbox/tazbox:232 tazbox/tazbox:244 tazbox/tazbox:257 +msgid "SliTaz TZ" +msgstr "" + +#: tazbox/tazbox:212 tazbox/tazbox:235 tazbox/tazbox:247 tazbox/tazbox:260 msgid "TimeZone Configuration" msgstr "TidsZon Inställning" -#: tazbox/tazbox:222 +#: tazbox/tazbox:235 +msgid "Select country" +msgstr "" + +#: tazbox/tazbox:237 +msgid "Flag" +msgstr "" + +#: tazbox/tazbox:237 +msgid "Code" +msgstr "" + +#: tazbox/tazbox:237 +msgid "Country" +msgstr "" + +#: tazbox/tazbox:247 +msgid "Select time zone" +msgstr "" + +#: tazbox/tazbox:260 +msgid "Select location" +msgstr "" + +#: tazbox/tazbox:261 +msgid "Location/City" +msgstr "" + +#: tazbox/tazbox:285 +msgid "New file" +msgstr "Ny fil" + +#: tazbox/tazbox:288 msgid "Create a new file or folder on your desktop" msgstr "Skapa en ny fil eller mapp på ditt skrivbord" -#: tazbox/tazbox:223 -msgid "New file" -msgstr "Ny fil" - -#: tazbox/tazbox:226 +#: tazbox/tazbox:289 msgid "File name" msgstr "Fil namn" -#: tazbox/tazbox:227 +#: tazbox/tazbox:292 msgid "SHell script" msgstr "SHell skript" -#: tazbox/tazbox:228 +#: tazbox/tazbox:293 msgid "Folder" msgstr "Mapp" -#: tazbox/tazbox:229 +#: tazbox/tazbox:295 msgid "File" msgstr "Fil" -#: tazbox/tazbox:253 +#: tazbox/tazbox:319 msgid "All Applications" msgstr "Alla Applikationer" + +#: tazbox/tazbox:450 +msgid "SliTaz default applications" +msgstr "" + +#: tazbox/tazbox:452 +msgid "SliTaz default applications configuration" +msgstr "" + +#: tazbox/tazbox:454 +msgid "File manager:" +msgstr "" + +#: tazbox/tazbox:455 +msgid "Web browser:" +msgstr "" + +#: tazbox/tazbox:456 +msgid "Text editor:" +msgstr "" + +#: tazbox/tazbox:457 +msgid "Terminal:" +msgstr "" + +#: tazbox/tazbox:458 +msgid "Window manager:" +msgstr "" diff -r de13422f3a69 -r e232f0e1413a po/tazbox/tazbox.pot --- a/po/tazbox/tazbox.pot Thu Jul 25 03:24:36 2013 +0300 +++ b/po/tazbox/tazbox.pot Mon Sep 09 03:27:04 2013 +0300 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: TazBox\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-07-16 18:18+0300\n" +"POT-Creation-Date: 2013-09-06 02:11+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,200 +17,263 @@ "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: tazbox/tazbox:35 +#: tazbox/tazbox:28 +msgid "SliTaz tiny GUI boxes for the desktop" +msgstr "" + +#: tazbox/tazbox:30 msgid "Usage:" msgstr "" -#: tazbox/tazbox:37 +#: tazbox/tazbox:31 +msgid "command" +msgstr "" + +#: tazbox/tazbox:33 msgid "Commands:" msgstr "" -#: tazbox/tazbox:38 +#: tazbox/tazbox:35 msgid "Display this short help usage" msgstr "" -#: tazbox/tazbox:39 +#: tazbox/tazbox:36 msgid "Execute a command as super-user" msgstr "" -#: tazbox/tazbox:40 +#: tazbox/tazbox:37 msgid "Desktop logout box with actions" msgstr "" -#: tazbox/tazbox:41 +#: tazbox/tazbox:38 msgid "Pipe a command output into a GTK window" msgstr "" +#: tazbox/tazbox:39 +msgid "Pipe wget output into a GTK window" +msgstr "" + +#: tazbox/tazbox:40 +msgid "Configure system language (root)" +msgstr "" + +#: tazbox/tazbox:41 +msgid "Configure system keymap (root)" +msgstr "" + #: tazbox/tazbox:42 -msgid "Pipe Wget output into a GTK window" +msgid "Configure system timezone (root)" msgstr "" #: tazbox/tazbox:43 -msgid "Configure system language (root)" +msgid "System initial setup (locale, keymap & timezone)" msgstr "" #: tazbox/tazbox:44 -msgid "Configure system keymap (root)" +msgid "Create a new file or folder on the desktop" msgstr "" #: tazbox/tazbox:45 -msgid "Configure system timezone (root)" +msgid "Display icons of all installed applications" msgstr "" #: tazbox/tazbox:46 -msgid "System initial setup (locale, keymap & timezone)" +msgid "Notify user with a desktop centered box" msgstr "" #: tazbox/tazbox:47 -msgid "Create a new file or folder on the desktop" -msgstr "" - -#: tazbox/tazbox:48 -msgid "Display icons of all installed applications" -msgstr "" - -#: tazbox/tazbox:49 -msgid "Notify user with a desktop centered box" -msgstr "" - -#: tazbox/tazbox:50 msgid "Configure SliTaz default applications" msgstr "" -#: tazbox/tazbox:57 -msgid "Slitaz admin password" +#: tazbox/tazbox:65 +msgid "SliTaz admin password" msgstr "" -#: tazbox/tazbox:58 +#: tazbox/tazbox:68 msgid "Please enter root password (default root) to execute:" msgstr "" -#: tazbox/tazbox:64 +#: tazbox/tazbox:71 msgid "Password:" msgstr "" -#: tazbox/tazbox:65 +#: tazbox/tazbox:72 msgid "Autosave password" msgstr "" -#: tazbox/tazbox:69 +#: tazbox/tazbox:77 +msgid "Error" +msgstr "" + +#: tazbox/tazbox:80 msgid "Error: wrong password!" msgstr "" -#: tazbox/tazbox:91 -msgid "SliTaz Logout. Please choose an action:" +#: tazbox/tazbox:87 +msgid "CANCEL" msgstr "" -#: tazbox/tazbox:96 +#: tazbox/tazbox:94 +msgid "TazBox Output" +msgstr "" + +#: tazbox/tazbox:106 +msgid "SliTaz Logout" +msgstr "" + +#: tazbox/tazbox:109 +msgid "Please choose an action:" +msgstr "" + +#: tazbox/tazbox:111 msgid "Close X session" msgstr "" -#: tazbox/tazbox:97 +#: tazbox/tazbox:112 msgid "Reboot system" msgstr "" -#: tazbox/tazbox:98 +#: tazbox/tazbox:113 msgid "Shutdown system" msgstr "" -#: tazbox/tazbox:117 +#: tazbox/tazbox:133 msgid "SliTaz Initial Setup" msgstr "" -#: tazbox/tazbox:118 +#: tazbox/tazbox:136 msgid "" -"\\nHere you can set your preferences\\nfor locale, keymap and " -"timezone.\\n\\n" +"Here you can set your preferences\\nfor locale, keymap and timezone." msgstr "" -#: tazbox/tazbox:124 +#: tazbox/tazbox:138 msgid "Locale" msgstr "" -#: tazbox/tazbox:125 tazbox/tazbox:182 +#: tazbox/tazbox:139 tazbox/tazbox:190 msgid "Keymap" msgstr "" -#: tazbox/tazbox:126 +#: tazbox/tazbox:140 msgid "Timezone" msgstr "" -#: tazbox/tazbox:142 +#: tazbox/tazbox:160 +msgid "SliTaz locale" +msgstr "" + +#: tazbox/tazbox:163 msgid "Language configuration" msgstr "" -#: tazbox/tazbox:153 tazbox/tazbox:209 +#: tazbox/tazbox:164 tazbox/tazbox:214 msgid "Name" msgstr "" -#: tazbox/tazbox:153 +#: tazbox/tazbox:164 msgid "Description" msgstr "" -#: tazbox/tazbox:170 +#: tazbox/tazbox:186 +msgid "SliTaz keymap" +msgstr "" + +#: tazbox/tazbox:189 msgid "Keyboard configuration" msgstr "" -#: tazbox/tazbox:182 +#: tazbox/tazbox:190 msgid "Type" msgstr "" -#: tazbox/tazbox:199 +#: tazbox/tazbox:209 tazbox/tazbox:232 tazbox/tazbox:244 tazbox/tazbox:257 +msgid "SliTaz TZ" +msgstr "" + +#: tazbox/tazbox:212 tazbox/tazbox:235 tazbox/tazbox:247 tazbox/tazbox:260 msgid "TimeZone Configuration" msgstr "" -#: tazbox/tazbox:223 +#: tazbox/tazbox:235 +msgid "Select country" +msgstr "" + +#: tazbox/tazbox:237 +msgid "Flag" +msgstr "" + +#: tazbox/tazbox:237 +msgid "Code" +msgstr "" + +#: tazbox/tazbox:237 +msgid "Country" +msgstr "" + +#: tazbox/tazbox:247 +msgid "Select time zone" +msgstr "" + +#: tazbox/tazbox:260 +msgid "Select location" +msgstr "" + +#: tazbox/tazbox:261 +msgid "Location/City" +msgstr "" + +#: tazbox/tazbox:285 +msgid "New file" +msgstr "" + +#: tazbox/tazbox:288 msgid "Create a new file or folder on your desktop" msgstr "" -#: tazbox/tazbox:224 -msgid "New file" -msgstr "" - -#: tazbox/tazbox:227 +#: tazbox/tazbox:289 msgid "File name" msgstr "" -#: tazbox/tazbox:228 +#: tazbox/tazbox:292 msgid "SHell script" msgstr "" -#: tazbox/tazbox:229 +#: tazbox/tazbox:293 msgid "Folder" msgstr "" -#: tazbox/tazbox:230 +#: tazbox/tazbox:295 msgid "File" msgstr "" -#: tazbox/tazbox:254 +#: tazbox/tazbox:319 msgid "All Applications" msgstr "" -#: tazbox/tazbox:361 +#: tazbox/tazbox:450 msgid "SliTaz default applications" msgstr "" -#: tazbox/tazbox:363 +#: tazbox/tazbox:452 msgid "SliTaz default applications configuration" msgstr "" -#: tazbox/tazbox:365 +#: tazbox/tazbox:454 msgid "File manager:" msgstr "" -#: tazbox/tazbox:366 +#: tazbox/tazbox:455 msgid "Web browser:" msgstr "" -#: tazbox/tazbox:367 +#: tazbox/tazbox:456 msgid "Text editor:" msgstr "" -#: tazbox/tazbox:368 +#: tazbox/tazbox:457 msgid "Terminal:" msgstr "" -#: tazbox/tazbox:369 +#: tazbox/tazbox:458 msgid "Window manager:" msgstr "" diff -r de13422f3a69 -r e232f0e1413a po/tazdrop/es_AR.po --- a/po/tazdrop/es_AR.po Thu Jul 25 03:24:36 2013 +0300 +++ b/po/tazdrop/es_AR.po Mon Sep 09 03:27:04 2013 +0300 @@ -1,26 +1,42 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. +# Spanish translations for TazDrop package. +# Copyright (C) 2013 SliTaz GNU/Linux +# This file is distributed under the same license as the TazDrop package. +# Lucas Gioia , 2011. # msgid "" msgstr "" "Project-Id-Version: TazDrop\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-06-18 22:20+0200\n" +"POT-Creation-Date: 2013-09-06 02:11+0300\n" "PO-Revision-Date: 2011-08-11 00:25-0300\n" "Last-Translator: Lucas Gioia \n" -"Language-Team: LANGUAGE \n" +"Language-Team: \n" "Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: tazdrop/tazdrop:32 +#: tazdrop/tazdrop:28 +msgid "SliTaz Drag N Drop tool" +msgstr "" + +#: tazdrop/tazdrop:30 msgid "Usage:" msgstr "Uso:" -#: tazdrop/tazdrop:34 +#: tazdrop/tazdrop:31 +msgid "option" +msgstr "" + +#: tazdrop/tazdrop:31 +msgid "file" +msgstr "" + +#: tazdrop/tazdrop:31 +msgid "URL" +msgstr "" + +#: tazdrop/tazdrop:33 msgid "Options:" msgstr "Opciónes:" @@ -29,11 +45,11 @@ msgstr "Muestra esta pequeña ayuda" #: tazdrop/tazdrop:36 -msgid "Display the desktop Drag N' Drop window" +msgid "Display the desktop Drag N Drop window" msgstr "" #: tazdrop/tazdrop:37 -msgid "Display the desktop Drag N' Drop image" +msgid "Display the desktop Drag N Drop image" msgstr "" #: tazdrop/tazdrop:38 @@ -41,6 +57,9 @@ msgstr "Muestra en pantalla sus notas de texto tiradas" #: tazdrop/tazdrop:82 +msgid "Dropped Notes" +msgstr "" + +#: tazdrop/tazdrop:86 msgid "Edit or clean-up your dropped text notes" msgstr "Editar o limpiar sus notas de texto tiradas" - diff -r de13422f3a69 -r e232f0e1413a po/tazdrop/fr.po --- a/po/tazdrop/fr.po Thu Jul 25 03:24:36 2013 +0300 +++ b/po/tazdrop/fr.po Mon Sep 09 03:27:04 2013 +0300 @@ -1,14 +1,14 @@ -# French translations for PACKAGE package. -# Copyright (C) 2010 THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# Christophe Lincoln , 2010. +# French translations for TazDrop package. +# Copyright (C) 2013 SliTaz GNU/Linux +# This file is distributed under the same license as the TazDrop package. +# Christophe Lincoln , 2010. +# Stanislas Leduc , 2013. # -#, fuzzy msgid "" msgstr "" "Project-Id-Version: TazDrop\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-26 15:48-0200\n" +"POT-Creation-Date: 2013-09-06 02:11+0300\n" "PO-Revision-Date: 2013-02-20 10:21+0100\n" "Last-Translator: Stanislas Leduc \n" "Language-Team: French\n" @@ -17,11 +17,27 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: tazdrop/tazdrop:32 +#: tazdrop/tazdrop:28 +msgid "SliTaz Drag N Drop tool" +msgstr "" + +#: tazdrop/tazdrop:30 msgid "Usage:" msgstr "Utilisation:" -#: tazdrop/tazdrop:34 +#: tazdrop/tazdrop:31 +msgid "option" +msgstr "" + +#: tazdrop/tazdrop:31 +msgid "file" +msgstr "" + +#: tazdrop/tazdrop:31 +msgid "URL" +msgstr "" + +#: tazdrop/tazdrop:33 msgid "Options:" msgstr "Options:" @@ -30,11 +46,11 @@ msgstr "Affiche cette courte aide" #: tazdrop/tazdrop:36 -msgid "Display the desktop Drag N' Drop window" +msgid "Display the desktop Drag N Drop window" msgstr "Affiche la fenêtre de drag n' drop" #: tazdrop/tazdrop:37 -msgid "Display the desktop Drag N' Drop image" +msgid "Display the desktop Drag N Drop image" msgstr "Affiche la fenêtre de drag n' drop pour les images" #: tazdrop/tazdrop:38 @@ -42,5 +58,9 @@ msgstr "Affiche vos prises de notes" #: tazdrop/tazdrop:82 +msgid "Dropped Notes" +msgstr "" + +#: tazdrop/tazdrop:86 msgid "Edit or clean-up your dropped text notes" msgstr "Editer ou supprimer vos prises de notes" diff -r de13422f3a69 -r e232f0e1413a po/tazdrop/pl.po --- a/po/tazdrop/pl.po Thu Jul 25 03:24:36 2013 +0300 +++ b/po/tazdrop/pl.po Mon Sep 09 03:27:04 2013 +0300 @@ -1,5 +1,5 @@ -# Polish translation for TazDrop package. -# Copyright (C) 2013 SliTaz +# Polish translations for TazDrop package. +# Copyright (C) 2013 SliTaz GNU/Linux # This file is distributed under the same license as the TazDrop package. # Paweł Pyrczak , 2013. # @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: TazDrop\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-26 15:48-0200\n" +"POT-Creation-Date: 2013-09-06 02:11+0300\n" "PO-Revision-Date: 2013-07-23 12:35+0100\n" "Last-Translator: Paweł Pyrczak \n" "Language-Team: Paweł Pyrczak \n" @@ -15,16 +15,31 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Poedit-Language: Polish\n" "X-Poedit-Country: POLAND\n" "X-Poedit-SourceCharset: utf-8\n" -#: tazdrop/tazdrop:32 +#: tazdrop/tazdrop:28 +msgid "SliTaz Drag N Drop tool" +msgstr "" + +#: tazdrop/tazdrop:30 msgid "Usage:" msgstr "Użycie:" -#: tazdrop/tazdrop:34 +#: tazdrop/tazdrop:31 +msgid "option" +msgstr "" + +#: tazdrop/tazdrop:31 +msgid "file" +msgstr "" + +#: tazdrop/tazdrop:31 +msgid "URL" +msgstr "" + +#: tazdrop/tazdrop:33 msgid "Options:" msgstr "Opcje:" @@ -33,11 +48,11 @@ msgstr "Pokazuje tą krótką pomoc" #: tazdrop/tazdrop:36 -msgid "Display the desktop Drag N' Drop window" +msgid "Display the desktop Drag N Drop window" msgstr "Wyświetla na pulpicie okno Drag N' Drop" #: tazdrop/tazdrop:37 -msgid "Display the desktop Drag N' Drop image" +msgid "Display the desktop Drag N Drop image" msgstr "Wyświetla na pulpicie obraz Drag N' Drop" #: tazdrop/tazdrop:38 @@ -45,6 +60,9 @@ msgstr "Wyświetla notatki tekstowe" #: tazdrop/tazdrop:82 +msgid "Dropped Notes" +msgstr "" + +#: tazdrop/tazdrop:86 msgid "Edit or clean-up your dropped text notes" msgstr "Edytuje albo czyści wyświetlane notatki tekstowe" - diff -r de13422f3a69 -r e232f0e1413a po/tazdrop/pt_BR.po --- a/po/tazdrop/pt_BR.po Thu Jul 25 03:24:36 2013 +0300 +++ b/po/tazdrop/pt_BR.po Mon Sep 09 03:27:04 2013 +0300 @@ -1,5 +1,5 @@ -# Tazdrop Brazilian Portuguese translation. -# Copyright (C) 2013 SliTaz Association +# Brazilian Portuguese translations for TazDrop package. +# Copyright (C) 2013 SliTaz GNU/Linux # This file is distributed under the same license as the TazDrop package. # Claudinei Pereira , 2013. # @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: tazdrop\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-06-16 20:28+0200\n" +"POT-Creation-Date: 2013-09-06 02:11+0300\n" "PO-Revision-Date: 2013-01-26 01:50-0300\n" "Last-Translator: Claudinei Pereira \n" "Language-Team: Portuguese \n" @@ -15,13 +15,28 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: tazdrop/tazdrop:32 +#: tazdrop/tazdrop:28 +msgid "SliTaz Drag N Drop tool" +msgstr "" + +#: tazdrop/tazdrop:30 msgid "Usage:" msgstr "Utilização:" -#: tazdrop/tazdrop:34 +#: tazdrop/tazdrop:31 +msgid "option" +msgstr "" + +#: tazdrop/tazdrop:31 +msgid "file" +msgstr "" + +#: tazdrop/tazdrop:31 +msgid "URL" +msgstr "" + +#: tazdrop/tazdrop:33 msgid "Options:" msgstr "Opções:" @@ -30,11 +45,11 @@ msgstr "Mostra esta utilização" #: tazdrop/tazdrop:36 -msgid "Display the desktop Drag N' Drop window" +msgid "Display the desktop Drag N Drop window" msgstr "Mostra a janela de Arrastar e Largar do desktop" #: tazdrop/tazdrop:37 -msgid "Display the desktop Drag N' Drop image" +msgid "Display the desktop Drag N Drop image" msgstr "Mostra a imagem de Arrastar e Largar do desktop" #: tazdrop/tazdrop:38 @@ -42,5 +57,9 @@ msgstr "Mostra suas notas de texto" #: tazdrop/tazdrop:82 +msgid "Dropped Notes" +msgstr "" + +#: tazdrop/tazdrop:86 msgid "Edit or clean-up your dropped text notes" msgstr "Edita ou limpa suas notas de texto" diff -r de13422f3a69 -r e232f0e1413a po/tazdrop/ru.po --- a/po/tazdrop/ru.po Thu Jul 25 03:24:36 2013 +0300 +++ b/po/tazdrop/ru.po Mon Sep 09 03:27:04 2013 +0300 @@ -1,30 +1,44 @@ -# Russian translations for TazDrop package -# Английские переводы для пакета TazDrop. -# Copyright (C) 2012 THE TazDrop'S COPYRIGHT HOLDER +# Russian translations for TazDrop package. +# Copyright (C) 2013 SliTaz GNU/Linux # This file is distributed under the same license as the TazDrop package. -# SliTaz User , 2012. +# Aleksej Bobylev , 2013. # msgid "" msgstr "" "Project-Id-Version: TazDrop\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-07-01 20:20+0000\n" -"PO-Revision-Date: 2012-07-15 15:34-0000\n" +"POT-Creation-Date: 2013-09-06 01:33+0300\n" +"PO-Revision-Date: 2013-09-06 01:35+0300\n" "Last-Translator: Aleksej Bobylev \n" "Language-Team: Russian\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Poedit-Basepath: ../../\n" "X-Poedit-SearchPath-0: .\n" -#: tazdrop/tazdrop:32 +#: tazdrop/tazdrop:28 +msgid "SliTaz Drag N Drop tool" +msgstr "Утилита «тяни-и-бросай» для SliTaz" + +#: tazdrop/tazdrop:30 msgid "Usage:" msgstr "Использование:" -#: tazdrop/tazdrop:34 +#: tazdrop/tazdrop:31 +msgid "option" +msgstr "параметр" + +#: tazdrop/tazdrop:31 +msgid "file" +msgstr "файл" + +#: tazdrop/tazdrop:31 +msgid "URL" +msgstr "адрес" + +#: tazdrop/tazdrop:33 msgid "Options:" msgstr "Параметры:" @@ -33,11 +47,11 @@ msgstr "Показать эту короткую справку" #: tazdrop/tazdrop:36 -msgid "Display the desktop Drag N' Drop window" +msgid "Display the desktop Drag N Drop window" msgstr "Показать окно тяни-и-бросай" #: tazdrop/tazdrop:37 -msgid "Display the desktop Drag N' Drop image" +msgid "Display the desktop Drag N Drop image" msgstr "Показать изображение тяни-и-бросай" #: tazdrop/tazdrop:38 @@ -45,6 +59,10 @@ msgstr "Показать брошенные текстовые заметки" #: tazdrop/tazdrop:82 +msgid "Dropped Notes" +msgstr "Накопленные записи" + +#: tazdrop/tazdrop:86 msgid "Edit or clean-up your dropped text notes" msgstr "Правка и очистка брошенных текстовых заметок" diff -r de13422f3a69 -r e232f0e1413a po/tazdrop/tazdrop.pot --- a/po/tazdrop/tazdrop.pot Thu Jul 25 03:24:36 2013 +0300 +++ b/po/tazdrop/tazdrop.pot Mon Sep 09 03:27:04 2013 +0300 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: TazDrop\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-26 15:48-0200\n" +"POT-Creation-Date: 2013-09-06 02:11+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,11 +17,27 @@ "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: tazdrop/tazdrop:32 +#: tazdrop/tazdrop:28 +msgid "SliTaz Drag N Drop tool" +msgstr "" + +#: tazdrop/tazdrop:30 msgid "Usage:" msgstr "" -#: tazdrop/tazdrop:34 +#: tazdrop/tazdrop:31 +msgid "option" +msgstr "" + +#: tazdrop/tazdrop:31 +msgid "file" +msgstr "" + +#: tazdrop/tazdrop:31 +msgid "URL" +msgstr "" + +#: tazdrop/tazdrop:33 msgid "Options:" msgstr "" @@ -30,11 +46,11 @@ msgstr "" #: tazdrop/tazdrop:36 -msgid "Display the desktop Drag N' Drop window" +msgid "Display the desktop Drag N Drop window" msgstr "" #: tazdrop/tazdrop:37 -msgid "Display the desktop Drag N' Drop image" +msgid "Display the desktop Drag N Drop image" msgstr "" #: tazdrop/tazdrop:38 @@ -42,5 +58,9 @@ msgstr "" #: tazdrop/tazdrop:82 +msgid "Dropped Notes" +msgstr "" + +#: tazdrop/tazdrop:86 msgid "Edit or clean-up your dropped text notes" msgstr "" diff -r de13422f3a69 -r e232f0e1413a tazbox/iso3166-1.tab --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tazbox/iso3166-1.tab Mon Sep 09 03:27:04 2013 +0300 @@ -0,0 +1,255 @@ +AD Andorra +AE United Arab Emirates +AF Afghanistan +AG Antigua and Barbuda +AI Anguilla +AL Albania +AM Armenia +AN Netherlands Antilles +AO Angola +AQ Antarctica +AR Argentina +AS American Samoa +AT Austria +AU Australia +AW Aruba +AX Åland Islands +AZ Azerbaijan +BA Bosnia and Herzegovina +BB Barbados +BD Bangladesh +BE Belgium +BF Burkina Faso +BG Bulgaria +BH Bahrain +BI Burundi +BJ Benin +BL Saint Barthélemy +BM Bermuda +BN Brunei Darussalam +BO Bolivia, Plurinational State of +BQ Bonaire, Sint Eustatius and Saba +BR Brazil +BS Bahamas +BT Bhutan +BV Bouvet Island +BW Botswana +BY Belarus +BZ Belize +CA Canada +CC Cocos (Keeling) Islands +#CD Congo, the Democratic Republic of the +CD Congo, The Democratic Republic of the +CF Central African Republic +CG Congo +CH Switzerland +CI Côte d'Ivoire +CK Cook Islands +CL Chile +CM Cameroon +CN China +CO Colombia +CR Costa Rica +CU Cuba +CV Cape Verde +CW Curaçao +CX Christmas Island +CY Cyprus +CZ Czech Republic +DE Germany +DJ Djibouti +DK Denmark +DM Dominica +DO Dominican Republic +DZ Algeria +EC Ecuador +EE Estonia +EG Egypt +EH Western Sahara +ER Eritrea +ES Spain +ET Ethiopia +FI Finland +FJ Fiji +FK Falkland Islands (Malvinas) +FM Micronesia, Federated States of +FO Faroe Islands +FR France +GA Gabon +GB United Kingdom +GD Grenada +GE Georgia +GF French Guiana +GG Guernsey +GH Ghana +GI Gibraltar +GL Greenland +GM Gambia +GN Guinea +GP Guadeloupe +GQ Equatorial Guinea +GR Greece +GS South Georgia and the South Sandwich Islands +GT Guatemala +GU Guam +GW Guinea-Bissau +GY Guyana +HK Hong Kong +HM Heard Island and McDonald Islands +HN Honduras +HR Croatia +HT Haiti +HU Hungary +ID Indonesia +IE Ireland +IL Israel +IM Isle of Man +IN India +IO British Indian Ocean Territory +IQ Iraq +IR Iran, Islamic Republic of +IS Iceland +IT Italy +JE Jersey +JM Jamaica +JO Jordan +JP Japan +KE Kenya +KG Kyrgyzstan +KH Cambodia +KI Kiribati +KM Comoros +KN Saint Kitts and Nevis +KP Korea, Democratic People's Republic of +KR Korea, Republic of +KW Kuwait +KY Cayman Islands +KZ Kazakhstan +LA Lao People's Democratic Republic +LB Lebanon +LC Saint Lucia +LI Liechtenstein +LK Sri Lanka +LR Liberia +LS Lesotho +LT Lithuania +LU Luxembourg +LV Latvia +LY Libya +MA Morocco +MC Monaco +MD Moldova, Republic of +ME Montenegro +MF Saint Martin (French part) +MG Madagascar +MH Marshall Islands +#MK Macedonia, the former Yugoslav Republic of +MK Macedonia, Republic of +ML Mali +MM Myanmar +MN Mongolia +MO Macao +MP Northern Mariana Islands +MQ Martinique +MR Mauritania +MS Montserrat +MT Malta +MU Mauritius +MV Maldives +MW Malawi +MX Mexico +MY Malaysia +MZ Mozambique +NA Namibia +NC New Caledonia +NE Niger +NF Norfolk Island +NG Nigeria +NI Nicaragua +NL Netherlands +NO Norway +NP Nepal +NR Nauru +NU Niue +NZ New Zealand +OM Oman +PA Panama +PE Peru +PF French Polynesia +PG Papua New Guinea +PH Philippines +PK Pakistan +PL Poland +PM Saint Pierre and Miquelon +PN Pitcairn +PR Puerto Rico +#PS Palestine, State of +PS Palestinian Territory, Occupied +PT Portugal +PW Palau +PY Paraguay +QA Qatar +#RE Réunion +RE Reunion +RO Romania +RS Serbia +RU Russian Federation +RW Rwanda +SA Saudi Arabia +SB Solomon Islands +SC Seychelles +SD Sudan +SE Sweden +SG Singapore +SH Saint Helena, Ascension and Tristan da Cunha +SI Slovenia +SJ Svalbard and Jan Mayen +SK Slovakia +SL Sierra Leone +SM San Marino +SN Senegal +SO Somalia +SR Suriname +SS South Sudan +ST Sao Tome and Principe +SV El Salvador +SX Sint Maarten (Dutch part) +SY Syrian Arab Republic +SZ Swaziland +TC Turks and Caicos Islands +TD Chad +TF French Southern Territories +TG Togo +TH Thailand +TJ Tajikistan +TK Tokelau +TL Timor-Leste +TM Turkmenistan +TN Tunisia +TO Tonga +TR Turkey +TT Trinidad and Tobago +TV Tuvalu +TW Taiwan, Province of China +TZ Tanzania, United Republic of +UA Ukraine +UG Uganda +UM United States Minor Outlying Islands +US United States +UY Uruguay +UZ Uzbekistan +VA Holy See (Vatican City State) +VC Saint Vincent and the Grenadines +#VE Venezuela, Bolivarian Republic of +VE Venezuela, Bolivarian republic of +VG Virgin Islands, British +VI Virgin Islands, U.S. +VN Viet Nam +VU Vanuatu +WF Wallis and Futuna +WS Samoa +YE Yemen +YT Mayotte +ZA South Africa +ZM Zambia +ZW Zimbabwe diff -r de13422f3a69 -r e232f0e1413a tazbox/tazbox --- a/tazbox/tazbox Thu Jul 25 03:24:36 2013 +0300 +++ b/tazbox/tazbox Mon Sep 09 03:27:04 2013 +0300 @@ -3,22 +3,17 @@ # SliTaz tiny GUI boxes for the desktop (su, logout, locale, etc) # and as usual, please: KISS # -# Note: $(gettext "text") doesn't work inside Yad so use `gettext \"text\"` -# -# Copyright (C) 2011 SliTaz GNU/linux - GNU gpl v3 +# Copyright (C) 2011-2013 SliTaz GNU/Linux - GNU GPL v3 # - Christophe Lincoln # +. /lib/libtaz.sh +export TEXTDOMAIN='tazbox' # i18n -# Download dir (may be in a config file) +# download dir (may be in a config file) DOWNLOADS=$HOME/Downloads -# Internationalization -. /usr/bin/gettext.sh -TEXTDOMAIN='tazbox' -export TEXTDOMAIN - -# Icons for most windows -icon=/usr/share/pixmaps/slitaz-icon.png +# icons for most windows +#icon=/usr/share/pixmaps/slitaz-icon.png # some constants to be used inside functions tmp="/tmp/keymap.list" @@ -30,101 +25,131 @@ # usage() { - cat << EOT + newline; _ 'SliTaz tiny GUI boxes for the desktop' -$(gettext "Usage:") $(basename $0) [command] + newline; boldify $(_ 'Usage:') + echo " $(basename $0) [$(_n 'command')]" -$(gettext "Commands:") - usage $(gettext "Display this short help usage") - su $(gettext "Execute a command as super-user") - logout $(gettext "Desktop logout box with actions") - out $(gettext "Pipe a command output into a GTK window") - out-dl $(gettext "Pipe Wget output into a GTK window") - locale $(gettext "Configure system language (root)") - keymap $(gettext "Configure system keymap (root)") - tz $(gettext "Configure system timezone (root)") - setup $(gettext "System initial setup (locale, keymap & timezone)") - new-file $(gettext "Create a new file or folder on the desktop") - all-apps $(gettext "Display icons of all installed applications") - notify $(gettext "Notify user with a desktop centered box") - tazapps $(gettext "Configure SliTaz default applications") - -EOT + newline; boldify $(_ 'Commands:') + optlist "\ +usage $(_ 'Display this short help usage') +su $(_ 'Execute a command as super-user') +logout $(_ 'Desktop logout box with actions') +out $(_ 'Pipe a command output into a GTK window') +out-dl $(_ 'Pipe wget output into a GTK window') +locale $(_ 'Configure system language (root)') +keymap $(_ 'Configure system keymap (root)') +tz $(_ 'Configure system timezone (root)') +setup $(_ 'System initial setup (locale, keymap & timezone)') +new-file $(_ 'Create a new file or folder on the desktop') +all-apps $(_ 'Display icons of all installed applications') +notify $(_ 'Notify user with a desktop centered box') +tazapps $(_ 'Configure SliTaz default applications')" + newline } -# Su frontend GUI's +# try to find icon in .desktop files +find_icon() { + local desktop + desktop=$(find $HOME/.local/share/applications /usr/share/applications \ + -name $1.desktop | head -n1) + [ x$desktop != x ] && cat $desktop | sed '/\[Desktop\ Entry\]/,/^\[/!d' | \ + sed '/^Icon=/!d' | head -n1 | cut -d= -f2 +} + +# su frontend GUI's su_main() { - text=$(gettext "Slitaz admin password") - note=$(gettext "Please enter root password (default root) to execute:") - yad --title="Slitaz - su" --window-icon=$icon \ - --width=520 --height=140 \ - --text="$text\n$note\n$SU_CMD\n" \ - --image="slitaz-icon" --image-on-top \ - --center --on-top --form $PASSWD \ - --field="`gettext "Password:"`:H" $CHECKED \ - --field="`gettext "Autosave password"`:CHK" + CMD1="$1"; shift; CMD2="$(echo $@ | sed 's|&|&|g')" + : ${icon=$(find_icon $CMD1)} + [ x$icon == x ] && icon=gtk-dialog-authentication + + yad --title="$(_n 'SliTaz admin password')" --window-icon=$icon \ + --width=520 --on-top --center \ + --image=$icon --image-on-top \ + --text="$(_n 'Please enter root password (default root) to execute:')\n +$CMD1 $CMD2\n" \ + --form \ + --field="$(_n 'Password:'):H" $PASSWD \ + --field="$(_n 'Autosave password'):CHK" $CHECKED } su_error() { - text=$(gettext "Error: wrong password!") - yad --title="Slitaz - su error" --width=520 --height=60 \ - --image="error" --image-on-top --center --on-top \ - --text="\n\t$text" --button="gtk-close:1" + icon=gtk-dialog-error + yad --title="$(_n 'Error')" --window-icon=$icon \ + --width=320 --on-top --center \ + --image=$icon --image-on-top \ + --text="\n$(_n 'Error: wrong password!')\n" \ + --button="gtk-close:1" } -# User may press cancel on download. +# user may press cancel on download. cancel_dl() { if [ "$?" == 1 ]; then - echo "CANCEL" + _ "CANCEL" rm -f $DOWNLOADS/$(basename $url) fi } -# Output a command in a GTK window +# output a command in a GTK window output_command() { - yad --text-info --title="TazBox Output" --window-icon=$icon \ - --geometry="560x210+0-24" --fore="#ffffff" --back="#000000" + : ${title=$(_n 'TazBox Output')} + : ${icon=gtk-dialog-info} + + yad --title="$title" --window-icon=$icon \ + --geometry="600x220+0-24" --fore="#ffffff" --back="#000000" \ + --text-info --fontname=monospace --wrap $opts \ + --button="gtk-close:1" } -# Logout GUI function +# logout GUI function logout_main() { - text=$(gettext "SliTaz Logout. Please choose an action:") - yad --entry --title="SliTaz Logout" --window-icon=$icon \ - --width=440 --height=140 --text="$text" \ - --image="slitaz-icon" --image-on-top \ - --center --on-top --entry-text \ - "`gettext \"Close X session\"` : exit" \ - "`gettext \"Reboot system\"` : reboot" \ - "`gettext \"Shutdown system\"` : halt" + icon=system-log-out + yad --title="$(_n 'SliTaz Logout')" --window-icon=$icon \ + --on-top --center \ + --image=$icon --image-on-top \ + --text="$(_n 'Please choose an action:')" \ + --always-print-result \ + --button "$(_n 'Close X session'):4" \ + --button "$(_n 'Reboot system'):3" \ + --button "$(_n 'Shutdown system'):2" +} +logout_oldstyle() { + icon=/usr/share/pixmaps/slitaz-icon.png + yad --title="$(_n 'SliTaz Logout')" --window-icon=$icon \ + --on-top --center --width=440 --height=140 \ + --image=$icon --image-on-top \ + --text="$(_n 'SliTaz Logout'). $(_n 'Please choose an action:')" \ + --entry --entry-text \ + "$(_n 'Close X session'): exit" \ + "$(_n 'Reboot system'): reboot" \ + "$(_n 'Shutdown system'): halt" } -# Generate keymap list +# generate keymap list gen_kmap_list() { echo > $tmp cd /usr/share/kbd/keymaps/i386 - # We first need a list to sort and then use \n for Yad list. - for i in $(find *rty *rtz dvorak -name *.map.gz) - do - keymap=$(basename $i) - type=$(dirname $i) - echo -e "$keymap|$type" >> $tmp + # we first need a list to sort and then use \n for Yad list. + for i in $(find -type f | sed '/include/d; s|./||'); do + echo "$(basename $i .map.gz)|$(dirname $i)" >> $tmp done } # Initial Config functions setup_main() { + icon=locale gen_kmap_list - title=$(gettext "SliTaz Initial Setup") - message=$(gettext "\nHere you can set your preferences\nfor locale, keymap and timezone.\n\n") - locale=$(ls -1 $db | grep ^[a-z][a-z]_[A-Z][A-Z] | tr "\n" "!") - keymap=$(cat $tmp | cut -d. -f1 | sort | tr "\n" "!") - timezone=$(find $zi -type f | sed s,$zi,,g | tr "\n" "!") - yad --width=500 --height=380 \ - --image=$icon --title="$title" --form --text="$message" \ - --field "$(gettext 'Locale'):CB" \ - --field "$(gettext 'Keymap'):CB" \ - --field "$(gettext 'Timezone'):CB" \ - $locale \ $keymap \ $timezone + locale=$(ls -1 $db | grep ^[a-z][a-z]_[A-Z][A-Z] | tr "\n" "!") + keymap=$(cat $tmp | sort | tr "\n" "!") + timezone=$(find $zi -type f | sed s,$zi,,g | tr "\n" "!") + yad --title="$(_n 'SliTaz Initial Setup')" --window-icon=$icon \ + --width=500 \ + --image=$icon --image-on-top \ + --text="$(_n 'Here you can set your preferences \n for locale, keymap and timezone.')" \ + --form \ + --field "$(_n 'Locale'):CB" $locale \ + --field "$(_n 'Keymap'):CB" $keymap \ + --field "$(_n 'Timezone'):CB" $timezone } setup() { @@ -139,18 +164,17 @@ # Locale functions locale_main() { - text=$(gettext "Language configuration") - for locale in $(ls -1 $db | grep ^[a-z][a-z]_[A-Z][A-Z]) - do - desc=$(grep ^title $db/$locale | cut -d '"' -f 2) + icon=preferences-desktop-locale + for locale in $(ls -1 $db | grep '[a-z]_[A-Z]'); do + desc=$(fgrep -m1 title $db/$locale | cut -d'"' -f2) echo -e "$locale \n $desc" done | \ - yad --list --title="SliTaz locale" --window-icon=$icon \ - --width=500 --height=380 --separator="" \ - --center --sticky --on-top \ - --image=preferences-desktop-locale --image-on-top \ - --text="$text" --print-column=1 \ - --column $(gettext "Name") --column $(gettext "Description") + yad --title="$(_n 'SliTaz locale')" --window-icon=$icon \ + --width=600 --height=380 --sticky --on-top --center \ + --image=$icon --image-on-top \ + --text="$(_n 'Language configuration')" \ + --list --column $(_n 'Name') --column $(_n 'Description') \ + --print-column=1 --separator='' } locale() { @@ -166,68 +190,122 @@ # Keymap functions keymap_main() { + #icon=preferences-desktop-keyboard + icon=input-keyboard gen_kmap_list - text=$(gettext "Keyboard configuration") - for i in $(sort $tmp) - do - keymap=$(echo $i | cut -d "|" -f 1) - type=$(echo $i | cut -d "|" -f 2) - echo -e "${keymap%.map.gz} \n $type" + for i in $(sort $tmp); do + echo "$i" | tr '|' '\n' done | \ - yad --list $opts --title="SliTaz keymap" --window-icon=$icon \ - --width=500 --height=380 --separator="" \ - --center --sticky --on-top \ - --image=input-keyboard --image-on-top \ - --text="$text" --print-column=1 \ - --column $(gettext "Keymap") --column $(gettext "Type") + yad --title="$(_ 'SliTaz keymap')" --window-icon=$icon \ + --width=500 --height=380 --sticky --on-top --center \ + --image=$icon --image-on-top \ + --text="$(_n 'Keyboard configuration')" \ + --list --column $(_n 'Keymap') --column $(_n 'Type') \ + --print-column=1 --separator='' rm -f $tmp } keymap() { keymap=$(keymap_main) # Deal with --button values - case $? in - 1) exit 0 ;; - *) continue ;; - esac + [ x$? == x1 ] && exit 0 # System keymap configuration [ "$keymap" ] && tazkeymap $keymap } # TZ functions tz_main() { - text=$(gettext "TimeZone Configuration") - for t in $(find $zi -type f | sed s,$zi,,g) - do - echo -e "$t" - done | \ - yad --list --title="SliTaz TZ" --window-icon=$icon \ - --width=500 --height=380 --separator="" \ - --center --sticky --on-top \ - --image=preferences-desktop-locale --image-on-top \ - --text="$text" --print-column=1 \ - --column $(gettext "Name") + icon=config-date + for t in $(find $zi -type f | sed s,$zi,,g); do + echo -e "$t" + done | \ + yad --title="$(_ 'SliTaz TZ')" --window-icon=$icon \ + --width=500 --height=380 --sticky --on-top --center \ + --image=$icon --image-on-top \ + --text="$(_n 'TimeZone Configuration')" \ + --list \ + --column $(_n 'Name') +} + +tz_select() { + icon=config-date + ZONEINFO=/usr/share/zoneinfo + exit_code=0 + + case x$1 in + x) + # first pass - country + for CC in $(sed '/^#/d; s|^\([^ ]*\).*|\1|' $ZONEINFO/zone.tab | sort -u); do + cat << EOT +$CC +$CC +$(gettext iso_3166 "$(sed -n 's|^'$CC' \(.*\)$|\1|p' $ZONEINFO/iso3166-1.tab)") +EOT + done | \ + yad --title="$(_ 'SliTaz TZ')" --window-icon=$icon \ + --width=500 --height=380 --on-top --center \ + --image=$icon --image-on-top \ + --text="$(_ 'TimeZone Configuration')\n$(_ 'Select country')" \ + --list \ + --column="$(_n 'Flag'):IMG" --column=$(_n 'Code') --column=$(_n 'Country') \ + --button="gtk-index:2" --button="gtk-go-forward:0" \ + --button="gtk-cancel:1" --always-print-result \ + --print-column=2 --separator='' + ;; + xindex) + # manual selection of file with timezone info + yad --title="$(_ 'SliTaz TZ')" --window-icon=$icon \ + --width=500 --on-top --center \ + --image=$icon --image-on-top \ + --text="$(_ 'TimeZone Configuration')\n$(_ 'Select time zone')" \ + --form --field=":FL" $ZONEINFO/UTC --separator='' | \ + sed "s|$ZONEINFO/||" + ;; + *) + # second pass - city/place + list=$(cat $ZONEINFO/zone.tab | grep "^$1 " | cut -f3) + icon=$1 + if [ $(echo "$list" | wc -l) != 1 ]; then + echo "$list" | \ + yad --title="$(_ 'SliTaz TZ')" --window-icon=$icon \ + --width=500 --height=380 --on-top --center \ + --image=$icon --image-on-top \ + --text="$(_ 'TimeZone Configuration')\n$(_ 'Select location')" \ + --list --column $(_n 'Location/City') --separator='' + else + echo $list + fi + ;; + esac } tz() { - timezone=$(tz_main) - case $? in - 1) exit 0 ;; - *) continue ;; - esac - [ "$timezone" ] && echo $timezone > /etc/TZ + timezone=$(tz_select $1) + case $? in + 1) exit 0 ;; + 0) [ x$timezone == x ] && exit 0 + timezone=$(tz_select "$timezone") ;; + 2) timezone=$(tz_select "index") ;; + esac + [ x$timezone == x ] && exit 0 + echo $timezone > /etc/TZ + export TZ=$timezone } # New file functions newfile_main() { - text=$(gettext "Create a new file or folder on your desktop") - yad --entry --title="$(gettext "New file")" --window-icon=$icon \ - --text="$text" --width=460 --height=160 \ - --center --on-top --image=slitaz-icon --image-on-top \ - --entry-label="$(gettext "File name")" --always-print-result \ - --button="$(gettext "SHell script"):4" \ - --button="$(gettext "Folder"):3" \ - --button="$(gettext "File"):2" \ + icon=gtk-new + yad --title="$(_n 'New file')" --window-icon=$icon \ + --width=460 --height=160 --on-top --center \ + --image=$icon --image-on-top \ + --text="$(_n 'Create a new file or folder on your desktop')" \ + --entry --entry-label="$(_n 'File name')" \ + --ricon=editclear \ + --always-print-result \ + --button="$(_n 'SHell script'):4" \ + --button="$(_n 'Folder'):3" \ + --icon="gtk-new" \ + --button="$(_n 'File'):2" \ --button="gtk-cancel:1" } @@ -251,9 +329,11 @@ # All applications all_apps() { - yad --icons --title="$(gettext 'All Applications')" \ - --compact --read-dir=/usr/share/applications \ - --window-icon=$icon --width=400 --height=400 \ + icon=stock_bookmark + yad --title="$(_n 'All Applications')" --window-icon=$icon \ + --width=400 --height=400 \ + --icons --compact \ + --read-dir=/usr/share/applications \ --button="gtk-close:0" } @@ -265,33 +345,35 @@ for alt in $alts; do [ ! $(busybox which $alt) ] && alts=$(echo $alts | sed "s|$alt||") done - echo $current $alts | tr ' ' '!' #sed 's| |!|g' + echo $current $alts | tr ' ' '!' } +# Ask root permissions for system settings +ask_root() { + if [ $(id -u) != 0 ]; then + exec tazbox su $0 $@ + exit 0 + fi +} # # Commands # case "$1" in su) - # Keep command in an exported variable to be used by Yad. 4 arguments - # should be enuff: appname --opt --opt -v /dev/sda. Nothing to do if - # we are root. + # Don't show dialog if we are root test $(id -u) = 0 && exec ${@:2} - export SU_CMD="${@:2}" + SU_CMD="${@:2}" # Check if a password has been saved before launching main dialog if [ -s $HOME/.config/slitaz/subox.conf ]; then PASSWD=$(cat $HOME/.config/slitaz/subox.conf) CHECKED="TRUE" fi # Display the main dialog (ask for password) - main=$(su_main) + main=$(su_main $SU_CMD) # Deal with --button values and exit if cancelled to avoid erasing # saved password. - case $? in - 1) exit 0 ;; - *) continue ;; - esac + [ $? == 1 ] && exit 0 # Save or erase Autosaved password if [ $(echo $main | cut -f2 -d"|") == "TRUE" ]; then echo $main | cut -f 1 -d "|" > $HOME/.config/slitaz/subox.conf @@ -300,24 +382,25 @@ cat /dev/null > $HOME/.config/slitaz/subox.conf fi # Try to login & execute. If password is wrong execute error dialog - echo $main | cut -f 1 -d "|" | su -c "$SU_CMD &" || su_error ;; + SU_CMD_QUOTED="$(echo "$SU_CMD" | sed 's|&|\\&|g')" + echo "SU_CMD«$SU_CMD» SU_CMD_QUOTED«$SU_CMD_QUOTED»" + echo $main | cut -f 1 -d "|" | su -c "$SU_CMD_QUOTED &" || su_error ;; logout) # Logout window with actions - main=$(logout_main) + if [ "$oldstyle" ]; then + answer=$(logout_oldstyle) + else + logout_main; answer=$? + fi # Deal with --button values - case $? in - 1) exit 0 ;; - *) continue ;; - esac # DE and WM started with a custom -session script should export # XDG_CURRENT_DESKTOP - case "$main" in - *exit) + case $answer in + 4|*exit) case $XDG_CURRENT_DESKTOP in LXDE) [ "$_LXSESSION_PID" ] && kill $_LXSESSION_PID - [ "$DESKTOP_SESSION" == "compiz" ] && \ - killall compiz + [ "$DESKTOP_SESSION" == "compiz" ] && killall compiz openbox --exit ;; openbox) openbox --exit ;; compiz) killall compiz ;; @@ -325,27 +408,29 @@ # Try to kill other WM that dont set XDG var. jwm -exit 2>/dev/null ;; esac ;; - *reboot) reboot || reboot -f ;; - *halt) poweroff ;; + 3|*reboot) + reboot || reboot -f ;; + 2|*halt) + poweroff ;; esac ;; out) # Pipe a command into a GTK window - output_command ;; + sed 's|\[.m||g; s|\[[0-9][0-9]*G| |g' | output_command ;; out-dl) # A tiny GTK window for Busybox wget output - url=$2 + url=$2; opts="--tail --button=gtk-cancel:1" + icon=folder-downloads; title="$(_ 'Downloading...')" [ -d $DOWNLOADS ] || mkdir -p $DOWNLOADS busybox wget -c -P $DOWNLOADS $url 2>&1 | output_command cancel_dl ;; locale) - locale ;; + ask_root $@ && locale ;; keymap) - keymap ;; - tz) - test $(id -u) != 0 && exec tazbox su tazbox $@ && exit 0 ; - tz ;; - setup) - setup ;; + ask_root $@ && keymap ;; + tz) + ask_root $@ && tz $2;; + setup) + ask_root $@ && setup ;; new-file) newfile ;; all-apps) @@ -356,10 +441,9 @@ time="$4" [ "$icon" ] || icon=info [ "$time" ] || time=4 - yad --text="$2" --width=520 --height=80 \ - --center --on-top --image=$icon --image-on-top \ - --timeout=$time --skip-taskbar --no-buttons \ - --borders=12 --undecorated ;; + yad --width=520 --height=80 --timeout=$time --timeout-indicator=right \ + --on-top --center --no-buttons --borders=12 --undecorated \ + --skip-taskbar --image=$icon --image-on-top --text="$2" ;; tazapps) # Default applications configuration script. System wide config file # is /etc/slitaz/applications.conf and each user can have personal @@ -386,15 +470,16 @@ awesome blackbox dwm echinus enlightenment fluxbox icewm jwm \ karmen matchbox openbox-session pekwm ratpoison xfwm4) - eval $(yad --title="$(gettext 'SliTaz default applications')" \ - --window-icon=preferences-desktop --image=preferences-desktop \ - --text="$(gettext 'SliTaz default applications configuration')" \ + icon=preferences-desktop-default-applications + eval $(yad --title="$(_n 'SliTaz default applications')" \ + --window-icon=$icon --image=$icon --image-on-top \ + --text="$(_n 'SliTaz default applications configuration')" \ --form \ - --field="$(gettext 'File manager:'):CBE" "$FILE_MANAGERS" \ - --field="$(gettext 'Web browser:'):CBE" "$BROWSERS" \ - --field="$(gettext 'Text editor:'):CBE" "$EDITORS" \ - --field="$(gettext 'Terminal:'):CBE" "$TERMINALS" \ - --field="$(gettext 'Window manager:'):CBE" "$WINDOW_MANAGERS" | \ + --field="$(_n 'File manager:'):CBE" "$FILE_MANAGERS" \ + --field="$(_n 'Web browser:'):CBE" "$BROWSERS" \ + --field="$(_n 'Text editor:'):CBE" "$EDITORS" \ + --field="$(_n 'Terminal:'):CBE" "$TERMINALS" \ + --field="$(_n 'Window manager:'):CBE" "$WINDOW_MANAGERS" | \ awk -F'|' '{printf "FILE_MANAGER=\"%s\"\nBROWSER=\"%s\"\nEDITOR=\"%s\"\ TERMINAL=\"%s\"\nWINDOW_MANAGER=\"%s\"\n", $1, $2, $3, $4, $5}') @@ -405,10 +490,13 @@ /WINDOW_MANAGER=/s|"\([^"]*\)"|"'$WINDOW_MANAGER'"|' \ -i $CONFIG ;; gpl) - yad --center --text-info --title="GNU General Public License" \ + yad --title="GNU General Public License" --window-icon=text-x-generic \ + --geometry="650x500" \ --image=/usr/share/pixmaps/gpl3.png --image-on-top \ - --image-on-top --window-icon=text-x-generic --geometry="580x500" \ - --fontname=monospace --button "OK" < /usr/share/licenses/gpl.txt ;; + --center \ + --text-info \ + --fontname=monospace \ + --button "OK" < /usr/share/licenses/gpl.txt ;; *) usage ;; esac diff -r de13422f3a69 -r e232f0e1413a tazdrop/Makefile --- a/tazdrop/Makefile Thu Jul 25 03:24:36 2013 +0300 +++ b/tazdrop/Makefile Mon Sep 09 03:27:04 2013 +0300 @@ -2,7 +2,7 @@ # PREFIX?=/usr SYSCONFDIR?=/etc/slitaz -LINGUAS?=es_AR pt_BR ru +LINGUAS?=es_AR fr pl pt_BR ru # Installation diff -r de13422f3a69 -r e232f0e1413a tazdrop/README --- a/tazdrop/README Thu Jul 25 03:24:36 2013 +0300 +++ b/tazdrop/README Mon Sep 09 03:27:04 2013 +0300 @@ -5,7 +5,7 @@ TazDrop is a small window which can run in a corner of a screen and as an expanded panel and let you Drag N' Drop any kind of content and perform an action on it. If you drop an URL to a site it will open a browser to its -location, if the URL is a file (tarball, iso, PDF, etc) it will download it. +location, if the URL is a file (tarball, ISO, PDF, etc) it will download it. It can also handle email addresses, SliTaz Packages (drop one on TazDrop and it will install it) and if you drop a folder it will create a tar.bz2 archive of it. You can even drop one of its options, try to drop: --notes @@ -17,7 +17,7 @@ Auto start the DND window ------------------------- To start TazDrop with your Window manager you have to put these lines in your -autostart script (For Openbox: ~/.config/openbox/autostart.sh) to have a DND +autostart script (For Openbox: ~/.config/openbox/autostart) to have a DND window with some text: # TazDrop Drag N' Drop handler diff -r de13422f3a69 -r e232f0e1413a tazdrop/data/tazdrop.desktop --- a/tazdrop/data/tazdrop.desktop Thu Jul 25 03:24:36 2013 +0300 +++ b/tazdrop/data/tazdrop.desktop Mon Sep 09 03:27:04 2013 +0300 @@ -1,9 +1,8 @@ [Desktop Entry] -Encoding=UTF-8 Type=Application Name=Dropped Notes Name[fr]=Notes déposées Name[ru]=Коллекция заметок +Exec=tazdrop --notes Icon=slitaz-menu -Exec=tazdrop --notes -Categories=Office; +Categories=GTK;Utility;TextTools; diff -r de13422f3a69 -r e232f0e1413a tazdrop/doc/tazdrop.en.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tazdrop/doc/tazdrop.en.html Mon Sep 09 03:27:04 2013 +0300 @@ -0,0 +1,66 @@ + + + + + TazDrop Manual (en) + + + + + +
+

TazDrop Manual

+
+ +
+ +

SliTaz Drag N' Drop tool

+ +

TazDrop is a small window which can run in a corner of a screen and as an +expanded panel and let you Drag N' Drop any kind of content and perform an +action on it. If you drop an URL to a site it will open a browser to its +location, if the URL is a file (tarball, ISO, PDF, etc) it will download it. +It can also handle email addresses, SliTaz Packages (drop one on TazDrop and +it will install it) and if you drop a folder it will create a tar.bz2 archive +of it. You can even drop one of its options, try to drop: --notes

+ +

Note: This tool is separate from tazboxes since it runs permanently +and has quite a few lines of code.

+ + +

Auto start the DND window

+ +

To start TazDrop with your Window manager you have to put these lines in your +autostart script (For Openbox: ~/.config/openbox/autostart) to have +a DND window with some text:

+ +
+# TazDrop Drag N' Drop handler
+tazdrop --dnd &
+
+ +

To use an image as DND box, you can configure the image path via +tazdrop.conf:

+ +
+# TazDrop Drag N' Drop handler
+tazdrop --dnd-image &
+
+ + +

Misc notes

+ +
    +
  • Dropped folders will be archived to tar.bz2
    • +
  • Text content is written to $HOME/.cache/tazdrop.notes
    • +
  • Applications are logically configurable as well as the tool behaviour
    • +
+ +
+ + + + + diff -r de13422f3a69 -r e232f0e1413a tazdrop/doc/tazdrop.ru.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tazdrop/doc/tazdrop.ru.html Mon Sep 09 03:27:04 2013 +0300 @@ -0,0 +1,56 @@ + + + + + Руководство TazDrop + + + + + +
+

Руководство TazDrop

+
+ +
+ +

Утилита «тяни-и-бросай» для SliTaz

+ +

TazDrop — маленькое окно в углу экрана, дополнительная панель, на которую можно перетягивать любую информацию и файлы с любым содержимым, при этом будет происходить заданное действие. Если вы перетяните адрес сайта (URL), то он откроется в браузере, а если адрес указывает на файл (архив, образ ISO, документ PDF и т.д.), то он будет загружен. Кроме того, обслуживаются адреса электронной почты, пакеты SliTaz (перетяните пакет на TazDrop, и он будет установлен), а если вы перетянете папку, то будет создан архив tar.bz2. Вы даже можете перетянуть один из параметров TazDrop, попробуйте: --notes

+ +

Примечание: Эта утилита идёт отдельно от других, входящих в состав tazbox, так как она может работать постоянно и имеет довольно много строк кода.

+ + +

Автостарт окна TazDrop

+ +

Для запуска TazDrop при старте оконного менеджера, поместите следующие строки в скрипт автостарта (для Openbox: ~/.config/openbox/autostart), чтобы отобразить окно «тяни-и-бросай» с текстом:

+ +
+# TazDrop Drag N' Drop handler
+tazdrop --dnd &
+
+ +

Вариант окна со значком (вы можете изменить значок в файле настроек tazdrop.conf):

+ +
+# TazDrop Drag N' Drop handler
+tazdrop --dnd-image &
+
+ + +

Примечания

+ +
    +
  • Перетянутые папки архивируются в tar.bz2
    • +
  • Текстовые заметки сохраняются в $HOME/.cache/tazdrop.notes
    • +
  • Приложения для запуска файлов и поведение TazDrop легко и логично настраиваются
    • +
+ +
+ + + + + diff -r de13422f3a69 -r e232f0e1413a tazdrop/tazdrop --- a/tazdrop/tazdrop Thu Jul 25 03:24:36 2013 +0300 +++ b/tazdrop/tazdrop Mon Sep 09 03:27:04 2013 +0300 @@ -7,6 +7,8 @@ # Copyright (C) 2011 SliTaz GNU/linux - BSD License # - Christophe Lincoln # +. /lib/libtaz.sh +export TEXTDOMAIN='tazdrop' # i18n # Follow XDG standards CONFIG=$HOME/.config/slitaz/tazdrop.conf @@ -17,75 +19,71 @@ [ -d $DOWNLOADS ] || mkdir -p $DOWNLOADS -# Internationalization -. /usr/bin/gettext.sh -TEXTDOMAIN='tazdrop' -export TEXTDOMAIN # -# Here are the functions +# Functions # usage() { - cat << EOT + newline; _ 'SliTaz Drag N Drop tool' -$(gettext "Usage:") $(basename $0) [--option|file|url] + newline; boldify "$(_ 'Usage:')" + echo " $(basename $0) [--$(_n 'option')|$(_n 'file')|$(_n 'URL')]" -$(gettext "Options:") - --usage $(gettext "Display this small help") - --dnd $(gettext "Display the desktop Drag N' Drop window") - --dnd-image $(gettext "Display the desktop Drag N' Drop image") - --notes $(gettext "Display your dropped text notes") - -EOT + newline; boldify "$(_ 'Options:')" + optlist "\ +--usage|-h|--help $(_ 'Display this small help') +--dnd $(_ 'Display the desktop Drag N Drop window') +--image $(_ 'Display the desktop Drag N Drop image') +--notes $(_ 'Display your dropped text notes')" + newline } # Write notes content type to a file write_drop() { - sed "s/`echo -en '\r'` /\n/g" >> $NOTES << EOT -==== + sed "s/$(echo -en '\r') /\n/g" >> $NOTES << EOT +====[ $(date '+%x %X') ]==== $drop EOT } # Get and install a package from an URL get_install_pkg() { - tmp=$DOWNLOADS/$$ + tmp=$DOWNLOADS/$$ mkdir -p $tmp - $TERMINAL -hold -e "cd $tmp && wget $drop && \ - su -c \"tazpkg install *.tazpkg && mv *.tazpkg .. && \ - cd .. && rm -rf $tmp\"" & + cd $tmp + wget $drop + su -c "tazpkg install *.tazpkg && mv *.tazpkg .. && cd .. && rm -rf $tmp" } # Main GUI function drop_main() { - yad --text "$DROP_TEXT" \ - --geometry="${DROP_SIZE}$DROP_GEOM" \ - --name="tazdrop" --skip-taskbar \ - --dnd --sticky --on-top \ - --undecorated --no-buttons \ + yad --geometry="$DROP_SIZE$DROP_GEOM" \ + --sticky --on-top --skip-taskbar --undecorated --no-buttons \ + --text "$DROP_TEXT" \ + --name="tazdrop" \ + --dnd \ --command="$0" } # Image GUI function drop_image() { - yad --image=$DROP_IMAGE \ - --geometry="$DROP_IMAGE_GEOM" \ - --name="tazdrop" --skip-taskbar \ - --dnd --sticky --on-top \ - --undecorated --no-buttons \ + yad --geometry="$DROP_IMAGE_GEOM" \ + --sticky --on-top --skip-taskbar --undecorated --no-buttons \ + --image=$DROP_IMAGE \ + --name="tazdrop" \ + --dnd \ --command="$0" } # Notes GUI function drop_notes() { - text=$(gettext "Edit or clean-up your dropped text notes") - yad --text-info --filename=$NOTES \ - --title="Dropped Notes" --editable \ - --image=text-editor --image-on-top \ - --window-icon=/usr/share/pixmaps/slitaz-menu.png \ - --text="$text" --margins=5 \ - --width=500 --height=400 \ + icon=text-editor + yad --title="$(_ 'Dropped Notes')" --window-icon=$icon \ + --width=500 --height=400 --margins=5 \ + --image=$icon --image-on-top \ + --text-info --editable --filename=$NOTES \ + --text="$(_ 'Edit or clean-up your dropped text notes')" \ --button="gtk-remove:2" \ --button="gtk-save:0" \ --button="gtk-close:1" @@ -95,11 +93,11 @@ # We may have args on cmdline, execute cmd & and exit. # case "$1" in - --usage|--help) + --usage|-h|--help) usage && exit 0 ;; --dnd) drop_main && exit 0 ;; - --dnd-image) + --image) drop_image && exit 0 ;; --notes) drop_notes > /tmp/notes.$$ @@ -111,6 +109,8 @@ esac # Clean cache and exit rm -f /tmp/notes.$$ && exit 0 ;; + get_install_pkg) + get_install_pkg ;; *) [ -z "$1" ] && usage && exit 0 drop="$1" && continue ;; @@ -130,11 +130,11 @@ $IMAGE "$drop" & ;; *.txt|*.conf|*.css|*.php|*.cgi|*.list|*README*|*TODO| \ *.diff|*.log|*.js|*.xml|*receipt) - $EDITOR "$drop" & ;; + editor "$drop" & ;; *.pdf) $PDF "$drop" & ;; *.html) - $BROWSER "$drop" & ;; + browser "$drop" & ;; *.ogg|*.mp3) file=${drop#file://} $SOUND "$file" & ;; @@ -142,11 +142,12 @@ file=${drop#file://} dir=$(dirname $file) pkg=$(basename $file) - $TERMINAL -e "su -c \"cd $dir && tazpkg install ${pkg%/}\"" & ;; + tazbox su tazpkg actions $file ;; *.desktop) # Exec *.desktop files so they can be used in a non # Freedesktop environment (Ex: Ob/tint2/emlfm2) file=${drop#file://} + # FIXME: should process all other stuff from .desktop file! exec=$(fgrep Exec= "$file" | sed s'/Exec=//') $exec & ;; *) @@ -170,11 +171,11 @@ case "$drop" in *.png|*.jpg|*.jpeg|*.ico|*.gif|*.xpm|*.gz|*.bz2|*.lzma|*.xz| \ *.zip|*.pdf|*.iso) - $TERMINAL -e "cd $DOWNLOADS && wget $drop" & ;; + terminal -e "cd $DOWNLOADS && wget $drop" & ;; *.tazpkg) - get_install_pkg ;; + terminal -hold -e $0 get_install_pkg ;; *.html|*.php|*.cgi|*.py|*.pl|*/|*[a-zA-Z0-9]) - $BROWSER "$drop" & ;; + browser "$drop" & ;; esac ;; *[a-z0-9]@[a-z0-9]*.[a-z]*) diff -r de13422f3a69 -r e232f0e1413a tazdrop/tazdrop.conf --- a/tazdrop/tazdrop.conf Thu Jul 25 03:24:36 2013 +0300 +++ b/tazdrop/tazdrop.conf Mon Sep 09 03:27:04 2013 +0300 @@ -1,15 +1,10 @@ # TazDrop configuration file # -# Favorite applications used by TazDrop -TERMINAL="xterm -geometry 80x10+0-24" - # Files PDF="epdfview" -EDITOR="geany" # Web -BROWSER="tazweb" EMAIL="sylpheed --compose" # Multimedia diff -r de13422f3a69 -r e232f0e1413a tinyutils/decode --- a/tinyutils/decode Thu Jul 25 03:24:36 2013 +0300 +++ b/tinyutils/decode Mon Sep 09 03:27:04 2013 +0300 @@ -8,6 +8,7 @@ # Author: Christophe Lincoln # . /lib/libtaz.sh +export TEXTDOMAIN='slitaz-tools' #i18n # NOTES: # Do we need a --out=/output/path options ? @@ -15,10 +16,6 @@ # Use separators and give decoded file size ? # Use mencoder for flash video files (and other format) ? -# Internationalization -. /usr/bin/gettext.sh -TEXTDOMAIN='slitaz-tools' -export TEXTDOMAIN # # Functions @@ -28,14 +25,15 @@ usage() { cat << EOT -$(gettext "Usage:") $(basename $0) [option] [file|url] [file2 url2 ... fileN urlN] +$(_n 'Decode audio and video files') -$(gettext "Decode audio and video files") +$(boldify "$(_ 'Usage:')") + $(basename $0) [$(_n 'option')] [$(_n 'file')|$(_n 'URL')] ... -$(gettext "Examples:") +$(boldify "$(_ 'Examples:')") $(basename $0) audio.mp3 audio.ogg - $(basename $0) /path/files/* - $(basename $0) http://www.myurl/file.avi + $(basename $0) $(_n '/path/to/files/*') + $(basename $0) http://www.myurl/$(_n 'file').avi EOT } @@ -43,39 +41,45 @@ # Check if a tool is installed. Don't force users and auto install package # Decode is a cmdline line tool, let's have auto install option in GUI. check_tool() { + dec=$1 name="$(basename "$file")" if [ ! -x /usr/bin/$1 ]; then - echo "" - gettext "Missing decoder :"; echo " $1" - gettext "Skipping file :"; echo " $name" + _ 'Missing decoder: $dec' + _ 'Skipping file: $name' continue else - echo "" - gettext "Decoding:"; echo " $name" - #separator + _ 'Decoding: $name' + newline fi } # Decode a file. decoder() { - case "$file" in - *.mp3|*.MP3) + newline; separator; newline + if [ ! -f "$file" ]; then + _ 'No file: $file' + continue + fi + ext=$(echo ${file##*.} | tr '[A-Z]' '[a-z]') + case $ext in + mp3) check_tool "mpg123" mpg123 --rate 44100 --stereo --buffer 3072 --resync \ - -w "${file%.*3}.wav" "$file" ;; - *.ogg) + -w "${file%.*}.wav" "$file" ;; + ogg) check_tool "oggdec" oggdec "$file" ;; - *.avi|*.wmv|*.mov|*.flv) + avi|wmv|mov|flv) check_tool "ffmpeg" - ext=${file##*.} # *.flv --> mencoder file.flv -ovc lavc -oac mp3lame -o file.avi - ffmpeg -y -i "$file" "${file%.$ext}.mpg" - du -sh "${file%.$ext}.mpg" ;; - *.wav|*.mpg|--*) + ffmpeg -y -i "$file" "${file%.*}.mpg" + du -sh "${file%.*}.mpg" ;; + wav|mpg|--*) # Skip decoded files and --options. + name="$(basename "$file")" + _ 'Skipping file: $name' continue ;; - *) echo ""; gettext "Unsupported file:"; echo " $file" ;; + *) _ 'Unsupported file: $file' ;; esac } @@ -84,21 +88,20 @@ # case "$1" in - "") usage ;; + -h|--help|"") usage ;; *) - for file in "$@" - do + for file in "$@"; do + debug "$file" case "$file" in http://*) busybox wget "$file" file="$(basename "$file")" decoder && rm "$file" ;; *.*) - [ ! -f "$file" ] && \ - (gettext "No file:"; echo " $file") && continue decoder ;; esac - done && echo "" ;; + done + newline ;; esac exit 0 diff -r de13422f3a69 -r e232f0e1413a tinyutils/file-manager --- a/tinyutils/file-manager Thu Jul 25 03:24:36 2013 +0300 +++ b/tinyutils/file-manager Mon Sep 09 03:27:04 2013 +0300 @@ -6,6 +6,84 @@ USER_CONFIG="$HOME/.config/slitaz/applications.conf" [ -f $USER_CONFIG ] && . $USER_CONFIG -$FILE_MANAGER $@ & +# Check for terminal based File manager +local desktop_file terminal_line exec_line exec icon_line icon params param + +desktop_file=$(find $HOME/.local/share/applications /usr/share/applications \ + -iname $FILE_MANAGER.desktop | head -n1) +echo "desktop_file: «$desktop_file»" + +if [ "x$desktop_file" != x ]; then + terminal_line=$(grep "^Terminal" $desktop_file | head -n1 | cut -d= -f2) + exec_line=$(grep "^Exec" $desktop_file | head -n1 | cut -d= -f2) + + exec=${exec_line%% *} + params=${exec_line#* }; [ "x$exec" == "x$params" ] && params= + + case x$terminal_line in + xTrue|xtrue|x1) exec="terminal -e $exec" ;; + *) ;; + esac + + echo "terminal_line: «$terminal_line» exec: «$exec» params: «$params»" + + if [ "x$(echo $params | grep '%i')" != x ]; then + # The Icon key expected + icon_line=$(grep "^Icon" $desktop_file | head -n1 | cut -d= -f2) + if [ "x$icon_line" != x ]; then + exec_line=$(echo $exec_line | sed 's|%i|--icon '$icon_line'|') + fi + fi + echo "exec_line: «$exec_line»" + + for param in $params; do + echo "param: «$param»" + case x$param in + x%F) # A list of files expected + echo "F)" + echo » $exec $icon $@ ;; + x%f) # A single file name expected + echo "f)" + for param in $@; do + echo » $exec $icon $param + done ;; + x%U) # A list of URLs expected + echo "U)" + params= + for param in $@; do + case $param in + *://) + params="$params $param" ;; + *) + param="$(realpath $param 2>/dev/null)" + if [ "x$param" != x ]; then + params="$params file://$param" + fi ;; + esac + done + echo » $exec $icon $params + ;; + x%u) # A single URL expected + echo "u)" + for param in $@; do + case $param in + *://) + echo » $exec $icon $param ;; + *) + param="$(realpath $param 2>/dev/null)" + if [ "x$param" != x ]; then + echo » $exec $icon file://$param + fi ;; + esac + done + ;; + *) echo unknown ;; + esac + done + [ "x$params" == x ] && echo » $exec + [ "x$params" == "x%i" ] && echo » $exec $icon +fi + +#echo $FILE_MANAGER $@ & exit 0 diff -r de13422f3a69 -r e232f0e1413a tinyutils/history --- a/tinyutils/history Thu Jul 25 03:24:36 2013 +0300 +++ b/tinyutils/history Mon Sep 09 03:27:04 2013 +0300 @@ -2,5 +2,7 @@ # # Fake history command for Ash. # +. /lib/libtaz.sh +export TEXTDOMAIN='slitaz-tools' #i18n -cat $HOME/.ash_history 2>/dev/null || echo "No history file found..." +cat $HOME/.ash_history 2>/dev/null || _ 'No history file found...' diff -r de13422f3a69 -r e232f0e1413a tinyutils/hwsetup --- a/tinyutils/hwsetup Thu Jul 25 03:24:36 2013 +0300 +++ b/tinyutils/hwsetup Mon Sep 09 03:27:04 2013 +0300 @@ -2,9 +2,12 @@ # usage: hwsetup [device] # e.g., hwsetup printer # # -# (c) - SliTaz GNU/Linux 2009 - GNU GPL v3 +# Copyright (C) 2009-2013 SliTaz GNU/Linux - GNU GPL v3 # Authors : Rohit Joshi # +. /lib/libtaz.sh +. /etc/slitaz/slitaz.conf +export TEXTDOMAIN='slitaz-tools' #i18n DEVICE=$1 DEPENDS="" @@ -12,33 +15,37 @@ CONFIRM_SUGGESTED="no" NON_FREE="no" DETECTED="no" +USB_IDS=/usr/share/misc/usb.ids.gz -usage() -{ - echo -e "\nSliTaz Setup configuration\n -\033[1mUsage: \033[0m `basename $0` [command] [--option] - -\033[1mCommands: \033[0m - usage Print this short usage. - printer Parallel and USB Printer setup. - scanner USB Scanner setup. - webcam Integrated and USB webcam setup. - camera Digital Camera setup. - bluetooth Bluetooth setup. - 3g-modem 3g-modem setup. - firewall Start/stop firewall. - nvidia Nvidia (non-free/free) setup. - ati ATI (non-free/free) setup. - -\033[1mOptions: \033[0m - --non-free install non-free packages (nvidia, ati). - --suggested auto-install optional dependencies. - --confirm confirm before installing optional dependencies\n" +usage() { + newline + _ 'SliTaz Setup configuration' + newline + boldify $(_n 'Usage:') + echo " $(basename $0) [$(_n 'command')] [--$(_n 'option')]" + newline + boldify $(_n 'Commands:') + optlist "\ +usage $(_n 'Print this short usage.') +printer $(_n 'Parallel and USB Printer setup.') +scanner $(_n 'USB Scanner setup.') +webcam $(_n 'Integrated and USB webcam setup.') +camera $(_n 'Digital Camera setup.') +bluetooth $(_n 'Bluetooth setup.') +3g-modem $(_n '3g-modem setup.') +firewall $(_n 'Start/stop firewall.') +nvidia $(_n 'Nvidia (non-free/free) setup.') +ati $(_n 'ATI (non-free/free) setup.')" + newline + boldify $(_n 'Options:') + optlist "\ +--nonfree $(_n 'install non-free packages (nvidia, ati).') +--suggested $(_n 'auto-install optional dependencies.') +--confirm $(_n 'confirm before installing optional dependencies')" + newline } - -run_daemon_startup() -{ +run_daemon_startup() { # Add server to rcS.conf and avoid duplication. . /etc/rcS.conf if ! echo "$RUN_DAEMONS" | grep -q "$1"; then @@ -46,421 +53,316 @@ fi } -device() -{ +device() { + SUGGESTED="" case "$DEVICE" in - printer) + printer) DEPENDS="$DEPENDS cups cups-pdf usbutils hal-info ghostscript aspell aspell-en" SUGGESTED="hplip gutenprint foomatic-filters foomatic-db hal-cups-utils foomatic-db-nonfree ufr2 splix" CONFIRM_SUGGESTED="yes" - GROUP="lp" - ;; + GROUP="lp" ;; scanner) DEPENDS="$DEPENDS xsane usbutils hal-info" SUGGESTED="hplip" - GROUP="scanner lp" - ;; - webcam) - DEPENDS="$DEPENDS v4l-dvb usbutils hal-info" + GROUP="scanner lp" ;; + webcam) + DEPENDS="$DEPENDS v4l-dvb usbutils hal-info" SUGGESTED="xorg-xf86-video-v4l linux-video libv4l " - GROUP="video audio lp" - ;; + GROUP="video audio lp" ;; camera) - DEPENDS="$DEPENDS gphoto2 usbutils hal-info" - SUGGESTED="" - GROUP="camera lp" - ;; + DEPENDS="$DEPENDS gphoto2 usbutils hal-info" + GROUP="camera lp" ;; bluetooth) DEPENDS="$DEPENDS bluez usbutils hal-info pygobject dbus-python" - SUGGESTED="" - GROUP="lp" - ;; + GROUP="lp" ;; 3g-modem) - DEPENDS="$DEPENDS linux-dialup wvdial pcmciautils usbutils hal-info" - SUGGESTED="" - GROUP="dialout lp" - ;; + DEPENDS="$DEPENDS linux-dialup wvdial pcmciautils usbutils hal-info" + GROUP="dialout lp" ;; firewall) - DEPENDS="iptables slitaz-tools" + DEPENDS="iptables slitaz-tools" SUGGESTED="nmap" - GROUP="" - ;; + GROUP="" ;; nvidia) - DEPENDS="mesa mesa-demos linux-agp xorg-xf86-video-nv" - NON_FREE_DEPENDS="mesa mesa-demos linux-agp nvidia" - SUGGESTED="" - GROUP="video" - ;; + DEPENDS="mesa mesa-demos linux-agp xorg-xf86-video-nv" + NON_FREE_DEPENDS="mesa mesa-demos linux-agp nvidia" + GROUP="video" ;; ati) - DEPENDS=" xorg-xf86-video-ati mesa-dri-ati mesa-demos" - NON_FREE_DEPENDS="mesa mesa-demos mesa-dri linux-agp catalyst" - SUGGESTED="" - GROUP="video" - ;; + DEPENDS="xorg-xf86-video-ati mesa-dri-ati mesa-demos" + NON_FREE_DEPENDS="mesa mesa-demos mesa-dri linux-agp catalyst" + GROUP="video" ;; esac } -# Check if user is root -check_root() -{ - if test $(id -u) != 0 ; then - echo -e "\nYou must be root to run `basename $0` with this option." - echo -e "Please use 'su' and root password to become super-user.\n" - exit 0 - fi -} - -untested() -{ - echo "==========================================================" - echo "Due to a lack of compatible hardware for troubleshooting," - echo "this $DEVICE device has not been properly tested. Please " - echo "report any success, failure, bug to SliTaz Labs or Forums." - echo "==========================================================" +untested() { + newline; separator + longline $(_ "Due to a lack of compatible hardware for troubleshooting, \ +this \$DEVICE device has not been properly tested. Please report any success, \ +failure, bug to SliTaz Bug tracker or Forum.") + separator; newline sleep 1 } -failed() -{ - echo "" - echo "======================================" - echo " Failed to setup $DEVICE" - echo "======================================" +failed() { + newline; separator + _ 'Failed to setup $DEVICE' + separator; newline sleep 1 } + # Install DEPENDS and/or SUGGESTED -install() -{ - #echo "pkgs to install: $1" +install() { for pkg in $1 ; do - # Avoid reinstall - if [ ! -d /var/lib/tazpkg/installed/"$pkg" ]; then - echo "Installing pkg: $pkg" - tazpkg get-install "$pkg" --forced + # Avoid reinstall + if [ ! -d "$INSTALLED/$pkg" ]; then + _ 'Installing pkg: $pkg' + tazpkg get-install "$pkg" if tazpkg list-files "$pkg" | grep -q "/etc/udev" ; then - UDEV_RULES="yes" + UDEV_RULES="yes" fi fi done +} -} # Install DEPENDS and/or SUGGESTED -confirm_install() -{ - #echo "Suggested pkgs to install: $1" +confirm_install() { for pkg in $1 ; do - # Avoid reinstall - if [ ! -d /var/lib/tazpkg/installed/"$pkg" ]; then - echo -n "Would you like to install pkg: $pkg (y/N) ? "; read anser - if [ "$anser" == "y" ]; then + # Avoid reinstall + if [ ! -d "$INSTALLED/$pkg" ]; then + _n 'Would you like to install pkg: $pkg'; confirm + if [ $? == 0 ]; then tazpkg get-install "$pkg" --forced if tazpkg list-files "$pkg" | grep -q "/etc/udev" ; then - UDEV_RULES="yes" + UDEV_RULES="yes" fi fi fi done } -add_all_user_to_group() -{ - USERS=`grep /home /etc/passwd | cut -d: -f1` +add_all_user_to_group() { + USERS=$(grep /home /etc/passwd | cut -d: -f1) #echo "checking $USERS in $GROUP" for grp in $GROUP ; do for user in $USERS ; do if ! grep -q "$grp.*$user.*" /etc/group ; then - echo "adding $user to $grp" + _ 'adding $user to $grp' addgroup "$user" "$grp" fi done done } -find_usb_device() -{ +find_usb_device() { case "$DEVICE" in - printer) PATTERN="Cls=00" ;; - scanner) PATTERN="Cls=00" ;; - camera) PATTERN="Cls=00" ;; - bluetooth) PATTERN="Cls=e0" ;; - esac + printer|scanner|camera) PATTERN="Cls=00" ;; + bluetooth) PATTERN="Cls=e0" ;; + esac if [ -f /proc/bus/usb/devices ]; then - # no vendor entry in dmesg ?? - #dmesglogs=`dmesg | tail -20` - DETECTED="no" - count=1 + # no vendor entry in dmesg ?? + #dmesglogs=`dmesg | tail -20` + DETECTED="no" + count=1 - # assume device to be in last 3 entries; use tac - DEVICES_LIST=`cat /proc/bus/usb/devices | grep ^[TDP] | grep -B1 -A1 "$PATTERN" | grep -i vendor | \ - awk ' { print $2,$3 } ' | sed 's/ / /'|sed 's/Vendor=//' | sed 's/ProdID=//' | tail -3` - echo "Detected USB Device : Vendor : Product" - echo "========================================" - echo "$DEVICES_LIST" | while read line - do - vendorid=`echo "$line" | awk '{ print $1 }'` - [ -n "$vendorid" ] || continue - productid=`echo "$line" | awk '{ print $2 }'` - vendor=`zcat /usr/share/misc/usb.ids.gz | grep $vendorid | head -1` - product=`zcat /usr/share/misc/usb.ids.gz | grep $productid | head -2 | awk ' { print $1,$2,$3,$4} ' | sed -e :a -e '$!N;s/\n/ ; /;ta' ` - echo " $count) Vendor : $vendor " - echo " Product : $product" - echo "========================================" - count=`expr $count + 1` - done - # confirm (use dmesg or some other way to automate this) - confirm_device + # assume device to be in last 3 entries; use tac + DEVICES_LIST=$(cat /proc/bus/usb/devices | grep ^[TDP] | \ + grep -B1 -A1 "$PATTERN" | grep -i vendor | awk ' { print $2,$3 } ' | \ + sed 's/ / /'|sed 's/Vendor=//' | sed 's/ProdID=//' | tail -3) + _ 'Detected USB Device : Vendor : Product' + separator + echo "$DEVICES_LIST" | while read line + do + vendorid=$(echo "$line" | awk '{ print $1 }') + [ -n "$vendorid" ] || continue + productid=$(echo "$line" | awk '{ print $2 }') + vendor=$(zcat $USB_IDS | grep $vendorid | head -1) + product=$(zcat $USB_IDS | grep $productid | head -2 | \ + awk ' { print $1,$2,$3,$4} ' | sed -e :a -e '$!N;s/\n/ ; /;ta') + _ " $count) Vendor : $vendor " + _ " Product : $product" + separator + count=$(expr $count + 1) + done + # confirm (use dmesg or some other way to automate this) + confirm_device fi } -confirm_device() -{ - echo -n "Which no. is your $DEVICE shown in the above lines (1,2,3,none); ? "; read choice - +confirm_device() { + _ "Which no. is your $DEVICE shown in the above lines (1,2,3,none)? "; read choice case "$choice" in - [nN*]) DETECTED="no" ;; - - *) dev=`echo "$DEVICES_LIST" | head -$choice | tail -1` - vendorid=`echo "$dev" | awk '{ print $1 }'` - productid=`echo "$dev" | awk '{ print $2 }'` - bus=`grep -B2 ".*$vendorid.*$productid" /proc/bus/usb/devices| grep Bus` - busno=` echo $bus| awk '{ print $2 }' |cut -d "=" -f 2` - deviceno=`echo $bus| awk '{ print $8 }' ` - HP=`echo $vendor | grep -q -i "Hewlett"` + 1|2|3) + dev=$(echo "$DEVICES_LIST" | head -$choice | tail -1) + vendorid=$(echo "$dev" | awk '{ print $1 }') + productid=$(echo "$dev" | awk '{ print $2 }') + bus=$(grep -B2 ".*$vendorid.*$productid" /proc/bus/usb/devices | grep Bus) + busno=$(echo $bus | awk '{ print $2 }' | cut -d"=" -f2) + deviceno=$(echo $bus | awk '{ print $8 }') + HP=$(echo $vendor | grep -q -i "Hewlett") DETECTED="yes" ;; + *) + DETECTED="no" ;; esac - - } -hputil() -{ +hputil() { if [ "$HP" == "1" ]; then - install "hplip" - echo "" - echo -n "Do you want to use hp-setup utility (y/N) ? "; read choice - if [ "$choice" == "y" ]; then - hp-setup + install "hplip" + newline + _n 'Do you want to use hp-setup utility'; confirm + if [ $? == 0 ]; then + hp-setup fi fi } # udev now should do this correctly -fix_usb_permissions() -{ +fix_usb_permissions() { grp=$1 if [ "$DETECTED" == "yes" ]; then if ls /dev/bus/usb/*$busno/*$deviceno ; then chmod 666 /dev/bus/usb/*$busno/*$deviceno chgrp $grp /dev/bus/usb/*$busno/*$deviceno - echo "========================================" - echo -e "\033[1m Verify $DEVICE Permissions \033[0m " - echo "Your $DEVICE must be in $grp group with 666 permissions" + newline; separator + boldify "$(_ 'Verify $DEVICE Permissions')" + _ 'Your $DEVICE must be in $grp group with rw-rw-rw- permissions' ls -l /dev/bus/usb/*$busno/*$deviceno - echo "========================================" + separator; newline fi fi - } -fix_parallel_permissions() -{ - if [ -f /usr/lib/cups/backend/parallel ] ; then - chmod 0755 /usr/lib/cups/backend/parallel - fi +fix_parallel_permissions() { + if [ -f /usr/lib/cups/backend/parallel ] ; then + chmod 0755 /usr/lib/cups/backend/parallel + fi } -load_modules() -{ +load_modules() { tazhw detect-pci tazhw detect-usb sleep 1 } -udev() -{ - +udev() { if [ "$UDEV_RULES" == "yes" ]; then - echo "New udev rules are added by a package" + _ 'New udev rules are added by a package' udevadm trigger sleep 2 fi - } -xorg() -{ - +xorg() { [ -x /usr/bin/Xorg ] || install "xorg" - echo "Auto configuring Xorg.." + _ 'Auto configuring Xorg...' # Xorg auto configuration. if [ ! -d /etc/X11/xorg.conf.d -a -x /usr/bin/Xorg ]; then - echo "Configuring Xorg..." + _ 'Configuring Xorg...' # Populate /etc/X11/xorg.conf.d if it doesn't exist. sed -i 's|/usr/bin/Xvesa|/usr/bin/Xorg|' /etc/slim.conf - sed -i s/"^xserver_arguments"/'\#xserver_arguments'/ /etc/slim.conf + sed -i 's|^xserver_arguments|\#xserver_arguments|' /etc/slim.conf tazx config-xorg fi - } -wvdialbox() -{ +get_wvdial_vars() { + PHONE=$( grep ^Phone $CONF | cut -d= -f2 | tr -d '[" ]') + USERNAME=$(grep ^Username $CONF | cut -d= -f2 | tr -d '[" ]') + PASSWORD=$(grep ^Password $CONF | cut -d= -f2 | tr -d '[" ]') + PIN=$( grep AT+CPIN= $CONF | cut -d= -f3 | tr -d '[" ]') + MODEM=$( grep ^Modem.*/dev.* $CONF | cut -d= -f2 | tr -d '[" ]' | uniq) + APN=$( grep AT+CGDCONT $CONF | cut -d, -f3 | tr -d '[" ]') + [ "x$USERNAME" == "x''" ] && USERNAME= + [ "x$PASSWORD" == "x''" ] && PASSWORD= +} + +set_wvdial_vars() { + # wvdial needs something right the equal sign + [ x$USERNAME == x ] && USERNAME="''" + [ x$PASSWORD == x ] && PASSWORD="''" + sed 's|^Phone.*|Phone = '$PHONE'|; s|^Username.*|Username = '$USERNAME'|; \ + s|^Password.*|Password = '$PASSWORD'|; s|.*AT+CPIN=.*|Init4 = AT+CPIN='$PIN'|; \ + s|.*AT+CGDCONT=.*|Init3 = AT+CGDCONT=1,"IP", "'$APN'"|; \ + s|^Modem.*/dev.*|Modem = '$MODEM'|' -i $CONF +} + +wvdialbox_main() { + icon=network-transmit-receive + yad --title="$(_n 'Wvdial Box')" --window-icon=$icon --center \ + --image=$icon \ + --form \ + --field="$(_n 'Phone Number:')" "$PHONE" \ + --field="$(_n 'Username:')" "$USERNAME" \ + --field="$(_n 'Password:'):H" "$PASSWORD" \ + --field="$(_n 'Pin (if required):'):H" "$PIN" \ + --field="$(_n 'Modem:')" "$MODEM" \ + --field="$(_n 'Access Point Name (APN):')" "$APN" \ + --field="$(_n 'You must save your account info before dialing'):LBL" "" \ + --field="$(_n 'Edit config file'):BTN" "leafpad $CONF" \ + --button="$(_n 'Save Configuration'):2" \ + --button="$(_n 'Dial Pin Once'):1" \ + --button="gtk-connect:3" + # --always-print-result +} + +wvdialbox() { # setup your modem #wvdialconf - echo "====================================" #set username, password, pin #echo -e "Edit \033[1m /etc/wvdial.conf \033[0m for phone number, login name, password and pin" - if [ ! -f /etc/wvdial.conf ]; then - APN="apn.yournet.net" - PHONE="*99#" - USERNAME="user" - PASSWORD="passwd" - PIN="9999" - echo "[Dialer slitaz]" > /etc/wvdial.conf - echo "Phone = $PHONE" >> /etc/wvdial.conf - echo "Username = $USERNAME" >> /etc/wvdial.conf - echo "Password = $PASSWORD" >> /etc/wvdial.conf - echo "Stupid Mode = 1" >> /etc/wvdial.conf - echo "Dial Command = ATDT" >> /etc/wvdial.conf + CONF=/etc/wvdial.conf + if [ ! -f $CONF ]; then + APN="apn.yournet.net" + PHONE="*99#" + USERNAME="user" + PASSWORD="passwd" + PIN="9999" [ -n "$MODEM" ] || MODEM="/dev/ttyUSB0" - echo "Modem = $MODEM" >> /etc/wvdial.conf - echo "Baud = 460800" >> /etc/wvdial.conf - echo "Init1 = ATZ " >> /etc/wvdial.conf - echo "Init2 = ATQ0 V1 E1 S0=0 &C1 &D2 +FCLASS=0" >> /etc/wvdial.conf - echo "Init3 = AT+CGDCONT=1,\"IP\", \"$APN\"" >> /etc/wvdial.conf - echo "ISDN = 0" >> /etc/wvdial.conf - echo "Modem Type = Analog Modem" >> /etc/wvdial.conf - echo "" >> /etc/wvdial.conf - echo "" >> /etc/wvdial.conf - echo "[Dialer pin]" >> /etc/wvdial.conf - echo "Modem = $MODEM" >> /etc/wvdial.conf - echo "Init4 = AT+CPIN=$PIN" >> /etc/wvdial.conf + cat > $CONF << EOT +[Dialer slitaz] +Phone = $PHONE +Username = $USERNAME +Password = $PASSWORD +Stupid Mode = 1 +Dial Command = ATDT +Modem = $MODEM +Baud = 460800 +Init1 = ATZ +Init2 = ATQ0 V1 E1 S0=0 &C1 &D2 +FCLASS=0 +Init3 = AT+CGDCONT=1,"IP", "$APN" +ISDN = 0 +Modem Type = Analog Modem + +[Dialer pin] +Modem = $MODEM +Init4 = AT+CPIN=$PIN +EOT fi #sed -i "s/^\[Dialer.*/[Dialer slitaz]/" /etc/wvdial.conf #DIALER=`grep Dialer /etc/wvdial.conf | sed \'2d\'|tr \"[]\" \" \"|cut -d \" \" -f 3` #DIALER=`grep -B1 AT+CPIN /etc/wvdial.conf | sed \'2d\'|tr \"[]\" \" \"|cut -d \" \" -f 3` -MAIN_DIALOG=" - - + get_wvdial_vars -" - MAIN_DIALOG=${MAIN_DIALOG}' + CONF_VARS=$(wvdialbox_main); BUTTON="$?" + PHONE=$( echo $CONF_VARS | cut -d"|" -f1) + USERNAME=$(echo $CONF_VARS | cut -d"|" -f2) + PASSWORD=$(echo $CONF_VARS | cut -d"|" -f3) + PIN=$( echo $CONF_VARS | cut -d"|" -f4) + MODEM=$( echo $CONF_VARS | cut -d"|" -f5) + APN=$( echo $CONF_VARS | cut -d"|" -f6) - - - - - - cat /etc/wvdial.conf | grep ^Phone | cut -d "=" -f2 | tr -d "[\" ]" - PHONE - - - - - - - - cat /etc/wvdial.conf | grep ^Username | cut -d "=" -f2 | tr -d "[\" ]" - USERNAME - - - - - - - - cat /etc/wvdial.conf | grep ^Password | cut -d "=" -f2 | tr -d "[\" ]" - PASSWORD - - - - - - - - cat /etc/wvdial.conf | grep AT+CPIN= | cut -d "=" -f3 | tr -d "[\" ]" - PIN - - - - - - - - cat /etc/wvdial.conf | grep ^Modem.*/dev.* | cut -d "=" -f2 | tr -d "[\" ]"|uniq - MODEM - - - - - - - - cat /etc/wvdial.conf | grep AT+CGDCONT | cut -d "," -f3 | tr -d "[\" ]" - APN - - - - - - - - - - - - - - - - - - ' - - -export MAIN_DIALOG=${MAIN_DIALOG}" - -" - gtkdialog --center --program=MAIN_DIALOG + case "$BUTTON" in + 2) set_wvdial_vars; wvdialbox ;; + 1) terminal -geometry 80x16 -title "Wvdial" -e "$0 dial pin" ;; + 3) terminal -geometry 80x16 -title "Wvdial" -e "$0 dial slitaz" ;; + esac } - - -setup() -{ - case "$DEVICE" in +setup() { + case "$DEVICE" in printer) load_modules udev @@ -470,344 +372,357 @@ DETECTED="yes" else find_usb_device - fix_usb_permissions "lp" + fix_usb_permissions "lp" fi #lpinfo -v if [ "$DETECTED" == "yes" ]; then - echo "" - echo -n "Do you want to start cups (y/N) ? "; read anser - echo "" - if [ "$anser" == "y" ]; then - /etc/init.d/cupsd start - sleep 2 - browser http://localhost:631/ + newline + _n 'Do you want to start cups'; confirm + if [ $? == 0 ]; then + newline + /etc/init.d/cupsd start + sleep 2 + browser http://localhost:631/ else - echo "" - echo "====================================" - echo -e "Starting \033[1m cups \033[0m using :" - echo "/etc/init.d/cupsd start" - echo "browser http://localhost:631/" - echo "====================================" + newline; separator + emsg "$(_ 'Starting cups using:')" + echo "/etc/init.d/cupsd start" + echo "browser http://localhost:631/" + separator; newline fi else failed - fi + fi ;; + scanner) load_modules udev find_usb_device fix_usb_permissions "scanner" - if [ "$DETECTED" == "yes" ]; then - #hputil - echo "" - echo -n "Do you want to start scanner (y/N) ? "; read anser - echo "" - if [ "$anser" == "y" ]; then - sane-find-scanner # to verify scanner has been found - scanimage -L # List scanners - xsane #scanner application + if [ "$DETECTED" == "yes" ]; then + #hputil + newline + _n 'Do you want to start scanner'; confirm + if [ $? == 0 ]; then + newline + sane-find-scanner # to verify scanner has been found + scanimage -L # List scanners + xsane #scanner application else - echo "" - echo "====================================" - echo -e "Following \033[1m Scanner commands \033[0m may be of help" - echo "sane-find-scanner # to verify scanner has been found" - echo "xsane # scanner application" - echo "====================================" - fi - else - failed - fi - ;; - webcam) - load_modules - udev - - if [ -n "`ls /dev/video0`" ] ; then - # fix permissions - chmod 666 /dev/video0 - # ls -l /dev/video0 - - if [ -d /var/lib/tazpkg/installed/mplayer-svn ]; then - echo "" - echo -n "Would you like to test webcam (y/N) ? "; read anser - echo "" - if [ "$anser" == "y" ]; then - mplayer tv:// -tv driver=v4l2:width=320:height=240:device=/dev/video0 -vo x11 & - fi - else - echo "" - echo -n "Would you like to test webcam by installing mplayer-svn (y/N) ? "; read anser - echo "" - if [ "$anser" == "y" ]; then - install mplayer-svn - mplayer tv:// -tv driver=v4l2:width=320:height=240:device=/dev/video0 -vo x11 & - else - echo "" - echo "============================" - echo "Webcam is set up; please use mplayer-svn/fswebcam/amsn/skype to view" - echo "============================" - fi + newline; separator + emsg "$(_ 'Following scanner commands may be of help:')" + echo ' sane-find-scanner # ' $(_n 'to verify scanner has been found') + echo ' xsane # ' $(_n 'scanner application') + separator fi else failed fi ;; + + webcam) + load_modules + udev + + if [ -n "$(ls /dev/video0)" ] ; then + # fix permissions + chmod 666 /dev/video0 + # ls -l /dev/video0 + + if [ -d $INSTALLED/mplayer-svn ]; then + newline + _n 'Would you like to test webcam'; confirm + if [ $? == 0 ]; then + newline + mplayer tv:// -tv driver=v4l2:width=320:height=240:device=/dev/video0 -vo x11 & + fi + else + newline + _n 'Would you like to test webcam by installing mplayer-svn'; confirm + if [ $? == 0 ]; then + newline + install mplayer-svn + mplayer tv:// -tv driver=v4l2:width=320:height=240:device=/dev/video0 -vo x11 & + else + newline; separator + _ "Webcam is set up; please use mplayer-svn/fswebcam/amsn/skype to view" + separator + fi + fi + else + failed + fi + ;; + camera) udev find_usb_device fix_usb_permissions "camera" if [ "$DETECTED" == "yes" ]; then - echo "" - echo -n "Do you want to check if gphoto2 can talk to your camera (y/N) ? "; read anser - echo "" - if [ "$anser" == "y" ]; then + newline + _n 'Do you want to check if gphoto2 can talk to your camera'; confirm + if [ $? == 0 ]; then + newline # Show if the camera is detected gphoto2 --auto-detect - echo -e "Do you want to test importing photos (y/N) ? "; read choice - if [ "$choice" == "y" ]; then + _n 'Do you want to test importing photos'; confirm + if [ $? == 0 ]; then mkdir -p ~/Images/Photos cd ~/Images/Photos gphoto2 --get-all-files - pcmanfm ~/Images/Photos + file-manager ~/Images/Photos fi - echo "" + newline else - echo "" - echo "====================================" - echo "Camera is set up; please use gphoto2 to import photos" - echo "Quick start guide: http://www.gphoto.org/doc/manual/using-gphoto2.html" - echo "====================================" + newline; separator + _ 'Camera is set up; please use gphoto2 to import photos' + guide_url='http://www.gphoto.org/doc/manual/using-gphoto2.html' + _ 'Quick start guide: $guide_url' + separator; newline fi else failed - fi - ;; + fi + ;; bluetooth) load_modules udev - echo -n "Do you want to see if the bluetooth is working (y/N) ? "; read anser - echo "" - if [ "$anser" == "y" ]; then + _n 'Do you want to see if the bluetooth is working'; confirm + if [ $? == 0 ]; then + newline # sanity check: btusb is not loaded automagically for unknown reasons if ! lsmod | grep -q btusb ; then modprobe btusb fi - echo "========================================" - echo -e "\033[1m Bluetooth \033[0m interfaces" - echo "" + separator + emsg "$(_n 'Bluetooth interfaces')" + newline lsusb | grep Bluetooth # udev should run bluetoothd automatically bluetoothd sleep 1 if hcitool dev | grep -q hci ; then - echo "========================================" - echo -e "Following \033[1m Bluetooth commands \033[0m may be of help " - echo "" - #echo " modprobe btusb" - #echo " /usr/sbin/bluetoothd -nd #for starting bluetooth daemon" - echo " hciconfig -a" - echo " \"hcitool dev\" : checking local bluetooth devices..." - echo " \"hcitool scan\" : scanning remote bluetooth devices..." - echo " \"bluez-simple-agent\" : pairing with remote bluetooth devices..." - echo -e " You can manually edit the configuration files in \033[1m /etc/bluetooth \033[0m if need be" - echo "========================================" + newline; separator + emsg "$(_n 'Following Bluetooth commands may be of help')" + newline + optlist "\ +modprobe btusb +hciconfig -a +hcitool dev $(_n 'checking local bluetooth devices...') +hcitool scan $(_n 'scanning remote bluetooth devices...') +bluez-simple-agent $(_n 'pairing with remote bluetooth devices...')" + newline + bt=$(emsg '/etc/bluetooth') + longline $(_ "You can manually edit the configuration \ +files in \$bt if need be") + separator; newline fi else - echo "" - echo "========================================" - echo -e "Following \033[1m Bluetooth commands \033[0m may be of help" - echo "" - echo " modprobe btusb" - echo " lsusb | grep Bluetooth" - echo " /usr/sbin/bluetoothd -nd # for starting bluetooth daemon" - echo " hciconfig -a" # Show if the bluetooth is detected - echo " hcitool dev # for checking local devices" - echo " hcitool scan # for scanning remote devices" - echo " bluez-simple-agent # pairing with remote bluetooth devices" - echo "" - echo -e "You can manually edit the configuration files in \033[1m /etc/bluetooth \033[0m if need be" - echo "" - echo "========================================" - fi - ;; + newline; separator + emsg "$(_n 'Following Bluetooth commands may be of help')" + newline + cat << EOT + modprobe btusb + lsusb | grep Bluetooth +EOT + optlist "\ +/usr/sbin/bluetoothd -nd $(_n 'for starting bluetooth daemon') +hciconfig -a +hcitool dev $(_n 'for checking local devices') +hcitool scan $(_n 'for scanning remote devices') +bluez-simple-agent $(_n 'pairing with remote bluetooth devices')" + newline + bt=$(emsg '/etc/bluetooth') + longline $(_ "You can manually edit the configuration files \ +in \$bt if need be") + newline; separator + fi + ;; + 3g-modem) - untested - load_modules - udev - echo "" - echo "====================================" - echo "List detected devices" - # ls /dev/ttyUSB* /dev/ttyACM* /dev/modem + untested + load_modules + udev + newline; separator + _ 'List detected devices' + # ls /dev/ttyUSB* /dev/ttyACM* /dev/modem - if [ -n "`ls /dev/ttyUSB*`" -o -n "`ls /dev/ttyACM*`" ] ; then - echo "Detected Modem at:" - echo "`ls /dev/ttyUSB*`" - echo -n "Do you want to configure wvdial (y/N) ? "; read anser - echo "" - if [ "$anser" == "y" ]; then - wvdialbox - else - echo "====================================" - echo "wvdialconf" - echo -e "Edit \033[1m /etc/wvdial.conf \033[0m for phone number, login name, password and pin" - echo "wvdial dialername" - #nameserver `tail -30 /var/log/messages| grep DNS| sed 's/*\([.0-9]*\)$/\1/'` >/etc/resolv.conf - echo -e "Add DNS adress of your provider in : \033[1m /etc/resolv.conf \033[0m " - echo "====================================" - fi - else - failed - fi - ;; - firewall) echo "Setting IPTABLES_RULES to yes in /etc/slitaz/firewall.conf" - sed -i 's/^IPTABLES_RULES="no"/IPTABLES_RULES="yes"/' /etc/slitaz/firewall.conf - # default is "start" - if [ "$STOP" == "yes" ] ; then - /etc/init.d/firewall stop - else - /etc/init.d/firewall start - if [ -d /var/lib/tazpkg/installed/nmap ]; then - echo "====================================" - echo "Probing for open ports..." - nmap localhost - echo "====================================" - fi - echo "Adding firewall daemon to start automatically at boot" - run_daemon_startup "firewall" - echo "====================================" - fi + if [ -n "$(ls /dev/ttyUSB*)" -o -n "$(ls /dev/ttyACM*)" ] ; then + _ 'Detected Modem at:' + ls /dev/ttyUSB* /dev/ttyACM* 2> /dev/null + _n 'Do you want to configure wvdial'; confirm + if [ $? == 0 ]; then + wvdialbox + else + #nameserver `tail -30 /var/log/messages| grep DNS| sed 's/*\([.0-9]*\)$/\1/'` >/etc/resolv.conf + newline; separator + wc=$(boldify '/etc/wvdial.conf') + rc=$(boldify '/etc/resolv.conf') + optlist "\ +wvdialconf $(_ 'Edit $wc for phone number, login name, password and pin') +wvdial $(_ 'Add DNS adress of your provider in $rc')" + separator + fi + else + failed + fi + ;; - ;; + firewall) + _ 'Setting IPTABLES_RULES to yes in /etc/slitaz/firewall.conf' + sed -i 's/^IPTABLES_RULES="no"/IPTABLES_RULES="yes"/' /etc/slitaz/firewall.conf + # default is "start" + if [ "$STOP" == "yes" ] ; then + /etc/init.d/firewall stop + else + /etc/init.d/firewall start + if [ -d $INSTALLED/nmap ]; then + separator + _ "Probing for open ports..." + nmap localhost + separator + fi + _ "Adding firewall daemon to start automatically at boot" + run_daemon_startup "firewall" + separator + fi + ;; + nvidia) + xorg55=/etc/X11/xorg.conf.d/55-DeviceTweaks.conf + xorg60=/etc/X11/xorg.conf.d/60-Device.conf + xorg55short=55-DeviceTweaks.conf if [ "$NON_FREE" == "yes" ] ; then - if [ -d /var/lib/tazpkg/installed/xorg-xf86-video-nv ]; then - rm /etc/X11/xorg.conf.d/55-DeviceTweaks.conf + if [ -d $INSTALLED/xorg-xf86-video-nv ]; then + rm $xorg55 tazpkg remove xorg-xf86-video-nv fi load_modules #xorg - echo -n "Do you want to configure X using non-free nvidia driver (y/N) ? "; read anser - echo "" - if [ "$anser" == "y" ]; then - echo "Your previous config is in /etc/X11/xorg.conf.d/60-Device.conf" - echo "If nvidia fails, you can remove /etc/X11/xorg.conf.d/55-DeviceTweaks.conf to restore previous config." + _n 'Do you want to configure X using non-free nvidia driver'; confirm + if [ $? == 0 ]; then + newline + _ 'Your previous config is in $xorg60' + _ 'If nvidia fails, you can remove $xorg55 to restore previous config.' Xorg -configure :1 > /dev/null nvidia-xconfig -c /root/xorg.conf.new -o /tmp/xorg.conf.nvidia - sed -e '/Section "Device"/,/EndSection/!d' -e "s/EndSection/EndSection\n/" /tmp/xorg.conf.nvidia > /etc/X11/xorg.conf.d/55-DeviceTweaks.conf + sed -e '/Section "Device"/,/EndSection/!d' -e "s/EndSection/EndSection\n/" /tmp/xorg.conf.nvidia > $xorg55 rm /tmp/xorg.conf.nvidia /root/xorg.conf.new - if ! grep -q "NoLogo" /etc/X11/xorg.conf.d/55-DeviceTweaks.conf ; then - echo "Adding to xorg.conf: Option \"NoLogo\" \"True\"" - sed -i 's/BoardName\(.*\)/Boardname \1 \n Option "NoLogo" "True" /' /etc/X11/xorg.conf.d/55-DeviceTweaks.conf + if ! grep -q "NoLogo" $xorg55 ; then + _n 'Adding to xorg.conf:'; echo ' Option "NoLogo" "True"' + sed -i 's/BoardName\(.*\)/Boardname \1 \n Option "NoLogo" "True" /' $xorg55 fi # mesa-demos to check if acceleration is working - echo "Checking if nvidia is working ..." - glxinfo |grep rendering + _ 'Checking if nvidia is working...' + glxinfo | grep rendering - echo "================================" - echo -e "\033[1m Configure nvidia settings :\033[0m " + newline; separator + boldify "$(_n 'Configure nvidia settings:')" nvidia-settings - echo "================================" + separator; newline else - echo "" - echo "================================" - echo "Use 'Xorg -configure :1 && nvidia-xconfig -c /root/xorg.conf.new -o /tmp/xorg.conf.nvidia' to generate a template configuration file." - echo "glxinfo |grep rendering # test nvidia" - echo "Use: nvidia-settings utility to configure your settings if necessary" - echo "Option \"NoLogo\" \"True\"" - echo "================================" + newline; separator + xcmd='Xorg -configure :1 && nvidia-xconfig -c /root/xorg.conf.new -o /tmp/xorg.conf.nvidia' + _ "Use '$xcmd' to generate a template configuration file." + echo 'glxinfo | grep rendering #' $(_n 'test nvidia') + _ 'Use: nvidia-settings utility to configure your settings if necessary' + echo 'Option "NoLogo" "True"' + separator; newline fi else - if [ -d /var/lib/tazpkg/installed/nvidia ]; then - rm /etc/X11/xorg.conf.d/55-DeviceTweaks.conf + if [ -d $INSTALLED/nvidia ]; then + rm $xorg55 tazpkg remove nvidia fi load_modules #xorg - echo -n "Do you want to configure X using free nvidia driver (y/N) ? "; read anser - echo "" - if [ "$anser" == "y" ]; then - echo "" - echo "================================" - echo "Your previous config is in /etc/X11/xorg.conf.d/60-Device.conf" - echo "If nvidia fails, you can remove /etc/X11/xorg.conf.d/55-DeviceTweaks.conf to restore previous config." - echo "" - echo "Create 55-DeviceTweaks.conf configured with nv driver." + _n 'Do you want to configure X using free nvidia driver'; confirm + if [ $? == 0 ]; then + newline; separator + _ 'Your previous config is in $xorg60' + _ 'If nvidia fails, you can remove $xorg55 to restore previous config.' + newline + _ 'Create $xorg55short configured with nv driver.' # free nvidia driver is called nv - cp -a /etc/X11/xorg.conf.d/60-Device.conf /etc/X11/xorg.conf.d/55-DeviceTweaks.conf - sed -i 's/vesa/nv/' /etc/X11/xorg.conf.d/55-DeviceTweaks.conf + cp -a $xorg60 $xorg55 + sed -i 's/vesa/nv/' $xorg55 # mesa-demos to check if acceleration is working - echo "Checking if nvidia is working ..." - glxinfo |grep rendering - echo "================================" + _ 'Checking if nvidia is working...' + glxinfo | grep rendering + separator fi fi ;; - ati) untested + + ati) + xorg55=/etc/X11/xorg.conf.d/55-DeviceTweaks.conf + xorg60=/etc/X11/xorg.conf.d/60-Device.conf + xorg55short=55-DeviceTweaks.conf + untested if [ "$NON_FREE" == "yes" ] ; then - if [ -d /var/lib/tazpkg/installed/xorg-xf86-video-ati ]; then - rm /etc/X11/xorg.conf.d/55-DeviceTweaks.conf + if [ -d $INSTALLED/xorg-xf86-video-ati ]; then + rm $xorg55 tazpkg remove xorg-xf86-video-ati fi load_modules #xorg - echo -n "Do you want to configure X using non-free catalyst ati(radeon) driver (y/N) ? "; read anser - echo "" - if [ "$anser" == "y" ]; then - echo "Your previous config is in /etc/X11/xorg.conf.d/60-Device.conf" - echo "If ati fails, you can remove /etc/X11/xorg.conf.d/55-DeviceTweaks.conf to restore previous config." + _n 'Do you want to configure X using non-free catalyst ATI (radeon) driver'; confirm + if [ $? == 0 ]; then + newline + _ 'Your previous config is in $xorg60' + _ 'If ati fails, you can remove $xorg55 to restore previous config.' # add fglrx driver to xorg.conf Xorg -configure :1 > /dev/null aticonfig --initial --input=/root/xorg.conf.new --output=/tmp/xorg.conf.ati - sed -e '/Section "Device"/,/EndSection/!d' -e "s/EndSection/EndSection\n/" /tmp/xorg.conf.ati > /etc/X11/xorg.conf.d/55-DeviceTweaks.conf + sed -e '/Section "Device"/,/EndSection/!d' -e "s/EndSection/EndSection\n/" /tmp/xorg.conf.ati > $xorg55 rm /tmp/xorg.conf.ati /root/xorg.conf.new # mesa-demos to check if acceleration is working - echo "Checking if ati catalyst is working ..." - glxinfo |grep rendering + _ 'Checking if ati catalyst is working...' + glxinfo | grep rendering else - echo "" - echo "================================" - echo -e "\033[1m Configuration :\033[0m " - echo "Use: aticonfig utility to generate a template configuration file if necessary" - echo "Xorg -configure :1 && aticonfig --initial --input=/root/xorg.conf.new --output=/tmp/xorg.conf.ati" - echo "restart xorg" - echo "glxinfo |grep rendering" - echo "================================" + newline; separator + boldify "$(_n 'Configuration:')" + _ 'Use: aticonfig utility to generate a template configuration file if necessary' + cat << EOT +Xorg -configure :1 && aticonfig --initial --input=/root/xorg.conf.new --output=/tmp/xorg.conf.ati +restart xorg +glxinfo | grep rendering +EOT + separator; newline fi else - if [ -d /var/lib/tazpkg/installed/catalyst ]; then - rm /etc/X11/xorg.conf.d/55-DeviceTweaks.conf + if [ -d $INSTALLED/catalyst ]; then + rm $xorg55 tazpkg remove catalyst fi load_modules #xorg - echo -n "Do you want to configure X using free ati (radeon) driver (y/N) ? "; read anser - echo "" - if [ "$anser" == "y" ]; then - echo "" - echo "================================" - echo "Your previous config is in /etc/X11/xorg.conf.d/60-Device.conf" - echo "If ati fails, you can remove /etc/X11/xorg.conf.d/55-DeviceTweaks.conf to restore previous config." - echo "" - echo "Create 55-DeviceTweaks.conf configured with radeon driver." + _n 'Do you want to configure X using free ATI (radeon) driver'; confirm + if [ $? == 0 ]; then + newline; separator + _ 'Your previous config is in $xorg60' + _ 'If ATI fails, you can remove $xorg55 to restore previous config.' + newline + _ 'Create $xorg55short configured with radeon driver.' # free ati driver is called radeon cp -a /etc/X11/xorg.conf.d/60-Device.conf /etc/X11/xorg.conf.d/55-DeviceTweaks.conf sed -i 's/vesa/nv/' /etc/X11/xorg.conf.d/55-DeviceTweaks.conf # mesa-demos to check if acceleration is working - echo "Checking if ati radeon is working ..." + _ 'Checking if ATI radeon is working...' glxinfo |grep rendering - echo "================================" + separator fi fi ;; @@ -816,46 +731,52 @@ # What to do. case "$1" in - help|usage ) usage ;; - wvdial) wvdialbox ;; - xorg) xorg;; + -h|--help|help|usage) usage ;; + wvdial) wvdialbox ;; + xorg) xorg ;; - *) check_root - echo "COMMAND OPTIONS: $@" - for i in "$@"; do - if [ "$i" == "--non-free" ] ; then NON_FREE="yes"; fi - if [ "$i" == "--suggested" ] ; then AUTO_INSTALL_SUGGESTED="yes"; fi - if [ "$i" == "--confirm" ] ; then CONFIRM_SUGGESTED="yes"; fi - if [ "$i" == "stop" ] ; then STOP="yes"; fi - done + dial) + _ 'Bringing eth0 down...'; ifconfig eth0 down; ifconfig eth1 down + _ 'Dialing...'; wvdial $2 + sleep 5 ;; - device - #untested - if [ ! "$NON_FREE_DEPENDS" == "" -a "$NON_FREE" == "yes" ]; then - DEPENDS="$NON_FREE_DEPENDS" - fi + *) + check_root $@ + echo "COMMAND OPTIONS: $@" + NON_FREE="$nonfree" + AUTO_INSTALL_SUGGESTED="$suggested" + CONFIRM_SUGGESTED="$confirm" + for i in "$@"; do +# if [ "$i" == "--non-free" ] ; then NON_FREE="yes"; fi +# if [ "$i" == "--suggested" ] ; then AUTO_INSTALL_SUGGESTED="yes"; fi +# if [ "$i" == "--confirm" ] ; then CONFIRM_SUGGESTED="yes"; fi + if [ "$i" == "stop" ] ; then STOP="yes"; fi + done - if [ "$AUTO_INSTALL_SUGGESTED" == "yes" ]; then - anser="all" - elif [ "$CONFIRM_SUGGESTED" == "yes" ]; then - echo "" - echo "====================================" - echo "The following optional packages can be installed:" - echo "" - echo "$SUGGESTED" - echo "====================================" - echo -n "Do you want to install all/few/no optional dependencies (all|few|N) ? "; read anser - fi + device + #untested + if [ ! "$NON_FREE_DEPENDS" == "" -a "$NON_FREE" == "yes" ]; then + DEPENDS="$NON_FREE_DEPENDS" + fi - install "$DEPENDS" - case $anser in - [aA]*|[yY]|1) install "$SUGGESTED" ;; - [fF]*|2) confirm_install "$SUGGESTED" ;; - *) ;; - esac + if [ "$AUTO_INSTALL_SUGGESTED" == "yes" ]; then + anser="all" + elif [ "$CONFIRM_SUGGESTED" == "yes" ]; then + newline; separator + _ 'The following optional packages can be installed:' + newline + echo $SUGGESTED + separator; newline + _n 'Do you want to install all/few/no optional dependencies (all|few|N)? '; read anser + fi - add_all_user_to_group - setup ;; + install "$DEPENDS" + case $anser in + [aA]*|[yY]|1) install "$SUGGESTED" ;; + [fF]*|2) confirm_install "$SUGGESTED" ;; + *) ;; + esac + + add_all_user_to_group + setup ;; esac - - diff -r de13422f3a69 -r e232f0e1413a tinyutils/tazhw --- a/tinyutils/tazhw Thu Jul 25 03:24:36 2013 +0300 +++ b/tinyutils/tazhw Mon Sep 09 03:27:04 2013 +0300 @@ -3,81 +3,85 @@ # SliTaz Hardware configuration tool. Auto-detect and configure in a # simple way all PCI, PCMCIA and USB devices. Some Wireless Adapters # need non-free firmware not installed by default. Users must use the -# option --get-firmware to force installation. GUI uses GTKdialog, and is +# option --get-firmware to force installation. GUI uses Yad, and is # called by args such as all box functions. # -# (c) 2009 SliTaz GNU/Linux - GNU gpl v3 +# (c) 2009-2013 SliTaz GNU/Linux - GNU GPL v3 # -# Authors : Christophe Lincoln -# Rohit Joshi +# Authors: Christophe Lincoln +# Rohit Joshi # +. /lib/libtaz.sh +export TEXTDOMAIN='slitaz-boxes' #i18n -usage() -{ - echo -e "\nSliTaz Hardware configuration\n -\033[1mUsage: \033[0m `basename $0` [command] [--option] -\033[1mCommands: \033[0m\n - usage Print this short usage. - box Start in graphical mode. - init Used at boot time to configure devices. - setup Setup hardware devices. - detect-pci Detect all PCI devices. - detect-usb Detect all USB devices. - detected-modules List all detected Kernel modules. - -\033[1mOptions: \033[0m\n - --get-firmware Get and install non-free firmware (PCI and USB).\n" +usage() { + cat << EOT + +$(_n 'SliTaz Hardware configuration') + +$(boldify "$(_n 'Usage:')") $(basename $0) [$(_n 'command')] [--$(_n 'option')] + +$(boldify "$(_n 'Commands:')") + usage $(_n 'Print this short usage.') + box $(_n 'Start in graphical mode.') + init $(_n 'Used at boot time to configure devices.') + setup $(_n 'Setup hardware devices.') + detect-pci $(_n 'Detect all PCI devices.') + detect-usb $(_n 'Detect all USB devices.') + detected-modules $(_n 'List all detected Kernel modules.') + +$(boldify "$(_n 'Options:')") + --get-firmware $(_n 'Get and install non-free firmware (PCI and USB).') + +EOT } # Check if user is root to install, or remove packages. -check_root() -{ +check_root() { if test $(id -u) != 0 ; then echo -e "\nYou must be root to run `basename $0` with this option." echo -e "Please use 'su' and root password to become super-user.\n" exit 0 fi } -box_check_root() -{ + +box_check_root() { if test $(id -u) != 0 ; then exec subox tazhw box exit 0 fi } -check_firmware() -{ +check_firmware() { if [ -x /usr/bin/get-$mod-firmware ]; then if [ ! -d /var/lib/tazpkg/installed/$mod-firmware ]; then # We need an active connection to install firmware and we # only install firmware if specified from cmdline. if ifconfig | grep -q "inet addr"; then - # Ensure module is not loaded and get files. + # Ensure module is not loaded and get files. if [ "$firmware" == "get" ]; then rmmod $mod 2>/dev/null get-$mod-firmware else - echo "* Use --get-firmware option to install missing files." + _ '* Use --get-firmware option to install missing files.' fi else - echo "* No active connection to get and install firmware." + _ '* No active connection to get and install firmware.' fi else - echo "> Firmware in use: $mod-firmware" + _ '> Firmware in use: $mod-firmware' fi fi } -load_module() -{ +load_module() { if ! lsmod | grep -q "^$mod"; then # lsmod and some modules use underscore, others use dash. # The real modprobe can handle both but not busybox version modprobe $mod 2>/dev/null && \ - echo "* Loaded module: $mod" || \ - echo "! Missing module: $mod" + _ '* Loaded module: $mod' || \ + _ '! Missing module: $mod' # Add it to load automatically at next boot. if ! echo "$LOAD_MODULES" | grep -q "$mod"; then @@ -87,26 +91,24 @@ . /etc/rcS.conf else - echo "> Module in use: $mod" + _ '> Module in use: $mod' fi } # Detect PCI devices and load kernel module only at first boot, # in LiveCD mode or with the command 'detect-pci'. -detect_pci_devices() -{ +detect_pci_devices() { if [ ! -s /var/lib/detected-modules ]; then . /etc/rcS.conf # We need module_name to match output of lsmod. - list=`lspci -k | grep "modules" | cut -d ":" -f 2 | sed s/-/_/g` + list=$(lspci -k | grep "modules" | cut -d ":" -f 2 | sed s/-/_/g) echo "$list" > /var/lib/detected-modules - for mod in $list - do + for mod in $list; do check_firmware load_module done # yenta_socket = laptop - if `lsmod | grep -q "yenta_socket"`; then + if $(lsmod | grep -q "yenta_socket"); then grep -qs batt /etc/lxpanel/default/panels/panel || sed -i 's/= cpu/= batt\n}\n\nPlugin {\n type = cpu/' \ /etc/lxpanel/default/panels/panel 2> /dev/null @@ -115,18 +117,17 @@ } # Detect all USB devices. -detect_usb_devices() -{ +detect_usb_devices() { if [ -f /proc/bus/usb/devices -a ! -s /var/lib/detected-usb-modules ]; then rm -f /var/lib/detected-usb-modules cat /proc/bus/usb/devices | grep "Vendor" | while read line ; do - ID=`echo "$line" | awk '{ print $2,$3 }' | sed 's/ / /' | \ - sed 's/Vendor=/0x/' | sed 's/ProdID=/0x/'` - if grep -q "$ID" /lib/modules/`uname -r`/modules.usbmap; then - mod=`grep "$ID" /lib/modules/$(uname -r)/modules.usbmap | \ - awk '{ print $1 }'` - prod=`grep -A 2 "$line" /proc/bus/usb/devices | grep Product | \ - cut -d "=" -f 2` + ID=$(echo "$line" | awk '{ print $2,$3 }' | sed 's/ / /' | \ + sed 's/Vendor=/0x/' | sed 's/ProdID=/0x/') + if grep -q "$ID" /lib/modules/$(uname -r)/modules.usbmap; then + mod=$(grep "$ID" /lib/modules/$(uname -r)/modules.usbmap | \ + awk '{ print $1 }') + prod=$(grep -A 2 "$line" /proc/bus/usb/devices | grep Product | \ + cut -d"=" -f2) echo "$prod" check_firmware load_module @@ -136,25 +137,17 @@ fi } -display_line() -{ - echo "================================================================================" -} - # Box functions and dialog -box_list() -{ - for mod in `cat /var/lib/detected-modules /var/lib/detected-usb-modules 2>/dev/null` - do - desc=`modinfo $mod | grep ^description | cut -d ":" -f 2` +box_list() { + for mod in $(cat /var/lib/detected-modules /var/lib/detected-usb-modules 2>/dev/null); do + desc=$(modinfo $mod | grep ^description | cut -d":" -f2) [ -z "$desc" ] && desc="N/A" echo "$mod | $desc" done } -box_detect_devices() -{ +box_detect_devices() { if [ $INSTALL_FIRMARE != true ]; then xterm -T "Detect devices" \ -geometry 80x24 \ @@ -171,38 +164,35 @@ fi } -box_setup_devices() -{ +box_setup_devices() { SETUP_OPTIONS="" if [ $INSTALL_NON_FREE == true ]; then - SETUP_OPTIONS="$SETUP_OPTIONS --non-free" + SETUP_OPTIONS="$SETUP_OPTIONS --non-free" fi if [ $AUTO_INSTALL_SUGGESTED == true ]; then - SETUP_OPTIONS="$SETUP_OPTIONS --suggested" + SETUP_OPTIONS="$SETUP_OPTIONS --suggested" elif [ $CONFIRM_INSTALL_SUGGESTED == true ]; then - SETUP_OPTIONS="$SETUP_OPTIONS --confirm" - fi + SETUP_OPTIONS="$SETUP_OPTIONS --confirm" + fi xterm -geometry 80x24 -T "$DEVICE Setup" \ -e "$0 setup $DEVICE $SETUP_OPTIONS; \ echo -e \"----\nPress ENTER to close...\"; \ - read i; exit 0" + read i; exit 0" } -box() -{ +box() { export BIN=$0 export MAIN_DIALOG=' - - - + + + - 470180 + 470 + 180 MODULE $BIN box_list @@ -219,85 +209,79 @@ $BIN box_detect_devices refresh:MODULE - + - - - - - - - - - - - - - - - - - - - - INSTALL_NON_FREE - true - - - - AUTO_INSTALL_SUGGESTED - false - - - - - - - CONFIRM_INSTALL_SUGGESTED - false - - - + + + + + + + + + + + + + + + + INSTALL_NON_FREE + true + + + + AUTO_INSTALL_SUGGESTED + false + + + + + + CONFIRM_INSTALL_SUGGESTED + false + + - - + ' - - gtkdialog --center --program=MAIN_DIALOG >/dev/null + + gtkdialog --center --program=MAIN_DIALOG >/dev/null } # Get firmware used by check_firmware() if [ "$2" == "--get-firmware" ]; then firmware='get' fi - + # What to do. case "$1" in init) check_root - echo "Detecting PCI devices Kernel modules..." + _ 'Detecting PCI devices Kernel modules...' detect_pci_devices - echo "Detecting USB devices Kernel modules..." + _ 'Detecting USB devices Kernel modules...' detect_usb_devices ;; detect-pci) check_root - echo -e "\nDetected PCI devices Kernel modules" && display_line + newline; _ 'Detected PCI devices Kernel modules'; separator rm -f /var/lib/detected-modules detect_pci_devices - display_line && echo "" ;; + separator; newline ;; detect-usb) check_root - echo -e "\nDetected USB devices Kernel modules" && display_line + newline; _ 'Detected USB devices Kernel modules'; separator rm -f /var/lib/detected-usb-modules detect_usb_devices - display_line && echo "" ;; - setup) - SETUP_OPTIONS=`echo "$@" | sed 's/setup//' ` + separator; newline ;; + setup) + SETUP_OPTIONS=$(echo "$@" | sed 's/setup//') hwsetup $SETUP_OPTIONS ;; box*) box_check_root $1 ;; detected-modules) - echo -e "\nDetected PCI and USB modules" && display_line + newline; _ 'Detected PCI and USB modules'; separator cat /var/lib/detected-modules cat /var/lib/detected-usb-modules 2>/dev/null - display_line && echo "" ;; + separator; newline ;; *) usage ;; esac diff -r de13422f3a69 -r e232f0e1413a tinyutils/tazkeymap --- a/tinyutils/tazkeymap Thu Jul 25 03:24:36 2013 +0300 +++ b/tinyutils/tazkeymap Mon Sep 09 03:27:04 2013 +0300 @@ -3,23 +3,18 @@ # Tazkeymap - SliTaz GNU/Linux keymap config using loadkeys and dialog boxes. # Configuration file is: /etc/keymap.conf # -# Copyright (C) 2008-2012 SliTaz GNU/Linux - BSD License +# Copyright (C) 2008-2013 SliTaz GNU/Linux - BSD License # # Author: Christophe Lincoln # . /lib/libtaz.sh - -# Internationalization -. /usr/bin/gettext.sh -TEXTDOMAIN='slitaz-tools' -export TEXTDOMAIN +export TEXTDOMAIN='slitaz-tools' #i18n # List all keymaps. list_keymaps() { cd /usr/share/kbd/keymaps/i386 # We first need a list to sort and then use \n for Yad list. - for i in $(find *rty *rtz dvorak -name *.map.gz) - do + for i in $(find *rty *rtz dvorak -name *.map.gz); do keymap=$(basename $i) type=$(dirname $i) echo "${keymap%.map.gz} $type" @@ -44,8 +39,8 @@ case "$1" in info) - gettext "Config file :"; echo " /etc/keymap.conf" - gettext "Current keymap:"; echo " $(cat /etc/keymap.conf)" ;; + _n 'Config file:'; echo " /etc/keymap.conf" + _n 'Current keymap:'; echo " $(cat /etc/keymap.conf)" ;; list) list_keymaps | sort ;; "") @@ -54,7 +49,7 @@ check_root exec 3>&1 value=$($DIALOG --clear \ - --title " $(gettext "SliTaz keymap configuration") " \ + --title " $(_n 'SliTaz keymap configuration') " \ --menu "" 15 70 5 \ $(list_keymaps | sort) \ 2>&1 1>&3) @@ -66,9 +61,8 @@ esac # If it's a reconfiguration give an info message. if [ -s /etc/keymap.conf ]; then - msg=$(gettext "\ -Please logout of your current session and login again to use new keyboard.") - $DIALOG --clear --title " Information " --msgbox "$msg" 16 70 + $DIALOG --clear --title " $(_n 'Information') " \ + --msgbox "$(_n 'Please logout of your current session and login again to use new keyboard.')" 16 70 fi kmap=$value system_config diff -r de13422f3a69 -r e232f0e1413a tinyutils/tazlocale --- a/tinyutils/tazlocale Thu Jul 25 03:24:36 2013 +0300 +++ b/tinyutils/tazlocale Mon Sep 09 03:27:04 2013 +0300 @@ -3,103 +3,107 @@ # Tazlocale: SliTaz GNU/Linux locale setting using dialog boxes. # Configuration file is: /etc/locale.conf # -# Copyright (C) 2008-2012 SliTaz GNU/Linux - BSD License +# Copyright (C) 2008-2013 SliTaz GNU/Linux - BSD License # # Author: Christophe Lincoln # . /lib/libtaz.sh +export TEXTDOMAIN='slitaz-tools' #i18n -# Internationalization -. /usr/bin/gettext.sh -TEXTDOMAIN='slitaz-tools' -export TEXTDOMAIN +usage() { + newline + _ 'SliTaz GNU/Linux locale setting using dialog boxes.' + + newline; boldify "$(_ 'Usage:')" + echo " tazlocale [$(_ 'option')]" + + newline; boldify "$(_ 'Options:')" + optlist "\ +info $(_ 'Show info about config file and current locale.') +list $(_ 'Show list of available locales.')" + + newline + _ 'Any other option treated as locale - set locale (root).' + _ 'Display locale selecting dialog if no option given (root).' + newline +} + +# Make symlink to file, substitute "%%" to "ll_CC", "ll" or "en" according to +# current language settings and file existance +# (where "ll_CC" - full locale format (lang and country, and maybe, modifier). +make_i18n_link() { + if [ -d $(dirname ${1/.%%/}) ]; then + cd $(dirname ${1/.%%/}) + + if [ -e ${1/%%/$LANG} ]; then + ln -fs $(basename ${1/%%/$LANG}) ${1/.%%/} + else + if [ -e ${1/%%/$LANGUAGE} ]; then + ln -fs $(basename ${1/%%/$LANGUAGE}) ${1/.%%/} + else + ln -fs $(basename ${1/%%/en}) ${1/.%%/} + fi + fi + fi +} # Create symlink to translated files provided by SliTaz language pack, # doc and config files. -link_language_files() -{ +link_language_files() { . /etc/locale.conf LANGUAGE=${LANG%_*} - [ "$LANG" = "POSIX" ] && LANGUAGE="en" - # Openbox menu in /usr/share/doc/slitaz - if [ -f /etc/xdg/openbox/menu.$LANGUAGE.xml ]; then - cd /etc/xdg/openbox && rm -f menu.xml - ln -s menu.$LANGUAGE.xml menu.xml - fi - # Documentation in /usr/share/doc/slitaz - if [ -f /usr/share/doc/slitaz/index.$LANGUAGE.html ]; then - cd /usr/share/doc/slitaz && rm -f index.html - ln -s index.$LANGUAGE.html index.html - fi + [ "$LANG" == "POSIX" ] && LANGUAGE="en" + # Openbox menu + make_i18n_link /etc/xdg/openbox/menu.%%.xml + # Documentation + make_i18n_link /usr/share/doc/slitaz/index.%%.html # SliTaz Software Manuals - for soft in tazpkg tazlito tazusb tazwok tazweb cookutils - do - if [ -f /usr/share/doc/$soft/$soft.$LANGUAGE.html ]; then - cd /usr/share/doc/$soft && rm -f $soft.html - ln -s $soft.$LANGUAGE.html $soft.html - fi + for soft in tazpkg tazlito tazusb tazwok tazweb cookutils; do + make_i18n_link /usr/share/doc/$soft/$soft.%%.html done # SliTaz TazWeb "My Web Home" - if [ -f /usr/share/tazweb/home.$LANGUAGE.html ]; then - cd /usr/share/tazweb && rm -f home.html - ln -s home.$LANGUAGE.html home.html - fi + make_i18n_link /usr/share/tazweb/home.%%.html # SliTaz WebHome - if [ -f /usr/share/webhome/index.$LANGUAGE.html ]; then - cd /usr/share/webhome && rm -f index.html - ln -s index.$LANGUAGE.html index.html - fi - # TazPanel Doc under www - if [ -f /var/www/tazpanel/doc/tazpanel.$LANGUAGE.html ]; then - cd /var/www/tazpanel/doc && rm -f tazpanel.html - ln -s tazpanel.$LANGUAGE.html tazpanel.html - fi + make_i18n_link /usr/share/webhome/index.%%.html + # TazPanel Doc under www + make_i18n_link /var/www/tazpanel/doc/tazpanel.%%.html # SliTaz Tools Manuals - for soft in tazinst - do - if [ -f /usr/share/doc/slitaz/$soft.$LANGUAGE.html ]; then - cd /usr/share/doc/slitaz && rm -f $soft.html - ln -s $soft.$LANGUAGE.html $soft.html - fi + for soft in burnbox tazinst; do + make_i18n_link /usr/share/doc/slitaz-tools/$soft.%%.html done } # Locale name displayed. -get_locale_name() -{ - for i in $(ls -1 /usr/share/i18n/locales | grep ^[a-z][a-z]_[A-Z][A-Z]) - do +get_locale_name() { + for i in $(ls -1 /usr/share/i18n/locales | grep [a-z]_[A-Z]); do #desc=$(grep ^title /usr/share/i18n/locales/$i | cut -d '"' -f 2) echo "$i Locale" done } -# We have no locale files in /usr/lib/locale by default. Run localedef in -# background to have a faster boot. -gen_utf8_locale() -{ - localedef -i $locale -c -f UTF-8 /usr/lib/locale/$locale & +# We have no locale files in /usr/lib/locale by default. +# Run localedef in background to have a faster boot. +gen_utf8_locale() { + [ -e /usr/lib/locale/$locale ] || \ + localedef -i $locale -c -f UTF-8 /usr/lib/locale/$locale & } # Config /etc/locale.conf system_config() { export LC_ALL=$locale - gettext "Setting system locale to:"; echo -n " $locale" - echo "LANG=$locale" > /etc/locale.conf - echo "LC_ALL=$locale" >> /etc/locale.conf - # Resource libtaz.sh to get status message in the correct locale. - . /lib/libtaz.sh && status + _n "Setting system locale to: $locale" + echo -e "LANG=$locale\nLC_ALL=$locale" > /etc/locale.conf + status gen_utf8_locale link_language_files } # Dialog menu. -dialog_menu() -{ +dialog_menu() { exec 3>&1 locale=$($DIALOG --clear \ - --title " $(gettext "SliTaz language configuration") " \ - --menu "" 15 70 5 \ + --title " $(_n 'SliTaz language configuration') " \ + --menu "" 15 70 9 \ "en" "English" \ $(get_locale_name) \ 2>&1 1>&3) @@ -117,35 +121,39 @@ # If it's a reconfiguration give an info message. if [ -n "$RECONFIG" ]; then export LC_ALL=$locale - msg=$(gettext "\ + msg=$(_n "\ Please logout of your current session and login again to use new locale.") - $DIALOG --clear --title " Information " --msgbox "$msg" 16 70 + $DIALOG --clear --title " $(_n 'Information') " --msgbox "$msg" 16 70 fi system_config } case "$1" in + --help|-h) + usage ;; info) - gettext "Config file :"; echo " /etc/locale.conf" - gettext "Current locale:"; echo " $LANG" ;; + optlist "\ +$(_ 'Config file:') /etc/locale.conf +$(_ 'Current locale:') $LANG" + ;; list) - for i in $(ls -1 /usr/share/i18n/locales | grep ^[a-z][a-z]_[A-Z][A-Z]) - do - desc=$(grep ^title /usr/share/i18n/locales/$i | cut -d '"' -f 2) - echo "$i $desc" - done ;; + list= + for i in $(ls -1 /usr/share/i18n/locales | grep '[a-z]_[A-Z]'); do + desc=$(fgrep -m1 title /usr/share/i18n/locales/$i | cut -d'"' -f2) + list="$list +$i $desc" + done + optlist "$list" ;; "") # No args: display Ncurses dialog. : ${DIALOG=dialog} - check_root + check_root $@ dialog_menu ;; *) # Usage: tazlocale LANG_COUNTRY locale=$1 - check_root - system_config - gen_utf8_locale - link_language_files ;; + check_root $@ + system_config ;; esac exit 0 diff -r de13422f3a69 -r e232f0e1413a tinyutils/tazx --- a/tinyutils/tazx Thu Jul 25 03:24:36 2013 +0300 +++ b/tinyutils/tazx Mon Sep 09 03:27:04 2013 +0300 @@ -4,10 +4,14 @@ # This tinyutils is part of slitaz-tools. Tazx can configure Xorg with # several Window Managers. The GTK interface to configure X is in tazbox. # -# (c) 2011 SliTaz GNU/Linux - GNU gpl v3. +# (c) 2011-2013 SliTaz GNU/Linux - GNU GPL v3. # Authors: Christophe Lincoln # Pascal Bellard # +. /lib/libtaz.sh +. /etc/slitaz/slitaz.conf +export TEXTDOMAIN='slitaz-tools' #i18n + : ${DIALOG=dialog} # Default value. @@ -17,26 +21,19 @@ # created by /etc/init.d/bootopts.sh. USER=$(cat /etc/passwd | grep 1000 | cut -d ":" -f 1) -# Internationalization -. /usr/bin/gettext.sh -TEXTDOMAIN='slitaz-tools' -export TEXTDOMAIN - # # Functions # -# Be sure we're root. -check_root() { - if [ $(id -u) != 0 ]; then - gettext "You must be root to configure X server." - echo "" && exit 0 - fi +# Save chunk of xorg.conf into specified file +save_chunk() { + sed -e '/Section "'${1#*-}'"/,/EndSection/!d' \ + -e "s/EndSection/EndSection\n/" $xorg_template > \ + $xorg_config/$1.conf } # Populate xorg.conf.d. -xorg_conf_d() -{ +xorg_conf_d() { # Define the xorg.conf.d (can be /etc/X11/xorg.conf.d or /usr/share/X11/xorg.conf.d) xorg_config=/etc/X11/xorg.conf.d @@ -50,30 +47,19 @@ tar -cf $xorg_config/../Previous_xorg.conf.d.tar $xorg_config/ &> /dev/null # Put the different sections in separate files in the config directory. - sed -e '/Section "ServerLayout"/,/EndSection/!d' \ - -e "s/EndSection/EndSection\n/" $xorg_template | \ - grep -v Core > $xorg_config/10-ServerLayout.conf - sed -e '/Section "Files"/,/EndSection/!d' \ - -e "s/EndSection/EndSection\n/" $xorg_template > \ - $xorg_config/20-Files.conf - sed -e '/Section "Module"/,/EndSection/!d' \ - -e "s/EndSection/EndSection\n/" $xorg_template > \ - $xorg_config/30-Module.conf - sed -e '/Section "Monitor"/,/EndSection/!d' \ - -e "s/EndSection/EndSection\n/" $xorg_template > \ - $xorg_config/50-Monitor.conf - sed -e '/Section "Device"/,/EndSection/!d' \ - -e "s/EndSection/EndSection\n/" $xorg_template > \ - $xorg_config/60-Device.conf - sed -e '/Section "Screen"/,/EndSection/!d' \ - -e "s/EndSection/EndSection\n/" $xorg_template > \ - $xorg_config/70-Screen.conf + save_chunk 10-ServerLayout + sed -i '/Core/d' $xorg_config/10-ServerLayout.conf + save_chunk 20-Files + save_chunk 30-Module + save_chunk 50-Monitor + save_chunk 60-Device + save_chunk 70-Screen # Remove the template. rm $xorg_template # Configure the keyboard with the right keymap. - keymap=`cat /etc/keymap.conf` + keymap=$(cat /etc/keymap.conf) keyboard_config=$xorg_config/40-Keyboard.conf variant="" # this XkbOption moved from 40-evdev.conf (xorg-xf86-input-evdev) @@ -89,6 +75,10 @@ # Russian layout="us,ru" options="grp:ctrl_shift_toggle, grp_led:scroll, $options" ;; + ua) + # Ukrainian + layout="us,ua,ru" + options="grp:ctrl_shift_toggle, $options" ;; slovene) # Slovenian layout="si"; options="grp:alt_shift_toggle, $options" ;; @@ -111,7 +101,7 @@ Option "XkbOptions" "$options" EndSection EOC - [ "x$variant" != "x" ] && sed -i '/XkbVariant/d' $keyboard_config + [ x$variant == x ] && sed -i '/XkbVariant/d' $keyboard_config # Create a xorg.conf if needed. if [ ! -f /etc/X11/xorg.conf ]; then @@ -124,26 +114,26 @@ } # Install xorg server. -install_xorg() -{ +install_xorg() { [ -f "/var/lib/tazpkg/packages.list" ] || tazpkg recharge exec 3>&1 - value=`$DIALOG --clear --colors --title " $(gettext "Install Xorg") " \ - --menu "\ -$(gettext "Tazx helps you to select your X driver.")" 16 70 5 \ + value=$($DIALOG \ + --clear --colors \ + --title " $(_n 'Install Xorg') " \ + --menu "$(_n 'Tazx helps you to select your X driver.')" 16 70 8 \ $(fgrep xorg-xf86-video /var/lib/tazpkg/packages.list | cut -d- -f4 | \ - while read x; do echo $x; echo driver; done) \ - "quit" "Quitter" \ - 2>&1 1>&3` + while read x; do echo $x; _ 'driver'; done) \ + "quit" "$(_n 'Quit')" \ + 2>&1 1>&3) retval=$? exec 3>&- - + # Continue or exit. case $retval in 0) continue ;; 1|255) exit 0 ;; esac - + # Set selected value. case $value in quit) exit 0 ;; @@ -158,29 +148,28 @@ # Screen configuration dialog. TODO: menus items to enable/disable X on boot # and sed /etc/rcS.conf to remove slim from RUN_DAEMONS. -config_dialog() -{ +config_dialog() { exec 3>&1 - value=`$DIALOG \ + value=$($DIALOG \ --clear --colors \ - --title " Configure X " \ + --title " $(_n 'Configure X') " \ --menu "\ -$(gettext "Tazx dialog helps you to configure your Xorg server.")\n\ -$(gettext "Window Manager:") \Z2$WM\Zn \ -$(gettext "X server:") \Z2Xorg\Zn" 16 70 5 \ - "xorg" "$(gettext "Install or reconfigure Xorg")" \ - "xfbdev" "$(gettext "Install TinyX server Xfbdev")" \ - "quit" "$(gettext "Quit Tazx utility")" \ - 2>&1 1>&3` +$(_n 'Tazx dialog helps you to configure your Xorg server.')\n\n\ +$(_n 'Window Manager:') \Z2$WM\Zn \n\ +$(_n 'X server:') \Z2Xorg\Zn" 16 70 3 \ + "xorg" "$(_n 'Install or reconfigure Xorg')" \ + "xfbdev" "$(_n 'Install TinyX server Xfbdev')" \ + "quit" "$(_n 'Quit Tazx utility')" \ + 2>&1 1>&3) retval=$? exec 3>&- - + # Continue or exit. case $retval in 0) continue ;; 1|255) exit 0 ;; esac - + # Set selected value. case $value in xorg) @@ -193,13 +182,12 @@ } # Window manager specific configuration. -wm_config() -{ +wm_config() { case $WM in ob|openbox) WM=openbox-session # Check if a personal autostart script exists if OB is installed. - if [ -d "/var/lib/tazpkg/installed/openbox" ]; then + if [ -d "$INSTALLED/openbox" ]; then if [ ! -f "$HOME/.config/openbox/autostart.sh" ]; then mkdir -p $HOME/.config/openbox cp /etc/xdg/openbox/autostart.sh $HOME/.config/openbox @@ -218,7 +206,7 @@ jwm) WM=jwm JWM_CONFIG=$HOME/.jwmrc - if [ -d "/var/lib/tazpkg/installed/jwm" ]; then + if [ -d "$INSTALLED/jwm" ]; then if [ ! -f "$JWM_CONFIG" ]; then cp /etc/jwm/system.jwmrc $JWM_CONFIG fi @@ -229,13 +217,13 @@ cp /etc/jwm/system.jwmrc /home/$USER/.jwmrc chown $USER.users /home/$USER/.jwmrc fi - if [ ! -f "/root/.jwmrc" -a `id -u` = 0 ]; then + if [ ! -f "/root/.jwmrc" -a $(id -u) = 0 ]; then cp /etc/jwm/system.jwmrc /root/.jwmrc fi fi ;; pekwm) WM=pekwm - if [ -d "/var/lib/tazpkg/installed/pekwm" ]; then + if [ -d "$INSTALLED/pekwm" ]; then if [ -d "$HOME/.pekwm" ]; then cp -R /etc/pekwm $HOME/.pekwm fi @@ -264,9 +252,8 @@ } # Sample xinitrc for user (WM can be specified with F1 at slim login). -xinitrc_sample() -{ - cat > $FILE << "EOF" +xinitrc_sample() { + cat > $1 << "EOF" # ~/.xinitrc: Executed by slim login manager to startx X session. # You can use F1 with Slim to change your window manager or configure # it permanently with your personal applications.conf file. @@ -274,76 +261,63 @@ . $HOME/.config/slitaz/applications.conf case $1 in - e17|enlightenment*) - exec enlightenment_start ;; - openbox|openbox-session|ob) - exec openbox-session ;; - dwm|dwm-session) - exec dwm-session ;; - fluxbox|startfluxbox) - exec startfluxbox ;; - awesome) - exec awesome ;; - pekwm) - exec pekwm ;; - karmen|karmen-session) - exec karmen-session ;; - jwm) - lxpanel & - exec jwm ;; - xfce|xfce4|xfce4-session) - xfce4-session ;; - *) - exec $WINDOW_MANAGER ;; + e17|enlightenment*) exec enlightenment_start ;; + openbox|openbox-session|ob) exec openbox-session ;; + dwm|dwm-session) exec dwm-session ;; + fluxbox|startfluxbox) exec startfluxbox ;; + awesome) exec awesome ;; + pekwm) exec pekwm ;; + karmen|karmen-session) exec karmen-session ;; + jwm) lxpanel & exec jwm ;; + xfce|xfce4|xfce4-session) xfce4-session ;; + *) exec $WINDOW_MANAGER ;; esac EOF # Set default WM in applications.conf user file. Default WM can be # configured graphically with 'desktopbox tazapps' . $CONFIG - sed -i s/"WINDOW_MANAGER=.*"/"WINDOW_MANAGER=\"$WM\""/ \ - $CONFIG + sed -i 's|WINDOW_MANAGER=.*|WINDOW_MANAGER="'$WM'"|' $CONFIG } # ~/.xinitrc for X login from a DM. -creat_xinitrc() -{ - FILE=$HOME/.xinitrc +creat_xinitrc() { + local APCONF=/etc/slitaz/applications.conf + CONFIG=$HOME/.config/slitaz/applications.conf if [ ! -f $CONFIG ]; then - mkdir -p $HOME/.config/slitaz - cp /etc/slitaz/applications.conf $CONFIG + mkdir -p $(dirname $CONFIG); cp $APCONF $CONFIG fi - xinitrc_sample - # .xinitrc and config for /etc/skel so new added user will get + xinitrc_sample $HOME/.xinitrc + + # Make .xinitrc and config for /etc/skel so new added user will get # a working X session. if test $(id -u) = 0; then - FILE=/etc/skel/.xinitrc CONFIG=/etc/skel/.config/slitaz/applications.conf - mkdir -p /etc/skel/.config/slitaz - cp -f /etc/slitaz/applications.conf $CONFIG - xinitrc_sample + mkdir -p $(dirname $CONFIG); cp -f $APCONF $CONFIG + xinitrc_sample /etc/skel/.xinitrc fi + # In Live mode default user needs a xinitrc, since tazx # is executed only by root. CONFIG=/home/$USER/.config/slitaz/applications.conf if [ ! -f $CONFIG ]; then - mkdir -p /home/$USER/.config/slitaz - cp /etc/slitaz/applications.conf $CONFIG + mkdir -p $(dirname $CONFIG); cp $APCONF $CONFIG fi chown -R $USER.users /home/$USER/.config/slitaz - if [ ! -f /home/$USER/.xinitrc ]; then - FILE=/home/$USER/.xinitrc - xinitrc_sample + + FILE=/home/$USER/.xinitrc + if [ ! -f $FILE ]; then + xinitrc_sample $FILE chown $USER.users $FILE fi } # Create ~/.xsession to keep the configuration selected (used # only by startx, Slim login manager uses .xinitrc). -creat_xsession() -{ - [ -f $HOME/.xsession ] && cp -f $HOME/.xsession $HOME/.previous_xsession - cat > $HOME/.xsession << _EOF_ +creat_xsession() { + local xsession=$HOME/.xsession + [ -f $xsession ] && cp -f $xsession $HOME/.previous_xsession + cat > $xsession << _EOF_ # ~/.xsession: Start X window session manually on your system (startx). # Xorg & @@ -351,10 +325,10 @@ _EOF_ # LXpanel by default with JWM. if [ "$WM" = "jwm" ]; then - echo 'lxpanel &' >> $HOME/.xsession + echo 'lxpanel &' >> $xsession fi - echo "exec $WM" >> $HOME/.xsession - chmod 700 $HOME/.xsession + echo "exec $WM" >> $xsession + chmod 700 $xsession } @@ -362,7 +336,7 @@ case "$1" in install-xorg) - check_root + check_root $@ if [ -n "$2" ]; then WM=$2 fi @@ -372,7 +346,7 @@ creat_xinitrc creat_xsession ;; config-xorg) - check_root + check_root $@ if [ -n "$2" ]; then WM=$2 fi diff -r de13422f3a69 -r e232f0e1413a tinyutils/terminal --- a/tinyutils/terminal Thu Jul 25 03:24:36 2013 +0300 +++ b/tinyutils/terminal Mon Sep 09 03:27:04 2013 +0300 @@ -3,23 +3,22 @@ # . /etc/slitaz/applications.conf . /lib/libtaz.sh - -export TEXTDOMAIN='slitaz-tools' +export TEXTDOMAIN='slitaz-tools' #i18n help() { cat << EOT -$(boldify terminal): $(gettext 'configurable SliTaz wrapper for terminal.') +$(boldify terminal): $(_n 'configurable SliTaz wrapper for terminal.') -$(boldify $(gettext 'Recognized options:')) --v -version --version $(gettext 'Print the version number') - -help --help $(gettext 'Print out this message') - -geometry --geometry $(eval_gettext 'Width and height of terminal window ($GEOMETRY)') --t -title -T --title $(eval_gettext 'Title name for window ("$TITLE")') --h -hold $(gettext "Don't close terminal after command finished") --e --xterm-execute $(gettext 'Command to execute (must be last in line)') +$(boldify $(_n 'Recognized options:')) +-v -version --version $(_n 'Print the version number') + -help --help $(_n 'Print out this message') + -geometry --geometry $(_n 'Width and height of terminal window ($GEOMETRY)') +-t -title -T --title $(_n 'Title name for window ("$TITLE")') +-h -hold $(_n "Don't close terminal after command finished") +-e --xterm-execute $(_n 'Command to execute (must be last in line)') -$(boldify $(eval_gettext 'Help for $TERMINAL:')) +$(boldify $(_n 'Help for $TERMINAL:')) EOT $TERMINAL $OPT_HELP