14 Commits

Author	SHA1	Message	Date
Jimmy Shih	fbd7f1b2b0	merge heads	2011-11-07 09:39:08 -08:00
Jimmy Shih	6ccb32c837	Clean up. Have ImportActivity call ImportAllTracks	2011-11-05 16:27:46 -07:00
Jimmy Shih	fe9e6d47a2	fix comment on 78a330b32e6f	2011-11-04 15:04:15 -07:00
Jimmy Shih	fe8cd0b884	merge heads	2011-11-04 14:30:35 -07:00
Jimmy Shih	f2c3673406	merge heads	2011-11-04 14:11:47 -07:00
Jimmy Shih	cc06c469ee	fix comment on 87a508c1fb9b	2011-11-04 13:50:25 -07:00
Jimmy Shih	684546f080	add translation descriptionws	2011-10-31 11:18:55 -07:00
Jimmy Shih	0f4483e2f8	add translation_description	2011-10-28 18:44:09 -07:00
Jimmy Shih	de9c3c94de	add translation descriptions for settings options	2011-10-28 16:23:45 -07:00
Jimmy Shih	1637d2202c	merge heads	2011-10-28 13:01:29 -07:00
Jimmy Shih	0b879eb5a0	fix comments for a4dd967c8b26	2011-10-28 12:43:36 -07:00
Jimmy Shih	d3ad49c4e1	merge heads	2011-10-27 18:59:10 -07:00
Jimmy Shih	2bacc8d7b8	add translation_description	2011-10-27 13:21:14 -07:00
Jimmy Shih	dfc5d61514	More translation_descriptions.	2011-10-26 18:04:49 -07:00