Commit 569a5e8e authored by intrigeri's avatar intrigeri
Browse files

Merge branch 'stable' into devel

Conflicts:
	debian/changelog
parents c4006120 89b089c7
Host 192.168.* 10.* 172.16.*
Host 192.168.* 10.* 172.16.* 172.17.* 172.18.* 172.19.* 172.20.* 172.21.* 172.22.* 172.23.* 172.24.* 172.25.* 172.26.* 172.27.* 172.28.* 172.29.* 172.30.* 172.31.*
ProxyCommand none
Host *
......
amnesia ALL = NOPASSWD: /usr/local/sbin/tails-debugging-info
amnesia ALL = NOPASSWD: /usr/local/sbin/tails-debugging-info ""
# -*- coding: UTF-8 -*-
#
# Tails configuration file for Whisperback
# Tails configuration file for WhisperBack
# ==========================================
#
# This is a python script that will be read at startup. Any python
# This is a Python script that will be read at startup. Any Python
# syntax is valid.
# IMPORTS
......@@ -20,8 +20,8 @@ import gettext
def __get_localised_doc_link():
"""Return the link to the localised documentation
@returns the link to the localised documentation if available, or to the
english version
@returns the link to the localised documentation if available, or fallback
to the English version
"""
# Try to get the list of supported languages codes supported by the
......@@ -128,34 +128,34 @@ mail_subject = "Bug report: %x" % random.randrange(16**32)
# It should not take any parameter, and should return a string to be
# preprended to the email
def mail_prepended_info():
"""Returns the version of the running amnesia system
"""Returns the version of the running Tails system
@return The output of tails-version, if any, or an english string
@return The output of tails-version, if any, or an English string
explaining the error
"""
try:
amnesia_version_process = subprocess.Popen ("tails-version",
tails_version_process = subprocess.Popen ("tails-version",
stdout=subprocess.PIPE)
amnesia_version_process.wait()
amnesia_version = amnesia_version_process.stdout.read()
tails_version_process.wait()
tails_version = tails_version_process.stdout.read()
except OSError:
amnesia_version = "tails-version command not found"
tails_version = "tails-version command not found"
except subprocess.CalledProcessError:
amnesia_version = "tails-version returned an error"
tails_version = "tails-version returned an error"
return "Tails-Version: %s\n" % amnesia_version
return "Tails-Version: %s\n" % tails_version
# A callback function to get information to append to the email
# (this information will be encrypted). This is useful to add
# configuration files usebul for debugging.
# configuration files useful for debugging.
#
# It should not take any parameter, and should return a string to be
# appended to the email
def mail_appended_info():
"""Returns debugging informations on the running amnesia system
"""Returns debugging information on the running Tails system
@return a long string containing debugging informations
@return a long string containing debugging information
"""
debugging_info = ""
......
......@@ -9,7 +9,7 @@ debug_command() {
debug_file() {
echo
echo "===== content of $1 ====="
cat $1
cat "$1"
}
debug_command /usr/sbin/dmidecode -s system-manufacturer
......
81560cc55e1eba80f25d67fcdee65c5f24d8190598bdad3fa0a561739d2b6f41 tor-browser-linux32-4.0.4_ar.tar.xz
71d4e9c19939796111344e8a172c3f737869dcf894f5096f5005d555945ee8ff tor-browser-linux32-4.0.4_de.tar.xz
046dbdbfd1944b44a073e4e6f0ca6fd0a3974d4a5230967dfbe1d49a49b283eb tor-browser-linux32-4.0.4_en-US.tar.xz
297aad855faa0cd1d65ac004eb13fb1d8c93f0a8b737d01c51cd63f8a728bfaa tor-browser-linux32-4.0.4_es-ES.tar.xz
3803f01af380d917f63177cd553796b91e7de73e4ccc9695fa85658540f00d48 tor-browser-linux32-4.0.4_fa.tar.xz
5fda5bd4735390c71451f5f2262b8b08341595bc029003087728a706b2adbdd3 tor-browser-linux32-4.0.4_fr.tar.xz
7ecaba7217f57f4653dc1cb071181e5c1fe674f541e827cbdd006bdf54bfe367 tor-browser-linux32-4.0.4_it.tar.xz
9df928063d3725e049da619b5ff7762de065de2aac487024bcadbfdddcd22837 tor-browser-linux32-4.0.4_ko.tar.xz
4ec587cc75dd4b4b9f0dad6fb663cdea540ea9158b37de1f98da2376b24c9696 tor-browser-linux32-4.0.4_nl.tar.xz
d41293947c3cfb78a639b6ebe88af395b147f89933d77ebffaba42a10794a26f tor-browser-linux32-4.0.4_pl.tar.xz
d343b3e29d0c250cb7a2c32b5cf07d74e562ef8e5590e6787a31728d49b7865c tor-browser-linux32-4.0.4_pt-PT.tar.xz
21ea5ca1c31d48341aa4608498a2db91c48c0e0e778d0dfd86ab2a5bfa6e8127 tor-browser-linux32-4.0.4_ru.tar.xz
19651adbe0b0f2a73dd7aa484ba8339483c4cf32cb7829819b9f0b3abe063515 tor-browser-linux32-4.0.4_tr.tar.xz
07226af742f294c521a0cfdb40384808bd8f9b0d572eea0342e198b5d5da991b tor-browser-linux32-4.0.4_vi.tar.xz
2cdb1706dd7afbab8587f1e8dbcd13fb32ecf941f580f815aab95b21475004ca tor-browser-linux32-4.0.4_zh-CN.tar.xz
c5877f9d9eac3f6ce5867f854981fc0196e2a66e08d77382e30a24f6724b06ab tor-browser-linux32-4.0.5_ar.tar.xz
b82fb144d928670c65a79efba03e6e3986028ef8f21f0dca6521391bf1eb97be tor-browser-linux32-4.0.5_de.tar.xz
c30c9897d3bf0056a36eafe5f5f8fe0c5e6b6077b5db1e62aed7503f07f992fa tor-browser-linux32-4.0.5_en-US.tar.xz
97b8c02291aefd0c26a58bea195f0bdbb3e674bedde86b2932d7c967ed94e5e8 tor-browser-linux32-4.0.5_es-ES.tar.xz
2416715fa5ce22e418aded24036410a6b46d63699cb503a3a2c4ef76926059c9 tor-browser-linux32-4.0.5_fa.tar.xz
9a302024b7f4f3fbfc5f6ac308f709813ded1e70326dfcc25b01daed2bc25c3c tor-browser-linux32-4.0.5_fr.tar.xz
3fdc087b3cdca20d8ef3cf3e857a63d3a1f19dfa9c13c4961b2fa7a5e8e64536 tor-browser-linux32-4.0.5_it.tar.xz
12a2f113728a36b318d01df8104f22e2ff0042e1b4532b0b16daa03406c06848 tor-browser-linux32-4.0.5_ko.tar.xz
d63aa334b11e986eec56abb06f2f41997c018da46c489b0533598e6213651b07 tor-browser-linux32-4.0.5_nl.tar.xz
8a7ee62ef9ac1c158239c1361e769c472f0ef70139898306d3f621756f98d80a tor-browser-linux32-4.0.5_pl.tar.xz
d98e37b95c665668a6b9235cdd657cfbfb19cf7bfbe2d3a277b7b664b59b2f50 tor-browser-linux32-4.0.5_pt-PT.tar.xz
7f4b244f0a69d0e7520ef3b12519b3dfcf01bbf161000bc4808d439eef979fd6 tor-browser-linux32-4.0.5_ru.tar.xz
34420fa5afc306d63b394068f026440fff97ebc8724edba1ce23c53a5aaa2c8b tor-browser-linux32-4.0.5_tr.tar.xz
4252d062ac002988c13fb718771d6f4ebe17f93b0ab8e2920e78038132d5a148 tor-browser-linux32-4.0.5_vi.tar.xz
0577c1e91d2b9be22731bdf9607caf93f78e62a806b4b46f8c24385f991abba7 tor-browser-linux32-4.0.5_zh-CN.tar.xz
tails (1.4) UNRELEASED; urgency=medium
* Dummy entry.
* Dummy changelog entry for next major release.
-- Tails developers <tails@boum.org> Tue, 24 Feb 2015 21:39:38 +0100
-- Tails developers <tails@boum.org> Tue, 12 May 2015 12:34:56 +0000
tails (1.3.1) unstable; urgency=medium
* Security fixes
- Upgrade Tor Browser to 4.0.5, based on Firefox 31.5.3 ESR. This addresses:
· https://www.mozilla.org/en-US/security/advisories/mfsa2015-28/
· https://www.mozilla.org/en-US/security/advisories/mfsa2015-29/
- Upgrade Linux to 3.16.7-ckt7-1.
- Upgrade libxfont to 1:1.4.5-5.
- Upgrade OpenSSL to 1.0.1e-2+deb7u15.
- Upgrade tcpdump to 4.3.0-1+deb7u2.
- Upgrade bsdtar to 3.0.4-3+wheezy1.
- Upgrade CUPS to 1.5.3-5+deb7u5.
- Upgrade file and libmagic to 5.11-2+deb7u8.
- Upgrade GnuPG to 1.4.12-7+deb7u7.
- Upgrade libarchive to 3.0.4-3+wheezy1.
- Upgrade libav to 6:0.8.17-1.
- Upgrade FreeType 2 to 2.4.9-1.1+deb7u1.
- Upgrade libgcrypt11 1.5.0-5+deb7u3.
- Upgrade libgnutls26 to 2.12.20-8+deb7u3.
- Upgrade libgtk2-perl to 2:1.244-1+deb7u1.
- Upgrade ICU to 4.8.1.1-12+deb7u2.
- Upgrade NSS to 2:3.14.5-1+deb7u4.
- Upgrade libssh2 to 1.4.2-1.1+deb7u1.
* Bugfixes
- Upgrade Tor to 0.2.5.11-1~d70.wheezy+1+tails1. Changes include:
· Directory authority changes.
· Fix assertion errors that may trigger under high DNS load.
· No longer break on HUP with seccomp2 enabled.
· and more - please consult the upstream changelog.
- Upgrade Tor Launcher to 0.2.7.2, and update the test suite accordingly
(Closes: #8964, #6985). Changes include:
· Ask about bridges before proxy in wizard.
· Hide logo if TOR_HIDE_BROWSER_LOGO set.
· Remove firewall prompt from wizard.
· Feedback when Copy Tor Log is clicked.
· Improve behavior if tor exits.
· Add option to hide TBB's logo
· Change "Tor Browser Bundle" to "Tor Browser"
· Update translations from Transifex.
- Fix the Tor Launcher killer. (Closes: #9067)
- Allow Seahorse to communicate with keyservers when run from Tails
OpenPGP Applet. (Closes: #6394)
- SSH client: don't proxy connections to 172.17.* to 172.31.*.
(Closes: #6558)
- Repair config/chroot_local-packages feature, that was broken in Tails 1.3
by 19-install-tor-browser-AppArmor-profile. (Closes: #8910)
- language_statistics.sh: count original words instead of translated words.
Otherwise we get >100% translation if translated strings are longer than
original strings. (Closes: #9016)
* Minor improvements
- Only ship the new Tails signing key, and have Tails Upgrader stop trusting
the old one. Update the documentation and test suite accordingly.
(Closes: #8735, #8736, #8882, #8769, #8951)
- Polish and harden a bit the WhisperBack configuration (Closes: #8991):
· Only allow the `amnesia' user to run tails-debugging info as root
with no arguments.
· Fix spelling and grammar mistakes, improve phrasing a bit.
· Quote variables consistently.
* Test suite
- New tests:
· Chatting over XMPP in Pidgin, both peer-to-peer and in a multi-user
chatroom. (Closes: #8002)
· Chatting with OTR enabled over XMPP in Pidgin. (Closes: #8001)
· Check that Pidgin only responds to the expected CTCP requests.
(Closes: #8966)
· Fetching keys using Seahorse started via the OpenPGP Applet.
· Sync'ing keys using Seahorse.
- Bugfixes:
· Fix a race condition between the remote shell's and Tails Greeter's
startup, by making sure the remote shell is ready before we start
GDM. (Closes: #8941)
· Kill virt-viewer properly. (Closes: #9070)
· Make sure the display is stopped on destroy_and_undefine().
Where we had it earlier, it could be skipped if anything else in the
block threw an exception.
· Fix wrong use of "$@". (Closes: #9071)
· Enable the pipefail option in run_test_suite.
· Improve the GNOME screenshot test's robustness. (Closes: #8952)
- Refactoring:
· turn the focus_pidgin_window() helper into a more generic
VM.focus_xorg_window() one.
· Reorganize the Display class.
· Use clearer method to check process status in the Display class.
- New developer-oriented features:
· Add a --log-to-file option to run_test_suite. (Closes: #8894)
· Add helpers for generating random strings.
· Make it possible to hook arbitrary calls on scenario end. This is useful
for dynamically adding cleanup functions, instead of having
to explicitly deal with them in some After hook.
-- Tails developers <tails@boum.org> Mon, 23 Mar 2015 12:34:56 +0000
tails (1.3) unstable; urgency=medium
......@@ -95,7 +190,7 @@ tails (1.3) unstable; urgency=medium
Vagrant. We need version 6.03~pre20 to make the Tails ISO image
in hybrid mode
- Update deb.tails.boum.org apt repo signing key. (Closes: #8747)
- Revert "Workaround build failure in lb_source, after creating
- Revert "Workaround build failure in lb_source, after creating
the ISO." This is not needed anymore given the move to the Tor
SOCKS proxy. (Closes: #5307)
- Remove the bootstrap stage usage option and disable all
......
......@@ -6,8 +6,21 @@ class Display
@x_display = x_display
end
def active?
p = IO.popen("xprop -display #{@x_display} " +
"-name '#{@domain} (1) - Virt Viewer' 2>/dev/null")
Process.wait(p.pid)
p.close
$?.success?
end
def start
start_virtviewer(@domain)
@virtviewer = IO.popen(["virt-viewer", "-d",
"-f",
"-r",
"-c", "qemu:///system",
["--display=", @x_display].join(''),
@domain].join(' '))
# We wait for the display to be active to not lose actions
# (e.g. key presses via sikuli) that come immediately after
# starting (or restoring) a vm
......@@ -17,35 +30,12 @@ class Display
end
def stop
stop_virtviewer
Process.kill("INT", @virtviewer.pid)
end
def restart
stop_virtviewer
start_virtviewer(@domain)
end
def start_virtviewer(domain)
# virt-viewer forks, so we cannot (easily) get the child pid
# and use it in active? and stop_virtviewer below...
IO.popen(["virt-viewer", "-d",
"-f",
"-r",
"-c", "qemu:///system",
["--display=", @x_display].join(''),
domain,
"&"].join(' '))
stop
start
end
def active?
p = IO.popen("xprop -display #{@x_display} " +
"-name '#{@domain} (1) - Virt Viewer' 2>/dev/null")
Process.wait(p.pid)
p.close
$? == 0
end
def stop_virtviewer
system("killall virt-viewer")
end
end
......@@ -73,11 +73,11 @@ class VM
# We lookup by name so we also catch domains from previous test
# suite runs that weren't properly cleaned up (e.g. aborted).
def destroy_and_undefine
@display.stop if @display && @display.active?
begin
old_domain = @virt.lookup_domain_by_name(@domain_name)
old_domain.destroy if old_domain.active?
old_domain.undefine
@display.stop if @display && @display.active?
rescue
end
end
......
......@@ -19,7 +19,7 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-02-23 16:25+0100\n"
"POT-Creation-Date: 2015-03-22 13:46+0100\n"
"PO-Revision-Date: 2014-12-05 17:21+0000\n"
"Last-Translator: Osama M. Mneina <o.mneina@gmail.com>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/torproject/"
......@@ -31,11 +31,11 @@ msgstr ""
"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"
#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:42
#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:43
msgid "Tor is ready"
msgstr "تور جاهز"
#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:43
#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:44
msgid "You can now access the Internet."
msgstr "يمكنك الأن تصفح الأنترنت."
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-02-23 16:25+0100\n"
"POT-Creation-Date: 2015-03-22 13:46+0100\n"
"PO-Revision-Date: 2014-12-30 17:30+0000\n"
"Last-Translator: E <ehuseynzade@gmail.com>\n"
"Language-Team: Azerbaijani (http://www.transifex.com/projects/p/torproject/"
......@@ -19,11 +19,11 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:42
#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:43
msgid "Tor is ready"
msgstr "Tor hazırdır"
#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:43
#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:44
msgid "You can now access the Internet."
msgstr "İndi internetə qoşula bilərsən."
......
......@@ -12,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-02-23 16:25+0100\n"
"PO-Revision-Date: 2015-02-23 11:31+0000\n"
"POT-Creation-Date: 2015-03-22 13:46+0100\n"
"PO-Revision-Date: 2015-03-20 19:32+0000\n"
"Last-Translator: laia_ <laiaadorio@gmail.com>\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/torproject/"
"language/ca/)\n"
......@@ -23,11 +23,11 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:42
#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:43
msgid "Tor is ready"
msgstr "Tor es troba actiu"
#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:43
#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:44
msgid "You can now access the Internet."
msgstr "Ara ja pots accedir a Internet."
......@@ -81,9 +81,8 @@ msgstr ""
"seva propietat de persistència és activada. "
#: config/chroot_local-includes/usr/local/bin/electrum:18
#, fuzzy
msgid "Do you want to start Electrum anyway?"
msgstr "Voleu iniciar l'Electrum igualment?"
msgstr "Voleu iniciar l'Electrum de totes maneres?"
#: config/chroot_local-includes/usr/local/bin/electrum:20
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:36
......@@ -433,13 +432,12 @@ msgstr ""
"estan preparats per gravar el que feu a Tails. "
#: config/chroot_local-includes/usr/local/bin/tails-virt-notify-user:57
#, fuzzy
msgid ""
"<a href='file:///usr/share/doc/tails/website/doc/advanced_topics/"
"virtualization.en.html#security'>Learn more...</a>"
msgstr ""
"<a href='file:///usr/share/doc/tails/website/doc/advanced_topics/"
"virtualization.en.html'>Apreneu-ne més...</a>"
"virtualization.en.html#security'>Saber-ne més...</a>"
#: config/chroot_local-includes/usr/local/bin/tor-browser:18
msgid "Tor is not ready"
......
......@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-02-23 16:25+0100\n"
"POT-Creation-Date: 2015-03-22 13:46+0100\n"
"PO-Revision-Date: 2014-12-04 08:50+0000\n"
"Last-Translator: runasand <runa.sandvik@gmail.com>\n"
"Language-Team: Czech (http://www.transifex.com/projects/p/torproject/"
......@@ -23,11 +23,11 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:42
#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:43
msgid "Tor is ready"
msgstr "Tor je připraven"
#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:43
#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:44
msgid "You can now access the Internet."
msgstr "Nyní můžete přistupovat k Internetu."
......
......@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-02-23 16:25+0100\n"
"POT-Creation-Date: 2015-03-22 13:46+0100\n"
"PO-Revision-Date: 2014-04-30 09:10+0000\n"
"Last-Translator: runasand <runa.sandvik@gmail.com>\n"
"Language-Team: Welsh (http://www.transifex.com/projects/p/torproject/"
......@@ -21,11 +21,11 @@ msgstr ""
"Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != "
"11) ? 2 : 3;\n"
#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:42
#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:43
msgid "Tor is ready"
msgstr "Mae Tor yn barod"
#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:43
#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:44
msgid "You can now access the Internet."
msgstr "Yn awr, gallwch cysylltu a'r We."
......
......@@ -7,16 +7,16 @@
# bna1605 <bna1605@gmail.com>, 2014
# christianflintrup <chr@agge.net>, 2014
# Christian Villum <villum@autofunk.dk>, 2014-2015
# David Nielsen <gnomeuser@gmail.com>, 2014
# David Nielsen <gnomeuser@gmail.com>, 2014-2015
# Niels, 2013
# Whiz Zurrd <Whizzurrd@hmamail.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-02-23 16:25+0100\n"
"PO-Revision-Date: 2015-02-23 07:00+0000\n"
"Last-Translator: Christian Villum <villum@autofunk.dk>\n"
"POT-Creation-Date: 2015-03-22 13:46+0100\n"
"PO-Revision-Date: 2015-02-26 12:35+0000\n"
"Last-Translator: David Nielsen <gnomeuser@gmail.com>\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/torproject/"
"language/da/)\n"
"Language: da\n"
......@@ -25,11 +25,11 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:42
#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:43
msgid "Tor is ready"
msgstr "Tor er klar"
#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:43
#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:44
msgid "You can now access the Internet."
msgstr "Du kan nu forbinde til internettet"
......@@ -82,7 +82,6 @@ msgstr ""
"funktionen er aktiveret."
#: config/chroot_local-includes/usr/local/bin/electrum:18
#, fuzzy
msgid "Do you want to start Electrum anyway?"
msgstr "Vil du starte Electrum alligevel?"
......@@ -435,13 +434,12 @@ msgstr ""
"overvåge hvad du foretager dig i Tails."
#: config/chroot_local-includes/usr/local/bin/tails-virt-notify-user:57
#, fuzzy
msgid ""
"<a href='file:///usr/share/doc/tails/website/doc/advanced_topics/"
"virtualization.en.html#security'>Learn more...</a>"
msgstr ""
"<a href='file:///usr/share/doc/tails/website/doc/advanced_topics/"
"virtualization.en.html'>Læs mere...</a>"
"virtualization.en.html#security'>Lær mere...</a>"
#: config/chroot_local-includes/usr/local/bin/tor-browser:18
msgid "Tor is not ready"
......
......@@ -6,6 +6,7 @@
# Andreas Demmelbauer, 2014
# Claudia <claudianied@web.de>, 2015
# trantor <clucko3@gmail.com>, 2014
# DoKnGH26" 21 <dokngh2621@gmail.com>, 2015
# D P, 2015
# Ettore Atalan <atalanttore@googlemail.com>, 2014
# gerhard <listmember@rinnberger.de>, 2013
......@@ -21,9 +22,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-02-23 16:25+0100\n"
"PO-Revision-Date: 2015-02-15 20:51+0000\n"
"Last-Translator: D P\n"
"POT-Creation-Date: 2015-03-22 13:46+0100\n"
"PO-Revision-Date: 2015-03-21 22:52+0000\n"
"Last-Translator: DoKnGH26\" 21 <dokngh2621@gmail.com>\n"
"Language-Team: German (http://www.transifex.com/projects/p/torproject/"
"language/de/)\n"
"Language: de\n"
......@@ -32,11 +33,11 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:42
#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:43
msgid "Tor is ready"
msgstr "Tor ist bereit"
#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:43
#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:44
msgid "You can now access the Internet."
msgstr "Sie haben nun Zugriff auf das Internet."
......@@ -89,7 +90,6 @@ msgstr ""
"aktivierter Persistenz zu nutzen."
#: config/chroot_local-includes/usr/local/bin/electrum:18
#, fuzzy
msgid "Do you want to start Electrum anyway?"
msgstr "Wollen Sie Electrum trotzdem starten?"
......@@ -444,13 +444,12 @@ msgstr ""
"überwachen, was Sie in Tails machen."
#: config/chroot_local-includes/usr/local/bin/tails-virt-notify-user:57
#, fuzzy
msgid ""
"<a href='file:///usr/share/doc/tails/website/doc/advanced_topics/"
"virtualization.en.html#security'>Learn more...</a>"
msgstr ""
"<a href='file:///usr/share/doc/tails/website/doc/advanced_topics/"
"virtualization.en.html'>Mehr erfahren</a>"
"virtualization.de.html#security'>Mehr erfahren...</a>"
#: config/chroot_local-includes/usr/local/bin/tor-browser:18
msgid "Tor is not ready"
......
......@@ -17,7 +17,7 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-02-23 16:25+0100\n"
"POT-Creation-Date: 2015-03-22 13:46+0100\n"
"PO-Revision-Date: 2014-12-04 08:50+0000\n"
"Last-Translator: runasand <runa.sandvik@gmail.com>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/torproject/"
......@@ -28,11 +28,11 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:42
#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:43
msgid "Tor is ready"
msgstr "Το Tor είναι έτοιμο"
#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:43
#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:44
msgid "You can now access the Internet."
msgstr "Μπορείτε τώρα να έχετε πρόσβαση στο Διαδίκτυο."
......
......@@ -3,16 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
# Andi Chandler <andi@gowling.com>, 2014
# Andi Chandler <andi@gowling.com>, 2014-2015
# Billy Humphreys <sysop@enderbbs.enderservices.tk>, 2014
# Richard Shaylor <rshaylor@me.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-02-23 16:25+0100\n"
"PO-Revision-Date: 2014-12-04 08:50+0000\n"
"Last-Translator: runasand <runa.sandvik@gmail.com>\n"
"POT-Creation-Date: 2015-03-22 13:46+0100\n"
"PO-Revision-Date: 2015-03-21 20:37+0000\n"
"Last-Translator: Andi Chandler <andi@gowling.com>\n"
"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/"
"torproject/language/en_GB/)\n"
"Language: en_GB\n"
......@@ -21,16 +21,16 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:42
#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:43
msgid "Tor is ready"
msgstr "Tor is ready."
#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:43
#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:44
msgid "You can now access the Internet."
msgstr "You can now access the Internet"
#: config/chroot_local-includes/etc/whisperback/config.py:64
#, fuzzy, python-format
#, python-format
msgid ""
"<h1>Help us fix your bug!</h1>\n"
"<p>Read <a href=\"%s\">our bug reporting instructions</a>.</p>\n"
......@@ -52,18 +52,19 @@ msgstr ""