Commit Graph

25 Commits

Author SHA1 Message Date
Evan Prodromou
e3f4165d69 conflict resolution after pulling from mikenz
darcs-hash:20080713215601-84dde-371d54221d9ffbed500e8d3c9e0ad4bb15bd5c30.gz
2008-07-13 17:56:01 -04:00
Mike Cochrane
b104da04fb Colapse a lot of strings to make like easier for translators and more consisitant for users
darcs-hash:20080713053748-533db-1cdb0cf3a9e4102eb139b74a7a9d4f97dadb20b8.gz
2008-07-13 01:37:48 -04:00
Mike Cochrane
834c21b2aa Merge some gettext strings to one line so translation tools are happier
darcs-hash:20080713044608-533db-ee16aecee9b6d82b22ce6a25f6a9573c23eee9f8.gz
2008-07-13 00:46:08 -04:00
Evan Prodromou
a55044ac03 twiddle some parens in imsettings for gettext
darcs-hash:20080713130112-84dde-b3727f84de7db3bbe96b9d1003380b89402495de.gz
2008-07-13 09:01:12 -04:00
Mike Cochrane
4d65b99c68 Translate a few more strings.
darcs-hash:20080708100519-533db-b326ea0bb16ea6c8244cfd00a0dd639d0553dd21.gz
2008-07-08 06:05:19 -04:00
Mike Cochrane
0f502b8d86 Remove tralling whitespace on lines and a gettext replacement that I missed.
darcs-hash:20080708095113-533db-ad63bbde67b6275fb7ae944cc9882adf6f3be517.gz
2008-07-08 05:51:13 -04:00
Mike Cochrane
87b494f1eb Convert _t() to _() for gettext.
darcs-hash:20080708094531-533db-83399a46e6ec4c0fcc6249b0235961f969d1ae73.gz
2008-07-08 05:45:31 -04:00
Evan Prodromou
e4a1b9cde9 optionally queue jabber confirmations
darcs-hash:20080706035707-84dde-5403fe9bcb017c401fe5847527628df548e54499.gz
2008-07-05 23:57:07 -04:00
Evan Prodromou
721d6f94c7 method
darcs-hash:20080702131507-84dde-507a6380fcab66c1fbcbaad6d1399c8a2f210acf.gz
2008-07-02 09:15:07 -04:00
Evan Prodromou
5121cbebe4 return instructions
darcs-hash:20080630170653-84dde-e13ebf4ea364a6f12bb2692bc0278491a804c0fc.gz
2008-06-30 13:06:53 -04:00
Evan Prodromou
c64f137497 refactor common behaviour in settings pages
darcs-hash:20080630170342-84dde-5d7feb88a0a707b24c8070802a7ec99dd1f35687.gz
2008-06-30 13:03:42 -04:00
Evan Prodromou
453751263b add a space between address and to
darcs-hash:20080627154825-84dde-b876f7dff5e1b72b94432e26cf8af02e2c36d0cc.gz
2008-06-27 11:48:25 -04:00
Evan Prodromou
450d727458 "subscribe" -> "add to buddy list"
darcs-hash:20080627143025-84dde-fee234fbcdf825cccc2ce0c9c812dcb27ebe6433.gz
2008-06-27 10:30:25 -04:00
Evan Prodromou
48cac45fd9 don't bother with subscription hoohaw; just ask the user to do it
darcs-hash:20080626203103-34904-19ef53bc734622a310a705608f3e227e2f387904.gz
2008-06-26 16:31:03 -04:00
Evan Prodromou
31b5ae1523 compile error with lost dot
darcs-hash:20080626190538-34904-d160176208203bcc806e824874c75021b32b6f92.gz
2008-06-26 15:05:38 -04:00
Evan Prodromou
201a988bf7 better instructions on confirmation code
darcs-hash:20080626190307-34904-5aca9b62944d4e8f6170705dec822d30a1163401.gz
2008-06-26 15:03:07 -04:00
Evan Prodromou
0b0beda026 some variable names swapped around when I split up the big method
darcs-hash:20080626184811-34904-d5d7373acb89b06eb3f0854d83b0ac425a70d1e2.gz
2008-06-26 14:48:11 -04:00
Evan Prodromou
fcc12459ed forgot to clone user
darcs-hash:20080626183721-34904-7c03b34e911ddb0c4adba959402d49476be932c1.gz
2008-06-26 14:37:21 -04:00
Evan Prodromou
f5caccc827 show checkbox as checked or not
darcs-hash:20080626182705-34904-893d72f480c330beb2d8f871da0d2cd9b902ffbf.gz
2008-06-26 14:27:05 -04:00
Evan Prodromou
db2d79cd31 some UI changes to the IM settings
darcs-hash:20080626181144-34904-87503e70e6705b06ebb6c19910583f4fba1b22e0.gz
2008-06-26 14:11:44 -04:00
Evan Prodromou
e330eb50d2 more robust handling of new JIDs
darcs-hash:20080624015616-34904-c1ff985257c8c57aacf68439488d628a8b4d2e38.gz
2008-06-23 21:56:16 -04:00
Evan Prodromou
a8a2f40696 broadcast notices to jabber
darcs-hash:20080624014241-34904-39ace8e82e50e5f50c5980b5fb3256184a7c9050.gz
2008-06-23 21:42:41 -04:00
Evan Prodromou
d1e55b3777 jabber send and confirmation code
darcs-hash:20080624013203-34904-fe87dc6b3b991e9753512b8b7cc192f7610eb1dc.gz
2008-06-23 21:32:03 -04:00
Evan Prodromou
63dcbe1e6e add jabber library and use it
darcs-hash:20080624001523-34904-8d0c052f12301d86aeb9107149b34f22c94da1c4.gz
2008-06-23 20:15:23 -04:00
Evan Prodromou
ae40dfe842 add imsettings to menu
darcs-hash:20080623223641-34904-2758e19c70026a0c169e99d86481d87b0b4bc79c.gz
2008-06-23 18:36:41 -04:00