summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/skins/default')
-rw-r--r--indra/newview/skins/default/textures/arrow_keys.pngbin6558 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/bottomtray/Cam_Pan_Over.pngbin275 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/bottomtray/CameraView_Press.pngbin489 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/bottomtray/PanOrbit_Disabled.pngbin50975 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/bottomtray/PanOrbit_Over.pngbin54713 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/bottomtray/PanOrbit_Press.pngbin51053 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl1_Dark.pngbin0 -> 602 bytes
-rw-r--r--indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl2_Dark.pngbin0 -> 669 bytes
-rw-r--r--indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl3_Dark.pngbin0 -> 639 bytes
-rw-r--r--indra/newview/skins/default/textures/bottomtray/VoicePTT_Off_Dark.pngbin0 -> 547 bytes
-rw-r--r--indra/newview/skins/default/textures/bottomtray/VoicePTT_On_Dark.pngbin0 -> 526 bytes
-rw-r--r--indra/newview/skins/default/textures/checkerboard_transparency_bg.pngbin1110 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/circle.tgabin1068 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/containers/Accordion_ArrowClosed_Over.pngbin170 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/containers/Accordion_ArrowOpened_Over.pngbin162 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/containers/TabTop_Left_Over.pngbin337 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/containers/TabTop_Middle_Over.pngbin285 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/containers/TabTop_Right_Over.pngbin362 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/icn_label_web.tgabin4140 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/icn_media.tgabin4140 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/icn_voice-groupfocus.tgabin1068 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/icn_voice-localchat.tgabin1068 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/icn_voice-pvtfocus.tgabin1068 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/icon_day_cycle.tgabin25682 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/icon_event_adult.tgabin1006 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/icon_lock.tgabin1030 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/icons/AddItem_Over.pngbin165 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/icons/BackArrow_Over.pngbin214 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/icons/DragHandle.pngbin163 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/icons/Generic_Object.pngbin366 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/icons/Inv_Gift.pngbin1335 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/icons/OptionsMenu_Over.pngbin277 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/icons/OutboxPush_On_Selected.pngbin1912 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/icons/Parcel_Damage_Light_Alt.pngbin285 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/icons/Parcel_NoScripts_Light.pngbin620 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/icons/TrashItem_Over.pngbin201 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/icons/parcel_color_EVRY.pngbin393 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/icons/parcel_color_EXP.pngbin272 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/icons/parcel_color_M.pngbin306 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/image_edit_icon.tgabin3116 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/inv_folder_animation.tgabin1068 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/inv_folder_inbox.tgabin2085 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/map_avatar_above_8.tgabin300 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/map_avatar_below_8.tgabin300 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/map_event_adult.tgabin1006 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/map_event_mature.tgabin1068 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/map_track_8.tgabin300 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/model_wizard/divider_line.pngbin2815 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/mute_icon.tgabin1042 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/navbar/Arrow_Left_Over.pngbin381 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/navbar/Arrow_Right_Over.pngbin379 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/navbar/Help_Over.pngbin348 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/navbar/Home_Over.pngbin330 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/places_rating_adult.tgabin648 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/places_rating_mature.tgabin1068 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/places_rating_pg.tgabin1068 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/propertyline.tgabin2092 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/quick_tips/avatar_free_mode.pngbin1447 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/quick_tips/camera_free_mode.pngbin2267 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/quick_tips/camera_orbit_mode.pngbin2381 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/quick_tips/camera_pan_mode.pngbin2418 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/quick_tips/camera_preset_front_view.pngbin2365 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/quick_tips/camera_preset_group_view.pngbin2595 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/quick_tips/camera_preset_rear_view.pngbin2221 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/quick_tips/move_fly_first.pngbin1528 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/quick_tips/move_fly_second.pngbin2128 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/quick_tips/move_run_first.pngbin1554 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/quick_tips/move_run_second.pngbin2534 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/quick_tips/move_walk_first.pngbin2106 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/quick_tips/move_walk_second.pngbin3108 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/show_btn.tgabin3884 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/show_btn_selected.tgabin3884 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/smicon_warn.tgabin1068 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/snapshot_download.pngbin0 -> 1226 bytes
-rw-r--r--indra/newview/skins/default/textures/snapshot_email.pngbin0 -> 1231 bytes
-rw-r--r--indra/newview/skins/default/textures/spacer35.tgabin3404 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/square_btn_32x128.tgabin6292 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/square_btn_selected_32x128.tgabin6983 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/startup_logo.j2cbin69118 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/status_busy.tgabin4140 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/taskpanel/TabIcon_Appearance_Off.pngbin273 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/taskpanel/TabIcon_Appearance_Selected.pngbin349 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/taskpanel/TabIcon_Home_Off.pngbin749 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/taskpanel/TabIcon_Me_Selected.pngbin359 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/taskpanel/TabIcon_People_Selected.pngbin536 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/taskpanel/TabIcon_Places_Large.pngbin709 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/taskpanel/TabIcon_Places_Selected.pngbin653 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/taskpanel/TabIcon_Things_Selected.pngbin297 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/textures.xml33
-rw-r--r--indra/newview/skins/default/textures/widgets/Checkbox_On_Over.pngbin547 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/widgets/Checkbox_Over.pngbin318 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/widgets/ComboButton_Up_On_Selected.pngbin482 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/widgets/DisclosureArrow_Closed_Over.pngbin164 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/widgets/DisclosureArrow_Opened_Over.pngbin165 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/widgets/PushButton_On_Over.pngbin498 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/widgets/PushButton_Selected_Over.pngbin498 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/widgets/RadioButton_On_Over.pngbin635 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/widgets/RadioButton_Over.pngbin575 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/widgets/ScrollArrow_Down_Over.pngbin257 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/widgets/ScrollArrow_Left_Over.pngbin295 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/widgets/ScrollArrow_Right_Over.pngbin283 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/widgets/ScrollArrow_Up_Over.pngbin276 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/widgets/ScrollThumb_Horiz_Over.pngbin311 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/widgets/ScrollThumb_Vert_Over.pngbin311 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_On.pngbin404 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_On_Disabled.pngbin404 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_On_Over.pngbin394 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_On_Selected.pngbin495 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_On.pngbin308 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_On_Over.pngbin300 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_On_Press.pngbin393 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Over.pngbin286 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected_Over.pngbin300 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_On.pngbin420 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_On_Over.pngbin416 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Selected_Over.pngbin416 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/widgets/SliderThumb_Over.pngbin482 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/widgets/Stepper_Down_Over.pngbin310 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/widgets/Stepper_Up_Over.pngbin314 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/windows/Flyout.pngbin820 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/windows/Flyout_Pointer_Up.pngbin260 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/windows/Icon_Gear_Over.pngbin293 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/windows/Icon_Undock_Press.pngbin267 -> 0 bytes
-rw-r--r--indra/newview/skins/default/xui/da/floater_nearby_chat.xml2
-rw-r--r--indra/newview/skins/default/xui/da/panel_preferences_chat.xml2
-rw-r--r--indra/newview/skins/default/xui/da/teleport_strings.xml4
-rw-r--r--indra/newview/skins/default/xui/de/floater_nearby_chat.xml2
-rw-r--r--indra/newview/skins/default/xui/de/panel_nearby_chat.xml2
-rw-r--r--indra/newview/skins/default/xui/de/panel_preferences_chat.xml2
-rw-r--r--indra/newview/skins/default/xui/de/teleport_strings.xml4
-rw-r--r--indra/newview/skins/default/xui/en/floater_about_land.xml2
-rw-r--r--indra/newview/skins/default/xui/en/floater_avatar.xml4
-rw-r--r--indra/newview/skins/default/xui/en/floater_buy_currency_html.xml1
-rw-r--r--indra/newview/skins/default/xui/en/floater_model_preview.xml5
-rw-r--r--indra/newview/skins/default/xui/en/floater_snapshot.xml724
-rw-r--r--indra/newview/skins/default/xui/en/floater_toybox.xml24
-rw-r--r--indra/newview/skins/default/xui/en/floater_translation_settings.xml2
-rw-r--r--indra/newview/skins/default/xui/en/floater_world_map.xml2
-rw-r--r--indra/newview/skins/default/xui/en/menu_login.xml7
-rw-r--r--indra/newview/skins/default/xui/en/menu_toolbars.xml8
-rw-r--r--indra/newview/skins/default/xui/en/menu_viewer.xml16
-rw-r--r--indra/newview/skins/default/xui/en/notifications.xml18
-rw-r--r--indra/newview/skins/default/xui/en/panel_edit_jacket.xml2
-rw-r--r--indra/newview/skins/default/xui/en/panel_login.xml22
-rw-r--r--indra/newview/skins/default/xui/en/panel_nearby_chat.xml2
-rw-r--r--indra/newview/skins/default/xui/en/panel_places.xml4
-rw-r--r--indra/newview/skins/default/xui/en/panel_postcard_message.xml (renamed from indra/newview/skins/default/xui/en/floater_postcard.xml)110
-rw-r--r--indra/newview/skins/default/xui/en/panel_postcard_settings.xml137
-rw-r--r--indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml147
-rw-r--r--indra/newview/skins/default/xui/en/panel_snapshot_local.xml236
-rw-r--r--indra/newview/skins/default/xui/en/panel_snapshot_options.xml84
-rw-r--r--indra/newview/skins/default/xui/en/panel_snapshot_postcard.xml107
-rw-r--r--indra/newview/skins/default/xui/en/panel_snapshot_profile.xml200
-rw-r--r--indra/newview/skins/default/xui/en/strings.xml8
-rw-r--r--indra/newview/skins/default/xui/en/teleport_strings.xml4
-rw-r--r--indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml21
-rw-r--r--indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml21
-rw-r--r--indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml21
-rw-r--r--indra/newview/skins/default/xui/en/widgets/inbox_folder_view_item.xml19
-rw-r--r--indra/newview/skins/default/xui/es/floater_nearby_chat.xml2
-rw-r--r--indra/newview/skins/default/xui/es/panel_nearby_chat.xml2
-rw-r--r--indra/newview/skins/default/xui/es/panel_people.xml2
-rw-r--r--indra/newview/skins/default/xui/es/panel_preferences_chat.xml2
-rw-r--r--indra/newview/skins/default/xui/es/strings.xml3
-rw-r--r--indra/newview/skins/default/xui/es/teleport_strings.xml4
-rw-r--r--indra/newview/skins/default/xui/fr/floater_nearby_chat.xml2
-rw-r--r--indra/newview/skins/default/xui/fr/panel_nearby_chat.xml2
-rw-r--r--indra/newview/skins/default/xui/fr/panel_preferences_chat.xml2
-rw-r--r--indra/newview/skins/default/xui/fr/panel_preferences_privacy.xml2
-rw-r--r--indra/newview/skins/default/xui/fr/panel_preferences_sound.xml6
-rw-r--r--indra/newview/skins/default/xui/fr/panel_region_debug.xml2
-rw-r--r--indra/newview/skins/default/xui/fr/strings.xml2
-rw-r--r--indra/newview/skins/default/xui/fr/teleport_strings.xml4
-rw-r--r--indra/newview/skins/default/xui/it/floater_nearby_chat.xml2
-rw-r--r--indra/newview/skins/default/xui/it/panel_nearby_chat.xml2
-rw-r--r--indra/newview/skins/default/xui/it/panel_preferences_chat.xml4
-rw-r--r--indra/newview/skins/default/xui/it/teleport_strings.xml4
-rw-r--r--indra/newview/skins/default/xui/ja/floater_nearby_chat.xml2
-rw-r--r--indra/newview/skins/default/xui/ja/panel_nearby_chat.xml2
-rw-r--r--indra/newview/skins/default/xui/ja/panel_preferences_chat.xml4
-rw-r--r--indra/newview/skins/default/xui/ja/teleport_strings.xml4
-rw-r--r--indra/newview/skins/default/xui/pl/floater_nearby_chat.xml2
-rw-r--r--indra/newview/skins/default/xui/pl/panel_preferences_chat.xml2
-rw-r--r--indra/newview/skins/default/xui/pl/teleport_strings.xml4
-rw-r--r--indra/newview/skins/default/xui/pt/floater_nearby_chat.xml2
-rw-r--r--indra/newview/skins/default/xui/pt/panel_nearby_chat.xml2
-rw-r--r--indra/newview/skins/default/xui/pt/panel_preferences_chat.xml2
-rw-r--r--indra/newview/skins/default/xui/pt/teleport_strings.xml4
-rw-r--r--indra/newview/skins/default/xui/ru/floater_about_land.xml34
-rw-r--r--indra/newview/skins/default/xui/ru/floater_bulk_perms.xml2
-rw-r--r--indra/newview/skins/default/xui/ru/floater_buy_currency.xml2
-rw-r--r--indra/newview/skins/default/xui/ru/floater_color_picker.xml2
-rw-r--r--indra/newview/skins/default/xui/ru/floater_destinations.xml2
-rw-r--r--indra/newview/skins/default/xui/ru/floater_edit_day_cycle.xml18
-rw-r--r--indra/newview/skins/default/xui/ru/floater_edit_sky_preset.xml8
-rw-r--r--indra/newview/skins/default/xui/ru/floater_edit_water_preset.xml2
-rw-r--r--indra/newview/skins/default/xui/ru/floater_god_tools.xml4
-rw-r--r--indra/newview/skins/default/xui/ru/floater_image_preview.xml2
-rw-r--r--indra/newview/skins/default/xui/ru/floater_joystick.xml2
-rw-r--r--indra/newview/skins/default/xui/ru/floater_lagmeter.xml2
-rw-r--r--indra/newview/skins/default/xui/ru/floater_land_holdings.xml2
-rw-r--r--indra/newview/skins/default/xui/ru/floater_model_wizard.xml8
-rw-r--r--indra/newview/skins/default/xui/ru/floater_nearby_chat.xml2
-rw-r--r--indra/newview/skins/default/xui/ru/floater_select_key.xml2
-rw-r--r--indra/newview/skins/default/xui/ru/floater_snapshot.xml2
-rw-r--r--indra/newview/skins/default/xui/ru/floater_tools.xml46
-rw-r--r--indra/newview/skins/default/xui/ru/floater_toybox.xml2
-rw-r--r--indra/newview/skins/default/xui/ru/floater_voice_controls.xml2
-rw-r--r--indra/newview/skins/default/xui/ru/floater_windlight_options.xml2
-rw-r--r--indra/newview/skins/default/xui/ru/floater_world_map.xml4
-rw-r--r--indra/newview/skins/default/xui/ru/menu_attachment_other.xml2
-rw-r--r--indra/newview/skins/default/xui/ru/menu_gesture_gear.xml2
-rw-r--r--indra/newview/skins/default/xui/ru/menu_inventory_gear_default.xml2
-rw-r--r--indra/newview/skins/default/xui/ru/menu_landmark.xml2
-rw-r--r--indra/newview/skins/default/xui/ru/menu_model_import_gear_default.xml2
-rw-r--r--indra/newview/skins/default/xui/ru/menu_participant_list.xml2
-rw-r--r--indra/newview/skins/default/xui/ru/menu_places_gear_landmark.xml2
-rw-r--r--indra/newview/skins/default/xui/ru/menu_viewer.xml4
-rw-r--r--indra/newview/skins/default/xui/ru/notifications.xml12
-rw-r--r--indra/newview/skins/default/xui/ru/panel_edit_alpha.xml4
-rw-r--r--indra/newview/skins/default/xui/ru/panel_edit_shape.xml2
-rw-r--r--indra/newview/skins/default/xui/ru/panel_im_control_panel.xml2
-rw-r--r--indra/newview/skins/default/xui/ru/panel_landmarks.xml2
-rw-r--r--indra/newview/skins/default/xui/ru/panel_navigation_bar.xml2
-rw-r--r--indra/newview/skins/default/xui/ru/panel_nearby_chat.xml2
-rw-r--r--indra/newview/skins/default/xui/ru/panel_notes.xml2
-rw-r--r--indra/newview/skins/default/xui/ru/panel_outfit_edit.xml4
-rw-r--r--indra/newview/skins/default/xui/ru/panel_people.xml10
-rw-r--r--indra/newview/skins/default/xui/ru/panel_preferences_chat.xml2
-rw-r--r--indra/newview/skins/default/xui/ru/panel_preferences_move.xml6
-rw-r--r--indra/newview/skins/default/xui/ru/panel_profile.xml4
-rw-r--r--indra/newview/skins/default/xui/ru/panel_region_estate.xml6
-rw-r--r--indra/newview/skins/default/xui/ru/panel_region_general.xml6
-rw-r--r--indra/newview/skins/default/xui/ru/panel_region_terrain.xml28
-rw-r--r--indra/newview/skins/default/xui/ru/panel_region_texture.xml24
-rw-r--r--indra/newview/skins/default/xui/ru/strings.xml178
-rw-r--r--indra/newview/skins/default/xui/ru/teleport_strings.xml4
-rw-r--r--indra/newview/skins/default/xui/tr/floater_about.xml6
-rw-r--r--indra/newview/skins/default/xui/tr/floater_about_land.xml16
-rw-r--r--indra/newview/skins/default/xui/tr/floater_buy_land.xml4
-rw-r--r--indra/newview/skins/default/xui/tr/floater_edit_day_cycle.xml4
-rw-r--r--indra/newview/skins/default/xui/tr/floater_environment_settings.xml2
-rw-r--r--indra/newview/skins/default/xui/tr/floater_god_tools.xml2
-rw-r--r--indra/newview/skins/default/xui/tr/floater_joystick.xml8
-rw-r--r--indra/newview/skins/default/xui/tr/floater_nearby_chat.xml2
-rw-r--r--indra/newview/skins/default/xui/tr/floater_preferences.xml2
-rw-r--r--indra/newview/skins/default/xui/tr/floater_preview_gesture.xml2
-rw-r--r--indra/newview/skins/default/xui/tr/floater_report_abuse.xml2
-rw-r--r--indra/newview/skins/default/xui/tr/floater_tools.xml6
-rw-r--r--indra/newview/skins/default/xui/tr/menu_viewer.xml4
-rw-r--r--indra/newview/skins/default/xui/tr/notifications.xml2
-rw-r--r--indra/newview/skins/default/xui/tr/panel_nearby_chat.xml2
-rw-r--r--indra/newview/skins/default/xui/tr/panel_people.xml6
-rw-r--r--indra/newview/skins/default/xui/tr/panel_preferences_advanced.xml4
-rw-r--r--indra/newview/skins/default/xui/tr/panel_preferences_chat.xml6
-rw-r--r--indra/newview/skins/default/xui/tr/panel_preferences_general.xml2
-rw-r--r--indra/newview/skins/default/xui/tr/panel_preferences_graphics1.xml4
-rw-r--r--indra/newview/skins/default/xui/tr/panel_preferences_privacy.xml2
-rw-r--r--indra/newview/skins/default/xui/tr/panel_region_debug.xml4
-rw-r--r--indra/newview/skins/default/xui/tr/panel_region_environment.xml2
-rw-r--r--indra/newview/skins/default/xui/tr/panel_region_terrain.xml2
-rw-r--r--indra/newview/skins/default/xui/tr/role_actions.xml2
-rw-r--r--indra/newview/skins/default/xui/tr/sidepanel_task_info.xml2
-rw-r--r--indra/newview/skins/default/xui/tr/strings.xml92
-rw-r--r--indra/newview/skins/default/xui/tr/teleport_strings.xml4
-rw-r--r--indra/newview/skins/default/xui/zh/floater_nearby_chat.xml2
-rw-r--r--indra/newview/skins/default/xui/zh/panel_preferences_chat.xml2
-rw-r--r--indra/newview/skins/default/xui/zh/teleport_strings.xml4
268 files changed, 1874 insertions, 888 deletions
diff --git a/indra/newview/skins/default/textures/arrow_keys.png b/indra/newview/skins/default/textures/arrow_keys.png
deleted file mode 100644
index f19af59251..0000000000
--- a/indra/newview/skins/default/textures/arrow_keys.png
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/bottomtray/Cam_Pan_Over.png b/indra/newview/skins/default/textures/bottomtray/Cam_Pan_Over.png
deleted file mode 100644
index b5781718ec..0000000000
--- a/indra/newview/skins/default/textures/bottomtray/Cam_Pan_Over.png
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/bottomtray/CameraView_Press.png b/indra/newview/skins/default/textures/bottomtray/CameraView_Press.png
deleted file mode 100644
index 5a9346fd39..0000000000
--- a/indra/newview/skins/default/textures/bottomtray/CameraView_Press.png
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/bottomtray/PanOrbit_Disabled.png b/indra/newview/skins/default/textures/bottomtray/PanOrbit_Disabled.png
deleted file mode 100644
index 20fa40e127..0000000000
--- a/indra/newview/skins/default/textures/bottomtray/PanOrbit_Disabled.png
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/bottomtray/PanOrbit_Over.png b/indra/newview/skins/default/textures/bottomtray/PanOrbit_Over.png
deleted file mode 100644
index f1420e0002..0000000000
--- a/indra/newview/skins/default/textures/bottomtray/PanOrbit_Over.png
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/bottomtray/PanOrbit_Press.png b/indra/newview/skins/default/textures/bottomtray/PanOrbit_Press.png
deleted file mode 100644
index 89a6269edc..0000000000
--- a/indra/newview/skins/default/textures/bottomtray/PanOrbit_Press.png
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl1_Dark.png b/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl1_Dark.png
new file mode 100644
index 0000000000..857fa1e047
--- /dev/null
+++ b/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl1_Dark.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl2_Dark.png b/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl2_Dark.png
new file mode 100644
index 0000000000..453bb53673
--- /dev/null
+++ b/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl2_Dark.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl3_Dark.png b/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl3_Dark.png
new file mode 100644
index 0000000000..135a66ca0d
--- /dev/null
+++ b/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl3_Dark.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/bottomtray/VoicePTT_Off_Dark.png b/indra/newview/skins/default/textures/bottomtray/VoicePTT_Off_Dark.png
new file mode 100644
index 0000000000..a63aec5e6d
--- /dev/null
+++ b/indra/newview/skins/default/textures/bottomtray/VoicePTT_Off_Dark.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/bottomtray/VoicePTT_On_Dark.png b/indra/newview/skins/default/textures/bottomtray/VoicePTT_On_Dark.png
new file mode 100644
index 0000000000..1719eb3e84
--- /dev/null
+++ b/indra/newview/skins/default/textures/bottomtray/VoicePTT_On_Dark.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/checkerboard_transparency_bg.png b/indra/newview/skins/default/textures/checkerboard_transparency_bg.png
deleted file mode 100644
index 9a16935204..0000000000
--- a/indra/newview/skins/default/textures/checkerboard_transparency_bg.png
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/circle.tga b/indra/newview/skins/default/textures/circle.tga
deleted file mode 100644
index d7097e3a35..0000000000
--- a/indra/newview/skins/default/textures/circle.tga
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/containers/Accordion_ArrowClosed_Over.png b/indra/newview/skins/default/textures/containers/Accordion_ArrowClosed_Over.png
deleted file mode 100644
index e47f913db1..0000000000
--- a/indra/newview/skins/default/textures/containers/Accordion_ArrowClosed_Over.png
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/containers/Accordion_ArrowOpened_Over.png b/indra/newview/skins/default/textures/containers/Accordion_ArrowOpened_Over.png
deleted file mode 100644
index e2c67de9c0..0000000000
--- a/indra/newview/skins/default/textures/containers/Accordion_ArrowOpened_Over.png
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/containers/TabTop_Left_Over.png b/indra/newview/skins/default/textures/containers/TabTop_Left_Over.png
deleted file mode 100644
index 295cd89a57..0000000000
--- a/indra/newview/skins/default/textures/containers/TabTop_Left_Over.png
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/containers/TabTop_Middle_Over.png b/indra/newview/skins/default/textures/containers/TabTop_Middle_Over.png
deleted file mode 100644
index 0758cbcf0d..0000000000
--- a/indra/newview/skins/default/textures/containers/TabTop_Middle_Over.png
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/containers/TabTop_Right_Over.png b/indra/newview/skins/default/textures/containers/TabTop_Right_Over.png
deleted file mode 100644
index c2cbc2b1e5..0000000000
--- a/indra/newview/skins/default/textures/containers/TabTop_Right_Over.png
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/icn_label_web.tga b/indra/newview/skins/default/textures/icn_label_web.tga
deleted file mode 100644
index 7c9131dfff..0000000000
--- a/indra/newview/skins/default/textures/icn_label_web.tga
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/icn_media.tga b/indra/newview/skins/default/textures/icn_media.tga
deleted file mode 100644
index 43dd342c9d..0000000000
--- a/indra/newview/skins/default/textures/icn_media.tga
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/icn_voice-groupfocus.tga b/indra/newview/skins/default/textures/icn_voice-groupfocus.tga
deleted file mode 100644
index 9f48d4609d..0000000000
--- a/indra/newview/skins/default/textures/icn_voice-groupfocus.tga
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/icn_voice-localchat.tga b/indra/newview/skins/default/textures/icn_voice-localchat.tga
deleted file mode 100644
index 7cf267eaf5..0000000000
--- a/indra/newview/skins/default/textures/icn_voice-localchat.tga
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/icn_voice-pvtfocus.tga b/indra/newview/skins/default/textures/icn_voice-pvtfocus.tga
deleted file mode 100644
index abadb09aaf..0000000000
--- a/indra/newview/skins/default/textures/icn_voice-pvtfocus.tga
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/icon_day_cycle.tga b/indra/newview/skins/default/textures/icon_day_cycle.tga
deleted file mode 100644
index 2d5dee1e94..0000000000
--- a/indra/newview/skins/default/textures/icon_day_cycle.tga
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/icon_event_adult.tga b/indra/newview/skins/default/textures/icon_event_adult.tga
deleted file mode 100644
index f548126e5a..0000000000
--- a/indra/newview/skins/default/textures/icon_event_adult.tga
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/icon_lock.tga b/indra/newview/skins/default/textures/icon_lock.tga
deleted file mode 100644
index 23521aa113..0000000000
--- a/indra/newview/skins/default/textures/icon_lock.tga
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/icons/AddItem_Over.png b/indra/newview/skins/default/textures/icons/AddItem_Over.png
deleted file mode 100644
index cad6e8d52f..0000000000
--- a/indra/newview/skins/default/textures/icons/AddItem_Over.png
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/icons/BackArrow_Over.png b/indra/newview/skins/default/textures/icons/BackArrow_Over.png
deleted file mode 100644
index b36e03a8cf..0000000000
--- a/indra/newview/skins/default/textures/icons/BackArrow_Over.png
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/icons/DragHandle.png b/indra/newview/skins/default/textures/icons/DragHandle.png
deleted file mode 100644
index c3cbc07a33..0000000000
--- a/indra/newview/skins/default/textures/icons/DragHandle.png
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/icons/Generic_Object.png b/indra/newview/skins/default/textures/icons/Generic_Object.png
deleted file mode 100644
index e3a80b2aef..0000000000
--- a/indra/newview/skins/default/textures/icons/Generic_Object.png
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/icons/Inv_Gift.png b/indra/newview/skins/default/textures/icons/Inv_Gift.png
deleted file mode 100644
index 5afe85d72d..0000000000
--- a/indra/newview/skins/default/textures/icons/Inv_Gift.png
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/icons/OptionsMenu_Over.png b/indra/newview/skins/default/textures/icons/OptionsMenu_Over.png
deleted file mode 100644
index fcabd4c6d3..0000000000
--- a/indra/newview/skins/default/textures/icons/OptionsMenu_Over.png
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_On_Selected.png b/indra/newview/skins/default/textures/icons/OutboxPush_On_Selected.png
deleted file mode 100644
index 0e60b417b0..0000000000
--- a/indra/newview/skins/default/textures/icons/OutboxPush_On_Selected.png
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/icons/Parcel_Damage_Light_Alt.png b/indra/newview/skins/default/textures/icons/Parcel_Damage_Light_Alt.png
deleted file mode 100644
index d72f02f708..0000000000
--- a/indra/newview/skins/default/textures/icons/Parcel_Damage_Light_Alt.png
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/icons/Parcel_NoScripts_Light.png b/indra/newview/skins/default/textures/icons/Parcel_NoScripts_Light.png
deleted file mode 100644
index f82354959e..0000000000
--- a/indra/newview/skins/default/textures/icons/Parcel_NoScripts_Light.png
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/icons/TrashItem_Over.png b/indra/newview/skins/default/textures/icons/TrashItem_Over.png
deleted file mode 100644
index 1a0eea6c67..0000000000
--- a/indra/newview/skins/default/textures/icons/TrashItem_Over.png
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/icons/parcel_color_EVRY.png b/indra/newview/skins/default/textures/icons/parcel_color_EVRY.png
deleted file mode 100644
index b5508423eb..0000000000
--- a/indra/newview/skins/default/textures/icons/parcel_color_EVRY.png
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/icons/parcel_color_EXP.png b/indra/newview/skins/default/textures/icons/parcel_color_EXP.png
deleted file mode 100644
index 4813d37198..0000000000
--- a/indra/newview/skins/default/textures/icons/parcel_color_EXP.png
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/icons/parcel_color_M.png b/indra/newview/skins/default/textures/icons/parcel_color_M.png
deleted file mode 100644
index 41984c43e4..0000000000
--- a/indra/newview/skins/default/textures/icons/parcel_color_M.png
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/image_edit_icon.tga b/indra/newview/skins/default/textures/image_edit_icon.tga
deleted file mode 100644
index 8666f0bbe6..0000000000
--- a/indra/newview/skins/default/textures/image_edit_icon.tga
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/inv_folder_animation.tga b/indra/newview/skins/default/textures/inv_folder_animation.tga
deleted file mode 100644
index 1b4df7a2d8..0000000000
--- a/indra/newview/skins/default/textures/inv_folder_animation.tga
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/inv_folder_inbox.tga b/indra/newview/skins/default/textures/inv_folder_inbox.tga
deleted file mode 100644
index 04539c2cc4..0000000000
--- a/indra/newview/skins/default/textures/inv_folder_inbox.tga
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/map_avatar_above_8.tga b/indra/newview/skins/default/textures/map_avatar_above_8.tga
deleted file mode 100644
index 193428e530..0000000000
--- a/indra/newview/skins/default/textures/map_avatar_above_8.tga
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/map_avatar_below_8.tga b/indra/newview/skins/default/textures/map_avatar_below_8.tga
deleted file mode 100644
index 9e14bfab90..0000000000
--- a/indra/newview/skins/default/textures/map_avatar_below_8.tga
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/map_event_adult.tga b/indra/newview/skins/default/textures/map_event_adult.tga
deleted file mode 100644
index f548126e5a..0000000000
--- a/indra/newview/skins/default/textures/map_event_adult.tga
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/map_event_mature.tga b/indra/newview/skins/default/textures/map_event_mature.tga
deleted file mode 100644
index 71067c0dfd..0000000000
--- a/indra/newview/skins/default/textures/map_event_mature.tga
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/map_track_8.tga b/indra/newview/skins/default/textures/map_track_8.tga
deleted file mode 100644
index 53425ff45b..0000000000
--- a/indra/newview/skins/default/textures/map_track_8.tga
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/model_wizard/divider_line.png b/indra/newview/skins/default/textures/model_wizard/divider_line.png
deleted file mode 100644
index 76c9e68767..0000000000
--- a/indra/newview/skins/default/textures/model_wizard/divider_line.png
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/mute_icon.tga b/indra/newview/skins/default/textures/mute_icon.tga
deleted file mode 100644
index 879b9e6188..0000000000
--- a/indra/newview/skins/default/textures/mute_icon.tga
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/navbar/Arrow_Left_Over.png b/indra/newview/skins/default/textures/navbar/Arrow_Left_Over.png
deleted file mode 100644
index a91b74819f..0000000000
--- a/indra/newview/skins/default/textures/navbar/Arrow_Left_Over.png
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/navbar/Arrow_Right_Over.png b/indra/newview/skins/default/textures/navbar/Arrow_Right_Over.png
deleted file mode 100644
index a2caf227a7..0000000000
--- a/indra/newview/skins/default/textures/navbar/Arrow_Right_Over.png
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/navbar/Help_Over.png b/indra/newview/skins/default/textures/navbar/Help_Over.png
deleted file mode 100644
index b9bc0d0f87..0000000000
--- a/indra/newview/skins/default/textures/navbar/Help_Over.png
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/navbar/Home_Over.png b/indra/newview/skins/default/textures/navbar/Home_Over.png
deleted file mode 100644
index d9c6b3842e..0000000000
--- a/indra/newview/skins/default/textures/navbar/Home_Over.png
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/places_rating_adult.tga b/indra/newview/skins/default/textures/places_rating_adult.tga
deleted file mode 100644
index c344fb1e78..0000000000
--- a/indra/newview/skins/default/textures/places_rating_adult.tga
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/places_rating_mature.tga b/indra/newview/skins/default/textures/places_rating_mature.tga
deleted file mode 100644
index 61c879bc92..0000000000
--- a/indra/newview/skins/default/textures/places_rating_mature.tga
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/places_rating_pg.tga b/indra/newview/skins/default/textures/places_rating_pg.tga
deleted file mode 100644
index 7805dbce60..0000000000
--- a/indra/newview/skins/default/textures/places_rating_pg.tga
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/propertyline.tga b/indra/newview/skins/default/textures/propertyline.tga
deleted file mode 100644
index 0c504eea71..0000000000
--- a/indra/newview/skins/default/textures/propertyline.tga
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/quick_tips/avatar_free_mode.png b/indra/newview/skins/default/textures/quick_tips/avatar_free_mode.png
deleted file mode 100644
index be7c87efb6..0000000000
--- a/indra/newview/skins/default/textures/quick_tips/avatar_free_mode.png
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/quick_tips/camera_free_mode.png b/indra/newview/skins/default/textures/quick_tips/camera_free_mode.png
deleted file mode 100644
index 9a3f3703b2..0000000000
--- a/indra/newview/skins/default/textures/quick_tips/camera_free_mode.png
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/quick_tips/camera_orbit_mode.png b/indra/newview/skins/default/textures/quick_tips/camera_orbit_mode.png
deleted file mode 100644
index dd72cc0162..0000000000
--- a/indra/newview/skins/default/textures/quick_tips/camera_orbit_mode.png
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/quick_tips/camera_pan_mode.png b/indra/newview/skins/default/textures/quick_tips/camera_pan_mode.png
deleted file mode 100644
index b537dcbe46..0000000000
--- a/indra/newview/skins/default/textures/quick_tips/camera_pan_mode.png
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/quick_tips/camera_preset_front_view.png b/indra/newview/skins/default/textures/quick_tips/camera_preset_front_view.png
deleted file mode 100644
index 7674a75ac3..0000000000
--- a/indra/newview/skins/default/textures/quick_tips/camera_preset_front_view.png
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/quick_tips/camera_preset_group_view.png b/indra/newview/skins/default/textures/quick_tips/camera_preset_group_view.png
deleted file mode 100644
index 9c9b923a5a..0000000000
--- a/indra/newview/skins/default/textures/quick_tips/camera_preset_group_view.png
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/quick_tips/camera_preset_rear_view.png b/indra/newview/skins/default/textures/quick_tips/camera_preset_rear_view.png
deleted file mode 100644
index 15c3053491..0000000000
--- a/indra/newview/skins/default/textures/quick_tips/camera_preset_rear_view.png
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/quick_tips/move_fly_first.png b/indra/newview/skins/default/textures/quick_tips/move_fly_first.png
deleted file mode 100644
index b6e2ce60e4..0000000000
--- a/indra/newview/skins/default/textures/quick_tips/move_fly_first.png
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/quick_tips/move_fly_second.png b/indra/newview/skins/default/textures/quick_tips/move_fly_second.png
deleted file mode 100644
index 84b63cc338..0000000000
--- a/indra/newview/skins/default/textures/quick_tips/move_fly_second.png
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/quick_tips/move_run_first.png b/indra/newview/skins/default/textures/quick_tips/move_run_first.png
deleted file mode 100644
index 16093dc683..0000000000
--- a/indra/newview/skins/default/textures/quick_tips/move_run_first.png
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/quick_tips/move_run_second.png b/indra/newview/skins/default/textures/quick_tips/move_run_second.png
deleted file mode 100644
index 19fa43ec32..0000000000
--- a/indra/newview/skins/default/textures/quick_tips/move_run_second.png
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/quick_tips/move_walk_first.png b/indra/newview/skins/default/textures/quick_tips/move_walk_first.png
deleted file mode 100644
index 92d120d53e..0000000000
--- a/indra/newview/skins/default/textures/quick_tips/move_walk_first.png
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/quick_tips/move_walk_second.png b/indra/newview/skins/default/textures/quick_tips/move_walk_second.png
deleted file mode 100644
index f8e28722be..0000000000
--- a/indra/newview/skins/default/textures/quick_tips/move_walk_second.png
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/show_btn.tga b/indra/newview/skins/default/textures/show_btn.tga
deleted file mode 100644
index 5f05f377e3..0000000000
--- a/indra/newview/skins/default/textures/show_btn.tga
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/show_btn_selected.tga b/indra/newview/skins/default/textures/show_btn_selected.tga
deleted file mode 100644
index 00a2f34a37..0000000000
--- a/indra/newview/skins/default/textures/show_btn_selected.tga
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/smicon_warn.tga b/indra/newview/skins/default/textures/smicon_warn.tga
deleted file mode 100644
index 90ccaa07e5..0000000000
--- a/indra/newview/skins/default/textures/smicon_warn.tga
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/snapshot_download.png b/indra/newview/skins/default/textures/snapshot_download.png
new file mode 100644
index 0000000000..6aa1abded5
--- /dev/null
+++ b/indra/newview/skins/default/textures/snapshot_download.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/snapshot_email.png b/indra/newview/skins/default/textures/snapshot_email.png
new file mode 100644
index 0000000000..dee784a9bf
--- /dev/null
+++ b/indra/newview/skins/default/textures/snapshot_email.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/spacer35.tga b/indra/newview/skins/default/textures/spacer35.tga
deleted file mode 100644
index b88bc6680a..0000000000
--- a/indra/newview/skins/default/textures/spacer35.tga
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/square_btn_32x128.tga b/indra/newview/skins/default/textures/square_btn_32x128.tga
deleted file mode 100644
index d7ce58dac3..0000000000
--- a/indra/newview/skins/default/textures/square_btn_32x128.tga
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/square_btn_selected_32x128.tga b/indra/newview/skins/default/textures/square_btn_selected_32x128.tga
deleted file mode 100644
index 59ca365aa4..0000000000
--- a/indra/newview/skins/default/textures/square_btn_selected_32x128.tga
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/startup_logo.j2c b/indra/newview/skins/default/textures/startup_logo.j2c
deleted file mode 100644
index d1b991f17f..0000000000
--- a/indra/newview/skins/default/textures/startup_logo.j2c
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/status_busy.tga b/indra/newview/skins/default/textures/status_busy.tga
deleted file mode 100644
index 7743d9c7bb..0000000000
--- a/indra/newview/skins/default/textures/status_busy.tga
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/taskpanel/TabIcon_Appearance_Off.png b/indra/newview/skins/default/textures/taskpanel/TabIcon_Appearance_Off.png
deleted file mode 100644
index 0b91abfb0d..0000000000
--- a/indra/newview/skins/default/textures/taskpanel/TabIcon_Appearance_Off.png
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/taskpanel/TabIcon_Appearance_Selected.png b/indra/newview/skins/default/textures/taskpanel/TabIcon_Appearance_Selected.png
deleted file mode 100644
index 33a47236a5..0000000000
--- a/indra/newview/skins/default/textures/taskpanel/TabIcon_Appearance_Selected.png
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/taskpanel/TabIcon_Home_Off.png b/indra/newview/skins/default/textures/taskpanel/TabIcon_Home_Off.png
deleted file mode 100644
index 421f5e1705..0000000000
--- a/indra/newview/skins/default/textures/taskpanel/TabIcon_Home_Off.png
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/taskpanel/TabIcon_Me_Selected.png b/indra/newview/skins/default/textures/taskpanel/TabIcon_Me_Selected.png
deleted file mode 100644
index 905d4c973e..0000000000
--- a/indra/newview/skins/default/textures/taskpanel/TabIcon_Me_Selected.png
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/taskpanel/TabIcon_People_Selected.png b/indra/newview/skins/default/textures/taskpanel/TabIcon_People_Selected.png
deleted file mode 100644
index 909f0d0a47..0000000000
--- a/indra/newview/skins/default/textures/taskpanel/TabIcon_People_Selected.png
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/taskpanel/TabIcon_Places_Large.png b/indra/newview/skins/default/textures/taskpanel/TabIcon_Places_Large.png
deleted file mode 100644
index cc505c4a30..0000000000
--- a/indra/newview/skins/default/textures/taskpanel/TabIcon_Places_Large.png
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/taskpanel/TabIcon_Places_Selected.png b/indra/newview/skins/default/textures/taskpanel/TabIcon_Places_Selected.png
deleted file mode 100644
index 8e0fb9661e..0000000000
--- a/indra/newview/skins/default/textures/taskpanel/TabIcon_Places_Selected.png
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/taskpanel/TabIcon_Things_Selected.png b/indra/newview/skins/default/textures/taskpanel/TabIcon_Things_Selected.png
deleted file mode 100644
index d4ac451c8e..0000000000
--- a/indra/newview/skins/default/textures/taskpanel/TabIcon_Things_Selected.png
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index bb91d32c6c..8702ebde2a 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -39,7 +39,7 @@ with the same filename but different name
<texture name="Accordion_Over" file_name="containers/Accordion_Over.png" preload="false" />
<texture name="Accordion_Selected" file_name="containers/Accordion_Selected.png" preload="false" />
-<texture name="Activate_Checkmark" file_name="taskpanel/Activate_Checkmark.png" preload="false" />
+ <texture name="Activate_Checkmark" file_name="taskpanel/Activate_Checkmark.png" preload="false" />
<texture name="AddItem_Disabled" file_name="icons/AddItem_Disabled.png" preload="false" />
<texture name="AddItem_Off" file_name="icons/AddItem_Off.png" preload="false" />
@@ -48,9 +48,6 @@ with the same filename but different name
<texture name="Arrow_Left_Off" file_name="navbar/Arrow_Left_Off.png" preload="true" />
<texture name="Arrow_Right_Off" file_name="navbar/Arrow_Right_Off.png" preload="true" />
-<!--
--->
-
<texture name="Arrow_Small_Up" file_name="widgets/Arrow_Small_Up.png" preload="true" />
<texture name="Arrow_Small_Left" file_name="widgets/Arrow_Small_Left.png" preload="true" />
<texture name="Arrow_Small_Right" file_name="widgets/Arrow_Small_Right.png" preload="true" />
@@ -157,7 +154,6 @@ with the same filename but different name
<texture name="ComboButton_Disabled" file_name="widgets/ComboButton_Disabled.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
<texture name="ComboButton_Selected" file_name="widgets/ComboButton_Selected.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
<texture name="ComboButton_UpSelected" file_name="widgets/ComboButton_UpSelected.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
- <texture name="ComboButton_Up_On_Selected" file_name="widgets/ComboButton_Up_On_Selected.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
<texture name="ComboButton_On" file_name="widgets/ComboButton_On.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
<texture name="ComboButton_Off" file_name="widgets/ComboButton_Off.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
<texture name="ComboButton_UpOff" file_name="widgets/ComboButton_UpOff.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
@@ -190,6 +186,10 @@ with the same filename but different name
<texture name="Flag" file_name="navbar/Flag.png" preload="false" />
+ <texture name="Flyout_Left" file_name="windows/Flyout_Left.png" preload="false" />
+ <texture name="Flyout_Pointer" file_name="windows/Flyout_Pointer.png" preload="false" />
+ <texture name="Flyout_Right" file_name="windows/Flyout_Right.png" preload="false" />
+
<texture name="Folder_Arrow" file_name="folder_arrow.tga" preload="false" />
<texture name="ForSale_Badge" file_name="icons/ForSale_Badge.png" preload="false" />
<texture name="ForwardArrow_Off" file_name="icons/ForwardArrow_Off.png" preload="false" />
@@ -547,6 +547,10 @@ with the same filename but different name
<texture name="Unknown_Icon" file_name="icons/unknown_icon.png" preload="true" />
<texture name="Snapshot_Off" file_name="bottomtray/Snapshot_Off.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" />
+ <texture name="Snapshot_Download" file_name="snapshot_download.png" preload="false" />
+ <texture name="Snapshot_Email" file_name="snapshot_email.png" preload="false" />
+ <texture name="Snapshot_Inventory" file_name="toolbar_icons/inventory.png" preload="false" />
+ <texture name="Snapshot_Profile" file_name="toolbar_icons/profile.png" preload="false" />
<texture name="startup_logo" file_name="windows/startup_logo.png" preload="true" />
@@ -568,21 +572,13 @@ with the same filename but different name
<texture name="Sync_Progress_5" file_name="icons/Sync_Progress_5.png" preload="true" />
<texture name="Sync_Progress_6" file_name="icons/Sync_Progress_6.png" preload="true" />
- <texture name="TabIcon_Appearance_Off" file_name="taskpanel/TabIcon_Appearance_Off.png" preload="false" />
- <texture name="TabIcon_Appearance_Selected" file_name="taskpanel/TabIcon_Appearance_Selected.png" preload="false" />
<texture name="TabIcon_Close_Off" file_name="taskpanel/TabIcon_Close_Off.png" preload="false" />
- <texture name="TabIcon_Home_Off" file_name="taskpanel/TabIcon_Home_Off.png" preload="false" />
<texture name="TabIcon_Home_Selected" file_name="taskpanel/TabIcon_Home_Selected.png" preload="false" />
<texture name="TabIcon_Me_Off" file_name="taskpanel/TabIcon_Me_Off.png" preload="false" />
- <texture name="TabIcon_Me_Selected" file_name="taskpanel/TabIcon_Me_Selected.png" preload="false" />
<texture name="TabIcon_Open_Off" file_name="taskpanel/TabIcon_Open_Off.png" preload="false" />
<texture name="TabIcon_People_Off" file_name="taskpanel/TabIcon_People_Off.png" preload="false" />
- <texture name="TabIcon_People_Selected" file_name="taskpanel/TabIcon_People_Selected.png" preload="false" />
- <texture name="TabIcon_Places_Large" file_name="taskpanel/TabIcon_Places_Large.png" preload="false" />
<texture name="TabIcon_Places_Off" file_name="taskpanel/TabIcon_Places_Off.png" preload="false" />
- <texture name="TabIcon_Places_Selected" file_name="taskpanel/TabIcon_Places_Selected.png" preload="false" />
<texture name="TabIcon_Things_Off" file_name="taskpanel/TabIcon_Things_Off.png" preload="false" />
- <texture name="TabIcon_Things_Selected" file_name="taskpanel/TabIcon_Things_Selected.png" preload="false" />
<texture name="TabTop_Right_Off" file_name="containers/TabTop_Right_Off.png" preload="false" scale.left="8" scale.top="8" scale.right="62" scale.bottom="9" />
<texture name="TabTop_Right_Selected" file_name="containers/TabTop_Right_Selected.png" preload="false" scale.left="8" scale.top="8" scale.right="62" scale.bottom="9" />
@@ -646,6 +642,12 @@ with the same filename but different name
<texture name="VoicePTT_Lvl3" file_name="bottomtray/VoicePTT_Lvl3.png" preload="false" />
<texture name="VoicePTT_Off" file_name="bottomtray/VoicePTT_Off.png" preload="false" />
<texture name="VoicePTT_On" file_name="bottomtray/VoicePTT_On.png" preload="false" />
+
+ <texture name="VoicePTT_Lvl1_Dark" file_name="bottomtray/VoicePTT_Lvl1_Dark.png" preload="false" />
+ <texture name="VoicePTT_Lvl2_Dark" file_name="bottomtray/VoicePTT_Lvl2_Dark.png" preload="false" />
+ <texture name="VoicePTT_Lvl3_Dark" file_name="bottomtray/VoicePTT_Lvl3_Dark.png" preload="false" />
+ <texture name="VoicePTT_Off_Dark" file_name="bottomtray/VoicePTT_Off_Dark.png" preload="false" />
+ <texture name="VoicePTT_On_Dark" file_name="bottomtray/VoicePTT_On_Dark.png" preload="false" />
<texture name="Wearables_Divider" file_name="windows/Wearables_Divider.png" preload="false" />
@@ -678,9 +680,6 @@ with the same filename but different name
<!--WARNING OLD ART BELOW *do not use*-->
<texture name="icn_media_web.tga" preload="true" />
<texture name="icn_media_movie.tga" preload="true" />
- <texture name="icn_voice-localchat.tga" />
- <texture name="icn_voice-groupfocus.tga" />
- <texture name="icn_voice-pvtfocus.tga" />
<texture name="jump_left_out.tga" file_name="widgets/jump_left_out.png" />
<texture name="jump_left_in.tga" file_name="widgets/jump_left_in.png" />
@@ -714,7 +713,6 @@ with the same filename but different name
<texture name="icon_avatar_offline.tga" />
<texture name="icon_avatar_online.tga" />
- <texture name="icon_day_cycle.tga" />
<texture name="icon_diurnal.tga" />
<texture name="icon_for_sale.tga" file_name="icons/Icon_For_Sale.png" />
<texture name="icon_top_pick.tga" />
@@ -731,7 +729,6 @@ with the same filename but different name
<texture name="map_avatar_16.tga" />
<texture name="map_avatar_8.tga" />
<texture name="map_event.tga" />
- <texture name="map_event_mature.tga" />
<texture name="map_home.tga" />
<texture name="map_infohub.tga" />
<texture name="map_telehub.tga" />
diff --git a/indra/newview/skins/default/textures/widgets/Checkbox_On_Over.png b/indra/newview/skins/default/textures/widgets/Checkbox_On_Over.png
deleted file mode 100644
index bc504d130e..0000000000
--- a/indra/newview/skins/default/textures/widgets/Checkbox_On_Over.png
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/widgets/Checkbox_Over.png b/indra/newview/skins/default/textures/widgets/Checkbox_Over.png
deleted file mode 100644
index 5a7162addf..0000000000
--- a/indra/newview/skins/default/textures/widgets/Checkbox_Over.png
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/widgets/ComboButton_Up_On_Selected.png b/indra/newview/skins/default/textures/widgets/ComboButton_Up_On_Selected.png
deleted file mode 100644
index fd1d11dd0b..0000000000
--- a/indra/newview/skins/default/textures/widgets/ComboButton_Up_On_Selected.png
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/widgets/DisclosureArrow_Closed_Over.png b/indra/newview/skins/default/textures/widgets/DisclosureArrow_Closed_Over.png
deleted file mode 100644
index 45bcb0464e..0000000000
--- a/indra/newview/skins/default/textures/widgets/DisclosureArrow_Closed_Over.png
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/widgets/DisclosureArrow_Opened_Over.png b/indra/newview/skins/default/textures/widgets/DisclosureArrow_Opened_Over.png
deleted file mode 100644
index dabbd85b34..0000000000
--- a/indra/newview/skins/default/textures/widgets/DisclosureArrow_Opened_Over.png
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/widgets/PushButton_On_Over.png b/indra/newview/skins/default/textures/widgets/PushButton_On_Over.png
deleted file mode 100644
index 064a4c4f7f..0000000000
--- a/indra/newview/skins/default/textures/widgets/PushButton_On_Over.png
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/widgets/PushButton_Selected_Over.png b/indra/newview/skins/default/textures/widgets/PushButton_Selected_Over.png
deleted file mode 100644
index 064a4c4f7f..0000000000
--- a/indra/newview/skins/default/textures/widgets/PushButton_Selected_Over.png
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/widgets/RadioButton_On_Over.png b/indra/newview/skins/default/textures/widgets/RadioButton_On_Over.png
deleted file mode 100644
index 3e7d803a28..0000000000
--- a/indra/newview/skins/default/textures/widgets/RadioButton_On_Over.png
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/widgets/RadioButton_Over.png b/indra/newview/skins/default/textures/widgets/RadioButton_Over.png
deleted file mode 100644
index a5c8cbe293..0000000000
--- a/indra/newview/skins/default/textures/widgets/RadioButton_Over.png
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/widgets/ScrollArrow_Down_Over.png b/indra/newview/skins/default/textures/widgets/ScrollArrow_Down_Over.png
deleted file mode 100644
index 605d159eaa..0000000000
--- a/indra/newview/skins/default/textures/widgets/ScrollArrow_Down_Over.png
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/widgets/ScrollArrow_Left_Over.png b/indra/newview/skins/default/textures/widgets/ScrollArrow_Left_Over.png
deleted file mode 100644
index c79547dffd..0000000000
--- a/indra/newview/skins/default/textures/widgets/ScrollArrow_Left_Over.png
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/widgets/ScrollArrow_Right_Over.png b/indra/newview/skins/default/textures/widgets/ScrollArrow_Right_Over.png
deleted file mode 100644
index e353542ad9..0000000000
--- a/indra/newview/skins/default/textures/widgets/ScrollArrow_Right_Over.png
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/widgets/ScrollArrow_Up_Over.png b/indra/newview/skins/default/textures/widgets/ScrollArrow_Up_Over.png
deleted file mode 100644
index dd2fceb716..0000000000
--- a/indra/newview/skins/default/textures/widgets/ScrollArrow_Up_Over.png
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/widgets/ScrollThumb_Horiz_Over.png b/indra/newview/skins/default/textures/widgets/ScrollThumb_Horiz_Over.png
deleted file mode 100644
index cf78ea3924..0000000000
--- a/indra/newview/skins/default/textures/widgets/ScrollThumb_Horiz_Over.png
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/widgets/ScrollThumb_Vert_Over.png b/indra/newview/skins/default/textures/widgets/ScrollThumb_Vert_Over.png
deleted file mode 100644
index 53587197da..0000000000
--- a/indra/newview/skins/default/textures/widgets/ScrollThumb_Vert_Over.png
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_On.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_On.png
deleted file mode 100644
index 7afb9c99c3..0000000000
--- a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_On.png
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_On_Disabled.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_On_Disabled.png
deleted file mode 100644
index 77c4224539..0000000000
--- a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_On_Disabled.png
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_On_Over.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_On_Over.png
deleted file mode 100644
index 8b93dd551e..0000000000
--- a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_On_Over.png
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_On_Selected.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_On_Selected.png
deleted file mode 100644
index 3f207cbea2..0000000000
--- a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_On_Selected.png
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_On.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_On.png
deleted file mode 100644
index 220df9db25..0000000000
--- a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_On.png
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_On_Over.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_On_Over.png
deleted file mode 100644
index 5bbcdcb0b4..0000000000
--- a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_On_Over.png
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_On_Press.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_On_Press.png
deleted file mode 100644
index dde367f05e..0000000000
--- a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_On_Press.png
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Over.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Over.png
deleted file mode 100644
index d4f30b9adb..0000000000
--- a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Over.png
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected_Over.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected_Over.png
deleted file mode 100644
index 5bbcdcb0b4..0000000000
--- a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected_Over.png
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_On.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_On.png
deleted file mode 100644
index 467c43fc90..0000000000
--- a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_On.png
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_On_Over.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_On_Over.png
deleted file mode 100644
index 2049736897..0000000000
--- a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_On_Over.png
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Selected_Over.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Selected_Over.png
deleted file mode 100644
index 2049736897..0000000000
--- a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Selected_Over.png
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/widgets/SliderThumb_Over.png b/indra/newview/skins/default/textures/widgets/SliderThumb_Over.png
deleted file mode 100644
index b6f900d3bd..0000000000
--- a/indra/newview/skins/default/textures/widgets/SliderThumb_Over.png
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/widgets/Stepper_Down_Over.png b/indra/newview/skins/default/textures/widgets/Stepper_Down_Over.png
deleted file mode 100644
index 01e0a2d9f1..0000000000
--- a/indra/newview/skins/default/textures/widgets/Stepper_Down_Over.png
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/widgets/Stepper_Up_Over.png b/indra/newview/skins/default/textures/widgets/Stepper_Up_Over.png
deleted file mode 100644
index 2ce84ea5be..0000000000
--- a/indra/newview/skins/default/textures/widgets/Stepper_Up_Over.png
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/windows/Flyout.png b/indra/newview/skins/default/textures/windows/Flyout.png
deleted file mode 100644
index 5596b194c9..0000000000
--- a/indra/newview/skins/default/textures/windows/Flyout.png
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/windows/Flyout_Pointer_Up.png b/indra/newview/skins/default/textures/windows/Flyout_Pointer_Up.png
deleted file mode 100644
index 361fab59e0..0000000000
--- a/indra/newview/skins/default/textures/windows/Flyout_Pointer_Up.png
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/windows/Icon_Gear_Over.png b/indra/newview/skins/default/textures/windows/Icon_Gear_Over.png
deleted file mode 100644
index 67bd399358..0000000000
--- a/indra/newview/skins/default/textures/windows/Icon_Gear_Over.png
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/windows/Icon_Undock_Press.png b/indra/newview/skins/default/textures/windows/Icon_Undock_Press.png
deleted file mode 100644
index 3ab8c3666a..0000000000
--- a/indra/newview/skins/default/textures/windows/Icon_Undock_Press.png
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/xui/da/floater_nearby_chat.xml b/indra/newview/skins/default/xui/da/floater_nearby_chat.xml
index bd17224259..76bc40edac 100644
--- a/indra/newview/skins/default/xui/da/floater_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/da/floater_nearby_chat.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="nearby_chat" title="CHAT NÆRVED">
- <check_box label="Oversæt chat (håndteret af Google)" name="translate_chat_checkbox"/>
+ <check_box label="Oversæt chat" name="translate_chat_checkbox"/>
</floater>
diff --git a/indra/newview/skins/default/xui/da/panel_preferences_chat.xml b/indra/newview/skins/default/xui/da/panel_preferences_chat.xml
index f0f6242fff..890a3038ef 100644
--- a/indra/newview/skins/default/xui/da/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/da/panel_preferences_chat.xml
@@ -31,7 +31,7 @@
<spinner label="Tid før chatvisning forsvinder:" name="nearby_toasts_fadingtime"/>
<check_box name="translate_chat_checkbox"/>
<text name="translate_chb_label">
- Benyt maskinel oversættelse ved chat (håndteret af Google)
+ Benyt maskinel oversættelse ved chat
</text>
<text name="translate_language_text" width="110">
Oversæt chat til :
diff --git a/indra/newview/skins/default/xui/da/teleport_strings.xml b/indra/newview/skins/default/xui/da/teleport_strings.xml
index 071aab46f4..0d89fae986 100644
--- a/indra/newview/skins/default/xui/da/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/da/teleport_strings.xml
@@ -20,6 +20,10 @@ Hvis du stadig ikke kan teleporte, prøv venligst at logge ud og ligge ind for a
Beklager, systemet kunne ikke fuldføre teleport forbindelse.
Prøv igen om lidt.
</message>
+ <message name="NoHelpIslandTP">
+ Du kan ikke teleportere tilbage til Welcome Island.
+Gå til &apos;Welcome Island Puclic&apos; for at prøve tutorial igen.
+ </message>
<message name="noaccess_tport">
Beklager, du har ikke adgang til denne teleport destination.
</message>
diff --git a/indra/newview/skins/default/xui/de/floater_nearby_chat.xml b/indra/newview/skins/default/xui/de/floater_nearby_chat.xml
index bbb4114200..2aabbb18f2 100644
--- a/indra/newview/skins/default/xui/de/floater_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/de/floater_nearby_chat.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="nearby_chat" title="CHAT IN DER NÄHE">
- <check_box label="Chat übersetzen (Service von Google)" name="translate_chat_checkbox"/>
+ <check_box label="Chat übersetzen" name="translate_chat_checkbox"/>
</floater>
diff --git a/indra/newview/skins/default/xui/de/panel_nearby_chat.xml b/indra/newview/skins/default/xui/de/panel_nearby_chat.xml
index c3ce42efa1..2068c39024 100644
--- a/indra/newview/skins/default/xui/de/panel_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/de/panel_nearby_chat.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="nearby_chat">
- <check_box label="Chat übersetzen (von Google bereitgestellt)" name="translate_chat_checkbox"/>
+ <check_box label="Chat übersetzen" name="translate_chat_checkbox"/>
</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_chat.xml b/indra/newview/skins/default/xui/de/panel_preferences_chat.xml
index 104f89b80c..04f6c27330 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_chat.xml
@@ -31,7 +31,7 @@
<spinner label="Ein-/Ausblenddauer von Toasts für Chat in der Nähe:" name="nearby_toasts_fadingtime"/>
<check_box name="translate_chat_checkbox"/>
<text name="translate_chb_label">
- Beim Chatten Maschinenübersetzung verwenden (von Google bereitgestellt)
+ Beim Chatten Maschinenübersetzung verwenden
</text>
<text name="translate_language_text">
Chat übersetzen in:
diff --git a/indra/newview/skins/default/xui/de/teleport_strings.xml b/indra/newview/skins/default/xui/de/teleport_strings.xml
index 69c952c532..bbfc830688 100644
--- a/indra/newview/skins/default/xui/de/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/de/teleport_strings.xml
@@ -20,6 +20,10 @@ Wenn der Teleport dann immer noch nicht funktioniert, melden Sie sich bitte ab u
Das System konnte keine Teleport-Verbindung herstellen.
Versuchen Sie es später noch einmal.
</message>
+ <message name="NoHelpIslandTP">
+ Sie können nicht zurück nach Welcome Island teleportieren.
+Gehen Sie zu „Welcome Island Public“ und wiederholen sie das Tutorial.
+ </message>
<message name="noaccess_tport">
Sie haben leider keinen Zugang zu diesem Teleport-Ziel.
</message>
diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml
index eaffbf5fa6..1c7b354221 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -487,7 +487,7 @@
name="DwellText"
top_delta="0"
width="186">
- 0
+ Loading...
</text>
<button
diff --git a/indra/newview/skins/default/xui/en/floater_avatar.xml b/indra/newview/skins/default/xui/en/floater_avatar.xml
index 2d973e7d90..6009821f7f 100644
--- a/indra/newview/skins/default/xui/en/floater_avatar.xml
+++ b/indra/newview/skins/default/xui/en/floater_avatar.xml
@@ -16,11 +16,11 @@
save_rect="true"
save_visibility="true"
title="AVATAR PICKER"
- width="635">
+ width="700">
<web_browser
top="25"
height="200"
- width="635"
+ width="700"
follows="all"
name="avatar_picker_contents"
trusted_content="true"/>
diff --git a/indra/newview/skins/default/xui/en/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/en/floater_buy_currency_html.xml
index b9c415633f..0637eedfb2 100644
--- a/indra/newview/skins/default/xui/en/floater_buy_currency_html.xml
+++ b/indra/newview/skins/default/xui/en/floater_buy_currency_html.xml
@@ -23,6 +23,5 @@
right="-1"
top="1"
bottom="-1"
- ignore_ui_scale="false"
name="browser"/>
</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml
index fbaf4f0a8a..eebc5ddc72 100644
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -6,6 +6,7 @@
<string name="status_idle"></string>
<string name="status_parse_error">Error: Dae parsing issue - see log for details.</string>
+ <string name="status_material_mismatch">Error: Material of model is not a subset of reference model.</string>
<string name="status_reading_file">Loading...</string>
<string name="status_generating_meshes">Generating Meshes...</string>
<string name="status_vertex_number_overflow">Error: Vertex number is more than 65534, aborted!</string>
@@ -789,7 +790,7 @@
<check_box name="physics_use_hull" follows="left|top" width="130" left_pad="5" height="20" label="Use Convex Hull"/> -->
</panel>
- <!-- ==== STEP 2: Analyse ==== -->
+ <!-- ==== STEP 2: Analyze ==== -->
<view_border
bevel_style="none"
follows="top|left"
@@ -818,7 +819,7 @@
name="method_label"
text_color="White"
top_pad="0">
- Step 2: Analyse
+ Step 2: Analyze
</text>
<text
follows="top|left"
diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml
index 91b4ed6954..85f65dedd3 100644
--- a/indra/newview/skins/default/xui/en/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml
@@ -5,400 +5,370 @@
can_minimize="true"
can_close="true"
follows="left|top"
- height="520"
+ height="500"
layout="topleft"
name="Snapshot"
help_topic="snapshot"
save_rect="true"
save_visibility="true"
title="SNAPSHOT PREVIEW"
- width="245">
+ width="470">
<floater.string
name="unknown">
unknown
</floater.string>
- <radio_group
- height="70"
- label="Snapshot type"
- layout="topleft"
- left="10"
- name="snapshot_type_radio"
- top="20"
- width="205">
-<!--
- <radio_item
- height="16"
- label="Share to Web"
- layout="topleft"
- name="share_to_web"
- top_pad="0" />
--->
- <radio_item
- height="16"
- label="Email"
- layout="topleft"
- name="postcard"
- top_pad="2" />
- <radio_item
- height="16"
- label="My inventory (L$[AMOUNT])"
- layout="topleft"
- name="texture"
- top_pad="2" />
- <radio_item
- height="16"
- label="Save to my computer"
- layout="topleft"
- name="local"
- top_pad="2" />
- </radio_group>
- <ui_ctrl
- height="90"
- width="125"
- layout="topleft"
- name="thumbnail_placeholder"
- top_pad="6"
- follows="left|top"
- left="10"
- />
- <text
- type="string"
- font="SansSerifSmall"
- length="1"
- follows="left|top"
- height="14"
- layout="topleft"
- right="-5"
- left_delta="0"
- halign="right"
- name="file_size_label"
- top_pad="8"
- width="195">
- [SIZE] KB
- </text>
- <button
- follows="left|top"
- height="22"
- image_overlay="Refresh_Off"
- layout="topleft"
- left="10"
- name="new_snapshot_btn"
- width="23" />
- <button
- follows="left|top"
- height="23"
- label="Send"
- layout="topleft"
- left_pad="5"
- right="-5"
- name="send_btn"
- width="100" />
+ <string
+ name="postcard_progress_str">
+ Sending Email
+ </string>
+ <string
+ name="profile_progress_str">
+ Posting
+ </string>
+ <string
+ name="inventory_progress_str">
+ Saving to Inventory
+ </string>
+ <string
+ name="local_progress_str">
+ Saving to Computer
+ </string>
+ <string
+ name="profile_succeeded_str">
+ Profile feed updated!
+ </string>
+ <string
+ name="postcard_succeeded_str">
+ Email Sent!
+ </string>
+ <string
+ name="inventory_succeeded_str">
+ Saved to Inventory!
+ </string>
+ <string
+ name="local_succeeded_str">
+ Saved to Computer!
+ </string>
+ <string
+ name="profile_failed_str">
+ Failed to update your Profile Feed.
+ </string>
+ <string
+ name="postcard_failed_str">
+ Failed to send email.
+ </string>
+ <string
+ name="inventory_failed_str">
+ Failed to save to inventory.
+ </string>
+ <string
+ name="local_failed_str">
+ Failed to save to computer.
+ </string>
<button
follows="left|top"
height="23"
- label="Save (L$[AMOUNT])"
+ image_overlay="TabIcon_Close_Off"
layout="topleft"
- right="-5"
- name="upload_btn"
- top_delta="0"
- width="110" />
- <flyout_button
- follows="left|top"
- height="23"
- label="Save"
- layout="topleft"
- right="-5"
- name="save_btn"
- tool_tip="Save image to a file"
- top_delta="0"
- width="100">
- <flyout_button.item
- label="Save"
- name="save_item"
- value="save" />
- <flyout_button.item
- label="Save As..."
- name="saveas_item"
- value="save as" />
- </flyout_button>
- <button
- follows="left|top"
- height="23"
- label="More"
- layout="topleft"
- left="10"
- name="more_btn"
+ left="236"
+ name="advanced_options_btn"
tool_tip="Advanced options"
- width="80" />
- <button
- follows="left|top"
- height="23"
- label="Less"
- layout="topleft"
- left_delta="0"
- name="less_btn"
- tool_tip="Advanced options"
- top_delta="0"
- width="80" />
- <button
- follows="left|top"
- height="23"
- label="Cancel"
- layout="topleft"
- right="-5"
- left_pad="5"
- name="discard_btn"
- width="110" />
- <text
- type="string"
- length="1"
- follows="top|left"
- height="12"
- layout="topleft"
- left="10"
- name="type_label2"
- top_pad="5"
- width="127">
- Size
- </text>
- <text
- type="string"
- length="1"
- follows="top|left"
- height="12"
- layout="topleft"
- left_pad="5"
- name="format_label"
- top_delta="0"
- width="70">
- Format
- </text>
- <combo_box
- height="23"
- label="Resolution"
- layout="topleft"
- left="10"
- name="postcard_size_combo"
- width="120">
- <combo_box.item
- label="Current Window"
- name="CurrentWindow"
- value="[i0,i0]" />
- <combo_box.item
- label="640x480"
- name="640x480"
- value="[i640,i480]" />
- <combo_box.item
- label="800x600"
- name="800x600"
- value="[i800,i600]" />
- <combo_box.item
- label="1024x768"
- name="1024x768"
- value="[i1024,i768]" />
- <combo_box.item
- label="Custom"
- name="Custom"
- value="[i-1,i-1]" />
- </combo_box>
- <combo_box
- height="23"
- label="Resolution"
- layout="topleft"
- left_delta="0"
- name="texture_size_combo"
- top_delta="0"
- width="127">
- <combo_box.item
- label="Current Window"
- name="CurrentWindow"
- value="[i0,i0]" />
- <combo_box.item
- label="Small (128x128)"
- name="Small(128x128)"
- value="[i128,i128]" />
- <combo_box.item
- label="Medium (256x256)"
- name="Medium(256x256)"
- value="[i256,i256]" />
- <combo_box.item
- label="Large (512x512)"
- name="Large(512x512)"
- value="[i512,i512]" />
- <combo_box.item
- label="Custom"
- name="Custom"
- value="[i-1,i-1]" />
- </combo_box>
- <combo_box
- height="23"
- label="Resolution"
- layout="topleft"
- left_delta="0"
- name="local_size_combo"
- top_delta="0"
- width="127">
- <combo_box.item
- label="Current Window"
- name="CurrentWindow"
- value="[i0,i0]" />
- <combo_box.item
- label="320x240"
- name="320x240"
- value="[i320,i240]" />
- <combo_box.item
- label="640x480"
- name="640x480"
- value="[i640,i480]" />
- <combo_box.item
- label="800x600"
- name="800x600"
- value="[i800,i600]" />
- <combo_box.item
- label="1024x768"
- name="1024x768"
- value="[i1024,i768]" />
- <combo_box.item
- label="1280x1024"
- name="1280x1024"
- value="[i1280,i1024]" />
- <combo_box.item
- label="1600x1200"
- name="1600x1200"
- value="[i1600,i1200]" />
- <combo_box.item
- label="Custom"
- name="Custom"
- value="[i-1,i-1]" />
- </combo_box>
- <combo_box
- height="23"
- label="Format"
- layout="topleft"
- left_pad="5"
- name="local_format_combo"
- width="70">
- <combo_box.item
- label="PNG"
- name="PNG" />
- <combo_box.item
- label="JPEG"
- name="JPEG" />
- <combo_box.item
- label="BMP"
- name="BMP" />
- </combo_box>
- <spinner
- allow_text_entry="false"
- decimal_digits="0"
- follows="left|top"
- height="20"
- increment="32"
- label="Width"
- label_width="40"
- layout="topleft"
- left="10"
- max_val="6016"
- min_val="32"
- name="snapshot_width"
- top_pad="10"
- width="95" />
- <spinner
- allow_text_entry="false"
- decimal_digits="0"
- follows="left|top"
- height="20"
- increment="32"
- label="Height"
- label_width="40"
- layout="topleft"
- left_pad="5"
- max_val="6016"
- min_val="32"
- name="snapshot_height"
- top_delta="0"
- width="95" />
- <check_box
- bottom_delta="20"
- label="Constrain proportions"
- layout="topleft"
- left="10"
- name="keep_aspect_check" />
- <slider
- decimal_digits="0"
- follows="left|top"
- height="15"
- increment="1"
- initial_value="75"
- label="Image quality"
- label_width="124"
- layout="topleft"
- left_delta="0"
- max_val="100"
- name="image_quality_slider"
- top_pad="5"
- width="228" />
- <text
- type="string"
- length="1"
+ top="25"
+ width="23" />
+ <ui_ctrl
+ height="160"
+ width="250"
+ layout="topleft"
+ name="thumbnail_placeholder"
+ top="50"
+ follows="left|top"
+ left="10">
+ <panel
+ background_visible="true"
+ bg_alpha_color="0.9 1 0.9 1"
+ follows="left|top"
+ font="SansSerifLarge"
+ halign="center"
+ height="20"
+ layout="topleft"
+ left="0"
+ length="1"
+ name="succeeded_panel"
+ right="-1"
+ top="0"
+ type="string"
+ visible="false">
+ <text
+ follows="all"
+ font="SansSerif"
+ halign="center"
+ height="18"
+ layout="topleft"
+ left="1"
+ length="1"
+ name="succeeded_lbl"
+ right="-1"
+ text_color="0.2 0.5 0.2 1"
+ top="4"
+ translate="false"
+ type="string">
+ Succeeded
+ </text>
+ </panel>
+ <panel
+ background_visible="true"
+ bg_alpha_color="1 0.9 0.9 1"
+ follows="left|top"
+ font="SansSerifLarge"
+ halign="center"
+ height="20"
+ layout="topleft"
+ left_delta="0"
+ length="1"
+ name="failed_panel"
+ right="-1"
+ top="0"
+ type="string"
+ visible="false">
+ <text
+ follows="all"
+ font="SansSerif"
+ halign="center"
+ height="18"
+ layout="topleft"
+ left="1"
+ length="1"
+ name="failed_lbl"
+ right="-1"
+ text_color="0.5 0.2 0.2 1"
+ top="4"
+ translate="false"
+ type="string">
+ Failed
+ </text>
+ </panel>
+ <loading_indicator
+ follows="left|top"
+ height="48"
+ layout="topleft"
+ name="working_indicator"
+ left="101"
+ top="46"
+ visible="false"
+ width="48" />
+ <text
+ follows="left|top|right"
+ font="SansSerifBold"
+ height="14"
+ layout="topleft"
+ left="5"
+ length="1"
+ halign="center"
+ name="working_lbl"
+ right="-5"
+ top="98"
+ translate="false"
+ type="string"
+ visible="false"
+ width="130">
+ Working
+ </text>
+ <button
+ follows="left|top"
+ height="22"
+ image_overlay="Refresh_Off"
+ layout="topleft"
+ left="20"
+ name="new_snapshot_btn"
+ bottom="-20"
+ visible="false"
+ width="22" />
+ <text
+ follows="left|top"
+ font="SansSerifBold"
+ halign="left"
+ height="18"
+ layout="topleft"
+ left_pad="10"
+ length="1"
+ name="refresh_lbl"
+ right="-5"
+ text_color="red"
+ top_delta="0"
+ translate="false"
+ type="string"
+ visible="false"
+ width="130">
+ Refresh to save.
+ </text>
+ </ui_ctrl>
+ <view_border
+ bevel_style="in"
+ height="21"
+ width="250"
+ layout="topleft"
+ name="img_info_border"
+ top_pad="3"
+ follows="left|top"
+ left_delta="0"
+ />
+ <text
+ type="string"
+ font="SansSerifSmall"
+ length="1"
+ follows="left|top"
+ height="14"
+ layout="topleft"
+ left_delta="5"
+ halign="left"
+ name="image_res_text"
+ top_delta="5"
+ width="100">
+ [WIDTH] x [HEIGHT] px
+ </text>
+ <text
+ follows="left|top"
+ font="SansSerifSmall"
+ height="14"
+ layout="topleft"
+ left="200"
+ length="1"
+ halign="right"
+ name="file_size_label"
+ top_delta="0"
+ type="string"
+ width="50">
+ [SIZE] KB
+ </text>
+ <panel_container
follows="left|top"
- height="13"
- layout="topleft"
- left="10"
- name="layer_type_label"
- top_pad="5"
- width="50">
- Capture:
- </text>
- <combo_box
- height="23"
- label="Image Layers"
+ height="260"
layout="topleft"
- left="30"
- name="layer_types"
- width="145">
- <combo_box.item
- label="Colors"
- name="Colors"
- value="colors" />
- <combo_box.item
- label="Depth"
- name="Depth"
- value="depth" />
- </combo_box>
- <check_box
- label="Interface"
- layout="topleft"
- left="30"
- top_pad="10"
- width="180"
- name="ui_check" />
- <check_box
- label="HUDs"
- layout="topleft"
- left="30"
+ left="0"
+ name="panel_container"
+ default_panel_name="panel_snapshot_options"
top_pad="10"
- width="180"
- name="hud_check" />
- <check_box
- label="Keep open after saving"
- layout="topleft"
- left="10"
- top_pad="8"
- width="180"
- name="keep_open_check" />
- <check_box
- label="Freeze frame (fullscreen)"
- layout="topleft"
- left="10"
- top_pad="8"
- width="180"
- name="freeze_frame_check" />
- <check_box
- label="Auto-refresh"
+ width="270">
+ <panel
+ class="llpanelsnapshotoptions"
+ filename="panel_snapshot_options.xml"
+ follows="all"
+ layout="topleft"
+ left="0"
+ name="panel_snapshot_options"
+ top="0" />
+ <panel
+ class="llpanelsnapshotprofile"
+ follows="all"
+ layout="topleft"
+ name="panel_snapshot_profile"
+ filename="panel_snapshot_profile.xml" />
+ <panel
+ class="llpanelsnapshotpostcard"
+ follows="all"
+ layout="topleft"
+ name="panel_snapshot_postcard"
+ filename="panel_snapshot_postcard.xml" />
+ <panel
+ class="llpanelsnapshotinventory"
+ follows="all"
+ layout="topleft"
+ name="panel_snapshot_inventory"
+ filename="panel_snapshot_inventory.xml" />
+ <panel
+ class="llpanelsnapshotlocal"
+ follows="all"
+ layout="topleft"
+ name="panel_snapshot_local"
+ filename="panel_snapshot_local.xml" />
+ </panel_container>
+ <panel
+ height="295"
layout="topleft"
- left="10"
- top_pad="8"
- width="180"
- name="auto_snapshot_check" />
+ left="270"
+ name="advanced_options_panel"
+ top="20"
+ width="200">
+ <text
+ type="string"
+ font="SansSerifSmall"
+ length="1"
+ follows="left|top"
+ height="14"
+ layout="topleft"
+ left="10"
+ halign="left"
+ name="advanced_options_label"
+ right="-10"
+ top="10">
+ ADVANCED OPTIONS
+ </text>
+ <view_border
+ bevel_style="in"
+ follows="left|top|right"
+ height="1"
+ left="10"
+ layout="topleft"
+ name="advanced_options_hr"
+ right="-10"
+ top_pad="5"
+ />
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ height="13"
+ layout="topleft"
+ left="10"
+ name="layer_type_label"
+ top_pad="10"
+ width="50">
+ Capture:
+ </text>
+ <combo_box
+ follows="left|top|right"
+ height="23"
+ label="Image Layers"
+ layout="topleft"
+ left="30"
+ name="layer_types"
+ right="-10">
+ <combo_box.item
+ label="Colors"
+ name="Colors"
+ value="colors" />
+ <combo_box.item
+ label="Depth"
+ name="Depth"
+ value="depth" />
+ </combo_box>
+ <check_box
+ label="Interface"
+ layout="topleft"
+ left="30"
+ top_pad="10"
+ width="180"
+ name="ui_check" />
+ <check_box
+ label="HUDs"
+ layout="topleft"
+ left="30"
+ top_pad="10"
+ width="180"
+ name="hud_check" />
+ <check_box
+ label="Freeze frame (fullscreen)"
+ layout="topleft"
+ left="10"
+ top_pad="8"
+ width="180"
+ name="freeze_frame_check" />
+ <check_box
+ label="Auto-refresh"
+ layout="topleft"
+ left="10"
+ top_pad="8"
+ width="180"
+ name="auto_snapshot_check" />
+ </panel>
</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_toybox.xml b/indra/newview/skins/default/xui/en/floater_toybox.xml
index ef3951a1cd..493d44a9cf 100644
--- a/indra/newview/skins/default/xui/en/floater_toybox.xml
+++ b/indra/newview/skins/default/xui/en/floater_toybox.xml
@@ -5,7 +5,7 @@
can_minimize="false"
can_resize="false"
default_tab_group="1"
- height="460"
+ height="330"
help_topic="toybox"
layout="topleft"
legacy_header_height="18"
@@ -46,7 +46,7 @@
Buttons will appear as shown or as icon-only depending on each toolbar's settings.
</text>
<toolbar
- bottom="395"
+ bottom="265"
button_display_mode="icons_with_text"
follows="all"
left="20"
@@ -82,20 +82,32 @@
<panel
bevel_style="none"
border="true"
- bottom="396"
+ bottom="266"
follows="left|bottom|right"
left="20"
right="-20"
- top="396" />
+ top="266" />
+ <button
+ follows="left|bottom|right"
+ height="23"
+ label="Clear all toolbars"
+ label_selected="Clear all toolbars"
+ layout="topleft"
+ left="185"
+ name="btn_clear_all"
+ top="285"
+ width="130">
+ <button.commit_callback function="Toybox.ClearAll" />
+ </button>
<button
follows="left|bottom|right"
height="23"
label="Restore defaults"
label_selected="Restore defaults"
layout="topleft"
- left="260"
+ left="335"
name="btn_restore_defaults"
- top="415"
+ top="285"
width="130">
<button.commit_callback function="Toybox.RestoreDefaults" />
</button>
diff --git a/indra/newview/skins/default/xui/en/floater_translation_settings.xml b/indra/newview/skins/default/xui/en/floater_translation_settings.xml
index c03f751265..a212ce7889 100644
--- a/indra/newview/skins/default/xui/en/floater_translation_settings.xml
+++ b/indra/newview/skins/default/xui/en/floater_translation_settings.xml
@@ -4,7 +4,7 @@
height="310"
layout="topleft"
name="floater_translation_settings"
- help_topic="environment_editor_floater"
+ help_topic="translation_settings"
save_rect="true"
title="CHAT TRANSLATION SETTINGS"
width="485">
diff --git a/indra/newview/skins/default/xui/en/floater_world_map.xml b/indra/newview/skins/default/xui/en/floater_world_map.xml
index 4314c8a9e2..56d79f62c7 100644
--- a/indra/newview/skins/default/xui/en/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/en/floater_world_map.xml
@@ -468,7 +468,7 @@
left="3"
top_pad="7"
mouse_opaque="true"
- name="region_icon"
+ name="location_icon"
width="16" />
<search_editor
follows="top|right"
diff --git a/indra/newview/skins/default/xui/en/menu_login.xml b/indra/newview/skins/default/xui/en/menu_login.xml
index 80e310a873..8ac1ac9e09 100644
--- a/indra/newview/skins/default/xui/en/menu_login.xml
+++ b/indra/newview/skins/default/xui/en/menu_login.xml
@@ -167,13 +167,6 @@
function="Floater.Show"
parameter="message_critical" />
</menu_item_call>
- <menu_item_call
- label="Media Browser Test"
- name="Web Browser Test">
- <menu_item_call.on_click
- function="Advanced.WebBrowserTest"
- parameter="http://join.secondlife.com/"/>
- </menu_item_call>
<menu_item_call
label="Web Content Floater Debug Test"
name="Web Content Floater Debug Test">
diff --git a/indra/newview/skins/default/xui/en/menu_toolbars.xml b/indra/newview/skins/default/xui/en/menu_toolbars.xml
index 7384114d7d..fbe40a7244 100644
--- a/indra/newview/skins/default/xui/en/menu_toolbars.xml
+++ b/indra/newview/skins/default/xui/en/menu_toolbars.xml
@@ -3,9 +3,15 @@
layout="topleft"
name="Toolbars Popup"
visible="false">
+ <menu_item_call label="Remove this button"
+ layout="topleft"
+ name="Remove button">
+ <menu_item_call.on_click function="Toolbars.RemoveSelectedCommand" />
+ </menu_item_call>
+ <menu_item_separator layout="topleft" />
<menu_item_call label="Toolbar buttons..."
layout="topleft"
- name="Chose Buttons">
+ name="Choose Buttons">
<menu_item_call.on_click function="Floater.Show"
parameter="toybox" />
</menu_item_call>
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 723256b8a5..c8c1922bf6 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -533,18 +533,26 @@
function="World.EnvSettings"
parameter="midnight" />
</menu_item_call>
+ <menu_item_separator/>
+ <menu_item_call
+ label="Use Region Settings"
+ name="Use Region Settings">
+ <menu_item_call.on_click
+ function="World.EnvSettings"
+ parameter="region" />
+ </menu_item_call>
</menu>
<menu
create_jump_keys="true"
- label="Enviroment Editor"
- name="Enviroment Editor"
+ label="Environment Editor"
+ name="Environment Editor"
tear_off="true">
<menu_item_call
- label="Enviroment Settings..."
- name="Enviroment Settings">
+ label="Environment Settings..."
+ name="Environment Settings">
<menu_item_call.on_click
function="World.EnvSettings"
parameter="editor"/>
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 3ed8c30ca8..e4458f33b1 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -4636,7 +4636,21 @@ Are you sure you want to quit?
name="ConfirmRestoreToybox"
type="alertmodal">
<unique/>
-Are you sure you want to restore your default buttons and toolbars?
+This action will restore your default buttons and toolbars.
+
+You cannot undo this action.
+ <usetemplate
+ name="okcancelbuttons"
+ notext="Cancel"
+ yestext="OK"/>
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="ConfirmClearAllToybox"
+ type="alertmodal">
+ <unique/>
+This action will return all buttons to the toolbox and your toolbars will be empty.
You cannot undo this action.
<usetemplate
@@ -4644,7 +4658,7 @@ You cannot undo this action.
notext="Cancel"
yestext="OK"/>
</notification>
-
+
<notification
icon="alertmodal.tga"
name="DeleteItems"
diff --git a/indra/newview/skins/default/xui/en/panel_edit_jacket.xml b/indra/newview/skins/default/xui/en/panel_edit_jacket.xml
index 8e8d8e6505..0f8c37c691 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_jacket.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_jacket.xml
@@ -32,7 +32,7 @@
name="Upper Fabric"
tool_tip="Click to choose a picture"
top="10"
- width="74" >
+ width="75" >
<texture_picker.commit_callback
function="TexturePicker.Commit" />
</texture_picker>
diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index 3835cd17b6..6521bf2a4e 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -22,17 +22,17 @@ top="600"
<!-- *NOTE: Custom resize logic for login_html in llpanellogin.cpp -->
<web_browser
tab_stop="false"
-trusted_content="true"
-bg_opaque_color="Black"
-border_visible="false"
-bottom="600"
-follows="all"
-left="0"
-name="login_html"
-start_url=""
-top="0"
-height="600"
- width="980" />
+ trusted_content="true"
+ bg_opaque_color="Black"
+ border_visible="false"
+ bottom="600"
+ follows="all"
+ left="0"
+ name="login_html"
+ start_url=""
+ top="0"
+ height="600"
+ width="980"/>
<layout_stack
follows="left|bottom|right"
name="login_widgets"
diff --git a/indra/newview/skins/default/xui/en/panel_nearby_chat.xml b/indra/newview/skins/default/xui/en/panel_nearby_chat.xml
index f766236b2e..d492f9bd68 100644
--- a/indra/newview/skins/default/xui/en/panel_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_nearby_chat.xml
@@ -11,7 +11,7 @@
control_name="TranslateChat"
enabled="true"
height="16"
- label="Translate chat (powered by Google)"
+ label="Translate chat"
layout="topleft"
left="5"
name="translate_chat_checkbox"
diff --git a/indra/newview/skins/default/xui/en/panel_places.xml b/indra/newview/skins/default/xui/en/panel_places.xml
index 5d7334f780..670aa47313 100644
--- a/indra/newview/skins/default/xui/en/panel_places.xml
+++ b/indra/newview/skins/default/xui/en/panel_places.xml
@@ -202,7 +202,7 @@ background_visible="true"
</layout_panel>
<layout_panel
- follows="bottom|left|right"
+ follows="bottom|right"
height="23"
layout="bottomleft"
left_pad="0"
@@ -212,7 +212,7 @@ background_visible="true"
auto_resize="true"
width="24">
<menu_button
- follows="bottom|left|right"
+ follows="bottom|right"
height="23"
image_disabled="ComboButton_UpOff"
image_unselected="ComboButton_UpOff"
diff --git a/indra/newview/skins/default/xui/en/floater_postcard.xml b/indra/newview/skins/default/xui/en/panel_postcard_message.xml
index adc2433105..ab2a42ea01 100644
--- a/indra/newview/skins/default/xui/en/floater_postcard.xml
+++ b/indra/newview/skins/default/xui/en/panel_postcard_message.xml
@@ -1,131 +1,101 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- legacy_header_height="18"
- can_minimize="false"
- can_resize="true"
+<panel
height="380"
layout="topleft"
- min_height="380"
- min_width="490"
- name="Postcard"
- help_topic="postcard"
- title="EMAIL SNAPSHOT"
+ name="panel_postcard_message"
width="490">
- <floater.string
- name="default_subject">
- Postcard from [SECOND_LIFE].
- </floater.string>
- <floater.string
- name="default_message">
- Check this out!
- </floater.string>
- <floater.string
- name="upload_message">
- Sending...
- </floater.string>
<text
type="string"
length="1"
bottom="35"
follows="top|left"
font="SansSerif"
+ height="16"
layout="topleft"
left="12"
- name="to_label">
- Recipient&apos;s Email:
+ name="to_label"
+ top="10"
+ width="60">
+ To:
</text>
<line_editor
control_name="LastPostcardRecipient"
- follows="left|top"
+ follows="left|top|right"
height="20"
layout="topleft"
- left_delta="148"
+ left_pad="10"
name="to_form"
- top_delta="-4"
- width="150" />
- <text
- type="string"
- length="1"
- bottom_delta="23"
- follows="top|left"
- font="SansSerif"
- layout="topleft"
- left="12"
- name="from_label">
- Your Email:
- </text>
- <line_editor
- follows="left|top"
- height="20"
- layout="topleft"
- left_delta="148"
- name="from_form"
- top_delta="-4"
- width="150" />
+ right="-10"
+ top_delta="-4" />
<text
type="string"
length="1"
bottom_delta="23"
follows="top|left"
font="SansSerif"
+ height="16"
layout="topleft"
left="12"
- name="name_label">
- Your Name:
+ name="name_label"
+ width="60">
+ From:
</text>
<line_editor
- follows="left|top"
+ follows="left|top|right"
height="20"
layout="topleft"
- left_delta="148"
+ left_pad="10"
max_length_bytes="100"
name="name_form"
- top_delta="-4"
- width="150" />
+ right="-10"
+ top_delta="-4" />
<text
type="string"
length="1"
bottom_delta="23"
follows="top|left"
font="SansSerif"
+ height="16"
layout="topleft"
left="12"
- name="subject_label">
+ name="subject_label"
+ width="60">
Subject:
</text>
<line_editor
- follows="left|top"
+ follows="left|top|right"
height="20"
label="Type your subject here."
layout="topleft"
- left_delta="148"
+ left_pad="10"
max_length_bytes="100"
name="subject_form"
- top_delta="-4"
- width="150" />
+ right="-10"
+ top_delta="-4" />
<text
type="string"
length="1"
bottom_delta="23"
- follows="top|left"
+ follows="top|left|right"
font="SansSerif"
layout="topleft"
left="12"
- name="msg_label">
+ name="msg_label"
+ right="-10">
Message:
</text>
<text_editor
type="string"
length="1"
- follows="left|top|right|bottom"
- height="140"
+ follows="left|top|right"
+ height="60"
layout="topleft"
left_delta="0"
max_length="700"
name="msg_form"
- word_wrap="true"
+ right="-10"
top_pad="10"
- width="420">
+ word_wrap="true">
Type your message here.
</text_editor>
<button
@@ -134,9 +104,12 @@
label="Cancel"
layout="topleft"
name="cancel_btn"
- right="-10"
+ right="-32"
top="350"
- width="100" />
+ width="100">
+ <button.commit_callback
+ function="Postcard.Cancel" />
+ </button>
<button
follows="right|bottom"
height="23"
@@ -145,5 +118,8 @@
left_delta="-106"
name="send_btn"
top_delta="0"
- width="100" />
-</floater>
+ width="100">
+ <button.commit_callback
+ function="Postcard.Send" />
+ </button>
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_postcard_settings.xml b/indra/newview/skins/default/xui/en/panel_postcard_settings.xml
new file mode 100644
index 0000000000..aebbc51be1
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_postcard_settings.xml
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ height="380"
+ layout="topleft"
+ name="panel_postcard_settings"
+ width="490">
+ <combo_box
+ follows="left|top|right"
+ height="23"
+ label="Resolution"
+ layout="topleft"
+ left="10"
+ name="postcard_size_combo"
+ right="-10"
+ top_pad="10">
+ <combo_box.item
+ label="Current Window"
+ name="CurrentWindow"
+ value="[i0,i0]" />
+ <combo_box.item
+ label="640x480"
+ name="640x480"
+ value="[i640,i480]" />
+ <combo_box.item
+ label="800x600"
+ name="800x600"
+ value="[i800,i600]" />
+ <combo_box.item
+ label="1024x768"
+ name="1024x768"
+ value="[i1024,i768]" />
+ <combo_box.item
+ label="Custom"
+ name="Custom"
+ value="[i-1,i-1]" />
+ </combo_box>
+ <layout_stack
+ animate="false"
+ follows="all"
+ height="275"
+ layout="bottomleft"
+ name="postcard_image_params_ls"
+ left_delta="0"
+ orientation="vertical"
+ top_pad="10"
+ right="-10">
+ <layout_panel
+ follows="top|left|right"
+ height="60"
+ layout="topleft"
+ left="0"
+ name="postcard_image_size_lp"
+ user_resize="false"
+ auto_resize="false"
+ top="0"
+ right="-1"
+ visible="true">
+ <spinner
+ allow_text_entry="false"
+ decimal_digits="0"
+ follows="left|top"
+ height="20"
+ increment="32"
+ label="Width"
+ label_width="40"
+ layout="topleft"
+ left="10"
+ max_val="6016"
+ min_val="32"
+ name="postcard_snapshot_width"
+ top_pad="10"
+ width="95" />
+ <spinner
+ allow_text_entry="false"
+ decimal_digits="0"
+ follows="left|top"
+ height="20"
+ increment="32"
+ label="Height"
+ label_width="40"
+ layout="topleft"
+ left_pad="5"
+ max_val="6016"
+ min_val="32"
+ name="postcard_snapshot_height"
+ top_delta="0"
+ width="95" />
+ <check_box
+ bottom_delta="20"
+ follows="left|top"
+ label="Constrain proportions"
+ layout="topleft"
+ left="10"
+ name="postcard_keep_aspect_check" />
+ </layout_panel>
+ <layout_panel
+ follows="top|left|right"
+ height="23"
+ layout="topleft"
+ left="0"
+ name="postcard_image_format_quality_lp"
+ user_resize="false"
+ auto_resize="true"
+ top="0"
+ right="-1"
+ visible="true">
+ <slider
+ decimal_digits="0"
+ follows="left|top"
+ height="15"
+ increment="1"
+ initial_value="75"
+ label="Image quality"
+ label_width="80"
+ layout="topleft"
+ left="10"
+ max_val="100"
+ name="image_quality_slider"
+ top_pad="7"
+ width="200" />
+ <text
+ type="string"
+ follows="left|top"
+ font="SansSerifSmall"
+ length="1"
+ height="14"
+ layout="topleft"
+ left_pad="-5"
+ halign="left"
+ name="image_quality_level"
+ top_delta="0"
+ width="60">
+ ([QLVL])
+ </text>
+ </layout_panel>
+ </layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml
new file mode 100644
index 0000000000..9057ebb65e
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ height="380"
+ layout="topleft"
+ name="panel_snapshot_inventory"
+ width="490">
+ <icon
+ follows="top|left"
+ height="18"
+ image_name="Snapshot_Inventory"
+ layout="topleft"
+ left="12"
+ mouse_opaque="true"
+ name="title_icon"
+ top="5"
+ width="18" />
+ <text
+ follows="top|left|right"
+ font="SansSerifBold"
+ height="20"
+ layout="topleft"
+ left_pad="12"
+ length="1"
+ name="title"
+ right="-10"
+ text_color="white"
+ type="string"
+ top_delta="5">
+ Save to My Inventory
+ </text>
+ <view_border
+ bevel_style="in"
+ follows="left|top|right"
+ height="1"
+ left="10"
+ layout="topleft"
+ name="hr"
+ right="-10"
+ top_pad="5"
+ />
+ <text
+ bottom="35"
+ follows="top|left|right"
+ font="SansSerif"
+ height="56"
+ layout="topleft"
+ left="12"
+ length="1"
+ name="hint_lbl"
+ top_pad="10"
+ type="string"
+ word_wrap="true">
+ Saving an image to your inventory costs L$[UPLOAD_COST]. To save your image as a texture select one of the square formats.
+ </text>
+ <combo_box
+ follows="top|left|right"
+ height="23"
+ label="Resolution"
+ layout="topleft"
+ left_delta="0"
+ name="texture_size_combo"
+ right="-10"
+ top_pad="10">
+ <combo_box.item
+ label="Current Window"
+ name="CurrentWindow"
+ value="[i0,i0]" />
+ <combo_box.item
+ label="Small (128x128)"
+ name="Small(128x128)"
+ value="[i128,i128]" />
+ <combo_box.item
+ label="Medium (256x256)"
+ name="Medium(256x256)"
+ value="[i256,i256]" />
+ <combo_box.item
+ label="Large (512x512)"
+ name="Large(512x512)"
+ value="[i512,i512]" />
+ <combo_box.item
+ label="Custom"
+ name="Custom"
+ value="[i-1,i-1]" />
+ </combo_box>
+ <spinner
+ allow_text_entry="false"
+ decimal_digits="0"
+ follows="left|top"
+ height="20"
+ increment="32"
+ label="Width"
+ label_width="40"
+ layout="topleft"
+ left="10"
+ max_val="6016"
+ min_val="32"
+ name="inventory_snapshot_width"
+ top_pad="10"
+ width="95" />
+ <spinner
+ allow_text_entry="false"
+ decimal_digits="0"
+ follows="left|top"
+ height="20"
+ increment="32"
+ label="Height"
+ label_width="40"
+ layout="topleft"
+ left_pad="5"
+ max_val="6016"
+ min_val="32"
+ name="inventory_snapshot_height"
+ top_delta="0"
+ width="95" />
+ <check_box
+ bottom_delta="20"
+ follows="left|top"
+ label="Constrain proportions"
+ layout="topleft"
+ left="10"
+ name="inventory_keep_aspect_check"
+ visible="false" />
+ <button
+ follows="right|bottom"
+ height="23"
+ label="Cancel"
+ layout="topleft"
+ name="cancel_btn"
+ right="-32"
+ top="350"
+ width="100">
+ <button.commit_callback
+ function="Inventory.Cancel" />
+ </button>
+ <button
+ follows="right|bottom"
+ height="23"
+ label="Save"
+ layout="topleft"
+ left_delta="-106"
+ name="save_btn"
+ top_delta="0"
+ width="100">
+ <button.commit_callback
+ function="Inventory.Save" />
+ </button>
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_local.xml b/indra/newview/skins/default/xui/en/panel_snapshot_local.xml
new file mode 100644
index 0000000000..ae0215a578
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_snapshot_local.xml
@@ -0,0 +1,236 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ height="380"
+ layout="topleft"
+ name="panel_snapshot_local"
+ width="490">
+ <icon
+ follows="top|left"
+ height="18"
+ image_name="Snapshot_Download"
+ layout="topleft"
+ left="12"
+ mouse_opaque="true"
+ name="title_icon"
+ top="5"
+ width="18" />
+ <text
+ follows="top|left|right"
+ font="SansSerifBold"
+ height="20"
+ layout="topleft"
+ left_pad="12"
+ length="1"
+ name="title"
+ right="-10"
+ text_color="white"
+ type="string"
+ top_delta="4">
+ Save to My Computer
+ </text>
+ <view_border
+ bevel_style="in"
+ follows="left|top|right"
+ height="1"
+ left="10"
+ layout="topleft"
+ name="hr"
+ right="-10"
+ top_pad="5"
+ />
+ <combo_box
+ follows="left|top|right"
+ height="23"
+ label="Resolution"
+ layout="topleft"
+ left_delta="0"
+ name="local_size_combo"
+ right="-10"
+ top_pad="10">
+ <combo_box.item
+ label="Current Window"
+ name="CurrentWindow"
+ value="[i0,i0]" />
+ <combo_box.item
+ label="320x240"
+ name="320x240"
+ value="[i320,i240]" />
+ <combo_box.item
+ label="640x480"
+ name="640x480"
+ value="[i640,i480]" />
+ <combo_box.item
+ label="800x600"
+ name="800x600"
+ value="[i800,i600]" />
+ <combo_box.item
+ label="1024x768"
+ name="1024x768"
+ value="[i1024,i768]" />
+ <combo_box.item
+ label="1280x1024"
+ name="1280x1024"
+ value="[i1280,i1024]" />
+ <combo_box.item
+ label="1600x1200"
+ name="1600x1200"
+ value="[i1600,i1200]" />
+ <combo_box.item
+ label="Custom"
+ name="Custom"
+ value="[i-1,i-1]" />
+ </combo_box>
+ <layout_stack
+ animate="false"
+ follows="all"
+ height="275"
+ layout="bottomleft"
+ name="local_image_params_ls"
+ left_delta="0"
+ orientation="vertical"
+ top_pad="10"
+ right="-10">
+ <layout_panel
+ follows="top|left|right"
+ height="60"
+ layout="topleft"
+ left="0"
+ name="local_image_size_lp"
+ user_resize="false"
+ auto_resize="false"
+ top="0"
+ right="-1"
+ visible="true">
+ <spinner
+ allow_text_entry="false"
+ decimal_digits="0"
+ follows="left|top"
+ height="20"
+ increment="32"
+ label="Width"
+ label_width="40"
+ layout="topleft"
+ left="10"
+ max_val="6016"
+ min_val="32"
+ name="local_snapshot_width"
+ top_pad="10"
+ width="95" />
+ <spinner
+ allow_text_entry="false"
+ decimal_digits="0"
+ follows="left|top"
+ height="20"
+ increment="32"
+ label="Height"
+ label_width="40"
+ layout="topleft"
+ left_pad="5"
+ max_val="6016"
+ min_val="32"
+ name="local_snapshot_height"
+ top_delta="0"
+ width="95" />
+ <check_box
+ bottom_delta="20"
+ follows="left|top"
+ label="Constrain proportions"
+ layout="topleft"
+ left="10"
+ name="local_keep_aspect_check" />
+ </layout_panel>
+ <layout_panel
+ follows="top|left|right"
+ height="23"
+ layout="topleft"
+ left="0"
+ name="local_image_format_quality_lp"
+ user_resize="false"
+ auto_resize="true"
+ top="0"
+ right="-1"
+ visible="true">
+ <combo_box
+ follows="left|top"
+ height="23"
+ label="Format"
+ layout="topleft"
+ left_delta="0"
+ name="local_format_combo"
+ top_pad="0"
+ width="120">
+ <combo_box.item
+ label="PNG (Lossless)"
+ name="PNG"
+ value="PNG" />
+ <combo_box.item
+ label="JPEG"
+ name="JPEG"
+ value="JPEG" />
+ <combo_box.item
+ label="BMP (Lossless)"
+ name="BMP"
+ value="BMP" />
+ </combo_box>
+ <slider
+ decimal_digits="0"
+ follows="left|top"
+ height="15"
+ increment="1"
+ initial_value="75"
+ label="Image quality"
+ label_width="80"
+ layout="topleft"
+ left="10"
+ max_val="100"
+ name="image_quality_slider"
+ top_pad="7"
+ width="200" />
+ <text
+ type="string"
+ follows="left|top"
+ font="SansSerifSmall"
+ length="1"
+ height="14"
+ layout="topleft"
+ left_pad="-5"
+ halign="left"
+ name="image_quality_level"
+ top_delta="0"
+ width="60">
+ ([QLVL])
+ </text>
+ </layout_panel>
+ </layout_stack>
+ <button
+ follows="right|bottom"
+ height="23"
+ label="Cancel"
+ layout="topleft"
+ name="cancel_btn"
+ right="-32"
+ top="350"
+ width="100">
+ <button.commit_callback
+ function="Local.Cancel" />
+ </button>
+ <flyout_button
+ follows="right|bottom"
+ height="23"
+ label="Save"
+ layout="topleft"
+ left_delta="-106"
+ name="save_btn"
+ tool_tip="Save image to a file"
+ top_delta="0"
+ width="100">
+ <flyout_button.item
+ label="Save"
+ name="save_item"
+ value="save" />
+ <flyout_button.item
+ label="Save As..."
+ name="saveas_item"
+ value="save as" />
+ </flyout_button>
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_options.xml b/indra/newview/skins/default/xui/en/panel_snapshot_options.xml
new file mode 100644
index 0000000000..d2f29ade44
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_snapshot_options.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ follows="all"
+ height="240"
+ layout="topleft"
+ name="panel_snapshot_options"
+ width="490">
+ <button
+ follows="left|top|right"
+ font="SansSerif"
+ halign="left"
+ height="38"
+ image_overlay="Snapshot_Profile"
+ image_overlay_alignment="left"
+ image_top_pad="-2"
+ imgoverlay_label_space="10"
+ label="Post to My Profile Feed"
+ layout="topleft"
+ left="10"
+ name="save_to_profile_btn"
+ pad_left="10"
+ right="-10"
+ top="5">
+ <button.commit_callback
+ function="Snapshot.SaveToProfile" />
+ </button>
+ <button
+ follows="left|top|right"
+ font="SansSerif"
+ halign="left"
+ height="38"
+ image_overlay="Snapshot_Email"
+ image_overlay_alignment="left"
+ image_top_pad="-2"
+ imgoverlay_label_space="10"
+ label="Email"
+ layout="topleft"
+ left_delta="0"
+ name="save_to_email_btn"
+ pad_left="10"
+ right="-10"
+ top_pad="10">
+ <button.commit_callback
+ function="Snapshot.SaveToEmail" />
+ </button>
+ <button
+ follows="left|top|right"
+ font="SansSerif"
+ halign="left"
+ height="38"
+ image_overlay="Snapshot_Inventory"
+ image_overlay_alignment="left"
+ image_top_pad="-2"
+ imgoverlay_label_space="10"
+ label="Save to My Inventory (L$[AMOUNT])"
+ layout="topleft"
+ left_delta="0"
+ name="save_to_inventory_btn"
+ pad_left="10"
+ right="-10"
+ top_pad="10">
+ <button.commit_callback
+ function="Snapshot.SaveToInventory" />
+ </button>
+ <button
+ follows="left|top|right"
+ font="SansSerif"
+ halign="left"
+ height="38"
+ image_overlay="Snapshot_Download"
+ image_overlay_alignment="left"
+ image_top_pad="-2"
+ imgoverlay_label_space="10"
+ label="Save to My Computer"
+ layout="topleft"
+ left_delta="0"
+ name="save_to_computer_btn"
+ pad_left="10"
+ right="-10"
+ top_pad="10">
+ <button.commit_callback
+ function="Snapshot.SaveToComputer" />
+ </button>
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/en/panel_snapshot_postcard.xml
new file mode 100644
index 0000000000..d8ff043444
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_snapshot_postcard.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ height="380"
+ layout="topleft"
+ name="panel_snapshot_postcard"
+ width="490">
+ <string
+ name="default_subject">
+ Postcard from [SECOND_LIFE].
+ </string>
+ <string
+ name="default_message">
+ Check this out!
+ </string>
+ <string
+ name="upload_message">
+ Sending...
+ </string>
+ <string
+ name="default_subject">
+ Postcard from [SECOND_LIFE].
+ </string>
+ <string
+ name="default_message">
+ Check this out!
+ </string>
+ <icon
+ follows="top|left"
+ height="18"
+ image_name="Snapshot_Email"
+ layout="topleft"
+ left="12"
+ mouse_opaque="true"
+ name="title_icon"
+ top="5"
+ width="18" />
+ <text
+ follows="top|left|right"
+ font="SansSerifBold"
+ height="20"
+ layout="topleft"
+ left_pad="12"
+ length="1"
+ name="title"
+ right="-10"
+ text_color="white"
+ type="string"
+ top_delta="3">
+ Email
+ </text>
+ <button
+ follows="right|top"
+ height="23"
+ is_toggle="true"
+ label="Message"
+ layout="topleft"
+ name="message_btn"
+ right="-82"
+ top_delta="-7"
+ width="70">
+ <button.commit_callback
+ function="Postcard.Message" />
+ </button>
+ <button
+ follows="right|top"
+ height="23"
+ is_toggle="true"
+ label="Settings"
+ layout="topleft"
+ name="settings_btn"
+ top_delta="0"
+ right="-10"
+ width="70">
+ <button.commit_callback
+ function="Postcard.Settings" />
+ </button>
+ <view_border
+ bevel_style="in"
+ follows="left|top|right"
+ height="1"
+ left="10"
+ layout="topleft"
+ name="hr"
+ right="-10"
+ top_pad="5"
+ />
+ <panel_container
+ follows="all"
+ height="340"
+ layout="topleft"
+ left="0"
+ name="postcard_panel_container"
+ default_panel_name="panel_postcard_message"
+ top_pad="10"
+ width="490">
+ <panel
+ follows="all"
+ layout="topleft"
+ name="panel_postcard_message"
+ filename="panel_postcard_message.xml" />
+ <panel
+ follows="all"
+ layout="topleft"
+ name="panel_postcard_settings"
+ filename="panel_postcard_settings.xml" />
+ </panel_container>
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_profile.xml b/indra/newview/skins/default/xui/en/panel_snapshot_profile.xml
new file mode 100644
index 0000000000..91ac9ad658
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_snapshot_profile.xml
@@ -0,0 +1,200 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ height="380"
+ layout="topleft"
+ name="panel_snapshot_profile"
+ width="490">
+ <icon
+ follows="top|left"
+ height="18"
+ image_name="Snapshot_Profile"
+ layout="topleft"
+ left="12"
+ mouse_opaque="true"
+ name="title_icon"
+ top="5"
+ width="18" />
+ <text
+ follows="top|left|right"
+ font="SansSerifBold"
+ height="20"
+ layout="topleft"
+ left_pad="12"
+ length="1"
+ name="title"
+ right="-10"
+ text_color="white"
+ type="string"
+ top_delta="4">
+ Post to My Profile Feed
+ </text>
+ <view_border
+ bevel_style="in"
+ follows="left|top|right"
+ height="1"
+ left="10"
+ layout="topleft"
+ name="hr"
+ right="-10"
+ top_pad="5"
+ />
+ <combo_box
+ follows="left|top"
+ height="23"
+ label="Resolution"
+ layout="topleft"
+ left_delta="0"
+ name="profile_size_combo"
+ top_pad="10"
+ width="250">
+ <combo_box.item
+ label="Current Window"
+ name="CurrentWindow"
+ value="[i0,i0]" />
+ <combo_box.item
+ label="640x480"
+ name="640x480"
+ value="[i640,i480]" />
+ <combo_box.item
+ label="800x600"
+ name="800x600"
+ value="[i800,i600]" />
+ <combo_box.item
+ label="1024x768"
+ name="1024x768"
+ value="[i1024,i768]" />
+ <combo_box.item
+ label="Custom"
+ name="Custom"
+ value="[i-1,i-1]" />
+ </combo_box>
+ <layout_stack
+ animate="false"
+ follows="all"
+ height="270"
+ layout="bottomleft"
+ name="profile_image_params_ls"
+ left_delta="0"
+ orientation="vertical"
+ top_pad="10"
+ right="-10">
+ <layout_panel
+ follows="top|left|right"
+ height="55"
+ layout="topleft"
+ left="0"
+ name="profile_image_size_lp"
+ user_resize="false"
+ auto_resize="false"
+ top="0"
+ right="-1"
+ visible="true">
+ <spinner
+ allow_text_entry="false"
+ decimal_digits="0"
+ follows="left|top"
+ height="20"
+ increment="32"
+ label="Width"
+ label_width="40"
+ layout="topleft"
+ left="10"
+ max_val="6016"
+ min_val="32"
+ name="profile_snapshot_width"
+ top_pad="10"
+ width="95" />
+ <spinner
+ allow_text_entry="false"
+ decimal_digits="0"
+ follows="left|top"
+ height="20"
+ increment="32"
+ label="Height"
+ label_width="40"
+ layout="topleft"
+ left_pad="5"
+ max_val="6016"
+ min_val="32"
+ name="profile_snapshot_height"
+ top_delta="0"
+ width="95" />
+ <check_box
+ bottom_delta="20"
+ label="Constrain proportions"
+ layout="topleft"
+ left="10"
+ name="profile_keep_aspect_check" />
+ </layout_panel>
+ <layout_panel
+ follows="top|left|right"
+ height="200"
+ layout="topleft"
+ left="0"
+ name="profile_image_metadata_lp"
+ user_resize="false"
+ auto_resize="true"
+ top="0"
+ right="-1"
+ visible="true">
+ <text
+ length="1"
+ follows="top|left|right"
+ font="SansSerif"
+ height="16"
+ layout="topleft"
+ left="0"
+ name="caption_label"
+ right="-10"
+ top_pad="0"
+ type="string">
+ Caption:
+ </text>
+ <text_editor
+ follows="all"
+ height="155"
+ layout="topleft"
+ left_delta="0"
+ length="1"
+ max_length="700"
+ name="caption"
+ right="-10"
+ top_pad="5"
+ type="string"
+ word_wrap="true">
+ </text_editor>
+ <check_box
+ follows="left|bottom"
+ initial_value="true"
+ label="Include location"
+ layout="topleft"
+ left_delta="0"
+ name="add_location_cb"
+ top_pad="15" />
+ </layout_panel>
+ </layout_stack>
+ <button
+ follows="right|bottom"
+ height="23"
+ label="Cancel"
+ layout="topleft"
+ name="cancel_btn"
+ right="-32"
+ top="350"
+ width="100">
+ <button.commit_callback
+ function="PostToProfile.Cancel" />
+ </button>
+ <button
+ follows="right|bottom"
+ height="23"
+ label="Post"
+ layout="topleft"
+ left_delta="-106"
+ name="post_btn"
+ top_delta="0"
+ width="100">
+ <button.commit_callback
+ function="PostToProfile.Send" />
+ </button>
+</panel>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index ec230773cc..befcc5dd87 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3724,4 +3724,12 @@ Try enclosing path to the editor with double quotes.
<string name="Wrap">Wrap</string>
<string name="Preview">Preview</string>
<string name="Normal">Normal</string>
+
+ <!-- Snapshot image quality levels -->
+ <string name="snapshot_quality_very_low">Very Low</string>
+ <string name="snapshot_quality_low">Low</string>
+ <string name="snapshot_quality_medium">Medium</string>
+ <string name="snapshot_quality_high">High</string>
+ <string name="snapshot_quality_very_high">Very High</string>
+
</strings>
diff --git a/indra/newview/skins/default/xui/en/teleport_strings.xml b/indra/newview/skins/default/xui/en/teleport_strings.xml
index bae821d3b5..dce6b8dd6d 100644
--- a/indra/newview/skins/default/xui/en/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/en/teleport_strings.xml
@@ -20,6 +20,10 @@ If you still cannot teleport, please log out and log back in to resolve the prob
Sorry, but system was unable to complete the teleport connection.
Try again in a moment.
</message>
+ <message name="NoHelpIslandTP">
+You cannot teleport back to Welcome Island.
+Go to &apos;Welcome Island Public&apos; to repeat the tutorial.
+ </message>
<message name="noaccess_tport">
Sorry, you do not have access to that teleport destination.
</message>
diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml
index 413ca1d1ef..0e29ed0d0b 100644
--- a/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml
+++ b/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml
@@ -12,13 +12,20 @@
tab_stop="false"
width="25" />
<chiclet_im_adhoc.speaker
- auto_update="true"
- draw_border="false"
- height="23"
- left="25"
- name="speaker"
- visible="false"
- width="20" />
+ image_mute="Parcel_VoiceNo_Light"
+ image_off="VoicePTT_Off_Dark"
+ image_on="VoicePTT_On_Dark"
+ image_level_1="VoicePTT_Lvl1_Dark"
+ image_level_2="VoicePTT_Lvl2_Dark"
+ image_level_3="VoicePTT_Lvl3_Dark"
+ auto_update="true"
+ draw_border="false"
+ height="24"
+ left="25"
+ bottom="1"
+ name="speaker"
+ visible="false"
+ width="20" />
<chiclet_im_adhoc.avatar_icon
bottom="3"
follows="left|top|bottom"
diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml
index 372a89cbc7..77011139bf 100644
--- a/indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml
+++ b/indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml
@@ -12,13 +12,20 @@
tab_stop="false"
width="25" />
<chiclet_im_group.speaker
- auto_update="true"
- draw_border="false"
- height="25"
- left="25"
- name="speaker"
- visible="false"
- width="20" />
+ image_mute="Parcel_VoiceNo_Light"
+ image_off="VoicePTT_Off_Dark"
+ image_on="VoicePTT_On_Dark"
+ image_level_1="VoicePTT_Lvl1_Dark"
+ image_level_2="VoicePTT_Lvl2_Dark"
+ image_level_3="VoicePTT_Lvl3_Dark"
+ auto_update="true"
+ draw_border="false"
+ height="24"
+ left="25"
+ bottom="1"
+ name="speaker"
+ visible="false"
+ width="20" />
<chiclet_im_group.group_icon
bottom="3"
default_icon="Generic_Group"
diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml
index d27c14f4e7..8b56a8f0f6 100644
--- a/indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml
+++ b/indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml
@@ -12,13 +12,20 @@
tab_stop="false"
width="25"/>
<chiclet_im_p2p.speaker
- auto_update="true"
- draw_border="false"
- height="23"
- left="25"
- name="speaker"
- visible="false"
- width="20" />
+ image_mute="Parcel_VoiceNo_Light"
+ image_off="VoicePTT_Off_Dark"
+ image_on="VoicePTT_On_Dark"
+ image_level_1="VoicePTT_Lvl1_Dark"
+ image_level_2="VoicePTT_Lvl2_Dark"
+ image_level_3="VoicePTT_Lvl3_Dark"
+ auto_update="true"
+ draw_border="false"
+ height="24"
+ left="25"
+ bottom="1"
+ name="speaker"
+ visible="false"
+ width="20" />
<chiclet_im_p2p.avatar_icon
bottom="3"
color="white"
diff --git a/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_item.xml b/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_item.xml
new file mode 100644
index 0000000000..7a7a6e9a09
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_item.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<inbox_folder_view_item
+ item_height="20"
+ item_top_pad="4"
+ selection_image="Rounded_Square"
+ >
+ <new_badge
+ label="New"
+ label_offset_horiz="-1"
+ location="right"
+ padding_horiz="12.5"
+ padding_vert="2"
+ location_offset_hcenter="-23"
+ border_image="New_Tag_Border"
+ border_color="DkGray2"
+ image="New_Tag_Background"
+ image_color="Black"
+ />
+</inbox_folder_view_item>
diff --git a/indra/newview/skins/default/xui/es/floater_nearby_chat.xml b/indra/newview/skins/default/xui/es/floater_nearby_chat.xml
index 1fee9ab056..b3b8cdcfff 100644
--- a/indra/newview/skins/default/xui/es/floater_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/es/floater_nearby_chat.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="nearby_chat" title="CHAT">
- <check_box label="Traducir chat (mediante Google)" name="translate_chat_checkbox"/>
+ <check_box label="Traducir chat" name="translate_chat_checkbox"/>
</floater>
diff --git a/indra/newview/skins/default/xui/es/panel_nearby_chat.xml b/indra/newview/skins/default/xui/es/panel_nearby_chat.xml
index 95ce14c9a7..5a852a6711 100644
--- a/indra/newview/skins/default/xui/es/panel_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/es/panel_nearby_chat.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="nearby_chat">
- <check_box label="Traducir chat (mediante Google)" name="translate_chat_checkbox"/>
+ <check_box label="Traducir chat" name="translate_chat_checkbox"/>
</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_people.xml b/indra/newview/skins/default/xui/es/panel_people.xml
index 2fcbb00aed..a9d38dca25 100644
--- a/indra/newview/skins/default/xui/es/panel_people.xml
+++ b/indra/newview/skins/default/xui/es/panel_people.xml
@@ -76,7 +76,7 @@
<button label="Compartir" name="share_btn" tool_tip="Compartir un objeto del inventario"/>
</layout_panel>
<layout_panel name="teleport_btn_lp">
- <button label="Teleportarte" name="teleport_btn" tool_tip="Ofrecer teleporte"/>
+ <button label="Teleporte" name="teleport_btn" tool_tip="Ofrecer teleporte"/>
</layout_panel>
</layout_stack>
<layout_stack name="bottom_bar_ls1">
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_chat.xml b/indra/newview/skins/default/xui/es/panel_preferences_chat.xml
index 4625075aa5..e822585566 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_chat.xml
@@ -31,7 +31,7 @@
<spinner label="Tiempo de los otros interlocutores:" name="nearby_toasts_fadingtime"/>
<check_box name="translate_chat_checkbox"/>
<text name="translate_chb_label">
- Usar en el chat el traductor automático de Google
+ Usar en el chat el traductor automático
</text>
<text name="translate_language_text">
Traducir el chat al:
diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml
index 83747b85c0..4cae6ce5e8 100644
--- a/indra/newview/skins/default/xui/es/strings.xml
+++ b/indra/newview/skins/default/xui/es/strings.xml
@@ -3841,6 +3841,9 @@ Si sigues recibiendo este mensaje, contacta con [SUPPORT_SITE].
<string name="inventory_item_offered-im">
Ofrecido el item del inventario
</string>
+ <string name="share_alert">
+ Arrastra los ítems desde el invenbtario hasta aquí
+ </string>
<string name="no_session_message">
(La sesión de MI no existe)
</string>
diff --git a/indra/newview/skins/default/xui/es/teleport_strings.xml b/indra/newview/skins/default/xui/es/teleport_strings.xml
index e0e0061729..e785a7ac40 100644
--- a/indra/newview/skins/default/xui/es/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/es/teleport_strings.xml
@@ -19,6 +19,10 @@ Si sigues recibiendo este mensaje, por favor, acude al [SUPPORT_SITE].
Lo sentimos, pero el sistema no ha podido completar el teleporte.
Vuelva a intentarlo en un momento.
</message>
+ <message name="NoHelpIslandTP">
+ No puede teleportarse de vuelta a la Welcome Island (&apos;Isla de Ayuda&apos;).
+Vaya a la &apos;Welcome Island Public&apos; (&apos;Isla Pública de Ayuda&apos;) para repetir el tutorial.
+ </message>
<message name="noaccess_tport">
Lo sentimos, pero no tienes acceso al destino de este teleporte.
</message>
diff --git a/indra/newview/skins/default/xui/fr/floater_nearby_chat.xml b/indra/newview/skins/default/xui/fr/floater_nearby_chat.xml
index 9b1b21c434..8bbd34baae 100644
--- a/indra/newview/skins/default/xui/fr/floater_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/fr/floater_nearby_chat.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="nearby_chat" title="CHAT PRÈS DE MOI">
- <check_box label="Traduction du chat (fournie par Google)" name="translate_chat_checkbox"/>
+ <check_box label="Traduction du chat" name="translate_chat_checkbox"/>
</floater>
diff --git a/indra/newview/skins/default/xui/fr/panel_nearby_chat.xml b/indra/newview/skins/default/xui/fr/panel_nearby_chat.xml
index 98eddf196b..31cb3308e3 100644
--- a/indra/newview/skins/default/xui/fr/panel_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/fr/panel_nearby_chat.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="nearby_chat">
- <check_box label="Traduction du chat (fournie par Google)" name="translate_chat_checkbox"/>
+ <check_box label="Traduction du chat" name="translate_chat_checkbox"/>
</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml b/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml
index 646f53704c..fa026d8106 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml
@@ -31,7 +31,7 @@
<spinner label="Disparition progressive du popup Chat près de moi :" name="nearby_toasts_fadingtime"/>
<check_box name="translate_chat_checkbox"/>
<text name="translate_chb_label">
- Utiliser la traduction automatique lors des chats (fournie par Google)
+ Utiliser la traduction automatique lors des chats
</text>
<text name="translate_language_text">
Traduire le chat en :
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/fr/panel_preferences_privacy.xml
index 3123a4c6fe..b122db9502 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_privacy.xml
@@ -20,7 +20,7 @@
<check_box label="Inclure la date et l&apos;heure pour chaque ligne du journal de chat" name="show_timestamps_check_im"/>
<check_box label="Inclure la date dans le nom du fichier journal" name="logfile_name_datestamp"/>
<text name="log_path_desc">
- Emplacement :
+ Emplacement des journaux :
</text>
<line_editor left="308" name="log_path_string" right="-20"/>
<button label="Parcourir" label_selected="Parcourir" name="log_path_button" width="150"/>
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_sound.xml b/indra/newview/skins/default/xui/fr/panel_preferences_sound.xml
index deaec2e14f..37eb6bbeb0 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_sound.xml
@@ -17,9 +17,9 @@
<check_box label="Activé" name="enable_media"/>
<slider label="Chat vocal" name="Voice Volume"/>
<check_box label="Activé" name="enable_voice_check"/>
- <check_box label="Autoriser la lecture automatique du média" name="media_auto_play_btn" tool_tip="Cochez pour autoriser la lecture automatique du média" value="true"/>
- <check_box label="Lecture du média aux autres avatars" name="media_show_on_others_btn" tool_tip="Décochez pour masquer le média aux autres avatars près de vous" value="true"/>
- <check_box label="Lire les sons des gestes" name="gesture_audio_play_btn" tool_tip="Cochez cette case pour entendre les sons associés aux gestes." value="true"/>
+ <check_box label="Autoriser la lecture automatique du média" name="media_auto_play_btn" tool_tip="Cocher pour autoriser la lecture automatique du média." value="true"/>
+ <check_box label="Lire le média attaché aux autres avatars" name="media_show_on_others_btn" tool_tip="Décocher pour masquer le média attaché aux autres avatars près de vous." value="true"/>
+ <check_box label="Lire les sons des gestes" name="gesture_audio_play_btn" tool_tip="Cocher cette case pour entendre les sons associés aux gestes." value="true"/>
<text name="voice_chat_settings">
Paramètres du chat vocal
</text>
diff --git a/indra/newview/skins/default/xui/fr/panel_region_debug.xml b/indra/newview/skins/default/xui/fr/panel_region_debug.xml
index cb4a74e142..733c3f9a22 100644
--- a/indra/newview/skins/default/xui/fr/panel_region_debug.xml
+++ b/indra/newview/skins/default/xui/fr/panel_region_debug.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Débugger" name="Debug">
+<panel label="Débogage" name="Debug">
<text name="region_text_lbl">
Région :
</text>
diff --git a/indra/newview/skins/default/xui/fr/strings.xml b/indra/newview/skins/default/xui/fr/strings.xml
index daa31c980a..f9f3366f63 100644
--- a/indra/newview/skins/default/xui/fr/strings.xml
+++ b/indra/newview/skins/default/xui/fr/strings.xml
@@ -4837,7 +4837,7 @@ Essayez avec le chemin d&apos;accès à l&apos;éditeur entre guillemets doubles
Parler
</string>
<string name="Command_View_Label">
- Vue
+ Affichage
</string>
<string name="Command_Voice_Label">
Chat près de vous
diff --git a/indra/newview/skins/default/xui/fr/teleport_strings.xml b/indra/newview/skins/default/xui/fr/teleport_strings.xml
index 7c291c0984..401b272c81 100644
--- a/indra/newview/skins/default/xui/fr/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/fr/teleport_strings.xml
@@ -20,6 +20,10 @@ Si vous ne parvenez toujours pas à être téléporté, déconnectez-vous puis r
Désolé, la connexion vers votre lieu de téléportation n&apos;a pas abouti.
Veuillez réessayer dans un moment.
</message>
+ <message name="NoHelpIslandTP">
+ Vous ne pouvez pas retourner sur Welcome Island.
+Pour répéter le didacticiel, veuillez aller sur Welcome Island Public.
+ </message>
<message name="noaccess_tport">
Désolé, vous n&apos;avez pas accès à cette destination.
</message>
diff --git a/indra/newview/skins/default/xui/it/floater_nearby_chat.xml b/indra/newview/skins/default/xui/it/floater_nearby_chat.xml
index 4c41df8a62..9e81899880 100644
--- a/indra/newview/skins/default/xui/it/floater_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/it/floater_nearby_chat.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="nearby_chat" title="CHAT NEI DINTORNI">
- <check_box label="Traduci chat (tecnologia Google)" name="translate_chat_checkbox"/>
+ <check_box label="Traduci chat" name="translate_chat_checkbox"/>
</floater>
diff --git a/indra/newview/skins/default/xui/it/panel_nearby_chat.xml b/indra/newview/skins/default/xui/it/panel_nearby_chat.xml
index 7afc3cd7e7..1b529e2737 100644
--- a/indra/newview/skins/default/xui/it/panel_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/it/panel_nearby_chat.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="nearby_chat">
- <check_box label="Traduci chat (tecnologia Google)" name="translate_chat_checkbox"/>
+ <check_box label="Traduci chat" name="translate_chat_checkbox"/>
</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_chat.xml b/indra/newview/skins/default/xui/it/panel_preferences_chat.xml
index 72e687b6d1..1a0a1d8434 100644
--- a/indra/newview/skins/default/xui/it/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/it/panel_preferences_chat.xml
@@ -29,9 +29,9 @@
<check_box label="Chat IM" name="EnableIMChatPopups" tool_tip="Seleziona per vedere una finestra popup quando arriva un messaggio IM"/>
<spinner label="Durata chat vicine:" name="nearby_toasts_lifetime"/>
<spinner label="Durata dissolvenza chat vicine:" name="nearby_toasts_fadingtime"/>
- <check_box label="Use machine translation while chatting (powered by Google)" name="translate_chat_checkbox"/>
+ <check_box label="Use machine translation while chatting" name="translate_chat_checkbox"/>
<text name="translate_chb_label">
- Usa la traduzione meccanica durante le chat (tecnologia Google)
+ Usa la traduzione meccanica durante le chat
</text>
<text name="translate_language_text" width="110">
Traduci chat in:
diff --git a/indra/newview/skins/default/xui/it/teleport_strings.xml b/indra/newview/skins/default/xui/it/teleport_strings.xml
index 7a1046abd3..a0b324d8fb 100644
--- a/indra/newview/skins/default/xui/it/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/it/teleport_strings.xml
@@ -18,6 +18,10 @@ Se si continua a visualizzare questo messaggio, consulta la pagina [SUPPORT_SITE
<message name="timeout_tport">
Spiacenti, il sistema non riesce a completare il teletrasporto. Riprova tra un attimo.
</message>
+ <message name="NoHelpIslandTP">
+ Non è possibile per te ritornare all&apos;Welcome Island.
+Vai alla &apos;Welcome Island Public&apos; per ripetere il tutorial.
+ </message>
<message name="noaccess_tport">
Spiacenti, ma non hai accesso nel luogo di destinazione richiesto.
</message>
diff --git a/indra/newview/skins/default/xui/ja/floater_nearby_chat.xml b/indra/newview/skins/default/xui/ja/floater_nearby_chat.xml
index a29c6a0630..bcddcc6907 100644
--- a/indra/newview/skins/default/xui/ja/floater_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/ja/floater_nearby_chat.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="nearby_chat" title="近くのチャット">
- <check_box label="チャットを翻訳(Google翻訳)" name="translate_chat_checkbox"/>
+ <check_box label="チャットを翻訳" name="translate_chat_checkbox"/>
</floater>
diff --git a/indra/newview/skins/default/xui/ja/panel_nearby_chat.xml b/indra/newview/skins/default/xui/ja/panel_nearby_chat.xml
index 4334659557..aca055bb43 100644
--- a/indra/newview/skins/default/xui/ja/panel_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/ja/panel_nearby_chat.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="nearby_chat">
- <check_box label="チャットを翻訳(Google翻訳)" name="translate_chat_checkbox"/>
+ <check_box label="チャットを翻訳" name="translate_chat_checkbox"/>
</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml b/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml
index c8584ccaae..1502442a06 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml
@@ -29,9 +29,9 @@
<check_box label="IM チャット" name="EnableIMChatPopups" tool_tip="これを選択すると、インスタントメッセージを受信した際にポップアップが表示されます"/>
<spinner label="近くのチャットメッセージが表示される長さ:" name="nearby_toasts_lifetime"/>
<spinner label="近くのチャットメッセージが消えるまでの長さ:" name="nearby_toasts_fadingtime"/>
- <check_box label="Use machine translation while chatting (powered by Google)" name="translate_chat_checkbox"/>
+ <check_box label="Use machine translation while chatting" name="translate_chat_checkbox"/>
<text name="translate_chb_label">
- チャット中に内容を機械翻訳する(Google翻訳)
+ チャット中に内容を機械翻訳する
</text>
<text name="translate_language_text">
翻訳する言語:
diff --git a/indra/newview/skins/default/xui/ja/teleport_strings.xml b/indra/newview/skins/default/xui/ja/teleport_strings.xml
index 2f67d43707..04ea1c2438 100644
--- a/indra/newview/skins/default/xui/ja/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/ja/teleport_strings.xml
@@ -20,6 +20,10 @@
申し訳ございませんが、システムはテレポートの接続を完了できませんでした。
もう少し後でやり直してください。
</message>
+ <message name="NoHelpIslandTP">
+ Welcome Islandには戻ることができません。
+「Welcome Island Public」に行き、
+ </message>
<message name="noaccess_tport">
残念ながら、そのテレポート目的地へのアクセスがありません。
</message>
diff --git a/indra/newview/skins/default/xui/pl/floater_nearby_chat.xml b/indra/newview/skins/default/xui/pl/floater_nearby_chat.xml
index 7dc3e1f22e..214d465f1c 100644
--- a/indra/newview/skins/default/xui/pl/floater_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/pl/floater_nearby_chat.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="nearby_chat" title="CZAT LOKALNY">
- <check_box label="Tłumaczenie czatu (wspierane przez Google)" name="translate_chat_checkbox"/>
+ <check_box label="Tłumaczenie czatu" name="translate_chat_checkbox"/>
</floater>
diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_chat.xml b/indra/newview/skins/default/xui/pl/panel_preferences_chat.xml
index be730eb73f..7fd1029e6a 100644
--- a/indra/newview/skins/default/xui/pl/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/pl/panel_preferences_chat.xml
@@ -31,7 +31,7 @@
<spinner label="Czas znikania czatu w pobliżu:" name="nearby_toasts_fadingtime"/>
<check_box name="translate_chat_checkbox"/>
<text name="translate_chb_label">
- Użyj translatora podczas rozmowy (wspierany przez Google)
+ Użyj translatora podczas rozmowy
</text>
<text name="translate_language_text">
Przetłumacz czat na:
diff --git a/indra/newview/skins/default/xui/pl/teleport_strings.xml b/indra/newview/skins/default/xui/pl/teleport_strings.xml
index 57fb55bf4c..0366c3fdbc 100644
--- a/indra/newview/skins/default/xui/pl/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/pl/teleport_strings.xml
@@ -19,6 +19,10 @@ Jeśli nadal nie możesz się teleportować wyloguj się i ponownie zaloguj.
<message name="timeout_tport">
Przepraszamy, ale nie udało się przeprowadzić teleportacji. Spróbuj jeszcze raz.
</message>
+ <message name="NoHelpIslandTP">
+ Brak możliwości ponownej teleportacji do Welcome Island.
+Odwiedź &apos;Welcome Island Public&apos; by powtórzyć szkolenie.
+ </message>
<message name="noaccess_tport">
Przepraszamy, ale nie masz dostępu do miejsca docelowego.
</message>
diff --git a/indra/newview/skins/default/xui/pt/floater_nearby_chat.xml b/indra/newview/skins/default/xui/pt/floater_nearby_chat.xml
index 60edfa505f..653861f7d8 100644
--- a/indra/newview/skins/default/xui/pt/floater_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/pt/floater_nearby_chat.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="nearby_chat" title="Bate-papo local">
- <check_box label="Traduzir bate-papo (via Google)" name="translate_chat_checkbox"/>
+ <check_box label="Traduzir bate-papo" name="translate_chat_checkbox"/>
</floater>
diff --git a/indra/newview/skins/default/xui/pt/panel_nearby_chat.xml b/indra/newview/skins/default/xui/pt/panel_nearby_chat.xml
index 9d44c7f62d..15470dc94a 100644
--- a/indra/newview/skins/default/xui/pt/panel_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/pt/panel_nearby_chat.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="nearby_chat">
- <check_box label="Traduzir bate-papo (via Google)" name="translate_chat_checkbox"/>
+ <check_box label="Traduzir bate-papo" name="translate_chat_checkbox"/>
</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml b/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml
index e5aa42aae0..f98659aa73 100644
--- a/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml
@@ -31,7 +31,7 @@
<spinner label="Transição de avisos de bate-papos por perto:" name="nearby_toasts_fadingtime"/>
<check_box name="translate_chat_checkbox"/>
<text name="translate_chb_label">
- Traduzir bate-papo automaticamente (via Google)
+ Traduzir bate-papo automaticamente
</text>
<text name="translate_language_text">
Traduzir bate-papo para:
diff --git a/indra/newview/skins/default/xui/pt/teleport_strings.xml b/indra/newview/skins/default/xui/pt/teleport_strings.xml
index 11ea0f4195..f8ded1ce69 100644
--- a/indra/newview/skins/default/xui/pt/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/pt/teleport_strings.xml
@@ -18,6 +18,10 @@ Se você continuar a receber esta mensagem, por favor consulte o [SUPPORT_SITE].
<message name="timeout_tport">
Desculpe, não foi possível para o sistema executar o teletransporte. Tente novamente dentro de alguns instantes.
</message>
+ <message name="NoHelpIslandTP">
+ Você não pode se tele-transportar de volta à Ilha de Welcome.
+Vá para a Ilha de Welcome Pública para repetir este tutorial.
+ </message>
<message name="noaccess_tport">
Desculpe, você não tem acesso ao destino deste teletransporte.
</message>
diff --git a/indra/newview/skins/default/xui/ru/floater_about_land.xml b/indra/newview/skins/default/xui/ru/floater_about_land.xml
index 488d2cda17..3c278fce52 100644
--- a/indra/newview/skins/default/xui/ru/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/ru/floater_about_land.xml
@@ -141,16 +141,16 @@
</panel>
<panel label="СОГЛАШЕНИЕ" name="land_covenant_panel">
<panel.string name="can_resell">
- Приобретенная в этом регионе земля может быть перепродана.
+ Купленная в этом регионе земля может быть перепродана.
</panel.string>
<panel.string name="can_not_resell">
- Приобретенная в этом регионе земля не может быть перепродана.
+ Купленная в этом регионе земля не может быть перепродана.
</panel.string>
<panel.string name="can_change">
- Приобретенная в этом регионе земля может быть объединена или разделена.
+ Купленная в этом регионе земля может быть объединена или разделена.
</panel.string>
<panel.string name="can_not_change">
- Приобретенная в этом регионе земля не может быть объединена или разделена.
+ Купленная в этом регионе земля не может быть объединена или разделена.
</panel.string>
<text name="estate_section_lbl">
Землевладение:
@@ -270,7 +270,7 @@
<name_list name="owner list">
<name_list.columns label="Тип" name="type"/>
<name_list.columns label="Название" name="name"/>
- <name_list.columns label="Количество" name="count"/>
+ <name_list.columns label="Кол-во" name="count"/>
<name_list.columns label="Последний объект" name="mostrecent"/>
</name_list>
</panel>
@@ -286,10 +286,10 @@
Этот параметр недоступен, потому что вы не можете изменять его на этом участке.
</panel.string>
<panel.string name="mature_check_mature">
- Moderate-контент
+ Умеренный контент
</panel.string>
<panel.string name="mature_check_adult">
- Содержимое для взрослых
+ Контент для взрослых
</panel.string>
<panel.string name="mature_check_mature_tooltip">
Информация или содержимое вашего участка расценивается как moderate.
@@ -366,7 +366,7 @@
<combo_box.item label="Аренда" name="item13"/>
<combo_box.item label="Другое" name="item12"/>
</combo_box>
- <check_box label="Moderate-контент" name="MatureCheck" tool_tip=" "/>
+ <check_box label="Умеренный контент" name="MatureCheck" tool_tip=" "/>
<text name="Snapshot:">
Снимок:
</text>
@@ -374,7 +374,7 @@
<text name="allow_label5">
Позволить жителям с других участков:
</text>
- <check_box label="Видеть аватары" name="SeeAvatarsCheck" tool_tip="Жители с других участков могут видеть жителей этого участка и общаться с ними в чате (вы также сможете видеть жителей с других участков и общаться с ними)."/>
+ <check_box label="Видны аватары" name="SeeAvatarsCheck" tool_tip="Жители с других участков могут видеть жителей этого участка и общаться с ними в чате (вы также сможете видеть жителей с других участков и общаться с ними)."/>
<text name="landing_point">
В точку телепортации: [LANDING]
</text>
@@ -395,7 +395,7 @@
</text>
<combo_box name="media type" tool_tip="Укажите, чем является ссылка – видео, веб-страница или другое медиа"/>
<text name="at URL:">
- Домашняя страница:
+ Дом. страница:
</text>
<button label="Задать" name="set_media_url"/>
<text name="Description:">
@@ -403,7 +403,7 @@
</text>
<line_editor name="url_description" tool_tip="Текст, показываемый рядом с кнопкой проигрывания/загрузки"/>
<text name="Media texture:">
- Заменяемая текстура:
+ Замена текстуры:
</text>
<texture_picker name="media texture" tool_tip="Щелкните для выбора изображения"/>
<text name="replace_texture_help">
@@ -416,7 +416,7 @@
<spinner name="media_size_width" tool_tip="Размер отображения веб-медиа, по умолчанию – 0."/>
<spinner name="media_size_height" tool_tip="Размер отображения веб-медиа, по умолчанию – 0."/>
<text name="pixels">
- пикселей
+ пикс.
</text>
<text name="Options:">
Опции:
@@ -425,7 +425,7 @@
</panel>
<panel label="ЗВУК" name="land_audio_panel">
<text name="MusicURL:">
- URL-адрес для музыки:
+ URL музыки:
</text>
<text name="Sound:">
Звук:
@@ -448,18 +448,18 @@
(Определено на землевладении)
</panel.string>
<panel.string name="allow_public_access">
- Разрешить публичный доступ ([MATURITY]) (Примечание. Снятие приведет к созданию линий запрета)
+ Разрешить общий доступ ([MATURITY]) (Снятие приведет к созданию линий запрета)
</panel.string>
<panel.string name="estate_override">
- Часть этих параметров установлены на уровне землевладения
+ Часть этих параметров установлена на уровне землевладения
</panel.string>
<text name="Limit access to this parcel to:">
Доступ на этот участок
</text>
<text name="Only Allow">
- Ограничить жителям доступ проверкой:
+ Разрешить доступ только жителям, у которых:
</text>
- <check_box label="Информация об оплате в файле [ESTATE_PAYMENT_LIMIT]" name="limit_payment" tool_tip="Банить нераспознанных жителей."/>
+ <check_box label="Записана информация об оплате [ESTATE_PAYMENT_LIMIT]" name="limit_payment" tool_tip="Банить нераспознанных жителей."/>
<check_box label="Проверка возраста [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="Банить жителей, не прошедших проверку возраста. Более подробная информация находится здесь: [SUPPORT_SITE]."/>
<check_box label="Разрешить доступ группе: [GROUP]" name="GroupCheck" tool_tip="Группа устанавливается на основной вкладке."/>
<check_box label="Продать доступ:" name="PassCheck" tool_tip="Разрешить временный доступ к участку."/>
diff --git a/indra/newview/skins/default/xui/ru/floater_bulk_perms.xml b/indra/newview/skins/default/xui/ru/floater_bulk_perms.xml
index a497c14cac..ccf13cf02a 100644
--- a/indra/newview/skins/default/xui/ru/floater_bulk_perms.xml
+++ b/indra/newview/skins/default/xui/ru/floater_bulk_perms.xml
@@ -24,7 +24,7 @@
<button label="√ Все" name="check_all"/>
<button label="Очистить" label_selected="Нет" name="check_none"/>
<text name="newperms">
- Новые разрешения на использование контента
+ Новые разрешения на контент
</text>
<text name="GroupLabel">
Группа:
diff --git a/indra/newview/skins/default/xui/ru/floater_buy_currency.xml b/indra/newview/skins/default/xui/ru/floater_buy_currency.xml
index 197a2a3327..7690ff2a6c 100644
--- a/indra/newview/skins/default/xui/ru/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/ru/floater_buy_currency.xml
@@ -60,7 +60,7 @@
<button label="Приобрести" name="buy_btn"/>
<button label="Отмена" name="cancel_btn"/>
<text name="info_cannot_buy">
- Невозможно приобрести
+ Нельзя купить
</text>
<button label="Продолжить в Интернете" name="error_web"/>
</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_color_picker.xml b/indra/newview/skins/default/xui/ru/floater_color_picker.xml
index d6e737d584..b7034bef0b 100644
--- a/indra/newview/skins/default/xui/ru/floater_color_picker.xml
+++ b/indra/newview/skins/default/xui/ru/floater_color_picker.xml
@@ -13,7 +13,7 @@
Оттенок:
</text>
<text name="s_val_text">
- Насыщенность:
+ Насыщен.:
</text>
<text name="l_val_text">
Яркость:
diff --git a/indra/newview/skins/default/xui/ru/floater_destinations.xml b/indra/newview/skins/default/xui/ru/floater_destinations.xml
index e769812beb..5ba0841564 100644
--- a/indra/newview/skins/default/xui/ru/floater_destinations.xml
+++ b/indra/newview/skins/default/xui/ru/floater_destinations.xml
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Destinations" title="МЕСТА"/>
+<floater name="Destinations" title="ПУНКТЫ"/> \ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ru/floater_edit_day_cycle.xml b/indra/newview/skins/default/xui/ru/floater_edit_day_cycle.xml
index 1adc8173c6..61d708c567 100644
--- a/indra/newview/skins/default/xui/ru/floater_edit_day_cycle.xml
+++ b/indra/newview/skins/default/xui/ru/floater_edit_day_cycle.xml
@@ -16,25 +16,25 @@
-Выбор настройки-
</string>
<text name="label">
- Название настройки:
+ Имя настройки:
</text>
<text name="note">
Примечание. Если изменить имя настройки, будет создана новая настройка, а изменения в существующей не будут сохранены.
</text>
<text name="hint_item1">
- - Чтобы изменить определенные настройки неба и времени, выберите соответствующую вкладку.
+ - Для изменения настроек неба и времени выберите соответствующую вкладку.
</text>
<text name="hint_item2">
- - Чтобы задать время переходов, вабирайте и перетаскивайте вкладки.
+ - Чтобы задать время переходов, перетаскивайте вкладки.
</text>
<text name="hint_item3">
- - Используйте скребок для предварительного просмотра суточного цикла.
+ - Скребок служит для просмотра суточного цикла.
</text>
<panel name="day_cycle_slider_panel">
<multi_slider initial_value="0" name="WLTimeSlider"/>
<multi_slider initial_value="0" name="WLDayCycleKeys"/>
- <button label="Добавить отметку" label_selected="Добавить отметку" name="WLAddKey"/>
- <button label="Удалить отметку" label_selected="Удалить отметку" name="WLDeleteKey"/>
+ <button label="+ отметку" label_selected="+ отметку" name="WLAddKey"/>
+ <button label="- отметку" label_selected="- отметку" name="WLDeleteKey"/>
<text name="WL12am">
12 ночи
</text>
@@ -91,14 +91,14 @@
</text>
</panel>
<text name="WLCurKeyPresetText">
- Настройка неба:
+ Небо:
</text>
- <combo_box label="Стандартная" name="WLSkyPresets"/>
+ <combo_box label="Стандарт" name="WLSkyPresets"/>
<text name="WLCurKeyTimeText">
Время:
</text>
<time name="time" value="6:00"/>
- <check_box label="Установить в качестве нового суточного цикла" name="make_default_cb"/>
+ <check_box label="Установить как новый суточный цикл" name="make_default_cb"/>
<button label="Сохранить" name="save"/>
<button label="Отмена" name="cancel"/>
</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_edit_sky_preset.xml b/indra/newview/skins/default/xui/ru/floater_edit_sky_preset.xml
index aa60cb6337..354120ea72 100644
--- a/indra/newview/skins/default/xui/ru/floater_edit_sky_preset.xml
+++ b/indra/newview/skins/default/xui/ru/floater_edit_sky_preset.xml
@@ -19,7 +19,7 @@
Чтобы изменить настройку, задайте ее параметры с помощью элементов управления и нажмите кнопку «Сохранить».
</text>
<text name="label">
- Название настройки:
+ Имя настройки:
</text>
<text name="note">
Примечание. Если изменить имя настройки, будет создана новая настройка, а изменения в существующей не будут сохранены.
@@ -58,7 +58,7 @@
<text name="SunGlowText">
Сияние солнца
</text>
- <slider label="Отчетливость" name="WLGlowB"/>
+ <slider label="Фокус" name="WLGlowB"/>
<slider label="Размер" name="WLGlowR"/>
<text name="WLStarText">
Яркость звезд
@@ -102,7 +102,7 @@
</text>
<time name="WLDayTime" value="6:00"/>
<text name="WLEastAngleText">
- Смещение относительно востока
+ Смещение отн. востока
</text>
</panel>
<panel label="ОБЛАКА" name="Clouds">
@@ -122,7 +122,7 @@
Размеры
</text>
<text name="WLCloudDetailText">
- Детализация (положение/плотность)
+ Детали (положение/плотность)
</text>
<slider label="X" name="WLCloudDetailX"/>
<slider label="Y" name="WLCloudDetailY"/>
diff --git a/indra/newview/skins/default/xui/ru/floater_edit_water_preset.xml b/indra/newview/skins/default/xui/ru/floater_edit_water_preset.xml
index 3befe4b038..f6def86380 100644
--- a/indra/newview/skins/default/xui/ru/floater_edit_water_preset.xml
+++ b/indra/newview/skins/default/xui/ru/floater_edit_water_preset.xml
@@ -19,7 +19,7 @@
Чтобы изменить настройку, задайте ее параметры с помощью элементов управления и нажмите кнопку «Сохранить».
</text>
<text name="label">
- Название настройки:
+ Имя настройки:
</text>
<text name="note">
Примечание. Если изменить имя настройки, будет создана новая настройка, а изменения в существующей не будут сохранены.
diff --git a/indra/newview/skins/default/xui/ru/floater_god_tools.xml b/indra/newview/skins/default/xui/ru/floater_god_tools.xml
index ec64a5c7af..81329475aa 100644
--- a/indra/newview/skins/default/xui/ru/floater_god_tools.xml
+++ b/indra/newview/skins/default/xui/ru/floater_god_tools.xml
@@ -72,10 +72,10 @@
</panel>
<panel label="Запрос" name="request">
<text name="Destination:">
- Место назначения:
+ Пункт назначения:
</text>
<combo_box name="destination">
- <combo_box.item label="назначенное" name="item1"/>
+ <combo_box.item label="назначенный" name="item1"/>
<combo_box.item label="текущий регион" name="item2"/>
</combo_box>
<text name="Request:">
diff --git a/indra/newview/skins/default/xui/ru/floater_image_preview.xml b/indra/newview/skins/default/xui/ru/floater_image_preview.xml
index ae7c77ea0e..dbc4c32b98 100644
--- a/indra/newview/skins/default/xui/ru/floater_image_preview.xml
+++ b/indra/newview/skins/default/xui/ru/floater_image_preview.xml
@@ -23,7 +23,7 @@
</combo_box>
<text name="bad_image_text">
Невозможно прочитать изображение.
-Попробуйте сохранить изображение как 24-разрядный TGA-файл (Targa).
+Попробуйте сохранить изображение как 24-битный TGA-файл (Targa).
</text>
<check_box label="Использовать сжатие без потерь" name="lossless_check"/>
<button label="Отмена" name="cancel_btn"/>
diff --git a/indra/newview/skins/default/xui/ru/floater_joystick.xml b/indra/newview/skins/default/xui/ru/floater_joystick.xml
index cc93152225..66568563da 100644
--- a/indra/newview/skins/default/xui/ru/floater_joystick.xml
+++ b/indra/newview/skins/default/xui/ru/floater_joystick.xml
@@ -3,7 +3,7 @@
<floater.string name="NoDevice">
устройство не выбрано
</floater.string>
- <check_box label="Включить джойстик:" name="enable_joystick"/>
+ <check_box label="Вкл. джойстик:" name="enable_joystick"/>
<spinner label="Наложение по X" name="JoystickAxis1"/>
<spinner label="Наложение по Y" name="JoystickAxis2"/>
<spinner label="Наложение по Z" name="JoystickAxis0"/>
diff --git a/indra/newview/skins/default/xui/ru/floater_lagmeter.xml b/indra/newview/skins/default/xui/ru/floater_lagmeter.xml
index 48f7dd969f..c420006a03 100644
--- a/indra/newview/skins/default/xui/ru/floater_lagmeter.xml
+++ b/indra/newview/skins/default/xui/ru/floater_lagmeter.xml
@@ -106,7 +106,7 @@
Возможная причина: слишком много физических объектов
</floater.string>
<floater.string name="server_scripts_cause_msg">
- Возможная причина: слишком мало физических объектов
+ Возможная причина: слишком много скриптовых объектов
</floater.string>
<floater.string name="server_net_cause_msg">
Возможная причина: слишком большой сетевой трафик
diff --git a/indra/newview/skins/default/xui/ru/floater_land_holdings.xml b/indra/newview/skins/default/xui/ru/floater_land_holdings.xml
index c88c88988b..17d347867d 100644
--- a/indra/newview/skins/default/xui/ru/floater_land_holdings.xml
+++ b/indra/newview/skins/default/xui/ru/floater_land_holdings.xml
@@ -9,7 +9,7 @@
<scroll_list.columns label="Тип" name="type"/>
<scroll_list.columns label="Площадь" name="area"/>
</scroll_list>
- <button label="Телепортация" label_selected="Телепортация" name="Teleport" tool_tip="Телепортироваться в центр этой земли."/>
+ <button label="Телепорт" label_selected="Телепорт" name="Teleport" tool_tip="Телепортироваться в центр этой земли."/>
<button label="Карта" label_selected="Карта" name="Show on Map" tool_tip="Показать эту землю на карте мира."/>
<text name="contrib_label">
Ваши вложения в группы:
diff --git a/indra/newview/skins/default/xui/ru/floater_model_wizard.xml b/indra/newview/skins/default/xui/ru/floater_model_wizard.xml
index 204f752cd9..ef2fe8e5a5 100644
--- a/indra/newview/skins/default/xui/ru/floater_model_wizard.xml
+++ b/indra/newview/skins/default/xui/ru/floater_model_wizard.xml
@@ -13,7 +13,7 @@
</panel>
<panel name="content">
<text name="advanced_users_text">
- Пользователям, работающим в расширенном режиме: если вы умеете создавать трехмерные графические объекты, то, возможно, захотите воспользоваться средством Advanced Uploader, которое предоставляет расширенные возможности передачи объектов.
+ Пользователям в расширенном режиме: если вы умеете создавать трехмерные графические объекты, то, возможно, захотите воспользоваться средством Advanced Uploader, которое предоставляет расширенные возможности передачи объектов.
</text>
<button label="Перейти в расширенный режим" name="switch_to_advanced"/>
<text name="Cache location">
@@ -78,17 +78,17 @@
<panel name="physics_panel">
<panel name="header_panel">
<text name="header_text">
- Настроить физические параметры
+ Настроить физику
</text>
</panel>
<text name="description">
Мы создадим форму для внешнего каркаса модели. Настройте уровень детализации формы в соответствии с целями, для которых предназначена модель.
</text>
<panel name="content">
- <button label="Пересчитать физические данные" name="recalculate_physics_btn"/>
+ <button label="Пересчитать физику" name="recalculate_physics_btn"/>
<button label="Пересчет..." name="recalculating_physics_btn"/>
<text name="lod_label">
- Просмотр физических данных
+ Просмотр физики
</text>
<combo_box name="preview_lod_combo2" tool_tip="Уровень детализации при предварительном просмотре">
<combo_item name="high">
diff --git a/indra/newview/skins/default/xui/ru/floater_nearby_chat.xml b/indra/newview/skins/default/xui/ru/floater_nearby_chat.xml
index fd3c9f3512..184c753e40 100644
--- a/indra/newview/skins/default/xui/ru/floater_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/ru/floater_nearby_chat.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="nearby_chat" title="ЛОКАЛЬНЫЙ ЧАТ">
- <check_box label="Перевод чата (используется Google)" name="translate_chat_checkbox"/>
+ <check_box label="Перевод чата" name="translate_chat_checkbox"/>
</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_select_key.xml b/indra/newview/skins/default/xui/ru/floater_select_key.xml
index 84cc4a3ef3..99c2b9a2c4 100644
--- a/indra/newview/skins/default/xui/ru/floater_select_key.xml
+++ b/indra/newview/skins/default/xui/ru/floater_select_key.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="modal container">
<text name="Save item as:">
- Нажмите кнопку для установки триггера включения разговора.
+ Нажмите клавишу для включения/выключения речи.
</text>
<button label="Отмена" label_selected="Отмена" name="Cancel"/>
</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_snapshot.xml b/indra/newview/skins/default/xui/ru/floater_snapshot.xml
index a3b40a4f1c..f85d602be7 100644
--- a/indra/newview/skins/default/xui/ru/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/ru/floater_snapshot.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="Snapshot" title="ПРОСМОТР СНИМКА">
<floater.string name="unknown">
- неизвестен
+ неизвестно
</floater.string>
<radio_group label="Тип снимка" name="snapshot_type_radio">
<radio_item label="Электронная почта" name="postcard"/>
diff --git a/indra/newview/skins/default/xui/ru/floater_tools.xml b/indra/newview/skins/default/xui/ru/floater_tools.xml
index 660eca51c6..eb9083f7fc 100644
--- a/indra/newview/skins/default/xui/ru/floater_tools.xml
+++ b/indra/newview/skins/default/xui/ru/floater_tools.xml
@@ -1,28 +1,28 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="toolbox floater" short_title="ИНСТРУМЕНТЫ ДЛЯ СТРОИТЕЛЬСТВА">
<floater.string name="status_rotate">
- Перемещайте цветные полосы для вращения объекта
+ Перетягивайте цветные полосы для вращения объекта
</floater.string>
<floater.string name="status_scale">
- Щелкните и переместите для растяжения выбранной стороны
+ Щелкните и перетащите для растяжения выбранной стороны
</floater.string>
<floater.string name="status_move">
- Переместите для перемещения, переместите с одновременным нажатием клавиши Shift для копирования
+ Перемещение: перетащить, копирование: перетащить при нажатой клавише Shift
</floater.string>
<floater.string name="status_modifyland">
Щелкните и удерживайте для изменения земли
</floater.string>
<floater.string name="status_camera">
- Щелкните и переместите для перемещения камеры
+ Щелкните и перетащите для перемещения камеры
</floater.string>
<floater.string name="status_grab">
- Переместите для перемещения, нажмите клавишу Ctrl для подъема, нажмите клавиши Ctrl+Shift для вращения
+ Перемещение: перетащить, подъем: нажать Ctrl, вращение: нажать Ctrl+Shift
</floater.string>
<floater.string name="status_place">
Щелкните для создания
</floater.string>
<floater.string name="status_selectland">
- Щелкните и переместите для выделения земли
+ Щелкните и перетащите для выделения земли
</floater.string>
<floater.string name="status_selectcount">
Выбрано объектов: [OBJ_COUNT], влияние на землю [LAND_IMPACT]
@@ -30,13 +30,13 @@
<floater.string name="status_remaining_capacity">
Остаток емкости [LAND_CAPACITY].
</floater.string>
- <button name="button focus" tool_tip="Отчетливость"/>
+ <button name="button focus" tool_tip="Фокус"/>
<button name="button move" tool_tip="Переместить"/>
<button name="button edit" tool_tip="Изменить"/>
<button name="button create" tool_tip="Создать"/>
<button name="button land" tool_tip="Земля"/>
<text name="text status">
- Переместите для перемещения, переместите с одновременным нажатием клавиши Shift для копирования
+ Перемещение: перетащить, копирование: перетащить при нажатой клавише Shift
</text>
<radio_group name="focus_radio_group">
<radio_item label="Увеличение" name="radio zoom"/>
@@ -52,14 +52,14 @@
<radio_group name="edit_radio_group">
<radio_item label="Переместить" name="radio position"/>
<radio_item label="Вращение (Ctrl)" name="radio rotate"/>
- <radio_item label="Растягивание (Ctrl+Shift)" name="radio stretch"/>
+ <radio_item label="Растяжка (Ctrl+Shift)" name="radio stretch"/>
<radio_item label="Выбор грани" name="radio select face"/>
</radio_group>
<check_box label="Редактировать объединенные" name="checkbox edit linked parts"/>
<button label="Объединить" name="link_btn"/>
<button label="Разъединить" name="unlink_btn"/>
- <text label="Растягивать в обе стороны" name="checkbox uniform label">
- Растягивать в обе стороны
+ <text label="Растяжка обеих сторон" name="checkbox uniform label">
+ Растяжка обеих сторон
</text>
<check_box initial_value="истина" label="Растягивать текстуры" name="checkbox stretch textures"/>
<check_box initial_value="истина" label="Привязка" name="checkbox snap to grid"/>
@@ -79,9 +79,9 @@
<button name="ToolRing" tool_tip="Кольцо"/>
<button name="ToolTree" tool_tip="Дерево"/>
<button name="ToolGrass" tool_tip="Трава"/>
- <check_box label="Оставить инструмент выбранным" name="checkbox sticky"/>
- <check_box label="Копировать выделенное" name="checkbox copy selection"/>
- <check_box initial_value="истина" label="Центрировать копию" name="checkbox copy centers"/>
+ <check_box label="Держать инструмент" name="checkbox sticky"/>
+ <check_box label="Копировать выдел." name="checkbox copy selection"/>
+ <check_box initial_value="истина" label="Центрир. копию" name="checkbox copy centers"/>
<check_box label="Повернуть копию" name="checkbox copy rotates"/>
<radio_group name="land_radio_group">
<radio_item label="Выбрать землю" name="radio select land"/>
@@ -105,7 +105,7 @@
<slider_bar initial_value="0.00" name="slider force"/>
<button label="Применить" label_selected="Применить" name="button apply to selection" tool_tip="Изменить выбранную землю"/>
<text name="selection_empty">
- Ничего не выбрано.
+ Не выбрано.
</text>
<text name="remaining_capacity">
[CAPACITY_STRING] [secondlife:///app/openfloater/object_weights Дополнительная информация]
@@ -168,7 +168,7 @@
<check_box label="Поделиться" name="checkbox share with group" tool_tip="Позволить всем участникам выбранной группы получить установленные вам права на этот объект. Для включения ролевых ограничений необходимо произвести сделку."/>
<button label="Сделка" label_selected="Сделка" name="button deed" tool_tip="В результате сделки объект передается группе, при этом права на него будут соответствовать правам следующего владельца. Переданный группе объект может передаваться должностным лицом группы."/>
<text name="label click action">
- Действие по щелчку:
+ По щелчку:
</text>
<combo_box name="clickaction">
<combo_box.item label="Коснуться (по умолчанию)" name="Touch/grab(default)"/>
@@ -185,7 +185,7 @@
<combo_box.item label="Оригинал" name="Original"/>
</combo_box>
<spinner label="Цена: L$" name="Edit Cost"/>
- <check_box label="Показать в результатах поиска" name="search_check" tool_tip="Показывать объект в результатах поиска"/>
+ <check_box label="Показать в поиске" name="search_check" tool_tip="Показывать объект в результатах поиска"/>
<panel name="perms_build">
<text name="perm_modify">
Этот объект можно изменять
@@ -349,9 +349,9 @@
<spinner label="Парусность" name="FlexFriction"/>
<spinner label="Ветер" name="FlexWind"/>
<spinner label="Упругость" name="FlexTension"/>
- <spinner label="Действие по X" name="FlexForceX"/>
- <spinner label="Действие по Y" name="FlexForceY"/>
- <spinner label="Действие по Z" name="FlexForceZ"/>
+ <spinner label="X-действие" name="FlexForceX"/>
+ <spinner label="Y-действие" name="FlexForceY"/>
+ <spinner label="Z-действие" name="FlexForceZ"/>
<check_box label="Свет" name="Light Checkbox Ctrl" tool_tip="Объект будет излучать свет"/>
<color_swatch name="colorswatch" tool_tip="Щелкните для выбора цвета"/>
<texture_picker label="" name="light texture control" tool_tip="Щелкните для выбора проецируемого изображения (действует только с включенной отложенной отрисовкой)"/>
@@ -362,7 +362,7 @@
<spinner label="Ослабление" name="Light Falloff"/>
<spinner label="Окружение" name="Light Ambiance"/>
<text name="label physicsshapetype">
- Тип физической формы:
+ Тип физич. формы:
</text>
<combo_box name="Physics Shape Type Combo Ctrl" tool_tip="Выберите тип физической формы"/>
<combo_box name="material">
@@ -394,7 +394,7 @@
<text name="glow label">
Свечение
</text>
- <check_box label="Собственная яркость" name="checkbox fullbright"/>
+ <check_box label="Собств. яркость" name="checkbox fullbright"/>
<text name="tex gen">
Наложение
</text>
@@ -476,7 +476,7 @@
Площадь: [AREA] м²
</text>
<button label="О земле" label_selected="О земле" name="button about land"/>
- <check_box label="Показать владельцев" name="checkbox show owners" tool_tip="Цвет участка в зависимости от типа владения: зеленый = ваша земля голубой = земля вашей группы красный = чужая земля желтый = для продажи фиолетовый = для аукциона серый = общая"/>
+ <check_box label="Показать владельцев" name="checkbox show owners" tool_tip="Цвет участка в зависимости от типа владения: зеленый = ваша земля; голубой = земля вашей группы; красный = чужая земля; желтый = для продажи; фиолетовый = для аукциона; серый = общая"/>
<text name="label_parcel_modify">
Изменение участка
</text>
diff --git a/indra/newview/skins/default/xui/ru/floater_toybox.xml b/indra/newview/skins/default/xui/ru/floater_toybox.xml
index eb03e8c8bf..8d7431d393 100644
--- a/indra/newview/skins/default/xui/ru/floater_toybox.xml
+++ b/indra/newview/skins/default/xui/ru/floater_toybox.xml
@@ -6,5 +6,5 @@
<text name="toybox label 2">
Кнопки будут отображены в исходном виде или в виде значков, в зависимости от настроек каждой панели инструментов.
</text>
- <button label="Восстановить умолчания" label_selected="Восстановить умолчания" name="btn_restore_defaults"/>
+ <button label="Вернуть стандартные" label_selected="Вернуть стандартные" name="btn_restore_defaults"/>
</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_voice_controls.xml b/indra/newview/skins/default/xui/ru/floater_voice_controls.xml
index 6520a4342c..c1fb858d48 100644
--- a/indra/newview/skins/default/xui/ru/floater_voice_controls.xml
+++ b/indra/newview/skins/default/xui/ru/floater_voice_controls.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="floater_voice_controls" title="УПРАВЛЕНИЕ ГОЛОСОМ">
<string name="title_nearby">
- Голоса собеседников
+ Настройки голоса
</string>
<string name="title_group">
Звонок группе [GROUP]
diff --git a/indra/newview/skins/default/xui/ru/floater_windlight_options.xml b/indra/newview/skins/default/xui/ru/floater_windlight_options.xml
index 6667e6b19a..bbb37aaaa0 100644
--- a/indra/newview/skins/default/xui/ru/floater_windlight_options.xml
+++ b/indra/newview/skins/default/xui/ru/floater_windlight_options.xml
@@ -98,7 +98,7 @@
<text name="SunGlowText">
Сияние солнца
</text>
- <slider label="Отчетливость" name="WLGlowB"/>
+ <slider label="Фокус" name="WLGlowB"/>
<slider label="Размер" name="WLGlowR"/>
<text name="SceneGammaText">
Гамма-коррекция сцены
diff --git a/indra/newview/skins/default/xui/ru/floater_world_map.xml b/indra/newview/skins/default/xui/ru/floater_world_map.xml
index 5fa45bd5e5..ef8dfe22ae 100644
--- a/indra/newview/skins/default/xui/ru/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/ru/floater_world_map.xml
@@ -37,7 +37,7 @@
</text>
<check_box initial_value="истина" name="events_mature_chk"/>
<text name="events_mature_label">
- Умеренный
+ Умеренные
</text>
<text name="events_adult_label">
Для взрослых
@@ -62,7 +62,7 @@
Место:
</text>
<button label="Телепортация" name="Teleport" tool_tip="Телепортация в выбранное место"/>
- <button label="Копировать URL-адрес SL" name="copy_slurl" tool_tip="Копировать текущее место в виде URL-адреса SL для использования в Интернете."/>
+ <button label="Копировать URL SL" name="copy_slurl" tool_tip="Копировать текущее место в виде URL-адреса SL для использования в интернете."/>
<button label="Показать выбранное" name="Show Destination" tool_tip="Центрировать карту на выбранном месте"/>
</panel>
<panel name="layout_panel_5">
diff --git a/indra/newview/skins/default/xui/ru/menu_attachment_other.xml b/indra/newview/skins/default/xui/ru/menu_attachment_other.xml
index 72063737eb..fb1c24448b 100644
--- a/indra/newview/skins/default/xui/ru/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/ru/menu_attachment_other.xml
@@ -4,7 +4,7 @@
<menu_item_call label="Смотреть профиль" name="Profile..."/>
<menu_item_call label="В друзья" name="Add Friend"/>
<menu_item_call label="IM" name="Send IM..."/>
- <menu_item_call label="Позвонить" name="Call"/>
+ <menu_item_call label="Звонок" name="Call"/>
<menu_item_call label="Пригласить в группу" name="Invite..."/>
<menu_item_call label="Заблокировать" name="Avatar Mute"/>
<menu_item_call label="Пожаловаться" name="abuse"/>
diff --git a/indra/newview/skins/default/xui/ru/menu_gesture_gear.xml b/indra/newview/skins/default/xui/ru/menu_gesture_gear.xml
index 78b1768761..d0b68cefbd 100644
--- a/indra/newview/skins/default/xui/ru/menu_gesture_gear.xml
+++ b/indra/newview/skins/default/xui/ru/menu_gesture_gear.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<toggleable_menu name="menu_gesture_gear">
- <menu_item_call label="Добавить/удалить из избранного" name="activate"/>
+ <menu_item_call label="Добавить в избранное/удалить" name="activate"/>
<menu_item_call label="Копировать" name="copy_gesture"/>
<menu_item_call label="Вставить" name="paste"/>
<menu_item_call label="Копировать UUID" name="copy_uuid"/>
diff --git a/indra/newview/skins/default/xui/ru/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/ru/menu_inventory_gear_default.xml
index d500f0fac6..9fc0b6d44e 100644
--- a/indra/newview/skins/default/xui/ru/menu_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/ru/menu_inventory_gear_default.xml
@@ -8,7 +8,7 @@
<menu_item_call label="Показать фильтры" name="show_filters"/>
<menu_item_call label="Сбросить фильтры" name="reset_filters"/>
<menu_item_call label="Закрыть все папки" name="close_folders"/>
- <menu_item_call label="Очистить Lost and Found" name="empty_lostnfound"/>
+ <menu_item_call label="Очистить бюро находок" name="empty_lostnfound"/>
<menu_item_call label="Сохранить текстуру как" name="Save Texture As"/>
<menu_item_call label="Поделиться" name="Share"/>
<menu_item_call label="Найти оригинал" name="Find Original"/>
diff --git a/indra/newview/skins/default/xui/ru/menu_landmark.xml b/indra/newview/skins/default/xui/ru/menu_landmark.xml
index 11d6e37e81..24b60f9d86 100644
--- a/indra/newview/skins/default/xui/ru/menu_landmark.xml
+++ b/indra/newview/skins/default/xui/ru/menu_landmark.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<toggleable_menu name="landmark_overflow_menu">
- <menu_item_call label="Копировать URL-адрес SL" name="copy"/>
+ <menu_item_call label="Копировать URL SL" name="copy"/>
<menu_item_call label="Удалить" name="delete"/>
<menu_item_call label="Создать подборку" name="pick"/>
<menu_item_call label="Добавить в любимые" name="add_to_favbar"/>
diff --git a/indra/newview/skins/default/xui/ru/menu_model_import_gear_default.xml b/indra/newview/skins/default/xui/ru/menu_model_import_gear_default.xml
index b7949b30d9..5ae5e7dfbc 100644
--- a/indra/newview/skins/default/xui/ru/menu_model_import_gear_default.xml
+++ b/indra/newview/skins/default/xui/ru/menu_model_import_gear_default.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<toggleable_menu name="model_menu_gear_default">
<menu_item_check label="Показать грани" name="show_edges"/>
- <menu_item_check label="Показать физические параметры" name="show_physics"/>
+ <menu_item_check label="Показать физику" name="show_physics"/>
<menu_item_check label="Показать текстуры" name="show_textures"/>
<menu_item_check label="Показать вес кожи" name="show_skin_weight"/>
<menu_item_check label="Показать положение сочленений" name="show_joint_positions"/>
diff --git a/indra/newview/skins/default/xui/ru/menu_participant_list.xml b/indra/newview/skins/default/xui/ru/menu_participant_list.xml
index 8bbf2d52bf..932ad5bacf 100644
--- a/indra/newview/skins/default/xui/ru/menu_participant_list.xml
+++ b/indra/newview/skins/default/xui/ru/menu_participant_list.xml
@@ -5,7 +5,7 @@
<menu_item_call label="Открыть профиль" name="View Profile"/>
<menu_item_call label="Добавить в друзья" name="Add Friend"/>
<menu_item_call label="IM" name="IM"/>
- <menu_item_call label="Позвонить" name="Call"/>
+ <menu_item_call label="Звонок" name="Call"/>
<menu_item_call label="Поделиться" name="Share"/>
<menu_item_call label="Заплатить" name="Pay"/>
<menu_item_check label="Показывать значки участников" name="View Icons"/>
diff --git a/indra/newview/skins/default/xui/ru/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/ru/menu_places_gear_landmark.xml
index a838dd5c42..b1ebd4af83 100644
--- a/indra/newview/skins/default/xui/ru/menu_places_gear_landmark.xml
+++ b/indra/newview/skins/default/xui/ru/menu_places_gear_landmark.xml
@@ -8,7 +8,7 @@
<menu_item_call label="Восстановить вещь" name="restore_item"/>
<menu_item_call label="Вырезать" name="cut"/>
<menu_item_call label="Копировать закладку" name="copy_landmark"/>
- <menu_item_call label="Копировать URL-адрес SL" name="copy_slurl"/>
+ <menu_item_call label="Копировать URL SL" name="copy_slurl"/>
<menu_item_call label="Вставить" name="paste"/>
<menu_item_call label="Переименовать" name="rename"/>
<menu_item_call label="Удалить" name="delete"/>
diff --git a/indra/newview/skins/default/xui/ru/menu_viewer.xml b/indra/newview/skins/default/xui/ru/menu_viewer.xml
index 322a27003f..b9f403c04b 100644
--- a/indra/newview/skins/default/xui/ru/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/ru/menu_viewer.xml
@@ -54,7 +54,7 @@
<menu_item_check label="Владельцы земли" name="Land Owners"/>
<menu_item_check label="Координаты" name="Coordinates"/>
<menu_item_check label="Свойства участка" name="Parcel Properties"/>
- <menu_item_check label="Дополнительное меню" name="Show Advanced Menu"/>
+ <menu_item_check label="Меню «Дополнительно»" name="Show Advanced Menu"/>
</menu>
<menu_item_call label="Телепортироваться домой" name="Teleport Home"/>
<menu_item_call label="Установить дом здесь" name="Set Home to Here"/>
@@ -203,7 +203,7 @@
<menu_item_check label="Поиск" name="Search"/>
<menu_item_call label="Освободить клавиши" name="Release Keys"/>
<menu_item_call label="Сбросить размер интерфейса" name="Set UI Size to Default"/>
- <menu_item_check label="Показать дополнительное меню – устаревшее сочетание клавиш" name="Show Advanced Menu - legacy shortcut"/>
+ <menu_item_check label="Показать меню «Дополнительно» - старое сочетание клавиш" name="Show Advanced Menu - legacy shortcut"/>
<menu_item_call label="Закрыть окно" name="Close Window"/>
<menu_item_call label="Закрыть все окна" name="Close All Windows"/>
<menu_item_call label="Сохранить снимок на диске" name="Snapshot to Disk"/>
diff --git a/indra/newview/skins/default/xui/ru/notifications.xml b/indra/newview/skins/default/xui/ru/notifications.xml
index 87ae9d06dd..d43d907164 100644
--- a/indra/newview/skins/default/xui/ru/notifications.xml
+++ b/indra/newview/skins/default/xui/ru/notifications.xml
@@ -724,13 +724,13 @@
Телепортация сейчас заблокирована. Повторите попытку позже. Если все равно не удается телепортироваться, выйдите из программы и войдите снова, чтобы устранить проблему.
</notification>
<notification name="nolandmark_tport">
- Системе не удалось определить место назначения закладки.
+ Системе не удалось определить пункт назначения закладки.
</notification>
<notification name="timeout_tport">
Системе не удалось выполнить подключение телепорта. Повторите попытку позже.
</notification>
<notification name="noaccess_tport">
- У вас нет доступа к точке назначения этого телепорта.
+ У вас нет доступа в пункт назначения этого телепорта.
</notification>
<notification name="missing_attach_tport">
Ваши присоединения еще не доставлены. Подождите несколько секунд либо выйдите из программы и войдите снова, прежде чем повторить попытку телепортации.
@@ -745,7 +745,7 @@
Системе не удалось своевременно выполнить ваше пересечение границы. Повторите попытку через несколько минут.
</notification>
<notification name="no_host">
- Не удалось найти точку назначения телепорта. Возможно, место назначения временно недоступно или уже не существует. Повторите попытку через несколько минут.
+ Не удалось найти точку назначения телепорта. Возможно, пункт назначения временно недоступен или уже не существует. Повторите попытку через несколько минут.
</notification>
<notification name="no_inventory_host">
Система инвентаря сейчас недоступна.
@@ -2381,7 +2381,7 @@ http://secondlife.com/download.
Не найден регион назначения.
</notification>
<notification name="NotAllowedInDest">
- Вам не разрешен доступ к месту назначения.
+ Вам не разрешен доступ в пункт назначения.
</notification>
<notification name="RegionParcelBan">
Нельзя пересечь границу региона по пути на забаненный участок. Выберите другой путь.
@@ -2390,7 +2390,7 @@ http://secondlife.com/download.
Вы перенаправлены на телехаб.
</notification>
<notification name="CouldntTPCloser">
- Не удалось телепортироваться ближе к месту назначения.
+ Не удалось телепортироваться ближе к пункту назначения.
</notification>
<notification name="TPCancelled">
Телепортация отменена.
@@ -2904,7 +2904,7 @@ http://secondlife.com/download.
При скрытии кнопки «Говорить» голосовая функция отключается.
</notification>
<notification label="Исследование мира" name="HintDestinationGuide">
- Путеводитель по местам назначения содержит тысячи новых мест, в которых вы можете побывать. Выберите место и нажмите кнопку «Телепортация», чтобы начать исследование.
+ Путеводитель по пунктам назначения содержит тысячи новых мест, в которых вы можете побывать. Выберите место и нажмите кнопку «Телепортация», чтобы начать исследование.
</notification>
<notification label="Боковая панель" name="HintSidePanel">
Быстрый доступ к вашему инвентарю, костюмам, профилю и многому другому открывается на боковой панели.
diff --git a/indra/newview/skins/default/xui/ru/panel_edit_alpha.xml b/indra/newview/skins/default/xui/ru/panel_edit_alpha.xml
index 38789c1c5e..7cde4099ef 100644
--- a/indra/newview/skins/default/xui/ru/panel_edit_alpha.xml
+++ b/indra/newview/skins/default/xui/ru/panel_edit_alpha.xml
@@ -2,8 +2,8 @@
<panel name="edit_alpha_panel">
<scroll_container name="avatar_alpha_color_panel_scroll">
<panel name="avatar_alpha_color_panel">
- <texture_picker label="Альфа нижних частей тела" name="Lower Alpha" tool_tip="Щелкните для выбора изображения"/>
- <texture_picker label="Альфа верхних частей тела" name="Upper Alpha" tool_tip="Щелкните для выбора изображения"/>
+ <texture_picker label="Альфа низа" name="Lower Alpha" tool_tip="Щелкните для выбора изображения"/>
+ <texture_picker label="Альфа верха" name="Upper Alpha" tool_tip="Щелкните для выбора изображения"/>
<texture_picker label="Альфа головы" name="Head Alpha" tool_tip="Щелкните для выбора изображения"/>
<texture_picker label="Альфа глаз" name="Eye Alpha" tool_tip="Щелкните для выбора изображения"/>
<texture_picker label="Альфа волос" name="Hair Alpha" tool_tip="Щелкните для выбора изображения"/>
diff --git a/indra/newview/skins/default/xui/ru/panel_edit_shape.xml b/indra/newview/skins/default/xui/ru/panel_edit_shape.xml
index b185ce1d45..312ad593a1 100644
--- a/indra/newview/skins/default/xui/ru/panel_edit_shape.xml
+++ b/indra/newview/skins/default/xui/ru/panel_edit_shape.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="edit_shape_panel">
<string name="meters">
- метров
+ м
</string>
<string name="feet">
футов
diff --git a/indra/newview/skins/default/xui/ru/panel_im_control_panel.xml b/indra/newview/skins/default/xui/ru/panel_im_control_panel.xml
index f1cba0d3be..2a23cdb800 100644
--- a/indra/newview/skins/default/xui/ru/panel_im_control_panel.xml
+++ b/indra/newview/skins/default/xui/ru/panel_im_control_panel.xml
@@ -17,7 +17,7 @@
<button label="Заплатить" name="pay_btn"/>
</layout_panel>
<layout_panel name="call_btn_panel">
- <button label="Позвонить" name="call_btn"/>
+ <button label="Звонок" name="call_btn"/>
</layout_panel>
<layout_panel name="end_call_btn_panel">
<button label="Завершить звонок" name="end_call_btn"/>
diff --git a/indra/newview/skins/default/xui/ru/panel_landmarks.xml b/indra/newview/skins/default/xui/ru/panel_landmarks.xml
index 66c5b3b574..7d684cd479 100644
--- a/indra/newview/skins/default/xui/ru/panel_landmarks.xml
+++ b/indra/newview/skins/default/xui/ru/panel_landmarks.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="Landmarks">
<accordion name="landmarks_accordion">
- <accordion_tab name="tab_favorites" title="Панель «Избранное»"/>
+ <accordion_tab name="tab_favorites" title="Избранное"/>
<accordion_tab name="tab_landmarks" title="Мои закладки"/>
<accordion_tab name="tab_inventory" title="Мой инвентарь"/>
<accordion_tab name="tab_library" title="Библиотека"/>
diff --git a/indra/newview/skins/default/xui/ru/panel_navigation_bar.xml b/indra/newview/skins/default/xui/ru/panel_navigation_bar.xml
index d9890acff2..5e3de180f9 100644
--- a/indra/newview/skins/default/xui/ru/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/ru/panel_navigation_bar.xml
@@ -12,7 +12,7 @@
<layout_panel name="favorites_layout_panel">
<favorites_bar name="favorite" tool_tip="Перетаскивайте сюда закладки, чтобы было удобнее переходить в любимые места в Second Life!">
<label name="favorites_bar_label" tool_tip="Перетаскивайте сюда закладки, чтобы было удобнее переходить в любимые места в Second Life!">
- Панель «Избранное»
+ Избранное
</label>
<more_button name="&gt;&gt;" tool_tip="Показать больше избранного">
Больше ▼
diff --git a/indra/newview/skins/default/xui/ru/panel_nearby_chat.xml b/indra/newview/skins/default/xui/ru/panel_nearby_chat.xml
index a371040b74..1d26eecf87 100644
--- a/indra/newview/skins/default/xui/ru/panel_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/ru/panel_nearby_chat.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="nearby_chat">
- <check_box label="Перевод чата (технология Google)" name="translate_chat_checkbox"/>
+ <check_box label="Перевод чата" name="translate_chat_checkbox"/>
</panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_notes.xml b/indra/newview/skins/default/xui/ru/panel_notes.xml
index f88b4f13c3..aa74383349 100644
--- a/indra/newview/skins/default/xui/ru/panel_notes.xml
+++ b/indra/newview/skins/default/xui/ru/panel_notes.xml
@@ -21,7 +21,7 @@
<button label="IM" name="im" tool_tip="Начать сеанс IM"/>
</layout_panel>
<layout_panel name="call_btn_lp">
- <button label="Позвонить" name="call" tool_tip="Позвонить этому жителю"/>
+ <button label="Звонок" name="call" tool_tip="Позвонить этому жителю"/>
</layout_panel>
<layout_panel name="show_on_map_btn_lp">
<button label="Карта" name="show_on_map_btn" tool_tip="Показать жителя на карте"/>
diff --git a/indra/newview/skins/default/xui/ru/panel_outfit_edit.xml b/indra/newview/skins/default/xui/ru/panel_outfit_edit.xml
index 0657e6ff40..91c03342a7 100644
--- a/indra/newview/skins/default/xui/ru/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/ru/panel_outfit_edit.xml
@@ -2,7 +2,7 @@
<!-- Side tray Outfit Edit panel -->
<panel name="outfit_edit">
<string name="No Outfit" value="Нет костюма"/>
- <string name="unsaved_changes" value="Не сохраненные изменения"/>
+ <string name="unsaved_changes" value="Несохраненные изменения"/>
<string name="now_editing" value="Сейчас редактируется"/>
<panel.string name="not_available">
(нет)
@@ -35,7 +35,7 @@
</layout_stack>
</layout_panel>
<layout_panel name="add_wearables_panel">
- <button label="Вещь, которая носится" name="plus_btn"/>
+ <button label="Носимая вещь" name="plus_btn"/>
</layout_panel>
</layout_stack>
<panel name="no_add_wearables_button_bar">
diff --git a/indra/newview/skins/default/xui/ru/panel_people.xml b/indra/newview/skins/default/xui/ru/panel_people.xml
index e8a25d5349..607921f2d6 100644
--- a/indra/newview/skins/default/xui/ru/panel_people.xml
+++ b/indra/newview/skins/default/xui/ru/panel_people.xml
@@ -64,13 +64,13 @@
<panel name="button_bar">
<layout_stack name="bottom_bar_ls">
<layout_panel name="view_profile_btn_lp">
- <button label="Профиль" name="view_profile_btn" tool_tip="Показывает изображение, группы и прочую информацию о жителе"/>
+ <button label="Профиль" name="view_profile_btn" tool_tip="Показать изображение, группы и прочую информацию о жителе"/>
</layout_panel>
<layout_panel name="im_btn_lp">
<button label="IM" name="im_btn" tool_tip="Начать сеанс IM"/>
</layout_panel>
<layout_panel name="call_btn_lp">
- <button label="Позвонить" name="call_btn" tool_tip="Позвонить этому жителю"/>
+ <button label="Звонок" name="call_btn" tool_tip="Позвонить этому жителю"/>
</layout_panel>
<layout_panel name="share_btn_lp">
<button label="Поделиться" name="share_btn" tool_tip="Поделиться объектом из инвентаря"/>
@@ -81,13 +81,13 @@
</layout_stack>
<layout_stack name="bottom_bar_ls1">
<layout_panel name="group_info_btn_lp">
- <button label="Профиль группы" name="group_info_btn" tool_tip="Показывает информацию о группе"/>
+ <button label="Профиль группы" name="group_info_btn" tool_tip="Показать информацию о группе"/>
</layout_panel>
<layout_panel name="chat_btn_lp">
- <button label="Групповой чат" name="chat_btn" tool_tip="Открывает сеанс чата"/>
+ <button label="Групповой чат" name="chat_btn" tool_tip="Открыть сеанс чата"/>
</layout_panel>
<layout_panel name="group_call_btn_lp">
- <button label="Звонок группе" name="group_call_btn" tool_tip="Звонок этой группе"/>
+ <button label="Звонок группе" name="group_call_btn" tool_tip="Позвонить этой группе"/>
</layout_panel>
</layout_stack>
</panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_preferences_chat.xml b/indra/newview/skins/default/xui/ru/panel_preferences_chat.xml
index fa08c134ad..a3ee5b7815 100644
--- a/indra/newview/skins/default/xui/ru/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/ru/panel_preferences_chat.xml
@@ -30,7 +30,7 @@
<spinner label="Время отображения всплывающих реплик:" name="nearby_toasts_lifetime"/>
<spinner label="Время затухания всплывающих реплик:" name="nearby_toasts_fadingtime"/>
<text name="translate_chb_label">
- Использовать машинный перевод при общении (технология Google)
+ Использовать машинный перевод при общении
</text>
<text name="translate_language_text">
Переводить чат на:
diff --git a/indra/newview/skins/default/xui/ru/panel_preferences_move.xml b/indra/newview/skins/default/xui/ru/panel_preferences_move.xml
index 878a729113..a6e9b00f2a 100644
--- a/indra/newview/skins/default/xui/ru/panel_preferences_move.xml
+++ b/indra/newview/skins/default/xui/ru/panel_preferences_move.xml
@@ -5,12 +5,12 @@
<text name="heading2">
Автоматическая установка позиции для:
</text>
- <check_box label="создания/редактирования" name="edit_camera_movement" tool_tip="Производить автоматическое позиционирование камеры при входе в режим редактирования и выходе из него"/>
- <check_box label="внешности" name="appearance_camera_movement" tool_tip="Производить автоматическое позиционирование камеры в режиме изменения внешности"/>
+ <check_box label="создания/редактирования" name="edit_camera_movement" tool_tip="Автоматическое позиционирование камеры при входе в режим редактирования и выходе из него"/>
+ <check_box label="внешности" name="appearance_camera_movement" tool_tip="Автоматическое позиционирование камеры в режиме редактирования"/>
<text name="keyboard_lbl">
Клавиатура:
</text>
- <check_box label="Клавиши стрелок всегда перемещают меня" name="arrow_keys_move_avatar_check"/>
+ <check_box label="Клавиши со стрелками всегда перемещают меня" name="arrow_keys_move_avatar_check"/>
<check_box label="Бег после двойного нажатия клавиши" name="tap_tap_hold_to_run"/>
<text name="mouse_lbl">
Мышь:
diff --git a/indra/newview/skins/default/xui/ru/panel_profile.xml b/indra/newview/skins/default/xui/ru/panel_profile.xml
index 79c060c050..fab57d678c 100644
--- a/indra/newview/skins/default/xui/ru/panel_profile.xml
+++ b/indra/newview/skins/default/xui/ru/panel_profile.xml
@@ -53,10 +53,10 @@
<button label="IM" name="im" tool_tip="Начать сеанс IM"/>
</layout_panel>
<layout_panel name="call_btn_lp">
- <button label="Позвонить" name="call" tool_tip="Позвонить этому жителю"/>
+ <button label="Звонок" name="call" tool_tip="Позвонить этому жителю"/>
</layout_panel>
<layout_panel name="chat_btn_lp">
- <button label="Телепортироваться" name="teleport" tool_tip="Предложить телепортацию"/>
+ <button label="Телепортация" name="teleport" tool_tip="Предложить телепортацию"/>
</layout_panel>
<layout_panel name="overflow_btn_lp">
<menu_button label="▼" name="overflow_btn" tool_tip="Заплатить жителю или поделиться с ним вещами"/>
diff --git a/indra/newview/skins/default/xui/ru/panel_region_estate.xml b/indra/newview/skins/default/xui/ru/panel_region_estate.xml
index d957274026..27ec10b323 100644
--- a/indra/newview/skins/default/xui/ru/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/ru/panel_region_estate.xml
@@ -18,16 +18,16 @@
<check_box label="Глобальное время" name="use_global_time_check"/>
<check_box label="Фиксированное" name="fixed_sun_check"/>
<slider label="Фаза" name="sun_hour_slider"/>
- <check_box label="Разрешить публичный доступ" name="externally_visible_check"/>
+ <check_box label="Разрешить общий доступ" name="externally_visible_check"/>
<text name="Only Allow">
- Ограничить доступ проверкой:
+ Разрешить доступ только аккаунтам с подтверждением:
</text>
<check_box label="Информации об оплате в файле" name="limit_payment" tool_tip="Банить нераспознанных жителей"/>
<check_box label="Проверка возраста" name="limit_age_verified" tool_tip="Банить жителей, не прошедших проверку возраста. Более подробная информация находится здесь: [SUPPORT_SITE]."/>
<check_box label="Разрешить голосовое общение" name="voice_chat_check"/>
<check_box label="Разрешить прямой телепорт" name="allow_direct_teleport"/>
<button label="Применить" name="apply_btn"/>
- <button label="Отправить сообщение в землевладение..." name="message_estate_btn"/>
+ <button label="Сообщение в землевладение..." name="message_estate_btn"/>
<button label="Выкинуть жителя с землевладения..." name="kick_user_from_estate_btn"/>
<text name="estate_manager_label">
Менеджеры землевладения:
diff --git a/indra/newview/skins/default/xui/ru/panel_region_general.xml b/indra/newview/skins/default/xui/ru/panel_region_general.xml
index 97bfbbeeea..8559be6c9e 100644
--- a/indra/newview/skins/default/xui/ru/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/ru/panel_region_general.xml
@@ -31,10 +31,10 @@
<text label="Дозволенность" name="access_text">
Категория:
</text>
- <icons_combo_box label="Умеренная" name="access_combo">
+ <icons_combo_box label="Умеренный" name="access_combo">
<icons_combo_box.item label="Для взрослых" name="Adult" value="42"/>
- <icons_combo_box.item label="Умеренная" name="Mature" value="21"/>
- <icons_combo_box.item label="Общая" name="PG" value="13"/>
+ <icons_combo_box.item label="Умеренный" name="Mature" value="21"/>
+ <icons_combo_box.item label="Общий" name="PG" value="13"/>
</icons_combo_box>
<button label="Применить" name="apply_btn"/>
<button label="Телепортировать домой одного жителя..." name="kick_btn"/>
diff --git a/indra/newview/skins/default/xui/ru/panel_region_terrain.xml b/indra/newview/skins/default/xui/ru/panel_region_terrain.xml
index 08258b5034..af25565226 100644
--- a/indra/newview/skins/default/xui/ru/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/ru/panel_region_terrain.xml
@@ -7,13 +7,13 @@
неизвестен
</text>
<spinner label="Уровень воды" name="water_height_spin"/>
- <spinner label="Верхняя точка ландшафта" name="terrain_raise_spin"/>
- <spinner label="Нижняя точка ландшафта" name="terrain_lower_spin"/>
+ <spinner label="Верх. точка ландшафта" name="terrain_raise_spin"/>
+ <spinner label="Ниж. точка ландшафта" name="terrain_lower_spin"/>
<text name="detail_texture_text">
- Текстуры ландшафта (требования: 512x512, 24-разрядные, TGA)
+ Текстуры ландшафта (требования: 512x512, 24-битные, TGA)
</text>
<text name="height_text_lbl">
- 1 (Нижняя)
+ 1 (Низ)
</text>
<text name="height_text_lbl2">
2
@@ -22,7 +22,7 @@
3
</text>
<text name="height_text_lbl4">
- 4 (Верхняя)
+ 4 (Верх)
</text>
<text name="height_text_lbl5">
Диапазон высот текстур
@@ -31,7 +31,7 @@
Эти значения определяют степень смешивания наложенных текстур.
</text>
<text name="height_text_lbl11">
- Измеряются в метрах. Значение «Нижняя» – это МАКСИМАЛЬНАЯ высота текстуры №1, а значение «Верхняя» – это МИНИМАЛЬНАЯ высота текстуры №4.
+ Измеряются в метрах. Значение «Низ» – это МАКСИМАЛЬНАЯ высота текстуры №1, а значение «Верх» – это МИНИМАЛЬНАЯ высота текстуры №4.
</text>
<text name="height_text_lbl6">
Северо-запад
@@ -39,20 +39,20 @@
<text name="height_text_lbl7">
Северо-восток
</text>
- <spinner label="Нижняя" name="height_start_spin_1"/>
- <spinner label="Нижняя" name="height_start_spin_3"/>
- <spinner label="Верхняя" name="height_range_spin_1"/>
- <spinner label="Верхняя" name="height_range_spin_3"/>
+ <spinner label="Низ" name="height_start_spin_1"/>
+ <spinner label="Низ" name="height_start_spin_3"/>
+ <spinner label="Верх" name="height_range_spin_1"/>
+ <spinner label="Верх" name="height_range_spin_3"/>
<text name="height_text_lbl8">
Юго-запад
</text>
<text name="height_text_lbl9">
Юго-восток
</text>
- <spinner label="Нижняя" name="height_start_spin_0"/>
- <spinner label="Нижняя" name="height_start_spin_2"/>
- <spinner label="Верхняя" name="height_range_spin_0"/>
- <spinner label="Верхняя" name="height_range_spin_2"/>
+ <spinner label="Низ" name="height_start_spin_0"/>
+ <spinner label="Низ" name="height_start_spin_2"/>
+ <spinner label="Верх" name="height_range_spin_0"/>
+ <spinner label="Верх" name="height_range_spin_2"/>
<button label="Загрузить ландшафт RAW..." name="download_raw_btn" tool_tip="Доступно только землевладельцам, не менеджерам"/>
<button label="Передать ландшафт RAW..." name="upload_raw_btn" tool_tip="Доступно только землевладельцам, не менеджерам"/>
<button label="Зафиксировать пределы" name="bake_terrain_btn" tool_tip="Установить высоту ландшафта по средней точке между верхней и нижней точками"/>
diff --git a/indra/newview/skins/default/xui/ru/panel_region_texture.xml b/indra/newview/skins/default/xui/ru/panel_region_texture.xml
index 369beb1e9b..c4b35a536d 100644
--- a/indra/newview/skins/default/xui/ru/panel_region_texture.xml
+++ b/indra/newview/skins/default/xui/ru/panel_region_texture.xml
@@ -7,10 +7,10 @@
неизвестен
</text>
<text name="detail_texture_text">
- Текстуры ландшафта (требования: 512x512, 24-разрядные TGA-файлы)
+ Текстуры ландшафта (требования: 512x512, 24-битные TGA-файлы)
</text>
<text name="height_text_lbl">
- 1 (нижняя)
+ 1 (низ)
</text>
<text name="height_text_lbl2">
2
@@ -19,7 +19,7 @@
3
</text>
<text name="height_text_lbl4">
- 4 (верхняя)
+ 4 (верх)
</text>
<text name="height_text_lbl5">
Диапазон высот текстур
@@ -30,25 +30,25 @@
<text name="height_text_lbl7">
Северо-восток
</text>
- <spinner label="Низко" name="height_start_spin_1"/>
- <spinner label="Низко" name="height_start_spin_3"/>
- <spinner label="Высоко" name="height_range_spin_1"/>
- <spinner label="Высоко" name="height_range_spin_3"/>
+ <spinner label="Низ" name="height_start_spin_1"/>
+ <spinner label="Низ" name="height_start_spin_3"/>
+ <spinner label="Верх" name="height_range_spin_1"/>
+ <spinner label="Верх" name="height_range_spin_3"/>
<text name="height_text_lbl8">
Юго-запад
</text>
<text name="height_text_lbl9">
Юго-восток
</text>
- <spinner label="Низко" name="height_start_spin_0"/>
- <spinner label="Низко" name="height_start_spin_2"/>
- <spinner label="Высоко" name="height_range_spin_0"/>
- <spinner label="Высоко" name="height_range_spin_2"/>
+ <spinner label="Низ" name="height_start_spin_0"/>
+ <spinner label="Низ" name="height_start_spin_2"/>
+ <spinner label="Верх" name="height_range_spin_0"/>
+ <spinner label="Верх" name="height_range_spin_2"/>
<text name="height_text_lbl10">
Эти значения отображают диапазон перекрытия вышеуказанных текстур.
</text>
<text name="height_text_lbl11">
- Измеряется в метрах, НИЖНЕЕ значение – это МАКСИМАЛЬНАЯ высота текстуры №1, ВЕРХНЕЕ значение – это МИНИМАЛЬНАЯ высота текстуры №4.
+ Измеряется в метрах, значение «Низ» – это МАКСИМАЛЬНАЯ высота текстуры №1, значение «Верх» – это МИНИМАЛЬНАЯ высота текстуры №4.
</text>
<button label="Применить" name="apply_btn"/>
</panel>
diff --git a/indra/newview/skins/default/xui/ru/strings.xml b/indra/newview/skins/default/xui/ru/strings.xml
index df657b39c6..7fef5797a9 100644
--- a/indra/newview/skins/default/xui/ru/strings.xml
+++ b/indra/newview/skins/default/xui/ru/strings.xml
@@ -872,7 +872,7 @@ support@secondlife.com.
Новое сопоставление элементов управления
</string>
<string name="AnimateYourAvatar">
- Анимация аватара
+ Анимировать ваш аватар
</string>
<string name="AttachToYourAvatar">
Прикрепить к аватару
@@ -899,10 +899,10 @@ support@secondlife.com.
Нет подключения
</string>
<string name="SIM_ACCESS_PG">
- Общая
+ Общий
</string>
<string name="SIM_ACCESS_MATURE">
- Умеренная
+ Умеренный
</string>
<string name="SIM_ACCESS_ADULT">
Для взрослых
@@ -1073,7 +1073,7 @@ support@secondlife.com.
Тату не надето
</string>
<string name="physics_not_worn">
- Физические данные не учитываются
+ Физика не учитывается
</string>
<string name="invalid_not_worn">
ошибка
@@ -1124,7 +1124,7 @@ support@secondlife.com.
Создать тату
</string>
<string name="create_new_physics">
- Создать физические данные
+ Создать физику
</string>
<string name="create_new_invalid">
ошибка
@@ -1437,7 +1437,7 @@ support@secondlife.com.
Резина
</string>
<string name="Light">
- Освещение
+ Светлый
</string>
<string name="KBShift">
SHIFT
@@ -1617,7 +1617,7 @@ support@secondlife.com.
Есть информация о платежах
</string>
<string name="PaymentInfoOnFile">
- Есть информация в файле о платежах
+ Есть зарегистрир. информация о платежах
</string>
<string name="NoPaymentInfoOnFile">
Нет информации о платежах
@@ -2340,13 +2340,13 @@ support@secondlife.com.
Не удается получить описание формата пикселей
</string>
<string name="MBTrueColorWindow">
- Для работы [APP_NAME] необходим режим True Color (32 разряда).
-Задайте в настройках дисплея 32-разрядный режим цвета.
+ Для работы [APP_NAME] необходим режим True Color (32 бита).
+Задайте в настройках дисплея 32-битный режим цвета.
</string>
<string name="MBAlpha">
- Не удается запустить [APP_NAME] из-за отсутствия доступа к 8-разрядному альфа-каналу. Обычно эта проблема возникает из-за неполадок с драйвером видеокарты.
+ Не удается запустить [APP_NAME] из-за отсутствия доступа к 8-битному альфа-каналу. Обычно эта проблема возникает из-за неполадок с драйвером видеокарты.
Установите новые драйверы видеокарты.
-Также задайте для монитора 32-разрядный режим True Color (Панель управления &gt; Экран &gt; Параметры).
+Также задайте для монитора 32-битный режим True Color (Панель управления &gt; Экран &gt; Параметры).
Если это сообщение продолжает отображаться, обратитесь на сайт [SUPPORT_SITE].
</string>
<string name="MBPixelFmtSetErr">
@@ -2363,7 +2363,7 @@ support@secondlife.com.
Если это сообщение продолжает отображаться, обратитесь на сайт [SUPPORT_SITE].
</string>
<string name="5 O&apos;Clock Shadow">
- Легкие сумерки
+ Жидкие
</string>
<string name="All White">
Полностью белые
@@ -2381,10 +2381,10 @@ support@secondlife.com.
Прикреплено
</string>
<string name="Attached Earlobes">
- Примыкающие мочки
+ Приросшие мочки
</string>
<string name="Back Fringe">
- Черная челка
+ Затылок
</string>
<string name="Baggy">
С мешками
@@ -2417,7 +2417,7 @@ support@secondlife.com.
Большая голова
</string>
<string name="Big Pectorals">
- Большие грудные мышцы
+ Выпуклая грудь
</string>
<string name="Big Spikes">
Большие «шипы»
@@ -2603,7 +2603,7 @@ support@secondlife.com.
Кустистые брови
</string>
<string name="Bushy Hair">
- Вьющиеся волосы
+ Пышные
</string>
<string name="Butt Size">
Размер зада
@@ -2636,7 +2636,7 @@ support@secondlife.com.
Ямка на подбородке
</string>
<string name="Chin Curtains">
- Борода в стиле Линкольна
+ Шкиперская бородка
</string>
<string name="Chin Depth">
Толщина подбородка
@@ -2654,10 +2654,10 @@ support@secondlife.com.
Переход от подбородка к шее
</string>
<string name="Clear">
- Очистить
+ Чистый
</string>
<string name="Cleft">
- Щелкой
+ Ямка
</string>
<string name="Close Set Eyes">
Близко посаженные
@@ -2711,7 +2711,7 @@ support@secondlife.com.
Темнее
</string>
<string name="Deep">
- Глубокий
+ Глубоко
</string>
<string name="Default Heels">
Стандартные каблуки
@@ -2726,7 +2726,7 @@ support@secondlife.com.
Вниз
</string>
<string name="Duffle Bag">
- Сумка из плотной ткани
+ Больше
</string>
<string name="Ear Angle">
Оттопыренность ушей
@@ -2756,7 +2756,7 @@ support@secondlife.com.
Открытость глаз
</string>
<string name="Eye Pop">
- Взмах ресницами
+ Вытаращить глаз
</string>
<string name="Eye Size">
Размер глаз
@@ -2774,7 +2774,7 @@ support@secondlife.com.
Высота бровей
</string>
<string name="Eyebrow Points">
- Точки бровей
+ Кончики бровей
</string>
<string name="Eyebrow Size">
Размер бровей
@@ -2792,10 +2792,10 @@ support@secondlife.com.
Выпученные глаза
</string>
<string name="Face Shear">
- Овал лица
+ Перекос лица
</string>
<string name="Facial Definition">
- Описание лица
+ Черты лица
</string>
<string name="Far Set Eyes">
Широко расставленные глаза
@@ -2816,7 +2816,7 @@ support@secondlife.com.
С манжетами
</string>
<string name="Flat">
- Плоский
+ Плоские
</string>
<string name="Flat Butt">
Плоский зад
@@ -2903,7 +2903,7 @@ support@secondlife.com.
Размер кисти
</string>
<string name="Handlebars">
- Рули
+ Длинные усы
</string>
<string name="Head Length">
Длина головы
@@ -2924,10 +2924,10 @@ support@secondlife.com.
Форма каблука
</string>
<string name="Height">
- Высота
+ Рост
</string>
<string name="High">
- высокий
+ Высокие
</string>
<string name="High Heels">
Высокий каблук
@@ -2939,7 +2939,7 @@ support@secondlife.com.
Высокая платформа
</string>
<string name="High and Tight">
- Высокое и плотное
+ Высокий и плотный
</string>
<string name="Higher">
Выше
@@ -2951,13 +2951,13 @@ support@secondlife.com.
Ширина бедер
</string>
<string name="In">
- Внутри
+ Внутрь
</string>
<string name="In Shdw Color">
Цвет внутренних теней
</string>
<string name="In Shdw Opacity">
- Прозрачность внутренних теней
+ Прозрачность внутр. теней
</string>
<string name="Inner Eye Corner">
Внутренние уголки глаз
@@ -2990,13 +2990,13 @@ support@secondlife.com.
Щеки
</string>
<string name="Knee Angle">
- Угол коленей
+ Угол колен
</string>
<string name="Knock Kneed">
- Ровность ног
+ Колченогие
</string>
<string name="Large">
- Большие
+ Больше
</string>
<string name="Large Hands">
Большие кисти
@@ -3029,7 +3029,7 @@ support@secondlife.com.
Меньше притяжения
</string>
<string name="Less Love">
- Меньше любви
+ Меньше
</string>
<string name="Less Muscles">
Меньше мышц
@@ -3044,7 +3044,7 @@ support@secondlife.com.
Меньше округлости
</string>
<string name="Less Saddle">
- Меньше седлообразности
+ Меньше
</string>
<string name="Less Square">
Меньше угловатости
@@ -3053,16 +3053,16 @@ support@secondlife.com.
Меньше объема
</string>
<string name="Less soul">
- Меньше энергичности
+ Меньше
</string>
<string name="Lighter">
Светлее
</string>
<string name="Lip Cleft">
- Зазор между губ
+ Ямка между губ
</string>
<string name="Lip Cleft Depth">
- Глубина зазора
+ Глубина ямки
</string>
<string name="Lip Fullness">
Полнота губ
@@ -3128,28 +3128,28 @@ support@secondlife.com.
Отложения на талии
</string>
<string name="Low">
- Низкое
+ Низкие
</string>
<string name="Low Heels">
Низкий каблук
</string>
<string name="Low Jaw">
- Низкая челюсть
+ Челюсть низко
</string>
<string name="Low Platforms">
Низкая платформа
</string>
<string name="Low and Loose">
- Низкое и свободное
+ Низкий и свободный
</string>
<string name="Lower">
Ниже
</string>
<string name="Lower Bridge">
- Ниже переносицу
+ Спинка носа
</string>
<string name="Lower Cheeks">
- Ниже щеки
+ Щеки ниже
</string>
<string name="Male">
Мужчина
@@ -3185,7 +3185,7 @@ support@secondlife.com.
Больше помады
</string>
<string name="More Love">
- Больше любви
+ Больше
</string>
<string name="More Lower Lip">
Больше нижняя губа
@@ -3194,7 +3194,7 @@ support@secondlife.com.
Больше мышц
</string>
<string name="More Muscular">
- Более мускулистое
+ Больше мышц
</string>
<string name="More Rosy">
Больше румянца
@@ -3203,7 +3203,7 @@ support@secondlife.com.
Больше округлости
</string>
<string name="More Saddle">
- Более седлообразно
+ Больше
</string>
<string name="More Sloped">
Более наклонный
@@ -3218,10 +3218,10 @@ support@secondlife.com.
Более вертикальный
</string>
<string name="More Volume">
- Больший объем
+ Больше объема
</string>
<string name="More soul">
- Больше духа
+ Больше
</string>
<string name="Moustache">
Усы
@@ -3251,7 +3251,7 @@ support@secondlife.com.
Узко
</string>
<string name="Narrow Back">
- Узкая спина
+ Узко сзади
</string>
<string name="Narrow Front">
Узкий перед
@@ -3260,7 +3260,7 @@ support@secondlife.com.
Узкие губы
</string>
<string name="Natural">
- Естественно
+ Естественный
</string>
<string name="Neck Length">
Длина шеи
@@ -3356,13 +3356,13 @@ support@secondlife.com.
Оранжевый
</string>
<string name="Out">
- Снаружи
+ Наружу
</string>
<string name="Out Shdw Color">
Цвет внешних теней
</string>
<string name="Out Shdw Opacity">
- Прозрачность внешних теней
+ Прозрачность внеш. теней
</string>
<string name="Outer Eye Corner">
Внешние уголки глаз
@@ -3377,7 +3377,7 @@ support@secondlife.com.
Глубокий прикус
</string>
<string name="Package">
- Пакет
+ Гульфик
</string>
<string name="Painted Nails">
Покрашенные
@@ -3386,7 +3386,7 @@ support@secondlife.com.
Бледный
</string>
<string name="Pants Crotch">
- Мотня
+ Шаг
</string>
<string name="Pants Fit">
Облегающие брюки
@@ -3404,13 +3404,13 @@ support@secondlife.com.
Пробор
</string>
<string name="Part Bangs">
- Челки с пробором
+ Челка с пробором
</string>
<string name="Pectorals">
Грудные мышцы
</string>
<string name="Pigment">
- Пигмент
+ Пигментация
</string>
<string name="Pigtails">
Хвосты по бокам
@@ -3428,7 +3428,7 @@ support@secondlife.com.
Ширина платформы
</string>
<string name="Pointy">
- Острый
+ Острые
</string>
<string name="Pointy Heels">
Острый каблук
@@ -3440,13 +3440,13 @@ support@secondlife.com.
Пышная юбка
</string>
<string name="Pop Left Eye">
- Хлопнуть левым глазом
+ Левый глаз
</string>
<string name="Pop Right Eye">
- Хлопнуть правым глазом
+ Правый глаз
</string>
<string name="Puffy">
- Припухшие
+ Пухлые
</string>
<string name="Puffy Eyelids">
Припухлость век
@@ -3473,13 +3473,13 @@ support@secondlife.com.
Румянец
</string>
<string name="Ruddy">
- Румяное
+ Румяный
</string>
<string name="Rumpled Hair">
Взъерошенные
</string>
<string name="Saddle Bags">
- Седельные сумки
+ Галифе
</string>
<string name="Scrawny Leg">
Сухопарая нога
@@ -3488,25 +3488,25 @@ support@secondlife.com.
Разделить
</string>
<string name="Shallow">
- Мелкий
+ Мелко
</string>
<string name="Shear Back">
- Очертание спины
+ Скос сзади
</string>
<string name="Shear Face">
- Овал лица
+ Перекос лица
</string>
<string name="Shear Front">
- Очертание спереди
+ Скос спереди
</string>
<string name="Shear Left Up">
- Очертание левой верхней части
+ Скос влево вверх
</string>
<string name="Shear Right Up">
- Очертание правой верхней части
+ Скос вправо вверх
</string>
<string name="Sheared Back">
- Уменьшенная спина
+ Уменьшено сзади
</string>
<string name="Sheared Front">
Уменьшено спереди
@@ -3533,7 +3533,7 @@ support@secondlife.com.
Высота обуви
</string>
<string name="Short">
- Короче
+ Ниже
</string>
<string name="Short Arms">
Короткие руки
@@ -3608,7 +3608,7 @@ support@secondlife.com.
Разрез: справа
</string>
<string name="Small">
- Маленький
+ Меньше
</string>
<string name="Small Hands">
Маленькие кисти
@@ -3620,13 +3620,13 @@ support@secondlife.com.
Гладко
</string>
<string name="Smooth Hair">
- Приглаженные волосы
+ Приглаженные
</string>
<string name="Socks Length">
Длина носков
</string>
<string name="Soulpatch">
- Бородка под губой
+ Эспаньолка
</string>
<string name="Sparse">
Жидкие
@@ -3662,13 +3662,13 @@ support@secondlife.com.
Зачесанные вперед
</string>
<string name="Tall">
- Высокие
+ Выше
</string>
<string name="Taper Back">
- Градуировка сзади
+ Конус сзади
</string>
<string name="Taper Front">
- Градуировка спереди
+ Конус спереди
</string>
<string name="Thick Heels">
Широкий каблук
@@ -3737,16 +3737,16 @@ support@secondlife.com.
Неестественный
</string>
<string name="Upper Bridge">
- Переносицу выше
+ Переносица
</string>
<string name="Upper Cheeks">
Щеки выше
</string>
<string name="Upper Chin Cleft">
- Ямку на подбородке выше
+ Ямка на подбородке выше
</string>
<string name="Upper Eyelid Fold">
- Складку века выше
+ Складка верхнего века
</string>
<string name="Upturned">
Вверх
@@ -3758,7 +3758,7 @@ support@secondlife.com.
Высота талии
</string>
<string name="Well-Fed">
- Упитанное
+ Упитанные
</string>
<string name="White Hair">
Белые волосы
@@ -3767,7 +3767,7 @@ support@secondlife.com.
Широко
</string>
<string name="Wide Back">
- Широкая спина
+ Широко сзади
</string>
<string name="Wide Front">
Широкий перед
@@ -4252,7 +4252,7 @@ support@secondlife.com.
Женщина – ух ты!
</string>
<string name="/bow">
- /поклон
+ /поклониться
</string>
<string name="/clap">
/хлопнуть
@@ -4794,7 +4794,7 @@ support@secondlife.com.
Компас
</string>
<string name="Command_Destinations_Label">
- Места
+ Пункты
</string>
<string name="Command_Gestures_Label">
Жесты
@@ -4845,16 +4845,16 @@ support@secondlife.com.
Вид
</string>
<string name="Command_Voice_Label">
- Голоса собеседников
+ Настройки голоса
</string>
<string name="Command_AboutLand_Tooltip">
Информация о посещаемой вами земле
</string>
<string name="Command_Appearance_Tooltip">
- Сменить аватар
+ Изменить аватар
</string>
<string name="Command_Avatar_Tooltip">
- Выберите весь аватар
+ Выбор аватара
</string>
<string name="Command_Build_Tooltip">
Построение объектов и формирование ландшафта
@@ -4917,7 +4917,7 @@ support@secondlife.com.
Изменение угла камеры
</string>
<string name="Command_Voice_Tooltip">
- Люди около вас с оспособностью говорить
+ Громкость звонков и голосов окружающих вас людей
</string>
<string name="Retain%">
Остаток%
diff --git a/indra/newview/skins/default/xui/ru/teleport_strings.xml b/indra/newview/skins/default/xui/ru/teleport_strings.xml
index 6a7a181046..296562e6f1 100644
--- a/indra/newview/skins/default/xui/ru/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/ru/teleport_strings.xml
@@ -20,6 +20,10 @@
Системе не удалось выполнить подключение телепорта.
Повторите попытку позже.
</message>
+ <message name="NoHelpIslandTP">
+ Вы не можете телепортироваться обратно на Остров Помощи.
+Телепортируйтесь на Общественный Остров Помощи, чтобы повторить обучение
+ </message>
<message name="noaccess_tport">
У вас нет доступа к точке назначения этого телепорта.
</message>
diff --git a/indra/newview/skins/default/xui/tr/floater_about.xml b/indra/newview/skins/default/xui/tr/floater_about.xml
index 998890b85c..993ec42958 100644
--- a/indra/newview/skins/default/xui/tr/floater_about.xml
+++ b/indra/newview/skins/default/xui/tr/floater_about.xml
@@ -46,16 +46,16 @@ Ses Sunucusu Sürümü: [VOICE_VERSION]
</panel>
<panel label="Katkıda Bulunanlar" name="credits_panel">
<text name="linden_intro">
- Second Life, Lindens&apos;lar tarafından geliştirilmiştir:
+ Second Life, Linden&apos;lar tarafından geliştirilmiştir:
</text>
<text name="contrib_intro">
- açık kaynak kod katkısında bulunanlar:
+ Açık kaynak kod katkısında bulunanlar:
</text>
<text_editor name="contrib_names">
Geçici Ad çalıştırma sırasında değiştirilir
</text_editor>
<text name="trans_intro">
- çevirileri yapanlar:
+ Çevirileri yapanlar:
</text>
<text_editor name="trans_names">
Geçici Ad çalıştırma sırasında değiştirilir
diff --git a/indra/newview/skins/default/xui/tr/floater_about_land.xml b/indra/newview/skins/default/xui/tr/floater_about_land.xml
index c44722f4ba..e0350964b5 100644
--- a/indra/newview/skins/default/xui/tr/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/tr/floater_about_land.xml
@@ -102,7 +102,7 @@
<text name="For Sale: Price L$[PRICE].">
Fiyat: L$[PRICE] (L$[PRICE_PER_SQM]/m²)
</text>
- <button label="Arazi Sat" name="Sell Land..."/>
+ <button label="Araziyi Sat" name="Sell Land..."/>
<text name="For sale to">
Şu Alıcıya Satılık: [BUYER]
</text>
@@ -307,7 +307,7 @@ Sadece büyük parseller aramada görünür.
İtme Yok (Bölge Geçersiz Kılma)
</panel.string>
<panel.string name="see_avs_text">
- Bu parseldeki sakinleri gör ve onlarla sohbet et
+ Parseldeki sakinleri gör ve onlarla sohbet et
</panel.string>
<text name="allow_label">
Sakinlere şunun için izin ver:
@@ -336,7 +336,7 @@ Sadece büyük parseller aramada görünür.
<check_box label="İtme Yok" name="PushRestrictCheck" tool_tip="Komut dosyalarının itmesini önler Bu seçeneğin işaretlenmesi arazinizdeki bozucu davranışları önlemeye yardımcı olabilir."/>
<check_box label="Konumu Arama sonuçlarında göster (L$30/hafta)" name="ShowDirectoryCheck" tool_tip="Arama sonuçlarında bu parsel görünsün"/>
<combo_box name="land category with adult">
- <combo_box.item label="Herhangi Bir Kategori" name="item0"/>
+ <combo_box.item label="Herh. Bir Kategori" name="item0"/>
<combo_box.item label="Linden Konumu" name="item1"/>
<combo_box.item label="Yetişkin" name="item2"/>
<combo_box.item label="Sanat ve Kültür" name="item3"/>
@@ -352,7 +352,7 @@ Sadece büyük parseller aramada görünür.
<combo_box.item label="Diğer" name="item12"/>
</combo_box>
<combo_box name="land category">
- <combo_box.item label="Herhangi Bir Kategori" name="item0"/>
+ <combo_box.item label="Herh. Bir Kategori" name="item0"/>
<combo_box.item label="Linden Konumu" name="item1"/>
<combo_box.item label="Sanat ve Kültür" name="item3"/>
<combo_box.item label="İş" name="item4"/>
@@ -372,7 +372,7 @@ Sadece büyük parseller aramada görünür.
</text>
<texture_picker name="snapshot_ctrl" tool_tip="Bir resim seçmek için tıklayın"/>
<text name="allow_label5">
- Diğer parsellerdeki Sakinlere şunun için izin verin:
+ Diğer parsel Sakinlerine şunun için izin verin:
</text>
<check_box label="Avatarları Gör" name="SeeAvatarsCheck" tool_tip="Diğer parsellerdeki sakinlerin bu parseldeki sakinleri görmesine ve onlarla sohbet etmesine, sizin de onları görüp, onlarla sohbet etmenize imkan tanır."/>
<text name="landing_point">
@@ -419,7 +419,7 @@ Sadece büyük parseller aramada görünür.
piksel
</text>
<text name="Options:">
- Seçenekler:
+ Seçenklr.:
</text>
<check_box label="Döngü" name="media_loop" tool_tip="Ortamı döngüsel olarak oynat. Ortamın oynatılması bittiğinde baştan tekrar başlayacaktır."/>
</panel>
@@ -448,7 +448,7 @@ Sadece büyük parseller aramada görünür.
(Gayrimenkul tarafından tanımlanır)
</panel.string>
<panel.string name="allow_public_access">
- Kamusal Erişime İzin Ver ([MATURITY]) (Not: Bunun işaretinin kaldırılması yasaklama çizgileri oluşturacaktır)
+ Kamusal Erişime İzin Ver ([MATURITY]) (Not: İşaret kaldırılırsa yasaklama çizgileri oluşur)
</panel.string>
<panel.string name="estate_override">
Bu seçeneklerden biri veya daha fazlası gayrimenkul düzeyinde ayarlanır
@@ -462,7 +462,7 @@ Sadece büyük parseller aramada görünür.
<check_box label="Dosyadaki ödeme bilgileri [ESTATE_PAYMENT_LIMIT]" name="limit_payment" tool_tip="Tanınmayan Sakinleri Yasakla."/>
<check_box label="Yaş doğrulama [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="Yaşını doğrulamayan Sakinleri yasakla Daha fazla bilgi için [SUPPORT_SITE] adresini ziyaret edin."/>
<check_box label="Grup Erişimine İzin Ver: [GROUP]" name="GroupCheck" tool_tip="Genel sekmesinde grup ayarla."/>
- <check_box label="Geçiş haklarını şuna sat:" name="PassCheck" tool_tip="Bu parsele geçici erişim verir"/>
+ <check_box label="Geçiş haklr. şuna sat:" name="PassCheck" tool_tip="Bu parsele geçici erişim verir"/>
<combo_box name="pass_combo">
<combo_box.item label="Herkes" name="Anyone"/>
<combo_box.item label="Grup" name="Group"/>
diff --git a/indra/newview/skins/default/xui/tr/floater_buy_land.xml b/indra/newview/skins/default/xui/tr/floater_buy_land.xml
index 4d43157f99..7b43af2ea4 100644
--- a/indra/newview/skins/default/xui/tr/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/tr/floater_buy_land.xml
@@ -53,7 +53,7 @@ Daha küçük bir alan seçmeyi deneyin.
Arazi alma bilgileri çekilirken hata oluştu.
</floater.string>
<floater.string name="buying_will">
- Bu arazinin satın alınması sonucu:
+ Arazinin satın alınması sonucu:
</floater.string>
<floater.string name="buying_for_group">
Bu arazinin grup için satın alınması sonucu:
@@ -185,7 +185,7 @@ Daha küçük bir alan seçmeyi deneyin.
nesnelerle satılır
</text>
<text name="info_action">
- Bu arazinin satın alınması sonucu:
+ Arazinin satın alınması sonucu:
</text>
<text name="error_message">
Bir şeyler yolunda değil.
diff --git a/indra/newview/skins/default/xui/tr/floater_edit_day_cycle.xml b/indra/newview/skins/default/xui/tr/floater_edit_day_cycle.xml
index e2e87ddf1e..4be1068dcc 100644
--- a/indra/newview/skins/default/xui/tr/floater_edit_day_cycle.xml
+++ b/indra/newview/skins/default/xui/tr/floater_edit_day_cycle.xml
@@ -22,10 +22,10 @@
Not: Ön ayarınızın adını değiştirirseniz, yeni bir ön ayar oluşturursunuz ve mevcut ön ayar değişmez.
</text>
<text name="hint_item1">
- - Belirli gökyüzü ayarlarını ve zamanı düzenlemek için bir sekmeye tıklayın.
+ - Birine tıklayarak gökyüzü ayarlarını/zamanı düzenleyin.
</text>
<text name="hint_item2">
- - Geçiş sürelerini ayarlamak için sekmelere tıklayın ve bunları sürükleyin.
+ - Sekmelere tıklayıp sürükleyerek geçiş sürlrn. ayarlayın.
</text>
<text name="hint_item3">
- Gün döngünüzü önizlemek için fırçayı kullanın.
diff --git a/indra/newview/skins/default/xui/tr/floater_environment_settings.xml b/indra/newview/skins/default/xui/tr/floater_environment_settings.xml
index 943e1e810d..e702da7e1b 100644
--- a/indra/newview/skins/default/xui/tr/floater_environment_settings.xml
+++ b/indra/newview/skins/default/xui/tr/floater_environment_settings.xml
@@ -18,7 +18,7 @@
<combo_box.item label="-Bir ön ayar seçin-" name="item0"/>
</combo_box>
<text name="sky_dayc_settings_title">
- Gökyüzü / Gün Döngüsü
+ Gökyüzü/Gün Dön.
</text>
<radio_group name="sky_dayc_settings_radio_group">
<radio_item label="Sabit gökyüzü" name="my_sky_settings"/>
diff --git a/indra/newview/skins/default/xui/tr/floater_god_tools.xml b/indra/newview/skins/default/xui/tr/floater_god_tools.xml
index ce7f7badcc..26e5ebd18b 100644
--- a/indra/newview/skins/default/xui/tr/floater_god_tools.xml
+++ b/indra/newview/skins/default/xui/tr/floater_god_tools.xml
@@ -67,7 +67,7 @@
<button label="Hedefin *Herhangi Bir* Arazideki Komut Dosyalı Nesnelerini Sil" label_selected="Hedefin *Herhangi Bir* Arazideki Komut Dosyalı Nesnelerini Sil" name="Delete Target&apos;s Scripted Objects On *Any* Land" tool_tip="Bu bölgede hedefe ait olan tüm komut dosyalı nesneleri silin. (kopya yok) nesneler geri döndürülür."/>
<button label="Hedefin *TÜM* Nesnelerini Sil" label_selected="Hedefin *TÜM* Nesnelerini Sil" name="Delete *ALL* Of Target&apos;s Objects" tool_tip="Bu bölgede hedefe ait olan tüm nesneleri silin. (kopya yok) nesneler geri döndürülür."/>
<button label="En Çok Çarpışanlar" label_selected="En Çok Çarpışanlar" name="Get Top Colliders" tool_tip="En dar fazda geri aramaları yaşayan nesnelerin listesini alır"/>
- <button label="En Çok Komut Dosyası Çalıştıranlar" label_selected="En Çok Komut Dosyası Çalıştıranlar" name="Get Top Scripts" tool_tip="Komut dosyalarını çalıştırırken en çok zaman harcayan nesnelerin listesini alır"/>
+ <button label="En Çok Komut Dsy. Çalştr." label_selected="En Çok Komut Dsy. Çalştr." name="Get Top Scripts" tool_tip="Komut dosyalarını çalıştırırken en çok zaman harcayan nesnelerin listesini alır"/>
<button label="Komut dosyaları özeti" label_selected="Komut dosyaları özeti" name="Scripts digest" tool_tip="Tüm komut dosyalarının ve her birinin ne kadar kullanıldığının listesini alır"/>
</panel>
<panel label="Talep" name="request">
diff --git a/indra/newview/skins/default/xui/tr/floater_joystick.xml b/indra/newview/skins/default/xui/tr/floater_joystick.xml
index 31d819743c..4a27aac3c1 100644
--- a/indra/newview/skins/default/xui/tr/floater_joystick.xml
+++ b/indra/newview/skins/default/xui/tr/floater_joystick.xml
@@ -3,10 +3,10 @@
<floater.string name="NoDevice">
cihaz tespit edilmedi
</floater.string>
- <check_box label="Oyun Çubuğunu Etkinleştir:" name="enable_joystick"/>
- <spinner label="X Eksen Haritalama" name="JoystickAxis1"/>
- <spinner label="Y Eksen Haritalama" name="JoystickAxis2"/>
- <spinner label="Z Eksen Haritalama" name="JoystickAxis0"/>
+ <check_box label="Oyun Çub. Etkşt:" name="enable_joystick"/>
+ <spinner label="X Eks. Haritalama" name="JoystickAxis1"/>
+ <spinner label="Y Eks. Haritalama" name="JoystickAxis2"/>
+ <spinner label="Z Eks. Haritalama" name="JoystickAxis0"/>
<spinner label="Eğim Haritalama" name="JoystickAxis4"/>
<spinner label="Düşey Sapma Haritalama" name="JoystickAxis5"/>
<spinner label="Tilt Haritalama" name="JoystickAxis3"/>
diff --git a/indra/newview/skins/default/xui/tr/floater_nearby_chat.xml b/indra/newview/skins/default/xui/tr/floater_nearby_chat.xml
index 6570c4379c..6b12ad0ef5 100644
--- a/indra/newview/skins/default/xui/tr/floater_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/tr/floater_nearby_chat.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="nearby_chat" title="YAKINDAKİ SOHBET">
- <check_box label="Sohbeti çevir (Google tarafından desteklenir)" name="translate_chat_checkbox"/>
+ <check_box label="Sohbeti çevir" name="translate_chat_checkbox"/>
</floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_preferences.xml b/indra/newview/skins/default/xui/tr/floater_preferences.xml
index a0be9dc53f..edb3c19b81 100644
--- a/indra/newview/skins/default/xui/tr/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/tr/floater_preferences.xml
@@ -7,7 +7,7 @@
<panel label="Grafikler" name="display"/>
<panel label="Ses ve Ortamlar" name="audio"/>
<panel label="Sohbet" name="chat"/>
- <panel label="Hareketler ve Görünümler" name="move"/>
+ <panel label="Hareket ve Görünümler" name="move"/>
<panel label="Bildirimler" name="msgs"/>
<panel label="Renkler" name="colors"/>
<panel label="Gizlilik" name="im"/>
diff --git a/indra/newview/skins/default/xui/tr/floater_preview_gesture.xml b/indra/newview/skins/default/xui/tr/floater_preview_gesture.xml
index fa9fd37e6c..dc6f66f657 100644
--- a/indra/newview/skins/default/xui/tr/floater_preview_gesture.xml
+++ b/indra/newview/skins/default/xui/tr/floater_preview_gesture.xml
@@ -65,7 +65,7 @@
<check_box label="tüm animasyonlar bitinceye kadar" name="wait_anim_check"/>
<check_box label="saniye olarak zaman:" name="wait_time_check"/>
<text name="help_label">
- Bekleme adımlar eklemediğiniz sürece tüm adımlar aynı anda gerçekleşir.
+ Bekleme adımları eklemediğiniz sürece tüm adımlar aynı anda gerçekleşir.
</text>
<check_box label="Etkin" name="active_check" tool_tip="Etkin mimikleri tetiklemek için tetikleme fazları için sohbet gerçekleştirebilir veya kısayol tuşlarına basabilirsiniz. Bir anahtar bağlama ihtilafı olduğunda mimikler genellikle inaktif hale geçer."/>
<button label="Önizleme" name="preview_btn"/>
diff --git a/indra/newview/skins/default/xui/tr/floater_report_abuse.xml b/indra/newview/skins/default/xui/tr/floater_report_abuse.xml
index ae4c3cc75e..c5765883c4 100644
--- a/indra/newview/skins/default/xui/tr/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/tr/floater_report_abuse.xml
@@ -81,7 +81,7 @@
Özet:
</text>
<text name="dscr_title">
- Ayrıntılar:
+ Ayrıntl:
</text>
<text name="bug_aviso">
Mümkün olduğunca spesifik olun
diff --git a/indra/newview/skins/default/xui/tr/floater_tools.xml b/indra/newview/skins/default/xui/tr/floater_tools.xml
index cd5e6b7fac..d4ee9995dd 100644
--- a/indra/newview/skins/default/xui/tr/floater_tools.xml
+++ b/indra/newview/skins/default/xui/tr/floater_tools.xml
@@ -55,7 +55,7 @@
<radio_item label="Uzat (Ctrl+Shift)" name="radio stretch"/>
<radio_item label="Yüzü Seç" name="radio select face"/>
</radio_group>
- <check_box label="Bağlantılı olanları düzenle" name="checkbox edit linked parts"/>
+ <check_box label="Bağlantılıları düzenle" name="checkbox edit linked parts"/>
<button label="Bağla" name="link_btn"/>
<button label="Bağlantıyı Kopar" name="unlink_btn"/>
<text label="Her İki Tarafı Uzat" name="checkbox uniform label">
@@ -81,7 +81,7 @@
<button name="ToolGrass" tool_tip="Çimen"/>
<check_box label="Seçili Aracı tut" name="checkbox sticky"/>
<check_box label="Seçimi kopyala" name="checkbox copy selection"/>
- <check_box initial_value="true" label="Kopyayı Merkeze Al" name="checkbox copy centers"/>
+ <check_box initial_value="true" label="Kopyayı Merkezle" name="checkbox copy centers"/>
<check_box label="Kopyayı Döndür" name="checkbox copy rotates"/>
<radio_group name="land_radio_group">
<radio_item label="Araziyi Seç" name="radio select land"/>
@@ -376,7 +376,7 @@
</combo_box>
<spinner label="Yerçekimi" name="Physics Gravity"/>
<spinner label="Sürtünme" name="Physics Friction"/>
- <spinner label="100 kg/m^3 cinsinden yoğunluk" name="Physics Density"/>
+ <spinner label="100 kg/m3 cinsinden yoğunluk" name="Physics Density"/>
<spinner label="Restitüsyon" name="Physics Restitution"/>
</panel>
<panel label="Doku" name="Texture">
diff --git a/indra/newview/skins/default/xui/tr/menu_viewer.xml b/indra/newview/skins/default/xui/tr/menu_viewer.xml
index efeed833a5..75294e38d5 100644
--- a/indra/newview/skins/default/xui/tr/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/tr/menu_viewer.xml
@@ -93,7 +93,7 @@
<menu_item_call label="Arazi Aracı" name="Land"/>
</menu>
<menu_item_call label="Bağla" name="Link"/>
- <menu_item_call label="Bağlantıyı Kopar" name="Unlink"/>
+ <menu_item_call label="Bağlnty. Kopar" name="Unlink"/>
<menu_item_check label="Bağlantılı Parçaları Düzenle" name="Edit Linked Parts"/>
<menu label="Bağlantılı Parçaları Seç" name="Select Linked Parts">
<menu_item_call label="Sonraki Parçayı Seç" name="Select Next Part"/>
@@ -118,7 +118,7 @@
<menu_item_call label="Komut Dosyalarını Çalışıyor Olarak Ayarla" name="Set Scripts to Running"/>
<menu_item_call label="Komut Dosyalarını Çalışmıyor Olarak Ayarla" name="Set Scripts to Not Running"/>
</menu>
- <menu label="Seçenekler" name="Options">
+ <menu label="Seçenklr." name="Options">
<menu_item_check label="Gelişmiş İzinleri Göster" name="DebugPermissions"/>
<menu_item_check label="Sadece Nesnelerimi Seç" name="Select Only My Objects"/>
<menu_item_check label="Sadece Hareket Ettirilebilir Nesneleri Seç" name="Select Only Movable Objects"/>
diff --git a/indra/newview/skins/default/xui/tr/notifications.xml b/indra/newview/skins/default/xui/tr/notifications.xml
index a268c103a6..b62ff01ab9 100644
--- a/indra/newview/skins/default/xui/tr/notifications.xml
+++ b/indra/newview/skins/default/xui/tr/notifications.xml
@@ -2270,7 +2270,7 @@ Daha küçük bir arazi parçası seçmeyi deneyin.
[NAME]
[DATE]
<form name="form">
- <button name="Details" text="Ayrıntılar"/>
+ <button name="Details" text="Ayrıntl"/>
<button name="Cancel" text="İptal"/>
</form>
</notification>
diff --git a/indra/newview/skins/default/xui/tr/panel_nearby_chat.xml b/indra/newview/skins/default/xui/tr/panel_nearby_chat.xml
index 73da726cb2..c405105e00 100644
--- a/indra/newview/skins/default/xui/tr/panel_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/tr/panel_nearby_chat.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="nearby_chat">
- <check_box label="Sohbeti çevir (Google tarafından desteklenir)" name="translate_chat_checkbox"/>
+ <check_box label="Sohbeti çevir" name="translate_chat_checkbox"/>
</panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_people.xml b/indra/newview/skins/default/xui/tr/panel_people.xml
index 7d42e3ab79..1a1e53bac2 100644
--- a/indra/newview/skins/default/xui/tr/panel_people.xml
+++ b/indra/newview/skins/default/xui/tr/panel_people.xml
@@ -24,7 +24,7 @@ Birlikte takılacak kişiler mi arıyorsunuz? [secondlife:///app/worldmap Dünya
<tab_container name="tabs">
<panel label="YAKIN" name="nearby_panel">
<panel label="bottom_panel" name="bottom_panel">
- <menu_button name="nearby_view_sort_btn" tool_tip="Seçenekler"/>
+ <menu_button name="nearby_view_sort_btn" tool_tip="Seçenklr."/>
<button name="add_friend_btn" tool_tip="Seçilen Sakini arkadaş listene ekle"/>
</panel>
</panel>
@@ -49,14 +49,14 @@ Birlikte takılacak kişiler mi arıyorsunuz? [secondlife:///app/worldmap Dünya
</panel>
<panel label="GRUPLARIM" name="groups_panel">
<panel label="bottom_panel" name="bottom_panel">
- <menu_button name="groups_viewsort_btn" tool_tip="Seçenekler"/>
+ <menu_button name="groups_viewsort_btn" tool_tip="Seçenklr."/>
<button name="plus_btn" tool_tip="Gruba katıl/yeni grup oluştur"/>
<button name="activate_btn" tool_tip="Seçilen grubu etkinleştir"/>
</panel>
</panel>
<panel label="SON" name="recent_panel">
<panel label="bottom_panel" name="bottom_panel">
- <menu_button name="recent_viewsort_btn" tool_tip="Seçenekler"/>
+ <menu_button name="recent_viewsort_btn" tool_tip="Seçenklr."/>
<button name="add_friend_btn" tool_tip="Seçilen Sakini arkadaş listene ekle"/>
</panel>
</panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/tr/panel_preferences_advanced.xml
index 787efa32f4..770cdc6efd 100644
--- a/indra/newview/skins/default/xui/tr/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/tr/panel_preferences_advanced.xml
@@ -6,11 +6,11 @@
<text name="Cache:">
Önbellek:
</text>
- <spinner label="Önbellek büyüklüğü (64 - 9984 MB)" name="cachesizespinner"/>
+ <spinner label="Önbellek boyutu (64-9984 MB)" name="cachesizespinner"/>
<text name="text_box5">
MB
</text>
- <button label="Önbelleği Temizle" label_selected="Önbelleği Temizle" name="clear_cache"/>
+ <button label="Önbelleği Sil" label_selected="Önbelleği Sil" name="clear_cache"/>
<text name="Cache location">
Önbellek konumu:
</text>
diff --git a/indra/newview/skins/default/xui/tr/panel_preferences_chat.xml b/indra/newview/skins/default/xui/tr/panel_preferences_chat.xml
index aeef737420..f7f0698a31 100644
--- a/indra/newview/skins/default/xui/tr/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/tr/panel_preferences_chat.xml
@@ -16,9 +16,9 @@
Aİ&apos;leri şurada göster:
</text>
<text name="requires_restart_label">
- (yeniden başlatma gerektirir)
+ (tekrar başlatma gerekir)
</text>
- <radio_group name="chat_window" tool_tip="Anlık İletilerinizi ayrı gezdiricilerde veya birden çok sekmeye sahip tek bir gezdiricide gösterin (Yeniden başlatma gerektirir)">
+ <radio_group name="chat_window" tool_tip="Anlık İletileri ayrı gezdiricilerde veya çoklu sekmelere sahip tek bir gezdiricide gösterin (tekrar başlatma gerekir)">
<radio_item label="Ayrı Pencereler" name="radio" value="0"/>
<radio_item label="Sekmeler" name="radio2" value="1"/>
</radio_group>
@@ -30,7 +30,7 @@
<spinner label="Yakındaki sohbet iletilerinin vurgulanma süresi:" name="nearby_toasts_lifetime"/>
<spinner label="Yakındaki sohbet iletilerinin sönme süresi:" name="nearby_toasts_fadingtime"/>
<text name="translate_chb_label">
- Sohbet ederken makine çevirisi kullanılsın (Google tarafından desteklenir)
+ Sohbet ederken makine çevirisi kullanılsın
</text>
<text name="translate_language_text">
Sohbeti şu dile çevir:
diff --git a/indra/newview/skins/default/xui/tr/panel_preferences_general.xml b/indra/newview/skins/default/xui/tr/panel_preferences_general.xml
index fbfc07c4b8..4a48b1588c 100644
--- a/indra/newview/skins/default/xui/tr/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/tr/panel_preferences_general.xml
@@ -22,7 +22,7 @@
(Yeniden başlatma gerekir)
</text>
<text name="maturity_desired_prompt">
- Seviyelendirdiğim şu içeriğe erişim istiyorum:
+ Seviyelndrl. içeriğe erişim istiyorum::
</text>
<combo_box name="maturity_desired_combobox">
<combo_box.item label="Genel, Orta, Yetişkin" name="Desired_Adult"/>
diff --git a/indra/newview/skins/default/xui/tr/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/tr/panel_preferences_graphics1.xml
index ba31640e9c..ddb83ffc69 100644
--- a/indra/newview/skins/default/xui/tr/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/tr/panel_preferences_graphics1.xml
@@ -51,7 +51,7 @@
<combo_box.item label="Tüm avatarlar ve nesneler" name="3"/>
<combo_box.item label="Her şey" name="4"/>
</combo_box>
- <slider label="Avatarın Fiziksel Özellikleri:" name="AvatarPhysicsDetail"/>
+ <slider label="Avatar Fzk. Özlk.:" name="AvatarPhysicsDetail"/>
<text name="AvatarPhysicsDetailText">
Düşük
</text>
@@ -60,7 +60,7 @@
m
</text>
<slider label="Maks. parçacık sayısı:" name="MaxParticleCount"/>
- <slider label="Düşük grafik özellikli olmayan maks. avatar sayısı:" name="MaxNumberAvatarDrawn"/>
+ <slider label="Düşük gr. özl. olmayan mks. avatar:" name="MaxNumberAvatarDrawn"/>
<slider label="Son işleme kalitesi:" name="RenderPostProcess"/>
<text name="MeshDetailText">
Örgü detayı:
diff --git a/indra/newview/skins/default/xui/tr/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/tr/panel_preferences_privacy.xml
index e76616f667..9111594979 100644
--- a/indra/newview/skins/default/xui/tr/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/tr/panel_preferences_privacy.xml
@@ -11,7 +11,7 @@
<check_box label="Çevrimiçi olduğumu sadece arkadaşlar ve gruplar bilsin" name="online_visibility"/>
<check_box label="Sadece arkadaşlar ve gruplar beni arasın veya Aİ göndersin" name="voice_call_friends_only_check"/>
<check_box label="Aramaları sonlandırırken mikrofonu kapat" name="auto_disengage_mic_check"/>
- <check_box label="Oturum Açarken Favori Yer İmlerimi Göster (&apos;Buradan başla&apos; açılır menüsünden)" name="favorites_on_login_check"/>
+ <check_box label="Oturum Açarken Favori Yer İmlerimi Göster (&apos;Buradan başla&apos; menüsünden)" name="favorites_on_login_check"/>
<text name="Logs:">
Sohbet Günlükleri:
</text>
diff --git a/indra/newview/skins/default/xui/tr/panel_region_debug.xml b/indra/newview/skins/default/xui/tr/panel_region_debug.xml
index f16c666e86..6e15e0f6f6 100644
--- a/indra/newview/skins/default/xui/tr/panel_region_debug.xml
+++ b/indra/newview/skins/default/xui/tr/panel_region_debug.xml
@@ -21,14 +21,14 @@
</line_editor>
<button label="Seç" name="choose_avatar_btn"/>
<text name="options_text_lbl">
- Seçenekler:
+ Seçenklr.:
</text>
<check_box label="Komut dosyaları ile" name="return_scripts" tool_tip="Sadece komut dosyaları olan nesneler iade edilsin"/>
<check_box label="Başkasına ait arazi üzerinde" name="return_other_land" tool_tip="Sadece başkasına ait arazi üzerinde olan nesneler iade edilsin"/>
<check_box label="Bu gayrimenkulu oluşturan bölgelerin tümünde" name="return_estate_wide" tool_tip="Bu gayrimenkulu oluşturan bölgelerin tümündeki nesneler iade edilsin"/>
<button label="İade Et" name="return_btn"/>
<button label="En Çok Çarpışanlar..." name="top_colliders_btn" tool_tip="En çok potansiyel çarpışma yaşayan nesnelerin listesi"/>
- <button label="En Çok Komut Dosyası Çalıştıranlar..." name="top_scripts_btn" tool_tip="Komut dosyalarını çalıştırırken en çok zaman harcayan nesnelerin listesi"/>
+ <button label="En Çok Komut Dsy. Çalştr...." name="top_scripts_btn" tool_tip="Komut dosyalarını çalıştırırken en çok zaman harcayan nesnelerin listesi"/>
<button label="Bölgeyi Yeniden Başlat" name="restart_btn" tool_tip="2 dakikalık bir geri sayımdan sonra bölgeyi yeniden başlat"/>
<button label="Yeniden Başlatmayı Ertele" name="cancel_restart_btn" tool_tip="Bölgenin yeniden başlatılmasını 1 saat ertele"/>
</panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_region_environment.xml b/indra/newview/skins/default/xui/tr/panel_region_environment.xml
index 851cd23f30..058ea91b70 100644
--- a/indra/newview/skins/default/xui/tr/panel_region_environment.xml
+++ b/indra/newview/skins/default/xui/tr/panel_region_environment.xml
@@ -15,7 +15,7 @@
<combo_box.item label="-Bir ön ayar seçin-" name="item0"/>
</combo_box>
<text name="sky_dayc_settings_title">
- Gökyüzü / Gün Döngüsü
+ Gökyüzü/Gün Dön.
</text>
<radio_group name="sky_dayc_settings_radio_group">
<radio_item label="Sabit gökyüzü" name="my_sky_settings"/>
diff --git a/indra/newview/skins/default/xui/tr/panel_region_terrain.xml b/indra/newview/skins/default/xui/tr/panel_region_terrain.xml
index 874d27abfb..3226ee008e 100644
--- a/indra/newview/skins/default/xui/tr/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/tr/panel_region_terrain.xml
@@ -7,7 +7,7 @@
bilinmiyor
</text>
<spinner label="Su Yüksekliği" name="water_height_spin"/>
- <spinner label="Yüzey Yükseltme Limiti" name="terrain_raise_spin"/>
+ <spinner label="Yüzey Yükslt. Limiti" name="terrain_raise_spin"/>
<spinner label="Yüzey Alçatma Limiti" name="terrain_lower_spin"/>
<text name="detail_texture_text">
Yüzey Dokuları (512x512, 24 bit .tga dosyalar gerektirir)
diff --git a/indra/newview/skins/default/xui/tr/role_actions.xml b/indra/newview/skins/default/xui/tr/role_actions.xml
index 18f7d6dca2..655ac64172 100644
--- a/indra/newview/skins/default/xui/tr/role_actions.xml
+++ b/indra/newview/skins/default/xui/tr/role_actions.xml
@@ -44,7 +44,7 @@
<action_set description="Bu Yeteneklere, grubun sahip olduğu parsellere erişime izin verme veya buralara erişimi yasaklama ve Second Life Sakinlerini dondurma veya parselden dışarı çıkarma da dahildir." name="Parcel Access">
<action description="Parselin Erişim listelerini yönet" longdescription="Parselin Erişim listelerini Arazi Hakkında &gt; Erişim sekmesinden yönetin." name="land manage allowed" value="29"/>
<action description="Parselin Yasaklama listelerini yönet" longdescription="Parselin Yasaklama listelerini Arazi Hakkında &gt; Erişim sekmesinden yönetin." name="land manage banned" value="30"/>
- <action description="Parselin &apos;Geçiş haklarını şuna sat&apos; ayarlarını değiştir" longdescription="Parselin &apos;Geçiş haklarını şuna sat&apos; ayarlarını Arazi Hakkında &gt; Erişim sekmesinden değiştirin." name="land manage passes" value="31"/>
+ <action description="Parselin &apos;Geçiş haklr. şuna sat&apos; ayarlarını değiştir" longdescription="Parselin &apos;Geçiş haklr. şuna sat&apos; ayarlarını Arazi Hakkında &gt; Erişim sekmesinden değiştirin." name="land manage passes" value="31"/>
<action description="Parsel üzerindeki Second Life Sakinlerini dışarı çıkar veya dondur" longdescription="Bu Yeteneğe sahip olan bir Roldeki Üyeler, grubun sahip olduğu bir parsel üzerinde olmasını istemedikleri bir Second Life sakininin üzerini sağ tıklatıp &apos;Dışarı Çıkar&apos; veya &apos;Dondur&apos;u seçebilirler." name="land admin" value="32"/>
</action_set>
<action_set description="Bu Yeteneklere üyelerin nesneleri iade etmelerine, Linden bitkilerini yerleştirmelerine ve bu bitkilerin yerlerini değiştirmelerine izin veren güçler de dahildir. Bu özellik, Üyelerin çöpleri temizlemeleri ve bahçe düzenlemesi yapmaları için kullanışlıdır; fakat dikkatle kullanılmalıdır, çünkü nesneleri iade etmenin geri alınma imkanı yoktur." name="Parcel Content">
diff --git a/indra/newview/skins/default/xui/tr/sidepanel_task_info.xml b/indra/newview/skins/default/xui/tr/sidepanel_task_info.xml
index 28eeef02d3..2fa6281f05 100644
--- a/indra/newview/skins/default/xui/tr/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/tr/sidepanel_task_info.xml
@@ -118,6 +118,6 @@
<button label="Aç" name="open_btn"/>
<button label="Öde" name="pay_btn"/>
<button label="Satın Al" name="buy_btn"/>
- <button label="Ayrıntılar" name="details_btn"/>
+ <button label="Ayrıntl" name="details_btn"/>
</panel>
</panel>
diff --git a/indra/newview/skins/default/xui/tr/strings.xml b/indra/newview/skins/default/xui/tr/strings.xml
index a17d78486d..bf331dc3cf 100644
--- a/indra/newview/skins/default/xui/tr/strings.xml
+++ b/indra/newview/skins/default/xui/tr/strings.xml
@@ -2160,7 +2160,7 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin.
Aşağı
</string>
<string name="Any Category">
- Herhangi Bir Kategori
+ Herh. Bir Kategori
</string>
<string name="Shopping">
Alışveriş
@@ -2190,7 +2190,7 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin.
Kişisel
</string>
<string name="None">
- Hiçbiri
+ Renksiz
</string>
<string name="Linden Location">
Linden Konumu
@@ -2390,7 +2390,7 @@ Bu iletiyi almaya devam ederseniz, lütfen [SUPPORT_SITE] bölümüne başvurun.
Arka Perçem
</string>
<string name="Baggy">
- Lüleler
+ Torbalı
</string>
<string name="Bangs">
Kahküller
@@ -2480,7 +2480,7 @@ Bu iletiyi almaya devam ederseniz, lütfen [SUPPORT_SITE] bölümüne başvurun.
Geniş
</string>
<string name="Brow Size">
- Kaş Büyüklüğü
+ Alın Genişliği
</string>
<string name="Bug Eyes">
Patlak Gözlü
@@ -2777,7 +2777,7 @@ Bu iletiyi almaya devam ederseniz, lütfen [SUPPORT_SITE] bölümüne başvurun.
Kaş Yüksekliği
</string>
<string name="Eyebrow Points">
- Kaş Noktaları
+ Kaş Yapısı
</string>
<string name="Eyebrow Size">
Kaş Büyüklüğü
@@ -2846,13 +2846,13 @@ Bu iletiyi almaya devam ederseniz, lütfen [SUPPORT_SITE] bölümüne başvurun.
Ön Perçem
</string>
<string name="Full Back">
- Saçlar Arkada
+ Arkası Düz
</string>
<string name="Full Eyeliner">
Çift Taraflı Göz Kalemi
</string>
<string name="Full Front">
- Saçlar Önde
+ Önü Düz
</string>
<string name="Full Hair Sides">
Saçlar Yanda
@@ -2936,13 +2936,13 @@ Bu iletiyi almaya devam ederseniz, lütfen [SUPPORT_SITE] bölümüne başvurun.
Yüksek Topuklar
</string>
<string name="High Jaw">
- Yüksek Çene Ucu
+ Ayrık
</string>
<string name="High Platforms">
- Yüksek Topuklu Ayakkabılar
+ Yüksek Topuklu
</string>
<string name="High and Tight">
- Tepede Bırakılmış Saç
+ Düşük
</string>
<string name="Higher">
Daha Yüksek
@@ -2954,7 +2954,7 @@ Bu iletiyi almaya devam ederseniz, lütfen [SUPPORT_SITE] bölümüne başvurun.
Kalça Genişliği
</string>
<string name="In">
- İç
+ İçeri
</string>
<string name="In Shdw Color">
İç Gölge Rengi
@@ -2978,19 +2978,19 @@ Bu iletiyi almaya devam ederseniz, lütfen [SUPPORT_SITE] bölümüne başvurun.
Ceket Kırışıklıkları
</string>
<string name="Jaw Angle">
- Çene Ucu Açısı
+ Çenenin Boyuna Uzaklığı
</string>
<string name="Jaw Jut">
- Çene Ucu Çıkıntısı
+ Alt Çene Uzunluğu
</string>
<string name="Jaw Shape">
- Çene Ucu Şekli
+ Çene Kemiği Genişliği
</string>
<string name="Join">
- Birleştir
+ Birleşik
</string>
<string name="Jowls">
- Gıdıklar
+ Avurtlar
</string>
<string name="Knee Angle">
Diz Açısı
@@ -3029,7 +3029,7 @@ Bu iletiyi almaya devam ederseniz, lütfen [SUPPORT_SITE] bölümüne başvurun.
Daha Az Dolgun
</string>
<string name="Less Gravity">
- Daha Az Yerçekimi
+ Dik Göğüs
</string>
<string name="Less Love">
Daha İnce Bel
@@ -3047,7 +3047,7 @@ Bu iletiyi almaya devam ederseniz, lütfen [SUPPORT_SITE] bölümüne başvurun.
Daha Az Yuvarlak
</string>
<string name="Less Saddle">
- Daha Dar Kalça
+ Basensiz
</string>
<string name="Less Square">
Daha Az Küt
@@ -3098,7 +3098,7 @@ Bu iletiyi almaya devam ederseniz, lütfen [SUPPORT_SITE] bölümüne başvurun.
Uzun Kafa
</string>
<string name="Long Hips">
- Geniş Kalçalar
+ Yüksek kalça
</string>
<string name="Long Legs">
Uzun Bacaklar
@@ -3107,7 +3107,7 @@ Bu iletiyi almaya devam ederseniz, lütfen [SUPPORT_SITE] bölümüne başvurun.
Uzun Boyun
</string>
<string name="Long Pigtails">
- Uzun Saç Örgüleri
+ Yandan Uzun Kuyruk
</string>
<string name="Long Ponytail">
Uzun Atkuyruğu
@@ -3137,13 +3137,13 @@ Bu iletiyi almaya devam ederseniz, lütfen [SUPPORT_SITE] bölümüne başvurun.
Alçak Topuklar
</string>
<string name="Low Jaw">
- Düşük Çene Ucu
+ Bitişik
</string>
<string name="Low Platforms">
Alçak Topuklu
</string>
<string name="Low and Loose">
- Serbest At Kuyruğu
+ Yüksek
</string>
<string name="Lower">
Daha Alçak
@@ -3182,7 +3182,7 @@ Bu iletiyi almaya devam ederseniz, lütfen [SUPPORT_SITE] bölümüne başvurun.
Daha Dolgun
</string>
<string name="More Gravity">
- Daha Çok Yerçekimi
+ Sarkık Göğüs
</string>
<string name="More Lipstick">
Daha Çok Ruj
@@ -3191,7 +3191,7 @@ Bu iletiyi almaya devam ederseniz, lütfen [SUPPORT_SITE] bölümüne başvurun.
Daha Kalın Bel
</string>
<string name="More Lower Lip">
- Daha Çok Alt Dudak
+ Daha Dolgun Alt Dudak
</string>
<string name="More Muscles">
Daha Çok Kas
@@ -3206,7 +3206,7 @@ Bu iletiyi almaya devam ederseniz, lütfen [SUPPORT_SITE] bölümüne başvurun.
Daha Yuvarlak
</string>
<string name="More Saddle">
- Daha Geniş Kalça
+ Basenli
</string>
<string name="More Sloped">
Daha Eğimli
@@ -3215,7 +3215,7 @@ Bu iletiyi almaya devam ederseniz, lütfen [SUPPORT_SITE] bölümüne başvurun.
Daha Küt
</string>
<string name="More Upper Lip">
- Daha Çok Üst Dudak
+ Daha Dolgun Üst Dudak
</string>
<string name="More Vertical">
Daha Dikey
@@ -3260,7 +3260,7 @@ Bu iletiyi almaya devam ederseniz, lütfen [SUPPORT_SITE] bölümüne başvurun.
Önü Dar
</string>
<string name="Narrow Lips">
- İnce Dudaklar
+ Küçük Dudaklar
</string>
<string name="Natural">
Doğal
@@ -3359,7 +3359,7 @@ Bu iletiyi almaya devam ederseniz, lütfen [SUPPORT_SITE] bölümüne başvurun.
Turuncu
</string>
<string name="Out">
- Dış
+ Dışarı
</string>
<string name="Out Shdw Color">
Dış Gölge Rengi
@@ -3377,7 +3377,7 @@ Bu iletiyi almaya devam ederseniz, lütfen [SUPPORT_SITE] bölümüne başvurun.
Dış Gölge
</string>
<string name="Overbite">
- Üst Dişler Önde
+ Öne Doğru
</string>
<string name="Package">
Apış Arası Şişkinliği
@@ -3416,7 +3416,7 @@ Bu iletiyi almaya devam ederseniz, lütfen [SUPPORT_SITE] bölümüne başvurun.
Pigment
</string>
<string name="Pigtails">
- Saç Örgüleri
+ Yan Kuyruklar
</string>
<string name="Pink">
Pembe
@@ -3431,7 +3431,7 @@ Bu iletiyi almaya devam ederseniz, lütfen [SUPPORT_SITE] bölümüne başvurun.
Topuk Genişliği
</string>
<string name="Pointy">
- Sivri
+ Dar
</string>
<string name="Pointy Heels">
Sivri Topuklar
@@ -3482,25 +3482,25 @@ Bu iletiyi almaya devam ederseniz, lütfen [SUPPORT_SITE] bölümüne başvurun.
Dağınık Saç
</string>
<string name="Saddle Bags">
- Kalça Kalınlığı
+ Basen Genişliği
</string>
<string name="Scrawny Leg">
Sıska Bacak
</string>
<string name="Separate">
- Ayrı
+ Ayrık
</string>
<string name="Shallow">
Sığ
</string>
<string name="Shear Back">
- Arkayı Dikey Kaydır
+ Arka Dolgunluğu
</string>
<string name="Shear Face">
Yüzü Dikey Kaydır
</string>
<string name="Shear Front">
- Önü Dikey Kaydır
+ Ön Dolgunluğu
</string>
<string name="Shear Left Up">
Solu Yukarı Kaydır
@@ -3509,10 +3509,10 @@ Bu iletiyi almaya devam ederseniz, lütfen [SUPPORT_SITE] bölümüne başvurun.
Sağı Yukarı Kaydır
</string>
<string name="Sheared Back">
- Arkası Dikey Kaydırılmış
+ Arkası Dolgun
</string>
<string name="Sheared Front">
- Önü Dikey Kaydırılmış
+ Önü Dolgun
</string>
<string name="Shift Left">
Sola Kaydır
@@ -3548,7 +3548,7 @@ Bu iletiyi almaya devam ederseniz, lütfen [SUPPORT_SITE] bölümüne başvurun.
Kısa Boyun
</string>
<string name="Short Pigtails">
- Kısa Atkuyrukları
+ Yandan Kısa Kuyruk
</string>
<string name="Short Ponytail">
Kısa Atkuyruğu
@@ -3560,7 +3560,7 @@ Bu iletiyi almaya devam ederseniz, lütfen [SUPPORT_SITE] bölümüne başvurun.
Kısa Gövde
</string>
<string name="Short hips">
- Dar kalçalar
+ Düşük kalça
</string>
<string name="Shoulders">
Omuzlar
@@ -3638,7 +3638,7 @@ Bu iletiyi almaya devam ederseniz, lütfen [SUPPORT_SITE] bölümüne başvurun.
Dikleştirilmiş Saç
</string>
<string name="Square">
- Kare
+ Geniş
</string>
<string name="Square Toe">
Küt Burunlu
@@ -3680,7 +3680,7 @@ Bu iletiyi almaya devam ederseniz, lütfen [SUPPORT_SITE] bölümüne başvurun.
Kalın Boyun
</string>
<string name="Thick Toe">
- Kalın kabu Burnu
+ Kalın Ayak Ucu
</string>
<string name="Thin">
İnce
@@ -3695,7 +3695,7 @@ Bu iletiyi almaya devam ederseniz, lütfen [SUPPORT_SITE] bölümüne başvurun.
İnce Burun
</string>
<string name="Tight Chin">
- Dar Çene
+ Çift Çene
</string>
<string name="Tight Cuffs">
Dar Paçalar
@@ -3710,7 +3710,7 @@ Bu iletiyi almaya devam ederseniz, lütfen [SUPPORT_SITE] bölümüne başvurun.
Dar Etek
</string>
<string name="Tight Sleeves">
- Dar Kollar
+ Dar Kollu
</string>
<string name="Toe Shape">
Ayakkabu Burnu Şekli
@@ -3728,13 +3728,13 @@ Bu iletiyi almaya devam ederseniz, lütfen [SUPPORT_SITE] bölümüne başvurun.
Sıska Gövde
</string>
<string name="Unattached">
- Bağımsız
+ Ayrık
</string>
<string name="Uncreased">
Buruşuk olmayan
</string>
<string name="Underbite">
- Alt Dişler Önde
+ Geriye Doğru
</string>
<string name="Unnatural">
Doğal Olmayan
@@ -3770,7 +3770,7 @@ Bu iletiyi almaya devam ederseniz, lütfen [SUPPORT_SITE] bölümüne başvurun.
Geniş
</string>
<string name="Wide Back">
- Geniş Sırt
+ Geniş Arka
</string>
<string name="Wide Front">
Geniş Ön
diff --git a/indra/newview/skins/default/xui/tr/teleport_strings.xml b/indra/newview/skins/default/xui/tr/teleport_strings.xml
index c0c4be1393..c506bb8a58 100644
--- a/indra/newview/skins/default/xui/tr/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/tr/teleport_strings.xml
@@ -20,6 +20,10 @@ Hala ışınlanamıyorsanız, sorunu çözmek için lütfen çıkış yapıp otu
Üzgünüz fakat sistem ışınlama bağlantısını tamamlayamadı.
Bir dakika sonra tekrar deneyin.
</message>
+ <message name="NoHelpIslandTP">
+You cannot teleport back to Welcome Island.
+Go to &apos;Welcome Island Public&apos; to repeat the tutorial.
+ </message>
<message name="noaccess_tport">
Üzgünüz, bu ışınlanma hedef konumuna erişim hakkına sahip değilsiniz.
</message>
diff --git a/indra/newview/skins/default/xui/zh/floater_nearby_chat.xml b/indra/newview/skins/default/xui/zh/floater_nearby_chat.xml
index f0c34acb06..38a5dab523 100644
--- a/indra/newview/skins/default/xui/zh/floater_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/zh/floater_nearby_chat.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="nearby_chat" title="附近的聊天">
- <check_box label="Translate chat (powered by Google)" name="translate_chat_checkbox"/>
+ <check_box label="Translate chat" name="translate_chat_checkbox"/>
</floater>
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml b/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml
index fc326c2ce2..738c77fd08 100644
--- a/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml
@@ -30,7 +30,7 @@
<spinner label="Nearby chat toasts life time:" name="nearby_toasts_lifetime"/>
<spinner label="Nearby chat toasts fading time:" name="nearby_toasts_fadingtime"/>
<text name="translate_chb_label">
- 聊天時使用機器自動進行翻譯(由 Google 所提供)
+ 聊天時使用機器自動進行翻譯
</text>
<text name="translate_language_text">
聊天翻譯為:
diff --git a/indra/newview/skins/default/xui/zh/teleport_strings.xml b/indra/newview/skins/default/xui/zh/teleport_strings.xml
index ffb4c903bb..bfdb107810 100644
--- a/indra/newview/skins/default/xui/zh/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/zh/teleport_strings.xml
@@ -20,6 +20,10 @@
抱歉,不過系統無法完成瞬間傳送的聯接。
請稍後再試。
</message>
+ <message name="NoHelpIslandTP">
+ 您不能瞬间转移回“援助岛”。
+去“公共援助岛”重复您的教程。
+ </message>
<message name="noaccess_tport">
抱歉,你並沒有權限進入要瞬間傳送的目的地。
</message>