automated merge

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

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

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

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

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

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

...ewview/skins/default/xui/pt/floater_buy_currency_html.xml

indra/newview/skins/default/xui/pt/floater_map.xml

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

...newview/skins/default/xui/pt/floater_preview_notecard.xml

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

indra/newview/skins/default/xui/pt/menu_attachment_self.xml

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

indra/newview/skins/default/xui/pt/menu_bottomtray.xml

...a/newview/skins/default/xui/pt/menu_inspect_self_gear.xml

indra/newview/skins/default/xui/pt/menu_inventory.xml

indra/newview/skins/default/xui/pt/menu_login.xml

indra/newview/skins/default/xui/pt/menu_participant_list.xml

indra/newview/skins/default/xui/pt/menu_viewer.xml

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