November 2013 - tor-commits - lists.torproject.org

[tor-browser-bundle/master] Remove PDF.JS 0.8.1 from all TBBs.
by mikeperry＠torproject.org 14 Nov '13

14 Nov '13

commit 10dd07067e4eea90b8f58acce7b00f518ff10844 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Nov 14 01:49:15 2013 -0800 Remove PDF.JS 0.8.1 from all TBBs. It is probably vulnerable to https://www.mozilla.org/security/announce/2013/mfsa2013-99.html. Note that Firefox 24 includes a built-in version that will be getting security updates. --- gitian/descriptors/linux/gitian-bundle.yml | 1 - gitian/descriptors/mac/gitian-bundle.yml | 1 - gitian/descriptors/windows/gitian-bundle.yml | 1 - gitian/fetch-inputs.sh | 4 +--- gitian/record-inputs.sh | 3 --- gitian/versions | 2 -- gitian/versions.alpha | 2 -- 7 files changed, 1 insertion(+), 13 deletions(-) diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index 68e01ec..7dc1104 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -31,7 +31,6 @@ files: - "linux-skeleton.zip" - "linux-langpacks.zip" - "noscript(a)noscript.net.xpi" -- "uriloader(a)pdf.js.xpi" - "dzip.sh" - "dtar.sh" - "bare-version" diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index cdf387b..ade303b 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -27,7 +27,6 @@ files: - "mac-skeleton.zip" - "mac-langpacks.zip" - "noscript(a)noscript.net.xpi" -- "uriloader(a)pdf.js.xpi" - "dzip.sh" - "bare-version" - "bundle.inputs" diff --git a/gitian/descriptors/windows/gitian-bundle.yml b/gitian/descriptors/windows/gitian-bundle.yml index bb28155..44e1662 100644 --- a/gitian/descriptors/windows/gitian-bundle.yml +++ b/gitian/descriptors/windows/gitian-bundle.yml @@ -29,7 +29,6 @@ files: - "windows-skeleton.zip" - "win32-langpacks.zip" - "noscript(a)noscript.net.xpi" -- "uriloader(a)pdf.js.xpi" - "dzip.sh" - "bare-version" - "bundle.inputs" diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 535a797..19b3509 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -169,7 +169,6 @@ cd .. # NoScript and PDF.JS are magikal and special: wget -N ${NOSCRIPT_URL} -wget -N https://addons.mozilla.org/firefox/downloads/file/201180/${PDFJS_PACKAGE} # So is mingw: if [ ! -f mingw-w64-svn-snapshot.zip ]; @@ -181,7 +180,7 @@ fi # Verify packages with weak or no signatures via direct sha256 check # (OpenSSL is signed with MD5, and OSXSDK is not signed at all) -for i in OSXSDK TOOLCHAIN4 NOSCRIPT PDFJS MINGW MSVCR100 # OPENSSL +for i in OSXSDK TOOLCHAIN4 NOSCRIPT MINGW MSVCR100 # OPENSSL do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" @@ -217,7 +216,6 @@ done cd .. ln -sf "$NOSCRIPT_PACKAGE" noscript(a)noscript.net.xpi -ln -sf "$PDFJS_PACKAGE" uriloader(a)pdf.js.xpi ln -sf "$BINUTILS_PACKAGE" binutils.tar.bz2 ln -sf "$GCC_PACKAGE" gcc.tar.bz2 ln -sf "$PYTHON_PACKAGE" python.tar.bz2 diff --git a/gitian/record-inputs.sh b/gitian/record-inputs.sh index 95a8fcf..9bc1f7c 100755 --- a/gitian/record-inputs.sh +++ b/gitian/record-inputs.sh @@ -30,10 +30,7 @@ sha256sum $OSXSDK_PACKAGE >> bundle.inputs sha256sum $TOOLCHAIN4_PACKAGE >> bundle.inputs sha256sum mingw-w64-svn-snapshot.zip >> bundle.inputs echo >> bundle.inputs -#sha256sum relativelink-src.zip >> bundle.inputs -#sha256sum *-langpacks.zip >> bundle.inputs sha256sum noscript(a)noscript.net.xpi >> bundle.inputs -sha256sum uriloader(a)pdf.js.xpi >> bundle.inputs echo >> bundle.inputs if [ "z$VERIFY_TAGS" = "z1" ]; diff --git a/gitian/versions b/gitian/versions index 4128288..0fea02e 100755 --- a/gitian/versions +++ b/gitian/versions @@ -25,7 +25,6 @@ PYTHON_VER=2.7.5 ## File names for the source packages # OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.2-fx+fn+sm.xpi -PDFJS_PACKAGE=pdf_viewer-0.8.1-sm+fx+an.xpi TOOLCHAIN4_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb MINGW_PACKAGE=mingw-w64-svn-snapshot.zip @@ -39,7 +38,6 @@ PYTHON_PACKAGE=Python-${PYTHON_VER}.tar.bz2 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 NOSCRIPT_HASH=52b309f2e5ca1bee4d0f97cbb342fdac3be6a447c35f744a90348df55eea635f -PDFJS_HASH=2e3e6811f5294b24aafeba44e8206ddc81fb15e5934e5166a2c7df3a4405020b MINGW_HASH=457f11d29f6e95425d190711a73955fa54a98a2113ce2c2bfd76291be71e3e2b MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index d70d289..b605365 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -25,7 +25,6 @@ PYTHON_VER=2.7.5 ## File names for the source packages # OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.2-fx+fn+sm.xpi -PDFJS_PACKAGE=pdf_viewer-0.8.1-sm+fx+an.xpi TOOLCHAIN4_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb MINGW_PACKAGE=mingw-w64-svn-snapshot.zip @@ -39,7 +38,6 @@ PYTHON_PACKAGE=Python-${PYTHON_VER}.tar.bz2 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 NOSCRIPT_HASH=52b309f2e5ca1bee4d0f97cbb342fdac3be6a447c35f744a90348df55eea635f -PDFJS_HASH=2e3e6811f5294b24aafeba44e8206ddc81fb15e5934e5166a2c7df3a4405020b MINGW_HASH=457f11d29f6e95425d190711a73955fa54a98a2113ce2c2bfd76291be71e3e2b MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067

1 0

[tor-browser-bundle/master] Bug #10049: Fix architecture check to work from outside TBB's directory.
by mikeperry＠torproject.org 14 Nov '13

14 Nov '13

commit 056dd50cf89fa2482c65f00f235a54493fbc3e6f Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Nov 14 02:16:09 2013 -0800 Bug #10049: Fix architecture check to work from outside TBB's directory. Patch by Moritz Bartl. --- RelativeLink/RelativeLink.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/RelativeLink/RelativeLink.sh b/RelativeLink/RelativeLink.sh index 6a4d05e..b2255f6 100755 --- a/RelativeLink/RelativeLink.sh +++ b/RelativeLink/RelativeLink.sh @@ -116,14 +116,6 @@ if [ "`id -u`" -eq 0 ]; then exit 1 fi -SYSARCHITECTURE=$(getconf LONG_BIT) -TORARCHITECTURE=$(expr "$(file Tor/tor)" : '.*ELF $[[:digit:]]*$') - -if [ $SYSARCHITECTURE -ne $TORARCHITECTURE ]; then - complain "Wrong architecture? 32-bit vs. 64-bit." - exit 1 -fi - debug=0 usage_message="usage: $0 [--debug]" if [ "$#" -eq 1 -a $ "x$1" = "x--debug" -o "x$1" = "x-debug" $ ]; then @@ -206,6 +198,14 @@ else export HOME fi +SYSARCHITECTURE=$(getconf LONG_BIT) +TORARCHITECTURE=$(expr "$(file Tor/tor)" : '.*ELF $[[:digit:]]*$') + +if [ $SYSARCHITECTURE -ne $TORARCHITECTURE ]; then + complain "Wrong architecture? 32-bit vs. 64-bit." + exit 1 +fi + LDPATH="${HOME}/Tor/" export LDPATH

1 0

[torbrowser/maint-2.4] fix 32-bit Linux mozconfig name
by erinn＠torproject.org 14 Nov '13

14 Nov '13

commit eb17a2b2431f783b2ec07799ee8aad3f87511834 Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Nov 14 17:55:06 2013 -0200 fix 32-bit Linux mozconfig name --- build-scripts/config/mozconfig-lin-i686 | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/build-scripts/config/mozconfig-lin-i686 b/build-scripts/config/mozconfig-lin-i686 new file mode 100755 index 0000000..4421981 --- /dev/null +++ b/build-scripts/config/mozconfig-lin-i686 @@ -0,0 +1,16 @@ +. $topsrcdir/browser/config/mozconfig + +mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@ +mk_add_options MOZ_APP_DISPLAYNAME=TorBrowser +mk_add_options MOZ_MAKE_FLAGS="-s --no-print-directory -j2" +mk_add_options MOZILLA_OFFICIAL=1 +mk_add_options BUILD_OFFICIAL=1 + +ac_add_options --disable-optimize +ac_add_options --enable-official-branding +ac_add_options --enable-strip +ac_add_options --disable-tests +ac_add_options --disable-debug +ac_add_options --disable-maintenance-service +ac_add_options --disable-crashreporter +ac_add_options --disable-webrtc

1 0

[torbrowser/master] fix 32-bit Linux mozconfig name
by erinn＠torproject.org 14 Nov '13

14 Nov '13

commit eb17a2b2431f783b2ec07799ee8aad3f87511834 Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Nov 14 17:55:06 2013 -0200 fix 32-bit Linux mozconfig name --- build-scripts/config/mozconfig-lin-i686 | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/build-scripts/config/mozconfig-lin-i686 b/build-scripts/config/mozconfig-lin-i686 new file mode 100755 index 0000000..4421981 --- /dev/null +++ b/build-scripts/config/mozconfig-lin-i686 @@ -0,0 +1,16 @@ +. $topsrcdir/browser/config/mozconfig + +mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@ +mk_add_options MOZ_APP_DISPLAYNAME=TorBrowser +mk_add_options MOZ_MAKE_FLAGS="-s --no-print-directory -j2" +mk_add_options MOZILLA_OFFICIAL=1 +mk_add_options BUILD_OFFICIAL=1 + +ac_add_options --disable-optimize +ac_add_options --enable-official-branding +ac_add_options --enable-strip +ac_add_options --disable-tests +ac_add_options --disable-debug +ac_add_options --disable-maintenance-service +ac_add_options --disable-crashreporter +ac_add_options --disable-webrtc

1 0

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

14 Nov '13

commit ea59f6997f36a6ee417533032845755fc71bf135 Merge: a860ada eb17a2b Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Nov 14 17:55:24 2013 -0200 Merge branch 'maint-2.4' build-scripts/config/mozconfig-lin-i686 | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)

1 0

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

14 Nov '13

commit 5aeb045e6b7ec0ce96c7dfb3bdd1198b100d84be Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 14 19:46:03 2013 +0000 Update translations for liveusb-creator_completed --- sv/sv.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sv/sv.po b/sv/sv.po index b571f68..31cb637 100644 --- a/sv/sv.po +++ b/sv/sv.po @@ -12,7 +12,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-14 19:11+0000\n" +"PO-Revision-Date: 2013-11-14 19:30+0000\n" "Last-Translator: WinterFairy <winterfairy(a)riseup.net>\n" "Language-Team: Swedish (http://www.transifex.com/projects/p/torproject/language/sv/)\n" "MIME-Version: 1.0\n" @@ -338,7 +338,7 @@ msgstr "Målenhet" msgid "" "The Master Boot Record on your device is blank. Pressing 'Install Tails' " "again will reset the MBR on this device." -msgstr "Master Boot Record på din enhet är blank. MBR på denna enhet kommer att nollställas när du trycker på 'Installera Tails'." +msgstr "Master Boot Record på din enhet är tom. Tryck på 'Installera Tails' igen för att nollställa MBR på den här enheten." #: ../liveusb/gui.py:795 msgid "" @@ -568,7 +568,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 "Du är på väg att uppgradera Tails på enheten %(parent_size)s %(vendor)s %(model)s (%(device)s). Eventuell bestående lagring på den här enheten kommer behållas oförändrad. Vill du fortsätta?" +msgstr "Du är på väg att uppgradera Tails på enheten %(parent_size)s %(vendor)s %(model)s (%(device)s). Eventuell bestående lagring på den här enheten kommer att behållas som den är. Vill du fortsätta?" #: ../liveusb/creator.py:607 msgid ""

1 0

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

14 Nov '13

commit 21321ac13e019734807f7232c77a276495b914ec Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 14 19:46:01 2013 +0000 Update translations for liveusb-creator --- sv/sv.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sv/sv.po b/sv/sv.po index b571f68..31cb637 100644 --- a/sv/sv.po +++ b/sv/sv.po @@ -12,7 +12,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-14 19:11+0000\n" +"PO-Revision-Date: 2013-11-14 19:30+0000\n" "Last-Translator: WinterFairy <winterfairy(a)riseup.net>\n" "Language-Team: Swedish (http://www.transifex.com/projects/p/torproject/language/sv/)\n" "MIME-Version: 1.0\n" @@ -338,7 +338,7 @@ msgstr "Målenhet" msgid "" "The Master Boot Record on your device is blank. Pressing 'Install Tails' " "again will reset the MBR on this device." -msgstr "Master Boot Record på din enhet är blank. MBR på denna enhet kommer att nollställas när du trycker på 'Installera Tails'." +msgstr "Master Boot Record på din enhet är tom. Tryck på 'Installera Tails' igen för att nollställa MBR på den här enheten." #: ../liveusb/gui.py:795 msgid "" @@ -568,7 +568,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 "Du är på väg att uppgradera Tails på enheten %(parent_size)s %(vendor)s %(model)s (%(device)s). Eventuell bestående lagring på den här enheten kommer behållas oförändrad. Vill du fortsätta?" +msgstr "Du är på väg att uppgradera Tails på enheten %(parent_size)s %(vendor)s %(model)s (%(device)s). Eventuell bestående lagring på den här enheten kommer att behållas som den är. Vill du fortsätta?" #: ../liveusb/creator.py:607 msgid ""

1 0

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

14 Nov '13

commit e8d5942b97e64f22b4bda649d6ce5366520f32d1 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 14 19:45:58 2013 +0000 Update translations for https_everywhere_completed --- sv/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sv/https-everywhere.dtd b/sv/https-everywhere.dtd index c00f068..c7c28a5 100644 --- a/sv/https-everywhere.dtd +++ b/sv/https-everywhere.dtd @@ -43,4 +43,4 @@ <!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere regeltester"> <!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Avbryt"> -<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start"> +<!ENTITY https-everywhere.ruleset-tests.status_start_button "Kör">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 14 Nov '13

14 Nov '13

commit a649dddabd1a5005bfa03a348bffcd655010fd7f Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 14 19:45:53 2013 +0000 Update translations for https_everywhere --- sv/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sv/https-everywhere.dtd b/sv/https-everywhere.dtd index c00f068..c7c28a5 100644 --- a/sv/https-everywhere.dtd +++ b/sv/https-everywhere.dtd @@ -43,4 +43,4 @@ <!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere regeltester"> <!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Avbryt"> -<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start"> +<!ENTITY https-everywhere.ruleset-tests.status_start_button "Kör">

1 0

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

14 Nov '13

commit 82d38863e20b26ecb7ee3a536a3f74540c94b460 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 14 19:16:03 2013 +0000 Update translations for liveusb-creator_completed --- sv/sv.po | 149 ++++++++++++++++++++++++++++++++------------------------------ 1 file changed, 77 insertions(+), 72 deletions(-) diff --git a/sv/sv.po b/sv/sv.po index c08379d..b571f68 100644 --- a/sv/sv.po +++ b/sv/sv.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-10-17 13:19+0200\n" -"PO-Revision-Date: 2013-11-06 17:50+0000\n" +"POT-Creation-Date: 2013-11-12 13:29+0100\n" +"PO-Revision-Date: 2013-11-14 19:11+0000\n" "Last-Translator: WinterFairy <winterfairy(a)riseup.net>\n" "Language-Team: Swedish (http://www.transifex.com/projects/p/torproject/language/sv/)\n" "MIME-Version: 1.0\n" @@ -26,17 +26,22 @@ msgstr "" msgid "%(distribution)s installer" msgstr "%(distribution)s installerare" -#: ../liveusb/gui.py:803 +#: ../liveusb/gui.py:807 #, python-format msgid "%(filename)s selected" msgstr "%(filename)s vald" -#: ../liveusb/gui.py:440 +#: ../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:1020 +#: ../liveusb/creator.py:1023 #, python-format msgid "%s already bootable" msgstr "%s är redan startbar" @@ -66,7 +71,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 "<!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;\">Kopiera den aktuella Tails versionen till en redan installerad Tails enhet. Andra partitioner på enheten kommer att behållas.</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;\">Kopiera den aktuella Tails versionen till en redan installerad Tails enhet. Andra partitioner på enheten kommer att bevaras.</span></p></body></html>" #: ../liveusb/launcher_ui.py:164 msgid "" @@ -93,12 +98,12 @@ msgid "" "persist after a reboot." msgstr "Genom att allokera extra utrymme på ditt USB-minne för beständig överlagring kan du möjliggöra lagring av data samt göra beständiga ändringar i ditt live operativsystem. Utan detta kommer ingen data du sparar att finnas kvar mellan omstarter." -#: ../liveusb/creator.py:1122 ../liveusb/creator.py:1385 +#: ../liveusb/creator.py:1125 ../liveusb/creator.py:1388 #, python-format msgid "Calculating the SHA1 of %s" msgstr "Beräknar SHA1 för %s" -#: ../liveusb/creator.py:1333 +#: ../liveusb/creator.py:1336 msgid "Cannot find" msgstr "Kan inte hitta" @@ -121,16 +126,12 @@ msgid "" "Upgrade" msgstr "Klona\n&&\nUppgradera" -#: ../liveusb/dialog.py:174 -msgid "Create Live USB" -msgstr "Skapa Live USB" - #: ../liveusb/creator.py:400 #, python-format msgid "Creating %sMB persistent overlay" msgstr "Skapar %sMB beständig överlagring" -#: ../liveusb/gui.py:562 +#: ../liveusb/gui.py:565 msgid "" "Device is not yet mounted, so we cannot determine the amount of free space." msgstr "Enheten är inte monterad, så vi kan inte fastställa hur mycket ledigt utrymme där finns." @@ -140,11 +141,11 @@ msgstr "Enheten är inte monterad, så vi kan inte fastställa hur mycket ledigt msgid "Download %(distribution)s" msgstr "Ladda ned %(distribution)s" -#: ../liveusb/gui.py:777 +#: ../liveusb/gui.py:781 msgid "Download complete!" msgstr "Hämtning färdig!" -#: ../liveusb/gui.py:781 +#: ../liveusb/gui.py:785 msgid "Download failed: " msgstr "Hämtning misslyckades: " @@ -153,16 +154,16 @@ msgstr "Hämtning misslyckades: " msgid "Downloading %s..." msgstr "Hämtar %s…" -#: ../liveusb/creator.py:1118 +#: ../liveusb/creator.py:1121 msgid "Drive is a loopback, skipping MBR reset" msgstr "Enheten är en loopback, hoppar över att återställa MBR" -#: ../liveusb/creator.py:813 +#: ../liveusb/creator.py:816 #, python-format msgid "Entering unmount_device for '%(device)s'" msgstr "Anger unmount_device för \"%(device)s\"" -#: ../liveusb/creator.py:1198 +#: ../liveusb/creator.py:1201 msgid "Error probing device" msgstr "Fel vid sökning efter enheten" @@ -182,7 +183,7 @@ msgstr "Fel: SHA1-summan för din Live CD är ogiltig. Du kan köra detta progr msgid "Extracting live image to the target device..." msgstr "Packar upp live-avbild till målenheten..." -#: ../liveusb/creator.py:1063 +#: ../liveusb/creator.py:1066 #, python-format msgid "Formatting %(device)s as FAT32" msgstr "Formaterar %(device)s som FAT32" @@ -201,7 +202,11 @@ msgid "" "downloaded for you." msgstr "Om du inte väljer en existerande Live ISO kommer den valda utgåvan att laddas ned åt dig." -#: ../liveusb/gui.py:625 +#: ../liveusb/dialog.py:174 +msgid "Install Tails" +msgstr "Installera Tails" + +#: ../liveusb/gui.py:628 msgid "Installation complete!" msgstr "Installationen slutförd!" @@ -210,11 +215,11 @@ msgstr "Installationen slutförd!" msgid "Installation complete! (%s)" msgstr "Installationen är slutförd! (%s)" -#: ../liveusb/gui.py:626 +#: ../liveusb/gui.py:629 msgid "Installation was completed. Press OK to close this program." msgstr "Installationen slutförd. Tryck OK för att stänga detta program." -#: ../liveusb/creator.py:916 ../liveusb/creator.py:1239 +#: ../liveusb/creator.py:919 ../liveusb/creator.py:1242 msgid "Installing bootloader..." msgstr "Installerar starthanteraren..." @@ -222,28 +227,28 @@ msgstr "Installerar starthanteraren..." msgid "LiveUSB creation failed!" msgstr "Misslyckades med att skapa LiveUSB!" -#: ../liveusb/creator.py:1334 +#: ../liveusb/creator.py:1337 msgid "" "Make sure to extract the entire liveusb-creator zip file before running this" " program." msgstr "Säkerställ att du packar upp hela liveusb-creator zip-filen innan du kör detta program." -#: ../liveusb/creator.py:1210 +#: ../liveusb/creator.py:1213 msgid "" "Make sure your USB key is plugged in and formatted with the FAT filesystem" msgstr "Se till att din USB-pinne är inkopplat och formaterad med filsystemet FAT" -#: ../liveusb/creator.py:835 +#: ../liveusb/creator.py:838 #, python-format msgid "Mount %s exists after unmounting" msgstr "Montering %s existerar efter avmontering" -#: ../liveusb/gui.py:568 +#: ../liveusb/gui.py:571 #, python-format msgid "No free space on device %(device)s" msgstr "Inget ledigt utrymme på enheten %(device)s" -#: ../liveusb/creator.py:802 +#: ../liveusb/creator.py:805 msgid "No mount points found" msgstr "Hittade inga monteringspunkter" @@ -254,20 +259,20 @@ msgid "" "%dMB ISO + %dMB overlay > %dMB free space" msgstr "Inte tillräckligt med ledigt utrymme på enheten.\n%d MB ISO + %d MB överlägg > %d MB ledigt utrymme" -#: ../liveusb/gui.py:549 +#: ../liveusb/gui.py:552 msgid "Partition is FAT16; Restricting overlay size to 2G" msgstr "Partitionen är FAT16; Begränsar överlagringsstorlek till 2 GB" -#: ../liveusb/gui.py:545 +#: ../liveusb/gui.py:548 msgid "Partition is FAT32; Restricting overlay size to 4G" msgstr "Partitionen är FAT32; Begränsar överlagringsstorlek till 4 GB" -#: ../liveusb/creator.py:226 ../liveusb/creator.py:842 +#: ../liveusb/creator.py:226 ../liveusb/creator.py:845 #, python-format msgid "Partitioning device %(device)s" msgstr "Partitionerar enheten %(device)s" -#: ../liveusb/gui.py:616 +#: ../liveusb/gui.py:619 msgid "Persistent Storage" msgstr "Bestående lagring" @@ -275,19 +280,19 @@ msgstr "Bestående lagring" msgid "Persistent Storage (0 MB)" msgstr "Beständigt lagringsutrymme (0 MB)" -#: ../liveusb/gui.py:697 ../liveusb/gui.py:726 +#: ../liveusb/gui.py:700 ../liveusb/gui.py:730 msgid "Please confirm your device selection" msgstr "Bekräfta ditt val av enhet" -#: ../liveusb/gui.py:462 +#: ../liveusb/gui.py:465 msgid "Refreshing releases..." msgstr "Uppdaterar utgåvor..." -#: ../liveusb/gui.py:467 +#: ../liveusb/gui.py:470 msgid "Releases updated!" msgstr "Utgåvor uppdaterade!" -#: ../liveusb/creator.py:939 ../liveusb/creator.py:1257 +#: ../liveusb/creator.py:942 ../liveusb/creator.py:1260 #, python-format msgid "Removing %(file)s" msgstr "Tar bort %(file)s" @@ -296,12 +301,12 @@ msgstr "Tar bort %(file)s" msgid "Removing existing Live OS" msgstr "Tar bort existerande Live OS" -#: ../liveusb/creator.py:1112 +#: ../liveusb/creator.py:1115 #, python-format msgid "Resetting Master Boot Record of %s" msgstr "Nollställer Master Boot Record på %s" -#: ../liveusb/gui.py:788 +#: ../liveusb/gui.py:792 msgid "Select Live ISO" msgstr "Välj Live-ISO" @@ -309,7 +314,7 @@ msgstr "Välj Live-ISO" msgid "Setting up OLPC boot file..." msgstr "Installerar OLPC startfil..." -#: ../liveusb/creator.py:716 +#: ../liveusb/creator.py:719 #, python-format msgid "" "Some partitions of the target device %(device)s are mounted. They will be " @@ -321,7 +326,7 @@ msgid "" "Source type does not support verification of ISO MD5 checksum, skipping" msgstr "Källtypen stöder inte verifikation af ISO MD5 kontrollsummor, hoppar över" -#: ../liveusb/creator.py:1146 +#: ../liveusb/creator.py:1149 msgid "Synchronizing data on disk..." msgstr "Synkroniserar data på disk..." @@ -329,13 +334,13 @@ msgstr "Synkroniserar data på disk..." msgid "Target Device" msgstr "Målenhet" -#: ../liveusb/gui.py:662 +#: ../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 "Master Boot Record på din enhet är tom. Tryck på 'Skapa Live USB' igen för att nollställa MBR på den här enheten." +msgstr "Master Boot Record på din enhet är blank. MBR på denna enhet kommer att nollställas när du trycker på 'Installera Tails'." -#: ../liveusb/gui.py:791 +#: ../liveusb/gui.py:795 msgid "" "The selected file is unreadable. Please fix its permissions or select " "another file." @@ -379,11 +384,11 @@ msgstr "Detta är förloppsfältet som visar hur långt skapandet av LiveUSB pro msgid "This is the status console, where all messages get written to." msgstr "Detta är statuskonsollen där alla meddelanden sparas." -#: ../liveusb/creator.py:879 +#: ../liveusb/creator.py:882 msgid "Trying to continue anyway." msgstr "Försöker fortsätta ändå." -#: ../liveusb/creator.py:911 +#: ../liveusb/creator.py:914 #, python-format msgid "Unable to change volume label: %(message)s" msgstr "Kunde inte byta etikett på volymen: %(message)s" @@ -402,24 +407,24 @@ msgstr "Kunde inte kopiera %(infile)s till %(outfile)s: %(message)s" msgid "Unable to find any USB drive" msgstr "Kunde inte hitta någon USB-enhet." -#: ../liveusb/creator.py:1200 +#: ../liveusb/creator.py:1203 msgid "Unable to find any supported device" msgstr "Hittade ingen enhet som stöds." -#: ../liveusb/creator.py:1040 +#: ../liveusb/creator.py:1043 msgid "Unable to find partition" msgstr "Kunde inte hitta partitionen" -#: ../liveusb/creator.py:1280 +#: ../liveusb/creator.py:1283 msgid "" "Unable to get Win32_LogicalDisk; win32com query did not return any results" msgstr "Kunde inte läsa Win32_LogicalDisk; win32com frågan gav inte något svar" -#: ../liveusb/gui.py:690 +#: ../liveusb/gui.py:693 msgid "Unable to mount device" msgstr "Kunde inte montera enheten" -#: ../liveusb/creator.py:790 +#: ../liveusb/creator.py:793 #, python-format msgid "Unable to mount device: %(message)s" msgstr "Kunde inte montera enheten: %(message)s" @@ -434,18 +439,18 @@ msgstr "Kunde inte ta bort mapp från tidigare LiveOS: %(message)s" msgid "Unable to remove file from previous LiveOS: %(message)s" msgstr "Kunde inte ta bort fil från tidigare LiveOS: %(message)s" -#: ../liveusb/creator.py:1115 +#: ../liveusb/creator.py:1118 msgid "" "Unable to reset MBR. You may not have the `syslinux` package installed." msgstr "Kunde inte återställa MBR. Det kan vara så att du inte har `syslinux` paketet installerat." -#: ../liveusb/gui.py:797 +#: ../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 "Kunde inte använda den valda filen. Det kanske fungerar bättre om du flyttar din ISO till roten av din enhet (t.ex: C:\\)" -#: ../liveusb/creator.py:697 +#: ../liveusb/creator.py:700 #, python-format msgid "Unable to write on %(device)s, skipping." msgstr "Kunde inte skriva till %(device)s, hoppar över" @@ -454,12 +459,12 @@ msgstr "Kunde inte skriva till %(device)s, hoppar över" msgid "Unknown ISO, skipping checksum verification" msgstr "Okänd ISO, hoppar över verifiering av kontrollsumma" -#: ../liveusb/creator.py:786 +#: ../liveusb/creator.py:789 #, python-format msgid "Unknown dbus exception while trying to mount device: %(message)s" msgstr "Okänt dbus undantag vid försök att montera enheten: %(message)s" -#: ../liveusb/creator.py:765 ../liveusb/creator.py:890 +#: ../liveusb/creator.py:768 ../liveusb/creator.py:893 msgid "Unknown filesystem. Your device may need to be reformatted." msgstr "Okänt filsystem. Din enhet kan behöva omformateras." @@ -468,34 +473,34 @@ msgstr "Okänt filsystem. Din enhet kan behöva omformateras." msgid "Unknown release: %s" msgstr "Okänd utgåva: %s" -#: ../liveusb/creator.py:827 +#: ../liveusb/creator.py:830 #, python-format msgid "Unmounting '%(udi)s' on '%(device)s'" msgstr "Avmonterar \"%(udi)s\" på \"%(device)s\"" -#: ../liveusb/creator.py:823 +#: ../liveusb/creator.py:826 #, python-format msgid "Unmounting mounted filesystems on '%(device)s'" msgstr "Avmonterar monterade filsystem på \"%(device)s\"" -#: ../liveusb/creator.py:876 +#: ../liveusb/creator.py:879 #, python-format msgid "Unsupported device '%(device)s', please report a bug." msgstr "Enheten '%(device)s' stöds inte, anmäl detta som en bugg." -#: ../liveusb/creator.py:770 ../liveusb/creator.py:893 +#: ../liveusb/creator.py:773 ../liveusb/creator.py:896 #, python-format msgid "Unsupported filesystem: %s" msgstr "Stöder inte filsystemet: %s" -#: ../liveusb/creator.py:768 +#: ../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 "Filsystemet stöds inte: %s\nOm du försöker att uppgradera ett manuellt installerat Tails system (dvs, det var installerat utan denna installerare) så stöds inte det: du måste ominstallera systemet, t.ex genom att välja \"Klona & installera\" istället." -#: ../liveusb/creator.py:1213 +#: ../liveusb/creator.py:1216 #, python-format msgid "" "Unsupported filesystem: %s\n" @@ -522,16 +527,16 @@ msgstr "Verifierar SHA1 kontrollsumma av LiveCD avbild..." msgid "Verifying SHA256 checksum of LiveCD image..." msgstr "Verifierar SHA256 kontrollsumma av LiveCD avbild..." -#: ../liveusb/creator.py:887 ../liveusb/creator.py:1206 +#: ../liveusb/creator.py:890 ../liveusb/creator.py:1209 msgid "Verifying filesystem..." msgstr "Verifierar filsystem…" -#: ../liveusb/gui.py:724 +#: ../liveusb/gui.py:728 msgid "" "Warning: Creating a new persistent overlay will delete your existing one." msgstr "Varning: Att skapa ett nytt varaktigt överlägg kommer radera ditt nuvarande." -#: ../liveusb/gui.py:676 +#: ../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 " @@ -550,20 +555,20 @@ msgstr "Varning: Detta verktyg måste köras som en administratör. För att gö msgid "Wrote to device at %(speed)d MB/sec" msgstr "Skrev till enheten med %(speed)d MB/sek" -#: ../liveusb/gui.py:698 +#: ../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 drive will be lost. Continue?" +"(%(device)s). All data on the selected device will be lost. Continue?" msgstr "Du är på väg att installera Tails på enheten %(size)s %(vendor)s %(model)s (%(device)s). All data på den valda enheten kommer att gå förlorad. Vill du fortsätta?" -#: ../liveusb/gui.py:715 +#: ../liveusb/gui.py:718 #, python-format msgid "" -"You are going to upgrade Tails on the %(vendor)s %(model)s device " -"(%(device)s). Any persistent volume on this device will remain unchanged. " -"Continue?" -msgstr "Du är på väg att uppgradera Tails på enheten %(vendor)s %(model)s (%(device)s). Eventuell bestående lagring på den här enheten kommer att behållas som den är. Vill du fortsätta?" +"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 "Du är på väg att uppgradera Tails på enheten %(parent_size)s %(vendor)s %(model)s (%(device)s). Eventuell bestående lagring på den här enheten kommer behållas oförändrad. Vill du fortsätta?" #: ../liveusb/creator.py:607 msgid "" @@ -571,7 +576,7 @@ msgid "" "ext4 filesystem" msgstr "Du använder en äldre version av syslinux-extlinux som inte stöder ext4 filsystem." -#: ../liveusb/gui.py:782 +#: ../liveusb/gui.py:786 msgid "You can try again to resume your download" msgstr "Du kan försöka igen för att återuppta din hämtning"

1 0