- tor-commits - lists.torproject.org

[tor-messenger-build/master] Bump ctypes-otr to 42cbf4ef
by arlo＠torproject.org 24 Mar '16

24 Mar '16

commit 07b5043720c540456a67a3fb55099df8ce398380 Author: Arlo Breault <arlolra(a)gmail.com> Date: Thu Mar 24 16:32:32 2016 -0700 Bump ctypes-otr to 42cbf4ef --- ChangeLog | 4 ++++ projects/ctypes-otr/config | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 7e9e7a1..37c2a75 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,10 @@ Tor Messenger 0.1.0b6 * All Platforms * Use the THUNDERBIRD_45_0b3_RELEASE tag on mozilla-esr45 * Use the THUNDERBIRD_45_0b3_RELEASE tag on comm-esr45 + * ctypes-otr + * GH 68: Don't close notification bar until verification succeeds + * GH 71: Improve verifying from the fingerprint manager + * GH 72: Generate keys automatically after account creation Tor Messenger 0.1.0b5 -- March 09, 2016 * All Platforms diff --git a/projects/ctypes-otr/config b/projects/ctypes-otr/config index 611116d..0e580eb 100644 --- a/projects/ctypes-otr/config +++ b/projects/ctypes-otr/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/arlolra/ctypes-otr -git_hash: d733f71db6b08f25c3e01fed071d3fe84bab6352 +git_hash: 42cbf4ef97db631ccee265c9373be43236c455ce filename: 'ctypes-otr-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' var: lib_glob: 'lib/*.so*'

1 0

[tor-messenger-build/master] Add a patch for bug 1167248
by arlo＠torproject.org 24 Mar '16

24 Mar '16

commit 64bc03c695b2ebb1308aa69b5ce53eeaad149afe Author: Arlo Breault <arlolra(a)gmail.com> Date: Thu Mar 24 16:27:43 2016 -0700 Add a patch for bug 1167248 --- projects/instantbird/bug-1167248.mozpatch | 22 ++++++++++++++++++++++ projects/instantbird/config | 2 ++ 2 files changed, 24 insertions(+) diff --git a/projects/instantbird/bug-1167248.mozpatch b/projects/instantbird/bug-1167248.mozpatch new file mode 100644 index 0000000..2ef5804 --- /dev/null +++ b/projects/instantbird/bug-1167248.mozpatch @@ -0,0 +1,22 @@ +From 65aeb7ca6d2b5f55acb35bb8eef3152b613faf1f Mon Sep 17 00:00:00 2001 +From: Jacek Caban <jacek(a)codeweavers.com> +Date: Thu, 21 Jan 2016 13:40:07 +0100 +Subject: [PATCH] Bug 1167248 - Cross compilation fixup. + +--- + js/src/jsmath.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/js/src/jsmath.cpp b/js/src/jsmath.cpp +index 56ba1cf..3f4ddd9 100644 +--- a/js/src/jsmath.cpp ++++ b/js/src/jsmath.cpp +@@ -44,7 +44,7 @@ + // "Community Additions" comment on MSDN here: + // https://msdn.microsoft.com/en-us/library/windows/desktop/aa387694.aspx + # define SystemFunction036 NTAPI SystemFunction036 +-# include <NTSecAPI.h> ++# include <ntsecapi.h> + # undef SystemFunction036 + #endif + diff --git a/projects/instantbird/config b/projects/instantbird/config index df73d5a..d9e0646 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -109,6 +109,8 @@ input_files: enable: '[% c("var/windows") %]' - filename: bug-1240589.mozpatch enable: '[% c("var/windows") %]' + - filename: bug-1167248.mozpatch + enable: '[% c("var/windows") %]' - filename: Bug-9173-Change-the-default-Firefox-profile-director.mozpatch - filename: trac-16475.mozpatch - filename: OSX-package-as-tar.bz2.mozpatch

1 0

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation＠torproject.org 24 Mar '16

24 Mar '16

commit 002c9b3f7746838acc72b4d04ab9e0e18e420152 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 24 23:15:55 2016 +0000 Update translations for torbutton-torbuttonproperties --- zh_TW/torbutton.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_TW/torbutton.properties b/zh_TW/torbutton.properties index 864e8e9..f7eae05 100644 --- a/zh_TW/torbutton.properties +++ b/zh_TW/torbutton.properties @@ -76,4 +76,4 @@ profileProblemTitle=%S 配置問題 profileReadOnly=您不能在唯讀的檔案系統中執行 %S，請先將 %S 複製到其他位置下再行嘗試。 profileReadOnlyMac=您不能在唯讀的檔案系統中執行 %S，請先將 %S 複製到您的電腦桌面或應用程式資料夾中，再行嘗試。 profileAccessDenied=%S 沒有足夠的存取權限，請重新調整您的檔案系統權限後再行嘗試。 -profileMigrationFailed=Migration of your existing %S profile failed.\nNew settings will be used. +profileMigrationFailed=無法轉移至您現存的%S資料夾。\n將使用新設定。

1 0

[translation/tor-launcher-properties_completed] Update translations for tor-launcher-properties_completed
by translation＠torproject.org 24 Mar '16

24 Mar '16

commit 91171ac3217ca23cbb7e42257735cefd6d604209 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 24 23:15:37 2016 +0000 Update translations for tor-launcher-properties_completed --- zh_TW/torlauncher.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/zh_TW/torlauncher.properties b/zh_TW/torlauncher.properties index ca8bdb9..a706916 100644 --- a/zh_TW/torlauncher.properties +++ b/zh_TW/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=洋蔥路由啟動工具 @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S 失敗 (%2$S)。 torlauncher.unable_to_start_tor=無法啟動洋蔥路由。\n\n%S torlauncher.tor_missing=洋蔥路由可執行檔遺失。 -torlauncher.torrc_missing=torrc 檔案遺失。 -torlauncher.datadir_missing=洋蔥路由資料目錄不存在。 +torlauncher.torrc_missing=洋蔥路由的配置文件遺失而且無法創建。 +torlauncher.datadir_missing=洋蔥路由的資料路徑並不存在，且無法被創建。 torlauncher.password_hash_missing=無法取得雜湊過的密碼。 torlauncher.failed_to_get_settings=無法擷取洋蔥路由設定。\n\n%S

1 0

[translation/tor-launcher-properties] Update translations for tor-launcher-properties
by translation＠torproject.org 24 Mar '16

24 Mar '16

commit 9eb52c1086d6435c145a4db71783877bb241157b Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 24 23:15:33 2016 +0000 Update translations for tor-launcher-properties --- zh_TW/torlauncher.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zh_TW/torlauncher.properties b/zh_TW/torlauncher.properties index c0a5760..a706916 100644 --- a/zh_TW/torlauncher.properties +++ b/zh_TW/torlauncher.properties @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S 失敗 (%2$S)。 torlauncher.unable_to_start_tor=無法啟動洋蔥路由。\n\n%S torlauncher.tor_missing=洋蔥路由可執行檔遺失。 -torlauncher.torrc_missing=The torrc file is missing and could not be created. -torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. +torlauncher.torrc_missing=洋蔥路由的配置文件遺失而且無法創建。 +torlauncher.datadir_missing=洋蔥路由的資料路徑並不存在，且無法被創建。 torlauncher.password_hash_missing=無法取得雜湊過的密碼。 torlauncher.failed_to_get_settings=無法擷取洋蔥路由設定。\n\n%S

1 0

[tor-messenger-build/master] Add patch for bug 1240589
by arlo＠torproject.org 24 Mar '16

24 Mar '16

commit bc375d734f8395e7e4d842a26a5e0d57b2a0a98c Author: Arlo Breault <arlolra(a)gmail.com> Date: Thu Mar 24 15:50:16 2016 -0700 Add patch for bug 1240589 --- projects/instantbird/bug-1240589.mozpatch | 22 ++++++++++++++++++++++ projects/instantbird/config | 2 ++ 2 files changed, 24 insertions(+) diff --git a/projects/instantbird/bug-1240589.mozpatch b/projects/instantbird/bug-1240589.mozpatch new file mode 100644 index 0000000..0c52b02 --- /dev/null +++ b/projects/instantbird/bug-1240589.mozpatch @@ -0,0 +1,22 @@ +From 9e4a3887ed69bccc6186ef8765dfab690239f5fa Mon Sep 17 00:00:00 2001 +From: Jacek Caban <jacek(a)codeweavers.com> +Date: Sat, 30 Jan 2016 17:31:37 +0100 +Subject: [PATCH] Bug 1240589 - Cross compilation fixup. + +--- + ipc/chromium/src/base/rand_util_win.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ipc/chromium/src/base/rand_util_win.cc b/ipc/chromium/src/base/rand_util_win.cc +index 2a4fb29..d998cb6 100644 +--- a/ipc/chromium/src/base/rand_util_win.cc ++++ b/ipc/chromium/src/base/rand_util_win.cc +@@ -11,7 +11,7 @@ + // "Community Additions" comment on MSDN here: + // http://msdn.microsoft.com/en-us/library/windows/desktop/aa387694.aspx + #define SystemFunction036 NTAPI SystemFunction036 +-#include <NTSecAPI.h> ++#include <ntsecapi.h> + #undef SystemFunction036 + + #include <algorithm> diff --git a/projects/instantbird/config b/projects/instantbird/config index 547cebd..df73d5a 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -107,6 +107,8 @@ input_files: enable: '[% c("var/windows") %]' - filename: gmploader-sandbox.mozpatch enable: '[% c("var/windows") %]' + - filename: bug-1240589.mozpatch + enable: '[% c("var/windows") %]' - filename: Bug-9173-Change-the-default-Firefox-profile-director.mozpatch - filename: trac-16475.mozpatch - filename: OSX-package-as-tar.bz2.mozpatch

1 0

[translation/tor-launcher-progress_completed] Update translations for tor-launcher-progress_completed
by translation＠torproject.org 24 Mar '16

24 Mar '16

commit f62af5d27931e0634400e6060a7704694b46609a Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 24 22:45:38 2016 +0000 Update translations for tor-launcher-progress_completed --- zh_CN/progress.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_CN/progress.dtd b/zh_CN/progress.dtd index 838d88e..dc816a5 100644 --- a/zh_CN/progress.dtd +++ b/zh_CN/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor 状态"> <!ENTITY torprogress.openSettings "打开设置"> <!ENTITY torprogress.heading "正在连接 Tor 网络"> -<!ENTITY torprogress.pleaseWait "请等待我们建立到 Tor 网络的连接。这可能会需要几分钟。"> +<!ENTITY torprogress.pleaseWait "正在与 Tor 网络建立连接。这可能需要几分钟，请耐心等待。">

1 0

[translation/tor-launcher-progress] Update translations for tor-launcher-progress
by translation＠torproject.org 24 Mar '16

24 Mar '16

commit 52e33c330c59e0eb451da5b9715b0886b4019747 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 24 22:45:34 2016 +0000 Update translations for tor-launcher-progress --- zh_CN/progress.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_CN/progress.dtd b/zh_CN/progress.dtd index 838d88e..dc816a5 100644 --- a/zh_CN/progress.dtd +++ b/zh_CN/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor 状态"> <!ENTITY torprogress.openSettings "打开设置"> <!ENTITY torprogress.heading "正在连接 Tor 网络"> -<!ENTITY torprogress.pleaseWait "请等待我们建立到 Tor 网络的连接。这可能会需要几分钟。"> +<!ENTITY torprogress.pleaseWait "正在与 Tor 网络建立连接。这可能需要几分钟，请耐心等待。">

1 0

[translation/tor-messenger-ircproperties_completed] Update translations for tor-messenger-ircproperties_completed
by translation＠torproject.org 24 Mar '16

24 Mar '16

commit 36a4a168da8417686a897bf8bd8ff4d70fae261a Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 24 21:46:44 2016 +0000 Update translations for tor-messenger-ircproperties_completed --- fr/irc.properties | 3 +++ 1 file changed, 3 insertions(+) diff --git a/fr/irc.properties b/fr/irc.properties index 2f7ee49..6243f00 100644 --- a/fr/irc.properties +++ b/fr/irc.properties @@ -172,6 +172,9 @@ error.sendMessageFailed=Une erreur est survenue lors de l'envoi de votre dernier # %1$S is the channel the user tried to join, %2$S is the channel # he was forwarded to. error.channelForward=Vous ne pouvez pas rejoindre %1$S. Vous avez été automatiquement redirigé sur %2$S à la place. +# %S is the mode that the user tried to set but was not recognized +# by the server as a valid mode. +error.unknownMode='%S' n'est pas un mode utilisateur valide sur ce serveur. # LOCALIZATION NOTE (tooltip.*): # These are the descriptions given in a tooltip with information received

1 0

[translation/tor-messenger-ircproperties] Update translations for tor-messenger-ircproperties
by translation＠torproject.org 24 Mar '16

24 Mar '16

commit c839965f3c6aa5b0fa3b3a3ab5aaa8cbb430d036 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 24 21:46:39 2016 +0000 Update translations for tor-messenger-ircproperties --- fr/irc.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr/irc.properties b/fr/irc.properties index b206592..6243f00 100644 --- a/fr/irc.properties +++ b/fr/irc.properties @@ -174,7 +174,7 @@ error.sendMessageFailed=Une erreur est survenue lors de l'envoi de votre dernier error.channelForward=Vous ne pouvez pas rejoindre %1$S. Vous avez été automatiquement redirigé sur %2$S à la place. # %S is the mode that the user tried to set but was not recognized # by the server as a valid mode. -error.unknownMode='%S' is not a valid user mode on this server. +error.unknownMode='%S' n'est pas un mode utilisateur valide sur ce serveur. # LOCALIZATION NOTE (tooltip.*): # These are the descriptions given in a tooltip with information received

1 0