April 2012 - tor-commits - lists.torproject.org

[torbrowser/master] Lin: Don't build webkit support into Qt
by erinn＠torproject.org 27 Apr '12

27 Apr '12

commit 1cf692430f07aa7c77c9d9661e900c8dc61a5063 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Apr 27 12:30:55 2012 +0200 Lin: Don't build webkit support into Qt We don't use it, and we've also gotten rid of it on OS X --- build-scripts/linux.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 313c021..dec0294 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -55,7 +55,7 @@ build-openssl: build-zlib $(OPENSSL_DIR) cd $(OPENSSL_DIR) && make install_sw touch $(STAMP_DIR)/build-openssl -QT_BUILD_PREFS=-system-zlib -confirm-license -opensource -openssl-linked -no-qt3support -fast -release -nomake demos -nomake examples +QT_BUILD_PREFS=-system-zlib -confirm-license -opensource -openssl-linked -no-webkit -no-qt3support -fast -release -nomake demos -nomake examples QT_OPTS=$(QT_BUILD_PREFS) -prefix $(BUILT_DIR) -I $(BUILT_DIR)/include -I $(BUILT_DIR)/include/openssl/ -L$(BUILT_DIR)/lib build-qt: build-zlib build-openssl $(QT_DIR) cd $(QT_DIR) && ./configure $(QT_OPTS)

1 0

[torbrowser/master] OSX: Fix branding to use TorBrowser in Dock, too
by erinn＠torproject.org 27 Apr '12

27 Apr '12

commit 48bbd95ee95ee5bea0871d62a387f83a97f75687 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Apr 27 15:06:17 2012 +0200 OSX: Fix branding to use TorBrowser in Dock, too Otherwise the application would've been called "Firefox" in the Dock and when alt-tabbing around --- build-scripts/osx.mk | 18 +++++++++--------- .../0001-Adapt-paths-etc-for-OS-X-TBB.patch | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index a87cf9e..d7af26c 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -106,8 +106,8 @@ build-firefox: $(FIREFOX_DIR) config/mozconfig-osx-$(ARCH_TYPE) touch $(STAMP_DIR)/build-firefox copy-firefox: - -rm -rf $(BUILD_DIR)/Firefox.app - cp -r $(FIREFOX_DIR)/obj*/dist/*.app $(BUILD_DIR)/Firefox.app + -rm -rf $(BUILD_DIR)/TorBrowser.app + cp -r $(FIREFOX_DIR)/obj*/dist/*.app $(BUILD_DIR)/TorBrowser.app build-all-binaries: build-zlib build-openssl build-vidalia build-libevent build-tor build-firefox echo "If we're here, we've done something right." @@ -127,7 +127,7 @@ LIBEVENT=$(COMPILED_LIBS) VIDALIA=$(BUILT_DIR)/usr/local/bin/Vidalia.app/ TOR=$(COMPILED_BINS)/tor ## Someday, this will be our custom Firefox -FIREFOX=$(BUILD_DIR)/Firefox.app +FIREFOX=$(BUILD_DIR)/TorBrowser.app PIDGIN=$(COMPILED_BINS)/pidgin ## Location of utility applications @@ -236,8 +236,8 @@ TB_TMPDIR=$(DEST)/Contents/SharedSupport directory-structure: rm -fr $(DEST) mkdir -p $(APPDIR) - mkdir -p $(APPDIR)/Firefox.app/Contents/MacOS/Data/profile - mkdir -p $(APPDIR)/Firefox.app/Contents/MacOS/Data/plugins + mkdir -p $(APPDIR)/TorBrowser.app/Contents/MacOS/Data/profile + mkdir -p $(APPDIR)/TorBrowser.app/Contents/MacOS/Data/plugins mkdir -p $(DATADIR)/Tor mkdir -p $(DATADIR)/Vidalia mkdir -p $(DOCSDIR) @@ -274,9 +274,9 @@ install-firefox: configure-apps: ## Configure Firefox preferences #mkdir -p $(DEST)/.mozilla/Firefox/firefox.default - cp -R config/firefox-profiles.ini $(DEST)/Contents/MacOS/Firefox.app/Contents/MacOS/Data/profiles.ini - cp config/bookmarks.html $(DEST)/Contents/MacOS/Firefox.app/Contents/MacOS/Data/profile - cp config/prefs.js $(DEST)/Contents/MacOS/Firefox.app/Contents/MacOS/Data/profile/prefs.js + cp -R config/firefox-profiles.ini $(DEST)/Contents/MacOS/TorBrowser.app/Contents/MacOS/Data/profiles.ini + cp config/bookmarks.html $(DEST)/Contents/MacOS/TorBrowser.app/Contents/MacOS/Data/profile + cp config/prefs.js $(DEST)/Contents/MacOS/TorBrowser.app/Contents/MacOS/Data/profile/prefs.js cp config/Info.plist $(DEST)/Contents cp config/PkgInfo $(DEST)/Contents cp config/qt.conf $(DEST)/Contents/MacOS/Vidalia.app/Contents/Resources @@ -387,7 +387,7 @@ patch-firefox-language: ## Fix prefs.js since extensions.checkCompatibility, false doesn't work update-extension-pref: sed -i -e "s/SHPONKA/$(LANGCODE)/g" $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/prefs.js - sed -i -e "s/SHPONKA/$(LANGCODE)/g" $(BUNDLE)/Contents/MacOS/Firefox.app/Contents/MacOS/Data/profile/prefs.js + sed -i -e "s/SHPONKA/$(LANGCODE)/g" $(BUNDLE)/Contents/MacOS/TorBrowser.app/Contents/MacOS/Data/profile/prefs.js print-version: @echo $(RELEASE_VER)-$(BUILD_NUM) diff --git a/src/current-patches/vidalia/0001-Adapt-paths-etc-for-OS-X-TBB.patch b/src/current-patches/vidalia/0001-Adapt-paths-etc-for-OS-X-TBB.patch index d546ae1..293a52e 100644 --- a/src/current-patches/vidalia/0001-Adapt-paths-etc-for-OS-X-TBB.patch +++ b/src/current-patches/vidalia/0001-Adapt-paths-etc-for-OS-X-TBB.patch @@ -16,7 +16,7 @@ index d170d47..6835b1e 100644 /* The browser is in <browserDirectory>/App/Firefox/<browserDirectoryFilename> */ QString browserExecutable = - QDir::toNativeSeparators(browserDirectory + "/App/Firefox/" + browserDirectoryFilename); -+ QDir::toNativeSeparators(browserDirectory + "/Contents/MacOS/Firefox.app/Contents/MacOS/" + browserDirectoryFilename); ++ QDir::toNativeSeparators(browserDirectory + "/Contents/MacOS/TorBrowser.app/Contents/MacOS/" + browserDirectoryFilename); /* The profile is in <browserDirectory>/Data/profile */ QString profileDir = - QDir::toNativeSeparators(browserDirectory + "/Data/profile"); @@ -31,7 +31,7 @@ index d170d47..6835b1e 100644 - copy_dir(browserDirectory + "/App/DefaultData/profile", browserDirectory + "/Data/profile"); + if (!browserDirObj.exists("Library/Application Support/Firefox/Profiles/profile")) { + browserDirObj.mkdir("Library/Application Support/Firefox/Profiles/profile"); -+ QString src = browserDirectory + "/Contents/MacOS/Firefox.app/Contents/MacOS/defaults/profile"; ++ QString src = browserDirectory + "/Contents/MacOS/TorBrowser.app/Contents/MacOS/defaults/profile"; + QString dst = profileDir; + vNotice("Copying '%1' to '%2'").arg(src).arg(dst); + copy_dir(src, dst);

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 27 Apr '12

27 Apr '12

commit 8ee09308c322f30429848b5fd6191ea40710e8f1 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 27 12:15:17 2012 +0000 Update translations for vidalia_help --- nb/log.po | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/nb/log.po b/nb/log.po index df8a1ac..c5880a3 100644 --- a/nb/log.po +++ b/nb/log.po @@ -157,5 +157,3 @@ msgstr "" #: en/log.html:100 msgid "Click <i>Save Settings</i> to save your log destination." msgstr "" - -

1 0

[torbrowser/maint-2.3] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 27 Apr '12

27 Apr '12

commit 404a66ec9398082358fea393a2aba91ec894e3d9 Merge: 83fa4cc 86113b9 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Apr 27 07:24:26 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/versions.mk | 2 +- build-scripts/windows.mk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)

1 0

[torbrowser/master] Lin/Win: Disable -Werror for Tor builds for now
by erinn＠torproject.org 27 Apr '12

27 Apr '12

commit 86113b905479e984bce96aa2dc4ec182afb68501 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Apr 27 12:20:46 2012 +0200 Lin/Win: Disable -Werror for Tor builds for now openssl 1.0.1 really shouldn't cause programs that link it while using -Werror to fail, but of course it does. Yuck. --- build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/versions.mk | 2 +- build-scripts/windows.mk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 6441b25..313c021 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -77,7 +77,7 @@ build-libevent: build-zlib build-openssl $(LIBEVENT_DIR) cd $(LIBEVENT_DIR) && make install touch $(STAMP_DIR)/build-libevent -TOR_OPTS=--enable-gcc-warnings --with-openssl-dir=$(BUILT_DIR) --with-zlib-dir=$(BUILT_DIR) --with-libevent-dir=$(BUILT_DIR)/lib --prefix=$(BUILT_DIR) +TOR_OPTS=--with-openssl-dir=$(BUILT_DIR) --with-zlib-dir=$(BUILT_DIR) --with-libevent-dir=$(BUILT_DIR)/lib --prefix=$(BUILT_DIR) build-pidgin: echo "We're not building pidgin yet!" diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index ed34a9b..a87cf9e 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -97,7 +97,7 @@ build-libevent: build-zlib build-openssl $(LIBEVENT_DIR) TOR_CFLAGS="-arch $(ARCH_TYPE) -I$(BUILT_DIR)/include $(MIN_VERSION) $(CF_MIN_VERSION)" TOR_LDFLAGS="-L$(BUILT_DIR)/lib $(LD_MIN_VERSION)" -TOR_OPTS=--enable-gcc-warnings-advisory --enable-static-openssl --enable-static-libevent --with-openssl-dir=$(BUILT_DIR)/lib --with-libevent-dir=$(BUILT_DIR)/lib --prefix=$(BUILT_DIR) --disable-dependency-tracking $(CC) +TOR_OPTS=--enable-static-openssl --enable-static-libevent --with-openssl-dir=$(BUILT_DIR)/lib --with-libevent-dir=$(BUILT_DIR)/lib --prefix=$(BUILT_DIR) --disable-dependency-tracking $(CC) build-firefox: $(FIREFOX_DIR) config/mozconfig-osx-$(ARCH_TYPE) cp config/mozconfig-osx-$(ARCH_TYPE) $(FIREFOX_DIR)/mozconfig diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 9788cfb..e5afa00 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -232,7 +232,7 @@ $(OBFSPROXY_DIR): $(FETCH_DIR)/$(OBFSPROXY_PACKAGE) | $(BUILD_DIR) # Common build functionality. Modified by variables set in OS-specific makefiles build-tor: build-zlib build-openssl build-libevent $(TOR_DIR) - cd $(TOR_DIR) && CFLAGS=$(TOR_CFLAGS) LDFLAGS=$(TOR_LDFLAGS) ./configure $(TOR_OPTS) + cd $(TOR_DIR) && CFLAGS=$(TOR_CFLAGS) LDFLAGS=$(TOR_LDFLAGS) ./configure $(TOR_OPTS) --enable-gcc-warnings-advisory cd $(TOR_DIR) && make -j $(NUM_CORES) cd $(TOR_DIR) && make install touch $(STAMP_DIR)/build-tor diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 135989f..26075ca 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -97,7 +97,7 @@ build-libevent: build-zlib build-openssl $(LIBEVENT_DIR) TOR_CFLAGS="-I$(BUILT_DIR)/include" TOR_LDFLAGS="-L$(BUILT_DIR)/lib -L$(BUILT_DIR)/bin" -TOR_OPTS=--enable-gcc-warnings --enable-static-libevent --with-libevent-dir=$(BUILT_DIR)/lib --prefix=$(BUILT_DIR) +TOR_OPTS=--enable-static-libevent --with-libevent-dir=$(BUILT_DIR)/lib --prefix=$(BUILT_DIR) build-tor:PATH+=:$(BUILT_DIR)/bin build-firefox: $(FIREFOX_DIR) config/dot_mozconfig $(MOZBUILD_DIR) $(MOZBUILD_DIR)/start-msvc$(MSVC_VER).bat | $(PYTHON) $(PYMAKE_DIR)

1 0

[torbrowser/master] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 27 Apr '12

27 Apr '12

commit 404a66ec9398082358fea393a2aba91ec894e3d9 Merge: 83fa4cc 86113b9 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Apr 27 07:24:26 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/versions.mk | 2 +- build-scripts/windows.mk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)

1 0

[torbrowser/maint-2.3] Lin/Win: Disable -Werror for Tor builds for now
by erinn＠torproject.org 27 Apr '12

27 Apr '12

commit 86113b905479e984bce96aa2dc4ec182afb68501 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Apr 27 12:20:46 2012 +0200 Lin/Win: Disable -Werror for Tor builds for now openssl 1.0.1 really shouldn't cause programs that link it while using -Werror to fail, but of course it does. Yuck. --- build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/versions.mk | 2 +- build-scripts/windows.mk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 6441b25..313c021 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -77,7 +77,7 @@ build-libevent: build-zlib build-openssl $(LIBEVENT_DIR) cd $(LIBEVENT_DIR) && make install touch $(STAMP_DIR)/build-libevent -TOR_OPTS=--enable-gcc-warnings --with-openssl-dir=$(BUILT_DIR) --with-zlib-dir=$(BUILT_DIR) --with-libevent-dir=$(BUILT_DIR)/lib --prefix=$(BUILT_DIR) +TOR_OPTS=--with-openssl-dir=$(BUILT_DIR) --with-zlib-dir=$(BUILT_DIR) --with-libevent-dir=$(BUILT_DIR)/lib --prefix=$(BUILT_DIR) build-pidgin: echo "We're not building pidgin yet!" diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index ed34a9b..a87cf9e 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -97,7 +97,7 @@ build-libevent: build-zlib build-openssl $(LIBEVENT_DIR) TOR_CFLAGS="-arch $(ARCH_TYPE) -I$(BUILT_DIR)/include $(MIN_VERSION) $(CF_MIN_VERSION)" TOR_LDFLAGS="-L$(BUILT_DIR)/lib $(LD_MIN_VERSION)" -TOR_OPTS=--enable-gcc-warnings-advisory --enable-static-openssl --enable-static-libevent --with-openssl-dir=$(BUILT_DIR)/lib --with-libevent-dir=$(BUILT_DIR)/lib --prefix=$(BUILT_DIR) --disable-dependency-tracking $(CC) +TOR_OPTS=--enable-static-openssl --enable-static-libevent --with-openssl-dir=$(BUILT_DIR)/lib --with-libevent-dir=$(BUILT_DIR)/lib --prefix=$(BUILT_DIR) --disable-dependency-tracking $(CC) build-firefox: $(FIREFOX_DIR) config/mozconfig-osx-$(ARCH_TYPE) cp config/mozconfig-osx-$(ARCH_TYPE) $(FIREFOX_DIR)/mozconfig diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 9788cfb..e5afa00 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -232,7 +232,7 @@ $(OBFSPROXY_DIR): $(FETCH_DIR)/$(OBFSPROXY_PACKAGE) | $(BUILD_DIR) # Common build functionality. Modified by variables set in OS-specific makefiles build-tor: build-zlib build-openssl build-libevent $(TOR_DIR) - cd $(TOR_DIR) && CFLAGS=$(TOR_CFLAGS) LDFLAGS=$(TOR_LDFLAGS) ./configure $(TOR_OPTS) + cd $(TOR_DIR) && CFLAGS=$(TOR_CFLAGS) LDFLAGS=$(TOR_LDFLAGS) ./configure $(TOR_OPTS) --enable-gcc-warnings-advisory cd $(TOR_DIR) && make -j $(NUM_CORES) cd $(TOR_DIR) && make install touch $(STAMP_DIR)/build-tor diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 135989f..26075ca 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -97,7 +97,7 @@ build-libevent: build-zlib build-openssl $(LIBEVENT_DIR) TOR_CFLAGS="-I$(BUILT_DIR)/include" TOR_LDFLAGS="-L$(BUILT_DIR)/lib -L$(BUILT_DIR)/bin" -TOR_OPTS=--enable-gcc-warnings --enable-static-libevent --with-libevent-dir=$(BUILT_DIR)/lib --prefix=$(BUILT_DIR) +TOR_OPTS=--enable-static-libevent --with-libevent-dir=$(BUILT_DIR)/lib --prefix=$(BUILT_DIR) build-tor:PATH+=:$(BUILT_DIR)/bin build-firefox: $(FIREFOX_DIR) config/dot_mozconfig $(MOZBUILD_DIR) $(MOZBUILD_DIR)/start-msvc$(MSVC_VER).bat | $(PYTHON) $(PYMAKE_DIR)

1 0

[torbrowser/maint-2.2] Lin/Win: Disable -Werror for Tor builds for now
by erinn＠torproject.org 27 Apr '12

27 Apr '12

commit 86113b905479e984bce96aa2dc4ec182afb68501 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Apr 27 12:20:46 2012 +0200 Lin/Win: Disable -Werror for Tor builds for now openssl 1.0.1 really shouldn't cause programs that link it while using -Werror to fail, but of course it does. Yuck. --- build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/versions.mk | 2 +- build-scripts/windows.mk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 6441b25..313c021 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -77,7 +77,7 @@ build-libevent: build-zlib build-openssl $(LIBEVENT_DIR) cd $(LIBEVENT_DIR) && make install touch $(STAMP_DIR)/build-libevent -TOR_OPTS=--enable-gcc-warnings --with-openssl-dir=$(BUILT_DIR) --with-zlib-dir=$(BUILT_DIR) --with-libevent-dir=$(BUILT_DIR)/lib --prefix=$(BUILT_DIR) +TOR_OPTS=--with-openssl-dir=$(BUILT_DIR) --with-zlib-dir=$(BUILT_DIR) --with-libevent-dir=$(BUILT_DIR)/lib --prefix=$(BUILT_DIR) build-pidgin: echo "We're not building pidgin yet!" diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index ed34a9b..a87cf9e 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -97,7 +97,7 @@ build-libevent: build-zlib build-openssl $(LIBEVENT_DIR) TOR_CFLAGS="-arch $(ARCH_TYPE) -I$(BUILT_DIR)/include $(MIN_VERSION) $(CF_MIN_VERSION)" TOR_LDFLAGS="-L$(BUILT_DIR)/lib $(LD_MIN_VERSION)" -TOR_OPTS=--enable-gcc-warnings-advisory --enable-static-openssl --enable-static-libevent --with-openssl-dir=$(BUILT_DIR)/lib --with-libevent-dir=$(BUILT_DIR)/lib --prefix=$(BUILT_DIR) --disable-dependency-tracking $(CC) +TOR_OPTS=--enable-static-openssl --enable-static-libevent --with-openssl-dir=$(BUILT_DIR)/lib --with-libevent-dir=$(BUILT_DIR)/lib --prefix=$(BUILT_DIR) --disable-dependency-tracking $(CC) build-firefox: $(FIREFOX_DIR) config/mozconfig-osx-$(ARCH_TYPE) cp config/mozconfig-osx-$(ARCH_TYPE) $(FIREFOX_DIR)/mozconfig diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 9788cfb..e5afa00 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -232,7 +232,7 @@ $(OBFSPROXY_DIR): $(FETCH_DIR)/$(OBFSPROXY_PACKAGE) | $(BUILD_DIR) # Common build functionality. Modified by variables set in OS-specific makefiles build-tor: build-zlib build-openssl build-libevent $(TOR_DIR) - cd $(TOR_DIR) && CFLAGS=$(TOR_CFLAGS) LDFLAGS=$(TOR_LDFLAGS) ./configure $(TOR_OPTS) + cd $(TOR_DIR) && CFLAGS=$(TOR_CFLAGS) LDFLAGS=$(TOR_LDFLAGS) ./configure $(TOR_OPTS) --enable-gcc-warnings-advisory cd $(TOR_DIR) && make -j $(NUM_CORES) cd $(TOR_DIR) && make install touch $(STAMP_DIR)/build-tor diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 135989f..26075ca 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -97,7 +97,7 @@ build-libevent: build-zlib build-openssl $(LIBEVENT_DIR) TOR_CFLAGS="-I$(BUILT_DIR)/include" TOR_LDFLAGS="-L$(BUILT_DIR)/lib -L$(BUILT_DIR)/bin" -TOR_OPTS=--enable-gcc-warnings --enable-static-libevent --with-libevent-dir=$(BUILT_DIR)/lib --prefix=$(BUILT_DIR) +TOR_OPTS=--enable-static-libevent --with-libevent-dir=$(BUILT_DIR)/lib --prefix=$(BUILT_DIR) build-tor:PATH+=:$(BUILT_DIR)/bin build-firefox: $(FIREFOX_DIR) config/dot_mozconfig $(MOZBUILD_DIR) $(MOZBUILD_DIR)/start-msvc$(MSVC_VER).bat | $(PYTHON) $(PYMAKE_DIR)

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 27 Apr '12

27 Apr '12

commit 3924086107c0b1eb915bcf6db07d5232e70c139e Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 27 09:15:37 2012 +0000 Update translations for https_everywhere_completed --- templates/ssl-observatory.dtd | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/templates/ssl-observatory.dtd b/templates/ssl-observatory.dtd index a363b0b..37e6cce 100644 --- a/templates/ssl-observatory.dtd +++ b/templates/ssl-observatory.dtd @@ -89,4 +89,7 @@ looked at. Mouseover the options for further details:"> <!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificiate(s) for this site:"> <!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection."> - +<!ENTITY ssl-observatory.prefs.self_signed +"Submit and check self-signed certificates"> +<!ENTITY ssl-observatory.prefs.self_signed_tooltip +"This is recommended; cryptographic problems are especially common in self-signed embedded devices">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 27 Apr '12

27 Apr '12

commit 9823b62157bbdf309960c0083b65df4af6d01a79 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 27 09:15:35 2012 +0000 Update translations for https_everywhere --- ar/ssl-observatory.dtd | 5 ++++- da/ssl-observatory.dtd | 5 ++++- de/ssl-observatory.dtd | 5 ++++- el/ssl-observatory.dtd | 5 ++++- es/ssl-observatory.dtd | 5 ++++- eu/ssl-observatory.dtd | 5 ++++- fa/ssl-observatory.dtd | 5 ++++- fr/ssl-observatory.dtd | 5 ++++- hu/ssl-observatory.dtd | 5 ++++- it/ssl-observatory.dtd | 5 ++++- lt/ssl-observatory.dtd | 5 ++++- lv/ssl-observatory.dtd | 5 ++++- ms_MY/ssl-observatory.dtd | 5 ++++- nl/ssl-observatory.dtd | 5 ++++- pl/ssl-observatory.dtd | 5 ++++- pl_PL/ssl-observatory.dtd | 5 ++++- pt/ssl-observatory.dtd | 5 ++++- pt_BR/ssl-observatory.dtd | 5 ++++- ru/ssl-observatory.dtd | 5 ++++- sk/ssl-observatory.dtd | 5 ++++- sv/ssl-observatory.dtd | 5 ++++- templates/ssl-observatory.dtd | 5 ++++- zh-CN/ssl-observatory.dtd | 5 ++++- 23 files changed, 92 insertions(+), 23 deletions(-) diff --git a/ar/ssl-observatory.dtd b/ar/ssl-observatory.dtd index 428fb21..e72ce60 100644 --- a/ar/ssl-observatory.dtd +++ b/ar/ssl-observatory.dtd @@ -84,4 +84,7 @@ www.something.com, ولكن ليس من قام بالزيارة أو الصفح <!ENTITY ssl-observatory.warning.text "أصدر مرصد SSLمن الـEFF تحذيراً حول شهادات HTTPS لهذا الموقع:"> <!ENTITY ssl-observatory.warning.defense "إن كنت مسجل الدخول إلى هذا الموقع، ننصحك بتغيير كلمة السر باستخدام اتصال آمن بالإنترنت."> - +<!ENTITY ssl-observatory.prefs.self_signed +""> +<!ENTITY ssl-observatory.prefs.self_signed_tooltip +""> diff --git a/da/ssl-observatory.dtd b/da/ssl-observatory.dtd index 5ee91f9..5a63c8f 100644 --- a/da/ssl-observatory.dtd +++ b/da/ssl-observatory.dtd @@ -89,4 +89,7 @@ detaljer:"> <!ENTITY ssl-observatory.warning.text "EFF's SSL-observatorie har udsted en advarsel om HTTPS-certifikaterne for dette sted:"> <!ENTITY ssl-observatory.warning.defense "Hvis du er logget ind på dette sted, så kan det tilrådes at ændre din adgangskode når du har etableret en sikker forbindelse. "> - +<!ENTITY ssl-observatory.prefs.self_signed +""> +<!ENTITY ssl-observatory.prefs.self_signed_tooltip +""> diff --git a/de/ssl-observatory.dtd b/de/ssl-observatory.dtd index 4845b53..e4ea329 100644 --- a/de/ssl-observatory.dtd +++ b/de/ssl-observatory.dtd @@ -83,4 +83,7 @@ Mouseover the options for further details:">--> <!ENTITY ssl-observatory.warning.text ""> <!ENTITY ssl-observatory.warning.defense ""> - +<!ENTITY ssl-observatory.prefs.self_signed +""> +<!ENTITY ssl-observatory.prefs.self_signed_tooltip +""> diff --git a/el/ssl-observatory.dtd b/el/ssl-observatory.dtd index dc83a9f..4b3fe97 100644 --- a/el/ssl-observatory.dtd +++ b/el/ssl-observatory.dtd @@ -88,4 +88,7 @@ Mouseover the options for further details:">--> <!ENTITY ssl-observatory.warning.text "Το Παρατηρητήριο SSL του EFF έχει εκδώσει μια προειδοποίηση σχετικά με το πιστοποιητικό HTTPS του συγκεκριμένου ιστότοπου:"> <!ENTITY ssl-observatory.warning.defense "Αν είσαι συνδεδεμένος στο συγκεκριμένο ιστότοπο, προτείνεται να αλλάξεις τον κωδικό ασφαλείας σου όταν αποκτήσεις ασφαλή σύνδεση."> - +<!ENTITY ssl-observatory.prefs.self_signed +""> +<!ENTITY ssl-observatory.prefs.self_signed_tooltip +""> diff --git a/es/ssl-observatory.dtd b/es/ssl-observatory.dtd index 78a0f37..21397cc 100644 --- a/es/ssl-observatory.dtd +++ b/es/ssl-observatory.dtd @@ -80,4 +80,7 @@ Mouseover the options for further details:">--> <!ENTITY ssl-observatory.warning.text "El Observatorio SSL de EFF ha emitido una advertencia sobre el(los) certificado(s) para este sitio:"> <!ENTITY ssl-observatory.warning.defense "Si está conectado a este sitio, es aconsejable cambiar tu contraseña una vez que tengas una conexión segura."> - +<!ENTITY ssl-observatory.prefs.self_signed +""> +<!ENTITY ssl-observatory.prefs.self_signed_tooltip +""> diff --git a/eu/ssl-observatory.dtd b/eu/ssl-observatory.dtd index 3eb0a87..5024d95 100644 --- a/eu/ssl-observatory.dtd +++ b/eu/ssl-observatory.dtd @@ -84,4 +84,7 @@ Xehetasun gehiagorako pasa ezazu sagua aukeren gainetik:"> <!ENTITY ssl-observatory.warning.text "EFFren SSL Behatokiak leku honen HTTPS ziurtagiri(ar)entzako abisua igorri du:"> <!ENTITY ssl-observatory.warning.defense "Leku honetan saioa hasi baduzu, konexio seguru bat duzunean zure pasahitza aldatzea komeni da."> - +<!ENTITY ssl-observatory.prefs.self_signed +""> +<!ENTITY ssl-observatory.prefs.self_signed_tooltip +""> diff --git a/fa/ssl-observatory.dtd b/fa/ssl-observatory.dtd index fd6f836..74112de 100644 --- a/fa/ssl-observatory.dtd +++ b/fa/ssl-observatory.dtd @@ -80,4 +80,7 @@ Mouseover the options for further details:">--> <!ENTITY ssl-observatory.warning.text "رصدگر SSLی که توسط EFF اداره می‌شود برای گواهینامه(ها)ی HTTPS این وب‌سایت هشدار صادر کرده‌است:"> <!ENTITY ssl-observatory.warning.defense "اگر شما در این وب‌سایت لاگین کرده‌اید، پیشنهاد می‌کنیم که زمانی که با یک اتصال امن وارد شدید رمز ورود خود را تغییر دهید."> - +<!ENTITY ssl-observatory.prefs.self_signed +""> +<!ENTITY ssl-observatory.prefs.self_signed_tooltip +""> diff --git a/fr/ssl-observatory.dtd b/fr/ssl-observatory.dtd index d87acdf..e82e517 100644 --- a/fr/ssl-observatory.dtd +++ b/fr/ssl-observatory.dtd @@ -83,4 +83,7 @@ www.something.com, mais pas qui a visité le site, ou quelle page a été lue. P <!ENTITY ssl-observatory.warning.text "L'Observatoire SSL de l'EFF a publié un avertissement sur les certificats SSL émis par ce site:"> <!ENTITY ssl-observatory.warning.defense "Si vous vous êtes connecté à ce site, vous devriez changer de mot de passe dès que vous retrouvez une connexion sécurisée."> - +<!ENTITY ssl-observatory.prefs.self_signed +""> +<!ENTITY ssl-observatory.prefs.self_signed_tooltip +""> diff --git a/hu/ssl-observatory.dtd b/hu/ssl-observatory.dtd index bb4ff3a..228c6a5 100644 --- a/hu/ssl-observatory.dtd +++ b/hu/ssl-observatory.dtd @@ -80,4 +80,7 @@ Mouseover the options for further details:">--> <!ENTITY ssl-observatory.warning.text "Az EFF SSL Oeservatory figyelmeztetést bocsátott az alábbi tanúsítványokról, ehhez az oldalhoz:"> <!ENTITY ssl-observatory.warning.defense "Ha belépett erre az oldalra, ha már biztonságos kapcsolattal rendelkezik, hogy lecserélje a jelszavát."> - +<!ENTITY ssl-observatory.prefs.self_signed +""> +<!ENTITY ssl-observatory.prefs.self_signed_tooltip +""> diff --git a/it/ssl-observatory.dtd b/it/ssl-observatory.dtd index 7d13c1a..8c60222 100644 --- a/it/ssl-observatory.dtd +++ b/it/ssl-observatory.dtd @@ -81,4 +81,7 @@ Mouseover the options for further details:">--> <!ENTITY ssl-observatory.warning.text ""> <!ENTITY ssl-observatory.warning.defense ""> - +<!ENTITY ssl-observatory.prefs.self_signed +""> +<!ENTITY ssl-observatory.prefs.self_signed_tooltip +""> diff --git a/lt/ssl-observatory.dtd b/lt/ssl-observatory.dtd index 242ce81..c3a71e6 100644 --- a/lt/ssl-observatory.dtd +++ b/lt/ssl-observatory.dtd @@ -89,4 +89,7 @@ bet ne tai, kas aplankė svetainę, ar kokį konkrečiai puslapį jie <!ENTITY ssl-observatory.warning.text "EFF SSL Observatorija įspėja apie šių svetainių HTTPS sertifikatus:"> <!ENTITY ssl-observatory.warning.defense "Jei esate prisiregistravę prie šios svetainės, patartina pasikeisti slaptažodį, kai turėsite saugų ryšį."> - +<!ENTITY ssl-observatory.prefs.self_signed +""> +<!ENTITY ssl-observatory.prefs.self_signed_tooltip +""> diff --git a/lv/ssl-observatory.dtd b/lv/ssl-observatory.dtd index 2288ff8..016e78c 100644 --- a/lv/ssl-observatory.dtd +++ b/lv/ssl-observatory.dtd @@ -89,4 +89,7 @@ looked at. Mouseover the options for further details:"> <!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificiate(s) for this site:"> <!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection."> - +<!ENTITY ssl-observatory.prefs.self_signed +""> +<!ENTITY ssl-observatory.prefs.self_signed_tooltip +""> diff --git a/ms_MY/ssl-observatory.dtd b/ms_MY/ssl-observatory.dtd index 7c7c31c..e4df626 100644 --- a/ms_MY/ssl-observatory.dtd +++ b/ms_MY/ssl-observatory.dtd @@ -93,4 +93,7 @@ untuk butiran lanjut:"> <!ENTITY ssl-observatory.warning.text "Amaran tentang sijil SSL untuk laman ini telah diberikan oleh Pemantau SSL EFF:"> <!ENTITY ssl-observatory.warning.defense "Jika anda berjaya memasuki laman sesawang ini, anda dinasihatkan supaya menukar kata laluan setelah berada dalam sambungan yang selamat."> - +<!ENTITY ssl-observatory.prefs.self_signed +""> +<!ENTITY ssl-observatory.prefs.self_signed_tooltip +""> diff --git a/nl/ssl-observatory.dtd b/nl/ssl-observatory.dtd index 2ee0b30..db1413e 100644 --- a/nl/ssl-observatory.dtd +++ b/nl/ssl-observatory.dtd @@ -92,4 +92,7 @@ het DNS-systeem zijn op te lossen."> <!ENTITY ssl-observatory.warning.text "Het SSL-observatorium van EFF heeft een waarschuwing uitgegeven over een HTTPS-certificaat voor deze site:"> <!ENTITY ssl-observatory.warning.defense "Als u bent ingelogd op deze site, is het aan te raden uw wachtwoord te wijzigen zodra u een veilige verbinding hebt."> - +<!ENTITY ssl-observatory.prefs.self_signed +""> +<!ENTITY ssl-observatory.prefs.self_signed_tooltip +""> diff --git a/pl/ssl-observatory.dtd b/pl/ssl-observatory.dtd index 25eba5b..fbaa8c6 100644 --- a/pl/ssl-observatory.dtd +++ b/pl/ssl-observatory.dtd @@ -80,4 +80,7 @@ Mouseover the options for further details:">--> <!ENTITY ssl-observatory.warning.text ""> <!ENTITY ssl-observatory.warning.defense ""> - +<!ENTITY ssl-observatory.prefs.self_signed +""> +<!ENTITY ssl-observatory.prefs.self_signed_tooltip +""> diff --git a/pl_PL/ssl-observatory.dtd b/pl_PL/ssl-observatory.dtd index 1e51c39..386aece 100644 --- a/pl_PL/ssl-observatory.dtd +++ b/pl_PL/ssl-observatory.dtd @@ -84,4 +84,7 @@ przez Obserwatorium wskaże, że ktoś odwiedził www.something.com, ale nie to, <!ENTITY ssl-observatory.warning.text "Obserwatorium SSL EFF wydało ostrzeżenie o certyfikacie(-ach) HTTPS dla tej strony:"> <!ENTITY ssl-observatory.warning.defense "Jeśli jesteś zalogowany/a na tej stronie, może być zalecana zmiana hasła, gdy już będziesz mieć bezpieczne połączenie."> - +<!ENTITY ssl-observatory.prefs.self_signed +""> +<!ENTITY ssl-observatory.prefs.self_signed_tooltip +""> diff --git a/pt/ssl-observatory.dtd b/pt/ssl-observatory.dtd index 68b31e4..60dbca2 100644 --- a/pt/ssl-observatory.dtd +++ b/pt/ssl-observatory.dtd @@ -80,4 +80,7 @@ Mouseover the options for further details:">--> <!ENTITY ssl-observatory.warning.text ""> <!ENTITY ssl-observatory.warning.defense ""> - +<!ENTITY ssl-observatory.prefs.self_signed +""> +<!ENTITY ssl-observatory.prefs.self_signed_tooltip +""> diff --git a/pt_BR/ssl-observatory.dtd b/pt_BR/ssl-observatory.dtd index 8c3b441..b18a1eb 100644 --- a/pt_BR/ssl-observatory.dtd +++ b/pt_BR/ssl-observatory.dtd @@ -88,4 +88,7 @@ www.algumacoisa.com, mas não quem visitou o site, ou qual página específica f <!ENTITY ssl-observatory.warning.text "O Observatório SSL de EFF emitiu um aviso sobre o(s) certificados(s) HTTPS para este site:"> <!ENTITY ssl-observatory.warning.defense "Se você está logado neste site, é aconselhável trocar sua senha uma vez que você tenha uma conexão segura."> - +<!ENTITY ssl-observatory.prefs.self_signed +""> +<!ENTITY ssl-observatory.prefs.self_signed_tooltip +""> diff --git a/ru/ssl-observatory.dtd b/ru/ssl-observatory.dtd index 84e7083..6986eca 100644 --- a/ru/ssl-observatory.dtd +++ b/ru/ssl-observatory.dtd @@ -88,4 +88,7 @@ www.something.com, но не кто именно его посетил, или <!ENTITY ssl-observatory.warning.text "EFF SSL Observatory выдал предупреждение на счет HTTPS сертификат(-а/-ов) для данного сайта:"> <!ENTITY ssl-observatory.warning.defense "Если вы вошли в систему на данном сайте, может быть целесообразно сменить пароль после установки безопасного соединения."> - +<!ENTITY ssl-observatory.prefs.self_signed +""> +<!ENTITY ssl-observatory.prefs.self_signed_tooltip +""> diff --git a/sk/ssl-observatory.dtd b/sk/ssl-observatory.dtd index 4affaf1..349ae09 100644 --- a/sk/ssl-observatory.dtd +++ b/sk/ssl-observatory.dtd @@ -89,4 +89,7 @@ pre ďalšie podrobnosti."> <!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory vydalo varovanie o HTTPS certifikáte(certifikátoch) pre túto stránku:"> <!ENTITY ssl-observatory.warning.defense "Ak ste prihlásený na tejto stránke, tak sa odporúča, aby ste si zmenili heslo hneď ako budete mať bezpečné pripojenie"> - +<!ENTITY ssl-observatory.prefs.self_signed +""> +<!ENTITY ssl-observatory.prefs.self_signed_tooltip +""> diff --git a/sv/ssl-observatory.dtd b/sv/ssl-observatory.dtd index 6fbd4d7..382572f 100644 --- a/sv/ssl-observatory.dtd +++ b/sv/ssl-observatory.dtd @@ -89,4 +89,7 @@ looked at. Mouseover the options for further details:"> <!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificiate(s) for this site:"> <!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection."> - +<!ENTITY ssl-observatory.prefs.self_signed +""> +<!ENTITY ssl-observatory.prefs.self_signed_tooltip +""> diff --git a/templates/ssl-observatory.dtd b/templates/ssl-observatory.dtd index a363b0b..37e6cce 100644 --- a/templates/ssl-observatory.dtd +++ b/templates/ssl-observatory.dtd @@ -89,4 +89,7 @@ looked at. Mouseover the options for further details:"> <!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificiate(s) for this site:"> <!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection."> - +<!ENTITY ssl-observatory.prefs.self_signed +"Submit and check self-signed certificates"> +<!ENTITY ssl-observatory.prefs.self_signed_tooltip +"This is recommended; cryptographic problems are especially common in self-signed embedded devices"> diff --git a/zh-CN/ssl-observatory.dtd b/zh-CN/ssl-observatory.dtd index bc48431..7f422d0 100644 --- a/zh-CN/ssl-observatory.dtd +++ b/zh-CN/ssl-observatory.dtd @@ -80,4 +80,7 @@ Mouseover the options for further details:">--> <!ENTITY ssl-observatory.warning.text "EFF 的 SSL观测站已针对这个站点发布了一个有关 HTTPS 数字证书的警告"> <!ENTITY ssl-observatory.warning.defense "如果你已登入这个站点，建议你在取得安全的连结之後更改你在这个网站的密码"> - +<!ENTITY ssl-observatory.prefs.self_signed +""> +<!ENTITY ssl-observatory.prefs.self_signed_tooltip +"">

1 0