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

[torspec/master] List consensus methods 15..17 in section 3.5.1
by nickm＠torproject.org 11 May '13

11 May '13

commit 6b344c163da407b43e53ded91f8578c3906fb256 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 10 23:15:53 2013 -0400 List consensus methods 15..17 in section 3.5.1 --- dir-spec.txt | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dir-spec.txt b/dir-spec.txt index ac13d7f..4427035 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -1954,7 +1954,9 @@ "12" -- Params are only included if enough auths voted for them "13" -- Omit router entries with missing microdescriptors. "14" -- Adds support for "a" lines. - + "15" -- Adds support for "p6" lines. + "16" -- Adds ntor keys to microdescriptors + "17" -- Adds "Unmeasured=1" flags to "w" lines Before generating a consensus, an authority must decide which consensus method to use. To do this, it looks for the highest version number

1 0

[translation/gettor_completed] Update translations for gettor_completed
by translation＠torproject.org 11 May '13

11 May '13

commit 0bfacf31c0e8ed85095476ae3b2f7cec192eb961 Author: Translation commit bot <translation(a)torproject.org> Date: Sat May 11 02:15:11 2013 +0000 Update translations for gettor_completed --- zh_CN/gettor.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/zh_CN/gettor.po b/zh_CN/gettor.po index 39bae96..2a20417 100644 --- a/zh_CN/gettor.po +++ b/zh_CN/gettor.po @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2013-05-11 01:11+0000\n" +"PO-Revision-Date: 2013-05-11 01:50+0000\n" "Last-Translator: simabull tsai\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -313,7 +313,7 @@ msgid "" "requested. Please send us another package name or request the same package \n" "again, but remove the 'split' keyword. In that case we'll send you the whole \n" "package. Make sure this is what you want." -msgstr "抱歉，您所要求的软件包没有提供分卷下载。\n请发送其他软件包名称，或相同的软件包但删除关键词 \"split\"，这样我们会发给您整个软件包。请确认您邮箱的附件体积限制不是太小。" +msgstr "抱歉，你请求发送的软件包不提供分卷下载。\n请使用其他软件包名称，或请求发送同一软件包且删除关键词“split”，\n以便发送整个软件包。请确认邮件可接收整个文件包。" #: lib/gettor/i18n.py:202 msgid ""

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 11 May '13

11 May '13

commit 97e2ce37767ac14bdbbe73a39b7ac97db67351de Author: Translation commit bot <translation(a)torproject.org> Date: Sat May 11 02:15:06 2013 +0000 Update translations for gettor --- zh_CN/gettor.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/zh_CN/gettor.po b/zh_CN/gettor.po index 39bae96..2a20417 100644 --- a/zh_CN/gettor.po +++ b/zh_CN/gettor.po @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2013-05-11 01:11+0000\n" +"PO-Revision-Date: 2013-05-11 01:50+0000\n" "Last-Translator: simabull tsai\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -313,7 +313,7 @@ msgid "" "requested. Please send us another package name or request the same package \n" "again, but remove the 'split' keyword. In that case we'll send you the whole \n" "package. Make sure this is what you want." -msgstr "抱歉，您所要求的软件包没有提供分卷下载。\n请发送其他软件包名称，或相同的软件包但删除关键词 \"split\"，这样我们会发给您整个软件包。请确认您邮箱的附件体积限制不是太小。" +msgstr "抱歉，你请求发送的软件包不提供分卷下载。\n请使用其他软件包名称，或请求发送同一软件包且删除关键词“split”，\n以便发送整个软件包。请确认邮件可接收整个文件包。" #: lib/gettor/i18n.py:202 msgid ""

1 0

[translation/gettor_completed] Update translations for gettor_completed
by translation＠torproject.org 11 May '13

11 May '13

commit 28e92effdb54f05bf5771c9207568df1414c5596 Author: Translation commit bot <translation(a)torproject.org> Date: Sat May 11 01:15:10 2013 +0000 Update translations for gettor_completed --- zh_CN/gettor.po | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/zh_CN/gettor.po b/zh_CN/gettor.po index 28c9b51..39bae96 100644 --- a/zh_CN/gettor.po +++ b/zh_CN/gettor.po @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2013-05-10 16:30+0000\n" +"PO-Revision-Date: 2013-05-11 01:11+0000\n" "Last-Translator: simabull tsai\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -280,13 +280,13 @@ msgid "" "all split files to be received by you before you can save them all\n" "into the same directory and unpack them by double-clicking the\n" "first file." -msgstr "重要提示：\n因为这是分卷发送的请求，您需要等待所有的部分接受到后，\n然后把它们保存到同一个文件夹，接着双击第一个文件解压。" +msgstr "重要提示：\n由于文件分开发送，需接受所有部分之后将其保存在同一\n文件夹中，然后双击第一个文件进行解压。" #: lib/gettor/i18n.py:185 msgid "" "Packages might arrive out of order! Please make sure you received\n" "all packages before you attempt to unpack them!" -msgstr "文件包可能不是按顺序接受到！\n请您确认接受到所有的文件包后在尝试解压他们！ " +msgstr "文件包可能并非按顺序发送！\n请确认收到所有文件包之后再进行解压！ " #: lib/gettor/i18n.py:188 #, python-format @@ -305,7 +305,7 @@ msgstr "如果无法接收，可能是因为电子邮件提供商认为软件包 msgid "" "Unfortunately we are currently experiencing problems and we can't fulfill\n" "your request right now. Please be patient as we try to resolve this issue." -msgstr "很遗憾我们目前遇到一些问题，我们不能立刻实现您的请求。\n请您耐心等待，我们会尝试解决此问题。" +msgstr "抱歉，由于目前出现故障，无法立即回复你的请求。\n我们正在进行处理，请耐心等待。" #: lib/gettor/i18n.py:197 msgid ""

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 11 May '13

11 May '13

commit 5978e30b1eaac98a676dac3a3eaaa47ef59779ce Author: Translation commit bot <translation(a)torproject.org> Date: Sat May 11 01:15:05 2013 +0000 Update translations for gettor --- zh_CN/gettor.po | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/zh_CN/gettor.po b/zh_CN/gettor.po index 28c9b51..39bae96 100644 --- a/zh_CN/gettor.po +++ b/zh_CN/gettor.po @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2013-05-10 16:30+0000\n" +"PO-Revision-Date: 2013-05-11 01:11+0000\n" "Last-Translator: simabull tsai\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -280,13 +280,13 @@ msgid "" "all split files to be received by you before you can save them all\n" "into the same directory and unpack them by double-clicking the\n" "first file." -msgstr "重要提示：\n因为这是分卷发送的请求，您需要等待所有的部分接受到后，\n然后把它们保存到同一个文件夹，接着双击第一个文件解压。" +msgstr "重要提示：\n由于文件分开发送，需接受所有部分之后将其保存在同一\n文件夹中，然后双击第一个文件进行解压。" #: lib/gettor/i18n.py:185 msgid "" "Packages might arrive out of order! Please make sure you received\n" "all packages before you attempt to unpack them!" -msgstr "文件包可能不是按顺序接受到！\n请您确认接受到所有的文件包后在尝试解压他们！ " +msgstr "文件包可能并非按顺序发送！\n请确认收到所有文件包之后再进行解压！ " #: lib/gettor/i18n.py:188 #, python-format @@ -305,7 +305,7 @@ msgstr "如果无法接收，可能是因为电子邮件提供商认为软件包 msgid "" "Unfortunately we are currently experiencing problems and we can't fulfill\n" "your request right now. Please be patient as we try to resolve this issue." -msgstr "很遗憾我们目前遇到一些问题，我们不能立刻实现您的请求。\n请您耐心等待，我们会尝试解决此问题。" +msgstr "抱歉，由于目前出现故障，无法立即回复你的请求。\n我们正在进行处理，请耐心等待。" #: lib/gettor/i18n.py:197 msgid ""

1 0

[tor-browser/tor-browser-17.0.5esr-3] fixup! Tor Browser's Firefox preference overrides.
by mikeperry＠torproject.org 10 May '13

10 May '13

commit 82ffb2e227138ec95c7ae2d1e49acc2b9c503368 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri May 10 11:27:27 2013 -0700 fixup! Tor Browser's Firefox preference overrides. Apparently it's lexicographic order, not archive order that is important. --- browser/app/Makefile.in | 2 +- browser/app/profile/000-tor-browser.js | 124 +++++++++++++++++++++++++++++++ browser/app/profile/tor-browser.js | 125 -------------------------------- browser/installer/package-manifest.in | 2 +- toolkit/mozapps/installer/packager.mk | 3 - 5 files changed, 126 insertions(+), 130 deletions(-) diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in index bcd2d20..d8bc784 100644 --- a/browser/app/Makefile.in +++ b/browser/app/Makefile.in @@ -18,7 +18,7 @@ endif PREF_JS_EXPORTS = $(srcdir)/profile/firefox.js \ $(NULL) -PREF_JS_EXPORTS += $(srcdir)/profile/tor-browser.js +PREF_JS_EXPORTS += $(srcdir)/profile/000-tor-browser.js # hardcode en-US for the moment diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js new file mode 100644 index 0000000..c9c00f3 --- /dev/null +++ b/browser/app/profile/000-tor-browser.js @@ -0,0 +1,124 @@ +# Default Preferences +# Tor Browser Bundle +# Do not edit this file. + +// Disable browser auto updaters and associated homepage notifications +pref("app.update.auto", false); +pref("app.update.enabled", false); +pref("browser.search.update", false); +pref("browser.rights.3.shown", true); +pref("browser.startup.homepage_override.mstone", "ignore"); +pref("startup.homepage_welcome_url", ""); +pref("startup.homepage_override_url", ""); + +// Disk activity: Disable Browsing History Storage +pref("browser.privatebrowsing.autostart", true); +pref("browser.cache.disk.enable", false); +pref("browser.cache.offline.enable", false); +pref("dom.indexedDB.enabled", false); +pref("permissions.memory_only", true); +pref("network.cookie.lifetimePolicy", 2); +pref("browser.download.manager.retention", 1); + +// Disk activity: TBB Directory Isolation +pref("browser.download.useDownloadDir", false); +pref("browser.shell.checkDefaultBrowser", false); +pref("browser.download.manager.addToRecentDocs", false); + +// Misc privacy: Disk +pref("signon.rememberSignons", false); +pref("browser.formfill.enable", false); +pref("signon.autofillForms", false); +pref("browser.sessionstore.privacy_level", 2); + +// Misc privacy: Remote +pref("browser.send_pings", false); +pref("geo.enabled", false); +pref("geo.wifi.uri", ""); +pref("browser.search.suggest.enabled", false); +pref("browser.safebrowsing.enabled", false); +pref("browser.safebrowsing.malware.enabled", false); + +// Fingerprinting +pref("webgl.min_capability_mode", true); +pref("webgl.disable-extensions", true); +pref("dom.battery.enabled", false); // fingerprinting due to differing OS implementations +pref("dom.network.enabled",false); // fingerprinting due to differing OS implementations +pref("browser.display.max_font_attempts",10); +pref("browser.display.max_font_count",10); +pref("gfx.downloadable_fonts.fallback_delay", -1); +pref("general.appname.override", "Netscape"); +pref("general.appversion.override", "5.0 (Windows)"); +pref("general.buildID.override", "0"); +pref("general.oscpu.override", "Windows NT 6.1"); +pref("general.platform.override", "Win32"); +pref("general.productSub.override", "20100101"); +pref("general.useragent.override", "Mozilla/5.0 (Windows NT 6.1; rv:17.0) Gecko/20100101 Firefox/17.0"); +pref("general.useragent.vendor", ""); +pref("general.useragent.vendorSub", ""); +pref("dom.enable_performance", false); +pref("plugin.expose_full_path", false); +pref("browser.startup.homepage_override.buildID", "20110325121920"); +pref("browser.startup.homepage_override.mstone", "rv:2.0"); +pref("browser.zoom.siteSpecific", false); +// pref("intl.accept_languages", "en-us, en"); // Set by Torbutton +// pref("intl.accept_charsets", "iso-8859-1,*,utf-8"); // Set by Torbutton +// pref("intl.charsetmenu.browser.cache", "UTF-8"); // Set by Torbutton + +// Third party stuff +pref("network.cookie.cookieBehavior", 1); +pref("security.enable_tls_session_tickets", false); +pref("network.http.spdy.enabled", false); // Stores state and may have keepalive issues (both fixable) +pref("network.http.spdy.enabled.v2", false); // Seems redundant, but just in case +pref("network.http.spdy.enabled.v3", false); // Seems redundant, but just in case + +// Proxy and proxy security +pref("network.proxy.socks", "127.0.0.1"); +pref("network.proxy.socks_port", 9150); +pref("network.proxy.socks_remote_dns", true); +pref("network.proxy.type", 1); +pref("network.security.ports.banned", "8118,8123,9050,9051,9150,9151"); +pref("network.dns.disablePrefetch", true); +pref("network.protocol-handler.external-default", false); +pref("network.protocol-handler.external.mailto", false); +pref("network.protocol-handler.external.news", false); +pref("network.protocol-handler.external.nntp", false); +pref("network.protocol-handler.external.snews", false); +pref("network.protocol-handler.warn-external.mailto", true); +pref("network.protocol-handler.warn-external.news", true); +pref("network.protocol-handler.warn-external.nntp", true); +pref("network.protocol-handler.warn-external.snews", true); +pref("plugins.click_to_play", true); + +// Network and performance +pref("network.http.pipelining", true); +pref("network.http.pipelining.aggressive", true); +pref("network.http.pipelining.maxrequests", 12); +pref("network.http.pipelining.ssl", true); +pref("network.http.proxy.pipelining", true); +pref("security.ssl.enable_false_start", true); +pref("network.http.keep-alive.timeout", 20); +pref("network.http.connection-retry-timeout", 0); +pref("network.http.max-persistent-connections-per-proxy", 256); +pref("network.http.pipelining.reschedule-timeout", 15000); +pref("network.http.pipelining.read-timeout", 60000); +// Hacked pref: Now means "Attempt to pipeline at least this many requests together" +pref("network.http.pipelining.max-optimistic-requests", 3); + +// Extension support +pref("extensions.autoDisableScopes", 0); +pref("extensions.bootstrappedAddons", "{}"); +pref("extensions.checkCompatibility.4.*", false); +pref("extensions.databaseSchema", 3); +pref("extensions.enabledAddons", "https-everywhere%40eff.org:3.1.4,%7B73a6fe31-595d-460b-a920-fcc0f8843232%7D:2.6.6.1,torbutton%40torproject.org:1.5.2,ubufox%40ubuntu.com:2.6,tor-launcher%40torproject.org:0.1.1pre-alpha,%7B972ce4c6-7e08-4474-a285-3208198ce6fd%7D:17.0.5" +pref("extensions.enabledItems", "langpack-en-US@firefox.mozilla.org:,{73a6fe31-595d-460b-a920-fcc0f8843232}:1.9.9.57,{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}:1.2.4,{972ce4c6-7e08-4474-a285-3208198ce6fd}:3.5.8"); +pref("extensions.enabledScopes", 1); +pref("extensions.pendingOperations", false); +pref("xpinstall.whitelist.add", ""); +pref("xpinstall.whitelist.add.36", ""); + +// Omnibox settings +pref("keyword.URL", "https://startpage.com/do/search?q="); + +// Version placeholder +pref("torbrowser.version", "UNKNOWN"); diff --git a/browser/app/profile/tor-browser.js b/browser/app/profile/tor-browser.js deleted file mode 100644 index bcc5bad..0000000 --- a/browser/app/profile/tor-browser.js +++ /dev/null @@ -1,125 +0,0 @@ -# Default Preferences -# Tor Browser Bundle -# Do not edit this file. - -// Disable browser auto updaters and associated homepage notifications -pref("app.update.auto", false); -pref("app.update.enabled", false); -pref("browser.search.update", false); -pref("browser.rights.3.shown", true); -pref("browser.startup.homepage_override.mstone", "ignore"); -pref("startup.homepage_welcome_url", ""); -pref("startup.homepage_override_url", ""); - -// Disk activity: Disable Browsing History Storage -pref("browser.privatebrowsing.autostart", true); -pref("browser.cache.disk.enable", false); -pref("browser.cache.offline.enable", false); -pref("dom.indexedDB.enabled", false); -pref("permissions.memory_only", true); -pref("network.cookie.lifetimePolicy", 2); -pref("browser.download.manager.retention", 1); - -// Disk activity: TBB Directory Isolation -pref("browser.download.useDownloadDir", false); -pref("browser.shell.checkDefaultBrowser", false); -pref("browser.download.manager.addToRecentDocs", false); - -// Misc privacy: Disk -pref("signon.rememberSignons", false); -pref("browser.formfill.enable", false); -pref("signon.autofillForms", false); -pref("browser.sessionstore.privacy_level", 2); - -// Misc privacy: Remote -pref("browser.send_pings", false); -pref("geo.enabled", false); -pref("geo.wifi.uri", ""); -pref("browser.search.suggest.enabled", false); -pref("browser.safebrowsing.enabled", false); -pref("browser.safebrowsing.malware.enabled", false); - -// Fingerprinting -pref("webgl.min_capability_mode", true); -pref("webgl.disable-extensions", true); -pref("dom.battery.enabled", false); // fingerprinting due to differing OS implementations -pref("dom.network.enabled",false); // fingerprinting due to differing OS implementations -pref("browser.display.max_font_attempts",10); -pref("browser.display.max_font_count",10); -pref("gfx.downloadable_fonts.fallback_delay", -1); -pref("general.appname.override", "Netscape"); -pref("general.appversion.override", "5.0 (Windows)"); -pref("general.buildID.override", "0"); -//pref("general.useragent.locale", "SHPONKA"); // Set by Torbutton -pref("general.oscpu.override", "Windows NT 6.1"); -pref("general.platform.override", "Win32"); -pref("general.productSub.override", "20100101"); -pref("general.useragent.override", "Mozilla/5.0 (Windows NT 6.1; rv:17.0) Gecko/20100101 Firefox/17.0"); -pref("general.useragent.vendor", ""); -pref("general.useragent.vendorSub", ""); -pref("dom.enable_performance", false); -pref("plugin.expose_full_path", false); -pref("browser.startup.homepage_override.buildID", "20110325121920"); -pref("browser.startup.homepage_override.mstone", "rv:2.0"); -pref("browser.zoom.siteSpecific", false); -// pref("intl.accept_languages", "en-us, en"); // Set by Torbutton -// pref("intl.accept_charsets", "iso-8859-1,*,utf-8"); // Set by Torbutton -// pref("intl.charsetmenu.browser.cache", "UTF-8"); // Set by Torbutton - -// Third party stuff -pref("network.cookie.cookieBehavior", 1); -pref("security.enable_tls_session_tickets", false); -pref("network.http.spdy.enabled", false); // Stores state and may have keepalive issues (both fixable) -pref("network.http.spdy.enabled.v2", false); // Seems redundant, but just in case -pref("network.http.spdy.enabled.v3", false); // Seems redundant, but just in case - -// Proxy and proxy security -pref("network.proxy.socks", "127.0.0.1"); -pref("network.proxy.socks_port", 9150); -pref("network.proxy.socks_remote_dns", true); -pref("network.proxy.type", 1); -pref("network.security.ports.banned", "8118,8123,9050,9051,9150,9151"); -pref("network.dns.disablePrefetch", true); -pref("network.protocol-handler.external-default", false); -pref("network.protocol-handler.external.mailto", false); -pref("network.protocol-handler.external.news", false); -pref("network.protocol-handler.external.nntp", false); -pref("network.protocol-handler.external.snews", false); -pref("network.protocol-handler.warn-external.mailto", true); -pref("network.protocol-handler.warn-external.news", true); -pref("network.protocol-handler.warn-external.nntp", true); -pref("network.protocol-handler.warn-external.snews", true); -pref("plugins.click_to_play", true); - -// Network and performance -pref("network.http.pipelining", true); -pref("network.http.pipelining.aggressive", true); -pref("network.http.pipelining.maxrequests", 12); -pref("network.http.pipelining.ssl", true); -pref("network.http.proxy.pipelining", true); -pref("security.ssl.enable_false_start", true); -pref("network.http.keep-alive.timeout", 20); -pref("network.http.connection-retry-timeout", 0); -pref("network.http.max-persistent-connections-per-proxy", 256); -pref("network.http.pipelining.reschedule-timeout", 15000); -pref("network.http.pipelining.read-timeout", 60000); -// Hacked pref: Now means "Attempt to pipeline at least this many requests together" -pref("network.http.pipelining.max-optimistic-requests", 3); - -// Extension support -pref("extensions.autoDisableScopes", 0); -pref("extensions.bootstrappedAddons", "{}"); -pref("extensions.checkCompatibility.4.*", false); -pref("extensions.databaseSchema", 3); -pref("extensions.enabledAddons", "https-everywhere%40eff.org:3.1.4,%7B73a6fe31-595d-460b-a920-fcc0f8843232%7D:2.6.6.1,torbutton%40torproject.org:1.5.2,ubufox%40ubuntu.com:2.6,tor-launcher%40torproject.org:0.1.1pre-alpha,%7B972ce4c6-7e08-4474-a285-3208198ce6fd%7D:17.0.5" -pref("extensions.enabledItems", "langpack-en-US@firefox.mozilla.org:,{73a6fe31-595d-460b-a920-fcc0f8843232}:1.9.9.57,{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}:1.2.4,{972ce4c6-7e08-4474-a285-3208198ce6fd}:3.5.8"); -pref("extensions.enabledScopes", 1); -pref("extensions.pendingOperations", false); -pref("xpinstall.whitelist.add", ""); -pref("xpinstall.whitelist.add.36", ""); - -// Omnibox settings -pref("keyword.URL", "https://startpage.com/do/search?q="); - -// Version placeholder -pref("torbrowser.version", "UNKNOWN"); diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in index 6d58645..753597c 100644 --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in @@ -570,7 +570,7 @@ @BINPATH@/@PREF_DIR@/channel-prefs.js #endif @BINPATH@/defaults/profile/prefs.js -@BINPATH@/@PREF_DIR@/tor-browser.js +@BINPATH@/@PREF_DIR@/000-tor-browser.js ; [Layout Engine Resources] ; Style Sheets, Graphics and other Resources used by the layout engine. diff --git a/toolkit/mozapps/installer/packager.mk b/toolkit/mozapps/installer/packager.mk index 01c7b93..6963e8b 100644 --- a/toolkit/mozapps/installer/packager.mk +++ b/toolkit/mozapps/installer/packager.mk @@ -497,12 +497,10 @@ OMNIJAR_FILES = \ # defaults/pref/channel-prefs.js is handled separate from other prefs due to # bug 756325. -# tor-browser.js is also bundled last, because it must override other prefs. NON_OMNIJAR_FILES += \ chrome/icons/\* \ $(PREF_DIR)/channel-prefs.js \ defaults/pref/channel-prefs.js \ - defaults/preferences/tor-browser.js \ res/cursors/\* \ res/MainMenu.nib/\* \ \*/.mkdir.done \ @@ -516,7 +514,6 @@ PACK_OMNIJAR = \ mv tmp.manifest $$m; \ done; \ $(ZIP) -r9m $(OMNIJAR_NAME) $(OMNIJAR_FILES) -x $(NON_OMNIJAR_FILES) && \ - $(ZIP) -u $(OMNIJAR_NAME) defaults/preferences/tor-browser.js && \ $(GENERATE_CACHE) && \ $(OPTIMIZE_JARS_CMD) --optimize $(JARLOG_DIR_AB_CD) ./ ./ && \ mv binary.manifest components && \

1 0

[translation/gettor_completed] Update translations for gettor_completed
by translation＠torproject.org 10 May '13

10 May '13

commit 028f153ec595fd07ef241ad5c6890f796a6b5f1a Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 10 16:45:14 2013 +0000 Update translations for gettor_completed --- zh_CN/gettor.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/zh_CN/gettor.po b/zh_CN/gettor.po index 9fe83be..28c9b51 100644 --- a/zh_CN/gettor.po +++ b/zh_CN/gettor.po @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2013-05-10 14:29+0000\n" +"PO-Revision-Date: 2013-05-10 16:30+0000\n" "Last-Translator: simabull tsai\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -264,7 +264,7 @@ msgstr "如需获取网桥，请发送正文包含 \"get bridges\" 的电子邮 msgid "" "It is also possible to fetch bridges with a web browser at the following\n" "url: https://bridges.torproject.org/" -msgstr "您也可以通过浏览器在以下网址得到桥接：\nhttps://bridges.torproject.org/" +msgstr "另外，可通过浏览器打开以下网址获取桥接：\nhttps://bridges.torproject.org/" #: lib/gettor/i18n.py:175 msgid ""

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 10 May '13

10 May '13

commit de1f7482ce84b0f6bca2b6247d397e73cf9f43bf Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 10 16:45:11 2013 +0000 Update translations for gettor --- zh_CN/gettor.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/zh_CN/gettor.po b/zh_CN/gettor.po index 9fe83be..28c9b51 100644 --- a/zh_CN/gettor.po +++ b/zh_CN/gettor.po @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2013-05-10 14:29+0000\n" +"PO-Revision-Date: 2013-05-10 16:30+0000\n" "Last-Translator: simabull tsai\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -264,7 +264,7 @@ msgstr "如需获取网桥，请发送正文包含 \"get bridges\" 的电子邮 msgid "" "It is also possible to fetch bridges with a web browser at the following\n" "url: https://bridges.torproject.org/" -msgstr "您也可以通过浏览器在以下网址得到桥接：\nhttps://bridges.torproject.org/" +msgstr "另外，可通过浏览器打开以下网址获取桥接：\nhttps://bridges.torproject.org/" #: lib/gettor/i18n.py:175 msgid ""

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 10 May '13

10 May '13

commit eed2872dacf39ddd4702a8fd006e3d58f98f2329 Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 10 16:15:13 2013 +0000 Update translations for tsum --- eu/short-user-manual_eu_noimg.xhtml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/eu/short-user-manual_eu_noimg.xhtml b/eu/short-user-manual_eu_noimg.xhtml index c8acca6..d3bbc01 100644 --- a/eu/short-user-manual_eu_noimg.xhtml +++ b/eu/short-user-manual_eu_noimg.xhtml @@ -4,7 +4,7 @@ <title/> </head> <body> - <h1 id="the-short-user-manual">Erabiltzaile Eskuliburu Laburra</h1> + <h1 id="the-short-user-manual">Erabiltzaile eskuliburu laburra</h1> <p>This user manual contains information about how to download Tor, how to use it, and what to do if Tor is unable to connect to the network. If you can't find the answer to your question in this document, email help(a)rt.torproject.org.</p> <p>Mesedez kontuan izan bolondreski sostengua ematen ari garela, eta email asko jasotzen ditugu egunero. Ez dago larritu beharrik erantzun azkarrik jasotzen ez baduzu.</p> <h2 id="how-tor-works">Nola egiten du lan Tor</h2>

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 10 May '13

10 May '13

commit 0f895ba4e3223dffb2d25ce340bd3c33c8fffa1d Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 10 15:45:33 2013 +0000 Update translations for vidalia_help --- eu/server.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eu/server.po b/eu/server.po index 3812394..ec56f1d 100644 --- a/eu/server.po +++ b/eu/server.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 17:00+0200\n" -"PO-Revision-Date: 2013-05-09 15:02+0000\n" +"PO-Revision-Date: 2013-05-10 15:32+0000\n" "Last-Translator: Antxon Baldarra <baldarra(a)lavabit.com>\n" "Language-Team: Basque (http://www.transifex.com/projects/p/torproject/language/eu/)\n" "MIME-Version: 1.0\n" @@ -402,4 +402,4 @@ msgid "" "<i>Mirror the relay directory</i>, then you will also need to forward your " "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by " "default on all operating systems." -msgstr "" +msgstr "Ataka jarraipena eskuz konfiguratu behar baduzu, <a href=\"http://www.portforward.com/english/routers/port_forwarding/routerindex.htm\">portforward.com</a> webguneak bideratzaile eta sueten anitzetan ataka jarraipena konfiguratzeko argibideak ditu. Gutxienez, zure <i>errele ataka</i> jarraitu beharko duzu, Windowsen 443 ataka eta beste sistema eragileetan 9001 ataka lehenetsia dena. <i>Errele direktorioa ispilatu</i> etiketa duen kontrol-laukia markatu baduzu, orduan zure <i>direktorio ataka</i> jarraitu beharko duzu ere. <i>Direktorio ataka</i> 9030 ataka lehentsia da sistema eragile guztietan."

1 0