October 2015 - tor-commits - lists.torproject.org

[translation/tor-messenger-prefsdtd] Update translations for tor-messenger-prefsdtd
by translation＠torproject.org 08 Oct '15

08 Oct '15

commit 06b0c4c494a7ec0a6ddba22b72be9464e579bb7c Author: Translation commit bot <translation(a)torproject.org> Date: Thu Oct 8 04:16:41 2015 +0000 Update translations for tor-messenger-prefsdtd --- zh_TW/prefs.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_TW/prefs.dtd b/zh_TW/prefs.dtd index f37fdd3..88ae04c 100644 --- a/zh_TW/prefs.dtd +++ b/zh_TW/prefs.dtd @@ -1,4 +1,4 @@ -<!ENTITY prefs.otrPreferences "OTR Preferences"> +<!ENTITY prefs.otrPreferences "OTR偏好設定"> <!ENTITY prefs.otrSettings "OTR Settings"> <!ENTITY prefs.requireEncryption "請求加密"> <!ENTITY prefs.otrKeys "My Private Keys">

1 0

[translation/tor-messenger-fingerdtd] Update translations for tor-messenger-fingerdtd
by translation＠torproject.org 08 Oct '15

08 Oct '15

commit 081417113b102c01e793b7664eaf4135ab6af512 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Oct 8 04:16:28 2015 +0000 Update translations for tor-messenger-fingerdtd --- zh_TW/finger.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_TW/finger.dtd b/zh_TW/finger.dtd index f40e1a4..0053433 100644 --- a/zh_TW/finger.dtd +++ b/zh_TW/finger.dtd @@ -5,6 +5,6 @@ <!ENTITY finger.fingerprint "指紋"> <!ENTITY finger.account "Account"> <!ENTITY finger.protocol "Protocol"> -<!ENTITY finger.verify "Verify"> +<!ENTITY finger.verify "驗證"> <!ENTITY finger.remove "移除"> <!ENTITY finger.intro "Manage the list of fingerprints you've seen."> \ No newline at end of file

1 0

[translation/tor-messenger-authdtd] Update translations for tor-messenger-authdtd
by translation＠torproject.org 08 Oct '15

08 Oct '15

commit e62ea46eadbd8ce6d0fede4c110de13a751f1159 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Oct 8 04:16:12 2015 +0000 Update translations for tor-messenger-authdtd --- zh_TW/auth.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_TW/auth.dtd b/zh_TW/auth.dtd index dae80fa..d8b5450 100644 --- a/zh_TW/auth.dtd +++ b/zh_TW/auth.dtd @@ -1,5 +1,5 @@ <!ENTITY authDialog.title "Verify contact's identity"> -<!ENTITY authDialog.authenticate "Verify"> +<!ENTITY authDialog.authenticate "驗證"> <!ENTITY authDialog.cancel "Cancel"> <!ENTITY authDialog.help "Help"> <!ENTITY authDialog.yes "是">

1 0

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation＠torproject.org 08 Oct '15

08 Oct '15

commit a35269eaf651bd72cce44e0aeeb5af8a73306bc3 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Oct 8 04:15:50 2015 +0000 Update translations for torbutton-torbuttonproperties --- zh_TW/torbutton.properties | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/zh_TW/torbutton.properties b/zh_TW/torbutton.properties index 7da4acf..5a10135 100644 --- a/zh_TW/torbutton.properties +++ b/zh_TW/torbutton.properties @@ -1,12 +1,12 @@ torbutton.button.tooltip.disabled = 啟用 Tor torbutton.button.tooltip.enabled = 停用 Tor -torbutton.circuit_display.internet = Internet -torbutton.circuit_display.ip_unknown = IP unknown -torbutton.circuit_display.onion_site = Onion site -torbutton.circuit_display.this_browser = This browser -torbutton.circuit_display.relay = relay -torbutton.circuit_display.tor_bridge = Bridge -torbutton.circuit_display.unknown_country = Unknown country +torbutton.circuit_display.internet = 網際網路 +torbutton.circuit_display.ip_unknown = 未知IP +torbutton.circuit_display.onion_site = 洋蔥網站 +torbutton.circuit_display.this_browser = 此瀏覽器 +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. torbutton.panel.tooltip.disabled = 按一下以啟用 Tor torbutton.panel.tooltip.enabled = 按一下以停用 Tor @@ -54,10 +54,10 @@ torbutton.popup.short_torbrowser = 重要的 Torbutton 資訊!\n\nTorbutton 現 torbutton.popup.confirm_plugins = 如 Flash 的外掛程式可能會危害您的隱私和匿名性。\n\n它們還可以繞過 Tor，揭示您目前所在的位置和 IP 位址。\n\n您確定要啟用外掛程式嗎?\n 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.popup.confirm_newnym = Tor瀏覽器將關閉所有視窗和分頁。所有網站的會話都將丟失。\n\n現在重新啟動Tor瀏覽器來重新設置您的身份？\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 +profileProblemTitle=%S 配置問題 profileReadOnly=You cannot run %S from a read-only file system. Please copy %S to another location before trying to use it. 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.

1 0

[tor-messenger-build/master] Rebase patches for mozilla-release; Thunderbird 41 tag
by sukhbir＠torproject.org 08 Oct '15

08 Oct '15

commit 6577dd1b7657091c2c46719e10471fc677cb05ca Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Wed Oct 7 21:58:35 2015 -0400 Rebase patches for mozilla-release; Thunderbird 41 tag --- ...e-the-default-Firefox-profile-director.mozpatch | 65 +++++++++----------- projects/instantbird/search-preferences-xul.patch | 8 +-- projects/instantbird/top-protocols.patch | 3 +- 3 files changed, 35 insertions(+), 41 deletions(-) diff --git a/projects/instantbird/Bug-9173-Change-the-default-Firefox-profile-director.mozpatch b/projects/instantbird/Bug-9173-Change-the-default-Firefox-profile-director.mozpatch index a3ca392..abdf109 100644 --- a/projects/instantbird/Bug-9173-Change-the-default-Firefox-profile-director.mozpatch +++ b/projects/instantbird/Bug-9173-Change-the-default-Firefox-profile-director.mozpatch @@ -25,7 +25,7 @@ index 7d09374ba773..417ebee773ba 100644 #include "mozilla/Services.h" #include "mozilla/Omnijar.h" #include "mozilla/Preferences.h" -@@ -200,9 +201,6 @@ nsXREDirProvider::GetUserProfilesRootDir(nsIFile** aResult, +@@ -197,9 +198,6 @@ aProfileName, aAppName, aVendorName); if (NS_SUCCEEDED(rv)) { @@ -35,7 +35,7 @@ index 7d09374ba773..417ebee773ba 100644 // We must create the profile directory here if it does not exist. nsresult tmp = EnsureDirectoryExists(file); if (NS_FAILED(tmp)) { -@@ -225,9 +223,6 @@ nsXREDirProvider::GetUserProfilesLocalDir(nsIFile** aResult, +@@ -222,9 +220,6 @@ aProfileName, aAppName, aVendorName); if (NS_SUCCEEDED(rv)) { @@ -45,7 +45,7 @@ index 7d09374ba773..417ebee773ba 100644 // We must create the profile directory here if it does not exist. nsresult tmp = EnsureDirectoryExists(file); if (NS_FAILED(tmp)) { -@@ -1222,90 +1217,45 @@ nsresult +@@ -1219,82 +1214,44 @@ nsXREDirProvider::GetUserDataDirectoryHome(nsIFile** aFile, bool aLocal) { // Copied from nsAppFileLocationProvider (more or less) @@ -84,42 +84,44 @@ index 7d09374ba773..417ebee773ba 100644 + rv = localDir->GetNativeLeafName(removedName); + NS_ENSURE_SUCCESS(rv, rv); + bool didRemove = !removedName.Equals("."); - -- rv = dirFileMac->InitWithFSRef(&fsRef); -- NS_ENSURE_SUCCESS(rv, rv); + // Remove a directory component. + nsCOMPtr<nsIFile> parentDir; + rv = localDir->GetParent(getter_AddRefs(parentDir)); + NS_ENSURE_SUCCESS(rv, rv); + localDir = parentDir; ++ ++ if (didRemove) ++ --levelsToRemove; ++ } + +- rv = dirFileMac->InitWithFSRef(&fsRef); ++ if (!localDir) ++ return NS_ERROR_FAILURE; ++ ++ rv = localDir->AppendRelativeNativePath(NS_LITERAL_CSTRING("TorMessenger" ++ XPCOM_FILE_PATH_SEPARATOR "Data" ++ XPCOM_FILE_PATH_SEPARATOR "Browser")); + NS_ENSURE_SUCCESS(rv, rv); - localDir = do_QueryInterface(dirFileMac, &rv); --#elif defined(XP_IOS) -- nsAutoCString userDir; -- if (GetUIKitDirectory(aLocal, userDir)) { -- rv = NS_NewNativeLocalFile(userDir, true, getter_AddRefs(localDir)); -- } else { -- rv = NS_ERROR_FAILURE; -- } -- NS_ENSURE_SUCCESS(rv, rv); -#elif defined(XP_WIN) - nsString path; -- if (aLocal) { + if (aLocal) { - rv = GetShellFolderPath(CSIDL_LOCAL_APPDATA, path); - if (NS_FAILED(rv)) - rv = GetRegWindowsAppDataFolder(aLocal, path); -- } ++ rv = localDir->AppendNative(NS_LITERAL_CSTRING("Caches")); ++ NS_ENSURE_SUCCESS(rv, rv); + } - if (!aLocal || NS_FAILED(rv)) { - rv = GetShellFolderPath(CSIDL_APPDATA, path); - if (NS_FAILED(rv)) { - if (!aLocal) - rv = GetRegWindowsAppDataFolder(aLocal, path); - } -+ if (didRemove) -+ --levelsToRemove; - } +- } - NS_ENSURE_SUCCESS(rv, rv); - +- - rv = NS_NewLocalFile(path, true, getter_AddRefs(localDir)); -#elif defined(MOZ_WIDGET_GONK) - rv = NS_NewNativeLocalFile(NS_LITERAL_CSTRING("/data/b2g"), true, @@ -127,18 +129,13 @@ index 7d09374ba773..417ebee773ba 100644 -#elif defined(XP_UNIX) - const char* homeDir = getenv("HOME"); - if (!homeDir || !*homeDir) -+ if (!localDir) - return NS_ERROR_FAILURE; - +- return NS_ERROR_FAILURE; +- -#ifdef ANDROID /* We want (ProfD == ProfLD) on Android. */ - aLocal = false; -#endif -+ rv = localDir->AppendRelativeNativePath(NS_LITERAL_CSTRING("TorMessenger" -+ XPCOM_FILE_PATH_SEPARATOR "Data" -+ XPCOM_FILE_PATH_SEPARATOR "Browser")); -+ NS_ENSURE_SUCCESS(rv, rv); - - if (aLocal) { +- +- if (aLocal) { - // If $XDG_CACHE_HOME is defined use it, otherwise use $HOME/.cache. - const char* cacheHome = getenv("XDG_CACHE_HOME"); - if (cacheHome && *cacheHome) { @@ -153,16 +150,14 @@ index 7d09374ba773..417ebee773ba 100644 - } else { - rv = NS_NewNativeLocalFile(nsDependentCString(homeDir), true, - getter_AddRefs(localDir)); -+ rv = localDir->AppendNative(NS_LITERAL_CSTRING("Caches")); -+ NS_ENSURE_SUCCESS(rv, rv); - } +- } -#else -#error "Don't know how to get product dir on your platform" -#endif NS_IF_ADDREF(*aFile = localDir); return rv; -@@ -1518,48 +1468,25 @@ nsXREDirProvider::AppendProfilePath(nsIFile* aFile, +@@ -1507,48 +1464,25 @@ } nsAutoCString profile; @@ -214,7 +209,7 @@ index 7d09374ba773..417ebee773ba 100644 #elif defined(ANDROID) // The directory used for storing profiles -@@ -1571,12 +1498,6 @@ nsXREDirProvider::AppendProfilePath(nsIFile* aFile, +@@ -1560,12 +1494,6 @@ rv = aFile->AppendNative(nsDependentCString("mozilla")); NS_ENSURE_SUCCESS(rv, rv); #elif defined(XP_UNIX) @@ -227,7 +222,7 @@ index 7d09374ba773..417ebee773ba 100644 if (!profile.IsEmpty()) { // Skip any leading path characters const char* profileStart = profile.get(); -@@ -1585,31 +1506,17 @@ nsXREDirProvider::AppendProfilePath(nsIFile* aFile, +@@ -1574,31 +1502,17 @@ // On the off chance that someone wanted their folder to be hidden don't // let it become ".." diff --git a/projects/instantbird/search-preferences-xul.patch b/projects/instantbird/search-preferences-xul.patch index a6b2a31..647d9a5 100644 --- a/projects/instantbird/search-preferences-xul.patch +++ b/projects/instantbird/search-preferences-xul.patch @@ -1,7 +1,7 @@ diff --git a/im/content/preferences/advanced.xul b/im/content/preferences/advanced.xul --- a/im/content/preferences/advanced.xul +++ b/im/content/preferences/advanced.xul -@@ -143,17 +143,6 @@ +@@ -135,17 +135,6 @@ preference="layout.spellcheckDefault"/> </groupbox> @@ -16,6 +16,6 @@ diff --git a/im/content/preferences/advanced.xul b/im/content/preferences/advanc - oncommand="gAdvancedPane.showSearchEngineManager();"/> - </groupbox> - -  - <groupbox> - <caption label="&configEditDesc.label;"/> + #ifdef HAVE_SHELL_SERVICE +  + <groupbox id="systemDefaultsGroup" orient="horizontal"> diff --git a/projects/instantbird/top-protocols.patch b/projects/instantbird/top-protocols.patch index f808beb..db1b3e8 100644 --- a/projects/instantbird/top-protocols.patch +++ b/projects/instantbird/top-protocols.patch @@ -1,12 +1,11 @@ diff --git a/im/locales/en-US/chrome/instantbird/accountWizard.properties b/im/locales/en-US/chrome/instantbird/accountWizard.properties -index da7d6b7..90fbf3e 100644 --- a/im/locales/en-US/chrome/instantbird/accountWizard.properties +++ b/im/locales/en-US/chrome/instantbird/accountWizard.properties @@ -8,11 +8,13 @@ # Exceeding 4 protocols may cause scrolling. A list of the # available protocols can be found at # https://wiki.instantbird.org/Protocol_Identifiers --topProtocol.list=prpl-gtalk,prpl-facebook,prpl-twitter,prpl-aim,prpl-yahoo +-topProtocol.list=prpl-gtalk,prpl-facebook,prpl-twitter,prpl-aim,prpl-msn,prpl-yahoo +topProtocol.list=prpl-irc,prpl-jabber,prpl-gtalk,prpl-facebook # LOCALIZATION NOTE

1 0

[doctor/master] Suppressions were indefinite, blocking further notices
by atagar＠torproject.org 08 Oct '15

08 Oct '15

commit bd1f80683e3d028da25214c82cece0eb1455c204 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Oct 7 18:25:17 2015 -0700 Suppressions were indefinite, blocking further notices Oops, when checking for suppressions we updated the 'last notified' timestamp, so we were perpetually suppressed. *facepalm* --- fingerprint_change_checker.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/fingerprint_change_checker.py b/fingerprint_change_checker.py index c1d2474..71673ca 100755 --- a/fingerprint_change_checker.py +++ b/fingerprint_change_checker.py @@ -94,6 +94,15 @@ def main(): except Exception as exc: log.warn("Unable to send email: %s" % exc) + # register that we've notified for these + + current_time = str(int(time.time())) + + for address, or_port in alarm_for: + last_notified_config.set('%s:%s' % (address, or_port), current_time) + + last_notified_config.save() + save_fingerprint_changes(fingerprint_changes) @@ -153,8 +162,7 @@ def is_notification_suppressed(fingerprint_changes): for address, or_port in fingerprint_changes: key = '%s:%s' % (address, or_port) - current_time = int(time.time()) - suppression_time = ONE_DAY - (current_time - last_notified_config.get(key, 0)) + suppression_time = ONE_DAY - (int(time.time()) - last_notified_config.get(key, 0)) if suppression_time < 0: log.debug("* notification for %s isn't suppressed" % key) @@ -162,9 +170,6 @@ def is_notification_suppressed(fingerprint_changes): else: log.debug("* we already notified for %s recently, suppressed for %i hours" % (key, suppression_time / 3600)) - last_notified_config.set(key, str(current_time), overwrite = True) - - last_notified_config.save() return is_all_suppressed

1 0

[tor-commits] [translation/tor-messenger-loggerproperties_completed] Update translations for tor-messenger-loggerproperties_completed
by translation＠torproject.org 08 Oct '15

08 Oct '15

commit 4f1e34a21bf1349e682f9d2cd72cd053bd4a4ce3 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Oct 8 01:16:54 2015 +0000 Update translations for tor-messenger-loggerproperties_completed --- zh_TW/logger.properties | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/zh_TW/logger.properties b/zh_TW/logger.properties new file mode 100644 index 0000000..8b270ac --- /dev/null +++ b/zh_TW/logger.properties @@ -0,0 +1,7 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# 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/. + +# LOCALIZATION NOTE (badLogfile): +# %S is the filename of the log file. +badLogfile=空白或損壞的日誌文件：%S

1 0

[translation/tor-messenger-loggerproperties] Update translations for tor-messenger-loggerproperties
by translation＠torproject.org 08 Oct '15

08 Oct '15

commit d3ba0aec0b157ebe19585459ca41f2c8fea1430f Author: Translation commit bot <translation(a)torproject.org> Date: Thu Oct 8 01:16:50 2015 +0000 Update translations for tor-messenger-loggerproperties --- zh_TW/logger.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_TW/logger.properties b/zh_TW/logger.properties index 2228c50..8b270ac 100644 --- a/zh_TW/logger.properties +++ b/zh_TW/logger.properties @@ -4,4 +4,4 @@ # LOCALIZATION NOTE (badLogfile): # %S is the filename of the log file. -badLogfile=Empty or corrupt log file: %S +badLogfile=空白或損壞的日誌文件：%S

1 0

[translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
by translation＠torproject.org 08 Oct '15

08 Oct '15

commit 23e6a2c7719c99c97a2dd9c61dc9125270d37470 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Oct 8 00:46:00 2015 +0000 Update translations for torbutton-torbuttondtd --- fr/torbutton.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr/torbutton.dtd b/fr/torbutton.dtd index c7976bc..5308ece 100644 --- a/fr/torbutton.dtd +++ b/fr/torbutton.dtd @@ -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">

1 0

[translation/tor-messenger-ircproperties] Update translations for tor-messenger-ircproperties
by translation＠torproject.org 08 Oct '15

08 Oct '15

commit f9a8a80d3196059f93202abcc27445d247e5b8cc Author: Translation commit bot <translation(a)torproject.org> Date: Thu Oct 8 00:16:48 2015 +0000 Update translations for tor-messenger-ircproperties --- ar/irc.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ar/irc.properties b/ar/irc.properties index 7f1e43c..942be7a 100644 --- a/ar/irc.properties +++ b/ar/irc.properties @@ -80,7 +80,7 @@ command.whois2=%S [<nick>]: Get information on a user. # These are shown as system messages in the conversation. # %1$S is the nick and %2$S is the nick and host of the user who joined. message.join=%1$S [%2$S] entered the room. -message.rejoined=You have rejoined the room. +message.rejoined=لقد إلتحقت بالغرفة. # %1$S is the nick of who kicked you. # %2$S is message.kicked.reason, if a kick message was given. message.kicked.you=You have been kicked by %1$S%2$S.

1 0