orbit-basic/config/locales
Fu Matthew 76296ab29b Merge branch 'sidebar_config' into ntu
Conflicts:
	app/controllers/admin/object_auths_new_interface_controller.rb
	app/controllers/orbit_backend_controller.rb
	app/controllers/orbit_widget_controller.rb
	app/models/module_app.rb
	app/views/admin/page_parts/_module_widget.html.erb
	config/locales/zh_tw.yml
	lib/parsers/parser_common.rb
	lib/parsers/parser_front_end.rb
2013-01-08 14:17:21 +08:00
..
devise.en.yml add i18n variables 2012-10-26 11:19:56 +08:00
devise.zh_tw.yml Clean translations 2012-12-04 00:17:12 +08:00
en.yml Add translations 2013-01-07 10:42:17 +08:00
mobile.en.yml Add mobile but remove news in it 2013-01-07 03:03:38 +08:00
mobile.zh_tw.yml Add mobile but remove news in it 2013-01-07 03:03:38 +08:00
mongoid.zh_tw.yml Clean translations 2012-12-04 00:17:12 +08:00
rails.zh_tw.yml Clean translations 2012-12-04 00:17:12 +08:00
social_share_button.en.yml first version of fb_share 2012-08-08 11:04:19 +08:00
social_share_button.zh-tw.yml first version of fb_share 2012-08-08 11:04:19 +08:00
zh_tw.yml Merge branch 'sidebar_config' into ntu 2013-01-08 14:17:21 +08:00