Commit 71d7f8b9 authored by Tails developers's avatar Tails developers

Merge branch 'feature/dont_autostart_iceweasel' into stable

parents d026b885 a6af53cf
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
set -e set -e
apt-get --yes install xvfb apt-get --yes install xvfb
TOR_SOCKS_HOST='127.0.0.1' TOR_SOCKS_PORT='9151' xvfb-run iceweasel -CreateProfile default TOR_SOCKS_HOST='127.0.0.1' TOR_SOCKS_PORT='9151' xvfb-run /usr/bin/iceweasel -CreateProfile default
mv ~/.mozilla/firefox/*.default ~/.mozilla/firefox/default mv ~/.mozilla/firefox/*.default ~/.mozilla/firefox/default
sed -i "s@Path=.*\.default@Path=default@" ~/.mozilla/firefox/profiles.ini sed -i "s@Path=.*\.default@Path=default@" ~/.mozilla/firefox/profiles.ini
mv ~/.mozilla /etc/skel mv ~/.mozilla /etc/skel
......
...@@ -173,11 +173,6 @@ tor_cert_valid_after() { ...@@ -173,11 +173,6 @@ tor_cert_valid_after() {
${TOR_LOG} | tail -n 1 ${TOR_LOG} | tail -n 1
} }
tor_bootstrap_progress() {
grep -o "\[notice\] Bootstrapped [[:digit:]]\+%:" ${TOR_LOG} | \
tail -n1 | sed "s|\[notice\] Bootstrapped \([[:digit:]]\+\)%:|\1|"
}
tor_cert_lifetime_invalid() { tor_cert_lifetime_invalid() {
# To be sure that we only grep relevant information, we # To be sure that we only grep relevant information, we
# should delete the log when Tor is started, which we do # should delete the log when Tor is started, which we do
......
#! /bin/sh
# Run only when the interface is not "lo":
if [ $1 = "lo" ]; then
exit 0
fi
# Run whenever an interface gets "up", not otherwise:
if [ $2 != "up" ]; then
exit 0
fi
# There's nothing to do if Iceweasel is already running
if pgrep -u "${LIVE_USERNAME}" firefox-bin 1>/dev/null 2>&1; then
exit 0
fi
# Get LIVE_USERNAME
. /etc/live/config.d/username.conf
export DISPLAY=':0.0'
export XAUTHORITY="`echo /var/run/gdm3/auth-for-${LIVE_USERNAME}-*/database`"
export XDG_DATA_DIRS=/usr/share/gnome:/usr/share/gdm/:/usr/local/share/:/usr/share/
export MONKEYSPHERE_VALIDATION_AGENT_SOCKET='http://127.0.0.1:6136'
# Get GTK_IM_MODULE, QT_IM_MODULE and XMODIFIERS
if [ -e "/home/${LIVE_USERNAME}/.im_environment" ] ; then
. "/home/${LIVE_USERNAME}/.im_environment"
if [ -n "${XMODIFIERS}" ] ; then
export XMODIFIERS
fi
if [ -n "${GTK_IM_MODULE}" ] ; then
export GTK_IM_MODULE
fi
if [ -n "${QT_IM_MODULE}" ] ; then
export QT_IM_MODULE
fi
fi
exec /bin/su -c iceweasel "${LIVE_USERNAME}" &
#! /bin/sh
# Run only when the interface is not "lo":
if [ $1 = "lo" ]; then
exit 0
fi
# Run whenever an interface gets "up", not otherwise:
if [ $2 != "up" ]; then
exit 0
fi
# Get LANG
. /etc/default/locale
export LANG
# Initialize gettext support
. gettext.sh
TEXTDOMAIN="tails"
export TEXTDOMAIN
tor_has_bootstrapped() {
sudo -n -u debian-tor /usr/local/sbin/tor-has-bootstrapped
}
while ! tor_has_bootstrapped; do
sleep 1
done
/usr/local/sbin/tails-notify-user \
"`gettext \"Tor is ready\"`" \
"`gettext \"You can now access the Internet.\"`"
amnesia ALL = (debian-tor) NOPASSWD: /usr/local/sbin/tor-has-bootstrapped
#!/bin/sh
# Do not "set -u", else importing gettext.sh dies
# with "ZSH_VERSION: parameter not set".
set -e
. gettext.sh
TEXTDOMAIN="tails"
export TEXTDOMAIN
ask_for_confirmation() {
local dialog_title="`gettext \"Tor is not ready\"`"
local dialog_text="`gettext \"Tor is not ready. Start Tor Browser anyway?\"`"
local dialog_start="`gettext \"Start Tor Browser\"`"
local dialog_cancel="`gettext \"Cancel\"`"
# zenity can't set the default button to cancel, so we switch the
# labels and interpret the return value as its negation.
! zenity --question \
--title "$dialog_title" --text="$dialog_text" \
--cancel-label "$dialog_start" --ok-label "$dialog_cancel"
}
tor_has_bootstrapped() {
sudo -n -u debian-tor /usr/local/sbin/tor-has-bootstrapped
}
if tor_has_bootstrapped || ask_for_confirmation; then
exec /usr/bin/iceweasel "$@" &
fi
...@@ -29,6 +29,11 @@ tor_control_setconf() { ...@@ -29,6 +29,11 @@ tor_control_setconf() {
tor_control_send "SETCONF ${1}" >/dev/null tor_control_send "SETCONF ${1}" >/dev/null
} }
tor_bootstrap_progress() {
grep -o "\[notice\] Bootstrapped [[:digit:]]\+%:" ${TOR_LOG} | \
tail -n1 | sed "s|\[notice\] Bootstrapped \([[:digit:]]\+\)%:|\1|"
}
# Potential Tor bug: it seems like using this version makes Tor get # Potential Tor bug: it seems like using this version makes Tor get
# stuck at "Bootstrapped 5%" quite often. Is Tor sensitive to opening # stuck at "Bootstrapped 5%" quite often. Is Tor sensitive to opening
# control ports and/or issuing "getinfo status/bootstrap-phase" during # control ports and/or issuing "getinfo status/bootstrap-phase" during
......
#!/bin/sh
# This script is designed to be run as the debian-tor user.
# The desktop user is allowed to do so with passwordless sudo.
# Import tor_bootstrap_progress()
. /usr/local/lib/tails-shell-library/tor.sh
TOR_BOOTSTRAP_PROGRESS=$(tor_bootstrap_progress)
[ -n "$TOR_BOOTSTRAP_PROGRESS" ] && [ "$TOR_BOOTSTRAP_PROGRESS" -eq 100 ]
...@@ -207,7 +207,7 @@ run_browser_in_chroot () { ...@@ -207,7 +207,7 @@ run_browser_in_chroot () {
echo "* Starting Unsafe Browser" echo "* Starting Unsafe Browser"
sudo -u ${SUDO_USER} xhost +SI:localuser:${CLEARNET_USER} 2>/dev/null sudo -u ${SUDO_USER} xhost +SI:localuser:${CLEARNET_USER} 2>/dev/null
chroot ${CHROOT} sudo -u ${CLEARNET_USER} iceweasel -DISPLAY=:0.0 chroot ${CHROOT} sudo -u ${CLEARNET_USER} /usr/bin/iceweasel -DISPLAY=:0.0
sudo -u ${SUDO_USER} xhost -SI:localuser:${CLEARNET_USER} 2>/dev/null sudo -u ${SUDO_USER} xhost -SI:localuser:${CLEARNET_USER} 2>/dev/null
} }
......
# Files updated without intltool-update # Files updated without intltool-update
tmp/pot/60-tor-ready-notification.sh.pot
tmp/pot/config.py.pot tmp/pot/config.py.pot
tmp/pot/gpgApplet.pot tmp/pot/gpgApplet.pot
tmp/pot/iceweasel.pot
tmp/pot/shutdown_helper_applet.pot tmp/pot/shutdown_helper_applet.pot
tmp/pot/tails-about.pot tmp/pot/tails-about.pot
tmp/pot/tails-additional-software.pot tmp/pot/tails-additional-software.pot
......
...@@ -11,7 +11,7 @@ msgid "" ...@@ -11,7 +11,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: The Tor Project\n" "Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-12-09 22:49+0100\n" "POT-Creation-Date: 2014-01-08 16:54+0100\n"
"PO-Revision-Date: 2013-11-26 20:10+0000\n" "PO-Revision-Date: 2013-11-26 20:10+0000\n"
"Last-Translator: Sherief Alaa <sheriefalaa.w@gmail.com>\n" "Last-Translator: Sherief Alaa <sheriefalaa.w@gmail.com>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/torproject/" "Language-Team: Arabic (http://www.transifex.com/projects/p/torproject/"
...@@ -23,6 +23,14 @@ msgstr "" ...@@ -23,6 +23,14 @@ msgstr ""
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 " "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" "&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:23
msgid "Tor is ready"
msgstr ""
#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:24
msgid "You can now access the Internet."
msgstr ""
#: config/chroot_local-includes/etc/whisperback/config.py:64 #: config/chroot_local-includes/etc/whisperback/config.py:64
#, python-format #, python-format
msgid "" msgid ""
...@@ -221,6 +229,22 @@ msgstr "مخرجات GnuPG:" ...@@ -221,6 +229,22 @@ msgstr "مخرجات GnuPG:"
msgid "Other messages provided by GnuPG:" msgid "Other messages provided by GnuPG:"
msgstr "رسائل أخرى من GnuPG:" msgstr "رسائل أخرى من GnuPG:"
#: config/chroot_local-includes/usr/local/bin/iceweasel:12
msgid "Tor is not ready"
msgstr ""
#: config/chroot_local-includes/usr/local/bin/iceweasel:13
msgid "Tor is not ready. Start Tor Browser anyway?"
msgstr ""
#: config/chroot_local-includes/usr/local/bin/iceweasel:14
msgid "Start Tor Browser"
msgstr ""
#: config/chroot_local-includes/usr/local/bin/iceweasel:15
msgid "Cancel"
msgstr ""
#: config/chroot_local-includes/usr/local/bin/shutdown_helper_applet:34 #: config/chroot_local-includes/usr/local/bin/shutdown_helper_applet:34
msgid "Shutdown Immediately" msgid "Shutdown Immediately"
msgstr "إيقاف التشغيل في الحال" msgstr "إيقاف التشغيل في الحال"
...@@ -407,16 +431,16 @@ msgstr "قد يستغرق هذا بعض الوقت، يرجى التحلي با ...@@ -407,16 +431,16 @@ msgstr "قد يستغرق هذا بعض الوقت، يرجى التحلي با
msgid "Failed to setup chroot." msgid "Failed to setup chroot."
msgstr "فشلت محاولة تشغيل chroot." msgstr "فشلت محاولة تشغيل chroot."
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:182 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:184
#: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
msgid "Unsafe Browser" msgid "Unsafe Browser"
msgstr "المتصفح الغير الآمن" msgstr "المتصفح الغير الآمن"
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:222 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:224
msgid "Shutting down the Unsafe Browser..." msgid "Shutting down the Unsafe Browser..."
msgstr "جاري إيقاف تشغيل المتصفح الغير الآمن..." msgstr "جاري إيقاف تشغيل المتصفح الغير الآمن..."
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:223 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:225
msgid "" msgid ""
"This may take a while, and you may not restart the Unsafe Browser until it " "This may take a while, and you may not restart the Unsafe Browser until it "
"is properly shut down." "is properly shut down."
...@@ -424,18 +448,18 @@ msgstr "" ...@@ -424,18 +448,18 @@ msgstr ""
"هذه العملية قد تأخذ وقتاً طويلاً، وقد لا تتمكن من إعادة تشغيل المتصفح غير " "هذه العملية قد تأخذ وقتاً طويلاً، وقد لا تتمكن من إعادة تشغيل المتصفح غير "
"الآمن حتى يتم اغلاقه بشكل كامل." "الآمن حتى يتم اغلاقه بشكل كامل."
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:235 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:237
msgid "Failed to restart Tor." msgid "Failed to restart Tor."
msgstr "فشلت محاولة إعادة تشغيل تور." msgstr "فشلت محاولة إعادة تشغيل تور."
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:243 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:245
msgid "" msgid ""
"Another Unsafe Browser is currently running, or being cleaned up. Please " "Another Unsafe Browser is currently running, or being cleaned up. Please "
"retry in a while." "retry in a while."
msgstr "" msgstr ""
"توجد نسخة أخرى تعمل أو يتم تنظيفها من المتصفح غير الآمن. رجاءً حاول بعد قليل." "توجد نسخة أخرى تعمل أو يتم تنظيفها من المتصفح غير الآمن. رجاءً حاول بعد قليل."
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:256 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:258
msgid "" msgid ""
"No DNS server was obtained through DHCP or manually configured in " "No DNS server was obtained through DHCP or manually configured in "
"NetworkManager." "NetworkManager."
......
...@@ -9,7 +9,7 @@ msgid "" ...@@ -9,7 +9,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: The Tor Project\n" "Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-12-09 22:49+0100\n" "POT-Creation-Date: 2014-01-08 16:54+0100\n"
"PO-Revision-Date: 2013-11-06 09:10+0000\n" "PO-Revision-Date: 2013-11-06 09:10+0000\n"
"Last-Translator: andersd <andersd@riseup.net>\n" "Last-Translator: andersd <andersd@riseup.net>\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/torproject/" "Language-Team: Danish (http://www.transifex.com/projects/p/torproject/"
...@@ -20,6 +20,14 @@ msgstr "" ...@@ -20,6 +20,14 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:23
msgid "Tor is ready"
msgstr ""
#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:24
msgid "You can now access the Internet."
msgstr ""
#: config/chroot_local-includes/etc/whisperback/config.py:64 #: config/chroot_local-includes/etc/whisperback/config.py:64
#, python-format #, python-format
msgid "" msgid ""
...@@ -211,6 +219,22 @@ msgstr "GnuPG's output:" ...@@ -211,6 +219,22 @@ msgstr "GnuPG's output:"
msgid "Other messages provided by GnuPG:" msgid "Other messages provided by GnuPG:"
msgstr "Andre beskeder udbudt af GnuPG:" msgstr "Andre beskeder udbudt af GnuPG:"
#: config/chroot_local-includes/usr/local/bin/iceweasel:12
msgid "Tor is not ready"
msgstr ""
#: config/chroot_local-includes/usr/local/bin/iceweasel:13
msgid "Tor is not ready. Start Tor Browser anyway?"
msgstr ""
#: config/chroot_local-includes/usr/local/bin/iceweasel:14
msgid "Start Tor Browser"
msgstr ""
#: config/chroot_local-includes/usr/local/bin/iceweasel:15
msgid "Cancel"
msgstr ""
#: config/chroot_local-includes/usr/local/bin/shutdown_helper_applet:34 #: config/chroot_local-includes/usr/local/bin/shutdown_helper_applet:34
msgid "Shutdown Immediately" msgid "Shutdown Immediately"
msgstr "Luk ned med det samme" msgstr "Luk ned med det samme"
...@@ -402,16 +426,16 @@ msgstr "Dette kan tage et stykke tid, vær venligst tålmodig." ...@@ -402,16 +426,16 @@ msgstr "Dette kan tage et stykke tid, vær venligst tålmodig."
msgid "Failed to setup chroot." msgid "Failed to setup chroot."
msgstr "Kunne ikke indstille chroot." msgstr "Kunne ikke indstille chroot."
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:182 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:184
#: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
msgid "Unsafe Browser" msgid "Unsafe Browser"
msgstr "Usikker Browser" msgstr "Usikker Browser"
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:222 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:224
msgid "Shutting down the Unsafe Browser..." msgid "Shutting down the Unsafe Browser..."
msgstr "Afslutter den Usikre Browser" msgstr "Afslutter den Usikre Browser"
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:223 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:225
msgid "" msgid ""
"This may take a while, and you may not restart the Unsafe Browser until it " "This may take a while, and you may not restart the Unsafe Browser until it "
"is properly shut down." "is properly shut down."
...@@ -419,17 +443,17 @@ msgstr "" ...@@ -419,17 +443,17 @@ msgstr ""
"Dette kan tage et stykke tid, og du må ikke genstarte den Usikre Browser " "Dette kan tage et stykke tid, og du må ikke genstarte den Usikre Browser "
"indtil den er helt lukket ned." "indtil den er helt lukket ned."
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:235 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:237
msgid "Failed to restart Tor." msgid "Failed to restart Tor."
msgstr "Kunne ikke genstarte Tor." msgstr "Kunne ikke genstarte Tor."
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:243 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:245
msgid "" msgid ""
"Another Unsafe Browser is currently running, or being cleaned up. Please " "Another Unsafe Browser is currently running, or being cleaned up. Please "
"retry in a while." "retry in a while."
msgstr "En anden Usikker Browser kører, eller ryddes op. Forsøg igen om lidt." msgstr "En anden Usikker Browser kører, eller ryddes op. Forsøg igen om lidt."
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:256 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:258
msgid "" msgid ""
"No DNS server was obtained through DHCP or manually configured in " "No DNS server was obtained through DHCP or manually configured in "
"NetworkManager." "NetworkManager."
......
...@@ -10,7 +10,7 @@ msgid "" ...@@ -10,7 +10,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: The Tor Project\n" "Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-12-09 22:49+0100\n" "POT-Creation-Date: 2014-01-08 16:54+0100\n"
"PO-Revision-Date: 2013-11-06 21:50+0000\n" "PO-Revision-Date: 2013-11-06 21:50+0000\n"
"Last-Translator: ivl1705 <listmember@rinnberger.de>\n" "Last-Translator: ivl1705 <listmember@rinnberger.de>\n"
"Language-Team: German (http://www.transifex.com/projects/p/torproject/" "Language-Team: German (http://www.transifex.com/projects/p/torproject/"
...@@ -21,6 +21,14 @@ msgstr "" ...@@ -21,6 +21,14 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:23
msgid "Tor is ready"
msgstr ""
#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:24
msgid "You can now access the Internet."
msgstr ""
#: config/chroot_local-includes/etc/whisperback/config.py:64 #: config/chroot_local-includes/etc/whisperback/config.py:64
#, python-format #, python-format
msgid "" msgid ""
...@@ -212,6 +220,22 @@ msgstr "Ausgabe von GnuPG:" ...@@ -212,6 +220,22 @@ msgstr "Ausgabe von GnuPG:"
msgid "Other messages provided by GnuPG:" msgid "Other messages provided by GnuPG:"
msgstr "Andere Nachrichten von GnuPG:" msgstr "Andere Nachrichten von GnuPG:"
#: config/chroot_local-includes/usr/local/bin/iceweasel:12
msgid "Tor is not ready"
msgstr ""
#: config/chroot_local-includes/usr/local/bin/iceweasel:13
msgid "Tor is not ready. Start Tor Browser anyway?"
msgstr ""
#: config/chroot_local-includes/usr/local/bin/iceweasel:14
msgid "Start Tor Browser"
msgstr ""
#: config/chroot_local-includes/usr/local/bin/iceweasel:15
msgid "Cancel"
msgstr ""
#: config/chroot_local-includes/usr/local/bin/shutdown_helper_applet:34 #: config/chroot_local-includes/usr/local/bin/shutdown_helper_applet:34
msgid "Shutdown Immediately" msgid "Shutdown Immediately"
msgstr "Sofort Herunterfahren" msgstr "Sofort Herunterfahren"
...@@ -403,16 +427,16 @@ msgstr "Dies könnte eine weile dauern, bitte haben Sie etwas geduld." ...@@ -403,16 +427,16 @@ msgstr "Dies könnte eine weile dauern, bitte haben Sie etwas geduld."
msgid "Failed to setup chroot." msgid "Failed to setup chroot."
msgstr "Konnte chroot nicht einrichten." msgstr "Konnte chroot nicht einrichten."
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:182 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:184
#: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
msgid "Unsafe Browser" msgid "Unsafe Browser"
msgstr "Unsicherer Browser" msgstr "Unsicherer Browser"
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:222 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:224
msgid "Shutting down the Unsafe Browser..." msgid "Shutting down the Unsafe Browser..."
msgstr "Unsicherer Browser wird beendet..." msgstr "Unsicherer Browser wird beendet..."
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:223 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:225
msgid "" msgid ""
"This may take a while, and you may not restart the Unsafe Browser until it " "This may take a while, and you may not restart the Unsafe Browser until it "
"is properly shut down." "is properly shut down."
...@@ -420,11 +444,11 @@ msgstr "" ...@@ -420,11 +444,11 @@ msgstr ""
"Dies könnte eine weile dauen, und bevor der Unsichere Browser geschlossen " "Dies könnte eine weile dauen, und bevor der Unsichere Browser geschlossen "
"ist, können Sie ihn nicht noch einmal starten." "ist, können Sie ihn nicht noch einmal starten."
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:235 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:237
msgid "Failed to restart Tor." msgid "Failed to restart Tor."
msgstr "Tor konnte nicht neugestartet werden." msgstr "Tor konnte nicht neugestartet werden."
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:243 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:245
msgid "" msgid ""
"Another Unsafe Browser is currently running, or being cleaned up. Please " "Another Unsafe Browser is currently running, or being cleaned up. Please "
"retry in a while." "retry in a while."
...@@ -432,7 +456,7 @@ msgstr "" ...@@ -432,7 +456,7 @@ msgstr ""
"Ein anderer Unsicherer Browser ist derzeit offen oder wird gerade beendet. " "Ein anderer Unsicherer Browser ist derzeit offen oder wird gerade beendet. "
"Bitte probieren Sie es später noch einmal." "Bitte probieren Sie es später noch einmal."
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:256 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:258
msgid "" msgid ""
"No DNS server was obtained through DHCP or manually configured in " "No DNS server was obtained through DHCP or manually configured in "
"NetworkManager." "NetworkManager."
......
...@@ -9,7 +9,7 @@ msgid "" ...@@ -9,7 +9,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: The Tor Project\n" "Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-12-09 22:49+0100\n" "POT-Creation-Date: 2014-01-08 16:54+0100\n"
"PO-Revision-Date: 2013-11-10 01:10+0000\n" "PO-Revision-Date: 2013-11-10 01:10+0000\n"
"Last-Translator: strel\n" "Last-Translator: strel\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/"
...@@ -20,6 +20,14 @@ msgstr "" ...@@ -20,6 +20,14 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:23
msgid "Tor is ready"
msgstr ""
#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:24
msgid "You can now access the Internet."
msgstr ""
#: config/chroot_local-includes/etc/whisperback/config.py:64 #: config/chroot_local-includes/etc/whisperback/config.py:64
#, python-format #, python-format
msgid "" msgid ""
...@@ -212,6 +220,22 @@ msgstr "Datos de salida de GnuPG:" ...@@ -212,6 +220,22 @@ msgstr "Datos de salida de GnuPG:"
msgid "Other messages provided by GnuPG:" msgid "Other messages provided by GnuPG:"
msgstr "Otros mensajes emitidos por GnuPG:" msgstr "Otros mensajes emitidos por GnuPG:"
#: config/chroot_local-includes/usr/local/bin/iceweasel:12
msgid "Tor is not ready"
msgstr ""
#: config/chroot_local-includes/usr/local/bin/iceweasel:13
msgid "Tor is not ready. Start Tor Browser anyway?"
msgstr ""
#: config/chroot_local-includes/usr/local/bin/iceweasel:14
msgid "Start Tor Browser"
msgstr ""
#: config/chroot_local-includes/usr/local/bin/iceweasel:15
msgid "Cancel"
msgstr ""
#: config/chroot_local-includes/usr/local/bin/shutdown_helper_applet:34 #: config/chroot_local-includes/usr/local/bin/shutdown_helper_applet:34
msgid "Shutdown Immediately" msgid "Shutdown Immediately"
msgstr "Apagar inmediatamente" msgstr "Apagar inmediatamente"
...@@ -405,16 +429,16 @@ msgstr "Esto puede llevar un tiempo, por favor, sea paciente." ...@@ -405,16 +429,16 @@ msgstr "Esto puede llevar un tiempo, por favor, sea paciente."
msgid "Failed to setup chroot." msgid "Failed to setup chroot."
msgstr "Fallo al establecer chroot." msgstr "Fallo al establecer chroot."
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:182 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:184
#: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
msgid "Unsafe Browser" msgid "Unsafe Browser"
msgstr "Navegador No Seguro" msgstr "Navegador No Seguro"
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:222 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:224
msgid "Shutting down the Unsafe Browser..." msgid "Shutting down the Unsafe Browser..."
msgstr "Cerrando el Navegador No Seguro..." msgstr "Cerrando el Navegador No Seguro..."
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:223 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:225
msgid "" msgid ""
"This may take a while, and you may not restart the Unsafe Browser until it " "This may take a while, and you may not restart the Unsafe Browser until it "
"is properly shut down." "is properly shut down."
...@@ -422,11 +446,11 @@ msgstr "" ...@@ -422,11 +446,11 @@ msgstr ""
"Esto puede llevar un tiempo, y no puede reiniciar el Navegador No Seguro " "Esto puede llevar un tiempo, y no puede reiniciar el Navegador No Seguro "
"hasta que se haya cerrado adecuadamente." "hasta que se haya cerrado adecuadamente."
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:235 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:237
msgid "Failed to restart Tor." msgid "Failed to restart Tor."
msgstr "Fallo al reiniciar Tor." msgstr "Fallo al reiniciar Tor."
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:243 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:245
msgid "" msgid ""
"Another Unsafe Browser is currently running, or being cleaned up. Please " "Another Unsafe Browser is currently running, or being cleaned up. Please "
"retry in a while." "retry in a while."
...@@ -434,7 +458,7 @@ msgstr "" ...@@ -434,7 +458,7 @@ msgstr ""
"Otro Navegador No Seguro está ejecutándose actualmente, o está siendo " "Otro Navegador No Seguro está ejecutándose actualmente, o está siendo "
"limpiado. Inténtelo de nuevo dentro de un rato." "limpiado. Inténtelo de nuevo dentro de un rato."
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:256 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:258
msgid "" msgid ""
"No DNS server was obtained through DHCP or manually configured in " "No DNS server was obtained through DHCP or manually configured in "
"NetworkManager." "NetworkManager."
......
...@@ -57,7 +57,7 @@ msgid "" ...@@ -57,7 +57,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-12-09 22:49+0100\n" "POT-Creation-Date: 2014-01-08 16:54+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
...@@ -75,6 +75,14 @@ msgstr "" ...@@ -75,6 +75,14 @@ msgstr ""
"#-#-#-#-# tails-additional-software.po (PACKAGE VERSION) #-#-#-#-#\n" "#-#-#-#-# tails-additional-software.po (PACKAGE VERSION) #-#-#-#-#\n"
"#-#-#-#-# unsafe-browser.po (PACKAGE VERSION) #-#-#-#-#\n" "#-#-#-#-# unsafe-browser.po (PACKAGE VERSION) #-#-#-#-#\n"
#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:23
msgid "Tor is ready"
msgstr ""
#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:24
msgid "You can now access the Internet."
msgstr ""
#: config/chroot_local-includes/etc/whisperback/config.py:64 #: config/chroot_local-includes/etc/whisperback/config.py:64
#, python-format #, python-format
msgid "" msgid ""
...@@ -249,6 +257,22 @@ msgstr "" ...@@ -249,6 +257,22 @@ msgstr ""
msgid "Other messages provided by GnuPG:" msgid "Other messages provided by GnuPG:"
msgstr "" msgstr ""
#: config/chroot_local-includes/usr/local/bin/iceweasel:12
msgid "Tor is not ready"
msgstr ""
#: config/chroot_local-includes/usr/local/bin/iceweasel:13
msgid "Tor is not ready. Start Tor Browser anyway?"
msgstr ""
#: config/chroot_local-includes/usr/local/bin/iceweasel:14
msgid "Start Tor Browser"
msgstr ""
#: config/chroot_local-includes/usr/local/bin/iceweasel:15
msgid "Cancel"
msgstr ""
#: config/chroot_local-includes/usr/local/bin/shutdown_helper_applet:34 #: config/chroot_local-includes/usr/local/bin/shutdown_helper_applet:34
msgid "Shutdown Immediately" msgid "Shutdown Immediately"
msgstr "" msgstr ""
...@@ -428,32 +452,32 @@ msgstr "" ...@@ -428,32 +452,32 @@ msgstr ""
msgid "Failed to setup chroot." msgid "Failed to setup chroot."
msgstr "" msgstr ""
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:182 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:184
#: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
msgid "Unsafe Browser" msgid "Unsafe Browser"
msgstr "" msgstr ""
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:222 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:224
msgid "Shutting down the Unsafe Browser..." msgid "Shutting down the Unsafe Browser..."
msgstr "" msgstr ""
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:223 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:225
msgid "" msgid ""
"This may take a while, and you may not restart the Unsafe Browser until it " "This may take a while, and you may not restart the Unsafe Browser until it "
"is properly shut down." "is properly shut down."