automated merge

.../newview/skins/default/xui/fr/floater_preview_gesture.xml

indra/newview/skins/default/xui/fr/floater_tools.xml

indra/newview/skins/default/xui/fr/notifications.xml

indra/newview/skins/default/xui/fr/panel_edit_pick.xml

...ewview/skins/default/xui/fr/panel_group_control_panel.xml

indra/newview/skins/default/xui/fr/panel_group_notices.xml

indra/newview/skins/default/xui/fr/panel_notes.xml

indra/newview/skins/default/xui/fr/panel_people.xml

...wview/skins/default/xui/fr/panel_preferences_advanced.xml

indra/newview/skins/default/xui/fr/panel_profile.xml

indra/newview/skins/default/xui/fr/strings.xml

.../newview/skins/default/xui/ja/floater_avatar_textures.xml

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

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

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

.../skins/default/xui/ja/panel_bodyparts_list_button_bar.xml

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

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

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

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