commit 5219178857f79e73ee960ae8797e0bc0896e7d43 Author: Sukhbir Singh sukhbir@torproject.org Date: Sun Dec 7 15:56:18 2014 +0530

Add label to indicate that all traffic goes over Tor (#13757) --- projects/instantbird/config | 1 + projects/instantbird/trafficinfo.patch | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+)

diff --git a/projects/instantbird/config b/projects/instantbird/config index d69d5cc..2a479cb 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -67,6 +67,7 @@ input_files: - filename: accountcreation.patch - filename: links.patch - filename: picture.patch + - filename: trafficinfo.patch - filename: fix-mingw-build.nsprpatch enable: '[% c("var/windows") %]' - filename: fix-mingw-build.patch diff --git a/projects/instantbird/trafficinfo.patch b/projects/instantbird/trafficinfo.patch new file mode 100644 index 0000000..c571b79 --- /dev/null +++ b/projects/instantbird/trafficinfo.patch @@ -0,0 +1,25 @@ +diff --git a/im/content/accountWizard.xul b/im/content/accountWizard.xul +index 5fa5b82..46447ff 100644 +--- a/im/content/accountWizard.xul ++++ b/im/content/accountWizard.xul +@@ -39,6 +39,8 @@ + <description class="top-proto-description" value="&accountProtocolShowMore.description;"/> + </richlistitem> + </richlistbox> ++ <separator class="thin"/> ++ <description>&accountProtocolInfo.label3;</description> + </wizardpage> + + <wizardpage id="accountprotocol" pageid="accountprotocol" next="accountusername" +diff --git a/im/locales/en-US/chrome/instantbird/accountWizard.dtd b/im/locales/en-US/chrome/instantbird/accountWizard.dtd +index 43d0f19..5492985 100644 +--- a/im/locales/en-US/chrome/instantbird/accountWizard.dtd ++++ b/im/locales/en-US/chrome/instantbird/accountWizard.dtd +@@ -6,6 +6,7 @@ + + <!ENTITY accountProtocolTitle.label "Protocol"> + <!ENTITY accountProtocolInfo.label2 "Please choose the protocol of your IM account."> ++<!ENTITY accountProtocolInfo.label3 "All traffic will be routed over the Tor network."> + <!ENTITY accountProtocolGetMore.label "Get more…"> + <!ENTITY accountProtocolShowMore.label "Show all protocols"> + <!ENTITY accountProtocolShowMore.description "Choose from the full list of protocols">