September 2014 - tor-commits - lists.torproject.org

[tor-browser-bundle/master] Bug 12811: Bumping mingw-w64 commit.
by gk＠torproject.org 30 Sep '14

30 Sep '14

commit 74f0221f33873ff3191bc0f04adb739ad8ee9c6e Author: Georg Koppen <gk(a)torproject.org> Date: Wed Sep 17 10:45:53 2014 +0000 Bug 12811: Bumping mingw-w64 commit. Tag 3.1.0 is too old for building Firefox ESR 31. --- gitian/versions.nightly | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 5032058..58d647f 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -16,7 +16,8 @@ HTTPSE_TAG=master NSIS_TAG=v0.2 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable -MINGW_TAG=9418eaa1854320b57f40e29ec5bbc4f5717ecd58 # tag v3.1.0 +# A mingw-w64 commit that works. The 3.1.0 tag is too old. +MINGW_TAG=469ed5d227202b373409c8a3b4c1358be39b9983 PYPTLIB_TAG=master OBFSPROXY_TAG=master FLASHPROXY_TAG=master

1 0

[tor-browser-bundle/master] Bug 12462: Enable HTTPSHandler in Python.
by gk＠torproject.org 30 Sep '14

30 Sep '14

commit 96483cc6a8075d29a4715d3d389dbc4dbe4f3623 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Sep 16 14:15:37 2014 +0000 Bug 12462: Enable HTTPSHandler in Python. --- gitian/descriptors/linux/gitian-utils.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gitian/descriptors/linux/gitian-utils.yml b/gitian/descriptors/linux/gitian-utils.yml index 074076e..35fb67b 100644 --- a/gitian/descriptors/linux/gitian-utils.yml +++ b/gitian/descriptors/linux/gitian-utils.yml @@ -22,6 +22,8 @@ packages: - "zlib1g-dev" - "libxml2-dev" - "libxslt-dev" +# Needed for passing the Python related part of configure in ESR 31. +- "libssl-dev" reference_datetime: "2000-01-01 00:00:00" remotes: - "url": "https://github.com/libevent/libevent.git"

1 0

[tor-browser-bundle/master] Bug 12461: New compiler for Tor Browser ESR 31.
by gk＠torproject.org 30 Sep '14

30 Sep '14

commit 0d36f05505208e8c46ece532c9cb455cde31c417 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Sep 17 10:43:13 2014 +0000 Bug 12461: New compiler for Tor Browser ESR 31. Tor Browser based on Firefox ESR 31 needs a newer compiler. GCC 4.4 is not supported anymore. We chose the latest GCC (4.9.1) as we don't want to bump the version again when we start deploying hardened builds. --- RelativeLink/RelativeLink.sh | 2 +- gitian/descriptors/linux/gitian-firefox.yml | 22 +++++++++++++++++++--- gitian/descriptors/linux/gitian-utils.yml | 21 +++++++++++++++++++-- gitian/gpg/GCC.gpg | Bin 9931 -> 2635 bytes gitian/mkbundle-linux.sh | 6 ++++++ gitian/versions.nightly | 2 +- 6 files changed, 46 insertions(+), 7 deletions(-) diff --git a/RelativeLink/RelativeLink.sh b/RelativeLink/RelativeLink.sh index e75482a..88f9f8e 100755 --- a/RelativeLink/RelativeLink.sh +++ b/RelativeLink/RelativeLink.sh @@ -215,7 +215,7 @@ if [ $SYSARCHITECTURE -ne $TORARCHITECTURE ]; then exit 1 fi -LD_LIBRARY_PATH="${HOME}/TorBrowser/Tor/" +LD_LIBRARY_PATH="${HOME}:${HOME}/TorBrowser/Tor/" export LD_LIBRARY_PATH function setControlPortPasswd() { diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index 4284a5d..633444d 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -26,6 +26,8 @@ packages: - "libgstreamer-plugins-base0.10-dev" # To pass configure since ESR 31. - "libpulse-dev" +# We built GCC but not the libmpc2, thus we need to install it. +- "libmpc2" reference_datetime: "2000-01-01 00:00:00" remotes: - "url": "https://git.torproject.org/tor-browser.git" @@ -33,6 +35,8 @@ remotes: files: - "binutils-linux32-utils.zip" - "binutils-linux64-utils.zip" +- "gcc-linux32-utils.zip" +- "gcc-linux64-utils.zip" - "python-linux32-utils.zip" - "python-linux64-utils.zip" - "re-dzip.sh" @@ -60,12 +64,12 @@ script: | mkdir -p $INSTDIR/build/bin/ ln -s /usr/bin/yasm-1 $INSTDIR/build/bin/yasm export PATH=$PATH:$INSTDIR/build/bin - # Preparing Python for Firefox + # Preparing Python for Tor Browser unzip -d $INSTDIR python-linux$GBUILD_BITS-utils.zip # TODO: We might want to have a smarter solution than hard-coding the version. ln -sf $INSTDIR/python/bin/python2.7 $INSTDIR/python/bin/python export PATH=$INSTDIR/python/bin:$PATH - # + # Preparing Binutils and GCC for Tor Browser unzip -d $INSTDIR binutils-linux$GBUILD_BITS-utils.zip # Make sure gold is used with the hardening wrapper for full RELRO, see # #13031. @@ -76,7 +80,16 @@ script: | ln -sf hardened-ld ld.gold ln -sf ld.gold ld cd ~/build - export PATH=$INSTDIR/binutils/bin:$PATH + unzip -d $INSTDIR gcc-linux$GBUILD_BITS-utils.zip + export PATH=$INSTDIR/gcc/bin:$INSTDIR/binutils/bin:$PATH + ARCH="" + if [ $GBUILD_BITS == "64" ]; + then + ARCH="64" + fi + # Make sure our GCC gets properly used. + export LD_LIBRARY_PATH=$INSTDIR/gcc/lib$ARCH + # mkdir -p $INSTDIR/Browser/ mkdir -p $INSTDIR/Debug/Browser/components # @@ -119,6 +132,9 @@ script: | strip $LIB objcopy --add-gnu-debuglink=./Debug/$LIB $LIB done + # We need to copy the libstdc++.so.6 for older Linux distros. + cp $INSTDIR/gcc/lib$ARCH/libstdc++.so.6 Browser + # ~/build/re-dzip.sh Browser/omni.ja ~/build/re-dzip.sh Browser/webapprt/omni.ja ~/build/re-dzip.sh Browser/browser/omni.ja diff --git a/gitian/descriptors/linux/gitian-utils.yml b/gitian/descriptors/linux/gitian-utils.yml index 35fb67b..59ef707 100644 --- a/gitian/descriptors/linux/gitian-utils.yml +++ b/gitian/descriptors/linux/gitian-utils.yml @@ -17,6 +17,8 @@ packages: - "hardening-wrapper" # Needed for compiling gold. - "bison" +# Needed for compiling GCC. +- "libmpc-dev" # These packages are needed for Python due to HTTPS-Everywhere >= 3.5. - "libsqlite3-dev" - "zlib1g-dev" @@ -30,6 +32,7 @@ remotes: "dir": "libevent" files: - "binutils.tar.bz2" +- "gcc.tar.bz2" - "openssl.tar.gz" - "python.tar.bz2" - "lxml.tar.gz" @@ -39,8 +42,6 @@ files: script: | INSTDIR="$HOME/install" source versions - export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 - export FAKETIME=$REFERENCE_DATETIME export TZ=UTC export LC_ALL=C umask 0022 @@ -64,6 +65,21 @@ script: | make install cd .. + # Building GCC + tar xjf gcc.tar.bz2 + cd gcc-* + ./configure --prefix=$INSTDIR/gcc --disable-multilib --enable-languages=c,c++ + make $MAKEOPTS + make install + cd .. + + # libfaketime gets into our way when building GCC 4.9.x. See: + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61314 for details. Thus, we + # avoid it for the toolchain and cross our fingers. + # TODO: Test a newer libfaketime than 0.8. + export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 + export FAKETIME=$REFERENCE_DATETIME + # Building Libevent cd libevent ./autogen.sh @@ -122,6 +138,7 @@ script: | # Grabbing the remaining results cd $INSTDIR ~/build/dzip.sh binutils-$BINUTILS_VER-linux$GBUILD_BITS-utils.zip binutils + ~/build/dzip.sh gcc-$GCC_VER-linux$GBUILD_BITS-utils.zip gcc ~/build/dzip.sh openssl-$OPENSSL_VER-linux$GBUILD_BITS-utils.zip openssl ~/build/dzip.sh libevent-${LIBEVENT_TAG#release-}-linux$GBUILD_BITS-utils.zip libevent ~/build/dzip.sh python-$PYTHON_VER-linux$GBUILD_BITS-utils.zip python diff --git a/gitian/gpg/GCC.gpg b/gitian/gpg/GCC.gpg index d94d692..e62de27 100644 Binary files a/gitian/gpg/GCC.gpg and b/gitian/gpg/GCC.gpg differ diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index c4938d0..8a4e55f 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -100,6 +100,8 @@ cd $GITIAN_DIR if [ ! -f inputs/binutils-$BINUTILS_VER-linux32-utils.zip -o \ ! -f inputs/binutils-$BINUTILS_VER-linux64-utils.zip -o \ + ! -f inputs/gcc-$GCC_VER-linux32-utils.zip -o \ + ! -f inputs/gcc-$GCC_VER-linux64-utils.zip -o \ ! -f inputs/openssl-$OPENSSL_VER-linux32-utils.zip -o \ ! -f inputs/openssl-$OPENSSL_VER-linux64-utils.zip -o \ ! -f inputs/libevent-${LIBEVENT_TAG_ORIG#release-}-linux32-utils.zip -o \ @@ -126,6 +128,8 @@ then cp -a ../build/out/*-utils.zip . ln -sf binutils-$BINUTILS_VER-linux32-utils.zip binutils-linux32-utils.zip ln -sf binutils-$BINUTILS_VER-linux64-utils.zip binutils-linux64-utils.zip + ln -sf gcc-$GCC_VER-linux32-utils.zip gcc-linux32-utils.zip + ln -sf gcc-$GCC_VER-linux64-utils.zip gcc-linux64-utils.zip ln -sf openssl-$OPENSSL_VER-linux32-utils.zip openssl-linux32-utils.zip ln -sf openssl-$OPENSSL_VER-linux64-utils.zip openssl-linux64-utils.zip ln -sf libevent-${LIBEVENT_TAG_ORIG#release-}-linux32-utils.zip libevent-linux32-utils.zip @@ -147,6 +151,8 @@ else cd inputs ln -sf binutils-$BINUTILS_VER-linux32-utils.zip binutils-linux32-utils.zip ln -sf binutils-$BINUTILS_VER-linux64-utils.zip binutils-linux64-utils.zip + ln -sf gcc-$GCC_VER-linux32-utils.zip gcc-linux32-utils.zip + ln -sf gcc-$GCC_VER-linux64-utils.zip gcc-linux64-utils.zip ln -sf openssl-$OPENSSL_VER-linux32-utils.zip openssl-linux32-utils.zip ln -sf openssl-$OPENSSL_VER-linux64-utils.zip openssl-linux64-utils.zip ln -sf libevent-${LIBEVENT_TAG_ORIG#release-}-linux32-utils.zip libevent-linux32-utils.zip diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 4d4c4f5..5032058 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -34,7 +34,7 @@ GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION FIREFOX_LANG_BUILD=build1 BINUTILS_VER=2.24 -GCC_VER=4.8.3 +GCC_VER=4.9.1 PYTHON_VER=2.7.5 PYCRYPTO_VER=2.6.1 ARGPARSE_VER=1.2.1

1 0

[tor-browser-bundle/master] mbsdiff is not linked as mbsdiff.exe anymore.
by gk＠torproject.org 30 Sep '14

30 Sep '14

commit 0155dc71e24f434cb463062d1b22eca50d5aabd5 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Sep 12 10:02:23 2014 +0000 mbsdiff is not linked as mbsdiff.exe anymore. This got fixed by https://bugzilla.mozilla.org/show_bug.cgi?id=933120. --- gitian/descriptors/windows/gitian-firefox.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/gitian/descriptors/windows/gitian-firefox.yml b/gitian/descriptors/windows/gitian-firefox.yml index 2975ab5..da0c8b1 100644 --- a/gitian/descriptors/windows/gitian-firefox.yml +++ b/gitian/descriptors/windows/gitian-firefox.yml @@ -95,14 +95,12 @@ script: | i686-w64-mingw32-strip $INSTDIR/Browser/xul.dll # Make MAR-based update tools available for use during the bundle phase. - # Strangely, mbsdiff is linked as mbsdiff.exe even though it is a host - # (e.g., Linux) executable. MARTOOLS=~/build/mar-tools mkdir -p $MARTOOLS cp -p config/createprecomplete.py $MARTOOLS/ cp -p tools/update-packaging/*.sh $MARTOOLS/ cp -p obj-*/dist/host/bin/mar $MARTOOLS/ - cp -p obj-*/dist/host/bin/mbsdiff.exe $MARTOOLS/ + cp -p obj-*/dist/host/bin/mbsdiff $MARTOOLS/ cd ~/build zip -r mar-tools-win32.zip mar-tools cp mar-tools-win32.zip $OUTDIR/

1 0

[tor-browser-bundle/master] Bump NoScript version in nghtly builds.
by gk＠torproject.org 30 Sep '14

30 Sep '14

commit 0c0e32b86f51f8b971e867c320daca51d96798db Author: Georg Koppen <gk(a)torproject.org> Date: Tue Sep 30 09:16:04 2014 +0000 Bump NoScript version in nghtly builds. --- gitian/versions.nightly | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index a59e8a1..0617ea7 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -54,7 +54,7 @@ GO_VER=1.3 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.41-fx+sm+fn.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.42-fx+fn+sm.xpi HTTPSE_PACKAGE=https-everywhere-${HTTPSE_VER}.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz @@ -82,7 +82,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=ac8b2febff44a437e00bd261570af9f7aba8cc2f49e69ffb631a0578af6facc1 +NOSCRIPT_HASH=b474156fd6b9957b38054a34c8acb581204f08733cce898ed581c67d425dda33 HTTPSE_HASH=6feb4982d13f89656b61435b6b49e1996c61bc79e52d046d02312879376028e3 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c

1 0

[tor-browser-bundle/master] Use newer libfaketime (0.9.6).
by gk＠torproject.org 30 Sep '14

30 Sep '14

commit 82153228c675451dc5b37d8302beff0a93e981e4 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 22 20:10:38 2014 +0000 Use newer libfaketime (0.9.6). libfaketime 0.8 breaks the ESR 31 build (see #12461 comment 8 and later and #12812 comment 8 for the gory details). We therefore use a newer version that provides us with an environment variable to skip certain processes when faking time. --- gitian/descriptors/linux/gitian-firefox.yml | 33 +++++++++++++++++++++---- gitian/descriptors/mac/gitian-firefox.yml | 29 ++++++++++++++++++---- gitian/descriptors/windows/gitian-firefox.yml | 22 ++++++++++++++--- gitian/fetch-inputs.sh | 1 + gitian/mkbundle-linux.sh | 2 +- gitian/mkbundle-mac.sh | 2 +- gitian/mkbundle-windows.sh | 2 +- gitian/versions.nightly | 1 + 8 files changed, 76 insertions(+), 16 deletions(-) diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index 07927fb..d7958b0 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -6,7 +6,6 @@ architectures: - "i386" - "amd64" packages: -- "faketime" - "unzip" - "zip" - "libglib2.0-dev" @@ -32,6 +31,8 @@ reference_datetime: "2000-01-01 00:00:00" remotes: - "url": "https://git.torproject.org/tor-browser.git" "dir": "tor-browser" +- "url": "https://github.com/wolfcw/libfaketime" + "dir": "faketime" files: - "binutils-linux32-utils.zip" - "binutils-linux64-utils.zip" @@ -49,8 +50,6 @@ script: | export CFLAGS="-frandom-seed=tor" export CXXFLAGS="-frandom-seed=tor" export TZ=UTC - export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 - export FAKETIME=$REFERENCE_DATETIME export LC_ALL=C umask 0022 # @@ -92,18 +91,42 @@ script: | # mkdir -p $INSTDIR/Browser/ mkdir -p $INSTDIR/Debug/Browser/components - # + + # Building libfaketime + cd faketime + make + DESTDIR="$INSTDIR/faketime" make install + export LD_PRELOAD="$INSTDIR/faketime/usr/local/lib/faketime/libfaketime.so.1" + export FAKETIME=$REFERENCE_DATETIME + cd .. + cd tor-browser # .git and the src takes up a lot of useless space, and we need the space to build rm -rf .git find -type f | xargs touch --date="$REFERENCE_DATETIME" rm -f configure rm -f js/src/configure + # |configure| can't cope with nano seconds faked. And even if we would revert + # that feature it would hang sometimes for unknown but to libfaketime related + # reasons. + export LD_PRELOAD="" make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL}" + # We need libfaketime for all the timestamps e.g. written into the libraries. + # BUT we need to exclude |make build| from it. Otherwise the build fails close + # to the end, see #12461 comment 8 and later. Additionally, we need to avoid + # breaking the ICU compilation. Exlcuding |bash| helps here. See #12461 + # comment 13. + export LD_PRELOAD="$INSTDIR/faketime/usr/local/lib/faketime/libfaketime.so.1" + export FAKETIME_SKIP_CMDS="bash,make" find -type f | xargs touch --date="$REFERENCE_DATETIME" - # make BUILD_HOSTNAME="gitian" $MAKEOPTS -f client.mk build + # Packaging is broken with libfaketime enabled, thus we disable it again. See + # #12461 comments 11 and 12 for details. + export LD_PRELOAD="" make -C obj-* package INNER_MAKE_PACKAGE=true + # Without libfaketime enabled we would get different omni.ja and *debug.zip + # files. + export LD_PRELOAD="$INSTDIR/faketime/usr/local/lib/faketime/libfaketime.so.1" cp -a obj-*/dist/firefox/* $INSTDIR/Browser/ # Remove firefox-bin (we don't use it, see ticket #10126) rm -f $INSTDIR/Browser/firefox-bin diff --git a/gitian/descriptors/mac/gitian-firefox.yml b/gitian/descriptors/mac/gitian-firefox.yml index 40693b0..b07a261 100644 --- a/gitian/descriptors/mac/gitian-firefox.yml +++ b/gitian/descriptors/mac/gitian-firefox.yml @@ -10,12 +10,13 @@ packages: - "zip" - "autoconf" - "autoconf2.13" -- "faketime" - "yasm" reference_datetime: "2000-01-01 00:00:00" remotes: - "url": "https://git.torproject.org/tor-browser.git" "dir": "tor-browser" +- "url": "https://github.com/wolfcw/libfaketime" + "dir": "faketime" files: - "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb" - "x86_64-apple-darwin10.tar.xz" @@ -26,15 +27,21 @@ files: script: | INSTDIR="$HOME/install/" source versions - export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 - export FAKETIME=$REFERENCE_DATETIME export TZ=UTC export LC_ALL=C umask 0022 # mkdir -p $INSTDIR/TorBrowser.app/Contents/MacOS/ mkdir -p $OUTDIR/ - # + + # Building libfaketime. + cd faketime + make + DESTDIR="$INSTDIR/faketime" make install + export LD_PRELOAD="$INSTDIR/faketime/usr/local/lib/faketime/libfaketime.so.1" + export FAKETIME=$REFERENCE_DATETIME + cd .. + sudo dpkg -i *.deb tar -xavf x86_64-apple-darwin10.tar.xz # XXX: Needed for the otool patch. But we should replace that one with a @@ -57,9 +64,21 @@ script: | find -type f | xargs touch --date="$REFERENCE_DATETIME" rm -f configure rm -f js/src/configure + # |configure| can't cope with nano seconds faked. And even if we would revert + # that feature it would hang sometimes for unknown but to libfaketime related + # reasons. + export LD_PRELOAD="" make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL}" find -type f | xargs touch --date="$REFERENCE_DATETIME" - # + # We need libfaketime for all the timestamps e.g. written into the libraries. + # BUT we need to exclude |make build| from it. Otherwise the build fails close + # to the end, see #12812 comment 6 and #12461 comment 8 and later. + # Additionally, we need to exclude |rsync| due to #10153 which is reproducible + # reliably with the new libfaketime. + export LD_PRELOAD="$INSTDIR/faketime/usr/local/lib/faketime/libfaketime.so.1" + # XXX Order matters as for some reason the env variable has only the first + # command assigned when it comes to the rsync parts in the build process. + export FAKETIME_SKIP_CMDS="rsync,make" make BUILD_HOSTNAME="gitian" $MAKEOPTS -f client.mk build # make -C obj-macos package INNER_MAKE_PACKAGE=true diff --git a/gitian/descriptors/windows/gitian-firefox.yml b/gitian/descriptors/windows/gitian-firefox.yml index da0c8b1..bcffffe 100644 --- a/gitian/descriptors/windows/gitian-firefox.yml +++ b/gitian/descriptors/windows/gitian-firefox.yml @@ -9,12 +9,13 @@ packages: - "zip" - "autoconf" - "autoconf2.13" -- "faketime" - "yasm" reference_datetime: "2000-01-01 00:00:00" remotes: - "url": "https://git.torproject.org/tor-browser.git" "dir": "tor-browser" +- "url": "https://github.com/wolfcw/libfaketime" + "dir": "faketime" files: - "mingw-w64-win32-utils.zip" - "re-dzip.sh" @@ -28,8 +29,6 @@ files: script: | INSTDIR="$HOME/install" source versions - export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 - export FAKETIME=$REFERENCE_DATETIME export TZ=UTC export LC_ALL=C umask 0022 @@ -41,6 +40,14 @@ script: | # Make sure our custom mingw gets used. export PATH=$INSTDIR/mingw-w64/bin:$PATH + # Building libfaketime + cd faketime + make + DESTDIR="$INSTDIR/faketime" make install + export LD_PRELOAD="$INSTDIR/faketime/usr/local/lib/faketime/libfaketime.so.1" + export FAKETIME=$REFERENCE_DATETIME + cd .. + # We don't want to link against msvcrt.dll due to bug 9084. i686-w64-mingw32-g++ -dumpspecs > msvcr100.spec sed 's/msvcrt/msvcr100/' -i msvcr100.spec @@ -71,6 +78,10 @@ script: | find -type f | xargs touch --date="$REFERENCE_DATETIME" rm -f configure rm -f js/src/configure + # |configure| can't cope with nano seconds faked. And even if we would revert + # that feature it would hang sometimes for unknown but to libfaketime related + # reasons. + export LD_PRELOAD="" make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL}" find -type f | xargs touch --date="$REFERENCE_DATETIME" # @@ -78,6 +89,11 @@ script: | cp ~/build/i686* ~/build/bin/ export PATH=~/build/bin:$PATH # + # We need libfaketime for all the timestamps e.g. written into the libraries. + # BUT we need to exclude |make build| from it. Otherwise the build fails close + # to the end, see #12811 comment 14 and #12461 comment 8 and later. + export LD_PRELOAD="$INSTDIR/faketime/usr/local/lib/faketime/libfaketime.so.1" + export FAKETIME_SKIP_CMDS="make" make BUILD_HOSTNAME="gitian" $MAKEOPTS -f client.mk build # make -C obj-* package INNER_MAKE_PACKAGE=true diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index ad82ddf..3a4dc87 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -294,6 +294,7 @@ libdmg-hfsplus https://github.com/vasi/libdmg-hfsplus.git $LIBDMG_TAG txsocksx https://github.com/habnabit/txsocksx.git $TXSOCKSX_TAG goptlib https://git.torproject.org/pluggable-transports/goptlib.git $GOPTLIB_TAG meek https://git.torproject.org/pluggable-transports/meek.git $MEEK_TAG +faketime https://github.com/wolfcw/libfaketime $FAKETIME_TAG EOF exit 0 diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index 8a4e55f..4106e74 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -197,7 +197,7 @@ then echo "****** Starting TorBrowser Component of Linux Bundle (3/5 for Linux) ******" echo - ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit tor-browser=$TORBROWSER_TAG $DESCRIPTOR_DIR/linux/gitian-firefox.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit tor-browser=$TORBROWSER_TAG,faketime=$FAKETIME_TAG $DESCRIPTOR_DIR/linux/gitian-firefox.yml if [ $? -ne 0 ]; then #mv var/build.log ./firefox-fail-linux.log.`date +%Y%m%d%H%M%S` diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index d71c824..9a43685 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -165,7 +165,7 @@ then echo "****** Starting TorBrowser Component of Mac Bundle (3/5 for Mac) ******" echo - ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit tor-browser=$TORBROWSER_TAG $DESCRIPTOR_DIR/mac/gitian-firefox.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit tor-browser=$TORBROWSER_TAG,faketime=$FAKETIME_TAG $DESCRIPTOR_DIR/mac/gitian-firefox.yml if [ $? -ne 0 ]; then #mv var/build.log ./firefox-fail-mac.log.`date +%Y%m%d%H%M%S` diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh index d7fc722..56830a0 100755 --- a/gitian/mkbundle-windows.sh +++ b/gitian/mkbundle-windows.sh @@ -168,7 +168,7 @@ then echo "****** Starting Torbrowser Component of Windows Bundle (3/5 for Windows) ******" echo - ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit tor-browser=$TORBROWSER_TAG $DESCRIPTOR_DIR/windows/gitian-firefox.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit tor-browser=$TORBROWSER_TAG,faketime=$FAKETIME_TAG $DESCRIPTOR_DIR/windows/gitian-firefox.yml if [ $? -ne 0 ]; then #mv var/build.log ./firefox-fail-win32.log.`date +%Y%m%d%H%M%S` diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 58d647f..a59e8a1 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -27,6 +27,7 @@ LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2 GOPTLIB_TAG=master MEEK_TAG=master +FAKETIME_TAG=70aa6b394d9341522dffe8a5a5cf5929e82cc6b9 # unsigned v0.9.6 GITIAN_TAG=tor-browser-builder-3.x-7

1 0

[tor-browser-bundle/master] Package clean-up in descriptors.
by gk＠torproject.org 30 Sep '14

30 Sep '14

commit 232148eea6b7ce3816da757eb2532d0d40dc7050 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Sep 19 13:26:59 2014 +0000 Package clean-up in descriptors. --- gitian/descriptors/linux/gitian-bundle.yml | 7 ++----- gitian/descriptors/linux/gitian-firefox.yml | 12 ++---------- gitian/descriptors/linux/gitian-pluggable-transports.yml | 9 ++++----- gitian/descriptors/linux/gitian-tor.yml | 9 +++------ gitian/descriptors/linux/gitian-utils.yml | 8 ++------ gitian/descriptors/mac/gitian-bundle.yml | 12 +++++------- gitian/descriptors/mac/gitian-firefox.yml | 6 ++---- gitian/descriptors/mac/gitian-pluggable-transports.yml | 10 ++++------ gitian/descriptors/mac/gitian-tor.yml | 8 ++------ gitian/descriptors/mac/gitian-utils.yml | 8 ++------ gitian/descriptors/windows/gitian-bundle.yml | 4 +--- gitian/descriptors/windows/gitian-firefox.yml | 6 ++---- gitian/descriptors/windows/gitian-pluggable-transports.yml | 11 ++++------- gitian/descriptors/windows/gitian-tor.yml | 8 ++------ gitian/descriptors/windows/gitian-utils.yml | 12 ++++-------- 15 files changed, 41 insertions(+), 89 deletions(-) diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index d3b030c..19233b6 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -6,13 +6,10 @@ architectures: - "i386" - "amd64" packages: -- "git-core" +- "faketime" - "unzip" - "zip" -- "faketime" -- "python" -- "rnv" -- "xz-utils" +# Both packages are needed for assembling the HTTPS-Everywhere rules since 3.5. - "libxslt1.1" - "sqlite3" reference_datetime: "2000-01-01 00:00:00" diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index d7958b0..5d47b96 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -8,21 +8,13 @@ architectures: packages: - "unzip" - "zip" -- "libglib2.0-dev" +- "autoconf2.13" - "libgtk2.0-dev" -- "libdbus-1-dev" - "libdbus-glib-1-dev" - "yasm-1" - "libasound2-dev" -- "libcurl4-openssl-dev" -- "libxt-dev" -- "mesa-common-dev" -- "autoconf" -- "autoconf2.13" -- "libtool" -- "libiw-dev" -- "hardening-wrapper" - "libgstreamer-plugins-base0.10-dev" +- "hardening-wrapper" # To pass configure since ESR 31. - "libpulse-dev" # We built GCC but not the libmpc2, thus we need to install it. diff --git a/gitian/descriptors/linux/gitian-pluggable-transports.yml b/gitian/descriptors/linux/gitian-pluggable-transports.yml index f9e2b51..7e23ec5 100644 --- a/gitian/descriptors/linux/gitian-pluggable-transports.yml +++ b/gitian/descriptors/linux/gitian-pluggable-transports.yml @@ -6,14 +6,13 @@ architectures: - "i386" - "amd64" packages: -- "git-core" +- "faketime" - "unzip" -- "zip" -- "swig" -- "m4" - "python-setuptools" - "python-dev" -- "faketime" +# Needed by M2Crypto +- "swig" +- "zip" - "hardening-wrapper" reference_datetime: "2000-01-01 00:00:00" remotes: diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml index 2dccff6..aad9368 100644 --- a/gitian/descriptors/linux/gitian-tor.yml +++ b/gitian/descriptors/linux/gitian-tor.yml @@ -6,16 +6,13 @@ architectures: - "i386" - "amd64" packages: -- "git-core" +- "faketime" - "unzip" -- "zip" -- "autoconf" -- "autoconf2.13" - "automake" -- "faketime" - "libtool" -- "hardening-wrapper" - "zlib1g-dev" +- "zip" +- "hardening-wrapper" reference_datetime: "2000-01-01 00:00:00" remotes: - "url": "https://git.torproject.org/tor.git" diff --git a/gitian/descriptors/linux/gitian-utils.yml b/gitian/descriptors/linux/gitian-utils.yml index 59ef707..0c5e38c 100644 --- a/gitian/descriptors/linux/gitian-utils.yml +++ b/gitian/descriptors/linux/gitian-utils.yml @@ -6,14 +6,10 @@ architectures: - "i386" - "amd64" packages: -- "git-core" -- "unzip" -- "zip" -- "autoconf" -- "autoconf2.13" -- "automake" - "faketime" +- "automake" - "libtool" +- "zip" - "hardening-wrapper" # Needed for compiling gold. - "bison" diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index bd8bb5d..82b6595 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -5,19 +5,17 @@ suites: architectures: - "amd64" packages: -- "git-core" +- "faketime" - "unzip" - "zip" -- "faketime" -- "python" -- "hfsprogs" +# Both packages are needed for assembling the HTTPS-Everywhere rules since 3.5. +- "python-lxml" +- "sqlite3" +# Needed for the .dmgs - "genisoimage" - "cmake" - "zlib1g-dev" - "libbz2-dev" -# Both packages are needed for assembling the HTTPS-Everywhere rules since 3.5. -- "python-lxml" -- "sqlite3" reference_datetime: "2000-01-01 00:00:00" remotes: - "url": "https://git.torproject.org/tor-launcher.git" diff --git a/gitian/descriptors/mac/gitian-firefox.yml b/gitian/descriptors/mac/gitian-firefox.yml index b07a261..fc36472 100644 --- a/gitian/descriptors/mac/gitian-firefox.yml +++ b/gitian/descriptors/mac/gitian-firefox.yml @@ -5,12 +5,10 @@ suites: architectures: - "amd64" packages: -- "git-core" -- "unzip" -- "zip" -- "autoconf" - "autoconf2.13" +- "unzip" - "yasm" +- "zip" reference_datetime: "2000-01-01 00:00:00" remotes: - "url": "https://git.torproject.org/tor-browser.git" diff --git a/gitian/descriptors/mac/gitian-pluggable-transports.yml b/gitian/descriptors/mac/gitian-pluggable-transports.yml index d0322f8..33df49f 100644 --- a/gitian/descriptors/mac/gitian-pluggable-transports.yml +++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml @@ -5,15 +5,13 @@ suites: architectures: - "i386" packages: -- "git-core" +- "faketime" - "unzip" -- "zip" -- "swig" -- "m4" - "python-setuptools" - "python-dev" -- "faketime" -- "libtool" +# Needed by M2Crypto +- "swig" +- "zip" reference_datetime: "2000-01-01 00:00:00" remotes: - "url": "https://git.torproject.org/pluggable-transports/pyptlib.git" diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml index ee8a556..6022c0b 100644 --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@ -5,14 +5,10 @@ suites: architectures: - "i386" packages: -- "git-core" +- "faketime" - "unzip" -- "zip" -- "autoconf" -- "autoconf2.13" - "automake" -- "faketime" -- "libtool" +- "zip" reference_datetime: "2000-01-01 00:00:00" remotes: - "url": "https://git.torproject.org/tor.git" diff --git a/gitian/descriptors/mac/gitian-utils.yml b/gitian/descriptors/mac/gitian-utils.yml index 3c6e4a7..785d88c 100644 --- a/gitian/descriptors/mac/gitian-utils.yml +++ b/gitian/descriptors/mac/gitian-utils.yml @@ -5,14 +5,10 @@ suites: architectures: - "i386" packages: -- "git-core" -- "unzip" -- "zip" -- "autoconf" -- "autoconf2.13" -- "automake" - "faketime" +- "automake" - "libtool" +- "zip" reference_datetime: "2000-01-01 00:00:00" remotes: - "url": "https://github.com/libevent/libevent.git" diff --git a/gitian/descriptors/windows/gitian-bundle.yml b/gitian/descriptors/windows/gitian-bundle.yml index 2d50f9c..76f5c67 100644 --- a/gitian/descriptors/windows/gitian-bundle.yml +++ b/gitian/descriptors/windows/gitian-bundle.yml @@ -5,12 +5,10 @@ suites: architectures: - "i386" packages: -- "git-core" +- "faketime" - "unzip" - "zip" - "nsis" -- "faketime" -- "python" # Both packages are needed for assembling the HTTPS-Everywhere rules since 3.5. - "python-lxml" - "sqlite3" diff --git a/gitian/descriptors/windows/gitian-firefox.yml b/gitian/descriptors/windows/gitian-firefox.yml index bcffffe..07c082b 100644 --- a/gitian/descriptors/windows/gitian-firefox.yml +++ b/gitian/descriptors/windows/gitian-firefox.yml @@ -4,12 +4,10 @@ suites: architectures: - "i386" packages: -- "git-core" -- "unzip" -- "zip" -- "autoconf" - "autoconf2.13" +- "unzip" - "yasm" +- "zip" reference_datetime: "2000-01-01 00:00:00" remotes: - "url": "https://git.torproject.org/tor-browser.git" diff --git a/gitian/descriptors/windows/gitian-pluggable-transports.yml b/gitian/descriptors/windows/gitian-pluggable-transports.yml index 93776b8..6a6301d 100644 --- a/gitian/descriptors/windows/gitian-pluggable-transports.yml +++ b/gitian/descriptors/windows/gitian-pluggable-transports.yml @@ -5,15 +5,12 @@ suites: architectures: - "i386" packages: -- "git-core" +- "faketime" - "unzip" -- "zip" -- "swig" - "p7zip-full" -- "m4" -- "python-dev" -- "faketime" -- "libtool" +# Needed by M2Crypto +- "swig" +- "zip" reference_datetime: "2000-01-01 00:00:00" remotes: - "url": "https://git.torproject.org/pluggable-transports/pyptlib.git" diff --git a/gitian/descriptors/windows/gitian-tor.yml b/gitian/descriptors/windows/gitian-tor.yml index c326157..0ac603c 100644 --- a/gitian/descriptors/windows/gitian-tor.yml +++ b/gitian/descriptors/windows/gitian-tor.yml @@ -5,14 +5,10 @@ suites: architectures: - "i386" packages: -- "git-core" +- "faketime" - "unzip" -- "zip" -- "autoconf" - "automake" -- "autoconf2.13" -- "faketime" -- "libtool" +- "zip" reference_datetime: "2000-01-01 00:00:00" remotes: - "url": "https://git.torproject.org/tor.git" diff --git a/gitian/descriptors/windows/gitian-utils.yml b/gitian/descriptors/windows/gitian-utils.yml index 75e5662..f0deca0 100644 --- a/gitian/descriptors/windows/gitian-utils.yml +++ b/gitian/descriptors/windows/gitian-utils.yml @@ -5,15 +5,10 @@ suites: architectures: - "i386" packages: -- "git-core" -- "unzip" -- "zip" -- "autoconf" -- "autoconf2.13" -- "automake" -- "mingw-w64" - "faketime" +- "automake" - "libtool" +- "zip" # XXX: Only needed to dump the spec. - "g++-mingw-w64-i686" # Needed for compiling gcc. @@ -47,8 +42,9 @@ script: | cd binutils* # XXX: This is needed due to bug 10102. sed 's/= extern_rt_rel_d;/= extern_rt_rel_d;\n memset (extern_rt_rel_d, 0, PE_IDATA5_SIZE);/' -i ld/pe-dll.c - # Zeroing timestamps in PE headers reliably, see bug 12753. + # Needed for the hardening... patch -p1 < ../enable-reloc-section-ld.patch + # Zeroing timestamps in PE headers reliably, see bug 12753. patch -p1 < ../peXXigen.patch ./configure --prefix=$INSTDIR/mingw-w64 --target=i686-w64-mingw32 --disable-multilib make $MAKEOPTS

1 0

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation＠torproject.org 30 Sep '14

30 Sep '14

commit 0e6f1c3223884a64a02584b47f2f008701e1dac3 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 30 05:46:16 2014 +0000 Update translations for torbutton-torbuttonproperties --- cs/torbutton.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cs/torbutton.properties b/cs/torbutton.properties index 7baeff3..1ebcfa5 100644 --- a/cs/torbutton.properties +++ b/cs/torbutton.properties @@ -49,9 +49,9 @@ torbutton.popup.never_ask_again = Never ask me again # Canvas permission prompt. Strings are kept here for ease of translation. canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data? -canvas.notNow=Not Now +canvas.notNow=Nyní ne canvas.notNowAccessKey=N -canvas.allow=Allow in the future +canvas.allow=Povolit v budoucnu canvas.allowAccessKey=A -canvas.never=Never for this site (recommended) +canvas.never=Nikdy pro tuto stránku (doporučeno) canvas.neverAccessKey=e

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 30 Sep '14

30 Sep '14

commit 6643bf5813d3f4774c7dbf4c0bbcd6d8faa482dc Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 30 05:45:56 2014 +0000 Update translations for tor-launcher-network-settings --- cs/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cs/network-settings.dtd b/cs/network-settings.dtd index 4059981..4d18151 100644 --- a/cs/network-settings.dtd +++ b/cs/network-settings.dtd @@ -57,6 +57,6 @@ <!ENTITY torsettings.bridgeHelp2 "Použijte internetový prohlížeč k návštěvě https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Přes automatický e-mailový odpovídač"> <!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> +<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, nebo https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Přes zákaznickou linku"> <!ENTITY torsettings.bridgeHelp4 "Jako poslední řešení si můžete vyžádat adresy síťových mostů tak, že zašlete slušný e-mail na help(a)rt.torproject.org.  Vezměte v úvahu si prosím, že na každý požadavek musí odpovědět člověk.">

1 0

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

30 Sep '14

commit bd25b36537e53be89fd755d905ba2017099b4004 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 30 05:45:33 2014 +0000 Update translations for liveusb-creator_completed --- cs/cs.po | 272 ++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 132 insertions(+), 140 deletions(-) diff --git a/cs/cs.po b/cs/cs.po index a1ad417..724b7b2 100644 --- a/cs/cs.po +++ b/cs/cs.po @@ -5,19 +5,19 @@ # Translators: # Adam Pribyl <pribyl(a)lowlevel.cz>, 2008-2009 # Adam Přibyl <pribyl(a)lowlevel.cz>, 2008 -# adamse <adamslovacek(a)gmail.com>, 2013 -# FHRFHRFHRFHR <fhr(a)fhrnet.eu>, 2013 -# Jan Šplíchal <splichal.jan(a)gmail.com>, 2014 -# jui <appukonrad(a)gmail.com>, 2014 +# Adam Slovacek <adamslovacek(a)gmail.com>, 2013 +# Filip Hruska <fhr(a)fhrnet.eu>, 2013 +# Jan Splíchal <splichal.jan(a)gmail.com>, 2014 +# Jiří Vírava <appukonrad(a)gmail.com>, 2014 # dope <maniak11(a)gmail.com>, 2013 -# Radog <bensch.radek(a)gmail.com>, 2013 +# Radek Bensch <inactive+Radog(a)transifex.com>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-03-06 18:42+0100\n" -"PO-Revision-Date: 2014-03-07 09:33+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"POT-Creation-Date: 2014-08-31 10:31+0200\n" +"PO-Revision-Date: 2014-09-30 05:40+0000\n" +"Last-Translator: Jiří Vírava <appukonrad(a)gmail.com>\n" "Language-Team: Czech (http://www.transifex.com/projects/p/torproject/language/cs/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -25,76 +25,76 @@ msgstr "" "Language: cs\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -#: ../liveusb/dialog.py:159 ../liveusb/launcher_ui.py:158 +#: ../liveusb/dialog.py:150 ../liveusb/launcher_ui.py:149 #, python-format msgid "%(distribution)s Installer" msgstr "%(distribution)s instalátor" -#: ../liveusb/gui.py:808 +#: ../liveusb/gui.py:773 #, python-format msgid "%(filename)s selected" msgstr "%(filename)s zvolen" -#: ../liveusb/gui.py:439 +#: ../liveusb/gui.py:423 #, python-format msgid "%(size)s %(label)s" msgstr "%(size)s %(label)s" -#: ../liveusb/gui.py:445 +#: ../liveusb/gui.py:429 #, 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:1059 #, python-format msgid "%s already bootable" msgstr "%s je bootovatelné" -#: ../liveusb/launcher_ui.py:165 +#: ../liveusb/launcher_ui.py:156 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/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;\">Potřebujete pomoc? Přečtěte si </span><a href=\"file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\"><span style=\" text-decoration: underline; color:#0000ff;\">dokumentaci</span></a><span style=\" font-size:10pt;\">.</span></p></body></html>" +"</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; 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:11pt;\">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:11pt;\">.</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:11pt; 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:11pt;\">Potřebujete pomoc? Přečtěte si </span><a href=\"file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\"><span style=\" text-decoration: underline; color:#0000ff;\">dokumentaci</span></a><span style=\" font-size:11pt;\">.</span></p></body></html>" -#: ../liveusb/launcher_ui.py:160 +#: ../liveusb/launcher_ui.py:151 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 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;\">Zkopírujte Tails na USB disk nebo SD kartu. Všechna data z daného zařízení budou smazána.</span></p></body></html>" +"</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; 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:11pt;\">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:11pt; 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:11pt;\">Zkopírujte spuštěný Tails na USB flash disk nebo na SD kartu. Všechna data na cílovém disku budou ztracena.</span></p></body></html>" -#: ../liveusb/launcher_ui.py:162 +#: ../liveusb/launcher_ui.py:153 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 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;\">Zkopíruje právě spuštěný Tails na disk s již nainstalovaným Tails. Ostatní oddíli dísku budou zachovány.</span></p></body></html>" +"</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; 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:11pt;\">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:11pt; 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:11pt;\">Zkopírujte spuštěný Tails na již instalované Tails zařízení. Ostatní nalezené oddíly budou zachovány.</span></p></body></html>" -#: ../liveusb/launcher_ui.py:164 +#: ../liveusb/launcher_ui.py:155 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 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;\">Aktualizace již nainstalovaného Tails zařízení z nového obrazu ISO.</span></p></body></html>" +"</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; 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:11pt;\">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:11pt; 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:11pt;\">Aktualizujte již nainstalované Tails zařízení z nového ISO obrazu.</span></p></body></html>" -#: ../liveusb/dialog.py:163 +#: ../liveusb/dialog.py:154 msgid "Alt+B" msgstr "Alt+B" -#: ../liveusb/dialog.py:162 +#: ../liveusb/dialog.py:153 msgid "Browse" msgstr "Prohlížet" -#: ../liveusb/dialog.py:169 +#: ../liveusb/dialog.py:160 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 " @@ -102,54 +102,54 @@ msgid "" "persist after a reboot." msgstr "Vyčleněním speciálního místa na USB disku pro trvalé uložiště, budete schopni ukládat data a trvale upravovat Váš operační systém. Bez trvalého uložiště není možné data uložit pro další start systému." -#: ../liveusb/creator.py:1122 ../liveusb/creator.py:1385 +#: ../liveusb/creator.py:1158 ../liveusb/creator.py:1421 #, python-format msgid "Calculating the SHA1 of %s" msgstr "Kalkuluji SHA1 %s" -#: ../liveusb/creator.py:1333 +#: ../liveusb/creator.py:1369 msgid "Cannot find" msgstr "Nemohu nalézt" -#: ../liveusb/creator.py:542 +#: ../liveusb/creator.py:556 #, python-format msgid "Cannot find device %s" msgstr "Nemohu nalézt zařízení %s" -#: ../liveusb/launcher_ui.py:159 +#: ../liveusb/launcher_ui.py:150 msgid "" "Clone\n" "&&\n" "Install" msgstr "Klonovat\n&&\nInstalovat" -#: ../liveusb/launcher_ui.py:161 +#: ../liveusb/launcher_ui.py:152 msgid "" "Clone\n" "&&\n" "Upgrade" msgstr "Klonovat\n&&\nUpgradovat" -#: ../liveusb/creator.py:400 +#: ../liveusb/creator.py:408 #, python-format msgid "Creating %sMB persistent overlay" msgstr "Vytvářím %sMB překrytí trvalého úložiště" -#: ../liveusb/gui.py:567 +#: ../liveusb/gui.py:551 msgid "" "Device is not yet mounted, so we cannot determine the amount of free space." msgstr "Disk ještě nebyl připojen, proto není možné určit množství volného místa." -#: ../liveusb/dialog.py:166 +#: ../liveusb/dialog.py:157 #, python-format msgid "Download %(distribution)s" msgstr "Stáhni %(distribution)s" -#: ../liveusb/gui.py:782 +#: ../liveusb/gui.py:747 msgid "Download complete!" msgstr "Stahování dokončeno!" -#: ../liveusb/gui.py:786 +#: ../liveusb/gui.py:751 msgid "Download failed: " msgstr "Stahování selhalo: " @@ -158,210 +158,204 @@ msgstr "Stahování selhalo: " msgid "Downloading %s..." msgstr "Stahuji %s..." -#: ../liveusb/creator.py:1118 +#: ../liveusb/creator.py:1154 msgid "Drive is a loopback, skipping MBR reset" msgstr "Zařízení je smyčka, přeskakuji resetování hlavního bootovacího záznamu" -#: ../liveusb/creator.py:813 +#: ../liveusb/creator.py:827 #, python-format msgid "Entering unmount_device for '%(device)s'" msgstr "Spouští se unmount_device pro '%(device)s'" -#: ../liveusb/creator.py:1198 +#: ../liveusb/creator.py:1234 msgid "Error probing device" msgstr "Chyba při snímání zařízení" -#: ../liveusb/gui.py:227 +#: ../liveusb/gui.py:211 msgid "" "Error: Cannot set the label or obtain the UUID of your device. Unable to " "continue." msgstr "Chyba: Nelze nastavit jmenovku nebo získat UUID vašeho zařízení. Nemohu pokračovat." -#: ../liveusb/creator.py:376 +#: ../liveusb/creator.py:384 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 "Chyba: SHA1 vašeho LiveCD je neplatný. Tento program můžete spustit s parametrem --noverify abyste tuto kontrolu přeskočili." -#: ../liveusb/creator.py:145 +#: ../liveusb/creator.py:147 msgid "Extracting live image to the target device..." msgstr "Rozbalování obrazu na cílové zařízení..." -#: ../liveusb/creator.py:1063 +#: ../liveusb/creator.py:1102 #, python-format msgid "Formatting %(device)s as FAT32" msgstr "Formátuji %(device)s jako FAT32" -#: ../liveusb/creator.py:140 +#: ../liveusb/creator.py:142 msgid "ISO MD5 checksum passed" msgstr "ISO MD5 checksum prošel" -#: ../liveusb/creator.py:138 +#: ../liveusb/creator.py:140 msgid "ISO MD5 checksum verification failed" msgstr "ISO MD5 checksum selhal" -#: ../liveusb/dialog.py:165 +#: ../liveusb/dialog.py:156 msgid "" "If you do not select an existing Live ISO, the selected release will be " "downloaded for you." msgstr "Když nezvolíte existující Live ISO, vybraná verze se stáhne automaticky." -#: ../liveusb/dialog.py:174 +#: ../liveusb/dialog.py:165 msgid "Install Tails" msgstr "Instalace Tails" -#: ../liveusb/gui.py:630 +#: ../liveusb/gui.py:614 msgid "Installation complete!" msgstr "Instalace kompletní!" -#: ../liveusb/gui.py:279 +#: ../liveusb/gui.py:264 #, python-format msgid "Installation complete! (%s)" msgstr "Instalace kompletní! (%s)" -#: ../liveusb/gui.py:631 +#: ../liveusb/gui.py:615 msgid "Installation was completed. Press OK to close this program." msgstr "Instalace proběhla úspěšně. Stiskněte OK pro ukončení." -#: ../liveusb/creator.py:916 ../liveusb/creator.py:1239 +#: ../liveusb/creator.py:959 ../liveusb/creator.py:1275 msgid "Installing bootloader..." msgstr "Instaluji bootloader..." -#: ../liveusb/gui.py:284 +#: ../liveusb/gui.py:269 msgid "LiveUSB creation failed!" msgstr "Vytvoření LiveUSB selhalo!" -#: ../liveusb/creator.py:1334 +#: ../liveusb/creator.py:1370 msgid "" "Make sure to extract the entire liveusb-creator zip file before running this" " program." msgstr "Ujistěte se, že extrahujete celý liveusb-creator zip soubor před spuštěním programu." -#: ../liveusb/creator.py:1210 +#: ../liveusb/creator.py:1246 msgid "" "Make sure your USB key is plugged in and formatted with the FAT filesystem" msgstr "Ujistěte se, že váš USB disk je připojen a naformátován na systéme souborů FAT" -#: ../liveusb/creator.py:835 +#: ../liveusb/creator.py:849 #, python-format msgid "Mount %s exists after unmounting" msgstr "Připojení %s existuje po odpojení" -#: ../liveusb/gui.py:573 +#: ../liveusb/gui.py:557 #, python-format msgid "No free space on device %(device)s" msgstr "Žádné volné místo na zařízení %(device)s" -#: ../liveusb/creator.py:802 +#: ../liveusb/creator.py:816 msgid "No mount points found" msgstr "Nenalezeny žádné body připojení" -#: ../liveusb/creator.py:393 +#: ../liveusb/creator.py:401 msgid "Not enough free space on device." msgstr "Na disku není dostatek místa." -#: ../liveusb/gui.py:554 +#: ../liveusb/gui.py:538 msgid "Partition is FAT16; Restricting overlay size to 2G" msgstr "Oddíl je FAT16; Omezuje velikost na 2GB" -#: ../liveusb/gui.py:550 +#: ../liveusb/gui.py:534 msgid "Partition is FAT32; Restricting overlay size to 4G" msgstr "Oddíl je formátován na FAT32; velikost souborů je omezena na 4 GB" -#: ../liveusb/creator.py:226 ../liveusb/creator.py:842 +#: ../liveusb/creator.py:228 ../liveusb/creator.py:856 #, python-format msgid "Partitioning device %(device)s" msgstr "Vytváří se oddíly na zařízení %(device)s" -#: ../liveusb/gui.py:621 +#: ../liveusb/gui.py:605 msgid "Persistent Storage" msgstr "Trvalé úložiště" -#: ../liveusb/dialog.py:170 +#: ../liveusb/dialog.py:161 msgid "Persistent Storage (0 MB)" msgstr "Trvalé Úložiště (0 MB)" -#: ../liveusb/gui.py:702 ../liveusb/gui.py:731 +#: ../liveusb/gui.py:667 ../liveusb/gui.py:696 msgid "Please confirm your device selection" msgstr "Potvrďte prosím výběr vašeho zařízení" -#: ../liveusb/gui.py:467 +#: ../liveusb/gui.py:451 msgid "Refreshing releases..." msgstr "Obnovování verzí..." -#: ../liveusb/gui.py:472 +#: ../liveusb/gui.py:456 msgid "Releases updated!" msgstr "Verze obnoveny!" -#: ../liveusb/creator.py:939 ../liveusb/creator.py:1257 +#: ../liveusb/creator.py:966 ../liveusb/creator.py:1293 #, python-format msgid "Removing %(file)s" msgstr "Odebírám %(file)s" -#: ../liveusb/creator.py:469 +#: ../liveusb/creator.py:483 msgid "Removing existing Live OS" msgstr "Odebírám existující Live OS" -#: ../liveusb/creator.py:1112 +#: ../liveusb/creator.py:1148 #, python-format msgid "Resetting Master Boot Record of %s" msgstr "Resetuji hlavní bootovací záznam %s" -#: ../liveusb/gui.py:793 +#: ../liveusb/gui.py:758 msgid "Select Live ISO" msgstr "Vyberte Live ISO" -#: ../liveusb/creator.py:182 +#: ../liveusb/creator.py:184 msgid "Setting up OLPC boot file..." msgstr "Nastavuji startovací soubor OLPC..." -#: ../liveusb/creator.py:716 +#: ../liveusb/creator.py:730 #, python-format msgid "" "Some partitions of the target device %(device)s are mounted. They will be " "unmounted before starting the installation process." msgstr "Některé oddíly, které jsou připojeny na cílovém zařízení %(device)s, budou před zahájením procesu instalace odpojeny." -#: ../liveusb/creator.py:131 +#: ../liveusb/creator.py:133 msgid "" "Source type does not support verification of ISO MD5 checksum, skipping" msgstr "Typ zdroje nedovoluje ověření pomocí kontrolního součtu ISO MD5, přeskakuji" -#: ../liveusb/creator.py:1146 +#: ../liveusb/creator.py:1182 msgid "Synchronizing data on disk..." msgstr "Synchronizuji data na disk..." -#: ../liveusb/dialog.py:168 +#: ../liveusb/dialog.py:159 msgid "Target Device" msgstr "Cílové zařízení" -#: ../liveusb/gui.py:667 -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 na vašem zařízení je prázdný. Stisknutí tlačítka \"Instalovat Tails\" opět obnoví MBR na tomto zařízení." - -#: ../liveusb/gui.py:796 +#: ../liveusb/gui.py:761 msgid "" "The selected file is unreadable. Please fix its permissions or select " "another file." msgstr "Vybraný soubor je nečitelný. Opravte jeho oprávnění nebo vyberte jiný soubor." -#: ../liveusb/creator.py:337 +#: ../liveusb/creator.py:345 #, 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 "Vyskytl se problém s vykonáním následujícího příkazu: '%(command)s'\nPodrobnosti o této chybě byly zapsány do souboru '%(filename)s'." -#: ../liveusb/dialog.py:160 +#: ../liveusb/dialog.py:151 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 "Toto tlačítko Vám umožňuje najít ISO obraz Live systému, který jste si stáhnuli. Jestliže si žádný nevyberete, ISO bude staženo automaticky." -#: ../liveusb/dialog.py:173 +#: ../liveusb/dialog.py:164 msgid "" "This button will begin the LiveUSB creation process. This entails " "optionally downloading a release (if an existing one wasn't selected), " @@ -369,103 +363,103 @@ msgid "" "installing the bootloader." msgstr "Tlačítko spustí proces vytváření LiveUSB. To může popřípadě znamenat stažení ISO obrazu (pokud nebyl žádný vybrán) a rozbalení na USB disk, vytvoření trvalého uložiště a nainstalování zavaděče." -#: ../liveusb/dialog.py:167 +#: ../liveusb/dialog.py:158 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 "Na tento USB disk bude nainstalován Váš Live systém. Disk musí být zformátován souborovým systémem FAT." -#: ../liveusb/dialog.py:172 +#: ../liveusb/dialog.py:163 msgid "" "This is the progress bar that will indicate how far along in the LiveUSB " "creation process you are" msgstr "Indikátor postupu který zobrazí, jak daleko jste ve vytváření LiveUSB." -#: ../liveusb/dialog.py:171 +#: ../liveusb/dialog.py:162 msgid "This is the status console, where all messages get written to." msgstr "Toto je informační konsole, kde budou vypsané všechny zprávy." -#: ../liveusb/creator.py:879 +#: ../liveusb/creator.py:922 msgid "Trying to continue anyway." msgstr "Snažím se pokračovat dál." -#: ../liveusb/creator.py:911 +#: ../liveusb/creator.py:954 #, python-format msgid "Unable to change volume label: %(message)s" msgstr "Není možné změnit jmenovku svazku: %(message)s" -#: ../liveusb/creator.py:478 ../liveusb/creator.py:489 +#: ../liveusb/creator.py:492 ../liveusb/creator.py:503 #, python-format msgid "Unable to chmod %(file)s: %(message)s" msgstr "Nemohu změnit oprávnění %(file)s: %(message)s" -#: ../liveusb/creator.py:459 +#: ../liveusb/creator.py:469 #, python-format msgid "Unable to copy %(infile)s to %(outfile)s: %(message)s" msgstr "Nemohu zkopírovat %(infile)s do %(outfile)s: %(message)s" -#: ../liveusb/gui.py:418 +#: ../liveusb/gui.py:402 msgid "Unable to find any USB drive" msgstr "Nemohu najít žádný USB klíč." -#: ../liveusb/creator.py:1200 +#: ../liveusb/creator.py:1236 msgid "Unable to find any supported device" msgstr "Nenalezeno žádné podporované zařízení." -#: ../liveusb/creator.py:1040 +#: ../liveusb/creator.py:1079 msgid "Unable to find partition" msgstr "Nemohu najít oddíl" -#: ../liveusb/creator.py:1280 +#: ../liveusb/creator.py:1316 msgid "" "Unable to get Win32_LogicalDisk; win32com query did not return any results" msgstr "Nemohu získat Win32_LogicalDisk; win32com výsledky" -#: ../liveusb/gui.py:695 +#: ../liveusb/gui.py:660 msgid "Unable to mount device" msgstr "Nemohu připojit zařízení" -#: ../liveusb/creator.py:790 +#: ../liveusb/creator.py:804 #, python-format msgid "Unable to mount device: %(message)s" msgstr "Nemohu připojit zařízení: %(message)s" -#: ../liveusb/creator.py:494 +#: ../liveusb/creator.py:508 #, python-format msgid "Unable to remove directory from previous LiveOS: %(message)s" msgstr "Nemohu odebrat složku z předchozího LiveOS: %(message)s" -#: ../liveusb/creator.py:482 +#: ../liveusb/creator.py:496 #, python-format msgid "Unable to remove file from previous LiveOS: %(message)s" msgstr "Nemohu odebrat soubor z předchozího LiveOS: %(message)s" -#: ../liveusb/creator.py:1115 +#: ../liveusb/creator.py:1151 msgid "" "Unable to reset MBR. You may not have the `syslinux` package installed." msgstr "Nemohu resetovat hlavní bootovací záznam. Možná nemáte nainstalovaný `syslinux` balíček." -#: ../liveusb/gui.py:802 +#: ../liveusb/gui.py:767 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 "Nemohu použít vybraný soubor. Zkuste přesunout ISO do kořenového adresáře vašeho disku (např. C:\\)" -#: ../liveusb/creator.py:697 +#: ../liveusb/creator.py:711 #, python-format msgid "Unable to write on %(device)s, skipping." msgstr "Nemohu zapisovat na %(device)s, přeskakuji." -#: ../liveusb/creator.py:382 +#: ../liveusb/creator.py:390 msgid "Unknown ISO, skipping checksum verification" msgstr "Neznámé ISO, přeskakuji ověření kontrolního součtu" -#: ../liveusb/creator.py:786 +#: ../liveusb/creator.py:800 #, python-format msgid "Unknown dbus exception while trying to mount device: %(message)s" msgstr "Neznámá dbus vyjímka při pokusu připojit zařízení: %(message)s " -#: ../liveusb/creator.py:765 ../liveusb/creator.py:890 +#: ../liveusb/creator.py:779 ../liveusb/creator.py:933 msgid "Unknown filesystem. Your device may need to be reformatted." msgstr "Neznámý souborový systém. Vaše zařízení bude nutné zformátovat." @@ -474,96 +468,94 @@ msgstr "Neznámý souborový systém. Vaše zařízení bude nutné zformátovat msgid "Unknown release: %s" msgstr "Neznámé vydání: %s" -#: ../liveusb/creator.py:827 +#: ../liveusb/creator.py:841 #, python-format msgid "Unmounting '%(udi)s' on '%(device)s'" msgstr "Odpojuje se '%(udi)s' z '%(device)s'" -#: ../liveusb/creator.py:823 +#: ../liveusb/creator.py:837 #, python-format msgid "Unmounting mounted filesystems on '%(device)s'" msgstr "Odpojuje se připojený souborový systém na '%(device)s'" -#: ../liveusb/creator.py:876 +#: ../liveusb/creator.py:919 #, python-format msgid "Unsupported device '%(device)s', please report a bug." msgstr "Nepodporované zařízení '%(device)s', prosím nahlaste chybu" -#: ../liveusb/creator.py:770 ../liveusb/creator.py:893 +#: ../liveusb/creator.py:784 ../liveusb/creator.py:936 #, python-format msgid "Unsupported filesystem: %s" msgstr "Nepodporovaný systém souborů: %s" -#: ../liveusb/creator.py:768 +#: ../liveusb/creator.py:782 #, 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 "Nepodporovaný souborový systém: %s\nV případě, že se pokoušíte upgradovat manuálně nainstalovaný systém Tails (to znamená, že byl nainstalován bez instalátoru), tato možnost není podporována: je nutné nainstalovat systém nanovo, např. raději výběrem \"Clone Tails\"." -#: ../liveusb/creator.py:1213 +#: ../liveusb/creator.py:1249 #, python-format msgid "" "Unsupported filesystem: %s\n" "Please backup and format your USB key with the FAT filesystem." msgstr "Nepodporovaný systém souborů: %s\nProsím proveďte zálohu a naformátujte USB disk systémem souborů FAT." -#: ../liveusb/launcher_ui.py:163 +#: ../liveusb/creator.py:882 +#, python-format +msgid "Updating properties of system partition %(system_partition)s" +msgstr "Aktualizace vlastností systémového diskového oddílu %(system_partition)s" + +#: ../liveusb/launcher_ui.py:154 msgid "Upgrade from ISO" msgstr "Upgrade z ISO" -#: ../liveusb/dialog.py:161 +#: ../liveusb/dialog.py:152 msgid "Use existing Live system ISO" msgstr "Použít existující Live system ISO" -#: ../liveusb/creator.py:133 +#: ../liveusb/creator.py:135 msgid "Verifying ISO MD5 checksum" msgstr "Ověřuji ISO kontrolní součet MD5 " -#: ../liveusb/creator.py:356 +#: ../liveusb/creator.py:364 msgid "Verifying SHA1 checksum of LiveCD image..." msgstr "Ověřuji kontrolní součet SHA1 obrazu LiveCD..." -#: ../liveusb/creator.py:360 +#: ../liveusb/creator.py:368 msgid "Verifying SHA256 checksum of LiveCD image..." msgstr "Ověřuji kontrolní součet SHA256 obrazu LiveCD..." -#: ../liveusb/creator.py:887 ../liveusb/creator.py:1206 +#: ../liveusb/creator.py:930 ../liveusb/creator.py:1242 msgid "Verifying filesystem..." msgstr "Ověřuji systém souborů..." -#: ../liveusb/gui.py:729 +#: ../liveusb/gui.py:694 msgid "" "Warning: Creating a new persistent overlay will delete your existing one." msgstr "Varování: vytvořením nového trvalého úložiště smažete již existující." -#: ../liveusb/gui.py:681 -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 "Varování: Hlavní bootovací záznam vašeho zařízení neodpovídá syslinux bootovacímu záznamu vašeho systému. Jestliže máte problém nabootovat toto zařízení, zkuste zpustit liveusb-creator s --reset-mbr atributem." - -#: ../liveusb/gui.py:392 +#: ../liveusb/gui.py:376 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 "Upozornění: Tento nástroj je nutné spustit jako Administrátor. Učiníte tak kliknutím pravým tlačítkem na ikonu a vyberte Vlastnosti. V záložce Kompatibilita vyberte možnost Spustit tento program jako správce." -#: ../liveusb/creator.py:152 +#: ../liveusb/creator.py:154 #, python-format msgid "Wrote to device at %(speed)d MB/sec" msgstr "Zapsáno na zařízení %(speed)d MB/sec" -#: ../liveusb/gui.py:703 +#: ../liveusb/gui.py:668 #, 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 "Chystáte se nainstalovat Tails velikosti %(size)s na zařízení (%(device)s) %(vendor)s %(model)s. Všechna data na zvoleném zařízení budou ztracena. Pokračovat?" -#: ../liveusb/gui.py:719 +#: ../liveusb/gui.py:684 #, python-format msgid "" "You are going to upgrade Tails on the %(parent_size)s %(vendor)s %(model)s " @@ -571,20 +563,20 @@ msgid "" "unchanged. Continue?" msgstr "Chystáte se aktualizovat Tails velikosti %(parent_size)s na zařízení (%(device)s) %(vendor)s %(model)s. Jakékoli trvalé svazky na tomto zařízení zůstnou beze změny. Pokračovat?" -#: ../liveusb/creator.py:604 +#: ../liveusb/creator.py:618 msgid "" "You are using an old version of syslinux-extlinux that does not support the " "ext4 filesystem" msgstr "Používáte starou vezi syslinux-extlinux, které nepodporuje souborový systém ext4" -#: ../liveusb/gui.py:787 +#: ../liveusb/gui.py:752 msgid "You can try again to resume your download" msgstr "Zkuste znovu zahájit stahování" -#: ../liveusb/creator.py:92 +#: ../liveusb/creator.py:94 msgid "You must run this application as root" msgstr "Tuto aplikaci musíte spouštět jako root" -#: ../liveusb/dialog.py:164 +#: ../liveusb/dialog.py:155 msgid "or" msgstr "nebo"

1 0