23 Commits

Author	SHA1	Message	Date
Jimmy Shih	fbd7f1b2b0	merge heads	2011-11-07 09:39:08 -08:00
Jimmy Shih	32bc71ae0f	merge heads	2011-11-07 09:27:10 -08:00
Jimmy Shih	6ccb32c837	Clean up. Have ImportActivity call ImportAllTracks	2011-11-05 16:27:46 -07:00
Jimmy Shih	014e5257d0	merge heads	2011-11-05 11:50:27 -07:00
Jimmy Shih	827e94b721	merge heads	2011-11-04 15:22:15 -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	496e0c0862	fix comment on 9f9c8f7cfb29	2011-11-04 14:16:01 -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	20346091c3	fix a typo in 4dcde424d9a9	2011-11-03 18:32:48 -07:00
Jimmy Shih	776f9bf360	Modify the check units flow so that it asks the user to pick either ... metric or imperial. Metric is the default. Thus no longer need to send the user to the 'Display' settings page.	2011-11-03 18:29:30 -07:00
Jimmy Shih	e640d4280a	add translation description	2011-10-31 13:59:58 -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	730048c70b	fix comments for e50bc8498bb2	2011-10-28 13:15:58 -07:00
Jimmy Shih	1637d2202c	merge heads	2011-10-28 13:01:29 -07:00
Jimmy Shih	8f642ad112	fix a typo on a4dd967c8b26	2011-10-28 12:48:30 -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