Merge branch 'cronchy' into 'cronchy'

indra/newview/skins/default/html/ja/help-offline/index.html

indra/newview/skins/default/html/ja/loading-error/index.html

indra/newview/skins/default/html/ja/loading/loading.html

indra/newview/skins/default/xui/ja/alert_line_editor.xml

...ew/skins/default/xui/ja/control_table_contents_camera.xml

...s/default/xui/ja/control_table_contents_columns_basic.xml

...w/skins/default/xui/ja/control_table_contents_editing.xml

...iew/skins/default/xui/ja/control_table_contents_media.xml

.../skins/default/xui/ja/control_table_contents_movement.xml

indra/newview/skins/default/xui/ja/floater_360capture.xml

indra/newview/skins/default/xui/ja/floater_aaa.xml

indra/newview/skins/default/xui/ja/floater_about.xml

indra/newview/skins/default/xui/ja/floater_about_land.xml

indra/newview/skins/default/xui/ja/floater_activeim.xml

...wview/skins/default/xui/ja/floater_add_payment_method.xml

...wview/skins/default/xui/ja/floater_adjust_environment.xml

...w/skins/default/xui/ja/floater_animation_anim_preview.xml

...ew/skins/default/xui/ja/floater_animation_bvh_preview.xml

indra/newview/skins/default/xui/ja/floater_ao.xml

...a/newview/skins/default/xui/ja/floater_asset_recovery.xml