- tbb-commits - lists.torproject.org

[tor-browser/tor-browser-38.3.0esr-5.5-2] Updating .mozconfig-asan
by gk＠torproject.org 29 Oct '15

29 Oct '15

commit 70309d6b89162b398d8ad2f13a9f1ea839b9fce9 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Oct 29 20:56:11 2015 +0000 Updating .mozconfig-asan --- .mozconfig-asan | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/.mozconfig-asan b/.mozconfig-asan index 66e2dc1..218d2bd 100644 --- a/.mozconfig-asan +++ b/.mozconfig-asan @@ -1,17 +1,12 @@ . $topsrcdir/browser/config/mozconfig -export CFLAGS="-fsanitize=address -Dxmalloc=myxmalloc -fsanitize=undefined" -# When compiling with GCC 4.9.0 we need the libstdc++ either shipped with the -# bundles or link statically against it. We chose the latter as a) the -# resulting size of the bundle is smaller and b) there would probably occur -# issues with our Gitian setup as we compile GCC without LIBFAKETIME being set -# due to bug 11459. -export CXXFLAGS="-fsanitize=address -Dxmalloc=myxmalloc -fsanitize=undefined -static-libstdc++" -export LDFLAGS="-fsanitize=address -fsanitize=undefined" +export CFLAGS="-fsanitize=address -Dxmalloc=myxmalloc" +export CXXFLAGS="-fsanitize=address -Dxmalloc=myxmalloc" +# We need to add -ldl explicitely due to bug 1213698 +export LDFLAGS="-fsanitize=address -ldl" -mk_add_option sMOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@ +mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@ mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" -mk_add_options MOZ_MAKE_FLAGS="-j4" mk_add_options MOZILLA_OFFICIAL=1 mk_add_options BUILD_OFFICIAL=1 @@ -25,7 +20,8 @@ ac_add_options --enable-official-branding ac_add_options --enable-tor-browser-update ac_add_options --enable-update-packaging -ac_add_options --disable-verify-mar +ac_add_options --enable-signmar +ac_add_options --enable-verify-mar ac_add_options --disable-strip ac_add_options --disable-install-strip @@ -35,3 +31,11 @@ ac_add_options --disable-maintenance-service ac_add_options --disable-crashreporter ac_add_options --disable-webrtc #ac_add_options --disable-ctypes +ac_add_options --disable-eme +# We disable generating the startup cache to avoid crashing during the packaging +# step due to Ubuntu Lucid being special: +# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61408. +# Going this road and not backing out the feature responsible for this seems +# like the safer way even if it costs a bit start-up speed. But, hey, ASan +# builds are already slower. +ac_add_options --disable-startupcache

1 0

[tor-browser/tor-browser-38.3.0esr-5.5-2] Bug 1196381 - Eliminate breakpad dependency in ThreadStackHelper; r=nfroyd r=snorp The breakpad dependency in ThreadStackHelper is preventing us from upgrading our in-tree copy to a newer version (bug 1069556). This patch gets rid of that dependency. This makes native stack frames not work for BHR, but because of the ftp.m.o decommissioning, native symbolication was already broken and naive stack frames already don't work, so we don't really lose anyth
by gk＠torproject.org 29 Oct '15

29 Oct '15

commit 8c4206f4325d87eaeb68372c462ff2749a1d82a1 Author: Jim Chen <nchen(a)mozilla.com> Date: Fri Sep 18 09:17:10 2015 -0400 Bug 1196381 - Eliminate breakpad dependency in ThreadStackHelper; r=nfroyd r=snorp The breakpad dependency in ThreadStackHelper is preventing us from upgrading our in-tree copy to a newer version (bug 1069556). This patch gets rid of that dependency. This makes native stack frames not work for BHR, but because of the ftp.m.o decommissioning, native symbolication was already broken and naive stack frames already don't work, so we don't really lose anything from this patch. Eventually we want to make ThreadStackHelper use other means of unwinding, such as LUL for Linux I added | #if 0 | around the code to fill the thread context, but left the code in because I think we'll evenually want to reuse some of that code. --- xpcom/threads/ThreadStackHelper.cpp | 169 ++--------------------------------- xpcom/threads/ThreadStackHelper.h | 1 - 2 files changed, 6 insertions(+), 164 deletions(-) diff --git a/xpcom/threads/ThreadStackHelper.cpp b/xpcom/threads/ThreadStackHelper.cpp index 07a8e2d..a937e7f 100644 --- a/xpcom/threads/ThreadStackHelper.cpp +++ b/xpcom/threads/ThreadStackHelper.cpp @@ -22,22 +22,6 @@ #include "mozilla/UniquePtr.h" #include "mozilla/MemoryChecking.h" -#ifdef MOZ_THREADSTACKHELPER_NATIVE -#include "google_breakpad/processor/call_stack.h" -#include "google_breakpad/processor/basic_source_line_resolver.h" -#include "google_breakpad/processor/stack_frame_cpu.h" -#include "processor/basic_code_module.h" -#include "processor/basic_code_modules.h" -#endif - -#if defined(MOZ_THREADSTACKHELPER_X86) -#include "processor/stackwalker_x86.h" -#elif defined(MOZ_THREADSTACKHELPER_X64) -#include "processor/stackwalker_amd64.h" -#elif defined(MOZ_THREADSTACKHELPER_ARM) -#include "processor/stackwalker_arm.h" -#endif - #if defined(MOZ_VALGRIND) # include <valgrind/valgrind.h> #endif @@ -286,67 +270,12 @@ ThreadStackHelper::GetStack(Stack& aStack) } #ifdef MOZ_THREADSTACKHELPER_NATIVE -class ThreadStackHelper::CodeModulesProvider - : public google_breakpad::CodeModules +class ThreadStackHelper::ThreadContext final { -private: - typedef google_breakpad::CodeModule CodeModule; - typedef google_breakpad::BasicCodeModule BasicCodeModule; - - const SharedLibraryInfo mLibs; - mutable ScopedDeletePtr<BasicCodeModule> mModule; - public: - CodeModulesProvider() : mLibs(SharedLibraryInfo::GetInfoForSelf()) {} - virtual ~CodeModulesProvider() {} - - virtual unsigned int module_count() const - { - return mLibs.GetSize(); - } - - virtual const CodeModule* GetModuleForAddress(uint64_t aAddress) const - { - MOZ_CRASH("Not implemented"); - } + // TODO: provide per-platform definition of Context. + typedef struct {} Context; - virtual const CodeModule* GetMainModule() const - { - return nullptr; - } - - virtual const CodeModule* GetModuleAtSequence(unsigned int aSequence) const - { - MOZ_CRASH("Not implemented"); - } - - virtual const CodeModule* GetModuleAtIndex(unsigned int aIndex) const - { - const SharedLibrary& lib = mLibs.GetEntry(aIndex); - mModule = new BasicCodeModule(lib.GetStart(), lib.GetEnd() - lib.GetStart(), - lib.GetName(), lib.GetBreakpadId(), - lib.GetName(), lib.GetBreakpadId(), ""); - // Keep mModule valid until the next GetModuleAtIndex call. - return mModule; - } - - virtual const CodeModules* Copy() const - { - MOZ_CRASH("Not implemented"); - } -}; - -class ThreadStackHelper::ThreadContext - : public google_breakpad::MemoryRegion -{ -public: -#if defined(MOZ_THREADSTACKHELPER_X86) - typedef MDRawContextX86 Context; -#elif defined(MOZ_THREADSTACKHELPER_X64) - typedef MDRawContextAMD64 Context; -#elif defined(MOZ_THREADSTACKHELPER_ARM) - typedef MDRawContextARM Context; -#endif // Limit copied stack to 4kB static const size_t kMaxStackSize = 0x1000; // Limit unwound stack to 32 frames @@ -369,38 +298,6 @@ public: , mStackBase(0) , mStackSize(0) , mStackEnd(nullptr) {} - virtual ~ThreadContext() {} - - virtual uint64_t GetBase() const { return uint64_t(mStackBase); } - virtual uint32_t GetSize() const { return mStackSize; } - virtual bool GetMemoryAtAddress(uint64_t aAddress, uint8_t* aValue) const - { - return GetMemoryAtAddressInternal(aAddress, aValue); - } - virtual bool GetMemoryAtAddress(uint64_t aAddress, uint16_t* aValue) const - { - return GetMemoryAtAddressInternal(aAddress, aValue); - } - virtual bool GetMemoryAtAddress(uint64_t aAddress, uint32_t* aValue) const - { - return GetMemoryAtAddressInternal(aAddress, aValue); - } - virtual bool GetMemoryAtAddress(uint64_t aAddress, uint64_t* aValue) const - { - return GetMemoryAtAddressInternal(aAddress, aValue); - } - -private: - template<typename T> - bool GetMemoryAtAddressInternal(uint64_t aAddress, T* aValue) const - { - const intptr_t offset = intptr_t(aAddress) - intptr_t(GetBase()); - if (offset < 0 || uintptr_t(offset) > (GetSize() - sizeof(T))) { - return false; - } - *aValue = *reinterpret_cast<const T*>(&mStack[offset]); - return true; - } }; #endif // MOZ_THREADSTACKHELPER_NATIVE @@ -417,63 +314,7 @@ ThreadStackHelper::GetNativeStack(Stack& aStack) GetStack(aStack); NS_ENSURE_TRUE_VOID(context.mValid); - CodeModulesProvider modulesProvider; - google_breakpad::BasicCodeModules modules(&modulesProvider); - google_breakpad::BasicSourceLineResolver resolver; - google_breakpad::StackFrameSymbolizer symbolizer(nullptr, &resolver); - -#if defined(MOZ_THREADSTACKHELPER_X86) - google_breakpad::StackwalkerX86 stackWalker( - nullptr, &context.mContext, &context, &modules, &symbolizer); -#elif defined(MOZ_THREADSTACKHELPER_X64) - google_breakpad::StackwalkerAMD64 stackWalker( - nullptr, &context.mContext, &context, &modules, &symbolizer); -#elif defined(MOZ_THREADSTACKHELPER_ARM) - google_breakpad::StackwalkerARM stackWalker( - nullptr, &context.mContext, -1, &context, &modules, &symbolizer); -#else - #error "Unsupported architecture" -#endif - - google_breakpad::CallStack callStack; - std::vector<const google_breakpad::CodeModule*> modules_without_symbols; - - google_breakpad::Stackwalker::set_max_frames(ThreadContext::kMaxStackFrames); - google_breakpad::Stackwalker:: - set_max_frames_scanned(ThreadContext::kMaxStackFrames); - - NS_ENSURE_TRUE_VOID(stackWalker.Walk(&callStack, &modules_without_symbols)); - - const std::vector<google_breakpad::StackFrame*>& frames(*callStack.frames()); - for (intptr_t i = frames.size() - 1; i >= 0; i--) { - const google_breakpad::StackFrame& frame = *frames[i]; - if (!frame.module) { - continue; - } - const string& module = frame.module->code_file(); -#if defined(XP_LINUX) || defined(XP_MACOSX) - const char PATH_SEP = '/'; -#elif defined(XP_WIN) - const char PATH_SEP = '\\'; -#endif - const char* const module_basename = strrchr(module.c_str(), PATH_SEP); - const char* const module_name = module_basename ? - module_basename + 1 : module.c_str(); - - char buffer[0x100]; - size_t len = 0; - if (!frame.function_name.empty()) { - len = PR_snprintf(buffer, sizeof(buffer), "%s:%s", - module_name, frame.function_name.c_str()); - } else { - len = PR_snprintf(buffer, sizeof(buffer), "%s:0x%p", - module_name, (intptr_t) - (frame.instruction - frame.module->base_address())); - } - if (len) { - aStack.AppendViaBuffer(buffer, len); - } - } + // TODO: walk the saved stack frames. #endif // MOZ_THREADSTACKHELPER_NATIVE } @@ -701,6 +542,7 @@ ThreadStackHelper::FillThreadContext(void* aContext) return; } +#if 0 // TODO: remove dependency on Breakpad structs. #if defined(XP_LINUX) const ucontext_t& context = *reinterpret_cast<ucontext_t*>(aContext); #if defined(MOZ_THREADSTACKHELPER_X86) @@ -858,6 +700,7 @@ ThreadStackHelper::FillThreadContext(void* aContext) mContextToFill->mStackBase = uintptr_t(sp); mContextToFill->mStackSize = stackSize; mContextToFill->mValid = true; +#endif #endif // MOZ_THREADSTACKHELPER_NATIVE } diff --git a/xpcom/threads/ThreadStackHelper.h b/xpcom/threads/ThreadStackHelper.h index b334f2f..9c40ad5 100644 --- a/xpcom/threads/ThreadStackHelper.h +++ b/xpcom/threads/ThreadStackHelper.h @@ -66,7 +66,6 @@ private: #ifdef MOZ_THREADSTACKHELPER_PSEUDO const PseudoStack* const mPseudoStack; #ifdef MOZ_THREADSTACKHELPER_NATIVE - class CodeModulesProvider; class ThreadContext; // Set to non-null if GetStack should get the thread context. ThreadContext* mContextToFill;

1 0

[tor-browser/tor-browser-38.3.0esr-5.5-2] Bug 1147248 - GCC 4.9 needs this patch to use address sanitizer. r=glandium
by gk＠torproject.org 29 Oct '15

29 Oct '15

commit 4a90c975e0c251e073f5c218d72a8ce1a4087e97 Author: ISHIKAWA, Chiaki <ishikawa(a)yk.rim.or.jp> Date: Fri Apr 10 15:05:00 2015 +0200 Bug 1147248 - GCC 4.9 needs this patch to use address sanitizer. r=glandium --HG-- extra : rebase_source : 08c553d5b5ff76abd81b070ccd6e2f058a2c4e4b --- memory/mozalloc/mozalloc.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/memory/mozalloc/mozalloc.h b/memory/mozalloc/mozalloc.h index 2b370ec..a1479ad 100644 --- a/memory/mozalloc/mozalloc.h +++ b/memory/mozalloc/mozalloc.h @@ -203,7 +203,13 @@ MOZALLOC_EXPORT void* moz_valloc(size_t size) #define MOZALLOC_THROW_BAD_ALLOC MOZALLOC_THROW_BAD_ALLOC_IF_HAS_EXCEPTIONS -MOZALLOC_EXPORT_NEW MOZALLOC_INLINE +MOZALLOC_EXPORT_NEW +#if defined(__GNUC__) && !defined(__clang__) && defined(__SANITIZE_ADDRESS__) +/* gcc's asan somehow doesn't like always_inline on this function. */ +__attribute__((gnu_inline)) inline +#else +MOZALLOC_INLINE +#endif void* operator new(size_t size) MOZALLOC_THROW_BAD_ALLOC { return moz_xmalloc(size);

1 0

[tor-browser/tor-browser-38.3.0esr-5.5-2] Bug 1143411 - Fix build against latest freetype code. r=glandium
by gk＠torproject.org 29 Oct '15

29 Oct '15

commit 4ac742c18b99d09d956cef5341ff5314ac4eba66 Author: NiLuJe <ninuje(a)gmail.com> Date: Wed Mar 18 19:32:53 2015 -0400 Bug 1143411 - Fix build against latest freetype code. r=glandium --HG-- extra : amend_source : 1d6310f206f4fbf0a0063b4d0affc7bc3d16273a --- config/system-headers | 1 + 1 file changed, 1 insertion(+) diff --git a/config/system-headers b/config/system-headers index 2c94a7d..4ab45e1 100644 --- a/config/system-headers +++ b/config/system-headers @@ -471,6 +471,7 @@ freetype/ftbitmap.h freetype/ftxf86.h freetype.h ftcache.h +ftfntfmt.h ftglyph.h ftsynth.h ftoutln.h

1 0

[tor-browser-bundle/master] Bug 17122: Rename Japanese OS X bundle
by gk＠torproject.org 29 Oct '15

29 Oct '15

commit 52afb5a8e99cbd117e14f40c5450b7cc26b04f18 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Oct 29 12:25:56 2015 +0000 Bug 17122: Rename Japanese OS X bundle In order to avoid user confusion we change the locale part in the bundle name from `ja-JP-mac` to `ja` like it is on other platforms we support. The workings of Tor Browser on OS X are not affected as `ja-JP-mac` is used internally. --- gitian/descriptors/mac/gitian-bundle.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index e3baa3c..458d613 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -276,6 +276,10 @@ script: | # MAR_FILE=tor-browser-osx${GBUILD_BITS}-${TORBROWSER_VERSION}_$LANG.mar MAR=$MARTOOLS/mar MBSDIFF=$MARTOOLS/mbsdiff $MARTOOLS/make_full_update.sh -q $OUTDIR/$MAR_FILE ~/build/dmg/$DEST.app + # Rename the Japanese bundle to not confuse users + if [ "$LANG" = "ja-JP-mac" ]; then + LANG="ja" + fi ~/build/ddmg.sh $OUTDIR/TorBrowser-${TORBROWSER_VERSION}-osx${GBUILD_BITS}_$LANG.dmg ~/build/dmg/ rm -rf ~/build/dmg/$DEST.app done

1 0

[tor-browser-bundle/maint-5.0] Update changelog
by gk＠torproject.org 29 Oct '15

29 Oct '15

commit 6b478cc3c1632f9c8e9eb5acb6fd72fdeeecd394 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Oct 29 13:00:08 2015 +0000 Update changelog --- Bundle-Data/Docs/ChangeLog.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index bf21317..fab04c9 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -5,11 +5,11 @@ Tor Browser 5.0.4 -- November 3 2015 * Update Torbutton to 1.9.3.5 * Bug 9263: Spoof Referer when leaving a .onion domain * Bug 16735: about:tor should accommodate different fonts/font sizes - * Bug 16937: Don't translate the hompepage/spellchecker dictionary string + * Bug 16937: Don't translate the homepage/spellchecker dictionary string * Bug 17164: Don't show text-select cursor on circuit display * Bug 17351: Remove unused code * Translation updates - * Bug 16937: Don't translate the hompepage/spellchecker dictionary string + * Bug 16937: Remove the en-US dictionary from non en-US Tor Browser bundles * Bug 17318: Remove dead ScrambleSuit bridge * Bug 16983: Isolate favicon requests caused by the tab list dropdown * Bug 17102: Don't crash while opening a second Tor Browser

1 0

[tor-browser-bundle/master] fix typo in changelog
by gk＠torproject.org 29 Oct '15

29 Oct '15

commit 39e699247a1a561eb883c463b09ef6d2ed782afc Author: Georg Koppen <gk(a)torproject.org> Date: Thu Oct 29 12:59:01 2015 +0000 fix typo in changelog --- Bundle-Data/Docs/ChangeLog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index dce1a3e..71154c4 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -3,7 +3,7 @@ Tor Browser 5.5a3 -- September 22 2015 * Update Firefox to 38.3.0esr * Update libevent to 2.0.22-stable * Update Torbutton to 1.9.4 - * Bug 16937: Don't translate the hompepage/spellchecker dictionary string + * Bug 16937: Don't translate the homepage/spellchecker dictionary string * Bug 16735: about:tor should accommodate different fonts/font sizes * Bug 16887: Update intl.accept_languages value * Bug 15493: Update circuit display on new circuit info

1 0

[tor-browser/tor-browser-38.3.0esr-5.5-2] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 29 Oct '15

29 Oct '15

commit ea1c3ae18602b21bed1bcb6dad0f77703bfb6c4e Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Sat Oct 24 17:46:27 2015 -0700 fixup! TB4: Tor Browser's Firefox preference overrides. Adding Localized names to the font whitelist. Most localized names were taken from http://trigeminal.fmsinc.com/samples/font_choices.html. This is for bug 17250. --- browser/app/profile/000-tor-browser.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 26b50e3..c0fce16 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -273,7 +273,7 @@ pref("font.name.sans-serif.ar", "Arial"); #endif #ifdef XP_WIN -pref("font.system.whitelist", "Arial, Batang, Cambria Math, Courier New, Euphemia, Gautami, Georgia, Gulim, GulimChe, Iskoola Pota, Kalinga, Kartika, Latha, Lucida Console, MS Gothic, MS Mincho, MS PGothic, MS PMincho, MV Boli, Mangal, Microsoft Himalaya, Microsoft YaHei, MingLiU, Noto Sans Buginese, Noto Sans Khmer, Noto Sans Lao, Noto Sans Myanmar, Noto Sans Yi, Nyala, PMingLiU, Plantagenet Cherokee, Raavi, Segoe UI, Shruti, SimSun, Sylfaen, Tahoma, Times New Roman, Tunga, Verdana, Vrinda"); +pref("font.system.whitelist", "Arial, Batang, 바탕, Cambria Math, Courier New, Euphemia, Gautami, Georgia, Gulim, 굴림, GulimChe, 굴림체, Iskoola Pota, Kalinga, Kartika, Latha, Lucida Console, MS Gothic, ＭＳゴシック, MS Mincho, ＭＳ明朝, MS PGothic, ＭＳＰゴシック, MS PMincho, ＭＳＰ明朝, MV Boli, Mangal, Microsoft Himalaya, Microsoft YaHei, 微软雅黑, MingLiU, 細明體, Noto Sans Buginese, Noto Sans Khmer, Noto Sans Lao, Noto Sans Myanmar, Noto Sans Yi, Nyala, PMingLiU, 新細明體, Plantagenet Cherokee, Raavi, Segoe UI, Shruti, SimSun, 宋体, Sylfaen, Tahoma, Times New Roman, Tunga, Verdana, Vrinda"); #endif #ifdef XP_LINUX

1 0

[tor-browser-bundle/maint-5.0] updating the obfs4 key we ship
by gk＠torproject.org 29 Oct '15

29 Oct '15

commit 491d380960b3ba0b45f2b07fd56dd053cce2c218 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Oct 29 10:47:45 2015 +0000 updating the obfs4 key we ship --- gitian/gpg/obfs4proxy.gpg | Bin 34128 -> 41312 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gitian/gpg/obfs4proxy.gpg b/gitian/gpg/obfs4proxy.gpg index b9c490a..f26a4cd 100644 Binary files a/gitian/gpg/obfs4proxy.gpg and b/gitian/gpg/obfs4proxy.gpg differ

1 0

[torbutton/master] Update translations
by gk＠torproject.org 29 Oct '15

29 Oct '15

commit 3fcce52e9ad78a8e0798113cf42d953b0a4caabd Author: Georg Koppen <gk(a)torproject.org> Date: Thu Oct 29 09:46:34 2015 +0000 Update translations --- src/chrome/locale/ar/brand.properties | 2 +- src/chrome/locale/fr/aboutTor.dtd | 2 +- src/chrome/locale/fr/torbutton.dtd | 36 ++++++++++++++--------------- src/chrome/locale/ko/aboutDialog.dtd | 14 +++++------ src/chrome/locale/ko/aboutTor.properties | 6 ++--- src/chrome/locale/ko/torbutton.properties | 10 ++++---- src/chrome/locale/pt/brand.properties | 2 +- 7 files changed, 36 insertions(+), 36 deletions(-) diff --git a/src/chrome/locale/ar/brand.properties b/src/chrome/locale/ar/brand.properties index 3cbd6f2..75c5fd1 100644 --- a/src/chrome/locale/ar/brand.properties +++ b/src/chrome/locale/ar/brand.properties @@ -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/. -brandShorterName=Tor Browser +brandShorterName=متصفح Tor brandShortName=متصفح تور brandFullName=متصفح تور vendorShortName=مشروع تور diff --git a/src/chrome/locale/fr/aboutTor.dtd b/src/chrome/locale/fr/aboutTor.dtd index 576ca2f..67e55ef 100644 --- a/src/chrome/locale/fr/aboutTor.dtd +++ b/src/chrome/locale/fr/aboutTor.dtd @@ -8,7 +8,7 @@ <!ENTITY aboutTor.outOfDateTorOn.label "CEPENDANT, ce navigateur n'est pas à jour."> <!ENTITY aboutTor.outOfDateTorOff.label "DE PLUS, ce navigateur n'est pas à jour."> -<!ENTITY aboutTor.outOfDate2.label "Cliquez sur l'oignon et choissisez ensuite Vérifier les mises à jour du Tor Browser"> +<!ENTITY aboutTor.outOfDate2.label "Cliquez sur l'oignon et choisissez ensuite Vérifier les mises à jour du navigateur Tor"> <!ENTITY aboutTor.check.label "Tester les paramètres du réseau Tor"> diff --git a/src/chrome/locale/fr/torbutton.dtd b/src/chrome/locale/fr/torbutton.dtd index 64dcd96..9811e4c 100644 --- a/src/chrome/locale/fr/torbutton.dtd +++ b/src/chrome/locale/fr/torbutton.dtd @@ -1,6 +1,6 @@ -<!ENTITY torbutton.prefs.title "Préférences Torbutton"> +<!ENTITY torbutton.prefs.title "Préférences de Torbutton"> <!ENTITY torbutton.prefs.tor_settings "Paramètres du proxy"> -<!ENTITY torbutton.prefs.recommended_settings "Utiliser les paramètres de proxy recommandés pour ma version de Firefox"> +<!ENTITY torbutton.prefs.recommended_settings "Utiliser les paramètres du proxy recommandés pour ma version de Firefox"> <!ENTITY torbutton.prefs.use_privoxy "Utiliser Privoxy"> <!ENTITY torbutton.prefs.use_polipo "Utiliser Polipo"> <!ENTITY torbutton.prefs.custom_settings "Utiliser des paramètres de proxy personnalisés"> @@ -34,7 +34,7 @@ <!ENTITY torbutton.context_menu.about.key "A"> <!ENTITY torbutton.context_menu.networksettings "Paramètres du réseau Tor"> <!ENTITY torbutton.context_menu.networksettings.key "S"> -<!ENTITY torbutton.context_menu.downloadUpdate "Vérifiez les mises à jour du navigateur Tor"> +<!ENTITY torbutton.context_menu.downloadUpdate "Vérifier les mises à jour du navigateur Tor"> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Protections contre les cookies"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> @@ -54,7 +54,7 @@ <!ENTITY torbutton.prefs.clear_history "Vider l'historique à l'activation/désactivation de Tor (facultatif)"> <!ENTITY torbutton.prefs.clear_cache "Bloquer la mémoire tampon du disque Tor et vider tous les caches à l'activation/désactivation de Tor"> <!ENTITY torbutton.prefs.block_cache "Bloquer la mémoire tampon du disque et l'accès à la mémoire tampon pendant l'utilisation de Tor"> -<!ENTITY torbutton.prefs.cookie_jars "Conserver les cookies non-Tor dans une cookie-jar sécurisée"> +<!ENTITY torbutton.prefs.cookie_jars "Conserver les cookies non-Tor dans une boite à cookies sécurisée"> <!ENTITY torbutton.prefs.cookie_protection "Choisir parmi la boîte de dialogue des Protections de cookies"> <!ENTITY torbutton.prefs.mmm_cookies "Je gérerai mes cookies manuellement (dangereux)"> <!ENTITY torbutton.prefs.clear_cookies "Supprimer les cookies à l'activation/désactivation de Tor"> @@ -62,14 +62,14 @@ <!ENTITY torbutton.prefs.kill_bad_js "Intercepter les éléments javascript dangereux (indispensable)"> <!ENTITY torbutton.prefs.isolate_content "Isoler les contenus dynamiques lorsque Tor fonctionne (indispensable)"> <!ENTITY torbutton.prefs.no_updates "Désactiver les mises à jours durant l'utilisation de Tor"> -<!ENTITY torbutton.prefs.set_uagent "Paramétrer l'agent d'utilisateur pour l'utilisation de Tor (indispensable)"> +<!ENTITY torbutton.prefs.set_uagent "Altérer la version de navigateur communiquée pendant l'utilisation de Tor (indispensable)"> <!ENTITY torbutton.prefs.dynamic "Contenu dynamique"> <!ENTITY torbutton.prefs.cookies "Cookies"> <!ENTITY torbutton.prefs.cache "Cache"> <!ENTITY torbutton.prefs.history "Historique"> <!ENTITY torbutton.prefs.no_search "Désactiver les suggestions de recherche pendant l'utilisation de Tor (recommandé)"> <!ENTITY torbutton.prefs.shutdown "Arrêt"> -<!ENTITY torbutton.prefs.tor_shutdown "Supprimer les cookies Tor lors de l'arrêt du navigateur lorsque Tor est utilisé"> +<!ENTITY torbutton.prefs.tor_shutdown "Supprimer les cookies Tor à l'arrêt du navigateur lorsque Tor est utilisé"> <!ENTITY torbutton.prefs.all_shutdown "Supprimer les cookies à chaque fermeture du navigateur"> <!ENTITY torbutton.prefs.no_shutdown "Ne pas supprimer mes cookies à la fermeture"> <!ENTITY torbutton.prefs.disable_sessionstore "Désactiver la fonction de sauvegarde de session (recommandé)"> @@ -88,9 +88,9 @@ <!ENTITY torbutton.prefs.restore_tor "Lors d'une restauration de session, mettre Tor en état:"> <!ENTITY torbutton.prefs.startup_tor "Au démarrage, mettre Tor dans l'état :"> <!ENTITY torbutton.prefs.reload_crashed_jar "Recharger la cookie jar et supprimer cookies lors d'un plantage de Firefox (recommandé)"> -<!ENTITY torbutton.prefs.dual_cookie_jars "Stocker les cookies Tor et non-Tor dans des cookie-jars sécurisés (dangereux)"> +<!ENTITY torbutton.prefs.dual_cookie_jars "Stocker les cookies Tor et non-Tor dans des boites à cookies sécurisées (dangereux)"> <!ENTITY torbutton.prefs.clear_http_auth "Supprimer les sessions HTTP authentifiées (recommandé)"> -<!ENTITY torbutton.prefs.block_js_history "Isoler l'accès à l'historique de navigation à l'état Tor (indispensable)"> +<!ENTITY torbutton.prefs.block_js_history "Isoler l'accès à l'historique de navigation lors de la navigation Tor (indispensable)"> <!ENTITY torbutton.prefs.resize_on_toggle "Redimensionner la fenêtre sur un multiple de 50px lors de l'utilisation de Tor (recommandé)"> <!ENTITY torbutton.prefs.close_tor "Fermer toutes les fenêtres et onglets à l'activation/désactivation (facultatif)"> <!ENTITY torbutton.prefs.close_nontor "Fermer toutes les fenêtres et onglets Non-Tor à l'activation/désactivation (optionnel)"> @@ -144,8 +144,8 @@ <!ENTITY torbutton.prefs.engine3 "yahoo.com"> <!ENTITY torbutton.prefs.engine4 "startpage.com"> <!ENTITY torbutton.prefs.engine5 "duckduckgo.com"> -<!ENTITY torbutton.prefs.transparentTor "Torification transparente (requiert un transproxy personnalisé ou un routeur Tor)"> -<!ENTITY torbutton.prefs.priv_caption "Paramètres de vie privé"> +<!ENTITY torbutton.prefs.transparentTor "Torification transparente (requiert un transproxy spécialisé ou un routeur Tor)"> +<!ENTITY torbutton.prefs.priv_caption "Paramètres de vie privée"> <!ENTITY torbutton.prefs.block_disk "Ne pas sauvegarder l'historique de navigation et les données des sites webs (active le Mode de Navigation Privée)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Limiter les cookies tiers ainsi que les autres données de traçage"> <!ENTITY torbutton.prefs.block_plugins "Désactiver les greffons du navigateur (tels que Flash)"> @@ -153,25 +153,25 @@ <!ENTITY torbutton.prefs.sec_caption "Niveau de sécurité"> <!ENTITY torbutton.prefs.sec_low "Faible (par défaut)"> <!ENTITY torbutton.prefs.sec_low_usable_desc "Cela offre l'expérience la plus agréable."> -<!ENTITY torbutton.prefs.sec_low_desc "A ce niveau de sécurité, toutes les fonctions de navigation sont activés."> +<!ENTITY torbutton.prefs.sec_low_desc "A ce niveau de sécurité, toutes les fonctions de navigation sont activées."> <!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "Le mécanisme SVG OpenType de rendu des polices est désactivé."> <!ENTITY torbutton.prefs.sec_med_low "Moyen-Bas"> <!ENTITY torbutton.prefs.sec_gen_desc "À ce niveau de sécurité, les changements suivants s'appliquent (passez la souris au dessus pour afficher des détails) :"> -<!ENTITY torbutton.prefs.sec_html5_desc "Les vidéos et médias audio HTML5 deviennent jouable d'un clic via NoScript."> -<!ENTITY torbutton.prefs.sec_html5_tooltip "Sur quelques sites, vous pourriez devoir utiliser le bouton de barre d'outils de NoScript pour permettre ces objets médiatiques."> -<!ENTITY torbutton.prefs.sec_some_jit_desc "Quelques optimisations de performance liés à Javascript sont désactivées."> -<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "JIT ION, Inférence de types, ASM.JS."> +<!ENTITY torbutton.prefs.sec_html5_desc "Les média audio-vidéos HTML5 doivent être cliqués pour être lus (via NoScript)."> +<!ENTITY torbutton.prefs.sec_html5_tooltip "Sur quelques sites, vous pourriez avoir à utiliser le bouton de barre d'outils de NoScript pour autoriser ces objets multimédias."> +<!ENTITY torbutton.prefs.sec_some_jit_desc "Certaines optimisations liés à Javascript sont désactivées."> +<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "JIT ION, inférence de types, ASM.JS."> <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "JIT Baseline."> -<!ENTITY torbutton.prefs.sec_jit_slower_desc "Les scripts sur quelques sites peuvent fonctionner plus lentement."> +<!ENTITY torbutton.prefs.sec_jit_slower_desc "Les scripts sur certains sites peuvent être ralentis."> <!ENTITY torbutton.prefs.sec_jar_desc "Les fichiers distants JAR sont bloqués."> <!ENTITY torbutton.prefs.sec_jar_tooltip "Les fichiers JAR sont extrêmement rares sur le Web, mais peuvent être une source d'attaques XSS et autres."> <!ENTITY torbutton.prefs.sec_mathml_desc "Quelques mécanismes d'affichage d'équations mathématiques sont désactivés."> <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML est désactivé."> -<!ENTITY torbutton.prefs.sec_med_high "Moyen-Haut"> +<!ENTITY torbutton.prefs.sec_med_high "Moyennement haut"> <!ENTITY torbutton.prefs.sec_all_jit_desc "Toutes les optimisations de performance de Javascript sont désactivées."> <!ENTITY torbutton.prefs.sec_font_rend_desc "Certaines fonctionnalités de rendu de police sont désactivées."> <!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "Le mécanisme de rendu de police de caractères Graphite est désactivé."> -<!ENTITY torbutton.prefs.sec_svg_desc "Quelques types d'images sont désactivés."> +<!ENTITY torbutton.prefs.sec_svg_desc "Certains formats d'images sont désactivés."> <!ENTITY torbutton.prefs.sec_svg_desc_tooltip "Les images SVG sont désactivées."> <!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript est désactivé par défaut sur tous les sites non-HTTPS."> <!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript peut être activé selon le site via le bouton de barre d'outils NoScript."> diff --git a/src/chrome/locale/ko/aboutDialog.dtd b/src/chrome/locale/ko/aboutDialog.dtd index 09c8d82..ae087b7 100644 --- a/src/chrome/locale/ko/aboutDialog.dtd +++ b/src/chrome/locale/ko/aboutDialog.dtd @@ -1,19 +1,19 @@ <!ENTITY project.start "&brandShortName;의 개발자: ">  -<!ENTITY project.tpoLink "the &vendorShortName;"> +<!ENTITY project.tpoLink "&vendorShortName;"> <!ENTITY project.end ", a nonprofit working to defend your privacy and freedom online."> -<!ENTITY help.start "Want to help? "> +<!ENTITY help.start "도움이 필요하신가요?">  <!ENTITY help.donateLink "후원하기"> -<!ENTITY help.or " or "> +<!ENTITY help.or "또는">  <!ENTITY help.getInvolvedLink "get involved"> <!ENTITY help.end "!">  -<!ENTITY bottomLinks.questions "Questions?"> +<!ENTITY bottomLinks.questions "질문이 있으신가요?">  -<!ENTITY bottomLinks.grow "Help the Tor Network Grow!"> +<!ENTITY bottomLinks.grow "Tor 네트워크가 성장할 수 있도록 도와주세요!">  -<!ENTITY bottomLinks.license "Licensing Information"> -<!ENTITY tor.TrademarkStatement "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc."> +<!ENTITY bottomLinks.license "라이센스 정보"> +<!ENTITY tor.TrademarkStatement "'Tor'와 'Onion Logo'는 Tor Project의 등록 상표입니다."> diff --git a/src/chrome/locale/ko/aboutTor.properties b/src/chrome/locale/ko/aboutTor.properties index d607324..60d0646 100644 --- a/src/chrome/locale/ko/aboutTor.properties +++ b/src/chrome/locale/ko/aboutTor.properties @@ -2,19 +2,19 @@ # See LICENSE for licensing information. # vim: set sw=2 sts=2 ts=8 et: -aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +aboutTor.searchSP.privacy=<a href="%2$S">시작페이지</a>를 <a href="%1$S">안전하게</a> 검색 # The following string is a link which replaces %1$S above. aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.ht… # The following string is a link which replaces %2$S above. aboutTor.searchSP.search.link=https://startpage.com/ -aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +aboutTor.searchDDG.privacy=<a href="%2$S">DuckDuckGo</a>를 <a href="%1$S>안전하게</a> 검색 # The following string is a link which replaces %1$S above. aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html # The following string is a link which replaces %2$S above. aboutTor.searchDDG.search.link=https://duckduckgo.com/ -aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>. +aboutTor.searchDC.privacy=<a href="%2$S">Diconnect.me</a>를 <a href="%1$S">안전하게</a> # The following string is a link which replaces %1$S above. aboutTor.searchDC.privacy.link=https://disconnect.me/privacy # The following string is a link which replaces %2$S above. diff --git a/src/chrome/locale/ko/torbutton.properties b/src/chrome/locale/ko/torbutton.properties index d44bcf9..9476333 100644 --- a/src/chrome/locale/ko/torbutton.properties +++ b/src/chrome/locale/ko/torbutton.properties @@ -2,9 +2,9 @@ torbutton.button.tooltip.disabled = Tor 활성화 torbutton.button.tooltip.enabled = Tor 비활성화 torbutton.circuit_display.internet = 인터넷 torbutton.circuit_display.ip_unknown = 미확인 IP -torbutton.circuit_display.onion_site = Onion site +torbutton.circuit_display.onion_site = Onion 사이트 torbutton.circuit_display.this_browser = This browser -torbutton.circuit_display.relay = relay +torbutton.circuit_display.relay = 중계 torbutton.circuit_display.tor_bridge = 브릿지 torbutton.circuit_display.unknown_country = 미확인 국가 torbutton.content_sizer.margin_tooltip = Tor Browser adds this margin to make the width and height of your window less distinctive, and thus reduces the ability of people to track you online. @@ -57,7 +57,7 @@ torbutton.popup.never_ask_again = 다시는 물어보지 않기 torbutton.popup.confirm_newnym = Tor Browser will close all windows and tabs. All website sessions will be lost.\n\nRestart Tor Browser now to reset your identity?\n\n torbutton.slider_notification = The green onion menu now has a security slider which lets you adjust your security level. Check it out! -torbutton.slider_notification_button = Open security settings +torbutton.slider_notification_button = 보안 설정 열기 torbutton.maximize_warning = Maximizing Tor Browser can allow websites to determine your monitor size, which can be used to track you. We recommend that you leave Tor Browser windows in their original default size. @@ -72,7 +72,7 @@ canvas.neverAccessKey=e # Profile/startup error messages. Strings are kept here for ease of translation. # LOCALIZATION NOTE: %S is the application name. -profileProblemTitle=%S Profile Problem -profileReadOnly=You cannot run %S from a read-only file system. Please copy %S to another location before trying to use it. +profileProblemTitle=%S 프로필 문제 +profileReadOnly=%S 에서 읽기전용 파일시스템으로 실행하실 수 없습니다. 사용하시기 전에 %S를 복사하여 다른 곳에서 테스트 해 보십시오. profileReadOnlyMac=You cannot run %S from a read-only file system. Please copy %S to your Desktop or Applications folder before trying to use it. profileAccessDenied=%S does not have permission to access the profile. Please adjust your file system permissions and try again. diff --git a/src/chrome/locale/pt/brand.properties b/src/chrome/locale/pt/brand.properties index 1374192..6d96fb0 100644 --- a/src/chrome/locale/pt/brand.properties +++ b/src/chrome/locale/pt/brand.properties @@ -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/. -brandShorterName=Tor Browser +brandShorterName=Navegador Tor brandShortName=Navegador Tor brandFullName=Navegador Tor vendorShortName=Projeto Tor

1 0