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

[tor-browser-bundle/master] Upgrade OpenSSL to 1.0.1f.
by mikeperry＠torproject.org 14 Jan '14

14 Jan '14

commit 151bf2706122c61a10f305593137d9bd9352e421 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Jan 14 15:24:55 2014 -0800 Upgrade OpenSSL to 1.0.1f. Also switch back to using the official dist tarballs, since Nick's timestamp patch was merged. --- gitian/descriptors/linux/gitian-tor.yml | 6 ++--- gitian/descriptors/mac/gitian-tor.yml | 6 ++--- gitian/descriptors/windows/gitian-tor.yml | 6 ++--- gitian/fetch-inputs.sh | 34 ++++++++++++++--------------- gitian/mkbundle-linux.sh | 3 +-- gitian/mkbundle-mac.sh | 3 +-- gitian/mkbundle-windows.sh | 3 +-- gitian/record-inputs.sh | 3 +-- gitian/verify-tags.sh | 1 - gitian/versions | 9 ++++---- gitian/versions.alpha | 17 +++++++-------- 11 files changed, 42 insertions(+), 49 deletions(-) diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml index df92f37..736e84c 100644 --- a/gitian/descriptors/linux/gitian-tor.yml +++ b/gitian/descriptors/linux/gitian-tor.yml @@ -22,10 +22,9 @@ remotes: "dir": "tor" - "url": "https://github.com/libevent/libevent.git" "dir": "libevent" -- "url": "https://github.com/nmathewson/openssl.git" - "dir": "openssl" files: - "dzip.sh" +- "openssl.tar.gz" script: | INSTDIR="$HOME/install" export LIBRARY_PATH="$INSTDIR/lib" @@ -55,7 +54,8 @@ script: | cp $INSTDIR/libevent/lib/libevent-2.0.so.5 $INSTDIR/Tor/ cd .. # - cd openssl + tar xzf openssl.tar.gz + cd openssl-* find -type f | xargs touch --date="$REFERENCE_DATETIME" #./Configure -shared --prefix=$INSTDIR/openssl linux-elf ./config -shared --prefix=$INSTDIR/openssl diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml index c0b483b..7707555 100644 --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@ -22,9 +22,8 @@ remotes: "dir": "libevent" - "url": "https://github.com/madler/zlib.git" "dir": "zlib" -- "url": "https://github.com/nmathewson/openssl.git" - "dir": "openssl" files: +- "openssl.tar.gz" - "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb" - "multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz" - "dzip.sh" @@ -65,7 +64,8 @@ script: | #cp $INSTDIR/zlib/lib/*.dylib $INSTDIR/Tor/ #cd .. # - cd openssl + tar xzf openssl.tar.gz + cd openssl-* find -type f | xargs touch --date="$REFERENCE_DATETIME" ./Configure --cross-compile-prefix=i686-apple-darwin11- $CFLAGS darwin-i386-cc --prefix=$INSTDIR/openssl make # SHARED_LDFLAGS="-shared -dynamiclib -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/" diff --git a/gitian/descriptors/windows/gitian-tor.yml b/gitian/descriptors/windows/gitian-tor.yml index 836e695..901383e 100644 --- a/gitian/descriptors/windows/gitian-tor.yml +++ b/gitian/descriptors/windows/gitian-tor.yml @@ -22,11 +22,10 @@ remotes: "dir": "libevent" - "url": "https://github.com/madler/zlib.git" "dir": "zlib" -- "url": "https://github.com/nmathewson/openssl.git" - "dir": "openssl" files: - "binutils.tar.bz2" - "dzip.sh" +- "openssl.tar.gz" script: | INSTDIR="$HOME/install" export LIBRARY_PATH="$INSTDIR/lib" @@ -71,7 +70,8 @@ script: | cp $INSTDIR/libevent/bin/*.dll $INSTDIR/Tor/ cd .. # - cd openssl + tar xzf openssl.tar.gz + cd openssl-* find -type f | xargs touch --date="$REFERENCE_DATETIME" ./Configure -shared --cross-compile-prefix=i686-w64-mingw32- mingw --prefix=$INSTDIR/openssl make diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 9f54f61..862f8af 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -116,20 +116,20 @@ checkout_mingw() { # Get package files from mirror # Get+verify sigs that exist -#for i in OPENSSL # OBFSPROXY -#do -# PACKAGE="${i}_PACKAGE" -# URL="${MIRROR_URL}${!PACKAGE}" -# SUFFIX="asc" -# get "${!PACKAGE}" "$URL" -# get "${!PACKAGE}.$SUFFIX" "$URL.$SUFFIX" -# -# if ! verify "${!PACKAGE}" "$WRAPPER_DIR/gpg/$i.gpg" $SUFFIX; then -# echo "$i: GPG signature is broken for ${URL}" -# mv "${!PACKAGE}" "${!PACKAGE}.badgpg" -# exit 1 -# fi -#done +for i in OPENSSL # OBFSPROXY +do + PACKAGE="${i}_PACKAGE" + URL="${MIRROR_URL}${!PACKAGE}" + SUFFIX="asc" + get "${!PACKAGE}" "$URL" + get "${!PACKAGE}.$SUFFIX" "$URL.$SUFFIX" + + if ! verify "${!PACKAGE}" "$WRAPPER_DIR/gpg/$i.gpg" $SUFFIX; then + echo "$i: GPG signature is broken for ${URL}" + mv "${!PACKAGE}" "${!PACKAGE}.badgpg" + exit 1 + fi +done for i in BINUTILS GCC PYTHON do @@ -164,7 +164,7 @@ done # TOOLCHAIN4 each time. Rely only on SHA256 for now.. mkdir -p verify cd verify -for i in OSXSDK #OPENSSL +for i in OPENSSL OSXSDK do URL="${i}_URL" PACKAGE="${i}_PACKAGE" @@ -200,7 +200,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 MINGW MSVCR100 # OPENSSL +for i in OSXSDK TOOLCHAIN4 NOSCRIPT MINGW MSVCR100 OPENSSL do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" @@ -236,6 +236,7 @@ done cd .. ln -sf "$NOSCRIPT_PACKAGE" noscript(a)noscript.net.xpi +ln -sf "$OPENSSL_PACKAGE" openssl.tar.gz ln -sf "$BINUTILS_PACKAGE" binutils.tar.bz2 ln -sf "$GCC_PACKAGE" gcc.tar.bz2 ln -sf "$PYTHON_PACKAGE" python.tar.bz2 @@ -254,7 +255,6 @@ while read dir url tag; do update_git "$dir" "$url" "$tag" done << EOF tbb-windows-installer https://github.com/moba/tbb-windows-installer.git $NSIS_TAG -openssl https://github.com/nmathewson/openssl.git $OPENSSL_TAG zlib https://github.com/madler/zlib.git $ZLIB_TAG libevent https://github.com/libevent/libevent.git $LIBEVENT_TAG tor https://git.torproject.org/tor.git $TOR_TAG diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index 182b1b6..7c6bd60 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -66,7 +66,6 @@ then GITIAN_TAG=refs/tags/$GITIAN_TAG TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG TORBROWSER_TAG=refs/tags/$TORBROWSER_TAG - OPENSSL_TAG=refs/tags/$OPENSSL_TAG TORBUTTON_TAG=refs/tags/$TORBUTTON_TAG TOR_TAG=refs/tags/$TOR_TAG HTTPSE_TAG=refs/tags/$HTTPSE_TAG @@ -82,7 +81,7 @@ then echo "****** Starting Tor Component of Linux Bundle (1/3 for Linux) ******" echo - ./bin/gbuild -j $NUM_PROCS --commit openssl=$OPENSSL_TAG,zlib=$ZLIB_TAG,libevent=$LIBEVENT_TAG,tor=$TOR_TAG $DESCRIPTOR_DIR/linux/gitian-tor.yml + ./bin/gbuild -j $NUM_PROCS --commit zlib=$ZLIB_TAG,libevent=$LIBEVENT_TAG,tor=$TOR_TAG $DESCRIPTOR_DIR/linux/gitian-tor.yml if [ $? -ne 0 ]; then #mv var/build.log ./tor-fail-linux.log.`date +%Y%m%d%H%M%S` diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index edd3846..531db8f 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -66,7 +66,6 @@ then GITIAN_TAG=refs/tags/$GITIAN_TAG TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG TORBROWSER_TAG=refs/tags/$TORBROWSER_TAG - OPENSSL_TAG=refs/tags/$OPENSSL_TAG TORBUTTON_TAG=refs/tags/$TORBUTTON_TAG TOR_TAG=refs/tags/$TOR_TAG HTTPSE_TAG=refs/tags/$HTTPSE_TAG @@ -82,7 +81,7 @@ then echo "****** Starting Tor Component of Mac Bundle (1/3 for Mac) ******" echo - ./bin/gbuild -j $NUM_PROCS --commit openssl=$OPENSSL_TAG,zlib=$ZLIB_TAG,libevent=$LIBEVENT_TAG,tor=$TOR_TAG $DESCRIPTOR_DIR/mac/gitian-tor.yml + ./bin/gbuild -j $NUM_PROCS --commit zlib=$ZLIB_TAG,libevent=$LIBEVENT_TAG,tor=$TOR_TAG $DESCRIPTOR_DIR/mac/gitian-tor.yml if [ $? -ne 0 ]; then #mv var/build.log ./tor-fail-mac.log.`date +%Y%m%d%H%M%S` diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh index fd0cf42..183c737 100755 --- a/gitian/mkbundle-windows.sh +++ b/gitian/mkbundle-windows.sh @@ -67,7 +67,6 @@ then GITIAN_TAG=refs/tags/$GITIAN_TAG TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG TORBROWSER_TAG=refs/tags/$TORBROWSER_TAG - OPENSSL_TAG=refs/tags/$OPENSSL_TAG TORBUTTON_TAG=refs/tags/$TORBUTTON_TAG TOR_TAG=refs/tags/$TOR_TAG HTTPSE_TAG=refs/tags/$HTTPSE_TAG @@ -83,7 +82,7 @@ then echo "****** Starting Tor Component of Windows Bundle (1/3 for Windows) ******" echo - ./bin/gbuild -j $NUM_PROCS --commit openssl=$OPENSSL_TAG,zlib=$ZLIB_TAG,libevent=$LIBEVENT_TAG,tor=$TOR_TAG $DESCRIPTOR_DIR/windows/gitian-tor.yml + ./bin/gbuild -j $NUM_PROCS --commit zlib=$ZLIB_TAG,libevent=$LIBEVENT_TAG,tor=$TOR_TAG $DESCRIPTOR_DIR/windows/gitian-tor.yml if [ $? -ne 0 ]; then #mv var/build.log ./tor-fail-win32.log.`date +%Y%m%d%H%M%S` diff --git a/gitian/record-inputs.sh b/gitian/record-inputs.sh index 0d44b1a..bbae06f 100755 --- a/gitian/record-inputs.sh +++ b/gitian/record-inputs.sh @@ -24,6 +24,7 @@ cd $INPUTS_DIR rm -f bundle.inputs sha256sum $OSXSDK_PACKAGE >> bundle.inputs +sha256sum $OPENSSL_PACKAGE >> bundle.inputs sha256sum $TOOLCHAIN4_PACKAGE >> bundle.inputs sha256sum mingw-w64-svn-snapshot.zip >> bundle.inputs echo >> bundle.inputs @@ -43,7 +44,6 @@ then HTTPSE_TAG=refs/tags/$HTTPSE_TAG ZLIB_TAG=refs/tags/$ZLIB_TAG LIBEVENT_TAG=refs/tags/$LIBEVENT_TAG - OPENSSL_TAG=refs/tags/$OPENSSL_TAG fi echo "`cd zlib && git log --format=%H -1 $ZLIB_TAG` zlib.git" >> bundle.inputs @@ -53,7 +53,6 @@ echo "`cd torbutton && git log --format=%H -1 $TORBUTTON_TAG` torbutton.git" >> echo "`cd tor-launcher && git log --format=%H -1 $TORLAUNCHER_TAG` tor-launcher.git" >> bundle.inputs echo "`cd https-everywhere && git log --format=%H -1 $HTTPSE_TAG` https-everywhere.git" >> bundle.inputs echo "`cd tbb-windows-installer && git log --format=%H -1 $NSIS_TAG` tbb-windows-installer.git" >> bundle.inputs -echo "`cd openssl && git log --format=%H -1 $OPENSSL_TAG` openssl.git" >> bundle.inputs echo "`cd $INPUTS_DIR && git log --format=%H -1` gitian-builder.git" >> bundle.inputs echo "`cd $WRAPPER_DIR && git log --format=%H -1` tor-browser-bundle.git" >> bundle.inputs diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index 73016a8..055cac5 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -60,7 +60,6 @@ zlib zlib.gpg $ZLIB_TAG libevent libevent.gpg $LIBEVENT_TAG tor tor.gpg $TOR_TAG https-everywhere https-everywhere.gpg $HTTPSE_TAG -openssl tor.gpg $OPENSSL_TAG EOF cd "$INPUTS_DIR" diff --git a/gitian/versions b/gitian/versions index d109b50..e6fba05 100755 --- a/gitian/versions +++ b/gitian/versions @@ -5,7 +5,6 @@ VERIFY_TAGS=1 TORBROWSER_TAG=tor-browser-24.2.0esr-3.5.1-build1 TOR_TAG=tor-0.2.4.20 -OPENSSL_TAG=openssl-101e-no-gmt-time-v1 TORLAUNCHER_TAG=0.2.4.3 TORBUTTON_TAG=1.6.5.4 HTTPSE_TAG=3.4.4tbb @@ -16,14 +15,14 @@ MINGW_REV=6184 GITIAN_TAG=tor-browser-builder-3.0-4 -# OPENSSL_VER=1.0.1e +OPENSSL_VER=1.0.1f FIREFOX_LANG_VER=24.2.0esr BINUTILS_VER=2.22 GCC_VER=4.6.3 PYTHON_VER=2.7.5 ## File names for the source packages -# OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz +OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.7-sm+fx+fn.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb @@ -34,7 +33,7 @@ GCC_PACKAGE=gcc-${GCC_VER}.tar.bz2 PYTHON_PACKAGE=Python-${PYTHON_VER}.tar.bz2 # Hashes for packages with weak sigs or no sigs -# OPENSSL_HASH=f74f15e8c8ff11aa3d5bb5f276d202ec18d7246e95f961db76054199c69c1ae3 +OPENSSL_HASH=6cc2a80b17d64de6b7bac985745fdaba971d54ffd7d38d3556f998d7c0c9cb5a OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 NOSCRIPT_HASH=5ac1a5c727a5101fd7673ba48179a52ca1804149ed1b67e6172724606355440e @@ -42,7 +41,7 @@ MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 ## Non-git package URLs -# OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} +OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} TOOLCHAIN4_URL=https://people.torproject.org/~mikeperry/mirrors/sources/${T… OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} diff --git a/gitian/versions.alpha b/gitian/versions.alpha index fc5fa21..ac5894d 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -1,13 +1,12 @@ -TORBROWSER_VERSION=3.5-rc-1 +TORBROWSER_VERSION=4.0-alpha-1 BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru vi zh-CN" VERIFY_TAGS=1 TORBROWSER_TAG=tor-browser-24.2.0esr-3.5rc1-build3 -TOR_TAG=tor-0.2.4.18-rc -OPENSSL_TAG=openssl-101e-no-gmt-time-v1 -TORLAUNCHER_TAG=0.2.4.1 -TORBUTTON_TAG=1.6.5.1 +TOR_TAG=tor-0.2.5.1-alpha +TORLAUNCHER_TAG=0.2.4.3 +TORBUTTON_TAG=1.6.5.4 HTTPSE_TAG=3.4.4tbb NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8 @@ -16,14 +15,14 @@ MINGW_REV=6184 GITIAN_TAG=tor-browser-builder-3.0-4 -# OPENSSL_VER=1.0.1e +OPENSSL_VER=1.0.1f FIREFOX_LANG_VER=24.2.0esr BINUTILS_VER=2.22 GCC_VER=4.6.3 PYTHON_VER=2.7.5 ## File names for the source packages -# OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz +OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.7-sm+fx+fn.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb @@ -34,7 +33,7 @@ GCC_PACKAGE=gcc-${GCC_VER}.tar.bz2 PYTHON_PACKAGE=Python-${PYTHON_VER}.tar.bz2 # Hashes for packages with weak sigs or no sigs -# OPENSSL_HASH=f74f15e8c8ff11aa3d5bb5f276d202ec18d7246e95f961db76054199c69c1ae3 +OPENSSL_HASH=6cc2a80b17d64de6b7bac985745fdaba971d54ffd7d38d3556f998d7c0c9cb5a OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 NOSCRIPT_HASH=5ac1a5c727a5101fd7673ba48179a52ca1804149ed1b67e6172724606355440e @@ -42,7 +41,7 @@ MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 ## Non-git package URLs -# OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} +OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} TOOLCHAIN4_URL=https://people.torproject.org/~mikeperry/mirrors/sources/${T… OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE}

1 0

[tor-launcher/master] Add Arabic translations.
by mikeperry＠torproject.org 14 Jan '14

14 Jan '14

commit e5aaff059a9e68cf8101290ccddc7443be160537 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Jan 14 12:38:44 2014 -0800 Add Arabic translations. Also update Japanese translations. --- localization/import-translations.sh | 2 +- src/chrome/locale/ar/network-settings.dtd | 55 +++++++++++++++++++++++++++ src/chrome/locale/ar/progress.dtd | 4 ++ src/chrome/locale/ar/torlauncher.properties | 31 +++++++++++++++ src/chrome/locale/ja/progress.dtd | 2 +- 5 files changed, 92 insertions(+), 2 deletions(-) diff --git a/localization/import-translations.sh b/localization/import-translations.sh index 6332ff8..3096168 100755 --- a/localization/import-translations.sh +++ b/localization/import-translations.sh @@ -1,6 +1,6 @@ #!/bin/sh -BUNDLE_LOCALES="de es fa fr it ja ko nl pl pt ru vi zh-CN" +BUNDLE_LOCALES="ar de es fa fr it ja ko nl pl pt ru vi zh-CN" if [ -d translation ]; then diff --git a/src/chrome/locale/ar/network-settings.dtd b/src/chrome/locale/ar/network-settings.dtd new file mode 100644 index 0000000..8173a4a --- /dev/null +++ b/src/chrome/locale/ar/network-settings.dtd @@ -0,0 +1,55 @@ +<!ENTITY torsettings.dialog.title "إعدادات الشبكة الخاصة بتور"> + + + +<!ENTITY torsettings.prompt "قبل ان تحاول حزمة متصفح تور الاتصال بشبكة تور، تحتاج إلى توفير بعض المعلومات عن اتصال الانترنت الخاص بهذا الكمبيوتر."> + +<!ENTITY torSettings.yes "نعم"> +<!ENTITY torSettings.no "لا"> + +<!ENTITY torSettings.firstQuestion "أي مما يلي يعتبر وصف افضل لموقفك؟"> +<!ENTITY torSettings.configurePrompt1 " اتصال الإنترنت لهذا الكمبيوتر مُراقب، أو مصفى، أو يعمل ببروكسي."> +<!ENTITY torSettings.configurePrompt2 "أحتاج إلي تكوين إعدادات الشبكة."> +<!ENTITY torSettings.configure "تكوين"> +<!ENTITY torSettings.connectPrompt1 "اتصال الإنترنت لهذا الكمبيوتر خالي من العقبات."> +<!ENTITY torSettings.connectPrompt2 "أود الاتصال مباشرة إلى شبكة تور."> +<!ENTITY torSettings.connect "اتصل"> + +<!ENTITY torSettings.proxyQuestion "هل يحتاج هذا الجهاز إلي بروكسي حتي يصل إلي شبكة الإنترنت؟"> + +<!ENTITY torSettings.proxyHelp "إذا لم تكن متأكدا من كيفية الإجابة على هذا السؤال، إلقي نظرة على إعدادات الإنترنت في متصفح آخر حتي تتأكد إذا كان يستخدام بروكسي."> +<!ENTITY torSettings.enterProxy "أدخل إعدادات البروكسي."> +<!ENTITY torSettings.firewallQuestion "هل اتصال الإنترنت لهذا الكمبيوتر يمر بجدار حماية يسمح بالاتصال فقط من خلال منافذ معينة؟"> +<!ENTITY torSettings.firewallHelp "إذا لم تكن متأكدا من كيفية الإجابة على هذا السؤال، اختار لا. إذا واجهتك مشاكل في الاتصال بشبكة تور, غيير هذا الإعداد."> +<!ENTITY torSettings.enterFirewall "إدخل قائمة مفصولة بفواصل من المنافذ التي يسمح بها جدار الحماية."> +<!ENTITY torSettings.bridgeQuestion "إذا كان اتصال الإنترنت لهذا الكمبيوتر مُراقب، سوف تحتاج إلى الحصول على واستخدام جسور.&#160; إذا لم يكن مُراقب، اضغط اتصل."> + + + +<!ENTITY torsettings.startingTor "في انتظار تور حتي يبدء بالعمل..."> +<!ENTITY torsettings.restart "إعادة تشغيل"> + +<!ENTITY torsettings.optional "اختياري"> + +<!ENTITY torsettings.useProxy.checkbox "يحتاج هذا الجهاز إلي استخدام بروكسي للوصل إلي شبكة الإنترنت"> +<!ENTITY torsettings.useProxy.type "نوع البروكسي:"> +<!ENTITY torsettings.useProxy.address "العنوان:"> +<!ENTITY torsettings.useProxy.address.placeholder "عنوان الإنترنت IP أو اسم المضيف"> +<!ENTITY torsettings.useProxy.port "المنفذ:"> +<!ENTITY torsettings.useProxy.username "اسم المستخدم:"> +<!ENTITY torsettings.useProxy.password "كلمة السر:"> +<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> +<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> +<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> +<!ENTITY torsettings.firewall.checkbox "اتصال الإنترنت لهذا الكمبيوتر يمر بجدار حماية يسمح بالاتصال فقط من خلال منافذ معينة"> +<!ENTITY torsettings.firewall.allowedPorts "المنافذ المسموح بها:"> +<!ENTITY torsettings.useBridges.checkbox "مزود خدمة الإنترنت الخاص بي (ISP) يمنع الاتصالات بشبكة تور"> +<!ENTITY torsettings.useBridges.label "ادخل جسر او اكثر (جسر واحد في كل سطر)."> +<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port"> + +<!ENTITY torsettings.copyLog "نسخ سجل تور إلي الحافظة"> +<!ENTITY torsettings.bridgeHelpTitle "المساعدة الخاصة بالجسور المُرحلة"> +<!ENTITY torsettings.bridgeHelp1 "قد يكون السبب في عدم قدرتك علي الاتصال بشبكة تورهو ان مزود خدمة الإنترنت الخاص بك (ISP) أو منظمة اخري يمنع محاولات الاتصال بشبكة تور. &#160; وغالباً، تستطيع تخطي هذا المنع عن طريق استخدام جسور تور و الجسور عبارة عن مُرحلات مخفية صعب منعها."> +<!ENTITY torsettings.bridgeHelp2 "للحصول علي بعض الجسور، زر هذه الصفحة من خلال المتصفح: https://bridges.torproject.org"> +<!ENTITY torsettings.bridgeHelp3 "وهناك طريقة أخرى للعثور على عناوين الجسور العامة وهي إرسال بريد إلكتروني إلى bridges(a)torproject.org يحتوي علي 'get bridges' في قلب البريد.&#160; و حتي تضمن وصول ذلك البريد لنا بنجاح استخدم إما gmail.com أو إما yahoo.com"> +<!ENTITY torsettings.bridgeHelp4 "يمكنك إيضاً طلب الجسور يإرسال بريد إلكتروني إلي help(a)rt.torproject.org."> diff --git a/src/chrome/locale/ar/progress.dtd b/src/chrome/locale/ar/progress.dtd new file mode 100644 index 0000000..78ba7f0 --- /dev/null +++ b/src/chrome/locale/ar/progress.dtd @@ -0,0 +1,4 @@ +<!ENTITY torprogress.dialog.title "حالة تور"> +<!ENTITY torprogress.openSettings "افتح الإعدادات"> +<!ENTITY torprogress.heading "جاري الاتصال بشبكة تور"> +<!ENTITY torprogress.pleaseWait "سيتم فتح متصفح تور بعد إنشاء اتصال بشبكة تور."> diff --git a/src/chrome/locale/ar/torlauncher.properties b/src/chrome/locale/ar/torlauncher.properties new file mode 100644 index 0000000..1769467 --- /dev/null +++ b/src/chrome/locale/ar/torlauncher.properties @@ -0,0 +1,31 @@ +### Copyright (c) 2013, The Tor Project, Inc. +### See LICENSE for licensing information. + +torlauncher.error_title=مُشغل تور + +torlauncher.tor_exited=توقف تور عن العمل بشكل غير متوقع. +torlauncher.please_restart_app=يرجي إعادة تشغيل هذا البرنامج. +torlauncher.tor_controlconn_failed=تعذر الاتصال بمنفذ التحكم الخاص بتور. +torlauncher.tor_failed_to_start=تور فشل في بدء التشغيل. +torlauncher.tor_bootstrap_failed=فشل تور في إنشاء اتصال بشبكة تور.\n\n%S + +torlauncher.unable_to_start_tor=غير قادر علي بدء تشغيل تور.\n\n%S +torlauncher.tor_missing=الملف التنفيذي لتور مفقود. +torlauncher.torrc_missing=ملف torrc مفقود. +torlauncher.datadir_missing=مجلد data الخاص بتور غير موجود. +torlauncher.password_hash_missing=فشل في الحصول على كلمة المرور المجزأة. + +torlauncher.failed_to_get_settings=غير قادر علي جلب إعدادات تور.\n\n%S +torlauncher.failed_to_save_settings=غير قادر علي حفظ إعدادات تور.\n\n%S +torlauncher.ensure_tor_is_running=الرجاء التأكد أن تور يعمل. + +torlauncher.error_proxy_addr_missing=من الضروري تحديد كل من عنوان الانترنت IP أو عنوان مستضيف واحد و منفذ وذلك لتهيئة تور لأستخدام بروكسي حتي يستطيع الوصول إلي شبكة الانترنت. +torlauncher.error_proxy_type_missing=من الضروري تحديد نوع البروكسي. +torlauncher.error_bridges_missing=من الضروري تحديد جسر واحد أو أكثر. + +torlauncher.connect=اتصل +torlauncher.quit=إنهاء +torlauncher.quit_win=خروج +torlauncher.done=تم + +torlauncher.forAssistance=للمساعدة, اتصل بـ %S diff --git a/src/chrome/locale/ja/progress.dtd b/src/chrome/locale/ja/progress.dtd index 301fa89..883f748 100644 --- a/src/chrome/locale/ja/progress.dtd +++ b/src/chrome/locale/ja/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Torの状態"> <!ENTITY torprogress.openSettings "設定を開く"> -<!ENTITY torprogress.heading "Torネットワックに接続しています"> +<!ENTITY torprogress.heading "Torネットワークに接続しています"> <!ENTITY torprogress.pleaseWait "Tor BrowserはTorのネットワーク接続が確立された後に開きます。">

1 0

[tor-launcher/master] Bump version.
by mikeperry＠torproject.org 14 Jan '14

14 Jan '14

commit e629ff882b433fb314b92cb5b262a22565611ffd Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Jan 14 12:41:27 2014 -0800 Bump version. --- src/install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install.rdf b/src/install.rdf index 840c522..f2da944 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -7,7 +7,7 @@ <em:creator>The Tor Project, Inc.</em:creator> <em:contributor>Pearl Crescent, LLC</em:contributor> <em:id>tor-launcher(a)torproject.org</em:id> - <em:version>0.2.4.2</em:version> + <em:version>0.2.4.3</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL> <!-- <em:optionsURL>chrome://torlauncher/content/preferences.xul</em:optionsURL>

1 0

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

14 Jan '14

commit 2a89b60e3773efcf789b6d1b500834a150310eeb Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 14 20:46:01 2014 +0000 Update translations for https_everywhere_completed --- zh-CN/https-everywhere.dtd | 1 + 1 file changed, 1 insertion(+) diff --git a/zh-CN/https-everywhere.dtd b/zh-CN/https-everywhere.dtd index e6411b4..de49fca 100644 --- a/zh-CN/https-everywhere.dtd +++ b/zh-CN/https-everywhere.dtd @@ -14,6 +14,7 @@ <!ENTITY https-everywhere.menu.observatory "SSL Observatory 首选项"> <!ENTITY https-everywhere.menu.globalEnable "启用 HTTPS Everywhere"> <!ENTITY https-everywhere.menu.globalDisable "禁用 HTTPS Everywhere"> +<!ENTITY https-everywhere.menu.showCounter "显示计数器"> <!ENTITY https-everywhere.prefs.title "HTTPS Everywhere 首选项"> <!ENTITY https-everywhere.prefs.enable_all "全部启用">

1 0

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

14 Jan '14

commit 9cb40dffc52992f887414fb6c14ccbc5db11faf2 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 14 20:45:56 2014 +0000 Update translations for https_everywhere --- zh-CN/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh-CN/https-everywhere.dtd b/zh-CN/https-everywhere.dtd index 6bf45cd..de49fca 100644 --- a/zh-CN/https-everywhere.dtd +++ b/zh-CN/https-everywhere.dtd @@ -14,7 +14,7 @@ <!ENTITY https-everywhere.menu.observatory "SSL Observatory 首选项"> <!ENTITY https-everywhere.menu.globalEnable "启用 HTTPS Everywhere"> <!ENTITY https-everywhere.menu.globalDisable "禁用 HTTPS Everywhere"> -<!ENTITY https-everywhere.menu.showCounter "Show Counter"> +<!ENTITY https-everywhere.menu.showCounter "显示计数器"> <!ENTITY https-everywhere.prefs.title "HTTPS Everywhere 首选项"> <!ENTITY https-everywhere.prefs.enable_all "全部启用">

1 0

[torbutton/master] Bump version and update changelog for 1.6.5.4.
by mikeperry＠torproject.org 14 Jan '14

14 Jan '14

commit 57d61d8e03c7f807c811992495040f6f95fae3be Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Jan 14 12:30:11 2014 -0800 Bump version and update changelog for 1.6.5.4. --- src/CHANGELOG | 4 ++++ src/install.rdf | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index edec30a..b890b88 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,7 @@ +1.6.5.4: + 14 Jan 2014 + * Bug 10537: Include Arabic locale in Torbutton. + 1.6.5.3: 23 Dec 2013 * Bug 9486: Clear NoScript Temporary Permissions on New Identity diff --git a/src/install.rdf b/src/install.rdf index 29d06e0..904c363 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ <em:name>Torbutton</em:name> <em:creator>Mike Perry</em:creator> <em:id>torbutton(a)torproject.org</em:id> - <em:version>1.6.5.3</em:version> + <em:version>1.6.5.4</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL> <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>

1 0

[torbutton/master] Add Arabic to the list of locales.
by mikeperry＠torproject.org 14 Jan '14

14 Jan '14

commit bbebd1a078573214f58d0078255208ba1445d94c Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Jan 14 12:12:26 2014 -0800 Add Arabic to the list of locales. --- trans_tools/import-translations.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/trans_tools/import-translations.sh b/trans_tools/import-translations.sh index 7f0d1fa..4be99d1 100755 --- a/trans_tools/import-translations.sh +++ b/trans_tools/import-translations.sh @@ -2,7 +2,7 @@ # This var comes from the TBB locale list. # XXX: Find some way to keep this, tor-launcher, and Tor Browser in sync -BUNDLE_LOCALES="de es fa fr it ja ko nl pl pt ru vi zh-CN" +BUNDLE_LOCALES="ar de es fa fr it ja ko nl pl pt ru vi zh-CN" if [ -d translation ]; then

1 0

[torbutton/master] Add Arabic translations.
by mikeperry＠torproject.org 14 Jan '14

14 Jan '14

commit 3f6b6f8692532b7f83503175794824ba7d4e3313 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Jan 14 12:07:08 2014 -0800 Add Arabic translations. --- src/chrome/locale/ar/aboutTor.dtd | 83 ++++++++++++++++------------- src/chrome/locale/ar/brand.dtd | 8 +-- src/chrome/locale/ar/brand.properties | 16 +++--- src/chrome/locale/ar/torbutton.dtd | 6 +-- src/chrome/locale/ar/torbutton.properties | 8 +-- src/chrome/locale/de/brand.dtd | 2 +- src/chrome/locale/de/brand.properties | 2 +- src/chrome/locale/de/browser.properties | 2 +- src/chrome/locale/de/torbutton.dtd | 8 +-- src/chrome/locale/fa/aboutTor.dtd | 24 ++++----- src/chrome/locale/fr/aboutTor.dtd | 8 +-- 11 files changed, 88 insertions(+), 79 deletions(-) diff --git a/src/chrome/locale/ar/aboutTor.dtd b/src/chrome/locale/ar/aboutTor.dtd index 2fc51c6..8b0d7cf 100644 --- a/src/chrome/locale/ar/aboutTor.dtd +++ b/src/chrome/locale/ar/aboutTor.dtd @@ -4,37 +4,46 @@ - vim: set sw=2 sts=2 ts=8 et syntax=xml: --> -<!ENTITY aboutTor.title "About Tor"> +<!ENTITY aboutTor.title "Ø¹Ù ØªÙØ±"> -<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date."> -<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date."> -<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update."> +<!ENTITY aboutTor.outOfDateTorOn.label "ÙÙØ¹ Ø°ÙÙØ ÙØ°Ø§ Ø§ÙÙØªØµÙØ ÙØ¯ÙÙ."> +<!ENTITY aboutTor.outOfDateTorOff.label "Ø£ÙØ¶Ø§ÙØ ÙØ°Ø§ Ø§ÙÙØªØµÙØ ÙØ¯ÙÙ."> +<!ENTITY aboutTor.outOfDate2.label "Ø§Ø¶ØºØ· Ø¹ÙÙ Ø§ÙØšØµÙØ© Ù Ø§Ø®ØªØ± ØÙÙ ØªØØ¯ÙØ« ØØ²ÙØ© ÙØªØµÙØ ØªÙØ±."> -<!ENTITY aboutTor.check.label "Test Tor Network Settings"> +<!ENTITY aboutTor.check.label "Ø§Ø®ØªØšØ± Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª ØŽØšÙØ© ØªÙØ±."> -<!ENTITY aboutTor.success.label "Congratulations!"> -<!ENTITY aboutTor.success2.label "This browser is configured to use Tor."> -<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously."> -<!ENTITY aboutTor.failure.label "Something Went Wrong!"> -<!ENTITY aboutTor.failure2.label "Tor is not working in this browser."> -<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact "> +<!ENTITY aboutTor.success.label "ØªÙØ§ÙÙÙØ§!"> +<!ENTITY aboutTor.success2.label "ÙØ°Ø§ Ø§ÙÙØªØµÙØ ÙØ¹Ø¯ ÙØ§Ø³ØªØ®Ø¯Ø§Ù ØŽØšÙØ© ØªÙØ±."> +<!ENTITY aboutTor.success3.label "Ø§ÙØª Ø§ÙØ¢Ù ØØ± ÙÙ ØªØµÙØ ØŽØšÙØ© Ø§ÙØ¥ÙØªØ±ÙØª ØšØŽÙÙ ÙØ¬ÙÙÙ."> +<!ENTITY aboutTor.failure.label "ØØ¯Ø« Ø®Ø·Ø£ ÙØ§!"> +<!ENTITY aboutTor.failure2.label "ØªÙØ± ÙØ§ ÙØ¹ÙÙ ÙÙ ÙØ°Ø§ Ø§ÙÙØªØµÙØ."> +<!ENTITY aboutTor.failure3prefix.label "ÙÙÙØ³Ø§Ø¹Ø¯Ø©Ø ÙØ±Ø¬Ù ÙØ±Ø§Ø³ÙØ© "> <!ENTITY aboutTor.failure3Link "help(a)rt.torproject.org"> <!ENTITY aboutTor.failure3suffix.label "."> -<!ENTITY aboutTor.search.label "Search"> -<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> +<!ENTITY aboutTor.search.label "ØšØØ«"> + + +<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> +<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "ØšØØ«"> +<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "ØšØØ«"> +<!ENTITY aboutTor.searchSP.privacy.label "ØšØ¢ÙØ§Ù"> +<!ENTITY aboutTor.searchDDG.privacy.label "ØšØ¢ÙØ§Ù"> +<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html"> <!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> +<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&nbsp;"> +<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&nbsp;"> +<!ENTITY aboutTor.searchSP.search.beforeLink.label "ÙØ¹"> +<!ENTITY aboutTor.searchDDG.search.beforeLink.label "ÙØ¹"> <!ENTITY aboutTor.searchSP.search.label "Startpage"> <!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> <!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> @@ -42,23 +51,23 @@ <!ENTITY aboutTor.searchSP.search.afterLink.label "."> <!ENTITY aboutTor.searchDDG.search.afterLink.label "."> -<!ENTITY aboutTor.torInfo1.label "Additional Info:"> -<!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> -<!ENTITY aboutTor.torInfo3.label "Exit Node:"> -<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors."> -<!ENTITY aboutTor.whatnextQuestion.label "What Next?"> -<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe."> -<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»"> +<!ENTITY aboutTor.torInfo1.label "ÙØ¹ÙÙÙØ§Øª Ø¥Ø¶Ø§ÙÙØ©:"> +<!ENTITY aboutTor.torInfo2.label "Ø§ÙØ¯ÙÙØ© ÙØ¹ÙÙØ§Ù Ø§ÙØ¥ÙØªØ±ÙØª:"> +<!ENTITY aboutTor.torInfo3.label "ÙÙØ·Ø© Ø§ÙØ®Ø±ÙØ¬:"> +<!ENTITY aboutTor.torInfo4.label "ÙØ°Ø§ Ø§ÙØ®Ø§Ø¯Ù ÙØ§ ÙØ³Ø¬Ù Ø£Ù ÙØ¹ÙÙÙØ§Øª Ø¹Ù Ø§ÙØ²ÙØ§Ø±."> +<!ENTITY aboutTor.whatnextQuestion.label "ÙØ§Ø°Ø§ ØšØ¹Ø¯Ø"> +<!ENTITY aboutTor.whatnextAnswer.label "ØªÙØ± ÙÙØ³ ÙÙ ØŽÙØ¡ ØªØØªØ§Ø¬Ù ØØªÙ ØªØªØµÙØ ØšØµÙØ© ÙØ¬ÙÙÙØ©! ÙØ¯ ØªØØªØ§Ø¬ ÙØªØºÙÙØ± ØšØ¹Ø¯ Ø¹Ø§Ø¯Ø§ØªÙ Ø£Ø«ÙØ§Ø¡ Ø§ÙØªØµÙØ ÙØ¶ÙØ§Ù Ø§Ø®ÙØ§Ø¡ ÙÙÙØªÙ."> +<!ENTITY aboutTor.whatnext.label "ÙØµØ§ØŠØ ÙÙØšÙØ§Ø¡ ÙØ¬ÙÙÙØ§Ù Â»"> <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning"> -<!ENTITY aboutTor.helpInfo1.label "You Can Help!"> -<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:"> -<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»"> +<!ENTITY aboutTor.helpInfo1.label "ÙÙÙÙÙ Ø§ÙÙØ³Ø§Ø¹Ø¯Ø©!"> +<!ENTITY aboutTor.helpInfo2.label "ÙÙÙÙÙ ÙØ³Ø§Ø¹Ø¯Ø© ØŽØšÙØ© ØªÙØ± Ù Ø¬Ø¹ÙÙØ§ Ø§Ø³Ø±Ø¹ Ù Ø§ÙÙÙ ØšØ¥ØØ¯Ù Ø§ÙØ·Ø±Ù Ø§ÙØ¢ØªÙØ©:"> +<!ENTITY aboutTor.helpInfo3.label "ØŽØºÙ ÙÙØ·Ø© ØªÙØ± ÙÙØ±ØÙÙ Â»"> <!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en"> -<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»"> +<!ENTITY aboutTor.helpInfo4.label "ØªØšØ±Ø¹ ØšØ®Ø¯ÙØ§ØªÙ Â»"> <!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en"> -<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»"> +<!ENTITY aboutTor.helpInfo5.label "ØªØšØ±Ø¹ Â»"> <!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en"> -<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy."> -<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»"> +<!ENTITY aboutTor.footer.label "ÙØŽØ±ÙØ¹ ØªÙØ± ÙÙ US 501(c)(3) ØºÙØ± Ø±ØšØÙ ÙÙÙØ±Ø³ ÙÙØšØØ«Ø Ù Ø§ÙØªØ·ÙÙØ±Ø Ù Ø§ÙØªÙØ¹ÙØ© ØšØ¥Ø®ÙØ§Ø¡ Ø§ÙÙÙÙØ© ÙØ§ÙØ®ØµÙØµÙØ©."> +<!ENTITY aboutTor.learnMore.label "ØªØ¹ÙÙ Ø§ÙÙØ²ÙØ¯ Ø¹Ù ÙØŽØ±ÙØ¹ ØªÙØ± Â»"> <!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en"> diff --git a/src/chrome/locale/ar/brand.dtd b/src/chrome/locale/ar/brand.dtd index 76e405d..3faaf01 100644 --- a/src/chrome/locale/ar/brand.dtd +++ b/src/chrome/locale/ar/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> -<!ENTITY brandFullName "Tor Browser"> -<!ENTITY vendorShortName "Tor Project"> -<!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> +<!ENTITY brandShortName "ÙØªØµÙØ ØªÙØ±"> +<!ENTITY brandFullName "ÙØªØµÙØ ØªÙØ±"> +<!ENTITY vendorShortName "ÙØŽØ±ÙØ¹ ØªÙØ±"> +<!ENTITY trademarkInfo.part1 "ÙØ§ÙØ±ÙÙÙØ³ ÙØŽØ¹Ø§Ø±Ø§Øª ÙØ§ÙØ±ÙÙÙØ³ Ø¹ÙØ§ÙØ§Øª ØªØ¬Ø§Ø±ÙØ© ÙØ³Ø¬ÙØ© ÙÙØ€Ø³Ø³Ø© ÙÙØ²ÙÙØ§."> diff --git a/src/chrome/locale/ar/brand.properties b/src/chrome/locale/ar/brand.properties index 9ae168e..8f783fa 100644 --- a/src/chrome/locale/ar/brand.properties +++ b/src/chrome/locale/ar/brand.properties @@ -2,14 +2,14 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser -brandFullName=Tor Browser -vendorShortName=Tor Project +brandShortName=ÙØªØµÙØ ØªÙØ± +brandFullName=ÙØªØµÙØ ØªÙØ± +vendorShortName=ÙØŽØ±ÙØ¹ ØªÙØ± -homePageSingleStartMain=Firefox Start, a fast home page with built-in search -homePageImport=Import your home page from %S +homePageSingleStartMain=ØµÙØØ© ØšØ¯Ø¡ ÙØ§ÙØ±ÙÙÙØ³Ø ØµÙØØ© Ø±ØŠÙØ³ÙØ© Ø³Ø±ÙØ¹Ø© ÙØ¯ÙØ¬ ØšÙØ§ Ø®Ø§ØµÙØ© ÙÙØšØØ«. +homePageImport=Ø§Ø³ØªÙØ±Ø¯ Ø§ÙØµÙØØ© Ø§ÙØ±ØŠÙØ³ÙØ© ÙÙ %S -homePageMigrationPageTitle=Home Page Selection -homePageMigrationDescription=Please select the home page you wish to use: +homePageMigrationPageTitle=Ø§Ø®ØªÙØ§Ø± Ø§ÙØµÙØØ© Ø§ÙØ±ØŠÙØ³ÙØ© +homePageMigrationDescription=ÙØ¶ÙØ§ÙØ ÙÙ ØšØ§Ø®ØªÙØ§Ø± Ø§ÙØµÙØØ© Ø§ÙØ±ØŠÙØ³ÙØ© Ø§ÙØªÙ ØªØ±ØºØš ÙÙ Ø§Ø³ØªØ¹ÙØ§ÙÙØ§: -syncBrandShortName=Sync +syncBrandShortName=ÙØ²Ø§ÙÙØ© diff --git a/src/chrome/locale/ar/torbutton.dtd b/src/chrome/locale/ar/torbutton.dtd index 17bb670..be20a8d 100644 --- a/src/chrome/locale/ar/torbutton.dtd +++ b/src/chrome/locale/ar/torbutton.dtd @@ -116,10 +116,10 @@ <!ENTITY torbutton.prefs.no_proxy_warning "ØªØØ°ÙØ±: ØªØ¬ÙØš Ø§Ø³ØªØ®Ø¯Ø§Ù Ø£Ù ÙÙ Ø£Ø³ÙØ§Ø¡ Ø§ÙÙØ¶ÙÙ Ø§ÙÙØ°ÙÙØ±Ø© Ø£Ø¹ÙØ§Ù"> <!ENTITY torbutton.prefs.spoofreresh "ØªØØ¯ÙØ« Ø§ÙÙØØ§ÙØ§Ø© Ø§ÙØ³Ø§Ø®Ø±Ø©"> <!ENTITY torbutton.prefs.refereroptions "Ø®ÙØ§Ø±Ø§Øª Ø§ÙÙØ±Ø¬Ø¹ÙØ© Ø§ÙØ³Ø§Ø®Ø±Ø©"> -<!ENTITY torbutton.prefs.nospoof "ÙØ§ ØªØ³ØªØ®Ø¯Ù ÙØØ§ÙØ§Ø© ÙØ±Ø¬Ø¹ÙØ© Ø³Ø§Ø®Ø±Ø©"> +<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)"> <!ENTITY torbutton.prefs.spoofroot "ÙØØ§ÙØ§Ø© Ø³Ø§Ø®Ø±Ø© Ø§ÙÙØ¬ÙØ¯ Ø§ÙØ°Ù ÙØØªÙÙ Ø¹ÙÙ Ø§ÙØµÙØØ©"> <!ENTITY torbutton.prefs.spoofdomain "ÙØØ§ÙØ§Ø© Ø³Ø§Ø®Ø±Ø© Ø§ÙÙØ¬Ø§Ù ÙØ«Ù Ø§ÙÙØ±Ø¬Ø¹ÙØ©"> -<!ENTITY torbutton.prefs.spoofblank "Ø¥Ø¬Ø¹Ù Ø§ÙÙØ±Ø¬Ø¹ÙØ© ÙØ§Ø±ØºØ©"> +<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.cookiedialog.title "Ø¥Ø¯Ø§Ø±Ø© ÙØ¹ÙØ§Øª Ø§ÙØÙØ§ÙØ©"> <!ENTITY torbutton.cookiedialog.lockCol "ÙØÙÙØ©"> <!ENTITY torbutton.cookiedialog.domainCol "Ø§Ø³ØªØ¶Ø§ÙØ©"> @@ -131,7 +131,7 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Ø¥Ø²Ø§ÙØ© Ø§ÙÙÙ ÙÙÙ Ø§Ø³ØªÙØ± ÙÙ Ø§ÙØÙØ§ÙØ©"> <!ENTITY torbutton.cookiedialog.saveAllCookies "ÙØ¹ÙØ© ØÙØ§ÙØ© Ø¬Ø¯ÙØ¯Ø©"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "ÙØ§ ØªØÙÙ Ø§ÙÙØ¹ÙØ§Øª Ø§ÙØ¬Ø¯ÙØ¯Ø©"> -<!ENTITY torbutton.prefs.disable_livemarks "ØªØ¹Ø·ÙÙ Ø§ÙØ¹ÙØ§ÙØ§Øª Ø§ÙØÙØ© Ø®ÙØ§Ù Ø¥Ø³ØªØ¹ÙØ§Ù Ø§ÙØªÙØ±"> +<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage"> <!ENTITY torbutton.prefs.dtd_recommended "(ÙØØšÙØ°)"> <!ENTITY torbutton.prefs.dtd_optional "(Ø§Ø®ØªÙØ§Ø±Ù)"> <!ENTITY torbutton.prefs.dtd_crucial "(ØÙØ±ÙØ¬)"> diff --git a/src/chrome/locale/ar/torbutton.properties b/src/chrome/locale/ar/torbutton.properties index 7d1d936..ed55fb9 100644 --- a/src/chrome/locale/ar/torbutton.properties +++ b/src/chrome/locale/ar/torbutton.properties @@ -9,8 +9,8 @@ torbutton.panel.label.enabled = ØªÙØ± ÙÙØ¹ÙÙ extensions.torbutton(a)torproject.org.description = Ø²Ø± ØªÙØ± ÙÙÙØ± Ø²Ø± ÙØ£Ø¹Ø§Ø¯Ø© ØªÙÙÙÙ Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª ØªÙØ± ÙØ§ÙØ¶Ø§Ù ÙÙÙÙÙ ØšØ³ÙÙÙÙ Ù ØšØ³Ø±Ø¹Ø© ÙØ³Ø ØšÙØ§ÙØ§Øª Ø§ÙØªØµÙØ Ø§ÙØ®Ø§ØµØ© ØšÙ. torbutton.popup.history.warning = ØØ¬Øš ÙÙØªØ§Ø ØªÙØ± ÙØŽØ§Ø·Ø§Ù ÙÙ ØªØšÙÙØšØ© ÙØÙÙØ© ÙÙ ÙØ¶Ø¹ ØªÙØ± ÙØ®ØªÙÙ.\n\nÙØ°Ø§ Ø§ÙØ£ÙØ± ÙÙØ§ÙØªÙØ§Ù ØÙÙ ÙØŽØ§ÙÙ ÙØ§ÙØ±ÙÙÙØ³ Ø±ÙÙ 409737 Ù417869.\n\nØ¥Ø°Ø§ ØžÙØ±Øª ÙØ°Ù Ø§ÙØ±Ø³Ø§ÙØ© Ø¯ÙÙ Ø³ØšØšØ ÙÙØ§Ù Ø¥ØØ¯Ù ØªØšÙÙØšØ§ØªÙ ØªØØ§ÙÙ Ø¥Ø¹Ø§Ø¯Ø© ØªØÙÙÙ ÙÙØ³ÙØ§ ÙÙ Ø§ÙØ®ÙÙÙØ©Ø ÙØªÙ ØØ¬Øš ÙØ°Ø§.\n\nÙØ¥Ø¹Ø§Ø¯Ø© ØªØÙÙÙ Ø§ÙØªØšÙÙØšØ© ÙÙ ØØ§ÙØ© ØªÙØ± ÙØ°Ù ÙØ±Ø¬Ù Ø£Ù ØªØ¶ØºØ· 'Enter' ÙÙ ØµÙØ¯ÙÙ ØŽØ±ÙØ· Ø§ÙØ¹ÙÙØ§Ù.\n\n torbutton.popup.plugin.warning = ÙÙØ¹ ÙÙØªØ§Ø ØªÙØ± ØªØÙÙÙØ§ ÙØšØ§ØŽØ±Ø§Ù ÙÙØØªÙÙ ØšØ±ÙØ§ÙØ¬ Ø¥Ø¶Ø§ÙÙ ØšÙØ§ÙØ±ÙÙÙØ³.\n\nØ§Ø³ØªØ®Ø¯Ù 'Ø§ØÙØž ØšØ§Ø³Ù' ÙØšØ¯ÙÙ.\n\n -torbutton.popup.confirm_ca_certs = ÙÙØ§ØØžØ© ÙÙ ÙÙØªØ§Ø ØªÙØ±: ØšÙØ§ Ø£ÙÙÙ ÙØ§ ØªÙÙÙ ÙÙØ«Ø§Ù Ø¥ØµØ¯Ø§Ø± Ø§ÙØŽÙØ§Ø¯Ø© Ø§ÙØ±ÙÙÙØ ÙØÙØ« Ø£ÙÙ Ø¹ÙÙÙØ© ÙØØµ ÙØ§ØŠÙØ© ÙØµØ¯Ø± Ø§ÙØŽÙØ§Ø¯Ø© Ø§ÙØ±ÙÙÙØ© Ø¹ÙÙÙØ© ØšØ·ÙØŠØ© ÙØªØ³ØšØš ØšØ·ØŠØ§Ù ÙÙ Ø¹ÙÙ ÙÙØªØ§Ø ØªÙØ±Ø ÙÙÙ ØªØ±ØºØš ÙÙ ØªØ¹Ø·ÙÙ Ø¹ÙÙÙØ© Ø¹Ø²Ù ØŽÙØ§Ø¯Ø§Øª Ø§ÙØ¥ØµØ¯Ø§Ø± Ø§ÙØ±ÙÙÙØ (Ø¥Ù ÙÙØª ÙØ§ ØªØ¹ÙÙ Ø§Ù ÙØ§ ØªÙÙÙ ÙØ¹ÙÙ Ø°ÙÙØ ÙØ¥ÙÙ ÙÙ Ø§ÙÙØ³ØªØØ³Ù Ø£Ù ØªØ®ØªØ§Ø± Ø®ÙØ§Ø± Ø§ÙÙÙØ§ÙÙØ©) -torbutton.popup.ff3.warning = ØªØØ°ÙØ±! \n\nÙÙ Ø§ÙÙØ¹Ø±ÙÙ Ø£Ù ÙÙØªØ§Ø ØªÙØ± ÙÙ ØšØ±ÙØ§ÙØ¬ ÙØ§ÙØ±ÙÙÙØ³ 3 ÙÙÙÙ ØšØªØ³Ø±ÙØš ÙØ¹ÙÙÙØ§Øª Ø¹Ù Ø§ÙÙÙØ·ÙØ© Ø§ÙØ²ÙÙÙØ© Ø§ÙØªÙ Ø£ÙØª ÙÙÙØ§ ÙØ¹Ù ØµÙØØ§ØªÙ Ø§ÙÙÙØ¶ÙØ© (ÙØ§ÙÚ€ ÙØ§Ø±Ù). \n\nÙÙ ØªØ±ØºØš ØšØ§ÙÙØªØ§ØšØ¹Ø© Ø¹ÙÙ Ø£ÙÙ ØØ§ÙØ +torbutton.popup.confirm_ca_certs = ÙÙØ§ØØžØ© ÙÙ ÙÙØªØ§Ø ØªÙØ±: ØšÙØ§ Ø£ÙÙÙ ÙØ§ ØªÙÙÙ ÙÙØ«Ø§Ù Ø¥ØµØ¯Ø§Ø± Ø§ÙØŽÙØ§Ø¯Ø© Ø§ÙØ±ÙÙÙØ ÙØÙØ« Ø£ÙÙ Ø¹ÙÙÙØ© ÙØØµ ÙØ§ØŠÙØ© ÙØµØ¯Ø± Ø§ÙØŽÙØ§Ø¯Ø© Ø§ÙØ±ÙÙÙØ© Ø¹ÙÙÙØ© ØšØ·ÙØŠØ© ÙØªØ³ØšØš ØšØ·ØŠØ§Ù ÙÙ Ø¹ÙÙ ÙÙØªØ§Ø ØªÙØ±Ø ÙÙÙ ØªØ±ØºØš ÙÙ ØªØ¹Ø·ÙÙ Ø¹ÙÙÙØ© Ø¹Ø²Ù ØŽÙØ§Ø¯Ø§Øª Ø§ÙØ¥ØµØ¯Ø§Ø± Ø§ÙØ±ÙÙÙØ (Ø¥Ù ÙÙØª ÙØ§ ØªØ¹ÙÙ Ø§Ù ÙØ§ ØªÙÙÙ ÙØ¹ÙÙ Ø°ÙÙØ ÙØ¥ÙÙ ÙÙ Ø§ÙÙØ³ØªØØ³Ù Ø£Ù ØªØ®ØªØ§Ø± Ø®ÙØ§Ø± Ø§ÙÙÙØ§ÙÙØ©) +torbutton.popup.ff3.warning = ØªØØ°ÙØ±! \n\nÙÙ Ø§ÙÙØ¹Ø±ÙÙ Ø£Ù ÙÙØªØ§Ø ØªÙØ± ÙÙ ØšØ±ÙØ§ÙØ¬ ÙØ§ÙØ±ÙÙÙØ³ 3 ÙÙÙÙ ØšØªØ³Ø±ÙØš ÙØ¹ÙÙÙØ§Øª Ø¹Ù Ø§ÙÙÙØ·ÙØ© Ø§ÙØ²ÙÙÙØ© Ø§ÙØªÙ Ø£ÙØª ÙÙÙØ§ ÙØ¹Ù ØµÙØØ§ØªÙ Ø§ÙÙÙØ¶ÙØ© (ÙØ§ÙÚ€ ÙØ§Ø±Ù). \n\nÙÙ ØªØ±ØºØš ØšØ§ÙÙØªØ§ØšØ¹Ø© Ø¹ÙÙ Ø£ÙÙ ØØ§ÙØ torbutton.popup.toggle.warning = ØªØØªØ§Ø¬ Ø¥ÙÙ ØªØšØ¯ÙÙ ØØ§ÙØ© ØªÙØ± Ø£Ù Ø¥Ø¹Ø§Ø¯Ø© ØªØŽØºÙÙÙ ÙØªÙØ¹ÙÙ Ø§ÙØ¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§ÙØ¬Ø¯ÙØ¯Ø©. torbutton.popup.test.success = ØªÙÙ Ø§Ø®ØªØšØ§Ø± ØšØ±ÙÙØ³Ù ØªÙØ± ØšÙØ¬Ø§Ø! torbutton.popup.test.failure = ÙØŽÙØª Ø¹ÙÙÙØ© Ø§Ø®ØªØšØ§Ø± ØšØ±ÙÙØ³Ù ØªÙØ±! ØªØ£ÙØ¯ ÙÙ Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§ÙØšØ±ÙÙØ³Ù Ø§ÙØ®Ø§Øµ ØšÙ ÙØ¥Ø¹Ø¯Ø§Ø¯Ø§Øª Polipo . @@ -36,13 +36,13 @@ torbutton.popup.redirect = Ø¥Ø¹Ø§Ø¯Ø© Ø§ÙØªÙØ¬ÙÙ torbutton.popup.no_redirect = ÙØ§ ØªÙÙ ØšØ¥Ø¹Ø§Ø¯Ø© Ø§ÙØªÙØ¬ÙÙ torbutton.popup.prompted_language = ØØªÙ ÙÙÙØÙ Ø²Ø± ØªÙØ± ÙØ²ÙØ¯Ø§Ù ÙÙ Ø§ÙØ®ØµÙØµÙØ©Ø ÙØ³ØªØ·ÙØ¹ Ø²Ø± ØªÙØ± Ø·ÙØš Ø§ÙÙØ³Ø® Ø§ÙØ¥ÙØ¬ÙÙØ²ÙØ© ÙÙ ØµÙØØ§Øª Ø§ÙØ§ÙØªØ±ÙØª. ÙÙØ¯ ÙÙØªØ¬ Ø¹Ù Ø°ÙÙ Ø¹Ø±Ø¶ Ø§ÙØµÙØØ§Øª Ø§ÙØªÙ ØªÙØ¶Ù ÙØ±Ø§Ø¡ØªÙØ§ ØšÙØºØªÙ Ø§ÙØ£Ù ØšØ§ÙÙØºØ© Ø§ÙØ¥ÙØ¬ÙÙØ²ÙØ©.\n\nÙÙ ØªØ±ÙØ¯ Ø·ÙØš ØµÙØØ§Øª Ø§ÙÙØš ØšØ§ÙÙØºØ© Ø§ÙØ¥ÙØ¬ÙÙØ²ÙØ© ÙØ®ØµÙØµÙØ© Ø§ÙØ¶ÙØ torbutton.popup.no_newnym = ÙØ§ ÙÙÙÙ ÙØ²Ø± ØªÙØ± Ø£Ù ÙØ¹Ø·ÙÙ ÙÙÙØ© Ø¬Ø¯ÙØ¯Ø© ØšØŽÙÙ Ø¢ÙÙØ ÙÙØ°Ø§ ÙØ§Ù Ø²Ø± ØªÙØ± ÙØ§ ÙØ³ØªØ·ÙØ¹ Ø§ÙÙØµÙÙ Ø¥ÙÙ ÙÙÙØ° Ø§ÙØªØÙÙ Ø§ÙØ®Ø§Øµ ØšØªÙØ±.\n\nÙÙ ØªØ³ØªØ®Ø¯Ù ØØ²ÙØ© ÙØªØµÙØ ØªÙØ± ØØ§ÙÙØ§ÙØ -torbutton.popup.use_tbb = ÙØšØ¯Ù Ø£ÙÙ ØªØ³ØªØ®Ø¯Ù Ø²Ø± ØªÙØ± ÙØ¹ ÙØ§ÙØ±ÙÙÙØ³Ø ÙÙØ§ ÙÙØµÙ ØšÙØ°Ø§ Ø§ÙØªÙÙÙÙ ÙØ£ÙÙ ÙÙ ÙØ¹Ø¯ Ø¢ÙÙØ§.\n\nÙÙØšØ¯ÙÙØ ÙÙØµØÙ ØšØªØÙÙÙ ØØ²ÙØ© ÙØªØµÙØ ØªÙØ± Ø¹Ù Ø·Ø±ÙÙ Ø¥Ø±Ø³Ø§Ù ØšØ±ÙØ¯ Ø¥ÙÙ gettor(a)torproject.org Ø£Ù ØšØªØÙÙÙÙØ§ ÙÙ Ø§ÙØ¹ÙÙØ§Ù Ø§ÙØªØ§ÙÙ: +torbutton.popup.use_tbb = ÙØšØ¯Ù Ø£ÙÙ ØªØ³ØªØ®Ø¯Ù Ø²Ø± ØªÙØ± ÙØ¹ ÙØ§ÙØ±ÙÙÙØ³Ø ÙÙØ§ ÙÙØµÙ ØšÙØ°Ø§ Ø§ÙØªÙÙÙÙ ÙØ£ÙÙ ÙÙ ÙØ¹Ø¯ Ø¢ÙÙØ§.\n\nÙÙØšØ¯ÙÙØ ÙÙØµØÙ ØšØªØÙÙÙ ØØ²ÙØ© ÙØªØµÙØ ØªÙØ± Ø¹Ù Ø·Ø±ÙÙ Ø¥Ø±Ø³Ø§Ù ØšØ±ÙØ¯ Ø¥ÙÙ gettor(a)torproject.org Ø£Ù ØšØªØÙÙÙÙØ§ ÙÙ Ø§ÙØ¹ÙÙØ§Ù Ø§ÙØªØ§ÙÙ: torbutton.popup.pref_error = ÙØ§ ÙÙÙÙ ÙØ²Ø± ØªÙØ± ØªØØ¯ÙØ« Ø§ÙØªÙØ¶ÙÙØ§Øª ÙÙ ÙØ¬ÙØ¯ ÙØªØµÙØ ØªÙØ±. torbutton.popup.permission_denied = ÙØ±Ø¬Ù Ø£Ù ØªÙÙÙ ØšØªØºÙÙØ± Ø§ÙØµÙØ§ØÙØ§Øª ÙÙØ¬ÙØ¯ ÙØªØµÙØ ØªÙØ± Ø£Ù ÙÙ ØšÙÙÙÙ Ø¥ÙÙ ÙÙØ§Ù Ø¢Ø®Ø±. torbutton.popup.device_full = ÙØšØ¯Ù Ø£Ù Ø§ÙÙØ±Øµ Ø§ÙØµÙØš ÙÙØªÙØŠ. ÙØ±Ø¬Ù ØªÙØ±ÙØº ÙØ³Ø§ØØ© Ø£ÙØ«Ø± Ø£Ù ÙÙ ØšÙÙÙ ÙØªØµÙØ ØªÙØ± Ø¥ÙÙ ÙØØ¯Ø© ØªØ®Ø²ÙÙ Ø£Ø®Ø±Ù. torbutton.title.prompt_torbrowser = ÙØ¹ÙÙÙØ§Øª ÙØ§ÙØ© Ø¹Ù ØªÙØ± torbutton.popup.prompt_torbrowser = ÙÙØ¯ ØªØºÙØ±Øª Ø·Ø±ÙÙØ© Ø¹ÙÙ Ø²Ø± ØªÙØ± Ø§ÙØ§Ù: ÙØ§ ÙÙÙÙÙ Ø¥ÙÙØ§ÙÙ Ø§ÙØ§Ù \n\nÙÙÙØ§ ØšÙØ°Ø§ Ø§ÙØªØºÙÙØ± ÙØ§ÙÙ Ø§ØµØšØ ÙÙ ØºÙØ± Ø§ÙØ¢ÙÙ Ø§Ø³ØªØ®Ø¯Ø§Ù Ø²Ø± ØªÙØ± ÙÙ Ø§ÙÙØªØµÙØ Ø§ÙØ°Ù ÙØ³ØªØ®Ø¯Ù ÙÙ Ø§ÙØªØµÙØ Ø®Ø§Ø±Ø¬ ØªÙØ±. ÙØ§Ù ÙÙØ§Ù Ø§ÙØ¹Ø¯ÙØ¯ ÙÙ Ø§ÙØ¹ÙÙ Ù Ø§ÙØªÙ ÙÙ ÙÙÙÙ ÙÙ Ø§ÙÙÙÙÙ ÙØ¹Ø§ÙØ¬ØªÙØ§ ØšØ§Ù Ø·Ø±ÙÙØ© Ø§Ø®Ø±Ù.\n\nØ¥Ø°Ø§ Ø§Ø±Ø¯Øª Ø§ÙØ§Ø³ØªÙØ±Ø§Ø± ÙÙ Ø§Ø³ØªØ®Ø¯Ø§Ù ÙØ§ÙØ±ÙÙÙØ³ ØªÙÙÙØ¯ÙØ§ÙØ ÙØªÙØ¬Øš Ø¹ÙÙÙ Ø¥Ø²Ø§ÙØ© Ø²Ø± ØªÙØ± Ù ØªØÙÙÙ ØØ²ÙØ© ÙØªØµÙØ ØªÙØ±. ÙÙØ§ Ø§Ù Ø®ØµØ§ØŠØµ Ø§ÙØ®ØµÙØµÙØ© ÙÙØªØµÙØ ØªÙØ± ØªØªÙÙÙ Ø¹ÙÙ ØªÙÙ Ø§ÙØªÙ ÙÙ ÙØªØµÙØ ÙØ§ÙØ±ÙÙÙØ³ Ø§ÙØªÙÙÙØ¯ÙØ ØØªÙ ÙÙ ØªÙ Ø§Ø³ØªØ®Ø¯Ø§Ù ÙØªØµÙØ ÙØ§ÙØ±ÙÙÙØ³ ÙØ¹ Ø²Ø± ØªÙØ±.\n\nÙØ¥Ø²Ø§ÙØ© Ø²Ø± ØªÙØ±Ø Ø§Ø°ÙØš Ø¥ÙÙ Ø£Ø¯ÙØ§Øª->Ø¥Ø¶Ø§ÙØ§Øª->ÙØÙÙØ§Øª Ø Ø«Ù Ø¥Ø¶ØºØ· Ø¹ÙÙ Ø²Ø± Ø¥Ø²Ø§ÙØ© Ø§ÙØ°Ù ØšØ¬Ø§ÙØš Ø ²Ø± ØªÙØ±. -torbutton.popup.short_torbrowser = ÙØ¹ÙÙÙØ§Øª ÙØ§ÙØ© Ø¹Ù Ø²Ø± ØªÙØ± \n\nØªÙ ØªÙÙÙÙ Ø²Ø± ØªÙØ± ÙÙØ¹ÙÙ ØšØ§Ø³ØªÙØ±Ø§Ø± Ø§ÙØ§Ù\n\nØ§Ø¶ØºØ· Ø¹ÙÙ Ø²Ø± ØªÙØ± ÙÙÙØ²ÙØ¯ ÙÙ Ø§ÙÙØ¹ÙÙÙØ§Øª +torbutton.popup.short_torbrowser = ÙØ¹ÙÙÙØ§Øª ÙØ§ÙØ© Ø¹Ù Ø²Ø± ØªÙØ± \n\nØªÙ ØªÙÙÙÙ Ø²Ø± ØªÙØ± ÙÙØ¹ÙÙ ØšØ§Ø³ØªÙØ±Ø§Ø± Ø§ÙØ§Ù\n\nØ§Ø¶ØºØ· Ø¹ÙÙ Ø²Ø± ØªÙØ± ÙÙÙØ²ÙØ¯ ÙÙ Ø§ÙÙØ¹ÙÙÙØ§Øª torbutton.popup.confirm_plugins = Ø§ÙØšØ±Ø§ÙØ¬ Ø§ÙØ¥Ø¶Ø§ÙÙØ© ÙØ«Ù ÙÙØ§ØŽ ØªØ³ØªØ·ÙØ¹ Ø§Ù ØªØ¶Ø± ØšØ®ØµÙØµÙØªÙ Ù ØªÙØŽÙ ÙÙÙØªÙ.\n\nÙ ØªØ³ØªØ·ÙØ¹ Ø§ÙØ¶Ø§ Ø§Ù ØªØªØ¬ÙØš ØªÙØ± Ù ØªÙØŽÙ Ø¹Ù ÙÙØ§ÙÙ Ø§ÙØØ§ÙÙ Ù Ø¹ÙÙØ§Ù Ø§ÙØ£Ù ØšÙ Ø§ÙØ®Ø§Øµ ØšÙ.\n\nÙÙ Ø£ÙØª ÙØªØ£ÙØ¯ Ø£ÙÙ ØªØ±ÙØ¯ ØªÙØ¹ÙÙ Ø§ÙØšØ±Ø§ÙØ¬ Ø§ÙØ¥Ø¶Ø§ÙÙØ©Ø\n\n torbutton.popup.never_ask_again = ÙØ§ ØªØ³Ø£ÙÙÙ ÙØ±Ø© Ø§Ø®Ø±Ù diff --git a/src/chrome/locale/de/brand.dtd b/src/chrome/locale/de/brand.dtd index 9bb86e1..febd197 100644 --- a/src/chrome/locale/de/brand.dtd +++ b/src/chrome/locale/de/brand.dtd @@ -5,4 +5,4 @@ <!ENTITY brandShortName "TorBrowser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor-Projekt"> -<!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> +<!ENTITY trademarkInfo.part1 "Firefox und die Firefox-Logos sind Warenzeichen der Mozilla Foundation."> diff --git a/src/chrome/locale/de/brand.properties b/src/chrome/locale/de/brand.properties index 40f416f..bdb15b2 100644 --- a/src/chrome/locale/de/brand.properties +++ b/src/chrome/locale/de/brand.properties @@ -7,7 +7,7 @@ brandFullName=Tor Browser vendorShortName=Tor-Projekt homePageSingleStartMain=Firefox Start, eine schnelle Startseite mit eingebauter Suche -homePageImport=Importieren Sie ihre Startseite von %S +homePageImport=Ihre Startseite von %S importieren homePageMigrationPageTitle=Startseitenauswahl homePageMigrationDescription=Bitte wÃ€hlen Sie die Startseite die Sie benutzen mÃ¶chten: diff --git a/src/chrome/locale/de/browser.properties b/src/chrome/locale/de/browser.properties index 7a83d9d..df47914 100644 --- a/src/chrome/locale/de/browser.properties +++ b/src/chrome/locale/de/browser.properties @@ -2,7 +2,7 @@ browser.startup.homepage=about:tor # Spell checker dictionary -spellchecker.dictionary=en_US +spellchecker.dictionary=de_DE # Default search engine browser.search.defaultenginename=Startseite diff --git a/src/chrome/locale/de/torbutton.dtd b/src/chrome/locale/de/torbutton.dtd index 4b58e46..e431027 100644 --- a/src/chrome/locale/de/torbutton.dtd +++ b/src/chrome/locale/de/torbutton.dtd @@ -26,13 +26,13 @@ <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.toggle "Tor-Modus umschalten"> <!ENTITY torbutton.context_menu.toggle.key "T"> -<!ENTITY torbutton.context_menu.preferences "Einstellungen..."> +<!ENTITY torbutton.context_menu.preferences "Einstellungen âŠ"> <!ENTITY torbutton.context_menu.preferences.key "P"> -<!ENTITY torbutton.context_menu.about "Ãber Torbutton..."> +<!ENTITY torbutton.context_menu.about "Ãber Torbutton âŠ"> <!ENTITY torbutton.context_menu.about.key "A"> -<!ENTITY torbutton.context_menu.networksettings "Ãffne Netzwerkeinstellungen..."> +<!ENTITY torbutton.context_menu.networksettings "Ãffne Netzwerkeinstellungen âŠ"> <!ENTITY torbutton.context_menu.networksettings.key "S"> -<!ENTITY torbutton.context_menu.downloadUpdate "Tor-Browser aktualisierung herunterladen"> +<!ENTITY torbutton.context_menu.downloadUpdate "Aktualisierung des Tor-Browser-Paket herunterladen âŠ"> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Schutzvorkehrungen"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> diff --git a/src/chrome/locale/fa/aboutTor.dtd b/src/chrome/locale/fa/aboutTor.dtd index 1686f9a..08bf75c 100644 --- a/src/chrome/locale/fa/aboutTor.dtd +++ b/src/chrome/locale/fa/aboutTor.dtd @@ -6,9 +6,9 @@ <!ENTITY aboutTor.title "Ø¯Ø±ØšØ§Ø±ÙâÛ ØªÙØ±"> -<!ENTITY aboutTor.outOfDateTorOn.label ""> -<!ENTITY aboutTor.outOfDateTorOff.label ""> -<!ENTITY aboutTor.outOfDate2.label ""> +<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date."> +<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date."> +<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update."> <!ENTITY aboutTor.check.label "ØªÙØžÛÙØ§Øª ØŽØšÚ©ÙâÛ ØªÙØ± Ø±Ø§ ØšØ±Ø±Ø³Û Ú©ÙÛØ¯"> @@ -32,18 +32,18 @@ - The sentence contains two embedded links for "securely" and - the search engine ("Startpage" or "DuckDuckGo"). --> -<!ENTITY aboutTor.searchSPPost.link ""> +<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> <!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Ø¬Ø³ØªØ¬Ù"> <!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Ø¬Ø³ØªØ¬Ù"> <!ENTITY aboutTor.searchSP.privacy.label "ØšØµÙØ±Øª Ø§ÙÙ"> <!ENTITY aboutTor.searchDDG.privacy.label "ØšØµÙØ±Øª Ø§ÙÙ"> -<!ENTITY aboutTor.searchSP.privacy.link ""> +<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html"> <!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchSP.search.beforeLink.label ""> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label ""> +<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&nbsp;"> +<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&nbsp;"> +<!ENTITY aboutTor.searchSP.search.beforeLink.label "with "> +<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with "> <!ENTITY aboutTor.searchSP.search.label "Startpage"> <!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> <!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> @@ -54,13 +54,13 @@ <!ENTITY aboutTor.torInfo1.label "Ø§Ø·ÙØ§Ø¹Ø§Øª ØšÙØŽØªØ±"> <!ENTITY aboutTor.torInfo2.label "ÙØŽÙØ± Ù Ø¢Ø¯Ø±Ø³ Ø¢Ù ÙŸÛ:"> <!ENTITY aboutTor.torInfo3.label "ÙØ³ÙØ±ÙØ§Øš ÙØ®Ø±Ø¬"> -<!ENTITY aboutTor.torInfo4.label ""> -<!ENTITY aboutTor.whatnextQuestion.label ""> +<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors."> +<!ENTITY aboutTor.whatnextQuestion.label "What Next?"> <!ENTITY aboutTor.whatnextAnswer.label "ØªÙØ± ÙÙÙâÛ ÙÛØ§Ø² ØŽÙØ§ ØšØ±Ø§Û ÙØ§ØŽÙØ§Ø³ ÙØ§ÙØ¯Ù Ø¯Ø± ÙØš Ø±Ø§ ØšØ±Ø¢ÙØ±Ø¯Ù ÙÙÛâÚ©ÙØ¯! ØšØ±Ø§Û Ø§Ø·ÙÛÙØ§Ù Ø§Ø² Ø§ÛÙÙÛ ÙÙÛØªØªØ§ÙØ ÙÛØ§Ø² Ø¯Ø§Ø±ÛØ¯ ØšØ±Ø®Û Ø¹Ø§Ø¯Ø§Øª ÙØšÚ¯Ø±Ø¯ÛØªØ§Ù Ø±Ø§ ØªØºÛÛØ± Ø¯ÙÛØ¯."> <!ENTITY aboutTor.whatnext.label "Ø±Ø§ÙÙÙØ§ÛÛ ØšØ±Ø§Û ÙØ§ØŽÙØ§Ø³ ÙØ§ÙØ¯Ù."> <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning"> <!ENTITY aboutTor.helpInfo1.label "ÙÛâØªÙØ§ÙÛØ¯ Ú©ÙÚ© Ú©ÙÛØ¯!"> -<!ENTITY aboutTor.helpInfo2.label ""> +<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:"> <!ENTITY aboutTor.helpInfo3.label "ÙØ³ÙØ±ÙØ§Øš ØªÙØ±Ù Ø§Ø¯Ø§Ø±Ù ÙÙÙØ¯ Â»"> <!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en"> <!ENTITY aboutTor.helpInfo4.label "Ø¯Ø§ÙØ·ÙØš ØŽÙÙØ¯ Â»"> diff --git a/src/chrome/locale/fr/aboutTor.dtd b/src/chrome/locale/fr/aboutTor.dtd index b43c4ff..a0b041b 100644 --- a/src/chrome/locale/fr/aboutTor.dtd +++ b/src/chrome/locale/fr/aboutTor.dtd @@ -34,16 +34,16 @@ --> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Rechercher"> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Rechercher"> +<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Rechercher "> +<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Rechercher "> <!ENTITY aboutTor.searchSP.privacy.label "en toute sÃ©curitÃ©"> <!ENTITY aboutTor.searchDDG.privacy.label "en toute sÃ©curitÃ©"> <!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html"> <!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> <!ENTITY aboutTor.searchSP.privacy.afterLink.label "&nbsp;"> <!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&nbsp;"> -<!ENTITY aboutTor.searchSP.search.beforeLink.label "avec"> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label "avec"> +<!ENTITY aboutTor.searchSP.search.beforeLink.label "avec "> +<!ENTITY aboutTor.searchDDG.search.beforeLink.label "avec "> <!ENTITY aboutTor.searchSP.search.label "Startpage"> <!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> <!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">

1 0

[bridgedb/develop] Fix a typo in doc/DESCRIPTORS.md.
by isis＠torproject.org 14 Jan '14

14 Jan '14

commit ee1b3360f88f72e689f78bed8e63c141c8374050 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Jan 14 19:56:20 2014 +0000 Fix a typo in doc/DESCRIPTORS.md. --- doc/DESCRIPTORS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/DESCRIPTORS.md b/doc/DESCRIPTORS.md index 087d4e0..8a456b7 100644 --- a/doc/DESCRIPTORS.md +++ b/doc/DESCRIPTORS.md @@ -130,7 +130,7 @@ Optionally followed by: bridge-stats-end 2013-10-21 17:28:15 (86400 s) bridge-ips de=8,nl=8,us=8 -And, if it include the `bridge-ips` line, it MAY include the following right +And, if it includes the `bridge-ips` line, it MAY include the following right afterwards: bridge-ip-versions v4=16,v6=8

1 0

[bridgedb/develop] Add example extrainfo `transport` line for scramblesuit.
by isis＠torproject.org 14 Jan '14

14 Jan '14

commit 58884217ad83a4c5711e6e2c54aaa846af890e4e Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Jan 14 20:13:56 2014 +0000 Add example extrainfo `transport` line for scramblesuit. Philipp Winter's scramblesuit paper has a section on creating easily handwritable shared secrets. [0] To my memory, this excludes using the character `O` (capital o) and the integer `1`, because they are easily confused for the integer '0' and the character 'l', respectively. However, Philipp mentioned on IRC that scramblesuit `password=` fields in the `transport` line are actually just the set of base32 characters. [1] * ADD a line to doc/DESCRIPTORS.md which shows an example scramblesuit-enabled bridge which uses a shared secret passed through BridgeDB. See #9013. [0]: http://arxiv.org/abs/1305.3199 [1]: https://tools.ietf.org/html/rfc4648 --- doc/DESCRIPTORS.md | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/DESCRIPTORS.md b/doc/DESCRIPTORS.md index 8a456b7..226f368 100644 --- a/doc/DESCRIPTORS.md +++ b/doc/DESCRIPTORS.md @@ -170,6 +170,7 @@ obproxy pluggable transport types: dirreq-v3-tunneled-dl complete=12,timeout=0,running=0 transport obfs3 10.0.1.111:3333 transport obfs2 10.0.1.111:2222 + transport scramblesuit 10.0.1.111:4444 password=ABCDEFGHIJKLMNOPQRSTUVWXYZ234567 bridge-stats-end 2013-10-21 13:04:24 (86400 s) bridge-ips ca=8 bridge-ip-versions v4=8,v6=0

1 0