tor-commits November 2013

tor-commits@lists.torproject.org

17 participants
1171 discussions

[check/master] X-Forwarded-For can be a list.
by arlo＠torproject.org 19 Nov '13

19 Nov '13

commit 4b0742641963e92fa528f573d0f2ffc8a832006b Author: Arlo Breault <arlolra(a)gmail.com> Date: Tue Nov 19 11:44:07 2013 -0800 X-Forwarded-For can be a list. Since the service is behind Apache, the remote IP is append to that header. However, if it has already be set, it becomes a list. This was reported in trac #10190. --- handlers.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/handlers.go b/handlers.go index 9342ff8..f852a0a 100644 --- a/handlers.go +++ b/handlers.go @@ -12,6 +12,7 @@ import ( "regexp" "strconv" "time" + "strings" ) // page model @@ -44,7 +45,11 @@ func RootHandler(Layout *template.Template, Exits *Exits, domain *gettext.Domain // get remote ip host := r.Header.Get("X-Forwarded-For") - if len(host) == 0 { + if len(host) > 0 { + parts := strings.Split(host, ",") + // apache will append the remote address + host = strings.TrimSpace(parts[len(parts) - 1]) + } else { host, _, err = net.SplitHostPort(r.RemoteAddr) }

1 0

[torbrowser/master] bump recommended-versions for 2.4.18-rc-1 and 2.3.25-15
by erinn＠torproject.org 19 Nov '13

19 Nov '13

commit 3297949f27b1dca34b9dec1250f1ba705441d0af Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Nov 19 16:31:23 2013 -0200 bump recommended-versions for 2.4.18-rc-1 and 2.3.25-15 --- build-scripts/recommended-versions | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index 3d2cb2d..2f8d2cf 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -1,10 +1,13 @@ [ -"2.3.25-14-MacOS", -"2.3.25-14-Windows", -"2.3.25-14-Linux", +"2.3.25-15-MacOS", +"2.3.25-15-Windows", +"2.3.25-15-Linux", "2.4.17-rc-1-MacOS", "2.4.17-rc-1-Windows", "2.4.17-rc-1-Linux", +"2.4.18-rc-1-MacOS", +"2.4.18-rc-1-Windows", +"2.4.18-rc-1-Linux", "3.0-beta-1-Linux", "3.0-beta-1-MacOS", "3.0-beta-1-Windows"

1 0

[torbrowser/master] Merge branch 'maint-2.4'
by erinn＠torproject.org 19 Nov '13

19 Nov '13

commit dc7ca534f028825cab8f411e93cb23aabf695b18 Merge: e9152e6 3297949 Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Nov 19 16:31:39 2013 -0200 Merge branch 'maint-2.4' build-scripts/recommended-versions | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)

1 0

[torbrowser/maint-2.4] bump recommended-versions for 2.4.18-rc-1 and 2.3.25-15
by erinn＠torproject.org 19 Nov '13

19 Nov '13

1 0

r26433: {website} bump versions of TBB to 2.4.18-rc-1 and 2.3.25-15 for Firefo (website/trunk/include)
by Erinn Clark 19 Nov '13

19 Nov '13

Author: erinn Date: 2013-11-19 17:58:46 +0000 (Tue, 19 Nov 2013) New Revision: 26433 Modified: website/trunk/include/versions.wmi Log: bump versions of TBB to 2.4.18-rc-1 and 2.3.25-15 for Firefox 17.0.11esr Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2013-11-16 18:54:00 UTC (rev 26432) +++ website/trunk/include/versions.wmi 2013-11-19 17:58:46 UTC (rev 26433) @@ -2,59 +2,59 @@ <define-tag version-alpha whitespace=delete>0.2.4.18-rc</define-tag> <define-tag version-win32-stable whitespace=delete>0.2.3.25</define-tag> -<define-tag version-win32-alpha whitespace=delete>0.2.4.17-rc</define-tag> +<define-tag version-win32-alpha whitespace=delete>0.2.4.18-rc</define-tag> <define-tag version-win32-bundle-stable whitespace=delete>0.2.3.25</define-tag> -<define-tag version-win32-bundle-alpha whitespace=delete>0.2.4.17-rc</define-tag> +<define-tag version-win32-bundle-alpha whitespace=delete>0.2.4.18-rc</define-tag> -<define-tag version-win32-bridge-bundle-alpha whitespace=delete>0.2.4.17-rc-<version-vidalia-stable></define-tag> -<define-tag version-win32-relay-bundle-alpha whitespace=delete>0.2.4.17-rc-<version-vidalia-stable></define-tag> -<define-tag version-win32-exit-bundle-alpha whitespace=delete>0.2.4.17-rc-<version-vidalia-stable></define-tag> +<define-tag version-win32-bridge-bundle-alpha whitespace=delete>0.2.4.18-rc-<version-vidalia-stable></define-tag> +<define-tag version-win32-relay-bundle-alpha whitespace=delete>0.2.4.18-rc-<version-vidalia-stable></define-tag> +<define-tag version-win32-exit-bundle-alpha whitespace=delete>0.2.4.18-rc-<version-vidalia-stable></define-tag> <define-tag version-osx-x86-bundle-stable whitespace=delete>0.2.3.25</define-tag> -<define-tag version-osx-x86-bundle-alpha whitespace=delete>0.2.4.17-rc</define-tag> +<define-tag version-osx-x86-bundle-alpha whitespace=delete>0.2.4.18-rc</define-tag> <define-tag version-osx-ppc-bundle-stable whitespace=delete>0.2.3.25</define-tag> <define-tag version-osx-ppc-bundle-alpha whitespace=delete>0.2.4.17-rc</define-tag> <define-tag version-osx-x86-stable whitespace=delete>0.2.3.25</define-tag> -<define-tag version-osx-x86-alpha whitespace=delete>0.2.4.17-rc</define-tag> +<define-tag version-osx-x86-alpha whitespace=delete>0.2.4.18-rc</define-tag> <define-tag version-osx-ppc-stable whitespace=delete>0.2.3.25</define-tag> <define-tag version-osx-ppc-alpha whitespace=delete>0.2.4.17-rc</define-tag> -<define-tag version-torbrowserbundle whitespace=delete>2.3.25-14</define-tag> +<define-tag version-torbrowserbundle whitespace=delete>2.3.25-15</define-tag> <define-tag version-torbrowser-tor whitespace=delete>0.2.3.25</define-tag> <define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.21-stable, zlib-1.2.8, openssl-1.0.0k</define-tag> -<define-tag version-torbrowser-firefox whitespace=delete>17.0.10esr</define-tag> +<define-tag version-torbrowser-firefox whitespace=delete>17.0.11esr</define-tag> <define-tag version-torbrowser-torbutton whitespace=delete>1.5.2</define-tag> <define-tag version-torbrowser-pidgin whitespace=delete>2.7.5</define-tag> <define-tag version-torbrowser-otr whitespace=delete>3.2</define-tag> <define-tag version-torbrowser-vidalia whitespace=delete>0.2.21</define-tag> <define-tag version-torimbrowserbundle whitespace=delete>1.3.21</define-tag> -<define-tag version-torbrowserbundlealpha whitespace=delete>2.4.17-rc-1</define-tag> +<define-tag version-torbrowserbundlealpha whitespace=delete>2.4.18-rc-1</define-tag> <define-tag version-torobfsbundlealpha whitespace=delete>2.4.17-rc-1-pt2</define-tag> -<define-tag version-torbrowserbundlelinux32 whitespace=delete>2.3.25-14</define-tag> -<define-tag version-torbrowserbundlelinux64 whitespace=delete>2.3.25-14</define-tag> +<define-tag version-torbrowserbundlelinux32 whitespace=delete>2.3.25-15</define-tag> +<define-tag version-torbrowserbundlelinux64 whitespace=delete>2.3.25-15</define-tag> <define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.3.25</define-tag> <define-tag version-gnu-torbrowser-tor-components whitespace=delete>libevent-2.0.21-stable, zlib-1.2.8, openssl-1.0.0k</define-tag> -<define-tag version-gnu-torbrowser-firefox whitespace=delete>17.0.10esr</define-tag> +<define-tag version-gnu-torbrowser-firefox whitespace=delete>17.0.11esr</define-tag> <define-tag version-gnu-torbrowser-torbutton whitespace=delete>1.5.2</define-tag> <define-tag version-gnu-torbrowser-vidalia whitespace=delete>0.2.21</define-tag> -<define-tag version-torbrowserbundlelinux32alpha whitespace=delete>2.4.17-rc-1</define-tag> -<define-tag version-torbrowserbundlelinux64alpha whitespace=delete>2.4.17-rc-1</define-tag> +<define-tag version-torbrowserbundlelinux32alpha whitespace=delete>2.4.18-rc-1</define-tag> +<define-tag version-torbrowserbundlelinux64alpha whitespace=delete>2.4.18-rc-1</define-tag> <define-tag version-torobfsbundlelinux32alpha whitespace=delete>2.4.17-rc-1-pt2</define-tag> <define-tag version-torobfsbundlelinux64alpha whitespace=delete>2.4.17-rc-1-pt2</define-tag> -<define-tag version-torbrowserbundleosx32 whitespace=delete>2.3.25-14</define-tag> -<define-tag version-torbrowserbundleosx64 whitespace=delete>2.3.25-14</define-tag> +<define-tag version-torbrowserbundleosx32 whitespace=delete>2.3.25-15</define-tag> +<define-tag version-torbrowserbundleosx64 whitespace=delete>2.3.25-15</define-tag> <define-tag version-osx-torbrowser-tor whitespace=delete>0.2.3.25</define-tag> -<define-tag version-osx-torbrowser-firefox whitespace=delete>17.0.10esr</define-tag> +<define-tag version-osx-torbrowser-firefox whitespace=delete>17.0.11esr</define-tag> <define-tag version-osx-torbrowser-torbutton whitespace=delete>1.5.2</define-tag> <define-tag version-osx-torbrowser-vidalia whitespace=delete>0.2.21</define-tag> -<define-tag version-torbrowserbundleosx32alpha whitespace=delete>2.4.17-rc-1</define-tag> -<define-tag version-torbrowserbundleosx64alpha whitespace=delete>2.4.17-rc-1</define-tag> +<define-tag version-torbrowserbundleosx32alpha whitespace=delete>2.4.18-rc-1</define-tag> +<define-tag version-torbrowserbundleosx64alpha whitespace=delete>2.4.18-rc-1</define-tag> <define-tag version-torobfsbundleosx32alpha whitespace=delete>2.4.17-rc-1-pt2</define-tag> <define-tag version-torobfsbundleosx64alpha whitespace=delete>2.4.17-rc-1-pt2</define-tag>

1 0

[flashproxy/master] drop obsolete form of sha1 module and use with-syntax for locks
by infinity0＠torproject.org 19 Nov '13

19 Nov '13

commit f7883007ae2fd84c6349cba33725a657765011d9 Author: Ximin Luo <infinity0(a)gmx.com> Date: Tue Nov 19 17:32:52 2013 +0000 drop obsolete form of sha1 module and use with-syntax for locks --- flashproxy-client | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/flashproxy-client b/flashproxy-client index 945146a..e54e554 100755 --- a/flashproxy-client +++ b/flashproxy-client @@ -18,11 +18,7 @@ import traceback from flashproxy.util import parse_addr_spec, format_addr -try: - from hashlib import sha1 -except ImportError: - # Python 2.4 uses this name. - from sha import sha as sha1 +from hashlib import sha1 try: import numpy @@ -143,12 +139,9 @@ def safe_str(s): log_lock = threading.Lock() def log(msg): - log_lock.acquire() - try: + with log_lock: print >> options.log_file, (u"%s %s" % (time.strftime(LOG_DATE_FORMAT), msg)).encode("UTF-8") options.log_file.flush() - finally: - log_lock.release() def safe_format_addr(addr): return safe_str(format_addr(addr)) @@ -690,10 +683,9 @@ def register(): global register_flag if not options.register: return - register_condvar.acquire() - register_flag = True - register_condvar.notify() - register_condvar.release() + with register_condvar: + register_flag = True + register_condvar.notify() def register_using_command(command): basename = os.path.basename(command[0]) @@ -725,11 +717,10 @@ def register_one(): def registration_thread_func(): global register_flag while True: - register_condvar.acquire() - while not register_flag: - register_condvar.wait() - register_flag = False - register_condvar.release() + with register_condvar: + while not register_flag: + register_condvar.wait() + register_flag = False if len(unlinked_remotes) < DESIRED_NUMBER_OF_PROXIES: register_one()

1 0

[flashproxy/master] rm unused imports
by infinity0＠torproject.org 19 Nov '13

19 Nov '13

commit dd2a03831ef2db198de42730e83db5cfeb0517e6 Author: Ximin Luo <infinity0(a)gmx.com> Date: Tue Nov 19 16:52:58 2013 +0000 rm unused imports --- flashproxy-client | 4 ---- flashproxy-reg-appspot | 3 --- flashproxy-reg-email | 2 -- flashproxy-reg-http | 2 -- flashproxy-reg-url | 2 -- 5 files changed, 13 deletions(-) diff --git a/flashproxy-client b/flashproxy-client index d1490ce..945146a 100755 --- a/flashproxy-client +++ b/flashproxy-client @@ -5,10 +5,8 @@ import array import base64 import cStringIO import getopt -import httplib import os import os.path -import re import select import socket import struct @@ -17,8 +15,6 @@ import sys import threading import time import traceback -import urllib -import xml.sax.saxutils from flashproxy.util import parse_addr_spec, format_addr diff --git a/flashproxy-reg-appspot b/flashproxy-reg-appspot index eae80ea..516fcc9 100755 --- a/flashproxy-reg-appspot +++ b/flashproxy-reg-appspot @@ -3,13 +3,10 @@ import errno import getopt import httplib -import re import os import socket -import ssl import subprocess import sys -import tempfile import urlparse import urllib2 diff --git a/flashproxy-reg-email b/flashproxy-reg-email index b9b86b7..ab8d4cb 100755 --- a/flashproxy-reg-email +++ b/flashproxy-reg-email @@ -6,9 +6,7 @@ import os import re import smtplib import socket -import ssl import sys -import tempfile import urllib from flashproxy.keys import PIN_GOOGLE_CA_CERT, PIN_GOOGLE_PUBKEY_SHA1, DEFAULT_FACILITATOR_PUBKEY_PEM, check_certificate_pin, temp_cert diff --git a/flashproxy-reg-http b/flashproxy-reg-http index 1b97323..83b7084 100755 --- a/flashproxy-reg-http +++ b/flashproxy-reg-http @@ -1,8 +1,6 @@ #!/usr/bin/env python import getopt -import httplib -import re import socket import sys import urllib diff --git a/flashproxy-reg-url b/flashproxy-reg-url index 99503a0..c45bc26 100755 --- a/flashproxy-reg-url +++ b/flashproxy-reg-url @@ -2,8 +2,6 @@ import base64 import getopt -import re -import socket import sys import urllib import urlparse

1 0

[translation/liveusb-creator_completed] Update translations for liveusb-creator_completed
by translation＠torproject.org 19 Nov '13

19 Nov '13

commit 8cad4a8d7a71142f7b9b8a1f8a455216b924e1b2 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Nov 19 16:46:06 2013 +0000 Update translations for liveusb-creator_completed --- fi/fi.po | 345 ++++++++++++++++++++++++++++++++++---------------------------- 1 file changed, 191 insertions(+), 154 deletions(-) diff --git a/fi/fi.po b/fi/fi.po index 0e4e66e..1084a3c 100644 --- a/fi/fi.po +++ b/fi/fi.po @@ -4,14 +4,15 @@ # # Translators: # mikkoharhanen <gitti(a)mikkoharhanen.fi>, 2013 +# tonttula, 2013 # Ville-Pekka Vainio <vpivaini(a)cs.helsinki.fi>, 2009 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" -"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2013-02-14 16:07+0100\n" -"PO-Revision-Date: 2013-05-22 12:46+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2013-11-12 13:29+0100\n" +"PO-Revision-Date: 2013-11-19 16:40+0000\n" +"Last-Translator: mikkoharhanen <gitti(a)mikkoharhanen.fi>\n" "Language-Team: Finnish (http://www.transifex.com/projects/p/torproject/language/fi/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,66 +20,76 @@ msgstr "" "Language: fi\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../liveusb/dialog.py:150 ../liveusb/launcher_ui.py:149 +#: ../liveusb/dialog.py:159 ../liveusb/launcher_ui.py:158 #, python-format -msgid "%(distribution)s LiveUSB Creator" -msgstr "%(distribution)s LiveUSB:n luoja" +msgid "%(distribution)s installer" +msgstr "%(distribution)s asentaja" -#: ../liveusb/gui.py:758 +#: ../liveusb/gui.py:807 #, python-format msgid "%(filename)s selected" msgstr "%(filename)s valittu" -#: ../liveusb/creator.py:1018 +#: ../liveusb/gui.py:437 +#, python-format +msgid "%(size)s %(label)s" +msgstr "%(size)s %(label)s" + +#: ../liveusb/gui.py:443 +#, python-format +msgid "%(vendor)s %(model)s (%(details)s) - %(device)s" +msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s" + +#: ../liveusb/creator.py:1023 #, python-format msgid "%s already bootable" msgstr "%s on jo käynnistettävä" -#: ../liveusb/launcher_ui.py:156 +#: ../liveusb/launcher_ui.py:165 msgid "" "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n" "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n" "p, li { white-space: pre-wrap; }\n" "</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n" -"<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Need help? Read the </span><a href=\"file:///usr/share/doc/tails/website/doc/first_steps/usb_installation.en.html\"><span style=\" text-decoration: underline; color:#0000ff;\">documentation</span></a><span style=\" font-size:10pt;\">.</span></p></body></html>" -msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Tarvitsetko apua? Lue </span><a href=\"file:///usr/share/doc/tails/website/doc/first_steps/usb_installation.en.html\"><span style=\" text-decoration: underline; color:#0000ff;\">ohjeistus</span></a><span style=\" font-size:10pt;\">.</span></p></body></html>" +"<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Need help? Read the </span><a href=\"file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\"><span style=\" text-decoration: underline; color:#0000ff;\">documentation</span></a><span style=\" font-size:10pt;\">.</span></p></body></html>" +msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Tarvitsetko apua? Lue </span><a href=\"file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\"><span style=\" text-decoration: underline; color:#0000ff;\">ohjeistus</span></a><span style=\" font-size:10pt;\">.</span></p></body></html>" -#: ../liveusb/launcher_ui.py:151 +#: ../liveusb/launcher_ui.py:160 msgid "" "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n" "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n" "p, li { white-space: pre-wrap; }\n" "</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n" -"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Copy the running Tails onto a USB stick. All data on the target drive will be lost.</span></p></body></html>" -msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Kopioi käynnissä oleva Tails USB-tikulle. Kaikki USB-tikun tieto tulee häviämään.</span></p></body></html>" +"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Copy the running Tails onto a USB stick or SD card. All data on the target drive will be lost.</span></p></body></html>" +msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Kopioi käytössä oleva Tails USB-tikulle tai SD-kortille. Kaikki laitteen tieto häviää.</span></p></body></html>" -#: ../liveusb/launcher_ui.py:153 +#: ../liveusb/launcher_ui.py:162 msgid "" "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n" "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n" "p, li { white-space: pre-wrap; }\n" "</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n" -"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Copy the running Tails onto an already installed Tails USB stick. Other partitions found on the stick are preserved.</span></p></body></html>" -msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Kopioi käynnissä oleva Tails USB-tikulle, jolle se on jo aiemmin asennettu. Tikun muut osiot säästyvät.</span></p></body></html>" +"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Copy the running Tails onto an already installed Tails device. Other partitions found on the stick are preserved.</span></p></body></html>" +msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Kopioi käytössä oleva Tails laitteelle, johon se on jo valmiiksi asennettu. Tikun muut osiot säästetään.</span></p></body></html>" -#: ../liveusb/launcher_ui.py:155 +#: ../liveusb/launcher_ui.py:164 msgid "" "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n" "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n" "p, li { white-space: pre-wrap; }\n" "</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n" -"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Upgrade an already installed Tails USB stick from a new ISO image.</span></p></body></html>" -msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Päivitä aiemmin USB-tikulle asennettu Tails uudelta ISO-levykuvalta.</span></p></body></html>" +"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Upgrade an already installed Tails device from a new ISO image.</span></p></body></html>" +msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Päivitä valmiiksi asennettu Tails uudelta ISO-levykuvalta.</span></p></body></html>" -#: ../liveusb/dialog.py:154 +#: ../liveusb/dialog.py:163 msgid "Alt+B" msgstr "Alt+B" -#: ../liveusb/dialog.py:153 +#: ../liveusb/dialog.py:162 msgid "Browse" msgstr "Selaa" -#: ../liveusb/dialog.py:160 +#: ../liveusb/dialog.py:169 msgid "" "By allocating extra space on your USB stick for a persistent overlay, you " "will be able to store data and make permanent modifications to your live " @@ -86,262 +97,269 @@ msgid "" "persist after a reboot." msgstr "Jos varaat USB-tikulta vapaata tilaa pysyvää tallennustilaa varten, voit tallettaa tietoa ja muokata pysyvästi live-käyttöjärjestelmääsi. Jos pysyvää tallennustilaa ei ole, tallentamasi tiedot eivät säily uudelleen käynnistyksen jälkeen." -#: ../liveusb/creator.py:1120 ../liveusb/creator.py:1383 +#: ../liveusb/creator.py:1125 ../liveusb/creator.py:1388 #, python-format msgid "Calculating the SHA1 of %s" msgstr "Lasketaan %s:n SHA1-tarkistussummaa" -#: ../liveusb/creator.py:1331 +#: ../liveusb/creator.py:1336 msgid "Cannot find" msgstr "Ei voida löytää" -#: ../liveusb/creator.py:574 +#: ../liveusb/creator.py:545 #, python-format msgid "Cannot find device %s" msgstr "Laitetta %s ei löydy" -#: ../liveusb/launcher_ui.py:150 +#: ../liveusb/launcher_ui.py:159 msgid "" "Clone\n" "&&\n" "Install" msgstr "Jäljennä\n&&\nAsenna" -#: ../liveusb/launcher_ui.py:152 +#: ../liveusb/launcher_ui.py:161 msgid "" "Clone\n" "&&\n" "Upgrade" msgstr "Jäljennä\n&&\nPäivitä" -#: ../liveusb/dialog.py:165 -msgid "Create Live USB" -msgstr "Luo Live-USB" - -#: ../liveusb/creator.py:429 +#: ../liveusb/creator.py:400 #, python-format msgid "Creating %sMB persistent overlay" msgstr "Luodaan %s Mt:n pysyvää tallennustilaa" -#: ../liveusb/gui.py:534 +#: ../liveusb/gui.py:565 msgid "" "Device is not yet mounted, so we cannot determine the amount of free space." -" Setting a maximum limit of 8G for the persistent storage." -msgstr "Vapaan tilan suuruutta ei voi vielä määritellä, sillä levyä ei ole liitetty. Asetetaan 8 Gt:n yläraja pysyvälle säilytystilalle." +msgstr "Laitetta ei ole vielä liitetty, joten emme voi arvioida vapaan tilan määrää." -#: ../liveusb/gui.py:197 -#, python-format -msgid "Device is too small: it must be at least %s MiB." -msgstr "Laite on liian pieni. Tarvitaan vähintään %s Mt." - -#: ../liveusb/dialog.py:157 +#: ../liveusb/dialog.py:166 #, python-format msgid "Download %(distribution)s" msgstr "Lataa %(distribution)s" -#: ../liveusb/gui.py:732 +#: ../liveusb/gui.py:781 msgid "Download complete!" msgstr "Lataus on valmis!" -#: ../liveusb/gui.py:736 +#: ../liveusb/gui.py:785 msgid "Download failed: " msgstr "Lataus epäonnistui:" -#: ../liveusb/gui.py:84 +#: ../liveusb/gui.py:88 #, python-format msgid "Downloading %s..." msgstr "Ladataan %s..." -#: ../liveusb/creator.py:1116 +#: ../liveusb/creator.py:1121 msgid "Drive is a loopback, skipping MBR reset" msgstr "Levy on loopback-laite: ohitetaan MBR:n palautus" -#: ../liveusb/creator.py:1196 +#: ../liveusb/creator.py:816 +#, python-format +msgid "Entering unmount_device for '%(device)s'" +msgstr "Suoritetaan unmount_device laitteelle '%(device)s'" + +#: ../liveusb/creator.py:1201 msgid "Error probing device" msgstr "Laitteen etsimisessä virhe" -#: ../liveusb/gui.py:226 +#: ../liveusb/gui.py:227 msgid "" "Error: Cannot set the label or obtain the UUID of your device. Unable to " "continue." msgstr "Virhe: Ei voida asettaa nimiötä tai hakea laitteen UUID:tä. Ei voida jatkaa." -#: ../liveusb/creator.py:405 +#: ../liveusb/creator.py:376 msgid "" "Error: The SHA1 of your Live CD is invalid. You can run this program with " "the --noverify argument to bypass this verification check." msgstr "Virhe: LiveCD:n SHA1-tarkistussumma on virheellinen. Voit ajaa tämän ohjelman ja käyttää valitsinta --noverify, jolloin varmistus ohitetaan." -#: ../liveusb/creator.py:144 -msgid "Extracting live image to USB device..." -msgstr "Puretaan Live-levykuva USB-laitteelle..." +#: ../liveusb/creator.py:145 +msgid "Extracting live image to the target device..." +msgstr "Puretaan live-levykuvaa kohdelaittelle…" -#: ../liveusb/creator.py:1061 +#: ../liveusb/creator.py:1066 #, python-format msgid "Formatting %(device)s as FAT32" msgstr "Alustetaan %(device)s FAT32:lla." -#: ../liveusb/creator.py:139 +#: ../liveusb/creator.py:140 msgid "ISO MD5 checksum passed" msgstr "ISO:n MD5-tarkistussumma varmistui" -#: ../liveusb/creator.py:137 +#: ../liveusb/creator.py:138 msgid "ISO MD5 checksum verification failed" msgstr "ISO:n MD5-tarkistussumma ei varmistunut" -#: ../liveusb/dialog.py:156 +#: ../liveusb/dialog.py:165 msgid "" "If you do not select an existing Live ISO, the selected release will be " "downloaded for you." msgstr "Jos et valitse olemassaolevaa Live ISOa, valittu julkaisu ladataan puolestasi." -#: ../liveusb/gui.py:601 +#: ../liveusb/dialog.py:174 +msgid "Install Tails" +msgstr "Asenna Tails" + +#: ../liveusb/gui.py:628 msgid "Installation complete!" msgstr "Asennus on valmis!" -#: ../liveusb/gui.py:276 +#: ../liveusb/gui.py:279 #, python-format msgid "Installation complete! (%s)" msgstr "Asennus on valmis! (%s)" -#: ../liveusb/gui.py:602 +#: ../liveusb/gui.py:629 msgid "Installation was completed. Press OK to close this program." msgstr "Asennus on valmis. Napsauta OK, jolloin ohjelma sulkeutuu." -#: ../liveusb/creator.py:913 ../liveusb/creator.py:1237 +#: ../liveusb/creator.py:919 ../liveusb/creator.py:1242 msgid "Installing bootloader..." msgstr "Asennetaan alkulatausohjelma..." -#: ../liveusb/gui.py:281 +#: ../liveusb/gui.py:284 msgid "LiveUSB creation failed!" msgstr "LiveUSB:n luominen epäonnistui!" -#: ../liveusb/creator.py:1332 +#: ../liveusb/creator.py:1337 msgid "" "Make sure to extract the entire liveusb-creator zip file before running this" " program." msgstr "Huolehdi, että purat kokonaisuudessaan liveusb-creatorin zip -tiedoston ennen kuin ajat tämän ohjelman." -#: ../liveusb/creator.py:1208 +#: ../liveusb/creator.py:1213 msgid "" "Make sure your USB key is plugged in and formatted with the FAT filesystem" msgstr "Varmista että USB-tikku on kiinnitetty ja että sen tiedostojärjestelmä on FAT" -#: ../liveusb/creator.py:847 +#: ../liveusb/creator.py:838 #, python-format msgid "Mount %s exists after unmounting" msgstr "Irrotettu liitoskohta %s on vielä olemassa" -#: ../liveusb/gui.py:663 ../liveusb/gui.py:680 -msgid "Next" -msgstr "Seuraava" - -#: ../liveusb/gui.py:541 +#: ../liveusb/gui.py:571 #, python-format msgid "No free space on device %(device)s" msgstr "Laitteella %(device)s ei ole vapaata tilaa" -#: ../liveusb/creator.py:824 +#: ../liveusb/creator.py:805 msgid "No mount points found" msgstr "Liitoskohtia ei löytynyt" -#: ../liveusb/creator.py:422 -msgid "Not enough free space on device." -msgstr "Laitteella ei ole riittävästi vapaata tilaa." +#: ../liveusb/creator.py:393 +#, python-format +msgid "" +"Not enough free space on device.\n" +"%dMB ISO + %dMB overlay > %dMB free space" +msgstr "Laitteella ei ole tarpeeksi vapaata tilaa.\n%d Mt:n ISO + %d Mt:n tallennustila > %d Mt:a vapaata tilaa" -#: ../liveusb/gui.py:546 +#: ../liveusb/gui.py:552 msgid "Partition is FAT16; Restricting overlay size to 2G" msgstr "Osion levyjärjestelmä on FAT16: koko rajoitetaan 2 Gt:uun" -#: ../liveusb/gui.py:592 +#: ../liveusb/gui.py:548 +msgid "Partition is FAT32; Restricting overlay size to 4G" +msgstr "Levyjärjestelmänä on FAT32; rajoitetaan levyn koko 4 Gt:un." + +#: ../liveusb/creator.py:226 ../liveusb/creator.py:845 +#, python-format +msgid "Partitioning device %(device)s" +msgstr "Partitioidaan laitetta %(device)s" + +#: ../liveusb/gui.py:619 msgid "Persistent Storage" msgstr "Pysyvä tallennustila" -#: ../liveusb/dialog.py:161 +#: ../liveusb/dialog.py:170 msgid "Persistent Storage (0 MB)" msgstr "Pysyvä tallennustila (0 Mt)" -#: ../liveusb/gui.py:661 ../liveusb/gui.py:678 -msgid "Press 'Next' if you wish to continue." -msgstr "Napsauta 'Seuraava', jos haluat jatkaa." +#: ../liveusb/gui.py:700 ../liveusb/gui.py:730 +msgid "Please confirm your device selection" +msgstr "Vahvista laitevalintasi" -#: ../liveusb/gui.py:452 +#: ../liveusb/gui.py:465 msgid "Refreshing releases..." msgstr "Päivitetään julkaisuja..." -#: ../liveusb/gui.py:457 +#: ../liveusb/gui.py:470 msgid "Releases updated!" msgstr "Julkaisut päivitetty!" -#: ../liveusb/creator.py:936 ../liveusb/creator.py:1255 +#: ../liveusb/creator.py:942 ../liveusb/creator.py:1260 #, python-format msgid "Removing %(file)s" msgstr "Poistetaan %(file)s" -#: ../liveusb/creator.py:498 +#: ../liveusb/creator.py:469 msgid "Removing existing Live OS" msgstr "Poistetaan nykyinen Live-käyttöjärjestelmä" -#: ../liveusb/creator.py:1110 +#: ../liveusb/creator.py:1115 #, python-format msgid "Resetting Master Boot Record of %s" msgstr "Palautetaan %s:n oletusarvot" -#: ../liveusb/gui.py:743 +#: ../liveusb/gui.py:792 msgid "Select Live ISO" msgstr "Valitse Live-ISO" -#: ../liveusb/creator.py:181 +#: ../liveusb/creator.py:182 msgid "Setting up OLPC boot file..." msgstr "Luodaan OLPC-käynnistystiedostoa..." -#: ../liveusb/creator.py:738 +#: ../liveusb/creator.py:719 #, python-format msgid "" -"Some partitions of USB device %(device)s are mounted. They will be unmounted" -" before starting the installation process." -msgstr "USB-laitteen %(device)s jotkut osiot on liitetty. Osiot irrotetaan ennen kuin asennus alkaa." +"Some partitions of the target device %(device)s are mounted. They will be " +"unmounted before starting the installation process." +msgstr "Jotkut laitteen %(device)s osiot on liitetty. Osiot irrotetaan ennen kuin asennus alkaa." -#: ../liveusb/creator.py:130 +#: ../liveusb/creator.py:131 msgid "" "Source type does not support verification of ISO MD5 checksum, skipping" msgstr "Lähteen muoto ei tue ISO:n MD5-tarkistussumman varmistamista: vaihe ohitetaan" -#: ../liveusb/creator.py:1144 +#: ../liveusb/creator.py:1149 msgid "Synchronizing data on disk..." msgstr "Synkronoidaan levyn tiedot..." -#: ../liveusb/dialog.py:159 +#: ../liveusb/dialog.py:168 msgid "Target Device" msgstr "Kohdelaite" -#: ../liveusb/gui.py:625 +#: ../liveusb/gui.py:665 msgid "" -"The Master Boot Record on your device is blank. Pressing 'Create Live USB' " +"The Master Boot Record on your device is blank. Pressing 'Install Tails' " "again will reset the MBR on this device." -msgstr "Laitteesi Master Boot Record on tyhjä. 'Luo Live-USB' palauttaa laitteen MBR:n oletusarvoonsa." +msgstr "Pääkäynnistyslohko (MBR) on tyhjä. Asenna Tails -painike palauttaa laitteen pääkäynnistyslohkon." -#: ../liveusb/gui.py:746 +#: ../liveusb/gui.py:795 msgid "" "The selected file is unreadable. Please fix its permissions or select " "another file." msgstr "Valittu tiedosto ei ole luettavissa. Korjaa käyttöoikeudet tai valitse toinen tiedosto." -#: ../liveusb/creator.py:366 +#: ../liveusb/creator.py:337 #, python-format msgid "" "There was a problem executing the following command: `%(command)s`.\n" "A more detailed error log has been written to '%(filename)s'." msgstr "Komennon `%(command)s` suorittamisessa oli ongelma.\nTarkempi virheloki on kirjoitettu tiedostoon '%(filename)s'." -#: ../liveusb/dialog.py:151 +#: ../liveusb/dialog.py:160 msgid "" "This button allows you to browse for an existing Live system ISO that you " "have previously downloaded. If you do not select one, a release will be " "downloaded for you automatically." msgstr "Tästä napista voit selata Live-levykuvia, jotka on tallennettu koneellesi. Jos et valitse levykuvaa, julkaisu ladataan sinulle automaattisesti." -#: ../liveusb/dialog.py:164 +#: ../liveusb/dialog.py:173 msgid "" "This button will begin the LiveUSB creation process. This entails " "optionally downloading a release (if an existing one wasn't selected), " @@ -349,203 +367,222 @@ msgid "" "installing the bootloader." msgstr "Tästä napista aloitetaan Live-USB:n valmistus. Valmistuksessa ladataan julkaisu, jos olemassaolevaa levykuvaa ei valita, puretaan ISO-levykuva USB-laitteelle, luodaan laitteelle pysyvä tallennustila ja asennetaan alkulatausohjelma." -#: ../liveusb/dialog.py:158 +#: ../liveusb/dialog.py:167 msgid "" "This is the USB stick that you want to install your Live system on. This " "device must be formatted with the FAT filesystem." msgstr "Tämä on USB-tikku, jolle haluat asentaa Live-käyttöjärjestelmän. Laitteen on oltava alustettu FAT-tiedostojärjestelmällä." -#: ../liveusb/dialog.py:163 +#: ../liveusb/dialog.py:172 msgid "" "This is the progress bar that will indicate how far along in the LiveUSB " "creation process you are" msgstr "Tämä on edistymisen ilmaisin, joka kertoo, kuinka pitkällä LiveUSB:n luonti on." -#: ../liveusb/dialog.py:162 +#: ../liveusb/dialog.py:171 msgid "This is the status console, where all messages get written to." msgstr "Tämä on tilakonsoli, jonne kaikki viestit kirjoitetaan." -#: ../liveusb/creator.py:908 +#: ../liveusb/creator.py:882 +msgid "Trying to continue anyway." +msgstr "Yritetään jatkaa jokatapauksessa." + +#: ../liveusb/creator.py:914 #, python-format msgid "Unable to change volume label: %(message)s" msgstr "Taltion nimiötä ei voida muuttaa: %(message)s" -#: ../liveusb/creator.py:507 ../liveusb/creator.py:518 +#: ../liveusb/creator.py:478 ../liveusb/creator.py:489 #, python-format msgid "Unable to chmod %(file)s: %(message)s" msgstr "Komentoa chmod ei voi käyttää tiedostoon %(file)s: %(message)s" -#: ../liveusb/creator.py:488 +#: ../liveusb/creator.py:459 #, python-format msgid "Unable to copy %(infile)s to %(outfile)s: %(message)s" msgstr "Tiedostoa %(infile)s ei voida kopioida kohteeseen %(outfile)s: %(message)s" -#: ../liveusb/gui.py:414 +#: ../liveusb/gui.py:418 msgid "Unable to find any USB drive" msgstr "USB-laitetta ei löytynyt" -#: ../liveusb/creator.py:1198 -msgid "Unable to find any removable device" -msgstr "Vaihdettavaa levyä ei löydy" +#: ../liveusb/creator.py:1203 +msgid "Unable to find any supported device" +msgstr "Tuettua laitetta ei löydy" -#: ../liveusb/creator.py:1038 +#: ../liveusb/creator.py:1043 msgid "Unable to find partition" msgstr "Osiota ei löydy" -#: ../liveusb/creator.py:1278 +#: ../liveusb/creator.py:1283 msgid "" "Unable to get Win32_LogicalDisk; win32com query did not return any results" msgstr "Win32_LogicalDisk ei ole saatavissa; win32com -kysely ei tuottanut tuloksia." -#: ../liveusb/gui.py:653 +#: ../liveusb/gui.py:693 msgid "Unable to mount device" msgstr "Laitetta ei voida liittää" -#: ../liveusb/creator.py:812 +#: ../liveusb/creator.py:793 #, python-format msgid "Unable to mount device: %(message)s" msgstr "Laitetta ei voida liittää: %(message)s" -#: ../liveusb/creator.py:523 +#: ../liveusb/creator.py:494 #, python-format msgid "Unable to remove directory from previous LiveOS: %(message)s" msgstr "Edellisen Live-käyttöjärjestelmän hakemistoa ei voi poistaa: %(message)s" -#: ../liveusb/creator.py:511 +#: ../liveusb/creator.py:482 #, python-format msgid "Unable to remove file from previous LiveOS: %(message)s" msgstr "Edellisen Live-käyttöjärjestelmän tiedostoa ei voi poistaa: %(message)s" -#: ../liveusb/creator.py:1113 +#: ../liveusb/creator.py:1118 msgid "" "Unable to reset MBR. You may not have the `syslinux` package installed." msgstr "MBR:ää ei voitu palauttaa. Pakettia syslinux ei ehkä ole asennettu." -#: ../liveusb/gui.py:752 +#: ../liveusb/gui.py:801 msgid "" "Unable to use the selected file. You may have better luck if you move your " "ISO to the root of your drive (ie: C:\\)" msgstr "Valittua tiedostoa ei voitu käyttää. Tämä saattaa onnistua paremmin, jos siirrät ISOn aseman juurihakemistoon (esim. C:\\)." -#: ../liveusb/creator.py:719 +#: ../liveusb/creator.py:700 #, python-format msgid "Unable to write on %(device)s, skipping." msgstr "Laitteelle %(device)s ei voi kirjoittaa: vaihe ohitetaan." -#: ../liveusb/creator.py:411 +#: ../liveusb/creator.py:382 msgid "Unknown ISO, skipping checksum verification" msgstr "Tunnistamaton ISO, ohitetaan tarkistussumman varmistus." -#: ../liveusb/creator.py:808 +#: ../liveusb/creator.py:789 #, python-format msgid "Unknown dbus exception while trying to mount device: %(message)s" msgstr "Dbusissa tuntematon poikkeus, kun laitetta liitettiin: %(message)s" -#: ../liveusb/creator.py:787 ../liveusb/creator.py:887 +#: ../liveusb/creator.py:768 ../liveusb/creator.py:893 msgid "Unknown filesystem. Your device may need to be reformatted." msgstr "Tuntematon tiedostojärjestelmä. Laitteesi on ehkä alustettava uudelleen." -#: ../liveusb/gui.py:80 +#: ../liveusb/gui.py:84 #, python-format msgid "Unknown release: %s" msgstr "Tuntematon julkaisu: %s" -#: ../liveusb/creator.py:835 +#: ../liveusb/creator.py:830 +#, python-format +msgid "Unmounting '%(udi)s' on '%(device)s'" +msgstr "Irrotetaan '%(udi)s' laitteelta '%(device)s'" + +#: ../liveusb/creator.py:826 +#, python-format +msgid "Unmounting mounted filesystems on '%(device)s'" +msgstr "Irrotetaan liitetty tiedostojärjestelmä laitteelta '%(device)s'" + +#: ../liveusb/creator.py:879 #, python-format -msgid "Unmounting %(device)s" -msgstr "Irrotetaan %(device)s" +msgid "Unsupported device '%(device)s', please report a bug." +msgstr "Laitetta ei tueta '%(device)s', raportoi virheestä." -#: ../liveusb/creator.py:792 ../liveusb/creator.py:890 +#: ../liveusb/creator.py:773 ../liveusb/creator.py:896 #, python-format msgid "Unsupported filesystem: %s" msgstr "Tiedostojärjestelmä, jota ei tueta: %s" -#: ../liveusb/creator.py:790 +#: ../liveusb/creator.py:771 #, python-format msgid "" "Unsupported filesystem: %s\n" "In case you are trying to upgrade a manually installed Tails system (that is, if it was installed without this installer), this option is not supported: you need to install it anew to start with, e.g. by choosing the \"Clone & Install\" action instead." msgstr "Levyjärjestelmä, jota ei tueta: %s\nJos yrität päivittää käsin asennettua Tails-järjestelmää (jonka luomisessa ei ole käytetty asennusohjelmaa), tämä vaihtoehto ei ole valittavissa. Sinun on sen sijaan asennettava järjestelmä uudelleen esimerkiksi Jäljennä & Asenna -toiminnolla." -#: ../liveusb/creator.py:1211 +#: ../liveusb/creator.py:1216 #, python-format msgid "" "Unsupported filesystem: %s\n" "Please backup and format your USB key with the FAT filesystem." msgstr "Tiedostojärjestelmää ei tueta: %s\nTee varmuuskopiot ja alusta USB-tikku FAT-tiedostojärjestelmällä." -#: ../liveusb/launcher_ui.py:154 +#: ../liveusb/launcher_ui.py:163 msgid "Upgrade from ISO" msgstr "Päivitä ISOlta" -#: ../liveusb/dialog.py:152 +#: ../liveusb/dialog.py:161 msgid "Use existing Live system ISO" msgstr "Käytä olemassaolevaa Live-ISOa" -#: ../liveusb/creator.py:132 +#: ../liveusb/creator.py:133 msgid "Verifying ISO MD5 checksum" msgstr "Varmistetaan ISO:n MD5-tarkistussumma" -#: ../liveusb/creator.py:385 +#: ../liveusb/creator.py:356 msgid "Verifying SHA1 checksum of LiveCD image..." msgstr "Varmistetaan LiveCD-levykuvan SHA1-tarkistussumma..." -#: ../liveusb/creator.py:389 +#: ../liveusb/creator.py:360 msgid "Verifying SHA256 checksum of LiveCD image..." msgstr "Varmistetaan LiveCD-levykuvan SHA256-tarkistussumma..." -#: ../liveusb/creator.py:884 ../liveusb/creator.py:1204 +#: ../liveusb/creator.py:890 ../liveusb/creator.py:1209 msgid "Verifying filesystem..." msgstr "Tarkistetaan tiedostojärjestelmää..." -#: ../liveusb/gui.py:659 -msgid "Warning: All data on the selected drive will be lost." -msgstr "Varoitus: Valitun levyn kaikki tiedot häviävät." - -#: ../liveusb/gui.py:676 +#: ../liveusb/gui.py:728 msgid "" "Warning: Creating a new persistent overlay will delete your existing one." msgstr "Varoitus: Uuden pysyvän tallennustilan luominen tuhoaa nykyisen." -#: ../liveusb/gui.py:639 +#: ../liveusb/gui.py:679 msgid "" "Warning: The Master Boot Record on your device does not match your system's " "syslinux MBR. If you have trouble booting this stick, try running the " "liveusb-creator with the --reset-mbr option." msgstr "Varoitus: Laitteesi Master Boot Record ei vastaa järjestelmäsi Syslinux MBR:ää. Jos sinulla on ongelmia käynnistää tietokone uudelleen tikulta, voit ajaa ohjelman liveusb-creator ja käyttää valitsinta --reset-mbr." -#: ../liveusb/gui.py:389 +#: ../liveusb/gui.py:392 msgid "" "Warning: This tool needs to be run as an Administrator. To do this, right " "click on the icon and open the Properties. Under the Compatibility tab, " "check the \"Run this program as an administrator\" box." msgstr "Varoitus: Ohjelma on ajettava järjestelmänvalvojana. Tämä onnistuu, kun napsautat kuvaketta oikealla hiirenpainikkeella ja valitset Ominaisuudet. Rastita Yhteensopivuus-välilehdestä kohta \"Suorita ohjelma järjestelmänvalvojana\"." -#: ../liveusb/creator.py:151 +#: ../liveusb/creator.py:152 #, python-format msgid "Wrote to device at %(speed)d MB/sec" msgstr "Laitteelle kirjoitettiin nopeudella %(speed)d Mt/s" -#: ../liveusb/creator.py:636 +#: ../liveusb/gui.py:701 +#, python-format +msgid "" +"You are going to install Tails on the %(size)s %(vendor)s %(model)s device " +"(%(device)s). All data on the selected device will be lost. Continue?" +msgstr "Olet asentamassa Tailsin %(size)s %(vendor)s %(model)s laitteelle (%(device)s). Kaikki tiedot asemalta menetetään. Jatketaanko?" + +#: ../liveusb/gui.py:718 +#, python-format +msgid "" +"You are going to upgrade Tails on the %(parent_size)s %(vendor)s %(model)s " +"device (%(device)s). Any persistent volume on this device will remain " +"unchanged. Continue?" +msgstr "Olet päivittämässä Tailsin %(parent_size)s %(vendor)s %(model)s laitteelle (%(device)s). Mahdolliset pysyvät osiot jätetään ennalleen. Jatketaanko?" + +#: ../liveusb/creator.py:607 msgid "" "You are using an old version of syslinux-extlinux that does not support the " "ext4 filesystem" msgstr "Käytät syslinux-extlinuxin vanhaa versiota, joka ei tue ext4-tiedostojärjestelmää" -#: ../liveusb/gui.py:737 +#: ../liveusb/gui.py:786 msgid "You can try again to resume your download" msgstr "Voit yrittää jatkaa latausta" -#: ../liveusb/creator.py:91 +#: ../liveusb/creator.py:92 msgid "You must run this application as root" msgstr "Ohjelma on suoritettava pääkäyttäjänä" -#: ../liveusb/gui.py:673 -msgid "" -"Your device already contains a LiveOS.\n" -"If you continue, this will be overwritten." -msgstr "Tämä laite sisältää jo live-käyttöjärjestelmän.\nJos jatkat, entinen käyttöjärjestelmä korvataan." - -#: ../liveusb/dialog.py:155 +#: ../liveusb/dialog.py:164 msgid "or" msgstr "tai"

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 19 Nov '13

19 Nov '13

commit 7eb5b147e37884e45f71ec5cc5e7286a532f0897 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Nov 19 16:46:03 2013 +0000 Update translations for liveusb-creator --- fi/fi.po | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/fi/fi.po b/fi/fi.po index 75809a4..1084a3c 100644 --- a/fi/fi.po +++ b/fi/fi.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-11-12 13:29+0100\n" -"PO-Revision-Date: 2013-11-19 16:13+0000\n" +"PO-Revision-Date: 2013-11-19 16:40+0000\n" "Last-Translator: mikkoharhanen <gitti(a)mikkoharhanen.fi>\n" "Language-Team: Finnish (http://www.transifex.com/projects/p/torproject/language/fi/)\n" "MIME-Version: 1.0\n" @@ -33,7 +33,7 @@ msgstr "%(filename)s valittu" #: ../liveusb/gui.py:437 #, python-format msgid "%(size)s %(label)s" -msgstr "" +msgstr "%(size)s %(label)s" #: ../liveusb/gui.py:443 #, python-format @@ -52,7 +52,7 @@ msgid "" "p, li { white-space: pre-wrap; }\n" "</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n" "<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Need help? Read the </span><a href=\"file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\"><span style=\" text-decoration: underline; color:#0000ff;\">documentation</span></a><span style=\" font-size:10pt;\">.</span></p></body></html>" -msgstr "" +msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Tarvitsetko apua? Lue </span><a href=\"file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\"><span style=\" text-decoration: underline; color:#0000ff;\">ohjeistus</span></a><span style=\" font-size:10pt;\">.</span></p></body></html>" #: ../liveusb/launcher_ui.py:160 msgid "" @@ -61,7 +61,7 @@ msgid "" "p, li { white-space: pre-wrap; }\n" "</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n" "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Copy the running Tails onto a USB stick or SD card. All data on the target drive will be lost.</span></p></body></html>" -msgstr "" +msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Kopioi käytössä oleva Tails USB-tikulle tai SD-kortille. Kaikki laitteen tieto häviää.</span></p></body></html>" #: ../liveusb/launcher_ui.py:162 msgid "" @@ -70,7 +70,7 @@ msgid "" "p, li { white-space: pre-wrap; }\n" "</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n" "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Copy the running Tails onto an already installed Tails device. Other partitions found on the stick are preserved.</span></p></body></html>" -msgstr "" +msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Kopioi käytössä oleva Tails laitteelle, johon se on jo valmiiksi asennettu. Tikun muut osiot säästetään.</span></p></body></html>" #: ../liveusb/launcher_ui.py:164 msgid "" @@ -79,7 +79,7 @@ msgid "" "p, li { white-space: pre-wrap; }\n" "</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n" "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Upgrade an already installed Tails device from a new ISO image.</span></p></body></html>" -msgstr "" +msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Päivitä valmiiksi asennettu Tails uudelta ISO-levykuvalta.</span></p></body></html>" #: ../liveusb/dialog.py:163 msgid "Alt+B" @@ -160,7 +160,7 @@ msgstr "Levy on loopback-laite: ohitetaan MBR:n palautus" #: ../liveusb/creator.py:816 #, python-format msgid "Entering unmount_device for '%(device)s'" -msgstr "" +msgstr "Suoritetaan unmount_device laitteelle '%(device)s'" #: ../liveusb/creator.py:1201 msgid "Error probing device" @@ -256,7 +256,7 @@ msgstr "Liitoskohtia ei löytynyt" msgid "" "Not enough free space on device.\n" "%dMB ISO + %dMB overlay > %dMB free space" -msgstr "" +msgstr "Laitteella ei ole tarpeeksi vapaata tilaa.\n%d Mt:n ISO + %d Mt:n tallennustila > %d Mt:a vapaata tilaa" #: ../liveusb/gui.py:552 msgid "Partition is FAT16; Restricting overlay size to 2G" @@ -264,7 +264,7 @@ msgstr "Osion levyjärjestelmä on FAT16: koko rajoitetaan 2 Gt:uun" #: ../liveusb/gui.py:548 msgid "Partition is FAT32; Restricting overlay size to 4G" -msgstr "" +msgstr "Levyjärjestelmänä on FAT32; rajoitetaan levyn koko 4 Gt:un." #: ../liveusb/creator.py:226 ../liveusb/creator.py:845 #, python-format @@ -318,7 +318,7 @@ msgstr "Luodaan OLPC-käynnistystiedostoa..." msgid "" "Some partitions of the target device %(device)s are mounted. They will be " "unmounted before starting the installation process." -msgstr "" +msgstr "Jotkut laitteen %(device)s osiot on liitetty. Osiot irrotetaan ennen kuin asennus alkaa." #: ../liveusb/creator.py:131 msgid "" @@ -337,7 +337,7 @@ msgstr "Kohdelaite" msgid "" "The Master Boot Record on your device is blank. Pressing 'Install Tails' " "again will reset the MBR on this device." -msgstr "" +msgstr "Pääkäynnistyslohko (MBR) on tyhjä. Asenna Tails -painike palauttaa laitteen pääkäynnistyslohkon." #: ../liveusb/gui.py:795 msgid "" @@ -475,12 +475,12 @@ msgstr "Tuntematon julkaisu: %s" #: ../liveusb/creator.py:830 #, python-format msgid "Unmounting '%(udi)s' on '%(device)s'" -msgstr "" +msgstr "Irrotetaan '%(udi)s' laitteelta '%(device)s'" #: ../liveusb/creator.py:826 #, python-format msgid "Unmounting mounted filesystems on '%(device)s'" -msgstr "" +msgstr "Irrotetaan liitetty tiedostojärjestelmä laitteelta '%(device)s'" #: ../liveusb/creator.py:879 #, python-format @@ -559,7 +559,7 @@ msgstr "Laitteelle kirjoitettiin nopeudella %(speed)d Mt/s" msgid "" "You are going to install Tails on the %(size)s %(vendor)s %(model)s device " "(%(device)s). All data on the selected device will be lost. Continue?" -msgstr "" +msgstr "Olet asentamassa Tailsin %(size)s %(vendor)s %(model)s laitteelle (%(device)s). Kaikki tiedot asemalta menetetään. Jatketaanko?" #: ../liveusb/gui.py:718 #, python-format @@ -567,7 +567,7 @@ msgid "" "You are going to upgrade Tails on the %(parent_size)s %(vendor)s %(model)s " "device (%(device)s). Any persistent volume on this device will remain " "unchanged. Continue?" -msgstr "" +msgstr "Olet päivittämässä Tailsin %(parent_size)s %(vendor)s %(model)s laitteelle (%(device)s). Mahdolliset pysyvät osiot jätetään ennalleen. Jatketaanko?" #: ../liveusb/creator.py:607 msgid ""

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 19 Nov '13

19 Nov '13

commit 8ca22d1c4b5c0ac450cdad8be030e9225ad7024e Author: Translation commit bot <translation(a)torproject.org> Date: Tue Nov 19 16:46:01 2013 +0000 Update translations for https_everywhere_completed --- fi/https-everywhere.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/fi/https-everywhere.properties b/fi/https-everywhere.properties index 4ec69ca..1f88e0d 100644 --- a/fi/https-everywhere.properties +++ b/fi/https-everywhere.properties @@ -5,3 +5,4 @@ https-everywhere.menu.noRules = (Tälle sivulle ei ole sääntöjä) https-everywhere.menu.unknownRules = (Sivun sääntöä ei tunnistettu) https-everywhere.toolbar.hint = HTTPS Everywhere on käytössä. Voit valita, millä sivustoilla ohjelmaa käytetään, kun napsautat osoiterivissä olevaa kuvaketta. https-everywhere.migration.notification0 = Jotta tärkeä korjaus voidaan suorittaa, tämä päivitys palauttaa HTTPS Everywhere sääntö asetuksesi oletusarvoisiksi. +https-everywhere.menu.ruleset-tests = Suorita HTTPS Everywheren sääntötestit

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits November 2013