commit df65be620874997866cce05c67d583966ec708fa Author: Sukhbir Singh sukhbir@torproject.org Date: Sat Mar 19 07:53:08 2016 -0400

Rebase top-protocols.patch --- projects/instantbird/top-protocols.patch | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/projects/instantbird/top-protocols.patch b/projects/instantbird/top-protocols.patch index 59dbbe0..eb7c8f3 100644 --- a/projects/instantbird/top-protocols.patch +++ b/projects/instantbird/top-protocols.patch @@ -1,20 +1,18 @@ 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,13 +8,14 @@ +@@ -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-twitter,prpl-aim,prpl-yahoo,prpl-irc +topProtocol.list=prpl-irc,prpl-jabber,prpl-twitter,prpl-gtalk - + # 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 topProtocol.prpl-aim.description=Chat with your buddies on AOL Instant Messenger - topProtocol.prpl-yahoo.description=Chat with friends using Yahoo! Messenger