commit f4dd3e5f03418524758ab00b939911b01b3a1278 Author: Sukhbir Singh sukhbir@torproject.org Date: Sat Apr 25 09:52:00 2015 -0400

Rename accountcreation.patch to top-protocols.patch --- projects/instantbird/accountcreation.patch | 26 -------------------------- projects/instantbird/config | 2 +- projects/instantbird/top-protocols.patch | 26 ++++++++++++++++++++++++++ 3 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/projects/instantbird/accountcreation.patch b/projects/instantbird/accountcreation.patch deleted file mode 100644 index c6c58a5..0000000 --- a/projects/instantbird/accountcreation.patch +++ /dev/null @@ -1,26 +0,0 @@ -# HG changeset patch -# User Sukhbir Singh sukhbir@torproject.org -# Date 1414029949 -19800 -# Thu Oct 23 07:35:49 2014 +0530 -# Node ID 947732f86131ec2882340344ba0c29cc9943de48 -# Parent 1d142c56cdf63cb3b0bcab81607c72c4b8a04599 -Redesign the account creation protocol screen (closes #13323) - -diff --git a/im/locales/en-US/chrome/instantbird/accountWizard.properties b/im/locales/en-US/chrome/instantbird/accountWizard.properties ---- 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-msn,prpl-yahoo -+topProtocol.list=prpl-irc,prpl-jabber,prpl-gtalk,prpl-facebook - - # LOCALIZATION NOTE - # These are the descriptions of the top protocols specified above. - # A description should be provided for each protocol ID listed above. -+topProtocol.prpl-irc.description=Connect to your favourite IRC network -+topProtocol.prpl-jabber.description=Chat with friends using XMPP - topProtocol.prpl-gtalk.description=Talk to your Gmail contacts - topProtocol.prpl-facebook.description=Communicate with Facebook friends - topProtocol.prpl-twitter.description=Stay up to date with your Twitter timeline diff --git a/projects/instantbird/config b/projects/instantbird/config index ca653ff..c9593c9 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -61,7 +61,7 @@ input_files: - filename: irc.patch - filename: xmpp.patch - filename: gtalk-resource.patch - - filename: accountcreation.patch + - filename: top-protocols.patch - filename: disable-links.patch - filename: account-picture.patch - filename: show-traffic-tor.patch diff --git a/projects/instantbird/top-protocols.patch b/projects/instantbird/top-protocols.patch new file mode 100644 index 0000000..c6c58a5 --- /dev/null +++ b/projects/instantbird/top-protocols.patch @@ -0,0 +1,26 @@ +# HG changeset patch +# User Sukhbir Singh sukhbir@torproject.org +# Date 1414029949 -19800 +# Thu Oct 23 07:35:49 2014 +0530 +# Node ID 947732f86131ec2882340344ba0c29cc9943de48 +# Parent 1d142c56cdf63cb3b0bcab81607c72c4b8a04599 +Redesign the account creation protocol screen (closes #13323) + +diff --git a/im/locales/en-US/chrome/instantbird/accountWizard.properties b/im/locales/en-US/chrome/instantbird/accountWizard.properties +--- 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-msn,prpl-yahoo ++topProtocol.list=prpl-irc,prpl-jabber,prpl-gtalk,prpl-facebook + + # LOCALIZATION NOTE + # These are the descriptions of the top protocols specified above. + # A description should be provided for each protocol ID listed above. ++topProtocol.prpl-irc.description=Connect to your favourite IRC network ++topProtocol.prpl-jabber.description=Chat with friends using XMPP + topProtocol.prpl-gtalk.description=Talk to your Gmail contacts + topProtocol.prpl-facebook.description=Communicate with Facebook friends + topProtocol.prpl-twitter.description=Stay up to date with your Twitter timeline