summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/skins')
-rw-r--r--indra/newview/skins/default/textures/icons/Inv_StockFolderClosed.pngbin0 -> 1143 bytes
-rw-r--r--indra/newview/skins/default/textures/icons/Inv_StockFolderOpen.pngbin0 -> 1319 bytes
-rw-r--r--indra/newview/skins/default/textures/icons/Inv_VersionFolderClosed.pngbin0 -> 1132 bytes
-rw-r--r--indra/newview/skins/default/textures/icons/Inv_VersionFolderOpen.pngbin0 -> 1521 bytes
-rwxr-xr-xindra/newview/skins/default/textures/textures.xml7
-rw-r--r--indra/newview/skins/default/textures/toolbar_icons/mktlistings.pngbin0 -> 579 bytes
-rw-r--r--indra/newview/skins/default/textures/widgets/Marketplace_Dropzone_Background.pngbin0 -> 459 bytes
-rwxr-xr-xindra/newview/skins/default/xui/de/floater_about.xml69
-rwxr-xr-xindra/newview/skins/default/xui/de/floater_about_land.xml26
-rw-r--r--indra/newview/skins/default/xui/de/floater_associate_listing.xml7
-rw-r--r--indra/newview/skins/default/xui/de/floater_edit_hover_height.xml4
-rw-r--r--indra/newview/skins/default/xui/de/floater_experience_search.xml2
-rw-r--r--indra/newview/skins/default/xui/de/floater_experienceprofile.xml85
-rw-r--r--indra/newview/skins/default/xui/de/floater_experiences.xml2
-rw-r--r--indra/newview/skins/default/xui/de/floater_facebook.xml29
-rwxr-xr-xindra/newview/skins/default/xui/de/floater_inventory_item_properties.xml69
-rwxr-xr-xindra/newview/skins/default/xui/de/floater_inventory_view_finder.xml6
-rw-r--r--indra/newview/skins/default/xui/de/floater_item_properties.xml2
-rw-r--r--indra/newview/skins/default/xui/de/floater_lagmeter.xml24
-rwxr-xr-xindra/newview/skins/default/xui/de/floater_live_lsleditor.xml17
-rw-r--r--indra/newview/skins/default/xui/de/floater_marketplace_listings.xml10
-rw-r--r--indra/newview/skins/default/xui/de/floater_marketplace_validation.xml5
-rwxr-xr-xindra/newview/skins/default/xui/de/floater_openobject.xml9
-rwxr-xr-xindra/newview/skins/default/xui/de/floater_pay.xml37
-rwxr-xr-xindra/newview/skins/default/xui/de/floater_pay_object.xml42
-rwxr-xr-xindra/newview/skins/default/xui/de/floater_report_abuse.xml2
-rwxr-xr-xindra/newview/skins/default/xui/de/floater_snapshot.xml14
-rwxr-xr-xindra/newview/skins/default/xui/de/floater_top_objects.xml8
-rw-r--r--indra/newview/skins/default/xui/de/floater_twitter.xml24
-rwxr-xr-xindra/newview/skins/default/xui/de/menu_attachment_self.xml1
-rwxr-xr-xindra/newview/skins/default/xui/de/menu_avatar_self.xml1
-rwxr-xr-xindra/newview/skins/default/xui/de/menu_inventory.xml12
-rwxr-xr-xindra/newview/skins/default/xui/de/menu_inventory_gear_default.xml2
-rw-r--r--indra/newview/skins/default/xui/de/menu_marketplace_view.xml5
-rw-r--r--indra/newview/skins/default/xui/de/menu_url_experience.xml4
-rwxr-xr-xindra/newview/skins/default/xui/de/menu_viewer.xml7
-rwxr-xr-xindra/newview/skins/default/xui/de/mime_types.xml13
-rwxr-xr-xindra/newview/skins/default/xui/de/mime_types_linux.xml8
-rwxr-xr-xindra/newview/skins/default/xui/de/mime_types_mac.xml8
-rwxr-xr-xindra/newview/skins/default/xui/de/notifications.xml207
-rw-r--r--indra/newview/skins/default/xui/de/panel_experience_info.xml46
-rw-r--r--indra/newview/skins/default/xui/de/panel_experience_list_editor.xml27
-rw-r--r--indra/newview/skins/default/xui/de/panel_experience_list_item.xml6
-rw-r--r--indra/newview/skins/default/xui/de/panel_experience_log.xml24
-rw-r--r--indra/newview/skins/default/xui/de/panel_experience_search.xml41
-rw-r--r--indra/newview/skins/default/xui/de/panel_experiences.xml6
-rw-r--r--indra/newview/skins/default/xui/de/panel_facebook_friends.xml2
-rw-r--r--indra/newview/skins/default/xui/de/panel_facebook_photo.xml40
-rw-r--r--indra/newview/skins/default/xui/de/panel_facebook_place.xml20
-rw-r--r--indra/newview/skins/default/xui/de/panel_facebook_status.xml28
-rw-r--r--indra/newview/skins/default/xui/de/panel_flickr_photo.xml68
-rwxr-xr-xindra/newview/skins/default/xui/de/panel_group_info_sidetray.xml1
-rwxr-xr-xindra/newview/skins/default/xui/de/panel_login.xml19
-rw-r--r--indra/newview/skins/default/xui/de/panel_marketplace_listings.xml11
-rw-r--r--indra/newview/skins/default/xui/de/panel_marketplace_listings_inventory.xml2
-rw-r--r--indra/newview/skins/default/xui/de/panel_marketplace_listings_listed.xml2
-rw-r--r--indra/newview/skins/default/xui/de/panel_marketplace_listings_unassociated.xml2
-rw-r--r--indra/newview/skins/default/xui/de/panel_marketplace_listings_unlisted.xml2
-rwxr-xr-xindra/newview/skins/default/xui/de/panel_postcard_settings.xml2
-rwxr-xr-xindra/newview/skins/default/xui/de/panel_preferences_setup.xml6
-rw-r--r--indra/newview/skins/default/xui/de/panel_region_experiences.xml33
-rw-r--r--indra/newview/skins/default/xui/de/panel_script_experience.xml13
-rwxr-xr-xindra/newview/skins/default/xui/de/panel_snapshot_inventory.xml8
-rwxr-xr-xindra/newview/skins/default/xui/de/panel_snapshot_local.xml10
-rwxr-xr-xindra/newview/skins/default/xui/de/panel_snapshot_options.xml18
-rwxr-xr-xindra/newview/skins/default/xui/de/panel_snapshot_postcard.xml8
-rwxr-xr-xindra/newview/skins/default/xui/de/panel_snapshot_profile.xml10
-rwxr-xr-xindra/newview/skins/default/xui/de/panel_status_bar.xml26
-rw-r--r--indra/newview/skins/default/xui/de/panel_twitter_photo.xml50
-rwxr-xr-xindra/newview/skins/default/xui/de/role_actions.xml4
-rwxr-xr-xindra/newview/skins/default/xui/de/sidepanel_item_info.xml11
-rwxr-xr-xindra/newview/skins/default/xui/de/sidepanel_task_info.xml124
-rwxr-xr-xindra/newview/skins/default/xui/de/strings.xml253
-rwxr-xr-xindra/newview/skins/default/xui/de/teleport_strings.xml3
-rwxr-xr-xindra/newview/skins/default/xui/en/floater_about_land.xml12
-rwxr-xr-xindra/newview/skins/default/xui/en/floater_associate_listing.xml53
-rw-r--r--indra/newview/skins/default/xui/en/floater_experience_search.xml14
-rw-r--r--indra/newview/skins/default/xui/en/floater_experienceprofile.xml688
-rw-r--r--indra/newview/skins/default/xui/en/floater_experiences.xml28
-rwxr-xr-xindra/newview/skins/default/xui/en/floater_item_properties.xml23
-rwxr-xr-xindra/newview/skins/default/xui/en/floater_live_lsleditor.xml175
-rwxr-xr-xindra/newview/skins/default/xui/en/floater_marketplace_listings.xml113
-rwxr-xr-xindra/newview/skins/default/xui/en/floater_marketplace_validation.xml46
-rwxr-xr-xindra/newview/skins/default/xui/en/menu_inventory.xml93
-rwxr-xr-xindra/newview/skins/default/xui/en/menu_marketplace_view.xml48
-rw-r--r--indra/newview/skins/default/xui/en/menu_url_experience.xml12
-rwxr-xr-xindra/newview/skins/default/xui/en/menu_viewer.xml14
-rwxr-xr-xindra/newview/skins/default/xui/en/notifications.xml481
-rw-r--r--indra/newview/skins/default/xui/en/panel_experience_info.xml377
-rw-r--r--indra/newview/skins/default/xui/en/panel_experience_list_editor.xml83
-rw-r--r--indra/newview/skins/default/xui/en/panel_experience_list_item.xml21
-rw-r--r--indra/newview/skins/default/xui/en/panel_experience_log.xml152
-rw-r--r--indra/newview/skins/default/xui/en/panel_experience_search.xml182
-rw-r--r--indra/newview/skins/default/xui/en/panel_experiences.xml65
-rwxr-xr-xindra/newview/skins/default/xui/en/panel_group_info_sidetray.xml16
-rwxr-xr-xindra/newview/skins/default/xui/en/panel_marketplace_listings.xml117
-rwxr-xr-xindra/newview/skins/default/xui/en/panel_marketplace_listings_inventory.xml25
-rwxr-xr-xindra/newview/skins/default/xui/en/panel_marketplace_listings_listed.xml24
-rwxr-xr-xindra/newview/skins/default/xui/en/panel_marketplace_listings_unassociated.xml23
-rwxr-xr-xindra/newview/skins/default/xui/en/panel_marketplace_listings_unlisted.xml24
-rwxr-xr-xindra/newview/skins/default/xui/en/panel_outbox_inventory.xml3
-rw-r--r--indra/newview/skins/default/xui/en/panel_region_experiences.xml136
-rwxr-xr-xindra/newview/skins/default/xui/en/panel_script_ed.xml376
-rw-r--r--indra/newview/skins/default/xui/en/panel_script_experience.xml97
-rwxr-xr-xindra/newview/skins/default/xui/en/role_actions.xml12
-rwxr-xr-xindra/newview/skins/default/xui/en/sidepanel_item_info.xml898
-rwxr-xr-xindra/newview/skins/default/xui/en/strings.xml105
-rwxr-xr-xindra/newview/skins/default/xui/en/widgets/inbox_inventory_panel.xml3
-rwxr-xr-xindra/newview/skins/default/xui/en/widgets/inventory_panel.xml1
-rwxr-xr-xindra/newview/skins/default/xui/es/floater_about.xml75
-rwxr-xr-xindra/newview/skins/default/xui/es/floater_about_land.xml26
-rw-r--r--indra/newview/skins/default/xui/es/floater_associate_listing.xml7
-rw-r--r--indra/newview/skins/default/xui/es/floater_edit_hover_height.xml4
-rw-r--r--indra/newview/skins/default/xui/es/floater_experience_search.xml2
-rw-r--r--indra/newview/skins/default/xui/es/floater_experienceprofile.xml85
-rw-r--r--indra/newview/skins/default/xui/es/floater_experiences.xml2
-rw-r--r--indra/newview/skins/default/xui/es/floater_facebook.xml29
-rwxr-xr-xindra/newview/skins/default/xui/es/floater_inventory_item_properties.xml69
-rwxr-xr-xindra/newview/skins/default/xui/es/floater_inventory_view_finder.xml6
-rw-r--r--indra/newview/skins/default/xui/es/floater_item_properties.xml2
-rw-r--r--indra/newview/skins/default/xui/es/floater_lagmeter.xml50
-rwxr-xr-xindra/newview/skins/default/xui/es/floater_live_lsleditor.xml17
-rw-r--r--indra/newview/skins/default/xui/es/floater_marketplace_listings.xml10
-rw-r--r--indra/newview/skins/default/xui/es/floater_marketplace_validation.xml5
-rwxr-xr-xindra/newview/skins/default/xui/es/floater_openobject.xml9
-rwxr-xr-xindra/newview/skins/default/xui/es/floater_pay.xml38
-rwxr-xr-xindra/newview/skins/default/xui/es/floater_pay_object.xml42
-rwxr-xr-xindra/newview/skins/default/xui/es/floater_report_abuse.xml2
-rwxr-xr-xindra/newview/skins/default/xui/es/floater_snapshot.xml17
-rwxr-xr-xindra/newview/skins/default/xui/es/floater_top_objects.xml8
-rw-r--r--indra/newview/skins/default/xui/es/floater_twitter.xml24
-rwxr-xr-xindra/newview/skins/default/xui/es/menu_attachment_self.xml1
-rwxr-xr-xindra/newview/skins/default/xui/es/menu_avatar_self.xml1
-rwxr-xr-xindra/newview/skins/default/xui/es/menu_inventory.xml12
-rwxr-xr-xindra/newview/skins/default/xui/es/menu_inventory_gear_default.xml2
-rw-r--r--indra/newview/skins/default/xui/es/menu_marketplace_view.xml5
-rw-r--r--indra/newview/skins/default/xui/es/menu_url_experience.xml4
-rwxr-xr-xindra/newview/skins/default/xui/es/menu_viewer.xml7
-rwxr-xr-xindra/newview/skins/default/xui/es/mime_types.xml2
-rwxr-xr-xindra/newview/skins/default/xui/es/mime_types_linux.xml8
-rwxr-xr-xindra/newview/skins/default/xui/es/mime_types_mac.xml8
-rwxr-xr-xindra/newview/skins/default/xui/es/notifications.xml207
-rw-r--r--indra/newview/skins/default/xui/es/panel_experience_info.xml46
-rw-r--r--indra/newview/skins/default/xui/es/panel_experience_list_editor.xml27
-rw-r--r--indra/newview/skins/default/xui/es/panel_experience_list_item.xml6
-rw-r--r--indra/newview/skins/default/xui/es/panel_experience_log.xml24
-rw-r--r--indra/newview/skins/default/xui/es/panel_experience_search.xml41
-rw-r--r--indra/newview/skins/default/xui/es/panel_experiences.xml6
-rw-r--r--indra/newview/skins/default/xui/es/panel_facebook_friends.xml2
-rw-r--r--indra/newview/skins/default/xui/es/panel_facebook_photo.xml40
-rw-r--r--indra/newview/skins/default/xui/es/panel_facebook_place.xml20
-rw-r--r--indra/newview/skins/default/xui/es/panel_facebook_status.xml28
-rw-r--r--indra/newview/skins/default/xui/es/panel_flickr_photo.xml68
-rwxr-xr-xindra/newview/skins/default/xui/es/panel_group_info_sidetray.xml1
-rwxr-xr-xindra/newview/skins/default/xui/es/panel_login.xml19
-rw-r--r--indra/newview/skins/default/xui/es/panel_marketplace_listings.xml11
-rw-r--r--indra/newview/skins/default/xui/es/panel_marketplace_listings_inventory.xml2
-rw-r--r--indra/newview/skins/default/xui/es/panel_marketplace_listings_listed.xml2
-rw-r--r--indra/newview/skins/default/xui/es/panel_marketplace_listings_unassociated.xml2
-rw-r--r--indra/newview/skins/default/xui/es/panel_marketplace_listings_unlisted.xml2
-rwxr-xr-xindra/newview/skins/default/xui/es/panel_postcard_settings.xml16
-rwxr-xr-xindra/newview/skins/default/xui/es/panel_preferences_setup.xml6
-rw-r--r--indra/newview/skins/default/xui/es/panel_region_experiences.xml33
-rw-r--r--indra/newview/skins/default/xui/es/panel_script_experience.xml13
-rwxr-xr-xindra/newview/skins/default/xui/es/panel_snapshot_inventory.xml6
-rwxr-xr-xindra/newview/skins/default/xui/es/panel_snapshot_local.xml31
-rwxr-xr-xindra/newview/skins/default/xui/es/panel_snapshot_options.xml20
-rwxr-xr-xindra/newview/skins/default/xui/es/panel_snapshot_postcard.xml10
-rwxr-xr-xindra/newview/skins/default/xui/es/panel_snapshot_profile.xml21
-rwxr-xr-xindra/newview/skins/default/xui/es/panel_status_bar.xml26
-rw-r--r--indra/newview/skins/default/xui/es/panel_twitter_photo.xml50
-rwxr-xr-xindra/newview/skins/default/xui/es/role_actions.xml4
-rwxr-xr-xindra/newview/skins/default/xui/es/sidepanel_item_info.xml9
-rwxr-xr-xindra/newview/skins/default/xui/es/sidepanel_task_info.xml124
-rwxr-xr-xindra/newview/skins/default/xui/es/strings.xml253
-rwxr-xr-xindra/newview/skins/default/xui/es/teleport_strings.xml3
-rwxr-xr-xindra/newview/skins/default/xui/fr/floater_about.xml69
-rwxr-xr-xindra/newview/skins/default/xui/fr/floater_about_land.xml26
-rw-r--r--indra/newview/skins/default/xui/fr/floater_associate_listing.xml7
-rw-r--r--indra/newview/skins/default/xui/fr/floater_edit_hover_height.xml4
-rw-r--r--indra/newview/skins/default/xui/fr/floater_experience_search.xml2
-rw-r--r--indra/newview/skins/default/xui/fr/floater_experienceprofile.xml85
-rw-r--r--indra/newview/skins/default/xui/fr/floater_experiences.xml2
-rw-r--r--indra/newview/skins/default/xui/fr/floater_facebook.xml29
-rwxr-xr-xindra/newview/skins/default/xui/fr/floater_inventory_item_properties.xml67
-rwxr-xr-xindra/newview/skins/default/xui/fr/floater_inventory_view_finder.xml6
-rw-r--r--indra/newview/skins/default/xui/fr/floater_item_properties.xml2
-rw-r--r--indra/newview/skins/default/xui/fr/floater_lagmeter.xml38
-rwxr-xr-xindra/newview/skins/default/xui/fr/floater_live_lsleditor.xml17
-rw-r--r--indra/newview/skins/default/xui/fr/floater_marketplace_listings.xml10
-rw-r--r--indra/newview/skins/default/xui/fr/floater_marketplace_validation.xml5
-rwxr-xr-xindra/newview/skins/default/xui/fr/floater_openobject.xml9
-rwxr-xr-xindra/newview/skins/default/xui/fr/floater_pay.xml38
-rwxr-xr-xindra/newview/skins/default/xui/fr/floater_pay_object.xml43
-rwxr-xr-xindra/newview/skins/default/xui/fr/floater_report_abuse.xml2
-rwxr-xr-xindra/newview/skins/default/xui/fr/floater_snapshot.xml17
-rwxr-xr-xindra/newview/skins/default/xui/fr/floater_top_objects.xml8
-rw-r--r--indra/newview/skins/default/xui/fr/floater_twitter.xml24
-rwxr-xr-xindra/newview/skins/default/xui/fr/menu_attachment_self.xml1
-rwxr-xr-xindra/newview/skins/default/xui/fr/menu_avatar_self.xml1
-rwxr-xr-xindra/newview/skins/default/xui/fr/menu_inventory.xml12
-rwxr-xr-xindra/newview/skins/default/xui/fr/menu_inventory_gear_default.xml2
-rw-r--r--indra/newview/skins/default/xui/fr/menu_marketplace_view.xml5
-rw-r--r--indra/newview/skins/default/xui/fr/menu_url_experience.xml4
-rwxr-xr-xindra/newview/skins/default/xui/fr/menu_viewer.xml7
-rwxr-xr-xindra/newview/skins/default/xui/fr/mime_types_linux.xml8
-rwxr-xr-xindra/newview/skins/default/xui/fr/mime_types_mac.xml8
-rwxr-xr-xindra/newview/skins/default/xui/fr/notifications.xml207
-rw-r--r--indra/newview/skins/default/xui/fr/panel_experience_info.xml46
-rw-r--r--indra/newview/skins/default/xui/fr/panel_experience_list_editor.xml27
-rw-r--r--indra/newview/skins/default/xui/fr/panel_experience_list_item.xml6
-rw-r--r--indra/newview/skins/default/xui/fr/panel_experience_log.xml24
-rw-r--r--indra/newview/skins/default/xui/fr/panel_experience_search.xml41
-rw-r--r--indra/newview/skins/default/xui/fr/panel_experiences.xml6
-rw-r--r--indra/newview/skins/default/xui/fr/panel_facebook_friends.xml2
-rw-r--r--indra/newview/skins/default/xui/fr/panel_facebook_photo.xml40
-rw-r--r--indra/newview/skins/default/xui/fr/panel_facebook_place.xml20
-rw-r--r--indra/newview/skins/default/xui/fr/panel_facebook_status.xml28
-rw-r--r--indra/newview/skins/default/xui/fr/panel_flickr_photo.xml68
-rwxr-xr-xindra/newview/skins/default/xui/fr/panel_group_info_sidetray.xml1
-rwxr-xr-xindra/newview/skins/default/xui/fr/panel_login.xml19
-rw-r--r--indra/newview/skins/default/xui/fr/panel_marketplace_listings.xml11
-rw-r--r--indra/newview/skins/default/xui/fr/panel_marketplace_listings_inventory.xml2
-rw-r--r--indra/newview/skins/default/xui/fr/panel_marketplace_listings_listed.xml2
-rw-r--r--indra/newview/skins/default/xui/fr/panel_marketplace_listings_unassociated.xml2
-rw-r--r--indra/newview/skins/default/xui/fr/panel_marketplace_listings_unlisted.xml2
-rwxr-xr-xindra/newview/skins/default/xui/fr/panel_postcard_settings.xml16
-rwxr-xr-xindra/newview/skins/default/xui/fr/panel_preferences_setup.xml6
-rw-r--r--indra/newview/skins/default/xui/fr/panel_region_experiences.xml33
-rw-r--r--indra/newview/skins/default/xui/fr/panel_script_experience.xml13
-rwxr-xr-xindra/newview/skins/default/xui/fr/panel_snapshot_inventory.xml6
-rwxr-xr-xindra/newview/skins/default/xui/fr/panel_snapshot_local.xml31
-rwxr-xr-xindra/newview/skins/default/xui/fr/panel_snapshot_options.xml18
-rwxr-xr-xindra/newview/skins/default/xui/fr/panel_snapshot_postcard.xml8
-rwxr-xr-xindra/newview/skins/default/xui/fr/panel_snapshot_profile.xml21
-rwxr-xr-xindra/newview/skins/default/xui/fr/panel_status_bar.xml26
-rw-r--r--indra/newview/skins/default/xui/fr/panel_twitter_photo.xml50
-rwxr-xr-xindra/newview/skins/default/xui/fr/role_actions.xml4
-rwxr-xr-xindra/newview/skins/default/xui/fr/sidepanel_item_info.xml9
-rwxr-xr-xindra/newview/skins/default/xui/fr/sidepanel_task_info.xml124
-rwxr-xr-xindra/newview/skins/default/xui/fr/strings.xml253
-rwxr-xr-xindra/newview/skins/default/xui/fr/teleport_strings.xml3
-rwxr-xr-xindra/newview/skins/default/xui/it/floater_about.xml75
-rwxr-xr-xindra/newview/skins/default/xui/it/floater_about_land.xml26
-rw-r--r--indra/newview/skins/default/xui/it/floater_associate_listing.xml7
-rw-r--r--indra/newview/skins/default/xui/it/floater_edit_hover_height.xml4
-rw-r--r--indra/newview/skins/default/xui/it/floater_experience_search.xml2
-rw-r--r--indra/newview/skins/default/xui/it/floater_experienceprofile.xml85
-rw-r--r--indra/newview/skins/default/xui/it/floater_experiences.xml2
-rw-r--r--indra/newview/skins/default/xui/it/floater_facebook.xml29
-rwxr-xr-xindra/newview/skins/default/xui/it/floater_inventory_item_properties.xml67
-rwxr-xr-xindra/newview/skins/default/xui/it/floater_inventory_view_finder.xml6
-rw-r--r--indra/newview/skins/default/xui/it/floater_item_properties.xml2
-rw-r--r--indra/newview/skins/default/xui/it/floater_lagmeter.xml52
-rwxr-xr-xindra/newview/skins/default/xui/it/floater_live_lsleditor.xml17
-rw-r--r--indra/newview/skins/default/xui/it/floater_marketplace_listings.xml10
-rw-r--r--indra/newview/skins/default/xui/it/floater_marketplace_validation.xml5
-rwxr-xr-xindra/newview/skins/default/xui/it/floater_openobject.xml9
-rwxr-xr-xindra/newview/skins/default/xui/it/floater_pay.xml38
-rwxr-xr-xindra/newview/skins/default/xui/it/floater_pay_object.xml43
-rwxr-xr-xindra/newview/skins/default/xui/it/floater_report_abuse.xml2
-rwxr-xr-xindra/newview/skins/default/xui/it/floater_snapshot.xml17
-rwxr-xr-xindra/newview/skins/default/xui/it/floater_stats.xml2
-rwxr-xr-xindra/newview/skins/default/xui/it/floater_top_objects.xml8
-rw-r--r--indra/newview/skins/default/xui/it/floater_twitter.xml24
-rwxr-xr-xindra/newview/skins/default/xui/it/menu_attachment_self.xml1
-rwxr-xr-xindra/newview/skins/default/xui/it/menu_avatar_self.xml1
-rwxr-xr-xindra/newview/skins/default/xui/it/menu_inventory.xml12
-rwxr-xr-xindra/newview/skins/default/xui/it/menu_inventory_gear_default.xml2
-rw-r--r--indra/newview/skins/default/xui/it/menu_marketplace_view.xml5
-rw-r--r--indra/newview/skins/default/xui/it/menu_url_experience.xml4
-rwxr-xr-xindra/newview/skins/default/xui/it/menu_viewer.xml7
-rwxr-xr-xindra/newview/skins/default/xui/it/mime_types.xml4
-rwxr-xr-xindra/newview/skins/default/xui/it/mime_types_linux.xml8
-rwxr-xr-xindra/newview/skins/default/xui/it/mime_types_mac.xml8
-rwxr-xr-xindra/newview/skins/default/xui/it/notifications.xml207
-rw-r--r--indra/newview/skins/default/xui/it/panel_experience_info.xml46
-rw-r--r--indra/newview/skins/default/xui/it/panel_experience_list_editor.xml27
-rw-r--r--indra/newview/skins/default/xui/it/panel_experience_list_item.xml6
-rw-r--r--indra/newview/skins/default/xui/it/panel_experience_log.xml24
-rw-r--r--indra/newview/skins/default/xui/it/panel_experience_search.xml41
-rw-r--r--indra/newview/skins/default/xui/it/panel_experiences.xml6
-rw-r--r--indra/newview/skins/default/xui/it/panel_facebook_friends.xml2
-rw-r--r--indra/newview/skins/default/xui/it/panel_facebook_photo.xml40
-rw-r--r--indra/newview/skins/default/xui/it/panel_facebook_place.xml20
-rw-r--r--indra/newview/skins/default/xui/it/panel_facebook_status.xml28
-rw-r--r--indra/newview/skins/default/xui/it/panel_flickr_photo.xml68
-rwxr-xr-xindra/newview/skins/default/xui/it/panel_group_info_sidetray.xml1
-rwxr-xr-xindra/newview/skins/default/xui/it/panel_login.xml19
-rw-r--r--indra/newview/skins/default/xui/it/panel_marketplace_listings.xml11
-rw-r--r--indra/newview/skins/default/xui/it/panel_marketplace_listings_inventory.xml2
-rw-r--r--indra/newview/skins/default/xui/it/panel_marketplace_listings_listed.xml2
-rw-r--r--indra/newview/skins/default/xui/it/panel_marketplace_listings_unassociated.xml2
-rw-r--r--indra/newview/skins/default/xui/it/panel_marketplace_listings_unlisted.xml2
-rwxr-xr-xindra/newview/skins/default/xui/it/panel_postcard_settings.xml16
-rwxr-xr-xindra/newview/skins/default/xui/it/panel_preferences_setup.xml6
-rw-r--r--indra/newview/skins/default/xui/it/panel_region_experiences.xml33
-rw-r--r--indra/newview/skins/default/xui/it/panel_script_experience.xml13
-rwxr-xr-xindra/newview/skins/default/xui/it/panel_snapshot_inventory.xml6
-rwxr-xr-xindra/newview/skins/default/xui/it/panel_snapshot_local.xml31
-rwxr-xr-xindra/newview/skins/default/xui/it/panel_snapshot_options.xml18
-rwxr-xr-xindra/newview/skins/default/xui/it/panel_snapshot_postcard.xml8
-rwxr-xr-xindra/newview/skins/default/xui/it/panel_snapshot_profile.xml21
-rwxr-xr-xindra/newview/skins/default/xui/it/panel_status_bar.xml26
-rw-r--r--indra/newview/skins/default/xui/it/panel_twitter_photo.xml50
-rwxr-xr-xindra/newview/skins/default/xui/it/role_actions.xml4
-rwxr-xr-xindra/newview/skins/default/xui/it/sidepanel_item_info.xml9
-rwxr-xr-xindra/newview/skins/default/xui/it/sidepanel_task_info.xml124
-rwxr-xr-xindra/newview/skins/default/xui/it/strings.xml253
-rwxr-xr-xindra/newview/skins/default/xui/it/teleport_strings.xml3
-rwxr-xr-xindra/newview/skins/default/xui/ja/floater_about.xml69
-rwxr-xr-xindra/newview/skins/default/xui/ja/floater_about_land.xml26
-rw-r--r--indra/newview/skins/default/xui/ja/floater_associate_listing.xml7
-rw-r--r--indra/newview/skins/default/xui/ja/floater_edit_hover_height.xml4
-rw-r--r--indra/newview/skins/default/xui/ja/floater_experience_search.xml2
-rw-r--r--indra/newview/skins/default/xui/ja/floater_experienceprofile.xml85
-rw-r--r--indra/newview/skins/default/xui/ja/floater_experiences.xml2
-rw-r--r--indra/newview/skins/default/xui/ja/floater_facebook.xml29
-rwxr-xr-xindra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml67
-rwxr-xr-xindra/newview/skins/default/xui/ja/floater_inventory_view_finder.xml6
-rw-r--r--indra/newview/skins/default/xui/ja/floater_item_properties.xml2
-rw-r--r--indra/newview/skins/default/xui/ja/floater_lagmeter.xml60
-rwxr-xr-xindra/newview/skins/default/xui/ja/floater_live_lsleditor.xml17
-rw-r--r--indra/newview/skins/default/xui/ja/floater_marketplace_listings.xml10
-rw-r--r--indra/newview/skins/default/xui/ja/floater_marketplace_validation.xml5
-rwxr-xr-xindra/newview/skins/default/xui/ja/floater_openobject.xml9
-rwxr-xr-xindra/newview/skins/default/xui/ja/floater_pay.xml37
-rwxr-xr-xindra/newview/skins/default/xui/ja/floater_pay_object.xml42
-rwxr-xr-xindra/newview/skins/default/xui/ja/floater_report_abuse.xml2
-rwxr-xr-xindra/newview/skins/default/xui/ja/floater_snapshot.xml17
-rwxr-xr-xindra/newview/skins/default/xui/ja/floater_top_objects.xml8
-rw-r--r--indra/newview/skins/default/xui/ja/floater_twitter.xml24
-rwxr-xr-xindra/newview/skins/default/xui/ja/menu_attachment_self.xml1
-rwxr-xr-xindra/newview/skins/default/xui/ja/menu_avatar_self.xml1
-rwxr-xr-xindra/newview/skins/default/xui/ja/menu_inventory.xml12
-rwxr-xr-xindra/newview/skins/default/xui/ja/menu_inventory_gear_default.xml2
-rw-r--r--indra/newview/skins/default/xui/ja/menu_marketplace_view.xml5
-rw-r--r--indra/newview/skins/default/xui/ja/menu_url_experience.xml4
-rwxr-xr-xindra/newview/skins/default/xui/ja/menu_viewer.xml7
-rwxr-xr-xindra/newview/skins/default/xui/ja/mime_types.xml4
-rwxr-xr-xindra/newview/skins/default/xui/ja/mime_types_linux.xml8
-rwxr-xr-xindra/newview/skins/default/xui/ja/mime_types_mac.xml8
-rwxr-xr-xindra/newview/skins/default/xui/ja/notifications.xml207
-rw-r--r--indra/newview/skins/default/xui/ja/panel_experience_info.xml46
-rw-r--r--indra/newview/skins/default/xui/ja/panel_experience_list_editor.xml27
-rw-r--r--indra/newview/skins/default/xui/ja/panel_experience_list_item.xml6
-rw-r--r--indra/newview/skins/default/xui/ja/panel_experience_log.xml24
-rw-r--r--indra/newview/skins/default/xui/ja/panel_experience_search.xml41
-rw-r--r--indra/newview/skins/default/xui/ja/panel_experiences.xml6
-rw-r--r--indra/newview/skins/default/xui/ja/panel_facebook_friends.xml2
-rw-r--r--indra/newview/skins/default/xui/ja/panel_facebook_photo.xml40
-rw-r--r--indra/newview/skins/default/xui/ja/panel_facebook_place.xml20
-rw-r--r--indra/newview/skins/default/xui/ja/panel_facebook_status.xml28
-rw-r--r--indra/newview/skins/default/xui/ja/panel_flickr_photo.xml68
-rwxr-xr-xindra/newview/skins/default/xui/ja/panel_group_info_sidetray.xml1
-rwxr-xr-xindra/newview/skins/default/xui/ja/panel_login.xml19
-rw-r--r--indra/newview/skins/default/xui/ja/panel_marketplace_listings.xml11
-rw-r--r--indra/newview/skins/default/xui/ja/panel_marketplace_listings_inventory.xml2
-rw-r--r--indra/newview/skins/default/xui/ja/panel_marketplace_listings_listed.xml2
-rw-r--r--indra/newview/skins/default/xui/ja/panel_marketplace_listings_unassociated.xml2
-rw-r--r--indra/newview/skins/default/xui/ja/panel_marketplace_listings_unlisted.xml2
-rwxr-xr-xindra/newview/skins/default/xui/ja/panel_postcard_settings.xml16
-rwxr-xr-xindra/newview/skins/default/xui/ja/panel_preferences_setup.xml7
-rw-r--r--indra/newview/skins/default/xui/ja/panel_region_experiences.xml33
-rw-r--r--indra/newview/skins/default/xui/ja/panel_script_experience.xml13
-rwxr-xr-xindra/newview/skins/default/xui/ja/panel_snapshot_inventory.xml8
-rwxr-xr-xindra/newview/skins/default/xui/ja/panel_snapshot_local.xml31
-rwxr-xr-xindra/newview/skins/default/xui/ja/panel_snapshot_options.xml20
-rwxr-xr-xindra/newview/skins/default/xui/ja/panel_snapshot_postcard.xml10
-rwxr-xr-xindra/newview/skins/default/xui/ja/panel_snapshot_profile.xml21
-rwxr-xr-xindra/newview/skins/default/xui/ja/panel_status_bar.xml28
-rw-r--r--indra/newview/skins/default/xui/ja/panel_twitter_photo.xml50
-rwxr-xr-xindra/newview/skins/default/xui/ja/role_actions.xml4
-rwxr-xr-xindra/newview/skins/default/xui/ja/sidepanel_item_info.xml9
-rwxr-xr-xindra/newview/skins/default/xui/ja/sidepanel_task_info.xml124
-rwxr-xr-xindra/newview/skins/default/xui/ja/strings.xml253
-rwxr-xr-xindra/newview/skins/default/xui/ja/teleport_strings.xml3
-rwxr-xr-xindra/newview/skins/default/xui/pl/floater_about.xml95
-rw-r--r--indra/newview/skins/default/xui/pl/floater_associate_listing.xml7
-rw-r--r--indra/newview/skins/default/xui/pl/floater_edit_hover_height.xml4
-rwxr-xr-xindra/newview/skins/default/xui/pl/floater_inventory_item_properties.xml71
-rw-r--r--indra/newview/skins/default/xui/pl/floater_item_properties.xml2
-rw-r--r--indra/newview/skins/default/xui/pl/floater_marketplace_listings.xml10
-rw-r--r--indra/newview/skins/default/xui/pl/floater_marketplace_validation.xml5
-rwxr-xr-xindra/newview/skins/default/xui/pl/floater_openobject.xml9
-rwxr-xr-xindra/newview/skins/default/xui/pl/floater_pay.xml38
-rwxr-xr-xindra/newview/skins/default/xui/pl/floater_pay_object.xml43
-rwxr-xr-xindra/newview/skins/default/xui/pl/menu_attachment_self.xml1
-rwxr-xr-xindra/newview/skins/default/xui/pl/menu_avatar_self.xml1
-rwxr-xr-xindra/newview/skins/default/xui/pl/menu_inventory.xml11
-rw-r--r--indra/newview/skins/default/xui/pl/menu_marketplace_view.xml5
-rwxr-xr-xindra/newview/skins/default/xui/pl/menu_viewer.xml62
-rwxr-xr-xindra/newview/skins/default/xui/pl/notifications.xml233
-rwxr-xr-xindra/newview/skins/default/xui/pl/panel_login.xml49
-rw-r--r--indra/newview/skins/default/xui/pl/panel_marketplace_listings.xml11
-rw-r--r--indra/newview/skins/default/xui/pl/panel_marketplace_listings_inventory.xml2
-rw-r--r--indra/newview/skins/default/xui/pl/panel_marketplace_listings_listed.xml2
-rw-r--r--indra/newview/skins/default/xui/pl/panel_marketplace_listings_unassociated.xml2
-rw-r--r--indra/newview/skins/default/xui/pl/panel_marketplace_listings_unlisted.xml2
-rwxr-xr-xindra/newview/skins/default/xui/pl/panel_status_bar.xml34
-rwxr-xr-xindra/newview/skins/default/xui/pl/sidepanel_item_info.xml7
-rwxr-xr-xindra/newview/skins/default/xui/pl/sidepanel_task_info.xml112
-rwxr-xr-xindra/newview/skins/default/xui/pl/strings.xml183
-rwxr-xr-xindra/newview/skins/default/xui/pt/floater_about.xml68
-rwxr-xr-xindra/newview/skins/default/xui/pt/floater_about_land.xml26
-rw-r--r--indra/newview/skins/default/xui/pt/floater_associate_listing.xml7
-rw-r--r--indra/newview/skins/default/xui/pt/floater_edit_hover_height.xml4
-rw-r--r--indra/newview/skins/default/xui/pt/floater_experience_search.xml2
-rw-r--r--indra/newview/skins/default/xui/pt/floater_experienceprofile.xml85
-rw-r--r--indra/newview/skins/default/xui/pt/floater_experiences.xml2
-rw-r--r--indra/newview/skins/default/xui/pt/floater_facebook.xml29
-rwxr-xr-xindra/newview/skins/default/xui/pt/floater_inventory_item_properties.xml67
-rwxr-xr-xindra/newview/skins/default/xui/pt/floater_inventory_view_finder.xml6
-rw-r--r--indra/newview/skins/default/xui/pt/floater_item_properties.xml2
-rw-r--r--indra/newview/skins/default/xui/pt/floater_lagmeter.xml52
-rwxr-xr-xindra/newview/skins/default/xui/pt/floater_live_lsleditor.xml17
-rw-r--r--indra/newview/skins/default/xui/pt/floater_marketplace_listings.xml10
-rw-r--r--indra/newview/skins/default/xui/pt/floater_marketplace_validation.xml5
-rwxr-xr-xindra/newview/skins/default/xui/pt/floater_openobject.xml9
-rwxr-xr-xindra/newview/skins/default/xui/pt/floater_pay.xml37
-rwxr-xr-xindra/newview/skins/default/xui/pt/floater_pay_object.xml43
-rwxr-xr-xindra/newview/skins/default/xui/pt/floater_report_abuse.xml2
-rwxr-xr-xindra/newview/skins/default/xui/pt/floater_snapshot.xml17
-rwxr-xr-xindra/newview/skins/default/xui/pt/floater_top_objects.xml8
-rw-r--r--indra/newview/skins/default/xui/pt/floater_twitter.xml24
-rwxr-xr-xindra/newview/skins/default/xui/pt/menu_attachment_self.xml1
-rwxr-xr-xindra/newview/skins/default/xui/pt/menu_avatar_self.xml1
-rwxr-xr-xindra/newview/skins/default/xui/pt/menu_inventory.xml12
-rwxr-xr-xindra/newview/skins/default/xui/pt/menu_inventory_gear_default.xml2
-rw-r--r--indra/newview/skins/default/xui/pt/menu_marketplace_view.xml5
-rw-r--r--indra/newview/skins/default/xui/pt/menu_url_experience.xml4
-rwxr-xr-xindra/newview/skins/default/xui/pt/menu_viewer.xml9
-rwxr-xr-xindra/newview/skins/default/xui/pt/mime_types.xml6
-rwxr-xr-xindra/newview/skins/default/xui/pt/mime_types_linux.xml8
-rwxr-xr-xindra/newview/skins/default/xui/pt/mime_types_mac.xml8
-rwxr-xr-xindra/newview/skins/default/xui/pt/notifications.xml207
-rw-r--r--indra/newview/skins/default/xui/pt/panel_experience_info.xml46
-rw-r--r--indra/newview/skins/default/xui/pt/panel_experience_list_editor.xml27
-rw-r--r--indra/newview/skins/default/xui/pt/panel_experience_list_item.xml6
-rw-r--r--indra/newview/skins/default/xui/pt/panel_experience_log.xml24
-rw-r--r--indra/newview/skins/default/xui/pt/panel_experience_search.xml41
-rw-r--r--indra/newview/skins/default/xui/pt/panel_experiences.xml6
-rw-r--r--indra/newview/skins/default/xui/pt/panel_facebook_friends.xml2
-rw-r--r--indra/newview/skins/default/xui/pt/panel_facebook_photo.xml40
-rw-r--r--indra/newview/skins/default/xui/pt/panel_facebook_place.xml20
-rw-r--r--indra/newview/skins/default/xui/pt/panel_facebook_status.xml28
-rw-r--r--indra/newview/skins/default/xui/pt/panel_flickr_photo.xml68
-rwxr-xr-xindra/newview/skins/default/xui/pt/panel_group_info_sidetray.xml1
-rwxr-xr-xindra/newview/skins/default/xui/pt/panel_login.xml19
-rw-r--r--indra/newview/skins/default/xui/pt/panel_marketplace_listings.xml11
-rw-r--r--indra/newview/skins/default/xui/pt/panel_marketplace_listings_inventory.xml2
-rw-r--r--indra/newview/skins/default/xui/pt/panel_marketplace_listings_listed.xml2
-rw-r--r--indra/newview/skins/default/xui/pt/panel_marketplace_listings_unassociated.xml2
-rw-r--r--indra/newview/skins/default/xui/pt/panel_marketplace_listings_unlisted.xml2
-rwxr-xr-xindra/newview/skins/default/xui/pt/panel_postcard_settings.xml16
-rwxr-xr-xindra/newview/skins/default/xui/pt/panel_preferences_setup.xml6
-rw-r--r--indra/newview/skins/default/xui/pt/panel_region_experiences.xml33
-rw-r--r--indra/newview/skins/default/xui/pt/panel_script_experience.xml13
-rwxr-xr-xindra/newview/skins/default/xui/pt/panel_snapshot_inventory.xml6
-rwxr-xr-xindra/newview/skins/default/xui/pt/panel_snapshot_local.xml31
-rwxr-xr-xindra/newview/skins/default/xui/pt/panel_snapshot_options.xml20
-rwxr-xr-xindra/newview/skins/default/xui/pt/panel_snapshot_postcard.xml10
-rwxr-xr-xindra/newview/skins/default/xui/pt/panel_snapshot_profile.xml21
-rwxr-xr-xindra/newview/skins/default/xui/pt/panel_status_bar.xml26
-rw-r--r--indra/newview/skins/default/xui/pt/panel_twitter_photo.xml50
-rwxr-xr-xindra/newview/skins/default/xui/pt/role_actions.xml4
-rwxr-xr-xindra/newview/skins/default/xui/pt/sidepanel_item_info.xml11
-rwxr-xr-xindra/newview/skins/default/xui/pt/sidepanel_task_info.xml124
-rwxr-xr-xindra/newview/skins/default/xui/pt/strings.xml253
-rwxr-xr-xindra/newview/skins/default/xui/pt/teleport_strings.xml3
-rwxr-xr-xindra/newview/skins/default/xui/ru/floater_about.xml65
-rwxr-xr-xindra/newview/skins/default/xui/ru/floater_about_land.xml17
-rw-r--r--indra/newview/skins/default/xui/ru/floater_associate_listing.xml7
-rw-r--r--indra/newview/skins/default/xui/ru/floater_edit_hover_height.xml4
-rw-r--r--indra/newview/skins/default/xui/ru/floater_experience_search.xml2
-rw-r--r--indra/newview/skins/default/xui/ru/floater_experienceprofile.xml85
-rw-r--r--indra/newview/skins/default/xui/ru/floater_experiences.xml2
-rw-r--r--indra/newview/skins/default/xui/ru/floater_facebook.xml29
-rwxr-xr-xindra/newview/skins/default/xui/ru/floater_inventory_item_properties.xml67
-rwxr-xr-xindra/newview/skins/default/xui/ru/floater_inventory_view_finder.xml6
-rw-r--r--indra/newview/skins/default/xui/ru/floater_item_properties.xml2
-rw-r--r--indra/newview/skins/default/xui/ru/floater_lagmeter.xml12
-rwxr-xr-xindra/newview/skins/default/xui/ru/floater_live_lsleditor.xml17
-rw-r--r--indra/newview/skins/default/xui/ru/floater_marketplace_listings.xml10
-rw-r--r--indra/newview/skins/default/xui/ru/floater_marketplace_validation.xml5
-rwxr-xr-xindra/newview/skins/default/xui/ru/floater_openobject.xml9
-rwxr-xr-xindra/newview/skins/default/xui/ru/floater_pay.xml33
-rwxr-xr-xindra/newview/skins/default/xui/ru/floater_pay_object.xml41
-rwxr-xr-xindra/newview/skins/default/xui/ru/floater_report_abuse.xml2
-rwxr-xr-xindra/newview/skins/default/xui/ru/floater_snapshot.xml17
-rwxr-xr-xindra/newview/skins/default/xui/ru/floater_top_objects.xml8
-rw-r--r--indra/newview/skins/default/xui/ru/floater_twitter.xml24
-rwxr-xr-xindra/newview/skins/default/xui/ru/menu_attachment_self.xml1
-rwxr-xr-xindra/newview/skins/default/xui/ru/menu_avatar_self.xml1
-rwxr-xr-xindra/newview/skins/default/xui/ru/menu_inventory.xml12
-rwxr-xr-xindra/newview/skins/default/xui/ru/menu_inventory_gear_default.xml2
-rw-r--r--indra/newview/skins/default/xui/ru/menu_marketplace_view.xml5
-rw-r--r--indra/newview/skins/default/xui/ru/menu_url_experience.xml4
-rwxr-xr-xindra/newview/skins/default/xui/ru/menu_viewer.xml7
-rwxr-xr-xindra/newview/skins/default/xui/ru/mime_types.xml8
-rwxr-xr-xindra/newview/skins/default/xui/ru/mime_types_linux.xml8
-rwxr-xr-xindra/newview/skins/default/xui/ru/mime_types_mac.xml8
-rwxr-xr-xindra/newview/skins/default/xui/ru/notifications.xml207
-rw-r--r--indra/newview/skins/default/xui/ru/panel_experience_info.xml46
-rw-r--r--indra/newview/skins/default/xui/ru/panel_experience_list_editor.xml27
-rw-r--r--indra/newview/skins/default/xui/ru/panel_experience_list_item.xml6
-rw-r--r--indra/newview/skins/default/xui/ru/panel_experience_log.xml24
-rw-r--r--indra/newview/skins/default/xui/ru/panel_experience_search.xml41
-rw-r--r--indra/newview/skins/default/xui/ru/panel_experiences.xml6
-rw-r--r--indra/newview/skins/default/xui/ru/panel_facebook_friends.xml2
-rw-r--r--indra/newview/skins/default/xui/ru/panel_facebook_photo.xml40
-rw-r--r--indra/newview/skins/default/xui/ru/panel_facebook_place.xml20
-rw-r--r--indra/newview/skins/default/xui/ru/panel_facebook_status.xml28
-rw-r--r--indra/newview/skins/default/xui/ru/panel_flickr_photo.xml68
-rwxr-xr-xindra/newview/skins/default/xui/ru/panel_group_info_sidetray.xml1
-rwxr-xr-xindra/newview/skins/default/xui/ru/panel_login.xml19
-rw-r--r--indra/newview/skins/default/xui/ru/panel_marketplace_listings.xml11
-rw-r--r--indra/newview/skins/default/xui/ru/panel_marketplace_listings_inventory.xml2
-rw-r--r--indra/newview/skins/default/xui/ru/panel_marketplace_listings_listed.xml2
-rw-r--r--indra/newview/skins/default/xui/ru/panel_marketplace_listings_unassociated.xml2
-rw-r--r--indra/newview/skins/default/xui/ru/panel_marketplace_listings_unlisted.xml2
-rwxr-xr-xindra/newview/skins/default/xui/ru/panel_postcard_settings.xml16
-rwxr-xr-xindra/newview/skins/default/xui/ru/panel_preferences_setup.xml6
-rw-r--r--indra/newview/skins/default/xui/ru/panel_region_experiences.xml33
-rw-r--r--indra/newview/skins/default/xui/ru/panel_script_experience.xml13
-rwxr-xr-xindra/newview/skins/default/xui/ru/panel_snapshot_inventory.xml6
-rwxr-xr-xindra/newview/skins/default/xui/ru/panel_snapshot_local.xml31
-rwxr-xr-xindra/newview/skins/default/xui/ru/panel_snapshot_options.xml18
-rwxr-xr-xindra/newview/skins/default/xui/ru/panel_snapshot_postcard.xml10
-rwxr-xr-xindra/newview/skins/default/xui/ru/panel_snapshot_profile.xml21
-rwxr-xr-xindra/newview/skins/default/xui/ru/panel_status_bar.xml26
-rw-r--r--indra/newview/skins/default/xui/ru/panel_twitter_photo.xml50
-rwxr-xr-xindra/newview/skins/default/xui/ru/role_actions.xml4
-rwxr-xr-xindra/newview/skins/default/xui/ru/sidepanel_item_info.xml9
-rwxr-xr-xindra/newview/skins/default/xui/ru/sidepanel_task_info.xml124
-rwxr-xr-xindra/newview/skins/default/xui/ru/strings.xml253
-rwxr-xr-xindra/newview/skins/default/xui/ru/teleport_strings.xml3
-rwxr-xr-xindra/newview/skins/default/xui/tr/floater_about.xml66
-rwxr-xr-xindra/newview/skins/default/xui/tr/floater_about_land.xml17
-rw-r--r--indra/newview/skins/default/xui/tr/floater_associate_listing.xml7
-rw-r--r--indra/newview/skins/default/xui/tr/floater_edit_hover_height.xml4
-rw-r--r--indra/newview/skins/default/xui/tr/floater_experience_search.xml2
-rw-r--r--indra/newview/skins/default/xui/tr/floater_experienceprofile.xml85
-rw-r--r--indra/newview/skins/default/xui/tr/floater_experiences.xml2
-rw-r--r--indra/newview/skins/default/xui/tr/floater_facebook.xml29
-rwxr-xr-xindra/newview/skins/default/xui/tr/floater_inventory_item_properties.xml67
-rwxr-xr-xindra/newview/skins/default/xui/tr/floater_inventory_view_finder.xml6
-rw-r--r--indra/newview/skins/default/xui/tr/floater_item_properties.xml2
-rw-r--r--indra/newview/skins/default/xui/tr/floater_lagmeter.xml2
-rwxr-xr-xindra/newview/skins/default/xui/tr/floater_live_lsleditor.xml17
-rw-r--r--indra/newview/skins/default/xui/tr/floater_marketplace_listings.xml10
-rw-r--r--indra/newview/skins/default/xui/tr/floater_marketplace_validation.xml5
-rwxr-xr-xindra/newview/skins/default/xui/tr/floater_openobject.xml9
-rwxr-xr-xindra/newview/skins/default/xui/tr/floater_pay.xml33
-rwxr-xr-xindra/newview/skins/default/xui/tr/floater_pay_object.xml41
-rwxr-xr-xindra/newview/skins/default/xui/tr/floater_report_abuse.xml2
-rwxr-xr-xindra/newview/skins/default/xui/tr/floater_snapshot.xml17
-rwxr-xr-xindra/newview/skins/default/xui/tr/floater_top_objects.xml8
-rw-r--r--indra/newview/skins/default/xui/tr/floater_twitter.xml24
-rwxr-xr-xindra/newview/skins/default/xui/tr/menu_attachment_self.xml1
-rwxr-xr-xindra/newview/skins/default/xui/tr/menu_avatar_self.xml1
-rwxr-xr-xindra/newview/skins/default/xui/tr/menu_inventory.xml12
-rwxr-xr-xindra/newview/skins/default/xui/tr/menu_inventory_gear_default.xml2
-rw-r--r--indra/newview/skins/default/xui/tr/menu_marketplace_view.xml5
-rw-r--r--indra/newview/skins/default/xui/tr/menu_url_experience.xml4
-rwxr-xr-xindra/newview/skins/default/xui/tr/menu_viewer.xml7
-rwxr-xr-xindra/newview/skins/default/xui/tr/mime_types.xml8
-rwxr-xr-xindra/newview/skins/default/xui/tr/mime_types_linux.xml8
-rwxr-xr-xindra/newview/skins/default/xui/tr/mime_types_mac.xml8
-rwxr-xr-xindra/newview/skins/default/xui/tr/notifications.xml207
-rw-r--r--indra/newview/skins/default/xui/tr/panel_experience_info.xml46
-rw-r--r--indra/newview/skins/default/xui/tr/panel_experience_list_editor.xml27
-rw-r--r--indra/newview/skins/default/xui/tr/panel_experience_list_item.xml6
-rw-r--r--indra/newview/skins/default/xui/tr/panel_experience_log.xml24
-rw-r--r--indra/newview/skins/default/xui/tr/panel_experience_search.xml41
-rw-r--r--indra/newview/skins/default/xui/tr/panel_experiences.xml6
-rw-r--r--indra/newview/skins/default/xui/tr/panel_facebook_friends.xml2
-rw-r--r--indra/newview/skins/default/xui/tr/panel_facebook_photo.xml40
-rw-r--r--indra/newview/skins/default/xui/tr/panel_facebook_place.xml20
-rw-r--r--indra/newview/skins/default/xui/tr/panel_facebook_status.xml28
-rw-r--r--indra/newview/skins/default/xui/tr/panel_flickr_photo.xml68
-rwxr-xr-xindra/newview/skins/default/xui/tr/panel_group_info_sidetray.xml1
-rwxr-xr-xindra/newview/skins/default/xui/tr/panel_login.xml19
-rw-r--r--indra/newview/skins/default/xui/tr/panel_marketplace_listings.xml11
-rw-r--r--indra/newview/skins/default/xui/tr/panel_marketplace_listings_inventory.xml2
-rw-r--r--indra/newview/skins/default/xui/tr/panel_marketplace_listings_listed.xml2
-rw-r--r--indra/newview/skins/default/xui/tr/panel_marketplace_listings_unassociated.xml2
-rw-r--r--indra/newview/skins/default/xui/tr/panel_marketplace_listings_unlisted.xml2
-rwxr-xr-xindra/newview/skins/default/xui/tr/panel_postcard_settings.xml16
-rwxr-xr-xindra/newview/skins/default/xui/tr/panel_preferences_setup.xml6
-rw-r--r--indra/newview/skins/default/xui/tr/panel_region_experiences.xml33
-rw-r--r--indra/newview/skins/default/xui/tr/panel_script_experience.xml13
-rwxr-xr-xindra/newview/skins/default/xui/tr/panel_snapshot_inventory.xml6
-rwxr-xr-xindra/newview/skins/default/xui/tr/panel_snapshot_local.xml31
-rwxr-xr-xindra/newview/skins/default/xui/tr/panel_snapshot_options.xml20
-rwxr-xr-xindra/newview/skins/default/xui/tr/panel_snapshot_postcard.xml8
-rwxr-xr-xindra/newview/skins/default/xui/tr/panel_snapshot_profile.xml21
-rwxr-xr-xindra/newview/skins/default/xui/tr/panel_status_bar.xml26
-rw-r--r--indra/newview/skins/default/xui/tr/panel_twitter_photo.xml50
-rwxr-xr-xindra/newview/skins/default/xui/tr/role_actions.xml4
-rwxr-xr-xindra/newview/skins/default/xui/tr/sidepanel_item_info.xml9
-rwxr-xr-xindra/newview/skins/default/xui/tr/sidepanel_task_info.xml124
-rwxr-xr-xindra/newview/skins/default/xui/tr/strings.xml253
-rwxr-xr-xindra/newview/skins/default/xui/tr/teleport_strings.xml3
-rwxr-xr-xindra/newview/skins/default/xui/zh/floater_about.xml66
-rwxr-xr-xindra/newview/skins/default/xui/zh/floater_about_land.xml17
-rw-r--r--indra/newview/skins/default/xui/zh/floater_associate_listing.xml7
-rw-r--r--indra/newview/skins/default/xui/zh/floater_edit_hover_height.xml4
-rw-r--r--indra/newview/skins/default/xui/zh/floater_experience_search.xml2
-rw-r--r--indra/newview/skins/default/xui/zh/floater_experienceprofile.xml85
-rw-r--r--indra/newview/skins/default/xui/zh/floater_experiences.xml2
-rw-r--r--indra/newview/skins/default/xui/zh/floater_facebook.xml29
-rwxr-xr-xindra/newview/skins/default/xui/zh/floater_inventory_item_properties.xml69
-rwxr-xr-xindra/newview/skins/default/xui/zh/floater_inventory_view_finder.xml6
-rw-r--r--indra/newview/skins/default/xui/zh/floater_item_properties.xml2
-rw-r--r--indra/newview/skins/default/xui/zh/floater_lagmeter.xml28
-rwxr-xr-xindra/newview/skins/default/xui/zh/floater_live_lsleditor.xml17
-rw-r--r--indra/newview/skins/default/xui/zh/floater_marketplace_listings.xml10
-rw-r--r--indra/newview/skins/default/xui/zh/floater_marketplace_validation.xml5
-rwxr-xr-xindra/newview/skins/default/xui/zh/floater_openobject.xml9
-rwxr-xr-xindra/newview/skins/default/xui/zh/floater_pay.xml33
-rwxr-xr-xindra/newview/skins/default/xui/zh/floater_pay_object.xml41
-rwxr-xr-xindra/newview/skins/default/xui/zh/floater_report_abuse.xml2
-rwxr-xr-xindra/newview/skins/default/xui/zh/floater_snapshot.xml17
-rwxr-xr-xindra/newview/skins/default/xui/zh/floater_top_objects.xml8
-rw-r--r--indra/newview/skins/default/xui/zh/floater_twitter.xml24
-rwxr-xr-xindra/newview/skins/default/xui/zh/menu_attachment_self.xml1
-rwxr-xr-xindra/newview/skins/default/xui/zh/menu_avatar_self.xml1
-rwxr-xr-xindra/newview/skins/default/xui/zh/menu_inventory.xml12
-rwxr-xr-xindra/newview/skins/default/xui/zh/menu_inventory_gear_default.xml2
-rw-r--r--indra/newview/skins/default/xui/zh/menu_marketplace_view.xml5
-rw-r--r--indra/newview/skins/default/xui/zh/menu_url_experience.xml4
-rwxr-xr-xindra/newview/skins/default/xui/zh/menu_viewer.xml7
-rwxr-xr-xindra/newview/skins/default/xui/zh/mime_types.xml8
-rwxr-xr-xindra/newview/skins/default/xui/zh/mime_types_linux.xml8
-rwxr-xr-xindra/newview/skins/default/xui/zh/mime_types_mac.xml8
-rwxr-xr-xindra/newview/skins/default/xui/zh/notifications.xml207
-rw-r--r--indra/newview/skins/default/xui/zh/panel_experience_info.xml46
-rw-r--r--indra/newview/skins/default/xui/zh/panel_experience_list_editor.xml27
-rw-r--r--indra/newview/skins/default/xui/zh/panel_experience_list_item.xml6
-rw-r--r--indra/newview/skins/default/xui/zh/panel_experience_log.xml24
-rw-r--r--indra/newview/skins/default/xui/zh/panel_experience_search.xml41
-rw-r--r--indra/newview/skins/default/xui/zh/panel_experiences.xml6
-rw-r--r--indra/newview/skins/default/xui/zh/panel_facebook_photo.xml40
-rw-r--r--indra/newview/skins/default/xui/zh/panel_facebook_place.xml20
-rw-r--r--indra/newview/skins/default/xui/zh/panel_facebook_status.xml28
-rw-r--r--indra/newview/skins/default/xui/zh/panel_flickr_photo.xml68
-rwxr-xr-xindra/newview/skins/default/xui/zh/panel_group_info_sidetray.xml1
-rwxr-xr-xindra/newview/skins/default/xui/zh/panel_login.xml19
-rw-r--r--indra/newview/skins/default/xui/zh/panel_marketplace_listings.xml11
-rw-r--r--indra/newview/skins/default/xui/zh/panel_marketplace_listings_inventory.xml2
-rw-r--r--indra/newview/skins/default/xui/zh/panel_marketplace_listings_listed.xml2
-rw-r--r--indra/newview/skins/default/xui/zh/panel_marketplace_listings_unassociated.xml2
-rw-r--r--indra/newview/skins/default/xui/zh/panel_marketplace_listings_unlisted.xml2
-rwxr-xr-xindra/newview/skins/default/xui/zh/panel_postcard_settings.xml16
-rwxr-xr-xindra/newview/skins/default/xui/zh/panel_preferences_setup.xml6
-rw-r--r--indra/newview/skins/default/xui/zh/panel_region_experiences.xml33
-rw-r--r--indra/newview/skins/default/xui/zh/panel_script_experience.xml13
-rwxr-xr-xindra/newview/skins/default/xui/zh/panel_snapshot_inventory.xml6
-rwxr-xr-xindra/newview/skins/default/xui/zh/panel_snapshot_local.xml31
-rwxr-xr-xindra/newview/skins/default/xui/zh/panel_snapshot_options.xml20
-rwxr-xr-xindra/newview/skins/default/xui/zh/panel_snapshot_postcard.xml8
-rwxr-xr-xindra/newview/skins/default/xui/zh/panel_snapshot_profile.xml21
-rwxr-xr-xindra/newview/skins/default/xui/zh/panel_status_bar.xml26
-rw-r--r--indra/newview/skins/default/xui/zh/panel_twitter_photo.xml50
-rwxr-xr-xindra/newview/skins/default/xui/zh/role_actions.xml4
-rwxr-xr-xindra/newview/skins/default/xui/zh/sidepanel_item_info.xml17
-rwxr-xr-xindra/newview/skins/default/xui/zh/sidepanel_task_info.xml124
-rwxr-xr-xindra/newview/skins/default/xui/zh/strings.xml257
-rwxr-xr-xindra/newview/skins/default/xui/zh/teleport_strings.xml3
670 files changed, 14631 insertions, 6490 deletions
diff --git a/indra/newview/skins/default/textures/icons/Inv_StockFolderClosed.png b/indra/newview/skins/default/textures/icons/Inv_StockFolderClosed.png
new file mode 100644
index 0000000000..4dc484dc22
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/Inv_StockFolderClosed.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/icons/Inv_StockFolderOpen.png b/indra/newview/skins/default/textures/icons/Inv_StockFolderOpen.png
new file mode 100644
index 0000000000..0d140b56a7
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/Inv_StockFolderOpen.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/icons/Inv_VersionFolderClosed.png b/indra/newview/skins/default/textures/icons/Inv_VersionFolderClosed.png
new file mode 100644
index 0000000000..e89a4d7f31
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/Inv_VersionFolderClosed.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/icons/Inv_VersionFolderOpen.png b/indra/newview/skins/default/textures/icons/Inv_VersionFolderOpen.png
new file mode 100644
index 0000000000..659d7d392f
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/Inv_VersionFolderOpen.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 9c2d55e7b4..a5f2ce1f84 100755
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -140,6 +140,7 @@ with the same filename but different name
<texture name="Command_Inventory_Icon" file_name="toolbar_icons/inventory.png" preload="true" />
<texture name="Command_Map_Icon" file_name="toolbar_icons/map.png" preload="true" />
<texture name="Command_Marketplace_Icon" file_name="toolbar_icons/marketplace.png" preload="true" />
+ <texture name="Command_MktListings_Icon" file_name="toolbar_icons/mktlistings.png" preload="true" />
<texture name="Command_MiniCart_Icon" file_name="toolbar_icons/mini_cart.png" preload="true" />
<texture name="Command_MiniMap_Icon" file_name="toolbar_icons/mini_map.png" preload="true" />
<texture name="Command_Move_Icon" file_name="toolbar_icons/move.png" preload="true" />
@@ -222,6 +223,7 @@ with the same filename but different name
<texture name="ForwardArrow_Off" file_name="icons/ForwardArrow_Off.png" preload="false" />
<texture name="ForwardArrow_Press" file_name="icons/ForwardArrow_Press.png" preload="false" />
+ <texture name="Generic_Experience" file_name="Blank.png" preload="false" />
<texture name="Generic_Group" file_name="icons/Generic_Group.png" preload="false" />
<texture name="Generic_Group_Large" file_name="icons/Generic_Group_Large.png" preload="false" />
<texture name="icon_group.tga" file_name="icons/Generic_Group.png" preload="false" />
@@ -305,6 +307,8 @@ with the same filename but different name
<texture name="Inv_Snapshot" file_name="icons/Inv_Snapshot.png" preload="false" />
<texture name="Inv_Socks" file_name="icons/Inv_Socks.png" preload="false" />
<texture name="Inv_Sound" file_name="icons/Inv_Sound.png" preload="false" />
+ <texture name="Inv_StockFolderClosed" file_name="icons/Inv_StockFolderClosed.png" preload="false" />
+ <texture name="Inv_StockFolderOpen" file_name="icons/Inv_StockFolderOpen.png" preload="false" />
<texture name="Inv_SysClosed" file_name="icons/Inv_SysClosed.png" preload="false" />
<texture name="Inv_SysOpen" file_name="icons/Inv_SysOpen.png" preload="false" />
<texture name="Inv_Tattoo" file_name="icons/Inv_Tattoo.png" preload="false" />
@@ -316,6 +320,8 @@ with the same filename but different name
<texture name="Inv_Undershirt" file_name="icons/Inv_Undershirt.png" preload="false" />
<texture name="Inv_Link" file_name="icons/Inv_Link.png" preload="false" />
<texture name="Inv_Invalid" file_name="icons/Inv_Invalid.png" preload="false" />
+ <texture name="Inv_VersionFolderClosed" file_name="icons/Inv_VersionFolderClosed.png" preload="false" />
+ <texture name="Inv_VersionFolderOpen" file_name="icons/Inv_VersionFolderOpen.png" preload="false" />
<texture name="Linden_Dollar_Alert" file_name="widgets/Linden_Dollar_Alert.png"/>
<texture name="Linden_Dollar_Background" file_name="widgets/Linden_Dollar_Background.png"/>
@@ -333,6 +339,7 @@ with the same filename but different name
<texture name="Map_Placeholder_Icon" file_name="icons/map_placeholder.png" preload="true" />
+ <texture name="Marketplace_Dropzone_Background" file_name="widgets/Marketplace_Dropzone_Background.png" preload="true" />
<texture name="MarketplaceBtn_Off" file_name="widgets/MarketplaceBtn_Off.png" preload="true" scale.left="30" scale.top="19" scale.right="35" scale.bottom="4" />
<texture name="MarketplaceBtn_Selected" file_name="widgets/MarketplaceBtn_Selected.png" preload="true" scale.left="30" scale.top="19" scale.right="35" scale.bottom="4" />
diff --git a/indra/newview/skins/default/textures/toolbar_icons/mktlistings.png b/indra/newview/skins/default/textures/toolbar_icons/mktlistings.png
new file mode 100644
index 0000000000..a6f90461d7
--- /dev/null
+++ b/indra/newview/skins/default/textures/toolbar_icons/mktlistings.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/widgets/Marketplace_Dropzone_Background.png b/indra/newview/skins/default/textures/widgets/Marketplace_Dropzone_Background.png
new file mode 100644
index 0000000000..9478f7b813
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/Marketplace_Dropzone_Background.png
Binary files differ
diff --git a/indra/newview/skins/default/xui/de/floater_about.xml b/indra/newview/skins/default/xui/de/floater_about.xml
index bc0eae7c5d..ee631476cb 100755
--- a/indra/newview/skins/default/xui/de/floater_about.xml
+++ b/indra/newview/skins/default/xui/de/floater_about.xml
@@ -1,74 +1,16 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="floater_about" title="INFO ÃœBER [CAPITALIZED_APP_NAME]">
- <floater.string name="AboutHeader">
- [APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2] ([VIEWER_VERSION_3]) [BUILD_DATE] [BUILD_TIME] ([CHANNEL])
-[[VIEWER_RELEASE_NOTES_URL] [ReleaseNotes]]
- </floater.string>
- <floater.string name="AboutCompiler">
- Kompiliert mit [COMPILER] version [COMPILER_VERSION]
- </floater.string>
- <floater.string name="AboutPosition">
- Sie befinden sich an [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1] in [REGION] auf &lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt; ([HOSTIP])
-SLURL: &lt;nolink&gt;[SLURL]&lt;/nolink&gt;
-(globale Koordinaten [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1])
-[SERVER_VERSION]
-[SERVER_RELEASE_NOTES_URL]
- </floater.string>
- <floater.string name="AboutSystem">
- CPU: [CPU]
-Speicher: [MEMORY_MB] MB
-Betriebssystem, Version: [OS_VERSION]
-Grafikkarten-Hersteller: [GRAPHICS_CARD_VENDOR]
-Grafikkarten: [GRAPHICS_CARD]
- </floater.string>
- <floater.string name="AboutDriver">
- Windows Grafiktreiber-Version: [GRAPHICS_DRIVER_VERSION]
- </floater.string>
- <floater.string name="AboutLibs">
- OpenGL Version: [OPENGL_VERSION]
-
-libcurl-Version: [LIBCURL_VERSION]
-J2C-Decoderversion: [J2C_VERSION]
-Audio-Treiberversion: [AUDIO_DRIVER_VERSION]
-Qt Webkit-Version: [QT_WEBKIT_VERSION]
-Voice-Serverversion: [VOICE_VERSION]
- </floater.string>
- <floater.string name="none">
- (keiner)
- </floater.string>
- <floater.string name="AboutTraffic">
- Paketverlust: [PACKETS_LOST,number,0]/[PACKETS_IN,number,0] ([PACKETS_PCT,number,1]%)
- </floater.string>
- <floater.string name="ErrorFetchingServerReleaseNotesURL">
- Fehler beim Abrufen der URL für die Server-Versionshinweise.
- </floater.string>
<tab_container name="about_tab">
<panel label="Info" name="support_panel">
<button label="In Zwischenablage kopieren" name="copy_btn"/>
</panel>
<panel label="Danksagung" name="credits_panel">
- <text name="linden_intro">
- Second Life wird präsentiert von den Lindens:
- </text>
- <text_editor name="linden_names">
- Philip, Andrew, Doug, Richard, Phoenix, Ian, Mark, Robin, Dan, Char, Ryan, Eric, Jim, Lee, Jeff, Michael, Kelly, Steve, Catherine, Bub, Ramzi, Jill, Jeska, Don, Kona, Callum, Charity, Jack, Shawn, babbage, James, Lauren, Blue, Brent, Reuben, Pathfinder, Jesse, Patsy, Torley, Bo, Cyn, Jonathan, Gia, Annette, Ginsu, Harry, Lex, Runitai, Guy, Cornelius, Beth, Swiss, Thumper, Wendy, Teeple, Seth, Dee, Mia, Sally, Liana, Aura, Beez, Milo, Red, Gulliver, Marius, Joe, Jose, Dore, Justin, Nora, Morpheus, Lexie, Amber, Chris, Xan, Leyla, Walker, Sabin, Joshua, Hiromi, Tofu, Fritz, June, Jean, Ivy, Dez, Ken, Betsy, Which, Spike, Rob, Zee, Dustin, George, Claudia, del, Matthew, jane, jay, Adrian, Yool, Rika, Yoz, siobhan, Qarl, Benjamin, Beast, Everett, madhavi, Christopher, Izzy, stephany, Jeremy, sean, adreanne, Pramod, Tobin, sejong, Iridium, maurice, kj, Meta, kari, JP, bert, kyle, Jon, Socrates, Bridie, Ivan, maria, Aric, Coco, Periapse, sandy, Storrs, Lotte, Colossus, Brad, Pastrami, Zen, BigPapi, Banzai, Sardonyx, Mani, Garry, Jaime, Neuro, Samuel, Niko, CeeLo, Austin, Soft, Poppy, emma, tessa, angelo, kurz, alexa, Sue, CG, Blake, Erica, Brett, Bevis, kristen, Q, simon, Enus, MJ, laurap, Kip, Scouse, Ron, Ram, kend, Marty, Prospero, melissa, kraft, Nat, Seraph, Hamilton, Lordan, Green, miz, Ashlei, Trinity, Ekim, Echo, Charlie, Rowan, Rome, Jt, Doris, benoc, Christy, Bao, Kate, Tj, Patch, Cheah, Johan, Brandy, Angela, Oreh, Cogsworth, Lan, Mitchell, Space, Bambers, Einstein, Bender, Malbers, Matias, Maggie, Rothman, Milton, Niall, Marin, Allison, Mango, Andrea, Katt, Yi, Ambroff, Rico, Raymond, Gail, Christa, William, Dawn, Usi, Dynamike, M, Corr, Dante, Molly, kaylee, Danica, Kelv, Lil, jacob, Nya, Rodney, elsie, Blondin, Grant, Nyx, Devin, Monty, Minerva, Keira, Katie, Jenn, Makai, Clare, Joy, Cody, Gayathri, FJ, spider, Oskar, Landon, Jarv, Noelle, Al, Doc, Gray, Vir, t, Maestro, Simone, Shannon, yang, Courtney, Scott, charlene, Quixote, Susan, Zed, Amanda, Katelin, Esbee, JoRoan, Enkidu, roxie, Scarlet, Merov, Kevin, Judy, Rand, Newell, Les, Dessie, Galen, Michon, Geo, Siz, Calyle, Pete, Praveen, Callen, Sheldon, Pink, Nelson, jenelle, Terrence, Nathan, Juan, Sascha, Huseby, Karina, Kaye, Kotler, Lis, Darv, Charrell, Dakota, Kimmora, Theeba, Taka, Mae, Perry, Ducot, dana, Esther, Dough, gisele, Doten, Viale, Fisher, jessieann, ashley, Torres, delby, rountree, kurt, Slaton, Madison, Rue, Gino, Wen, Casssandra, Brodesky, Squid, Gez, Rakesh, Gecko, Ladan, Tony, Tatem, Squire, Falcon, BK, Crimp, Tiggs, Bacon, Coyot, Carmilla, Webb, Sea, Arch, Jillian, Jason, Bernard, Vogt, Peggy, dragon, Pup, xandix, Wallace, Bewest, Inoshiro, Rhett, AG, Aimee, Ghengis, Itiaes, Eli, Steffan, Epic, Grapes, Stone, Prep, Scobu, Robert, Alain, Carla, Vicky, Tia, Alec, Taras, Lisa, Oz, Ariane, Log, House, Kazu, Kim, Drofnas, Tyler, Campbell, Michele, Madeline, Nelly, Baron, Thor, Lori, Hele, Fredrik, Teddy, Pixie, Berry, Gabrielle, Alfonso, Brooke, Wolf, Ringo, Cru, Charlar, Rodvik, Gibson, Elise, Bagman, Greger, Leonidas, Jerm, Leslie, CB, Brenda, Durian, Carlo, mm, Zeeshan, Caleb, Max, Elikak, Mercille, Steph, Chase
- </text_editor>
- <text name="contrib_intro">
- mit Open-Source-Beiträgen von:
- </text>
- <text_editor name="contrib_names">
- Dummy-Name wird zur Laufzeit ersetzt
- </text_editor>
- <text name="trans_intro">
- mit Ãœbersetzungen von:
- </text>
- <text_editor name="trans_names">
- Dummy Name wird zur Laufzeit ersetzt
- </text_editor>
+ <text name="linden_intro">Second Life wird präsentiert von den Lindens
+mit Open-Source-Beiträgen von:</text>
+ <text_editor name="contrib_names">Dummy-Name wird zur Laufzeit ersetzt</text_editor>
</panel>
<panel label="Lizenzen" name="licenses_panel">
- <text_editor name="credits_editor">
- 3Dconnexion SDK Copyright (C) 1992-2009 3Dconnexion.
+ <text_editor name="licenses_editor">3Dconnexion SDK Copyright (C) 1992-2009 3Dconnexion.
APR Copyright (C) 2011 The Apache Software Foundation
Collada DOM Copyright 2006 Sony Computer Entertainment Inc.
cURL Copyright (C) 1996-2010, Daniel Stenberg (daniel@haxx.se).
@@ -95,8 +37,7 @@ Voice-Serverversion: [VOICE_VERSION]
Alle Rechte vorbehalten. Details siehe licenses.txt.
- Audiocodierung für Voice-Chat: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
- </text_editor>
+ Audiocodierung für Voice-Chat: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)</text_editor>
</panel>
</tab_container>
</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_about_land.xml b/indra/newview/skins/default/xui/de/floater_about_land.xml
index 44922fbe78..60f25704dd 100755
--- a/indra/newview/skins/default/xui/de/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/de/floater_about_land.xml
@@ -309,9 +309,6 @@ Nur große Parzellen können in der Suche aufgeführt werden.
<panel.string name="push_restrict_region_text">
Kein Stoßen (regional)
</panel.string>
- <panel.string name="see_avs_text">
- Avatare auf anderen Parzellen können
- </panel.string>
<text name="allow_label">
Anderen Einwohnern gestatten:
</text>
@@ -337,22 +334,6 @@ Nur große Parzellen können in der Suche aufgeführt werden.
<check_box label="Sicher (kein Schaden)" name="check safe" tool_tip="Falls aktiviert, wird Land auf Option „Sicher“ eingestellt, Kampfschäden sind deaktiviert. Ansonsten sind Kampfschäden aktiviert."/>
<check_box label="Kein Stoßen" name="PushRestrictCheck" tool_tip="Verhindert Stoßen durch Skripte. Durch Aktivieren dieser Option verhindern Sie störendes Verhalten auf Ihrem Land."/>
<check_box label="Ort in Suche anzeigen (30 L$/Woche)" name="ShowDirectoryCheck" tool_tip="Diese Parzelle in Suchergebnissen anzeigen."/>
- <combo_box name="land category with adult">
- <combo_box.item label="Alle Kategorien" name="item0"/>
- <combo_box.item label="Lindenort" name="item1"/>
- <combo_box.item label="Adult" name="item2"/>
- <combo_box.item label="Kunst &amp; Kultur" name="item3"/>
- <combo_box.item label="Business" name="item4"/>
- <combo_box.item label="Bildung" name="item5"/>
- <combo_box.item label="Spielen" name="item6"/>
- <combo_box.item label="Treffpunkt" name="item7"/>
- <combo_box.item label="Anfängergerecht" name="item8"/>
- <combo_box.item label="Parks und Natur" name="item9"/>
- <combo_box.item label="Wohngebiet" name="item10"/>
- <combo_box.item label="Shopping" name="item11"/>
- <combo_box.item label="Vermietung" name="item13"/>
- <combo_box.item label="Sonstige" name="item12"/>
- </combo_box>
<combo_box name="land category">
<combo_box.item label="Alle Kategorien" name="item0"/>
<combo_box.item label="Lindenort" name="item1"/>
@@ -449,15 +430,9 @@ Nur große Parzellen können in der Suche aufgeführt werden.
<panel.string name="access_estate_defined">
(Durch Grundbesitz festgelegt)
</panel.string>
- <panel.string name="allow_public_access">
- Öffentlichen Zugang erlauben ([MATURITY]) (Hinweis: Bei Deaktivierung dieser Option werden Bannlinien generiert)
- </panel.string>
<panel.string name="estate_override">
Eine oder mehrere dieser Optionen gelten auf Grundbesitzebene
</panel.string>
- <text name="Limit access to this parcel to:">
- Zugang zu dieser Parzelle
- </text>
<check_box label="Öffentlichen Zugang gestatten (bei Deaktivierung dieser Option werden Bannlinien generiert)" name="public_access"/>
<text name="Only Allow" width="400">
Zugang nur Einwohnern gestatten, die:
@@ -489,5 +464,6 @@ Nur große Parzellen können in der Suche aufgeführt werden.
<button label="Entfernen" label_selected="Entfernen" name="remove_banned"/>
</panel>
</panel>
+ <panel label="ERLEBNISSE" name="land_experiences_panel"/>
</tab_container>
</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_associate_listing.xml b/indra/newview/skins/default/xui/de/floater_associate_listing.xml
new file mode 100644
index 0000000000..827b1b0aea
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/floater_associate_listing.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="associate listing" title="AUFLISTUNG VERKNÃœPFEN">
+ <text name="message">Auflistungs-ID:</text>
+ <line_editor name="listing_id">ID hier eingeben</line_editor>
+ <button label="OK" name="OK"/>
+ <button label="Abbrechen" name="Cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_edit_hover_height.xml b/indra/newview/skins/default/xui/de/floater_edit_hover_height.xml
new file mode 100644
index 0000000000..c26f7f367d
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/floater_edit_hover_height.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="HoverHeight" title="SCHWEBEHÖHE FESTLEGEN">
+ <slider label="Höhe" name="HoverHeightSlider"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_experience_search.xml b/indra/newview/skins/default/xui/de/floater_experience_search.xml
new file mode 100644
index 0000000000..0fda5086ff
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/floater_experience_search.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="experiencepicker" title="ERLEBNIS AUSWÄHLEN"/>
diff --git a/indra/newview/skins/default/xui/de/floater_experienceprofile.xml b/indra/newview/skins/default/xui/de/floater_experienceprofile.xml
new file mode 100644
index 0000000000..a553a5b6f0
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/floater_experienceprofile.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater title="EXPERIENCE PROFILE">
+ <floater.string name="empty_slurl">
+ (keines)
+ </floater.string>
+ <floater.string name="maturity_icon_general">
+ &quot;Parcel_PG_Light&quot;
+ </floater.string>
+ <floater.string name="maturity_icon_moderate">
+ &quot;Parcel_M_Light&quot;
+ </floater.string>
+ <floater.string name="maturity_icon_adult">
+ &quot;Parcel_R_Light&quot;
+ </floater.string>
+ <text name="edit_title" value="Erlebnisprofil"/>
+ <tab_container name="tab_container">
+ <panel name="panel_experience_info">
+ <scroll_container name="xp_scroll">
+ <panel name="scrolling_panel">
+ <layout_stack>
+ <layout_panel name="top panel">
+ <button label="Bearbeiten" name="edit_btn"/>
+ </layout_panel>
+ <layout_panel name="maturity panel">
+ <text name="ContentRating">
+ Einstufung:
+ </text>
+ </layout_panel>
+ <layout_panel name="location panel">
+ <text name="Location">
+ Standort:
+ </text>
+ </layout_panel>
+ <layout_panel>
+ <text name="Owner">
+ Eigentümer:
+ </text>
+ </layout_panel>
+ <layout_panel name="group_panel">
+ <text name="Group">
+ Gruppe:
+ </text>
+ </layout_panel>
+ <layout_panel name="perm panel">
+ <button label="Zulassen" name="allow_btn"/>
+ <button label="Vergessen" name="forget_btn"/>
+ <button label="Blockieren" name="block_btn"/>
+ <text name="privileged">
+ Dieses Erlebnis ist für alle Einwohner aktiviert.
+ </text>
+ <button label="Missbrauch melden" name="report_btn"/>
+ </layout_panel>
+ </layout_stack>
+ </panel>
+ </scroll_container>
+ </panel>
+ <panel name="edit_panel_experience_info">
+ <scroll_container name="edit_xp_scroll">
+ <panel name="edit_scrolling_panel">
+ <text name="edit_experience_title_label" value="Name:"/>
+ <text name="edit_experience_desc_label" value="Beschreibung:"/>
+ <button label="Gruppe" name="Group_btn"/>
+ <text name="edit_ContentRating">
+ Einstufung:
+ </text>
+ <icons_combo_box label="Moderat" name="edit_ContentRatingText" tool_tip="Bei Erhöhung der Inhaltseinstufung eines Erlebnisses wird die Berechtigung für alle Einwohner zurückgesetzt, die das Erlebnis zugelassen haben.">
+ <icons_combo_box.item label="Adult" name="Adult" value="42"/>
+ <icons_combo_box.item label="Moderat" name="Mature" value="21"/>
+ <icons_combo_box.item label="Allgemein" name="PG" value="13"/>
+ </icons_combo_box>
+ <text name="edit_Location">
+ Standort:
+ </text>
+ <button label="Aktuellen Standort verwenden" name="location_btn"/>
+ <button label="Standort löschen" name="clear_btn"/>
+ <check_box label="Erlebnis aktivieren" name="edit_enable_btn" tool_tip=""/>
+ <check_box label="Aus Suche ausschließen" name="edit_private_btn"/>
+ <text name="changes" value="Es kann mehrere Minuten dauern, bis Erlebnisänderungen in allen Regionen umgesetzt werden."/>
+ <button label="Zurück" name="cancel_btn"/>
+ <button label="Speichern" name="save_btn"/>
+ </panel>
+ </scroll_container>
+ </panel>
+ </tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_experiences.xml b/indra/newview/skins/default/xui/de/floater_experiences.xml
new file mode 100644
index 0000000000..932592a63b
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/floater_experiences.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_experiences" title="ERLEBNISSE"/>
diff --git a/indra/newview/skins/default/xui/de/floater_facebook.xml b/indra/newview/skins/default/xui/de/floater_facebook.xml
index 25b11536eb..32d6d02c7a 100644
--- a/indra/newview/skins/default/xui/de/floater_facebook.xml
+++ b/indra/newview/skins/default/xui/de/floater_facebook.xml
@@ -1,20 +1,15 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="floater_facebook" title="AUF FACEBOOK POSTEN">
- <panel name="background">
- <tab_container name="tabs">
- <panel label="STATUS" name="panel_facebook_status"/>
- <panel label="FOTO" name="panel_facebook_photo"/>
- <panel label="EINCHECKEN" name="panel_facebook_place"/>
- <panel label="FREUNDE" name="panel_facebook_friends"/>
- <panel label="KONTO" name="panel_facebook_account"/>
- </tab_container>
- <panel name="connection_status_panel">
- <text name="connection_error_text">
- Fehler
- </text>
- <text name="connection_loading_text">
- Laden...
- </text>
- </panel>
- </panel>
+ <tab_container name="tabs">
+ <panel label="STATUS" name="panel_facebook_status"/>
+ <panel label="FOTO" name="panel_facebook_photo"/>
+ <panel label="EINCHECKEN" name="panel_facebook_place"/>
+ <panel label="FREUNDE" name="panel_facebook_friends"/>
+ </tab_container>
+ <text name="connection_error_text">
+ Fehler
+ </text>
+ <text name="connection_loading_text">
+ Laden...
+ </text>
</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/de/floater_inventory_item_properties.xml
index 7f48105460..92c038057f 100755
--- a/indra/newview/skins/default/xui/de/floater_inventory_item_properties.xml
+++ b/indra/newview/skins/default/xui/de/floater_inventory_item_properties.xml
@@ -1,67 +1,36 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="item properties" title="EIGENSCHAFTEN: INVENTAROBJEKT">
- <floater.string name="unknown">
- (unbekannt)
- </floater.string>
- <floater.string name="public">
- (öffentlich)
- </floater.string>
- <floater.string name="you_can">
- Sie können:
- </floater.string>
- <floater.string name="owner_can">
- Eigentümer kann:
- </floater.string>
- <floater.string name="acquiredDate">
- [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]
- </floater.string>
- <text name="LabelItemNameTitle">
- Name:
- </text>
- <text name="LabelItemDescTitle">
- Beschreibung:
- </text>
- <text name="LabelCreatorTitle">
- Ersteller:
- </text>
+ <floater.string name="unknown">(unbekannt)</floater.string>
+ <floater.string name="public">(öffentlich)</floater.string>
+ <floater.string name="you_can">Sie können:</floater.string>
+ <floater.string name="owner_can">Eigentümer kann:</floater.string>
+ <floater.string name="acquiredDate">[wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]</floater.string>
+ <text name="LabelItemNameTitle">Name:</text>
+ <text name="LabelItemDescTitle">Beschreibung:</text>
+ <text name="LabelCreatorTitle">Ersteller:</text>
<button label="Profil..." label_selected="" name="BtnCreator"/>
- <text name="LabelOwnerTitle">
- Eigentümer:
- </text>
+ <text name="LabelOwnerTitle">Eigentümer:</text>
<button label="Profil..." label_selected="" name="BtnOwner"/>
- <text name="LabelAcquiredTitle">
- Erworben:
- </text>
- <text name="LabelAcquiredDate">
- Mittwoch, 24. Mai 2006, 12:50:46
- </text>
- <text name="OwnerLabel">
- Sie:
- </text>
+ <text name="LabelAcquiredTitle">Erworben:</text>
+ <text name="LabelAcquiredDate">Mittwoch, 24. Mai 2006, 12:50:46</text>
+ <text name="OwnerLabel">Sie:</text>
<check_box label="Bearbeiten" name="CheckOwnerModify"/>
<check_box label="Kopieren" left_delta="85" name="CheckOwnerCopy"/>
<check_box label="Wiederverkaufen" name="CheckOwnerTransfer"/>
- <text name="AnyoneLabel">
- Jeder:
- </text>
+ <text name="AnyoneLabel">Jeder:</text>
<check_box label="Kopieren" name="CheckEveryoneCopy"/>
- <text name="GroupLabel">
- Gruppe:
- </text>
+ <text name="GroupLabel">Gruppe:</text>
<check_box label="Teilen" name="CheckShareWithGroup"/>
- <text name="NextOwnerLabel" width="150">
- Nächster Eigentümer:
- </text>
+ <text name="NextOwnerLabel" width="150">Nächster Eigentümer:</text>
<check_box label="Bearbeiten" name="CheckNextOwnerModify"/>
<check_box label="Kopieren" left_delta="55" name="CheckNextOwnerCopy"/>
<check_box label="Wiederverkaufen" name="CheckNextOwnerTransfer"/>
<check_box label="Zum Verkauf" name="CheckPurchase"/>
- <combo_box name="combobox sale copy" left_pad="25">
- <combo_box.item label="Kopieren" name="Copy"/>
+ <combo_box name="ComboBoxSaleType">
+ <combo_box.item label="Kopie" name="Copy"/>
+ <combo_box.item label="Inhalt" name="Contents"/>
<combo_box.item label="Original" name="Original"/>
</combo_box>
<spinner label="Preis:" name="Edit Cost"/>
- <text name="CurrencySymbol">
- L$
- </text>
+ <text name="CurrencySymbol">L$</text>
</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/de/floater_inventory_view_finder.xml
index d63426d684..0820e75029 100755
--- a/indra/newview/skins/default/xui/de/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/de/floater_inventory_view_finder.xml
@@ -5,8 +5,8 @@
<check_box label="Kleidung" name="check_clothing"/>
<check_box label="Gesten" name="check_gesture"/>
<check_box label="Landmarken" name="check_landmark"/>
- <check_box label="Netze" name="check_mesh"/>
<check_box label="Notizkarten" name="check_notecard"/>
+ <check_box label="Netze" name="check_mesh"/>
<check_box label="Objekte" name="check_object"/>
<check_box label="Skripts" name="check_script"/>
<check_box label="Sounds" name="check_sound"/>
@@ -19,6 +19,10 @@
<text name="- OR -">
- ODER -
</text>
+ <radio_group name="date_search_direction">
+ <radio_item label="Neuer als" name="newer"/>
+ <radio_item label="Älter als" name="older"/>
+ </radio_group>
<spinner label="Stunden zuvor" label_width="80" name="spin_hours_ago"/>
<spinner label="Tage zuvor" name="spin_days_ago"/>
<button label="Schließen" label_selected="Schließen" name="Close"/>
diff --git a/indra/newview/skins/default/xui/de/floater_item_properties.xml b/indra/newview/skins/default/xui/de/floater_item_properties.xml
new file mode 100644
index 0000000000..eb8314ad13
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/floater_item_properties.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Item Properties" title="OBJEKTEIGENSCHAFTEN"/>
diff --git a/indra/newview/skins/default/xui/de/floater_lagmeter.xml b/indra/newview/skins/default/xui/de/floater_lagmeter.xml
index 45ff37c147..2c8b76ace7 100644
--- a/indra/newview/skins/default/xui/de/floater_lagmeter.xml
+++ b/indra/newview/skins/default/xui/de/floater_lagmeter.xml
@@ -4,7 +4,7 @@
Lag-Anzeige
</floater.string>
<floater.string name="max_width_px">
- 350
+ 360
</floater.string>
<floater.string name="min_title_msg">
Lag
@@ -25,10 +25,10 @@
Normal, Fenster im Hintergrund
</floater.string>
<floater.string name="client_frame_time_critical_msg">
- Client-Frame-Rate unter [CLIENT_FRAME_RATE_CRITICAL]
+ Client-Framerate unter [CLIENT_FRAME_RATE_CRITICAL]
</floater.string>
<floater.string name="client_frame_time_warning_msg">
- Client-Frame-Rate zwischen [CLIENT_FRAME_RATE_CRITICAL] und [CLIENT_FRAME_RATE_WARNING]
+ Client-Framerate zwischen [CLIENT_FRAME_RATE_CRITICAL] und [CLIENT_FRAME_RATE_WARNING]
</floater.string>
<floater.string name="client_frame_time_normal_msg">
Normal
@@ -55,10 +55,10 @@
5
</floater.string>
<floater.string name="network_packet_loss_critical_msg">
- Paketverlust der Verbindung übersteigt [NETWORK_PACKET_LOSS_CRITICAL]%
+ Paketverlust der Verbindung übersteigt [NETWORK_PACKET_LOSS_CRITICAL] %
</floater.string>
<floater.string name="network_packet_loss_warning_msg">
- Paketverlust der Verbindung liegt bei [NETWORK_PACKET_LOSS_WARNING]%-[NETWORK_PACKET_LOSS_CRITICAL]%
+ Paketverlust der Verbindung liegt bei [NETWORK_PACKET_LOSS_WARNING]%-[NETWORK_PACKET_LOSS_CRITICAL] %
</floater.string>
<floater.string name="network_performance_normal_msg">
Normal
@@ -76,10 +76,10 @@
Ping-Zeit der Verbindung liegt bei [NETWORK_PING_WARNING]-[NETWORK_PING_CRITICAL] ms
</floater.string>
<floater.string name="network_packet_loss_cause_msg">
- Möglicherweise schlechte Verbindung oder zu hoher Wert für „Bandbreite“.
+ Möglicherweise schlechte Verbindung oder zu hoher Bandbreitenwert.
</floater.string>
<floater.string name="network_ping_cause_msg">
- Möglicherweise schlechte Verbindung oder File-Sharing-Anwendung.
+ Möglicherweise schlechte Verbindung oder Filesharing-Anwendung.
</floater.string>
<floater.string name="server_text_msg">
Server
@@ -94,10 +94,10 @@
20
</floater.string>
<floater.string name="server_frame_time_critical_msg">
- Simulator-Frame-Rate liegt unter [SERVER_FRAME_RATE_CRITICAL]
+ Simulator-Framerate liegt unter [SERVER_FRAME_RATE_CRITICAL]
</floater.string>
<floater.string name="server_frame_time_warning_msg">
- Simulator-Frame-Rate liegt zwischen [SERVER_FRAME_RATE_CRITICAL] und [SERVER_FRAME_RATE_WARNING]
+ Simulator-Framerate liegt zwischen [SERVER_FRAME_RATE_CRITICAL] und [SERVER_FRAME_RATE_WARNING]
</floater.string>
<floater.string name="server_frame_time_normal_msg">
Normal
@@ -112,13 +112,13 @@
Mögliche Ursache: Zu viel Netzwerktraffic
</floater.string>
<floater.string name="server_agent_cause_msg">
- Mögliche Ursache: Zu viele Personen in Bewegung in der Region
+ Mögliche Ursache: Zu viele Personen in der Region in Bewegung
</floater.string>
<floater.string name="server_images_cause_msg">
Mögliche Ursache: Zu viele Bildberechnungen
</floater.string>
<floater.string name="server_generic_cause_msg">
- Mögliche Ursache: Zu hohe Simulator-Last
+ Mögliche Ursache: Zu hohe Simulatorlast
</floater.string>
<floater.string name="smaller_label">
&gt;&gt;
@@ -147,5 +147,5 @@
<text name="server_text">
Normal
</text>
- <button label="&gt;&gt; " name="minimize" tool_tip="Fenstergröße ändern"/>
+ <button label="&gt;&gt;" name="minimize" tool_tip="Fenstergröße ändern"/>
</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/de/floater_live_lsleditor.xml
index 3b42a8b741..ae2dd4db67 100755
--- a/indra/newview/skins/default/xui/de/floater_live_lsleditor.xml
+++ b/indra/newview/skins/default/xui/de/floater_live_lsleditor.xml
@@ -9,7 +9,24 @@
<floater.string name="Title">
SKRIPT: [NAME]
</floater.string>
+ <floater.string name="experience_enabled">
+ Markierung löschen, um aktuelles Erlebnis zu entfernen
+ </floater.string>
+ <floater.string name="no_experiences">
+ Sie sind zu keinen Erlebnissen berechtigt
+ </floater.string>
+ <floater.string name="add_experiences">
+ Auswählen, um Erlebnis hinzuzufügen
+ </floater.string>
+ <floater.string name="show_experience_profile">
+ Klicken, um Erlebnisprofil aufzurufen
+ </floater.string>
+ <floater.string name="loading">
+ Laden...
+ </floater.string>
<button label="Zurücksetzen" label_selected="Zurücksetzen" name="Reset"/>
<check_box initial_value="true" label="Läuft" name="running"/>
<check_box initial_value="true" label="Mono" name="mono"/>
+ <check_box label="Erlebnis verwenden:" name="enable_xp"/>
+ <button label="&gt;" name="view_profile"/>
</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_marketplace_listings.xml b/indra/newview/skins/default/xui/de/floater_marketplace_listings.xml
new file mode 100644
index 0000000000..fd6e2d904f
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/floater_marketplace_listings.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_marketplace_listings" title="MARKTPLATZ-AUFLISTUNGEN">
+ <panel name="marketplace_listings_panel">
+ <panel>
+ <panel name="marketplace_listings_inventory_placeholder_panel">
+ <text name="marketplace_listings_inventory_placeholder_title">Laden...</text>
+ </panel>
+ </panel>
+ </panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_marketplace_validation.xml b/indra/newview/skins/default/xui/de/floater_marketplace_validation.xml
new file mode 100644
index 0000000000..4782b353b4
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/floater_marketplace_validation.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_marketplace_validation" title="Marketplace-Auflistungen prüfen">
+ <button label="OK" label_selected="OK" name="OK"/>
+ <text_editor name="validation_text">MARKETPLACE_VALIDATION_TEXT</text_editor>
+</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_openobject.xml b/indra/newview/skins/default/xui/de/floater_openobject.xml
index c3e7052283..cd7796418c 100755
--- a/indra/newview/skins/default/xui/de/floater_openobject.xml
+++ b/indra/newview/skins/default/xui/de/floater_openobject.xml
@@ -3,6 +3,11 @@
<text name="object_name">
[DESC]:
</text>
- <button label="In Inventar kopieren" label_selected="In Inventar kopieren" name="copy_to_inventory_button" width="120"/>
- <button label="Kopieren und anziehen" label_selected="Kopieren und anziehen" left_pad="6" name="copy_and_wear_button" width="136"/>
+ <text name="border_note">
+ In Inventar kopieren und tragen
+ </text>
+ <button label="Zum Outfit hinzufügen" label_selected="Zum Outfit hinzufügen" left_pad="6" name="copy_and_wear_button" width="136"/>
+ <button label="Outfit ersetzen" label_selected="Outfit ersetzen" name="copy_and_replace_button"/>
+ <button label="Nur in Inventar kopieren" label_selected="Nur in Inventar kopieren" name="copy_to_inventory_button" width="120"/>
+ <button label="Abbrechen" label_selected="Abbrechen" name="cancel_button"/>
</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_pay.xml b/indra/newview/skins/default/xui/de/floater_pay.xml
index a0a622ecbc..1882f5150b 100755
--- a/indra/newview/skins/default/xui/de/floater_pay.xml
+++ b/indra/newview/skins/default/xui/de/floater_pay.xml
@@ -1,25 +1,18 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="Give Money" title="">
- <string name="payee_group">
- Gruppe bezahlen
- </string>
- <string name="payee_resident">
- Einwohner bezahlen
- </string>
- <text name="payee_label" width="130">
- Bezahlen:
- </text>
- <icon name="icon_person" tool_tip="Person"/>
- <text left="130" name="payee_name">
- Extrem langen Namen testen, um zu prüfen, ob er abgeschnitten wird
- </text>
- <button label="1 L$" label_selected="1 L$" name="fastpay 1"/>
- <button label="5 L$" label_selected="5 L$" name="fastpay 5"/>
- <button label="10 L$" label_selected="10 L$" name="fastpay 10"/>
- <button label="20 L$" label_selected="20 L$" name="fastpay 20"/>
- <text name="amount text">
- oder Betrag auswählen:
- </text>
- <button label="Bezahlen" label_selected="Bezahlen" name="pay btn"/>
- <button label="Abbrechen" label_selected="Abbrechen" name="cancel btn"/>
+ <string name="payee_group">Gruppe bezahlen</string>
+ <string name="payee_resident">Einwohner bezahlen</string>
+ <text name="paying_text">Sie zahlen:</text>
+ <text left="130" name="payee_name">Extrem langen Namen testen, um zu prüfen, ob er abgeschnitten wird</text>
+ <panel label="Suchen" name="PatternsPanel">
+ <button label="L$ 1 zahlen" label_selected="L$ 1 zahlen" name="fastpay 1"/>
+ <button label="L$ 5 zahlen" label_selected="L$ 5 zahlen" name="fastpay 5"/>
+ <button label="L$ 10 zahlen" label_selected="L$ 10 zahlen" name="fastpay 10"/>
+ <button label="L$ 20 zahlen" label_selected="L$ 20 zahlen" name="fastpay 20"/>
+ </panel>
+ <panel label="Suchen" name="InputPanel">
+ <text name="amount text">Anderer Betrag:</text>
+ <button label="Bezahlen" label_selected="Bezahlen" name="pay btn"/>
+ <button label="Abbrechen" label_selected="Abbrechen" name="cancel btn"/>
+ </panel>
</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_pay_object.xml b/indra/newview/skins/default/xui/de/floater_pay_object.xml
index 7159bbadb3..35f3ca032a 100755
--- a/indra/newview/skins/default/xui/de/floater_pay_object.xml
+++ b/indra/newview/skins/default/xui/de/floater_pay_object.xml
@@ -1,29 +1,21 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="Give Money" title="">
- <string name="payee_group" width="105">
- Gruppe bezahlen
- </string>
- <string name="payee_resident" width="118">
- Einwohner bezahlen
- </string>
- <icon name="icon_person" tool_tip="Person"/>
- <text left="128" name="payee_name" width="168">
- Ericacita Moostopolison
- </text>
- <text halign="left" name="object_name_label">
- Ãœber Objekt:
- </text>
+ <string name="payee_group" width="105">Gruppe bezahlen</string>
+ <string name="payee_resident" width="118">Einwohner bezahlen</string>
+ <text name="paying_text">Sie zahlen:</text>
+ <text left="128" name="payee_name" width="168">Ericacita Moostopolison</text>
+ <text halign="left" name="object_name_label">Ãœber Objekt:</text>
<icon name="icon_object" tool_tip="Objekte"/>
- <text left="105" name="object_name_text">
- ...
- </text>
- <button label="1 L$" label_selected="1 L$" name="fastpay 1"/>
- <button label="5 L$" label_selected="5 L$" name="fastpay 5"/>
- <button label="10 L$" label_selected="10 L$" name="fastpay 10"/>
- <button label="20 L$" label_selected="20 L$" name="fastpay 20"/>
- <text name="amount text">
- oder Betrag auswählen:
- </text>
- <button label="Bezahlen" label_selected="Bezahlen" name="pay btn"/>
- <button label="Abbrechen" label_selected="Abbrechen" name="cancel btn" width="76"/>
+ <text left="105" name="object_name_text">...</text>
+ <panel label="Suchen" name="PatternsPanel">
+ <button label="L$ 1 zahlen" label_selected="L$ 1 zahlen" name="fastpay 1"/>
+ <button label="L$ 5 zahlen" label_selected="L$ 5 zahlen" name="fastpay 5"/>
+ <button label="L$ 10 zahlen" label_selected="L$ 10 zahlen" name="fastpay 10"/>
+ <button label="L$ 20 zahlen" label_selected="L$ 20 zahlen" name="fastpay 20"/>
+ </panel>
+ <panel label="Suchen" name="InputPanel">
+ <text name="amount text">Anderer Betrag:</text>
+ <button label="Bezahlen" label_selected="Bezahlen" name="pay btn"/>
+ <button label="Abbrechen" label_selected="Abbrechen" name="cancel btn"/>
+ </panel>
</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_report_abuse.xml b/indra/newview/skins/default/xui/de/floater_report_abuse.xml
index 34cb3d1cc2..6999679b3f 100755
--- a/indra/newview/skins/default/xui/de/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/de/floater_report_abuse.xml
@@ -77,7 +77,7 @@ Objekt:
<combo_box.item label="Land &gt; Unbefugte Nutzung &gt; Objekte oder Texturen" name="Land__Encroachment__Objects_textures"/>
<combo_box.item label="Land &gt; Unbefugte Nutzung &gt; Partikel" name="Land__Encroachment__Particles"/>
<combo_box.item label="Land &gt; Unbefugte Nutzung &gt; Bäume/Pflanzen" name="Land__Encroachment__Trees_plants"/>
- <combo_box.item label="Wetten/Glücksspiel" name="Wagering_gambling"/>
+ <combo_box.item label="Verstoß gegen die Spielerichtlinie" name="Wagering_gambling"/>
<combo_box.item label="Sonstige" name="Other"/>
</combo_box>
<text name="abuser_name_title">
diff --git a/indra/newview/skins/default/xui/de/floater_snapshot.xml b/indra/newview/skins/default/xui/de/floater_snapshot.xml
index 51614f1e8d..f0152ad8cd 100755
--- a/indra/newview/skins/default/xui/de/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/de/floater_snapshot.xml
@@ -39,13 +39,7 @@
<string name="local_failed_str">
Fehler beim Speichern auf dem Computer.
</string>
- <button name="advanced_options_btn" tool_tip="Erweiterte Optionen"/>
- <text name="image_res_text">
- [WIDTH]px (Breite) x [HEIGHT]px (Höhe)
- </text>
- <text name="file_size_label">
- [SIZE] KB
- </text>
+ <button label="AKTUALISIEREN" name="new_snapshot_btn"/>
<panel name="advanced_options_panel">
<text name="layer_type_label">
Aufnehmen:
@@ -65,4 +59,10 @@
<combo_box.item label="Kein Filter" name="NoFilter"/>
</combo_box>
</panel>
+ <text name="image_res_text">
+ [WIDTH] px (Breite) x [HEIGHT] px (Höhe)
+ </text>
+ <text name="file_size_label">
+ [SIZE] KB
+ </text>
</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_top_objects.xml b/indra/newview/skins/default/xui/de/floater_top_objects.xml
index f8130c6379..d01b4640c2 100755
--- a/indra/newview/skins/default/xui/de/floater_top_objects.xml
+++ b/indra/newview/skins/default/xui/de/floater_top_objects.xml
@@ -21,6 +21,12 @@
<floater.string name="none_descriptor">
Nicht gefunden.
</floater.string>
+ <floater.string name="URLs">
+ URLs
+ </floater.string>
+ <floater.string name="memory">
+ Speicher (KB)
+ </floater.string>
<text name="title_text">
Wird geladen...
</text>
@@ -30,7 +36,7 @@
<scroll_list.columns label="Eigentümer" name="owner"/>
<scroll_list.columns label="Position" name="location" width="125"/>
<scroll_list.columns label="Parzelle" name="parcel"/>
- <scroll_list.columns label="Uhrzeit" name="time"/>
+ <scroll_list.columns label="Datum" name="time"/>
<scroll_list.columns label="URLs" name="URLs"/>
<scroll_list.columns label="Speicher (KB)" name="memory"/>
</scroll_list>
diff --git a/indra/newview/skins/default/xui/de/floater_twitter.xml b/indra/newview/skins/default/xui/de/floater_twitter.xml
index a79a5d3cac..483641c260 100644
--- a/indra/newview/skins/default/xui/de/floater_twitter.xml
+++ b/indra/newview/skins/default/xui/de/floater_twitter.xml
@@ -1,17 +1,13 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="floater_twitter" title="TWITTER">
- <panel name="background">
- <tab_container name="tabs">
- <panel label="ERSTELLEN" name="panel_twitter_photo"/>
- <panel label="KONTO" name="panel_twitter_account"/>
- </tab_container>
- <panel name="connection_status_panel">
- <text name="connection_error_text">
- Fehler
- </text>
- <text name="connection_loading_text">
- Laden...
- </text>
- </panel>
- </panel>
+ <tab_container name="tabs">
+ <panel label="ERSTELLEN" name="panel_twitter_photo"/>
+ <panel label="KONTO" name="panel_twitter_account"/>
+ </tab_container>
+ <text name="connection_error_text">
+ Fehler
+ </text>
+ <text name="connection_loading_text">
+ Laden...
+ </text>
</floater>
diff --git a/indra/newview/skins/default/xui/de/menu_attachment_self.xml b/indra/newview/skins/default/xui/de/menu_attachment_self.xml
index 7888c7b0a1..e0f37b28af 100755
--- a/indra/newview/skins/default/xui/de/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/de/menu_attachment_self.xml
@@ -8,6 +8,7 @@
<menu_item_call label="Mein Aussehen" name="Change Outfit"/>
<menu_item_call label="Mein Outfit bearbeiten" name="Edit Outfit"/>
<menu_item_call label="Meine Form bearbeiten" name="Edit My Shape"/>
+ <menu_item_call label="Schwebehöhe" name="Hover Height"/>
<menu_item_call label="Meine Freunde" name="Friends..."/>
<menu_item_call label="Meine Gruppen" name="Groups..."/>
<menu_item_call label="Mein Profil" name="Profile..."/>
diff --git a/indra/newview/skins/default/xui/de/menu_avatar_self.xml b/indra/newview/skins/default/xui/de/menu_avatar_self.xml
index 022cd8c3ca..b53f8cd6af 100755
--- a/indra/newview/skins/default/xui/de/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/de/menu_avatar_self.xml
@@ -25,6 +25,7 @@
<menu_item_call label="Mein Aussehen" name="Chenge Outfit"/>
<menu_item_call label="Mein Outfit bearbeiten" name="Edit Outfit"/>
<menu_item_call label="Meine Form bearbeiten" name="Edit My Shape"/>
+ <menu_item_call label="Schwebehöhe" name="Hover Height"/>
<menu_item_call label="Meine Freunde" name="Friends..."/>
<menu_item_call label="Meine Gruppen" name="Groups..."/>
<menu_item_call label="Mein Profil" name="Profile..."/>
diff --git a/indra/newview/skins/default/xui/de/menu_inventory.xml b/indra/newview/skins/default/xui/de/menu_inventory.xml
index d838f736f8..e1f545adfc 100755
--- a/indra/newview/skins/default/xui/de/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/de/menu_inventory.xml
@@ -1,5 +1,14 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<menu name="Popup">
+ <menu_item_call label="Auflistung erstellen" name="Marketplace Create Listing"/>
+ <menu_item_call label="Auflistung verknüpfen" name="Marketplace Associate Listing"/>
+ <menu_item_call label="Auflistung abrufen (aktualisieren)" name="Marketplace Get Listing"/>
+ <menu_item_call label="Auf Fehler prüfen" name="Marketplace Check Listing"/>
+ <menu_item_call label="Auflistung bearbeiten" name="Marketplace Edit Listing"/>
+ <menu_item_call label="Auflisten" name="Marketplace List"/>
+ <menu_item_call label="Entfernen" name="Marketplace Unlist"/>
+ <menu_item_call label="Aktivieren" name="Marketplace Activate"/>
+ <menu_item_call label="Deaktivieren" name="Marketplace Deactivate"/>
<menu_item_call label="Teilen" name="Share"/>
<menu_item_call label="Kaufen" name="Task Buy"/>
<menu_item_call label="Öffnen" name="Task Open"/>
@@ -87,6 +96,7 @@
<menu_item_call label="Hinzufügen" name="Wearable Add"/>
<menu_item_call label="Ausziehen" name="Take Off"/>
<menu_item_call label="In Händler-Outbox kopieren" name="Merchant Copy"/>
- <menu_item_call label="In Marktplatz übertragen" name="Marketplace Send"/>
+ <menu_item_call label="In Marktplatz-Auflistungen kopieren" name="Marketplace Copy"/>
+ <menu_item_call label="In Marktplatz-Auflistungen verschieben" name="Marketplace Move"/>
<menu_item_call label="--keine Optionen--" name="--no options--"/>
</menu>
diff --git a/indra/newview/skins/default/xui/de/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/de/menu_inventory_gear_default.xml
index 48dec3e856..7438fc5aa2 100755
--- a/indra/newview/skins/default/xui/de/menu_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/de/menu_inventory_gear_default.xml
@@ -5,7 +5,7 @@
<menu_item_check label="Nach aktuellesten Objekten sortieren" name="sort_by_recent"/>
<menu_item_check label="Ordner immer nach Namen sortieren" name="sort_folders_by_name"/>
<menu_item_check label="Systemordner nach oben" name="sort_system_folders_to_top"/>
- <menu_item_call label="Filter anzeigen" name="show_filters"/>
+ <menu_item_call label="Filter anzeigen..." name="show_filters"/>
<menu_item_call label="Filter zurücksetzen" name="reset_filters"/>
<menu_item_call label="Alle Ordner schließen" name="close_folders"/>
<menu_item_call label="Fundbüro ausleeren" name="empty_lostnfound"/>
diff --git a/indra/newview/skins/default/xui/de/menu_marketplace_view.xml b/indra/newview/skins/default/xui/de/menu_marketplace_view.xml
new file mode 100644
index 0000000000..41516a1e7c
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_marketplace_view.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_marketplace_sort">
+ <menu_item_check label="Nach verfügbarer Menge sortieren (niedrig bis hoch)" name="sort_by_stock_amount"/>
+ <menu_item_check label="Nur Auflistungsordner anzeigen" name="show_only_listing_folders"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_url_experience.xml b/indra/newview/skins/default/xui/de/menu_url_experience.xml
new file mode 100644
index 0000000000..45c118cb6d
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_url_experience.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Url Popup">
+ <menu_item_call label="SLurl in die Zwischenablage kopieren" name="url_copy"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_viewer.xml b/indra/newview/skins/default/xui/de/menu_viewer.xml
index 50a6dafa91..1924ff4ec3 100755
--- a/indra/newview/skins/default/xui/de/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/de/menu_viewer.xml
@@ -8,6 +8,7 @@
<menu_item_call label="Neues Inventarfenster" name="NewInventoryWindow"/>
<menu_item_call label="Orte..." name="Places"/>
<menu_item_call label="Auswahlen..." name="Picks"/>
+ <menu_item_call label="Erlebnisse..." name="Experiences"/>
<menu_item_call label="Kamerasteuerungen..." name="Camera Controls"/>
<menu label="Bewegung" name="Movement">
<menu_item_call label="Hinsetzen" name="Sit Down Here"/>
@@ -22,6 +23,7 @@
</menu>
<menu_item_call label="L$ kaufen..." name="Buy and Sell L$"/>
<menu_item_call label="Händler-Outbox..." name="MerchantOutbox"/>
+ <menu_item_call label="Marktplatz-Auflistungen..." name="MarketplaceListings"/>
<menu_item_call label="Kontoübersicht..." name="Manage My Account">
<menu_item_call.on_click name="ManageMyAccount_url" parameter="WebLaunchJoinNow,http://secondlife.com/account/index.php?lang=de"/>
</menu_item_call>
@@ -48,7 +50,7 @@
<menu_item_check label="Freunde" name="My Friends"/>
<menu_item_check label="Gruppen" name="My Groups"/>
<menu_item_check label="Leute in der Nähe" name="Active Speakers"/>
- <menu_item_call label="Blockierliste" name="Block List"/>
+ <menu_item_check label="Blockierliste" name="Block List"/>
<menu_item_check label="Nicht stören" name="Do Not Disturb"/>
</menu>
<menu label="Welt" name="World">
@@ -250,6 +252,7 @@
<menu_item_check label="Textur" name="Texture Console"/>
<menu_item_check label="Fehler beseitigen" name="Debug Console"/>
<menu_item_call label="Meldungen" name="Notifications"/>
+ <menu_item_check label="Regions-Debug-Konsole" name="Region Debug Console"/>
<menu_item_check label="Schnelle Timer" name="Fast Timers"/>
<menu_item_check label="Speicher" name="Memory"/>
<menu_item_check label="Szenestatistiken" name="Scene Statistics"/>
@@ -353,7 +356,7 @@
<menu_item_check label="Positionen der interpolierten Objekte anfragen" name="Ping Interpolate Object Positions"/>
<menu_item_call label="Ein Paket fallenlassen" name="Drop a Packet"/>
</menu>
- <menu_item_call label="Geskriptete Kamera ausgeben" name="Dump Scripted Camera"/>
+ <menu_item_call label="Geskriptete Kamera ausgeben" name="Dump Scripted Camera"/>
<menu label="Rekorder" name="Recorder">
<menu_item_call label="Wiedergabe starten" name="Start Playback"/>
<menu_item_call label="Wiedergabe stoppen" name="Stop Playback"/>
diff --git a/indra/newview/skins/default/xui/de/mime_types.xml b/indra/newview/skins/default/xui/de/mime_types.xml
index de93107e94..ee05e47a63 100755
--- a/indra/newview/skins/default/xui/de/mime_types.xml
+++ b/indra/newview/skins/default/xui/de/mime_types.xml
@@ -44,6 +44,14 @@
Audio an diesem Ort wiedergeben
</playtip>
</widgetset>
+ <widgetset name="none">
+ <label name="none_label">
+ Keine Inhalte
+ </label>
+ <tooltip name="none_tooltip">
+ Keine Medien gefunden
+ </tooltip>
+ </widgetset>
<scheme name="rtsp">
<label name="rtsp_label">
Echtzeit-Streaming
@@ -119,11 +127,6 @@
Macromedia Director
</label>
</mimetype>
- <mimetype name="application/x-shockwave-flash">
- <label name="application/x-shockwave-flash_label">
- Flash
- </label>
- </mimetype>
<mimetype name="audio/mid">
<label name="audio/mid_label">
Audio (MIDI)
diff --git a/indra/newview/skins/default/xui/de/mime_types_linux.xml b/indra/newview/skins/default/xui/de/mime_types_linux.xml
index e4b5c53292..ffe819d157 100755
--- a/indra/newview/skins/default/xui/de/mime_types_linux.xml
+++ b/indra/newview/skins/default/xui/de/mime_types_linux.xml
@@ -44,6 +44,14 @@
Das Audio dieses Standorts abspielen
</playtip>
</widgetset>
+ <widgetset name="none">
+ <label name="none_label">
+ Keine Inhalte
+ </label>
+ <tooltip name="none_tooltip">
+ Keine Medien gefunden
+ </tooltip>
+ </widgetset>
<scheme name="rtsp">
<label name="rtsp_label">
Echtzeit-Streaming
diff --git a/indra/newview/skins/default/xui/de/mime_types_mac.xml b/indra/newview/skins/default/xui/de/mime_types_mac.xml
index e4b5c53292..ffe819d157 100755
--- a/indra/newview/skins/default/xui/de/mime_types_mac.xml
+++ b/indra/newview/skins/default/xui/de/mime_types_mac.xml
@@ -44,6 +44,14 @@
Das Audio dieses Standorts abspielen
</playtip>
</widgetset>
+ <widgetset name="none">
+ <label name="none_label">
+ Keine Inhalte
+ </label>
+ <tooltip name="none_tooltip">
+ Keine Medien gefunden
+ </tooltip>
+ </widgetset>
<scheme name="rtsp">
<label name="rtsp_label">
Echtzeit-Streaming
diff --git a/indra/newview/skins/default/xui/de/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml
index 2fa5005d15..0b1c18cd51 100755
--- a/indra/newview/skins/default/xui/de/notifications.xml
+++ b/indra/newview/skins/default/xui/de/notifications.xml
@@ -73,6 +73,10 @@ Fehlerdetails: The notification called &apos;[_NAME]&apos; was not found in noti
[MESSAGE]
<usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="Ja"/>
</notification>
+ <notification name="GenericAlertOK">
+ [MESSAGE]
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
<notification name="BadInstallation">
Beim Aktualisieren von [APP_NAME] ist ein Fehler aufgetreten. Bitte [http://get.secondlife.com laden Sie die aktuellste Version des Viewers herunter].
<usetemplate name="okbutton" yestext="OK"/>
@@ -125,6 +129,88 @@ Aufgrund eines System- oder Netzwerkfehlers wurden keine Ordner an den Marktplat
Marktplatzinitialisierung aufgrund eines System- oder Netzwerkfehlers fehlgeschlagen. Versuchen Sie es später erneut.
<usetemplate name="okbutton" yestext="OK"/>
</notification>
+ <notification name="StockPasteFailed">
+ Kopieren oder Verschieben in Bestandsordner fehlgeschlagen mit Fehler:
+
+ „[ERROR_CODE]“
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="MerchantPasteFailed">
+ Kopieren oder Verschieben von Marktplatz-Auflistungen fehlgeschlagen mit Fehler:
+
+ „[ERROR_CODE]“
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="MerchantTransactionFailed">
+ Marktplatztransaktion fehlgeschlagen mit Fehler:
+
+ Grund: „[ERROR_REASON]“
+ [ERROR_DESCRIPTION]
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="MerchantUnprocessableEntity">
+ Wir konnten dieses Produkt nicht auflisten bzw. den Versionsordner nicht aktivieren. Dies liegt meist an fehlenden Informationen im Formular zur Beschreibung der Auflistung, kann aber auch auf eine falsche Ordnerstruktur zurückzuführen sein. Bearbeiten Sie die Auflistung oder überprüfen Sie den Auflistungsordner auf Fehler.
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="MerchantListingFailed">
+ Auflistung in Marktplatz fehlgeschlagen mit Fehler:
+
+ „[ERROR_CODE]“
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="MerchantFolderActivationFailed">
+ Aktivierung dieses Versionsordners fehlgeschlagen mit Fehler:
+
+ „[ERROR_CODE]“
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="ConfirmMerchantActiveChange">
+ Diese Aktion ändert den aktiven Inhalt dieser Auflistung. Möchten Sie fortfahren?
+ <usetemplate ignoretext="Vor Ändern einer aktiven Auflistung im Marktplatz bestätigen" name="okcancelignore" notext="Abbrechen" yestext="OK"/>
+ </notification>
+ <notification name="ConfirmMerchantMoveInventory">
+ Objekte, die ins Marktplatz-Auflistungsfenster gezogen werden, werden verschoben, nicht kopiert. Möchten Sie fortfahren?
+ <usetemplate ignoretext="Vor Verschieben eines Objekts aus dem Inventar in den Marktplatz bestätigen" name="okcancelignore" notext="Abbrechen" yestext="OK"/>
+ </notification>
+ <notification name="ConfirmListingCutOrDelete">
+ Wenn Sie einen Auflistungsordner verschieben oder löschen, wird Ihre Marktplatz-Auflistung gelöscht. Um die Marktplatz-Auflistung beizubehalten, verschieben oder löschen Sie den Inhalt des Versionsordners, den Sie ändern möchten. Möchten Sie fortfahren?
+ <usetemplate ignoretext="Bestätigen, bevor ich eine Auflistung aus dem Marktplatz entferne oder verschiebe" name="okcancelignore" notext="Abbrechen" yestext="OK"/>
+ </notification>
+ <notification name="ConfirmCopyToMarketplace">
+ Sie haben keine Berechtigung, eines oder mehrere dieser Objekte in den Marktplatz zu kopieren. Sie können sie verschieben oder zurücklassen.
+ <usetemplate canceltext="Abbrechen" ignoretext="Vor Kopieren einer Auswahl mit kopiergeschützten Objekten in den Marktplatz bestätigen" name="yesnocancelbuttons" notext="Artikel nicht verschieben" yestext="Artikel verschieben"/>
+ </notification>
+ <notification name="ConfirmMerchantUnlist">
+ Diese Aktion entfernt diese Auflistung. Möchten Sie fortfahren?
+ <usetemplate ignoretext="Vor Entfernen einer aktiven Auflistung aus dem Marktplatz bestätigen" name="okcancelignore" notext="Abbrechen" yestext="OK"/>
+ </notification>
+ <notification name="ConfirmMerchantClearVersion">
+ Diese Aktion deaktiviert den Versionsordner der aktuellen Auflistung. Möchten Sie fortfahren?
+ <usetemplate ignoretext="Vor Deaktivieren des Versionsordners einer Auflistung im Marktplatz bestätigen" name="okcancelignore" notext="Abbrechen" yestext="OK"/>
+ </notification>
+ <notification name="AlertMerchantListingNotUpdated">
+ Diese Auflistung konnte nicht aktualisiert werden.
+[[URL] Klicken Sie hier], um sie im Marktplatz zu bearbeiten.
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="AlertMerchantListingCannotWear">
+ Sie können keine Kleidung oder Körperteile tragen, die im Marktplatz-Auflistungsordner enthalten sind
+ </notification>
+ <notification name="AlertMerchantListingInvalidID">
+ Auflistungs-ID ungültig.
+ </notification>
+ <notification name="AlertMerchantListingActivateRequired">
+ In dieser Auflistung gibt es mehrere oder keine Versionsordner. Sie müssen später einen auswählen und aktivieren.
+ <usetemplate ignoretext="Benachrichtung zur Versionsordneraktivierung, wenn ich eine Auflistung mit mehreren Versionsordnern erstelle" name="okignore" yestext="OK"/>
+ </notification>
+ <notification name="AlertMerchantStockFolderSplit">
+ Wir haben Bestandsobjekte unterschiedlicher Typen in separate Bestandsordner gelegt, damit wir Ihren Ordner auflisten können.
+ <usetemplate ignoretext="Benachrichtigen,wenn Bestandsordner vor dem Auflisten aufgeteilt wird" name="okignore" yestext="OK"/>
+ </notification>
+ <notification name="AlertMerchantStockFolderEmpty">
+ Wir haben Ihre Auflistung entfernt, da der Bestandsordner leer ist. Um diese Auflistung wieder zu listen, müssen Sie weitere Einheiten zum Bestandsordner hinzufügen.
+ <usetemplate ignoretext="Benachrichtigen, wenn Auflistung aufgrund eines leeren Bestandsordners nicht aufgelistet wird" name="okignore" yestext="OK"/>
+ </notification>
<notification name="CompileQueueSaveText">
Der Text für ein Skript konnte aus folgendem Grund nicht hochgeladen werden: [REASON]. Bitte versuchen Sie es erneut.
</notification>
@@ -476,6 +562,10 @@ Hinweis: Der Cache wird dabei gelöscht/geleert.
Änderungen speichern?
<usetemplate canceltext="Abbrechen" name="yesnocancelbuttons" notext="Nicht speichern" yestext="Speichern"/>
</notification>
+ <notification name="DeleteNotecard">
+ Notizkarte löschen?
+ <usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/>
+ </notification>
<notification name="GestureSaveFailedTooManySteps">
Speichern der Geste fehlgeschlagen.
Die Geste besteht aus zu vielen Schritten.
@@ -582,6 +672,9 @@ Sie können die Grafikqualität unter Einstellungen &gt; Grafik wieder erhöhen.
<notification name="RegionNoTerraforming">
Die Region [REGION] erlaubt kein Terraforming.
</notification>
+ <notification name="ParcelNoTerraforming">
+ Sie sind nicht zum Terraformen der Parzelle „[PARCEL]“ berechtigt.
+ </notification>
<notification name="CannotCopyWarning">
Sie sind nicht berechtigt, die folgenden Objekte zu kopieren:
[ITEMS]
@@ -1839,6 +1932,30 @@ Tausende Regionen werden verändert und der Spaceserver wird dadurch stark belas
Verwalter nur für diesen Grundbesitz oder für [ALL_ESTATES] entfernen?
<usetemplate canceltext="Abbrechen" name="yesnocancelbuttons" notext="Alle Grundbesitze" yestext="Diesen Grundbesitz"/>
</notification>
+ <notification label="Grundbesitz auswählen" name="EstateAllowedExperienceAdd">
+ Nur für diesen Grundbesitz oder für [ALL_ESTATES] zur Erlaubnisliste hinzufügen?
+ <usetemplate canceltext="Abbrechen" name="yesnocancelbuttons" notext="Alle Grundbesitze" yestext="Dieser Grundbesitz"/>
+ </notification>
+ <notification label="Grundbesitz auswählen" name="EstateAllowedExperienceRemove">
+ Nur für diesen Grundbesitz oder für [ALL_ESTATES] aus der Erlaubnisliste entfernen?
+ <usetemplate canceltext="Abbrechen" name="yesnocancelbuttons" notext="Alle Grundbesitze" yestext="Dieser Grundbesitz"/>
+ </notification>
+ <notification label="Grundbesitz auswählen" name="EstateBlockedExperienceAdd">
+ Nur für diesen Grundbesitz oder für [ALL_ESTATES] zur Blockierliste hinzufügen?
+ <usetemplate canceltext="Abbrechen" name="yesnocancelbuttons" notext="Alle Grundbesitze" yestext="Dieser Grundbesitz"/>
+ </notification>
+ <notification label="Grundbesitz auswählen" name="EstateBlockedExperienceRemove">
+ Nur für diesen Grundbesitz oder für [ALL_ESTATES] aus der Blockierliste entfernen?
+ <usetemplate canceltext="Abbrechen" name="yesnocancelbuttons" notext="Alle Grundbesitze" yestext="Dieser Grundbesitz"/>
+ </notification>
+ <notification label="Grundbesitz auswählen" name="EstateTrustedExperienceAdd">
+ Nur für diesen Grundbesitz oder für [ALL_ESTATES] zur Schlüsselliste hinzufügen?
+ <usetemplate canceltext="Abbrechen" name="yesnocancelbuttons" notext="Alle Grundbesitze" yestext="Dieser Grundbesitz"/>
+ </notification>
+ <notification label="Grundbesitz auswählen" name="EstateTrustedExperienceRemove">
+ Nur für diesen Grundbesitz oder für [ALL_ESTATES] aus der Schlüsselliste entfernen?
+ <usetemplate canceltext="Abbrechen" name="yesnocancelbuttons" notext="Alle Grundbesitze" yestext="Dieser Grundbesitz"/>
+ </notification>
<notification label="Rauswurf bestätigen" name="EstateKickUser">
Benutzer [EVIL_USER] von diesem Grundbesitz werfen?
<usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/>
@@ -1851,6 +1968,9 @@ Tausende Regionen werden verändert und der Spaceserver wird dadurch stark belas
Die Region, die Sie besuchen möchten, enthält Inhalte, die Ihre aktuellen Einstellungen überschreiten. Sie können Ihre Einstellungen unter „Ich“ &gt; „Einstellungen“ &gt; „Allgemein“ ändern.
<usetemplate name="okbutton" yestext="OK"/>
</notification>
+ <notification name="SLM_UPDATE_FOLDER">
+ [MESSAGE]
+ </notification>
<notification name="RegionEntryAccessBlocked_AdultsOnlyContent">
Die Region, die Sie besuchen möchten, enthält [REGIONMATURITY]-Inhalte, die nur für Erwachsene zugänglich sind.
<url name="url">
@@ -1913,6 +2033,10 @@ Tausende Regionen werden verändert und der Spaceserver wird dadurch stark belas
Wir haben technische Probleme mit Ihrem Teleport, da Ihre Einstellungen nicht mit dem Server synchronisiert sind.
<usetemplate name="okbutton" yestext="OK"/>
</notification>
+ <notification name="RegionTPSpecialUsageBlocked">
+ Betreten der Region nicht gestattet. „[REGION_NAME]“ ist eine Region für Geschicklichkeitsspiele. Der Zugang ist Einwohnern vorbehalten, die bestimmte Kriterien erfüllen. Weitere Details finden Sie unter [http://wiki.secondlife.com/wiki/Linden_Lab_Official:Skill_Gaming_in_Second_Life Skill Gaming FAQ].
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
<notification name="PreferredMaturityChanged">
Sie erhalten keine Benachrichtigungen mehr, wenn Sie eine Region der Inhaltseinstufung „[RATING]“ besuchen. Sie können Ihre Inhaltseinstellungen von der Menüleiste aus ändern („Ich“ &gt; „Einstellungen“ &gt; „Allgemein“).
<usetemplate name="okbutton" yestext="OK"/>
@@ -2136,6 +2260,10 @@ Inventarobjekt(e) verschieben?
<ignore name="ignore" text="Ich habe die Aktion „Objekt bezahlen&quot; eingestellt, während ich ein Objekt gebaut habe, dass kein Geld()-Skript enthält."/>
</form>
</notification>
+ <notification name="PayConfirmation">
+ Bestätigen Sie, dass Sie L$ [AMOUNT] an [TARGET] zahlen möchten.
+ <usetemplate ignoretext="Vor den Bezahlen bestätigen (Summen über L$ 200)" name="okcancelignore" notext="Abbrechen" yestext="Bezahlen"/>
+ </notification>
<notification name="OpenObjectCannotCopy">
Sie haben keine Berechtigung zum Kopieren von Elementen in diesem Objekt.
</notification>
@@ -2220,6 +2348,9 @@ Möchten Sie es mit dem ausgewählten Objekt ersetzen?
<button ignore="Nie ersetzen" name="No" text="Abbrechen"/>
</form>
</notification>
+ <notification name="TooManyWearables">
+ Sie können keinen Ordner tragen, der mehr als [AMOUNT] Elemente enthält. Sie können diesen Höchstwert unter „Erweitert“ &gt; „Debug-Einstellungen anzeigen“ &gt; „WearFolderLimit“ ändern.
+ </notification>
<notification label="Warnung für Nicht-stören-Modus" name="DoNotDisturbModePay">
Sie haben den Nicht-stören-Modus aktiviert. Sie erhalten keine Artikel, die im Gegenzug für diese Zahlung angeboten werden.
@@ -2828,7 +2959,7 @@ Wenn Sie in dieser Region bleiben, werden Sie abgemeldet.
[MESSAGE]
-Von Objekt: &lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;, Eigentümer: [NAME]?
+Von Objekt: &lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;, Eigentümer: [NAME]
<form name="form">
<button name="Gotopage" text="Zur Seite"/>
<button name="Cancel" text="Abbrechen"/>
@@ -2854,6 +2985,72 @@ Ist das OK?
<button name="Mute" text="Ignorieren"/>
</form>
</notification>
+ <notification name="ExperienceAcquireFailed">
+ Fehler beim Erwerb eines neuen Erlebnisses:
+ [ERROR_MESSAGE]
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="NotInGroupExperienceProfileMessage">
+ Eine Änderung der Erlebnisgruppe wurde ignoriert, weil der Eigentümer nicht Mitglied der ausgewählten Gruppe ist.
+ </notification>
+ <notification name="UneditableExperienceProfileMessage">
+ Das nicht bearbeitbare Feld „[field]“ wurde beim Aktualisieren des Erlebnisprofils ignoriert.
+ </notification>
+ <notification name="RestrictedToOwnerExperienceProfileMessage">
+ Änderungen des Felds „[field]“ ignoriert; Feld kann nur vom Eigentümer des Erlebnisses eingestellt werden.
+ </notification>
+ <notification name="MaturityRatingExceedsOwnerExperienceProfileMessage">
+ Sie können die Inhaltseinstufung eines Erlebnisses nicht auf eine höhere Stufe setzen als die des Eigentümers.
+ </notification>
+ <notification name="RestrictedTermExperienceProfileMessage">
+ Die folgenden Elemente verhinderten die Aktualisierung des Namens und/oder der Beschreibung im Erlebnisprofil: [extra_info]
+ </notification>
+ <notification name="TeleportedHomeExperienceRemoved">
+ Sie wurden aus der Region [region_name] teleportiert, weil Sie das Erlebnis secondlife:///app/experience/[public_id]/profile entfernt haben und nicht mehr berechtigt sind, sich in dieser Region aufzuhalten.
+ <form name="form">
+ <ignore name="ignore" text="Wegen Entfernen eines Erlebnisses aus Region hinausgeworfen"/>
+ </form>
+ </notification>
+ <notification name="TrustedExperienceEntry">
+ Sie durften die Region [region_name] betreten, weil Sie am Schlüsselerlebnis secondlife:///app/experience/[public_id]/profile teilgenommen haben. Wenn Sie dieses Erlebnis entfernen, werden Sie u. U. aus der Region hinausgeworfen.
+ <form name="form">
+ <ignore name="ignore" text="Betreten der Region durch ein Erlebnis gestattet"/>
+ </form>
+ </notification>
+ <notification name="TrustedExperiencesAvailable">
+ Sie haben keinen Zugang zu diesem Ziel. Sie erhalten u. U. Zugang zur Region, wenn Sie unten ein Erlebnis akzeptieren:
+
+[EXPERIENCE_LIST]
+
+Möglicherweise sind noch weitere Schlüsselerlebnisse verfügbar.
+ </notification>
+ <notification name="ExperienceEvent">
+ Ein Objekt erhielt vom Erlebnis secondlife:///app/experience/[public_id]/profile die Erlaubnis zum Durchführen der folgenden Aktion: [EventType].
+ Eigentümer: secondlife:///app/agent/[OwnerID]/inspect
+ Objektname: [ObjectName]
+ Parzellenname: [ParcelName]
+ </notification>
+ <notification name="ExperienceEventAttachment">
+ Ein Anhang erhielt vom Erlebnis secondlife:///app/experience/[public_id]/profile die Erlaubnis zum Durchführen der folgenden Aktion: [EventType].
+ Eigentümer: secondlife:///app/agent/[OwnerID]/inspect
+ </notification>
+ <notification name="ScriptQuestionExperience">
+ „&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;“, ein Objekt, das „[NAME]“ gehört, lädt Sie zur Teilnahme an diesem Erlebnis mit [GRID_WIDE] ein:
+
+[EXPERIENCE]
+
+Nach Erteilung der Genehmigung wird diese Nachricht für dieses Erlebnis nicht erneut angezeigt, es sei denn, Sie widerrufen die Genehmigung im Erlebnisprofil.
+
+Mit diesem Erlebnis verknüpfte Skripts können in Regionen, in denen dieses Erlebnis aktiv ist, Folgendes tun:
+
+[QUESTIONS]Sind Sie damit einverstanden?
+ <form name="form">
+ <button name="BlockExperience" text="Erlebnis blockieren"/>
+ <button name="Mute" text="Objekt blockieren"/>
+ <button name="Yes" text="Ja"/>
+ <button name="No" text="Nein"/>
+ </form>
+ </notification>
<notification name="ScriptQuestionCaution">
Achtung: Das Objekt „&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;“ fordert uneingeschränkten Zugriff auf Ihr Linden-Dollar-Konto an. Wenn Sie Zugriff gewähren, kann dieses Objekt jederzeit und ohne weitere Warnung Ihr Konto belasten bzw. ganz leeren.
@@ -3174,6 +3371,10 @@ Sie haben eine [RESOLUTION]-gebackene Textur für „[BODYREGION]“ nach [TIME]
( [EXISTENCE] Sekunden am Leben)
Sie haben lokal eine [RESOLUTION]-gebackene Textur für „[BODYREGION]“ nach [TIME] Sekunden aktualisiert.
</notification>
+ <notification name="CannotUploadTexture">
+ Textur kann nicht hochgeladen werden.
+[REASON]
+ </notification>
<notification name="LivePreviewUnavailable">
Wir können keine Vorschau dieser Textur anzeigen, da sie nicht kopier- und/oder übertragungsfähig ist.
<usetemplate ignoretext="Hinweis anzeigen, wenn bei nicht kopier- und/oder übertragungsfähigen Texturen keine Live-Vorschau möglich ist" name="okignore" yestext="OK"/>
@@ -3747,9 +3948,11 @@ Warten Sie kurz und versuchen Sie es noch einmal.
</notification>
<notification name="TeleportedByAttachment">
Sie wurden von einem Anhang an [ITEM_ID] teleportiert
+ <usetemplate ignoretext="Teleport: Sie wurden von einem Anhang teleportiert" name="notifyignore"/>
</notification>
<notification name="TeleportedByObjectOnParcel">
Sie wurden von Objekt „[OBJECT_NAME]“ auf der Parzelle „[PARCEL_NAME]“ teleportiert
+ <usetemplate ignoretext="Teleport: Sie wurden von einem Objekt in einer Parzelle teleportiert" name="notifyignore"/>
</notification>
<notification name="TeleportedByObjectOwnedBy">
Sie wurden von Objekt „[OBJECT_NAME]“, das [OWNER_ID] gehört, teleportiert
@@ -4081,7 +4284,7 @@ Wählen Sie eine kleinere Landfläche aus.
<usetemplate ignoretext="Dateien können nicht verschoben werden. Vorheriger Pfad wurde wiederhergestellt." name="okignore" yestext="OK"/>
</notification>
<notification name="DefaultObjectPermissions">
- Die Standardberechtigungen konnten aus folgendem Grund nicht gespeichert werden: [REASON]. Versuchen Sie später, die Standardberechtigungen einzustellen.
+ Problem beim Speichern der standardmäßigen Objektberechtigungen: [REASON]. Versuchen Sie später, die Standardberechtigungen einzustellen.
<usetemplate name="okbutton" yestext="OK"/>
</notification>
<notification name="ChatHistoryIsBusyAlert">
diff --git a/indra/newview/skins/default/xui/de/panel_experience_info.xml b/indra/newview/skins/default/xui/de/panel_experience_info.xml
new file mode 100644
index 0000000000..7231719561
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_experience_info.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_experience_info">
+ <text name="title" value="Erlebnisprofil"/>
+ <scroll_container name="xp_scroll">
+ <panel name="scrolling_panel">
+ <layout_stack>
+ <layout_panel>
+ <text name="experience_title" value="Kyle&apos;s Superhero RPG"/>
+ </layout_panel>
+ <layout_panel name="location panel">
+ <text name="Location">
+ Standort:
+ </text>
+ <text name="LocationTextText">
+ irgendwo
+ </text>
+ <button label="Teleportieren" name="teleport_btn"/>
+ <button label="Karte" name="map_btn"/>
+ </layout_panel>
+ <layout_panel name="marketplace panel">
+ <text name="Location">
+ Marketplace-Laden:
+ </text>
+ <text name="LocationTextText">
+ irgendwo
+ </text>
+ </layout_panel>
+ <layout_panel>
+ <text name="ContentRating">
+ Einstufung:
+ </text>
+ <text name="ContentRatingText">
+ Adult
+ </text>
+ <text name="Owner">
+ Eigentümer:
+ </text>
+ <text name="OwnerText">
+ Kyle
+ </text>
+ <button label="Bearbeiten" name="edit_btn"/>
+ </layout_panel>
+ </layout_stack>
+ </panel>
+ </scroll_container>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_experience_list_editor.xml b/indra/newview/skins/default/xui/de/panel_experience_list_editor.xml
new file mode 100644
index 0000000000..b87c814485
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_experience_list_editor.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="experince_list_editor">
+ <panel.string name="loading">
+ wird geladen...
+ </panel.string>
+ <panel.string name="panel_allowed">
+ Zulässige Erlebnisse:
+ </panel.string>
+ <panel.string name="panel_blocked">
+ Blockierte Erlebnisse:
+ </panel.string>
+ <panel.string name="panel_trusted">
+ Schlüsselerlebnisse:
+ </panel.string>
+ <panel.string name="no_results">
+ (leer)
+ </panel.string>
+ <text name="text_name">
+ Erlebnisliste
+ </text>
+ <scroll_list name="experience_list">
+ <columns label="Name" name="experience_name"/>
+ </scroll_list>
+ <button label="Hinzufügen..." name="btn_add"/>
+ <button label="Entfernen" name="btn_remove"/>
+ <button label="Profil..." name="btn_profile"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_experience_list_item.xml b/indra/newview/skins/default/xui/de/panel_experience_list_item.xml
new file mode 100644
index 0000000000..cfffa27a20
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_experience_list_item.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Experiences">
+ <text name="experience_name">
+ Dummy-Name
+ </text>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_experience_log.xml b/indra/newview/skins/default/xui/de/panel_experience_log.xml
new file mode 100644
index 0000000000..393bbbbf8e
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_experience_log.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="EVENTS">
+ <string name="no_events" value="Keine Events."/>
+ <string name="loading" value="Laden..."/>
+ <layout_stack>
+ <layout_panel>
+ <scroll_list name="experience_log_list">
+ <columns label="Zeit" name="time"/>
+ <columns label="Event" name="event"/>
+ <columns label="Erlebnis" name="experience_name"/>
+ <columns label="Objekt" name="object_name"/>
+ </scroll_list>
+ <button label="Benachrichtigen" name="btn_notify"/>
+ <button label="Profil" name="btn_profile_xp"/>
+ <button label="Melden" name="btn_report_xp"/>
+ </layout_panel>
+ <layout_panel name="button_panel">
+ <check_box label="Alle Events benachrichtigen Tage" name="notify_all"/>
+ <button label="Entfernen" name="btn_clear"/>
+ <button label="&lt;" name="btn_prev"/>
+ <button label="&gt;" name="btn_next"/>
+ </layout_panel>
+ </layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_experience_search.xml b/indra/newview/skins/default/xui/de/panel_experience_search.xml
new file mode 100644
index 0000000000..e556335213
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_experience_search.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="SEARCH">
+ <string name="not_found">
+ „[TEXT]“ nicht gefunden
+ </string>
+ <string name="no_results">
+ Keine Ergebnisse
+ </string>
+ <string name="searching">
+ Suchen...
+ </string>
+ <string name="loading">
+ Laden...
+ </string>
+ <string name="maturity_icon_general">
+ &quot;Parcel_PG_Light&quot;
+ </string>
+ <string name="maturity_icon_moderate">
+ &quot;Parcel_M_Light&quot;
+ </string>
+ <string name="maturity_icon_adult">
+ &quot;Parcel_R_Light&quot;
+ </string>
+ <panel name="search_panel">
+ <button label="Los" name="find"/>
+ <icons_combo_box label="Moderat" name="maturity">
+ <icons_combo_box.item label="Adult" name="Adult" value="42"/>
+ <icons_combo_box.item label="Moderat" name="Mature" value="21"/>
+ <icons_combo_box.item label="Allgemein" name="PG" value="13"/>
+ </icons_combo_box>
+ <scroll_list name="search_results">
+ <columns label="Name" name="experience_name"/>
+ <columns label="Eigentümer" name="owner"/>
+ </scroll_list>
+ <button label="OK" label_selected="OK" name="ok_btn"/>
+ <button label="Abbrechen" name="cancel_btn"/>
+ <button label="Profil anzeigen" name="profile_btn"/>
+ <button label="&lt;" name="left_btn"/>
+ <button label="&gt;" name="right_btn"/>
+ </panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_experiences.xml b/indra/newview/skins/default/xui/de/panel_experiences.xml
new file mode 100644
index 0000000000..6c1630d973
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_experiences.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Experiences">
+ <string name="loading_experiences" value="Erlebnisse werden geladen..."/>
+ <string name="no_experiences" value="Keine Erlebnisse."/>
+ <string name="acquire" value="Erlebnis erwerben"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_facebook_friends.xml b/indra/newview/skins/default/xui/de/panel_facebook_friends.xml
index 9712d681c7..f6a8fda23e 100644
--- a/indra/newview/skins/default/xui/de/panel_facebook_friends.xml
+++ b/indra/newview/skins/default/xui/de/panel_facebook_friends.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<panel name="panel_facebook_friends">
<string name="facebook_friends_empty" value="Sie haben gegenwärtig keine Facebook-Freunde, die gleichzeitig Einwohner von Second Life sind. Laden Sie Ihre Facebook-Freunde ein, Second Life beizutreten!"/>
- <string name="facebook_friends_no_connected" value="Sie sind gegenwärtig nicht mit Facebook verbunden. Um eine Verbindung herzustellen und diese Funktion zu aktivieren, gehen Sie zur Registerkarte „Konto“."/>
+ <string name="facebook_friends_no_connected" value="Sie sind gegenwärtig nicht mit Facebook verbunden. Um eine Verbindung herzustellen und diese Funktion zu aktivieren, gehen Sie zur Registerkarte „Status“."/>
<accordion name="friends_accordion">
<accordion_tab name="tab_second_life_friends" title="SL-Freunde"/>
<accordion_tab name="tab_suggested_friends" title="Diese Personen als SL-Freunde hinzufügen"/>
diff --git a/indra/newview/skins/default/xui/de/panel_facebook_photo.xml b/indra/newview/skins/default/xui/de/panel_facebook_photo.xml
index a1aabcd29c..bc48931129 100644
--- a/indra/newview/skins/default/xui/de/panel_facebook_photo.xml
+++ b/indra/newview/skins/default/xui/de/panel_facebook_photo.xml
@@ -1,26 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<panel name="panel_facebook_photo">
- <layout_stack name="stack_photo">
- <layout_panel name="snapshot_panel">
- <combo_box name="resolution_combobox" tool_tip="Bildauflösung">
- <combo_box.item label="Aktuelles Fenster" name="CurrentWindow"/>
- <combo_box.item label="640x480" name="640x480"/>
- <combo_box.item label="800x600" name="800x600"/>
- <combo_box.item label="1024x768" name="1024x768"/>
- <combo_box.item label="1200x630" name="1200x630"/>
- </combo_box>
- <combo_box name="filters_combobox" tool_tip="Bildfilter">
- <combo_box.item label="Kein Filter" name="NoFilter"/>
- </combo_box>
- <button label="Aktualisieren" name="new_snapshot_btn" tool_tip="Zum Aktualisieren klicken"/>
- <button label="Vorschau" name="big_preview_btn" tool_tip="Klicken, um Vorschau ein-/auszuschalten"/>
- <text name="caption_label">
- Kommentar (optional):
- </text>
- </layout_panel>
- <layout_panel name="photo_button_panel">
- <button label="Posten" name="post_photo_btn"/>
- <button label="Abbrechen" name="cancel_photo_btn"/>
- </layout_panel>
- </layout_stack>
+ <combo_box name="resolution_combobox" tool_tip="Bildauflösung">
+ <combo_box.item label="Aktuelles Fenster" name="CurrentWindow"/>
+ <combo_box.item label="640x480" name="640x480"/>
+ <combo_box.item label="800x600" name="800x600"/>
+ <combo_box.item label="1024x768" name="1024x768"/>
+ <combo_box.item label="1200x630" name="1200x630"/>
+ </combo_box>
+ <combo_box name="filters_combobox" tool_tip="Bildfilter">
+ <combo_box.item label="Kein Filter" name="NoFilter"/>
+ </combo_box>
+ <button label="Aktualisieren" name="new_snapshot_btn" tool_tip="Zum Aktualisieren klicken"/>
+ <button label="Vorschau" name="big_preview_btn" tool_tip="Klicken, um Vorschau ein-/auszuschalten"/>
+ <text name="caption_label">
+ Kommentar (optional):
+ </text>
+ <button label="Posten" name="post_photo_btn"/>
+ <button label="Abbrechen" name="cancel_photo_btn"/>
</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_facebook_place.xml b/indra/newview/skins/default/xui/de/panel_facebook_place.xml
index 0f556565b4..102be80502 100644
--- a/indra/newview/skins/default/xui/de/panel_facebook_place.xml
+++ b/indra/newview/skins/default/xui/de/panel_facebook_place.xml
@@ -1,17 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<panel name="panel_facebook_place">
- <layout_stack name="stack_place">
- <layout_panel name="place_detail_panel">
- <text name="place_caption_label">
- Details zu Ihrem aktuellen Standort:
- </text>
- </layout_panel>
- <layout_panel name="place_map_panel">
- <check_box initial_value="false" label="" name="add_place_view_cb"/>
- </layout_panel>
- <layout_panel name="place_button_panel">
- <button label="Posten" name="post_place_btn"/>
- <button label="Abbrechen" name="cancel_place_btn"/>
- </layout_panel>
- </layout_stack>
+ <text name="place_caption_label">
+ Details zu Ihrem aktuellen Standort:
+ </text>
+ <check_box initial_value="false" label="Draufsicht des Standorts einschließen" name="add_place_view_cb"/>
+ <button label="Posten" name="post_place_btn"/>
+ <button label="Abbrechen" name="cancel_place_btn"/>
</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_facebook_status.xml b/indra/newview/skins/default/xui/de/panel_facebook_status.xml
index 437243c360..23c9d3b75f 100644
--- a/indra/newview/skins/default/xui/de/panel_facebook_status.xml
+++ b/indra/newview/skins/default/xui/de/panel_facebook_status.xml
@@ -1,14 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<panel name="panel_facebook_status">
- <layout_stack name="stack_status">
- <layout_panel name="status_detail_panel">
- <text name="status_caption_label">
- Was machst du gerade?
- </text>
- </layout_panel>
- <layout_panel name="status_button_panel">
- <button label="Posten" name="post_status_btn"/>
- <button label="Abbrechen" name="cancel_status_btn"/>
- </layout_panel>
- </layout_stack>
+ <string name="facebook_connected" value="Sie sind mit Facebook verbunden als:"/>
+ <string name="facebook_disconnected" value="Nicht mit Facebook verbunden"/>
+ <text name="account_caption_label">
+ Nicht mit Facebook verbunden.
+ </text>
+ <panel name="panel_buttons">
+ <button label="Verbinden..." name="connect_btn"/>
+ <button label="Trennen" name="disconnect_btn"/>
+ <text name="account_learn_more_label">
+ [http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-Share-Facebook/ta-p/2149711 Anweisungen zum Posten auf Facebook]
+ </text>
+ </panel>
+ <text name="status_caption_label">
+ Was machst du gerade?
+ </text>
+ <button label="Posten" name="post_status_btn"/>
+ <button label="Abbrechen" name="cancel_status_btn"/>
</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_flickr_photo.xml b/indra/newview/skins/default/xui/de/panel_flickr_photo.xml
index 1627f405c5..38b5302fef 100644
--- a/indra/newview/skins/default/xui/de/panel_flickr_photo.xml
+++ b/indra/newview/skins/default/xui/de/panel_flickr_photo.xml
@@ -1,41 +1,35 @@
<?xml version="1.0" encoding="utf-8"?>
<panel name="panel_flickr_photo">
- <layout_stack name="stack_photo">
- <layout_panel name="snapshot_panel">
- <combo_box name="resolution_combobox" tool_tip="Bildauflösung">
- <combo_box.item label="Aktuelles Fenster" name="CurrentWindow"/>
- <combo_box.item label="640x480" name="640x480"/>
- <combo_box.item label="800x600" name="800x600"/>
- <combo_box.item label="1024x768" name="1024x768"/>
- </combo_box>
- <combo_box name="filters_combobox" tool_tip="Bildfilter">
- <combo_box.item label="Kein Filter" name="NoFilter"/>
- </combo_box>
- <button label="Aktualisieren" name="new_snapshot_btn" tool_tip="Zum Aktualisieren klicken"/>
- <button label="Vorschau" name="big_preview_btn" tool_tip="Klicken, um Vorschau ein-/auszuschalten"/>
- <text name="title_label">
- Titel:
- </text>
- <text name="description_label">
- Beschreibung:
- </text>
- <check_box initial_value="true" label="SL-Standort am Ende der Beschreibung hinzufügen" name="add_location_cb"/>
- <text name="tags_label">
- Markierungen:
- </text>
- <text name="tags_help_label">
- Markierungen durch Leerzeichen trennen.
+ <combo_box name="resolution_combobox" tool_tip="Bildauflösung">
+ <combo_box.item label="Aktuelles Fenster" name="CurrentWindow"/>
+ <combo_box.item label="640x480" name="640x480"/>
+ <combo_box.item label="800x600" name="800x600"/>
+ <combo_box.item label="1024x768" name="1024x768"/>
+ </combo_box>
+ <combo_box name="filters_combobox" tool_tip="Bildfilter">
+ <combo_box.item label="Kein Filter" name="NoFilter"/>
+ </combo_box>
+ <button label="Aktualisieren" name="new_snapshot_btn" tool_tip="Zum Aktualisieren klicken"/>
+ <button label="Vorschau" name="big_preview_btn" tool_tip="Klicken, um Vorschau ein-/auszuschalten"/>
+ <text name="title_label">
+ Titel:
+ </text>
+ <text name="description_label">
+ Beschreibung:
+ </text>
+ <check_box initial_value="true" label="SL-Standort am Ende der Beschreibung hinzufügen" name="add_location_cb"/>
+ <text name="tags_label">
+ Markierungen:
+ </text>
+ <text name="tags_help_label">
+ Markierungen durch Leerzeichen trennen.
Für Markierungen, die aus mehreren Wörtern bestehen, &quot;&quot; verwenden.
- </text>
- <combo_box name="rating_combobox" tool_tip="Flickr-Inhaltseinstufung">
- <combo_box.item label="Sichere Flickr-Einstufung" name="SafeRating"/>
- <combo_box.item label="Moderate Flickr-Einstufung" name="ModerateRating"/>
- <combo_box.item label="Beschränkte Flickr-Einstufung" name="RestrictedRating"/>
- </combo_box>
- </layout_panel>
- <layout_panel name="photo_button_panel">
- <button label="Hochladen" name="post_photo_btn"/>
- <button label="Abbrechen" name="cancel_photo_btn"/>
- </layout_panel>
- </layout_stack>
+ </text>
+ <combo_box name="rating_combobox" tool_tip="Flickr-Inhaltseinstufung">
+ <combo_box.item label="Sichere Flickr-Einstufung" name="SafeRating"/>
+ <combo_box.item label="Moderate Flickr-Einstufung" name="ModerateRating"/>
+ <combo_box.item label="Beschränkte Flickr-Einstufung" name="RestrictedRating"/>
+ </combo_box>
+ <button label="Hochladen" name="post_photo_btn"/>
+ <button label="Abbrechen" name="cancel_photo_btn"/>
</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/de/panel_group_info_sidetray.xml
index 1775394ecd..92c2a4b83a 100755
--- a/indra/newview/skins/default/xui/de/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/default/xui/de/panel_group_info_sidetray.xml
@@ -23,6 +23,7 @@
<accordion_tab name="group_roles_tab" title="Rollen und Mitglieder"/>
<accordion_tab name="group_notices_tab" title="Mitteilungen"/>
<accordion_tab name="group_land_tab" title="Land/Kapital"/>
+ <accordion_tab name="group_experiences_tab" title="Erlebnisse"/>
</accordion>
</layout_panel>
</layout_stack>
diff --git a/indra/newview/skins/default/xui/de/panel_login.xml b/indra/newview/skins/default/xui/de/panel_login.xml
index 816f22178c..32c9598edf 100755
--- a/indra/newview/skins/default/xui/de/panel_login.xml
+++ b/indra/newview/skins/default/xui/de/panel_login.xml
@@ -1,26 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<panel name="panel_login">
- <panel.string name="forgot_password_url">
- http://secondlife.com/account/request.php?lang=de
- </panel.string>
+ <panel.string name="forgot_password_url">http://secondlife.com/account/request.php?lang=de</panel.string>
<layout_stack name="ui_stack">
<layout_panel name="ui_container">
<combo_box label="Benutzername" name="username_combo" tool_tip="Bei der Registrierung gewählter Benutzername wie „berndschmidt12“ oder „Liebe Sonne“"/>
<line_editor label="Kennwort" name="password_edit"/>
- <check_box label="Details speichern" name="remember_check"/>
- <text name="forgot_password_text">
- Kennwort vergessen
- </text>
- <button label="Anmelden" name="connect_btn"/>
- <text name="At_My_Last_Location_Label">
- bei letztem Ort
- </text>
<combo_box label="Meine Lieblingsorte" name="start_location_combo">
+ <combo_box.item label="Mein letzter Standort" name="MyLastLocation"/>
<combo_box.item label="Mein Zuhause" name="MyHome"/>
</combo_box>
- <button label="Anmelden" name="connect_favorite_btn"/>
- <line_editor label="Ort eingeben" name="location_edit"/>
- <button label="Anmelden" name="connect_location_btn"/>
+ <button label="Anmelden" name="connect_btn"/>
+ <check_box label="Details speichern" name="remember_check"/>
+ <text name="forgot_password_text">Kennwort vergessen</text>
<combo_box label="Grid auswählen" name="server_combo"/>
</layout_panel>
</layout_stack>
diff --git a/indra/newview/skins/default/xui/de/panel_marketplace_listings.xml b/indra/newview/skins/default/xui/de/panel_marketplace_listings.xml
new file mode 100644
index 0000000000..bc9065e185
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_marketplace_listings.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Marktplatz" name="Marketplace Panel">
+ <panel name="tool_panel">
+ <menu_button name="sort_btn" tool_tip="Anzeige-/Sortieroptionen"/>
+ <button name="add_btn" tool_tip="Neuen Auflistungsordner erstellen"/>
+ <button label="Auf Fehler prüfen" name="audit_btn" tool_tip="Marktplatz-Auflistungen überprüfen"/>
+ </panel>
+ <panel name="tab_container_panel">
+ <filter_editor label="Marktplatz-Auflistungen filtern" name="filter_editor"/>
+ </panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_marketplace_listings_inventory.xml b/indra/newview/skins/default/xui/de/panel_marketplace_listings_inventory.xml
new file mode 100644
index 0000000000..becf79b0a2
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_marketplace_listings_inventory.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<inventory_panel label="ALLE" name="All Items" tool_tip="Objekte zum Auflisten hier ablegen"/>
diff --git a/indra/newview/skins/default/xui/de/panel_marketplace_listings_listed.xml b/indra/newview/skins/default/xui/de/panel_marketplace_listings_listed.xml
new file mode 100644
index 0000000000..63c4f34bad
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_marketplace_listings_listed.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<inventory_panel label="AUFGELISTET" name="Active Items"/>
diff --git a/indra/newview/skins/default/xui/de/panel_marketplace_listings_unassociated.xml b/indra/newview/skins/default/xui/de/panel_marketplace_listings_unassociated.xml
new file mode 100644
index 0000000000..26908c3e25
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_marketplace_listings_unassociated.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<inventory_panel label="NICHT VERKNÃœPFT" name="Unassociated Items"/>
diff --git a/indra/newview/skins/default/xui/de/panel_marketplace_listings_unlisted.xml b/indra/newview/skins/default/xui/de/panel_marketplace_listings_unlisted.xml
new file mode 100644
index 0000000000..00ea1e6fe7
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_marketplace_listings_unlisted.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<inventory_panel label="NICHT AUFGELISTET" name="Inactive Items"/>
diff --git a/indra/newview/skins/default/xui/de/panel_postcard_settings.xml b/indra/newview/skins/default/xui/de/panel_postcard_settings.xml
index e6d3b7de66..93b4121db5 100755
--- a/indra/newview/skins/default/xui/de/panel_postcard_settings.xml
+++ b/indra/newview/skins/default/xui/de/panel_postcard_settings.xml
@@ -9,7 +9,7 @@
</combo_box>
<spinner label="Breite x Höhe" name="postcard_snapshot_width"/>
<check_box label="Seitenverhältnis beibehalten" name="postcard_keep_aspect_check"/>
- <slider label="Qualität" name="image_quality_slider"/>
+ <slider label="Qualität:" name="image_quality_slider"/>
<text name="image_quality_level">
([QLVL])
</text>
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_setup.xml b/indra/newview/skins/default/xui/de/panel_preferences_setup.xml
index 24e5033bfc..e6c90f21d1 100755
--- a/indra/newview/skins/default/xui/de/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_setup.xml
@@ -14,9 +14,9 @@
<text name="Web:">
Web:
</text>
- <radio_group name="use_external_browser">
- <radio_item label="Meinen Browser verwenden (IE, Firefox, Safari)" name="external" tool_tip="Standard Webbrowser des Systems verwenden, um die Hilfe, Weblinks usw. anzuzeigen. Bei Vollbildmodus nicht empfohlen." value="true"/>
- <radio_item label="Integrierten Browser verwenden" name="internal" tool_tip="Integrierten Webbrowser verwenden, um die Hilfe, Weblinks usw. anzuzeigen. Dieser Browser öffnet als neues Fenster innerhalb von [APP_NAME]." value=""/>
+ <radio_group name="preferred_browser_behavior">
+ <radio_item label="Meinen Browser (Chrome, Firefox, IE) für alle Links verwenden" name="internal" tool_tip="Standard-Browser für Hilfe, Weblinks usw. verwenden. Im Vollbildmodus nicht empfohlen." value="0"/>
+ <radio_item label="Integrierten Browser nur für Linden Lab-/Second Life-Links verwenden" name="external" tool_tip="Verwenden Sie den Standard-Webbrowser Ihres Systems für Hilfe, Weblinks usw. Der integrierte Browser wird nur für Linden Lab-/Second Life-Links verwendet." value="1"/>
</radio_group>
<check_box initial_value="true" label="Plugins aktivieren" name="browser_plugins_enabled"/>
<check_box initial_value="true" label="Cookies annehmen" name="cookies_enabled"/>
diff --git a/indra/newview/skins/default/xui/de/panel_region_experiences.xml b/indra/newview/skins/default/xui/de/panel_region_experiences.xml
new file mode 100644
index 0000000000..6e193aba19
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_region_experiences.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Erlebnisse" name="Experiences">
+ <panel.string name="trusted_estate_text">
+ Jedes Erlebnis kann ein Schlüsselerlebnis sein.
+
+Schlüsselerlebnisse können in diesem Grundbesitz ausgeführt werden.
+
+Wenn der Grundbesitz keinen öffentlichen Zugang gestattet, können Einwohner, die an einem Schlüsselerlebnis teilnehmen, den Grundbesitz betreten und sich dort aufhalten, solange sie an einem Schlüsselerlebnis beteiligt sind.
+ </panel.string>
+ <panel.string name="allowed_estate_text">
+ Nur Erlebnisse mit Landumfang können zulässig sein.
+
+Zulässige Erlebnisse können in diesem Grundbesitz ausgeführt werden.
+ </panel.string>
+ <panel.string name="blocked_estate_text">
+ Nur Erlebnisse mit Gridumfang können blockiert werden.
+
+Blockierte Erlebnisse können in diesem Grundbesitz nicht ausgeführt werden.
+ </panel.string>
+ <panel.string name="estate_caption">
+ Änderungen wirken sich auf alle Regionen des Grundbesitzes aus.
+ </panel.string>
+ <panel.string name="allowed_parcel_text">
+ Nur Erlebnisse mit Landumfang können zulässig sein.
+
+Zulässige Erlebnisse können in dieser Parzelle ausgeführt werden, sofern sie nicht vom Grundbesitz blockiert sind.
+ </panel.string>
+ <panel.string name="blocked_parcel_text">
+ Jedes Einwohnererlebnis kann blockiert werden.
+
+Blockierte Erlebnisse können in dieser Parzelle nicht ausgeführt werden.
+ </panel.string>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_script_experience.xml b/indra/newview/skins/default/xui/de/panel_script_experience.xml
new file mode 100644
index 0000000000..192e661925
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_script_experience.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<panel name="script_experience" title="ERLEBNIS">
+ <button label="Erlebnis" name="Expand Experience"/>
+ <check_box label="Verwendet Erlebnis" name="enable_xp"/>
+ <layout_stack name="xp_details">
+ <layout_panel>
+ <combo_box label="Erlebnis auswählen..." name="Experiences..."/>
+ </layout_panel>
+ </layout_stack>
+ <text name="No Experiences">
+ Sie tragen zu keinen Erlebnissen bei.
+ </text>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/de/panel_snapshot_inventory.xml
index d13f56ed3d..2b8c4e6cd1 100755
--- a/indra/newview/skins/default/xui/de/panel_snapshot_inventory.xml
+++ b/indra/newview/skins/default/xui/de/panel_snapshot_inventory.xml
@@ -3,18 +3,18 @@
<text name="title">
Inventar
</text>
- <text name="hint_lbl">
- Das Speichern eines Bilds in Ihrem Inventar kostet [UPLOAD_COST] L$. Um das Bild als Textur zu speichern, wählen Sie eines der quadratischen Formate aus.
- </text>
<combo_box label="Auflösung" name="texture_size_combo">
- <combo_box.item label="Aktuelles Fenster" name="CurrentWindow"/>
<combo_box.item label="Klein (128x128)" name="Small(128x128)"/>
<combo_box.item label="Mittel (256x256)" name="Medium(256x256)"/>
<combo_box.item label="Groß (512x512)" name="Large(512x512)"/>
<combo_box.item label="Benutzerdefiniert" name="Custom"/>
</combo_box>
<spinner label="Breite x Höhe" name="inventory_snapshot_width"/>
+ <spinner label="" name="inventory_snapshot_height"/>
<check_box label="Seitenverhältnis beibehalten" name="inventory_keep_aspect_check"/>
+ <text name="hint_lbl">
+ Das Speichern eines Bilds in Ihrem Inventar kostet [UPLOAD_COST] L$. Um das Bild als Textur zu speichern, wählen Sie eines der quadratischen Formate aus.
+ </text>
<button label="Abbrechen" name="cancel_btn"/>
<button label="Speichern" name="save_btn"/>
</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_snapshot_local.xml b/indra/newview/skins/default/xui/de/panel_snapshot_local.xml
index 53e78ba290..9182c14063 100755
--- a/indra/newview/skins/default/xui/de/panel_snapshot_local.xml
+++ b/indra/newview/skins/default/xui/de/panel_snapshot_local.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="panel_snapshot_local">
<text name="title">
- Festplatte
+ Datenträger
</text>
<combo_box label="Auflösung" name="local_size_combo">
<combo_box.item label="Aktuelles Fenster" name="CurrentWindow"/>
@@ -15,15 +15,15 @@
</combo_box>
<spinner label="Breite x Höhe" name="local_snapshot_width"/>
<check_box label="Seitenverhältnis beibehalten" name="local_keep_aspect_check"/>
+ <text name="local_format_label">
+ Format:
+ </text>
<combo_box label="Format" name="local_format_combo">
<combo_box.item label="PNG (verlustfrei)" name="PNG"/>
<combo_box.item label="JPEG" name="JPEG"/>
<combo_box.item label="BMP (verlustfrei)" name="BMP"/>
</combo_box>
- <slider label="Qualität" name="image_quality_slider"/>
- <text name="image_quality_level">
- ([QLVL])
- </text>
+ <slider label="Qualität:" name="image_quality_slider"/>
<button label="Abbrechen" name="cancel_btn"/>
<flyout_button label="Speichern" name="save_btn" tool_tip="Bild als Datei speichern">
<flyout_button.item label="Speichern" name="save_item"/>
diff --git a/indra/newview/skins/default/xui/de/panel_snapshot_options.xml b/indra/newview/skins/default/xui/de/panel_snapshot_options.xml
index 7ec22adc4c..82e2b56f3f 100755
--- a/indra/newview/skins/default/xui/de/panel_snapshot_options.xml
+++ b/indra/newview/skins/default/xui/de/panel_snapshot_options.xml
@@ -1,16 +1,10 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="panel_snapshot_options">
- <button label="Ins Profil hochladen" name="save_to_profile_btn"/>
+ <button label="Auf Datenträger speichern" name="save_to_computer_btn"/>
+ <button label="In Inventar speichern ([AMOUNT] L$)" name="save_to_inventory_btn"/>
+ <button label="In Profil hochladen" name="save_to_profile_btn"/>
+ <button label="Auf Facebook hochladen" name="send_to_facebook_btn"/>
+ <button label="Auf Twitter hochladen" name="send_to_twitter_btn"/>
+ <button label="Auf Flickr hochladen" name="send_to_flickr_btn"/>
<button label="Per E-Mail senden" name="save_to_email_btn"/>
- <button label="Im Inventar speichern" name="save_to_inventory_btn"/>
- <button label="Auf Festplatte speichern" name="save_to_computer_btn"/>
- <text name="send_to_facebook_textbox">
- Senden an: [secondlife:/// Facebook]
- </text>
- <text name="send_to_twitter_textbox">
- [secondlife:/// Twitter]
- </text>
- <text name="send_to_flickr_textbox">
- [secondlife:/// Flickr]
- </text>
</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/de/panel_snapshot_postcard.xml
index ead56f2885..3f5bbda724 100755
--- a/indra/newview/skins/default/xui/de/panel_snapshot_postcard.xml
+++ b/indra/newview/skins/default/xui/de/panel_snapshot_postcard.xml
@@ -13,9 +13,9 @@
E-Mail
</text>
<tab_container name="postcard_tabs">
- <panel name="panel_postcard_message" label="Nachricht"/>
- <panel name="panel_postcard_settings" label="Einstellungen"/>
+ <panel label="Nachricht" name="panel_postcard_message"/>
+ <panel label="Einstellungen" name="panel_postcard_settings"/>
</tab_container>
- <button name="cancel_btn" label="Abbrechen"/>
- <button name="send_btn" label="Absenden"/>
+ <button label="Abbrechen" name="cancel_btn"/>
+ <button label="Senden" name="send_btn"/>
</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_snapshot_profile.xml b/indra/newview/skins/default/xui/de/panel_snapshot_profile.xml
index 0f21edd1b6..8c856b87a2 100755
--- a/indra/newview/skins/default/xui/de/panel_snapshot_profile.xml
+++ b/indra/newview/skins/default/xui/de/panel_snapshot_profile.xml
@@ -4,11 +4,11 @@
Profil
</text>
<combo_box label="Auflösung" name="profile_size_combo">
- <combo_box.item label="Aktuelles Fenster" name="CurrentWindow"/>
- <combo_box.item label="640x480" name="640x480"/>
- <combo_box.item label="800x600" name="800x600"/>
- <combo_box.item label="1024x768" name="1024x768"/>
- <combo_box.item label="Benutzerdefiniert" name="Custom"/>
+ <combo_box.item label="Aktuelles Fenster" name="CurrentWindow"/>
+ <combo_box.item label="640x480" name="640x480"/>
+ <combo_box.item label="800x600" name="800x600"/>
+ <combo_box.item label="1024x768" name="1024x768"/>
+ <combo_box.item label="Benutzerdefiniert" name="Custom"/>
</combo_box>
<spinner label="Breite x Höhe" name="profile_snapshot_width"/>
<check_box label="Seitenverhältnis beibehalten" name="profile_keep_aspect_check"/>
diff --git a/indra/newview/skins/default/xui/de/panel_status_bar.xml b/indra/newview/skins/default/xui/de/panel_status_bar.xml
index 14ace0ac3a..d3d85de3c3 100755
--- a/indra/newview/skins/default/xui/de/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/de/panel_status_bar.xml
@@ -1,28 +1,16 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="status">
- <panel.string name="packet_loss_tooltip">
- Paketverlust
- </panel.string>
- <panel.string name="bandwidth_tooltip">
- Bandbreite
- </panel.string>
- <panel.string name="time">
- [hour12, datetime, slt]:[min, datetime, slt] [ampm, datetime, slt] [timezone,datetime, slt]
- </panel.string>
- <panel.string name="timeTooltip">
- [weekday, datetime, slt], [day, datetime, slt] [month, datetime, slt] [year, datetime, slt]
- </panel.string>
- <panel.string name="buycurrencylabel">
- [AMT] L$
- </panel.string>
+ <panel.string name="packet_loss_tooltip">Paketverlust</panel.string>
+ <panel.string name="bandwidth_tooltip">Bandbreite</panel.string>
+ <panel.string name="time">[hour12, datetime, slt]:[min, datetime, slt] [ampm, datetime, slt] [timezone,datetime, slt]</panel.string>
+ <panel.string name="timeTooltip">[weekday, datetime, slt], [day, datetime, slt] [month, datetime, slt] [year, datetime, slt]</panel.string>
+ <panel.string name="buycurrencylabel">[AMT] L$</panel.string>
<panel left="-415" name="balance_bg" width="205">
- <text name="balance" tool_tip="Klicken, um L$-Guthaben zu aktualisieren" value="20 L$"/>
+ <text name="balance" tool_tip="Klicken, um L$-Guthaben zu aktualisieren" value="L$ ??"/>
<button label="L$ kaufen" name="buyL" tool_tip="Hier klicken, um mehr L$ zu kaufen"/>
<button label="Einkaufen" name="goShop" tool_tip="Second Life-Marktplatz öffnen" width="85"/>
</panel>
- <text name="TimeText" tool_tip="Aktuelle Zeit (Pazifik)">
- 24:00 H PST
- </text>
+ <text name="TimeText" tool_tip="Aktuelle Zeit (Pazifik)">24:00 H PST</text>
<button name="media_toggle_btn" tool_tip="Alle Medien starten/stoppen (Musik, Video, Webseiten)"/>
<button name="volume_btn" tool_tip="Steuerung der Gesamtlautstärke"/>
</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_twitter_photo.xml b/indra/newview/skins/default/xui/de/panel_twitter_photo.xml
index 89c4b98ffc..e637253983 100644
--- a/indra/newview/skins/default/xui/de/panel_twitter_photo.xml
+++ b/indra/newview/skins/default/xui/de/panel_twitter_photo.xml
@@ -1,32 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<panel name="panel_twitter_photo">
- <layout_stack name="stack_photo">
- <layout_panel name="text_panel">
- <text name="status_label">
- Was ist los?
- </text>
- <text name="status_counter_label">
- 140
- </text>
- <check_box initial_value="true" label="SL-Standort hinzufügen" name="add_location_cb"/>
- <check_box initial_value="true" label="Foto hinzufügen" name="add_photo_cb"/>
- </layout_panel>
- <layout_panel name="snapshot_panel">
- <combo_box name="resolution_combobox" tool_tip="Bildauflösung">
- <combo_box.item label="Aktuelles Fenster" name="CurrentWindow"/>
- <combo_box.item label="640x480" name="640x480"/>
- <combo_box.item label="800x600" name="800x600"/>
- <combo_box.item label="1024x768" name="1024x768"/>
- </combo_box>
- <combo_box name="filters_combobox" tool_tip="Bildfilter">
- <combo_box.item label="Kein Filter" name="NoFilter"/>
- </combo_box>
- <button label="Aktualisieren" name="new_snapshot_btn" tool_tip="Zum Aktualisieren klicken"/>
- <button label="Vorschau" name="big_preview_btn" tool_tip="Klicken, um Vorschau ein-/auszuschalten"/>
- </layout_panel>
- <layout_panel name="photo_button_panel">
- <button label="Tweeten" name="post_photo_btn"/>
- <button label="Abbrechen" name="cancel_photo_btn"/>
- </layout_panel>
- </layout_stack>
+ <text name="status_label">
+ Was ist los?
+ </text>
+ <text name="status_counter_label">
+ 140
+ </text>
+ <check_box initial_value="true" label="SL-Standort hinzufügen" name="add_location_cb"/>
+ <check_box initial_value="true" label="Foto hinzufügen" name="add_photo_cb"/>
+ <combo_box name="resolution_combobox" tool_tip="Bildauflösung">
+ <combo_box.item label="Aktuelles Fenster" name="CurrentWindow"/>
+ <combo_box.item label="640x480" name="640x480"/>
+ <combo_box.item label="800x600" name="800x600"/>
+ <combo_box.item label="1024x768" name="1024x768"/>
+ </combo_box>
+ <combo_box name="filters_combobox" tool_tip="Bildfilter">
+ <combo_box.item label="Kein Filter" name="NoFilter"/>
+ </combo_box>
+ <button label="Aktualisieren" name="new_snapshot_btn" tool_tip="Zum Aktualisieren klicken"/>
+ <button label="Vorschau" name="big_preview_btn" tool_tip="Klicken, um Vorschau ein-/auszuschalten"/>
+ <button label="Tweeten" name="post_photo_btn"/>
+ <button label="Abbrechen" name="cancel_photo_btn"/>
</panel>
diff --git a/indra/newview/skins/default/xui/de/role_actions.xml b/indra/newview/skins/default/xui/de/role_actions.xml
index d834fc57ca..e3fbe2a630 100755
--- a/indra/newview/skins/default/xui/de/role_actions.xml
+++ b/indra/newview/skins/default/xui/de/role_actions.xml
@@ -71,4 +71,8 @@
<action description="Gruppen-Voice-Chat beitreten" longdescription="Mitglieder in einer Rolle mit dieser Fähigkeit können Gruppen-Voice-Chat beitreten. HINWEIS: Sie benötigen die Fähigkeit „Gruppen-Chat beitreten“, um Zugang zu dieser Voice-Chat-Sitzung zu erhalten." name="join voice chat" value="27"/>
<action description="Gruppen-Chat moderieren" longdescription="Mitglieder in einer Rolle mit dieser Fähigkeit können den Zugang zu und die Teilnahme an Gruppen-Chat- und Voice-Chat-Sitzungen steuern." name="moderate group chat" value="37"/>
</action_set>
+ <action_set description="Diese Fähigkeiten enthalten die Berechtigung, die Erlebnisse zu ändern, die dieser Gruppe gehören." name="experience_tools_experience">
+ <action description="Erlebnis-Administrator" longdescription="Mitglieder in einer Rolle mit dieser Fähigkeit können die Metadaten für ein Erlebnis ändern." name="experience admin" value="49"/>
+ <action description="Erlebnis-Contributor" longdescription="Mitglieder in einer Rolle mit dieser Fähigkeit können Skripts für ein Erlebnis beitragen." name="experience contributor" value="50"/>
+ </action_set>
</role_actions>
diff --git a/indra/newview/skins/default/xui/de/sidepanel_item_info.xml b/indra/newview/skins/default/xui/de/sidepanel_item_info.xml
index 1b67eaf03b..f7dc265cf4 100755
--- a/indra/newview/skins/default/xui/de/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/de/sidepanel_item_info.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="item properties" title="Objektprofil">
+ <panel.string name="loading_experience">
+ (laden)
+ </panel.string>
<panel.string name="unknown">
(unbekannt)
</panel.string>
@@ -43,6 +46,9 @@
<text name="LabelAcquiredTitle">
Erworben:
</text>
+ <text name="LabelItemExperienceTitle">
+ Erlebnis:
+ </text>
<panel name="perms_inv">
<text name="perm_modify">
Sie können:
@@ -66,8 +72,9 @@
<check_box label="Übertragen" name="CheckNextOwnerTransfer" tool_tip="Nächster Eigentümer kann dieses Objekt weitergeben oder -verkaufen"/>
</panel>
<check_box label="Zum Verkauf" name="CheckPurchase"/>
- <combo_box name="combobox sale copy">
- <combo_box.item label="Kopieren" name="Copy"/>
+ <combo_box name="ComboBoxSaleType">
+ <combo_box.item label="Kopie" name="Copy"/>
+ <combo_box.item label="Inhalt" name="Contents"/>
<combo_box.item label="Original" name="Original"/>
</combo_box>
<spinner label="Preis: L$" name="Edit Cost"/>
diff --git a/indra/newview/skins/default/xui/de/sidepanel_task_info.xml b/indra/newview/skins/default/xui/de/sidepanel_task_info.xml
index 29239033fe..c30611c66c 100755
--- a/indra/newview/skins/default/xui/de/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/de/sidepanel_task_info.xml
@@ -1,71 +1,31 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="object properties" title="Objektprofil">
- <panel.string name="text deed continued">
- Ãœbertragung
- </panel.string>
- <panel.string name="text deed">
- Ãœbertragung
- </panel.string>
- <panel.string name="text modify info 1">
- Sie können dieses Objekt bearbeiten.
- </panel.string>
- <panel.string name="text modify info 2">
- Sie können diese Objekte bearbeiten.
- </panel.string>
- <panel.string name="text modify info 3">
- Sie können dieses Objekt nicht bearbeiten.
- </panel.string>
- <panel.string name="text modify info 4">
- Sie können diese Objekte nicht bearbeiten.
- </panel.string>
- <panel.string name="text modify info 5">
- Dieses Objekt kann nicht über eine Regionsgrenze hinweg geändert werden
- </panel.string>
- <panel.string name="text modify info 6">
- Diese Objekte können nicht über eine Regionsgrenze hinweg geändert werden
- </panel.string>
- <panel.string name="text modify warning">
- Diese Objekt verfügt über verknüpfte Teile
- </panel.string>
- <panel.string name="Cost Default">
- Preis: L$
- </panel.string>
- <panel.string name="Cost Total">
- Summe: L$
- </panel.string>
- <panel.string name="Cost Per Unit">
- Stückpreis: L$
- </panel.string>
- <panel.string name="Cost Mixed">
- Mischpreis
- </panel.string>
- <panel.string name="Sale Mixed">
- Mischverkauf
- </panel.string>
+ <panel.string name="text deed continued">Ãœbertragung</panel.string>
+ <panel.string name="text deed">Ãœbertragung</panel.string>
+ <panel.string name="text modify info 1">Sie können dieses Objekt bearbeiten.</panel.string>
+ <panel.string name="text modify info 2">Sie können diese Objekte bearbeiten.</panel.string>
+ <panel.string name="text modify info 3">Sie können dieses Objekt nicht bearbeiten.</panel.string>
+ <panel.string name="text modify info 4">Sie können diese Objekte nicht bearbeiten.</panel.string>
+ <panel.string name="text modify info 5">Dieses Objekt kann nicht über eine Regionsgrenze hinweg geändert werden</panel.string>
+ <panel.string name="text modify info 6">Diese Objekte können nicht über eine Regionsgrenze hinweg geändert werden</panel.string>
+ <panel.string name="text modify warning">Diese Objekt verfügt über verknüpfte Teile</panel.string>
+ <panel.string name="Cost Default">Preis: L$</panel.string>
+ <panel.string name="Cost Total">Summenpreis: L$</panel.string>
+ <panel.string name="Cost Per Unit">Stückpreis: L$</panel.string>
+ <panel.string name="Cost Mixed">Mischpreis</panel.string>
+ <panel.string name="Sale Mixed">Mischverkauf</panel.string>
<text name="title" value="Objektprofil"/>
<text name="where" value="(Inworld)"/>
<panel label="" name="properties_panel">
- <text name="Name:">
- Name:
- </text>
- <text name="Description:">
- Beschreibung:
- </text>
- <text name="CreatorNameLabel">
- Ersteller:
- </text>
- <text name="Owner:">
- Eigentümer:
- </text>
- <text name="Group_label">
- Gruppe:
- </text>
+ <text name="Name:">Name:</text>
+ <text name="Description:">Beschreibung:</text>
+ <text name="CreatorNameLabel">Ersteller:</text>
+ <text name="Owner:">Eigentümer:</text>
+ <text name="Group_label">Gruppe:</text>
<button name="button set group" tool_tip="Eine Gruppe auswählen, um die Berechtigungen des Objekts zu teilen."/>
<name_box initial_value="Wird geladen..." name="Group Name Proxy"/>
<button label="Übertragung" label_selected="Übertragung" name="button deed" tool_tip="Eine Übertragung bedeutet, dass das Objekt mit den Berechtigungen „Nächster Eigentümer“ weitergegeben wird. Mit der Gruppe geteilte Objekte können von einem Gruppen-Officer übertragen werden."/>
- <text name="label click action">
- Bei Linksklick:
- </text>
+ <text name="label click action">Bei Linksklick:</text>
<combo_box name="clickaction">
<combo_box.item label="Berühren (Standard)" name="Touch/grab(default)"/>
<combo_box.item label="Auf Objekt setzen" name="Sitonobject"/>
@@ -75,21 +35,13 @@
<combo_box.item label="Zoomen" name="Zoom"/>
</combo_box>
<panel name="perms_inv">
- <text name="perm_modify">
- Sie können dieses Objekt bearbeiten.
- </text>
- <text name="Anyone can:">
- Jeder:
- </text>
+ <text name="perm_modify">Sie können dieses Objekt bearbeiten.</text>
+ <text name="Anyone can:">Jeder:</text>
<check_box label="Kopieren" name="checkbox allow everyone copy"/>
<check_box label="Bewegen" name="checkbox allow everyone move"/>
- <text name="GroupLabel">
- Gruppe:
- </text>
+ <text name="GroupLabel">Gruppe:</text>
<check_box label="Teilen" name="checkbox share with group" tool_tip="Mit allen Mitgliedern der zugeordneten Gruppe, Ihre Berechtigungen dieses Objekt zu ändern, teilen. Sie müssen Übereignen, um Rollenbeschränkungen zu aktivieren."/>
- <text name="NextOwnerLabel">
- Nächster Eigentümer:
- </text>
+ <text name="NextOwnerLabel">Nächster Eigentümer:</text>
<check_box label="Bearbeiten" name="checkbox next owner can modify"/>
<check_box label="Kopieren" name="checkbox next owner can copy"/>
<check_box label="Transferieren" name="checkbox next owner can transfer" tool_tip="Nächster Eigentümer kann dieses Objekt weitergeben oder -verkaufen"/>
@@ -102,27 +54,13 @@
</combo_box>
<spinner label="Preis: L$" name="Edit Cost"/>
<check_box label="In Suche anzeigen" name="search_check" tool_tip="Dieses Objekt in Suchergebnissen anzeigen"/>
- <text name="pathfinding_attributes_label">
- Pathfinding-Attribute:
- </text>
- <text name="B:">
- B:
- </text>
- <text name="O:">
- O:
- </text>
- <text name="G:">
- G:
- </text>
- <text name="E:">
- E:
- </text>
- <text name="N:">
- N:
- </text>
- <text name="F:">
- F:
- </text>
+ <text name="pathfinding_attributes_label">Pathfinding-Attribute:</text>
+ <text name="B:">B:</text>
+ <text name="O:">O:</text>
+ <text name="G:">G:</text>
+ <text name="E:">E:</text>
+ <text name="N:">N:</text>
+ <text name="F:">F:</text>
</panel>
<panel name="button_panel">
<button label="Öffnen" name="open_btn"/>
diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml
index d4ce7b3fc3..35f5624c13 100755
--- a/indra/newview/skins/default/xui/de/strings.xml
+++ b/indra/newview/skins/default/xui/de/strings.xml
@@ -449,30 +449,51 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
<string name="TooltipMustSingleDrop">
Sie können nur ein einzelnes Objekt hierher ziehen
</string>
+ <string name="TooltipTooManyWearables">
+ Sie können keinen Ordner tragen, der mehr als [AMOUNT] Elemente enthält. Sie können diesen Höchstwert unter „Erweitert“ &gt; „Debug-Einstellungen anzeigen“ &gt; „WearFolderLimit“ ändern.
+ </string>
<string name="TooltipPrice" value="[AMOUNT] L$"/>
<string name="TooltipOutboxDragToWorld">
- Sie können Artikel nicht in Ihrer Händler-Outbox rezzen
+ Sie können keine Objekte aus dem Marktplatz-Auflistungsordner rezzen
+ </string>
+ <string name="TooltipOutboxWorn">
+ Sie können Objekte, die Sie tragen, nicht in den Marktplatz-Auflistungsordner stellen
+ </string>
+ <string name="TooltipOutboxFolderLevels">
+ Tiefe der verschachtelten Ordner überschreitet [AMOUNT]. Reduzieren Sie die Ordnertiefe. Verpacken Sie ggf. einige Artikel.
+ </string>
+ <string name="TooltipOutboxTooManyFolders">
+ Anzahl von Unterordnern überschreitet [AMOUNT]. Reduzieren Sie die Anzahl von Ordnern in Ihrer Auflistung. Verpacken Sie ggf. einige Artikel.
+ </string>
+ <string name="TooltipOutboxTooManyObjects">
+ Anzahl von Objekten überschreitet [AMOUNT]. Um mehr als [AMOUNT] Objekte in einer Auflistung verkaufen zu können, müssen Sie einige davon verpacken.
+ </string>
+ <string name="TooltipOutboxTooManyStockItems">
+ Anzahl von Bestandsobjekten überschreitet [AMOUNT].
+ </string>
+ <string name="TooltipOutboxCannotDropOnRoot">
+ Sie können Objekte oder Ordner nur in der Registerkarte „Alle“ ablegen. Wählen Sie diese Registerkarte aus und verschieben Sie Ihre Objekte bzw. Ordner noch einmal.
</string>
<string name="TooltipOutboxNoTransfer">
- Einer oder mehrere dieser Artikel können nicht verkauft oder übertragen werden.
+ Mindestens eines dieser Objekte kann nicht verkauft oder übertragen werden
</string>
<string name="TooltipOutboxNotInInventory">
- Nur Artikel direkt aus Ihrem Inventar können in Ihre Händler-Outbox gelegt werden
+ Sie können nur Objekte aus Ihrem Inventar in den Marktplatz einstellen
</string>
- <string name="TooltipOutboxWorn">
- Artikel, die Sie tragen, können nicht in Ihre Händler-Outbox gelegt werden.
+ <string name="TooltipOutboxLinked">
+ Sie können keine verknüpften Objekte oder Ordner in den Marktplatz einstellen
</string>
<string name="TooltipOutboxCallingCard">
- Sie können keine Visitenkarten in Ihre Händler-Outbox legen
+ Sie können Visitenkarten nicht in den Marktplatz einstellen
</string>
- <string name="TooltipOutboxFolderLevels">
- Tiefe der verschachtelten Ordner überschreitet 3
+ <string name="TooltipOutboxDragActive">
+ Sie können keine gelistete Auflistung entfernen
</string>
- <string name="TooltipOutboxTooManyFolders">
- Anzahl von Unterordnern im obersten Ordner überschreitet 20
+ <string name="TooltipOutboxCannotMoveRoot">
+ Der Stammordner mit Marktplatz-Auflistungen kann nicht verschoben werden.
</string>
- <string name="TooltipOutboxTooManyObjects">
- Anzahl von Artikeln im obersten Ordner überschreitet 200
+ <string name="TooltipOutboxMixedStock">
+ Alle Objekte in einem Bestandsordner müssen vom gleichen Typ sein und die gleiche Berechtigung haben
</string>
<string name="TooltipDragOntoOwnChild">
Sie können einen Ordner nicht in einen seiner untergeordneten Ordner verschieben
@@ -1060,9 +1081,7 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
<string name="AgentNameSubst">
(Sie)
</string>
- <string name="JoinAnExperience">
- Bei einem Erlebnis mitmachen
- </string>
+ <string name="JoinAnExperience"/><!-- intentionally blank -->
<string name="SilentlyManageEstateAccess">
Beim Verwalten von Grundbesitzzugangslisten Warnhinweise unterdrücken
</string>
@@ -1129,6 +1148,12 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
<string name="bitmap_image_files">
Bitmap-Bilder
</string>
+ <string name="png_image_files">
+ PNG-Bilder
+ </string>
+ <string name="save_texture_image_files">
+ Targa- oder PNG-Bilder
+ </string>
<string name="avi_movie_file">
AVI-Filmdatei
</string>
@@ -1378,6 +1403,9 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
<string name="FavoritesNoMatchingItems">
Landmarke hier hin ziehen, um diese hinzuzufügen.
</string>
+ <string name="MarketplaceNoMatchingItems">
+ Keine übereinstimmenden Objekte gefunden. Überprüfen Sie die Schreibweise des Suchbegriffs und versuchen Sie es noch einmal.
+ </string>
<string name="InventoryNoTexture">
Sie haben keine Kopie dieser Textur in Ihrem Inventar.
</string>
@@ -1425,29 +1453,95 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
<string name="InventoryOutboxError">
Der [[MARKETPLACE_CREATE_STORE_URL] Marktplatz-Laden] gibt Fehler zurück.
</string>
+ <string name="InventoryMarketplaceError">
+ Diese Funktion befindet sich in der Betaphase. Wenn Sie teilnehmen möchten, tragen Sie sich in dieses [http://goo.gl/forms/FCQ7UXkakz Google-Formular] ein.
+ </string>
+ <string name="InventoryMarketplaceListingsNoItemsTitle">
+ Ihr Ordner mit Marktplatz-Auflistungen ist leer.
+ </string>
+ <string name="InventoryMarketplaceListingsNoItems">
+ Ziehen Sie Ordner in diesen Bereich, um sie im [[MARKETPLACE_DASHBOARD_URL] Marktplatz] zum Verkauf anzubieten.
+ </string>
+ <string name="Marketplace Validation Warning Stock">
+ Bestandsordner müssen in einem Versionsordner gespeichert sein
+ </string>
+ <string name="Marketplace Validation Error Mixed Stock">
+ : Fehler: Alle Objekte in einem Bestandsordner müssen kopiergeschützt und vom gleichen Typ sein.
+ </string>
+ <string name="Marketplace Validation Error Subfolder In Stock">
+ : Fehler: Bestandsordner kann keine Unterordner enthalten
+ </string>
+ <string name="Marketplace Validation Warning Empty">
+ : Warnung: Ordner enthält keine Objekte
+ </string>
+ <string name="Marketplace Validation Warning Create Stock">
+ : Warnung: Bestandsordner wird erstellt
+ </string>
+ <string name="Marketplace Validation Warning Create Version">
+ : Warnung: Versionsordner wird erstellt
+ </string>
+ <string name="Marketplace Validation Warning Move">
+ : Warnung: Objekte werden verschoben
+ </string>
+ <string name="Marketplace Validation Warning Delete">
+ : Warnung: Ordnerinhalte wurden in Bestandsordner übertragen; leerer Ordner wird entfernt
+ </string>
+ <string name="Marketplace Validation Error Stock Item">
+ : Fehler: Kopiergeschützte Objekte müssen in einem Bestandsordner gespeichert sein
+ </string>
+ <string name="Marketplace Validation Warning Unwrapped Item">
+ : Warnung: Objekte müssen in einem Versionsordner gespeichert sein
+ </string>
+ <string name="Marketplace Validation Error">
+ : Fehler:
+ </string>
+ <string name="Marketplace Validation Warning">
+ : Warnung:
+ </string>
+ <string name="Marketplace Validation Error Empty Version">
+ : Warnung: Versionsordner muss mindestens 1 Objekt enthalten
+ </string>
+ <string name="Marketplace Validation Error Empty Stock">
+ : Warnung: Bestandsordner muss mindestens 1 Objekt enthalten
+ </string>
+ <string name="Marketplace Validation No Error">
+ Keine Fehler oder Warnungen
+ </string>
<string name="Marketplace Error None">
Keine Fehler
</string>
+ <string name="Marketplace Error Prefix">
+ Fehler:
+ </string>
<string name="Marketplace Error Not Merchant">
- Fehler: Bevor Sie Artikel in den Marktplatz übertragen können, müssen Sie sich als Händler registrieren (kostenlos).
+ Bevor Sie Artikel in den Marktplatz übertragen können, müssen Sie sich als Händler registrieren (kostenlos).
</string>
- <string name="Marketplace Error Empty Folder">
- Fehler: Dieser Ordner ist leer.
+ <string name="Marketplace Error Not Accepted">
+ Objekt kann nicht in diesen Ordner verschoben werden.
</string>
- <string name="Marketplace Error Unassociated Products">
- Fehler: Dieser Artikel konnte nicht hochgeladen werden, da in Ihrem Händlerkonto zu viele Artikel nicht mit Produkten verknüpft sind. Um diesen Fehler zu beheben, melden Sie sich auf der Marktplatz-Website an und reduzieren Sie die Anzahl von Artikeln, die nicht mit Produkten verknüpft sind.
+ <string name="Marketplace Error Unsellable Item">
+ Dieses Objekt kann nicht im Marktplatz verkauft werden.
</string>
- <string name="Marketplace Error Object Limit">
- Fehler: Dieser Artikel enthält zu viele Objekte. Beheben Sie diesen Fehler, indem Sie Objekte zusammen in Behältern verpacken, um die Objektanzahl auf unter 200 zu verringern.
+ <string name="MarketplaceNoID">
+ keine Mkt-ID
</string>
- <string name="Marketplace Error Folder Depth">
- Fehler: Dieser Artikel enthält zu viele verschachtelte Ordnerebenen. Organisieren Sie ihn neu, sodass maximal drei verschachtelte Ordnerebenen vorhanden sind.
+ <string name="MarketplaceLive">
+ aufgelistet
</string>
- <string name="Marketplace Error Unsellable Item">
- Fehler: Dieser Artikel kann nicht im Marktplatz verkauft werden.
+ <string name="MarketplaceActive">
+ aktiv
</string>
- <string name="Marketplace Error Internal Import">
- Fehler: Bei diesem Artikel ist ein Problem aufgetreten. Versuchen Sie es später erneut.
+ <string name="MarketplaceMax">
+ max.
+ </string>
+ <string name="MarketplaceStock">
+ Bestand
+ </string>
+ <string name="MarketplaceNoStock">
+ ausverkauft
+ </string>
+ <string name="MarketplaceUpdating">
+ Aktualisierung läuft...
</string>
<string name="Open landmarks">
Landmarken öffnen
@@ -1468,6 +1562,7 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
Keine Inhalte
</string>
<string name="WornOnAttachmentPoint" value=" (getragen am [ATTACHMENT_POINT])"/>
+ <string name="AttachmentErrorMessage" value="([ATTACHMENT_ERROR])"/>
<string name="ActiveGesture" value="[GESLABEL] (aktiviert)"/>
<string name="PermYes">
Ja
@@ -1738,6 +1833,15 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
<string name="Invalid Attachment">
Ungültige Stelle für Anhang
</string>
+ <string name="ATTACHMENT_MISSING_ITEM">
+ Fehler: fehlendes Objekt
+ </string>
+ <string name="ATTACHMENT_MISSING_BASE_ITEM">
+ Fehler: Basisobjekt fehlt
+ </string>
+ <string name="ATTACHMENT_NOT_ATTACHED">
+ Fehler: Objekt ist im aktuellen Outfit, aber nicht angehängt
+ </string>
<string name="YearsMonthsOld">
[AGEYEARS] [AGEMONTHS] alt
</string>
@@ -1906,6 +2010,9 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
<string name="SaveComplete">
Speichervorgang abgeschlossen.
</string>
+ <string name="UploadFailed">
+ Datei-Upload fehlgeschlagen:
+ </string>
<string name="ObjectOutOfRange">
Skript (Objekt außerhalb des Bereichs)
</string>
@@ -1915,6 +2022,9 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
<string name="GroupsNone">
keine
</string>
+ <string name="CompileNoExperiencePerm">
+ Skript „[SCRIPT]“ mit Erlebnis „[EXPERIENCE]“ wird übersprungen.
+ </string>
<string name="Group" value=" (Gruppe)"/>
<string name="Unknown">
(unbekannt)
@@ -5066,6 +5176,9 @@ Setzen Sie den Editorpfad in Anführungszeichen
<string name="Command_Marketplace_Label">
Marktplatz
</string>
+ <string name="Command_MarketplaceListings_Label">
+ Marktplatz
+ </string>
<string name="Command_MiniMap_Label">
Minikarte
</string>
@@ -5153,6 +5266,9 @@ Setzen Sie den Editorpfad in Anführungszeichen
<string name="Command_Marketplace_Tooltip">
Einkaufen gehen
</string>
+ <string name="Command_MarketplaceListings_Tooltip">
+ Ihre Kreation verkaufen
+ </string>
<string name="Command_MiniMap_Tooltip">
Leute in der Nähe anzeigen
</string>
@@ -5276,4 +5392,85 @@ Setzen Sie den Editorpfad in Anführungszeichen
<string name="loading_chat_logs">
Laden...
</string>
+ <string name="experience_tools_experience">
+ Erlebnis
+ </string>
+ <string name="ExperienceNameNull">
+ (kein Erlebnis)
+ </string>
+ <string name="ExperienceNameUntitled">
+ (unbenanntes Erlebnis)
+ </string>
+ <string name="Land-Scope">
+ Landumfang
+ </string>
+ <string name="Grid-Scope">
+ Gridumfang
+ </string>
+ <string name="Allowed_Experiences_Tab">
+ ZULÄSSIG
+ </string>
+ <string name="Blocked_Experiences_Tab">
+ BLOCKIERT
+ </string>
+ <string name="Contrib_Experiences_Tab">
+ CONTRIBUTOR
+ </string>
+ <string name="Admin_Experiences_Tab">
+ ADMIN
+ </string>
+ <string name="Recent_Experiences_Tab">
+ AKTUELL
+ </string>
+ <string name="Owned_Experiences_Tab">
+ EIGENE
+ </string>
+ <string name="ExperiencesCounter">
+ ([EXPERIENCES], max. [MAXEXPERIENCES])
+ </string>
+ <string name="ExperiencePermission1">
+ Ihre Steuerungen übernehmen
+ </string>
+ <string name="ExperiencePermission3">
+ Animationen Ihres Avatars auslösen
+ </string>
+ <string name="ExperiencePermission4">
+ an Ihren Avatar anhängen
+ </string>
+ <string name="ExperiencePermission9">
+ Ihre Kamera vorfolgen
+ </string>
+ <string name="ExperiencePermission10">
+ Ihre Kamera steuern
+ </string>
+ <string name="ExperiencePermission11">
+ Sie teleportieren
+ </string>
+ <string name="ExperiencePermission12">
+ automatisch Erlebnisberechtigungen akzeptieren
+ </string>
+ <string name="ExperiencePermissionShortUnknown">
+ unbekannten Vorgang durchführen: [Permission]
+ </string>
+ <string name="ExperiencePermissionShort1">
+ Steuerungen übernehmen
+ </string>
+ <string name="ExperiencePermissionShort3">
+ Animationen auslösen
+ </string>
+ <string name="ExperiencePermissionShort4">
+ Anhängen
+ </string>
+ <string name="ExperiencePermissionShort9">
+ Kamera verfolgen
+ </string>
+ <string name="ExperiencePermissionShort10">
+ Kamera steuern
+ </string>
+ <string name="ExperiencePermissionShort11">
+ Teleportieren
+ </string>
+ <string name="ExperiencePermissionShort12">
+ Berechtigung
+ </string>
</strings>
diff --git a/indra/newview/skins/default/xui/de/teleport_strings.xml b/indra/newview/skins/default/xui/de/teleport_strings.xml
index 8062633df6..e590db0dba 100755
--- a/indra/newview/skins/default/xui/de/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/de/teleport_strings.xml
@@ -49,6 +49,9 @@ Ihre Teleport-Anfrage kann nicht sofort bearbeitet werden. Versuchen Sie es in e
<message name="MustGetAgeRegion">
Sie müssen mindestens 18 Jahre alt sein, um diese Region betreten zu können.
</message>
+ <message name="RegionTPSpecialUsageBlocked">
+ Betreten der Region nicht gestattet. „[REGION_NAME]“ ist eine Region für Geschicklichkeitsspiele. Der Zutritt ist Einwohnern vorbehalten, die bestimmte Kriterien erfüllen. Weitere Details finden Sie unter [http://wiki.secondlife.com/wiki/Linden_Lab_Official:Skill_Gaming_in_Second_Life Skill Gaming FAQ].
+ </message>
</message_set>
<message_set name="progress">
<message name="sending_dest">
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 a660e812cc..62ab8ed193 100755
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -2096,5 +2096,17 @@ Only large parcels can be listed in search.
width="100" />
</panel>
</panel>
+ <panel
+ border="true"
+ follows="all"
+ label="EXPERIENCES"
+ layout="topleft"
+ left="0"
+ top="0"
+ help_topic="land_experiences_tab"
+ name="land_experiences_panel"
+ class="land_experiences_panel"
+ filename="panel_region_experiences.xml">
+ </panel>
</tab_container>
</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_associate_listing.xml b/indra/newview/skins/default/xui/en/floater_associate_listing.xml
new file mode 100755
index 0000000000..e019ed58dd
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_associate_listing.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ legacy_header_height="18"
+ can_minimize="false"
+ height="110"
+ layout="topleft"
+ name="associate listing"
+ help_topic="associate_listing"
+ title="ASSOCIATE LISTING"
+ width="375">
+ <text
+ type="string"
+ length="1"
+ follows="top|left"
+ font="SansSerifLarge"
+ height="16"
+ layout="topleft"
+ left="10"
+ top="25"
+ name="message">
+ Listing ID:
+ </text>
+ <line_editor
+ type="string"
+ length="1"
+ follows="top|right"
+ font="SansSerif"
+ height="20"
+ layout="topleft"
+ left_delta="0"
+ name="listing_id"
+ top_pad="5"
+ width="350">
+ Type ID here
+ </line_editor>
+ <button
+ follows="bottom|left"
+ height="23"
+ label="OK"
+ layout="topleft"
+ left="155"
+ name="OK"
+ top_pad="10"
+ width="100" />
+ <button
+ follows="bottom|right"
+ height="23"
+ label="Cancel"
+ layout="topleft"
+ left_pad="5"
+ name="Cancel"
+ width="100" />
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_experience_search.xml b/indra/newview/skins/default/xui/en/floater_experience_search.xml
new file mode 100644
index 0000000000..15a4b5665e
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_experience_search.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ positioning="cascading"
+ legacy_header_height="18"
+ can_resize="true"
+ height="350"
+ layout="topleft"
+ min_height="200"
+ min_width="400"
+ name="experiencepicker"
+ help_topic="experiencepicker"
+ title="CHOOSE EXPERIENCE"
+ width="350">
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_experienceprofile.xml b/indra/newview/skins/default/xui/en/floater_experienceprofile.xml
new file mode 100644
index 0000000000..2dfba1ac44
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_experienceprofile.xml
@@ -0,0 +1,688 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+
+<floater
+ positioning="cascading"
+ can_close="true"
+ enabled="true"
+ can_resize="true"
+ help_topic="floater_experienceprofile"
+ title="EXPERIENCE PROFILE"
+ save_rect="true"
+ min_width="325"
+ min_height="325"
+ width="358"
+ height="650">
+ <floater.string
+ name="empty_slurl">
+ (none)
+ </floater.string>
+ <floater.string
+ name="maturity_icon_general">
+ "Parcel_PG_Light"
+ </floater.string>
+ <floater.string
+ name="maturity_icon_moderate">
+ "Parcel_M_Light"
+ </floater.string>
+ <floater.string
+ name="maturity_icon_adult">
+ "Parcel_R_Light"
+ </floater.string>
+ <text
+ follows="top|left|right"
+ font="SansSerifHugeBold"
+ height="26"
+ layout="topleft"
+ left_pad="4"
+ name="edit_title"
+ top="2"
+ value="Experience Profile"
+ use_ellipses="true"
+ left="6"
+ right="-3"/>
+ <tab_container
+ hide_tabs="true"
+ follows="all"
+ height="615"
+ layout="topleft"
+ left="5"
+ min_height="250"
+ top_pad="3"
+ width="348"
+ name="tab_container">
+ <panel
+ background_visible="true"
+ follows="all"
+ height="540"
+ layout="topleft"
+ left="0"
+ min_height="250"
+ top="0"
+ width="348"
+ name="panel_experience_info">
+ <scroll_container
+ color="DkGray2"
+ follows="all"
+ height="520"
+ layout="topleft"
+ left="9"
+ name="xp_scroll"
+ opaque="true"
+ top_pad="10"
+ width="330">
+ <panel
+ bg_alpha_color="DkGray2"
+ follows="top|left|right"
+ height="550"
+ layout="topleft"
+ left="0"
+ name="scrolling_panel"
+ top="0"
+ width="315"
+ min_width="315">
+ <layout_stack
+ follows="all"
+ height="550"
+ layout="topleft"
+ left="0"
+ animate="false"
+ top="0"
+ orientation="vertical"
+ width="315">
+ <layout_panel
+ follows="all"
+ height="29"
+ layout="topleft"
+ left="0"
+ top="0"
+ auto_resize="false"
+ visible="false"
+ width="315"
+ name="top panel">
+ <text
+ type="string"
+ length="1"
+ follows="left|top|right"
+ font="SansSerif"
+ height="19"
+ top="10"
+ layout="topleft"
+ left="10"
+ right="-123"
+ visible="false"
+ name="grid_wide"/>
+ <button
+ follows="top|right"
+ height="23"
+ label="Edit"
+ layout="topleft"
+ name="edit_btn"
+ width="100"
+ visible="false"
+ top_pad="-23"
+ right="-14"/>
+ </layout_panel>
+ <layout_panel
+ follows="all"
+ height="197"
+ layout="topleft"
+ left="0"
+ top="0"
+ auto_resize="false"
+ visible="false"
+ width="315"
+ name="image_panel">
+ <texture_picker
+ enabled="false"
+ fallback_image="default_land_picture.j2c"
+ follows="left|top"
+ height="197"
+ layout="topleft"
+ left="10"
+ name="logo"
+ top="10"
+ width="290" />
+ </layout_panel>
+ <layout_panel
+ follows="all"
+ height="19"
+ layout="topleft"
+ left="0"
+ top="5"
+ width="313"
+ auto_resize="false">
+ <text
+ follows="left|top|right"
+ font="SansSerifLarge"
+ height="14"
+ layout="topleft"
+ left="10"
+ name="experience_title"
+ top="0"
+ use_ellipses="true"
+ value=""
+ width="288"/>
+ </layout_panel>
+ <layout_panel
+ follows=""
+ height="50"
+ layout="topleft"
+ left="0"
+ top="0"
+ auto_resize="false"
+ width="315"
+ visible="false"
+ name="description panel">
+ <expandable_text
+ follows="left|top|right"
+ font="SansSerif"
+ height="50"
+ layout="topleft"
+ left="7"
+ name="experience_description"
+ top="0"
+ value=""
+ width="293"
+ textbox.max_length="2048"/>
+ </layout_panel>
+ <layout_panel
+ follows=""
+ height="18"
+ layout="topleft"
+ left="0"
+ top="0"
+ auto_resize="false"
+ width="315"
+ visible="true"
+ name="maturity panel">
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ height="16"
+ layout="topleft"
+ left="10"
+ name="ContentRating"
+ width="75">
+ Rating:
+ </text>
+ <text
+ type="string"
+ length="1"
+ follows="left|top|right"
+ height="18"
+ layout="topleft"
+ left_pad="2"
+ valign="center"
+ name="ContentRatingText"
+ top_delta="-3"
+ width="188">
+ </text>
+ </layout_panel>
+ <layout_panel
+ follows="all"
+ height="46"
+ layout="topleft"
+ left="0"
+ top="5"
+ width="313"
+ visible="false"
+ auto_resize="false"
+ name="location panel">
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ height="16"
+ layout="topleft"
+ left="10"
+ name="Location"
+ width="290">
+ Location:
+ </text>
+ <text
+ type="string"
+ length="1"
+ follows="left|top|right"
+ height="18"
+ layout="topleft"
+ left="10"
+ valign="center"
+ use_ellipses="true"
+ name="LocationTextText"
+ width="288">
+ </text>
+ </layout_panel>
+ <layout_panel
+ follows="all"
+ height="53"
+ layout="topleft"
+ left="0"
+ top="5"
+ width="313"
+ visible="false"
+ auto_resize="false"
+ name="marketplace panel">
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ height="16"
+ layout="topleft"
+ left="10"
+ width="290">
+ Marketplace store:
+ </text>
+ <text
+ type="string"
+ length="1"
+ follows="left|top|right"
+ height="18"
+ layout="topleft"
+ left="10"
+ valign="center"
+ use_ellipses="true"
+ name="marketplace"
+ width="288">
+ </text>
+ </layout_panel>
+ <layout_panel
+ follows="left|top|right"
+ height="18"
+ left="0"
+ top="0"
+ auto_resize="false"
+ width="315">
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ height="16"
+ layout="topleft"
+ left="10"
+ name="Owner"
+ width="75">
+ Owner:
+ </text>
+ <text
+ type="string"
+ length="1"
+ follows="left|top|right"
+ height="18"
+ layout="topleft"
+ left_pad="2"
+ valign="center"
+ name="OwnerText"
+ use_ellipses="true"
+ top_delta="-2"
+ width="188">
+ </text>
+ </layout_panel>
+ <layout_panel
+ follows="all"
+ height="18"
+ layout="topleft"
+ left="0"
+ top="5"
+ width="313"
+ visible="false"
+ auto_resize="false"
+ name="group_panel">
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ height="16"
+ layout="topleft"
+ left="10"
+ name="Group"
+ width="75">
+ Group:
+ </text>
+ <text
+ type="string"
+ length="1"
+ follows="left|top|right"
+ height="18"
+ layout="topleft"
+ left_pad="2"
+ valign="center"
+ name="GroupText"
+ use_ellipses="true"
+ top_delta="-2"
+ width="188">
+ </text>
+ </layout_panel>
+ <layout_panel
+ follows="all"
+ height="75"
+ layout="topleft"
+ left="0"
+ top="5"
+ width="313"
+ auto_resize="false"
+ visible="true"
+ name="perm panel">
+ <button
+ follows="bottom|left"
+ height="23"
+ label="Allow"
+ layout="topleft"
+ name="allow_btn"
+ width="94"
+ top_pad="3"
+ left="10"
+ enabled="false"/>
+ <button
+ follows="bottom|left"
+ height="23"
+ label="Forget"
+ layout="topleft"
+ name="forget_btn"
+ width="94"
+ top_pad="-23"
+ left_pad="3"
+ enabled="false"/>
+ <button
+ follows="bottom|left"
+ height="23"
+ label="Block"
+ layout="topleft"
+ name="block_btn"
+ width="94"
+ top_pad="-23"
+ left_pad="3"
+ enabled="false"/>
+ <text
+ type="string"
+ halign="center"
+ length="1"
+ follows="left|top|right"
+ height="16"
+ layout="topleft"
+ left="10"
+ name="privileged"
+ visible="false"
+ width="288">
+ This experience is enabled for all residents.
+ </text>
+ <button
+ follows="bottom|left"
+ height="23"
+ label="Report Abuse"
+ layout="topleft"
+ name="report_btn"
+ width="94"
+ top_pad="3"
+ left="107"
+ enabled="true"/>
+ </layout_panel>
+ </layout_stack>
+ </panel>
+ </scroll_container>
+ </panel>
+ <panel
+ background_visible="true"
+ follows="all"
+ layout="topleft"
+ height="540"
+ left="0"
+ top="0"
+ width="348"
+ name="edit_panel_experience_info">
+ <scroll_container
+ color="DkGray2"
+ follows="all"
+ height="520"
+ layout="topleft"
+ left="9"
+ name="edit_xp_scroll"
+ opaque="true"
+ top_pad="10"
+ width="330">
+ <panel
+ bg_alpha_color="DkGray2"
+ follows="top|left|right"
+ height="590"
+ layout="topleft"
+ left="0"
+ name="edit_scrolling_panel"
+ top="0"
+ width="310">
+ <texture_picker
+ enabled="true"
+ fallback_image="default_land_picture.j2c"
+ follows="left|top"
+ height="197"
+ layout="topleft"
+ left="10"
+ name="edit_logo"
+ top="10"
+ width="290" />
+ <text
+ follows="left|top|right"
+ height="14"
+ layout="topleft"
+ left="10"
+ name="edit_experience_title_label"
+ use_ellipses="true"
+ value="Name:"
+ right="-10"/>
+ <line_editor
+ follows="left|top|right"
+ height="19"
+ layout="topleft"
+ left="10"
+ name="edit_experience_title"
+ max_length_bytes="63"
+ text_color="black"
+ right="-10"/>
+ <text
+ follows="left|top|right"
+ height="14"
+ layout="topleft"
+ left="10"
+ top_pad="10"
+ name="edit_experience_desc_label"
+ use_ellipses="true"
+ value="Description:"
+ right="-10"/>
+ <text_editor
+ follows="left|top|right"
+ height="57"
+ layout="topleft"
+ left="11"
+ name="edit_experience_description"
+ max_length="2048"
+ text_color="black"
+ right="-11"
+ word_wrap="true"/>
+ <button
+ top_pad="10"
+ left="10"
+ width="125"
+ height="23"
+ name="Group_btn"
+ label="Group"
+ />
+ <text
+ type="string"
+ length="1"
+ follows="left|top|right"
+ height="14"
+ layout="topleft"
+ left_pad="10"
+ top_pad="-18"
+ use_ellipses="true"
+ name="edit_GroupText"
+ right="-10" />
+ <text
+ top_pad="10"
+ type="string"
+ length="1"
+ follows="left|top|right"
+ height="16"
+ layout="topleft"
+ left="10"
+ name="edit_ContentRating"
+ right="-10">
+ Rating:
+ </text>
+ <icons_combo_box
+ follows="right|top"
+ height="20"
+ label="Moderate"
+ layout="topleft"
+ right="-10"
+ top_pad="-19"
+ tool_tip="Increasing the maturity rating on an experience will reset permission for all residents which have allowed the experience."
+ name="edit_ContentRatingText"
+ width="105">
+ <icons_combo_box.drop_down_button
+ image_overlay="Parcel_M_Light"
+ image_overlay_alignment="left"
+ imgoverlay_label_space="3"
+ pad_left="3"/>
+ <icons_combo_box.item
+ label="Adult"
+ name="Adult"
+ value="42">
+ <item.columns
+ halign="center"
+ type="icon"
+ value="Parcel_R_Light"
+ width="20"/>
+ </icons_combo_box.item>
+ <icons_combo_box.item
+ label="Moderate"
+ name="Mature"
+ value="21">
+ <item.columns
+ halign="center"
+ type="icon"
+ value="Parcel_M_Light"
+ width="20"/>
+ </icons_combo_box.item>
+ <icons_combo_box.item
+ label="General"
+ name="PG"
+ value="13">
+ <item.columns
+ halign="center"
+ type="icon"
+ value="Parcel_PG_Light"
+ width="20"/>
+ </icons_combo_box.item>
+ </icons_combo_box>
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ height="14"
+ layout="topleft"
+ left="10"
+ top_pad="10"
+ name="edit_Location"
+ right="90">
+ Location:
+ </text>
+ <text
+ type="string"
+ length="1"
+ follows="left|top|right"
+ height="14"
+ layout="topleft"
+ left_pad="5"
+ top_pad="-14"
+ use_ellipses="true"
+ name="edit_LocationTextText"
+ right="-10" />
+ <button
+ left="10"
+ width="125"
+ height="23"
+ name="location_btn"
+ label="Set to Current"
+ />
+ <button
+ top_pad="-23"
+ follows="top|right"
+ right="-10"
+ width="125"
+ name="clear_btn"
+ label="Clear Location"/>
+ <text
+ type="string"
+ length="1"
+ follows="left|top|right"
+ height="14"
+ top_pad="10"
+ layout="topleft"
+ left="10"
+ right="-10">
+ Marketplace store:
+ </text>
+ <line_editor
+ type="string"
+ length="1"
+ follows="left|top|right"
+ height="19"
+ layout="topleft"
+ left="10"
+ max_length_bytes="255"
+ valign="center"
+ name="edit_marketplace"
+ right="-10"/>
+ <check_box width="140"
+ height="21"
+ left="10"
+ layout="topleft"
+ follows="top|left"
+ tool_tip=""
+ label="Enable Experience"
+ name="edit_enable_btn"/>
+ <check_box width="125"
+ height="21"
+ top_pad="-21"
+ right="-10"
+ visible="false"
+ layout="topleft"
+ follows="top|left|right"
+ label="Hide In Search"
+ name="edit_private_btn"/>
+ <text
+ follows="left|top|right"
+ height="25"
+ layout="topleft"
+ left="10"
+ top_pad="10"
+ name="changes"
+ use_ellipses="true"
+ word_wrap="true"
+ value="Experience changes may take several minutes to be seen on all regions."
+ right="-10"/>
+ <button
+ follows="top|left"
+ height="23"
+ label="Back"
+ layout="topleft"
+ name="cancel_btn"
+ width="125"
+ top_pad="15"
+ left="10"
+ visible="true"/>
+ <button
+ follows="top|right"
+ height="23"
+ label="Save"
+ layout="topleft"
+ name="save_btn"
+ top_pad="-23"
+ width="125"
+ right="-10"
+ visible="true"/>
+ </panel>
+ </scroll_container>
+ </panel>
+ </tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_experiences.xml b/indra/newview/skins/default/xui/en/floater_experiences.xml
new file mode 100644
index 0000000000..70e7507907
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_experiences.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+
+<floater
+ can_close="true"
+ can_resize="true"
+ height="400"
+ width="500"
+ min_height="300"
+ min_width="500"
+ layout="topleft"
+ help_topic="floater_experiences"
+ name="floater_experiences"
+ save_rect="true"
+ single_instance="true"
+ reuse_instance="false"
+ bg_opaque_color="0 0.5 0 0.3"
+ title="EXPERIENCES">
+ <tab_container
+ top="3"
+ left="3"
+ layout="topleft"
+ right="-3"
+ follows="all"
+ height="394"
+ name="xp_tabs">
+ </tab_container>
+
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_item_properties.xml b/indra/newview/skins/default/xui/en/floater_item_properties.xml
new file mode 100755
index 0000000000..0fc54a9c8b
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_item_properties.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ legacy_header_height="18"
+ height="570"
+ layout="topleft"
+ name="Item Properties"
+ help_topic="item+properties"
+ title="ITEM PROPERTIES"
+ width="330">
+ <panel
+ follows="all"
+ layout="topleft"
+ left="0"
+ class="sidepanel_item_info"
+ filename="sidepanel_item_info.xml"
+ name="item_panel"
+ top="20"
+ label=""
+ height="570"
+ visible="true"
+ width="330">
+ </panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/en/floater_live_lsleditor.xml
index 5cd7cd196d..e8826034f6 100755
--- a/indra/newview/skins/default/xui/en/floater_live_lsleditor.xml
+++ b/indra/newview/skins/default/xui/en/floater_live_lsleditor.xml
@@ -1,71 +1,118 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater
- legacy_header_height="18"
- bevel_style="none"
- border_style="line"
- can_resize="true"
- height="580"
- layout="topleft"
- min_height="271"
- min_width="290"
- name="script ed float"
- help_topic="script_ed_float"
- save_rect="true"
- title="SCRIPT: NEW SCRIPT"
- width="508">
- <floater.string
- name="not_allowed">
- You can not view or edit this script, since it has been set as &quot;no copy&quot;. You need full permissions to view or edit a script inside an object.
- </floater.string>
- <floater.string
- name="script_running">
- Running
- </floater.string>
- <floater.string
- name="Title">
- SCRIPT: [NAME]
- </floater.string>
- <panel
- bevel_style="none"
+ legacy_header_height="18"
+ bevel_style="none"
+ border_style="line"
+ can_resize="true"
+ height="582"
+ layout="topleft"
+ min_height="271"
+ min_width="328"
+ name="script ed float"
+ help_topic="script_ed_float"
+ save_rect="true"
+ title="SCRIPT: NEW SCRIPT"
+ width="508">
+ <floater.string
+ name="not_allowed">
+ You can not view or edit this script, since it has been set as &quot;no copy&quot;. You need full permissions to view or edit a script inside an object.
+ </floater.string>
+ <floater.string
+ name="script_running">
+ Running
+ </floater.string>
+ <floater.string
+ name="Title">
+ SCRIPT: [NAME]
+ </floater.string>
+ <floater.string
+ name="experience_enabled">
+ Uncheck to remove the current experience
+ </floater.string>
+ <floater.string
+ name="no_experiences">
+ You are not authorized for any experiences
+ </floater.string>
+ <floater.string
+ name="add_experiences">
+ Select to add an experience
+ </floater.string>
+ <floater.string
+ name="show_experience_profile">
+ Click to view the experience profile
+ </floater.string>
+ <floater.string
+ name="loading">
+ Loading...
+ </floater.string>
+ <panel
+ bevel_style="none"
- border_style="line"
- follows="left|top|right|bottom"
- height="522"
- layout="topleft"
- left="10"
- name="script ed panel"
- top="20"
- width="497" />
- <button
- follows="left|bottom"
- height="23"
- label="Reset"
- label_selected="Reset"
- layout="topleft"
- name="Reset"
- left="10"
- width="85" />
- <check_box
+ border_style="line"
+ follows="left|top|right|bottom"
+ height="499"
+ layout="topleft"
+ left="10"
+ name="script ed panel"
+ top="16"
+ width="501" />
+ <button
+ follows="left|bottom"
+ height="23"
+ label="Reset"
+ label_selected="Reset"
+ layout="topleft"
+ name="Reset"
+ left="10"
+ width="85" />
+ <check_box
left_delta="90"
top_delta="3"
- enabled="false"
- follows="left|bottom"
- font="SansSerif"
- height="18"
- initial_value="true"
- label="Running"
- layout="topleft"
- name="running"
- width="205" />
- <check_box
+ enabled="false"
+ follows="left|bottom"
+ font="SansSerif"
+ height="18"
+ initial_value="true"
+ label="Running"
+ layout="topleft"
+ name="running"
+ width="205" />
+ <check_box
left_delta="140"
- enabled="true"
- follows="left|bottom"
- font="SansSerif"
- height="18"
- initial_value="true"
- label="Mono"
- layout="topleft"
- name="mono"
- width="100" />
+ enabled="true"
+ follows="left|bottom"
+ font="SansSerif"
+ height="18"
+ initial_value="true"
+ label="Mono"
+ layout="topleft"
+ name="mono"
+ width="100" />
+ <check_box width="130"
+ height="21"
+ enabled="false"
+ left="9"
+ top_pad="10"
+ layout="topleft"
+ follows="bottom|left"
+ label="Use Experience:"
+ name="enable_xp"/>
+ <combo_box
+ label=""
+ top_pad="-21"
+ left="149"
+ right="467"
+ layout="topleft"
+ follows="left|bottom|right"
+ visible="false"
+ name="Experiences..."/>
+ <button label="&gt;"
+ name="view_profile"
+ height="23"
+ width="23"
+ right="496"
+ layout="topleft"
+ top_pad="-23"
+ follows="right"
+ visible="false"/>
</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_marketplace_listings.xml b/indra/newview/skins/default/xui/en/floater_marketplace_listings.xml
new file mode 100755
index 0000000000..0806a87288
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_marketplace_listings.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<floater
+ title="MARKETPLACE LISTINGS"
+ name="floater_marketplace_listings"
+ help_topic="floater_marketplace_listings"
+ positioning="cascading"
+ width="333"
+ height="445"
+ min_width="200"
+ min_height="300"
+ can_close="true"
+ can_resize="true"
+ save_rect="true"
+ save_visibility="false"
+ reuse_instance="true">
+ <panel
+ name="marketplace_listings_panel"
+ follows="all"
+ layout="topleft"
+ left="0"
+ top="0"
+ height="440"
+ width="333">
+ <panel
+ follows="all"
+ left="10"
+ height="440"
+ width="313"
+ top="0"
+ bg_opaque_color="InventoryBackgroundColor">
+ <panel
+ name="marketplace_listings_inventory_placeholder_panel"
+ follows="all"
+ layout="topleft"
+ top="0"
+ left="0"
+ width="313"
+ height="440"
+ bg_opaque_color="InventoryBackgroundColor">
+ <text
+ name="marketplace_listings_inventory_placeholder_title"
+ type="string"
+ follows="top|left|right"
+ layout="topleft"
+ top="10"
+ left="0"
+ width="313"
+ height="25"
+ wrap="true"
+ halign="center"
+ font="SansSerifBold">
+ Loading...
+ </text>
+ <text
+ name="marketplace_listings_inventory_placeholder_text"
+ type="string"
+ follows="top|left|right"
+ layout="topleft"
+ top="35"
+ left="0"
+ width="313"
+ height="130"
+ wrap="true"
+ halign="left" />
+ </panel>
+ <panel
+ name="panel_marketplace_listing"
+ filename="panel_marketplace_listings.xml"
+ class="llpanelmarketplacelistings"
+ top="0"
+ follows="all"/>
+ </panel>
+ <panel
+ name="marketplace_panel_status"
+ follows="bottom|left|right"
+ layout="topleft"
+ left="10"
+ width="313"
+ height="20">
+ <text
+ name="marketplace_status"
+ type="string"
+ follows="bottom|left|right"
+ layout="topleft"
+ top="0"
+ left="5"
+ width="150"
+ height="20"
+ wrap="true"
+ halign="left"
+ valign="center"
+ font="SansSerif"/>
+ </panel>
+ <layout_stack name="initialization_progress_indicator" orientation="vertical" left="0" height="440" top="0" width="333" follows="all" visible="false">
+ <layout_panel />
+ <layout_panel height="24" auto_resize="false">
+ <layout_stack orientation="horizontal" left="0" height="24" top="0" width="333" follows="all">
+ <layout_panel width="0" />
+ <layout_panel width="24" auto_resize="false">
+ <loading_indicator
+ height="24"
+ layout="topleft"
+ left="0"
+ top="0"
+ width="24" />
+ </layout_panel>
+ <layout_panel width="0" />
+ </layout_stack>
+ </layout_panel>
+ <layout_panel />
+ </layout_stack>
+ </panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_marketplace_validation.xml b/indra/newview/skins/default/xui/en/floater_marketplace_validation.xml
new file mode 100755
index 0000000000..9035a7c161
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_marketplace_validation.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ title="Audit Marketplace Listings"
+ name="floater_marketplace_validation"
+ help_topic="floater_marketplace_validation"
+ layout="topleft"
+ positioning="cascading"
+ legacy_header_height="18"
+ width="600"
+ height="500"
+ min_width="400"
+ min_height="200"
+ can_close="true"
+ can_resize="true"
+ can_minimize="true"
+ save_rect="true"
+ reuse_instance="true"
+ save_visibility="false">
+ <button
+ name="OK"
+ label="OK"
+ label_selected="OK"
+ layout="topleft"
+ follows="right|bottom"
+ top="465"
+ width="100"
+ height="20"
+ left="484"/>
+ <text_editor
+ name="validation_text"
+ type="string"
+ font="SansSerif"
+ length="1"
+ max_length="65536"
+ layout="topleft"
+ follows="all"
+ bg_readonly_color="TextBgReadOnlyColor"
+ text_readonly_color="TextFgReadOnlyColor"
+ top="25"
+ bottom="455"
+ left="20"
+ right="-20"
+ word_wrap="true">
+ MARKETPLACE_VALIDATION_TEXT
+ </text_editor>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml
index 7099db63ab..91adec0789 100755
--- a/indra/newview/skins/default/xui/en/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory.xml
@@ -4,6 +4,81 @@
layout="topleft"
name="Popup"
visible="false">
+ <menu_item_call
+ label="Create listing"
+ layout="topleft"
+ name="Marketplace Create Listing">
+ <menu_item_call.on_click
+ function="Inventory.DoToSelected"
+ parameter="marketplace_create_listing" />
+ </menu_item_call>
+ <menu_item_call
+ label="Associate listing"
+ layout="topleft"
+ name="Marketplace Associate Listing">
+ <menu_item_call.on_click
+ function="Inventory.DoToSelected"
+ parameter="marketplace_associate_listing" />
+ </menu_item_call>
+ <menu_item_call
+ label="Get (Refresh) listing"
+ layout="topleft"
+ name="Marketplace Get Listing">
+ <menu_item_call.on_click
+ function="Inventory.DoToSelected"
+ parameter="marketplace_get_listing" />
+ </menu_item_call>
+ <menu_item_call
+ label="Check for errors"
+ layout="topleft"
+ name="Marketplace Check Listing">
+ <menu_item_call.on_click
+ function="Inventory.DoToSelected"
+ parameter="marketplace_check_listing" />
+ </menu_item_call>
+ <menu_item_call
+ label="Edit listing"
+ layout="topleft"
+ name="Marketplace Edit Listing">
+ <menu_item_call.on_click
+ function="Inventory.DoToSelected"
+ parameter="marketplace_edit_listing" />
+ </menu_item_call>
+ <menu_item_call
+ label="List"
+ layout="topleft"
+ name="Marketplace List">
+ <menu_item_call.on_click
+ function="Inventory.DoToSelected"
+ parameter="marketplace_list" />
+ </menu_item_call>
+ <menu_item_call
+ label="Unlist"
+ layout="topleft"
+ name="Marketplace Unlist">
+ <menu_item_call.on_click
+ function="Inventory.DoToSelected"
+ parameter="marketplace_unlist" />
+ </menu_item_call>
+ <menu_item_call
+ label="Activate"
+ layout="topleft"
+ name="Marketplace Activate">
+ <menu_item_call.on_click
+ function="Inventory.DoToSelected"
+ parameter="marketplace_activate" />
+ </menu_item_call>
+ <menu_item_call
+ label="Deactivate"
+ layout="topleft"
+ name="Marketplace Deactivate">
+ <menu_item_call.on_click
+ function="Inventory.DoToSelected"
+ parameter="marketplace_deactivate" />
+ </menu_item_call>
+ <menu_item_separator
+ layout="topleft"
+ name="Marketplace Listings Separator" />
<menu_item_call
label="Share"
layout="topleft"
@@ -718,12 +793,20 @@
parameter="copy_to_outbox" />
</menu_item_call>
<menu_item_call
- label="Send to Marketplace"
- layout="topleft"
- name="Marketplace Send">
+ label="Copy to Marketplace Listings"
+ layout="topleft"
+ name="Marketplace Copy">
<menu_item_call.on_click
- function="Inventory.DoToSelected"
- parameter="send_to_marketplace" />
+ function="Inventory.DoToSelected"
+ parameter="copy_to_marketplace_listings" />
+ </menu_item_call>
+ <menu_item_call
+ label="Move to Marketplace Listings"
+ layout="topleft"
+ name="Marketplace Move">
+ <menu_item_call.on_click
+ function="Inventory.DoToSelected"
+ parameter="move_to_marketplace_listings" />
</menu_item_call>
<menu_item_call
label="--no options--"
diff --git a/indra/newview/skins/default/xui/en/menu_marketplace_view.xml b/indra/newview/skins/default/xui/en/menu_marketplace_view.xml
new file mode 100755
index 0000000000..4b3bb8ee1c
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_marketplace_view.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu
+ name="menu_marketplace_sort"
+ left="0" bottom="0" visible="false"
+ mouse_opaque="false">
+ <menu_item_check
+ label="Sort by name"
+ name="sort_by_name">
+ <menu_item_check.on_click
+ function="Marketplace.ViewSort.Action"
+ parameter="sort_by_name" />
+ <menu_item_check.on_check
+ function="Marketplace.ViewSort.CheckItem"
+ parameter="sort_by_name" />
+ </menu_item_check>
+ <menu_item_check
+ label="Sort by most recent"
+ name="sort_by_recent">
+ <menu_item_check.on_click
+ function="Marketplace.ViewSort.Action"
+ parameter="sort_by_recent" />
+ <menu_item_check.on_check
+ function="Marketplace.ViewSort.CheckItem"
+ parameter="sort_by_recent" />
+ </menu_item_check>
+ <menu_item_check
+ label="Sort by stock amount (low to high)"
+ name="sort_by_stock_amount">
+ <menu_item_check.on_click
+ function="Marketplace.ViewSort.Action"
+ parameter="sort_by_stock_amount"/>
+ <menu_item_check.on_check
+ function="Marketplace.ViewSort.CheckItem"
+ parameter="sort_by_stock_amount"/>
+ </menu_item_check>
+ <menu_item_separator
+ layout="topleft" />
+ <menu_item_check
+ label="Show only listing folders"
+ name="show_only_listing_folders">
+ <menu_item_check.on_click
+ function="Marketplace.ViewSort.Action"
+ parameter="show_only_listing_folders"/>
+ <menu_item_check.on_check
+ function="Marketplace.ViewSort.CheckItem"
+ parameter="show_only_listing_folders"/>
+ </menu_item_check>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_url_experience.xml b/indra/newview/skins/default/xui/en/menu_url_experience.xml
new file mode 100644
index 0000000000..f4d50e1603
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_url_experience.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<context_menu
+ layout="topleft"
+ name="Url Popup">
+ <menu_item_call
+ label="Copy SLurl to clipboard"
+ layout="topleft"
+ name="url_copy">
+ <menu_item_call.on_click
+ function="Url.CopyUrl" />
+ </menu_item_call>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index b75d614dcc..2463c5f43b 100755
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -66,6 +66,13 @@
function="Floater.ToggleOrBringToFront"
parameter="picks" />
</menu_item_call>
+ <menu_item_call
+ label="Experiences..."
+ name="Experiences">
+ <menu_item_call.on_click
+ function="Floater.ToggleOrBringToFront"
+ parameter="experiences"/>
+ </menu_item_call>
<menu_item_separator/>
<menu_item_call
label="Camera Controls..."
@@ -173,6 +180,13 @@
function="Floater.ToggleOrBringToFront"
parameter="outbox" />
</menu_item_call>
+ <menu_item_call
+ label="Marketplace listings..."
+ name="MarketplaceListings">
+ <menu_item_call.on_click
+ function="Floater.ToggleOrBringToFront"
+ parameter="marketplace_listings" />
+ </menu_item_call>
<menu_item_call
label="Account dashboard..."
name="Manage My Account">
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 28565a85c6..2b01f763d5 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -308,9 +308,251 @@ Initialization with the Marketplace failed because of a system or network error.
name="okbutton"
yestext="OK"/>
</notification>
+
+ <notification
+ icon="OutboxStatus_Error"
+ name="StockPasteFailed"
+ type="outbox">
+ Copy or move to Stock Folder failed with error :
+
+ &apos;[ERROR_CODE]&apos;
+
+ <usetemplate
+ name="okbutton"
+ yestext="OK"/>
+ </notification>
+
+ <notification
+ icon="OutboxStatus_Error"
+ name="MerchantPasteFailed"
+ type="outbox">
+ Copy or move to Marketplace Listings failed with error :
+
+ &apos;[ERROR_CODE]&apos;
+
+ <usetemplate
+ name="okbutton"
+ yestext="OK"/>
+ </notification>
+
+ <notification
+ icon="OutboxStatus_Error"
+ name="MerchantTransactionFailed"
+ type="outbox">
+ The transaction with the Marketplace failed with the following error :
+
+ Reason : &apos;[ERROR_REASON]&apos;
+ [ERROR_DESCRIPTION]
+
+ <usetemplate
+ name="okbutton"
+ yestext="OK"/>
+ </notification>
+
+ <notification
+ icon="OutboxStatus_Error"
+ name="MerchantUnprocessableEntity"
+ type="outbox">
+ We are unable to list this product or activate the version folder. Usually this is caused by missing information in the listing description form, but it may be due to errors in the folder structure. Either edit the listing or check the listing folder for errors.
+
+ <usetemplate
+ name="okbutton"
+ yestext="OK"/>
+ </notification>
+
+ <notification
+ icon="OutboxStatus_Error"
+ name="MerchantListingFailed"
+ type="outbox">
+ Listing to Marketplace failed with error :
+
+ &apos;[ERROR_CODE]&apos;
+
+ <usetemplate
+ name="okbutton"
+ yestext="OK"/>
+ </notification>
+
+ <notification
+ icon="OutboxStatus_Error"
+ name="MerchantFolderActivationFailed"
+ type="outbox">
+ Activating this version folder failed with error :
+
+ &apos;[ERROR_CODE]&apos;
+
+ <usetemplate
+ name="okbutton"
+ yestext="OK"/>
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="MerchantForceValidateListing"
+ type="alertmodal">
+ In order to create your listing, we fixed the hierarchy of your listing contents.
+ <tag>confirm</tag>
+ <usetemplate
+ ignoretext="Warn me that creating a listing fixes the hierarchy of the content"
+ name="okignore"
+ yestext="OK"/>
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="ConfirmMerchantActiveChange"
+ type="alertmodal">
+ This action will change the active content of this listing. Do you want to continue?
+ <tag>confirm</tag>
+ <usetemplate
+ ignoretext="Confirm before I change an active listing on the marketplace"
+ name="okcancelignore"
+ notext="Cancel"
+ yestext="OK"/>
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="ConfirmMerchantMoveInventory"
+ type="alertmodal">
+ Items dragged to the Marketplace Listings window are moved from their original locations, not copied. Do you want to continue?
+ <tag>confirm</tag>
+ <usetemplate
+ ignoretext="Confirm before I move an item from the inventory to the marketplace"
+ name="okcancelignore"
+ notext="Cancel"
+ yestext="OK"/>
+ </notification>
+ <notification
+ icon="alertmodal.tga"
+ name="ConfirmListingCutOrDelete"
+ type="alertmodal">
+ Moving or deleting a listing folder will delete your Marketplace listing. If you would like to keep the Marketplace listing, move or delete the contents of the version folder you would like to modify. Do you want to continue?
+ <tag>confirm</tag>
+ <usetemplate
+ ignoretext="Confirm before I move or delete a listing from the marketplace"
+ name="okcancelignore"
+ notext="Cancel"
+ yestext="OK"/>
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="ConfirmCopyToMarketplace"
+ type="alertmodal">
+ You don't have permission to copy one or more of these items to the Marketplace. You can move them or leave them behind.
+ <tag>confirm</tag>
+ <usetemplate
+ ignoretext="Confirm before I try to copy a selection containing no copy items to the marketplace"
+ name="yesnocancelbuttons"
+ yestext="Move item(s)"
+ notext="Don't move item(s)"
+ canceltext="Cancel"/>
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="ConfirmMerchantUnlist"
+ type="alertmodal">
+ This action will unlist this listing. Do you want to continue?
+ <tag>confirm</tag>
+ <usetemplate
+ ignoretext="Confirm before I unlist an active listing on the marketplace"
+ name="okcancelignore"
+ notext="Cancel"
+ yestext="OK"/>
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="ConfirmMerchantClearVersion"
+ type="alertmodal">
+ This action will deactivate the version folder of the current listing. Do you want to continue?
+ <tag>confirm</tag>
+ <usetemplate
+ ignoretext="Confirm before I deactivate the version folder of a listing on the marketplace"
+ name="okcancelignore"
+ notext="Cancel"
+ yestext="OK"/>
+ </notification>
<notification
+ icon="alertmodal.tga"
+ name="AlertMerchantListingNotUpdated"
+ type="alertmodal">
+This listing could not be updated.
+[[URL] Click here] to edit it on the Marketplace.
+ <usetemplate
+ name="okbutton"
+ yestext="OK"/>
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="AlertMerchantListingCannotWear"
+ type="alertmodal">
+ You cannot wear clothes or body parts that are in the Marketplace Listings folder.
+ <tag>fail</tag>
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="AlertMerchantListingInvalidID"
+ type="alertmodal">
+ Invalid listing ID.
+ <tag>fail</tag>
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="AlertMerchantListingActivateRequired"
+ type="alertmodal">
+ There are several or no version folders in this listing. You will need to select and activate one independently later.
+ <tag>confirm</tag>
+ <usetemplate
+ ignoretext="Alert about version folder activation when I create a listing with several version folders"
+ name="okignore"
+ yestext="OK"/>
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="AlertMerchantStockFolderSplit"
+ type="alertmodal">
+ We have separated stock items of different types into separate stock folders, so your folder is arranged in a way that we can list it.
+ <tag>confirm</tag>
+ <usetemplate
+ ignoretext="Alert when stock folder is being split before being listed"
+ name="okignore"
+ yestext="OK"/>
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="AlertMerchantStockFolderEmpty"
+ type="alertmodal">
+ We have unlisted your listing because the stock is empty. You need to add more units to the stock folder to list the listing again.
+ <tag>confirm</tag>
+ <usetemplate
+ ignoretext="Alert when a listing is unlisted because stock folder is empty"
+ name="okignore"
+ yestext="OK"/>
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="AlertMerchantVersionFolderEmpty"
+ type="alertmodal">
+ We have unlisted your listing because the version folder is empty. You need to add items to the version folder to list the listing again.
+ <tag>confirm</tag>
+ <usetemplate
+ ignoretext="Alert when a listing is unlisted because version folder is empty"
+ name="okignore"
+ yestext="OK"/>
+ </notification>
+
+ <notification
icon="alertmodal.tga"
name="CompileQueueSaveText"
type="alertmodal">
@@ -4468,6 +4710,90 @@ Remove estate manager for this estate only or for [ALL_ESTATES]?
<notification
icon="alert.tga"
+ label="Select estate"
+ name="EstateAllowedExperienceAdd"
+ type="alert">
+ Add to allowed list for this estate only or for [ALL_ESTATES]?
+ <tag>confirm</tag>
+ <usetemplate
+ canceltext="Cancel"
+ name="yesnocancelbuttons"
+ notext="All Estates"
+ yestext="This Estate"/>
+ </notification>
+
+ <notification
+ icon="alert.tga"
+ label="Select estate"
+ name="EstateAllowedExperienceRemove"
+ type="alert">
+ Remove from allowed list for this estate only or for [ALL_ESTATES]?
+ <tag>confirm</tag>
+ <usetemplate
+ canceltext="Cancel"
+ name="yesnocancelbuttons"
+ notext="All Estates"
+ yestext="This Estate"/>
+ </notification>
+
+ <notification
+ icon="alert.tga"
+ label="Select estate"
+ name="EstateBlockedExperienceAdd"
+ type="alert">
+ Add to blocked list for this estate only or for [ALL_ESTATES]?
+ <tag>confirm</tag>
+ <usetemplate
+ canceltext="Cancel"
+ name="yesnocancelbuttons"
+ notext="All Estates"
+ yestext="This Estate"/>
+ </notification>
+
+ <notification
+ icon="alert.tga"
+ label="Select estate"
+ name="EstateBlockedExperienceRemove"
+ type="alert">
+ Remove from blocked list for this estate only or for [ALL_ESTATES]?
+ <tag>confirm</tag>
+ <usetemplate
+ canceltext="Cancel"
+ name="yesnocancelbuttons"
+ notext="All Estates"
+ yestext="This Estate"/>
+ </notification>
+
+ <notification
+ icon="alert.tga"
+ label="Select estate"
+ name="EstateTrustedExperienceAdd"
+ type="alert">
+ Add to key list for this estate only or for [ALL_ESTATES]?
+ <tag>confirm</tag>
+ <usetemplate
+ canceltext="Cancel"
+ name="yesnocancelbuttons"
+ notext="All Estates"
+ yestext="This Estate"/>
+ </notification>
+
+ <notification
+ icon="alert.tga"
+ label="Select estate"
+ name="EstateTrustedExperienceRemove"
+ type="alert">
+ Remove from key list for this estate only or for [ALL_ESTATES]?
+ <tag>confirm</tag>
+ <usetemplate
+ canceltext="Cancel"
+ name="yesnocancelbuttons"
+ notext="All Estates"
+ yestext="This Estate"/>
+ </notification>
+
+ <notification
+ icon="alert.tga"
label="Confirm Kick"
name="EstateKickUser"
type="alert">
@@ -4503,6 +4829,13 @@ Are you sure you want to change the Estate Covenant?
</notification>
<notification
+ icon="alertmodal.tga"
+ name="SLM_UPDATE_FOLDER"
+ type="alertmodal">
+ [MESSAGE]
+ </notification>
+
+ <notification
icon="alertmodal.tga"
name="RegionEntryAccessBlocked_AdultsOnlyContent"
type="alertmodal">
@@ -7173,6 +7506,154 @@ Is this OK?
</notification>
<notification
+ icon="alertmodal.tga"
+ name="ExperienceAcquireFailed"
+ type="alertmodal">
+Unable to acquire a new experience:
+ [ERROR_MESSAGE]
+ <tag>fail</tag>
+ <usetemplate
+ name="okbutton"
+ yestext="OK"/>
+ </notification>
+
+ <notification
+ icon="notify.tga"
+ name="NotInGroupExperienceProfileMessage"
+ persist="false"
+ type="notify">
+ A change to the experience group was ignored because the owner is not a member of the selected group.
+ </notification>
+
+ <notification
+ icon="notify.tga"
+ name="UneditableExperienceProfileMessage"
+ persist="false"
+ type="notify">
+ The uneditable field '[field]' was ignored when updating the experience profile.
+ </notification>
+
+ <notification
+ icon="notify.tga"
+ name="RestrictedToOwnerExperienceProfileMessage"
+ persist="false"
+ type="notify">
+ Ignored changes to the field '[field]' which can only be set by the experience owner.
+ </notification>
+
+ <notification
+ icon="notify.tga"
+ name="MaturityRatingExceedsOwnerExperienceProfileMessage"
+ persist="false"
+ type="notify">
+ You may not set the maturity rating of an experience higher than that of the owner.
+ </notification>
+
+ <notification
+ icon="notify.tga"
+ name="RestrictedTermExperienceProfileMessage"
+ persist="false"
+ type="notify">
+ The following terms prevented the update of the experience profile name and/or description: [extra_info]
+ </notification>
+
+ <notification
+ icon="notify.tga"
+ name="TeleportedHomeExperienceRemoved"
+ persist="false"
+ type="notify">
+ You have been teleported from the region [region_name] for removing the experience secondlife:///app/experience/[public_id]/profile and are no longer permitted in the region.
+ <form name="form">
+ <ignore name="ignore"
+ text="Kicked from region for removing an experience"/>
+ </form>
+ </notification>
+
+ <notification
+ icon="notify.tga"
+ name="TrustedExperienceEntry"
+ persist="false"
+ type="notify">
+ You have been allowed into the region [region_name] by participating in the key experience secondlife:///app/experience/[public_id]/profile removing this experience may kick you from the region.
+ <form name="form">
+ <ignore name="ignore"
+ text="Allowed into a region by an experience"/>
+ </form>
+ </notification>
+
+ <notification
+ icon="notify.tga"
+ name="TrustedExperiencesAvailable"
+ persist="false"
+ type="notify">
+You do not have access to this destination. You may be allowed into the region by Accepting an experience below:
+
+[EXPERIENCE_LIST]
+
+Other Key Experiences may be available.
+ </notification>
+
+
+ <notification
+ icon="notify.tga"
+ name="ExperienceEvent"
+ persist="false"
+ type="notifytip">
+ An object was allowed to [EventType] by the secondlife:///app/experience/[public_id]/profile experience.
+ Owner: secondlife:///app/agent/[OwnerID]/inspect
+ Object Name: [ObjectName]
+ Parcel Name: [ParcelName]
+ </notification>
+
+ <notification
+ icon="notify.tga"
+ name="ExperienceEventAttachment"
+ persist="false"
+ type="notifytip">
+ An attachment was allowed to [EventType] by the secondlife:///app/experience/[public_id]/profile experience.
+ Owner: secondlife:///app/agent/[OwnerID]/inspect
+ </notification>
+
+ <notification
+ icon="notify.tga"
+ name="ScriptQuestionExperience"
+ persist="false"
+ type="notify">
+&apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos;, an object owned by &apos;[NAME]&apos;, requests your participation in the [GRID_WIDE] experience:
+
+[EXPERIENCE]
+
+Once permission is granted you will not see this message again for this experience unless it is revoked from the experience profile.
+
+Scripts associated with this experience will be able to do the following on regions where the experience is active:
+
+[QUESTIONS]Is this OK?
+
+ <unique combine="combine_with_new">
+ <context>experience</context>
+ </unique>
+ <tag>confirm</tag>
+ <form name="form">
+ <button
+ index="3"
+ name="BlockExperience"
+ text="Block Experience"/>
+ <button
+ index="2"
+ name="Mute"
+ text="Block Object"/>
+ <button
+ index="0"
+ name="Yes"
+ text="Yes"/>
+ <button
+ index="1"
+ name="No"
+ text="No"/>
+ </form>
+ </notification>
+
+ <notification
icon="notify.tga"
name="ScriptQuestionCaution"
priority="critical"
diff --git a/indra/newview/skins/default/xui/en/panel_experience_info.xml b/indra/newview/skins/default/xui/en/panel_experience_info.xml
new file mode 100644
index 0000000000..70d8a4fc64
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_experience_info.xml
@@ -0,0 +1,377 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ background_visible="true"
+ follows="all"
+ height="570"
+ layout="topleft"
+ left="5"
+ min_height="350"
+ top="5"
+ width="348"
+ name="panel_experience_info">
+ <text
+ follows="top|left|right"
+ font="SansSerifHugeBold"
+ height="26"
+ layout="topleft"
+ left_pad="4"
+ name="title"
+ text_color="White"
+ top="2"
+ value="Experience Profile"
+ use_ellipses="true"
+ left="3"
+ right="-3"/>
+ <scroll_container
+ color="DkGray2"
+ follows="all"
+ height="532"
+ layout="topleft"
+ left="9"
+ name="xp_scroll"
+ opaque="true"
+ top_pad="10"
+ width="330">
+ <panel
+ bg_alpha_color="DkGray2"
+ follows="top|left"
+ height="480"
+ layout="topleft"
+ left="0"
+ min_height="480"
+ name="scrolling_panel"
+ top="0"
+ width="315"
+ min_width="315">
+ <layout_stack
+ follows="all"
+ height="480"
+ layout="topleft"
+ left="0"
+ top="0"
+ orientation="vertical"
+ width="315">
+ <layout_panel
+ follows="all"
+ height="197"
+ layout="topleft"
+ left="0"
+ top="0"
+ auto_resize="false"
+ visible="true"
+ width="315"
+ name="image_panel">
+ <texture_picker
+ enabled="false"
+ fallback_image="default_land_picture.j2c"
+ follows="left|top"
+ height="197"
+ layout="topleft"
+ left="10"
+ name="logo"
+ top="10"
+ width="290" />
+ </layout_panel>
+ <layout_panel
+ follows="all"
+ height="19"
+ layout="topleft"
+ left="0"
+ top="5"
+ width="313"
+ auto_resize="false"
+ >
+ <text
+ follows="left|top|right"
+ font="SansSerifLarge"
+ height="14"
+ layout="topleft"
+ left="10"
+ name="experience_title"
+ text_color="white"
+ top="0"
+ use_ellipses="true"
+ value="Kyle's Superhero RPG"
+ width="288"/>
+ </layout_panel>
+ <layout_panel
+ follows=""
+ height="50"
+ layout="topleft"
+ left="0"
+ top="0"
+ auto_resize="false"
+ width="315"
+ name="description panel">
+ <expandable_text
+ follows="left|top|right"
+ font="SansSerif"
+ height="50"
+ layout="topleft"
+ left="7"
+ name="experience_description"
+ top="0"
+ value=""
+ width="293"/>
+ </layout_panel>
+ <layout_panel
+ follows="all"
+ height="69"
+ layout="topleft"
+ left="0"
+ top="5"
+ width="313"
+ visible="true"
+ auto_resize="false"
+ name="location panel"
+ >
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ height="16"
+ layout="topleft"
+ left="10"
+ name="Location"
+ width="290">
+ Location:
+ </text>
+ <text
+ type="string"
+ length="1"
+ follows="left|top|right"
+ height="18"
+ layout="topleft"
+ left="10"
+ valign="center"
+ name="LocationTextText"
+ width="288">
+ someplace
+ </text>
+ <button
+ follows="bottom|left"
+ height="23"
+ label="Teleport"
+ layout="topleft"
+ name="teleport_btn"
+ width="151"
+ left="10"/>
+ <button
+ follows="bottom|left"
+ height="23"
+ label="Map"
+ layout="topleft"
+ name="map_btn"
+ top_pad="-23"
+ width="101"
+ left_pad="5"/>
+ </layout_panel>
+ <layout_panel
+ follows="all"
+ height="53"
+ layout="topleft"
+ left="0"
+ top="5"
+ width="313"
+ visible="true"
+ auto_resize="false"
+ name="marketplace panel"
+
+ >
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ height="16"
+ layout="topleft"
+ left="10"
+ name="Location"
+ width="290">
+ Marketplace store:
+ </text>
+ <text
+ type="string"
+ length="1"
+ follows="left|top|right"
+ height="18"
+ layout="topleft"
+ left="10"
+ valign="center"
+ name="LocationTextText"
+ width="288">
+ someplace
+ </text>
+ </layout_panel>
+ <layout_panel
+ follows="left|top|right"
+ height="69"
+ left="0"
+ top="0"
+ auto_resize="false"
+ width="315"
+ >
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ height="16"
+ layout="topleft"
+ left="10"
+ name="ContentRating"
+ width="100">
+ Rating:
+ </text>
+ <text
+ type="string"
+ length="1"
+ follows="left|top|right"
+ height="18"
+ layout="topleft"
+ left_pad="2"
+ valign="center"
+ name="ContentRatingText"
+ top_delta="-2"
+ width="188">
+ Adult
+ </text>
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ height="16"
+ layout="topleft"
+ left="10"
+ name="Owner"
+ width="100">
+ Owner:
+ </text>
+ <text
+ type="string"
+ length="1"
+ follows="left|top|right"
+ height="18"
+ layout="topleft"
+ left_pad="2"
+ valign="center"
+ name="OwnerText"
+ top_delta="-2"
+ width="188">
+ Kyle
+ </text>
+ <button
+ follows="bottom|left"
+ height="23"
+ label="Edit"
+ layout="topleft"
+ name="edit_btn"
+ top_pad="0"
+ width="151"
+ left="10"/>
+ <!--
+
+
+ <expandable_text
+ allow_scroll="false"
+ bg_visible="false"
+ follows="left|top|right"
+ h_pad="0"
+ height="35"
+ width="280"
+ layout="topleft"
+ font="SansSerifBig"
+ font.style="BOLD"
+ left="10"
+ top_pad="10"
+ name="pick_name"
+ read_only="false"
+ text_color="white"
+ v_pad="0"
+ use_ellipses="true"
+ value="It's an experience" />
+
+ <text
+ follows="left|top"
+ height="16"
+ layout="topleft"
+ left="10"
+ top_pad="10"
+ value="Maturity level:"
+ width="130" />
+ <icon
+ follows="top|left"
+ height="16"
+ image_name="unknown"
+ layout="topleft"
+ left_pad="10"
+ name="maturity_icon"
+ top_pad="-18"
+ width="18" />
+ <text
+ follows="top|left"
+ height="16"
+ layout="topleft"
+ left_pad="5"
+ name="maturity_value"
+ top_pad="-14"
+ value="unknown"
+ width="118" />
+ <panel
+ follows="left|top|right"
+ name="location_panel"
+ left="10"
+ width="280"
+ visible="false"
+ top_pad="10"
+ height="42">
+ <text
+ follows="left|top|right"
+ height="16"
+ layout="topleft"
+ left="00"
+ top="0"
+ value="Location:"
+ width="280" />
+
+ <text
+ follows="left|top|right"
+ height="16"
+ layout="topleft"
+ left="0"
+ top_pad="10"
+ value="Location:"
+ width="280" />
+ </panel>
+
+ <panel
+ follows="left|top|right"
+ name="location_panel"
+ left="10"
+ width="280"
+ top_pad="10"
+ height="42">
+ <text
+ follows="left|top|right"
+ height="16"
+ layout="topleft"
+ left="00"
+ top="0"
+ value="Location:"
+ width="280" />
+
+ <text
+ follows="left|top|right"
+ height="16"
+ layout="topleft"
+ left="0"
+ top_pad="10"
+ value="Location:"
+ width="280" />
+ </panel>
+
+-->
+ </layout_panel>
+ </layout_stack>
+ </panel>
+ </scroll_container>
+
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_experience_list_editor.xml b/indra/newview/skins/default/xui/en/panel_experience_list_editor.xml
new file mode 100644
index 0000000000..c76b958eda
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_experience_list_editor.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ layout="topleft"
+ left="0"
+ top="0"
+ width="300"
+ height="100"
+ min_height="100"
+ follows="all"
+ border="true"
+ name="experince_list_editor">
+ <panel.string
+ name="loading">
+ loading...
+ </panel.string>
+ <panel.string
+ name="panel_allowed">
+ Allowed Experiences:
+ </panel.string>
+ <panel.string
+ name="panel_blocked">
+ Blocked Experiences:
+ </panel.string>
+ <panel.string
+ name="panel_trusted">
+ Key Experiences:
+ </panel.string>
+ <panel.string
+ name="no_results">
+ (empty)
+ </panel.string>
+ <text
+ layout="topleft"
+ name="text_name"
+ left="3"
+ right="120"
+ height="12"
+ follows="left|top">
+ Experience List
+ </text>
+ <text
+ layout="topleft"
+ name="text_count"
+ left="125"
+ top_pad="-12"
+ right="-1"
+ height="12"
+ follows="top|left">
+ </text>
+ <scroll_list
+ draw_heading="false"
+ left="3"
+ width="225"
+ height="75"
+ follows="all"
+ name="experience_list">
+ <columns
+ width="225"
+ user_resize="false"
+ name="experience_name"
+ label="Name"/>
+ </scroll_list>
+ <button
+ layout="topleft"
+ follows="top|right"
+ top_pad="-77"
+ left_pad="3"
+ width="65"
+ name="btn_add"
+ label="Add..."/>
+ <button
+ layout="topleft"
+ follows="top|right"
+ width="64"
+ name="btn_remove"
+ label="Remove"/>
+ <button
+ layout="topleft"
+ follows="top|right"
+ width="64"
+ name="btn_profile"
+ label="Profile..."/>
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_experience_list_item.xml b/indra/newview/skins/default/xui/en/panel_experience_list_item.xml
new file mode 100644
index 0000000000..a9777c51e7
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_experience_list_item.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+
+<panel
+ layout="topleft"
+ top="100"
+ left="5"
+ width="100"
+ height="19"
+ label="Experiences"
+ follows="top|right|left">
+ <text
+ left="3"
+ top="3"
+ height="16"
+ width="177"
+ follows="all"
+ name="experience_name"
+ >
+ Dummy Name
+ </text>
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_experience_log.xml b/indra/newview/skins/default/xui/en/panel_experience_log.xml
new file mode 100644
index 0000000000..6869a135d8
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_experience_log.xml
@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+
+<panel
+ layout="topleft"
+ top="3"
+ left="3"
+ width="500"
+ height="300"
+ label="EVENTS"
+ bg_opaque_color="0 0.5 0 0.3"
+ follows="all">
+ <string
+ name="no_events"
+ value="No events."/>
+ <string
+ name="loading"
+ value="loading..."/>
+ <layout_stack
+ layout="topleft"
+ top="0"
+ left="4"
+ right="-1"
+ bottom="-4"
+ orientation="vertical"
+ follows="all">
+ <layout_panel
+ layout="topleft"
+ top="0"
+ left="1"
+ right="-1"
+ height="250"
+ follows="all">
+ <scroll_list
+ draw_heading="true"
+ left="1"
+ right="-86"
+ height="250"
+ follows="all"
+ name="experience_log_list">
+ <columns
+ width="100"
+ user_resize="true"
+ name="time"
+ label="Time"/>
+ <columns
+ width="100"
+ user_resize="true"
+ name="event"
+ label="Event"/>
+ <columns
+ width="100"
+ user_resize="true"
+ name="experience_name"
+ label="Experience"/>
+ <columns
+ width="100"
+ user_resize="true"
+ name="object_name"
+ label="Object"/>
+ </scroll_list>
+
+ <button
+ layout="topleft"
+ follows="top|right"
+ name="btn_notify"
+ label="Notify"
+ top_pad="-225"
+ left_pad="5"
+ right="-1"
+ enabled="false"/>
+
+ <button
+ layout="topleft"
+ follows="top|right"
+ name="btn_profile_xp"
+ label="Profile"
+ top_pad="5"
+ right="-1"
+ enabled="false"/>
+
+ <button
+ layout="topleft"
+ follows="top|right"
+ name="btn_report_xp"
+ label="Report"
+ top_pad="5"
+ right="-1"
+ enabled="false"/>
+ </layout_panel>
+ <layout_panel
+ layout="topleft"
+ top="0"
+ left="1"
+ right="-1"
+ height="30"
+ min_height="30"
+ follows="all"
+ name="button_panel"
+ visible="true">
+ <check_box
+ top="0"
+ follows="top|left"
+ height="26"
+ label="Notify All Events Days"
+ width="140"
+ name="notify_all" />
+
+ <spinner
+ top="5"
+ control_name="LogDays"
+ decimal_digits="0"
+ follows="left|top"
+ height="23"
+ increment="1"
+ initial_value="7"
+ label_width="30"
+ layout="topleft"
+ left_pad="5"
+ max_val="14"
+ min_val="0"
+ name="logsizespinner"
+ width="40" />
+ <button
+ top="5"
+ left="280"
+ layout="topleft"
+ follows="top|left"
+ name="btn_clear"
+ label="Clear"
+ width="80"
+ enabled="false"/>
+ <button
+ top="5"
+ layout="topleft"
+ left_pad="5"
+ width="20"
+ follows="top|left"
+ name="btn_prev"
+ label="&lt;"
+ enabled="false"/>
+ <button
+ top="5"
+ layout="topleft"
+ follows="top|left"
+ name="btn_next"
+ label="&gt;"
+ left_pad="5"
+ width="20"
+ enabled="false"/>
+ </layout_panel>
+ </layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_experience_search.xml b/indra/newview/skins/default/xui/en/panel_experience_search.xml
new file mode 100644
index 0000000000..99ad3e7fe3
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_experience_search.xml
@@ -0,0 +1,182 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ layout="topleft"
+ top="18"
+ left="0"
+ width="350"
+ height="330"
+ label="SEARCH"
+ follows="all">
+
+ <string
+ name="not_found">
+ &apos;[TEXT]&apos; not found
+ </string>
+ <string
+ name="no_results">
+ No results
+ </string>
+ <string
+ name="searching">
+ Searching...
+ </string>
+ <string
+ name="loading">
+ Loading...
+ </string>
+ <string
+ name="maturity_icon_general">
+ "Parcel_PG_Light"
+ </string>
+ <string
+ name="maturity_icon_moderate">
+ "Parcel_M_Light"
+ </string>
+ <string
+ name="maturity_icon_adult">
+ "Parcel_R_Light"
+ </string>
+ <panel
+ follows="all"
+ left="5"
+ right="-3"
+ bottom="-2"
+ top="0"
+ name="search_panel">
+ <text
+ left="0"
+ follows="top|left|right"
+ right="-1">
+ Enter part of the name:
+ </text>
+ <line_editor
+ left="0"
+ follows="left|top|right"
+ name="edit"
+ height="18"
+ right="-60"/>
+ <button label="Go"
+ follows="top|right"
+ top_pad="-18"
+ left_pad="2"
+ right="-1"
+ height="18"
+ name="find"/>
+ <text
+ top_pad="6"
+ left="0"
+ follows="top|left"
+ width="180">
+ Max Content Rating:
+ </text>
+ <icons_combo_box
+ follows="left|top"
+ height="20"
+ label="Moderate"
+ layout="topleft"
+ name="maturity"
+ top_pad="-13"
+ left_pad="0"
+ right="-1">
+ <icons_combo_box.drop_down_button
+ image_overlay="Parcel_M_Light"
+ image_overlay_alignment="left"
+ imgoverlay_label_space="3"
+ pad_left="3"/>
+ <icons_combo_box.item
+ label="Adult"
+ name="Adult"
+ value="42">
+ <item.columns
+ halign="center"
+ type="icon"
+ value="Parcel_R_Light"
+ width="20"/>
+ </icons_combo_box.item>
+ <icons_combo_box.item
+ label="Moderate"
+ name="Mature"
+ value="21">
+ <item.columns
+ halign="center"
+ type="icon"
+ value="Parcel_M_Light"
+ width="20"/>
+ </icons_combo_box.item>
+ <icons_combo_box.item
+ label="General"
+ name="PG"
+ value="13">
+ <item.columns
+ halign="center"
+ type="icon"
+ value="Parcel_PG_Light"
+ width="20"/>
+ </icons_combo_box.item>
+ </icons_combo_box>
+ <scroll_list
+ draw_heading="true"
+ left="0"
+ right="-1"
+ height="239"
+ top_pad="4"
+ follows="all"
+ column_padding="5"
+ name="search_results">
+ <columns
+ halign="center"
+ width="24"
+ name="maturity"
+ label=""/>
+ <columns
+ user_resize="true"
+ name="experience_name"
+ label="Name"/>
+ <columns
+ user_resize="true"
+ name="owner"
+ label="Owner"/>
+ </scroll_list>
+
+ <button
+ follows="left|bottom"
+ height="23"
+ label="OK"
+ label_selected="OK"
+ name="ok_btn"
+ top_pad="3"
+ left="0"
+ width="95" />
+ <button
+ follows="left|bottom"
+ height="23"
+ label="Cancel"
+ name="cancel_btn"
+ width="95"
+ left_pad="3" />
+ <button
+ follows="left|bottom"
+ height="23"
+ label="View Profile"
+ name="profile_btn"
+ width="95"
+ left_pad="3" />
+ <button
+ follows="left|bottom"
+ height="23"
+ label="&lt;"
+ name="left_btn"
+ width="23"
+ left_pad="3"
+ enabled="false"/>
+ <button
+ follows="left|bottom"
+ height="23"
+ label="&gt;"
+ name="right_btn"
+ width="23"
+ left_pad="3"
+ enabled="false" />
+
+ </panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_experiences.xml b/indra/newview/skins/default/xui/en/panel_experiences.xml
new file mode 100644
index 0000000000..7691e684c0
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_experiences.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+
+<panel
+ layout="topleft"
+ top="3"
+ left="3"
+ width="200"
+ height="300"
+ label="Experiences"
+ bg_opaque_color="0 0.5 0 0.3"
+ follows="all">
+ <string
+ name="loading_experiences"
+ value="Loading experiences..."/>
+ <string
+ name="no_experiences"
+ value="No experiences."/>
+ <string
+ name="acquire"
+ value="Acquire an Experience" />
+ <layout_stack
+ layout="topleft"
+ top="0"
+ left="4"
+ right="-1"
+ bottom="-4"
+ orientation="vertical"
+ follows="all">
+ <layout_panel
+ layout="topleft"
+ top="0"
+ left="1"
+ right="-1"
+ height="250"
+ follows="all">
+ <flat_list_view
+ name="experiences_list"
+ layout="topleft"
+ top="0"
+ left="1"
+ right="-1"
+ bottom="-1"
+ follows="all">
+ </flat_list_view>
+ </layout_panel>
+ <layout_panel
+ layout="topleft"
+ top="0"
+ left="1"
+ right="-1"
+ height="24"
+ min_height="24"
+ follows="all"
+ name="button_panel"
+ visible="false">
+ <button
+ layout="topleft"
+ left="2"
+ top="0"
+ follows="top|left"
+ name="btn_action"
+ enabled="true"/>
+ </layout_panel>
+ </layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
index b3326d8da6..95312edfb9 100755
--- a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
@@ -176,6 +176,22 @@ background_visible="true"
name="group_land_tab_panel"
top="0" />
</accordion_tab>
+ <accordion_tab
+ expanded="false"
+ layout="topleft"
+ name="group_experiences_tab"
+ title="Experiences"
+ fit_panel="false">
+ <panel
+ border="false"
+ class="panel_group_experiences"
+ filename="panel_experiences.xml"
+ follows="left|top|right"
+ layout="topleft"
+ left="0"
+ name="group_experiences_tab_panel"
+ top="0" />
+ </accordion_tab>
</accordion>
</layout_panel>
</layout_stack>
diff --git a/indra/newview/skins/default/xui/en/panel_marketplace_listings.xml b/indra/newview/skins/default/xui/en/panel_marketplace_listings.xml
new file mode 100755
index 0000000000..2b17473a84
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_marketplace_listings.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ label="Marketplace"
+ name="Marketplace Panel"
+ follows="all"
+ layout="topleft"
+ width="308"
+ height="440">
+ <panel
+ name="tool_panel"
+ follows="left|top|right"
+ layout="topleft"
+ height="30"
+ width="308"
+ top="0"
+ left="0">
+ <menu_button
+ name="sort_btn"
+ tool_tip="View/sort options"
+ layout="topleft"
+ follows="top|left"
+ width="31"
+ height="25"
+ left="2"
+ menu_filename="menu_marketplace_view.xml"
+ image_hover_unselected="Toolbar_Middle_Over"
+ image_overlay="Conv_toolbar_sort"
+ image_selected="Toolbar_Middle_Selected"
+ image_unselected="Toolbar_Middle_Off"
+ menu_position="bottomleft"/>
+ <button
+ name="add_btn"
+ tool_tip="Create a new listing folder"
+ layout="topleft"
+ follows="top|left"
+ width="31"
+ height="25"
+ left_pad="2"
+ image_hover_unselected="Toolbar_Middle_Over"
+ image_overlay="Conv_toolbar_plus"
+ image_selected="Toolbar_Middle_Selected"
+ image_unselected="Toolbar_Middle_Off"/>
+ <button
+ name="audit_btn"
+ label="Check for Errors"
+ tool_tip="Check your marketplace listings"
+ layout="topleft"
+ follows="top|right"
+ width="97"
+ height="26"
+ left_pad="143"/>
+ </panel>
+ <panel
+ name="tab_container_panel"
+ follows="all"
+ layout="topleft"
+ default_tab_group="1"
+ width="308"
+ height="350">
+ <filter_editor
+ text_pad_left="10"
+ follows="left|top|right"
+ height="23"
+ label="Filter Marketplace Listings"
+ layout="topleft"
+ left="0"
+ max_length_chars="300"
+ name="filter_editor"
+ top="0"
+ width="308" />
+ <tab_container
+ name="marketplace_filter_tabs"
+ follows="all"
+ layout="topleft"
+ top="30"
+ left="0"
+ top_pad="0"
+ width="308"
+ height="320"
+ halign="center"
+ tab_height="30"
+ tab_group="1"
+ tab_position="top"
+ tab_min_width="50">
+ </tab_container>
+ </panel>
+ <panel
+ name="marketplace_drop_zone"
+ mouse_opaque="true"
+ follows="bottom|left|right"
+ left="2"
+ width="306"
+ height="40"
+ background_visible="true"
+ background_opaque="true"
+ bg_alpha_image="none"
+ bg_alpha_color="EmphasisColor_35"
+ bg_opaque_image="Marketplace_Dropzone_Background"
+ border="true"
+ bevel_style="in"
+ visible="true">
+ <text
+ type="string"
+ follows="bottom|left|right"
+ layout="topleft"
+ top="13"
+ height="20"
+ left="2"
+ width="306"
+ halign="center"
+ font="SansSerifMedium"
+ font_shadow="hard"
+ valign="top">
+ Drop folders here to create new listings
+ </text>
+ </panel>
+</panel> \ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/panel_marketplace_listings_inventory.xml b/indra/newview/skins/default/xui/en/panel_marketplace_listings_inventory.xml
new file mode 100755
index 0000000000..8d5fa265e2
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_marketplace_listings_inventory.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<inventory_panel
+ label="ALL"
+ name="All Items"
+ help_topic="marketplace_tab"
+ layout="topleft"
+ follows="all"
+ width="308"
+ height="370"
+ top="16"
+ left="0"
+ start_folder.name="Marketplace listings"
+ show_empty_message="true"
+ show_root_folder="false"
+ use_marketplace_folders="true"
+ start_folder.type="merchant"
+ tool_tip="Drag and drop items here to list them"
+ bg_opaque_color="DkGray2"
+ bg_alpha_color="DkGray2"
+ background_visible="true"
+ border="false"
+ bevel_style="none"
+ show_item_link_overlays="true">
+ <item allow_wear="false"/>
+</inventory_panel>
diff --git a/indra/newview/skins/default/xui/en/panel_marketplace_listings_listed.xml b/indra/newview/skins/default/xui/en/panel_marketplace_listings_listed.xml
new file mode 100755
index 0000000000..44f507ad84
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_marketplace_listings_listed.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<inventory_panel
+ label="LISTED"
+ name="Active Items"
+ help_topic="marketplace_tab"
+ layout="topleft"
+ follows="all"
+ width="308"
+ height="370"
+ left_delta="0"
+ start_folder.name="Marketplace listings"
+ show_empty_message="true"
+ show_root_folder="false"
+ use_marketplace_folders="true"
+ allow_drop_on_root="false"
+ start_folder.type="merchant"
+ bg_opaque_color="DkGray2"
+ bg_alpha_color="DkGray2"
+ background_visible="true"
+ border="false"
+ bevel_style="none"
+ show_item_link_overlays="true">
+ <item allow_wear="false"/>
+</inventory_panel>
diff --git a/indra/newview/skins/default/xui/en/panel_marketplace_listings_unassociated.xml b/indra/newview/skins/default/xui/en/panel_marketplace_listings_unassociated.xml
new file mode 100755
index 0000000000..871e8773c4
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_marketplace_listings_unassociated.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<inventory_panel
+ label="UNASSOCIATED"
+ name="Unassociated Items"
+ help_topic="marketplace_tab"
+ layout="topleft"
+ follows="all"
+ width="308"
+ height="370"
+ left_delta="0"
+ start_folder.name="Marketplace listings"
+ show_empty_message="true"
+ show_root_folder="false"
+ use_marketplace_folders="true"
+ start_folder.type="merchant"
+ bg_opaque_color="DkGray2"
+ bg_alpha_color="DkGray2"
+ background_visible="true"
+ border="false"
+ bevel_style="none"
+ show_item_link_overlays="true">
+ <item allow_wear="false"/>
+</inventory_panel>
diff --git a/indra/newview/skins/default/xui/en/panel_marketplace_listings_unlisted.xml b/indra/newview/skins/default/xui/en/panel_marketplace_listings_unlisted.xml
new file mode 100755
index 0000000000..98bef04aa7
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_marketplace_listings_unlisted.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<inventory_panel
+ label="UNLISTED"
+ name="Inactive Items"
+ help_topic="marketplace_tab"
+ layout="topleft"
+ follows="all"
+ width="308"
+ height="370"
+ left_delta="0"
+ start_folder.name="Marketplace listings"
+ show_empty_message="true"
+ show_root_folder="false"
+ use_marketplace_folders="true"
+ allow_drop_on_root="false"
+ start_folder.type="merchant"
+ bg_opaque_color="DkGray2"
+ bg_alpha_color="DkGray2"
+ background_visible="true"
+ border="false"
+ bevel_style="none"
+ show_item_link_overlays="true">
+ <item allow_wear="false"/>
+</inventory_panel>
diff --git a/indra/newview/skins/default/xui/en/panel_outbox_inventory.xml b/indra/newview/skins/default/xui/en/panel_outbox_inventory.xml
index c80e5b168a..b2d8bb874b 100755
--- a/indra/newview/skins/default/xui/en/panel_outbox_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_outbox_inventory.xml
@@ -3,7 +3,6 @@
name="inventory_outbox"
start_folder.name="Outbox"
show_empty_message="false"
- show_load_status="false"
start_folder.type="outbox"
follows="all" layout="topleft"
top="0" left="0" height="165" width="308"
@@ -28,5 +27,5 @@
text_pad_right="4"
arrow_size="12"
max_folder_item_overlap="2"/>
- <item allow_open="false"/>
+ <item allow_wear="false"/>
</inventory_panel>
diff --git a/indra/newview/skins/default/xui/en/panel_region_experiences.xml b/indra/newview/skins/default/xui/en/panel_region_experiences.xml
new file mode 100644
index 0000000000..bced46f7dc
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_region_experiences.xml
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ border="true"
+ follows="all"
+ height="320"
+ help_topic="panel_region_experience_tab"
+ label="Experiences"
+ name="Experiences"
+ layout="topleft"
+ left="0"
+ top="320"
+ width="480">
+ <panel.string
+ name="trusted_estate_text">
+Any Experience may be Key.
+
+Key Experiences have permission to run on this estate.
+
+Additionally, if the estate does not allow public access, Residents participating in any Key Experience may enter the estate and can remain as long as they are in a Key Experience.
+ </panel.string>
+ <panel.string
+ name="allowed_estate_text">
+Only Experiences that are Land-Scope may be Allowed.
+
+Allowed Experiences have permission to run on this estate.
+ </panel.string>
+ <panel.string
+ name="blocked_estate_text">
+Only Grid-Scope Experiences may be Blocked.
+
+Blocked Experiences may not run on this estate.
+ </panel.string>
+ <panel.string
+ name="estate_caption">
+ Changes to settings on this tab will affect all regions in the estate.
+ </panel.string>
+ <panel.string
+ name="allowed_parcel_text">Only Experiences that are Land-Scope may be Allowed.
+
+Allowed Experiences have permission to run on this parcel if they are not Blocked by the estate.
+ </panel.string>
+ <panel.string
+ name="blocked_parcel_text">Any Resident Experience may be Blocked.
+
+Blocked Experiences may not run on this parcel.
+ </panel.string>
+ <panel.string
+ name="parcel_caption">
+ </panel.string>
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ height="32"
+ layout="topleft"
+ left="10"
+ name="experiences_help_text"
+ top="14"
+ word_wrap="true"/>
+ <layout_stack
+ left="5"
+ layout="topleft"
+ follows="all"
+ right="-5"
+ height="260"
+ orientation="vertical">
+ <layout_panel
+ follows="all"
+ height="93"
+ min_height="50"
+ width="530"
+ visible="false"
+ name="trusted_layout_panel">
+ <panel follows="all"
+ width="330"
+ name="panel_trusted"
+ class="panel_experience_list_editor"
+ filename="panel_experience_list_editor.xml" />
+ <text
+ layout="topleft"
+ name="trusted_text_help"
+ length="1"
+ top="5"
+ left_pad="5"
+ width="200"
+ height="200"
+ follows="top|right"
+ word_wrap="true">
+ </text>
+ </layout_panel>
+ <layout_panel
+ height="93"
+ min_height="50"
+ follows="all"
+ width="530">
+ <panel
+ width="330"
+ name="panel_allowed"
+ class="panel_experience_list_editor"
+ filename="panel_experience_list_editor.xml"/>
+ <text
+ layout="topleft"
+ name="allowed_text_help"
+ length="1"
+ top="5"
+ left_pad="5"
+ width="200"
+ height="200"
+ follows="top|right"
+ word_wrap="true">
+ </text>
+ </layout_panel>
+ <layout_panel
+ height="93"
+ min_height="50"
+ follows="all"
+ width="530">
+ <panel
+ width="330"
+ name="panel_blocked"
+ class="panel_experience_list_editor"
+ filename="panel_experience_list_editor.xml"/>
+ <text
+ layout="topleft"
+ name="blocked_text_help"
+ length="1"
+ top="5"
+ left_pad="5"
+ width="200"
+ height="200"
+ follows="top|right"
+ word_wrap="true">
+ </text>
+ </layout_panel>
+ </layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_script_ed.xml b/indra/newview/skins/default/xui/en/panel_script_ed.xml
index eb1b954e61..c56a5e17cd 100755
--- a/indra/newview/skins/default/xui/en/panel_script_ed.xml
+++ b/indra/newview/skins/default/xui/en/panel_script_ed.xml
@@ -1,75 +1,75 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel
- bevel_style="none"
- border_style="line"
- follows="left|top|right|bottom"
+ bevel_style="none"
+ border_style="line"
+ follows="left|top|right|bottom"
height="522"
- layout="topleft"
- left="0"
- name="script panel"
- width="497">
- <panel.string
- name="loading">
- Loading...
- </panel.string>
- <panel.string
- name="can_not_view">
- You can not view or edit this script, since it has been set as &quot;no copy&quot;. You need full permissions to view or edit a script inside an object.
- </panel.string>
- <panel.string
- name="public_objects_can_not_run">
- Public Objects cannot run scripts
- </panel.string>
- <panel.string
- name="script_running">
- Running
- </panel.string>
- <panel.string
- name="Title">
- Script: [NAME]
- </panel.string>
- <panel.string
- name="external_editor_not_set">
- Select an editor by setting the environment variable LL_SCRIPT_EDITOR or the ExternalEditor setting.
- </panel.string>
- <menu_bar
- bg_visible="false"
- follows="left|top"
- height="18"
- layout="topleft"
- left="0"
- mouse_opaque="false"
- name="script_menu"
- width="476">
- <menu
- top="0"
- height="62"
- label="File"
- layout="topleft"
- left="0"
- mouse_opaque="false"
- name="File"
- width="138">
- <menu_item_call
- label="Save"
- layout="topleft"
- name="Save" />
- <menu_item_separator
- layout="topleft" />
- <menu_item_call
- label="Revert All Changes"
- layout="topleft"
- name="Revert All Changes" />
- <menu_item_separator
- layout="topleft" />
- <menu_item_call
- label="Load from file..."
- layout="topleft"
- name="LoadFromFile" />
- <menu_item_call
- label="Save to file..."
- layout="topleft"
- name="SaveToFile" />
+ layout="topleft"
+ left="0"
+ name="script panel"
+ width="497">
+ <panel.string
+ name="loading">
+ Loading...
+ </panel.string>
+ <panel.string
+ name="can_not_view">
+ You can not view or edit this script, since it has been set as &quot;no copy&quot;. You need full permissions to view or edit a script inside an object.
+ </panel.string>
+ <panel.string
+ name="public_objects_can_not_run">
+ Public Objects cannot run scripts
+ </panel.string>
+ <panel.string
+ name="script_running">
+ Running
+ </panel.string>
+ <panel.string
+ name="Title">
+ Script: [NAME]
+ </panel.string>
+ <panel.string
+ name="external_editor_not_set">
+ Select an editor by setting the environment variable LL_SCRIPT_EDITOR or the ExternalEditor setting.
+ </panel.string>
+ <menu_bar
+ bg_visible="false"
+ follows="left|top"
+ height="18"
+ layout="topleft"
+ left="0"
+ mouse_opaque="false"
+ name="script_menu"
+ width="476">
+ <menu
+ top="0"
+ height="62"
+ label="File"
+ layout="topleft"
+ left="0"
+ mouse_opaque="false"
+ name="File"
+ width="138">
+ <menu_item_call
+ label="Save"
+ layout="topleft"
+ name="Save" />
+ <menu_item_separator
+ layout="topleft" />
+ <menu_item_call
+ label="Revert All Changes"
+ layout="topleft"
+ name="Revert All Changes" />
+ <menu_item_separator
+ layout="topleft" />
+ <menu_item_call
+ label="Load from file..."
+ layout="topleft"
+ name="LoadFromFile" />
+ <menu_item_call
+ label="Save to file..."
+ layout="topleft"
+ name="SaveToFile" />
<menu_item_separator
layout="topleft" />
<menu_item_call
@@ -80,95 +80,95 @@
function="Floater.Toggle"
parameter="script_colors"/>
</menu_item_call>
- </menu>
- <menu
- top="0"
- height="198"
- label="Edit"
- layout="topleft"
- mouse_opaque="false"
- name="Edit"
- width="139">
- <menu_item_call
- enabled="false"
- label="Undo"
- layout="topleft"
- name="Undo" />
- <menu_item_call
- enabled="false"
- label="Redo"
- layout="topleft"
- name="Redo" />
- <menu_item_separator
- layout="topleft" />
- <menu_item_call
- enabled="false"
- label="Cut"
- layout="topleft"
- name="Cut" />
- <menu_item_call
- enabled="false"
- label="Copy"
- layout="topleft"
- name="Copy" />
- <menu_item_call
- enabled="false"
- label="Paste"
- layout="topleft"
- name="Paste" />
- <menu_item_separator
- layout="topleft"
- name="separator2" />
- <menu_item_call
- label="Select All"
- layout="topleft"
- name="Select All" />
- <menu_item_call
- enabled="false"
- label="Deselect"
- layout="topleft"
- name="Deselect" />
- <menu_item_separator
- layout="topleft"
- name="separator3" />
- <menu_item_call
- label="Search / Replace..."
- layout="topleft"
- name="Search / Replace..." />
+ </menu>
+ <menu
+ top="0"
+ height="198"
+ label="Edit"
+ layout="topleft"
+ mouse_opaque="false"
+ name="Edit"
+ width="139">
+ <menu_item_call
+ enabled="false"
+ label="Undo"
+ layout="topleft"
+ name="Undo" />
+ <menu_item_call
+ enabled="false"
+ label="Redo"
+ layout="topleft"
+ name="Redo" />
+ <menu_item_separator
+ layout="topleft" />
+ <menu_item_call
+ enabled="false"
+ label="Cut"
+ layout="topleft"
+ name="Cut" />
+ <menu_item_call
+ enabled="false"
+ label="Copy"
+ layout="topleft"
+ name="Copy" />
+ <menu_item_call
+ enabled="false"
+ label="Paste"
+ layout="topleft"
+ name="Paste" />
+ <menu_item_separator
+ layout="topleft"
+ name="separator2" />
+ <menu_item_call
+ label="Select All"
+ layout="topleft"
+ name="Select All" />
+ <menu_item_call
+ enabled="false"
+ label="Deselect"
+ layout="topleft"
+ name="Deselect" />
+ <menu_item_separator
+ layout="topleft"
+ name="separator3" />
+ <menu_item_call
+ label="Search / Replace..."
+ layout="topleft"
+ name="Search / Replace..." />
<menu_item_call
label="Go to line..."
layout="topleft"
name="Go to line..." />
- </menu>
- <menu
- top="0"
- height="34"
- label="Help"
- layout="topleft"
- mouse_opaque="false"
- name="Help"
- width="112">
- <menu_item_call
- label="Help..."
- layout="topleft"
- name="Help..." />
- <menu_item_call
- label="Keyword Help..."
- layout="topleft"
- name="Keyword Help..." />
- </menu>
- </menu_bar>
+ </menu>
+ <menu
+ top="0"
+ height="34"
+ label="Help"
+ layout="topleft"
+ mouse_opaque="false"
+ name="Help"
+ width="112">
+ <menu_item_call
+ label="Help..."
+ layout="topleft"
+ name="Help..." />
+ <menu_item_call
+ label="Keyword Help..."
+ layout="topleft"
+ name="Keyword Help..." />
+ </menu>
+ </menu_bar>
<script_editor
- left="0"
- type="string"
- length="1"
- follows="left|top|right|bottom"
- font="Monospace"
+ left="0"
+ type="string"
+ length="1"
+ follows="left|top|right|bottom"
+ font="Monospace"
height="376"
- ignore_tab="false"
- layout="topleft"
+ ignore_tab="false"
+ layout="topleft"
max_length="262144"
- name="Script Editor"
+ name="Script Editor"
width="487"
text_color="ScriptText"
default_color="ScriptText"
@@ -177,51 +177,51 @@
text_readonly_color="ScriptText"
bg_readonly_color="ScriptBackground"
cursor_color="ScriptCursorColor"
- enable_tooltip_paste="true"
+ enable_tooltip_paste="true"
word_wrap="true"
show_context_menu="true">
- Loading...
+ Loading...
</script_editor>
- <scroll_list
+ <scroll_list
top_pad="10"
left="0"
- follows="left|right|bottom"
- height="60"
- layout="topleft"
- name="lsl errors"
+ follows="left|right|bottom"
+ height="60"
+ layout="topleft"
+ name="lsl errors"
width="487" />
- <text
- follows="left|bottom"
- height="12"
- layout="topleft"
+ <text
+ follows="left|bottom"
+ height="12"
+ layout="topleft"
left="0"
- name="line_col"
- width="128" />
- <combo_box
- follows="left|bottom"
- height="23"
- label="Insert..."
- layout="topleft"
- name="Insert..."
+ name="line_col"
+ width="128" />
+ <combo_box
+ follows="left|bottom"
+ height="23"
+ label="Insert..."
+ layout="topleft"
+ name="Insert..."
width="128" />
- <button
- follows="right|bottom"
- height="23"
- label="Save"
- label_selected="Save"
- layout="topleft"
- top_pad="-35"
+ <button
+ follows="right|bottom"
+ height="23"
+ label="Save"
+ label_selected="Save"
+ layout="topleft"
+ top_pad="-35"
right="487"
- name="Save_btn"
- width="81" />
- <button
- enabled="false"
- follows="right|bottom"
- height="23"
- label="Edit..."
- layout="topleft"
- top_pad="-23"
+ name="Save_btn"
+ width="81" />
+ <button
+ enabled="false"
+ follows="right|bottom"
+ height="23"
+ label="Edit..."
+ layout="topleft"
+ top_pad="-23"
right="400"
- name="Edit_btn"
- width="81" />
+ name="Edit_btn"
+ width="81" />
</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_script_experience.xml b/indra/newview/skins/default/xui/en/panel_script_experience.xml
new file mode 100644
index 0000000000..e798638751
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_script_experience.xml
@@ -0,0 +1,97 @@
+<panel
+ name="script_experience"
+ title="EXPERIENCE"
+ width="400"
+ follows="top|left|right"
+ top="0"
+ left="0"
+ layout="topleft">
+ <!-- <floater.string name="EXPERIENCE">EXPERIENCE!!!!</floater.string>
+
+ <floater.string name="Script:">Script:</floater.string>
+ <floater.string name="Associated with:">Associated with:</floater.string>
+ <floater.string name="You can contribute:">You can contribute:</floater.string>
+ <floater.string name="Associate with:">Associate with:</floater.string>
+ <floater.string name="Yes">Yes</floater.string>
+ <floater.string name="No">No</floater.string>
+ <floater.string name="(none)"></floater.string>
+ <floater.string name="Choose Experience...">Choose Experience...</floater.string>
+ <floater.string name="You are not a contributor to any experiences.">You are not a contributor to any experiences.</floater.string>
+ -->
+
+ <button name="Expand Experience" width="200"
+ height="35"
+ is_toggle="true"
+ tab_stop="false"
+ pad_left="35"
+ top="0"
+ left="3"
+ label="Experience"
+ halign="left"
+ handle_right_mouse="false"
+ follows="top|left|right"
+ image_unselected="MarketplaceBtn_Off"
+ image_selected="MarketplaceBtn_Selected">
+ </button>
+ <check_box
+ follows="top|right" height="25" label="Uses Experience" left="215" width="0" top="0" name="enable_xp"
+ />
+ <layout_stack
+ follows="top|left|right"
+
+ width="384"
+ height="140"
+ name="xp_details"
+ left="4"
+ top="45"
+ orientation="horizontal"
+ layout="topleft"
+ visible="false">
+ <layout_panel width="120"
+ height="140">
+ <text >
+ Script:
+ </text>
+ <text bottom_delta="25">
+ Associated with:
+ </text>
+ <text bottom_delta="25">
+ You can contribute:
+ </text>
+ <text bottom_delta="25">
+ Associate with:
+ </text>
+ </layout_panel>
+
+ <layout_panel width="250"
+ height="140">
+ <text >
+ EasySit Animator 1.2.4
+ </text>
+ <text bottom_delta="25"
+ text_color="HTMLLinkColor" font.style="UNDERLINE">
+ Kyle's Superhero RPG
+ </text>
+ <text bottom_delta="25">
+ Yes
+ </text>
+ <combo_box left="0" bottom_delta="33"
+ label="Choose Experience..."
+ name="Experiences..."
+ follows="top|left|right"
+ />
+ </layout_panel>
+ </layout_stack>
+ <text
+ follows="top|left|right"
+ width="400"
+ height="15"
+ bottom_delta="-12"
+ left="0"
+ halign="center"
+ name="No Experiences"
+ visible="false"
+ text_color="AlertCautionTextColor">
+ You are not a contributor to any experiences.
+ </text>
+</panel>
diff --git a/indra/newview/skins/default/xui/en/role_actions.xml b/indra/newview/skins/default/xui/en/role_actions.xml
index 1044cbfd2e..c2e7c706d6 100755
--- a/indra/newview/skins/default/xui/en/role_actions.xml
+++ b/indra/newview/skins/default/xui/en/role_actions.xml
@@ -190,4 +190,16 @@
longdescription="Members in a Role with this Ability can control access and participation in group voice and text chat sessions."
name="moderate group chat" value="37" />
</action_set>
+ <action_set
+ description="These Abilities include power to modify experiences owned by this group."
+ name="experience_tools_experience">
+ <action description="Experience Admin"
+ longdescription="Members in a role with this ability can edit the meta-data for an experience."
+ name="experience admin"
+ value ="49" />
+ <action description="Experience Contributor"
+ longdescription="Members in a role with this ability can contribute scripts for an experience."
+ name="experience contributor"
+ value ="50" />
+ </action_set>
</role_actions>
diff --git a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
index 9be01c5d4f..fd14b13ed6 100755
--- a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
@@ -1,444 +1,476 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel
- follows="all"
- height="570"
- layout="topleft"
- name="item properties"
- help_topic="item_properties"
- title="Item Profile"
- width="333">
- <panel.string
- name="unknown">
- (unknown)
- </panel.string>
- <panel.string
- name="unknown_multiple">
- (unknown / multiple)
- </panel.string>
- <panel.string
- name="public">
- (public)
- </panel.string>
- <panel.string
- name="you_can">
- You can:
- </panel.string>
- <panel.string
- name="owner_can">
- Owner can:
- </panel.string>
- <panel.string
- name="acquiredDate">
- [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]
- </panel.string>
- <panel.string
- name="origin_inventory">
- (Inventory)
- </panel.string>
- <panel.string
- name="origin_inworld">
- (Inworld)
- </panel.string>
- <icon
- follows="top|right"
- height="18"
- image_name="Lock"
- layout="topleft"
- right="-15"
- mouse_opaque="true"
- name="IconLocked"
- top="8"
- width="18" />
- <button
- follows="top|left"
- height="24"
- image_hover_unselected="BackButton_Over"
- image_pressed="BackButton_Press"
- image_unselected="BackButton_Off"
- layout="topleft"
- left="12"
- name="back_btn"
- tab_stop="false"
- top="2"
- width="30"
- use_draw_context_alpha="false" />
- <text
- follows="top|left|right"
- font="SansSerifHugeBold"
- height="26"
- layout="topleft"
- left_pad="3"
- name="title"
- text_color="LtGray"
- top="2"
- use_ellipses="true"
- value="Item Profile"
- width="275" />
- <text
- follows="top|left|right"
- height="13"
- layout="topleft"
- left="45"
- name="origin"
- text_color="LtGray_50"
- use_ellipses="true"
- value="(Inventory)"
- width="275" />
- <scroll_container
- color="DkGray2"
- follows="all"
- layout="topleft"
- left="9"
- name="item_profile_scroll"
- opaque="true"
- height="493"
- width="313"
- top="45">
- <panel
- follows="left|top|right"
- height="390"
- help_topic=""
- label=""
- layout="topleft"
- left="0"
- name="item_profile"
- top="0"
- width="295">
- <text
- type="string"
- length="1"
- follows="left|top"
- height="10"
- layout="topleft"
- left="5"
- name="LabelItemNameTitle"
- top="10"
- width="78">
- Name:
- </text>
- <line_editor
- border_style="line"
- border_thickness="1"
- follows="left|top|right"
- height="20"
- layout="topleft"
- left_delta="78"
- max_length_bytes="63"
- name="LabelItemName"
- top_delta="0"
- width="210" />
- <text
- type="string"
- length="1"
- follows="left|top"
- height="10"
- layout="topleft"
- left="5"
- name="LabelItemDescTitle"
- top_pad="10"
- width="78">
- Description:
- </text>
- <line_editor
- border_style="line"
- border_thickness="1"
- follows="left|top|right"
- height="23"
- layout="topleft"
- left_delta="78"
- max_length_bytes="127"
- name="LabelItemDesc"
- top_delta="-5"
- width="210" />
- <text
- type="string"
- length="1"
- follows="left|top"
- height="23"
- layout="topleft"
- left="5"
- name="LabelCreatorTitle"
- top_pad="10"
- width="78">
- Creator:
- </text>
- <avatar_icon
- follows="top|left"
- height="20"
- default_icon_name="Generic_Person"
- layout="topleft"
- left_pad="0"
- top_delta="-6"
- mouse_opaque="true"
- width="20" />
- <text
- type="string"
- follows="left|right|top"
- font="SansSerifSmall"
- height="15"
- layout="topleft"
- left_pad="5"
- name="LabelCreatorName"
- top_delta="6"
- use_ellipses="true"
- width="165">
- </text>
- <button
- follows="top|right"
- height="16"
+ follows="all"
+ height="570"
+ layout="topleft"
+ name="item properties"
+ help_topic="item_properties"
+ title="Item Profile"
+ width="333">
+ <panel.string
+ name="loading_experience">
+ (loading)
+ </panel.string>
+ <panel.string
+ name="unknown">
+ (unknown)
+ </panel.string>
+ <panel.string
+ name="unknown_multiple">
+ (unknown / multiple)
+ </panel.string>
+ <panel.string
+ name="public">
+ (public)
+ </panel.string>
+ <panel.string
+ name="you_can">
+ You can:
+ </panel.string>
+ <panel.string
+ name="owner_can">
+ Owner can:
+ </panel.string>
+ <panel.string
+ name="acquiredDate">
+ [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]
+ </panel.string>
+ <panel.string
+ name="origin_inventory">
+ (Inventory)
+ </panel.string>
+ <panel.string
+ name="origin_inworld">
+ (Inworld)
+ </panel.string>
+ <icon
+ follows="top|right"
+ height="18"
+ image_name="Lock"
+ layout="topleft"
+ right="-15"
+ mouse_opaque="true"
+ name="IconLocked"
+ top="8"
+ width="18" />
+ <button
+ follows="top|left"
+ height="24"
+ image_hover_unselected="BackButton_Over"
+ image_pressed="BackButton_Press"
+ image_unselected="BackButton_Off"
+ layout="topleft"
+ left="12"
+ name="back_btn"
+ tab_stop="false"
+ top="2"
+ width="30"
+ use_draw_context_alpha="false" />
+ <text
+ follows="top|left|right"
+ font="SansSerifHugeBold"
+ height="26"
+ layout="topleft"
+ left_pad="3"
+ name="title"
+ text_color="LtGray"
+ top="2"
+ use_ellipses="true"
+ value="Item Profile"
+ width="275" />
+ <text
+ follows="top|left|right"
+ height="13"
+ layout="topleft"
+ left="45"
+ name="origin"
+ text_color="LtGray_50"
+ use_ellipses="true"
+ value="(Inventory)"
+ width="275" />
+ <scroll_container
+ color="DkGray2"
+ follows="all"
+ layout="topleft"
+ left="9"
+ name="item_profile_scroll"
+ opaque="true"
+ height="493"
+ width="313"
+ top="45">
+ <panel
+ follows="left|top|right"
+ height="390"
+ help_topic=""
+ label=""
+ layout="topleft"
+ left="0"
+ name="item_profile"
+ top="0"
+ width="295">
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ height="10"
+ layout="topleft"
+ left="5"
+ name="LabelItemNameTitle"
+ top="10"
+ width="78">
+ Name:
+ </text>
+ <line_editor
+ border_style="line"
+ border_thickness="1"
+ follows="left|top|right"
+ height="20"
+ layout="topleft"
+ left_delta="78"
+ max_length_bytes="63"
+ name="LabelItemName"
+ top_delta="0"
+ width="210" />
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ height="10"
+ layout="topleft"
+ left="5"
+ name="LabelItemDescTitle"
+ top_pad="10"
+ width="78">
+ Description:
+ </text>
+ <line_editor
+ border_style="line"
+ border_thickness="1"
+ follows="left|top|right"
+ height="23"
+ layout="topleft"
+ left_delta="78"
+ max_length_bytes="127"
+ name="LabelItemDesc"
+ top_delta="-5"
+ width="210" />
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ height="23"
+ layout="topleft"
+ left="5"
+ name="LabelCreatorTitle"
+ top_pad="10"
+ width="78">
+ Creator:
+ </text>
+ <avatar_icon
+ follows="top|left"
+ height="20"
+ default_icon_name="Generic_Person"
+ layout="topleft"
+ left_pad="0"
+ top_delta="-6"
+ mouse_opaque="true"
+ width="20" />
+ <text
+ type="string"
+ follows="left|right|top"
+ font="SansSerifSmall"
+ height="15"
+ layout="topleft"
+ left_pad="5"
+ name="LabelCreatorName"
+ top_delta="6"
+ use_ellipses="true"
+ width="165">
+ </text>
+ <button
+ follows="top|right"
+ height="16"
+ image_selected="Inspector_I"
+ image_unselected="Inspector_I"
+ layout="topleft"
+ right="-5"
+ name="BtnCreator"
+ top_delta="-6"
+ width="16" />
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ height="23"
+ layout="topleft"
+ left="5"
+ name="LabelOwnerTitle"
+ top_pad="10"
+ width="78">
+ Owner:
+ </text>
+ <avatar_icon
+ follows="top|left"
+ height="20"
+ default_icon_name="Generic_Person"
+ layout="topleft"
+ left_pad="0"
+ top_delta="-6"
+ mouse_opaque="true"
+ width="20" />
+ <text
+ type="string"
+ follows="left|right|top"
+ font="SansSerifSmall"
+ height="15"
+ layout="topleft"
+ left_pad="5"
+ name="LabelOwnerName"
+ top_delta="6"
+ use_ellipses="true"
+ width="165">
+ </text>
+ <button
+ follows="top|right"
+ height="16"
image_selected="Inspector_I"
image_unselected="Inspector_I"
+ layout="topleft"
+ right="-5"
+ name="BtnOwner"
+ top_delta="-3"
+ width="16" />
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ height="23"
+ layout="topleft"
+ left="5"
+ name="LabelAcquiredTitle"
+ top_pad="10"
+ width="78">
+ Acquired:
+ </text>
+ <text
+ type="string"
+ length="1"
+ follows="left|top|right"
+ height="23"
+ layout="topleft"
+ left_delta="78"
+ name="LabelAcquiredDate"
+ top_delta="0"
+ width="210">
+ </text>
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ height="10"
+ layout="topleft"
+ left="5"
+ name="LabelItemExperienceTitle"
+ top_pad="0"
+ width="78"
+ visible="true">
+ Experience:
+ </text>
+ <text
+ type="string"
+ length="1"
+ follows="left|top|right"
+ height="10"
+ layout="topleft"
+ left_delta="78"
+ name="LabelItemExperience"
+ top_delta="0"
+ width="210"
+ visible="true"
+ />
+ <panel
+ border="false"
+ follows="left|top|right"
+ layout="topleft"
+ mouse_opaque="false"
+ name="perms_inv"
+ left="0"
+ top_pad="25"
+ height="155"
+ width="313">
+ <text
+ type="string"
+ length="1"
+ left="10"
+ top_pad="13"
+ text_color="EmphasisColor"
+ height="15"
+ follows="left|top|right"
+ layout="topleft"
+ name="perm_modify"
+ width="200">
+ You can:
+ </text>
+ <check_box
+ height="18"
+ label="Modify"
+ layout="topleft"
+ left="20"
+ name="CheckOwnerModify"
+ top_pad="0"
+ width="90" />
+ <check_box
+ height="18"
+ label="Copy"
+ layout="topleft"
+ left_pad="0"
+ name="CheckOwnerCopy"
+ width="90" />
+ <check_box
+ height="18"
+ label="Transfer"
+ layout="topleft"
+ left_pad="0"
+ name="CheckOwnerTransfer"
+ width="106" />
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ height="16"
+ layout="topleft"
+ left="10"
+ name="AnyoneLabel"
+ top_pad="8"
+ width="100">
+ Anyone:
+ </text>
+ <check_box
+ height="18"
+ label="Copy"
layout="topleft"
- right="-5"
- name="BtnCreator"
- top_delta="-6"
- width="16" />
- <text
+ left_pad="0"
+ name="CheckEveryoneCopy"
+ top_delta="-2"
+ width="150" />
+ <text
type="string"
length="1"
follows="left|top"
- height="23"
+ height="16"
layout="topleft"
- left="5"
- name="LabelOwnerTitle"
- top_pad="10"
- width="78">
- Owner:
- </text>
- <avatar_icon
- follows="top|left"
- height="20"
- default_icon_name="Generic_Person"
- layout="topleft"
- left_pad="0"
- top_delta="-6"
- mouse_opaque="true"
- width="20" />
- <text
+ left="10"
+ name="GroupLabel"
+ top_pad="8"
+ width="100">
+ Group:
+ </text>
+ <check_box
+ height="18"
+ label="Share"
+ layout="topleft"
+ left_pad="0"
+ top_delta="-2"
+ name="CheckShareWithGroup"
+ tool_tip="Allow all members of the set group to share your modify permissions for this object. You must Deed to enable role restrictions."
+ width="150" />
+ <text
type="string"
- follows="left|right|top"
- font="SansSerifSmall"
- height="15"
- layout="topleft"
- left_pad="5"
- name="LabelOwnerName"
- top_delta="6"
- use_ellipses="true"
- width="165">
- </text>
- <button
- follows="top|right"
- height="16"
- image_selected="Inspector_I"
- image_unselected="Inspector_I"
- layout="topleft"
- right="-5"
- name="BtnOwner"
- top_delta="-3"
- width="16" />
- <text
- type="string"
- length="1"
- follows="left|top"
- height="23"
- layout="topleft"
- left="5"
- name="LabelAcquiredTitle"
- top_pad="10"
- width="78">
- Acquired:
- </text>
- <text
- type="string"
- length="1"
- follows="left|top|right"
- height="23"
- layout="topleft"
- left_delta="78"
- name="LabelAcquiredDate"
- top_delta="0"
- width="210">
- </text>
- <panel
- border="false"
- follows="left|top|right"
- layout="topleft"
- mouse_opaque="false"
- name="perms_inv"
- left="0"
- top_pad="25"
- height="155"
- width="313">
- <text
- type="string"
- length="1"
- left="10"
- top_pad="13"
- text_color="EmphasisColor"
- height="15"
- follows="left|top|right"
- layout="topleft"
- name="perm_modify"
- width="200">
- You can:
- </text>
- <check_box
- height="18"
- label="Modify"
- layout="topleft"
- left="20"
- name="CheckOwnerModify"
- top_pad="0"
- width="90" />
- <check_box
- height="18"
- label="Copy"
- layout="topleft"
- left_pad="0"
- name="CheckOwnerCopy"
- width="90" />
- <check_box
- height="18"
- label="Transfer"
- layout="topleft"
- left_pad="0"
- name="CheckOwnerTransfer"
- width="106" />
- <text
- type="string"
- length="1"
- follows="left|top"
- height="16"
- layout="topleft"
- left="10"
- name="AnyoneLabel"
- top_pad="8"
- width="100">
- Anyone:
- </text>
- <check_box
- height="18"
- label="Copy"
- layout="topleft"
- left_pad="0"
- name="CheckEveryoneCopy"
- top_delta="-2"
- width="150" />
- <text
- type="string"
- length="1"
- follows="left|top"
- height="16"
- layout="topleft"
- left="10"
- name="GroupLabel"
- top_pad="8"
- width="100">
- Group:
- </text>
- <check_box
- height="18"
- label="Share"
- layout="topleft"
- left_pad="0"
- top_delta="-2"
- name="CheckShareWithGroup"
- tool_tip="Allow all members of the set group to share your modify permissions for this object. You must Deed to enable role restrictions."
- width="150" />
- <text
- type="string"
- length="1"
- follows="left|top"
- height="16"
- layout="topleft"
- left="10"
- name="NextOwnerLabel"
- top_pad="8"
- width="200"
- word_wrap="true">
- Next owner:
- </text>
- <check_box
- height="18"
- label="Modify"
- layout="topleft"
- left="20"
- top_pad="0"
- name="CheckNextOwnerModify"
- width="90" />
- <check_box
- height="18"
- label="Copy"
- layout="topleft"
- left_pad="0"
- name="CheckNextOwnerCopy"
- width="90" />
- <check_box
- height="18"
- label="Transfer"
- layout="topleft"
- left_pad="0"
- name="CheckNextOwnerTransfer"
- tool_tip="Next owner can give away or resell this object"
- width="106" />
- </panel>
+ length="1"
+ follows="left|top"
+ height="16"
+ layout="topleft"
+ left="10"
+ name="NextOwnerLabel"
+ top_pad="8"
+ width="200"
+ word_wrap="true">
+ Next owner:
+ </text>
<check_box
- height="18"
- label="For Sale"
- layout="topleft"
- left="20"
- name="CheckPurchase"
- top_pad="20"
- width="100" />
- <combo_box
- height="23"
- left_pad="0"
- layout="topleft"
- follows="left|top"
- name="ComboBoxSaleType"
- width="170">
- <combo_box.item
- name="Copy"
- label="Copy"
- value="2" />
- <combo_box.item
- name="Contents"
- label="Contents"
- value="3" />
- <combo_box.item
- name="Original"
- label="Original"
- value="1" />
- </combo_box>
- <spinner
- follows="left|top"
- decimal_digits="0"
- increment="1"
- control_name="Edit Cost"
- name="Edit Cost"
- label="Price: L$"
- label_width="75"
- left="120"
- width="170"
- min_val="0"
- height="23"
- max_val="999999999"
- top_pad="10"/>
- </panel>
- </scroll_container>
- <panel
- height="30"
- layout="topleft"
- name="button_panel"
- left="5"
- top_pad="0"
- width="313">
- <button
- height="23"
- label="Cancel"
- layout="topleft"
- name="cancel_btn"
- right="-1"
- width="100" />
- </panel>
- </panel>
+ height="18"
+ label="Modify"
+ layout="topleft"
+ left="20"
+ top_pad="0"
+ name="CheckNextOwnerModify"
+ width="90" />
+ <check_box
+ height="18"
+ label="Copy"
+ layout="topleft"
+ left_pad="0"
+ name="CheckNextOwnerCopy"
+ width="90" />
+ <check_box
+ height="18"
+ label="Transfer"
+ layout="topleft"
+ left_pad="0"
+ name="CheckNextOwnerTransfer"
+ tool_tip="Next owner can give away or resell this object"
+ width="106" />
+ </panel>
+ <check_box
+ height="18"
+ label="For Sale"
+ layout="topleft"
+ left="20"
+ name="CheckPurchase"
+ top_pad="20"
+ width="100" />
+ <combo_box
+ height="23"
+ left_pad="0"
+ layout="topleft"
+ follows="left|top"
+ name="ComboBoxSaleType"
+ width="170">
+ <combo_box.item
+ name="Copy"
+ label="Copy"
+ value="2" />
+ <combo_box.item
+ name="Contents"
+ label="Contents"
+ value="3" />
+ <combo_box.item
+ name="Original"
+ label="Original"
+ value="1" />
+ </combo_box>
+ <spinner
+ follows="left|top"
+ decimal_digits="0"
+ increment="1"
+ control_name="Edit Cost"
+ name="Edit Cost"
+ label="Price: L$"
+ label_width="75"
+ left="120"
+ width="170"
+ min_val="0"
+ height="23"
+ max_val="999999999"
+ top_pad="10"/>
+ </panel>
+
+ </scroll_container>
+ <panel
+ height="30"
+ layout="topleft"
+ name="button_panel"
+ left="5"
+ top_pad="0"
+ width="313"
+ follows="top|right|left">
+ <button
+ follows="top|right"
+ height="23"
+ label="Cancel"
+ layout="topleft"
+ name="cancel_btn"
+ right="-1"
+ width="100" />
+ </panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index f77678e5f8..5f6e90b47f 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -236,14 +236,20 @@ Please try logging in again in a minute.</string>
<string name="TooltipTooManyWearables">You can't wear a folder containing more than [AMOUNT] items. You can change this limit in Advanced > Show Debug Settings > WearFolderLimit.</string>
<string name="TooltipPrice" value="L$[AMOUNT]: "/>
- <string name="TooltipOutboxDragToWorld">You can not rez items in your merchant outbox</string>
- <string name="TooltipOutboxNoTransfer">One or more of these objects cannot be sold or transferred.</string>
- <string name="TooltipOutboxNotInInventory">Your merchant outbox can only accept items directly from your inventory</string>
- <string name="TooltipOutboxWorn">You can not put items you are wearing into your merchant outbox</string>
- <string name="TooltipOutboxCallingCard">You can not put calling cards into your merchant outbox</string>
- <string name="TooltipOutboxFolderLevels">Depth of nested folders exceeds 3</string>
- <string name="TooltipOutboxTooManyFolders">Subfolder count in top-level folder exceeds 20</string>
- <string name="TooltipOutboxTooManyObjects">Item count in top-level folder exceeds 200</string>
+ <string name="TooltipOutboxDragToWorld">You can't rez items from the Marketplace Listings folder</string>
+ <string name="TooltipOutboxWorn">You can't put items you are wearing in the Marketplace Listings folder</string>
+ <string name="TooltipOutboxFolderLevels">Depth of nested folders exceeds [AMOUNT]. Decrease the depth of folders-within-folders; box items if necessary.</string>
+ <string name="TooltipOutboxTooManyFolders">Subfolder count exceeds [AMOUNT]. Decrease the number of folders in your listing; box items if necessary.</string>
+ <string name="TooltipOutboxTooManyObjects">Item count exceeds [AMOUNT]. In order to sell more than [AMOUNT] items in one listing, you must box some of them.</string>
+ <string name="TooltipOutboxTooManyStockItems">Stock items count exceeds [AMOUNT].</string>
+ <string name="TooltipOutboxCannotDropOnRoot">You can only drop items or folders in the ALL or UNASSOCIATED tabs. Please select one of those tabs and move your item(s) or folder(s) again.</string>
+ <string name="TooltipOutboxNoTransfer">One or more of these objects cannot be sold or transferred</string>
+ <string name="TooltipOutboxNotInInventory">You can only put items from your inventory on the marketplace</string>
+ <string name="TooltipOutboxLinked">You can't put linked items or folders on the marketplace</string>
+ <string name="TooltipOutboxCallingCard">You can't put calling cards on the marketplace</string>
+ <string name="TooltipOutboxDragActive">You can't move a listed listing</string>
+ <string name="TooltipOutboxCannotMoveRoot">You can't move the marketplace listings root folder</string>
+ <string name="TooltipOutboxMixedStock">All items in a stock folder must have the same type and permission</string>
<string name="TooltipDragOntoOwnChild">You can't move a folder into its child</string>
<string name="TooltipDragOntoSelf">You can't move a folder into itself</string>
@@ -489,7 +495,7 @@ Please try logging in again in a minute.</string>
<string name="NotConnected">Not Connected</string>
<string name="AgentNameSubst">(You)</string> <!-- Substitution for agent name -->
- <string name="JoinAnExperience">Join an experience</string> <!-- not used -->
+ <string name="JoinAnExperience"/><!-- intentionally blank -->
<string name="SilentlyManageEstateAccess">Suppress alerts when managing estate access lists</string>
<string name="OverrideYourAnimations">Replace your default animations</string>
<string name="ScriptReturnObjects">Return objects on your behalf</string>
@@ -2256,6 +2262,7 @@ For AI Character: Get the closest navigable point to the point provided.
<string name="InventoryNoMatchingItems">Didn't find what you're looking for? Try [secondlife:///app/search/all/[SEARCH_TERM] Search].</string>
<string name="PlacesNoMatchingItems">Didn't find what you're looking for? Try [secondlife:///app/search/places/[SEARCH_TERM] Search].</string>
<string name="FavoritesNoMatchingItems">Drag a landmark here to add it to your favorites.</string>
+ <string name="MarketplaceNoMatchingItems">No items found. Check the spelling of your search string and try again.</string>
<string name="InventoryNoTexture">You do not have a copy of this texture in your inventory</string>
<string name="InventoryInboxNoItems">Your Marketplace purchases will appear here. You may then drag them into your inventory to use them.</string>
<string name="MarketplaceURL">https://marketplace.[MARKETPLACE_DOMAIN_NAME]/</string>
@@ -2283,16 +2290,45 @@ We are accessing your account on the [[MARKETPLACE_CREATE_STORE_URL] Marketplace
<string name="InventoryOutboxError">
The [[MARKETPLACE_CREATE_STORE_URL] Marketplace store] is returning errors.
</string>
-
+ <string name="InventoryMarketplaceError">
+This feature is currently in Beta. Please add your name to this [http://goo.gl/forms/FCQ7UXkakz Google form] if you would like to participate.
+ </string>
+ <string name="InventoryMarketplaceListingsNoItemsTitle">Your Marketplace Listings folder is empty.</string>
+ <string name="InventoryMarketplaceListingsNoItemsTooltip"></string>
+ <string name="InventoryMarketplaceListingsNoItems">
+ Drag folders to this area to list them for sale on the [[MARKETPLACE_DASHBOARD_URL] Marketplace].
+ </string>
+
+ <string name="Marketplace Validation Log"></string>
+ <string name="Marketplace Validation Warning Stock">stock folder must be contained by a version folder</string>
+ <string name="Marketplace Validation Error Mixed Stock">: Error: all items in a stock folder must be no-copy and of the same type</string>
+ <string name="Marketplace Validation Error Subfolder In Stock">: Error: stock folder cannot contain subfolders</string>
+ <string name="Marketplace Validation Warning Empty">: Warning: folder doesn't contain any items</string>
+ <string name="Marketplace Validation Warning Create Stock">: Warning: creating stock folder</string>
+ <string name="Marketplace Validation Warning Create Version">: Warning: creating version folder</string>
+ <string name="Marketplace Validation Warning Move">: Warning : moving items</string>
+ <string name="Marketplace Validation Warning Delete">: Warning: folder content transfered to stock folder, removing empty folder</string>
+ <string name="Marketplace Validation Error Stock Item">: Error: no-copy items must be contained by a stock folder</string>
+ <string name="Marketplace Validation Warning Unwrapped Item">: Warning: items must be contained by a version folder</string>
+ <string name="Marketplace Validation Error">: Error: </string>
+ <string name="Marketplace Validation Warning">: Warning: </string>
+ <string name="Marketplace Validation Error Empty Version">: Warning: version folder must contain at least 1 item</string>
+ <string name="Marketplace Validation Error Empty Stock">: Warning: stock folder must contain at least 1 item</string>
+
+ <string name="Marketplace Validation No Error">No errors or warnings to report</string>
<string name="Marketplace Error None">No errors</string>
- <string name="Marketplace Error Not Merchant">Error: Before sending items to the Marketplace you will need to set yourself up as a merchant (free of charge).</string>
- <string name="Marketplace Error Empty Folder">Error: This folder has no contents.</string>
- <string name="Marketplace Error Unassociated Products">Error: This item failed to upload because your merchant account has too many items unassociated with products. To fix this error, log in to the marketplace website and reduce your unassociated item count.</string>
-
- <string name="Marketplace Error Object Limit">Error: This item contains too many objects. Fix this error by placing objects together in boxes to reduce the total count to less than 200.</string>
- <string name="Marketplace Error Folder Depth">Error: This item contains too many levels of nested folders. Reorganize it to a maximum of 3 levels of nested folders.</string>
- <string name="Marketplace Error Unsellable Item">Error: This item can not be sold on the marketplace.</string>
- <string name="Marketplace Error Internal Import">Error: There was a problem with this item. Try again later.</string>
+ <string name="Marketplace Error Prefix">Error: </string>
+ <string name="Marketplace Error Not Merchant">Before sending items to the Marketplace you will need to set yourself up as a merchant (free of charge).</string>
+ <string name="Marketplace Error Not Accepted">Cannot move item in that folder.</string>
+ <string name="Marketplace Error Unsellable Item">This item cannot be sold on the Marketplace.</string>
+
+ <string name="MarketplaceNoID">no Mkt ID</string>
+ <string name="MarketplaceLive">listed</string>
+ <string name="MarketplaceActive">active</string>
+ <string name="MarketplaceMax">max</string>
+ <string name="MarketplaceStock">stock</string>
+ <string name="MarketplaceNoStock">out of stock</string>
+ <string name="MarketplaceUpdating">updating...</string>
<string name="Open landmarks">Open landmarks</string>
<string name="Unconstrained">Unconstrained</string>
@@ -2500,6 +2536,7 @@ The [[MARKETPLACE_CREATE_STORE_URL] Marketplace store] is returning errors.
<string name="CompileQueueInsufficientPermDownload">Insufficient permissions to download a script.</string>
<string name="CompileQueueInsufficientPermFor">Insufficient permissions for</string>
<string name="CompileQueueUnknownFailure">Unknown failure to download</string>
+ <string name="CompileNoExperiencePerm">Skipping script [SCRIPT] with Experience [EXPERIENCE].</string>
<string name="CompileQueueTitle">Recompilation Progress</string>
<string name="CompileQueueStart">recompile</string>
<string name="ResetQueueTitle">Reset Progress</string>
@@ -3955,6 +3992,7 @@ Try enclosing path to the editor with double quotes.
<string name="Command_Inventory_Label">Inventory</string>
<string name="Command_Map_Label">Map</string>
<string name="Command_Marketplace_Label">Marketplace</string>
+ <string name="Command_MarketplaceListings_Label">Marketplace</string>
<string name="Command_MiniMap_Label">Mini-map</string>
<string name="Command_Move_Label">Walk / run / fly</string>
<string name="Command_Outbox_Label">Merchant outbox</string>
@@ -3985,6 +4023,7 @@ Try enclosing path to the editor with double quotes.
<string name="Command_Inventory_Tooltip">View and use your belongings</string>
<string name="Command_Map_Tooltip">Map of the world</string>
<string name="Command_Marketplace_Tooltip">Go shopping</string>
+ <string name="Command_MarketplaceListings_Tooltip">Sell your creation</string>
<string name="Command_MiniMap_Tooltip">Show nearby people</string>
<string name="Command_Move_Tooltip">Moving your avatar</string>
<string name="Command_Outbox_Tooltip">Transfer items to your marketplace for sale</string>
@@ -4033,6 +4072,36 @@ Try enclosing path to the editor with double quotes.
<!-- Spell check settings floater -->
<string name="UserDictionary">[User]</string>
+ <!-- Experience Tools strings -->
+ <string name="experience_tools_experience">Experience</string>
+ <string name="ExperienceNameNull">(no experience)</string>
+ <string name="ExperienceNameUntitled">(untitled experience)</string>
+ <string name="Land-Scope">Land-Scope</string>
+ <string name="Grid-Scope">Grid-Scope</string>
+ <string name="Allowed_Experiences_Tab">ALLOWED</string>
+ <string name="Blocked_Experiences_Tab">BLOCKED</string>
+ <string name="Contrib_Experiences_Tab">CONTRIBUTOR</string>
+ <string name="Admin_Experiences_Tab">ADMIN</string>
+ <string name="Recent_Experiences_Tab">RECENT</string>
+ <string name="Owned_Experiences_Tab">OWNED</string>
+ <string name="ExperiencesCounter">([EXPERIENCES], max [MAXEXPERIENCES])</string>
+ <string name="ExperiencePermission1">take over your controls</string>
+ <string name="ExperiencePermission3">trigger animations on your avatar</string>
+ <string name="ExperiencePermission4">attach to your avatar</string>
+ <string name="ExperiencePermission9">track your camera</string>
+ <string name="ExperiencePermission10">control your camera</string>
+ <string name="ExperiencePermission11">teleport you</string>
+ <string name="ExperiencePermission12">automatically accept experience permissions</string>
+ <string name="ExperiencePermissionShortUnknown">perform an unknown operation: [Permission]</string>
+ <string name="ExperiencePermissionShort1">Take Controls</string>
+ <string name="ExperiencePermissionShort3">Trigger Animations</string>
+ <string name="ExperiencePermissionShort4">Attach</string>
+ <string name="ExperiencePermissionShort9">Track Camera</string>
+ <string name="ExperiencePermissionShort10">Control Camera</string>
+ <string name="ExperiencePermissionShort11">Teleport</string>
+ <string name="ExperiencePermissionShort12">Permission</string>
+ <string name="ExperiencePermissionShortUnknown">Unknown: [Permission]</string>
+
<!-- Conversation log messages -->
<string name="logging_calls_disabled_log_empty">
Conversations are not being logged. To begin keeping a log, choose "Save: Log only" or "Save: Log and transcripts" under Preferences > Chat.
diff --git a/indra/newview/skins/default/xui/en/widgets/inbox_inventory_panel.xml b/indra/newview/skins/default/xui/en/widgets/inbox_inventory_panel.xml
index d5b10e7f51..92f815d4bf 100755
--- a/indra/newview/skins/default/xui/en/widgets/inbox_inventory_panel.xml
+++ b/indra/newview/skins/default/xui/en/widgets/inbox_inventory_panel.xml
@@ -1,3 +1,2 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<inbox_inventory_panel show_load_status="false"
- start_folder.type="inbox"/>
+<inbox_inventory_panel start_folder.type="inbox"/>
diff --git a/indra/newview/skins/default/xui/en/widgets/inventory_panel.xml b/indra/newview/skins/default/xui/en/widgets/inventory_panel.xml
index eaf148c5e4..d5efd723c4 100755
--- a/indra/newview/skins/default/xui/en/widgets/inventory_panel.xml
+++ b/indra/newview/skins/default/xui/en/widgets/inventory_panel.xml
@@ -3,7 +3,6 @@
bg_opaque_color="InventoryBackgroundColor"
background_visible="true"
background_opaque="true"
- show_load_status="true"
accepts_drag_and_drop="true"
>
<scroll
diff --git a/indra/newview/skins/default/xui/es/floater_about.xml b/indra/newview/skins/default/xui/es/floater_about.xml
index e0a2375067..9bf485ce40 100755
--- a/indra/newview/skins/default/xui/es/floater_about.xml
+++ b/indra/newview/skins/default/xui/es/floater_about.xml
@@ -1,82 +1,24 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="floater_about" title="ACERCA DE [CAPITALIZED_APP_NAME]">
- <floater.string name="AboutHeader">
- [APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2] ([VIEWER_VERSION_3]) [BUILD_DATE] [BUILD_TIME] ([CHANNEL])
-[[VIEWER_RELEASE_NOTES_URL] [ReleaseNotes]]
- </floater.string>
- <floater.string name="AboutCompiler">
- Compilado con [COMPILER], versión [COMPILER_VERSION]
- </floater.string>
- <floater.string name="AboutPosition">
- Estás en la posición [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1] de [REGION], alojada en &lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt; ([HOSTIP])
-SLURL: &lt;nolink&gt;[SLURL]&lt;/nolink&gt;
-(coordenadas globales [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1])
-[SERVER_VERSION]
-[SERVER_RELEASE_NOTES_URL]
- </floater.string>
- <floater.string name="AboutSystem">
- CPU: [CPU]
-Memoria: [MEMORY_MB] MB
-Versión del Sistema Operativo: [OS_VERSION]
-Fabricante de la tarjeta gráfica: [GRAPHICS_CARD_VENDOR]
-Tarjeta gráfica: [GRAPHICS_CARD]
- </floater.string>
- <floater.string name="AboutDriver">
- Versión de Windows Graphics Driver: [GRAPHICS_DRIVER_VERSION]
- </floater.string>
- <floater.string name="AboutLibs">
- Versión de OpenGL: [OPENGL_VERSION]
-
-Versión de libcurl: [LIBCURL_VERSION]
-Versión de J2C Decoder: [J2C_VERSION]
-Versión de Audio Driver: [AUDIO_DRIVER_VERSION]
-Versión de Qt Webkit: [QT_WEBKIT_VERSION]
-Versión del servidor de voz: [VOICE_VERSION]
- </floater.string>
- <floater.string name="none">
- (no hay)
- </floater.string>
- <floater.string name="AboutTraffic">
- Paquetes perdidos: [PACKETS_LOST,number,0]/[PACKETS_IN,number,0] ([PACKETS_PCT,number,1]%)
- </floater.string>
- <floater.string name="ErrorFetchingServerReleaseNotesURL">
- Error al obtener la URL de las notas de la versión del servidor.
- </floater.string>
<tab_container name="about_tab">
<panel label="Información" name="support_panel">
<button label="Copiar al portapapeles" name="copy_btn" width="165"/>
</panel>
<panel label="Créditos" name="credits_panel">
- <text name="linden_intro">
- Second Life ofrecido por los Lindens:
- </text>
- <text_editor name="linden_names">
- Philip, Andrew, Doug, Richard, Phoenix, Ian, Mark, Robin, Dan, Char, Ryan, Eric, Jim, Lee, Jeff, Michael, Kelly, Steve, Catherine, Bub, Ramzi, Jill, Jeska, Don, Kona, Callum, Charity, Jack, Shawn, babbage, James, Lauren, Blue, Brent, Reuben, Pathfinder, Jesse, Patsy, Torley, Bo, Cyn, Jonathan, Gia, Annette, Ginsu, Harry, Lex, Runitai, Guy, Cornelius, Beth, Swiss, Thumper, Wendy, Teeple, Seth, Dee, Mia, Sally, Liana, Aura, Beez, Milo, Red, Gulliver, Marius, Joe, Jose, Dore, Justin, Nora, Morpheus, Lexie, Amber, Chris, Xan, Leyla, Walker, Sabin, Joshua, Hiromi, Tofu, Fritz, June, Jean, Ivy, Dez, Ken, Betsy, Which, Spike, Rob, Zee, Dustin, George, Claudia, del, Matthew, jane, jay, Adrian, Yool, Rika, Yoz, siobhan, Qarl, Benjamin, Beast, Everett, madhavi, Christopher, Izzy, stephany, Jeremy, sean, adreanne, Pramod, Tobin, sejong, Iridium, maurice, kj, Meta, kari, JP, bert, kyle, Jon, Socrates, Bridie, Ivan, maria, Aric, Coco, Periapse, sandy, Storrs, Lotte, Colossus, Brad, Pastrami, Zen, BigPapi, Banzai, Sardonyx, Mani, Garry, Jaime, Neuro, Samuel, Niko, CeeLo, Austin, Soft, Poppy, emma, tessa, angelo, kurz, alexa, Sue, CG, Blake, Erica, Brett, Bevis, kristen, Q, simon, Enus, MJ, laurap, Kip, Scouse, Ron, Ram, kend, Marty, Prospero, melissa, kraft, Nat, Seraph, Hamilton, Lordan, Green, miz, Ashlei, Trinity, Ekim, Echo, Charlie, Rowan, Rome, Jt, Doris, benoc, Christy, Bao, Kate, Tj, Patch, Cheah, Johan, Brandy, Angela, Oreh, Cogsworth, Lan, Mitchell, Space, Bambers, Einstein, Bender, Malbers, Matias, Maggie, Rothman, Milton, Niall, Marin, Allison, Mango, Andrea, Katt, Yi, Ambroff, Rico, Raymond, Gail, Christa, William, Dawn, Usi, Dynamike, M, Corr, Dante, Molly, kaylee, Danica, Kelv, Lil, jacob, Nya, Rodney, elsie, Blondin, Grant, Nyx, Devin, Monty, Minerva, Keira, Katie, Jenn, Makai, Clare, Joy, Cody, Gayathri, FJ, spider, Oskar, Landon, Jarv, Noelle, Al, Doc, Gray, Vir, t, Maestro, Simone, Shannon, yang, Courtney, Scott, charlene, Quixote, Susan, Zed, Amanda, Katelin, Esbee, JoRoan, Enkidu, roxie, Scarlet, Merov, Kevin, Judy, Rand, Newell, Les, Dessie, Galen, Michon, Geo, Siz, Calyle, Pete, Praveen, Callen, Sheldon, Pink, Nelson, jenelle, Terrence, Nathan, Juan, Sascha, Huseby, Karina, Kaye, Kotler, Lis, Darv, Charrell, Dakota, Kimmora, Theeba, Taka, Mae, Perry, Ducot, dana, Esther, Dough, gisele, Doten, Viale, Fisher, jessieann, ashley, Torres, delby, rountree, kurt, Slaton, Madison, Rue, Gino, Wen, Casssandra, Brodesky, Squid, Gez, Rakesh, Gecko, Ladan, Tony, Tatem, Squire, Falcon, BK, Crimp, Tiggs, Bacon, Coyot, Carmilla, Webb, Sea, Arch, Jillian, Jason, Bernard, Vogt, Peggy, dragon, Pup, xandix, Wallace, Bewest, Inoshiro, Rhett, AG, Aimee, Ghengis, Itiaes, Eli, Steffan, Epic, Grapes, Stone, Prep, Scobu, Robert, Alain, Carla, Vicky, Tia, Alec, Taras, Lisa, Oz, Ariane, Log, House, Kazu, Kim, Drofnas, Tyler, Campbell, Michele, Madeline, Nelly, Baron, Thor, Lori, Hele, Fredrik, Teddy, Pixie, Berry, Gabrielle, Alfonso, Brooke, Wolf, Ringo, Cru, Charlar, Rodvik, Gibson, Elise, Bagman, Greger, Leonidas, Jerm, Leslie, CB, Brenda, Durian, Carlo, mm, Zeeshan, Caleb, Max, Elikak, Mercille, Steph, Chase
- </text_editor>
- <text name="contrib_intro">
- con contribuciones de código abierto de:
- </text>
- <text_editor name="contrib_names">
- Dummy Name sustituido durante la ejecución
- </text_editor>
- <text name="trans_intro">
- y traducido por:
- </text>
- <text_editor name="trans_names">
- Dummy Name sustituido durante la ejecución
- </text_editor>
+ <text name="linden_intro">Second Life ofrecido por los Lindens,
+con contribuciones de código abierto de:</text>
+ <text_editor name="contrib_names">Dummy Name sustituido durante la ejecución</text_editor>
</panel>
<panel label="Licencias" name="licenses_panel">
- <text_editor name="credits_editor">
- 3Dconnexion SDK Copyright (C) 1992-2009 3Dconnexion
+ <text_editor name="licenses_editor">3Dconnexion SDK Copyright (C) 1992-2009 3Dconnexion
APR Copyright (C) 2011 The Apache Software Foundation
Collada DOM Copyright 2006 Sony Computer Entertainment Inc.
cURL Copyright (C) 1996-2010, Daniel Stenberg, (daniel@haxx.se)
DBus/dbus-glib Copyright (C) 2002, 2003 CodeFactory AB / Copyright (C) 2003, 2004 Red Hat, Inc.
expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd.
- FreeType Copyright (C) 1996-2002, 2006 David Turner, Robert Wilhelm, and Werner Lemberg.
+ FreeType Copyright (C) 1996-2002, 2006 David Turner, Robert Wilhelm y Werner Lemberg.
GL Copyright (C) 1999-2004 Brian Paul.
- GLOD Copyright (C) 2003-04 Jonathan Cohen, Nat Duca, Chris Niski, Johns Hopkins University and David Luebke, Brenden Schubert, University of Virginia.
+ GLOD Copyright (C) 2003-04 Jonathan Cohen, Nat Duca, Chris Niski, Johns Hopkins University y David Luebke, Brenden Schubert, University of Virginia.
google-perftools Copyright (c) 2005, Google Inc.
Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited.
jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW)
@@ -87,7 +29,7 @@ Versión del servidor de voz: [VOICE_VERSION]
SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
xmlrpc-epi Copyright (C) 2000 Epinions, Inc.
- zlib Copyright (C) 1995-2012 Jean-loup Gailly and Mark Adler.
+ zlib Copyright (C) 1995-2012 Jean-loup Gailly y Mark Adler.
El visor de Second Life usa Havok (TM) Physics. (c)Copyright 1999-2010 Havok.com Inc. (y sus licenciadores). Reservados todos los derechos. Vea los detalles en www.havok.com.
@@ -95,8 +37,7 @@ Versión del servidor de voz: [VOICE_VERSION]
Reservados todos los derechos. Consulte los detalles en licenses.txt.
- Codificación del audio del chat de voz: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
- </text_editor>
+ Codificación del audio del chat de voz: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)</text_editor>
</panel>
</tab_container>
</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_about_land.xml b/indra/newview/skins/default/xui/es/floater_about_land.xml
index f8c40d798a..10907344ae 100755
--- a/indra/newview/skins/default/xui/es/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/es/floater_about_land.xml
@@ -308,9 +308,6 @@ Sólo las parcelas más grandes pueden listarse en la búsqueda.
<panel.string name="push_restrict_region_text">
Sin &apos;empujones&apos; (prevalece lo marcado en la región)
</panel.string>
- <panel.string name="see_avs_text">
- Los avatares de otras parcelas pueden ver
- </panel.string>
<text name="allow_label">
Permitir a otros Residentes:
</text>
@@ -336,22 +333,6 @@ Sólo las parcelas más grandes pueden listarse en la búsqueda.
<check_box label="Seguro (sin daño)" name="check safe" tool_tip="Si se marca, convierte el terreno en &apos;seguro&apos;, desactivando el daño en combate. Si no, se activa el daño en combate."/>
<check_box label="Sin &apos;empujones&apos;" name="PushRestrictCheck" tool_tip="Previene scripts que empujen. Marcando esta opción prevendrá que en su terreno haya comportamientos destructivos."/>
<check_box label="Mostrar el sitio en la búsqueda (30 L$/semana)" name="ShowDirectoryCheck" tool_tip="Let people see this parcel in search results"/>
- <combo_box name="land category with adult">
- <combo_box.item label="Cualquier categoría" name="item0"/>
- <combo_box.item label="Localización Linden" name="item1"/>
- <combo_box.item label="Adulto" name="item2"/>
- <combo_box.item label="Arte y Cultura" name="item3"/>
- <combo_box.item label="Negocios" name="item4"/>
- <combo_box.item label="Educativo" name="item5"/>
- <combo_box.item label="Juegos de azar" name="item6"/>
- <combo_box.item label="Entretenimiento" name="item7"/>
- <combo_box.item label="Para recién llegados" name="item8"/>
- <combo_box.item label="Parques y Naturaleza" name="item9"/>
- <combo_box.item label="Residencial" name="item10"/>
- <combo_box.item label="Compras" name="item11"/>
- <combo_box.item label="Terreno en alquiler" name="item13"/>
- <combo_box.item label="Otra" name="item12"/>
- </combo_box>
<combo_box name="land category">
<combo_box.item label="Cualquier categoría" name="item0"/>
<combo_box.item label="Localización Linden" name="item1"/>
@@ -451,15 +432,9 @@ los media:
<panel.string name="access_estate_defined">
(Definido por el Estado)
</panel.string>
- <panel.string name="allow_public_access">
- Permitir el acceso público ([MATURITY]) (Nota: Si no seleccionas esta opción, se crearán líneas de prohibición)
- </panel.string>
<panel.string name="estate_override">
Una o más de esta opciones está configurada a nivel del estado
</panel.string>
- <text name="Limit access to this parcel to:">
- Acceso a esta parcela
- </text>
<check_box label="Permitir el acceso público (si no seleccionas esta opción, se crearán líneas de prohibición)" name="public_access"/>
<text name="Only Allow">
Permitir únicamente el acceso a los Residentes que:
@@ -491,5 +466,6 @@ los media:
<button label="Quitar" label_selected="Quitar" name="remove_banned"/>
</panel>
</panel>
+ <panel label="EXPERIENCIAS" name="land_experiences_panel"/>
</tab_container>
</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_associate_listing.xml b/indra/newview/skins/default/xui/es/floater_associate_listing.xml
new file mode 100644
index 0000000000..128382b277
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_associate_listing.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="associate listing" title="ASOCIAR ARTÃCULOS">
+ <text name="message">Id. de artículos:</text>
+ <line_editor name="listing_id">Escribe aquí el Id.</line_editor>
+ <button label="OK" name="OK"/>
+ <button label="Cancelar" name="Cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_edit_hover_height.xml b/indra/newview/skins/default/xui/es/floater_edit_hover_height.xml
new file mode 100644
index 0000000000..d2130228bc
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_edit_hover_height.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="HoverHeight" title="CONFIGURAR ALTURA DEL AVATAR">
+ <slider label="Altura" name="HoverHeightSlider"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_experience_search.xml b/indra/newview/skins/default/xui/es/floater_experience_search.xml
new file mode 100644
index 0000000000..315b3363fa
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_experience_search.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="experiencepicker" title="ELEGIR EXPERIENCIA"/>
diff --git a/indra/newview/skins/default/xui/es/floater_experienceprofile.xml b/indra/newview/skins/default/xui/es/floater_experienceprofile.xml
new file mode 100644
index 0000000000..c37208647a
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_experienceprofile.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater title="EXPERIENCE PROFILE">
+ <floater.string name="empty_slurl">
+ (ninguno)
+ </floater.string>
+ <floater.string name="maturity_icon_general">
+ &quot;Parcel_PG_Light&quot;
+ </floater.string>
+ <floater.string name="maturity_icon_moderate">
+ &quot;Parcel_M_Light&quot;
+ </floater.string>
+ <floater.string name="maturity_icon_adult">
+ &quot;Parcel_R_Light&quot;
+ </floater.string>
+ <text name="edit_title" value="Perfil de experiencia"/>
+ <tab_container name="tab_container">
+ <panel name="panel_experience_info">
+ <scroll_container name="xp_scroll">
+ <panel name="scrolling_panel">
+ <layout_stack>
+ <layout_panel name="top panel">
+ <button label="Editar" name="edit_btn"/>
+ </layout_panel>
+ <layout_panel name="maturity panel">
+ <text name="ContentRating">
+ Calificación:
+ </text>
+ </layout_panel>
+ <layout_panel name="location panel">
+ <text name="Location">
+ Ubicación:
+ </text>
+ </layout_panel>
+ <layout_panel>
+ <text name="Owner">
+ Propietario:
+ </text>
+ </layout_panel>
+ <layout_panel name="group_panel">
+ <text name="Group">
+ Grupo:
+ </text>
+ </layout_panel>
+ <layout_panel name="perm panel">
+ <button label="Permitir" name="allow_btn"/>
+ <button label="Olvidar" name="forget_btn"/>
+ <button label="Bloquear" name="block_btn"/>
+ <text name="privileged">
+ Esta experiencia está habilitada para todos los residentes.
+ </text>
+ <button label="Denunciar una infracción" name="report_btn"/>
+ </layout_panel>
+ </layout_stack>
+ </panel>
+ </scroll_container>
+ </panel>
+ <panel name="edit_panel_experience_info">
+ <scroll_container name="edit_xp_scroll">
+ <panel name="edit_scrolling_panel">
+ <text name="edit_experience_title_label" value="Nombre:"/>
+ <text name="edit_experience_desc_label" value="Descripción:"/>
+ <button label="Grupo" name="Group_btn"/>
+ <text name="edit_ContentRating">
+ Calificación:
+ </text>
+ <icons_combo_box label="Moderado" name="edit_ContentRatingText" tool_tip="Al aumentar el nivel de calificación de una experiencia se restablecen los permisos de todos los residentes que han permitido la experiencia.">
+ <icons_combo_box.item label="Adulto" name="Adult" value="42"/>
+ <icons_combo_box.item label="Moderado" name="Mature" value="21"/>
+ <icons_combo_box.item label="General" name="PG" value="13"/>
+ </icons_combo_box>
+ <text name="edit_Location">
+ Ubicación:
+ </text>
+ <button label="Configurar en mi posición" name="location_btn"/>
+ <button label="Borrar lugar" name="clear_btn"/>
+ <check_box label="Habilitar experiencia" name="edit_enable_btn" tool_tip=""/>
+ <check_box label="Ocultar en la búsqueda" name="edit_private_btn"/>
+ <text name="changes" value="Los cambios de una experiencia pueden tardar varios minutos en mostrarse en todas las regiones.+"/>
+ <button label="Anterior" name="cancel_btn"/>
+ <button label="Guardar" name="save_btn"/>
+ </panel>
+ </scroll_container>
+ </panel>
+ </tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_experiences.xml b/indra/newview/skins/default/xui/es/floater_experiences.xml
new file mode 100644
index 0000000000..1a95aa3da8
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_experiences.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_experiences" title="EXPERIENCIAS"/>
diff --git a/indra/newview/skins/default/xui/es/floater_facebook.xml b/indra/newview/skins/default/xui/es/floater_facebook.xml
index 3b0e05b193..4bccc6ee57 100644
--- a/indra/newview/skins/default/xui/es/floater_facebook.xml
+++ b/indra/newview/skins/default/xui/es/floater_facebook.xml
@@ -1,20 +1,15 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="floater_facebook" title="PUBLICAR EN FACEBOOK">
- <panel name="background">
- <tab_container name="tabs">
- <panel label="ESTADO" name="panel_facebook_status"/>
- <panel label="FOTO" name="panel_facebook_photo"/>
- <panel label="ESTOY AQUÃ" name="panel_facebook_place"/>
- <panel label="AMIGOS" name="panel_facebook_friends"/>
- <panel label="CUENTA" name="panel_facebook_account"/>
- </tab_container>
- <panel name="connection_status_panel">
- <text name="connection_error_text">
- Error
- </text>
- <text name="connection_loading_text">
- Cargando...
- </text>
- </panel>
- </panel>
+ <tab_container name="tabs">
+ <panel label="ESTADO" name="panel_facebook_status"/>
+ <panel label="FOTO" name="panel_facebook_photo"/>
+ <panel label="ESTOY AQUÃ" name="panel_facebook_place"/>
+ <panel label="AMIGOS" name="panel_facebook_friends"/>
+ </tab_container>
+ <text name="connection_error_text">
+ Error
+ </text>
+ <text name="connection_loading_text">
+ Cargando...
+ </text>
</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/es/floater_inventory_item_properties.xml
index bf84c3d808..a8a3ad08f8 100755
--- a/indra/newview/skins/default/xui/es/floater_inventory_item_properties.xml
+++ b/indra/newview/skins/default/xui/es/floater_inventory_item_properties.xml
@@ -1,67 +1,36 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="item properties" title="PROPIEDADES DEL ÃTEM DEL INVENTARIO">
- <floater.string name="unknown">
- (desconocido)
- </floater.string>
- <floater.string name="public">
- (público)
- </floater.string>
- <floater.string name="you_can">
- Usted puede:
- </floater.string>
- <floater.string name="owner_can">
- El propietario puede:
- </floater.string>
- <floater.string name="acquiredDate">
- [wkday,datetime,local][day,datetime,local] [mth,datetime,local] [year,datetime,local][hour,datetime,local]:[min,datetime,local]:[second,datetime,local]
- </floater.string>
- <text name="LabelItemNameTitle">
- Nombre:
- </text>
- <text name="LabelItemDescTitle">
- Descripción:
- </text>
- <text name="LabelCreatorTitle">
- Creador:
- </text>
+ <floater.string name="unknown">(desconocido)</floater.string>
+ <floater.string name="public">(público)</floater.string>
+ <floater.string name="you_can">Usted puede:</floater.string>
+ <floater.string name="owner_can">El propietario puede:</floater.string>
+ <floater.string name="acquiredDate">[wkday,datetime,local][day,datetime,local] [mth,datetime,local] [year,datetime,local][hour,datetime,local]:[min,datetime,local]:[second,datetime,local]</floater.string>
+ <text name="LabelItemNameTitle">Nombre:</text>
+ <text name="LabelItemDescTitle">Descripción:</text>
+ <text name="LabelCreatorTitle">Creador:</text>
<button label="Perfil..." label_selected="" name="BtnCreator"/>
- <text name="LabelOwnerTitle">
- Propietario:
- </text>
+ <text name="LabelOwnerTitle">Propietario:</text>
<button label="Perfil..." label_selected="" name="BtnOwner"/>
- <text name="LabelAcquiredTitle">
- Adquirido:
- </text>
- <text name="LabelAcquiredDate">
- May Mié 24 12:50:46 2006
- </text>
- <text name="OwnerLabel">
- Tú:
- </text>
+ <text name="LabelAcquiredTitle">Adquirido:</text>
+ <text name="LabelAcquiredDate">May Mié 24 12:50:46 2006</text>
+ <text name="OwnerLabel">Tú:</text>
<check_box label="Editar" name="CheckOwnerModify"/>
<check_box label="Copiarlo" left_delta="88" name="CheckOwnerCopy"/>
<check_box label="Revender" name="CheckOwnerTransfer"/>
- <text name="AnyoneLabel">
- Cualquiera:
- </text>
+ <text name="AnyoneLabel">Cualquiera:</text>
<check_box label="Copiar" name="CheckEveryoneCopy"/>
- <text name="GroupLabel">
- Grupo:
- </text>
+ <text name="GroupLabel">Grupo:</text>
<check_box label="Compartir" name="CheckShareWithGroup"/>
- <text name="NextOwnerLabel" width="230">
- Próximo propietario:
- </text>
+ <text name="NextOwnerLabel" width="230">Próximo propietario:</text>
<check_box label="Editar" name="CheckNextOwnerModify"/>
<check_box label="Copiarlo" left_delta="88" name="CheckNextOwnerCopy"/>
<check_box label="Revender" name="CheckNextOwnerTransfer"/>
<check_box label="En venta" name="CheckPurchase"/>
- <combo_box name="combobox sale copy">
- <combo_box.item label="Copia" name="Copy"/>
+ <combo_box name="ComboBoxSaleType">
+ <combo_box.item label="Copiar" name="Copy"/>
+ <combo_box.item label="Contenidos" name="Contents"/>
<combo_box.item label="Original" name="Original"/>
</combo_box>
<spinner label="Precio:" name="Edit Cost"/>
- <text name="CurrencySymbol">
- L$
- </text>
+ <text name="CurrencySymbol">L$</text>
</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/es/floater_inventory_view_finder.xml
index 6004034504..5d16ccd271 100755
--- a/indra/newview/skins/default/xui/es/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/es/floater_inventory_view_finder.xml
@@ -5,8 +5,8 @@
<check_box label="Ropa" name="check_clothing"/>
<check_box label="Gestos" name="check_gesture"/>
<check_box label="Hitos" name="check_landmark"/>
- <check_box label="Redes" name="check_mesh"/>
<check_box label="Notas" name="check_notecard"/>
+ <check_box label="Redes" name="check_mesh"/>
<check_box label="Objetos" name="check_object"/>
<check_box label="Scripts" name="check_script"/>
<check_box label="Sonidos" name="check_sound"/>
@@ -19,6 +19,10 @@
<text name="- OR -">
- o -
</text>
+ <radio_group name="date_search_direction">
+ <radio_item label="Posteriores a" name="newer"/>
+ <radio_item label="Anteriores a" name="older"/>
+ </radio_group>
<spinner label="horas atrás" name="spin_hours_ago"/>
<spinner label="días atrás" name="spin_days_ago"/>
<button bottom_delta="-30" label="Cerrar" label_selected="Cerrar" name="Close"/>
diff --git a/indra/newview/skins/default/xui/es/floater_item_properties.xml b/indra/newview/skins/default/xui/es/floater_item_properties.xml
new file mode 100644
index 0000000000..b5fd595c24
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_item_properties.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Item Properties" title="PROPIEDADES DEL ARTÃCULO"/>
diff --git a/indra/newview/skins/default/xui/es/floater_lagmeter.xml b/indra/newview/skins/default/xui/es/floater_lagmeter.xml
index 227689a194..64a2124cd6 100644
--- a/indra/newview/skins/default/xui/es/floater_lagmeter.xml
+++ b/indra/newview/skins/default/xui/es/floater_lagmeter.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_lagmeter" title="MEDIDOR DEL LAG">
+<floater name="floater_lagmeter" title="MEDIDOR DE LAG">
<floater.string name="max_title_msg">
- Medidor del lag
+ Medidor de lag
</floater.string>
<floater.string name="max_width_px">
360
@@ -25,25 +25,25 @@
Normal, ventana en segundo plano
</floater.string>
<floater.string name="client_frame_time_critical_msg">
- Frames del cliente valorados por debajo de [CLIENT_FRAME_RATE_CRITICAL]
+ Velocidad de fotogramas del cliente inferior a [CLIENT_FRAME_RATE_CRITICAL]
</floater.string>
<floater.string name="client_frame_time_warning_msg">
- Frames del cliente valorados entre [CLIENT_FRAME_RATE_CRITICAL] y [CLIENT_FRAME_RATE_WARNING]
+ Velocidad de fotogramas del cliente entre [CLIENT_FRAME_RATE_CRITICAL] y [CLIENT_FRAME_RATE_WARNING]
</floater.string>
<floater.string name="client_frame_time_normal_msg">
Normal
</floater.string>
<floater.string name="client_draw_distance_cause_msg">
- Posible causa: distancia de dibujo fijada muy alta
+ Causa posible: la distancia de dibujo configurada es demasiado grande
</floater.string>
<floater.string name="client_texture_loading_cause_msg">
- Posible causa: imágenes cargándose
+ Causa posible: se están cargando las imágenes
</floater.string>
<floater.string name="client_texture_memory_cause_msg">
- Posible causa: demasiadas imágenes en la memoria
+ Causa posible: demasiadas imágenes en la memoria
</floater.string>
<floater.string name="client_complex_objects_cause_msg">
- Posible causa: demasiados objetos complejos en la escena
+ Causa posible: la escena contiene demasiados objetos complejos
</floater.string>
<floater.string name="network_text_msg">
Red
@@ -55,10 +55,10 @@
5
</floater.string>
<floater.string name="network_packet_loss_critical_msg">
- La conexión deja caer más del [NETWORK_PACKET_LOSS_CRITICAL]% de los paquetes
+ La conexión pierde más de un [NETWORK_PACKET_LOSS_CRITICAL] % de paquetes
</floater.string>
<floater.string name="network_packet_loss_warning_msg">
- La conexión deja caer [NETWORK_PACKET_LOSS_WARNING]%-[NETWORK_PACKET_LOSS_CRITICAL]% de los paquetes
+ La conexión pierde entre un [NETWORK_PACKET_LOSS_WARNING] % y un [NETWORK_PACKET_LOSS_CRITICAL] % de paquetes
</floater.string>
<floater.string name="network_performance_normal_msg">
Normal
@@ -70,16 +70,16 @@
300
</floater.string>
<floater.string name="network_ping_critical_msg">
- El tiempo de conexión -ping- supera los [NETWORK_PING_CRITICAL] ms
+ Tiempo de ping de la conexión superior a [NETWORK_PING_CRITICAL] ms
</floater.string>
<floater.string name="network_ping_warning_msg">
- El tiempo de conexión -ping- es de [NETWORK_PING_WARNING]-[NETWORK_PING_CRITICAL] ms
+ Tiempo de ping de la conexión de [NETWORK_PING_WARNING]-[NETWORK_PING_CRITICAL] ms
</floater.string>
<floater.string name="network_packet_loss_cause_msg">
- Quizá una mala conexión o un ancho de banda fijado demasiado alto.
+ Posible conexión deficiente o la preferencia &apos;Bandwidth&apos; tiene un valor demasiado alto.
</floater.string>
<floater.string name="network_ping_cause_msg">
- Quizá una mala conexión o una aplicación de archivos compartidos.
+ Posible conexión deficiente o aplicación de archivos compartidos.
</floater.string>
<floater.string name="server_text_msg">
Servidor
@@ -94,31 +94,31 @@
20
</floater.string>
<floater.string name="server_frame_time_critical_msg">
- Frecuencia (framerate) por debajo de [SERVER_FRAME_RATE_CRITICAL]
+ Velocidad de fotogramas del simulador inferior a [SERVER_FRAME_RATE_CRITICAL]
</floater.string>
<floater.string name="server_frame_time_warning_msg">
- Frecuencia (framerate) entre [SERVER_FRAME_RATE_CRITICAL] y [SERVER_FRAME_RATE_WARNING]
+ Velocidad de fotogramas del simulador entre [SERVER_FRAME_RATE_CRITICAL] y [SERVER_FRAME_RATE_WARNING]
</floater.string>
<floater.string name="server_frame_time_normal_msg">
Normal
</floater.string>
<floater.string name="server_physics_cause_msg">
- Posible causa: demasiados objetos físicos
+ Causa posible: demasiados objetos físicos
</floater.string>
<floater.string name="server_scripts_cause_msg">
- Posible causa: demasiados objetos con script
+ Causa posible: demasiados objetos programados
</floater.string>
<floater.string name="server_net_cause_msg">
- Posible causa: demasiado tráfico en la red
+ Causa posible: tráfico excesivo en la red
</floater.string>
<floater.string name="server_agent_cause_msg">
- Posible causa: demasiada gente moviéndose en la región
+ Causa posible: demasiadas personas moviéndose en la región
</floater.string>
<floater.string name="server_images_cause_msg">
- Posible causa: demasiados cálculos de imáganes
+ Causa posible: demasiados cálculos de imagen
</floater.string>
<floater.string name="server_generic_cause_msg">
- Posible causa: carga del simulador muy pesada
+ Causa posible: carga del simulador excesiva
</floater.string>
<floater.string name="smaller_label">
&gt;&gt;
@@ -126,7 +126,7 @@
<floater.string name="bigger_label">
&lt;&lt;
</floater.string>
- <button label="" label_selected="" name="client_lagmeter" tool_tip="Estado del lag del cliente"/>
+ <button label="" label_selected="" name="client_lagmeter" tool_tip="Estado de lag del cliente"/>
<text name="client">
Cliente
</text>
@@ -134,7 +134,7 @@
Normal
</text>
<text left="30" name="client_lag_cause" right="-10"/>
- <button label="" label_selected="" name="network_lagmeter" tool_tip="Estado del lag de la red"/>
+ <button label="" label_selected="" name="network_lagmeter" tool_tip="Estado de lag de la red"/>
<text name="network">
Red
</text>
@@ -142,7 +142,7 @@
Normal
</text>
<text left="30" name="network_lag_cause" right="-10"/>
- <button label="" label_selected="" name="server_lagmeter" tool_tip="Estado del lag del servidor"/>
+ <button label="" label_selected="" name="server_lagmeter" tool_tip="Estado de lag del servidor"/>
<text name="server">
Servidor
</text>
diff --git a/indra/newview/skins/default/xui/es/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/es/floater_live_lsleditor.xml
index 4ff54bccb5..9672f910ea 100755
--- a/indra/newview/skins/default/xui/es/floater_live_lsleditor.xml
+++ b/indra/newview/skins/default/xui/es/floater_live_lsleditor.xml
@@ -9,7 +9,24 @@
<floater.string name="Title">
SCRIPT: [NAME]
</floater.string>
+ <floater.string name="experience_enabled">
+ Anular la selección para quitar la experiencia actual
+ </floater.string>
+ <floater.string name="no_experiences">
+ No tienes autorización para ninguna experiencia
+ </floater.string>
+ <floater.string name="add_experiences">
+ Seleccionar para agregar una experiencia
+ </floater.string>
+ <floater.string name="show_experience_profile">
+ Pulsar para ver el perfil de la experiencia
+ </floater.string>
+ <floater.string name="loading">
+ Cargando...
+ </floater.string>
<button label="Reiniciar" label_selected="Reiniciar" name="Reset"/>
<check_box initial_value="true" label="Ejecutándose" left="4" name="running"/>
<check_box initial_value="true" label="Mono" left="106" name="mono"/>
+ <check_box label="Usar experiencia(s):" name="enable_xp"/>
+ <button label="&gt;" name="view_profile"/>
</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_marketplace_listings.xml b/indra/newview/skins/default/xui/es/floater_marketplace_listings.xml
new file mode 100644
index 0000000000..2869af87f3
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_marketplace_listings.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_marketplace_listings" title="ARTÃCULOS DEL MERCADO">
+ <panel name="marketplace_listings_panel">
+ <panel>
+ <panel name="marketplace_listings_inventory_placeholder_panel">
+ <text name="marketplace_listings_inventory_placeholder_title">Cargando...</text>
+ </panel>
+ </panel>
+ </panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_marketplace_validation.xml b/indra/newview/skins/default/xui/es/floater_marketplace_validation.xml
new file mode 100644
index 0000000000..aab4b223dc
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_marketplace_validation.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_marketplace_validation" title="Auditar artículos del Mercado">
+ <button label="OK" label_selected="OK" name="OK"/>
+ <text_editor name="validation_text">MARKETPLACE_VALIDATION_TEXT</text_editor>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_openobject.xml b/indra/newview/skins/default/xui/es/floater_openobject.xml
index b8b688df60..ab5bec3301 100755
--- a/indra/newview/skins/default/xui/es/floater_openobject.xml
+++ b/indra/newview/skins/default/xui/es/floater_openobject.xml
@@ -3,6 +3,11 @@
<text name="object_name">
[DESC]:
</text>
- <button label="Copiar al inventario" label_selected="Copiar al inventario" name="copy_to_inventory_button"/>
- <button label="Copiar y vestirse" label_selected="Copiar y vestirse" name="copy_and_wear_button"/>
+ <text name="border_note">
+ Copiar en el inventario y vestir
+ </text>
+ <button label="Añadir a vestuario" label_selected="Añadir a vestuario" name="copy_and_wear_button"/>
+ <button label="Reemplazar vestuario" label_selected="Reemplazar vestuario" name="copy_and_replace_button"/>
+ <button label="Solo copiar en el inventario" label_selected="Solo copiar en el inventario" name="copy_to_inventory_button"/>
+ <button label="Cancelar" label_selected="Cancelar" name="cancel_button"/>
</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_pay.xml b/indra/newview/skins/default/xui/es/floater_pay.xml
index ad9a43ad71..567f980446 100755
--- a/indra/newview/skins/default/xui/es/floater_pay.xml
+++ b/indra/newview/skins/default/xui/es/floater_pay.xml
@@ -1,26 +1,18 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="Give Money" title="">
- <string name="payee_group">
- Pagar al grupo
- </string>
- <string name="payee_resident">
- Pagar al residente
- </string>
- <text left="5" name="payee_label" width="105">
- Pagar:
- </text>
- <icon name="icon_person" tool_tip="Persona"/>
- <text left="115" name="payee_name">
- Nombre de prueba demasiado largo para comprobar la función de recorte
- </text>
- <button label="1 L$" label_selected="1 L$" name="fastpay 1"/>
- <button label="5 L$" label_selected="5 L$" name="fastpay 5"/>
- <button label="10 L$" label_selected="10 L$" name="fastpay 10"/>
- <button label="20 L$" label_selected="20 L$" name="fastpay 20"/>
- <text left="4" name="amount text">
- O elige cuánto:
- </text>
- <line_editor left="60" name="amount" width="55"/>
- <button label="Pagar" label_selected="Pagar" name="pay btn"/>
- <button label="Cancelar" label_selected="Cancelar" name="cancel btn"/>
+ <string name="payee_group">Pagar al grupo</string>
+ <string name="payee_resident">Pagar al residente</string>
+ <text name="paying_text">Vas a pagar:</text>
+ <text left="115" name="payee_name">Nombre de prueba demasiado largo para comprobar la función de recorte</text>
+ <panel label="Buscar" name="PatternsPanel">
+ <button label="Pagar 1 L$" label_selected="Pagar 1 L$" name="fastpay 1"/>
+ <button label="Pagar 5 L$" label_selected="Pagar 5 L$" name="fastpay 5"/>
+ <button label="Pagar 10 L$" label_selected="Pagar 10 L$" name="fastpay 10"/>
+ <button label="Pagar 20 L$" label_selected="Pagar 20 L$" name="fastpay 20"/>
+ </panel>
+ <panel label="Buscar" name="InputPanel">
+ <text name="amount text">Otra cantidad:</text>
+ <button label="Pagar" label_selected="Pagar" name="pay btn"/>
+ <button label="Cancelar" label_selected="Cancelar" name="cancel btn"/>
+ </panel>
</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_pay_object.xml b/indra/newview/skins/default/xui/es/floater_pay_object.xml
index 4767f4dfa0..8a5b028927 100755
--- a/indra/newview/skins/default/xui/es/floater_pay_object.xml
+++ b/indra/newview/skins/default/xui/es/floater_pay_object.xml
@@ -1,29 +1,21 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="Give Money" title="">
- <string left="5" name="payee_group" width="110">
- Pagar al grupo
- </string>
- <string left="5" name="payee_resident" width="110">
- Pagar al residente
- </string>
- <icon name="icon_person" tool_tip="Persona"/>
- <text left="120" name="payee_name" width="180">
- Ericacita Moostopolison
- </text>
- <text left="5" name="object_name_label" width="110">
- A través del objeto:
- </text>
+ <string left="5" name="payee_group" width="110">Pagar al grupo</string>
+ <string left="5" name="payee_resident" width="110">Pagar al residente</string>
+ <text name="paying_text">Vas a pagar:</text>
+ <text left="120" name="payee_name" width="180">Ericacita Moostopolison</text>
+ <text left="5" name="object_name_label" width="110">A través del objeto:</text>
<icon name="icon_object" tool_tip="Objetos"/>
- <text left="120" name="object_name_text" width="180">
- El muy largo nombre de mi objeto
- </text>
- <button label="1 L$" label_selected="1 L$" name="fastpay 1"/>
- <button label="5 L$" label_selected="5 L$" name="fastpay 5"/>
- <button label="10 L$" label_selected="10 L$" name="fastpay 10"/>
- <button label="20 L$" label_selected="20 L$" name="fastpay 20"/>
- <text name="amount text">
- O elige cuánto:
- </text>
- <button label="Pagar" label_selected="Pagar" name="pay btn"/>
- <button label="Cancelar" label_selected="Cancelar" name="cancel btn"/>
+ <text left="120" name="object_name_text" width="180">El muy largo nombre de mi objeto</text>
+ <panel label="Buscar" name="PatternsPanel">
+ <button label="Pagar 1 L$" label_selected="Pagar 1 L$" name="fastpay 1"/>
+ <button label="Pagar 5 L$" label_selected="Pagar 5 L$" name="fastpay 5"/>
+ <button label="Pagar 10 L$" label_selected="Pagar 10 L$" name="fastpay 10"/>
+ <button label="Pagar 20 L$" label_selected="Pagar 20 L$" name="fastpay 20"/>
+ </panel>
+ <panel label="Buscar" name="InputPanel">
+ <text name="amount text">Otra cantidad:</text>
+ <button label="Pagar" label_selected="Pagar" name="pay btn"/>
+ <button label="Cancelar" label_selected="Cancelar" name="cancel btn"/>
+ </panel>
</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_report_abuse.xml b/indra/newview/skins/default/xui/es/floater_report_abuse.xml
index fe37f125b8..8d8906c617 100755
--- a/indra/newview/skins/default/xui/es/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/es/floater_report_abuse.xml
@@ -76,7 +76,7 @@
<combo_box.item label="Terreno &gt; Invasión &gt; Objetos o texturas" name="Land__Encroachment__Objects_textures"/>
<combo_box.item label="Terreno &gt; Invasión &gt; Partículas" name="Land__Encroachment__Particles"/>
<combo_box.item label="Terreno &gt; Invasión &gt; Ãrboles/Plantas" name="Land__Encroachment__Trees_plants"/>
- <combo_box.item label="Apostar" name="Wagering_gambling"/>
+ <combo_box.item label="Incumplimiento de la política de juegos" name="Wagering_gambling"/>
<combo_box.item label="Otra" name="Other"/>
</combo_box>
<text name="abuser_name_title">
diff --git a/indra/newview/skins/default/xui/es/floater_snapshot.xml b/indra/newview/skins/default/xui/es/floater_snapshot.xml
index 5e02bc52b7..c2c996aa8a 100755
--- a/indra/newview/skins/default/xui/es/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/es/floater_snapshot.xml
@@ -39,17 +39,8 @@
<string name="local_failed_str">
Error al guardar en el equipo.
</string>
- <button name="advanced_options_btn" tool_tip="Opciones avanzadas"/>
- <text name="image_res_text">
- [WIDTH] x [HEIGHT] px
- </text>
- <text name="file_size_label">
- [SIZE] kB
- </text>
+ <button label="ACTUALIZAR" name="new_snapshot_btn"/>
<panel name="advanced_options_panel">
- <text name="advanced_options_label">
- OPCIONES AVANZADAS
- </text>
<text name="layer_type_label">
Captura:
</text>
@@ -68,4 +59,10 @@
<combo_box.item label="Sin filtro" name="NoFilter"/>
</combo_box>
</panel>
+ <text name="image_res_text">
+ [WIDTH] px (ancho) × [HEIGHT] px (alto)
+ </text>
+ <text name="file_size_label">
+ [SIZE] kB
+ </text>
</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_top_objects.xml b/indra/newview/skins/default/xui/es/floater_top_objects.xml
index bb53f116c2..4eaa552fda 100755
--- a/indra/newview/skins/default/xui/es/floater_top_objects.xml
+++ b/indra/newview/skins/default/xui/es/floater_top_objects.xml
@@ -21,6 +21,12 @@
<floater.string name="none_descriptor">
No se ha encontrado ninguno.
</floater.string>
+ <floater.string name="URLs">
+ URL
+ </floater.string>
+ <floater.string name="memory">
+ Memoria (KB)
+ </floater.string>
<text name="title_text">
Cargando...
</text>
@@ -30,7 +36,7 @@
<scroll_list.columns label="Propietario" name="owner"/>
<scroll_list.columns label="Posición" name="location"/>
<scroll_list.columns label="Parcela" name="parcel"/>
- <scroll_list.columns label="Tiempo" name="time"/>
+ <scroll_list.columns label="Fecha" name="time"/>
<scroll_list.columns label="URLs" name="URLs"/>
<scroll_list.columns label="Memoria (KB)" name="memory"/>
</scroll_list>
diff --git a/indra/newview/skins/default/xui/es/floater_twitter.xml b/indra/newview/skins/default/xui/es/floater_twitter.xml
index 050ee1a391..92f4fc5bba 100644
--- a/indra/newview/skins/default/xui/es/floater_twitter.xml
+++ b/indra/newview/skins/default/xui/es/floater_twitter.xml
@@ -1,17 +1,13 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="floater_twitter" title="TWITTER">
- <panel name="background">
- <tab_container name="tabs">
- <panel label="REDACTAR" name="panel_twitter_photo"/>
- <panel label="CUENTA" name="panel_twitter_account"/>
- </tab_container>
- <panel name="connection_status_panel">
- <text name="connection_error_text">
- Error
- </text>
- <text name="connection_loading_text">
- Cargando...
- </text>
- </panel>
- </panel>
+ <tab_container name="tabs">
+ <panel label="REDACTAR" name="panel_twitter_photo"/>
+ <panel label="CUENTA" name="panel_twitter_account"/>
+ </tab_container>
+ <text name="connection_error_text">
+ Error
+ </text>
+ <text name="connection_loading_text">
+ Cargando...
+ </text>
</floater>
diff --git a/indra/newview/skins/default/xui/es/menu_attachment_self.xml b/indra/newview/skins/default/xui/es/menu_attachment_self.xml
index 5acd0c327a..02819e6816 100755
--- a/indra/newview/skins/default/xui/es/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/es/menu_attachment_self.xml
@@ -8,6 +8,7 @@
<menu_item_call label="Mi apariencia" name="Change Outfit"/>
<menu_item_call label="Editar mi vestuario" name="Edit Outfit"/>
<menu_item_call label="Editar mi anatomía" name="Edit My Shape"/>
+ <menu_item_call label="Altura del avatar" name="Hover Height"/>
<menu_item_call label="Mis amigos" name="Friends..."/>
<menu_item_call label="Mis grupos" name="Groups..."/>
<menu_item_call label="Mi perfil" name="Profile..."/>
diff --git a/indra/newview/skins/default/xui/es/menu_avatar_self.xml b/indra/newview/skins/default/xui/es/menu_avatar_self.xml
index 717b46ac74..d60a3434cf 100755
--- a/indra/newview/skins/default/xui/es/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/es/menu_avatar_self.xml
@@ -25,6 +25,7 @@
<menu_item_call label="Mi apariencia" name="Chenge Outfit"/>
<menu_item_call label="Editar mi vestuario" name="Edit Outfit"/>
<menu_item_call label="Editar mi anatomía" name="Edit My Shape"/>
+ <menu_item_call label="Altura del avatar" name="Hover Height"/>
<menu_item_call label="Mis amigos" name="Friends..."/>
<menu_item_call label="Mis grupos" name="Groups..."/>
<menu_item_call label="Mi perfil" name="Profile..."/>
diff --git a/indra/newview/skins/default/xui/es/menu_inventory.xml b/indra/newview/skins/default/xui/es/menu_inventory.xml
index cd5bc7917d..5d108abf67 100755
--- a/indra/newview/skins/default/xui/es/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/es/menu_inventory.xml
@@ -1,5 +1,14 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<menu name="Popup">
+ <menu_item_call label="Crear artículos" name="Marketplace Create Listing"/>
+ <menu_item_call label="Asociar artículos" name="Marketplace Associate Listing"/>
+ <menu_item_call label="Obtener (actualizar) artículos" name="Marketplace Get Listing"/>
+ <menu_item_call label="Comprobar errores" name="Marketplace Check Listing"/>
+ <menu_item_call label="Editar artículos" name="Marketplace Edit Listing"/>
+ <menu_item_call label="Incluir en la lista" name="Marketplace List"/>
+ <menu_item_call label="Retirar de la lista" name="Marketplace Unlist"/>
+ <menu_item_call label="Activar" name="Marketplace Activate"/>
+ <menu_item_call label="Desactivar" name="Marketplace Deactivate"/>
<menu_item_call label="Compartir" name="Share"/>
<menu_item_call label="Comprar" name="Task Buy"/>
<menu_item_call label="Abrir" name="Task Open"/>
@@ -86,6 +95,7 @@
<menu_item_call label="Añadir" name="Wearable Add"/>
<menu_item_call label="Quitarse" name="Take Off"/>
<menu_item_call label="Copiar al Buzón de salida de comerciante" name="Merchant Copy"/>
- <menu_item_call label="Enviar al Mercado" name="Marketplace Send"/>
+ <menu_item_call label="Copiar en artículos del Mercado" name="Marketplace Copy"/>
+ <menu_item_call label="Mover a artículos del Mercado" name="Marketplace Move"/>
<menu_item_call label="--sin opciones--" name="--no options--"/>
</menu>
diff --git a/indra/newview/skins/default/xui/es/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/es/menu_inventory_gear_default.xml
index 0e9644629e..c24910066b 100755
--- a/indra/newview/skins/default/xui/es/menu_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/es/menu_inventory_gear_default.xml
@@ -5,7 +5,7 @@
<menu_item_check label="Ordenar por los más recientes" name="sort_by_recent"/>
<menu_item_check label="Ordenar las carpetas siempre alfabéticamente" name="sort_folders_by_name"/>
<menu_item_check label="Las carpetas del sistema, arriba" name="sort_system_folders_to_top"/>
- <menu_item_call label="Ver los filtros" name="show_filters"/>
+ <menu_item_call label="Ver los filtros..." name="show_filters"/>
<menu_item_call label="Restablecer los filtros" name="reset_filters"/>
<menu_item_call label="Cerrar todas las carpetas" name="close_folders"/>
<menu_item_call label="Vaciar Objetos Perdidos" name="empty_lostnfound"/>
diff --git a/indra/newview/skins/default/xui/es/menu_marketplace_view.xml b/indra/newview/skins/default/xui/es/menu_marketplace_view.xml
new file mode 100644
index 0000000000..c46a9f490e
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/menu_marketplace_view.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_marketplace_sort">
+ <menu_item_check label="Ordenar por cantidad en stock (de baja a alta)" name="sort_by_stock_amount"/>
+ <menu_item_check label="Mostrar solamente las carpetas de artículos" name="show_only_listing_folders"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_url_experience.xml b/indra/newview/skins/default/xui/es/menu_url_experience.xml
new file mode 100644
index 0000000000..a18cb0e8e8
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/menu_url_experience.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Url Popup">
+ <menu_item_call label="Copiar la SLurl al portapapeles" name="url_copy"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_viewer.xml b/indra/newview/skins/default/xui/es/menu_viewer.xml
index 9596a8277e..5118171d80 100755
--- a/indra/newview/skins/default/xui/es/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/es/menu_viewer.xml
@@ -8,6 +8,7 @@
<menu_item_call label="Nueva ventana del inventario" name="NewInventoryWindow"/>
<menu_item_call label="Lugares..." name="Places"/>
<menu_item_call label="Destacados..." name="Picks"/>
+ <menu_item_call label="Experiencias..." name="Experiences"/>
<menu_item_call label="Controles de la cámara..." name="Camera Controls"/>
<menu label="Movimiento" name="Movement">
<menu_item_call label="Sentarte" name="Sit Down Here"/>
@@ -21,6 +22,7 @@
<menu_item_check label="No molestar" name="Do Not Disturb"/>
</menu>
<menu_item_call label="Comprar L$..." name="Buy and Sell L$"/>
+ <menu_item_call label="Artículos del Mercado..." name="MarketplaceListings"/>
<menu_item_call label="Panel de control de la cuenta..." name="Manage My Account">
<menu_item_call.on_click name="ManageMyAccount_url" parameter="WebLaunchJoinNow,http://secondlife.com/account/index.php?lang=es"/>
</menu_item_call>
@@ -47,7 +49,7 @@
<menu_item_check label="Amigos" name="My Friends"/>
<menu_item_check label="Grupos" name="My Groups"/>
<menu_item_check label="Gente cerca" name="Active Speakers"/>
- <menu_item_call label="Lista de ignorados" name="Block List"/>
+ <menu_item_check label="Lista de ignorados" name="Block List"/>
<menu_item_check label="No molestar" name="Do Not Disturb"/>
</menu>
<menu label="Mundo" name="World">
@@ -248,6 +250,7 @@
<menu_item_check label="Texture Console" name="Texture Console"/>
<menu_item_check label="Debug Console" name="Debug Console"/>
<menu_item_call label="Notifications Console" name="Notifications"/>
+ <menu_item_check label="Consola de depuración de región" name="Region Debug Console"/>
<menu_item_check label="Fast Timers" name="Fast Timers"/>
<menu_item_check label="Memory" name="Memory"/>
<menu_item_check label="Datos de la escena" name="Scene Statistics"/>
@@ -323,7 +326,7 @@
<menu label="Red" name="Network">
<menu_item_check label="Pause Avatar" name="AgentPause"/>
<menu_item_call label="Drop a Packet" name="Drop a Packet"/>
- </menu>
+ </menu>
<menu label="Mundo virtual" name="DevelopWorld">
<menu_item_check label="Anular el sol del Sim" name="Sim Sun Override"/>
<menu_item_check label="Meteorología fija" name="Fixed Weather"/>
diff --git a/indra/newview/skins/default/xui/es/mime_types.xml b/indra/newview/skins/default/xui/es/mime_types.xml
index 85ff4cfb48..eb212344ce 100755
--- a/indra/newview/skins/default/xui/es/mime_types.xml
+++ b/indra/newview/skins/default/xui/es/mime_types.xml
@@ -27,7 +27,7 @@
No hay contenido
</label>
<tooltip name="none_tooltip">
- Aquí no hay multimedia
+ Aquí no hay contenido multimedia
</tooltip>
</widgetset>
<widgetset name="image">
diff --git a/indra/newview/skins/default/xui/es/mime_types_linux.xml b/indra/newview/skins/default/xui/es/mime_types_linux.xml
index 77d05934f4..e5887e7d96 100755
--- a/indra/newview/skins/default/xui/es/mime_types_linux.xml
+++ b/indra/newview/skins/default/xui/es/mime_types_linux.xml
@@ -44,6 +44,14 @@
Oír el audio de este sitio
</playtip>
</widgetset>
+ <widgetset name="none">
+ <label name="none_label">
+ No hay contenido
+ </label>
+ <tooltip name="none_tooltip">
+ Aquí no hay contenido multimedia
+ </tooltip>
+ </widgetset>
<scheme name="rtsp">
<label name="rtsp_label">
Streaming en &apos;Real Time&apos;
diff --git a/indra/newview/skins/default/xui/es/mime_types_mac.xml b/indra/newview/skins/default/xui/es/mime_types_mac.xml
index 77d05934f4..e5887e7d96 100755
--- a/indra/newview/skins/default/xui/es/mime_types_mac.xml
+++ b/indra/newview/skins/default/xui/es/mime_types_mac.xml
@@ -44,6 +44,14 @@
Oír el audio de este sitio
</playtip>
</widgetset>
+ <widgetset name="none">
+ <label name="none_label">
+ No hay contenido
+ </label>
+ <tooltip name="none_tooltip">
+ Aquí no hay contenido multimedia
+ </tooltip>
+ </widgetset>
<scheme name="rtsp">
<label name="rtsp_label">
Streaming en &apos;Real Time&apos;
diff --git a/indra/newview/skins/default/xui/es/notifications.xml b/indra/newview/skins/default/xui/es/notifications.xml
index 01407dc69e..9578e1b863 100755
--- a/indra/newview/skins/default/xui/es/notifications.xml
+++ b/indra/newview/skins/default/xui/es/notifications.xml
@@ -73,6 +73,10 @@ Detalles del error: la notificación de nombre &apos;[_NAME]&apos; no se ha enco
[MESSAGE]
<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Sí"/>
</notification>
+ <notification name="GenericAlertOK">
+ [MESSAGE]
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
<notification name="BadInstallation">
Ha habido un error actualizando [APP_NAME]. Por favor, [http://get.secondlife.com descarga la última versión] del Visor.
<usetemplate name="okbutton" yestext="OK"/>
@@ -125,6 +129,88 @@ No se han enviado carpetas al Mercado a causa de un error del sistema o de la re
La inicialización del mercado ha fallado por un error del sistema o de la red. Vuelve a intentarlo más tarde.
<usetemplate name="okbutton" yestext="OK"/>
</notification>
+ <notification name="StockPasteFailed">
+ Ha ocurrido el siguiente error al copiar o mover a la carpeta de stock:
+
+ &apos;[ERROR_CODE]&apos;
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="MerchantPasteFailed">
+ Ha ocurrido el siguiente error al copiar o mover a artículos del Mercado:
+
+ &apos;[ERROR_CODE]&apos;
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="MerchantTransactionFailed">
+ La transacción con el Mercado ha fallado por el siguiente error:
+
+ Motivo: &apos;[ERROR_REASON]&apos;
+ [ERROR_DESCRIPTION]
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="MerchantUnprocessableEntity">
+ No hemos podido incluir este producto en tus artículos o activar la carpeta de versión. Normalmente esto ocurre porque falta información en el formulario de descripción de los artículos, aunque también puede deberse a errores en la estructura de carpetas. Puedes editar los artículos o comprobar si la carpeta de artículos tiene algún error.
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="MerchantListingFailed">
+ Ha ocurrido el siguiente error en la lista de artículos del Mercado:
+
+ &apos;[ERROR_CODE]&apos;
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="MerchantFolderActivationFailed">
+ Ha ocurrido el siguiente error al activar esta carpeta de versión:
+
+ &apos;[ERROR_CODE]&apos;
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="ConfirmMerchantActiveChange">
+ Esta acción cambiará el contenido activo de esta lista de artículos. ¿Quieres continuar?
+ <usetemplate ignoretext="Confirmar antes de que cambie una lista de artículos activa en el Mercado" name="okcancelignore" notext="Cancelar" yestext="OK"/>
+ </notification>
+ <notification name="ConfirmMerchantMoveInventory">
+ Los artículos arrastrados a la ventana Artículos del mercado se mueven desde sus ubicaciones originales, no se copian. ¿Quieres continuar?
+ <usetemplate ignoretext="Confirmar antes de mover un artículo desde el inventario al Mercado" name="okcancelignore" notext="Cancelar" yestext="OK"/>
+ </notification>
+ <notification name="ConfirmListingCutOrDelete">
+ Al mover o eliminar una carpeta de artículos, se eliminarán tus artículos del Mercado. Si deseas conservar los artículos del Mercado, mueve o elimina el contenido de la carpeta de versión que desees modificar. ¿Quieres continuar?
+ <usetemplate ignoretext="Confirmar antes de que mueva o elimine una lista de artículos del Mercado" name="okcancelignore" notext="Cancelar" yestext="OK"/>
+ </notification>
+ <notification name="ConfirmCopyToMarketplace">
+ No tienes permiso para copiar uno o varios de estos artículos en el Mercado. Puedes moverlos o dejártelos.
+ <usetemplate canceltext="Cancelar" ignoretext="Confirmar cuando intente copiar una selección que contiene artículos que no se pueden copiar en el Mercado" name="yesnocancelbuttons" notext="No mover objeto(s)" yestext="Mover objeto(s)"/>
+ </notification>
+ <notification name="ConfirmMerchantUnlist">
+ Esta acción retirará esta lista de artículos. ¿Quieres continuar?
+ <usetemplate ignoretext="Confirmar antes de que retire una lista de artículos activa en el Mercado" name="okcancelignore" notext="Cancelar" yestext="OK"/>
+ </notification>
+ <notification name="ConfirmMerchantClearVersion">
+ Esta acción desactivará la carpeta de versión de la lista de artículos actual. ¿Quieres continuar?
+ <usetemplate ignoretext="Confirmar antes de que desactive la carpeta de versión de una lista de artículos del Mercado" name="okcancelignore" notext="Cancelar" yestext="OK"/>
+ </notification>
+ <notification name="AlertMerchantListingNotUpdated">
+ No se ha podido actualizar esta lista de artículos.
+[[URL] Haz clic aquí] para editarla en el Mercado.
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="AlertMerchantListingCannotWear">
+ No puedes ponerte prendas ni partes del cuerpo que se encuentren en la carpeta Artículos del mercado.
+ </notification>
+ <notification name="AlertMerchantListingInvalidID">
+ Id. de lista de artículos no válida
+ </notification>
+ <notification name="AlertMerchantListingActivateRequired">
+ Esta lista de artículos contiene varias carpetas de versión o ninguna. Tendrás que seleccionar y activar una por tu cuenta más tarde.
+ <usetemplate ignoretext="Mostrar una alerta de la activación de la carpeta de versión cuando cree una lista de artículos con varias carpetas de versión" name="okignore" yestext="OK"/>
+ </notification>
+ <notification name="AlertMerchantStockFolderSplit">
+ Hemos separado los artículos en stock de diferentes tipos en carpetas distintas, para que tu carpeta esté organizada de tal forma que podamos incluirla en el Mercado.
+ <usetemplate ignoretext="Mostrar alerta cuando la carpeta de stock se divida antes de incluirla en la lista" name="okignore" yestext="OK"/>
+ </notification>
+ <notification name="AlertMerchantStockFolderEmpty">
+ Hemos retirado tu lista de artículos porque el stock está vacío. Para volver a publicar tus artículos, añade más unidades a la carpeta de stock.
+ <usetemplate ignoretext="Mostrar alerta cuando una lista de artículos se retire porque la carpeta de stock está vacía" name="okignore" yestext="OK"/>
+ </notification>
<notification name="CompileQueueSaveText">
Hubo un problema al subir el texto de un script por la siguiente razón: [REASON]. Por favor, inténtalo más tarde.
</notification>
@@ -464,6 +550,10 @@ o hacer una puja?
¿Guardar los cambios?
<usetemplate canceltext="Cancelar" name="yesnocancelbuttons" notext="No guardar" yestext="Guardar"/>
</notification>
+ <notification name="DeleteNotecard">
+ ¿Deseas borrar la nota?
+ <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
+ </notification>
<notification name="GestureSaveFailedTooManySteps">
Fallo al guardar el gesto.
Este gesto tiene demasiados pasos.
@@ -570,6 +660,9 @@ La calidad gráfica puede ajustarse en Preferencias &gt; Gráficos.
<notification name="RegionNoTerraforming">
En la región [REGION] no se permite modificar el terreno.
</notification>
+ <notification name="ParcelNoTerraforming">
+ No tienes permiso para modificar el terreno de la parcela [PARCEL].
+ </notification>
<notification name="CannotCopyWarning">
No tienes permiso para copiar los elementos siguientes:
[ITEMS] y, si los das, los perderás del inventario. ¿Seguro que quieres ofrecerlos?
@@ -1834,6 +1927,30 @@ Se cambiarán miles de regiones, y se provocará un colapso en el espacio del se
¿Remover al administrador del estado sólo para este estado o para [ALL_ESTATES]?
<usetemplate canceltext="Cancelar" name="yesnocancelbuttons" notext="Todos los estados" yestext="Este estado"/>
</notification>
+ <notification label="Seleccionar estado" name="EstateAllowedExperienceAdd">
+ ¿Añadir a la lista de permitidos solamente en este estado o en [ALL_ESTATES]?
+ <usetemplate canceltext="Cancelar" name="yesnocancelbuttons" notext="Todos los estados" yestext="Este estado"/>
+ </notification>
+ <notification label="Seleccionar estado" name="EstateAllowedExperienceRemove">
+ ¿Quitar de la lista de permitidos solamente en este estado o en [ALL_ESTATES]?
+ <usetemplate canceltext="Cancelar" name="yesnocancelbuttons" notext="Todos los estados" yestext="Este estado"/>
+ </notification>
+ <notification label="Seleccionar estado" name="EstateBlockedExperienceAdd">
+ ¿Añadir a la lista de bloqueados solamente en este estado o en [ALL_ESTATES]?
+ <usetemplate canceltext="Cancelar" name="yesnocancelbuttons" notext="Todos los estados" yestext="Este estado"/>
+ </notification>
+ <notification label="Seleccionar estado" name="EstateBlockedExperienceRemove">
+ ¿Quitar de la lista de bloqueados solamente en este estado o en [ALL_ESTATES]?
+ <usetemplate canceltext="Cancelar" name="yesnocancelbuttons" notext="Todos los estados" yestext="Este estado"/>
+ </notification>
+ <notification label="Seleccionar estado" name="EstateTrustedExperienceAdd">
+ ¿Añadir a la lista de claves solamente en este estado o en [ALL_ESTATES]?
+ <usetemplate canceltext="Cancelar" name="yesnocancelbuttons" notext="Todos los estados" yestext="Este estado"/>
+ </notification>
+ <notification label="Seleccionar estado" name="EstateTrustedExperienceRemove">
+ ¿Quitar de la lista de claves solamente en este estado o en [ALL_ESTATES]?
+ <usetemplate canceltext="Cancelar" name="yesnocancelbuttons" notext="Todos los estados" yestext="Este estado"/>
+ </notification>
<notification label="Confirmar la expulsión" name="EstateKickUser">
¿Echar a [EVIL_USER] de este estado?
<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
@@ -1846,6 +1963,9 @@ Se cambiarán miles de regiones, y se provocará un colapso en el espacio del se
Tus preferencias de contenido actuales te impiden visitar la región que has seleccionado. Puedes cambiar las preferencias en Yo &gt; Preferencias &gt; General.
<usetemplate name="okbutton" yestext="OK"/>
</notification>
+ <notification name="SLM_UPDATE_FOLDER">
+ [MESSAGE]
+ </notification>
<notification name="RegionEntryAccessBlocked_AdultsOnlyContent">
La región que intentas visitar tiene un contenido [REGIONMATURITY], que solo es accesible para los adultos.
<url name="url">
@@ -1908,6 +2028,10 @@ Se cambiarán miles de regiones, y se provocará un colapso en el espacio del se
Estamos experimentando dificultades técnicas con el teleporte porque tus preferencias no están sincronizadas con el servidor.
<usetemplate name="okbutton" yestext="OK"/>
</notification>
+ <notification name="RegionTPSpecialUsageBlocked">
+ No puedes entrar en la región. &apos;[REGION_NAME]&apos; es una región de juegos de habilidad, y debes cumplir determinados criterios para poder entrar en ella. Consulta los detalles en las [http://wiki.secondlife.com/wiki/Linden_Lab_Official:Skill_Gaming_in_Second_Life P+F de juegos de habilidad].
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
<notification name="PreferredMaturityChanged">
No recibirás más notificaciones cuando vayas a visitar una región con un contenido [RATING]. En el futuro, puedes cambiar tus preferencias de contenido en Yo &gt; Preferencias &gt; General en la barra de menús.
<usetemplate name="okbutton" yestext="OK"/>
@@ -2130,6 +2254,10 @@ Dado que estos objetos tienen scripts, moverlos a tu inventario puede provocar u
<ignore name="ignore" text="He establecido la acción &apos;Pagar al objeto&apos; cuando construyo uno sin un script money()"/>
</form>
</notification>
+ <notification name="PayConfirmation">
+ Confirma que deseas pagar L$[AMOUNT] a [TARGET].
+ <usetemplate ignoretext="Confirmar antes de pagar (sumas mayores de 200 L$)" name="okcancelignore" notext="Cancelar" yestext="Pagar"/>
+ </notification>
<notification name="OpenObjectCannotCopy">
En este objeto, no hay ítems que estés autorizado a copiar.
</notification>
@@ -2214,6 +2342,9 @@ Linden Lab
<button ignore="Nunca reemplazar" name="No" text="Cancelar"/>
</form>
</notification>
+ <notification name="TooManyWearables">
+ No puedes tener una carpeta de prendas que contenga más de [AMOUNT] elementos. Puedes cambiar este límite en Avanzado &gt; Mostrar las configuraciones del depurador &gt; WearFolderLimit.
+ </notification>
<notification label="Advertencia del modo No molestar" name="DoNotDisturbModePay">
Tienes activado No molestar. No podrás recibir ningún objeto ofrecido a cambio de este pago.
@@ -2822,7 +2953,7 @@ Si permaneces en esta región serás desconectado.
[MESSAGE]
-Del objeto: &lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;, propietario: [NAME]?
+Del objeto: &lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;, propietario: [NAME]
<form name="form">
<button name="Gotopage" text="Cargar"/>
<button name="Cancel" text="Cancelar"/>
@@ -2848,6 +2979,72 @@ Del objeto: &lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;, propietario: [NAME]?
<button name="Mute" text="Ignorar"/>
</form>
</notification>
+ <notification name="ExperienceAcquireFailed">
+ No se puede adquirir una experiencia nueva:
+ [ERROR_MESSAGE]
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="NotInGroupExperienceProfileMessage">
+ Se ha omitido un cambio en el grupo de la experiencia porque el propietario no es miembro del grupo seleccionado.
+ </notification>
+ <notification name="UneditableExperienceProfileMessage">
+ El campo no modificable &apos;[field]&apos; se ha omitido al actualizar el perfil de la experiencia.
+ </notification>
+ <notification name="RestrictedToOwnerExperienceProfileMessage">
+ Cambios omitidos en el campo &apos;[field]&apos; que solo puede configurar el propietario de la experiencia.
+ </notification>
+ <notification name="MaturityRatingExceedsOwnerExperienceProfileMessage">
+ No puedes definir un nivel de calificación de una experiencia superior al establecido por el propietario.
+ </notification>
+ <notification name="RestrictedTermExperienceProfileMessage">
+ Las condiciones siguientes han impedido la actualización del nombre o la descripción del perfil de la experiencia: [extra_info]
+ </notification>
+ <notification name="TeleportedHomeExperienceRemoved">
+ Te has teleportado desde la región [region_name] porque al quitar la experiencia secondlife:///app/experience/[public_id]/profile ya no tienes permiso para entrar en la región.
+ <form name="form">
+ <ignore name="ignore" text="Expulsado de la región por quitar una experiencia"/>
+ </form>
+ </notification>
+ <notification name="TrustedExperienceEntry">
+ La participación en la experiencia clave secondlife:///app/experience/[public_id]/profile te otorga permiso para entrar en la región [region_name]. Si quitas esta experiencia, puede que te expulsen de la región.
+ <form name="form">
+ <ignore name="ignore" text="Admitido en una región por una experiencia"/>
+ </form>
+ </notification>
+ <notification name="TrustedExperiencesAvailable">
+ No tienes permiso de acceso a este destino. Puedes obtener el permiso para entrar en la región si aceptas una de las siguientes experiencias:
+
+[EXPERIENCE_LIST]
+
+Pueden estar disponibles otras experiencias clave.
+ </notification>
+ <notification name="ExperienceEvent">
+ La experiencia secondlife:///app/experience/[public_id]/profile permitió la siguiente operación con un objeto: [EventType].
+ Propietario: secondlife:///app/agent/[OwnerID]/inspect
+ Nombre del objeto: [ObjectName]
+ Nombre de la parcela: [ParcelName]
+ </notification>
+ <notification name="ExperienceEventAttachment">
+ La experiencia secondlife:///app/experience/[public_id]/profile permitió la siguiente operación con un anexo: [EventType].
+ Propietario: secondlife:///app/agent/[OwnerID]/inspect
+ </notification>
+ <notification name="ScriptQuestionExperience">
+ &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos;, un objeto de propiedad de &apos;[NAME]&apos;, solicita tu participación en la experiencia [GRID_WIDE]:
+
+[EXPERIENCE]
+
+Una vez concedido el permiso, este mensaje no volverá a aparecer para la experiencia salvo que se revoque en el perfil de la experiencia.
+
+Los scripts asociados a esta experiencia podrán hacer lo siguiente en las regiones donde la experiencia esté activa:
+
+[QUESTIONS]¿Lo aceptas?
+ <form name="form">
+ <button name="BlockExperience" text="Bloquear experiencia"/>
+ <button name="Mute" text="Bloquear objeto"/>
+ <button name="Yes" text="Sí"/>
+ <button name="No" text="No"/>
+ </form>
+ </notification>
<notification name="ScriptQuestionCaution">
Atención: El objeto &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos; solicita un acceso pleno a tu cuenta de dólares Linden. Si le autorizas el acceso, podrá retirar fondos de tu cuenta en cualquier momento o vaciarla por completo, cuando lo desee y sin más advertencias.
@@ -3160,6 +3357,10 @@ Has actualizado una textura obtenida mediante bake de [RESOLUTION] para &apos;[B
( [EXISTENCE] segundos con vida )
Has actualizado de manera local una textura obtenida mediante bake de [RESOLUTION] para &apos;[BODYREGION]&apos; después de [TIME] segundos.
</notification>
+ <notification name="CannotUploadTexture">
+ No se puede subir la textura.
+[REASON]
+ </notification>
<notification name="LivePreviewUnavailable">
No se puede mostrar una vista previa de esta textura porque es de tipo &apos;no copiable&apos; y/o &apos;no transferible&apos;.
<usetemplate ignoretext="Advertirme si el modo Vista previa inmediata no está disponible para las texturas &apos;no copiable&apos; y/o &apos;no transferible&apos;" name="okignore" yestext="OK"/>
@@ -3732,9 +3933,11 @@ Prueba otra vez dentro de un minuto.
</notification>
<notification name="TeleportedByAttachment">
Has sido teleportado por un anexo de [ITEM_ID]
+ <usetemplate ignoretext="Teleportarme: has sido teleportado por un anexo" name="notifyignore"/>
</notification>
<notification name="TeleportedByObjectOnParcel">
Has sido teleportado por el objeto &apos;[OBJECT_NAME]&apos; de la parcela &apos;[PARCEL_NAME]&apos;
+ <usetemplate ignoretext="Teleportarme: has sido teleportado por un objeto de una parcela" name="notifyignore"/>
</notification>
<notification name="TeleportedByObjectOwnedBy">
Has sido teleportado por el objeto &apos;[OBJECT_NAME]&apos; que es propiedad de [OWNER_ID]
@@ -4066,7 +4269,7 @@ Prueba a seleccionar un terreno más pequeño.
<usetemplate ignoretext="No se pueden mover los archivos. Ruta anterior restaurada." name="okignore" yestext="OK"/>
</notification>
<notification name="DefaultObjectPermissions">
- Ha ocurrido un problema al guardar los permisos predeterminados por el siguiente motivo: [REASON]. Intenta configurar los permisos predeterminados más adelante.
+ Ha ocurrido un problema al guardar los permisos de objeto predeterminados: [REASON]. Intenta configurar los permisos predeterminados más adelante.
<usetemplate name="okbutton" yestext="OK"/>
</notification>
<notification name="ChatHistoryIsBusyAlert">
diff --git a/indra/newview/skins/default/xui/es/panel_experience_info.xml b/indra/newview/skins/default/xui/es/panel_experience_info.xml
new file mode 100644
index 0000000000..85fc94ebdc
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_experience_info.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_experience_info">
+ <text name="title" value="Perfil de experiencia"/>
+ <scroll_container name="xp_scroll">
+ <panel name="scrolling_panel">
+ <layout_stack>
+ <layout_panel>
+ <text name="experience_title" value="Kyle&apos;s Superhero RPG"/>
+ </layout_panel>
+ <layout_panel name="location panel">
+ <text name="Location">
+ Ubicación:
+ </text>
+ <text name="LocationTextText">
+ algún lugar
+ </text>
+ <button label="Teleportarte" name="teleport_btn"/>
+ <button label="Mapa" name="map_btn"/>
+ </layout_panel>
+ <layout_panel name="marketplace panel">
+ <text name="Location">
+ Tienda del Mercado:
+ </text>
+ <text name="LocationTextText">
+ algún lugar
+ </text>
+ </layout_panel>
+ <layout_panel>
+ <text name="ContentRating">
+ Calificación:
+ </text>
+ <text name="ContentRatingText">
+ Adulto
+ </text>
+ <text name="Owner">
+ Propietario:
+ </text>
+ <text name="OwnerText">
+ Kyle
+ </text>
+ <button label="Editar" name="edit_btn"/>
+ </layout_panel>
+ </layout_stack>
+ </panel>
+ </scroll_container>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_experience_list_editor.xml b/indra/newview/skins/default/xui/es/panel_experience_list_editor.xml
new file mode 100644
index 0000000000..5cc1462605
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_experience_list_editor.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="experince_list_editor">
+ <panel.string name="loading">
+ cargando...
+ </panel.string>
+ <panel.string name="panel_allowed">
+ Experiencias permitidas:
+ </panel.string>
+ <panel.string name="panel_blocked">
+ Experiencias bloqueadas:
+ </panel.string>
+ <panel.string name="panel_trusted">
+ Experiencias clave:
+ </panel.string>
+ <panel.string name="no_results">
+ (vacío)
+ </panel.string>
+ <text name="text_name">
+ Lista de experiencias
+ </text>
+ <scroll_list name="experience_list">
+ <columns label="Nombre" name="experience_name"/>
+ </scroll_list>
+ <button label="Añadir..." name="btn_add"/>
+ <button label="Eliminar" name="btn_remove"/>
+ <button label="Perfil..." name="btn_profile"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_experience_list_item.xml b/indra/newview/skins/default/xui/es/panel_experience_list_item.xml
new file mode 100644
index 0000000000..bd2e146223
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_experience_list_item.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Experiences">
+ <text name="experience_name">
+ Nombre ficticio
+ </text>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_experience_log.xml b/indra/newview/skins/default/xui/es/panel_experience_log.xml
new file mode 100644
index 0000000000..54d0f0fc44
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_experience_log.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="EVENTS">
+ <string name="no_events" value="No hay eventos."/>
+ <string name="loading" value="cargando..."/>
+ <layout_stack>
+ <layout_panel>
+ <scroll_list name="experience_log_list">
+ <columns label="Hora" name="time"/>
+ <columns label="Evento" name="event"/>
+ <columns label="Experiencia" name="experience_name"/>
+ <columns label="Objeto" name="object_name"/>
+ </scroll_list>
+ <button label="Notificar" name="btn_notify"/>
+ <button label="Perfil" name="btn_profile_xp"/>
+ <button label="Denunciar" name="btn_report_xp"/>
+ </layout_panel>
+ <layout_panel name="button_panel">
+ <check_box label="Notificar todos los eventos Días" name="notify_all"/>
+ <button label="Limpiar" name="btn_clear"/>
+ <button label="&lt;" name="btn_prev"/>
+ <button label="&gt;" name="btn_next"/>
+ </layout_panel>
+ </layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_experience_search.xml b/indra/newview/skins/default/xui/es/panel_experience_search.xml
new file mode 100644
index 0000000000..bb05ada5b9
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_experience_search.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="SEARCH">
+ <string name="not_found">
+ &apos;[TEXT]&apos; no encontrado
+ </string>
+ <string name="no_results">
+ No hay resultados
+ </string>
+ <string name="searching">
+ Buscando...
+ </string>
+ <string name="loading">
+ Cargando...
+ </string>
+ <string name="maturity_icon_general">
+ &quot;Parcel_PG_Light&quot;
+ </string>
+ <string name="maturity_icon_moderate">
+ &quot;Parcel_M_Light&quot;
+ </string>
+ <string name="maturity_icon_adult">
+ &quot;Parcel_R_Light&quot;
+ </string>
+ <panel name="search_panel">
+ <button label="Ir" name="find"/>
+ <icons_combo_box label="Moderado" name="maturity">
+ <icons_combo_box.item label="Adulto" name="Adult" value="42"/>
+ <icons_combo_box.item label="Moderado" name="Mature" value="21"/>
+ <icons_combo_box.item label="General" name="PG" value="13"/>
+ </icons_combo_box>
+ <scroll_list name="search_results">
+ <columns label="Nombre" name="experience_name"/>
+ <columns label="Propietario" name="owner"/>
+ </scroll_list>
+ <button label="OK" label_selected="OK" name="ok_btn"/>
+ <button label="Cancelar" name="cancel_btn"/>
+ <button label="Ver el perfil" name="profile_btn"/>
+ <button label="&lt;" name="left_btn"/>
+ <button label="&gt;" name="right_btn"/>
+ </panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_experiences.xml b/indra/newview/skins/default/xui/es/panel_experiences.xml
new file mode 100644
index 0000000000..182981fcb0
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_experiences.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Experiences">
+ <string name="loading_experiences" value="Cargando experiencias..."/>
+ <string name="no_experiences" value="No hay experiencias."/>
+ <string name="acquire" value="Adquirir una experiencia"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_facebook_friends.xml b/indra/newview/skins/default/xui/es/panel_facebook_friends.xml
index 6913e87aba..5557c0a73c 100644
--- a/indra/newview/skins/default/xui/es/panel_facebook_friends.xml
+++ b/indra/newview/skins/default/xui/es/panel_facebook_friends.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<panel name="panel_facebook_friends">
<string name="facebook_friends_empty" value="Actualmente no tienes amigos en Facebook que también sean residentes de Second Life. Invita a tus amigos de Facebook a que se unan a Second Life."/>
- <string name="facebook_friends_no_connected" value="Actualmente no estás conectado a Facebook. Selecciona la pestaña Cuenta para conectarte y habilitar esta función."/>
+ <string name="facebook_friends_no_connected" value="Actualmente no estás conectado a Facebook. Selecciona la pestaña Estado para conectarte y habilitar esta función."/>
<accordion name="friends_accordion">
<accordion_tab name="tab_second_life_friends" title="Amigos de SL"/>
<accordion_tab name="tab_suggested_friends" title="Agregar estas personas como amigos de SL"/>
diff --git a/indra/newview/skins/default/xui/es/panel_facebook_photo.xml b/indra/newview/skins/default/xui/es/panel_facebook_photo.xml
index f9e7265d34..5a533f8bcb 100644
--- a/indra/newview/skins/default/xui/es/panel_facebook_photo.xml
+++ b/indra/newview/skins/default/xui/es/panel_facebook_photo.xml
@@ -1,26 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<panel name="panel_facebook_photo">
- <layout_stack name="stack_photo">
- <layout_panel name="snapshot_panel">
- <combo_box name="resolution_combobox" tool_tip="Resolución de imagen">
- <combo_box.item label="Ventana actual" name="CurrentWindow"/>
- <combo_box.item label="640 × 480" name="640x480"/>
- <combo_box.item label="800 × 600" name="800x600"/>
- <combo_box.item label="1024 × 768" name="1024x768"/>
- <combo_box.item label="1200 × 630" name="1200x630"/>
- </combo_box>
- <combo_box name="filters_combobox" tool_tip="Filtros de imagen">
- <combo_box.item label="Sin filtro" name="NoFilter"/>
- </combo_box>
- <button label="Actualizar" name="new_snapshot_btn" tool_tip="Pulsa para actualizar"/>
- <button label="Vista previa" name="big_preview_btn" tool_tip="Pulsa para alternar entre vista previa sí/no"/>
- <text name="caption_label">
- Comentario (opcional):
- </text>
- </layout_panel>
- <layout_panel name="photo_button_panel">
- <button label="Publicar" name="post_photo_btn"/>
- <button label="Cancelar" name="cancel_photo_btn"/>
- </layout_panel>
- </layout_stack>
+ <combo_box name="resolution_combobox" tool_tip="Resolución de imagen">
+ <combo_box.item label="Ventana actual" name="CurrentWindow"/>
+ <combo_box.item label="640 × 480" name="640x480"/>
+ <combo_box.item label="800 × 600" name="800x600"/>
+ <combo_box.item label="1024 × 768" name="1024x768"/>
+ <combo_box.item label="1200 × 630" name="1200x630"/>
+ </combo_box>
+ <combo_box name="filters_combobox" tool_tip="Filtros de imagen">
+ <combo_box.item label="Sin filtro" name="NoFilter"/>
+ </combo_box>
+ <button label="Actualizar" name="new_snapshot_btn" tool_tip="Pulsa para actualizar"/>
+ <button label="Vista previa" name="big_preview_btn" tool_tip="Pulsa para alternar entre vista previa sí/no"/>
+ <text name="caption_label">
+ Comentario (opcional):
+ </text>
+ <button label="Publicar" name="post_photo_btn"/>
+ <button label="Cancelar" name="cancel_photo_btn"/>
</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_facebook_place.xml b/indra/newview/skins/default/xui/es/panel_facebook_place.xml
index 639825818a..5139bd1d0b 100644
--- a/indra/newview/skins/default/xui/es/panel_facebook_place.xml
+++ b/indra/newview/skins/default/xui/es/panel_facebook_place.xml
@@ -1,17 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<panel name="panel_facebook_place">
- <layout_stack name="stack_place">
- <layout_panel name="place_detail_panel">
- <text name="place_caption_label">
- Cuenta algo del lugar donde te encuentras:
- </text>
- </layout_panel>
- <layout_panel name="place_map_panel">
- <check_box initial_value="false" label="" name="add_place_view_cb"/>
- </layout_panel>
- <layout_panel name="place_button_panel">
- <button label="Publicar" name="post_place_btn"/>
- <button label="Cancelar" name="cancel_place_btn"/>
- </layout_panel>
- </layout_stack>
+ <text name="place_caption_label">
+ Cuenta algo del lugar donde te encuentras:
+ </text>
+ <check_box initial_value="false" label="Incluir una vista general del lugar" name="add_place_view_cb"/>
+ <button label="Publicar" name="post_place_btn"/>
+ <button label="Cancelar" name="cancel_place_btn"/>
</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_facebook_status.xml b/indra/newview/skins/default/xui/es/panel_facebook_status.xml
index dfaf4089fc..e6f137b750 100644
--- a/indra/newview/skins/default/xui/es/panel_facebook_status.xml
+++ b/indra/newview/skins/default/xui/es/panel_facebook_status.xml
@@ -1,14 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<panel name="panel_facebook_status">
- <layout_stack name="stack_status">
- <layout_panel name="status_detail_panel">
- <text name="status_caption_label">
- ¿En qué estás pensando?
- </text>
- </layout_panel>
- <layout_panel name="status_button_panel">
- <button label="Publicar" name="post_status_btn"/>
- <button label="Cancelar" name="cancel_status_btn"/>
- </layout_panel>
- </layout_stack>
+ <string name="facebook_connected" value="Estás conectado a Facebook como:"/>
+ <string name="facebook_disconnected" value="No conectado a Facebook"/>
+ <text name="account_caption_label">
+ No conectado a Facebook.
+ </text>
+ <panel name="panel_buttons">
+ <button label="Conectar..." name="connect_btn"/>
+ <button label="Desconectar" name="disconnect_btn"/>
+ <text name="account_learn_more_label">
+ [http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-Share-Facebook/ta-p/2149711 Aprende a publicar en Facebook]
+ </text>
+ </panel>
+ <text name="status_caption_label">
+ ¿En qué estás pensando?
+ </text>
+ <button label="Publicar" name="post_status_btn"/>
+ <button label="Cancelar" name="cancel_status_btn"/>
</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_flickr_photo.xml b/indra/newview/skins/default/xui/es/panel_flickr_photo.xml
index 465e80667b..fe80199355 100644
--- a/indra/newview/skins/default/xui/es/panel_flickr_photo.xml
+++ b/indra/newview/skins/default/xui/es/panel_flickr_photo.xml
@@ -1,41 +1,35 @@
<?xml version="1.0" encoding="utf-8"?>
<panel name="panel_flickr_photo">
- <layout_stack name="stack_photo">
- <layout_panel name="snapshot_panel">
- <combo_box name="resolution_combobox" tool_tip="Resolución de imagen">
- <combo_box.item label="Ventana actual" name="CurrentWindow"/>
- <combo_box.item label="640 × 480" name="640x480"/>
- <combo_box.item label="800 × 600" name="800x600"/>
- <combo_box.item label="1024 × 768" name="1024x768"/>
- </combo_box>
- <combo_box name="filters_combobox" tool_tip="Filtros de imagen">
- <combo_box.item label="Sin filtro" name="NoFilter"/>
- </combo_box>
- <button label="Actualizar" name="new_snapshot_btn" tool_tip="Pulsa para actualizar"/>
- <button label="Vista previa" name="big_preview_btn" tool_tip="Pulsa para alternar entre vista previa sí/no"/>
- <text name="title_label">
- Título:
- </text>
- <text name="description_label">
- Descripción:
- </text>
- <check_box initial_value="true" label="Incluir la ubicación de SL al final de la descripción" name="add_location_cb"/>
- <text name="tags_label">
- Etiquetas:
- </text>
- <text name="tags_help_label">
- Separa las etiquetas con espacios
+ <combo_box name="resolution_combobox" tool_tip="Resolución de imagen">
+ <combo_box.item label="Ventana actual" name="CurrentWindow"/>
+ <combo_box.item label="640 × 480" name="640x480"/>
+ <combo_box.item label="800 × 600" name="800x600"/>
+ <combo_box.item label="1024 × 768" name="1024x768"/>
+ </combo_box>
+ <combo_box name="filters_combobox" tool_tip="Filtros de imagen">
+ <combo_box.item label="Sin filtro" name="NoFilter"/>
+ </combo_box>
+ <button label="Actualizar" name="new_snapshot_btn" tool_tip="Pulsa para actualizar"/>
+ <button label="Vista previa" name="big_preview_btn" tool_tip="Pulsa para alternar entre vista previa sí/no"/>
+ <text name="title_label">
+ Título:
+ </text>
+ <text name="description_label">
+ Descripción:
+ </text>
+ <check_box initial_value="true" label="Incluir la ubicación de SL al final de la descripción" name="add_location_cb"/>
+ <text name="tags_label">
+ Etiquetas:
+ </text>
+ <text name="tags_help_label">
+ Separa las etiquetas con espacios
Usa &quot;&quot; para las etiquetas con varias palabras
- </text>
- <combo_box name="rating_combobox" tool_tip="Calificación de contenido de Flickr">
- <combo_box.item label="Calificación segura de Flickr" name="SafeRating"/>
- <combo_box.item label="Calificación moderada de Flickr" name="ModerateRating"/>
- <combo_box.item label="Calificación restringida de Flickr" name="RestrictedRating"/>
- </combo_box>
- </layout_panel>
- <layout_panel name="photo_button_panel">
- <button label="Subir" name="post_photo_btn"/>
- <button label="Cancelar" name="cancel_photo_btn"/>
- </layout_panel>
- </layout_stack>
+ </text>
+ <combo_box name="rating_combobox" tool_tip="Calificación de contenido de Flickr">
+ <combo_box.item label="Calificación segura de Flickr" name="SafeRating"/>
+ <combo_box.item label="Calificación moderada de Flickr" name="ModerateRating"/>
+ <combo_box.item label="Calificación restringida de Flickr" name="RestrictedRating"/>
+ </combo_box>
+ <button label="Subir" name="post_photo_btn"/>
+ <button label="Cancelar" name="cancel_photo_btn"/>
</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/es/panel_group_info_sidetray.xml
index 18eaa834da..8d8f3a9bbb 100755
--- a/indra/newview/skins/default/xui/es/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/default/xui/es/panel_group_info_sidetray.xml
@@ -23,6 +23,7 @@
<accordion_tab name="group_roles_tab" title="Miembros y Roles"/>
<accordion_tab name="group_notices_tab" title="Avisos"/>
<accordion_tab name="group_land_tab" title="Terreno/Bienes"/>
+ <accordion_tab name="group_experiences_tab" title="Experiencias"/>
</accordion>
</layout_panel>
</layout_stack>
diff --git a/indra/newview/skins/default/xui/es/panel_login.xml b/indra/newview/skins/default/xui/es/panel_login.xml
index 253d0800e1..5300fce153 100755
--- a/indra/newview/skins/default/xui/es/panel_login.xml
+++ b/indra/newview/skins/default/xui/es/panel_login.xml
@@ -1,26 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<panel name="panel_login">
- <panel.string name="forgot_password_url">
- http://secondlife.com/account/request.php?lang=es
- </panel.string>
+ <panel.string name="forgot_password_url">http://secondlife.com/account/request.php?lang=es</panel.string>
<layout_stack name="ui_stack">
<layout_panel name="ui_container">
<combo_box label="Nombre de usuario" name="username_combo" tool_tip="El nombre de usuario que elegiste al registrarte, como bobsmith12 o Steller Sunshine"/>
<line_editor label="Contraseña" name="password_edit"/>
- <check_box label="Recordarme" name="remember_check"/>
- <text name="forgot_password_text">
- Contraseña olvidada
- </text>
- <button label="Iniciar sesión" name="connect_btn"/>
- <text name="At_My_Last_Location_Label">
- en mi última posición
- </text>
<combo_box label="Mis lugares favoritos" name="start_location_combo">
+ <combo_box.item label="Mi última posición" name="MyLastLocation"/>
<combo_box.item label="Mi Base" name="MyHome"/>
</combo_box>
- <button label="Iniciar sesión" name="connect_favorite_btn"/>
- <line_editor label="Especifica una ubicación" name="location_edit"/>
- <button label="Iniciar sesión" name="connect_location_btn"/>
+ <button label="Iniciar sesión" name="connect_btn"/>
+ <check_box label="Recordarme" name="remember_check"/>
+ <text name="forgot_password_text">Contraseña olvidada</text>
<combo_box label="Seleccionar cuadrícula" name="server_combo"/>
</layout_panel>
</layout_stack>
diff --git a/indra/newview/skins/default/xui/es/panel_marketplace_listings.xml b/indra/newview/skins/default/xui/es/panel_marketplace_listings.xml
new file mode 100644
index 0000000000..d9cd93b349
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_marketplace_listings.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Mercado" name="Marketplace Panel">
+ <panel name="tool_panel">
+ <menu_button name="sort_btn" tool_tip="Opciones de vista/orden"/>
+ <button name="add_btn" tool_tip="Crear una carpeta de artículos nueva"/>
+ <button label="Comprobar errores" name="audit_btn" tool_tip="Comprobar tus artículos del Mercado"/>
+ </panel>
+ <panel name="tab_container_panel">
+ <filter_editor label="Filtrar artículos del Mercado" name="filter_editor"/>
+ </panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_marketplace_listings_inventory.xml b/indra/newview/skins/default/xui/es/panel_marketplace_listings_inventory.xml
new file mode 100644
index 0000000000..77540aee39
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_marketplace_listings_inventory.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<inventory_panel label="TODOS" name="All Items" tool_tip="Arrastra y suelta aquí los artículos para incluirlos en la lista de artículos"/>
diff --git a/indra/newview/skins/default/xui/es/panel_marketplace_listings_listed.xml b/indra/newview/skins/default/xui/es/panel_marketplace_listings_listed.xml
new file mode 100644
index 0000000000..ca8ff6aea9
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_marketplace_listings_listed.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<inventory_panel label="INCLUIDOS EN LA LISTA" name="Active Items"/>
diff --git a/indra/newview/skins/default/xui/es/panel_marketplace_listings_unassociated.xml b/indra/newview/skins/default/xui/es/panel_marketplace_listings_unassociated.xml
new file mode 100644
index 0000000000..2606e035cd
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_marketplace_listings_unassociated.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<inventory_panel label="SIN ASOCIAR" name="Unassociated Items"/>
diff --git a/indra/newview/skins/default/xui/es/panel_marketplace_listings_unlisted.xml b/indra/newview/skins/default/xui/es/panel_marketplace_listings_unlisted.xml
new file mode 100644
index 0000000000..ea568cab8a
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_marketplace_listings_unlisted.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<inventory_panel label="RETIRADOS DE LA LISTA" name="Inactive Items"/>
diff --git a/indra/newview/skins/default/xui/es/panel_postcard_settings.xml b/indra/newview/skins/default/xui/es/panel_postcard_settings.xml
index 3931319447..75bcd67f1f 100755
--- a/indra/newview/skins/default/xui/es/panel_postcard_settings.xml
+++ b/indra/newview/skins/default/xui/es/panel_postcard_settings.xml
@@ -7,17 +7,7 @@
<combo_box.item label="1024x768" name="1024x768"/>
<combo_box.item label="Personalizado" name="Custom"/>
</combo_box>
- <layout_stack name="postcard_image_params_ls">
- <layout_panel name="postcard_image_size_lp">
- <spinner label="Ancho" name="postcard_snapshot_width"/>
- <spinner label="Altura" name="postcard_snapshot_height"/>
- <check_box label="Mantener las proporciones" name="postcard_keep_aspect_check"/>
- </layout_panel>
- <layout_panel name="postcard_image_format_quality_lp">
- <slider label="Calidad de la imagen" name="image_quality_slider"/>
- <text name="image_quality_level">
- ([QLVL])
- </text>
- </layout_panel>
- </layout_stack>
+ <spinner label="Ancho × alto" name="postcard_snapshot_width"/>
+ <check_box label="Mantener las proporciones" name="postcard_keep_aspect_check"/>
+ <slider label="Calidad:" name="image_quality_slider"/>
</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_setup.xml b/indra/newview/skins/default/xui/es/panel_preferences_setup.xml
index 508bfbcd32..7ccad84b55 100755
--- a/indra/newview/skins/default/xui/es/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_setup.xml
@@ -14,9 +14,9 @@
<text name="Web:">
Web:
</text>
- <radio_group name="use_external_browser">
- <radio_item label="Usar mi navegador (IE, Firefox, Safari)" name="external" tool_tip="Usa tu navegador por defecto para ayuda, enlaces web, etc. No es aconsejable si estás a pantalla completa." value="true"/>
- <radio_item label="Usar el navegador incorporado" name="internal" tool_tip="Usa el navegador incorporado para ayuda, enlaces web, etc. Este navegador se abre en una nueva ventana dentro de [APP_NAME]." value=""/>
+ <radio_group name="preferred_browser_behavior">
+ <radio_item label="Usar mi navegador (Chrome, Firefox, IE) para todos los enlaces" name="internal" tool_tip="Usa el navegador predeterminado para obtener ayuda, visitar enlaces web, etc. No es aconsejable si estás a pantalla completa." value="0"/>
+ <radio_item label="Usar el navegador integrado solo para los enlaces de Second Life" name="external" tool_tip="Usa el navegador predeterminado del sistema para obtener ayuda, visitar enlaces web, etc. El navegador integrado solo se utilizará para los enlaces de LindenLab/SecondLife." value="1"/>
</radio_group>
<check_box initial_value="true" label="Activar plugins" name="browser_plugins_enabled"/>
<check_box initial_value="true" label="Aceptar las &apos;cookies&apos;" name="cookies_enabled"/>
diff --git a/indra/newview/skins/default/xui/es/panel_region_experiences.xml b/indra/newview/skins/default/xui/es/panel_region_experiences.xml
new file mode 100644
index 0000000000..4b7f82d3fb
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_region_experiences.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Experiencias" name="Experiences">
+ <panel.string name="trusted_estate_text">
+ Cualquier experiencia puede ser clave.
+
+Las experiencias clave tienen permiso de ejecución en este estado.
+
+Además, si el estado no admite el acceso público, los residentes que participen en una experiencia clave pueden entrar en el estado y permanecer en él mientras se encuentren en dicha experiencia.
+ </panel.string>
+ <panel.string name="allowed_estate_text">
+ Solo se permiten las experiencias activas en el terreno.
+
+Las experiencias permitidas tienen permiso de ejecución en este estado.
+ </panel.string>
+ <panel.string name="blocked_estate_text">
+ Solo pueden bloquearse las experiencias activas en el Grid.
+
+Las experiencias bloqueadas no pueden ejecutarse en este estado.
+ </panel.string>
+ <panel.string name="estate_caption">
+ En esta pestaña, los cambios en la configuración afectarán a todas las regiones del estado.
+ </panel.string>
+ <panel.string name="allowed_parcel_text">
+ Solo se permiten las experiencias activas en el terreno.
+
+Las experiencias permitidas tienen permiso de ejecución en esta parcela si no las ha bloqueado el estado.
+ </panel.string>
+ <panel.string name="blocked_parcel_text">
+ Puede bloquearse cualquier experiencia de los residentes.
+
+Las experiencias bloqueadas no pueden ejecutarse en esta parcela.
+ </panel.string>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_script_experience.xml b/indra/newview/skins/default/xui/es/panel_script_experience.xml
new file mode 100644
index 0000000000..2629a9fa69
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_script_experience.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<panel name="script_experience" title="EXPERIENCIA">
+ <button label="Experiencia" name="Expand Experience"/>
+ <check_box label="Usa las experiencias" name="enable_xp"/>
+ <layout_stack name="xp_details">
+ <layout_panel>
+ <combo_box label="Elegir experiencia..." name="Experiences..."/>
+ </layout_panel>
+ </layout_stack>
+ <text name="No Experiences">
+ No eres colaborador de ninguna experiencia.
+ </text>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/es/panel_snapshot_inventory.xml
index 12c74b5cd1..c9eea9a58e 100755
--- a/indra/newview/skins/default/xui/es/panel_snapshot_inventory.xml
+++ b/indra/newview/skins/default/xui/es/panel_snapshot_inventory.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="panel_snapshot_inventory">
<text name="title">
- Guardar en mi inventario
+ Inventario
</text>
<text name="hint_lbl">
Guardar una imagen en el inventario cuesta [UPLOAD_COST] L$. Para guardar una imagen como una textura, selecciona uno de los formatos cuadrados.
@@ -13,8 +13,8 @@
<combo_box.item label="Grande (512x512)" name="Large(512x512)"/>
<combo_box.item label="Personalizado" name="Custom"/>
</combo_box>
- <spinner label="Ancho" name="inventory_snapshot_width"/>
- <spinner label="Altura" name="inventory_snapshot_height"/>
+ <spinner label="Ancho × alto" name="inventory_snapshot_width"/>
+ <spinner label="" name="inventory_snapshot_height"/>
<check_box label="Mantener las proporciones" name="inventory_keep_aspect_check"/>
<button label="Cancelar" name="cancel_btn"/>
<button label="Guardar" name="save_btn"/>
diff --git a/indra/newview/skins/default/xui/es/panel_snapshot_local.xml b/indra/newview/skins/default/xui/es/panel_snapshot_local.xml
index 08c45d2e76..d0ea34d612 100755
--- a/indra/newview/skins/default/xui/es/panel_snapshot_local.xml
+++ b/indra/newview/skins/default/xui/es/panel_snapshot_local.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="panel_snapshot_local">
<text name="title">
- Guardar en mi ordenador
+ Disco
</text>
<combo_box label="Resolución" name="local_size_combo">
<combo_box.item label="Ventana actual" name="CurrentWindow"/>
@@ -13,24 +13,17 @@
<combo_box.item label="1600x1200" name="1600x1200"/>
<combo_box.item label="Personalizado" name="Custom"/>
</combo_box>
- <layout_stack name="local_image_params_ls">
- <layout_panel name="local_image_size_lp">
- <spinner label="Ancho" name="local_snapshot_width"/>
- <spinner label="Altura" name="local_snapshot_height"/>
- <check_box label="Mantener las proporciones" name="local_keep_aspect_check"/>
- </layout_panel>
- <layout_panel name="local_image_format_quality_lp">
- <combo_box label="Formato" name="local_format_combo">
- <combo_box.item label="PNG (sin pérdida)" name="PNG"/>
- <combo_box.item label="JPEG" name="JPEG"/>
- <combo_box.item label="BMP (sin pérdida)" name="BMP"/>
- </combo_box>
- <slider label="Calidad de la imagen" name="image_quality_slider"/>
- <text name="image_quality_level">
- ([QLVL])
- </text>
- </layout_panel>
- </layout_stack>
+ <spinner label="Ancho × alto" name="local_snapshot_width"/>
+ <check_box label="Mantener las proporciones" name="local_keep_aspect_check"/>
+ <text name="local_format_label">
+ Formato:
+ </text>
+ <combo_box label="Formato" name="local_format_combo">
+ <combo_box.item label="PNG (sin pérdida)" name="PNG"/>
+ <combo_box.item label="JPEG" name="JPEG"/>
+ <combo_box.item label="BMP (sin pérdida)" name="BMP"/>
+ </combo_box>
+ <slider label="Calidad:" name="image_quality_slider"/>
<button label="Cancelar" name="cancel_btn"/>
<flyout_button label="Guardar" name="save_btn" tool_tip="Guardar la imagen en un archivo">
<flyout_button.item label="Guardar" name="save_item"/>
diff --git a/indra/newview/skins/default/xui/es/panel_snapshot_options.xml b/indra/newview/skins/default/xui/es/panel_snapshot_options.xml
index f4bfc0e0b5..c1955f1fde 100755
--- a/indra/newview/skins/default/xui/es/panel_snapshot_options.xml
+++ b/indra/newview/skins/default/xui/es/panel_snapshot_options.xml
@@ -1,16 +1,10 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="panel_snapshot_options">
- <button label="Publicar en los comentarios de Mi perfil" name="save_to_profile_btn"/>
- <button label="Correo-e" name="save_to_email_btn"/>
- <button label="Guardar en Mi inventario ([AMOUNT] L$)" name="save_to_inventory_btn"/>
- <button label="Guardar en mi ordenador" name="save_to_computer_btn"/>
- <text name="send_to_facebook_textbox">
- Enviar a: [secondlife:/// Facebook]
- </text>
- <text name="send_to_twitter_textbox">
- [secondlife:/// Twitter]
- </text>
- <text name="send_to_flickr_textbox">
- [secondlife:/// Flickr]
- </text>
+ <button label="Guardar en disco" name="save_to_computer_btn"/>
+ <button label="Guardar en inventario (L$[AMOUNT])" name="save_to_inventory_btn"/>
+ <button label="Subir al perfil" name="save_to_profile_btn"/>
+ <button label="Subir a Facebook" name="send_to_facebook_btn"/>
+ <button label="Subir a Twitter" name="send_to_twitter_btn"/>
+ <button label="Subir a Flickr" name="send_to_flickr_btn"/>
+ <button label="Enviar por correo electrónico" name="save_to_email_btn"/>
</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/es/panel_snapshot_postcard.xml
index 649d547ba0..357b432c4c 100755
--- a/indra/newview/skins/default/xui/es/panel_snapshot_postcard.xml
+++ b/indra/newview/skins/default/xui/es/panel_snapshot_postcard.xml
@@ -10,8 +10,12 @@
Enviando...
</string>
<text name="title">
- Correo-e
+ Correo electrónico
</text>
- <button label="Mensaje" name="message_btn"/>
- <button label="Ajustes" name="settings_btn"/>
+ <tab_container name="postcard_tabs">
+ <panel label="Mensaje" name="panel_postcard_message"/>
+ <panel label="Opciones" name="panel_postcard_settings"/>
+ </tab_container>
+ <button label="Cancelar" name="cancel_btn"/>
+ <button label="Enviar" name="send_btn"/>
</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_snapshot_profile.xml b/indra/newview/skins/default/xui/es/panel_snapshot_profile.xml
index 6a0bc22d68..9fc925835f 100755
--- a/indra/newview/skins/default/xui/es/panel_snapshot_profile.xml
+++ b/indra/newview/skins/default/xui/es/panel_snapshot_profile.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="panel_snapshot_profile">
<text name="title">
- Publicar en los comentarios de Mi perfil
+ Perfil
</text>
<combo_box label="Resolución" name="profile_size_combo">
<combo_box.item label="Ventana actual" name="CurrentWindow"/>
@@ -10,19 +10,12 @@
<combo_box.item label="1024x768" name="1024x768"/>
<combo_box.item label="Personalizado" name="Custom"/>
</combo_box>
- <layout_stack name="profile_image_params_ls">
- <layout_panel name="profile_image_size_lp">
- <spinner label="Ancho" name="profile_snapshot_width"/>
- <spinner label="Altura" name="profile_snapshot_height"/>
- <check_box label="Mantener las proporciones" name="profile_keep_aspect_check"/>
- </layout_panel>
- <layout_panel name="profile_image_metadata_lp">
- <text name="caption_label">
- Título:
- </text>
- <check_box initial_value="true" label="Incluir ubicación" name="add_location_cb"/>
- </layout_panel>
- </layout_stack>
+ <spinner label="Ancho × alto" name="profile_snapshot_width"/>
+ <check_box label="Mantener las proporciones" name="profile_keep_aspect_check"/>
+ <text name="caption_label">
+ Título:
+ </text>
+ <check_box initial_value="true" label="Incluir ubicación" name="add_location_cb"/>
<button label="Cancelar" name="cancel_btn"/>
<button label="Publicar" name="post_btn"/>
</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_status_bar.xml b/indra/newview/skins/default/xui/es/panel_status_bar.xml
index 7eead3bc18..8ea56c5262 100755
--- a/indra/newview/skins/default/xui/es/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/es/panel_status_bar.xml
@@ -1,28 +1,16 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="status">
- <panel.string name="packet_loss_tooltip">
- Pérdida de paquetes
- </panel.string>
- <panel.string name="bandwidth_tooltip">
- Ancho de banda
- </panel.string>
- <panel.string name="time">
- [hour12, datetime, slt]:[min, datetime, slt] [ampm, datetime, slt] [timezone,datetime, slt]
- </panel.string>
- <panel.string name="timeTooltip">
- [weekday, datetime, slt], [day, datetime, slt] [month, datetime, slt] [year, datetime, slt]
- </panel.string>
- <panel.string name="buycurrencylabel">
- [AMT] L$
- </panel.string>
+ <panel.string name="packet_loss_tooltip">Pérdida de paquetes</panel.string>
+ <panel.string name="bandwidth_tooltip">Ancho de banda</panel.string>
+ <panel.string name="time">[hour12, datetime, slt]:[min, datetime, slt] [ampm, datetime, slt] [timezone,datetime, slt]</panel.string>
+ <panel.string name="timeTooltip">[weekday, datetime, slt], [day, datetime, slt] [month, datetime, slt] [year, datetime, slt]</panel.string>
+ <panel.string name="buycurrencylabel">[AMT] L$</panel.string>
<panel left="-410" name="balance_bg" width="200">
- <text name="balance" tool_tip="Haz clic para actualizar tu saldo en L$" value="20 L$"/>
+ <text name="balance" tool_tip="Haz clic para actualizar tu saldo en L$" value="L$??"/>
<button label="Comprar L$" name="buyL" tool_tip="Pulsa para comprar más L$"/>
<button label="Comprar" name="goShop" tool_tip="Abrir el mercado de Second Life" width="80"/>
</panel>
- <text name="TimeText" tool_tip="Hora actual (Pacífico)">
- 24:00 AM PST
- </text>
+ <text name="TimeText" tool_tip="Hora actual (Pacífico)">24:00 AM PST</text>
<button name="media_toggle_btn" tool_tip="Iniciar/Parar todos los media (música, vídeo, páginas web)"/>
<button name="volume_btn" tool_tip="Control general del volumen"/>
</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_twitter_photo.xml b/indra/newview/skins/default/xui/es/panel_twitter_photo.xml
index be1896b33b..0ae790514a 100644
--- a/indra/newview/skins/default/xui/es/panel_twitter_photo.xml
+++ b/indra/newview/skins/default/xui/es/panel_twitter_photo.xml
@@ -1,32 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<panel name="panel_twitter_photo">
- <layout_stack name="stack_photo">
- <layout_panel name="text_panel">
- <text name="status_label">
- ¿Qué está ocurriendo?
- </text>
- <text name="status_counter_label">
- 140
- </text>
- <check_box initial_value="true" label="Incluir ubicación de SL" name="add_location_cb"/>
- <check_box initial_value="true" label="Incluir una foto" name="add_photo_cb"/>
- </layout_panel>
- <layout_panel name="snapshot_panel">
- <combo_box name="resolution_combobox" tool_tip="Resolución de imagen">
- <combo_box.item label="Ventana actual" name="CurrentWindow"/>
- <combo_box.item label="640 × 480" name="640x480"/>
- <combo_box.item label="800 × 600" name="800x600"/>
- <combo_box.item label="1024 × 768" name="1024x768"/>
- </combo_box>
- <combo_box name="filters_combobox" tool_tip="Filtros de imagen">
- <combo_box.item label="Sin filtro" name="NoFilter"/>
- </combo_box>
- <button label="Actualizar" name="new_snapshot_btn" tool_tip="Pulsa para actualizar"/>
- <button label="Vista previa" name="big_preview_btn" tool_tip="Pulsa para alternar entre vista previa sí/no"/>
- </layout_panel>
- <layout_panel name="photo_button_panel">
- <button label="Tuitear" name="post_photo_btn"/>
- <button label="Cancelar" name="cancel_photo_btn"/>
- </layout_panel>
- </layout_stack>
+ <text name="status_label">
+ ¿Qué está ocurriendo?
+ </text>
+ <text name="status_counter_label">
+ 140
+ </text>
+ <check_box initial_value="true" label="Incluir ubicación de SL" name="add_location_cb"/>
+ <check_box initial_value="true" label="Incluir una foto" name="add_photo_cb"/>
+ <combo_box name="resolution_combobox" tool_tip="Resolución de imagen">
+ <combo_box.item label="Ventana actual" name="CurrentWindow"/>
+ <combo_box.item label="640 × 480" name="640x480"/>
+ <combo_box.item label="800 × 600" name="800x600"/>
+ <combo_box.item label="1024 × 768" name="1024x768"/>
+ </combo_box>
+ <combo_box name="filters_combobox" tool_tip="Filtros de imagen">
+ <combo_box.item label="Sin filtro" name="NoFilter"/>
+ </combo_box>
+ <button label="Actualizar" name="new_snapshot_btn" tool_tip="Pulsa para actualizar"/>
+ <button label="Vista previa" name="big_preview_btn" tool_tip="Pulsa para alternar entre vista previa sí/no"/>
+ <button label="Tuitear" name="post_photo_btn"/>
+ <button label="Cancelar" name="cancel_photo_btn"/>
</panel>
diff --git a/indra/newview/skins/default/xui/es/role_actions.xml b/indra/newview/skins/default/xui/es/role_actions.xml
index 5e0c21992d..3928ca2ab7 100755
--- a/indra/newview/skins/default/xui/es/role_actions.xml
+++ b/indra/newview/skins/default/xui/es/role_actions.xml
@@ -71,4 +71,8 @@
<action description="Abrir chat de voz del grupo" longdescription="Quien tenga un rol con esta capacidad puede abrir sesiones de chat de voz del grupo. NOTA: para acceder al chat de voz debe tenerse la capacidad &apos;Abrir chat de grupo&apos;." name="join voice chat" value="27"/>
<action description="Moderar el chat de grupo" longdescription="Quien tenga esta capacidad puede controlar el acceso y la participación en los chats de texto y de voz del grupo." name="moderate group chat" value="37"/>
</action_set>
+ <action_set description="Estas capacidades incluyen la posibilidad de modificar las experiencias propiedad del grupo." name="experience_tools_experience">
+ <action description="Admin. de la experiencia" longdescription="Los miembros con un rol que tenga esta capacidad pueden editar los metadatos de una experiencia." name="experience admin" value="49"/>
+ <action description="Colaborador de la experiencia" longdescription="Los miembros con un rol que tenga esta capacidad pueden incluir scripts en una experiencia." name="experience contributor" value="50"/>
+ </action_set>
</role_actions>
diff --git a/indra/newview/skins/default/xui/es/sidepanel_item_info.xml b/indra/newview/skins/default/xui/es/sidepanel_item_info.xml
index 176247f90e..8132bbdb1b 100755
--- a/indra/newview/skins/default/xui/es/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/es/sidepanel_item_info.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="item properties" title="Perfil del elemento">
+ <panel.string name="loading_experience">
+ (cargando)
+ </panel.string>
<panel.string name="unknown">
(desconocidas)
</panel.string>
@@ -43,6 +46,9 @@
<text name="LabelAcquiredTitle">
Obtenido:
</text>
+ <text name="LabelItemExperienceTitle">
+ Experiencia:
+ </text>
<panel name="perms_inv">
<text name="perm_modify">
Tú puedes:
@@ -66,8 +72,9 @@
<check_box label="Transferir" name="CheckNextOwnerTransfer" tool_tip="El próximo propietario puede dar o revender este objeto"/>
</panel>
<check_box label="En venta" name="CheckPurchase"/>
- <combo_box name="combobox sale copy">
+ <combo_box name="ComboBoxSaleType">
<combo_box.item label="Copiar" name="Copy"/>
+ <combo_box.item label="Contenidos" name="Contents"/>
<combo_box.item label="Original" name="Original"/>
</combo_box>
<spinner label="Precio: L$" name="Edit Cost"/>
diff --git a/indra/newview/skins/default/xui/es/sidepanel_task_info.xml b/indra/newview/skins/default/xui/es/sidepanel_task_info.xml
index cb061796e7..b9c8139f16 100755
--- a/indra/newview/skins/default/xui/es/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/es/sidepanel_task_info.xml
@@ -1,71 +1,31 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="object properties" title="Perfil del objeto">
- <panel.string name="text deed continued">
- Transferir
- </panel.string>
- <panel.string name="text deed">
- Transferir
- </panel.string>
- <panel.string name="text modify info 1">
- Puedes modificar este objeto
- </panel.string>
- <panel.string name="text modify info 2">
- Puedes modificar estos objetos
- </panel.string>
- <panel.string name="text modify info 3">
- No puedes modificar este objeto
- </panel.string>
- <panel.string name="text modify info 4">
- No puedes modificar estos objetos
- </panel.string>
- <panel.string name="text modify info 5">
- No se puede modificar este objeto a través del límite de una región
- </panel.string>
- <panel.string name="text modify info 6">
- No se pueden modificar estos objetos a través del límite de una región
- </panel.string>
- <panel.string name="text modify warning">
- Este objeto tiene partes enlazadas
- </panel.string>
- <panel.string name="Cost Default">
- Precio: L$
- </panel.string>
- <panel.string name="Cost Total">
- Precio total: L$
- </panel.string>
- <panel.string name="Cost Per Unit">
- Price Per: L$
- </panel.string>
- <panel.string name="Cost Mixed">
- Mixed Price
- </panel.string>
- <panel.string name="Sale Mixed">
- Mixed Sale
- </panel.string>
+ <panel.string name="text deed continued">Transferir</panel.string>
+ <panel.string name="text deed">Transferir</panel.string>
+ <panel.string name="text modify info 1">Puedes modificar este objeto</panel.string>
+ <panel.string name="text modify info 2">Puedes modificar estos objetos</panel.string>
+ <panel.string name="text modify info 3">No puedes modificar este objeto</panel.string>
+ <panel.string name="text modify info 4">No puedes modificar estos objetos</panel.string>
+ <panel.string name="text modify info 5">No se puede modificar este objeto a través del límite de una región</panel.string>
+ <panel.string name="text modify info 6">No se pueden modificar estos objetos a través del límite de una región</panel.string>
+ <panel.string name="text modify warning">Este objeto tiene partes enlazadas</panel.string>
+ <panel.string name="Cost Default">Precio: L$</panel.string>
+ <panel.string name="Cost Total">Precio total: L$</panel.string>
+ <panel.string name="Cost Per Unit">Price Per: L$</panel.string>
+ <panel.string name="Cost Mixed">Mixed Price</panel.string>
+ <panel.string name="Sale Mixed">Mixed Sale</panel.string>
<text name="title" value="Perfil del objeto"/>
<text name="where" value="(En el mundo)"/>
<panel label="" name="properties_panel">
- <text name="Name:">
- Nombre:
- </text>
- <text name="Description:">
- Descripción:
- </text>
- <text name="CreatorNameLabel">
- Creador:
- </text>
- <text name="Owner:">
- Propietario:
- </text>
- <text name="Group_label">
- Grupo:
- </text>
+ <text name="Name:">Nombre:</text>
+ <text name="Description:">Descripción:</text>
+ <text name="CreatorNameLabel">Creador:</text>
+ <text name="Owner:">Propietario:</text>
+ <text name="Group_label">Grupo:</text>
<button name="button set group" tool_tip="Elige un grupo con el que compartir los permisos de este objeto"/>
<name_box initial_value="Cargando..." name="Group Name Proxy"/>
<button label="Transferir" label_selected="Transferir" name="button deed" tool_tip="La transferencia entrega este objeto con los permisos del próximo propietario. Los objetos compartidos por el grupo pueden ser transferidos por un oficial del grupo."/>
- <text name="label click action">
- Pulsa para:
- </text>
+ <text name="label click action">Pulsa para:</text>
<combo_box name="clickaction">
<combo_box.item label="Tocarlo (por defecto)" name="Touch/grab(default)"/>
<combo_box.item label="Sentarme en el objeto" name="Sitonobject"/>
@@ -75,21 +35,13 @@
<combo_box.item label="Zoom" name="Zoom"/>
</combo_box>
<panel name="perms_inv">
- <text name="perm_modify">
- Puedes modificar este objeto
- </text>
- <text name="Anyone can:">
- Cualquiera:
- </text>
+ <text name="perm_modify">Puedes modificar este objeto</text>
+ <text name="Anyone can:">Cualquiera:</text>
<check_box label="Copiar" name="checkbox allow everyone copy"/>
<check_box label="Mover" name="checkbox allow everyone move"/>
- <text name="GroupLabel">
- Grupo:
- </text>
+ <text name="GroupLabel">Grupo:</text>
<check_box label="Compartir" name="checkbox share with group" tool_tip="Permite que todos los miembros del grupo compartan tus permisos de modificación de este objeto. Debes transferirlo para activar las restricciones según los roles."/>
- <text name="NextOwnerLabel">
- Próximo propietario:
- </text>
+ <text name="NextOwnerLabel">Próximo propietario:</text>
<check_box label="Modificar" name="checkbox next owner can modify"/>
<check_box label="Copiar" name="checkbox next owner can copy"/>
<check_box label="Transferir" name="checkbox next owner can transfer" tool_tip="El próximo propietario puede dar o revender este objeto"/>
@@ -102,27 +54,13 @@
</combo_box>
<spinner label="Precio: L$" name="Edit Cost"/>
<check_box label="Mostrar en la búsqueda" name="search_check" tool_tip="Permitir que la gente vea este objeto en los resultados de la búsqueda"/>
- <text name="pathfinding_attributes_label">
- Atributos de pathfinding:
- </text>
- <text name="B:">
- B:
- </text>
- <text name="O:">
- O:
- </text>
- <text name="G:">
- G:
- </text>
- <text name="E:">
- E:
- </text>
- <text name="N:">
- N:
- </text>
- <text name="F:">
- F:
- </text>
+ <text name="pathfinding_attributes_label">Atributos de pathfinding:</text>
+ <text name="B:">B:</text>
+ <text name="O:">O:</text>
+ <text name="G:">G:</text>
+ <text name="E:">E:</text>
+ <text name="N:">N:</text>
+ <text name="F:">F:</text>
</panel>
<panel name="button_panel">
<button label="Abrir" name="open_btn"/>
diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml
index bd339513b3..404aa1e60e 100755
--- a/indra/newview/skins/default/xui/es/strings.xml
+++ b/indra/newview/skins/default/xui/es/strings.xml
@@ -440,30 +440,51 @@ Intenta iniciar sesión de nuevo en unos instantes.
<string name="TooltipMustSingleDrop">
Aquí se puede arrastrar sólo un ítem
</string>
+ <string name="TooltipTooManyWearables">
+ No puedes tener una carpeta de prendas que contenga más de [AMOUNT] elementos. Puedes cambiar este límite en Avanzado &gt; Mostrar las configuraciones del depurador &gt; WearFolderLimit.
+ </string>
<string name="TooltipPrice" value="[AMOUNT] L$:"/>
<string name="TooltipOutboxDragToWorld">
- No puedes colocar objetos en tu buzón de salida de comerciante
+ No se pueden mostrar artículos desde la carpeta Artículos del mercado
+ </string>
+ <string name="TooltipOutboxWorn">
+ Los artículos que tienes puestos no se pueden colocar en la carpeta Artículos del mercado
+ </string>
+ <string name="TooltipOutboxFolderLevels">
+ La profundidad de carpetas anidadas excede de [AMOUNT]. Disminuye la profundidad de las carpetas anidadas; si es necesario, agrupa los artículos.
+ </string>
+ <string name="TooltipOutboxTooManyFolders">
+ La cantidad de subcarpetas excede de [AMOUNT]. Disminuye la cantidad de carpetas de tu lista de artículos; si es necesario, agrupa los artículos.
+ </string>
+ <string name="TooltipOutboxTooManyObjects">
+ La cantidad de artículos excede de [AMOUNT]. Para vender más de [AMOUNT] artículos en la misma lista, debes agrupar algunos.
+ </string>
+ <string name="TooltipOutboxTooManyStockItems">
+ La cantidad de artículos en stock excede de [AMOUNT].
+ </string>
+ <string name="TooltipOutboxCannotDropOnRoot">
+ Solo se pueden soltar artículos o carpetas en la pestaña TODOS. Selecciona esta pestaña y mueve otra vez los artículos o carpetas.
</string>
<string name="TooltipOutboxNoTransfer">
- Uno o varios de estos objetos no se pueden vender o transferir.
+ Uno o varios de estos objetos no se pueden vender o transferir
</string>
<string name="TooltipOutboxNotInInventory">
- Tu buzón de salida de comerciante sólo puede aceptar objetos procedentes directamente de tu inventario
+ Solo puedes colocar en el mercado artículos de tu inventario
</string>
- <string name="TooltipOutboxWorn">
- No puedes poner artículos que llevas puestos en el buzón de salida de comerciante
+ <string name="TooltipOutboxLinked">
+ No puedes poner carpetas o artículos vinculados en el Mercado
</string>
<string name="TooltipOutboxCallingCard">
- No puedes poner tarjetas de visita en tu buzón de salida de comerciante
+ No puedes colocar tarjetas de visita en el Mercado
</string>
- <string name="TooltipOutboxFolderLevels">
- La profundidad de carpetas anidadas excede de 3
+ <string name="TooltipOutboxDragActive">
+ No se puede mover una lista de artículos publicada
</string>
- <string name="TooltipOutboxTooManyFolders">
- El número de subcarpetas de la carpeta de nivel superior excede de 20
+ <string name="TooltipOutboxCannotMoveRoot">
+ No se puede mover la carpeta raíz de artículos del Mercado
</string>
- <string name="TooltipOutboxTooManyObjects">
- El número de elementos de la carpeta de nivel superior excede de 200
+ <string name="TooltipOutboxMixedStock">
+ Todos los artículos de una carpeta de stock deben tener el mismo tipo y permiso
</string>
<string name="TooltipDragOntoOwnChild">
No puedes mover una carpeta a su carpeta secundaria
@@ -1042,9 +1063,7 @@ Intenta iniciar sesión de nuevo en unos instantes.
<string name="AgentNameSubst">
(Tú)
</string>
- <string name="JoinAnExperience">
- Únete a una experiencia
- </string>
+ <string name="JoinAnExperience"/><!-- intentionally blank -->
<string name="SilentlyManageEstateAccess">
Suprimir alertas al gestionar las listas de acceso a un estado
</string>
@@ -1111,6 +1130,12 @@ Intenta iniciar sesión de nuevo en unos instantes.
<string name="bitmap_image_files">
Imágenes de mapa de bits
</string>
+ <string name="png_image_files">
+ Imágenes PNG
+ </string>
+ <string name="save_texture_image_files">
+ Imágenes Targa o PNG
+ </string>
<string name="avi_movie_file">
Archivo de película AVI
</string>
@@ -1360,6 +1385,9 @@ Intenta iniciar sesión de nuevo en unos instantes.
<string name="FavoritesNoMatchingItems">
Arrastra aquí un hito para tenerlo en tus favoritos.
</string>
+ <string name="MarketplaceNoMatchingItems">
+ No se han encontrado artículos. Comprueba si has escrito correctamente la cadena de búsqueda y vuelve a intentarlo.
+ </string>
<string name="InventoryNoTexture">
No tienes en tu inventario una copia de esta textura
</string>
@@ -1407,29 +1435,95 @@ Intenta iniciar sesión de nuevo en unos instantes.
<string name="InventoryOutboxError">
La [[MARKETPLACE_CREATE_STORE_URL] tienda del Mercado] devuelve errores.
</string>
+ <string name="InventoryMarketplaceError">
+ Esta función está actualmente en versión beta. Si quieres participar, añade tu nombre a este [http://goo.gl/forms/FCQ7UXkakz Formulario de Google].
+ </string>
+ <string name="InventoryMarketplaceListingsNoItemsTitle">
+ Tu carpeta Artículos del mercado está vacía.
+ </string>
+ <string name="InventoryMarketplaceListingsNoItems">
+ Arrastra carpetas a esta sección para incluirlas en la lista de venta del [[MARKETPLACE_DASHBOARD_URL] Mercado].
+ </string>
+ <string name="Marketplace Validation Warning Stock">
+ La carpeta de stock debe estar contenida en una carpeta de versión
+ </string>
+ <string name="Marketplace Validation Error Mixed Stock">
+ : Error: todos los artículos de una carpeta de stock deben ser del mismo tipo y que no se puedan copiar
+ </string>
+ <string name="Marketplace Validation Error Subfolder In Stock">
+ : Error: la carpeta de stock no puede contener subcarpetas
+ </string>
+ <string name="Marketplace Validation Warning Empty">
+ : Atención: la carpeta no contiene ningún artículo
+ </string>
+ <string name="Marketplace Validation Warning Create Stock">
+ : Atención: creando carpeta de stock
+ </string>
+ <string name="Marketplace Validation Warning Create Version">
+ : Atención: creando la carpeta de versión
+ </string>
+ <string name="Marketplace Validation Warning Move">
+ : Atención: moviendo artículos
+ </string>
+ <string name="Marketplace Validation Warning Delete">
+ : Atención: se ha transferido el contenido de la carpeta a la carpeta de stock, y se eliminará la carpeta vacía
+ </string>
+ <string name="Marketplace Validation Error Stock Item">
+ : Error: los artículos que no se pueden copiar deben estar contenidos en una carpeta de stock
+ </string>
+ <string name="Marketplace Validation Warning Unwrapped Item">
+ : Atención: los artículos deben estar contenidos en una carpeta de versión
+ </string>
+ <string name="Marketplace Validation Error">
+ : Error:
+ </string>
+ <string name="Marketplace Validation Warning">
+ : Atención:
+ </string>
+ <string name="Marketplace Validation Error Empty Version">
+ : Atención: la carpeta de versión debe contener al menos un artículo
+ </string>
+ <string name="Marketplace Validation Error Empty Stock">
+ : Atención: la carpeta de stock debe contener al menos un artículo
+ </string>
+ <string name="Marketplace Validation No Error">
+ No se han producido errores ni advertencias
+ </string>
<string name="Marketplace Error None">
Sin errores
</string>
+ <string name="Marketplace Error Prefix">
+ Error:
+ </string>
<string name="Marketplace Error Not Merchant">
- Error: Para poder enviar objetos al mercado, debes registrarte como comerciante (es gratis).
+ Para poder enviar objetos al mercado, debes registrarte como comerciante (es gratis).
</string>
- <string name="Marketplace Error Empty Folder">
- Error: Esta carpeta está vacía.
+ <string name="Marketplace Error Not Accepted">
+ No se puede mover el artículo a esa carpeta.
</string>
- <string name="Marketplace Error Unassociated Products">
- Error: Este objeto no se pudo subir porque tu cuenta de comerciante tiene demasiados objetos que no están asociados a productos. Para corregirlo, inicia sesión en la página web del mercado y asocia más objetos.
+ <string name="Marketplace Error Unsellable Item">
+ Este artículo no se puede vender en el Mercado.
</string>
- <string name="Marketplace Error Object Limit">
- Error: Este elemento contiene demasiados objetos. Para corregir el error, guarda objetos en cajas de forma que el total de objetos sea menor que 200.
+ <string name="MarketplaceNoID">
+ no Mkt ID
</string>
- <string name="Marketplace Error Folder Depth">
- Error: Este objeto contiene demasiados niveles de carpetas anidadas. Reorganízalo de forma que tenga como máximo 3 niveles de carpetas anidadas.
+ <string name="MarketplaceLive">
+ en la lista
</string>
- <string name="Marketplace Error Unsellable Item">
- Error: Este objeto no se puede vender en el mercado.
+ <string name="MarketplaceActive">
+ activa
</string>
- <string name="Marketplace Error Internal Import">
- Error: Este objeto tiene un problema. Vuelve a intentarlo más tarde.
+ <string name="MarketplaceMax">
+ máx.
+ </string>
+ <string name="MarketplaceStock">
+ stock
+ </string>
+ <string name="MarketplaceNoStock">
+ existencias agotadas
+ </string>
+ <string name="MarketplaceUpdating">
+ actualizando...
</string>
<string name="Open landmarks">
Abrir hitos
@@ -1450,6 +1544,7 @@ Intenta iniciar sesión de nuevo en unos instantes.
No hay contenido
</string>
<string name="WornOnAttachmentPoint" value="(lo llevas en: [ATTACHMENT_POINT])"/>
+ <string name="AttachmentErrorMessage" value="([ATTACHMENT_ERROR])"/>
<string name="ActiveGesture" value="[GESLABEL] (activo)"/>
<string name="Chat Message" value="Chat:"/>
<string name="Sound" value="Sonido :"/>
@@ -1714,6 +1809,15 @@ Intenta iniciar sesión de nuevo en unos instantes.
<string name="Invalid Attachment">
Punto de colocación no válido
</string>
+ <string name="ATTACHMENT_MISSING_ITEM">
+ Error: falta un artículo
+ </string>
+ <string name="ATTACHMENT_MISSING_BASE_ITEM">
+ Error: falta el artículo de base
+ </string>
+ <string name="ATTACHMENT_NOT_ATTACHED">
+ Error: el objeto se encuentra en el vestuario actual, pero no está anexado
+ </string>
<string name="YearsMonthsOld">
[AGEYEARS] [AGEMONTHS] de edad
</string>
@@ -1882,6 +1986,9 @@ Intenta iniciar sesión de nuevo en unos instantes.
<string name="SaveComplete">
Guardado.
</string>
+ <string name="UploadFailed">
+ Error al subir el archivo:
+ </string>
<string name="ObjectOutOfRange">
Script (objeto fuera de rango)
</string>
@@ -1891,6 +1998,9 @@ Intenta iniciar sesión de nuevo en unos instantes.
<string name="GroupsNone">
ninguno
</string>
+ <string name="CompileNoExperiencePerm">
+ Omitiendo el script [SCRIPT] con la experiencia [EXPERIENCE].
+ </string>
<string name="Group" value="(grupo)"/>
<string name="Unknown">
(Desconocido)
@@ -4976,6 +5086,9 @@ Inténtalo incluyendo la ruta de acceso al editor entre comillas
<string name="Command_Marketplace_Label">
Mercado
</string>
+ <string name="Command_MarketplaceListings_Label">
+ Mercado
+ </string>
<string name="Command_MiniMap_Label">
Minimapa
</string>
@@ -5063,6 +5176,9 @@ Inténtalo incluyendo la ruta de acceso al editor entre comillas
<string name="Command_Marketplace_Tooltip">
Ir de compras
</string>
+ <string name="Command_MarketplaceListings_Tooltip">
+ Vende tu creación
+ </string>
<string name="Command_MiniMap_Tooltip">
Mostrar la gente que está cerca
</string>
@@ -5186,4 +5302,85 @@ Inténtalo incluyendo la ruta de acceso al editor entre comillas
<string name="loading_chat_logs">
Cargando...
</string>
+ <string name="experience_tools_experience">
+ Experiencia
+ </string>
+ <string name="ExperienceNameNull">
+ (sin experiencia)
+ </string>
+ <string name="ExperienceNameUntitled">
+ (experiencia sin título)
+ </string>
+ <string name="Land-Scope">
+ Activa en el terreno
+ </string>
+ <string name="Grid-Scope">
+ Activa en el Grid
+ </string>
+ <string name="Allowed_Experiences_Tab">
+ PERMITIDO
+ </string>
+ <string name="Blocked_Experiences_Tab">
+ BLOQUEADO
+ </string>
+ <string name="Contrib_Experiences_Tab">
+ COLABORADOR
+ </string>
+ <string name="Admin_Experiences_Tab">
+ ADMIN.
+ </string>
+ <string name="Recent_Experiences_Tab">
+ RECIENTE
+ </string>
+ <string name="Owned_Experiences_Tab">
+ PROPIEDAD
+ </string>
+ <string name="ExperiencesCounter">
+ ([EXPERIENCES], máx. [MAXEXPERIENCES])
+ </string>
+ <string name="ExperiencePermission1">
+ hacerte con tus controles
+ </string>
+ <string name="ExperiencePermission3">
+ activar animaciones en tu avatar
+ </string>
+ <string name="ExperiencePermission4">
+ anexar a tu avatar
+ </string>
+ <string name="ExperiencePermission9">
+ seguimiento de la cámara
+ </string>
+ <string name="ExperiencePermission10">
+ controlar tu cámara
+ </string>
+ <string name="ExperiencePermission11">
+ teleportarte
+ </string>
+ <string name="ExperiencePermission12">
+ aceptar automáticamente permisos de experiencias
+ </string>
+ <string name="ExperiencePermissionShortUnknown">
+ ha realizado una operación desconocida: [Permission]
+ </string>
+ <string name="ExperiencePermissionShort1">
+ Ponerte al mando
+ </string>
+ <string name="ExperiencePermissionShort3">
+ Activar animaciones
+ </string>
+ <string name="ExperiencePermissionShort4">
+ Anexar
+ </string>
+ <string name="ExperiencePermissionShort9">
+ Seguir la cámara
+ </string>
+ <string name="ExperiencePermissionShort10">
+ Controlar la cámara
+ </string>
+ <string name="ExperiencePermissionShort11">
+ Teleportarte
+ </string>
+ <string name="ExperiencePermissionShort12">
+ Otorgar permisos
+ </string>
</strings>
diff --git a/indra/newview/skins/default/xui/es/teleport_strings.xml b/indra/newview/skins/default/xui/es/teleport_strings.xml
index 94975a83f8..a9b351b39c 100755
--- a/indra/newview/skins/default/xui/es/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/es/teleport_strings.xml
@@ -47,6 +47,9 @@ Para repetir el tutorial, visita la isla de bienvenida pública.
<message name="MustGetAgeRegion">
Solo pueden acceder a esta región los mayores de 18 años.
</message>
+ <message name="RegionTPSpecialUsageBlocked">
+ No puedes entrar en la región. &apos;[REGION_NAME]&apos; es una región de juegos de habilidad, y debes cumplir determinados criterios para poder entrar en ella. Consulta los detalles en las [http://wiki.secondlife.com/wiki/Linden_Lab_Official:Skill_Gaming_in_Second_Life P+F de juegos de habilidad].
+ </message>
</message_set>
<message_set name="progress">
<message name="sending_dest">
diff --git a/indra/newview/skins/default/xui/fr/floater_about.xml b/indra/newview/skins/default/xui/fr/floater_about.xml
index 384966354e..08f26e60b4 100755
--- a/indra/newview/skins/default/xui/fr/floater_about.xml
+++ b/indra/newview/skins/default/xui/fr/floater_about.xml
@@ -1,74 +1,16 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="floater_about" title="À PROPOS DE [CAPITALIZED_APP_NAME]">
- <floater.string name="AboutHeader">
- [APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2] ([VIEWER_VERSION_3]) [BUILD_DATE] [BUILD_TIME] ([CHANNEL])
-[[VIEWER_RELEASE_NOTES_URL] [ReleaseNotes]]
- </floater.string>
- <floater.string name="AboutCompiler">
- Compilé avec [COMPILER] version [COMPILER_VERSION]
- </floater.string>
- <floater.string name="AboutPosition">
- Vous êtes à [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1] dans [REGION], se trouvant à &lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt; ([HOSTIP])
-SLURL : &lt;nolink&gt;[SLURL]&lt;/nolink&gt;
-(coordonnées globales [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1])
-[SERVER_VERSION]
-[SERVER_RELEASE_NOTES_URL]
- </floater.string>
- <floater.string name="AboutSystem">
- CPU : [CPU]
-Mémoire : [MEMORY_MB] Mo
-Version OS : [OS_VERSION]
-Distributeur de cartes graphiques : [GRAPHICS_CARD_VENDOR]
-Cartes graphiques : [GRAPHICS_CARD]
- </floater.string>
- <floater.string name="AboutDriver">
- Version Windows Graphics Driver : [GRAPHICS_DRIVER_VERSION]
- </floater.string>
- <floater.string name="AboutLibs">
- Version OpenGL : [OPENGL_VERSION]
-
-Version libcurl : [LIBCURL_VERSION]
-Version J2C Decoder : [J2C_VERSION]
-Version Audio Driver : [AUDIO_DRIVER_VERSION]
-Version Qt Webkit : [QT_WEBKIT_VERSION]
-Version serveur vocal : [VOICE_VERSION]
- </floater.string>
- <floater.string name="none">
- (aucun)
- </floater.string>
- <floater.string name="AboutTraffic">
- Paquets perdus : [PACKETS_LOST,number,0]/[PACKETS_IN,number,0] ([PACKETS_PCT,number,1]%)
- </floater.string>
- <floater.string name="ErrorFetchingServerReleaseNotesURL">
- Erreur lors de la récupération de l&apos;URL des notes de version du serveur.
- </floater.string>
<tab_container name="about_tab">
<panel label="Infos" name="support_panel">
<button label="Copier dans le presse-papiers" name="copy_btn"/>
</panel>
<panel label="Remerciements" name="credits_panel">
- <text name="linden_intro">
- Second Life vous est proposé par les Linden :
- </text>
- <text_editor name="linden_names">
- Philip, Andrew, Doug, Richard, Phoenix, Ian, Mark, Robin, Dan, Char, Ryan, Eric, Jim, Lee, Jeff, Michael, Kelly, Steve, Catherine, Bub, Ramzi, Jill, Jeska, Don, Kona, Callum, Charity, Jack, Shawn, babbage, James, Lauren, Blue, Brent, Reuben, Pathfinder, Jesse, Patsy, Torley, Bo, Cyn, Jonathan, Gia, Annette, Ginsu, Harry, Lex, Runitai, Guy, Cornelius, Beth, Swiss, Thumper, Wendy, Teeple, Seth, Dee, Mia, Sally, Liana, Aura, Beez, Milo, Red, Gulliver, Marius, Joe, Jose, Dore, Justin, Nora, Morpheus, Lexie, Amber, Chris, Xan, Leyla, Walker, Sabin, Joshua, Hiromi, Tofu, Fritz, June, Jean, Ivy, Dez, Ken, Betsy, Which, Spike, Rob, Zee, Dustin, George, Claudia, del, Matthew, jane, jay, Adrian, Yool, Rika, Yoz, siobhan, Qarl, Benjamin, Beast, Everett, madhavi, Christopher, Izzy, stephany, Jeremy, sean, adreanne, Pramod, Tobin, sejong, Iridium, maurice, kj, Meta, kari, JP, bert, kyle, Jon, Socrates, Bridie, Ivan, maria, Aric, Coco, Periapse, sandy, Storrs, Lotte, Colossus, Brad, Pastrami, Zen, BigPapi, Banzai, Sardonyx, Mani, Garry, Jaime, Neuro, Samuel, Niko, CeeLo, Austin, Soft, Poppy, emma, tessa, angelo, kurz, alexa, Sue, CG, Blake, Erica, Brett, Bevis, kristen, Q, simon, Enus, MJ, laurap, Kip, Scouse, Ron, Ram, kend, Marty, Prospero, melissa, kraft, Nat, Seraph, Hamilton, Lordan, Green, miz, Ashlei, Trinity, Ekim, Echo, Charlie, Rowan, Rome, Jt, Doris, benoc, Christy, Bao, Kate, Tj, Patch, Cheah, Johan, Brandy, Angela, Oreh, Cogsworth, Lan, Mitchell, Space, Bambers, Einstein, Bender, Malbers, Matias, Maggie, Rothman, Milton, Niall, Marin, Allison, Mango, Andrea, Katt, Yi, Ambroff, Rico, Raymond, Gail, Christa, William, Dawn, Usi, Dynamike, M, Corr, Dante, Molly, kaylee, Danica, Kelv, Lil, jacob, Nya, Rodney, elsie, Blondin, Grant, Nyx, Devin, Monty, Minerva, Keira, Katie, Jenn, Makai, Clare, Joy, Cody, Gayathri, FJ, spider, Oskar, Landon, Jarv, Noelle, Al, Doc, Gray, Vir, t, Maestro, Simone, Shannon, yang, Courtney, Scott, charlene, Quixote, Susan, Zed, Amanda, Katelin, Esbee, JoRoan, Enkidu, roxie, Scarlet, Merov, Kevin, Judy, Rand, Newell, Les, Dessie, Galen, Michon, Geo, Siz, Calyle, Pete, Praveen, Callen, Sheldon, Pink, Nelson, jenelle, Terrence, Nathan, Juan, Sascha, Huseby, Karina, Kaye, Kotler, Lis, Darv, Charrell, Dakota, Kimmora, Theeba, Taka, Mae, Perry, Ducot, dana, Esther, Dough, gisele, Doten, Viale, Fisher, jessieann, ashley, Torres, delby, rountree, kurt, Slaton, Madison, Rue, Gino, Wen, Casssandra, Brodesky, Squid, Gez, Rakesh, Gecko, Ladan, Tony, Tatem, Squire, Falcon, BK, Crimp, Tiggs, Bacon, Coyot, Carmilla, Webb, Sea, Arch, Jillian, Jason, Bernard, Vogt, Peggy, dragon, Pup, xandix, Wallace, Bewest, Inoshiro, Rhett, AG, Aimee, Ghengis, Itiaes, Eli, Steffan, Epic, Grapes, Stone, Prep, Scobu, Robert, Alain, Carla, Vicky, Tia, Alec, Taras, Lisa, Oz, Ariane, Log, House, Kazu, Kim, Drofnas, Tyler, Campbell, Michele, Madeline, Nelly, Baron, Thor, Lori, Hele, Fredrik, Teddy, Pixie, Berry, Gabrielle, Alfonso, Brooke, Wolf, Ringo, Cru, Charlar, Rodvik, Gibson, Elise, Bagman, Greger, Leonidas, Jerm, Leslie, CB, Brenda, Durian, Carlo, mm, Zeeshan, Caleb, Max, Elikak, Mercille, Steph, Chase
- </text_editor>
- <text name="contrib_intro">
- Contributions Open Source :
- </text>
- <text_editor name="contrib_names">
- Dummy Name remplacé au moment de l&apos;exécution
- </text_editor>
- <text name="trans_intro">
- Participation aux traductions :
- </text>
- <text_editor name="trans_names">
- Dummy Name remplacé au moment de l&apos;exécution
- </text_editor>
+ <text name="linden_intro">Second Life vous est proposé par les Linden,
+avec les contributions Open Source de :</text>
+ <text_editor name="contrib_names">Dummy Name remplacé au moment de l&apos;exécution</text_editor>
</panel>
<panel label="Licences" name="licenses_panel">
- <text_editor name="credits_editor">
- 3Dconnexion SDK Copyright (C) 1992-2009 3Dconnexion
+ <text_editor name="licenses_editor">3Dconnexion SDK Copyright (C) 1992-2009 3Dconnexion
APR Copyright (C) 2011 The Apache Software Foundation
Collada DOM Copyright 2006 Sony Computer Entertainment Inc.
cURL Copyright (C) 1996-2010, Daniel Stenberg, (daniel@haxx.se)
@@ -95,8 +37,7 @@ Version serveur vocal : [VOICE_VERSION]
Tous droits réservés. Voir licenses.txt pour plus d&apos;informations.
- Codage audio du chat vocal : Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
- </text_editor>
+ Codage audio du chat vocal : Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)</text_editor>
</panel>
</tab_container>
</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_about_land.xml b/indra/newview/skins/default/xui/fr/floater_about_land.xml
index 25c49b97b5..3de282e8d5 100755
--- a/indra/newview/skins/default/xui/fr/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/fr/floater_about_land.xml
@@ -312,9 +312,6 @@ Seules les parcelles de grande taille peuvent apparaître dans la recherche.
<panel.string name="push_restrict_region_text">
Pas de bousculades (les règles de la région priment)
</panel.string>
- <panel.string name="see_avs_text">
- Les avatars sur les autres parcelles peuvent voir
- </panel.string>
<text name="allow_label">
Autoriser les autres résidents à :
</text>
@@ -340,22 +337,6 @@ Seules les parcelles de grande taille peuvent apparaître dans la recherche.
<check_box label="Sécurisé (pas de dégâts)" name="check safe" tool_tip="Si cette option est cochée, le terrain est sécurisé et il n&apos;y pas de risques de dommages causés par des combats. Si elle est décochée, des dommages causés par les combats peuvent avoir lieu."/>
<check_box label="Pas de bousculades" name="PushRestrictCheck" tool_tip="Empêche l&apos;utilisation de scripts causant des bousculades. Cette option est utile pour empêcher les comportements abusifs sur votre terrain."/>
<check_box label="Voir le lieu dans la recherche (30 L$/sem.)" name="ShowDirectoryCheck" tool_tip="Afficher la parcelle dans les résultats de recherche"/>
- <combo_box name="land category with adult">
- <combo_box.item label="Toutes catégories" name="item0"/>
- <combo_box.item label="Appartenant aux Lindens" name="item1"/>
- <combo_box.item label="Adult" name="item2"/>
- <combo_box.item label="Art et Culture" name="item3"/>
- <combo_box.item label="Affaires" name="item4"/>
- <combo_box.item label="Éducation" name="item5"/>
- <combo_box.item label="Jeux" name="item6"/>
- <combo_box.item label="Favoris" name="item7"/>
- <combo_box.item label="Accueil pour les nouveaux" name="item8"/>
- <combo_box.item label="Parcs et Nature" name="item9"/>
- <combo_box.item label="Résidentiel" name="item10"/>
- <combo_box.item label="Shopping" name="item11"/>
- <combo_box.item label="Location" name="item13"/>
- <combo_box.item label="Autre" name="item12"/>
- </combo_box>
<combo_box name="land category">
<combo_box.item label="Toutes catégories" name="item0"/>
<combo_box.item label="Appartenant aux Lindens" name="item1"/>
@@ -456,15 +437,9 @@ musique :
<panel.string name="access_estate_defined">
(défini par le domaine
</panel.string>
- <panel.string name="allow_public_access">
- Autoriser l&apos;accès public ([MATURITY]) (Remarque : des lignes d&apos;interdiction seront créées si cette case n&apos;est pas cochée)
- </panel.string>
<panel.string name="estate_override">
Au moins une de ces options est définie au niveau du domaine.
</panel.string>
- <text name="Limit access to this parcel to:">
- Accès à cette parcelle
- </text>
<check_box label="Autoriser l&apos;accès public (des lignes d&apos;interdiction seront créées si cette case n&apos;est pas cochée)" name="public_access"/>
<text name="Only Allow">
Conditions d&apos;accès des résidents :
@@ -496,5 +471,6 @@ musique :
<button label="Supprimer" label_selected="Supprimer" name="remove_banned"/>
</panel>
</panel>
+ <panel label="EXPÉRIENCES" name="land_experiences_panel"/>
</tab_container>
</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_associate_listing.xml b/indra/newview/skins/default/xui/fr/floater_associate_listing.xml
new file mode 100644
index 0000000000..3c61cfe4ca
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/floater_associate_listing.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="associate listing" title="ASSOCIER L&apos;ANNONCE">
+ <text name="message">ID d&apos;annonce :</text>
+ <line_editor name="listing_id">Saisir l&apos;ID ici</line_editor>
+ <button label="OK" name="OK"/>
+ <button label="Annuler" name="Cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_edit_hover_height.xml b/indra/newview/skins/default/xui/fr/floater_edit_hover_height.xml
new file mode 100644
index 0000000000..28e7e87193
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/floater_edit_hover_height.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="HoverHeight" title="DÉFINIR LA HAUTEUR DE SUSTENTATION">
+ <slider label="Hauteur" name="HoverHeightSlider"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_experience_search.xml b/indra/newview/skins/default/xui/fr/floater_experience_search.xml
new file mode 100644
index 0000000000..b7a175a066
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/floater_experience_search.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="experiencepicker" title="CHOISIR UNE EXPÉRIENCE"/>
diff --git a/indra/newview/skins/default/xui/fr/floater_experienceprofile.xml b/indra/newview/skins/default/xui/fr/floater_experienceprofile.xml
new file mode 100644
index 0000000000..080c6e4dde
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/floater_experienceprofile.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater title="EXPERIENCE PROFILE">
+ <floater.string name="empty_slurl">
+ (aucun)
+ </floater.string>
+ <floater.string name="maturity_icon_general">
+ &quot;Parcel_PG_Light&quot;
+ </floater.string>
+ <floater.string name="maturity_icon_moderate">
+ &quot;Parcel_M_Light&quot;
+ </floater.string>
+ <floater.string name="maturity_icon_adult">
+ &quot;Parcel_R_Light&quot;
+ </floater.string>
+ <text name="edit_title" value="Profil de l&apos;expérience"/>
+ <tab_container name="tab_container">
+ <panel name="panel_experience_info">
+ <scroll_container name="xp_scroll">
+ <panel name="scrolling_panel">
+ <layout_stack>
+ <layout_panel name="top panel">
+ <button label="Modifier" name="edit_btn"/>
+ </layout_panel>
+ <layout_panel name="maturity panel">
+ <text name="ContentRating">
+ Catégorie :
+ </text>
+ </layout_panel>
+ <layout_panel name="location panel">
+ <text name="Location">
+ Endroit :
+ </text>
+ </layout_panel>
+ <layout_panel>
+ <text name="Owner">
+ Propriétaire :
+ </text>
+ </layout_panel>
+ <layout_panel name="group_panel">
+ <text name="Group">
+ Groupe :
+ </text>
+ </layout_panel>
+ <layout_panel name="perm panel">
+ <button label="Autoriser" name="allow_btn"/>
+ <button label="Oublier" name="forget_btn"/>
+ <button label="Bloquer" name="block_btn"/>
+ <text name="privileged">
+ Cette expérience est activée pour tous les résidents.
+ </text>
+ <button label="Signaler une infraction" name="report_btn"/>
+ </layout_panel>
+ </layout_stack>
+ </panel>
+ </scroll_container>
+ </panel>
+ <panel name="edit_panel_experience_info">
+ <scroll_container name="edit_xp_scroll">
+ <panel name="edit_scrolling_panel">
+ <text name="edit_experience_title_label" value="Nom :"/>
+ <text name="edit_experience_desc_label" value="Description :"/>
+ <button label="Groupe" name="Group_btn"/>
+ <text name="edit_ContentRating">
+ Catégorie :
+ </text>
+ <icons_combo_box label="Modéré" name="edit_ContentRatingText" tool_tip="Si vous augmentez la catégorie de contenu pour une expérience, les permissions seront réinitialisées pour tous les résidents ayant autorisé l&apos;expérience.">
+ <icons_combo_box.item label="Adulte" name="Adult" value="42"/>
+ <icons_combo_box.item label="Modéré" name="Mature" value="21"/>
+ <icons_combo_box.item label="Général" name="PG" value="13"/>
+ </icons_combo_box>
+ <text name="edit_Location">
+ Endroit :
+ </text>
+ <button label="Définir sur l&apos;emplacement actuel" name="location_btn"/>
+ <button label="Effacer l&apos;emplacement" name="clear_btn"/>
+ <check_box label="Activer l&apos;expérience" name="edit_enable_btn" tool_tip=""/>
+ <check_box label="Cacher dans les résultats de recherche" name="edit_private_btn"/>
+ <text name="changes" value="Il peut falloir plusieurs minutes pour que l&apos;expérience soit visible dans toutes les régions."/>
+ <button label="Retour" name="cancel_btn"/>
+ <button label="Enregistrer" name="save_btn"/>
+ </panel>
+ </scroll_container>
+ </panel>
+ </tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_experiences.xml b/indra/newview/skins/default/xui/fr/floater_experiences.xml
new file mode 100644
index 0000000000..d130129a25
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/floater_experiences.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_experiences" title="EXPÉRIENCES"/>
diff --git a/indra/newview/skins/default/xui/fr/floater_facebook.xml b/indra/newview/skins/default/xui/fr/floater_facebook.xml
index 12a3c9ae61..f5097e7a88 100644
--- a/indra/newview/skins/default/xui/fr/floater_facebook.xml
+++ b/indra/newview/skins/default/xui/fr/floater_facebook.xml
@@ -1,20 +1,15 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="floater_facebook" title="PUBLIER SUR FACEBOOK">
- <panel name="background">
- <tab_container name="tabs">
- <panel label="STATUT" name="panel_facebook_status"/>
- <panel label="PHOTO" name="panel_facebook_photo"/>
- <panel label="INDIQUER VOTRE PRÉSENCE" name="panel_facebook_place"/>
- <panel label="AMIS" name="panel_facebook_friends"/>
- <panel label="COMPTE" name="panel_facebook_account"/>
- </tab_container>
- <panel name="connection_status_panel">
- <text name="connection_error_text">
- Erreur
- </text>
- <text name="connection_loading_text">
- Chargement...
- </text>
- </panel>
- </panel>
+ <tab_container name="tabs">
+ <panel label="STATUT" name="panel_facebook_status"/>
+ <panel label="PHOTO" name="panel_facebook_photo"/>
+ <panel label="INDIQUER VOTRE PRÉSENCE" name="panel_facebook_place"/>
+ <panel label="AMIS" name="panel_facebook_friends"/>
+ </tab_container>
+ <text name="connection_error_text">
+ Erreur
+ </text>
+ <text name="connection_loading_text">
+ Chargement...
+ </text>
</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/fr/floater_inventory_item_properties.xml
index f2eb3cb6bc..1d4e7c818f 100755
--- a/indra/newview/skins/default/xui/fr/floater_inventory_item_properties.xml
+++ b/indra/newview/skins/default/xui/fr/floater_inventory_item_properties.xml
@@ -1,67 +1,36 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="item properties" title="PROPRIÉTÉS DES ARTICLES DE L&apos;INVENTAIRE">
- <floater.string name="unknown">
- (inconnu)
- </floater.string>
- <floater.string name="public">
- (public)
- </floater.string>
- <floater.string name="you_can">
- Vous pouvez :
- </floater.string>
- <floater.string name="owner_can">
- Le propriétaire peut :
- </floater.string>
- <floater.string name="acquiredDate">
- [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]
- </floater.string>
- <text name="LabelItemNameTitle">
- Nom :
- </text>
- <text name="LabelItemDescTitle">
- Description :
- </text>
- <text name="LabelCreatorTitle">
- Créateur :
- </text>
+ <floater.string name="unknown">(inconnu)</floater.string>
+ <floater.string name="public">(public)</floater.string>
+ <floater.string name="you_can">Vous pouvez :</floater.string>
+ <floater.string name="owner_can">Le propriétaire peut :</floater.string>
+ <floater.string name="acquiredDate">[wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]</floater.string>
+ <text name="LabelItemNameTitle">Nom :</text>
+ <text name="LabelItemDescTitle">Description :</text>
+ <text name="LabelCreatorTitle">Créateur :</text>
<button label="Profil..." label_selected="" name="BtnCreator"/>
- <text name="LabelOwnerTitle">
- Propriétaire :
- </text>
+ <text name="LabelOwnerTitle">Propriétaire :</text>
<button label="Profil..." label_selected="" name="BtnOwner"/>
- <text name="LabelAcquiredTitle">
- Acquis :
- </text>
- <text name="LabelAcquiredDate">
- Wed May 24 12:50:46 2006
- </text>
- <text name="OwnerLabel">
- Vous :
- </text>
+ <text name="LabelAcquiredTitle">Acquis :</text>
+ <text name="LabelAcquiredDate">Wed May 24 12:50:46 2006</text>
+ <text name="OwnerLabel">Vous :</text>
<check_box label="Modifier" name="CheckOwnerModify"/>
<check_box label="Copier" name="CheckOwnerCopy"/>
<check_box label="Revendre" name="CheckOwnerTransfer"/>
- <text name="AnyoneLabel" width="80">
- N&apos;importe qui :
- </text>
+ <text name="AnyoneLabel" width="80">N&apos;importe qui :</text>
<check_box label="Copier" name="CheckEveryoneCopy"/>
- <text name="GroupLabel" width="80">
- Groupe :
- </text>
+ <text name="GroupLabel" width="80">Groupe :</text>
<check_box label="Partager" name="CheckShareWithGroup"/>
- <text name="NextOwnerLabel" width="192">
- Le prochain propriétaire :
- </text>
+ <text name="NextOwnerLabel" width="192">Le prochain propriétaire :</text>
<check_box label="Modifier" name="CheckNextOwnerModify"/>
<check_box label="Copier" name="CheckNextOwnerCopy"/>
<check_box label="Revendre" name="CheckNextOwnerTransfer"/>
<check_box label="À vendre" name="CheckPurchase"/>
- <combo_box name="combobox sale copy">
+ <combo_box name="ComboBoxSaleType">
<combo_box.item label="Copier" name="Copy"/>
+ <combo_box.item label="Contenu" name="Contents"/>
<combo_box.item label="Original" name="Original"/>
</combo_box>
<spinner label="Prix :" name="Edit Cost"/>
- <text name="CurrencySymbol">
- L$
- </text>
+ <text name="CurrencySymbol">L$</text>
</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/fr/floater_inventory_view_finder.xml
index 7567817f3a..fdc4000746 100755
--- a/indra/newview/skins/default/xui/fr/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/fr/floater_inventory_view_finder.xml
@@ -5,8 +5,8 @@
<check_box label="Habits" name="check_clothing"/>
<check_box label="Gestes" name="check_gesture"/>
<check_box label="Repères" name="check_landmark"/>
- <check_box label="Maillages" name="check_mesh"/>
<check_box label="Notes" name="check_notecard"/>
+ <check_box label="Maillages" name="check_mesh"/>
<check_box label="Objets" name="check_object"/>
<check_box label="Scripts" name="check_script"/>
<check_box label="Sons" name="check_sound"/>
@@ -19,6 +19,10 @@
<text name="- OR -">
Ou il y a...
</text>
+ <radio_group name="date_search_direction">
+ <radio_item label="Ultérieure à" name="newer"/>
+ <radio_item label="Antérieure à" name="older"/>
+ </radio_group>
<spinner label="Heures" name="spin_hours_ago"/>
<spinner label="Jours" name="spin_days_ago"/>
<button label="Fermer" label_selected="Fermer" name="Close"/>
diff --git a/indra/newview/skins/default/xui/fr/floater_item_properties.xml b/indra/newview/skins/default/xui/fr/floater_item_properties.xml
new file mode 100644
index 0000000000..5301e759ee
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/floater_item_properties.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Item Properties" title="PROPRIÉTÉS DE L&apos;ARTICLE"/>
diff --git a/indra/newview/skins/default/xui/fr/floater_lagmeter.xml b/indra/newview/skins/default/xui/fr/floater_lagmeter.xml
index 39a861d8bd..c93ca5aacb 100644
--- a/indra/newview/skins/default/xui/fr/floater_lagmeter.xml
+++ b/indra/newview/skins/default/xui/fr/floater_lagmeter.xml
@@ -25,7 +25,7 @@
Normal, fenêtre en arrière-plan
</floater.string>
<floater.string name="client_frame_time_critical_msg">
- Taux de défilement [CLIENT_FRAME_RATE_CRITICAL]
+ Taux de défilement client ci-dessous [CLIENT_FRAME_RATE_CRITICAL]
</floater.string>
<floater.string name="client_frame_time_warning_msg">
Taux de défilement entre [CLIENT_FRAME_RATE_CRITICAL] et [CLIENT_FRAME_RATE_WARNING]
@@ -34,16 +34,16 @@
Normal
</floater.string>
<floater.string name="client_draw_distance_cause_msg">
- Cause possible : limite d&apos;affichage trop élevée
+ Cause possible : la limite d&apos;affichage est trop élevée
</floater.string>
<floater.string name="client_texture_loading_cause_msg">
- Cause possible : images en cours de chargement
+ Cause possible : images en cours de chargement
</floater.string>
<floater.string name="client_texture_memory_cause_msg">
- Cause possible : trop d&apos;images en mémoire
+ Cause possible : trop d&apos;images en mémoire
</floater.string>
<floater.string name="client_complex_objects_cause_msg">
- Cause possible : trop d&apos;objets complexes
+ Cause possible : trop d&apos;objets complexes dans la scène
</floater.string>
<floater.string name="network_text_msg">
Réseau
@@ -55,10 +55,10 @@
5
</floater.string>
<floater.string name="network_packet_loss_critical_msg">
- La connexion perd plus de [NETWORK_PACKET_LOSS_CRITICAL] % de paquets
+ La connexion perd plus de [NETWORK_PACKET_LOSS_CRITICAL] % de paquets
</floater.string>
<floater.string name="network_packet_loss_warning_msg">
- La connexion perd entre [NETWORK_PACKET_LOSS_WARNING] % et [NETWORK_PACKET_LOSS_CRITICAL] % de paquets
+ La connexion perd entre [NETWORK_PACKET_LOSS_WARNING] % et [NETWORK_PACKET_LOSS_CRITICAL] % de paquets
</floater.string>
<floater.string name="network_performance_normal_msg">
Normal
@@ -70,7 +70,7 @@
300
</floater.string>
<floater.string name="network_ping_critical_msg">
- Connexion ping > [NETWORK_PING_CRITICAL] ms
+ Temps de connexion ping &gt;[NETWORK_PING_CRITICAL] ms
</floater.string>
<floater.string name="network_ping_warning_msg">
Connexion ping entre [NETWORK_PING_WARNING] et [NETWORK_PING_CRITICAL] ms
@@ -94,31 +94,31 @@
20
</floater.string>
<floater.string name="server_frame_time_critical_msg">
- Défilement du simulateur &lt; [SERVER_FRAME_RATE_CRITICAL]
+ Taux de défilement du simulateur au-dessous de [SERVER_FRAME_RATE_CRITICAL]
</floater.string>
<floater.string name="server_frame_time_warning_msg">
- Défilement simulateur entre [SERVER_FRAME_RATE_CRITICAL] et [SERVER_FRAME_RATE_WARNING]
+ Taux de défilement du simulateur entre [SERVER_FRAME_RATE_CRITICAL] et [SERVER_FRAME_RATE_WARNING]
</floater.string>
<floater.string name="server_frame_time_normal_msg">
Normal
</floater.string>
<floater.string name="server_physics_cause_msg">
- Cause possible : trop d&apos;objets physiques
+ Cause possible : trop d&apos;objets physiques
</floater.string>
<floater.string name="server_scripts_cause_msg">
- Cause possible : trop d&apos;objets scriptés
+ Cause possible : trop d&apos;objets scriptés
</floater.string>
<floater.string name="server_net_cause_msg">
- Cause possible : trop de trafic réseau
+ Cause possible : trop de trafic réseau
</floater.string>
<floater.string name="server_agent_cause_msg">
- Cause possible : trop de personnes en mouvement
+ Cause possible : trop de personnes en mouvement dans la région
</floater.string>
<floater.string name="server_images_cause_msg">
- Cause possible : trop de calculs d&apos;images
+ Cause possible : trop de calculs d&apos;images
</floater.string>
<floater.string name="server_generic_cause_msg">
- Cause possible : charge simulateur trop lourde
+ Cause possible : charge simulateur trop lourde
</floater.string>
<floater.string name="smaller_label">
&gt;&gt;
@@ -126,21 +126,21 @@
<floater.string name="bigger_label">
&lt;&lt;
</floater.string>
- <button name="client_lagmeter" tool_tip="Statut du lag client"/>
+ <button name="client_lagmeter" tool_tip="Statut du lag au niveau du client"/>
<text name="client">
Client
</text>
<text name="client_text">
Normal
</text>
- <button name="network_lagmeter" tool_tip="Statut du lag réseau"/>
+ <button name="network_lagmeter" tool_tip="Statut du lag au niveau du réseau"/>
<text name="network">
Réseau
</text>
<text name="network_text">
Normal
</text>
- <button name="server_lagmeter" tool_tip="Statut du lag serveur"/>
+ <button name="server_lagmeter" tool_tip="Statut du lag au niveau du serveur"/>
<text name="server">
Serveur
</text>
diff --git a/indra/newview/skins/default/xui/fr/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/fr/floater_live_lsleditor.xml
index 7647452e91..d69c311a8e 100755
--- a/indra/newview/skins/default/xui/fr/floater_live_lsleditor.xml
+++ b/indra/newview/skins/default/xui/fr/floater_live_lsleditor.xml
@@ -9,7 +9,24 @@
<floater.string name="Title">
SCRIPT : [NAME]
</floater.string>
+ <floater.string name="experience_enabled">
+ Supprimer la coche pour supprimer l&apos;expérience actuelle
+ </floater.string>
+ <floater.string name="no_experiences">
+ Vous n&apos;êtes autorisé(e) pour aucune expérience.
+ </floater.string>
+ <floater.string name="add_experiences">
+ Sélectionner pour ajouter une expérience
+ </floater.string>
+ <floater.string name="show_experience_profile">
+ Cliquer pour afficher le profil de l&apos;expérience
+ </floater.string>
+ <floater.string name="loading">
+ Chargement...
+ </floater.string>
<button label="Réinitialiser" label_selected="Réinitialiser" name="Reset"/>
<check_box initial_value="true" label="Exécution en cours" name="running"/>
<check_box initial_value="true" label="Mono" name="mono"/>
+ <check_box label="Utiliser la ou les expériences :" name="enable_xp"/>
+ <button label="&gt;" name="view_profile"/>
</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_marketplace_listings.xml b/indra/newview/skins/default/xui/fr/floater_marketplace_listings.xml
new file mode 100644
index 0000000000..8488d17d00
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/floater_marketplace_listings.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_marketplace_listings" title="ANNONCES DE LA PLACE DU MARCHÉ">
+ <panel name="marketplace_listings_panel">
+ <panel>
+ <panel name="marketplace_listings_inventory_placeholder_panel">
+ <text name="marketplace_listings_inventory_placeholder_title">Chargement…</text>
+ </panel>
+ </panel>
+ </panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_marketplace_validation.xml b/indra/newview/skins/default/xui/fr/floater_marketplace_validation.xml
new file mode 100644
index 0000000000..01527800ac
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/floater_marketplace_validation.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_marketplace_validation" title="Auditer les annonces de la Place du marché">
+ <button label="OK" label_selected="OK" name="OK"/>
+ <text_editor name="validation_text">MARKETPLACE_VALIDATION_TEXT</text_editor>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_openobject.xml b/indra/newview/skins/default/xui/fr/floater_openobject.xml
index 4e046ff3f3..54edf92379 100755
--- a/indra/newview/skins/default/xui/fr/floater_openobject.xml
+++ b/indra/newview/skins/default/xui/fr/floater_openobject.xml
@@ -3,6 +3,11 @@
<text name="object_name">
[DESC]:
</text>
- <button label="Copier vers l&apos;inventaire" label_selected="Copier vers l&apos;inventaire" name="copy_to_inventory_button" width="132"/>
- <button label="Copier et porter" label_selected="Copier et porter" left="152" name="copy_and_wear_button"/>
+ <text name="border_note">
+ Copier dans l&apos;inventaire et porter
+ </text>
+ <button label="Ajouter à la tenue" label_selected="Ajouter à la tenue" left="152" name="copy_and_wear_button"/>
+ <button label="Remplacer la tenue" label_selected="Remplacer la tenue" name="copy_and_replace_button"/>
+ <button label="Copier uniquement dans l&apos;inventaire" label_selected="Copier uniquement dans l&apos;inventaire" name="copy_to_inventory_button" width="132"/>
+ <button label="Annuler" label_selected="Annuler" name="cancel_button"/>
</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_pay.xml b/indra/newview/skins/default/xui/fr/floater_pay.xml
index 397436876d..bbd20e868c 100755
--- a/indra/newview/skins/default/xui/fr/floater_pay.xml
+++ b/indra/newview/skins/default/xui/fr/floater_pay.xml
@@ -1,26 +1,18 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="Give Money" title="">
- <string name="payee_group">
- Payer le groupe
- </string>
- <string name="payee_resident">
- Payer le résident
- </string>
- <text left="5" name="payee_label">
- Payer :
- </text>
- <icon name="icon_person" tool_tip="Résident"/>
- <text name="payee_name">
- Test Name That Is Extremely Long To Check Clipping
- </text>
- <button label="1 L$" label_selected="1 L$" name="fastpay 1"/>
- <button label="5 L$" label_selected="5 L$" name="fastpay 5"/>
- <button label="10 L$" label_selected="10 L$" name="fastpay 10"/>
- <button label="20 L$" label_selected="20 L$" name="fastpay 20"/>
- <text left="4" name="amount text">
- Ou choisir un montant :
- </text>
- <line_editor left="60" name="amount" width="55"/>
- <button label="Payer" label_selected="Payer" name="pay btn"/>
- <button label="Annuler" label_selected="Annuler" name="cancel btn"/>
+ <string name="payee_group">Payer le groupe</string>
+ <string name="payee_resident">Payer le résident</string>
+ <text name="paying_text">Vous payez :</text>
+ <text name="payee_name">Test Name That Is Extremely Long To Check Clipping</text>
+ <panel label="Rechercher" name="PatternsPanel">
+ <button label="Payer 1 L$" label_selected="Payer 1 L$" name="fastpay 1"/>
+ <button label="Payer 5 L$" label_selected="Payer 5 L$" name="fastpay 5"/>
+ <button label="Payer 10 L$" label_selected="Payer 10 L$" name="fastpay 10"/>
+ <button label="Payer 20 L$" label_selected="Payer 20 L$" name="fastpay 20"/>
+ </panel>
+ <panel label="Rechercher" name="InputPanel">
+ <text name="amount text">Autre montant :</text>
+ <button label="Payer" label_selected="Payer" name="pay btn"/>
+ <button label="Annuler" label_selected="Annuler" name="cancel btn"/>
+ </panel>
</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_pay_object.xml b/indra/newview/skins/default/xui/fr/floater_pay_object.xml
index 966fa3b8a6..c98d2f7c0c 100755
--- a/indra/newview/skins/default/xui/fr/floater_pay_object.xml
+++ b/indra/newview/skins/default/xui/fr/floater_pay_object.xml
@@ -1,30 +1,21 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="Give Money" title="">
- <string name="payee_group" width="95">
- Payer le groupe
- </string>
- <string halign="left" name="payee_resident" width="100">
- Payer le résident
- </string>
- <icon name="icon_person" tool_tip="Résident"/>
- <text left="105" name="payee_name">
- Ericacita Moostopolison
- </text>
- <text left="25" name="object_name_label">
- Via un objet :
- </text>
+ <string name="payee_group" width="95">Payer le groupe</string>
+ <string halign="left" name="payee_resident" width="100">Payer le résident</string>
+ <text name="paying_text">Vous payez :</text>
+ <text left="105" name="payee_name">Ericacita Moostopolison</text>
+ <text left="25" name="object_name_label">Via un objet :</text>
<icon name="icon_object" tool_tip="Objets"/>
- <text left="105" name="object_name_text">
- ...
- </text>
- <button label="1 L$" label_selected="1 L$" name="fastpay 1"/>
- <button label="5 L$" label_selected="5 L$" name="fastpay 5"/>
- <button label="10 L$" label_selected="10 L$" name="fastpay 10"/>
- <button label="20 L$" label_selected="20 L$" name="fastpay 20"/>
- <text halign="left" left="5" name="amount text">
- Ou choisir un montant :
- </text>
- <line_editor left="65" name="amount" width="50"/>
- <button label="Payer" label_selected="Payer" name="pay btn"/>
- <button label="Annuler" label_selected="Annuler" name="cancel btn"/>
+ <text left="105" name="object_name_text">...</text>
+ <panel label="Rechercher" name="PatternsPanel">
+ <button label="Payer 1 L$" label_selected="Payer 1 L$" name="fastpay 1"/>
+ <button label="Payer 5 L$" label_selected="Payer 5 L$" name="fastpay 5"/>
+ <button label="Payer 10 L$" label_selected="Payer 10 L$" name="fastpay 10"/>
+ <button label="Payer 20 L$" label_selected="Payer 20 L$" name="fastpay 20"/>
+ </panel>
+ <panel label="Rechercher" name="InputPanel">
+ <text name="amount text">Autre montant :</text>
+ <button label="Payer" label_selected="Payer" name="pay btn"/>
+ <button label="Annuler" label_selected="Annuler" name="cancel btn"/>
+ </panel>
</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_report_abuse.xml b/indra/newview/skins/default/xui/fr/floater_report_abuse.xml
index 153be444e5..638f0d68ff 100755
--- a/indra/newview/skins/default/xui/fr/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/fr/floater_report_abuse.xml
@@ -76,7 +76,7 @@
<combo_box.item label="Terrain &gt; Empiètement &gt; Objets ou textures" name="Land__Encroachment__Objects_textures"/>
<combo_box.item label="Terrain &gt; Empiètement &gt; Particules" name="Land__Encroachment__Particles"/>
<combo_box.item label="Terrain &gt; Empiètement &gt; Arbres/plantes" name="Land__Encroachment__Trees_plants"/>
- <combo_box.item label="Paris ou jeux d&apos;argent" name="Wagering_gambling"/>
+ <combo_box.item label="Violation du règlement pour les jeux" name="Wagering_gambling"/>
<combo_box.item label="Autre" name="Other"/>
</combo_box>
<text name="abuser_name_title">
diff --git a/indra/newview/skins/default/xui/fr/floater_snapshot.xml b/indra/newview/skins/default/xui/fr/floater_snapshot.xml
index ab2256e356..8eb05dd945 100755
--- a/indra/newview/skins/default/xui/fr/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/fr/floater_snapshot.xml
@@ -39,17 +39,8 @@
<string name="local_failed_str">
Échec d&apos;enregistrement sur l&apos;ordinateur.
</string>
- <button name="advanced_options_btn" tool_tip="Options avancées"/>
- <text name="image_res_text">
- [WIDTH] x [HEIGHT] px
- </text>
- <text name="file_size_label">
- [SIZE] Ko
- </text>
+ <button label="ACTUALISER" name="new_snapshot_btn"/>
<panel name="advanced_options_panel">
- <text name="advanced_options_label">
- OPTIONS AVANCÉES
- </text>
<text name="layer_type_label">
Capturer :
</text>
@@ -68,4 +59,10 @@
<combo_box.item label="Aucun filtre" name="NoFilter"/>
</combo_box>
</panel>
+ <text name="image_res_text">
+ [WIDTH] px (largeur) x [HEIGHT] px (hauteur)
+ </text>
+ <text name="file_size_label">
+ [SIZE] Ko
+ </text>
</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_top_objects.xml b/indra/newview/skins/default/xui/fr/floater_top_objects.xml
index eb084d9184..2c411933a8 100755
--- a/indra/newview/skins/default/xui/fr/floater_top_objects.xml
+++ b/indra/newview/skins/default/xui/fr/floater_top_objects.xml
@@ -21,6 +21,12 @@
<floater.string name="none_descriptor">
Aucun résultat.
</floater.string>
+ <floater.string name="URLs">
+ URL
+ </floater.string>
+ <floater.string name="memory">
+ Mémoire (Ko)
+ </floater.string>
<text name="title_text">
Chargement...
</text>
@@ -30,7 +36,7 @@
<scroll_list.columns label="Propriétaire" name="owner"/>
<scroll_list.columns label="Lieu" name="location"/>
<scroll_list.columns label="Parcelle" name="parcel"/>
- <scroll_list.columns label="Temps" name="time"/>
+ <scroll_list.columns label="Date" name="time"/>
<scroll_list.columns label="URL" name="URLs"/>
<scroll_list.columns label="Mémoire (Ko)" name="memory"/>
</scroll_list>
diff --git a/indra/newview/skins/default/xui/fr/floater_twitter.xml b/indra/newview/skins/default/xui/fr/floater_twitter.xml
index 9ca2b0d48d..608b02dced 100644
--- a/indra/newview/skins/default/xui/fr/floater_twitter.xml
+++ b/indra/newview/skins/default/xui/fr/floater_twitter.xml
@@ -1,17 +1,13 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="floater_twitter" title="TWITTER">
- <panel name="background">
- <tab_container name="tabs">
- <panel label="COMPOSER" name="panel_twitter_photo"/>
- <panel label="COMPTE" name="panel_twitter_account"/>
- </tab_container>
- <panel name="connection_status_panel">
- <text name="connection_error_text">
- Erreur
- </text>
- <text name="connection_loading_text">
- Chargement...
- </text>
- </panel>
- </panel>
+ <tab_container name="tabs">
+ <panel label="COMPOSER" name="panel_twitter_photo"/>
+ <panel label="COMPTE" name="panel_twitter_account"/>
+ </tab_container>
+ <text name="connection_error_text">
+ Erreur
+ </text>
+ <text name="connection_loading_text">
+ Chargement...
+ </text>
</floater>
diff --git a/indra/newview/skins/default/xui/fr/menu_attachment_self.xml b/indra/newview/skins/default/xui/fr/menu_attachment_self.xml
index f2e7928c24..1ccba08099 100755
--- a/indra/newview/skins/default/xui/fr/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/fr/menu_attachment_self.xml
@@ -8,6 +8,7 @@
<menu_item_call label="Mon apparence" name="Change Outfit"/>
<menu_item_call label="Modifier ma tenue" name="Edit Outfit"/>
<menu_item_call label="Modifier ma silhouette" name="Edit My Shape"/>
+ <menu_item_call label="Hauteur de sustentation" name="Hover Height"/>
<menu_item_call label="Mes amis" name="Friends..."/>
<menu_item_call label="Mes groupes" name="Groups..."/>
<menu_item_call label="Mon profil" name="Profile..."/>
diff --git a/indra/newview/skins/default/xui/fr/menu_avatar_self.xml b/indra/newview/skins/default/xui/fr/menu_avatar_self.xml
index 4815ad0676..1c768a078c 100755
--- a/indra/newview/skins/default/xui/fr/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/fr/menu_avatar_self.xml
@@ -25,6 +25,7 @@
<menu_item_call label="Mon apparence" name="Chenge Outfit"/>
<menu_item_call label="Modifier ma tenue" name="Edit Outfit"/>
<menu_item_call label="Modifier ma silhouette" name="Edit My Shape"/>
+ <menu_item_call label="Hauteur de sustentation" name="Hover Height"/>
<menu_item_call label="Mes amis" name="Friends..."/>
<menu_item_call label="Mes groupes" name="Groups..."/>
<menu_item_call label="Mon profil" name="Profile..."/>
diff --git a/indra/newview/skins/default/xui/fr/menu_inventory.xml b/indra/newview/skins/default/xui/fr/menu_inventory.xml
index 87b11bdaa5..c0808f1139 100755
--- a/indra/newview/skins/default/xui/fr/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/fr/menu_inventory.xml
@@ -1,5 +1,14 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<menu name="Popup">
+ <menu_item_call label="Créer une annonce" name="Marketplace Create Listing"/>
+ <menu_item_call label="Associer l&apos;annonce" name="Marketplace Associate Listing"/>
+ <menu_item_call label="Obtenir (actualiser) l&apos;annonce" name="Marketplace Get Listing"/>
+ <menu_item_call label="Consultez les erreurs" name="Marketplace Check Listing"/>
+ <menu_item_call label="Modifier l&apos;annonce" name="Marketplace Edit Listing"/>
+ <menu_item_call label="Publier" name="Marketplace List"/>
+ <menu_item_call label="Ne plus publier" name="Marketplace Unlist"/>
+ <menu_item_call label="Activer" name="Marketplace Activate"/>
+ <menu_item_call label="Désactiver" name="Marketplace Deactivate"/>
<menu_item_call label="Partager" name="Share"/>
<menu_item_call label="Acheter" name="Task Buy"/>
<menu_item_call label="Ouvrir" name="Task Open"/>
@@ -87,6 +96,7 @@
<menu_item_call label="Ajouter" name="Wearable Add"/>
<menu_item_call label="Enlever" name="Take Off"/>
<menu_item_call label="Copier vers la boîte d&apos;envoi vendeur" name="Merchant Copy"/>
- <menu_item_call label="Envoyer vers la Place du marché" name="Marketplace Send"/>
+ <menu_item_call label="Copier dans les annonces Place du marché" name="Marketplace Copy"/>
+ <menu_item_call label="Déplacer dans les annonces Place du marché" name="Marketplace Move"/>
<menu_item_call label="--aucune option--" name="--no options--"/>
</menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/fr/menu_inventory_gear_default.xml
index 364872c875..c21caae0b2 100755
--- a/indra/newview/skins/default/xui/fr/menu_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/fr/menu_inventory_gear_default.xml
@@ -5,7 +5,7 @@
<menu_item_check label="Trier en commençant par le plus récent" name="sort_by_recent"/>
<menu_item_check label="Toujours trier les dossiers par nom" name="sort_folders_by_name"/>
<menu_item_check label="Dossiers système en premier" name="sort_system_folders_to_top"/>
- <menu_item_call label="Afficher les filtres" name="show_filters"/>
+ <menu_item_call label="Afficher les filtres..." name="show_filters"/>
<menu_item_call label="Réinitialiser les filtres" name="reset_filters"/>
<menu_item_call label="Fermer tous les dossiers" name="close_folders"/>
<menu_item_call label="Vider les objets trouvés" name="empty_lostnfound"/>
diff --git a/indra/newview/skins/default/xui/fr/menu_marketplace_view.xml b/indra/newview/skins/default/xui/fr/menu_marketplace_view.xml
new file mode 100644
index 0000000000..a63e2082b7
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_marketplace_view.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_marketplace_sort">
+ <menu_item_check label="Trier par volume de stock (de bas à élevé)" name="sort_by_stock_amount"/>
+ <menu_item_check label="Afficher uniquement les dossiers d&apos;annonces" name="show_only_listing_folders"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_url_experience.xml b/indra/newview/skins/default/xui/fr/menu_url_experience.xml
new file mode 100644
index 0000000000..90c0ce6765
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_url_experience.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Url Popup">
+ <menu_item_call label="Copier la SLurl dans le presse-papier" name="url_copy"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_viewer.xml b/indra/newview/skins/default/xui/fr/menu_viewer.xml
index 2c30fe07b4..33b2ba6982 100755
--- a/indra/newview/skins/default/xui/fr/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/fr/menu_viewer.xml
@@ -8,6 +8,7 @@
<menu_item_call label="Nouvelle fenêtre d&apos;inventaire" name="NewInventoryWindow"/>
<menu_item_call label="Endroits..." name="Places"/>
<menu_item_call label="Favoris..." name="Picks"/>
+ <menu_item_call label="Expériences..." name="Experiences"/>
<menu_item_call label="Contrôles de la caméra..." name="Camera Controls"/>
<menu label="Déplacement" name="Movement">
<menu_item_call label="M&apos;asseoir" name="Sit Down Here"/>
@@ -22,6 +23,7 @@
</menu>
<menu_item_call label="Acheter des L$..." name="Buy and Sell L$"/>
<menu_item_call label="Boîte d&apos;envoi vendeur..." name="MerchantOutbox"/>
+ <menu_item_call label="Annonces de Place du marché..." name="MarketplaceListings"/>
<menu_item_call label="Page d&apos;accueil du compte..." name="Manage My Account">
<menu_item_call.on_click name="ManageMyAccount_url" parameter="WebLaunchJoinNow,http://secondlife.com/account/index.php?lang=fr"/>
</menu_item_call>
@@ -48,7 +50,7 @@
<menu_item_check label="Amis" name="My Friends"/>
<menu_item_check label="Groupes" name="My Groups"/>
<menu_item_check label="Personnes près de vous" name="Active Speakers"/>
- <menu_item_call label="Liste des ignorés" name="Block List"/>
+ <menu_item_check label="Liste des ignorés" name="Block List"/>
<menu_item_check label="Ne pas déranger" name="Do Not Disturb"/>
</menu>
<menu label="Monde" name="World">
@@ -250,6 +252,7 @@
<menu_item_check label="Console de textures" name="Texture Console"/>
<menu_item_check label="Console de débogage" name="Debug Console"/>
<menu_item_call label="Console de notifications" name="Notifications"/>
+ <menu_item_check label="Console de débogage de région" name="Region Debug Console"/>
<menu_item_check label="Chronos" name="Fast Timers"/>
<menu_item_check label="Mémoire" name="Memory"/>
<menu_item_check label="Statistiques de la scène" name="Scene Statistics"/>
@@ -353,7 +356,7 @@
<menu_item_check label="Interpolation ping des positions des objets" name="Ping Interpolate Object Positions"/>
<menu_item_call label="Abandonner un paquet" name="Drop a Packet"/>
</menu>
- <menu_item_call label="Dump caméra scriptée" name="Dump Scripted Camera"/>
+ <menu_item_call label="Dump caméra scriptée" name="Dump Scripted Camera"/>
<menu label="Enregistreur" name="Recorder">
<menu_item_call label="Commencer la lecture" name="Start Playback"/>
<menu_item_call label="Arrêter la lecture" name="Stop Playback"/>
diff --git a/indra/newview/skins/default/xui/fr/mime_types_linux.xml b/indra/newview/skins/default/xui/fr/mime_types_linux.xml
index 3a7ff979ee..93d1406ba5 100755
--- a/indra/newview/skins/default/xui/fr/mime_types_linux.xml
+++ b/indra/newview/skins/default/xui/fr/mime_types_linux.xml
@@ -44,6 +44,14 @@
Lire le contenu audio qui se trouve ici
</playtip>
</widgetset>
+ <widgetset name="none">
+ <label name="none_label">
+ Aucun contenu
+ </label>
+ <tooltip name="none_tooltip">
+ Aucun média ici
+ </tooltip>
+ </widgetset>
<scheme name="rtsp">
<label name="rtsp_label">
Flux en temps réel
diff --git a/indra/newview/skins/default/xui/fr/mime_types_mac.xml b/indra/newview/skins/default/xui/fr/mime_types_mac.xml
index 3a7ff979ee..93d1406ba5 100755
--- a/indra/newview/skins/default/xui/fr/mime_types_mac.xml
+++ b/indra/newview/skins/default/xui/fr/mime_types_mac.xml
@@ -44,6 +44,14 @@
Lire le contenu audio qui se trouve ici
</playtip>
</widgetset>
+ <widgetset name="none">
+ <label name="none_label">
+ Aucun contenu
+ </label>
+ <tooltip name="none_tooltip">
+ Aucun média ici
+ </tooltip>
+ </widgetset>
<scheme name="rtsp">
<label name="rtsp_label">
Flux en temps réel
diff --git a/indra/newview/skins/default/xui/fr/notifications.xml b/indra/newview/skins/default/xui/fr/notifications.xml
index 2325c8e34d..f13a80fe61 100755
--- a/indra/newview/skins/default/xui/fr/notifications.xml
+++ b/indra/newview/skins/default/xui/fr/notifications.xml
@@ -73,6 +73,10 @@ Détails de l&apos;erreur : La notification, appelée &apos;[_NAME]&apos;, est i
[MESSAGE]
<usetemplate name="okcancelbuttons" notext="Annuler" yestext="Oui"/>
</notification>
+ <notification name="GenericAlertOK">
+ [MESSAGE]
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
<notification name="BadInstallation">
Une erreur est survenue lors de la mise à jour de [APP_NAME]. Veuillez [http://get.secondlife.com télécharger la dernière version] du client.
<usetemplate name="okbutton" yestext="OK"/>
@@ -125,6 +129,88 @@ Aucun dossier n&apos;a été envoyé vers la Place du marché en raison d&apos;u
L&apos;initialisation de la Place du marché a échoué en raison d&apos;une erreur système ou réseau. Réessayez ultérieurement.
<usetemplate name="okbutton" yestext="OK"/>
</notification>
+ <notification name="StockPasteFailed">
+ Échec de la copie ou du déplacement vers le dossier de stock. Erreur :
+
+ &apos;[ERROR_CODE]&apos;
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="MerchantPasteFailed">
+ Échec de la copie ou du déplacement vers les annonces Place du marché. Erreur :
+
+ &apos;[ERROR_CODE]&apos;
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="MerchantTransactionFailed">
+ La transaction avec la Place du marché a échoué en raison de l&apos;erreur suivante :
+
+ Motif : &apos;[ERROR_REASON]&apos;
+ [ERROR_DESCRIPTION]
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="MerchantUnprocessableEntity">
+ Nous ne pouvons pas publier ce produit ni activer le dossier de version. Cela est en général dû à des informations manquantes dans le formulaire de description de l&apos;annonce, mais parfois à cause d&apos;erreurs dans la structure du dossier. Modifiez l&apos;annonce ou consultez les erreurs du dossier de l&apos;annonce.
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="MerchantListingFailed">
+ Échec de la publication d&apos;une annonce sur la Place du marché. Erreur :
+
+ &apos;[ERROR_CODE]&apos;
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="MerchantFolderActivationFailed">
+ Échec de l&apos;activation de ce dossier de version. Erreur :
+
+ &apos;[ERROR_CODE]&apos;
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="ConfirmMerchantActiveChange">
+ Cette action va modifier le contenu actif de cette annonce. Voulez-vous continuer ?
+ <usetemplate ignoretext="Confirmer avant que je ne modifie une annonce active sur la Place du marché" name="okcancelignore" notext="Annuler" yestext="OK"/>
+ </notification>
+ <notification name="ConfirmMerchantMoveInventory">
+ Les articles glissés vers la fenêtre Annonces de la Place du marché sont déplacés de leur emplacement d&apos;origine, et non copiés. Voulez-vous continuer ?
+ <usetemplate ignoretext="Confirmer avant que je ne déplace un article de l&apos;inventaire vers la Place du marché" name="okcancelignore" notext="Annuler" yestext="OK"/>
+ </notification>
+ <notification name="ConfirmListingCutOrDelete">
+ Le déplacement ou la suppression d&apos;un dossier d&apos;annonces supprimera votre annonce de la Place du marché. Si vous souhaitez conserver l&apos;annonce de la Place du marché, déplacez ou supprimez le contenu du dossier de version que vous souhaitez modifier. Voulez-vous continuer ?
+ <usetemplate ignoretext="Confirmer avant que je déplace ou supprime une annonce de la Place du marché" name="okcancelignore" notext="Annuler" yestext="OK"/>
+ </notification>
+ <notification name="ConfirmCopyToMarketplace">
+ Vous n&apos;êtes pas autorisé à copier un ou plusieurs de ces articles vers la Place du marché. Vous pouvez les déplacer ou les laisser.
+ <usetemplate canceltext="Annuler" ignoretext="Confirmer avant que je ne copie une sélection contenant des articles non reproductibles vers la Place du marché" name="yesnocancelbuttons" notext="Ne pas déplacer les articles" yestext="Déplacer les articles"/>
+ </notification>
+ <notification name="ConfirmMerchantUnlist">
+ Cette action va annuler cette annonce. Voulez-vous continuer ?
+ <usetemplate ignoretext="Confirmer avant que j&apos;annule une annonce active sur la Place du marché" name="okcancelignore" notext="Annuler" yestext="OK"/>
+ </notification>
+ <notification name="ConfirmMerchantClearVersion">
+ Cette action va désactiver le dossier de version de l&apos;annonce active. Voulez-vous continuer ?
+ <usetemplate ignoretext="Confirmer avant que je ne désactive le dossier de version d&apos;une annonce de la Place du marché" name="okcancelignore" notext="Annuler" yestext="OK"/>
+ </notification>
+ <notification name="AlertMerchantListingNotUpdated">
+ Impossible de mettre à jour cette annonce.
+[[URL] Cliquez ici] pour la modifier sur la Place du marché.
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="AlertMerchantListingCannotWear">
+ Vous ne pouvez pas porter de vêtements ou des parties du corps se trouvant dans le dossier Annonces de la Place du marché.
+ </notification>
+ <notification name="AlertMerchantListingInvalidID">
+ ID d&apos;annonce non valide.
+ </notification>
+ <notification name="AlertMerchantListingActivateRequired">
+ Il y a plusieurs dossiers de version (ou aucun) dans cette liste. Vous devrez en sélectionner et activer un indépendamment plus tard.
+ <usetemplate ignoretext="Alerter en cas d&apos;activation du dossier de version lorsque je crée une annonce avec plusieurs dossiers de version" name="okignore" yestext="OK"/>
+ </notification>
+ <notification name="AlertMerchantStockFolderSplit">
+ Nous avons classé les articles du stock de types différents dans des dossiers de stocks distincts ; votre dossier est organisé de telle façon que nous pouvons le répertorier.
+ <usetemplate ignoretext="Alerter lorsque le dossier de stock est divisé avant publication" name="okignore" yestext="OK"/>
+ </notification>
+ <notification name="AlertMerchantStockFolderEmpty">
+ Nous avons retiré votre annonce car le stock est vide. Vous devez ajouter plus d&apos;unités au dossier de stock pour publier à nouveau l&apos;annonce.
+ <usetemplate ignoretext="Alerter lorsqu&apos;une annonce n&apos;est pas publiée parce que le dossier de stock est vide" name="okignore" yestext="OK"/>
+ </notification>
<notification name="CompileQueueSaveText">
Une erreur est survenue lors du chargement du texte pour un script, suite au problème suivant : [REASON]. Veuillez réessayer ultérieurement.
</notification>
@@ -468,6 +554,10 @@ Remarque : cela videra le cache.
Enregistrer les changements ?
<usetemplate canceltext="Annuler" name="yesnocancelbuttons" notext="Ne pas enregistrer" yestext="Enregistrer"/>
</notification>
+ <notification name="DeleteNotecard">
+ Supprimer la note ?
+ <usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
+ </notification>
<notification name="GestureSaveFailedTooManySteps">
L&apos;enregistrement du geste a échoué.
Il y a trop d&apos;étapes dans ce geste.
@@ -574,6 +664,9 @@ La qualité des graphiques peut être augmentée à la section Préférences &gt
<notification name="RegionNoTerraforming">
Le terraformage est interdit dans la région [REGION].
</notification>
+ <notification name="ParcelNoTerraforming">
+ Vous n&apos;êtes pas autorisé(e) à terraformer la parcelle [PARCEL].
+ </notification>
<notification name="CannotCopyWarning">
Vous n&apos;êtes pas autorisé à copier les articles suivants :
[ITEMS].
@@ -1824,6 +1917,30 @@ Cette action modifiera des milliers de régions et sera difficile à digérer po
Supprimer le gérant de domaine pour ce domaine uniquement ou pour [ALL_ESTATES] ?
<usetemplate canceltext="Annuler" name="yesnocancelbuttons" notext="Tous les domaines" yestext="Ce domaine"/>
</notification>
+ <notification label="Sélectionner un domaine" name="EstateAllowedExperienceAdd">
+ Ajouter à la liste des expériences autorisées uniquement pour ce domaine ou pour [ALL_ESTATES] ?
+ <usetemplate canceltext="Annuler" name="yesnocancelbuttons" notext="Tous les domaines" yestext="Ce domaine"/>
+ </notification>
+ <notification label="Sélectionner un domaine" name="EstateAllowedExperienceRemove">
+ Supprimer de la liste des expériences autorisées uniquement pour ce domaine ou pour [ALL_ESTATES] ?
+ <usetemplate canceltext="Annuler" name="yesnocancelbuttons" notext="Tous les domaines" yestext="Ce domaine"/>
+ </notification>
+ <notification label="Sélectionner un domaine" name="EstateBlockedExperienceAdd">
+ Ajouter à la liste des expériences bloquées uniquement pour ce domaine ou pour [ALL_ESTATES]
+ <usetemplate canceltext="Annuler" name="yesnocancelbuttons" notext="Tous les domaines" yestext="Ce domaine"/>
+ </notification>
+ <notification label="Sélectionner un domaine" name="EstateBlockedExperienceRemove">
+ Supprimer de la liste des expériences bloquées uniquement pour ce domaine ou pour [ALL_ESTATES] ?
+ <usetemplate canceltext="Annuler" name="yesnocancelbuttons" notext="Tous les domaines" yestext="Ce domaine"/>
+ </notification>
+ <notification label="Sélectionner un domaine" name="EstateTrustedExperienceAdd">
+ Ajouter à la liste des clés uniquement pour ce domaine ou pour [ALL_ESTATES] ?
+ <usetemplate canceltext="Annuler" name="yesnocancelbuttons" notext="Tous les domaines" yestext="Ce domaine"/>
+ </notification>
+ <notification label="Sélectionner un domaine" name="EstateTrustedExperienceRemove">
+ Supprimer de la liste des clés uniquement pour ce domaine ou pour [ALL_ESTATES] ?
+ <usetemplate canceltext="Annuler" name="yesnocancelbuttons" notext="Tous les domaines" yestext="Ce domaine"/>
+ </notification>
<notification label="Confirmer" name="EstateKickUser">
Éjecter [EVIL_USER] de ce domaine ?
<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
@@ -1836,6 +1953,9 @@ Cette action modifiera des milliers de régions et sera difficile à digérer po
La région que vous essayez de visiter comporte du contenu dont le niveau dépasse celui de vos préférences actuelles. Vous pouvez modifier vos préférences en accédant à Moi &gt; Préférences &gt; Général.
<usetemplate name="okbutton" yestext="OK"/>
</notification>
+ <notification name="SLM_UPDATE_FOLDER">
+ [MESSAGE]
+ </notification>
<notification name="RegionEntryAccessBlocked_AdultsOnlyContent">
La région que vous essayez de visiter comporte du contenu [REGIONMATURITY] uniquement accessible aux adultes.
<url name="url">
@@ -1898,6 +2018,10 @@ Cette action modifiera des milliers de régions et sera difficile à digérer po
Nous rencontrons des difficultés techniques au niveau de votre téléportation car vos préférences ne sont pas synchronisées avec le serveur.
<usetemplate name="okbutton" yestext="OK"/>
</notification>
+ <notification name="RegionTPSpecialUsageBlocked">
+ Impossible de pénétrer dans la région. « [REGION_NAME] » est une région de jeux d&apos;adresse et vous devez satisfaire à certains critères pour y pénétrer. Pour en savoir plus, consultez la page [http://wiki.secondlife.com/wiki/Linden_Lab_Official:Skill_Gaming_in_Second_Life FAQ sur les jeux d&apos;adresse].
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
<notification name="PreferredMaturityChanged">
Aucune autre notification vous informant que vous allez visiter une région au contenu [RATING] ne vous sera envoyée. Vous pouvez modifier vos préférences de contenu à l&apos;avenir en accédant à Moi &gt; Préférences &gt; Général, à partir de la barre de menus.
<usetemplate name="okbutton" yestext="OK"/>
@@ -2120,6 +2244,10 @@ Déplacer les objets de l&apos;inventaire ?
<ignore name="ignore" text="Je définis l&apos;action du clic Payer l&apos;objet lorsque je construis un objet sans le script money()"/>
</form>
</notification>
+ <notification name="PayConfirmation">
+ Confirmez que vous voulez payer [AMOUNT] L$ à [TARGET].
+ <usetemplate ignoretext="Confirmez avant de payer (sommes supérieures à 200 L$)" name="okcancelignore" notext="Annuler" yestext="Payer"/>
+ </notification>
<notification name="OpenObjectCannotCopy">
Vous n&apos;êtes autorisé à copier aucun élément dans cet objet.
</notification>
@@ -2205,6 +2333,9 @@ Voulez-vous le remplacer par l&apos;objet sélectionné ?
<button ignore="Ne jamais remplacer" name="No" text="Annuler"/>
</form>
</notification>
+ <notification name="TooManyWearables">
+ Vous ne pouvez pas porter un dossier contenant plus de [AMOUNT] articles. Vous pouvez modifier cette limite dans Avancé &gt; Afficher les paramètres de débogage &gt; WearFolderLimit.
+ </notification>
<notification label="Avertissement de mode Ne pas déranger" name="DoNotDisturbModePay">
Vous avez activé Ne pas déranger. Vous ne recevrez aucun article proposé en échange de ce paiement.
@@ -2814,7 +2945,7 @@ Si vous restez dans cette région, vous serez déconnecté(e).
[MESSAGE]
-Venant de l&apos;objet : &lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;, propriétaire : [NAME] ?
+Venant de l&apos;objet : &lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;, propriétaire : [NAME]
<form name="form">
<button name="Gotopage" text="Charger"/>
<button name="Cancel" text="Annuler"/>
@@ -2840,6 +2971,72 @@ Acceptez-vous ?
<button name="Mute" text="Interdire"/>
</form>
</notification>
+ <notification name="ExperienceAcquireFailed">
+ Impossible d&apos;acquérir une nouvelle expérience :
+ [ERROR_MESSAGE]
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="NotInGroupExperienceProfileMessage">
+ Une modification du groupe de l&apos;expérience a été ignorée, car le propriétaire n&apos;est pas membre du groupe sélectionné.
+ </notification>
+ <notification name="UneditableExperienceProfileMessage">
+ Le champ non modifiable « [field] » a été ignoré lors de la mise à jour du profil de l&apos;expérience.
+ </notification>
+ <notification name="RestrictedToOwnerExperienceProfileMessage">
+ Modifications du champ « [field] » ignorées, car il ne peut être défini que par le propriétaire de l&apos;expérience.
+ </notification>
+ <notification name="MaturityRatingExceedsOwnerExperienceProfileMessage">
+ Vous ne pouvez pas définir une catégorie de contenu plus élevée pour une expérience que pour son propriétaire.
+ </notification>
+ <notification name="RestrictedTermExperienceProfileMessage">
+ Les termes suivants ont empêché la mise à jour du nom et/ou de la description du profil de l&apos;expérience : [extra_info]
+ </notification>
+ <notification name="TeleportedHomeExperienceRemoved">
+ Vous avez été téléporté(e) hors de la région [region_name], car vous avez supprimé l&apos;expérience secondlife:///app/experience/[public_id]/profile et n&apos;êtes plus autorisé(e) dans cette région.
+ <form name="form">
+ <ignore name="ignore" text="Éjecté(e) de la région pour cause de suppression d&apos;une expérience"/>
+ </form>
+ </notification>
+ <notification name="TrustedExperienceEntry">
+ Vous avez été autorisé(e) à pénétrer dans la région [region_name] en participant à l&apos;expérience avec clé secondlife:///app/experience/[public_id]/profile. Si vous supprimez cette expérience, vous risquez d&apos;être éjecté(e) de cette région.
+ <form name="form">
+ <ignore name="ignore" text="Autorisé(e) dans une région par une expérience"/>
+ </form>
+ </notification>
+ <notification name="TrustedExperiencesAvailable">
+ Vous n&apos;avez pas accès à cette destination. Vous pouvez être autorisé(e) à pénétrer dans la région en acceptant une expérience ci-dessous :
+
+[EXPERIENCE_LIST]
+
+Il est possible que d&apos;autres expériences avec clé soient disponibles.
+ </notification>
+ <notification name="ExperienceEvent">
+ Un objet a été autorisé à [EventType] par l&apos;expérience secondlife:///app/experience/[public_id]/profile.
+ Propriétaire : secondlife:///app/agent/[OwnerID]/inspect
+ Nom de l&apos;objet : [ObjectName]
+ Nom de la parcelle : [ParcelName]
+ </notification>
+ <notification name="ExperienceEventAttachment">
+ Une pièce jointe a été autorisée à [EventType] par l&apos;expérience secondlife:///app/experience/[public_id]/profile.
+ Propriétaire : secondlife:///app/agent/[OwnerID]/inspect
+ </notification>
+ <notification name="ScriptQuestionExperience">
+ « &lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt; », un objet appartenant à « [NAME] », demande votre participation à l&apos;expérience [GRID_WIDE] :
+
+[EXPERIENCE]
+
+Une fois l&apos;autorisation accordée, vous ne verrez plus ce message pour cette expérience, sauf si elle est révoquée dans le profil de l&apos;expérience.
+
+Les scripts associés à cette expérience pourront effectuer les actions suivantes dans les régions dans lesquelles l&apos;expérience est active :
+
+[QUESTIONS]Acceptez-vous ?
+ <form name="form">
+ <button name="BlockExperience" text="Bloquer l&apos;expérience"/>
+ <button name="Mute" text="Ignorer l&apos;objet"/>
+ <button name="Yes" text="Oui"/>
+ <button name="No" text="Non"/>
+ </form>
+ </notification>
<notification name="ScriptQuestionCaution">
Avertissement : l&apos;objet &lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt; souhaite un accès total à votre compte en Linden dollars. Si vous autorisez cet accès, il pourra supprimer des fonds de votre compte à tout moment ou le vider entièrement de façon continue sans avis préalable.
@@ -3159,6 +3356,10 @@ Texture figée de [RESOLUTION] chargée pour [BODYREGION] au bout de [TIME] seco
([EXISTENCE] secondes d&apos;existence)
Texture figée de [RESOLUTION] mise à jour localement pour [BODYREGION] au bout de [TIME] secondes.
</notification>
+ <notification name="CannotUploadTexture">
+ Chargement de la texture impossible.
+[REASON]
+ </notification>
<notification name="LivePreviewUnavailable">
Impossible d&apos;afficher un aperçu de cette texture car il s&apos;agit d&apos;une texture sans copie et/ou transfert.
<usetemplate ignoretext="M&apos;avertir que le mode Aperçu en direct n&apos;est pas disponible pour les textures sans copie et/ou transfert" name="okignore" yestext="OK"/>
@@ -3733,9 +3934,11 @@ Veuillez réessayer dans une minute.
</notification>
<notification name="TeleportedByAttachment">
Vous avez été téléporté par un élément sur [ITEM_ID]
+ <usetemplate ignoretext="Téléportation : vous avez été téléporté par un attachement." name="notifyignore"/>
</notification>
<notification name="TeleportedByObjectOnParcel">
Vous avez été téléporté par l&apos;objet [OBJECT_NAME] sur la parcelle [PARCEL_NAME].
+ <usetemplate ignoretext="Téléportation : vous avez été téléporté par un objet sur une parcelle" name="notifyignore"/>
</notification>
<notification name="TeleportedByObjectOwnedBy">
Vous avez été téléporté par l&apos;objet [OBJECT_NAME] appartenant à [OWNER_ID].
@@ -4067,7 +4270,7 @@ Veuillez sélectionner un terrain plus petit.
<usetemplate ignoretext="Impossible de déplacer les fichiers. Chemin précédent rétabli." name="okignore" yestext="OK"/>
</notification>
<notification name="DefaultObjectPermissions">
- Une erreur est survenue lors de l&apos;enregistrement des droits par défaut, suite au problème suivant : [REASON]. Réessayez de définir les droits par défaut ultérieurement.
+ Problème lors de l&apos;enregistrement des droits d&apos;objet par défaut : [REASON]. Réessayez de définir les droits par défaut ultérieurement.
<usetemplate name="okbutton" yestext="OK"/>
</notification>
<notification name="ChatHistoryIsBusyAlert">
diff --git a/indra/newview/skins/default/xui/fr/panel_experience_info.xml b/indra/newview/skins/default/xui/fr/panel_experience_info.xml
new file mode 100644
index 0000000000..e830ce1ba6
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_experience_info.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_experience_info">
+ <text name="title" value="Profil de l&apos;expérience"/>
+ <scroll_container name="xp_scroll">
+ <panel name="scrolling_panel">
+ <layout_stack>
+ <layout_panel>
+ <text name="experience_title" value="Kyle&apos;s Superhero RPG"/>
+ </layout_panel>
+ <layout_panel name="location panel">
+ <text name="Location">
+ Endroit :
+ </text>
+ <text name="LocationTextText">
+ quelque part
+ </text>
+ <button label="Téléporter" name="teleport_btn"/>
+ <button label="Carte" name="map_btn"/>
+ </layout_panel>
+ <layout_panel name="marketplace panel">
+ <text name="Location">
+ Boutique de la Place du marché :
+ </text>
+ <text name="LocationTextText">
+ quelque part
+ </text>
+ </layout_panel>
+ <layout_panel>
+ <text name="ContentRating">
+ Catégorie :
+ </text>
+ <text name="ContentRatingText">
+ Adulte
+ </text>
+ <text name="Owner">
+ Propriétaire :
+ </text>
+ <text name="OwnerText">
+ Kyle
+ </text>
+ <button label="Modifier" name="edit_btn"/>
+ </layout_panel>
+ </layout_stack>
+ </panel>
+ </scroll_container>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_experience_list_editor.xml b/indra/newview/skins/default/xui/fr/panel_experience_list_editor.xml
new file mode 100644
index 0000000000..d1c448b425
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_experience_list_editor.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="experince_list_editor">
+ <panel.string name="loading">
+ en cours de chargement...
+ </panel.string>
+ <panel.string name="panel_allowed">
+ Expériences autorisées :
+ </panel.string>
+ <panel.string name="panel_blocked">
+ Expériences bloquées :
+ </panel.string>
+ <panel.string name="panel_trusted">
+ Expériences avec clé :
+ </panel.string>
+ <panel.string name="no_results">
+ (vide)
+ </panel.string>
+ <text name="text_name">
+ Liste des expériences
+ </text>
+ <scroll_list name="experience_list">
+ <columns label="Nom" name="experience_name"/>
+ </scroll_list>
+ <button label="Ajouter..." name="btn_add"/>
+ <button label="Supprimer" name="btn_remove"/>
+ <button label="Profil..." name="btn_profile"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_experience_list_item.xml b/indra/newview/skins/default/xui/fr/panel_experience_list_item.xml
new file mode 100644
index 0000000000..c28f85f5eb
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_experience_list_item.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Experiences">
+ <text name="experience_name">
+ Dummy Name
+ </text>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_experience_log.xml b/indra/newview/skins/default/xui/fr/panel_experience_log.xml
new file mode 100644
index 0000000000..cc9eb3dbe3
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_experience_log.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="EVENTS">
+ <string name="no_events" value="Aucun événement."/>
+ <string name="loading" value="en cours de chargement..."/>
+ <layout_stack>
+ <layout_panel>
+ <scroll_list name="experience_log_list">
+ <columns label="Durée" name="time"/>
+ <columns label="Événement" name="event"/>
+ <columns label="Expérience" name="experience_name"/>
+ <columns label="Objet" name="object_name"/>
+ </scroll_list>
+ <button label="Prévenir" name="btn_notify"/>
+ <button label="Profil" name="btn_profile_xp"/>
+ <button label="Signaler" name="btn_report_xp"/>
+ </layout_panel>
+ <layout_panel name="button_panel">
+ <check_box label="Prévenir de tous les événements jours" name="notify_all"/>
+ <button label="Effacer" name="btn_clear"/>
+ <button label="&lt;" name="btn_prev"/>
+ <button label="&gt;" name="btn_next"/>
+ </layout_panel>
+ </layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_experience_search.xml b/indra/newview/skins/default/xui/fr/panel_experience_search.xml
new file mode 100644
index 0000000000..13495057d4
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_experience_search.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="SEARCH">
+ <string name="not_found">
+ &apos;[TEXT]&apos; introuvable
+ </string>
+ <string name="no_results">
+ Aucun résultat
+ </string>
+ <string name="searching">
+ Recherche...
+ </string>
+ <string name="loading">
+ Chargement...
+ </string>
+ <string name="maturity_icon_general">
+ &quot;Parcel_PG_Light&quot;
+ </string>
+ <string name="maturity_icon_moderate">
+ &quot;Parcel_M_Light&quot;
+ </string>
+ <string name="maturity_icon_adult">
+ &quot;Parcel_R_Light&quot;
+ </string>
+ <panel name="search_panel">
+ <button label="OK" name="find"/>
+ <icons_combo_box label="Modéré" name="maturity">
+ <icons_combo_box.item label="Adulte" name="Adult" value="42"/>
+ <icons_combo_box.item label="Modéré" name="Mature" value="21"/>
+ <icons_combo_box.item label="Général" name="PG" value="13"/>
+ </icons_combo_box>
+ <scroll_list name="search_results">
+ <columns label="Nom" name="experience_name"/>
+ <columns label="Propriétaire" name="owner"/>
+ </scroll_list>
+ <button label="OK" label_selected="OK" name="ok_btn"/>
+ <button label="Annuler" name="cancel_btn"/>
+ <button label="Voir le profil" name="profile_btn"/>
+ <button label="&lt;" name="left_btn"/>
+ <button label="&gt;" name="right_btn"/>
+ </panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_experiences.xml b/indra/newview/skins/default/xui/fr/panel_experiences.xml
new file mode 100644
index 0000000000..f95a664531
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_experiences.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Experiences">
+ <string name="loading_experiences" value="Chargement des expériences..."/>
+ <string name="no_experiences" value="Aucune expérience."/>
+ <string name="acquire" value="Acquérir une expérience"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_facebook_friends.xml b/indra/newview/skins/default/xui/fr/panel_facebook_friends.xml
index 3ac0ce229c..319737a2af 100644
--- a/indra/newview/skins/default/xui/fr/panel_facebook_friends.xml
+++ b/indra/newview/skins/default/xui/fr/panel_facebook_friends.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<panel name="panel_facebook_friends">
<string name="facebook_friends_empty" value="Vous n&apos;avez actuellement aucun ami Facebook qui est également résident de Second Life. Invitez vos amis Facebook à rejoindre Second Life !"/>
- <string name="facebook_friends_no_connected" value="Vous n&apos;êtes pas connecté(e) à Facebook. Allez à l&apos;onglet Compte pour vous connecter et activer cette fonctionnalité."/>
+ <string name="facebook_friends_no_connected" value="Vous n&apos;êtes pas connecté(e) à Facebook. Allez à l&apos;onglet Statut pour vous connecter et activer cette fonctionnalité."/>
<accordion name="friends_accordion">
<accordion_tab name="tab_second_life_friends" title="Amis SL"/>
<accordion_tab name="tab_suggested_friends" title="Ajouter ces personnes en tant qu&apos;amis SL"/>
diff --git a/indra/newview/skins/default/xui/fr/panel_facebook_photo.xml b/indra/newview/skins/default/xui/fr/panel_facebook_photo.xml
index c5b09c4bcc..3236f35b55 100644
--- a/indra/newview/skins/default/xui/fr/panel_facebook_photo.xml
+++ b/indra/newview/skins/default/xui/fr/panel_facebook_photo.xml
@@ -1,26 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<panel name="panel_facebook_photo">
- <layout_stack name="stack_photo">
- <layout_panel name="snapshot_panel">
- <combo_box name="resolution_combobox" tool_tip="Résolution d’image">
- <combo_box.item label="Fenêtre actuelle" name="CurrentWindow"/>
- <combo_box.item label="640 x 480" name="640x480"/>
- <combo_box.item label="800 x 600" name="800x600"/>
- <combo_box.item label="1 024 x 768" name="1024x768"/>
- <combo_box.item label="1 200 x 630" name="1200x630"/>
- </combo_box>
- <combo_box name="filters_combobox" tool_tip="Filtres d&apos;image">
- <combo_box.item label="Aucun filtre" name="NoFilter"/>
- </combo_box>
- <button label="Actualiser" name="new_snapshot_btn" tool_tip="Cliquer pour actualiser"/>
- <button label="Aperçu" name="big_preview_btn" tool_tip="Cliquer pour activer/désactiver l&apos;aperçu"/>
- <text name="caption_label">
- Commentaire (facultatif) :
- </text>
- </layout_panel>
- <layout_panel name="photo_button_panel">
- <button label="Publier" name="post_photo_btn"/>
- <button label="Annuler" name="cancel_photo_btn"/>
- </layout_panel>
- </layout_stack>
+ <combo_box name="resolution_combobox" tool_tip="Résolution d’image">
+ <combo_box.item label="Fenêtre actuelle" name="CurrentWindow"/>
+ <combo_box.item label="640 x 480" name="640x480"/>
+ <combo_box.item label="800 x 600" name="800x600"/>
+ <combo_box.item label="1 024 x 768" name="1024x768"/>
+ <combo_box.item label="1 200 x 630" name="1200x630"/>
+ </combo_box>
+ <combo_box name="filters_combobox" tool_tip="Filtres d&apos;image">
+ <combo_box.item label="Aucun filtre" name="NoFilter"/>
+ </combo_box>
+ <button label="Actualiser" name="new_snapshot_btn" tool_tip="Cliquer pour actualiser"/>
+ <button label="Aperçu" name="big_preview_btn" tool_tip="Cliquer pour activer/désactiver l&apos;aperçu"/>
+ <text name="caption_label">
+ Commentaire (facultatif) :
+ </text>
+ <button label="Publier" name="post_photo_btn"/>
+ <button label="Annuler" name="cancel_photo_btn"/>
</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_facebook_place.xml b/indra/newview/skins/default/xui/fr/panel_facebook_place.xml
index 0eaea66ad4..f8e597450b 100644
--- a/indra/newview/skins/default/xui/fr/panel_facebook_place.xml
+++ b/indra/newview/skins/default/xui/fr/panel_facebook_place.xml
@@ -1,17 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<panel name="panel_facebook_place">
- <layout_stack name="stack_place">
- <layout_panel name="place_detail_panel">
- <text name="place_caption_label">
- Dites quelque chose au sujet du lieu où vous vous trouvez :
- </text>
- </layout_panel>
- <layout_panel name="place_map_panel">
- <check_box initial_value="false" label="" name="add_place_view_cb"/>
- </layout_panel>
- <layout_panel name="place_button_panel">
- <button label="Publier" name="post_place_btn"/>
- <button label="Annuler" name="cancel_place_btn"/>
- </layout_panel>
- </layout_stack>
+ <text name="place_caption_label">
+ Dites quelque chose au sujet du lieu où vous vous trouvez :
+ </text>
+ <check_box initial_value="false" label="Inclure la vue aérienne du lieu" name="add_place_view_cb"/>
+ <button label="Publier" name="post_place_btn"/>
+ <button label="Annuler" name="cancel_place_btn"/>
</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_facebook_status.xml b/indra/newview/skins/default/xui/fr/panel_facebook_status.xml
index 260378978b..9afa42d2aa 100644
--- a/indra/newview/skins/default/xui/fr/panel_facebook_status.xml
+++ b/indra/newview/skins/default/xui/fr/panel_facebook_status.xml
@@ -1,14 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<panel name="panel_facebook_status">
- <layout_stack name="stack_status">
- <layout_panel name="status_detail_panel">
- <text name="status_caption_label">
- À quoi pensez-vous ?
- </text>
- </layout_panel>
- <layout_panel name="status_button_panel">
- <button label="Publier" name="post_status_btn"/>
- <button label="Annuler" name="cancel_status_btn"/>
- </layout_panel>
- </layout_stack>
+ <string name="facebook_connected" value="Vous êtes connecté(e) à Facebook en tant que :"/>
+ <string name="facebook_disconnected" value="Pas connecté(e) à Facebook"/>
+ <text name="account_caption_label">
+ Pas connecté(e) à Facebook.
+ </text>
+ <panel name="panel_buttons">
+ <button label="Connexion..." name="connect_btn"/>
+ <button label="Déconnexion" name="disconnect_btn"/>
+ <text name="account_learn_more_label">
+ [http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-Share-Facebook/ta-p/2149711 Apprenez comment publier sur Facebook]
+ </text>
+ </panel>
+ <text name="status_caption_label">
+ À quoi pensez-vous ?
+ </text>
+ <button label="Publier" name="post_status_btn"/>
+ <button label="Annuler" name="cancel_status_btn"/>
</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_flickr_photo.xml b/indra/newview/skins/default/xui/fr/panel_flickr_photo.xml
index 63738a773a..7b3a176703 100644
--- a/indra/newview/skins/default/xui/fr/panel_flickr_photo.xml
+++ b/indra/newview/skins/default/xui/fr/panel_flickr_photo.xml
@@ -1,41 +1,35 @@
<?xml version="1.0" encoding="utf-8"?>
<panel name="panel_flickr_photo">
- <layout_stack name="stack_photo">
- <layout_panel name="snapshot_panel">
- <combo_box name="resolution_combobox" tool_tip="Résolution d’image">
- <combo_box.item label="Fenêtre actuelle" name="CurrentWindow"/>
- <combo_box.item label="640 x 480" name="640x480"/>
- <combo_box.item label="800 x 600" name="800x600"/>
- <combo_box.item label="1 024 x 768" name="1024x768"/>
- </combo_box>
- <combo_box name="filters_combobox" tool_tip="Filtres d&apos;image">
- <combo_box.item label="Aucun filtre" name="NoFilter"/>
- </combo_box>
- <button label="Actualiser" name="new_snapshot_btn" tool_tip="Cliquer pour actualiser"/>
- <button label="Aperçu" name="big_preview_btn" tool_tip="Cliquer pour activer/désactiver l&apos;aperçu"/>
- <text name="title_label">
- Titre :
- </text>
- <text name="description_label">
- Description :
- </text>
- <check_box initial_value="true" label="Inclure l&apos;emplacement SL à la fin de la description" name="add_location_cb"/>
- <text name="tags_label">
- Balises :
- </text>
- <text name="tags_help_label">
- Séparer les balises par des espaces
+ <combo_box name="resolution_combobox" tool_tip="Résolution d’image">
+ <combo_box.item label="Fenêtre actuelle" name="CurrentWindow"/>
+ <combo_box.item label="640 x 480" name="640x480"/>
+ <combo_box.item label="800 x 600" name="800x600"/>
+ <combo_box.item label="1 024 x 768" name="1024x768"/>
+ </combo_box>
+ <combo_box name="filters_combobox" tool_tip="Filtres d&apos;image">
+ <combo_box.item label="Aucun filtre" name="NoFilter"/>
+ </combo_box>
+ <button label="Actualiser" name="new_snapshot_btn" tool_tip="Cliquer pour actualiser"/>
+ <button label="Aperçu" name="big_preview_btn" tool_tip="Cliquer pour activer/désactiver l&apos;aperçu"/>
+ <text name="title_label">
+ Titre :
+ </text>
+ <text name="description_label">
+ Description :
+ </text>
+ <check_box initial_value="true" label="Inclure l&apos;emplacement SL à la fin de la description" name="add_location_cb"/>
+ <text name="tags_label">
+ Balises :
+ </text>
+ <text name="tags_help_label">
+ Séparer les balises par des espaces
Utiliser &quot;&quot; pour les balises contenant plusieurs mots
- </text>
- <combo_box name="rating_combobox" tool_tip="Catégorie de contenu Flickr">
- <combo_box.item label="Catégorie de contenu Flickr sûr" name="SafeRating"/>
- <combo_box.item label="Catégorie de contenu Flickr modéré" name="ModerateRating"/>
- <combo_box.item label="Catégorie de contenu Flickr réservé aux adultes" name="RestrictedRating"/>
- </combo_box>
- </layout_panel>
- <layout_panel name="photo_button_panel">
- <button label="Charger" name="post_photo_btn"/>
- <button label="Annuler" name="cancel_photo_btn"/>
- </layout_panel>
- </layout_stack>
+ </text>
+ <combo_box name="rating_combobox" tool_tip="Catégorie de contenu Flickr">
+ <combo_box.item label="Catégorie de contenu Flickr sûr" name="SafeRating"/>
+ <combo_box.item label="Catégorie de contenu Flickr modéré" name="ModerateRating"/>
+ <combo_box.item label="Catégorie de contenu Flickr réservé aux adultes" name="RestrictedRating"/>
+ </combo_box>
+ <button label="Charger" name="post_photo_btn"/>
+ <button label="Annuler" name="cancel_photo_btn"/>
</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/fr/panel_group_info_sidetray.xml
index 7c3b852de1..bea114af6c 100755
--- a/indra/newview/skins/default/xui/fr/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/default/xui/fr/panel_group_info_sidetray.xml
@@ -23,6 +23,7 @@
<accordion_tab name="group_roles_tab" title="Rôles et membres"/>
<accordion_tab name="group_notices_tab" title="Notices"/>
<accordion_tab name="group_land_tab" title="Terrain/Actifs"/>
+ <accordion_tab name="group_experiences_tab" title="Expériences"/>
</accordion>
</layout_panel>
</layout_stack>
diff --git a/indra/newview/skins/default/xui/fr/panel_login.xml b/indra/newview/skins/default/xui/fr/panel_login.xml
index b39920fe13..54c857fdc8 100755
--- a/indra/newview/skins/default/xui/fr/panel_login.xml
+++ b/indra/newview/skins/default/xui/fr/panel_login.xml
@@ -1,26 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<panel name="panel_login">
- <panel.string name="forgot_password_url">
- http://secondlife.com/account/request.php?lang=fr
- </panel.string>
+ <panel.string name="forgot_password_url">http://secondlife.com/account/request.php?lang=fr</panel.string>
<layout_stack name="ui_stack">
<layout_panel name="ui_container">
<combo_box label="Nom d&apos;utilisateur" name="username_combo" tool_tip="Nom d&apos;utilisateur que vous avez choisi lors de votre inscription (par exemple, bobsmith12 ou Steller Sunshine)."/>
<line_editor label="Mot de passe" name="password_edit"/>
- <check_box label="Mémoriser mes informations" name="remember_check"/>
- <text name="forgot_password_text">
- Mot de passe oublié
- </text>
- <button label="Connexion" name="connect_btn"/>
- <text name="At_My_Last_Location_Label" font="SansSerifSmall" width="140">
- au dernier emplacement
- </text>
<combo_box label="Mes lieux préférés" name="start_location_combo">
+ <combo_box.item label="Dernier emplacement" name="MyLastLocation"/>
<combo_box.item label="Domicile" name="MyHome"/>
</combo_box>
- <button label="Connexion" name="connect_favorite_btn"/>
- <line_editor label="Tapez un emplacement" name="location_edit"/>
- <button label="Connexion" name="connect_location_btn"/>
+ <button label="Connexion" name="connect_btn"/>
+ <check_box label="Mémoriser mes informations" name="remember_check"/>
+ <text name="forgot_password_text">Mot de passe oublié</text>
<combo_box label="Sélectionner la grille" name="server_combo"/>
</layout_panel>
</layout_stack>
diff --git a/indra/newview/skins/default/xui/fr/panel_marketplace_listings.xml b/indra/newview/skins/default/xui/fr/panel_marketplace_listings.xml
new file mode 100644
index 0000000000..46578182da
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_marketplace_listings.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Place du marché" name="Marketplace Panel">
+ <panel name="tool_panel">
+ <menu_button name="sort_btn" tool_tip="Options d&apos;affichage/de tri"/>
+ <button name="add_btn" tool_tip="Créer un nouveau dossier d&apos;annonces"/>
+ <button label="Consulter les erreurs" name="audit_btn" tool_tip="Consulter vos annonces de Place du marché"/>
+ </panel>
+ <panel name="tab_container_panel">
+ <filter_editor label="Filtrer les annonces de Place du marché" name="filter_editor"/>
+ </panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_marketplace_listings_inventory.xml b/indra/newview/skins/default/xui/fr/panel_marketplace_listings_inventory.xml
new file mode 100644
index 0000000000..fdee447a29
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_marketplace_listings_inventory.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<inventory_panel label="TOUT" name="All Items" tool_tip="Faire glisser les objets et les déposer ici pour les publier"/>
diff --git a/indra/newview/skins/default/xui/fr/panel_marketplace_listings_listed.xml b/indra/newview/skins/default/xui/fr/panel_marketplace_listings_listed.xml
new file mode 100644
index 0000000000..d3d476af6e
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_marketplace_listings_listed.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<inventory_panel label="PUBLIÉS" name="Active Items"/>
diff --git a/indra/newview/skins/default/xui/fr/panel_marketplace_listings_unassociated.xml b/indra/newview/skins/default/xui/fr/panel_marketplace_listings_unassociated.xml
new file mode 100644
index 0000000000..95018e339f
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_marketplace_listings_unassociated.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<inventory_panel label="DÉSASSOCIÉE" name="Unassociated Items"/>
diff --git a/indra/newview/skins/default/xui/fr/panel_marketplace_listings_unlisted.xml b/indra/newview/skins/default/xui/fr/panel_marketplace_listings_unlisted.xml
new file mode 100644
index 0000000000..5d811af914
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_marketplace_listings_unlisted.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<inventory_panel label="NON PUBLIÉS" name="Inactive Items"/>
diff --git a/indra/newview/skins/default/xui/fr/panel_postcard_settings.xml b/indra/newview/skins/default/xui/fr/panel_postcard_settings.xml
index 945a5e0272..eebf84c0d0 100755
--- a/indra/newview/skins/default/xui/fr/panel_postcard_settings.xml
+++ b/indra/newview/skins/default/xui/fr/panel_postcard_settings.xml
@@ -7,17 +7,7 @@
<combo_box.item label="1 024 x 768" name="1024x768"/>
<combo_box.item label="Personnalisée" name="Custom"/>
</combo_box>
- <layout_stack name="postcard_image_params_ls">
- <layout_panel name="postcard_image_size_lp">
- <spinner label="Larg." name="postcard_snapshot_width"/>
- <spinner label="Haut." name="postcard_snapshot_height"/>
- <check_box label="Conserver les proportions" name="postcard_keep_aspect_check"/>
- </layout_panel>
- <layout_panel name="postcard_image_format_quality_lp">
- <slider label="Qualité image" name="image_quality_slider"/>
- <text name="image_quality_level">
- ([QLVL])
- </text>
- </layout_panel>
- </layout_stack>
+ <spinner label="Largeur x Hauteur" name="postcard_snapshot_width"/>
+ <check_box label="Conserver les proportions" name="postcard_keep_aspect_check"/>
+ <slider label="Qualité :" name="image_quality_slider"/>
</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_setup.xml b/indra/newview/skins/default/xui/fr/panel_preferences_setup.xml
index 50f4a49bd0..e2f9b9567c 100755
--- a/indra/newview/skins/default/xui/fr/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_setup.xml
@@ -14,9 +14,9 @@
<text name="Web:">
Web :
</text>
- <radio_group name="use_external_browser">
- <radio_item label="Utiliser mon navigateur (IE, Firefox, Safari)" name="external" tool_tip="Utiliser le navigateur web système par défaut pour l&apos;aide, les liens etc. Non recommandé en mode plein écran." value="true"/>
- <radio_item label="Utiliser le navigateur intégré" name="internal" tool_tip="Utilisez le navigateur intégré pour obtenir de l&apos;aide, ouvrir des liens, etc. Ce navigateur s&apos;ouvre dans [APP_NAME]." value=""/>
+ <radio_group name="preferred_browser_behavior">
+ <radio_item label="Utiliser mon navigateur (Chrome, Firefox, IE) pour tous les liens" name="internal" tool_tip="Utiliser le navigateur web système par défaut pour l&apos;aide, les liens, etc. Non recommandé en mode plein écran." value="0"/>
+ <radio_item label="Utiliser le navigateur intégré pour les liens Second Life uniquement" name="external" tool_tip="Utilisez le navigateur web système par défaut pour l&apos;aide, les liens Web, etc. Le navigateur intégré sera uniquement utilisé pour les liens LindenLab/SecondLife." value="1"/>
</radio_group>
<check_box initial_value="true" label="Activer les plugins" name="browser_plugins_enabled"/>
<check_box initial_value="true" label="Accepter les cookies" name="cookies_enabled"/>
diff --git a/indra/newview/skins/default/xui/fr/panel_region_experiences.xml b/indra/newview/skins/default/xui/fr/panel_region_experiences.xml
new file mode 100644
index 0000000000..be9c99b009
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_region_experiences.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Expériences" name="Experiences">
+ <panel.string name="trusted_estate_text">
+ Toute expérience peut être une expérience avec clé.
+
+Les expériences avec clé peuvent s&apos;exécuter dans ce domaine.
+
+En outre, si le domaine n&apos;autorise pas l&apos;accès public, les résidents participant à une expérience avec clé peuvent pénétrer dans ce domaine et y rester tant qu&apos;ils participent à ladite expérience.
+ </panel.string>
+ <panel.string name="allowed_estate_text">
+ Seules les expériences à l&apos;échelle des terrains peuvent être autorisées.
+
+Les expériences autorisées peuvent s&apos;exécuter dans ce domaine.
+ </panel.string>
+ <panel.string name="blocked_estate_text">
+ Seules les expériences à l&apos;échelle de la grille peuvent être bloquées.
+
+Les expériences bloquées ne peuvent pas s&apos;exécuter dans ce domaine.
+ </panel.string>
+ <panel.string name="estate_caption">
+ Les modifications des paramètres de cet onglet affecteront toutes les régions du domaine.
+ </panel.string>
+ <panel.string name="allowed_parcel_text">
+ Seules les expériences à l&apos;échelle des terrains peuvent être autorisées.
+
+Les expériences autorisées peuvent s&apos;exécuter sur cette parcelle si elles ne sont pas bloquées par le domaine.
+ </panel.string>
+ <panel.string name="blocked_parcel_text">
+ Toute expérience de résident peut être bloquée.
+
+Les expériences bloquées ne peuvent pas s&apos;exécuter dans cette parcelle.
+ </panel.string>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_script_experience.xml b/indra/newview/skins/default/xui/fr/panel_script_experience.xml
new file mode 100644
index 0000000000..dde84ed845
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_script_experience.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<panel name="script_experience" title="EXPÉRIENCE">
+ <button label="Expérience" name="Expand Experience"/>
+ <check_box label="Utilise la ou les expériences :" name="enable_xp"/>
+ <layout_stack name="xp_details">
+ <layout_panel>
+ <combo_box label="Choisir une expérience..." name="Experiences..."/>
+ </layout_panel>
+ </layout_stack>
+ <text name="No Experiences">
+ Vous ne contribuez à aucune expérience.
+ </text>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/fr/panel_snapshot_inventory.xml
index 472c4a5e8f..a560ff8d5e 100755
--- a/indra/newview/skins/default/xui/fr/panel_snapshot_inventory.xml
+++ b/indra/newview/skins/default/xui/fr/panel_snapshot_inventory.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="panel_snapshot_inventory">
<text name="title">
- Enregistrer dans l&apos;inventaire
+ Inventaire
</text>
<text name="hint_lbl">
L&apos;enregistrement d&apos;une image dans l&apos;inventaire coûte [UPLOAD_COST] L$. Pour enregistrer votre image sous forme de texture, sélectionnez un format carré.
@@ -13,8 +13,8 @@
<combo_box.item label="Grande (512 x 512)" name="Large(512x512)"/>
<combo_box.item label="Personnalisée" name="Custom"/>
</combo_box>
- <spinner label="Largeur" name="inventory_snapshot_width"/>
- <spinner label="Hauteur" name="inventory_snapshot_height"/>
+ <spinner label="Largeur x Hauteur" name="inventory_snapshot_width"/>
+ <spinner label="" name="inventory_snapshot_height"/>
<check_box label="Conserver les proportions" name="inventory_keep_aspect_check"/>
<button label="Annuler" name="cancel_btn"/>
<button label="Enregistrer" name="save_btn"/>
diff --git a/indra/newview/skins/default/xui/fr/panel_snapshot_local.xml b/indra/newview/skins/default/xui/fr/panel_snapshot_local.xml
index 97dc3e7e2b..8d361f0605 100755
--- a/indra/newview/skins/default/xui/fr/panel_snapshot_local.xml
+++ b/indra/newview/skins/default/xui/fr/panel_snapshot_local.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="panel_snapshot_local">
<text name="title">
- Enregistrer sur l&apos;ordinateur
+ Disque
</text>
<combo_box label="Résolution" name="local_size_combo">
<combo_box.item label="Fenêtre actuelle" name="CurrentWindow"/>
@@ -13,24 +13,17 @@
<combo_box.item label="1 600 x 1 200" name="1600x1200"/>
<combo_box.item label="Personnalisée" name="Custom"/>
</combo_box>
- <layout_stack name="local_image_params_ls">
- <layout_panel name="local_image_size_lp">
- <spinner label="Largeur" name="local_snapshot_width"/>
- <spinner label="Hauteur" name="local_snapshot_height"/>
- <check_box label="Conserver les proportions" name="local_keep_aspect_check"/>
- </layout_panel>
- <layout_panel name="local_image_format_quality_lp">
- <combo_box label="Format" name="local_format_combo">
- <combo_box.item label="PNG (sans perte)" name="PNG"/>
- <combo_box.item label="JPEG" name="JPEG"/>
- <combo_box.item label="BMP (sans perte)" name="BMP"/>
- </combo_box>
- <slider label="Qualité image" name="image_quality_slider"/>
- <text name="image_quality_level">
- ([QLVL])
- </text>
- </layout_panel>
- </layout_stack>
+ <spinner label="Largeur x Hauteur" name="local_snapshot_width"/>
+ <check_box label="Conserver les proportions" name="local_keep_aspect_check"/>
+ <text name="local_format_label">
+ Format :
+ </text>
+ <combo_box label="Format" name="local_format_combo">
+ <combo_box.item label="PNG (sans perte)" name="PNG"/>
+ <combo_box.item label="JPEG" name="JPEG"/>
+ <combo_box.item label="BMP (sans perte)" name="BMP"/>
+ </combo_box>
+ <slider label="Qualité :" name="image_quality_slider"/>
<button label="Annuler" name="cancel_btn"/>
<flyout_button label="Enregistrer" name="save_btn" tool_tip="Enregistrer l&apos;image dans un fichier.">
<flyout_button.item label="Enregistrer" name="save_item"/>
diff --git a/indra/newview/skins/default/xui/fr/panel_snapshot_options.xml b/indra/newview/skins/default/xui/fr/panel_snapshot_options.xml
index bb858d5d23..eb724f4bd1 100755
--- a/indra/newview/skins/default/xui/fr/panel_snapshot_options.xml
+++ b/indra/newview/skins/default/xui/fr/panel_snapshot_options.xml
@@ -1,16 +1,10 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="panel_snapshot_options">
- <button label="Publier sur le flux de mon profil" name="save_to_profile_btn"/>
- <button label="Envoyer par e-mail" name="save_to_email_btn"/>
+ <button label="Enreg. sur le disque" name="save_to_computer_btn"/>
<button label="Enreg. dans l&apos;inventaire ([AMOUNT] L$)" name="save_to_inventory_btn"/>
- <button label="Enreg. sur l&apos;ordinateur" name="save_to_computer_btn"/>
- <text name="send_to_facebook_textbox">
- Envoyer à : [secondlife:/// Facebook]
- </text>
- <text name="send_to_twitter_textbox">
- [secondlife:/// Twitter]
- </text>
- <text name="send_to_flickr_textbox">
- [secondlife:/// Flickr]
- </text>
+ <button label="Charger dans le profil" name="save_to_profile_btn"/>
+ <button label="Charger sur Facebook" name="send_to_facebook_btn"/>
+ <button label="Charger sur Twitter" name="send_to_twitter_btn"/>
+ <button label="Charger sur Flickr" name="send_to_flickr_btn"/>
+ <button label="Envoyer par e-mail" name="save_to_email_btn"/>
</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/fr/panel_snapshot_postcard.xml
index 82a4815144..067fa091d8 100755
--- a/indra/newview/skins/default/xui/fr/panel_snapshot_postcard.xml
+++ b/indra/newview/skins/default/xui/fr/panel_snapshot_postcard.xml
@@ -12,6 +12,10 @@
<text name="title">
E-mail
</text>
- <button label="Message" name="message_btn"/>
- <button label="Paramètres" name="settings_btn"/>
+ <tab_container name="postcard_tabs">
+ <panel label="Message" name="panel_postcard_message"/>
+ <panel label="Paramètres" name="panel_postcard_settings"/>
+ </tab_container>
+ <button label="Annuler" name="cancel_btn"/>
+ <button label="Envoyer" name="send_btn"/>
</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_snapshot_profile.xml b/indra/newview/skins/default/xui/fr/panel_snapshot_profile.xml
index 427ffe2113..b87d62bedd 100755
--- a/indra/newview/skins/default/xui/fr/panel_snapshot_profile.xml
+++ b/indra/newview/skins/default/xui/fr/panel_snapshot_profile.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="panel_snapshot_profile">
<text name="title">
- Publier sur le flux de mon profil
+ Profil
</text>
<combo_box label="Résolution" name="profile_size_combo">
<combo_box.item label="Fenêtre actuelle" name="CurrentWindow"/>
@@ -10,19 +10,12 @@
<combo_box.item label="1 024 x 768" name="1024x768"/>
<combo_box.item label="Personnalisée" name="Custom"/>
</combo_box>
- <layout_stack name="profile_image_params_ls">
- <layout_panel name="profile_image_size_lp">
- <spinner label="Largeur" name="profile_snapshot_width"/>
- <spinner label="Hauteur" name="profile_snapshot_height"/>
- <check_box label="Conserver les proportions" name="profile_keep_aspect_check"/>
- </layout_panel>
- <layout_panel name="profile_image_metadata_lp">
- <text name="caption_label">
- Légende :
- </text>
- <check_box initial_value="true" label="Inclure l&apos;endroit" name="add_location_cb"/>
- </layout_panel>
- </layout_stack>
+ <spinner label="Largeur x Hauteur" name="profile_snapshot_width"/>
+ <check_box label="Conserver les proportions" name="profile_keep_aspect_check"/>
+ <text name="caption_label">
+ Légende :
+ </text>
+ <check_box initial_value="true" label="Inclure l&apos;endroit" name="add_location_cb"/>
<button label="Annuler" name="cancel_btn"/>
<button label="Publier" name="post_btn"/>
</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_status_bar.xml b/indra/newview/skins/default/xui/fr/panel_status_bar.xml
index ba36a7d299..e2f05a525e 100755
--- a/indra/newview/skins/default/xui/fr/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/fr/panel_status_bar.xml
@@ -1,28 +1,16 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="status">
- <panel.string name="packet_loss_tooltip">
- Perte de paquets
- </panel.string>
- <panel.string name="bandwidth_tooltip">
- Bande passante
- </panel.string>
- <panel.string name="time">
- [hour12, datetime, slt]:[min, datetime, slt] [ampm, datetime, slt] [timezone,datetime, slt]
- </panel.string>
- <panel.string name="timeTooltip">
- [weekday, datetime, slt] [sday, datetime, slt] [month, datetime, slt] [year, datetime, slt]
- </panel.string>
- <panel.string name="buycurrencylabel">
- [AMT] L$
- </panel.string>
+ <panel.string name="packet_loss_tooltip">Perte de paquets</panel.string>
+ <panel.string name="bandwidth_tooltip">Bande passante</panel.string>
+ <panel.string name="time">[hour12, datetime, slt]:[min, datetime, slt] [ampm, datetime, slt] [timezone,datetime, slt]</panel.string>
+ <panel.string name="timeTooltip">[weekday, datetime, slt] [sday, datetime, slt] [month, datetime, slt] [year, datetime, slt]</panel.string>
+ <panel.string name="buycurrencylabel">[AMT] L$</panel.string>
<panel left="-405" name="balance_bg" width="195">
- <text name="balance" tool_tip="Cliquer sur ce bouton pour actualiser votre solde en L$." value="20 L$"/>
+ <text name="balance" tool_tip="Cliquer sur ce bouton pour actualiser votre solde en L$." value="L$ ??"/>
<button label="Acheter L$" name="buyL" tool_tip="Cliquer pour acheter plus de L$."/>
<button label="Achats" name="goShop" tool_tip="Ouvrir la Place du marché Second Life." width="75"/>
</panel>
- <text name="TimeText" tool_tip="Heure actuelle (Pacifique)">
- 00h00 PST
- </text>
+ <text name="TimeText" tool_tip="Heure actuelle (Pacifique)">00h00 PST</text>
<button name="media_toggle_btn" tool_tip="Arrêter tous les médias (musique, vidéo, pages web)."/>
<button name="volume_btn" tool_tip="Régler le volume global."/>
</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_twitter_photo.xml b/indra/newview/skins/default/xui/fr/panel_twitter_photo.xml
index 2d3888f4c2..3e23e5d577 100644
--- a/indra/newview/skins/default/xui/fr/panel_twitter_photo.xml
+++ b/indra/newview/skins/default/xui/fr/panel_twitter_photo.xml
@@ -1,32 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<panel name="panel_twitter_photo">
- <layout_stack name="stack_photo">
- <layout_panel name="text_panel">
- <text name="status_label">
- Que se passe-t-il ?
- </text>
- <text name="status_counter_label">
- 140
- </text>
- <check_box initial_value="true" label="Inclure l&apos;emplacement SL" name="add_location_cb"/>
- <check_box initial_value="true" label="Inclure une photo" name="add_photo_cb"/>
- </layout_panel>
- <layout_panel name="snapshot_panel">
- <combo_box name="resolution_combobox" tool_tip="Résolution d’image">
- <combo_box.item label="Fenêtre actuelle" name="CurrentWindow"/>
- <combo_box.item label="640 x 480" name="640x480"/>
- <combo_box.item label="800 x 600" name="800x600"/>
- <combo_box.item label="1 024 x 768" name="1024x768"/>
- </combo_box>
- <combo_box name="filters_combobox" tool_tip="Filtres d&apos;image">
- <combo_box.item label="Aucun filtre" name="NoFilter"/>
- </combo_box>
- <button label="Actualiser" name="new_snapshot_btn" tool_tip="Cliquer pour actualiser"/>
- <button label="Aperçu" name="big_preview_btn" tool_tip="Cliquer pour activer/désactiver l&apos;aperçu"/>
- </layout_panel>
- <layout_panel name="photo_button_panel">
- <button label="Envoyer tweet" name="post_photo_btn"/>
- <button label="Annuler" name="cancel_photo_btn"/>
- </layout_panel>
- </layout_stack>
+ <text name="status_label">
+ Que se passe-t-il ?
+ </text>
+ <text name="status_counter_label">
+ 140
+ </text>
+ <check_box initial_value="true" label="Inclure l&apos;emplacement SL" name="add_location_cb"/>
+ <check_box initial_value="true" label="Inclure une photo" name="add_photo_cb"/>
+ <combo_box name="resolution_combobox" tool_tip="Résolution d’image">
+ <combo_box.item label="Fenêtre actuelle" name="CurrentWindow"/>
+ <combo_box.item label="640 x 480" name="640x480"/>
+ <combo_box.item label="800 x 600" name="800x600"/>
+ <combo_box.item label="1 024 x 768" name="1024x768"/>
+ </combo_box>
+ <combo_box name="filters_combobox" tool_tip="Filtres d&apos;image">
+ <combo_box.item label="Aucun filtre" name="NoFilter"/>
+ </combo_box>
+ <button label="Actualiser" name="new_snapshot_btn" tool_tip="Cliquer pour actualiser"/>
+ <button label="Aperçu" name="big_preview_btn" tool_tip="Cliquer pour activer/désactiver l&apos;aperçu"/>
+ <button label="Envoyer tweet" name="post_photo_btn"/>
+ <button label="Annuler" name="cancel_photo_btn"/>
</panel>
diff --git a/indra/newview/skins/default/xui/fr/role_actions.xml b/indra/newview/skins/default/xui/fr/role_actions.xml
index 25920da4c3..966e3440e5 100755
--- a/indra/newview/skins/default/xui/fr/role_actions.xml
+++ b/indra/newview/skins/default/xui/fr/role_actions.xml
@@ -71,4 +71,8 @@
<action description="Participer au chat vocal" longdescription="Participez au chat vocal du groupe. Remarque : vous devez au préalable avoir le pouvoir de participer aux chats." name="join voice chat" value="27"/>
<action description="Modérer les chats" longdescription="Contrôlez l&apos;accès et la participation aux chats de groupe écrits et vocaux." name="moderate group chat" value="37"/>
</action_set>
+ <action_set description="Ces pouvoirs incluent la possibilité de modifier les expériences appartenant à ce groupe." name="experience_tools_experience">
+ <action description="Administrateur des expériences" longdescription="Les membres dotés d&apos;un rôle avec ce pouvoir peuvent modifier les métadonnées pour cette expérience." name="experience admin" value="49"/>
+ <action description="Contributeur aux expériences" longdescription="Les membres dotés d&apos;un rôle avec ce pouvoir peuvent contribuer des scripts pour une expérience." name="experience contributor" value="50"/>
+ </action_set>
</role_actions>
diff --git a/indra/newview/skins/default/xui/fr/sidepanel_item_info.xml b/indra/newview/skins/default/xui/fr/sidepanel_item_info.xml
index e7fc7859c9..ede5ec08af 100755
--- a/indra/newview/skins/default/xui/fr/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/fr/sidepanel_item_info.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="item properties" title="Profil de l&apos;article">
+ <panel.string name="loading_experience">
+ (chargement)
+ </panel.string>
<panel.string name="unknown">
(inconnu)
</panel.string>
@@ -43,6 +46,9 @@
<text name="LabelAcquiredTitle">
Acquis le :
</text>
+ <text name="LabelItemExperienceTitle">
+ Expérience :
+ </text>
<panel name="perms_inv">
<text name="perm_modify">
Vous pouvez :
@@ -66,8 +72,9 @@
<check_box label="Transférer" name="CheckNextOwnerTransfer" tool_tip="Le prochain propriétaire peut donner ou revendre cet objet."/>
</panel>
<check_box label="À vendre" name="CheckPurchase"/>
- <combo_box name="combobox sale copy">
+ <combo_box name="ComboBoxSaleType">
<combo_box.item label="Copier" name="Copy"/>
+ <combo_box.item label="Contenu" name="Contents"/>
<combo_box.item label="Original" name="Original"/>
</combo_box>
<spinner label="Prix : L$" name="Edit Cost"/>
diff --git a/indra/newview/skins/default/xui/fr/sidepanel_task_info.xml b/indra/newview/skins/default/xui/fr/sidepanel_task_info.xml
index 896dd932e3..f6b4f28046 100755
--- a/indra/newview/skins/default/xui/fr/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/fr/sidepanel_task_info.xml
@@ -1,71 +1,31 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="object properties" title="Profil de l&apos;objet">
- <panel.string name="text deed continued">
- Céder
- </panel.string>
- <panel.string name="text deed">
- Céder
- </panel.string>
- <panel.string name="text modify info 1">
- Vous pouvez modifier cet objet
- </panel.string>
- <panel.string name="text modify info 2">
- Vous pouvez modifier ces objets
- </panel.string>
- <panel.string name="text modify info 3">
- Vous ne pouvez pas modifier cet objet
- </panel.string>
- <panel.string name="text modify info 4">
- Vous ne pouvez pas modifier ces objets
- </panel.string>
- <panel.string name="text modify info 5">
- Impossible de modifier cet objet au-delà de la frontière d&apos;une région
- </panel.string>
- <panel.string name="text modify info 6">
- Impossible de modifier ces objets au-delà de la frontière d&apos;une région
- </panel.string>
- <panel.string name="text modify warning">
- Cet objet comprend des parties liées
- </panel.string>
- <panel.string name="Cost Default">
- Prix : L$
- </panel.string>
- <panel.string name="Cost Total">
- Prix total : L$
- </panel.string>
- <panel.string name="Cost Per Unit">
- Prix par : L$
- </panel.string>
- <panel.string name="Cost Mixed">
- Prix mixte
- </panel.string>
- <panel.string name="Sale Mixed">
- Vente mixte
- </panel.string>
+ <panel.string name="text deed continued">Céder</panel.string>
+ <panel.string name="text deed">Céder</panel.string>
+ <panel.string name="text modify info 1">Vous pouvez modifier cet objet</panel.string>
+ <panel.string name="text modify info 2">Vous pouvez modifier ces objets</panel.string>
+ <panel.string name="text modify info 3">Vous ne pouvez pas modifier cet objet</panel.string>
+ <panel.string name="text modify info 4">Vous ne pouvez pas modifier ces objets</panel.string>
+ <panel.string name="text modify info 5">Impossible de modifier cet objet au-delà de la frontière d&apos;une région</panel.string>
+ <panel.string name="text modify info 6">Impossible de modifier ces objets au-delà de la frontière d&apos;une région</panel.string>
+ <panel.string name="text modify warning">Cet objet comprend des parties liées</panel.string>
+ <panel.string name="Cost Default">Prix : L$</panel.string>
+ <panel.string name="Cost Total">Prix total : L$</panel.string>
+ <panel.string name="Cost Per Unit">Prix par : L$</panel.string>
+ <panel.string name="Cost Mixed">Prix mixte</panel.string>
+ <panel.string name="Sale Mixed">Vente mixte</panel.string>
<text name="title" value="Profil de l&apos;objet"/>
<text name="where" value="(dans Second Life)"/>
<panel label="" name="properties_panel">
- <text name="Name:">
- Nom :
- </text>
- <text name="Description:">
- Description :
- </text>
- <text name="CreatorNameLabel">
- Créateur :
- </text>
- <text name="Owner:">
- Propriétaire :
- </text>
- <text name="Group_label">
- Groupe :
- </text>
+ <text name="Name:">Nom :</text>
+ <text name="Description:">Description :</text>
+ <text name="CreatorNameLabel">Créateur :</text>
+ <text name="Owner:">Propriétaire :</text>
+ <text name="Group_label">Groupe :</text>
<button name="button set group" tool_tip="Choisir un groupe pour partager les droits relatifs à cet objet"/>
<name_box initial_value="Chargement…" name="Group Name Proxy"/>
<button label="Céder" label_selected="Céder" name="button deed" tool_tip="En cédant un objet, vous donnez aussi les droits au prochain propriétaire. Seul un officier peut céder les objets partagés d&apos;un groupe."/>
- <text name="label click action">
- Cliquer pour :
- </text>
+ <text name="label click action">Cliquer pour :</text>
<combo_box name="clickaction">
<combo_box.item label="Toucher (défaut)" name="Touch/grab(default)"/>
<combo_box.item label="S&apos;asseoir sur l&apos;objet" name="Sitonobject"/>
@@ -75,21 +35,13 @@
<combo_box.item label="Zoom" name="Zoom"/>
</combo_box>
<panel name="perms_inv">
- <text name="perm_modify">
- Vous pouvez modifier cet objet
- </text>
- <text name="Anyone can:">
- N&apos;importe qui :
- </text>
+ <text name="perm_modify">Vous pouvez modifier cet objet</text>
+ <text name="Anyone can:">N&apos;importe qui :</text>
<check_box label="Copier" name="checkbox allow everyone copy"/>
<check_box label="Bouger" name="checkbox allow everyone move"/>
- <text name="GroupLabel">
- Groupe :
- </text>
+ <text name="GroupLabel">Groupe :</text>
<check_box label="Partager" name="checkbox share with group" tool_tip="Autoriser tous les membres du groupe choisi à partager vos droits de modification pour cet objet. Pour activer les restrictions de rôles, vous devez d&apos;abord cliquer sur Céder."/>
- <text name="NextOwnerLabel">
- Le prochain propriétaire :
- </text>
+ <text name="NextOwnerLabel">Le prochain propriétaire :</text>
<check_box label="Modifier" name="checkbox next owner can modify"/>
<check_box label="Copier" name="checkbox next owner can copy"/>
<check_box label="Transférer" name="checkbox next owner can transfer" tool_tip="Le prochain propriétaire peut donner ou revendre cet objet"/>
@@ -102,27 +54,13 @@
</combo_box>
<spinner label="Prix : L$" name="Edit Cost"/>
<check_box label="Afficher avec la recherche" name="search_check" tool_tip="Permettre aux autres résidents de voir cet objet dans les résultats de recherche"/>
- <text name="pathfinding_attributes_label">
- Attributs de recherche de chemin :
- </text>
- <text name="B:">
- B :
- </text>
- <text name="O:">
- O :
- </text>
- <text name="G:">
- G :
- </text>
- <text name="E:">
- E :
- </text>
- <text name="N:">
- N :
- </text>
- <text name="F:">
- F :
- </text>
+ <text name="pathfinding_attributes_label">Attributs de recherche de chemin :</text>
+ <text name="B:">B :</text>
+ <text name="O:">O :</text>
+ <text name="G:">G :</text>
+ <text name="E:">E :</text>
+ <text name="N:">N :</text>
+ <text name="F:">F :</text>
</panel>
<panel name="button_panel">
<button label="Ouvrir" name="open_btn"/>
diff --git a/indra/newview/skins/default/xui/fr/strings.xml b/indra/newview/skins/default/xui/fr/strings.xml
index b3ce171633..e462b805e3 100755
--- a/indra/newview/skins/default/xui/fr/strings.xml
+++ b/indra/newview/skins/default/xui/fr/strings.xml
@@ -449,30 +449,51 @@ Veuillez réessayer de vous connecter dans une minute.
<string name="TooltipMustSingleDrop">
Impossible de faire glisser plus d&apos;un objet ici
</string>
+ <string name="TooltipTooManyWearables">
+ Vous ne pouvez pas porter un dossier contenant plus de [AMOUNT] articles. Vous pouvez modifier cette limite dans Avancé &gt; Afficher les paramètres de débogage &gt; WearFolderLimit.
+ </string>
<string name="TooltipPrice" value="[AMOUNT] L$ :"/>
<string name="TooltipOutboxDragToWorld">
- Impossible de rezzer des articles dans la boîte d&apos;envoi vendeur
+ Vous ne pouvez pas rezzer (charger) des articles du dossier Annonces de la Place de marché
+ </string>
+ <string name="TooltipOutboxWorn">
+ Vous ne pouvez pas mettre d&apos;articles que vous portez dans le dossier Annonces de la Place du marché
+ </string>
+ <string name="TooltipOutboxFolderLevels">
+ Le niveau de dossiers imbriqués dépasse [AMOUNT]. Diminuez le nombre de niveaux de dossiers imbriqués dans d&apos;autres dossiers. Si nécessaire, placez certains articles dans une boîte.
+ </string>
+ <string name="TooltipOutboxTooManyFolders">
+ Le nombre de sous-dossiers dépasse [AMOUNT]. Diminuez le nombre de sous-dossiers dans votre annonce. Si nécessaire, placez certains articles dans une boîte.
+ </string>
+ <string name="TooltipOutboxTooManyObjects">
+ Le nombre d&apos;articles dépasse [AMOUNT]. Pour pouvoir vendre plus de [AMOUNT] articles au sein d&apos;une même annonce, vous devez placer certains de ces articles dans une boîte.
+ </string>
+ <string name="TooltipOutboxTooManyStockItems">
+ Le nombre d&apos;articles de stock dépasse [AMOUNT].
+ </string>
+ <string name="TooltipOutboxCannotDropOnRoot">
+ Vous ne pouvez déposer des articles ou des dossiers que dans l&apos;onglet TOUT. Veuillez activer cet onglet et déplacer à nouveau article(s) et dossier(s).
</string>
<string name="TooltipOutboxNoTransfer">
- Impossible de vendre ou de transférer un ou plusieurs de ces objets.
+ Impossible de vendre ou de transférer un ou plusieurs de ces objets
</string>
<string name="TooltipOutboxNotInInventory">
- La boîte d&apos;envoi vendeur n&apos;accepte que les articles directement issus de votre inventaire.
+ Vous ne pouvez mettre sur la Place du marché que des articles de votre inventaire
</string>
- <string name="TooltipOutboxWorn">
- Impossible de placer des articles que vous portez dans votre boîte d&apos;envoi vendeur
+ <string name="TooltipOutboxLinked">
+ Vous ne pouvez pas mettre des articles ou dossiers liés sur la Place du marché
</string>
<string name="TooltipOutboxCallingCard">
- Impossible de placer des cartes de visite dans votre boîte d&apos;envoi vendeur
+ Vous ne pouvez pas mettre des cartes de visite sur la Place du marché
</string>
- <string name="TooltipOutboxFolderLevels">
- Il existe plus de 3 niveaux de dossiers imbriqués.
+ <string name="TooltipOutboxDragActive">
+ vous ne pouvez pas déplacer une annonce publiée
</string>
- <string name="TooltipOutboxTooManyFolders">
- Le dossier de niveau supérieur contient plus de 20 sous-dossiers.
+ <string name="TooltipOutboxCannotMoveRoot">
+ Vous ne pouvez pas déplacer le dossier racine des annonces de la Place du marché
</string>
- <string name="TooltipOutboxTooManyObjects">
- Le dossier de niveau supérieur contient plus de 200 articles.
+ <string name="TooltipOutboxMixedStock">
+ tous les articles d&apos;un dossier de stock doivent avoir le même type et droit
</string>
<string name="TooltipDragOntoOwnChild">
Impossible de déplacer un dossier vers son enfant
@@ -1060,9 +1081,7 @@ Veuillez réessayer de vous connecter dans une minute.
<string name="AgentNameSubst">
(Vous)
</string>
- <string name="JoinAnExperience">
- Rejoindre une expérience
- </string>
+ <string name="JoinAnExperience"/><!-- intentionally blank -->
<string name="SilentlyManageEstateAccess">
Supprimer les alertes lors de la gestion des listes d&apos;accès aux domaines
</string>
@@ -1129,6 +1148,12 @@ Veuillez réessayer de vous connecter dans une minute.
<string name="bitmap_image_files">
Images Bitmap
</string>
+ <string name="png_image_files">
+ Images PNG
+ </string>
+ <string name="save_texture_image_files">
+ Images Targa ou PNG
+ </string>
<string name="avi_movie_file">
Fichier de film AVI
</string>
@@ -1378,6 +1403,9 @@ Veuillez réessayer de vous connecter dans une minute.
<string name="FavoritesNoMatchingItems">
Faites glisser un repère ici pour l&apos;ajouter à vos Favoris.
</string>
+ <string name="MarketplaceNoMatchingItems">
+ Aucun article trouvé. Vérifiez l&apos;orthographe de votre chaîne de recherche et réessayez.
+ </string>
<string name="InventoryNoTexture">
Vous n&apos;avez pas de copie de cette texture dans votre inventaire
</string>
@@ -1425,29 +1453,95 @@ Veuillez réessayer de vous connecter dans une minute.
<string name="InventoryOutboxError">
La [[MARKETPLACE_CREATE_STORE_URL] boutique de la Place du marché] renvoie des erreurs.
</string>
+ <string name="InventoryMarketplaceError">
+ Cette fonctionnalité est en version bêta. Veuillez ajouter votre nom à ce [http://goo.gl/forms/FCQ7UXkakz formulaire Google] si vous souhaitez participer.
+ </string>
+ <string name="InventoryMarketplaceListingsNoItemsTitle">
+ Votre dossier Annonces de la Place du marché est vide.
+ </string>
+ <string name="InventoryMarketplaceListingsNoItems">
+ Pour mettre des dossiers en vente sur la [[MARKETPLACE_DASHBOARD_URL] Place du marché], faites-les glisser vers cette zone.
+ </string>
+ <string name="Marketplace Validation Warning Stock">
+ le dossier de stock doit être contenu dans un dossier de version
+ </string>
+ <string name="Marketplace Validation Error Mixed Stock">
+ : Erreur : tous les articles d&apos;un dossier de stock doivent être non reproductibles et de même type
+ </string>
+ <string name="Marketplace Validation Error Subfolder In Stock">
+ : Erreur : un dossier de stock ne peut pas contenir de sous-dossiers
+ </string>
+ <string name="Marketplace Validation Warning Empty">
+ : Avertissement : le dossier ne contient aucun article
+ </string>
+ <string name="Marketplace Validation Warning Create Stock">
+ : Avertissement : création du dossier de stock
+ </string>
+ <string name="Marketplace Validation Warning Create Version">
+ : Avertissement : création du dossier de version
+ </string>
+ <string name="Marketplace Validation Warning Move">
+ : Avertissement : déplacement d&apos;articles
+ </string>
+ <string name="Marketplace Validation Warning Delete">
+ : Avertissement : contenu du dossier transféré vers le dossier de stock, suppression du dossier vide
+ </string>
+ <string name="Marketplace Validation Error Stock Item">
+ : Erreur : les articles non reproductibles doivent être contenus dans un dossier de stock
+ </string>
+ <string name="Marketplace Validation Warning Unwrapped Item">
+ : Avertissement : les articles doivent être contenus dans un dossier de version
+ </string>
+ <string name="Marketplace Validation Error">
+ : Erreur :
+ </string>
+ <string name="Marketplace Validation Warning">
+ : Avertissement :
+ </string>
+ <string name="Marketplace Validation Error Empty Version">
+ : Avertissement : le dossier de version doit contenir au moins 1 article
+ </string>
+ <string name="Marketplace Validation Error Empty Stock">
+ : Avertissement : le dossier de stock doit contenir au moins 1 article
+ </string>
+ <string name="Marketplace Validation No Error">
+ Pas d&apos;erreur ni d&apos;avertissement à signaler
+ </string>
<string name="Marketplace Error None">
Aucune erreur
</string>
+ <string name="Marketplace Error Prefix">
+ Erreur :
+ </string>
<string name="Marketplace Error Not Merchant">
- Erreur : avant d&apos;envoyer des articles vers la Place du marché, vous devez vous configurer comme vendeur (gratuit).
+ Avant d&apos;envoyer des articles vers la Place du marché, vous devez vous configurer comme vendeur (gratuit).
</string>
- <string name="Marketplace Error Empty Folder">
- Erreur : ce dossier est vide.
+ <string name="Marketplace Error Not Accepted">
+ Impossible de déplacer l&apos;article dans ce dossier.
</string>
- <string name="Marketplace Error Unassociated Products">
- Erreur : le chargement de cet article a échoué en raison d&apos;un nombre trop important d&apos;articles non associés à des produits au niveau de votre compte de vendeur. Pour résoudre ce problème, connectez-vous au site Web de la Place du marché et réduisez le nombre d&apos;articles non associés.
+ <string name="Marketplace Error Unsellable Item">
+ Cet article ne peut pas être vendu sur la Place du marché.
</string>
- <string name="Marketplace Error Object Limit">
- Erreur : cet article contient trop d&apos;objets. Pour résoudre le problème, regroupez des objets dans des paquets afin de réduire le nombre total à moins de 200.
+ <string name="MarketplaceNoID">
+ no Mkt ID
</string>
- <string name="Marketplace Error Folder Depth">
- Erreur : trop de niveaux de dossiers imbriqués concernant cet article. Réorganisez le tout afin qu&apos;un maximum de 3 niveaux soit utilisé.
+ <string name="MarketplaceLive">
+ publié
</string>
- <string name="Marketplace Error Unsellable Item">
- Erreur : cet article ne peut pas être vendu sur la Place du marché.
+ <string name="MarketplaceActive">
+ actif
</string>
- <string name="Marketplace Error Internal Import">
- Erreur : un problème est survenu concernant cet article. Veuillez réessayer ultérieurement.
+ <string name="MarketplaceMax">
+ max.
+ </string>
+ <string name="MarketplaceStock">
+ stock
+ </string>
+ <string name="MarketplaceNoStock">
+ rupture de stock
+ </string>
+ <string name="MarketplaceUpdating">
+ mise à jour...
</string>
<string name="Open landmarks">
Ouvrir les repères
@@ -1468,6 +1562,7 @@ Veuillez réessayer de vous connecter dans une minute.
Aucun contenu
</string>
<string name="WornOnAttachmentPoint" value=" (porté sur [ATTACHMENT_POINT])"/>
+ <string name="AttachmentErrorMessage" value="([ATTACHMENT_ERROR])"/>
<string name="ActiveGesture" value="[GESLABEL] (actif)"/>
<string name="PermYes">
Oui
@@ -1738,6 +1833,15 @@ Veuillez réessayer de vous connecter dans une minute.
<string name="Invalid Attachment">
Point d&apos;attache non valide
</string>
+ <string name="ATTACHMENT_MISSING_ITEM">
+ Erreur : article manquant
+ </string>
+ <string name="ATTACHMENT_MISSING_BASE_ITEM">
+ Erreur : article de base manquant
+ </string>
+ <string name="ATTACHMENT_NOT_ATTACHED">
+ Erreur : l&apos;objet est dans une tenue actuelle, mais il n&apos;est pas attaché
+ </string>
<string name="YearsMonthsOld">
[AGEYEARS] [AGEMONTHS]
</string>
@@ -1906,6 +2010,9 @@ Veuillez réessayer de vous connecter dans une minute.
<string name="SaveComplete">
Enregistrement terminé.
</string>
+ <string name="UploadFailed">
+ Échec du chargement de fichier :
+ </string>
<string name="ObjectOutOfRange">
Script (objet hors de portée)
</string>
@@ -1915,6 +2022,9 @@ Veuillez réessayer de vous connecter dans une minute.
<string name="GroupsNone">
aucun
</string>
+ <string name="CompileNoExperiencePerm">
+ En train d&apos;ignorer le script [SCRIPT] avec l&apos;expérience [EXPERIENCE].
+ </string>
<string name="Group" value=" (groupe)"/>
<string name="Unknown">
(Inconnu)
@@ -5066,6 +5176,9 @@ Essayez avec le chemin d&apos;accès à l&apos;éditeur entre guillemets doubles
<string name="Command_Marketplace_Label">
Place du marché
</string>
+ <string name="Command_MarketplaceListings_Label">
+ Place du marché
+ </string>
<string name="Command_MiniMap_Label">
Mini-carte
</string>
@@ -5153,6 +5266,9 @@ Essayez avec le chemin d&apos;accès à l&apos;éditeur entre guillemets doubles
<string name="Command_Marketplace_Tooltip">
Faire du shopping
</string>
+ <string name="Command_MarketplaceListings_Tooltip">
+ Vendez votre création
+ </string>
<string name="Command_MiniMap_Tooltip">
Afficher les personnes près de vous
</string>
@@ -5276,4 +5392,85 @@ Essayez avec le chemin d&apos;accès à l&apos;éditeur entre guillemets doubles
<string name="loading_chat_logs">
Chargement...
</string>
+ <string name="experience_tools_experience">
+ Expérience
+ </string>
+ <string name="ExperienceNameNull">
+ (aucune expérience)
+ </string>
+ <string name="ExperienceNameUntitled">
+ (expérience sans titre)
+ </string>
+ <string name="Land-Scope">
+ À l&apos;échelle des terrains
+ </string>
+ <string name="Grid-Scope">
+ À l&apos;échelle de la grille
+ </string>
+ <string name="Allowed_Experiences_Tab">
+ AUTORISÉE
+ </string>
+ <string name="Blocked_Experiences_Tab">
+ BLOQUÉE
+ </string>
+ <string name="Contrib_Experiences_Tab">
+ CONTRIBUTEUR
+ </string>
+ <string name="Admin_Experiences_Tab">
+ ADMIN
+ </string>
+ <string name="Recent_Experiences_Tab">
+ RÉCENTE
+ </string>
+ <string name="Owned_Experiences_Tab">
+ AVEC PROPRIÉTAIRE
+ </string>
+ <string name="ExperiencesCounter">
+ ([EXPERIENCES], [MAXEXPERIENCES] max.)
+ </string>
+ <string name="ExperiencePermission1">
+ assumer vos contrôles
+ </string>
+ <string name="ExperiencePermission3">
+ déclencher des animations pour votre avatar
+ </string>
+ <string name="ExperiencePermission4">
+ attacher à votre avatar
+ </string>
+ <string name="ExperiencePermission9">
+ suivre votre caméra
+ </string>
+ <string name="ExperiencePermission10">
+ contrôler votre caméra
+ </string>
+ <string name="ExperiencePermission11">
+ vous téléporter
+ </string>
+ <string name="ExperiencePermission12">
+ accepter automatiquement les permissions d&apos;expérience
+ </string>
+ <string name="ExperiencePermissionShortUnknown">
+ a effectué une opération inconnue : [Permission]
+ </string>
+ <string name="ExperiencePermissionShort1">
+ Prendre le contrôle
+ </string>
+ <string name="ExperiencePermissionShort3">
+ Déclencher des animations
+ </string>
+ <string name="ExperiencePermissionShort4">
+ Attacher
+ </string>
+ <string name="ExperiencePermissionShort9">
+ Suivre la caméra
+ </string>
+ <string name="ExperiencePermissionShort10">
+ Contrôler la caméra
+ </string>
+ <string name="ExperiencePermissionShort11">
+ Téléporter
+ </string>
+ <string name="ExperiencePermissionShort12">
+ Permission
+ </string>
</strings>
diff --git a/indra/newview/skins/default/xui/fr/teleport_strings.xml b/indra/newview/skins/default/xui/fr/teleport_strings.xml
index 6065fa2966..f4499d46f8 100755
--- a/indra/newview/skins/default/xui/fr/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/fr/teleport_strings.xml
@@ -48,6 +48,9 @@ Pour recommencer le didacticiel, accédez à Welcome Island Public.
<message name="MustGetAgeRegion">
Pour accéder à cette région, vous devez avoir au moins 18 ans.
</message>
+ <message name="RegionTPSpecialUsageBlocked">
+ Impossible de pénétrer dans la région. « [REGION_NAME] » est une région de jeux d&apos;adresse et vous devez satisfaire à certains critères pour y pénétrer. Pour en savoir plus, consultez la page [http://wiki.secondlife.com/wiki/Linden_Lab_Official:Skill_Gaming_in_Second_Life FAQ sur les jeux d&apos;adresse].
+ </message>
</message_set>
<message_set name="progress">
<message name="sending_dest">
diff --git a/indra/newview/skins/default/xui/it/floater_about.xml b/indra/newview/skins/default/xui/it/floater_about.xml
index 6f09eca90c..f3b7effdaa 100755
--- a/indra/newview/skins/default/xui/it/floater_about.xml
+++ b/indra/newview/skins/default/xui/it/floater_about.xml
@@ -1,82 +1,24 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="floater_about" title="INFO [CAPITALIZED_APP_NAME]">
- <floater.string name="AboutHeader">
- [APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2] ([VIEWER_VERSION_3]) [BUILD_DATE] [BUILD_TIME] ([CHANNEL])
-[[VIEWER_RELEASE_NOTES_URL] [ReleaseNotes]]
- </floater.string>
- <floater.string name="AboutCompiler">
- Generato con [COMPILER] versione [COMPILER_VERSION]
- </floater.string>
- <floater.string name="AboutPosition">
- Tu sei a [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1] in [REGION] che si trova a &lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt; ([HOSTIP])
-SLURL: &lt;nolink&gt;[SLURL]&lt;/nolink&gt;
-(coordinate globali [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1])
-[SERVER_VERSION]
-[SERVER_RELEASE_NOTES_URL]
- </floater.string>
- <floater.string name="AboutSystem">
- CPU: [CPU]
-Memoria: [MEMORY_MB] MB
-Versione sistema operativo: [OS_VERSION]
-Venditore scheda grafica: [GRAPHICS_CARD_VENDOR]
-Scheda grafica: [GRAPHICS_CARD]
- </floater.string>
- <floater.string name="AboutDriver">
- Versione driver Windows per grafica: [GRAPHICS_DRIVER_VERSION]
- </floater.string>
- <floater.string name="AboutLibs">
- Versione OpenGL: [OPENGL_VERSION]
-
-Versione libcurl: [LIBCURL_VERSION]
-Versione J2C Decoder: [J2C_VERSION]
-Versione Driver audio: [AUDIO_DRIVER_VERSION]
-Versione Qt Webkit: [QT_WEBKIT_VERSION]
-Versione Server voice: [VOICE_VERSION]
- </floater.string>
- <floater.string name="none">
- (nessuno)
- </floater.string>
- <floater.string name="AboutTraffic">
- Pacchetti perduti: [PACKETS_LOST,number,0]/[PACKETS_IN,number,0] ([PACKETS_PCT,number,1]%) Informazioni
- </floater.string>
- <floater.string name="ErrorFetchingServerReleaseNotesURL">
- Errore nel recupero URL note rilascio versione
- </floater.string>
<tab_container name="about_tab">
<panel label="Informazioni" name="support_panel">
<button label="Copia negli appunti" name="copy_btn"/>
</panel>
<panel label="Ringraziamenti" name="credits_panel">
- <text name="linden_intro">
- Second Life vi è offerto dai Linden:
- </text>
- <text_editor name="linden_names">
- Philip, Andrew, Doug, Richard, Phoenix, Ian, Mark, Robin, Dan, Char, Ryan, Eric, Jim, Lee, Jeff, Michael, Kelly, Steve, Catherine, Bub, Ramzi, Jill, Jeska, Don, Kona, Callum, Charity, Jack, Shawn, babbage, James, Lauren, Blue, Brent, Reuben, Pathfinder, Jesse, Patsy, Torley, Bo, Cyn, Jonathan, Gia, Annette, Ginsu, Harry, Lex, Runitai, Guy, Cornelius, Beth, Swiss, Thumper, Wendy, Teeple, Seth, Dee, Mia, Sally, Liana, Aura, Beez, Milo, Red, Gulliver, Marius, Joe, Jose, Dore, Justin, Nora, Morpheus, Lexie, Amber, Chris, Xan, Leyla, Walker, Sabin, Joshua, Hiromi, Tofu, Fritz, June, Jean, Ivy, Dez, Ken, Betsy, Which, Spike, Rob, Zee, Dustin, George, Claudia, del, Matthew, jane, jay, Adrian, Yool, Rika, Yoz, siobhan, Qarl, Benjamin, Beast, Everett, madhavi, Christopher, Izzy, stephany, Jeremy, sean, adreanne, Pramod, Tobin, sejong, Iridium, maurice, kj, Meta, kari, JP, bert, kyle, Jon, Socrates, Bridie, Ivan, maria, Aric, Coco, Periapse, sandy, Storrs, Lotte, Colossus, Brad, Pastrami, Zen, BigPapi, Banzai, Sardonyx, Mani, Garry, Jaime, Neuro, Samuel, Niko, CeeLo, Austin, Soft, Poppy, emma, tessa, angelo, kurz, alexa, Sue, CG, Blake, Erica, Brett, Bevis, kristen, Q, simon, Enus, MJ, laurap, Kip, Scouse, Ron, Ram, kend, Marty, Prospero, melissa, kraft, Nat, Seraph, Hamilton, Lordan, Green, miz, Ashlei, Trinity, Ekim, Echo, Charlie, Rowan, Rome, Jt, Doris, benoc, Christy, Bao, Kate, Tj, Patch, Cheah, Johan, Brandy, Angela, Oreh, Cogsworth, Lan, Mitchell, Space, Bambers, Einstein, Bender, Malbers, Matias, Maggie, Rothman, Milton, Niall, Marin, Allison, Mango, Andrea, Katt, Yi, Ambroff, Rico, Raymond, Gail, Christa, William, Dawn, Usi, Dynamike, M, Corr, Dante, Molly, kaylee, Danica, Kelv, Lil, jacob, Nya, Rodney, elsie, Blondin, Grant, Nyx, Devin, Monty, Minerva, Keira, Katie, Jenn, Makai, Clare, Joy, Cody, Gayathri, FJ, spider, Oskar, Landon, Jarv, Noelle, Al, Doc, Gray, Vir, t, Maestro, Simone, Shannon, yang, Courtney, Scott, charlene, Quixote, Susan, Zed, Amanda, Katelin, Esbee, JoRoan, Enkidu, roxie, Scarlet, Merov, Kevin, Judy, Rand, Newell, Les, Dessie, Galen, Michon, Geo, Siz, Calyle, Pete, Praveen, Callen, Sheldon, Pink, Nelson, jenelle, Terrence, Nathan, Juan, Sascha, Huseby, Karina, Kaye, Kotler, Lis, Darv, Charrell, Dakota, Kimmora, Theeba, Taka, Mae, Perry, Ducot, dana, Esther, Dough, gisele, Doten, Viale, Fisher, jessieann, ashley, Torres, delby, rountree, kurt, Slaton, Madison, Rue, Gino, Wen, Casssandra, Brodesky, Squid, Gez, Rakesh, Gecko, Ladan, Tony, Tatem, Squire, Falcon, BK, Crimp, Tiggs, Bacon, Coyot, Carmilla, Webb, Sea, Arch, Jillian, Jason, Bernard, Vogt, Peggy, dragon, Pup, xandix, Wallace, Bewest, Inoshiro, Rhett, AG, Aimee, Ghengis, Itiaes, Eli, Steffan, Epic, Grapes, Stone, Prep, Scobu, Robert, Alain, Carla, Vicky, Tia, Alec, Taras, Lisa, Oz, Ariane, Log, House, Kazu, Kim, Drofnas, Tyler, Campbell, Michele, Madeline, Nelly, Baron, Thor, Lori, Hele, Fredrik, Teddy, Pixie, Berry, Gabrielle, Alfonso, Brooke, Wolf, Ringo, Cru, Charlar, Rodvik, Gibson, Elise, Bagman, Greger, Leonidas, Jerm, Leslie, CB, Brenda, Durian, Carlo, mm, Zeeshan, Caleb, Max, Elikak, Mercille, Steph, Chase
- </text_editor>
- <text name="contrib_intro">
- con contributi open source da:
- </text>
- <text_editor name="contrib_names">
- Dummy Name sostituito all&apos;avvio
- </text_editor>
- <text name="trans_intro">
- e le traduzioni da:
- </text>
- <text_editor name="trans_names">
- Dummy Name sostituito all&apos;avvio
- </text_editor>
+ <text name="linden_intro">Second Life vi è offerto dai Linden,
+con contributi open source da:</text>
+ <text_editor name="contrib_names">Dummy Name sostituito all&apos;avvio</text_editor>
</panel>
<panel label="Licenze" name="licenses_panel">
- <text_editor name="credits_editor">
- 3Dconnexion SDK Copyright (C) 1992-2009 3Dconnexion
+ <text_editor name="licenses_editor">3Dconnexion SDK Copyright (C) 1992-2009 3Dconnexion
APR Copyright (C) 2011 The Apache Software Foundation
Collada DOM Copyright 2006 Sony Computer Entertainment Inc.
cURL Copyright (C) 1996-2010, Daniel Stenberg, (daniel@haxx.se)
DBus/dbus-glib Copyright (C) 2002, 2003 CodeFactory AB / Copyright (C) 2003, 2004 Red Hat, Inc.
expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd.
- FreeType Copyright (C) 1996-2002, 2006 David Turner, Robert Wilhelm, and Werner Lemberg.
+ FreeType Copyright (C) 1996-2002, 2006 David Turner, Robert Wilhelm e Werner Lemberg.
GL Copyright (C) 1999-2004 Brian Paul.
- GLOD Copyright (C) 2003-04 Jonathan Cohen, Nat Duca, Chris Niski, Johns Hopkins University and David Luebke, Brenden Schubert, University of Virginia.
+ GLOD Copyright (C) 2003-04 Jonathan Cohen, Nat Duca, Chris Niski, Johns Hopkins University e David Luebke, Brenden Schubert, University of Virginia.
google-perftools Copyright (c) 2005, Google Inc.
Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited.
jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW)
@@ -87,7 +29,7 @@ Versione Server voice: [VOICE_VERSION]
SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
xmlrpc-epi Copyright (C) 2000 Epinions, Inc.
- zlib Copyright (C) 1995-2012 Jean-loup Gailly and Mark Adler.
+ zlib Copyright (C) 1995-2012 Jean-loup Gailly e Mark Adler.
Il Viewer Second Life utilizza Havok (TM) Physics. (c)Copyright 1999-2010 Havok.com Inc. (e licenziatari). Tutti i diritti riservati. Per informazioni dettagliate, vedere www.havok.com.
@@ -95,8 +37,7 @@ Versione Server voice: [VOICE_VERSION]
Tutti i diritti riservati. Per informazioni dettagliate, vedere licenses.txt.
- Codifica audio chat vocale: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
- </text_editor>
+ Codifica audio chat vocale: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)</text_editor>
</panel>
</tab_container>
</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_about_land.xml b/indra/newview/skins/default/xui/it/floater_about_land.xml
index fe3e59b0bd..0c0d05308b 100755
--- a/indra/newview/skins/default/xui/it/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/it/floater_about_land.xml
@@ -313,9 +313,6 @@ Solamente terreni più grandi possono essere abilitati nella ricerca.
<panel.string name="push_restrict_region_text">
Nessuna spinta (Impostazione regionale)
</panel.string>
- <panel.string name="see_avs_text">
- Gli avatar in altri lotti possono vedere
- </panel.string>
<text name="allow_label">
Permetti ad altri residenti di:
</text>
@@ -341,22 +338,6 @@ Solamente terreni più grandi possono essere abilitati nella ricerca.
<check_box label="Sicuro (senza danno)" name="check safe" tool_tip="Se spuntato, imposta il terreno su &apos;sicuro&apos;, disabilitando i danni da combattimento. Se non spuntato, viene abilitato il combattimento con danni."/>
<check_box label="Nessuna spinta" name="PushRestrictCheck" tool_tip="Previeni i colpi. Selezionare questa opzione può essere utile per prevenire comportamenti dannosi sul tuo terreno."/>
<check_box label="Mostra luogo nella ricerca (30 L$/settimana)" name="ShowDirectoryCheck" tool_tip="Consenti che il lotto sia visto nei risultati di ricerca"/>
- <combo_box name="land category with adult">
- <combo_box.item label="Tutte le categorie" name="item0"/>
- <combo_box.item label="Luogo dei Linden" name="item1"/>
- <combo_box.item label="Adulti" name="item2"/>
- <combo_box.item label="Arte e cultura" name="item3"/>
- <combo_box.item label="Affari" name="item4"/>
- <combo_box.item label="Istruzione" name="item5"/>
- <combo_box.item label="Gioco" name="item6"/>
- <combo_box.item label="Divertimento" name="item7"/>
- <combo_box.item label="Accoglienza nuovi residenti" name="item8"/>
- <combo_box.item label="Parchi &amp; Natura" name="item9"/>
- <combo_box.item label="Residenziale" name="item10"/>
- <combo_box.item label="Shopping" name="item11"/>
- <combo_box.item label="Affitto" name="item13"/>
- <combo_box.item label="Altro" name="item12"/>
- </combo_box>
<combo_box name="land category">
<combo_box.item label="Tutte le categorie" name="item0"/>
<combo_box.item label="Luogo dei Linden" name="item1"/>
@@ -456,15 +437,9 @@ Media:
<panel.string name="access_estate_defined">
(Definito dalla proprietà)
</panel.string>
- <panel.string name="allow_public_access">
- Consenti accesso pubblico ([MATURITY]) (Nota: se si rimuove la selezione vengono create linee di espulsione)
- </panel.string>
<panel.string name="estate_override">
Una o più di queste impostazioni sono già impostate a livello regionale
</panel.string>
- <text name="Limit access to this parcel to:">
- Accesso a questo terreno
- </text>
<check_box label="Consenti l&apos;accesso pubblico (se si rimuove la selezione vengono create linee di espulsione)" name="public_access"/>
<text name="Only Allow">
Consenti l&apos;accesso solo ai Residenti che:
@@ -496,5 +471,6 @@ Media:
<button label="Rimuovi" label_selected="Rimuovi" name="remove_banned"/>
</panel>
</panel>
+ <panel label="ESPERIENZE" name="land_experiences_panel"/>
</tab_container>
</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_associate_listing.xml b/indra/newview/skins/default/xui/it/floater_associate_listing.xml
new file mode 100644
index 0000000000..2d7e1f9d3b
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/floater_associate_listing.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="associate listing" title="ASSOCIA ANNUNCIO">
+ <text name="message">ID annuncio:</text>
+ <line_editor name="listing_id">Digita qui l&apos;ID</line_editor>
+ <button label="OK" name="OK"/>
+ <button label="Annulla" name="Cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_edit_hover_height.xml b/indra/newview/skins/default/xui/it/floater_edit_hover_height.xml
new file mode 100644
index 0000000000..a395b247ed
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/floater_edit_hover_height.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="HoverHeight" title="IMPOSTA ALTEZZA DI VOLO">
+ <slider label="Altezza" name="HoverHeightSlider"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_experience_search.xml b/indra/newview/skins/default/xui/it/floater_experience_search.xml
new file mode 100644
index 0000000000..a31e7aa76f
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/floater_experience_search.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="experiencepicker" title="SCEGLI ESPERIENZA"/>
diff --git a/indra/newview/skins/default/xui/it/floater_experienceprofile.xml b/indra/newview/skins/default/xui/it/floater_experienceprofile.xml
new file mode 100644
index 0000000000..031900825d
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/floater_experienceprofile.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater title="EXPERIENCE PROFILE">
+ <floater.string name="empty_slurl">
+ (nessuno)
+ </floater.string>
+ <floater.string name="maturity_icon_general">
+ &quot;Parcel_PG_Light&quot;
+ </floater.string>
+ <floater.string name="maturity_icon_moderate">
+ &quot;Parcel_M_Light&quot;
+ </floater.string>
+ <floater.string name="maturity_icon_adult">
+ &quot;Parcel_R_Light&quot;
+ </floater.string>
+ <text name="edit_title" value="Profilo esperienza"/>
+ <tab_container name="tab_container">
+ <panel name="panel_experience_info">
+ <scroll_container name="xp_scroll">
+ <panel name="scrolling_panel">
+ <layout_stack>
+ <layout_panel name="top panel">
+ <button label="Modifica" name="edit_btn"/>
+ </layout_panel>
+ <layout_panel name="maturity panel">
+ <text name="ContentRating">
+ Categoria:
+ </text>
+ </layout_panel>
+ <layout_panel name="location panel">
+ <text name="Location">
+ Luogo:
+ </text>
+ </layout_panel>
+ <layout_panel>
+ <text name="Owner">
+ Proprietario:
+ </text>
+ </layout_panel>
+ <layout_panel name="group_panel">
+ <text name="Group">
+ Gruppo:
+ </text>
+ </layout_panel>
+ <layout_panel name="perm panel">
+ <button label="Consenti" name="allow_btn"/>
+ <button label="Dimentica" name="forget_btn"/>
+ <button label="Blocca" name="block_btn"/>
+ <text name="privileged">
+ Questa esperienza è attivata per tutti i residenti.
+ </text>
+ <button label="Segnala abuso" name="report_btn"/>
+ </layout_panel>
+ </layout_stack>
+ </panel>
+ </scroll_container>
+ </panel>
+ <panel name="edit_panel_experience_info">
+ <scroll_container name="edit_xp_scroll">
+ <panel name="edit_scrolling_panel">
+ <text name="edit_experience_title_label" value="Nome:"/>
+ <text name="edit_experience_desc_label" value="Descrizione:"/>
+ <button label="Gruppo" name="Group_btn"/>
+ <text name="edit_ContentRating">
+ Categoria:
+ </text>
+ <icons_combo_box label="Moderato" name="edit_ContentRatingText" tool_tip="Se si aumenta la categoria di accesso di un&apos;esperienza, vengono ripristinate le autorizzazioni per tutti i residenti che hanno consentito l&apos;esperienza.">
+ <icons_combo_box.item label="Adulti" name="Adult" value="42"/>
+ <icons_combo_box.item label="Moderato" name="Mature" value="21"/>
+ <icons_combo_box.item label="Generale" name="PG" value="13"/>
+ </icons_combo_box>
+ <text name="edit_Location">
+ Luogo:
+ </text>
+ <button label="Imposta come attuale" name="location_btn"/>
+ <button label="Cancella luogo" name="clear_btn"/>
+ <check_box label="Attiva esperienza" name="edit_enable_btn" tool_tip=""/>
+ <check_box label="Nascondi nella ricerca" name="edit_private_btn"/>
+ <text name="changes" value="Le modifiche apportate alle esperienze potrebbero essere visibili su tutte le regioni solo dopo alcuni minuti."/>
+ <button label="Indietro" name="cancel_btn"/>
+ <button label="Salva" name="save_btn"/>
+ </panel>
+ </scroll_container>
+ </panel>
+ </tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_experiences.xml b/indra/newview/skins/default/xui/it/floater_experiences.xml
new file mode 100644
index 0000000000..7cd19783a3
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/floater_experiences.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_experiences" title="ESPERIENZE"/>
diff --git a/indra/newview/skins/default/xui/it/floater_facebook.xml b/indra/newview/skins/default/xui/it/floater_facebook.xml
index 89d58f4e67..cb700f00e1 100644
--- a/indra/newview/skins/default/xui/it/floater_facebook.xml
+++ b/indra/newview/skins/default/xui/it/floater_facebook.xml
@@ -1,20 +1,15 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="floater_facebook" title="PUBBLICA SU FACEBOOK">
- <panel name="background">
- <tab_container name="tabs">
- <panel label="STATO" name="panel_facebook_status"/>
- <panel label="FOTO" name="panel_facebook_photo"/>
- <panel label="REGISTRATI" name="panel_facebook_place"/>
- <panel label="AMICI" name="panel_facebook_friends"/>
- <panel label="ACCOUNT" name="panel_facebook_account"/>
- </tab_container>
- <panel name="connection_status_panel">
- <text name="connection_error_text">
- Errore
- </text>
- <text name="connection_loading_text">
- Caricamento...
- </text>
- </panel>
- </panel>
+ <tab_container name="tabs">
+ <panel label="STATO" name="panel_facebook_status"/>
+ <panel label="FOTO" name="panel_facebook_photo"/>
+ <panel label="REGISTRATI" name="panel_facebook_place"/>
+ <panel label="AMICI" name="panel_facebook_friends"/>
+ </tab_container>
+ <text name="connection_error_text">
+ Errore
+ </text>
+ <text name="connection_loading_text">
+ Caricamento in corso...
+ </text>
</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/it/floater_inventory_item_properties.xml
index 7ed3486b9b..8cf680b3f0 100755
--- a/indra/newview/skins/default/xui/it/floater_inventory_item_properties.xml
+++ b/indra/newview/skins/default/xui/it/floater_inventory_item_properties.xml
@@ -1,67 +1,36 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="item properties" title="CARATTERISTICHE DELL&apos;ARTICOLO IN INVENTARIO">
- <floater.string name="unknown">
- (sconosciuto)
- </floater.string>
- <floater.string name="public">
- (pubblico)
- </floater.string>
- <floater.string name="you_can">
- Tu puoi:
- </floater.string>
- <floater.string name="owner_can">
- Il proprietario può:
- </floater.string>
- <floater.string name="acquiredDate">
- [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]
- </floater.string>
- <text name="LabelItemNameTitle">
- Nome:
- </text>
- <text name="LabelItemDescTitle">
- Descrizione:
- </text>
- <text name="LabelCreatorTitle">
- Creatore:
- </text>
+ <floater.string name="unknown">(sconosciuto)</floater.string>
+ <floater.string name="public">(pubblico)</floater.string>
+ <floater.string name="you_can">Tu puoi:</floater.string>
+ <floater.string name="owner_can">Il proprietario può:</floater.string>
+ <floater.string name="acquiredDate">[wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]</floater.string>
+ <text name="LabelItemNameTitle">Nome:</text>
+ <text name="LabelItemDescTitle">Descrizione:</text>
+ <text name="LabelCreatorTitle">Creatore:</text>
<button label="Profilo..." label_selected="" name="BtnCreator"/>
- <text name="LabelOwnerTitle">
- proprietario:
- </text>
+ <text name="LabelOwnerTitle">proprietario:</text>
<button label="Profilo..." label_selected="" name="BtnOwner"/>
- <text name="LabelAcquiredTitle">
- Acquisito:
- </text>
- <text name="LabelAcquiredDate">
- Wed May 24 12:50:46 2006
- </text>
- <text name="OwnerLabel">
- Tu:
- </text>
+ <text name="LabelAcquiredTitle">Acquisito:</text>
+ <text name="LabelAcquiredDate">Wed May 24 12:50:46 2006</text>
+ <text name="OwnerLabel">Tu:</text>
<check_box label="Modifica" name="CheckOwnerModify"/>
<check_box label="Copiare" left_delta="88" name="CheckOwnerCopy"/>
<check_box label="Rivendi" name="CheckOwnerTransfer"/>
- <text name="AnyoneLabel">
- Chiunque:
- </text>
+ <text name="AnyoneLabel">Chiunque:</text>
<check_box label="Copia" name="CheckEveryoneCopy"/>
- <text name="GroupLabel">
- Gruppo:
- </text>
+ <text name="GroupLabel">Gruppo:</text>
<check_box label="Condividi" name="CheckShareWithGroup"/>
- <text name="NextOwnerLabel" width="230">
- Proprietario successivo:
- </text>
+ <text name="NextOwnerLabel" width="230">Proprietario successivo:</text>
<check_box label="Modifica" name="CheckNextOwnerModify"/>
<check_box label="Copiare" left_delta="88" name="CheckNextOwnerCopy"/>
<check_box label="Rivendi" name="CheckNextOwnerTransfer"/>
<check_box label="In vendita" name="CheckPurchase"/>
- <combo_box name="combobox sale copy">
+ <combo_box name="ComboBoxSaleType">
<combo_box.item label="Copia" name="Copy"/>
+ <combo_box.item label="Contenuti" name="Contents"/>
<combo_box.item label="Originale" name="Original"/>
</combo_box>
<spinner label="Prezzo:" name="Edit Cost"/>
- <text name="CurrencySymbol">
- L$
- </text>
+ <text name="CurrencySymbol">L$</text>
</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/it/floater_inventory_view_finder.xml
index cf790ee62e..e5543c741f 100755
--- a/indra/newview/skins/default/xui/it/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/it/floater_inventory_view_finder.xml
@@ -5,8 +5,8 @@
<check_box label="Abiti" name="check_clothing"/>
<check_box label="Gesture" name="check_gesture"/>
<check_box label="Landmark" name="check_landmark"/>
- <check_box label="Reticoli" name="check_mesh"/>
<check_box label="Notecard" name="check_notecard"/>
+ <check_box label="Reticoli" name="check_mesh"/>
<check_box label="Oggetti" name="check_object"/>
<check_box label="Script" name="check_script"/>
<check_box label="Suoni" name="check_sound"/>
@@ -19,6 +19,10 @@
<text name="- OR -">
- Oppure -
</text>
+ <radio_group name="date_search_direction">
+ <radio_item label="Più recenti del" name="newer"/>
+ <radio_item label="Precedenti al" name="older"/>
+ </radio_group>
<spinner label="Ore fa" name="spin_hours_ago"/>
<spinner label="Giorni fa" name="spin_days_ago"/>
<button label="Chiudi" label_selected="Chiudi" name="Close"/>
diff --git a/indra/newview/skins/default/xui/it/floater_item_properties.xml b/indra/newview/skins/default/xui/it/floater_item_properties.xml
new file mode 100644
index 0000000000..ba57e27b45
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/floater_item_properties.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Item Properties" title="CARATTERISTICHE DELL&apos;ARTICOLO"/>
diff --git a/indra/newview/skins/default/xui/it/floater_lagmeter.xml b/indra/newview/skins/default/xui/it/floater_lagmeter.xml
index f7b2b1ab4a..13f54eabcc 100644
--- a/indra/newview/skins/default/xui/it/floater_lagmeter.xml
+++ b/indra/newview/skins/default/xui/it/floater_lagmeter.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="floater_lagmeter" title="MISURATORE LAG">
<floater.string name="max_title_msg">
- Misuratore del lag
+ Misuratore lag
</floater.string>
<floater.string name="max_width_px">
360
@@ -13,7 +13,7 @@
90
</floater.string>
<floater.string name="client_text_msg">
- Programma in locale
+ Client
</floater.string>
<floater.string name="client_frame_rate_critical_fps">
10
@@ -22,31 +22,31 @@
15
</floater.string>
<floater.string name="client_frame_time_window_bg_msg">
- Normale, finestra sullo sfondo
+ Normale, finestra in background
</floater.string>
<floater.string name="client_frame_time_critical_msg">
- Velocità dei frame al di sotto di [CLIENT_FRAME_RATE_CRITICAL]
+ Frame rate del client inferiore a [CLIENT_FRAME_RATE_CRITICAL]
</floater.string>
<floater.string name="client_frame_time_warning_msg">
- Velocità dei frame tra [CLIENT_FRAME_RATE_CRITICAL] e [CLIENT_FRAME_RATE_WARNING]
+ Frame rate del client tra [CLIENT_FRAME_RATE_CRITICAL] e [CLIENT_FRAME_RATE_WARNING]
</floater.string>
<floater.string name="client_frame_time_normal_msg">
Normale
</floater.string>
<floater.string name="client_draw_distance_cause_msg">
- Possibile causa: Campo visivo impostato troppo alto
+ Causa possibile: Distanza di visualizzazione impostata su un valore troppo alto
</floater.string>
<floater.string name="client_texture_loading_cause_msg">
- Possibile causa: Caricamento immagini
+ Causa possibile: Caricamento immagini in corso
</floater.string>
<floater.string name="client_texture_memory_cause_msg">
- Possibile causa: Troppe immagini in memoria
+ Causa possibile: Troppe immagini in memoria
</floater.string>
<floater.string name="client_complex_objects_cause_msg">
- Possibile causa: Troppi oggetti complessi intorno
+ Causa possibile: Troppi oggetti complessi in una scena
</floater.string>
<floater.string name="network_text_msg">
- Network
+ Rete
</floater.string>
<floater.string name="network_packet_loss_critical_pct">
10
@@ -55,10 +55,10 @@
5
</floater.string>
<floater.string name="network_packet_loss_critical_msg">
- La connessione sta calando al di sotto del [NETWORK_PACKET_LOSS_CRITICAL]% di pacchetti
+ Il collegamento perde più del [NETWORK_PACKET_LOSS_CRITICAL]% dei pacchetti
</floater.string>
<floater.string name="network_packet_loss_warning_msg">
- La connessione sta calando tra il [NETWORK_PACKET_LOSS_WARNING]% e il [NETWORK_PACKET_LOSS_CRITICAL]% di pacchetti
+ Il collegamento perde [NETWORK_PACKET_LOSS_WARNING]%-[NETWORK_PACKET_LOSS_CRITICAL]% dei pacchetti
</floater.string>
<floater.string name="network_performance_normal_msg">
Normale
@@ -70,16 +70,16 @@
300
</floater.string>
<floater.string name="network_ping_critical_msg">
- Il tempo di ping della connessione è al di sopra di [NETWORK_PING_CRITICAL] ms
+ Tempo di ping del collegamento superiore a [NETWORK_PING_CRITICAL] ms
</floater.string>
<floater.string name="network_ping_warning_msg">
- Il tempo di ping della connessione è tra [NETWORK_PING_WARNING]-[NETWORK_PING_CRITICAL] ms
+ Tempo di ping del collegamento pari a [NETWORK_PING_WARNING]-[NETWORK_PING_CRITICAL] ms
</floater.string>
<floater.string name="network_packet_loss_cause_msg">
- Possibile cattiva connessione o la larghezza di banda impostata nelle preferenze troppo alta.
+ Collegamento scadente oppure valore della larghezza di banda troppo alto.
</floater.string>
<floater.string name="network_ping_cause_msg">
- Possibile cattiva connessione o l&apos;apertura di un programma di scambio files.
+ Collegamento scadente oppure problemi di app di condivisione file.
</floater.string>
<floater.string name="server_text_msg">
Server
@@ -94,31 +94,31 @@
20
</floater.string>
<floater.string name="server_frame_time_critical_msg">
- Velocità dei frame al di sotto di [SERVER_FRAME_RATE_CRITICAL]
+ Frame rate del simulatore inferiore a [SERVER_FRAME_RATE_CRITICAL]
</floater.string>
<floater.string name="server_frame_time_warning_msg">
- Velocità dei frame tra [SERVER_FRAME_RATE_CRITICAL] e [SERVER_FRAME_RATE_WARNING]
+ Frame rate del simulatore tra [SERVER_FRAME_RATE_CRITICAL] e [SERVER_FRAME_RATE_WARNING]
</floater.string>
<floater.string name="server_frame_time_normal_msg">
Normale
</floater.string>
<floater.string name="server_physics_cause_msg">
- Possibile causa: troppi oggetti fisici
+ Causa possibile: Troppi oggetti fisici
</floater.string>
<floater.string name="server_scripts_cause_msg">
- Possibile causa: troppi oggetti scriptati
+ Causa possibile: Troppi oggetti scriptati
</floater.string>
<floater.string name="server_net_cause_msg">
- Possibile causa: eccessivo traffico sulla rete
+ Causa possibile: Troppo traffico di rete
</floater.string>
<floater.string name="server_agent_cause_msg">
- Possibile causa: troppi residenti in movimento nella regione
+ Causa possibile: Troppe persone in movimento nella regione
</floater.string>
<floater.string name="server_images_cause_msg">
- Possibile causa: troppe elaborazioni di immagini
+ Causa possibile: Troppi calcoli delle immagini
</floater.string>
<floater.string name="server_generic_cause_msg">
- Possibile causa: carico eccessivo del simulatore
+ Causa possibile: Carico eccessivo del simulatore
</floater.string>
<floater.string name="smaller_label">
&gt;&gt;
@@ -126,7 +126,7 @@
<floater.string name="bigger_label">
&lt;&lt;
</floater.string>
- <button label="" label_selected="" name="client_lagmeter" tool_tip="Stato del lag del programma in locale"/>
+ <button label="" label_selected="" name="client_lagmeter" tool_tip="Stato del lag del client"/>
<text name="client">
Client
</text>
@@ -134,7 +134,7 @@
Normale
</text>
<text left="30" name="client_lag_cause" right="-10"/>
- <button label="" label_selected="" name="network_lagmeter" tool_tip="Stato del lag del network"/>
+ <button label="" label_selected="" name="network_lagmeter" tool_tip="Stato del lag della rete"/>
<text name="network">
Rete
</text>
diff --git a/indra/newview/skins/default/xui/it/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/it/floater_live_lsleditor.xml
index 0bd2b02323..c28df6c12e 100755
--- a/indra/newview/skins/default/xui/it/floater_live_lsleditor.xml
+++ b/indra/newview/skins/default/xui/it/floater_live_lsleditor.xml
@@ -9,7 +9,24 @@
<floater.string name="Title">
SCRIPT: [NAME]
</floater.string>
+ <floater.string name="experience_enabled">
+ Rimuovi il segno di spunta per rimuovere l&apos;esperienza corrente
+ </floater.string>
+ <floater.string name="no_experiences">
+ Non hai l&apos;autorizzazione necessaria per alcuna esperienza
+ </floater.string>
+ <floater.string name="add_experiences">
+ Seleziona per aggiungere un&apos;esperienza
+ </floater.string>
+ <floater.string name="show_experience_profile">
+ Clicca per vedere il profilo dell&apos;esperienza
+ </floater.string>
+ <floater.string name="loading">
+ Caricamento in corso...
+ </floater.string>
<button label="Ripristina" label_selected="Ripristina" name="Reset"/>
<check_box initial_value="true" label="In esecuzione" left="4" name="running"/>
<check_box initial_value="true" label="Mono" left="106" name="mono"/>
+ <check_box label="Usa le esperienze:" name="enable_xp"/>
+ <button label="&gt;" name="view_profile"/>
</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_marketplace_listings.xml b/indra/newview/skins/default/xui/it/floater_marketplace_listings.xml
new file mode 100644
index 0000000000..bff5189ea4
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/floater_marketplace_listings.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_marketplace_listings" title="ANNUNCI NEL MARKETPLACE">
+ <panel name="marketplace_listings_panel">
+ <panel>
+ <panel name="marketplace_listings_inventory_placeholder_panel">
+ <text name="marketplace_listings_inventory_placeholder_title">Caricamento in corso...</text>
+ </panel>
+ </panel>
+ </panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_marketplace_validation.xml b/indra/newview/skins/default/xui/it/floater_marketplace_validation.xml
new file mode 100644
index 0000000000..45805a3232
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/floater_marketplace_validation.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_marketplace_validation" title="Verifica annunci Marketplace">
+ <button label="OK" label_selected="OK" name="OK"/>
+ <text_editor name="validation_text">MARKETPLACE_VALIDATION_TEXT</text_editor>
+</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_openobject.xml b/indra/newview/skins/default/xui/it/floater_openobject.xml
index d8144c7cd5..0d313602b5 100755
--- a/indra/newview/skins/default/xui/it/floater_openobject.xml
+++ b/indra/newview/skins/default/xui/it/floater_openobject.xml
@@ -3,6 +3,11 @@
<text name="object_name">
[DESC]:
</text>
- <button label="Copia nell&apos;inventario" label_selected="Copia nell&apos;inventario" name="copy_to_inventory_button"/>
- <button label="Copia ed indossa" label_selected="Copia ed indossa" name="copy_and_wear_button"/>
+ <text name="border_note">
+ Copia nell&apos;inventario e indossa
+ </text>
+ <button label="Aggiungi al vestiario" label_selected="Aggiungi al vestiario" name="copy_and_wear_button"/>
+ <button label="Sostituisci vestiario" label_selected="Sostituisci vestiario" name="copy_and_replace_button"/>
+ <button label="Crea solo la copia nell&apos;inventario" label_selected="Crea solo la copia nell&apos;inventario" name="copy_to_inventory_button"/>
+ <button label="Annulla" label_selected="Annulla" name="cancel_button"/>
</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_pay.xml b/indra/newview/skins/default/xui/it/floater_pay.xml
index 5753c8c765..ef24fc850d 100755
--- a/indra/newview/skins/default/xui/it/floater_pay.xml
+++ b/indra/newview/skins/default/xui/it/floater_pay.xml
@@ -1,26 +1,18 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="Give Money" title="">
- <string name="payee_group">
- Paga gruppo
- </string>
- <string name="payee_resident">
- Paga residente
- </string>
- <text left="5" name="payee_label" width="105">
- Paga:
- </text>
- <icon name="icon_person" tool_tip="Persona"/>
- <text left="115" name="payee_name">
- Nome di test che è troppo lungo per controllare il taglio
- </text>
- <button label="1 L$" label_selected="1 L$" left="118" name="fastpay 1" width="80"/>
- <button label="5 L$" label_selected="5 L$" left="210" name="fastpay 5"/>
- <button label="10 L$" label_selected="10 L$" left="118" name="fastpay 10" width="80"/>
- <button label="20 L$" label_selected="20 L$" left="210" name="fastpay 20"/>
- <text left="4" name="amount text">
- Oppure, scegli importo:
- </text>
- <line_editor left="70" name="amount" width="49"/>
- <button label="Paga" label_selected="Paga" left="127" name="pay btn"/>
- <button label="Annulla" label_selected="Annulla" left="210" name="cancel btn"/>
+ <string name="payee_group">Paga gruppo</string>
+ <string name="payee_resident">Paga residente</string>
+ <text name="paying_text">Stai pagando:</text>
+ <text left="115" name="payee_name">Nome di test che è troppo lungo per controllare il taglio</text>
+ <panel label="Cerca" name="PatternsPanel">
+ <button label="Paga 1 L$" label_selected="Paga 1 L$" name="fastpay 1"/>
+ <button label="Paga 5 L$" label_selected="Paga 5 L$" name="fastpay 5"/>
+ <button label="Paga 10 L$" label_selected="Paga 10 L$" name="fastpay 10"/>
+ <button label="Paga 20 L$" label_selected="Paga 20 L$" name="fastpay 20"/>
+ </panel>
+ <panel label="Cerca" name="InputPanel">
+ <text name="amount text">Altro importo:</text>
+ <button label="Paga" label_selected="Paga" name="pay btn"/>
+ <button label="Annulla" label_selected="Annulla" name="cancel btn"/>
+ </panel>
</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_pay_object.xml b/indra/newview/skins/default/xui/it/floater_pay_object.xml
index 8805f3208e..8e6fd37c2d 100755
--- a/indra/newview/skins/default/xui/it/floater_pay_object.xml
+++ b/indra/newview/skins/default/xui/it/floater_pay_object.xml
@@ -1,30 +1,21 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="Give Money" title="">
- <string halign="left" name="payee_group" width="100">
- Paga gruppo
- </string>
- <string halign="left" name="payee_resident" width="120">
- Paga residente
- </string>
- <icon name="icon_person" tool_tip="Persona"/>
- <text left="120" name="payee_name">
- Ericacita Moostopolison
- </text>
- <text halign="left" left="5" name="object_name_label" width="110">
- Mediante l&apos;oggetto:
- </text>
+ <string halign="left" name="payee_group" width="100">Paga gruppo</string>
+ <string halign="left" name="payee_resident" width="120">Paga residente</string>
+ <text name="paying_text">Stai pagando:</text>
+ <text left="120" name="payee_name">Ericacita Moostopolison</text>
+ <text halign="left" left="5" name="object_name_label" width="110">Mediante l&apos;oggetto:</text>
<icon name="icon_object" tool_tip="Oggetti"/>
- <text left="120" name="object_name_text">
- Il mio oggetto con un nome veramente lungo
- </text>
- <button label="1 L$" label_selected="1 L$" left="125" name="fastpay 1" width="70"/>
- <button label="5 L$" label_selected="5 L$" left="200" name="fastpay 5" width="70"/>
- <button label="10 L$" label_selected="10 L$" left="125" name="fastpay 10" width="70"/>
- <button label="20 L$" label_selected="20 L$" left="200" name="fastpay 20" width="70"/>
- <text halign="left" left="5" name="amount text">
- Oppure, scegli importo:
- </text>
- <line_editor left="74" name="amount" width="50"/>
- <button label="Paga" label_selected="Paga" name="pay btn"/>
- <button label="Cancella" label_selected="Cancella" name="cancel btn"/>
+ <text left="120" name="object_name_text">Il mio oggetto con un nome veramente lungo</text>
+ <panel label="Cerca" name="PatternsPanel">
+ <button label="Paga 1 L$" label_selected="Paga 1 L$" name="fastpay 1"/>
+ <button label="Paga 5 L$" label_selected="Paga 5 L$" name="fastpay 5"/>
+ <button label="Paga 10 L$" label_selected="Paga 10 L$" name="fastpay 10"/>
+ <button label="Paga 20 L$" label_selected="Paga 20 L$" name="fastpay 20"/>
+ </panel>
+ <panel label="Cerca" name="InputPanel">
+ <text name="amount text">Altro importo:</text>
+ <button label="Paga" label_selected="Paga" name="pay btn"/>
+ <button label="Annulla" label_selected="Annulla" name="cancel btn"/>
+ </panel>
</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_report_abuse.xml b/indra/newview/skins/default/xui/it/floater_report_abuse.xml
index 728d089205..f74d84fb8f 100755
--- a/indra/newview/skins/default/xui/it/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/it/floater_report_abuse.xml
@@ -76,7 +76,7 @@
<combo_box.item label="Terreno &gt; Invasione &gt; Oggetti o texture" name="Land__Encroachment__Objects_textures"/>
<combo_box.item label="Terreno &gt; Invasione &gt; Particelle" name="Land__Encroachment__Particles"/>
<combo_box.item label="Terreno &gt; Invasione &gt; Alberi/piante" name="Land__Encroachment__Trees_plants"/>
- <combo_box.item label="Scommesse o gioco d&apos;azzardo" name="Wagering_gambling"/>
+ <combo_box.item label="Violazione regole del gioco" name="Wagering_gambling"/>
<combo_box.item label="Altro" name="Other"/>
</combo_box>
<text name="abuser_name_title">
diff --git a/indra/newview/skins/default/xui/it/floater_snapshot.xml b/indra/newview/skins/default/xui/it/floater_snapshot.xml
index 16289ac7af..d21c206f6f 100755
--- a/indra/newview/skins/default/xui/it/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/it/floater_snapshot.xml
@@ -39,17 +39,8 @@
<string name="local_failed_str">
Non salvato sul computer.
</string>
- <button name="advanced_options_btn" tool_tip="Opzioni Avanzate"/>
- <text name="image_res_text">
- [WIDTH] x [HEIGHT] px
- </text>
- <text name="file_size_label">
- [SIZE] KB
- </text>
+ <button label="AGGIORNA" name="new_snapshot_btn"/>
<panel name="advanced_options_panel">
- <text name="advanced_options_label">
- OPZIONI AVANZATE
- </text>
<text name="layer_type_label">
Cattura:
</text>
@@ -68,4 +59,10 @@
<combo_box.item label="Nessun filtro" name="NoFilter"/>
</combo_box>
</panel>
+ <text name="image_res_text">
+ [WIDTH] px (larghezza) x [HEIGHT] px (altezza)
+ </text>
+ <text name="file_size_label">
+ [SIZE] KB
+ </text>
</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_stats.xml b/indra/newview/skins/default/xui/it/floater_stats.xml
index 7516af957e..7ef13aa37f 100755
--- a/indra/newview/skins/default/xui/it/floater_stats.xml
+++ b/indra/newview/skins/default/xui/it/floater_stats.xml
@@ -72,7 +72,7 @@
<stat_view label="Pathfinding" name="simpathfinding">
<stat_bar label="Tempo passaggio AI" name="simsimaistepmsec"/>
<stat_bar label="Passaggi silhouette saltati" name="simsimskippedsilhouettesteps"/>
- <stat_bar label="Personaggi aggiornati" name="simsimpctsteppedcharacters"/>
+ <stat_bar label="Caratteri aggiornati" name="simsimpctsteppedcharacters"/>
</stat_view>
<stat_bar label="Totale dati non confermati (unacked)" name="simtotalunackedbytes"/>
<stat_view label="Orario" name="simperf">
diff --git a/indra/newview/skins/default/xui/it/floater_top_objects.xml b/indra/newview/skins/default/xui/it/floater_top_objects.xml
index d8ca7f4438..afd6a87646 100755
--- a/indra/newview/skins/default/xui/it/floater_top_objects.xml
+++ b/indra/newview/skins/default/xui/it/floater_top_objects.xml
@@ -21,6 +21,12 @@
<floater.string name="none_descriptor">
Nulla di rilevato.
</floater.string>
+ <floater.string name="URLs">
+ URL
+ </floater.string>
+ <floater.string name="memory">
+ Memoria (KB)
+ </floater.string>
<text name="title_text">
In caricamento...
</text>
@@ -30,7 +36,7 @@
<scroll_list.columns label="Proprietario" name="owner" width="84"/>
<scroll_list.columns label="Ubicazione" name="location" width="84"/>
<scroll_list.columns label="Lotto" name="parcel"/>
- <scroll_list.columns label="Ora" name="time" width="84"/>
+ <scroll_list.columns label="Data" name="time" width="84"/>
<scroll_list.columns label="URL" name="URLs"/>
<scroll_list.columns label="Memoria (KB)" name="memory"/>
</scroll_list>
diff --git a/indra/newview/skins/default/xui/it/floater_twitter.xml b/indra/newview/skins/default/xui/it/floater_twitter.xml
index c903705e69..a34052a620 100644
--- a/indra/newview/skins/default/xui/it/floater_twitter.xml
+++ b/indra/newview/skins/default/xui/it/floater_twitter.xml
@@ -1,17 +1,13 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="floater_twitter" title="TWITTER">
- <panel name="background">
- <tab_container name="tabs">
- <panel label="COMPONI" name="panel_twitter_photo"/>
- <panel label="ACCOUNT" name="panel_twitter_account"/>
- </tab_container>
- <panel name="connection_status_panel">
- <text name="connection_error_text">
- Errore
- </text>
- <text name="connection_loading_text">
- Caricamento...
- </text>
- </panel>
- </panel>
+ <tab_container name="tabs">
+ <panel label="COMPONI" name="panel_twitter_photo"/>
+ <panel label="ACCOUNT" name="panel_twitter_account"/>
+ </tab_container>
+ <text name="connection_error_text">
+ Errore
+ </text>
+ <text name="connection_loading_text">
+ Caricamento in corso...
+ </text>
</floater>
diff --git a/indra/newview/skins/default/xui/it/menu_attachment_self.xml b/indra/newview/skins/default/xui/it/menu_attachment_self.xml
index b28137262f..1539fbafa1 100755
--- a/indra/newview/skins/default/xui/it/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/it/menu_attachment_self.xml
@@ -8,6 +8,7 @@
<menu_item_call label="Il mio aspetto" name="Change Outfit"/>
<menu_item_call label="Modifica il mio vestiario" name="Edit Outfit"/>
<menu_item_call label="Modifica la figura corporea" name="Edit My Shape"/>
+ <menu_item_call label="Altezza di volo" name="Hover Height"/>
<menu_item_call label="I miei amici..." name="Friends..."/>
<menu_item_call label="I miei gruppi" name="Groups..."/>
<menu_item_call label="Il mio profilo" name="Profile..."/>
diff --git a/indra/newview/skins/default/xui/it/menu_avatar_self.xml b/indra/newview/skins/default/xui/it/menu_avatar_self.xml
index 3666571065..0c9663fd4c 100755
--- a/indra/newview/skins/default/xui/it/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/it/menu_avatar_self.xml
@@ -25,6 +25,7 @@
<menu_item_call label="Il mio aspetto" name="Chenge Outfit"/>
<menu_item_call label="Modifica il mio vestiario" name="Edit Outfit"/>
<menu_item_call label="Modifica la figura corporea" name="Edit My Shape"/>
+ <menu_item_call label="Altezza di volo" name="Hover Height"/>
<menu_item_call label="I miei amici..." name="Friends..."/>
<menu_item_call label="I miei gruppi" name="Groups..."/>
<menu_item_call label="Il mio profilo" name="Profile..."/>
diff --git a/indra/newview/skins/default/xui/it/menu_inventory.xml b/indra/newview/skins/default/xui/it/menu_inventory.xml
index c8042f4253..2cd0d2c078 100755
--- a/indra/newview/skins/default/xui/it/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/it/menu_inventory.xml
@@ -1,5 +1,14 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<menu name="Popup">
+ <menu_item_call label="Crea annuncio" name="Marketplace Create Listing"/>
+ <menu_item_call label="Associa annuncio" name="Marketplace Associate Listing"/>
+ <menu_item_call label="Visualizza (aggiorna) annuncio" name="Marketplace Get Listing"/>
+ <menu_item_call label="Controlla che non ci siano errori" name="Marketplace Check Listing"/>
+ <menu_item_call label="Modifica annuncio" name="Marketplace Edit Listing"/>
+ <menu_item_call label="Elenca" name="Marketplace List"/>
+ <menu_item_call label="Rimuovi annuncio" name="Marketplace Unlist"/>
+ <menu_item_call label="Attiva" name="Marketplace Activate"/>
+ <menu_item_call label="Disattiva" name="Marketplace Deactivate"/>
<menu_item_call label="Condividi" name="Share"/>
<menu_item_call label="Compra" name="Task Buy"/>
<menu_item_call label="Apri" name="Task Open"/>
@@ -87,6 +96,7 @@
<menu_item_call label="Aggiungi" name="Wearable Add"/>
<menu_item_call label="Togli" name="Take Off"/>
<menu_item_call label="Copia nella casella venditore in uscita" name="Merchant Copy"/>
- <menu_item_call label="Invia a Marketplace" name="Marketplace Send"/>
+ <menu_item_call label="Copia negli annunci Marketplace" name="Marketplace Copy"/>
+ <menu_item_call label="Sposta negli annunci Marketplace" name="Marketplace Move"/>
<menu_item_call label="--nessuna opzione--" name="--no options--"/>
</menu>
diff --git a/indra/newview/skins/default/xui/it/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/it/menu_inventory_gear_default.xml
index 3d64e4da4e..403f5da5fe 100755
--- a/indra/newview/skins/default/xui/it/menu_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/it/menu_inventory_gear_default.xml
@@ -5,7 +5,7 @@
<menu_item_check label="Mostra prima i più recenti" name="sort_by_recent"/>
<menu_item_check label="Ordina le cartelle sempre in base al nome" name="sort_folders_by_name"/>
<menu_item_check label="Ordina cartelle di sistema all&apos;inizio" name="sort_system_folders_to_top"/>
- <menu_item_call label="Mostra filtri" name="show_filters"/>
+ <menu_item_call label="Mostra filtri..." name="show_filters"/>
<menu_item_call label="Ripristina filtri" name="reset_filters"/>
<menu_item_call label="Chiudi tutte le cartelle" name="close_folders"/>
<menu_item_call label="Svuota oggetti smarriti" name="empty_lostnfound"/>
diff --git a/indra/newview/skins/default/xui/it/menu_marketplace_view.xml b/indra/newview/skins/default/xui/it/menu_marketplace_view.xml
new file mode 100644
index 0000000000..63f0b7fc50
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/menu_marketplace_view.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_marketplace_sort">
+ <menu_item_check label="Ordina per quantità in magazzino (da bassa ad alta)" name="sort_by_stock_amount"/>
+ <menu_item_check label="Mostra solo cartelle annunci" name="show_only_listing_folders"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_url_experience.xml b/indra/newview/skins/default/xui/it/menu_url_experience.xml
new file mode 100644
index 0000000000..d6ea3f352b
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/menu_url_experience.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Url Popup">
+ <menu_item_call label="Copia SLurl negli Appunti" name="url_copy"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_viewer.xml b/indra/newview/skins/default/xui/it/menu_viewer.xml
index d25e11e7a4..3f4c370ccd 100755
--- a/indra/newview/skins/default/xui/it/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/it/menu_viewer.xml
@@ -8,6 +8,7 @@
<menu_item_call label="Nuova finestra inventario" name="NewInventoryWindow"/>
<menu_item_call label="Luoghi..." name="Places"/>
<menu_item_call label="Preferiti..." name="Picks"/>
+ <menu_item_call label="Esperienze..." name="Experiences"/>
<menu_item_call label="Controlli fotocamera..." name="Camera Controls"/>
<menu label="Spostamento" name="Movement">
<menu_item_call label="Siedi" name="Sit Down Here"/>
@@ -22,6 +23,7 @@
</menu>
<menu_item_call label="Acquista L$..." name="Buy and Sell L$"/>
<menu_item_call label="Casella venditore in uscita..." name="MerchantOutbox"/>
+ <menu_item_call label="Annunci Marketplace..." name="MarketplaceListings"/>
<menu_item_call label="Dashboard dell&apos;account..." name="Manage My Account">
<menu_item_call.on_click name="ManageMyAccount_url" parameter="WebLaunchJoinNow,http://secondlife.com/account/index.php?lang=it"/>
</menu_item_call>
@@ -48,7 +50,7 @@
<menu_item_check label="Amici" name="My Friends"/>
<menu_item_check label="Gruppi" name="My Groups"/>
<menu_item_check label="Persone vicine" name="Active Speakers"/>
- <menu_item_call label="Blocca lista" name="Block List"/>
+ <menu_item_check label="Blocca lista" name="Block List"/>
<menu_item_check label="Non disturbare" name="Do Not Disturb"/>
</menu>
<menu label="Mondo" name="World">
@@ -249,6 +251,7 @@
<menu_item_check label="Console texture" name="Texture Console"/>
<menu_item_check label="Console di Debug" name="Debug Console"/>
<menu_item_call label="Console notifiche" name="Notifications"/>
+ <menu_item_check label="Console di debug regione" name="Region Debug Console"/>
<menu_item_check label="Timer veloci" name="Fast Timers"/>
<menu_item_check label="Memoria" name="Memory"/>
<menu_item_check label="Statistiche scena" name="Scene Statistics"/>
@@ -324,7 +327,7 @@
<menu label="Rete" name="Network">
<menu_item_check label="Metti in pausa" name="AgentPause"/>
<menu_item_call label="Lascia un pacchetto" name="Drop a Packet"/>
- </menu>
+ </menu>
<menu label="Mondo" name="DevelopWorld">
<menu_item_check label="Esclusione al sole della simulazione" name="Sim Sun Override"/>
<menu_item_check label="Clima fisso" name="Fixed Weather"/>
diff --git a/indra/newview/skins/default/xui/it/mime_types.xml b/indra/newview/skins/default/xui/it/mime_types.xml
index 5eda7a5752..df119263b7 100755
--- a/indra/newview/skins/default/xui/it/mime_types.xml
+++ b/indra/newview/skins/default/xui/it/mime_types.xml
@@ -24,10 +24,10 @@
</widgetset>
<widgetset name="none">
<label name="none_label">
- Senza Contenuti
+ Nessun contenuto
</label>
<tooltip name="none_tooltip">
- Nessun video qui
+ Nessun contenuto multimediale qui
</tooltip>
</widgetset>
<widgetset name="image">
diff --git a/indra/newview/skins/default/xui/it/mime_types_linux.xml b/indra/newview/skins/default/xui/it/mime_types_linux.xml
index 3bc30b507a..1ed1fd6b1d 100755
--- a/indra/newview/skins/default/xui/it/mime_types_linux.xml
+++ b/indra/newview/skins/default/xui/it/mime_types_linux.xml
@@ -44,6 +44,14 @@
Riproduci l&apos;audio di questo luogo
</playtip>
</widgetset>
+ <widgetset name="none">
+ <label name="none_label">
+ Nessun contenuto
+ </label>
+ <tooltip name="none_tooltip">
+ Nessun contenuto multimediale qui
+ </tooltip>
+ </widgetset>
<scheme name="rtsp">
<label name="rtsp_label">
Streaming in tempo reale
diff --git a/indra/newview/skins/default/xui/it/mime_types_mac.xml b/indra/newview/skins/default/xui/it/mime_types_mac.xml
index 3bc30b507a..1ed1fd6b1d 100755
--- a/indra/newview/skins/default/xui/it/mime_types_mac.xml
+++ b/indra/newview/skins/default/xui/it/mime_types_mac.xml
@@ -44,6 +44,14 @@
Riproduci l&apos;audio di questo luogo
</playtip>
</widgetset>
+ <widgetset name="none">
+ <label name="none_label">
+ Nessun contenuto
+ </label>
+ <tooltip name="none_tooltip">
+ Nessun contenuto multimediale qui
+ </tooltip>
+ </widgetset>
<scheme name="rtsp">
<label name="rtsp_label">
Streaming in tempo reale
diff --git a/indra/newview/skins/default/xui/it/notifications.xml b/indra/newview/skins/default/xui/it/notifications.xml
index 11211e01fe..06f2b70dcf 100755
--- a/indra/newview/skins/default/xui/it/notifications.xml
+++ b/indra/newview/skins/default/xui/it/notifications.xml
@@ -73,6 +73,10 @@ Dettagli errore: La notifica denominata &apos;[_NAME]&apos; non è stata trovata
[MESSAGE]
<usetemplate name="okcancelbuttons" notext="Annulla" yestext="Si"/>
</notification>
+ <notification name="GenericAlertOK">
+ [MESSAGE]
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
<notification name="BadInstallation">
Il programma [APP_NAME] ha riscontrato un&apos;errore durante il tentativo di aggiornamento. [http://get.secondlife.com Scarica l&apos;ultima versione] del Viewer.
<usetemplate name="okbutton" yestext="OK"/>
@@ -125,6 +129,88 @@ Nessuna cartella è stata inviata a Marketplace, a causa di un errore di sistema
L&apos;inizializzazione con il Marketplace non ha avuto successo a causa di un errore di sistema o di rete. Riprova più tardi.
<usetemplate name="okbutton" yestext="OK"/>
</notification>
+ <notification name="StockPasteFailed">
+ Impossibile copiare o spostare la cartella di magazzino a causa dell&apos;errore seguente:
+
+ &apos;[ERROR_CODE]&apos;
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="MerchantPasteFailed">
+ Impossibile copiare o spostare gli annunci Marketplace a causa dell&apos;errore seguente:
+
+ &apos;[ERROR_CODE]&apos;
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="MerchantTransactionFailed">
+ La transazione in Marketplace non è riuscita a causa dell&apos;errore seguente:
+
+ Motivo: &apos;[ERROR_REASON]&apos;
+ [ERROR_DESCRIPTION]
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="MerchantUnprocessableEntity">
+ Non siamo in grado di creare un annuncio per questo prodotto o di attivare la cartella di versione. Di solito la causa è la mancanza di informazioni nel modulo di descrizione dell&apos;annuncio, ma potrebbero esserci errori nella struttura delle cartelle. Modifica l&apos;annuncio oppure verifica che non ci siano problemi legati alla cartella dell&apos;annuncio.
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="MerchantListingFailed">
+ Aggiunta annuncio a Marketplace non riuscita a causa dell&apos;errore seguente:
+
+ &apos;[ERROR_CODE]&apos;
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="MerchantFolderActivationFailed">
+ L&apos;attivazione di questa cartella di versione non è riuscita a causa dell&apos;errore:
+
+ &apos;[ERROR_CODE]&apos;
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="ConfirmMerchantActiveChange">
+ Questa azione cambierà il contenuto attivo di questo annuncio. Vuoi continuare?
+ <usetemplate ignoretext="Conferma prima di modificare un annuncio attivo su Marketplace" name="okcancelignore" notext="Annulla" yestext="OK"/>
+ </notification>
+ <notification name="ConfirmMerchantMoveInventory">
+ Gli articoli trascinati nella finestra degli annunci di Marketplace vengono spostati dalle posizioni iniziali e non vengono copiati. Vuoi continuare?
+ <usetemplate ignoretext="Conferma prima di spostare un articolo dall&apos;inventario a Marketplace" name="okcancelignore" notext="Annulla" yestext="OK"/>
+ </notification>
+ <notification name="ConfirmListingCutOrDelete">
+ Se sposti o elimini la cartella dell&apos;annuncio, l&apos;annuncio su Marketplace verrà eliminato. Per mantenere l&apos;annuncio su Marketplace, sposta o elimina i contenuti della cartella di versione da modificare. Vuoi continuare?
+ <usetemplate ignoretext="Conferma prima di spostare o eliminare un annuncio da Marketplace" name="okcancelignore" notext="Annulla" yestext="OK"/>
+ </notification>
+ <notification name="ConfirmCopyToMarketplace">
+ Non hai l&apos;autorizzazione necessaria per copiare uno o più di questi articoli su Marketplace. Puoi spostarli o lasciarli dove si trovano.
+ <usetemplate canceltext="Annulla" ignoretext="Conferma prima di copiare nel Marketplace una selezione che contiene articoli per i quali non è consentita la copia" name="yesnocancelbuttons" notext="Non spostare gli articoli" yestext="Sposta articoli"/>
+ </notification>
+ <notification name="ConfirmMerchantUnlist">
+ Questa azione causa la rimozione dell&apos;annuncio. Vuoi continuare?
+ <usetemplate ignoretext="Conferma prima di rimuovere un annuncio attivo da Marketplace" name="okcancelignore" notext="Annulla" yestext="OK"/>
+ </notification>
+ <notification name="ConfirmMerchantClearVersion">
+ Questa azione disattiverà la cartella di versione per l&apos;annuncio corrente. Vuoi continuare?
+ <usetemplate ignoretext="Conferma prima di disattivare la cartella di versione di un annuncio su Marketplace" name="okcancelignore" notext="Annulla" yestext="OK"/>
+ </notification>
+ <notification name="AlertMerchantListingNotUpdated">
+ Impossibile aggiornare l&apos;annuncio.
+[[URL] Fai clic qui] per modificarlo in Marketplace.
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="AlertMerchantListingCannotWear">
+ Non puoi indossare vestiario o parti del corpo che sono nella cartella degli annunci di Marketplace.
+ </notification>
+ <notification name="AlertMerchantListingInvalidID">
+ ID annuncio non valido.
+ </notification>
+ <notification name="AlertMerchantListingActivateRequired">
+ Ci sono svariate cartelle di versione oppure nessuna cartella di versione in questo annuncio. In seguito dovrai selezionarne e attivarne una separatamente.
+ <usetemplate ignoretext="Avvisa riguardo all&apos;attivazione della cartella di versione quando creo un annuncio con varie cartelle di versione" name="okignore" yestext="OK"/>
+ </notification>
+ <notification name="AlertMerchantStockFolderSplit">
+ Abbiamo diviso gli articoli in magazzino di tipo diverso in cartelle di magazzino separate. In questo modo la tua cartella è ordinata per la pubblicazione nell&apos;annuncio.
+ <usetemplate ignoretext="Avverti quando la cartella di magazzino viene suddivisa prima della pubblicazione dell&apos;annuncio" name="okignore" yestext="OK"/>
+ </notification>
+ <notification name="AlertMerchantStockFolderEmpty">
+ L&apos;annuncio è stato rimosso perché il magazzino è esaurito. Aggiungi altre unità alla cartella di magazzino prima di pubblicare nuovamente l&apos;annuncio.
+ <usetemplate ignoretext="Avverti quando un annuncio viene rimosso perché la cartella di magazzino è vuota" name="okignore" yestext="OK"/>
+ </notification>
<notification name="CompileQueueSaveText">
C&apos;è stato un problema importando il testo di uno script per la seguente ragione: [REASON]. Riprova più tardi.
</notification>
@@ -466,6 +552,10 @@ Nota: questa operazione cancellerà la cache.
Salva le modifiche?
<usetemplate canceltext="Annulla" name="yesnocancelbuttons" notext="Non salvare" yestext="Salva"/>
</notification>
+ <notification name="DeleteNotecard">
+ Vuoi eliminare il biglietto?
+ <usetemplate name="okcancelbuttons" notext="Annulla" yestext="OK"/>
+ </notification>
<notification name="GestureSaveFailedTooManySteps">
Il salvataggio della Gesture è fallito.
La gesture ha troppi passi.
@@ -572,6 +662,9 @@ La qualità grafica può essere aumentata in Preferenze &gt; Grafica.
<notification name="RegionNoTerraforming">
La regione [REGION] non consente di terraformare.
</notification>
+ <notification name="ParcelNoTerraforming">
+ Non ti è consentito terraformare il lotto [PARCEL].
+ </notification>
<notification name="CannotCopyWarning">
Non hai l&apos;autorizzazione a copiare i seguenti oggetti:
[ITEMS]
@@ -1829,6 +1922,30 @@ Cambierà migliaia di regioni e produrrà seri problemi ai vari server.
Rimuovi come gestore della proprietà solo per questa proprietà oppure per [ALL_ESTATES]?
<usetemplate canceltext="Annulla" name="yesnocancelbuttons" notext="Tutte le proprietà" yestext="Questa proprietà"/>
</notification>
+ <notification label="Seleziona proprietà immobiliare" name="EstateAllowedExperienceAdd">
+ Aggiungi all&apos;elenco di elementi consentiti per questa proprietà immobiliare oppure per [ALL_ESTATES]?
+ <usetemplate canceltext="Annulla" name="yesnocancelbuttons" notext="Tutte le proprietà immobiliari" yestext="Questa proprietà immobiliare"/>
+ </notification>
+ <notification label="Seleziona proprietà immobiliare" name="EstateAllowedExperienceRemove">
+ Rimuovi dall&apos;elenco di elementi consentiti per questa proprietà immobiliare oppure per [ALL_ESTATES]?
+ <usetemplate canceltext="Annulla" name="yesnocancelbuttons" notext="Tutte le proprietà immobiliari" yestext="Questa proprietà immobiliare"/>
+ </notification>
+ <notification label="Seleziona proprietà immobiliare" name="EstateBlockedExperienceAdd">
+ Aggiungi all&apos;elenco di elementi bloccati per questa proprietà immobiliare oppure per [ALL_ESTATES]?
+ <usetemplate canceltext="Annulla" name="yesnocancelbuttons" notext="Tutte le proprietà immobiliari" yestext="Questa proprietà immobiliare"/>
+ </notification>
+ <notification label="Seleziona proprietà immobiliare" name="EstateBlockedExperienceRemove">
+ Rimuovi dall&apos;elenco di elementi bloccati per questa proprietà immobiliare oppure per [ALL_ESTATES]?
+ <usetemplate canceltext="Annulla" name="yesnocancelbuttons" notext="Tutte le proprietà immobiliari" yestext="Questa proprietà immobiliare"/>
+ </notification>
+ <notification label="Seleziona proprietà immobiliare" name="EstateTrustedExperienceAdd">
+ Aggiungi all&apos;elenco di elementi chiave per questa proprietà immobiliare oppure per [ALL_ESTATES]?
+ <usetemplate canceltext="Annulla" name="yesnocancelbuttons" notext="Tutte le proprietà immobiliari" yestext="Questa proprietà immobiliare"/>
+ </notification>
+ <notification label="Seleziona proprietà immobiliare" name="EstateTrustedExperienceRemove">
+ Rimuovi dall&apos;elenco di elementi chiave per questa proprietà immobiliare oppure per [ALL_ESTATES]?
+ <usetemplate canceltext="Annulla" name="yesnocancelbuttons" notext="Tutte le proprietà immobiliari" yestext="Questa proprietà immobiliare"/>
+ </notification>
<notification label="Conferma espulsione" name="EstateKickUser">
Espelli [EVIL_USER] da questa proprietà?
<usetemplate name="okcancelbuttons" notext="Annulla" yestext="OK"/>
@@ -1841,6 +1958,9 @@ Cambierà migliaia di regioni e produrrà seri problemi ai vari server.
La regione che cerchi di visitare include contenuti che non corripondono al livello selezionato nelle preferenze. Per cambiare le preferenze seleziona Io &gt; Preferenze &gt; Generale.
<usetemplate name="okbutton" yestext="OK"/>
</notification>
+ <notification name="SLM_UPDATE_FOLDER">
+ [MESSAGE]
+ </notification>
<notification name="RegionEntryAccessBlocked_AdultsOnlyContent">
La regione che cerchi di visitare include contenuti [REGIONMATURITY] accessibili solo ad adulti.
<url name="url">
@@ -1903,6 +2023,10 @@ Cambierà migliaia di regioni e produrrà seri problemi ai vari server.
Si è verificato un problema con il teleport a causa di un errore di sincronizzazione delle preferenze con il server.
<usetemplate name="okbutton" yestext="OK"/>
</notification>
+ <notification name="RegionTPSpecialUsageBlocked">
+ Impossibile entrare nella regione. &apos;[REGION_NAME]&apos; è una regione per giochi di abilità e per entrare è necessario soddisfare alcuni requisiti. Per dettagli, leggi le [http://wiki.secondlife.com/wiki/Linden_Lab_Official:Skill_Gaming_in_Second_Life domande frequenti sui giochi di abilità].
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
<notification name="PreferredMaturityChanged">
Non riceverai più notifiche se stai per visitare una regione con contenuti [RATING]. In futuro potrai modificare le preferenze relative ai contenuti selezionando Io &gt; Preferenze &gt; Generale nella barra del menu.
<usetemplate name="okbutton" yestext="OK"/>
@@ -2126,6 +2250,10 @@ Trasferisci gli elementi nell&apos;inventario?
<ignore name="ignore" text="Ho impostato l&apos;azione Paga oggetto costruendo un oggetto senza uno script money()"/>
</form>
</notification>
+ <notification name="PayConfirmation">
+ Conferma che desideri pagare [AMOUNT] L$ a [TARGET].
+ <usetemplate ignoretext="Conferma prima di pagare (somme superiori a 200 L$)" name="okcancelignore" notext="Annulla" yestext="Paga"/>
+ </notification>
<notification name="OpenObjectCannotCopy">
Non ci sono elementi in questo oggetto che tu possa copiare.
</notification>
@@ -2211,6 +2339,9 @@ Vuoi sostituirlo con l&apos;oggetto selezionato?
<button ignore="Never Replace" name="No" text="Annulla"/>
</form>
</notification>
+ <notification name="TooManyWearables">
+ Non puoi indossare una cartella che contiene più di [AMOUNT] elementi. Per modificare questo limite, accedi ad Avanzate &gt; Mostra impostazioni di debug &gt; WearFolderLimit.
+ </notification>
<notification label="Avviso modalità Non disturbare" name="DoNotDisturbModePay">
Hai attivato la modalità Non disturbare. Non riceverai alcun oggetto offerto in cambio di questo pagamento.
@@ -2819,7 +2950,7 @@ Se rimani qui verrai scollegato da Second Life.
[MESSAGE]
-Dall&apos;oggetto: &lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;, proprietario: [NAME]?
+Dall&apos;oggetto: &lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;, proprietario: [NAME]
<form name="form">
<button name="Gotopage" text="Caricare"/>
<button name="Cancel" text="Annulla"/>
@@ -2845,6 +2976,72 @@ OK?
<button name="Mute" text="Blocca"/>
</form>
</notification>
+ <notification name="ExperienceAcquireFailed">
+ Impossibile acquisire una nuova esperienza:
+ [ERROR_MESSAGE]
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="NotInGroupExperienceProfileMessage">
+ Una modifica apportata al gruppo esperienza è stata ignorata perché il proprietario non è un membro del gruppo selezionato.
+ </notification>
+ <notification name="UneditableExperienceProfileMessage">
+ Il campo non modificabile &apos;[field]&apos; è stato ignorato durante l&apos;aggiornamento del profilo esperienza.
+ </notification>
+ <notification name="RestrictedToOwnerExperienceProfileMessage">
+ Ignorate le modifiche apportate al campo &apos;[field]&apos;, che può essere impostato solo dal proprietario dell&apos;esperienza.
+ </notification>
+ <notification name="MaturityRatingExceedsOwnerExperienceProfileMessage">
+ Non puoi impostare la categoria di accesso di un&apos;esperienza a un livello maggiore di quello del proprietario.
+ </notification>
+ <notification name="RestrictedTermExperienceProfileMessage">
+ I termini seguenti hanno impedito l&apos;aggiornamento del nome o della descrizione del profilo dell&apos;esperienza: [extra_info]
+ </notification>
+ <notification name="TeleportedHomeExperienceRemoved">
+ Sei stato teleportato dalla regione [region_name] per aver rimosso l&apos;esperienza secondlife:///app/experience/[public_id]/profile e non puoi più accedere alla regione.
+ <form name="form">
+ <ignore name="ignore" text="Espulso dalla regione per aver rimosso un&apos;esperienza"/>
+ </form>
+ </notification>
+ <notification name="TrustedExperienceEntry">
+ Ti è stato consentito l&apos;accesso alla regione [region_name] grazie alla partecipazione all&apos;esperienza chiave secondlife:///app/experience/[public_id]/profile. Se rimuovi l&apos;esperienza, sarai passibile di espulsione dalla regione.
+ <form name="form">
+ <ignore name="ignore" text="Può accedere a una regione grazie a un&apos;esperienza"/>
+ </form>
+ </notification>
+ <notification name="TrustedExperiencesAvailable">
+ Non puoi accedere a questa destinazione. Potresti accedere alla regione accettando un&apos;esperienza nell&apos;elenco seguente:
+
+[EXPERIENCE_LIST]
+
+Potrebbero essere disponibili altre esperienze chiave.
+ </notification>
+ <notification name="ExperienceEvent">
+ L&apos;esperienza secondlife:///app/experience/[public_id]/profile ha consentito un oggetto la seguente azione: [EventType].
+ Proprietario: secondlife:///app/agent/[OwnerID]/inspect
+ Nome oggetto: [ObjectName]
+ Nome lotto: [ParcelName]
+ </notification>
+ <notification name="ExperienceEventAttachment">
+ L&apos;esperienza secondlife:///app/experience/[public_id]/profile ha consentito un elemento collegato la seguente azione: [EventType].
+ Proprietario: secondlife:///app/agent/[OwnerID]/inspect
+ </notification>
+ <notification name="ScriptQuestionExperience">
+ &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos;, un oggetto posseduto da &apos;[NAME]&apos;, richiede la tua partecipazione all&apos;esperienza [GRID_WIDE]:
+
+[EXPERIENCE]
+
+Una volta concessa l&apos;autorizzazione, questo messaggio non verrà più visualizzato per questa esperienza, a meno che l&apos;autorizzazione non venga revocata nel profilo dell&apos;esperienza.
+
+Gli script associati a questa esperienza potranno fare quanto segue nelle regioni in cui è attiva l&apos;esperienza:
+
+[QUESTIONS]OK?
+ <form name="form">
+ <button name="BlockExperience" text="Blocca esperienza"/>
+ <button name="Mute" text="Blocca oggetto"/>
+ <button name="Yes" text="Sì"/>
+ <button name="No" text="No"/>
+ </form>
+ </notification>
<notification name="ScriptQuestionCaution">
Avviso: L&apos;oggetto &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos; ha richiesto accesso completo al tuo account in Dollari Linden. Se consenti l&apos;accesso, potrà rimuovere fondi dal tuo account in qualunque momento e anche svuotare completamente l&apos;account, per un periodo illimitato e senza ulteriori avvisi.
@@ -3164,6 +3361,10 @@ Hai caricato una texture [RESOLUTION] completata per &apos;[BODYREGION]&apos; do
( In esistenza da [EXISTENCE] secondi)
Hai aggiornato localmente una texture [RESOLUTION] completata per &apos;[BODYREGION]&apos; dopo [TIME] secondi.
</notification>
+ <notification name="CannotUploadTexture">
+ Impossibile caricare la texture.
+[REASON]
+ </notification>
<notification name="LivePreviewUnavailable">
Non possiamo mostrare un&apos;anteprima di questa texture perché non ne è consentita la copia e/o il trasferimento.
<usetemplate ignoretext="Avvisami se la modalità Anteprima dal vivo non è disponibile per texture per cui non è consentita la copia e/o il trasferimento." name="okignore" yestext="OK"/>
@@ -3739,9 +3940,11 @@ Riprova tra un minuto.
</notification>
<notification name="TeleportedByAttachment">
Sei stato teletrasportato da un elemento collegato a [ITEM_ID]
+ <usetemplate ignoretext="Teleport: sei stato teleportato da un elemento accessorio" name="notifyignore"/>
</notification>
<notification name="TeleportedByObjectOnParcel">
Sei stato teleportato dall&apos;oggetto &apos;[OBJECT_NAME]&apos; sul lotto &apos;[PARCEL_NAME]&apos;
+ <usetemplate ignoretext="Teleport: sei stato teleportato su un lotto da un oggetto" name="notifyignore"/>
</notification>
<notification name="TeleportedByObjectOwnedBy">
Sei stato teleportato dall&apos;oggetto &apos;[OBJECT_NAME]&apos; di proprietà di [OWNER_ID]
@@ -4073,7 +4276,7 @@ Prova a selezionare un pezzo di terreno più piccolo.
<usetemplate ignoretext="Impossibile spostare i file. Il percorso precedente è stato ripristinato." name="okignore" yestext="OK"/>
</notification>
<notification name="DefaultObjectPermissions">
- Si è verificato un problema nel salvare i diritti predefiniti per il motivo seguente: [REASON]. Riprova più tardi.
+ Si è verificato un problema nel salvare le autorizzazioni predefinite dell&apos;oggetto: [REASON]. Riprova più tardi.
<usetemplate name="okbutton" yestext="OK"/>
</notification>
<notification name="ChatHistoryIsBusyAlert">
diff --git a/indra/newview/skins/default/xui/it/panel_experience_info.xml b/indra/newview/skins/default/xui/it/panel_experience_info.xml
new file mode 100644
index 0000000000..706f139bcc
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/panel_experience_info.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_experience_info">
+ <text name="title" value="Profilo esperienza"/>
+ <scroll_container name="xp_scroll">
+ <panel name="scrolling_panel">
+ <layout_stack>
+ <layout_panel>
+ <text name="experience_title" value="Kyle&apos;s Superhero RPG"/>
+ </layout_panel>
+ <layout_panel name="location panel">
+ <text name="Location">
+ Luogo:
+ </text>
+ <text name="LocationTextText">
+ in qualche posto
+ </text>
+ <button label="Teleport" name="teleport_btn"/>
+ <button label="Mappa" name="map_btn"/>
+ </layout_panel>
+ <layout_panel name="marketplace panel">
+ <text name="Location">
+ Negozio Marketplace:
+ </text>
+ <text name="LocationTextText">
+ in qualche posto
+ </text>
+ </layout_panel>
+ <layout_panel>
+ <text name="ContentRating">
+ Categoria:
+ </text>
+ <text name="ContentRatingText">
+ Adulti
+ </text>
+ <text name="Owner">
+ Proprietario:
+ </text>
+ <text name="OwnerText">
+ Kyle
+ </text>
+ <button label="Modifica" name="edit_btn"/>
+ </layout_panel>
+ </layout_stack>
+ </panel>
+ </scroll_container>
+</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_experience_list_editor.xml b/indra/newview/skins/default/xui/it/panel_experience_list_editor.xml
new file mode 100644
index 0000000000..46d39eabdd
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/panel_experience_list_editor.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="experince_list_editor">
+ <panel.string name="loading">
+ caricamento in corso...
+ </panel.string>
+ <panel.string name="panel_allowed">
+ Esperienze consentite:
+ </panel.string>
+ <panel.string name="panel_blocked">
+ Esperienze bloccate:
+ </panel.string>
+ <panel.string name="panel_trusted">
+ Esperienze chiave:
+ </panel.string>
+ <panel.string name="no_results">
+ (vuoto)
+ </panel.string>
+ <text name="text_name">
+ Elenco esperienze
+ </text>
+ <scroll_list name="experience_list">
+ <columns label="Nome" name="experience_name"/>
+ </scroll_list>
+ <button label="Aggiungi..." name="btn_add"/>
+ <button label="Rimuovi" name="btn_remove"/>
+ <button label="Profilo..." name="btn_profile"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_experience_list_item.xml b/indra/newview/skins/default/xui/it/panel_experience_list_item.xml
new file mode 100644
index 0000000000..f99c71c22e
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/panel_experience_list_item.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Experiences">
+ <text name="experience_name">
+ Nome fittizio
+ </text>
+</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_experience_log.xml b/indra/newview/skins/default/xui/it/panel_experience_log.xml
new file mode 100644
index 0000000000..a03e8410b1
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/panel_experience_log.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="EVENTS">
+ <string name="no_events" value="Nessun evento."/>
+ <string name="loading" value="caricamento in corso..."/>
+ <layout_stack>
+ <layout_panel>
+ <scroll_list name="experience_log_list">
+ <columns label="Giorno/ora" name="time"/>
+ <columns label="Evento" name="event"/>
+ <columns label="Esperienza" name="experience_name"/>
+ <columns label="Oggetto" name="object_name"/>
+ </scroll_list>
+ <button label="Notifica" name="btn_notify"/>
+ <button label="Profilo" name="btn_profile_xp"/>
+ <button label="Segnalazione" name="btn_report_xp"/>
+ </layout_panel>
+ <layout_panel name="button_panel">
+ <check_box label="Notifica tutti gli eventi Giorni" name="notify_all"/>
+ <button label="Cancella" name="btn_clear"/>
+ <button label="&lt;" name="btn_prev"/>
+ <button label="&gt;" name="btn_next"/>
+ </layout_panel>
+ </layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_experience_search.xml b/indra/newview/skins/default/xui/it/panel_experience_search.xml
new file mode 100644
index 0000000000..124b060f20
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/panel_experience_search.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="SEARCH">
+ <string name="not_found">
+ &apos;[TEXT]&apos; non trovato
+ </string>
+ <string name="no_results">
+ Nessun risultato
+ </string>
+ <string name="searching">
+ Ricerca in corso...
+ </string>
+ <string name="loading">
+ Caricamento in corso...
+ </string>
+ <string name="maturity_icon_general">
+ &quot;Parcel_PG_Light&quot;
+ </string>
+ <string name="maturity_icon_moderate">
+ &quot;Parcel_M_Light&quot;
+ </string>
+ <string name="maturity_icon_adult">
+ &quot;Parcel_R_Light&quot;
+ </string>
+ <panel name="search_panel">
+ <button label="Vai" name="find"/>
+ <icons_combo_box label="Moderato" name="maturity">
+ <icons_combo_box.item label="Adulti" name="Adult" value="42"/>
+ <icons_combo_box.item label="Moderato" name="Mature" value="21"/>
+ <icons_combo_box.item label="Generale" name="PG" value="13"/>
+ </icons_combo_box>
+ <scroll_list name="search_results">
+ <columns label="Nome" name="experience_name"/>
+ <columns label="Proprietario" name="owner"/>
+ </scroll_list>
+ <button label="OK" label_selected="OK" name="ok_btn"/>
+ <button label="Annulla" name="cancel_btn"/>
+ <button label="Visualizza profilo" name="profile_btn"/>
+ <button label="&lt;" name="left_btn"/>
+ <button label="&gt;" name="right_btn"/>
+ </panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_experiences.xml b/indra/newview/skins/default/xui/it/panel_experiences.xml
new file mode 100644
index 0000000000..a305860f8f
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/panel_experiences.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Experiences">
+ <string name="loading_experiences" value="Caricamento esperienze in corso..."/>
+ <string name="no_experiences" value="Nessuna esperienza."/>
+ <string name="acquire" value="Acquisisci un&apos;esperienza"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_facebook_friends.xml b/indra/newview/skins/default/xui/it/panel_facebook_friends.xml
index 917dbec4d9..c1c0489f88 100644
--- a/indra/newview/skins/default/xui/it/panel_facebook_friends.xml
+++ b/indra/newview/skins/default/xui/it/panel_facebook_friends.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<panel name="panel_facebook_friends">
<string name="facebook_friends_empty" value="Attualmente non hai amici su Facebook che sono anche residenti in Second Life. Invita i tuoi amici di Facebook a partecipare a Second Life!"/>
- <string name="facebook_friends_no_connected" value="Attualmente non sei in collegamento con Facebook. Accedi alla scheda Account per collegarti e attivare questa funzionalità."/>
+ <string name="facebook_friends_no_connected" value="Attualmente non sei in collegamento con Facebook. Accedi alla scheda Stato per collegarti e attivare questa funzionalità."/>
<accordion name="friends_accordion">
<accordion_tab name="tab_second_life_friends" title="Amici SL"/>
<accordion_tab name="tab_suggested_friends" title="Aggiungi queste persone come amici SL"/>
diff --git a/indra/newview/skins/default/xui/it/panel_facebook_photo.xml b/indra/newview/skins/default/xui/it/panel_facebook_photo.xml
index 20ec7f0a70..044b8b6164 100644
--- a/indra/newview/skins/default/xui/it/panel_facebook_photo.xml
+++ b/indra/newview/skins/default/xui/it/panel_facebook_photo.xml
@@ -1,26 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<panel name="panel_facebook_photo">
- <layout_stack name="stack_photo">
- <layout_panel name="snapshot_panel">
- <combo_box name="resolution_combobox" tool_tip="Risoluzione immagini">
- <combo_box.item label="Finestra attuale" name="CurrentWindow"/>
- <combo_box.item label="640x480" name="640x480"/>
- <combo_box.item label="800x600" name="800x600"/>
- <combo_box.item label="1024x768" name="1024x768"/>
- <combo_box.item label="1200x630" name="1200x630"/>
- </combo_box>
- <combo_box name="filters_combobox" tool_tip="Filtri immagini">
- <combo_box.item label="Nessun filtro" name="NoFilter"/>
- </combo_box>
- <button label="Aggiorna" name="new_snapshot_btn" tool_tip="Fai clic per aggiornare"/>
- <button label="Anteprima" name="big_preview_btn" tool_tip="Fai clic per alternare l&apos;anteprima"/>
- <text name="caption_label">
- Commento (facoltativo):
- </text>
- </layout_panel>
- <layout_panel name="photo_button_panel">
- <button label="Pubblica" name="post_photo_btn"/>
- <button label="Annulla" name="cancel_photo_btn"/>
- </layout_panel>
- </layout_stack>
+ <combo_box name="resolution_combobox" tool_tip="Risoluzione immagini">
+ <combo_box.item label="Finestra attuale" name="CurrentWindow"/>
+ <combo_box.item label="640x480" name="640x480"/>
+ <combo_box.item label="800x600" name="800x600"/>
+ <combo_box.item label="1024x768" name="1024x768"/>
+ <combo_box.item label="1200x630" name="1200x630"/>
+ </combo_box>
+ <combo_box name="filters_combobox" tool_tip="Filtri immagini">
+ <combo_box.item label="Nessun filtro" name="NoFilter"/>
+ </combo_box>
+ <button label="Aggiorna" name="new_snapshot_btn" tool_tip="Fai clic per aggiornare"/>
+ <button label="Anteprima" name="big_preview_btn" tool_tip="Fai clic per alternare l&apos;anteprima"/>
+ <text name="caption_label">
+ Commento (facoltativo):
+ </text>
+ <button label="Post" name="post_photo_btn"/>
+ <button label="Annulla" name="cancel_photo_btn"/>
</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_facebook_place.xml b/indra/newview/skins/default/xui/it/panel_facebook_place.xml
index 297f0caccc..3f1365f12c 100644
--- a/indra/newview/skins/default/xui/it/panel_facebook_place.xml
+++ b/indra/newview/skins/default/xui/it/panel_facebook_place.xml
@@ -1,17 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<panel name="panel_facebook_place">
- <layout_stack name="stack_place">
- <layout_panel name="place_detail_panel">
- <text name="place_caption_label">
- Racconta dove ti trovi:
- </text>
- </layout_panel>
- <layout_panel name="place_map_panel">
- <check_box initial_value="false" label="" name="add_place_view_cb"/>
- </layout_panel>
- <layout_panel name="place_button_panel">
- <button label="Pubblica" name="post_place_btn"/>
- <button label="Annulla" name="cancel_place_btn"/>
- </layout_panel>
- </layout_stack>
+ <text name="place_caption_label">
+ Racconta dove ti trovi:
+ </text>
+ <check_box initial_value="false" label="Includi vista dall&apos;alto del luogo" name="add_place_view_cb"/>
+ <button label="Post" name="post_place_btn"/>
+ <button label="Annulla" name="cancel_place_btn"/>
</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_facebook_status.xml b/indra/newview/skins/default/xui/it/panel_facebook_status.xml
index d373fb0717..9b5171043a 100644
--- a/indra/newview/skins/default/xui/it/panel_facebook_status.xml
+++ b/indra/newview/skins/default/xui/it/panel_facebook_status.xml
@@ -1,14 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<panel name="panel_facebook_status">
- <layout_stack name="stack_status">
- <layout_panel name="status_detail_panel">
- <text name="status_caption_label">
- A cosa stai pensando?
- </text>
- </layout_panel>
- <layout_panel name="status_button_panel">
- <button label="Pubblica" name="post_status_btn"/>
- <button label="Annulla" name="cancel_status_btn"/>
- </layout_panel>
- </layout_stack>
+ <string name="facebook_connected" value="Sei in collegamento con Facebook come:"/>
+ <string name="facebook_disconnected" value="Non in collegamento con Facebook"/>
+ <text name="account_caption_label">
+ Non in collegamento con Facebook.
+ </text>
+ <panel name="panel_buttons">
+ <button label="Collegamento..." name="connect_btn"/>
+ <button label="Interrompi collegamento" name="disconnect_btn"/>
+ <text name="account_learn_more_label">
+ [http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-Share-Facebook/ta-p/2149711 Come pubblicare su Facebook]
+ </text>
+ </panel>
+ <text name="status_caption_label">
+ A cosa stai pensando?
+ </text>
+ <button label="Post" name="post_status_btn"/>
+ <button label="Annulla" name="cancel_status_btn"/>
</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_flickr_photo.xml b/indra/newview/skins/default/xui/it/panel_flickr_photo.xml
index 064c302b14..e989fb2081 100644
--- a/indra/newview/skins/default/xui/it/panel_flickr_photo.xml
+++ b/indra/newview/skins/default/xui/it/panel_flickr_photo.xml
@@ -1,41 +1,35 @@
<?xml version="1.0" encoding="utf-8"?>
<panel name="panel_flickr_photo">
- <layout_stack name="stack_photo">
- <layout_panel name="snapshot_panel">
- <combo_box name="resolution_combobox" tool_tip="Risoluzione immagini">
- <combo_box.item label="Finestra attuale" name="CurrentWindow"/>
- <combo_box.item label="640x480" name="640x480"/>
- <combo_box.item label="800x600" name="800x600"/>
- <combo_box.item label="1024x768" name="1024x768"/>
- </combo_box>
- <combo_box name="filters_combobox" tool_tip="Filtri immagini">
- <combo_box.item label="Nessun filtro" name="NoFilter"/>
- </combo_box>
- <button label="Aggiorna" name="new_snapshot_btn" tool_tip="Fai clic per aggiornare"/>
- <button label="Anteprima" name="big_preview_btn" tool_tip="Fai clic per alternare l&apos;anteprima"/>
- <text name="title_label">
- Titolo:
- </text>
- <text name="description_label">
- Descrizione:
- </text>
- <check_box initial_value="true" label="Includi l&apos;ubicazione SL al termine della descrizione" name="add_location_cb"/>
- <text name="tags_label">
- Tag:
- </text>
- <text name="tags_help_label">
- Separa tag con spazi
+ <combo_box name="resolution_combobox" tool_tip="Risoluzione immagini">
+ <combo_box.item label="Finestra attuale" name="CurrentWindow"/>
+ <combo_box.item label="640x480" name="640x480"/>
+ <combo_box.item label="800x600" name="800x600"/>
+ <combo_box.item label="1024x768" name="1024x768"/>
+ </combo_box>
+ <combo_box name="filters_combobox" tool_tip="Filtri immagini">
+ <combo_box.item label="Nessun filtro" name="NoFilter"/>
+ </combo_box>
+ <button label="Aggiorna" name="new_snapshot_btn" tool_tip="Fai clic per aggiornare"/>
+ <button label="Anteprima" name="big_preview_btn" tool_tip="Fai clic per alternare l&apos;anteprima"/>
+ <text name="title_label">
+ Titolo:
+ </text>
+ <text name="description_label">
+ Descrizione:
+ </text>
+ <check_box initial_value="true" label="Includi il luogo SL al termine della descrizione" name="add_location_cb"/>
+ <text name="tags_label">
+ Tag:
+ </text>
+ <text name="tags_help_label">
+ Separa tag con spazi
Usa &quot;&quot; per tag con più di una parola
- </text>
- <combo_box name="rating_combobox" tool_tip="Categoria del contenuto di Flickr">
- <combo_box.item label="Categoria Flickr Sicuro" name="SafeRating"/>
- <combo_box.item label="Categoria Flickr Moderato" name="ModerateRating"/>
- <combo_box.item label="Categoria Flickr Censurato" name="RestrictedRating"/>
- </combo_box>
- </layout_panel>
- <layout_panel name="photo_button_panel">
- <button label="Carica" name="post_photo_btn"/>
- <button label="Annulla" name="cancel_photo_btn"/>
- </layout_panel>
- </layout_stack>
+ </text>
+ <combo_box name="rating_combobox" tool_tip="Categoria del contenuto di Flickr">
+ <combo_box.item label="Categoria Flickr Sicuro" name="SafeRating"/>
+ <combo_box.item label="Categoria Flickr Moderato" name="ModerateRating"/>
+ <combo_box.item label="Categoria Flickr Censurato" name="RestrictedRating"/>
+ </combo_box>
+ <button label="Carica" name="post_photo_btn"/>
+ <button label="Annulla" name="cancel_photo_btn"/>
</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/it/panel_group_info_sidetray.xml
index 138edc3a26..fb51febc58 100755
--- a/indra/newview/skins/default/xui/it/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/default/xui/it/panel_group_info_sidetray.xml
@@ -23,6 +23,7 @@
<accordion_tab name="group_roles_tab" title="Ruoli e membri"/>
<accordion_tab name="group_notices_tab" title="Avvisi"/>
<accordion_tab name="group_land_tab" title="Terra/Beni"/>
+ <accordion_tab name="group_experiences_tab" title="Esperienze"/>
</accordion>
</layout_panel>
</layout_stack>
diff --git a/indra/newview/skins/default/xui/it/panel_login.xml b/indra/newview/skins/default/xui/it/panel_login.xml
index 1ce38ac40c..6c1777163c 100755
--- a/indra/newview/skins/default/xui/it/panel_login.xml
+++ b/indra/newview/skins/default/xui/it/panel_login.xml
@@ -1,26 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<panel name="panel_login">
- <panel.string name="forgot_password_url">
- http://secondlife.com/account/request.php?lang=it
- </panel.string>
+ <panel.string name="forgot_password_url">http://secondlife.com/account/request.php?lang=it</panel.string>
<layout_stack name="ui_stack">
<layout_panel name="ui_container">
<combo_box label="Nome utente" name="username_combo" tool_tip="Il nome utente che hai scelto durante la registrazione, come roby12 o Stella Solare"/>
<line_editor label="Password" name="password_edit"/>
- <check_box label="Ricordami" name="remember_check"/>
- <text name="forgot_password_text">
- Password dimenticata
- </text>
- <button label="Accedi" name="connect_btn"/>
- <text name="At_My_Last_Location_Label">
- all&apos;ultima ubicazione
- </text>
<combo_box label="I miei luoghi preferiti" name="start_location_combo">
+ <combo_box.item label="La mia ultima ubicazione" name="MyLastLocation"/>
<combo_box.item label="Casa mia" name="MyHome"/>
</combo_box>
- <button label="Accedi" name="connect_favorite_btn"/>
- <line_editor label="Digita un&apos;ubicazione" name="location_edit"/>
- <button label="Accedi" name="connect_location_btn"/>
+ <button label="Accedi" name="connect_btn"/>
+ <check_box label="Ricordami" name="remember_check"/>
+ <text name="forgot_password_text">Password dimenticata</text>
<combo_box label="Seleziona griglia" name="server_combo"/>
</layout_panel>
</layout_stack>
diff --git a/indra/newview/skins/default/xui/it/panel_marketplace_listings.xml b/indra/newview/skins/default/xui/it/panel_marketplace_listings.xml
new file mode 100644
index 0000000000..d28dfadf45
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/panel_marketplace_listings.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Marketplace" name="Marketplace Panel">
+ <panel name="tool_panel">
+ <menu_button name="sort_btn" tool_tip="Visualizza/ordina opzioni"/>
+ <button name="add_btn" tool_tip="Crea una nuova cartella annunci"/>
+ <button label="Controlla che non ci siano errori" name="audit_btn" tool_tip="Controlla i tuoi annunci su Marketplace"/>
+ </panel>
+ <panel name="tab_container_panel">
+ <filter_editor label="Filtra annunci Marketplace" name="filter_editor"/>
+ </panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_marketplace_listings_inventory.xml b/indra/newview/skins/default/xui/it/panel_marketplace_listings_inventory.xml
new file mode 100644
index 0000000000..4902442d2b
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/panel_marketplace_listings_inventory.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<inventory_panel label="TUTTO" name="All Items" tool_tip="Trascina e rilascia qui gli articoli da elencare"/>
diff --git a/indra/newview/skins/default/xui/it/panel_marketplace_listings_listed.xml b/indra/newview/skins/default/xui/it/panel_marketplace_listings_listed.xml
new file mode 100644
index 0000000000..3fb0d5645c
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/panel_marketplace_listings_listed.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<inventory_panel label="IN ELENCO" name="Active Items"/>
diff --git a/indra/newview/skins/default/xui/it/panel_marketplace_listings_unassociated.xml b/indra/newview/skins/default/xui/it/panel_marketplace_listings_unassociated.xml
new file mode 100644
index 0000000000..ac6b2952fc
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/panel_marketplace_listings_unassociated.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<inventory_panel label="NON ASSOCIATO" name="Unassociated Items"/>
diff --git a/indra/newview/skins/default/xui/it/panel_marketplace_listings_unlisted.xml b/indra/newview/skins/default/xui/it/panel_marketplace_listings_unlisted.xml
new file mode 100644
index 0000000000..6c9fae7ddc
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/panel_marketplace_listings_unlisted.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<inventory_panel label="RIMOSSI" name="Inactive Items"/>
diff --git a/indra/newview/skins/default/xui/it/panel_postcard_settings.xml b/indra/newview/skins/default/xui/it/panel_postcard_settings.xml
index 6a586c4415..374e6a07e5 100755
--- a/indra/newview/skins/default/xui/it/panel_postcard_settings.xml
+++ b/indra/newview/skins/default/xui/it/panel_postcard_settings.xml
@@ -7,17 +7,7 @@
<combo_box.item label="1024x768" name="1024x768"/>
<combo_box.item label="Personalizza" name="Custom"/>
</combo_box>
- <layout_stack name="postcard_image_params_ls">
- <layout_panel name="postcard_image_size_lp">
- <spinner label="Larghezza" name="postcard_snapshot_width"/>
- <spinner label="Altezza" name="postcard_snapshot_height"/>
- <check_box label="Mantieni le proporzioni" name="postcard_keep_aspect_check"/>
- </layout_panel>
- <layout_panel name="postcard_image_format_quality_lp">
- <slider label="Qualità dell&apos;immagine" name="image_quality_slider"/>
- <text name="image_quality_level">
- ([QLVL])
- </text>
- </layout_panel>
- </layout_stack>
+ <spinner label="Larghezza x altezza" name="postcard_snapshot_width"/>
+ <check_box label="Mantieni le proporzioni" name="postcard_keep_aspect_check"/>
+ <slider label="Qualità:" name="image_quality_slider"/>
</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_setup.xml b/indra/newview/skins/default/xui/it/panel_preferences_setup.xml
index fcc9661d03..e204d70b03 100755
--- a/indra/newview/skins/default/xui/it/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/it/panel_preferences_setup.xml
@@ -14,9 +14,9 @@
<text name="Web:">
Web:
</text>
- <radio_group name="use_external_browser">
- <radio_item label="Usa il mio browser (IE, Firefox, Safari)" name="external" tool_tip="Utilizza il browser Web predefinito di sistema per l&apos;aiuto, per i link Web e così via. Sconsigliato durante l&apos;esecuzione a tutto schermo." value="true"/>
- <radio_item label="Utilizza il browser Web integrato" name="internal" tool_tip="Utilizza il browser Web integrato per l&apos;aiuto, per i link Web e così via. Questo browser si apre in una nuova finestra in [APP_NAME]." value=""/>
+ <radio_group name="preferred_browser_behavior">
+ <radio_item label="Usa il mio browser (Chrome, Firefox, IE) per tutti i link" name="internal" tool_tip="Utilizza il browser Web predefinito di sistema per l&apos;aiuto, per i link Web e così via. Sconsigliato durante l&apos;esecuzione a tutto schermo." value="0"/>
+ <radio_item label="Usa il browser incorporato solo per i link di Second Life" name="external" tool_tip="Utilizza il browser Web predefinito di sistema per l&apos;aiuto, per i link Web e così via. Il browser incorporato verrà usato solo per i link LindenLab/SecondLife." value="1"/>
</radio_group>
<check_box initial_value="true" label="Abilita plugin" name="browser_plugins_enabled"/>
<check_box initial_value="true" label="Accetta cookie" name="cookies_enabled"/>
diff --git a/indra/newview/skins/default/xui/it/panel_region_experiences.xml b/indra/newview/skins/default/xui/it/panel_region_experiences.xml
new file mode 100644
index 0000000000..e19650553a
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/panel_region_experiences.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Esperienze" name="Experiences">
+ <panel.string name="trusted_estate_text">
+ Qualunque esperienza può essere un&apos;esperienza chiave.
+
+Le esperienze chiave dispongono di autorizzazione per l&apos;esecuzione in questa proprietà immobiliare.
+
+Inoltre, se la proprietà immobiliare non consente l&apos;accesso pubblico, i Residenti che partecipano a un&apos;esperienza chiave possono accedere alla proprietà e restarvi per tutto il tempo durante il quale partecipano all&apos;esperienza chiave.
+ </panel.string>
+ <panel.string name="allowed_estate_text">
+ Sono consentite solo le esperienze a livello di terreno.
+
+Le esperienze consentite dispongono di autorizzazione per l&apos;esecuzione in questa proprietà immobiliare.
+ </panel.string>
+ <panel.string name="blocked_estate_text">
+ Possono essere bloccate solo le esperienze a livello di griglia.
+
+Le esperienze bloccate non possono essere eseguite su questa proprietà immobiliare.
+ </panel.string>
+ <panel.string name="estate_caption">
+ Le modifiche apportate in questa scheda saranno valide per tutte le regioni in questa proprietà.
+ </panel.string>
+ <panel.string name="allowed_parcel_text">
+ Sono consentite solo le esperienze a livello di terreno.
+
+Le esperienze consentite dispongono di autorizzazione per l&apos;esecuzione su questo lotto se non sono bloccate a livello di proprietà immobiliare.
+ </panel.string>
+ <panel.string name="blocked_parcel_text">
+ Qualsiasi esperienza residente può essere bloccata.
+
+Le esperienze bloccate non possono essere eseguite su questo lotto.
+ </panel.string>
+</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_script_experience.xml b/indra/newview/skins/default/xui/it/panel_script_experience.xml
new file mode 100644
index 0000000000..0f9e2fb9c5
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/panel_script_experience.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<panel name="script_experience" title="ESPERIENZA">
+ <button label="Esperienza" name="Expand Experience"/>
+ <check_box label="Usa le esperienze" name="enable_xp"/>
+ <layout_stack name="xp_details">
+ <layout_panel>
+ <combo_box label="Scegli esperienza..." name="Experiences..."/>
+ </layout_panel>
+ </layout_stack>
+ <text name="No Experiences">
+ Non sei il fornitore di alcuna esperienza.
+ </text>
+</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/it/panel_snapshot_inventory.xml
index c9245029b7..e6fba8e3bf 100755
--- a/indra/newview/skins/default/xui/it/panel_snapshot_inventory.xml
+++ b/indra/newview/skins/default/xui/it/panel_snapshot_inventory.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="panel_snapshot_inventory">
<text name="title">
- Salva nell&apos;inventario
+ Inventario
</text>
<text name="hint_lbl">
Salvare un&apos;immagine nell&apos;inventario costa L$[UPLOAD_COST]. Per salvare l&apos;immagine come texture, selezionare uno dei formati quadrati.
@@ -13,8 +13,8 @@
<combo_box.item label="Grande (512x512)" name="Large(512x512)"/>
<combo_box.item label="Personalizza" name="Custom"/>
</combo_box>
- <spinner label="Larghezza" name="inventory_snapshot_width"/>
- <spinner label="Altezza" name="inventory_snapshot_height"/>
+ <spinner label="Larghezza x altezza" name="inventory_snapshot_width"/>
+ <spinner label="" name="inventory_snapshot_height"/>
<check_box label="Mantieni le proporzioni" name="inventory_keep_aspect_check"/>
<button label="Annulla" name="cancel_btn"/>
<button label="Salva" name="save_btn"/>
diff --git a/indra/newview/skins/default/xui/it/panel_snapshot_local.xml b/indra/newview/skins/default/xui/it/panel_snapshot_local.xml
index 4b725b68f9..f76c19d27b 100755
--- a/indra/newview/skins/default/xui/it/panel_snapshot_local.xml
+++ b/indra/newview/skins/default/xui/it/panel_snapshot_local.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="panel_snapshot_local">
<text name="title">
- Salva sul mio computer
+ Disco
</text>
<combo_box label="Risoluzione" name="local_size_combo">
<combo_box.item label="Finestra attuale" name="CurrentWindow"/>
@@ -13,24 +13,17 @@
<combo_box.item label="1600x1200" name="1600x1200"/>
<combo_box.item label="Personalizza" name="Custom"/>
</combo_box>
- <layout_stack name="local_image_params_ls">
- <layout_panel name="local_image_size_lp">
- <spinner label="Larghezza" name="local_snapshot_width"/>
- <spinner label="Altezza" name="local_snapshot_height"/>
- <check_box label="Mantieni le proporzioni" name="local_keep_aspect_check"/>
- </layout_panel>
- <layout_panel name="local_image_format_quality_lp">
- <combo_box label="Formato" name="local_format_combo">
- <combo_box.item label="PNG (senza perdite)" name="PNG"/>
- <combo_box.item label="JPEG" name="JPEG"/>
- <combo_box.item label="BMP (senza perdite)" name="BMP"/>
- </combo_box>
- <slider label="Qualità dell&apos;immagine" name="image_quality_slider"/>
- <text name="image_quality_level">
- ([QLVL])
- </text>
- </layout_panel>
- </layout_stack>
+ <spinner label="Larghezza x altezza" name="local_snapshot_width"/>
+ <check_box label="Mantieni le proporzioni" name="local_keep_aspect_check"/>
+ <text name="local_format_label">
+ Formato:
+ </text>
+ <combo_box label="Formato" name="local_format_combo">
+ <combo_box.item label="PNG (senza perdite)" name="PNG"/>
+ <combo_box.item label="JPEG" name="JPEG"/>
+ <combo_box.item label="BMP (senza perdite)" name="BMP"/>
+ </combo_box>
+ <slider label="Qualità:" name="image_quality_slider"/>
<button label="Annulla" name="cancel_btn"/>
<flyout_button label="Salva" name="save_btn" tool_tip="Salva immagine come file">
<flyout_button.item label="Salva" name="save_item"/>
diff --git a/indra/newview/skins/default/xui/it/panel_snapshot_options.xml b/indra/newview/skins/default/xui/it/panel_snapshot_options.xml
index a043e5add6..ba56499987 100755
--- a/indra/newview/skins/default/xui/it/panel_snapshot_options.xml
+++ b/indra/newview/skins/default/xui/it/panel_snapshot_options.xml
@@ -1,16 +1,10 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="panel_snapshot_options">
- <button label="Invia post al feed del mio profilo" name="save_to_profile_btn"/>
- <button label="E-mail" name="save_to_email_btn"/>
+ <button label="Salva sul disco" name="save_to_computer_btn"/>
<button label="Salva nell&apos;inventario (L$[AMOUNT])" name="save_to_inventory_btn"/>
- <button label="Salva sul mio computer" name="save_to_computer_btn"/>
- <text name="send_to_facebook_textbox">
- Invia a: [secondlife:/// Facebook]
- </text>
- <text name="send_to_twitter_textbox">
- [secondlife:/// Twitter]
- </text>
- <text name="send_to_flickr_textbox">
- [secondlife:/// Flickr]
- </text>
+ <button label="Carica sul profilo" name="save_to_profile_btn"/>
+ <button label="Carica su Facebook" name="send_to_facebook_btn"/>
+ <button label="Carica su Twitter" name="send_to_twitter_btn"/>
+ <button label="Carica su Flickr" name="send_to_flickr_btn"/>
+ <button label="Invia tramite e-mail" name="save_to_email_btn"/>
</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/it/panel_snapshot_postcard.xml
index 3703b97e6c..be7d8763b6 100755
--- a/indra/newview/skins/default/xui/it/panel_snapshot_postcard.xml
+++ b/indra/newview/skins/default/xui/it/panel_snapshot_postcard.xml
@@ -12,6 +12,10 @@
<text name="title">
E-mail
</text>
- <button label="Messaggio" name="message_btn"/>
- <button label="Impostazioni" name="settings_btn"/>
+ <tab_container name="postcard_tabs">
+ <panel label="Messaggio" name="panel_postcard_message"/>
+ <panel label="Impostazioni" name="panel_postcard_settings"/>
+ </tab_container>
+ <button label="Annulla" name="cancel_btn"/>
+ <button label="Invia" name="send_btn"/>
</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_snapshot_profile.xml b/indra/newview/skins/default/xui/it/panel_snapshot_profile.xml
index 2cdbf97049..3de12c959c 100755
--- a/indra/newview/skins/default/xui/it/panel_snapshot_profile.xml
+++ b/indra/newview/skins/default/xui/it/panel_snapshot_profile.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="panel_snapshot_profile">
<text name="title">
- Invia post al feed del mio profilo
+ Profilo
</text>
<combo_box label="Risoluzione" name="profile_size_combo">
<combo_box.item label="Finestra attuale" name="CurrentWindow"/>
@@ -10,19 +10,12 @@
<combo_box.item label="1024x768" name="1024x768"/>
<combo_box.item label="Personalizza" name="Custom"/>
</combo_box>
- <layout_stack name="profile_image_params_ls">
- <layout_panel name="profile_image_size_lp">
- <spinner label="Larghezza" name="profile_snapshot_width"/>
- <spinner label="Altezza" name="profile_snapshot_height"/>
- <check_box label="Mantieni le proporzioni" name="profile_keep_aspect_check"/>
- </layout_panel>
- <layout_panel name="profile_image_metadata_lp">
- <text name="caption_label">
- Didascalia:
- </text>
- <check_box initial_value="true" label="Includi luogo" name="add_location_cb"/>
- </layout_panel>
- </layout_stack>
+ <spinner label="Larghezza x altezza" name="profile_snapshot_width"/>
+ <check_box label="Mantieni le proporzioni" name="profile_keep_aspect_check"/>
+ <text name="caption_label">
+ Didascalia:
+ </text>
+ <check_box initial_value="true" label="Includi luogo" name="add_location_cb"/>
<button label="Annulla" name="cancel_btn"/>
<button label="Post" name="post_btn"/>
</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_status_bar.xml b/indra/newview/skins/default/xui/it/panel_status_bar.xml
index 0aaf89d8c8..83d2ae5bab 100755
--- a/indra/newview/skins/default/xui/it/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/it/panel_status_bar.xml
@@ -1,28 +1,16 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="status">
- <panel.string name="packet_loss_tooltip">
- Perdita di pacchetti
- </panel.string>
- <panel.string name="bandwidth_tooltip">
- Larghezza di banda
- </panel.string>
- <panel.string name="time">
- [hour12, datetime, slt]:[min, datetime, slt] [ampm, datetime, slt] [timezone,datetime, slt]
- </panel.string>
- <panel.string name="timeTooltip">
- [weekday, datetime, slt], [day, datetime, slt] [month, datetime, slt] [year, datetime, slt]
- </panel.string>
- <panel.string name="buycurrencylabel">
- L$ [AMT]
- </panel.string>
+ <panel.string name="packet_loss_tooltip">Perdita di pacchetti</panel.string>
+ <panel.string name="bandwidth_tooltip">Larghezza di banda</panel.string>
+ <panel.string name="time">[hour12, datetime, slt]:[min, datetime, slt] [ampm, datetime, slt] [timezone,datetime, slt]</panel.string>
+ <panel.string name="timeTooltip">[weekday, datetime, slt], [day, datetime, slt] [month, datetime, slt] [year, datetime, slt]</panel.string>
+ <panel.string name="buycurrencylabel">L$ [AMT]</panel.string>
<panel left="-405" name="balance_bg" width="195">
- <text name="balance" tool_tip="Clicca per aggiornare il tuo saldo in L$" value="L$ 20"/>
+ <text name="balance" tool_tip="Clicca per aggiornare il tuo saldo in L$" value="L$ ??"/>
<button label="Acquista L$" name="buyL" tool_tip="Clicca per acquistare più L$"/>
<button label="Acquisti" name="goShop" tool_tip="Apri Mercato Second Life" width="75"/>
</panel>
- <text name="TimeText" tool_tip="Orario attuale (Pacifico)">
- 24:00, ora del Pacifico
- </text>
+ <text name="TimeText" tool_tip="Orario attuale (Pacifico)">24:00, ora del Pacifico</text>
<button name="media_toggle_btn" tool_tip="Attiva/ferma tutti i media (musica, video, pagine Web)"/>
<button name="volume_btn" tool_tip="Regolazione del volume globale"/>
</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_twitter_photo.xml b/indra/newview/skins/default/xui/it/panel_twitter_photo.xml
index 740ec3961f..69596784bd 100644
--- a/indra/newview/skins/default/xui/it/panel_twitter_photo.xml
+++ b/indra/newview/skins/default/xui/it/panel_twitter_photo.xml
@@ -1,32 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<panel name="panel_twitter_photo">
- <layout_stack name="stack_photo">
- <layout_panel name="text_panel">
- <text name="status_label">
- Cosa sta succedendo?
- </text>
- <text name="status_counter_label">
- 140
- </text>
- <check_box initial_value="true" label="Includi l&apos;ubicazione in SL" name="add_location_cb"/>
- <check_box initial_value="true" label="Includi una foto" name="add_photo_cb"/>
- </layout_panel>
- <layout_panel name="snapshot_panel">
- <combo_box name="resolution_combobox" tool_tip="Risoluzione immagini">
- <combo_box.item label="Finestra attuale" name="CurrentWindow"/>
- <combo_box.item label="640x480" name="640x480"/>
- <combo_box.item label="800x600" name="800x600"/>
- <combo_box.item label="1024x768" name="1024x768"/>
- </combo_box>
- <combo_box name="filters_combobox" tool_tip="Filtri immagini">
- <combo_box.item label="Nessun filtro" name="NoFilter"/>
- </combo_box>
- <button label="Aggiorna" name="new_snapshot_btn" tool_tip="Fai clic per aggiornare"/>
- <button label="Anteprima" name="big_preview_btn" tool_tip="Fai clic per alternare l&apos;anteprima"/>
- </layout_panel>
- <layout_panel name="photo_button_panel">
- <button label="Tweetta" name="post_photo_btn"/>
- <button label="Annulla" name="cancel_photo_btn"/>
- </layout_panel>
- </layout_stack>
+ <text name="status_label">
+ Cosa sta succedendo?
+ </text>
+ <text name="status_counter_label">
+ 140
+ </text>
+ <check_box initial_value="true" label="Includi il luogo in SL" name="add_location_cb"/>
+ <check_box initial_value="true" label="Includi una foto" name="add_photo_cb"/>
+ <combo_box name="resolution_combobox" tool_tip="Risoluzione immagini">
+ <combo_box.item label="Finestra attuale" name="CurrentWindow"/>
+ <combo_box.item label="640x480" name="640x480"/>
+ <combo_box.item label="800x600" name="800x600"/>
+ <combo_box.item label="1024x768" name="1024x768"/>
+ </combo_box>
+ <combo_box name="filters_combobox" tool_tip="Filtri immagini">
+ <combo_box.item label="Nessun filtro" name="NoFilter"/>
+ </combo_box>
+ <button label="Aggiorna" name="new_snapshot_btn" tool_tip="Fai clic per aggiornare"/>
+ <button label="Anteprima" name="big_preview_btn" tool_tip="Fai clic per alternare l&apos;anteprima"/>
+ <button label="Tweetta" name="post_photo_btn"/>
+ <button label="Annulla" name="cancel_photo_btn"/>
</panel>
diff --git a/indra/newview/skins/default/xui/it/role_actions.xml b/indra/newview/skins/default/xui/it/role_actions.xml
index 80d65a9c74..b53eca4f78 100755
--- a/indra/newview/skins/default/xui/it/role_actions.xml
+++ b/indra/newview/skins/default/xui/it/role_actions.xml
@@ -71,4 +71,8 @@
<action description="Partecipa alla Chat vocale di gruppo" longdescription=" I membri con questo ruolo e abilità possono partecipare alle sessioni di Chat vocale nel gruppo. NOTA: per poter partecipare alla Chat di gruppo è necessario accedere alla sessione di chat vocale." name="join voice chat" value="27"/>
<action description="Moderare la Chat di gruppo" longdescription="I membri con questo ruolo e abilità possono gestire l&apos;accesso e la partecipazione alle sessioni di chat scritta e di chat vocale nel gruppo." name="moderate group chat" value="37"/>
</action_set>
+ <action_set description="Queste Abilità includono la capacità di modificare le esperienze che appartengono al gruppo." name="experience_tools_experience">
+ <action description="Amministratore esperienza" longdescription="I membri di un ruolo che include questa abilità possono modificare i metadati di un&apos;esperienza." name="experience admin" value="49"/>
+ <action description="Fornitore esperienza" longdescription="I membri di un ruolo che include questa abilità possono fornire script per un&apos;esperienza." name="experience contributor" value="50"/>
+ </action_set>
</role_actions>
diff --git a/indra/newview/skins/default/xui/it/sidepanel_item_info.xml b/indra/newview/skins/default/xui/it/sidepanel_item_info.xml
index 2b3ea0fb83..14c1c43816 100755
--- a/indra/newview/skins/default/xui/it/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/it/sidepanel_item_info.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="item properties" title="Profilo articolo">
+ <panel.string name="loading_experience">
+ (caricamento in corso)
+ </panel.string>
<panel.string name="unknown">
(sconosciuto)
</panel.string>
@@ -43,6 +46,9 @@
<text name="LabelAcquiredTitle">
Acquisito:
</text>
+ <text name="LabelItemExperienceTitle">
+ Esperienza:
+ </text>
<panel name="perms_inv">
<text name="perm_modify">
Tu puoi:
@@ -66,8 +72,9 @@
<check_box label="Trasferisci" name="CheckNextOwnerTransfer" tool_tip="Il prossimo proprietario può regalare o rivendere questo oggetto"/>
</panel>
<check_box label="In vendita" name="CheckPurchase"/>
- <combo_box name="combobox sale copy">
+ <combo_box name="ComboBoxSaleType">
<combo_box.item label="Copia" name="Copy"/>
+ <combo_box.item label="Contenuti" name="Contents"/>
<combo_box.item label="Originale" name="Original"/>
</combo_box>
<spinner label="Prezzo: L$" name="Edit Cost"/>
diff --git a/indra/newview/skins/default/xui/it/sidepanel_task_info.xml b/indra/newview/skins/default/xui/it/sidepanel_task_info.xml
index 5f912dd126..aabefd7d3c 100755
--- a/indra/newview/skins/default/xui/it/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/it/sidepanel_task_info.xml
@@ -1,71 +1,31 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="object properties" title="Profilo dell&apos;oggetto">
- <panel.string name="text deed continued">
- Cessione
- </panel.string>
- <panel.string name="text deed">
- Cessione
- </panel.string>
- <panel.string name="text modify info 1">
- Tu puoi modificare questo oggetto
- </panel.string>
- <panel.string name="text modify info 2">
- Tu puoi modificare questi oggetti
- </panel.string>
- <panel.string name="text modify info 3">
- Non puoi modificare questo oggetto
- </panel.string>
- <panel.string name="text modify info 4">
- Non puoi modificare questi oggetti
- </panel.string>
- <panel.string name="text modify info 5">
- Questo oggetto non può essere modificato attraverso il confine di una regione
- </panel.string>
- <panel.string name="text modify info 6">
- Questi oggetti non possono essere modificati attraverso il confine di una regione
- </panel.string>
- <panel.string name="text modify warning">
- Questo oggetto ha parti collegate
- </panel.string>
- <panel.string name="Cost Default">
- Prezzo: L$
- </panel.string>
- <panel.string name="Cost Total">
- Prezzo totale: L$
- </panel.string>
- <panel.string name="Cost Per Unit">
- Prezzo per: L$
- </panel.string>
- <panel.string name="Cost Mixed">
- Prezzo misto
- </panel.string>
- <panel.string name="Sale Mixed">
- Vendita mista
- </panel.string>
+ <panel.string name="text deed continued">Cessione</panel.string>
+ <panel.string name="text deed">Cessione</panel.string>
+ <panel.string name="text modify info 1">Tu puoi modificare questo oggetto</panel.string>
+ <panel.string name="text modify info 2">Tu puoi modificare questi oggetti</panel.string>
+ <panel.string name="text modify info 3">Non puoi modificare questo oggetto</panel.string>
+ <panel.string name="text modify info 4">Non puoi modificare questi oggetti</panel.string>
+ <panel.string name="text modify info 5">Questo oggetto non può essere modificato attraverso il confine di una regione</panel.string>
+ <panel.string name="text modify info 6">Questi oggetti non possono essere modificati attraverso il confine di una regione</panel.string>
+ <panel.string name="text modify warning">Questo oggetto ha parti collegate</panel.string>
+ <panel.string name="Cost Default">Prezzo: L$</panel.string>
+ <panel.string name="Cost Total">Prezzo totale: L$</panel.string>
+ <panel.string name="Cost Per Unit">Prezzo per: L$</panel.string>
+ <panel.string name="Cost Mixed">Prezzo misto</panel.string>
+ <panel.string name="Sale Mixed">Vendita mista</panel.string>
<text name="title" value="Profilo dell&apos;oggetto"/>
<text name="where" value="(in Second Life)"/>
<panel label="" name="properties_panel">
- <text name="Name:">
- Nome:
- </text>
- <text name="Description:">
- Descrizione:
- </text>
- <text name="CreatorNameLabel">
- Ideatore:
- </text>
- <text name="Owner:">
- Proprietario:
- </text>
- <text name="Group_label">
- Gruppo:
- </text>
+ <text name="Name:">Nome:</text>
+ <text name="Description:">Descrizione:</text>
+ <text name="CreatorNameLabel">Ideatore:</text>
+ <text name="Owner:">Proprietario:</text>
+ <text name="Group_label">Gruppo:</text>
<button name="button set group" tool_tip="Scegli un gruppo con cui condividere i diritti relativi all&apos;oggetto"/>
<name_box initial_value="Caricamento in corso..." name="Group Name Proxy"/>
<button label="Cessione" label_selected="Cessione" name="button deed" tool_tip="Con una cessione si trasferisce il bene con i diritti al proprietario successivo Gli oggetti in proprietà condivisa di gruppo possono essere ceduti soltanto da un funzionario del gruppo."/>
- <text name="label click action">
- Fai clic per:
- </text>
+ <text name="label click action">Fai clic per:</text>
<combo_box name="clickaction">
<combo_box.item label="Tocca (predefinito)" name="Touch/grab(default)"/>
<combo_box.item label="Siediti sull&apos;oggetto" name="Sitonobject"/>
@@ -75,21 +35,13 @@
<combo_box.item label="Ingrandisci" name="Zoom"/>
</combo_box>
<panel name="perms_inv">
- <text name="perm_modify">
- Tu puoi modificare questo oggetto
- </text>
- <text name="Anyone can:">
- Chiunque:
- </text>
+ <text name="perm_modify">Tu puoi modificare questo oggetto</text>
+ <text name="Anyone can:">Chiunque:</text>
<check_box label="Copia" name="checkbox allow everyone copy"/>
<check_box label="Sposta" name="checkbox allow everyone move"/>
- <text name="GroupLabel">
- Gruppo:
- </text>
+ <text name="GroupLabel">Gruppo:</text>
<check_box label="Condividi" name="checkbox share with group" tool_tip="Consenti a tutti i membri del gruppo selezionato di condividere i tuoi diritti di modifica di questo oggetto. Per attivare le restrizioni per ruolo devi prima effettuare la cessione."/>
- <text name="NextOwnerLabel">
- Proprietario successivo:
- </text>
+ <text name="NextOwnerLabel">Proprietario successivo:</text>
<check_box label="Modifica" name="checkbox next owner can modify"/>
<check_box label="Copia" name="checkbox next owner can copy"/>
<check_box label="Trasferisci" name="checkbox next owner can transfer" tool_tip="Il prossimo proprietario può regalare o rivendere questo oggetto"/>
@@ -102,27 +54,13 @@
</combo_box>
<spinner label="Prezzo: L$" name="Edit Cost"/>
<check_box label="Mostra nella ricerca" name="search_check" tool_tip="Permetti alle persone di vedere questo oggetto nei risultati della ricerca"/>
- <text name="pathfinding_attributes_label">
- Attributi pathfinding:
- </text>
- <text name="B:">
- B:
- </text>
- <text name="O:">
- O:
- </text>
- <text name="G:">
- G:
- </text>
- <text name="E:">
- E:
- </text>
- <text name="N:">
- N:
- </text>
- <text name="F:">
- F:
- </text>
+ <text name="pathfinding_attributes_label">Attributi pathfinding:</text>
+ <text name="B:">B:</text>
+ <text name="O:">O:</text>
+ <text name="G:">G:</text>
+ <text name="E:">E:</text>
+ <text name="N:">N:</text>
+ <text name="F:">F:</text>
</panel>
<panel name="button_panel">
<button label="Apri" name="open_btn"/>
diff --git a/indra/newview/skins/default/xui/it/strings.xml b/indra/newview/skins/default/xui/it/strings.xml
index 17ce8aaf5e..b9a87a1527 100755
--- a/indra/newview/skins/default/xui/it/strings.xml
+++ b/indra/newview/skins/default/xui/it/strings.xml
@@ -446,30 +446,51 @@ Prova ad accedere nuovamente tra un minuto.
<string name="TooltipMustSingleDrop">
Solo un singolo oggetto può essere creato qui
</string>
+ <string name="TooltipTooManyWearables">
+ Non puoi indossare una cartella che contiene più di [AMOUNT] elementi. Per modificare questo limite, accedi ad Avanzate &gt; Mostra impostazioni di debug &gt; WearFolderLimit.
+ </string>
<string name="TooltipPrice" value="L$ [AMOUNT]:"/>
<string name="TooltipOutboxDragToWorld">
- Non puoi rezzare elementi nella tua casella in uscita del rivenditore
+ Non puoi rezzare articoli dalla cartella degli annunci di Marketplace
+ </string>
+ <string name="TooltipOutboxWorn">
+ Non puoi inserire nella cartella degli annunci in Marketplace gli articoli che indossi
+ </string>
+ <string name="TooltipOutboxFolderLevels">
+ La profondità delle caselle nidificate è maggiore di [AMOUNT]. Diminuisci la profondità delle cartelle nidificate; se necessario, raggruppa gli articoli.
+ </string>
+ <string name="TooltipOutboxTooManyFolders">
+ Il numero di sottocartelle è maggiore di [AMOUNT]. Diminuisci il numero delle cartelle nel tuo annuncio; se necessario, raggruppa gli articoli.
+ </string>
+ <string name="TooltipOutboxTooManyObjects">
+ Il numero di articoli è maggiore di [AMOUNT]. Per vendere più di [AMOUNT] articoli in un annuncio, devi raggruppare alcuni di essi.
+ </string>
+ <string name="TooltipOutboxTooManyStockItems">
+ Il numero di articoli in magazzino è maggiore di [AMOUNT].
+ </string>
+ <string name="TooltipOutboxCannotDropOnRoot">
+ Puoi trascinare articoli o cartelle solo nella scheda TUTTI. Seleziona la scheda e sposta nuovamente gli articoli o le cartelle.
</string>
<string name="TooltipOutboxNoTransfer">
- Almeno uno di questi oggetti non può essere venduto o trasferito.
+ Almeno uno di questi oggetti non può essere venduto o trasferito
</string>
<string name="TooltipOutboxNotInInventory">
- La tua casella in uscita del rivenditore può accettare solo elementi provenienti dal tuo inventario
+ Puoi aggiungere a Marketplace solo gli articoli nel tuo inventario
</string>
- <string name="TooltipOutboxWorn">
- Non puoi mettere gli elementi che indossi nella casella in uscita del rivenditore
+ <string name="TooltipOutboxLinked">
+ Non puoi inserire cartelle o articoli collegati tramite link nel Marketplace
</string>
<string name="TooltipOutboxCallingCard">
- Non puoi inserire il tuo biglietto da visita nella tua casella in uscita del rivenditore
+ Non puoi inserire biglietti da visita in Marketplace
</string>
- <string name="TooltipOutboxFolderLevels">
- La profondità delle caselle nidificate è maggiore di 3
+ <string name="TooltipOutboxDragActive">
+ non puoi muovere un annuncio attivo
</string>
- <string name="TooltipOutboxTooManyFolders">
- Il numero di sottocartelle nella cartella al livello più alto è maggiore di 20
+ <string name="TooltipOutboxCannotMoveRoot">
+ Non puoi spostare la cartella principale degli annunci di Marketplace
</string>
- <string name="TooltipOutboxTooManyObjects">
- Il numero di elementi nella cartella al livello più alto è maggiore di 200
+ <string name="TooltipOutboxMixedStock">
+ Tutti gli articoli in una cartella di magazzino devono essere dello stesso tipo e con le stesse autorizzazioni
</string>
<string name="TooltipDragOntoOwnChild">
Non puoi spostare una cartella nella relativa cartella secondaria
@@ -1051,9 +1072,7 @@ Prova ad accedere nuovamente tra un minuto.
<string name="AgentNameSubst">
(Tu)
</string>
- <string name="JoinAnExperience">
- Partecipa a un&apos;esperienza
- </string>
+ <string name="JoinAnExperience"/><!-- intentionally blank -->
<string name="SilentlyManageEstateAccess">
Omette gli avvisi durante la gestione degli elenchi di accesso alle proprietà immobiliari
</string>
@@ -1120,6 +1139,12 @@ Prova ad accedere nuovamente tra un minuto.
<string name="bitmap_image_files">
Immagini Bitmap
</string>
+ <string name="png_image_files">
+ Immagini PNG
+ </string>
+ <string name="save_texture_image_files">
+ Immagini Targa o PNG
+ </string>
<string name="avi_movie_file">
File video AVI
</string>
@@ -1369,6 +1394,9 @@ Prova ad accedere nuovamente tra un minuto.
<string name="FavoritesNoMatchingItems">
Trascina qui un punto di riferimento per aggiungerlo ai Preferiti.
</string>
+ <string name="MarketplaceNoMatchingItems">
+ Nessun articolo trovato. Controlla di aver digitato la stringa di ricerca correttamente e riprova.
+ </string>
<string name="InventoryNoTexture">
Non hai una copia di questa texture nel tuo inventario
</string>
@@ -1416,29 +1444,95 @@ Prova ad accedere nuovamente tra un minuto.
<string name="InventoryOutboxError">
Il [[MARKETPLACE_CREATE_STORE_URL] negozio nel Marketplace] ha riportato errori.
</string>
+ <string name="InventoryMarketplaceError">
+ Questa funzione è al momento in versione beta. Per partecipare, aggiungi il tuo nome a questo [http://goo.gl/forms/FCQ7UXkakz modulo Google].
+ </string>
+ <string name="InventoryMarketplaceListingsNoItemsTitle">
+ La cartella degli annunci di Marketplace è vuota.
+ </string>
+ <string name="InventoryMarketplaceListingsNoItems">
+ Trascina le cartelle in questa area per metterle in vendita su [[MARKETPLACE_DASHBOARD_URL] Marketplace].
+ </string>
+ <string name="Marketplace Validation Warning Stock">
+ la cartella di magazzino deve essere inclusa in una cartella di versione
+ </string>
+ <string name="Marketplace Validation Error Mixed Stock">
+ : Errore: tutti gli articoli un una cartella di magazzino devono essere non copiabili e dello stesso tipo
+ </string>
+ <string name="Marketplace Validation Error Subfolder In Stock">
+ : Errore: la cartella di magazzino non può contenere sottocartelle
+ </string>
+ <string name="Marketplace Validation Warning Empty">
+ : Avviso: la cartella non contiene alcun articolo
+ </string>
+ <string name="Marketplace Validation Warning Create Stock">
+ : Avviso: creazione cartella di magazzino in corso
+ </string>
+ <string name="Marketplace Validation Warning Create Version">
+ : Avviso: creazione cartella di versione in corso
+ </string>
+ <string name="Marketplace Validation Warning Move">
+ : Avviso: spostamento articoli in corso
+ </string>
+ <string name="Marketplace Validation Warning Delete">
+ : Avviso: il contenuto della cartella è stato trasferito alla cartella di magazzino e la cartella vuota sta per essere rimossa
+ </string>
+ <string name="Marketplace Validation Error Stock Item">
+ : Errore: gli articoli di cui non è permessa la copia devono essere all&apos;interno di una cartella di magazzino
+ </string>
+ <string name="Marketplace Validation Warning Unwrapped Item">
+ : Avviso: gli articoli devono essere inclusi in una cartella di versione
+ </string>
+ <string name="Marketplace Validation Error">
+ : Errore:
+ </string>
+ <string name="Marketplace Validation Warning">
+ : Avviso:
+ </string>
+ <string name="Marketplace Validation Error Empty Version">
+ : Avviso: la cartella di versione deve contenere almeno 1 articolo
+ </string>
+ <string name="Marketplace Validation Error Empty Stock">
+ : Avviso: la cartella di magazzino deve contenere almeno 1 articolo
+ </string>
+ <string name="Marketplace Validation No Error">
+ Nessun errore o avviso da segnalare
+ </string>
<string name="Marketplace Error None">
Nessun errore
</string>
+ <string name="Marketplace Error Prefix">
+ Errore:
+ </string>
<string name="Marketplace Error Not Merchant">
- Errore: Prima di inviare elementi al Marketplace devi essere impostato come rivenditore (gratis).
+ Prima di inviare gli articoli al Marketplace devi essere impostato come rivenditore (gratis).
</string>
- <string name="Marketplace Error Empty Folder">
- Errore: questa cartella non include alcun contenuto.
+ <string name="Marketplace Error Not Accepted">
+ L&apos;articolo non può essere spostato in quella cartella.
</string>
- <string name="Marketplace Error Unassociated Products">
- Errore: Oggetto non caricato perché il tuo account venditore ha troppi oggetti che non sono associati con dei prodotti. Per risolvere questo errore, esegui l&apos;accesso al sito di Marketplace e riduci il numero di oggetti non associati.
+ <string name="Marketplace Error Unsellable Item">
+ Questo articolo non può essere venduto nel Marketplace.
</string>
- <string name="Marketplace Error Object Limit">
- Errore: questo elemento contiene troppi oggetti. Per risolvere questo problema, inserisci più oggetti insieme in una scatola per ridurre a meno di 200 il numero totale di oggetti.
+ <string name="MarketplaceNoID">
+ no Mkt ID
</string>
- <string name="Marketplace Error Folder Depth">
- Errore: questo elemento contiene troppi livelli di cartelle nidificate. Riorganizzalo per ottenere un massimo di 3 livelli di cartelle nidificate.
+ <string name="MarketplaceLive">
+ in elenco
</string>
- <string name="Marketplace Error Unsellable Item">
- Errore: Questo elemento non può essere venduto nel Marketplace.
+ <string name="MarketplaceActive">
+ attivi
+ </string>
+ <string name="MarketplaceMax">
+ massimo
+ </string>
+ <string name="MarketplaceStock">
+ magazzino
</string>
- <string name="Marketplace Error Internal Import">
- Errore: problema con questo elemento. Riprova più tardi.
+ <string name="MarketplaceNoStock">
+ non in magazzino
+ </string>
+ <string name="MarketplaceUpdating">
+ in aggiornamento...
</string>
<string name="Open landmarks">
Apri luoghi di riferimento
@@ -1459,6 +1553,7 @@ Prova ad accedere nuovamente tra un minuto.
Nessun contenuto
</string>
<string name="WornOnAttachmentPoint" value="(indossato su [ATTACHMENT_POINT])"/>
+ <string name="AttachmentErrorMessage" value="([ATTACHMENT_ERROR])"/>
<string name="ActiveGesture" value="[GESLABEL] (attivo)"/>
<string name="Chat Message" value="Chat:"/>
<string name="Sound" value="Suono :"/>
@@ -1723,6 +1818,15 @@ Prova ad accedere nuovamente tra un minuto.
<string name="Invalid Attachment">
Punto di collegamento non valido
</string>
+ <string name="ATTACHMENT_MISSING_ITEM">
+ Errore: articolo mancante
+ </string>
+ <string name="ATTACHMENT_MISSING_BASE_ITEM">
+ Errore: articolo di base mancante
+ </string>
+ <string name="ATTACHMENT_NOT_ATTACHED">
+ Errore: l&apos;oggetto è nel vestiario corrente ma non è collegato
+ </string>
<string name="YearsMonthsOld">
Nato da [AGEYEARS] [AGEMONTHS]
</string>
@@ -1891,6 +1995,9 @@ Prova ad accedere nuovamente tra un minuto.
<string name="SaveComplete">
Salvataggio completato.
</string>
+ <string name="UploadFailed">
+ Caricamento file non riuscito:
+ </string>
<string name="ObjectOutOfRange">
Script (oggetto fuori portata)
</string>
@@ -1900,6 +2007,9 @@ Prova ad accedere nuovamente tra un minuto.
<string name="GroupsNone">
nessuno
</string>
+ <string name="CompileNoExperiencePerm">
+ Saltato lo script [SCRIPT] con l&apos;esperienza [EXPERIENCE].
+ </string>
<string name="Group" value="(gruppo)"/>
<string name="Unknown">
(Sconosciuto)
@@ -4979,6 +5089,9 @@ Prova a racchiudere il percorso dell&apos;editor in doppie virgolette.
<string name="Command_Marketplace_Label">
Mercato
</string>
+ <string name="Command_MarketplaceListings_Label">
+ Marketplace
+ </string>
<string name="Command_MiniMap_Label">
Mini mappa
</string>
@@ -5066,6 +5179,9 @@ Prova a racchiudere il percorso dell&apos;editor in doppie virgolette.
<string name="Command_Marketplace_Tooltip">
Vai allo shopping
</string>
+ <string name="Command_MarketplaceListings_Tooltip">
+ Vendi le tue creazioni
+ </string>
<string name="Command_MiniMap_Tooltip">
Mostra le persone vicine
</string>
@@ -5189,4 +5305,85 @@ Prova a racchiudere il percorso dell&apos;editor in doppie virgolette.
<string name="loading_chat_logs">
Caricamento in corso...
</string>
+ <string name="experience_tools_experience">
+ Esperienza
+ </string>
+ <string name="ExperienceNameNull">
+ (nessuna esperienza)
+ </string>
+ <string name="ExperienceNameUntitled">
+ (esperienza senza titolo)
+ </string>
+ <string name="Land-Scope">
+ A livello di terreno
+ </string>
+ <string name="Grid-Scope">
+ A livello di griglia
+ </string>
+ <string name="Allowed_Experiences_Tab">
+ CONSENTITO
+ </string>
+ <string name="Blocked_Experiences_Tab">
+ BLOCCATO
+ </string>
+ <string name="Contrib_Experiences_Tab">
+ FORNITORE
+ </string>
+ <string name="Admin_Experiences_Tab">
+ AMMINISTRATORE
+ </string>
+ <string name="Recent_Experiences_Tab">
+ RECENTE
+ </string>
+ <string name="Owned_Experiences_Tab">
+ DI PROPRIETÀ
+ </string>
+ <string name="ExperiencesCounter">
+ ([EXPERIENCES], massimo [MAXEXPERIENCES])
+ </string>
+ <string name="ExperiencePermission1">
+ gestione dei tuoi comandi
+ </string>
+ <string name="ExperiencePermission3">
+ attivazione di animazioni per il tuo avatar
+ </string>
+ <string name="ExperiencePermission4">
+ collegamento al tuo avatar
+ </string>
+ <string name="ExperiencePermission9">
+ monitoraggio della tua videocamera
+ </string>
+ <string name="ExperiencePermission10">
+ controllo della tua videocamera
+ </string>
+ <string name="ExperiencePermission11">
+ ti teletrasporta
+ </string>
+ <string name="ExperiencePermission12">
+ accettazione automaticamente delle autorizzazioni per le esperienze
+ </string>
+ <string name="ExperiencePermissionShortUnknown">
+ ha eseguito un&apos;operazione sconosciuta: [Permission]
+ </string>
+ <string name="ExperiencePermissionShort1">
+ Gestione dei comandi
+ </string>
+ <string name="ExperiencePermissionShort3">
+ Attivazione di animazioni
+ </string>
+ <string name="ExperiencePermissionShort4">
+ Collegamento
+ </string>
+ <string name="ExperiencePermissionShort9">
+ Monitoraggio videocamera
+ </string>
+ <string name="ExperiencePermissionShort10">
+ Controllo videocamera
+ </string>
+ <string name="ExperiencePermissionShort11">
+ Teleport
+ </string>
+ <string name="ExperiencePermissionShort12">
+ Autorizzazione
+ </string>
</strings>
diff --git a/indra/newview/skins/default/xui/it/teleport_strings.xml b/indra/newview/skins/default/xui/it/teleport_strings.xml
index bd967ebcc4..e4c4dda889 100755
--- a/indra/newview/skins/default/xui/it/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/it/teleport_strings.xml
@@ -46,6 +46,9 @@ Per ripetere l&apos;esercitazione, visita &apos;Welcome Island Public&apos;.
<message name="MustGetAgeRegion">
Per poter entrare in questa regione devi avere almeno 18 anni.
</message>
+ <message name="RegionTPSpecialUsageBlocked">
+ Impossibile entrare nella regione. &apos;[REGION_NAME]&apos; è una regione per giochi di abilità e per entrare è necessario soddisfare alcuni requisiti. Per dettagli, leggi le [http://wiki.secondlife.com/wiki/Linden_Lab_Official:Skill_Gaming_in_Second_Life domande frequenti sui giochi di abilità].
+ </message>
</message_set>
<message_set name="progress">
<message name="sending_dest">
diff --git a/indra/newview/skins/default/xui/ja/floater_about.xml b/indra/newview/skins/default/xui/ja/floater_about.xml
index 63a4e69c10..91a61ab225 100755
--- a/indra/newview/skins/default/xui/ja/floater_about.xml
+++ b/indra/newview/skins/default/xui/ja/floater_about.xml
@@ -1,74 +1,16 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="floater_about" title="[CAPITALIZED_APP_NAME] ã«ã¤ã„ã¦">
- <floater.string name="AboutHeader">
- [APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2] ([VIEWER_VERSION_3]) [BUILD_DATE] [BUILD_TIME] ([CHANNEL])
-[[VIEWER_RELEASE_NOTES_URL] [ReleaseNotes]]
- </floater.string>
- <floater.string name="AboutCompiler">
- コンパイラー [COMPILER] [COMPILER_VERSION] ãƒãƒ¼ã‚¸ãƒ§ãƒ³
- </floater.string>
- <floater.string name="AboutPosition">
- ã‚ãªãŸã®ç¾åœ¨åœ°ã¯ã€[POSITION_LOCAL_0,number,1]ã€[POSITION_LOCAL_1,number,1]ã€[POSITION_LOCAL_2,number,1] ã® [REGION] ã§ã™ã€‚ä½ç½®ã¯ &lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt; ã§ã™ã€‚([HOSTIP])
-SLURL:&lt;nolink&gt;[SLURL]&lt;/nolink&gt;
-(グローãƒãƒ«åº§æ¨™ [POSITION_0,number,1]ã€[POSITION_1,number,1]ã€[POSITION_2,number,1])
-[SERVER_VERSION]
-[SERVER_RELEASE_NOTES_URL]
- </floater.string>
- <floater.string name="AboutSystem">
- CPU: [CPU]
-メモリ: [MEMORY_MB] MB
-OS ãƒãƒ¼ã‚¸ãƒ§ãƒ³ï¼š [OS_VERSION]
-グラフィックカード製造元: [GRAPHICS_CARD_VENDOR]
-グラフィックカード: [GRAPHICS_CARD]
- </floater.string>
- <floater.string name="AboutDriver">
- Windows グラフィックドライãƒãƒãƒ¼ã‚¸ãƒ§ãƒ³ï¼š [GRAPHICS_DRIVER_VERSION]
- </floater.string>
- <floater.string name="AboutLibs">
- OpenGL ãƒãƒ¼ã‚¸ãƒ§ãƒ³ï¼š [OPENGL_VERSION]
-
-libcurl ãƒãƒ¼ã‚¸ãƒ§ãƒ³ï¼š [LIBCURL_VERSION]
-J2C デコーダãƒãƒ¼ã‚¸ãƒ§ãƒ³ï¼š [J2C_VERSION]
-オーディオドライãƒãƒãƒ¼ã‚¸ãƒ§ãƒ³ï¼š [AUDIO_DRIVER_VERSION]
-Qt Webkit ãƒãƒ¼ã‚¸ãƒ§ãƒ³ï¼š [QT_WEBKIT_VERSION]
-ボイスサーãƒãƒ¼ãƒãƒ¼ã‚¸ãƒ§ãƒ³ï¼š [VOICE_VERSION]
- </floater.string>
- <floater.string name="none">
- (ãªã—)
- </floater.string>
- <floater.string name="AboutTraffic">
- パケットロス: [PACKETS_LOST,number,0]/[PACKETS_IN,number,0] ([PACKETS_PCT,number,1]%)
- </floater.string>
- <floater.string name="ErrorFetchingServerReleaseNotesURL">
- サーãƒãƒ¼ã®ãƒªãƒªãƒ¼ã‚¹ãƒŽãƒ¼ãƒˆã® URL ã‚’å–得中ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚
- </floater.string>
<tab_container name="about_tab">
<panel label="情報" name="support_panel">
<button label="クリップボードã«ã‚³ãƒ”ー" name="copy_btn"/>
</panel>
<panel label="クレジット" name="credits_panel">
- <text name="linden_intro">
- Second Life ã®æ供元: Lindens ã®ï¼š
- </text>
- <text_editor name="linden_names">
- Philip, Andrew, Doug, Richard, Phoenix, Ian, Mark, Robin, Dan, Char, Ryan, Eric, Jim, Lee, Jeff, Michael, Kelly, Steve, Catherine, Bub, Ramzi, Jill, Jeska, Don, Kona, Callum, Charity, Jack, Shawn, babbage, James, Lauren, Blue, Brent, Reuben, Pathfinder, Jesse, Patsy, Torley, Bo, Cyn, Jonathan, Gia, Annette, Ginsu, Harry, Lex, Runitai, Guy, Cornelius, Beth, Swiss, Thumper, Wendy, Teeple, Seth, Dee, Mia, Sally, Liana, Aura, Beez, Milo, Red, Gulliver, Marius, Joe, Jose, Dore, Justin, Nora, Morpheus, Lexie, Amber, Chris, Xan, Leyla, Walker, Sabin, Joshua, Hiromi, Tofu, Fritz, June, Jean, Ivy, Dez, Ken, Betsy, Which, Spike, Rob, Zee, Dustin, George, Claudia, del, Matthew, jane, jay, Adrian, Yool, Rika, Yoz, siobhan, Qarl, Benjamin, Beast, Everett, madhavi, Christopher, Izzy, stephany, Jeremy, sean, adreanne, Pramod, Tobin, sejong, Iridium, maurice, kj, Meta, kari, JP, bert, kyle, Jon, Socrates, Bridie, Ivan, maria, Aric, Coco, Periapse, sandy, Storrs, Lotte, Colossus, Brad, Pastrami, Zen, BigPapi, Banzai, Sardonyx, Mani, Garry, Jaime, Neuro, Samuel, Niko, CeeLo, Austin, Soft, Poppy, emma, tessa, angelo, kurz, alexa, Sue, CG, Blake, Erica, Brett, Bevis, kristen, Q, simon, Enus, MJ, laurap, Kip, Scouse, Ron, Ram, kend, Marty, Prospero, melissa, kraft, Nat, Seraph, Hamilton, Lordan, Green, miz, Ashlei, Trinity, Ekim, Echo, Charlie, Rowan, Rome, Jt, Doris, benoc, Christy, Bao, Kate, Tj, Patch, Cheah, Johan, Brandy, Angela, Oreh, Cogsworth, Lan, Mitchell, Space, Bambers, Einstein, Bender, Malbers, Matias, Maggie, Rothman, Milton, Niall, Marin, Allison, Mango, Andrea, Katt, Yi, Ambroff, Rico, Raymond, Gail, Christa, William, Dawn, Usi, Dynamike, M, Corr, Dante, Molly, kaylee, Danica, Kelv, Lil, jacob, Nya, Rodney, elsie, Blondin, Grant, Nyx, Devin, Monty, Minerva, Keira, Katie, Jenn, Makai, Clare, Joy, Cody, Gayathri, FJ, spider, Oskar, Landon, Jarv, Noelle, Al, Doc, Gray, Vir, t, Maestro, Simone, Shannon, yang, Courtney, Scott, charlene, Quixote, Susan, Zed, Amanda, Katelin, Esbee, JoRoan, Enkidu, roxie, Scarlet, Merov, Kevin, Judy, Rand, Newell, Les, Dessie, Galen, Michon, Geo, Siz, Calyle, Pete, Praveen, Callen, Sheldon, Pink, Nelson, jenelle, Terrence, Nathan, Juan, Sascha, Huseby, Karina, Kaye, Kotler, Lis, Darv, Charrell, Dakota, Kimmora, Theeba, Taka, Mae, Perry, Ducot, dana, Esther, Dough, gisele, Doten, Viale, Fisher, jessieann, ashley, Torres, delby, rountree, kurt, Slaton, Madison, Rue, Gino, Wen, Casssandra, Brodesky, Squid, Gez, Rakesh, Gecko, Ladan, Tony, Tatem, Squire, Falcon, BK, Crimp, Tiggs, Bacon, Coyot, Carmilla, Webb, Sea, Arch, Jillian, Jason, Bernard, Vogt, Peggy, dragon, Pup, xandix, Wallace, Bewest, Inoshiro, Rhett, AG, Aimee, Ghengis, Itiaes, Eli, Steffan, Epic, Grapes, Stone, Prep, Scobu, Robert, Alain, Carla, Vicky, Tia, Alec, Taras, Lisa, Oz, Ariane, Log, House, Kazu, Kim, Drofnas, Tyler, Campbell, Michele, Madeline, Nelly, Baron, Thor, Lori, Hele, Fredrik, Teddy, Pixie, Berry, Gabrielle, Alfonso, Brooke, Wolf, Ringo, Cru, Charlar, Rodvik, Gibson, Elise, Bagman, Greger, Leonidas, Jerm, Leslie, CB, Brenda, Durian, Carlo, mm, Zeeshan, Caleb, Max, Elikak, Mercille, Steph, Chase
- </text_editor>
- <text name="contrib_intro">
- オープンソースã®æ供:
- </text>
- <text_editor name="contrib_names">
- Dummy Name ã¯å®Ÿè¡Œæ™‚é–“ã«ç½®ãæ›ãˆ
- </text_editor>
- <text name="trans_intro">
- 翻訳会社:
- </text>
- <text_editor name="trans_names">
- Dummy Name ã¯å®Ÿè¡Œæ™‚é–“ã«ç½®ãæ›ãˆ
- </text_editor>
+ <text name="linden_intro">Second Life ã®æ供元: Lindens ã®ã€
+オープンソースã®æ供:</text>
+ <text_editor name="contrib_names">Dummy Name ã¯å®Ÿè¡Œæ™‚é–“ã«ç½®ãæ›ãˆ</text_editor>
</panel>
<panel label="ライセンス" name="licenses_panel">
- <text_editor name="credits_editor">
- 3Dconnexion SDK Copyright (C) 1992-2009 3Dconnexion
+ <text_editor name="licenses_editor">3Dconnexion SDK Copyright (C) 1992-2009 3Dconnexion
APR Copyright (C) 2011 The Apache Software Foundation
Collada DOM Copyright 2006 Sony Computer Entertainment Inc.
cURL Copyright (C) 1996-2010, Daniel Stenberg, (daniel@haxx.se)
@@ -95,8 +37,7 @@ Second Life ビューワã§ã¯ Havok (TM) Physics ãŒä½¿ç”¨ã•ã‚Œã¦ã„ã¾ã™ã€‚
無断複写・複製・転載をç¦ã˜ã¾ã™ã€‚詳細ã«ã¤ã„ã¦ã¯ licenses.txt ã‚’ã”å‚ç…§ãã ã•ã„。
-ボイスãƒãƒ£ãƒƒãƒˆã®ã‚ªãƒ¼ãƒ‡ã‚£ã‚ªã‚³ãƒ¼ãƒ‡ã‚£ãƒ³ã‚°ï¼šPolycom(R) Siren14(TM) (ITU-T Rec.G.722.1 Annex C)
- </text_editor>
+ボイスãƒãƒ£ãƒƒãƒˆã®ã‚ªãƒ¼ãƒ‡ã‚£ã‚ªã‚³ãƒ¼ãƒ‡ã‚£ãƒ³ã‚°ï¼šPolycom(R) Siren14(TM) (ITU-T Rec.G.722.1 Annex C)</text_editor>
</panel>
</tab_container>
</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_about_land.xml b/indra/newview/skins/default/xui/ja/floater_about_land.xml
index 3b4b5ed070..fc1ed5554a 100755
--- a/indra/newview/skins/default/xui/ja/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/ja/floater_about_land.xml
@@ -310,9 +310,6 @@
<panel.string name="push_restrict_region_text">
プッシュç¦æ­¢ (地域設定優先)
</panel.string>
- <panel.string name="see_avs_text">
- ä»–ã®åŒºç”»ã«ã„ã‚‹ã‚¢ãƒã‚¿ãƒ¼ã¯ã€
- </panel.string>
<text name="allow_label">
ä»–ã®ä½äººã¸ã®è¨±å¯ï¼š
</text>
@@ -338,22 +335,6 @@
<check_box label="安全(ダメージãªã—)" name="check safe" tool_tip="ãƒã‚§ãƒƒã‚¯ã‚’入れるã¨ã“ã®åœŸåœ°ã§ã®ãƒ€ãƒ¡ãƒ¼ã‚¸ã‚³ãƒ³ãƒãƒƒãƒˆãŒç„¡åŠ¹ã«ãªã‚Šã€ã€Œå®‰å…¨ã€ã«è¨­å®šã•ã‚Œã¾ã™ã€‚ ãƒã‚§ãƒƒã‚¯ã‚’外ã™ã¨ãƒ€ãƒ¡ãƒ¼ã‚¸ã‚³ãƒ³ãƒãƒƒãƒˆãŒæœ‰åŠ¹ã«ãªã‚Šã¾ã™ã€‚"/>
<check_box label="プッシュç¦æ­¢" name="PushRestrictCheck" tool_tip="スクリプトã«ã‚ˆã‚‹ãƒ—ッシュをç¦æ­¢ã—ã¾ã™ã€‚ ã“ã®ã‚ªãƒ—ションをé¸æŠžã™ã‚‹ã“ã¨ã«ã‚ˆã‚Šã€ã‚ãªãŸã®åœŸåœ°ã§ã®ç ´å£Šçš„行動を防ãã“ã¨ãŒã§ãã¾ã™ã€‚"/>
<check_box label="検索ã«åŒºç”»ã‚’表示(週 L$ 30)" name="ShowDirectoryCheck" tool_tip="ã“ã®åŒºç”»ã‚’検索çµæžœã«è¡¨ç¤ºã—ã¾ã™"/>
- <combo_box name="land category with adult">
- <combo_box.item label="全カテゴリ" name="item0"/>
- <combo_box.item label="Linden 所在地" name="item1"/>
- <combo_box.item label="Adult" name="item2"/>
- <combo_box.item label="アートã¨ã‚«ãƒ«ãƒãƒ£ãƒ¼" name="item3"/>
- <combo_box.item label="ビジãƒã‚¹" name="item4"/>
- <combo_box.item label="教育的" name="item5"/>
- <combo_box.item label="ゲーム" name="item6"/>
- <combo_box.item label="ãŸã¾ã‚Šå ´" name="item7"/>
- <combo_box.item label="æ–°ä½äººã«å¥½æ„çš„" name="item8"/>
- <combo_box.item label="公園ã¨è‡ªç„¶" name="item9"/>
- <combo_box.item label="ä½å®…用" name="item10"/>
- <combo_box.item label="ショッピング" name="item11"/>
- <combo_box.item label="レンタル" name="item13"/>
- <combo_box.item label="ãã®ä»–" name="item12"/>
- </combo_box>
<combo_box name="land category">
<combo_box.item label="全カテゴリ" name="item0"/>
<combo_box.item label="Linden 所在地" name="item1"/>
@@ -450,15 +431,9 @@
<panel.string name="access_estate_defined">
(エステートã«é™å®šï¼‰
</panel.string>
- <panel.string name="allow_public_access">
- ãƒ‘ãƒ–ãƒªãƒƒã‚¯ã‚¢ã‚¯ã‚»ã‚¹ã‚’è¨±å¯ ï¼ˆ[MATURITY])(注æ„:ã“ã®ã‚ªãƒ—ションをオフã«ã™ã‚‹ã¨ç«‹å…¥ç¦æ­¢ãƒ©ã‚¤ãƒ³ãŒä½œæˆã•ã‚Œã¾ã™ï¼‰
- </panel.string>
<panel.string name="estate_override">
1 ã¤ä»¥ä¸Šã®ã‚ªãƒ—ションãŒã€ä¸å‹•ç”£ãƒ¬ãƒ™ãƒ«ã§è¨­å®šã•ã‚Œã¦ã„ã¾ã™ã€‚
</panel.string>
- <text name="Limit access to this parcel to:">
- ã“ã®åŒºç”»ã¸ã®ã‚¢ã‚¯ã‚»ã‚¹
- </text>
<check_box label="パブリックアクセスを許å¯ï¼ˆã“ã®ã‚ªãƒ—ションをオフã«ã™ã‚‹ã¨ç«‹å…¥ç¦æ­¢ãƒ©ã‚¤ãƒ³ãŒä½œæˆã•ã‚Œã¾ã™ï¼‰" name="public_access"/>
<text name="Only Allow">
次ã®ä½äººã«ã®ã¿ã‚¢ã‚¯ã‚»ã‚¹ã‚’許å¯ï¼š
@@ -490,5 +465,6 @@
<button label="削除" label_selected="削除" name="remove_banned"/>
</panel>
</panel>
+ <panel label="経験" name="land_experiences_panel"/>
</tab_container>
</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_associate_listing.xml b/indra/newview/skins/default/xui/ja/floater_associate_listing.xml
new file mode 100644
index 0000000000..b106750a6f
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_associate_listing.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="associate listing" title="リストを関連付ã‘ã‚‹">
+ <text name="message">リスト ID:</text>
+ <line_editor name="listing_id">ã“ã“ã« ID を入力</line_editor>
+ <button label="OK" name="OK"/>
+ <button label="å–り消ã—" name="Cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_edit_hover_height.xml b/indra/newview/skins/default/xui/ja/floater_edit_hover_height.xml
new file mode 100644
index 0000000000..ac5b2839d1
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_edit_hover_height.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="HoverHeight" title="ホãƒãƒ¼é«˜ã•ã®è¨­å®š">
+ <slider label="高ã•" name="HoverHeightSlider"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_experience_search.xml b/indra/newview/skins/default/xui/ja/floater_experience_search.xml
new file mode 100644
index 0000000000..37f3da7d73
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_experience_search.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="experiencepicker" title="体験をé¸æŠž"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_experienceprofile.xml b/indra/newview/skins/default/xui/ja/floater_experienceprofile.xml
new file mode 100644
index 0000000000..7819b887db
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_experienceprofile.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater title="EXPERIENCE PROFILE">
+ <floater.string name="empty_slurl">
+ (ãªã—)
+ </floater.string>
+ <floater.string name="maturity_icon_general">
+ &quot;Parcel_PG_Light&quot;
+ </floater.string>
+ <floater.string name="maturity_icon_moderate">
+ &quot;Parcel_M_Light&quot;
+ </floater.string>
+ <floater.string name="maturity_icon_adult">
+ &quot;Parcel_R_Light&quot;
+ </floater.string>
+ <text name="edit_title" value="体験プロフィール"/>
+ <tab_container name="tab_container">
+ <panel name="panel_experience_info">
+ <scroll_container name="xp_scroll">
+ <panel name="scrolling_panel">
+ <layout_stack>
+ <layout_panel name="top panel">
+ <button label="編集" name="edit_btn"/>
+ </layout_panel>
+ <layout_panel name="maturity panel">
+ <text name="ContentRating">
+ 評価:
+ </text>
+ </layout_panel>
+ <layout_panel name="location panel">
+ <text name="Location">
+ 場所:
+ </text>
+ </layout_panel>
+ <layout_panel>
+ <text name="Owner">
+ 所有者:
+ </text>
+ </layout_panel>
+ <layout_panel name="group_panel">
+ <text name="Group">
+ グループ:
+ </text>
+ </layout_panel>
+ <layout_panel name="perm panel">
+ <button label="許å¯" name="allow_btn"/>
+ <button label="無視" name="forget_btn"/>
+ <button label="ブロック" name="block_btn"/>
+ <text name="privileged">
+ ã“ã®ä½“験ã¯ã™ã¹ã¦ã®ä½äººã«å¯¾ã—ã¦æœ‰åŠ¹ã§ã™ã€‚
+ </text>
+ <button label="å«ŒãŒã‚‰ã›ã®å ±å‘Š" name="report_btn"/>
+ </layout_panel>
+ </layout_stack>
+ </panel>
+ </scroll_container>
+ </panel>
+ <panel name="edit_panel_experience_info">
+ <scroll_container name="edit_xp_scroll">
+ <panel name="edit_scrolling_panel">
+ <text name="edit_experience_title_label" value="åå‰ï¼š"/>
+ <text name="edit_experience_desc_label" value="説明:"/>
+ <button label="グループ" name="Group_btn"/>
+ <text name="edit_ContentRating">
+ 評価:
+ </text>
+ <icons_combo_box label="Moderate" name="edit_ContentRatingText" tool_tip="体験ã®ãƒ¬ãƒ¼ãƒ†ã‚£ãƒ³ã‚°åŒºåˆ†ã‚’上ã’ã‚‹ã¨ã€ä½“験を許å¯ã—ãŸã™ã¹ã¦ã®ä½äººã®æ¨©é™ãŒãƒªã‚»ãƒƒãƒˆã•ã‚Œã¾ã™ã€‚">
+ <icons_combo_box.item label="Adult" name="Adult" value="42"/>
+ <icons_combo_box.item label="Moderate" name="Mature" value="21"/>
+ <icons_combo_box.item label="全般" name="PG" value="13"/>
+ </icons_combo_box>
+ <text name="edit_Location">
+ 場所:
+ </text>
+ <button label="ç¾åœ¨ã«è¨­å®š" name="location_btn"/>
+ <button label="場所をクリア" name="clear_btn"/>
+ <check_box label="体験を有効ã«ã™ã‚‹" name="edit_enable_btn" tool_tip=""/>
+ <check_box label="検索ã§è¡¨ç¤ºã—ãªã„" name="edit_private_btn"/>
+ <text name="changes" value="体験ãŒã™ã¹ã¦ã®ãƒªãƒ¼ã‚¸ãƒ§ãƒ³ã«è¡¨ç¤ºã•ã‚Œã‚‹ã«ã¯æ•°åˆ†ã‹ã‹ã‚‹å ´åˆãŒã‚ã‚Šã¾ã™ã€‚"/>
+ <button label="戻る" name="cancel_btn"/>
+ <button label="ä¿å­˜" name="save_btn"/>
+ </panel>
+ </scroll_container>
+ </panel>
+ </tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_experiences.xml b/indra/newview/skins/default/xui/ja/floater_experiences.xml
new file mode 100644
index 0000000000..5186f8ee38
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_experiences.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_experiences" title="体験"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_facebook.xml b/indra/newview/skins/default/xui/ja/floater_facebook.xml
index d99841f0de..76149a875e 100644
--- a/indra/newview/skins/default/xui/ja/floater_facebook.xml
+++ b/indra/newview/skins/default/xui/ja/floater_facebook.xml
@@ -1,20 +1,15 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="floater_facebook" title="FACEBOOK ã«æŠ•ç¨¿">
- <panel name="background">
- <tab_container name="tabs">
- <panel label="ステータス" name="panel_facebook_status"/>
- <panel label="写真" name="panel_facebook_photo"/>
- <panel label="ãƒã‚§ãƒƒã‚¯ã‚¤ãƒ³" name="panel_facebook_place"/>
- <panel label="フレンド" name="panel_facebook_friends"/>
- <panel label="アカウント" name="panel_facebook_account"/>
- </tab_container>
- <panel name="connection_status_panel">
- <text name="connection_error_text">
- エラー
- </text>
- <text name="connection_loading_text">
- ロード中...
- </text>
- </panel>
- </panel>
+ <tab_container name="tabs">
+ <panel label="ステータス" name="panel_facebook_status"/>
+ <panel label="写真" name="panel_facebook_photo"/>
+ <panel label="ãƒã‚§ãƒƒã‚¯ã‚¤ãƒ³" name="panel_facebook_place"/>
+ <panel label="フレンド" name="panel_facebook_friends"/>
+ </tab_container>
+ <text name="connection_error_text">
+ エラー
+ </text>
+ <text name="connection_loading_text">
+ ロード中...
+ </text>
</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml
index c01c46211e..8d3a655a06 100755
--- a/indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml
+++ b/indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml
@@ -1,67 +1,36 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="item properties" title="インベントリアイテムã®ãƒ—ロパティ">
- <floater.string name="unknown">
- (ä¸æ˜Žï¼‰
- </floater.string>
- <floater.string name="public">
- (公共)
- </floater.string>
- <floater.string name="you_can">
- ã§ãã‚‹ã“ã¨ï¼š
- </floater.string>
- <floater.string name="owner_can">
- オーナーã¯æ¬¡ã®ã“ã¨ãŒã§ãã¾ã™ï¼š
- </floater.string>
- <floater.string name="acquiredDate">
- [year,datetime,local] [mth,datetime,local] [day,datetime,local] [wkday,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local]
- </floater.string>
- <text name="LabelItemNameTitle">
- åå‰ï¼š
- </text>
- <text name="LabelItemDescTitle">
- 説明:
- </text>
- <text name="LabelCreatorTitle">
- クリエーター
- </text>
+ <floater.string name="unknown">(ä¸æ˜Žï¼‰</floater.string>
+ <floater.string name="public">(公共)</floater.string>
+ <floater.string name="you_can">ã§ãã‚‹ã“ã¨ï¼š</floater.string>
+ <floater.string name="owner_can">オーナーã¯æ¬¡ã®ã“ã¨ãŒã§ãã¾ã™ï¼š</floater.string>
+ <floater.string name="acquiredDate">[year,datetime,local] [mth,datetime,local] [day,datetime,local] [wkday,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local]</floater.string>
+ <text name="LabelItemNameTitle">åå‰ï¼š</text>
+ <text name="LabelItemDescTitle">説明:</text>
+ <text name="LabelCreatorTitle">クリエーター</text>
<button label="プロフィール..." label_selected="" name="BtnCreator"/>
- <text name="LabelOwnerTitle">
- オーナー:
- </text>
+ <text name="LabelOwnerTitle">オーナー:</text>
<button label="プロフィール..." label_selected="" name="BtnOwner"/>
- <text name="LabelAcquiredTitle">
- 入手日時:
- </text>
- <text name="LabelAcquiredDate">
- 2006年5月24日水曜日12:50:46
- </text>
- <text name="OwnerLabel">
- ã‚ãªãŸï¼š
- </text>
+ <text name="LabelAcquiredTitle">入手日時:</text>
+ <text name="LabelAcquiredDate">2006年5月24日水曜日12:50:46</text>
+ <text name="OwnerLabel">ã‚ãªãŸï¼š</text>
<check_box label="編集" name="CheckOwnerModify"/>
<check_box label="コピー" name="CheckOwnerCopy"/>
<check_box label="å†è²©ãƒ»ãƒ—レゼント" name="CheckOwnerTransfer"/>
- <text name="AnyoneLabel">
- 全員:
- </text>
+ <text name="AnyoneLabel">全員:</text>
<check_box label="コピー" name="CheckEveryoneCopy"/>
- <text name="GroupLabel">
- グループ:
- </text>
+ <text name="GroupLabel">グループ:</text>
<check_box label="共有" name="CheckShareWithGroup"/>
- <text name="NextOwnerLabel" width="158">
- 次ã®æ‰€æœ‰è€…:
- </text>
+ <text name="NextOwnerLabel" width="158">次ã®æ‰€æœ‰è€…:</text>
<check_box label="編集" name="CheckNextOwnerModify"/>
<check_box label="コピー" name="CheckNextOwnerCopy"/>
<check_box label="å†è²©ãƒ»ãƒ—レゼント" name="CheckNextOwnerTransfer"/>
<check_box label="売り出ã—中" name="CheckPurchase"/>
- <combo_box name="combobox sale copy">
+ <combo_box name="ComboBoxSaleType">
<combo_box.item label="コピー" name="Copy"/>
+ <combo_box.item label="コンテンツ" name="Contents"/>
<combo_box.item label="オリジナル" name="Original"/>
</combo_box>
<spinner label="価格:" name="Edit Cost"/>
- <text name="CurrencySymbol">
- L$
- </text>
+ <text name="CurrencySymbol">L$</text>
</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/ja/floater_inventory_view_finder.xml
index af96edda79..19d767ab57 100755
--- a/indra/newview/skins/default/xui/ja/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/ja/floater_inventory_view_finder.xml
@@ -5,8 +5,8 @@
<check_box label="æœ" name="check_clothing"/>
<check_box label="ジェスãƒãƒ£ãƒ¼" name="check_gesture"/>
<check_box label="ランドマーク" name="check_landmark"/>
- <check_box label="メッシュ" name="check_mesh"/>
<check_box label="ノートカード" name="check_notecard"/>
+ <check_box label="メッシュ" name="check_mesh"/>
<check_box label="オブジェクト" name="check_object"/>
<check_box label="スクリプト" name="check_script"/>
<check_box label="サウンド" name="check_sound"/>
@@ -19,6 +19,10 @@
<text name="- OR -">
ï¼ã¾ãŸã¯ï¼
</text>
+ <radio_group name="date_search_direction">
+ <radio_item label="より新ã—ã„" name="newer"/>
+ <radio_item label="よりå¤ã„" name="older"/>
+ </radio_group>
<spinner label="経éŽæ™‚é–“" name="spin_hours_ago"/>
<spinner label="経éŽæ—¥æ•°" name="spin_days_ago"/>
<button label="é–‰ã˜ã‚‹" label_selected="é–‰ã˜ã‚‹" name="Close"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_item_properties.xml b/indra/newview/skins/default/xui/ja/floater_item_properties.xml
new file mode 100644
index 0000000000..c8648503d7
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_item_properties.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Item Properties" title="アイテムã®ãƒ—ロパティ"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_lagmeter.xml b/indra/newview/skins/default/xui/ja/floater_lagmeter.xml
index e3546cd837..dd51d64ed2 100644
--- a/indra/newview/skins/default/xui/ja/floater_lagmeter.xml
+++ b/indra/newview/skins/default/xui/ja/floater_lagmeter.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="floater_lagmeter" title="ラグメーター">
<floater.string name="max_title_msg">
- ラグ メーター
+ ラグ計測器
</floater.string>
<floater.string name="max_width_px">
- 350
+ 360
</floater.string>
<floater.string name="min_title_msg">
ラグ
@@ -22,28 +22,28 @@
15
</floater.string>
<floater.string name="client_frame_time_window_bg_msg">
- ノーマルã€ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã¯èƒŒæ™¯ã«
+ 標準ã€ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã¯èƒŒæ™¯ã«
</floater.string>
<floater.string name="client_frame_time_critical_msg">
- クライアント フレームレート < [CLIENT_FRAME_RATE_CRITICAL]
+ クライアントã®ãƒ•ãƒ¬ãƒ¼ãƒ ãƒ¬ãƒ¼ãƒˆãŒ [CLIENT_FRAME_RATE_CRITICAL] 以下
</floater.string>
<floater.string name="client_frame_time_warning_msg">
- クライアント フレームレート: [CLIENT_FRAME_RATE_CRITICAL] ~ [CLIENT_FRAME_RATE_WARNING]
+ クライアントã®ãƒ•ãƒ¬ãƒ¼ãƒ  レート㌠[CLIENT_FRAME_RATE_CRITICAL] 㨠[CLIENT_FRAME_RATE_WARNING] ã®é–“
</floater.string>
<floater.string name="client_frame_time_normal_msg">
- ノーマル
+ 標準
</floater.string>
<floater.string name="client_draw_distance_cause_msg">
- 考ãˆã‚‰ã‚Œã‚‹åŽŸå› : æç”»è·é›¢ã®è¨­å®šãŒå¤§ãã™ãŽã‚‹
+ 考ãˆã‚‰ã‚Œã‚‹åŽŸå› ï¼šæç”»è·é›¢ã®è¨­å®šãŒé«˜ã™ãŽã‚‹
</floater.string>
<floater.string name="client_texture_loading_cause_msg">
- 考ãˆã‚‰ã‚Œã‚‹åŽŸå› : ç”»åƒã®ãƒ­ãƒ¼ãƒ‰ä¸­
+ 考ãˆã‚‰ã‚Œã‚‹åŽŸå› ï¼šç”»åƒã®ãƒ­ãƒ¼ãƒ‰ä¸­
</floater.string>
<floater.string name="client_texture_memory_cause_msg">
- 考ãˆã‚‰ã‚Œã‚‹åŽŸå› : メモリ内ã®ç”»åƒæ•°ãŒå¤šã™ãŽã‚‹
+ 考ãˆã‚‰ã‚Œã‚‹åŽŸå› ï¼šãƒ¡ãƒ¢ãƒªå†…ã«ç”»åƒãŒå¤šã™ãŽã‚‹
</floater.string>
<floater.string name="client_complex_objects_cause_msg">
- 考ãˆã‚‰ã‚Œã‚‹åŽŸå› : ç”»é¢ã«å«ã¾ã‚Œã‚‹è¤‡é›‘ãªã‚ªãƒ–ジェクトãŒå¤šã™ãŽã‚‹
+ 考ãˆã‚‰ã‚Œã‚‹åŽŸå› ï¼šã‚·ãƒ¼ãƒ³ã«è¤‡é›‘ãªã‚ªãƒ–ジェクトãŒå¤šã™ãŽã‚‹
</floater.string>
<floater.string name="network_text_msg">
ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯
@@ -55,13 +55,13 @@
5
</floater.string>
<floater.string name="network_packet_loss_critical_msg">
- 接続ã§ãƒ‰ãƒ­ãƒƒãƒ—ã•ã‚Œã‚‹ãƒ‘ケットã®å‰²åˆ: > [NETWORK_PACKET_LOSS_CRITICAL]
+ 接続㧠[NETWORK_PACKET_LOSS_CRITICAL]% を超ãˆã‚‹ãƒ‘ケットãŒè„±è½ã—ã¦ã„ã¾ã™
</floater.string>
<floater.string name="network_packet_loss_warning_msg">
- 接続ã§ãƒ‰ãƒ­ãƒƒãƒ—ã•ã‚Œã‚‹ãƒ‘ケットã®å‰²åˆ:[NETWORK_PACKET_LOSS_WARNING] ~ [NETWORK_PACKET_LOSS_CRITICAL]
+ 接続㧠[NETWORK_PACKET_LOSS_WARNING]%~[NETWORK_PACKET_LOSS_CRITICAL]% ã®ãƒ‘ケットãŒè„±è½ã—ã¦ã„ã¾ã™
</floater.string>
<floater.string name="network_performance_normal_msg">
- ノーマル
+ 標準
</floater.string>
<floater.string name="network_ping_critical_ms">
600
@@ -70,16 +70,16 @@
300
</floater.string>
<floater.string name="network_ping_critical_msg">
- 接続㮠ping 時間: > [NETWORK_PING_CRITICAL] ミリ秒
+ 接続㮠ping 時間㌠[NETWORK_PING_CRITICAL] ms 以上ã§ã™
</floater.string>
<floater.string name="network_ping_warning_msg">
- 接続㮠ping 時間: [NETWORK_PING_WARNING] ~ [NETWORK_PING_CRITICAL] ミリ秒
+ 接続㮠ping 時間㌠[NETWORK_PING_WARNING]~[NETWORK_PING_CRITICAL] ms ã§ã™
</floater.string>
<floater.string name="network_packet_loss_cause_msg">
- 接続ä¸è‰¯ã«ãªã£ã¦ã„ã‚‹ã‹ã€å¸¯åŸŸå¹…設定ãŒé«˜ã™ãŽã¾ã™ã€‚
+ 接続ä¸è‰¯ã¾ãŸã¯ &apos;帯域幅&apos; ã®è¨­å®šãŒé«˜ã™ãŽã‚‹å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™
</floater.string>
<floater.string name="network_ping_cause_msg">
- 接続ä¸è‰¯ã«ãªã£ã¦ã„ã‚‹ã‹ã€ãƒ•ã‚¡ã‚¤ãƒ«å…±æœ‰ã‚¢ãƒ—リケーションã«å•é¡ŒãŒã‚ã‚Šã¾ã™ã€‚
+ 接続ä¸è‰¯ã¾ãŸã¯ãƒ•ã‚¡ã‚¤ãƒ«å…±æœ‰ã‚¢ãƒ—リã®å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚
</floater.string>
<floater.string name="server_text_msg">
サーãƒãƒ¼
@@ -94,31 +94,31 @@
20
</floater.string>
<floater.string name="server_frame_time_critical_msg">
- シミュレーターã®ãƒ•ãƒ¬ãƒ¼ãƒ ãƒ¬ãƒ¼ãƒˆ: < [SERVER_FRAME_RATE_CRITICAL]
+ シミュレータã®ãƒ•ãƒ¬ãƒ¼ãƒ ãƒ¬ãƒ¼ãƒˆãŒ [SERVER_FRAME_RATE_CRITICAL] 以下
</floater.string>
<floater.string name="server_frame_time_warning_msg">
- シミュレーターã®ãƒ•ãƒ¬ãƒ¼ãƒ ãƒ¬ãƒ¼ãƒˆ: [SERVER_FRAME_RATE_CRITICAL] ~ [SERVER_FRAME_RATE_WARNING]
+ シミュレータã®ãƒ•ãƒ¬ãƒ¼ãƒ ãƒ¬ãƒ¼ãƒˆãŒ [SERVER_FRAME_RATE_CRITICAL] ~ [SERVER_FRAME_RATE_WARNING] ã®é–“
</floater.string>
<floater.string name="server_frame_time_normal_msg">
- ノーマル
+ 標準
</floater.string>
<floater.string name="server_physics_cause_msg">
- 考ãˆã‚‰ã‚Œã‚‹åŽŸå› : 物ç†çš„オブジェクトãŒå¤šã™ãŽã‚‹
+ 考ãˆã‚‰ã‚Œã‚‹åŽŸå› ï¼šç‰©ç†ã‚ªãƒ–ジェクトãŒå¤šã™ãŽã‚‹
</floater.string>
<floater.string name="server_scripts_cause_msg">
- 考ãˆã‚‰ã‚Œã‚‹åŽŸå› : スクリプトをå«ã‚€ã‚ªãƒ–ジェクトãŒå¤šã™ãŽã‚‹
+ 考ãˆã‚‰ã‚Œã‚‹åŽŸå› ï¼šã‚¹ã‚¯ãƒªãƒ—トオブジェクトãŒå¤šã™ãŽã‚‹
</floater.string>
<floater.string name="server_net_cause_msg">
- 考ãˆã‚‰ã‚Œã‚‹åŽŸå› : ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ トラフィックéŽå¤§
+ 考ãˆã‚‰ã‚Œã‚‹åŽŸå› ï¼šãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ãƒˆãƒ©ãƒ•ã‚£ãƒƒã‚¯ãŒå¤šã™ãŽã‚‹
</floater.string>
<floater.string name="server_agent_cause_msg">
- 考ãˆã‚‰ã‚Œã‚‹åŽŸå› : 地域内ã«ã¦å‹•ã„ã¦ã„ã‚‹ã‚¢ãƒã‚¿ãƒ¼ãŒå¤šã™ãŽã‚‹
+ 考ãˆã‚‰ã‚Œã‚‹åŽŸå› ï¼šãƒªãƒ¼ã‚¸ãƒ§ãƒ³å†…ã®äººã®ç§»å‹•ãŒå¤šã™ãŽã‚‹
</floater.string>
<floater.string name="server_images_cause_msg">
- 考ãˆã‚‰ã‚Œã‚‹åŽŸå› : ç”»åƒè¨ˆç®—ãŒå¤šã™ãŽã‚‹
+ 考ãˆã‚‰ã‚Œã‚‹åŽŸå› ï¼šç”»åƒè¨ˆç®—ãŒå¤šã™ãŽã‚‹
</floater.string>
<floater.string name="server_generic_cause_msg">
- 考ãˆã‚‰ã‚Œã‚‹åŽŸå› : シミュレーターã®éŽè² è·
+ 考ãˆã‚‰ã‚Œã‚‹åŽŸå› ï¼šã‚·ãƒŸãƒ¥ãƒ¬ãƒ¼ã‚¿ã®ãƒ­ãƒ¼ãƒ‰ãŒé‡ã™ãŽã‚‹
</floater.string>
<floater.string name="smaller_label">
&gt;&gt;
@@ -131,21 +131,21 @@
クライアント
</text>
<text name="client_text">
- ノーマル
+ 標準
</text>
<button name="network_lagmeter" tool_tip="ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ ラグ ステータス"/>
<text name="network">
ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯
</text>
<text name="network_text">
- ノーマル
+ 標準
</text>
<button name="server_lagmeter" tool_tip="サーãƒãƒ¼ ラグ ステータス"/>
<text name="server">
サーãƒãƒ¼
</text>
<text name="server_text">
- ノーマル
+ 標準
</text>
- <button label="&gt;&gt; " name="minimize" tool_tip="フローターã®ã‚µã‚¤ã‚ºã‚’トグル"/>
+ <button label="&gt;&gt;" name="minimize" tool_tip="フローターã®ã‚µã‚¤ã‚ºã‚’トグル"/>
</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/ja/floater_live_lsleditor.xml
index 5a155c9f12..864feef8cc 100755
--- a/indra/newview/skins/default/xui/ja/floater_live_lsleditor.xml
+++ b/indra/newview/skins/default/xui/ja/floater_live_lsleditor.xml
@@ -9,7 +9,24 @@
<floater.string name="Title">
スクリプト: [NAME]
</floater.string>
+ <floater.string name="experience_enabled">
+ オフã«ã—ã¦ã€ç¾åœ¨ã®ä½“験を削除ã™ã‚‹
+ </floater.string>
+ <floater.string name="no_experiences">
+ ã©ã®ä½“験ã«ã‚‚権é™ãŒã‚ã‚Šã¾ã›ã‚“
+ </floater.string>
+ <floater.string name="add_experiences">
+ é¸æŠžã—ã¦ã€ä½“験を追加ã™ã‚‹
+ </floater.string>
+ <floater.string name="show_experience_profile">
+ クリックã—ã¦ã€ä½“験プロフィールを表示ã™ã‚‹
+ </floater.string>
+ <floater.string name="loading">
+ ロード中...
+ </floater.string>
<button label="リセット" label_selected="リセット" name="Reset"/>
<check_box initial_value="true" label="実行中" name="running"/>
<check_box initial_value="true" label="Mono" name="mono"/>
+ <check_box label="次ã®ä½“験を使用:" name="enable_xp"/>
+ <button label="&gt;" name="view_profile"/>
</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_marketplace_listings.xml b/indra/newview/skins/default/xui/ja/floater_marketplace_listings.xml
new file mode 100644
index 0000000000..f6b8e2928e
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_marketplace_listings.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_marketplace_listings" title="マーケットプレイスã®ãƒªã‚¹ãƒˆ">
+ <panel name="marketplace_listings_panel">
+ <panel>
+ <panel name="marketplace_listings_inventory_placeholder_panel">
+ <text name="marketplace_listings_inventory_placeholder_title">ロード中...</text>
+ </panel>
+ </panel>
+ </panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_marketplace_validation.xml b/indra/newview/skins/default/xui/ja/floater_marketplace_validation.xml
new file mode 100644
index 0000000000..164864ed4e
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_marketplace_validation.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_marketplace_validation" title="マーケットプレイスã®ãƒªã‚¹ãƒˆã®ç›£æŸ»">
+ <button label="OK" label_selected="OK" name="OK"/>
+ <text_editor name="validation_text">MARKETPLACE_VALIDATION_TEXT</text_editor>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_openobject.xml b/indra/newview/skins/default/xui/ja/floater_openobject.xml
index af02ffedda..3f2f71511b 100755
--- a/indra/newview/skins/default/xui/ja/floater_openobject.xml
+++ b/indra/newview/skins/default/xui/ja/floater_openobject.xml
@@ -3,6 +3,11 @@
<text name="object_name">
[DESC]:
</text>
- <button label="インベントリã«ã‚³ãƒ”ー" label_selected="インベントリã«ã‚³ãƒ”ー" name="copy_to_inventory_button"/>
- <button label="コピーã—ã¦è£…ç€" label_selected="コピーã—ã¦è£…ç€" name="copy_and_wear_button"/>
+ <text name="border_note">
+ インベントリãŠã‚ˆã³ã‚¦ã‚§ã‚¢ã«ã‚³ãƒ”ー
+ </text>
+ <button label="アウトフィットã«è¿½åŠ " label_selected="アウトフィットã«è¿½åŠ " name="copy_and_wear_button"/>
+ <button label="アウトフィットを交æ›" label_selected="アウトフィットを交æ›" name="copy_and_replace_button"/>
+ <button label="インベントリã«ã‚³ãƒ”ーã™ã‚‹ã ã‘" label_selected="インベントリã«ã‚³ãƒ”ーã™ã‚‹ã ã‘" name="copy_to_inventory_button"/>
+ <button label="å–り消ã—" label_selected="å–り消ã—" name="cancel_button"/>
</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_pay.xml b/indra/newview/skins/default/xui/ja/floater_pay.xml
index 17965fb60a..0ca0990bd4 100755
--- a/indra/newview/skins/default/xui/ja/floater_pay.xml
+++ b/indra/newview/skins/default/xui/ja/floater_pay.xml
@@ -1,25 +1,18 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="Give Money" title="">
- <string name="payee_group">
- グループã«æ”¯æ‰•ã†
- </string>
- <string name="payee_resident">
- ä½äººã«æ”¯æ‰•ã†
- </string>
- <text name="payee_label">
- 支払ã†ï¼š
- </text>
- <icon name="icon_person" tool_tip="ä½äºº"/>
- <text name="payee_name">
- éžå¸¸ã«é•·ã„åå‰ãŒé€”中ã§åˆ‡ã‚Œã¦ã„ãªã„ã‹ã‚’テストã—ã¦ç¢ºèª
- </text>
- <button label="L$1" label_selected="L$1" name="fastpay 1"/>
- <button label="L$5" label_selected="L$5" name="fastpay 5"/>
- <button label="L$10" label_selected="L$10" name="fastpay 10"/>
- <button label="L$20" label_selected="L$20" name="fastpay 20"/>
- <text name="amount text">
- 金é¡ã‚’指定:
- </text>
- <button label="支払ã†" label_selected="支払ã†" name="pay btn"/>
- <button label="å–り消ã—" label_selected="å–り消ã—" name="cancel btn"/>
+ <string name="payee_group">グループã«æ”¯æ‰•ã†</string>
+ <string name="payee_resident">ä½äººã«æ”¯æ‰•ã†</string>
+ <text name="paying_text">支払中:</text>
+ <text name="payee_name">éžå¸¸ã«é•·ã„åå‰ãŒé€”中ã§åˆ‡ã‚Œã¦ã„ãªã„ã‹ã‚’テストã—ã¦ç¢ºèª</text>
+ <panel label="検索" name="PatternsPanel">
+ <button label="L$ 1 支払ã†" label_selected="L$ 1 支払ã†" name="fastpay 1"/>
+ <button label="L$ 5 支払ã†" label_selected="L$ 5 支払ã†" name="fastpay 5"/>
+ <button label="L$ 10 支払ã†" label_selected="L$ 10 支払ã†" name="fastpay 10"/>
+ <button label="L$ 20 支払ã†" label_selected="L$ 20 支払ã†" name="fastpay 20"/>
+ </panel>
+ <panel label="検索" name="InputPanel">
+ <text name="amount text">ãã®ä»–ã®é‡‘é¡:</text>
+ <button label="支払ã„" label_selected="支払ã„" name="pay btn"/>
+ <button label="å–り消ã—" label_selected="å–り消ã—" name="cancel btn"/>
+ </panel>
</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_pay_object.xml b/indra/newview/skins/default/xui/ja/floater_pay_object.xml
index 637ad496ef..3331cee0e0 100755
--- a/indra/newview/skins/default/xui/ja/floater_pay_object.xml
+++ b/indra/newview/skins/default/xui/ja/floater_pay_object.xml
@@ -1,29 +1,21 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="Give Money" title="">
- <string name="payee_group">
- グループã«æ”¯æ‰•ã†
- </string>
- <string name="payee_resident">
- ä½äººã«æ”¯æ‰•ã†
- </string>
- <icon name="icon_person" tool_tip="ä½äºº"/>
- <text name="payee_name">
- Ericacita Moostopolison
- </text>
- <text name="object_name_label">
- オブジェクトを介ã—ã¦ï¼š
- </text>
+ <string name="payee_group">グループã«æ”¯æ‰•ã†</string>
+ <string name="payee_resident">ä½äººã«æ”¯æ‰•ã†</string>
+ <text name="paying_text">支払中:</text>
+ <text name="payee_name">Ericacita Moostopolison</text>
+ <text name="object_name_label">オブジェクトを介ã—ã¦ï¼š</text>
<icon name="icon_object" tool_tip="オブジェクト"/>
- <text name="object_name_text">
- ...
- </text>
- <button label="L$1" label_selected="L$1" name="fastpay 1"/>
- <button label="L$5" label_selected="L$5" name="fastpay 5"/>
- <button label="L$10" label_selected="L$10" name="fastpay 10"/>
- <button label="L$20" label_selected="L$20" name="fastpay 20"/>
- <text name="amount text">
- 金é¡ã‚’指定:
- </text>
- <button label="支払ã„" label_selected="支払ã„" name="pay btn"/>
- <button label="å–り消ã—" label_selected="å–り消ã—" name="cancel btn"/>
+ <text name="object_name_text">...</text>
+ <panel label="検索" name="PatternsPanel">
+ <button label="L$ 1 支払ã†" label_selected="L$ 1 支払ã†" name="fastpay 1"/>
+ <button label="L$ 5 支払ã†" label_selected="L$ 5 支払ã†" name="fastpay 5"/>
+ <button label="L$ 10 支払ã†" label_selected="L$ 10 支払ã†" name="fastpay 10"/>
+ <button label="L$ 20 支払ã†" label_selected="L$ 20 支払ã†" name="fastpay 20"/>
+ </panel>
+ <panel label="検索" name="InputPanel">
+ <text name="amount text">ãã®ä»–ã®é‡‘é¡:</text>
+ <button label="支払ã„" label_selected="支払ã„" name="pay btn"/>
+ <button label="å–り消ã—" label_selected="å–り消ã—" name="cancel btn"/>
+ </panel>
</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_report_abuse.xml b/indra/newview/skins/default/xui/ja/floater_report_abuse.xml
index 9021be5dda..7631cd7aba 100755
--- a/indra/newview/skins/default/xui/ja/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/ja/floater_report_abuse.xml
@@ -76,7 +76,7 @@
<combo_box.item label="土地 &gt; ä¸æ³•ä¾µå…¥ &gt; オブジェクトã¾ãŸã¯ãƒ†ã‚¯ã‚¹ãƒãƒ£" name="Land__Encroachment__Objects_textures"/>
<combo_box.item label="土地>ä¸æ³•ä¾µå…¥ï¼žãƒ‘ーティクル" name="Land__Encroachment__Particles"/>
<combo_box.item label="土地>ä¸æ³•ä¾µå…¥ï¼žæ¨¹æœ¨/æ¤ç‰©" name="Land__Encroachment__Trees_plants"/>
- <combo_box.item label="è³­ã‘ã¾ãŸã¯ã‚®ãƒ£ãƒ³ãƒ–ル" name="Wagering_gambling"/>
+ <combo_box.item label="ゲーミング ãƒãƒªã‚·ãƒ¼é•å" name="Wagering_gambling"/>
<combo_box.item label="ãã®ä»–" name="Other"/>
</combo_box>
<text name="abuser_name_title">
diff --git a/indra/newview/skins/default/xui/ja/floater_snapshot.xml b/indra/newview/skins/default/xui/ja/floater_snapshot.xml
index 7d0fb27932..f04193d034 100755
--- a/indra/newview/skins/default/xui/ja/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/ja/floater_snapshot.xml
@@ -39,17 +39,8 @@
<string name="local_failed_str">
コンピュータã«ä¿å­˜ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚
</string>
- <button name="advanced_options_btn" tool_tip="詳ã—ã„設定"/>
- <text name="image_res_text">
- [WIDTH] x [HEIGHT] px
- </text>
- <text name="file_size_label">
- [SIZE] キロãƒã‚¤ãƒˆ
- </text>
+ <button label="æ›´æ–°" name="new_snapshot_btn"/>
<panel name="advanced_options_panel">
- <text name="advanced_options_label">
- 詳ã—ã„設定
- </text>
<text name="layer_type_label">
キャプãƒãƒ£ï¼š
</text>
@@ -68,4 +59,10 @@
<combo_box.item label="フィルターãªã—" name="NoFilter"/>
</combo_box>
</panel>
+ <text name="image_res_text">
+ [WIDTH]px (横幅) x [HEIGHT]px (高ã•)
+ </text>
+ <text name="file_size_label">
+ [SIZE] キロãƒã‚¤ãƒˆ
+ </text>
</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_top_objects.xml b/indra/newview/skins/default/xui/ja/floater_top_objects.xml
index c44f409d4e..cc81ead116 100755
--- a/indra/newview/skins/default/xui/ja/floater_top_objects.xml
+++ b/indra/newview/skins/default/xui/ja/floater_top_objects.xml
@@ -21,6 +21,12 @@
<floater.string name="none_descriptor">
何も見ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸã€‚
</floater.string>
+ <floater.string name="URLs">
+ URL
+ </floater.string>
+ <floater.string name="memory">
+ メモリ(KB)
+ </floater.string>
<text name="title_text">
ロード中...
</text>
@@ -30,7 +36,7 @@
<scroll_list.columns label="所有者" name="owner"/>
<scroll_list.columns label="ロケーション" name="location"/>
<scroll_list.columns label="区画" name="parcel"/>
- <scroll_list.columns label="時間" name="time"/>
+ <scroll_list.columns label="日付" name="time"/>
<scroll_list.columns label="URL" name="URLs"/>
<scroll_list.columns label="メモリ(KB)" name="memory"/>
</scroll_list>
diff --git a/indra/newview/skins/default/xui/ja/floater_twitter.xml b/indra/newview/skins/default/xui/ja/floater_twitter.xml
index 7cd71df800..6df2045554 100644
--- a/indra/newview/skins/default/xui/ja/floater_twitter.xml
+++ b/indra/newview/skins/default/xui/ja/floater_twitter.xml
@@ -1,17 +1,13 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="floater_twitter" title="TWITTER">
- <panel name="background">
- <tab_container name="tabs">
- <panel label="作æˆ" name="panel_twitter_photo"/>
- <panel label="アカウント" name="panel_twitter_account"/>
- </tab_container>
- <panel name="connection_status_panel">
- <text name="connection_error_text">
- エラー
- </text>
- <text name="connection_loading_text">
- ロード中...
- </text>
- </panel>
- </panel>
+ <tab_container name="tabs">
+ <panel label="作æˆ" name="panel_twitter_photo"/>
+ <panel label="アカウント" name="panel_twitter_account"/>
+ </tab_container>
+ <text name="connection_error_text">
+ エラー
+ </text>
+ <text name="connection_loading_text">
+ ロード中...
+ </text>
</floater>
diff --git a/indra/newview/skins/default/xui/ja/menu_attachment_self.xml b/indra/newview/skins/default/xui/ja/menu_attachment_self.xml
index d87ef8e2a0..e7aa3cfc30 100755
--- a/indra/newview/skins/default/xui/ja/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/ja/menu_attachment_self.xml
@@ -8,6 +8,7 @@
<menu_item_call label="容姿" name="Change Outfit"/>
<menu_item_call label="アウトフィットã®ç·¨é›†" name="Edit Outfit"/>
<menu_item_call label="シェイプã®ç·¨é›†" name="Edit My Shape"/>
+ <menu_item_call label="ホãƒãƒ¼é«˜ã•" name="Hover Height"/>
<menu_item_call label="フレンド" name="Friends..."/>
<menu_item_call label="グループ" name="Groups..."/>
<menu_item_call label="プロフィール" name="Profile..."/>
diff --git a/indra/newview/skins/default/xui/ja/menu_avatar_self.xml b/indra/newview/skins/default/xui/ja/menu_avatar_self.xml
index eb8e98059a..a14cfd5876 100755
--- a/indra/newview/skins/default/xui/ja/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/ja/menu_avatar_self.xml
@@ -25,6 +25,7 @@
<menu_item_call label="容姿" name="Chenge Outfit"/>
<menu_item_call label="アウトフィットを編集" name="Edit Outfit"/>
<menu_item_call label="シェイプを編集" name="Edit My Shape"/>
+ <menu_item_call label="ホãƒãƒ¼é«˜ã•" name="Hover Height"/>
<menu_item_call label="フレンド" name="Friends..."/>
<menu_item_call label="グループ" name="Groups..."/>
<menu_item_call label="プロフィール" name="Profile..."/>
diff --git a/indra/newview/skins/default/xui/ja/menu_inventory.xml b/indra/newview/skins/default/xui/ja/menu_inventory.xml
index 8d6c983aa7..9a68ed8a6b 100755
--- a/indra/newview/skins/default/xui/ja/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/ja/menu_inventory.xml
@@ -1,5 +1,14 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<menu name="Popup">
+ <menu_item_call label="リストを作æˆ" name="Marketplace Create Listing"/>
+ <menu_item_call label="リストを関連付ã‘" name="Marketplace Associate Listing"/>
+ <menu_item_call label="リストをå–å¾— (æ›´æ–°)" name="Marketplace Get Listing"/>
+ <menu_item_call label="エラーを確èª" name="Marketplace Check Listing"/>
+ <menu_item_call label="リストを編集" name="Marketplace Edit Listing"/>
+ <menu_item_call label="リスト" name="Marketplace List"/>
+ <menu_item_call label="リストã‹ã‚‰å–り除ã" name="Marketplace Unlist"/>
+ <menu_item_call label="有効ã«ã™ã‚‹" name="Marketplace Activate"/>
+ <menu_item_call label="無効ã«ã™ã‚‹" name="Marketplace Deactivate"/>
<menu_item_call label="共有" name="Share"/>
<menu_item_call label="購入" name="Task Buy"/>
<menu_item_call label="é–‹ã" name="Task Open"/>
@@ -87,6 +96,7 @@
<menu_item_call label="追加" name="Wearable Add"/>
<menu_item_call label="å–り外ã™" name="Take Off"/>
<menu_item_call label="マーãƒãƒ£ãƒ³ãƒˆã®ã‚¢ã‚¦ãƒˆãƒœãƒƒã‚¯ã‚¹ã«ã‚³ãƒ”ー" name="Merchant Copy"/>
- <menu_item_call label="マーケットプレイスã«é€ä¿¡" name="Marketplace Send"/>
+ <menu_item_call label="マーケットプレイスã®ãƒªã‚¹ãƒˆã«ã‚³ãƒ”ー" name="Marketplace Copy"/>
+ <menu_item_call label="マーケットプレイスã®ãƒªã‚¹ãƒˆã«ç§»å‹•" name="Marketplace Move"/>
<menu_item_call label="ï¼ï¼ã‚ªãƒ—ションãªã—ï¼ï¼" name="--no options--"/>
</menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/ja/menu_inventory_gear_default.xml
index f38dbc71a8..18478b5711 100755
--- a/indra/newview/skins/default/xui/ja/menu_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/ja/menu_inventory_gear_default.xml
@@ -5,7 +5,7 @@
<menu_item_check label="æ–°ã—ã„é †ã«ä¸¦ã¹æ›¿ãˆ" name="sort_by_recent"/>
<menu_item_check label="フォルダを常ã«åå‰é †ã«ä¸¦ã¹ã‚‹" name="sort_folders_by_name"/>
<menu_item_check label="システムフォルダを上ã«ã‚½ãƒ¼ãƒˆã™ã‚‹" name="sort_system_folders_to_top"/>
- <menu_item_call label="フィルターを表示" name="show_filters"/>
+ <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="紛失物を空ã«ã™ã‚‹" name="empty_lostnfound"/>
diff --git a/indra/newview/skins/default/xui/ja/menu_marketplace_view.xml b/indra/newview/skins/default/xui/ja/menu_marketplace_view.xml
new file mode 100644
index 0000000000..ad36aa3f77
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_marketplace_view.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_marketplace_sort">
+ <menu_item_check label="在庫高順ã«ä¸¦ã¹æ›¿ãˆ (低ã‹ã‚‰é«˜ã¸)" name="sort_by_stock_amount"/>
+ <menu_item_check label="リストフォルダã®ã¿è¡¨ç¤º" name="show_only_listing_folders"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_url_experience.xml b/indra/newview/skins/default/xui/ja/menu_url_experience.xml
new file mode 100644
index 0000000000..582784c2f0
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_url_experience.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Url Popup">
+ <menu_item_call label="SLurl をクリップボードã«ã‚³ãƒ”ー" name="url_copy"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_viewer.xml b/indra/newview/skins/default/xui/ja/menu_viewer.xml
index 0b85c693f0..3f756c5f94 100755
--- a/indra/newview/skins/default/xui/ja/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/ja/menu_viewer.xml
@@ -8,6 +8,7 @@
<menu_item_call label="æ–°ã—ã„インベントリウィンドウ" name="NewInventoryWindow"/>
<menu_item_call label="場所..." name="Places"/>
<menu_item_call label="ピック..." name="Picks"/>
+ <menu_item_call label="体験..." name="Experiences"/>
<menu_item_call label="カメラコントロール..." name="Camera Controls"/>
<menu label="ムーブメント" name="Movement">
<menu_item_call label="座る" name="Sit Down Here"/>
@@ -22,6 +23,7 @@
</menu>
<menu_item_call label="L$ ã®è³¼å…¥..." name="Buy and Sell L$"/>
<menu_item_call label="マーãƒãƒ£ãƒ³ãƒˆã‚¢ã‚¦ãƒˆãƒœãƒƒã‚¯ã‚¹..." name="MerchantOutbox"/>
+ <menu_item_call label="マーケティングプレイスã®ãƒªã‚¹ãƒˆ..." name="MarketplaceListings"/>
<menu_item_call label="マイアカウント..." name="Manage My Account">
<menu_item_call.on_click name="ManageMyAccount_url" parameter="WebLaunchJoinNow,http://secondlife.com/account/index.php?lang=ja"/>
</menu_item_call>
@@ -48,7 +50,7 @@
<menu_item_check label="フレンド" name="My Friends"/>
<menu_item_check label="グループ" name="My Groups"/>
<menu_item_check label="è¿‘ãã«ã„る人" name="Active Speakers"/>
- <menu_item_call label="リストをブロック" name="Block List"/>
+ <menu_item_check label="リストをブロック" name="Block List"/>
<menu_item_check label="ç€ä¿¡æ‹’å¦" name="Do Not Disturb"/>
</menu>
<menu label="世界" name="World">
@@ -250,6 +252,7 @@
<menu_item_check label="テクスãƒãƒ£ã®ã‚³ãƒ³ã‚½ãƒ¼ãƒ«" name="Texture Console"/>
<menu_item_check label="デãƒãƒƒã‚°ã‚³ãƒ³ã‚½ãƒ¼ãƒ«" name="Debug Console"/>
<menu_item_call label="通知コンソール" name="Notifications"/>
+ <menu_item_check label="地域デãƒãƒƒã‚°ã‚³ãƒ³ã‚½ãƒ¼ãƒ«" name="Region Debug Console"/>
<menu_item_check label="ファーストタイマー" name="Fast Timers"/>
<menu_item_check label="メモリ" name="Memory"/>
<menu_item_check label="風景ã®çµ±è¨ˆ" name="Scene Statistics"/>
@@ -353,7 +356,7 @@
<menu_item_check label="挿入ã•ã‚ŒãŸã‚ªãƒ–ジェクトã®ä½ç½®ã® Ping" name="Ping Interpolate Object Positions"/>
<menu_item_call label="パケットドロップ" name="Drop a Packet"/>
</menu>
- <menu_item_call label="スクリプト付ãカメラをダンプ" name="Dump Scripted Camera"/>
+ <menu_item_call label="スクリプト付ãカメラをダンプ" name="Dump Scripted Camera"/>
<menu label="レコーダー" name="Recorder">
<menu_item_call label="å†ç”Ÿé–‹å§‹" name="Start Playback"/>
<menu_item_call label="å†ç”Ÿåœæ­¢" name="Stop Playback"/>
diff --git a/indra/newview/skins/default/xui/ja/mime_types.xml b/indra/newview/skins/default/xui/ja/mime_types.xml
index 54663a0367..bfc8d0b724 100755
--- a/indra/newview/skins/default/xui/ja/mime_types.xml
+++ b/indra/newview/skins/default/xui/ja/mime_types.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<mimetypes name="default">
<widgetset name="web">
<label name="web_label">
@@ -27,7 +27,7 @@
コンテンツãªã—
</label>
<tooltip name="none_tooltip">
- メディアãªã—
+ ã“ã“ã«ãƒ¡ãƒ‡ã‚£ã‚¢ãªã—
</tooltip>
</widgetset>
<widgetset name="image">
diff --git a/indra/newview/skins/default/xui/ja/mime_types_linux.xml b/indra/newview/skins/default/xui/ja/mime_types_linux.xml
index 0ec1030113..cb1e48148f 100755
--- a/indra/newview/skins/default/xui/ja/mime_types_linux.xml
+++ b/indra/newview/skins/default/xui/ja/mime_types_linux.xml
@@ -44,6 +44,14 @@
ã“ã®ãƒ­ã‚±ãƒ¼ã‚·ãƒ§ãƒ³ã®ã‚ªãƒ¼ãƒ‡ã‚£ã‚ªã‚’å†ç”Ÿã™ã‚‹
</playtip>
</widgetset>
+ <widgetset name="none">
+ <label name="none_label">
+ コンテンツãªã—
+ </label>
+ <tooltip name="none_tooltip">
+ ã“ã“ã«ãƒ¡ãƒ‡ã‚£ã‚¢ãªã—
+ </tooltip>
+ </widgetset>
<scheme name="rtsp">
<label name="rtsp_label">
リアルタイム・ストリーミング
diff --git a/indra/newview/skins/default/xui/ja/mime_types_mac.xml b/indra/newview/skins/default/xui/ja/mime_types_mac.xml
index 0ec1030113..cb1e48148f 100755
--- a/indra/newview/skins/default/xui/ja/mime_types_mac.xml
+++ b/indra/newview/skins/default/xui/ja/mime_types_mac.xml
@@ -44,6 +44,14 @@
ã“ã®ãƒ­ã‚±ãƒ¼ã‚·ãƒ§ãƒ³ã®ã‚ªãƒ¼ãƒ‡ã‚£ã‚ªã‚’å†ç”Ÿã™ã‚‹
</playtip>
</widgetset>
+ <widgetset name="none">
+ <label name="none_label">
+ コンテンツãªã—
+ </label>
+ <tooltip name="none_tooltip">
+ ã“ã“ã«ãƒ¡ãƒ‡ã‚£ã‚¢ãªã—
+ </tooltip>
+ </widgetset>
<scheme name="rtsp">
<label name="rtsp_label">
リアルタイム・ストリーミング
diff --git a/indra/newview/skins/default/xui/ja/notifications.xml b/indra/newview/skins/default/xui/ja/notifications.xml
index 1d52b42039..694f38467e 100755
--- a/indra/newview/skins/default/xui/ja/notifications.xml
+++ b/indra/newview/skins/default/xui/ja/notifications.xml
@@ -72,6 +72,10 @@
[MESSAGE]
<usetemplate name="okcancelbuttons" notext="å–り消ã—" yestext="ã¯ã„"/>
</notification>
+ <notification name="GenericAlertOK">
+ [MESSAGE]
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
<notification name="BadInstallation">
[APP_NAME] をアップデート中ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚ ビューワ㮠[http://get.secondlife.com 最新ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’ダウンロード] ã—ã¦ãã ã•ã„。
<usetemplate name="okbutton" yestext="OK"/>
@@ -124,6 +128,88 @@
システムã¾ãŸã¯ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã®ã‚¨ãƒ©ãƒ¼ã®ãŸã‚ã€ãƒžãƒ¼ã‚±ãƒƒãƒˆãƒ—レイスã®åˆæœŸåŒ–ã«å¤±æ•—ã—ã¾ã—ãŸã€‚後ã§ã‚‚ã†ä¸€åº¦ãŠè©¦ã—ãã ã•ã„。
<usetemplate name="okbutton" yestext="OK"/>
</notification>
+ <notification name="StockPasteFailed">
+ 在庫フォルダã¸ã®ã‚³ãƒ”ーã¾ãŸã¯ç§»å‹•ãŒã‚¨ãƒ©ãƒ¼ã«ã‚ˆã‚Šå¤±æ•—ã—ã¾ã—ãŸ:
+
+&apos;[ERROR_CODE]&apos;
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="MerchantPasteFailed">
+ マーケットプレイスã®ãƒªã‚¹ãƒˆã¸ã®ã‚³ãƒ”ーã¾ãŸã¯ç§»å‹•ãŒã‚¨ãƒ©ãƒ¼ã«ã‚ˆã‚Šå¤±æ•—ã—ã¾ã—ãŸ:
+
+&apos;[ERROR_CODE]&apos;
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="MerchantTransactionFailed">
+ マーケットプレイスã«ã‚ˆã‚‹å–引ãŒæ¬¡ã®ã‚¨ãƒ©ãƒ¼ã«ã‚ˆã‚Šå¤±æ•—ã—ã¾ã—ãŸ:
+
+ç†ç”±ï¼š&apos;[ERROR_REASON]&apos;
+[ERROR_DESCRIPTION]
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="MerchantUnprocessableEntity">
+ ã“ã®è£½å“をリストã«è¡¨ç¤ºã§ããªã„ã‹ã€ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãƒ•ã‚©ãƒ«ãƒ€ã‚’有効ã«ã§ãã¾ã›ã‚“。通常ã€ã“ã‚Œã¯ãƒªã‚¹ãƒˆèª¬æ˜Žãƒ•ã‚©ãƒ¼ãƒ ã«æƒ…å ±ãŒä¸è¶³ã—ã¦ã„ã‚‹ãŸã‚ã«èµ·ã“ã‚Šã¾ã™ãŒã€ãƒ•ã‚©ãƒ«ãƒ€æ§‹é€ ã®ã‚¨ãƒ©ãƒ¼ãŒåŽŸå› ã®å ´åˆã‚‚ã‚ã‚Šã¾ã™ã€‚リストを編集ã™ã‚‹ã‹ã€ãƒªã‚¹ãƒˆãƒ•ã‚©ãƒ«ãƒ€ã«ã‚¨ãƒ©ãƒ¼ãŒãªã„ã‹ç¢ºèªã—ã¦ãã ã•ã„。
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="MerchantListingFailed">
+ マーケットプレイスã¸ã®ãƒªã‚¹ãƒˆè¡¨ç¤ºãŒæ¬¡ã®ã‚¨ãƒ©ãƒ¼ã§å¤±æ•—ã—ã¾ã—㟠:
+
+&apos;[ERROR_CODE]&apos;
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="MerchantFolderActivationFailed">
+ ã“ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãƒ•ã‚©ãƒ«ãƒ€ã®æœ‰åŠ¹åŒ–ãŒæ¬¡ã®ã‚¨ãƒ©ãƒ¼ã«ã‚ˆã‚Šå¤±æ•—ã—ã¾ã—㟠:
+
+&apos;[ERROR_CODE]&apos;
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="ConfirmMerchantActiveChange">
+ ã“ã®æ“作ã«ã‚ˆã‚Šã€ã“ã®ãƒªã‚¹ãƒˆã®æœ‰åŠ¹ãªå†…容ãŒå¤‰æ›´ã•ã‚Œã¾ã™ã€‚続ã‘ã¾ã™ã‹ï¼Ÿ
+ <usetemplate ignoretext="マーケットプレイスã§æœ‰åŠ¹ãªãƒªã‚¹ãƒˆã‚’変更ã™ã‚‹å‰ã«ç¢ºèªã™ã‚‹" name="okcancelignore" notext="å–り消ã—" yestext="OK"/>
+ </notification>
+ <notification name="ConfirmMerchantMoveInventory">
+ マーケットプレイスã®ãƒªã‚¹ãƒˆã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã«ãƒ‰ãƒ©ãƒƒã‚°ã—ãŸã‚¢ã‚¤ãƒ†ãƒ ã¯å…ƒã®å ´æ‰€ã‹ã‚‰ã‚³ãƒ”ーã•ã‚Œã‚‹ã®ã§ã¯ãªãã€ç§»å‹•ã—ã¾ã™ã€‚続ã‘ã¾ã™ã‹ï¼Ÿ
+ <usetemplate ignoretext="アイテムをインベントリã‹ã‚‰ãƒžãƒ¼ã‚±ãƒƒãƒˆãƒ—レイスã«ç§»å‹•ã™ã‚‹å‰ã«ç¢ºèªã™ã‚‹" name="okcancelignore" notext="å–り消ã—" yestext="OK"/>
+ </notification>
+ <notification name="ConfirmListingCutOrDelete">
+ リストフォルダを移動ã¾ãŸã¯å‰Šé™¤ã™ã‚‹ã¨ã€ãƒžãƒ¼ã‚±ãƒƒãƒˆãƒ—レイスã®ãƒªã‚¹ãƒˆãŒå‰Šé™¤ã•ã‚Œã¾ã™ã€‚マーケットプレイスã®ãƒªã‚¹ãƒˆã‚’維æŒã™ã‚‹å ´åˆã¯ã€å¤‰æ›´ã™ã‚‹ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãƒ•ã‚©ãƒ«ãƒ€ã®ä¸­èº«ã‚’移動ã¾ãŸã¯å‰Šé™¤ã—ã¦ãã ã•ã„。続ã‘ã¾ã™ã‹ï¼Ÿ
+ <usetemplate ignoretext="マーケットプレイスã‹ã‚‰ãƒªã‚¹ãƒˆã‚’移動ã¾ãŸã¯å‰Šé™¤ã™ã‚‹å‰ã«ç¢ºèªã™ã‚‹" name="okcancelignore" notext="å–り消ã—" yestext="OK"/>
+ </notification>
+ <notification name="ConfirmCopyToMarketplace">
+ ã“れらã®ã‚¢ã‚¤ãƒ†ãƒ ã® 1 ã¤ã¾ãŸã¯è¤‡æ•°ã‚’マーケットプレイスã«ã‚³ãƒ”ーã™ã‚‹æ¨©é™ãŒã‚ã‚Šã¾ã›ã‚“。移動ã™ã‚‹ã‹ã€ç½®ã去りã«ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã™ã€‚
+ <usetemplate canceltext="å–り消ã—" ignoretext="コピー付加アイテムをå«ã‚€é¸æŠžå†…容をマーケットプレイスã¸ã‚³ãƒ”ーã™ã‚‹å‰ã«ç¢ºèªã™ã‚‹" name="yesnocancelbuttons" notext="アイテムを移動ã—ãªã„" yestext="アイテムを移動"/>
+ </notification>
+ <notification name="ConfirmMerchantUnlist">
+ ã“ã®æ“作ã«ã‚ˆã‚Šã€ã“ã®ãƒªã‚¹ãƒˆãŒå‰Šé™¤ã•ã‚Œã¾ã™ã€‚続ã‘ã¾ã™ã‹ï¼Ÿ
+ <usetemplate ignoretext="マーケットプレイスã§æœ‰åŠ¹ãªãƒªã‚¹ãƒˆã‚’削除ã™ã‚‹å‰ã«ç¢ºèªã™ã‚‹" name="okcancelignore" notext="å–り消ã—" yestext="OK"/>
+ </notification>
+ <notification name="ConfirmMerchantClearVersion">
+ ã“ã®æ“作ã«ã‚ˆã‚Šã€ç¾åœ¨ã®ãƒªã‚¹ãƒˆã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãƒ•ã‚©ãƒ«ãƒ€ãŒç„¡åŠ¹ã«ãªã‚Šã¾ã™ã€‚続ã‘ã¾ã™ã‹ï¼Ÿ
+ <usetemplate ignoretext="マーケットプレイスã§ãƒªã‚¹ãƒˆã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãƒ•ã‚©ãƒ«ãƒ€ã‚’無効ã«ã™ã‚‹å‰ã«ç¢ºèªã™ã‚‹" name="okcancelignore" notext="å–り消ã—" yestext="OK"/>
+ </notification>
+ <notification name="AlertMerchantListingNotUpdated">
+ ã“ã®ãƒªã‚¹ãƒˆã‚’アップデートã§ãã¾ã›ã‚“ã§ã—ãŸã€‚
+[[URL] ã“ã“をクリック] ã—ã¦ãƒžãƒ¼ã‚±ãƒƒãƒˆãƒ—レイスã§ç·¨é›†ã—ã¾ã™ã€‚
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="AlertMerchantListingCannotWear">
+ マーケットプレイスã®ãƒªã‚¹ãƒˆãƒ•ã‚©ãƒ«ãƒ€ã«ã‚ã‚‹è¡£æœã‚„ボディパーツをç€ç”¨ã§ãã¾ã›ã‚“。
+ </notification>
+ <notification name="AlertMerchantListingInvalidID">
+ リスト ID ãŒç„¡åŠ¹ã§ã™ã€‚
+ </notification>
+ <notification name="AlertMerchantListingActivateRequired">
+ ã“ã®ãƒªã‚¹ãƒˆã«ã¯è¤‡æ•°ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãƒ•ã‚©ãƒ«ãƒ€ãŒã‚ã‚‹ã‹ã€ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãƒ•ã‚©ãƒ«ãƒ€ãŒã‚ã‚Šã¾ã›ã‚“。後ã§ã€å˜ç‹¬ã§ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãƒ•ã‚©ãƒ«ãƒ€ã‚’é¸æŠžã—ã¦æœ‰åŠ¹ã«ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚
+ <usetemplate ignoretext="複数ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãƒ•ã‚©ãƒ«ãƒ€ã®ã‚るリストを作æˆã™ã‚‹ã¨ãã«ã€ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãƒ•ã‚©ãƒ«ãƒ€ã®æœ‰åŠ¹åŒ–ã«é–¢ã™ã‚‹è­¦å‘ŠãŒè¡¨ç¤ºã•ã‚Œã¾ã™" name="okignore" yestext="OK"/>
+ </notification>
+ <notification name="AlertMerchantStockFolderSplit">
+ å„種ã®åœ¨åº«å“目を別々ã®åœ¨åº«ãƒ•ã‚©ãƒ«ãƒ€ã«åˆ†ã‘ãŸãŸã‚ã€ãƒ•ã‚©ãƒ«ãƒ€ã¯ãƒªã‚¹ãƒˆã«è¡¨ç¤ºã§ãるよã†ã«é…ç½®ã•ã‚Œã¦ã„ã¾ã™ã€‚
+ <usetemplate ignoretext="リストã«è¡¨ç¤ºã™ã‚‹å‰ã«åœ¨åº«ãƒ•ã‚©ãƒ«ãƒ€ãŒåˆ†å‰²ã•ã‚Œã‚‹ã¨ã€è­¦å‘ŠãŒè¡¨ç¤ºã•ã‚Œã¾ã™" name="okignore" yestext="OK"/>
+ </notification>
+ <notification name="AlertMerchantStockFolderEmpty">
+ 在庫ãŒç©ºã®ãŸã‚ã€ãƒªã‚¹ãƒˆã‚’削除ã—ã¾ã—ãŸã€‚ã‚‚ã†ä¸€åº¦ãƒªã‚¹ãƒˆã‚’表示ã™ã‚‹ã«ã¯ã€åœ¨åº«ãƒ•ã‚©ãƒ«ãƒ€ã«ãƒ¦ãƒ‹ãƒƒãƒˆã‚’追加ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚
+ <usetemplate ignoretext="在庫フォルダãŒç©ºã®ãŸã‚ã«ãƒªã‚¹ãƒˆãŒè¡¨ç¤ºã•ã‚Œãªã„ã¨è­¦å‘ŠãŒè¡¨ç¤ºã•ã‚Œã¾ã™" name="okignore" yestext="OK"/>
+ </notification>
<notification name="CompileQueueSaveText">
次ã®ç†ç”±ã§ã€ã‚¹ã‚¯ãƒªãƒ—ト用テキストã®ã‚¢ãƒƒãƒ—ロード時ã«å•é¡ŒãŒèµ·ã“ã‚Šã¾ã—ãŸã€‚
[REASON]
@@ -491,6 +577,10 @@ L$ ãŒä¸è¶³ã—ã¦ã„ã‚‹ã®ã§ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ã«å‚加ã™ã‚‹ã“ã¨ãŒã§ãã
変更をä¿å­˜ã—ã¾ã™ã‹ï¼Ÿ
<usetemplate canceltext="å–り消ã—" name="yesnocancelbuttons" notext="ä¿å­˜ã—ãªã„" yestext="ä¿å­˜"/>
</notification>
+ <notification name="DeleteNotecard">
+ ノートカードを削除ã—ã¾ã™ã‹?
+ <usetemplate name="okcancelbuttons" notext="å–り消ã—" yestext="OK"/>
+ </notification>
<notification name="GestureSaveFailedTooManySteps">
ジェスãƒãƒ£ãƒ¼ã®ä¿å­˜ã«å¤±æ•—ã—ã¾ã—ãŸã€‚
ステップãŒå¤šã™ãŽã¾ã™ã€‚
@@ -597,6 +687,9 @@ L$ ãŒä¸è¶³ã—ã¦ã„ã‚‹ã®ã§ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ã«å‚加ã™ã‚‹ã“ã¨ãŒã§ãã
<notification name="RegionNoTerraforming">
[REGION] ã§ã¯ã€åœ°å½¢ã®å¤‰æ›´ãŒã§ãã¾ã›ã‚“。
</notification>
+ <notification name="ParcelNoTerraforming">
+ ã‚ãªãŸã«ã¯ [PARCEL] 区画を地形編集ã™ã‚‹è¨±å¯ãŒã‚ã‚Šã¾ã›ã‚“。
+ </notification>
<notification name="CannotCopyWarning">
ã‚ãªãŸã«ã¯[ITEMS]ã¨ã„ã†ã‚¢ã‚¤ãƒ†ãƒ ã‚’コピーã™ã‚‹è¨±å¯ãŒã‚ã‚Šã¾ã›ã‚“。他ã®ä½äººã«æä¾›ã™ã‚‹ã¨ã€ãã®ã‚¢ã‚¤ãƒ†ãƒ ã¯ã‚ãªãŸã®ã‚¤ãƒ³ãƒ™ãƒ³ãƒˆãƒªã‹ã‚‰å‰Šé™¤ã•ã‚Œã¾ã™ã€‚本当ã«ã“れらã®ã‚¢ã‚¤ãƒ†ãƒ ã‚’譲りã¾ã™ã‹ï¼Ÿ
<usetemplate name="okcancelbuttons" notext="ã„ã„ãˆ" yestext="ã¯ã„"/>
@@ -1863,6 +1956,30 @@ http://wiki.secondlife.com/wiki/Setting_your_display_name ã‚’å‚ç…§ã—ã¦ãã ã
ä¸å‹•ç”£ãƒžãƒãƒ¼ã‚¸ãƒ£ãƒ¼ã‚’ã€ã“ã®ä¸å‹•ç”£é™å®šã€ã¾ãŸã¯ [ALL_ESTATES] ã‹ã‚‰ã€å‰Šé™¤ã—ã¾ã™ã‹ï¼Ÿ
<usetemplate canceltext="å–り消ã—" name="yesnocancelbuttons" notext="ã™ã¹ã¦ã®ä¸å‹•ç”£" yestext="ã“ã®ä¸å‹•ç”£"/>
</notification>
+ <notification label="ä¸å‹•ç”£ã‚’é¸æŠž" name="EstateAllowedExperienceAdd">
+ ã“ã®ä¸å‹•ç”£ã®è¨±å¯ãƒªã‚¹ãƒˆã«ã®ã¿è¿½åŠ ã—ã¾ã™ã‹ã€ãã‚Œã¨ã‚‚ [ALL_ESTATES] ã®è¨±å¯ãƒªã‚¹ãƒˆã«è¿½åŠ ã—ã¾ã™ã‹?
+ <usetemplate canceltext="å–り消ã—" name="yesnocancelbuttons" notext="ã™ã¹ã¦ã®ä¸å‹•ç”£" yestext="ã“ã®ä¸å‹•ç”£"/>
+ </notification>
+ <notification label="ä¸å‹•ç”£ã‚’é¸æŠž" name="EstateAllowedExperienceRemove">
+ ã“ã®ä¸å‹•ç”£ã®è¨±å¯ãƒªã‚¹ãƒˆã‹ã‚‰ã®ã¿å‰Šé™¤ã—ã¾ã™ã‹ã€ãã‚Œã¨ã‚‚ [ALL_ESTATES] ã®è¨±å¯ãƒªã‚¹ãƒˆã‹ã‚‰å‰Šé™¤ã—ã¾ã™ã‹?
+ <usetemplate canceltext="å–り消ã—" name="yesnocancelbuttons" notext="ã™ã¹ã¦ã®ä¸å‹•ç”£" yestext="ã“ã®ä¸å‹•ç”£"/>
+ </notification>
+ <notification label="ä¸å‹•ç”£ã‚’é¸æŠž" name="EstateBlockedExperienceAdd">
+ ã“ã®ä¸å‹•ç”£ã®ãƒ–ロックã•ã‚ŒãŸãƒªã‚¹ãƒˆã«ã®ã¿è¿½åŠ ã—ã¾ã™ã‹ã€ãã‚Œã¨ã‚‚ [ALL_ESTATES] ã®ãƒ–ロックã•ã‚ŒãŸãƒªã‚¹ãƒˆã«è¿½åŠ ã—ã¾ã™ã‹?
+ <usetemplate canceltext="å–り消ã—" name="yesnocancelbuttons" notext="ã™ã¹ã¦ã®ä¸å‹•ç”£" yestext="ã“ã®ä¸å‹•ç”£"/>
+ </notification>
+ <notification label="ä¸å‹•ç”£ã‚’é¸æŠž" name="EstateBlockedExperienceRemove">
+ ã“ã®ä¸å‹•ç”£ã®ãƒ–ロックã•ã‚ŒãŸãƒªã‚¹ãƒˆã‹ã‚‰ã®ã¿å‰Šé™¤ã—ã¾ã™ã‹ã€ãã‚Œã¨ã‚‚ [ALL_ESTATES] ã®ãƒ–ロックã•ã‚ŒãŸãƒªã‚¹ãƒˆã‹ã‚‰å‰Šé™¤ã—ã¾ã™ã‹?
+ <usetemplate canceltext="å–り消ã—" name="yesnocancelbuttons" notext="ã™ã¹ã¦ã®ä¸å‹•ç”£" yestext="ã“ã®ä¸å‹•ç”£"/>
+ </notification>
+ <notification label="ä¸å‹•ç”£ã‚’é¸æŠž" name="EstateTrustedExperienceAdd">
+ ã“ã®ä¸å‹•ç”£ã®ã‚­ãƒ¼ä½“験リストã«ã®ã¿è¿½åŠ ã—ã¾ã™ã‹ã€ãã‚Œã¨ã‚‚ [ALL_ESTATES] ã®ã‚­ãƒ¼ä½“験リストã«è¿½åŠ ã—ã¾ã™ã‹?
+ <usetemplate canceltext="å–り消ã—" name="yesnocancelbuttons" notext="ã™ã¹ã¦ã®ä¸å‹•ç”£" yestext="ã“ã®ä¸å‹•ç”£"/>
+ </notification>
+ <notification label="ä¸å‹•ç”£ã‚’é¸æŠž" name="EstateTrustedExperienceRemove">
+ ã“ã®ä¸å‹•ç”£ã®ä¿¡é ¼æ¸ˆã¿ä½“験リストã‹ã‚‰ã®ã¿å‰Šé™¤ã—ã¾ã™ã‹ã€ãã‚Œã¨ã‚‚ [ALL_ESTATES] ã®ä¿¡é ¼æ¸ˆã¿ãƒªã‚¹ãƒˆã‹ã‚‰å‰Šé™¤ã—ã¾ã™ã‹?
+ <usetemplate canceltext="å–り消ã—" name="yesnocancelbuttons" notext="ã™ã¹ã¦ã®ä¸å‹•ç”£" yestext="ã“ã®ä¸å‹•ç”£"/>
+ </notification>
<notification label="キックを確èª" name="EstateKickUser">
ã“ã®ä¸å‹•ç”£ã‹ã‚‰ [EVIL_USER] を追ã„出ã—ã¾ã™ã‹ï¼Ÿ
<usetemplate name="okcancelbuttons" notext="å–り消ã—" yestext="OK"/>
@@ -1875,6 +1992,9 @@ http://wiki.secondlife.com/wiki/Setting_your_display_name ã‚’å‚ç…§ã—ã¦ãã ã
訪å•ã—よã†ã¨ã—ã¦ã„る地域(リージョン)ã«ã¯ç¾åœ¨ã®ç’°å¢ƒè¨­å®šã‚’超ãˆã‚‹ã‚³ãƒ³ãƒ†ãƒ³ãƒ„ãŒå«ã¾ã‚Œã¦ã„ã¾ã™ã€‚「ミー〠&gt; 「環境設定〠&gt; 「一般ã€ã‚’é¸æŠžã—ã¦ã€ç’°å¢ƒè¨­å®šã‚’変更ã§ãã¾ã™ã€‚
<usetemplate name="okbutton" yestext="OK"/>
</notification>
+ <notification name="SLM_UPDATE_FOLDER">
+ [MESSAGE]
+ </notification>
<notification name="RegionEntryAccessBlocked_AdultsOnlyContent">
訪å•ã—よã†ã¨ã—ã¦ã„る地域(リージョン)ã«ã¯ã€æˆäººã®ã¿ã‚¢ã‚¯ã‚»ã‚¹ã§ãã‚‹ [REGIONMATURITY] コンテンツãŒå«ã¾ã‚Œã¦ã„ã¾ã™ã€‚
<url name="url">
@@ -1937,6 +2057,10 @@ http://wiki.secondlife.com/wiki/Setting_your_display_name ã‚’å‚ç…§ã—ã¦ãã ã
ã‚ãªãŸã®ç’°å¢ƒè¨­å®šãŒã‚µãƒ¼ãƒãƒ¼ã¨åŒæœŸã—ã¦ã„ãªã„ãŸã‚ã€ãƒ†ãƒ¬ãƒãƒ¼ãƒˆã«æŠ€è¡“çš„ãªå•é¡ŒãŒç™ºç”Ÿã—ã¦ã„ã¾ã™ã€‚
<usetemplate name="okbutton" yestext="OK"/>
</notification>
+ <notification name="RegionTPSpecialUsageBlocked">
+ リージョンã«å…¥ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“。&apos;[REGION_NAME]&apos; ã¯ã‚¹ã‚­ãƒ« ゲーミング リージョンã§ã‚ã‚Šã€ã‚ãªãŸã¯ã“ã®ãƒªãƒ¼ã‚¸ãƒ§ãƒ³ã«å…¥ã‚‹ãŸã‚ã®ç‰¹å®šã®åŸºæº–を満ãŸã™å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚詳ã—ãã¯ã€[http://wiki.secondlife.com/wiki/Linden_Lab_Official:Skill_Gaming_in_Second_Life スキル ゲーミングã®ã‚ˆãã‚る質å•] ã‚’å‚ç…§ã—ã¦ãã ã•ã„。
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
<notification name="PreferredMaturityChanged">
今後ã€[RATING] コンテンツ付ãã®åœ°åŸŸï¼ˆãƒªãƒ¼ã‚¸ãƒ§ãƒ³ï¼‰ã‚’訪å•ã—よã†ã¨ã—ã¦ã„ã‚‹ã¨ã„ã†é€šçŸ¥ã‚’å—ã‘å–ã‚Šã¾ã›ã‚“。後ã§ãƒ¡ãƒ‹ãƒ¥ãƒ¼ãƒãƒ¼ã®ã€ŒãƒŸãƒ¼ã€ &gt; 「環境設定〠&gt; 「一般ã€ã‚’使用ã—ã¦ã€ã‚³ãƒ³ãƒ†ãƒ³ãƒ„ã®ç’°å¢ƒè¨­å®šã‚’変更ã§ãã¾ã™ã€‚
<usetemplate name="okbutton" yestext="OK"/>
@@ -2163,6 +2287,10 @@ L$ [AMOUNT] ã§ã€ã“ã®ã‚¯ãƒ©ã‚·ãƒ•ã‚¡ã‚¤ãƒ‰åºƒå‘Šã‚’今ã™ã公開ã—ã¾ã™ã
<ignore name="ignore" text="オブジェクトを作æˆä¸­ã«ã€money() スクリプトを入れãšã«ã€Œã‚ªãƒ–ジェクトã«æ”¯æ‰•ã†ã€ã‚¢ã‚¯ã‚·ãƒ§ãƒ³ã‚’設定ã—ãŸã¨ã"/>
</form>
</notification>
+ <notification name="PayConfirmation">
+ L$[AMOUNT] ã‚’ [TARGET] ã«æ”¯æ‰•ã†ã“ã¨ã‚’確èªã—ã¦ãã ã•ã„。
+ <usetemplate ignoretext="支払ã„å‰ã«ç¢ºèª (åˆè¨ˆé‡‘é¡ãŒ L$200 以上ã®å ´åˆ)" name="okcancelignore" notext="å–り消ã—" yestext="支払ã„"/>
+ </notification>
<notification name="OpenObjectCannotCopy">
ã“ã®ã‚ªãƒ–ジェクトã«ã¯ã€ã‚ãªãŸãŒã‚³ãƒ”ーã§ãるアイテムã¯ã‚ã‚Šã¾ã›ã‚“。
</notification>
@@ -2251,6 +2379,9 @@ Linden Lab
<button ignore="交æ›ã—ãªã„" name="No" text="キャンセル"/>
</form>
</notification>
+ <notification name="TooManyWearables">
+ [AMOUNT] 以上ã®ã‚¢ã‚¤ãƒ†ãƒ ã‚’å«ã‚€ãƒ•ã‚©ãƒ«ãƒ€ã‚’装ç€ã§ãã¾ã›ã‚“。「詳細設定〠&gt; 「デãƒãƒƒã‚°è¨­å®šã‚’表示〠&gt; 「WearFolderLimitã€ã§ã“ã®åˆ¶é™ã‚’変更ã§ãã¾ã™ã€‚
+ </notification>
<notification label="「通知をå—ã‘ãªã„ã€ãƒ¢ãƒ¼ãƒ‰ã®è­¦å‘Š" name="DoNotDisturbModePay">
「通知をå—ã‘ãªã„ã€ã‚’オンã«ã—ã¾ã™ã€‚ã“ã®æ”¯æ‰•ã¨ã®äº¤æ›ã§æä¾›ã•ã‚Œã‚‹ã‚¢ã‚¤ãƒ†ãƒ ãŒå—ä¿¡ã•ã‚Œãªããªã‚Šã¾ã™ã€‚
@@ -2862,7 +2993,7 @@ Web ページã«ãƒªãƒ³ã‚¯ã™ã‚‹ã¨ã€ä»–人ãŒã“ã®å ´æ‰€ã«ç°¡å˜ã«ã‚¢ã‚¯ã‚»ã
[MESSAGE]
-é€ä¿¡å…ƒã®ã‚ªãƒ–ジェクト:&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;ã€æ‰€æœ‰è€…:[NAME]?
+é€ä¿¡å…ƒã®ã‚ªãƒ–ジェクト:&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;ã€æ‰€æœ‰è€…:[NAME]
<form name="form">
<button name="Gotopage" text="ページã«ç§»å‹•"/>
<button name="Cancel" text="å–り消ã—"/>
@@ -2888,6 +3019,72 @@ Web ページã«ãƒªãƒ³ã‚¯ã™ã‚‹ã¨ã€ä»–人ãŒã“ã®å ´æ‰€ã«ç°¡å˜ã«ã‚¢ã‚¯ã‚»ã
<button name="Mute" text="ブロック"/>
</form>
</notification>
+ <notification name="ExperienceAcquireFailed">
+ æ–°ã—ã„体験をå–å¾—ã§ãã¾ã›ã‚“:
+[ERROR_MESSAGE]
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="NotInGroupExperienceProfileMessage">
+ 所有者ãŒé¸æŠžã•ã‚ŒãŸã‚°ãƒ«ãƒ¼ãƒ—ã®ãƒ¡ãƒ³ãƒãƒ¼ã§ãªã„ãŸã‚ã€ä½“験グループã¸ã®å¤‰æ›´ãŒç„¡è¦–ã•ã‚Œã¾ã—ãŸã€‚
+ </notification>
+ <notification name="UneditableExperienceProfileMessage">
+ 体験プロフィールを更新ã™ã‚‹ã¨ãã«ã€ç·¨é›†ä¸å¯ã® &apos;[field]&apos; フィールドãŒç„¡è¦–ã•ã‚Œã¾ã—ãŸã€‚
+ </notification>
+ <notification name="RestrictedToOwnerExperienceProfileMessage">
+ 体験ã®æ‰€æœ‰è€…ã®ã¿ãŒè¨­å®šã§ãã‚‹ &apos;[field]&apos;フィールドã¸ã®å¤‰æ›´ã‚’無視ã—ã¾ã—ãŸã€‚
+ </notification>
+ <notification name="MaturityRatingExceedsOwnerExperienceProfileMessage">
+ 所有者ã®ãƒ¬ãƒ¼ãƒ†ã‚£ãƒ³ã‚°åŒºåˆ†ã‚ˆã‚Šé«˜ã„レーティング区分ã®ä½“験を設定ã§ãã¾ã›ã‚“。
+ </notification>
+ <notification name="RestrictedTermExperienceProfileMessage">
+ 次ã®æ¡ä»¶ã«ã‚ˆã‚Šã€ä½“験プロフィールåãŠã‚ˆã³èª¬æ˜Žã®æ›´æ–°ãŒã§ãã¾ã›ã‚“ã§ã—ãŸ: [extra_info]
+ </notification>
+ <notification name="TeleportedHomeExperienceRemoved">
+ 体験 secondlife:///app/experience/[public_id]/profile を削除ã™ã‚‹ãŸã‚ã«ã€[region_name] リージョンã‹ã‚‰ãƒ†ãƒ¬ãƒãƒ¼ãƒˆã•ã‚Œã€ã“ã®ãƒªãƒ¼ã‚¸ãƒ§ãƒ³ã«å…¥ã‚‹ã“ã¨ã¯ã§ããªããªã‚Šã¾ã—ãŸã€‚
+ <form name="form">
+ <ignore name="ignore" text="体験を削除ã™ã‚‹ãŸã‚ã«ã€ãƒªãƒ¼ã‚¸ãƒ§ãƒ³ã‹ã‚‰è¿½æ”¾ã•ã‚Œã¾ã—ãŸ"/>
+ </form>
+ </notification>
+ <notification name="TrustedExperienceEntry">
+ キー体験 secondlife:///app/experience/[public_id]/profile ã«å‚加ã™ã‚‹ã“ã¨ã«ã‚ˆã‚Šã€[region_name] リージョンã«å…¥ã‚‹ã“ã¨ã‚’許å¯ã•ã‚Œã¾ã—ãŸã€‚ã“ã®ä½“験を削除ã™ã‚‹ã¨ã€ã“ã®ãƒªãƒ¼ã‚¸ãƒ§ãƒ³ã‹ã‚‰è¿½æ”¾ã•ã‚Œã‚‹å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚
+ <form name="form">
+ <ignore name="ignore" text="体験ã«ã‚ˆã‚Šãƒªãƒ¼ã‚¸ãƒ§ãƒ³ã«å…¥ã‚‹ã“ã¨ã‚’許å¯ã•ã‚Œã¾ã—ãŸ"/>
+ </form>
+ </notification>
+ <notification name="TrustedExperiencesAvailable">
+ ã“ã®ç›®çš„地ã¸ã®ã‚¢ã‚¯ã‚»ã‚¹æ¨©ãŒã‚ã‚Šã¾ã›ã‚“。下ã®ä½“験をå—ã‘入れるã“ã¨ã«ã‚ˆã‚Šã€ã“ã®ãƒªãƒ¼ã‚¸ãƒ§ãƒ³ã«å…¥ã‚‹ã“ã¨ãŒã§ãã¾ã™:
+
+[EXPERIENCE_LIST]
+
+ãã®ä»–ã®ã‚­ãƒ¼ä½“験を利用ã§ãã¾ã™ã€‚
+ </notification>
+ <notification name="ExperienceEvent">
+ [EventType] by the secondlife:///app/experience/[public_id]/profile experience ã«ã‚ˆã‚Šã€ã‚ªãƒ–ジェクトã§ã‚¢ã‚¯ã‚·ãƒ§ãƒ³ ([EventType]) を実行ã™ã‚‹ã“ã¨ãŒè¨±å¯ã•ã‚Œã¾ã—ãŸã€‚
+所有者:secondlife:///app/agent/[OwnerID]/inspect
+オブジェクトå:[ObjectName]
+区画å:[ParcelName]
+ </notification>
+ <notification name="ExperienceEventAttachment">
+ [EventType] by the secondlife:///app/experience/[public_id]/profile experience ã«ã‚ˆã‚Šã€æ·»ä»˜ãƒ•ã‚¡ã‚¤ãƒ«ã§ã‚¢ã‚¯ã‚·ãƒ§ãƒ³ ([EventType]) を実行ã™ã‚‹ã“ã¨ãŒè¨±å¯ã•ã‚Œã¾ã—ãŸã€‚
+所有者:secondlife:///app/agent/[OwnerID]/inspect
+ </notification>
+ <notification name="ScriptQuestionExperience">
+ [NAME] ãŒæ‰€æœ‰ã™ã‚‹ã€Œ&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;〠ã¨ã„ã†ã‚ªãƒ–ジェクトãŒã€[GRID_WIDE] 体験ã¸ã®å‚加をè¦æ±‚ã—ã¦ã„ã¾ã™ï¼š
+
+[EXPERIENCE]
+
+権é™ãŒè¨±å¯ã•ã‚Œã‚‹ã¨ã€ä½“験プロフィールã‹ã‚‰å‘¼ã³å‡ºã•ãªã„é™ã‚Šã€ã“ã®ä½“験ã«ã“ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ãŒå†ã³è¡¨ç¤ºã•ã‚Œã‚‹ã“ã¨ã¯ã‚ã‚Šã¾ã›ã‚“。
+
+ã“ã®ä½“験ã«é–¢é€£ä»˜ã‘られãŸã‚¹ã‚¯ãƒªãƒ—トã«ã‚ˆã‚Šã€ã“ã®ä½“験ãŒæœ‰åŠ¹ãªãƒªãƒ¼ã‚¸ãƒ§ãƒ³ã§ä»¥ä¸‹ã®ã“ã¨ã‚’実行ã§ãã¾ã™:
+
+[QUESTIONS]よã‚ã—ã„ã§ã™ã‹ï¼Ÿ
+ <form name="form">
+ <button name="BlockExperience" text="体験をブロック"/>
+ <button name="Mute" text="オブジェクトをブロックã™ã‚‹"/>
+ <button name="Yes" text="ã¯ã„"/>
+ <button name="No" text="ã„ã„ãˆ"/>
+ </form>
+ </notification>
<notification name="ScriptQuestionCaution">
警告:オブジェクト &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos; ã¯ã€ã‚ãªãŸã®ãƒªãƒ³ãƒ‡ãƒ³ãƒ‰ãƒ«ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã¸ã®ãƒ•ãƒ«ã‚¢ã‚¯ã‚»ã‚¹ã‚’è¦æ±‚ã—ã¦ã„ã¾ã™ã€‚アクセスを許å¯ã™ã‚‹ã¨ã€ã“ã®ã‚ªãƒ–ジェクトã¯ã€ç‰¹ã«è­¦å‘Šã‚’発ã›ãšã«å˜ç™ºã§ã€éšæ™‚アカウントã‹ã‚‰è³‡é‡‘を削除ã™ã‚‹ã‹ã€ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã‚’完全ã«ç©ºã«ã—ã¾ã™ã€‚
@@ -3204,6 +3401,10 @@ M キーを押ã—ã¦å¤‰æ›´ã—ã¾ã™ã€‚
( 作æˆå¾Œ[EXISTENCE]秒経éŽï¼‰
&apos;[BODYREGION]&apos;ã®[RESOLUTION]ã®ãƒ™ãƒ¼ã‚¯ãƒ‰ãƒ†ã‚¯ã‚¹ãƒãƒ£ã¯[TIME]秒後ã«ãƒ­ãƒ¼ã‚«ãƒ«ã«æ›´æ–°ã•ã‚Œã¾ã—ãŸã€‚
</notification>
+ <notification name="CannotUploadTexture">
+ テクスãƒãƒ£ã‚’アップロードã§ãã¾ã›ã‚“。
+[REASON]
+ </notification>
<notification name="LivePreviewUnavailable">
コピーä¸å¯ãŠã‚ˆã³/ã¾ãŸã¯è»¢é€ä¸å¯ã®ãŸã‚ã€ã“ã®ãƒ†ã‚¯ã‚¹ãƒãƒ£ã‚’表示ã§ãã¾ã›ã‚“。
<usetemplate ignoretext="コピーä¸å¯ãŠã‚ˆã³/ã¾ãŸã¯è»¢é€ä¸å¯ãƒ†ã‚¯ã‚¹ãƒãƒ£ã§ãƒ©ã‚¤ãƒ–プレビューモードを使用ã§ããªã„ã“ã¨ã‚’警告ã™ã‚‹" name="okignore" yestext="OK"/>
@@ -3773,9 +3974,11 @@ M キーを押ã—ã¦å¤‰æ›´ã—ã¾ã™ã€‚
</notification>
<notification name="TeleportedByAttachment">
[ITEM_ID] ã¸ã®ã‚¢ã‚¿ãƒƒãƒãƒ¡ãƒ³ãƒˆã«ã‚ˆã£ã¦ã€ã‚ãªãŸã¯ãƒ†ãƒ¬ãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã™ã€‚
+ <usetemplate ignoretext="テレãƒãƒ¼ãƒˆï¼šã‚¢ã‚¿ãƒƒãƒãƒ¡ãƒ³ãƒˆã«ã‚ˆã‚Šãƒ†ãƒ¬ãƒãƒ¼ãƒˆã•ã‚Œã¾ã—ãŸ" name="notifyignore"/>
</notification>
<notification name="TeleportedByObjectOnParcel">
区画 &apos;[PARCEL_NAME]&apos; ã®ã‚ªãƒ–ジェクト &apos;[OBJECT_NAME]&apos; ã«ã‚ˆã£ã¦ã€ã‚ãªãŸã¯ãƒ†ãƒ¬ãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã™ã€‚
+ <usetemplate ignoretext="テレãƒãƒ¼ãƒˆï¼šåŒºç”»ä¸Šã®ã‚ªãƒ–ジェクトã«ã‚ˆã‚Šãƒ†ãƒ¬ãƒãƒ¼ãƒˆã•ã‚Œã¾ã—ãŸ" name="notifyignore"/>
</notification>
<notification name="TeleportedByObjectOwnedBy">
[OWNER_ID] ãŒæ‰€æœ‰ã—ã¦ã„るオブジェクト &apos;[OBJECT_NAME]&apos; ã«ã‚ˆã£ã¦ã€ã‚ãªãŸã¯ãƒ†ãƒ¬ãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã™ã€‚
@@ -4107,7 +4310,7 @@ M キーを押ã—ã¦å¤‰æ›´ã—ã¾ã™ã€‚
<usetemplate ignoretext="ファイルを移動ã§ãã¾ã›ã‚“。以å‰ã®ãƒ‘スãŒãƒªã‚¹ãƒˆã‚¢ã•ã‚Œã¾ã—ãŸã€‚" name="okignore" yestext="OK"/>
</notification>
<notification name="DefaultObjectPermissions">
- 次ã®ç†ç”±ã«ã‚ˆã‚Šã€ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆæ¨©é™ã‚’ä¿å­˜ã™ã‚‹ã¨ãã«å•é¡ŒãŒã‚ã‚Šã¾ã—ãŸ: [REASON]。後ã§ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆæ¨©é™ã‚’設定ã—ã¦ãã ã•ã„。
+ デフォルトã®ã‚ªãƒ–ジェクト権é™ã‚’ä¿å­˜ã™ã‚‹ã¨ãã«å•é¡ŒãŒç™ºç”Ÿã—ã¾ã—ãŸ: [REASON]。後ã§ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã®æ¨©é™ã‚’設定ã—ã¦ãã ã•ã„。
<usetemplate name="okbutton" yestext="OK"/>
</notification>
<notification name="ChatHistoryIsBusyAlert">
diff --git a/indra/newview/skins/default/xui/ja/panel_experience_info.xml b/indra/newview/skins/default/xui/ja/panel_experience_info.xml
new file mode 100644
index 0000000000..b3a17fcb56
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_experience_info.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_experience_info">
+ <text name="title" value="体験プロフィール"/>
+ <scroll_container name="xp_scroll">
+ <panel name="scrolling_panel">
+ <layout_stack>
+ <layout_panel>
+ <text name="experience_title" value="Kyle&apos;s Superhero RPG"/>
+ </layout_panel>
+ <layout_panel name="location panel">
+ <text name="Location">
+ 場所:
+ </text>
+ <text name="LocationTextText">
+ ã©ã“ã‹
+ </text>
+ <button label="テレãƒãƒ¼ãƒˆ" name="teleport_btn"/>
+ <button label="地図" name="map_btn"/>
+ </layout_panel>
+ <layout_panel name="marketplace panel">
+ <text name="Location">
+ マーケットプレイスストア:
+ </text>
+ <text name="LocationTextText">
+ ã©ã“ã‹
+ </text>
+ </layout_panel>
+ <layout_panel>
+ <text name="ContentRating">
+ 評価:
+ </text>
+ <text name="ContentRatingText">
+ Adult
+ </text>
+ <text name="Owner">
+ 所有者:
+ </text>
+ <text name="OwnerText">
+ Kyle
+ </text>
+ <button label="編集" name="edit_btn"/>
+ </layout_panel>
+ </layout_stack>
+ </panel>
+ </scroll_container>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_experience_list_editor.xml b/indra/newview/skins/default/xui/ja/panel_experience_list_editor.xml
new file mode 100644
index 0000000000..84e60aea56
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_experience_list_editor.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="experince_list_editor">
+ <panel.string name="loading">
+ ローディング...
+ </panel.string>
+ <panel.string name="panel_allowed">
+ 許å¯ã•ã‚ŒãŸä½“験:
+ </panel.string>
+ <panel.string name="panel_blocked">
+ ブロックã•ã‚ŒãŸä½“験:
+ </panel.string>
+ <panel.string name="panel_trusted">
+ キー体験:
+ </panel.string>
+ <panel.string name="no_results">
+ (空)
+ </panel.string>
+ <text name="text_name">
+ 体験リスト
+ </text>
+ <scroll_list name="experience_list">
+ <columns label="åå‰" name="experience_name"/>
+ </scroll_list>
+ <button label="追加..." name="btn_add"/>
+ <button label="削除" name="btn_remove"/>
+ <button label="プロフィール..." name="btn_profile"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_experience_list_item.xml b/indra/newview/skins/default/xui/ja/panel_experience_list_item.xml
new file mode 100644
index 0000000000..d72d2bebf6
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_experience_list_item.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Experiences">
+ <text name="experience_name">
+ ダミーå
+ </text>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_experience_log.xml b/indra/newview/skins/default/xui/ja/panel_experience_log.xml
new file mode 100644
index 0000000000..39e0e27b05
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_experience_log.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="EVENTS">
+ <string name="no_events" value="イベントãªã—。"/>
+ <string name="loading" value="ローディング..."/>
+ <layout_stack>
+ <layout_panel>
+ <scroll_list name="experience_log_list">
+ <columns label="時間" name="time"/>
+ <columns label="イベント" name="event"/>
+ <columns label="体験" name="experience_name"/>
+ <columns label="オブジェクト" name="object_name"/>
+ </scroll_list>
+ <button label="知らã›ã‚‹" name="btn_notify"/>
+ <button label="プロフィール" name="btn_profile_xp"/>
+ <button label="報告" name="btn_report_xp"/>
+ </layout_panel>
+ <layout_panel name="button_panel">
+ <check_box label="ã™ã¹ã¦ã®ã‚¤ãƒ™ãƒ³ãƒˆã‚’通知 日数" name="notify_all"/>
+ <button label="クリア" name="btn_clear"/>
+ <button label="&lt;" name="btn_prev"/>
+ <button label="&gt;" name="btn_next"/>
+ </layout_panel>
+ </layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_experience_search.xml b/indra/newview/skins/default/xui/ja/panel_experience_search.xml
new file mode 100644
index 0000000000..9ab84e7d18
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_experience_search.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="SEARCH">
+ <string name="not_found">
+ 「[TEXT]ã€ã¯è¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸ
+ </string>
+ <string name="no_results">
+ 検索çµæžœï¼šã‚¼ãƒ­
+ </string>
+ <string name="searching">
+ 検索中...
+ </string>
+ <string name="loading">
+ ロード中...
+ </string>
+ <string name="maturity_icon_general">
+ &quot;Parcel_PG_Light&quot;
+ </string>
+ <string name="maturity_icon_moderate">
+ &quot;Parcel_M_Light&quot;
+ </string>
+ <string name="maturity_icon_adult">
+ &quot;Parcel_R_Light&quot;
+ </string>
+ <panel name="search_panel">
+ <button label="進む" name="find"/>
+ <icons_combo_box label="Moderate" name="maturity">
+ <icons_combo_box.item label="Adult" name="Adult" value="42"/>
+ <icons_combo_box.item label="Moderate" name="Mature" value="21"/>
+ <icons_combo_box.item label="全般" name="PG" value="13"/>
+ </icons_combo_box>
+ <scroll_list name="search_results">
+ <columns label="åå‰" name="experience_name"/>
+ <columns label="所有者" name="owner"/>
+ </scroll_list>
+ <button label="OK" label_selected="OK" name="ok_btn"/>
+ <button label="å–り消ã—" name="cancel_btn"/>
+ <button label="プロフィールを表示" name="profile_btn"/>
+ <button label="&lt;" name="left_btn"/>
+ <button label="&gt;" name="right_btn"/>
+ </panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_experiences.xml b/indra/newview/skins/default/xui/ja/panel_experiences.xml
new file mode 100644
index 0000000000..ab0d2a97a4
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_experiences.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Experiences">
+ <string name="loading_experiences" value="体験をロード中..."/>
+ <string name="no_experiences" value="体験ãŒã‚ã‚Šã¾ã›ã‚“。"/>
+ <string name="acquire" value="体験をå–å¾—"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_facebook_friends.xml b/indra/newview/skins/default/xui/ja/panel_facebook_friends.xml
index 18ae4f9295..17c628a190 100644
--- a/indra/newview/skins/default/xui/ja/panel_facebook_friends.xml
+++ b/indra/newview/skins/default/xui/ja/panel_facebook_friends.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<panel name="panel_facebook_friends">
<string name="facebook_friends_empty" value="Second Life ã®ä½äººã«ã‚‚ãªã£ã¦ã„ã‚‹ Facebook ã®å‹ã ã¡ãŒã„ã¾ã›ã‚“。今ã™ã Facebook ã®å‹ã ã¡ã« Second Life ã«å‚加ã—ã¦ã‚‚らã„ã¾ã—ょã†ï¼"/>
- <string name="facebook_friends_no_connected" value="ç¾åœ¨ Facebook ã«æŽ¥ç¶šã•ã‚Œã¦ã„ã¾ã›ã‚“。「アカウントã€ã‚¿ãƒ–ã«é€²ã‚“ã§ã€ã“ã®æ©Ÿèƒ½ã‚’有効ã«ã—ã¦ãã ã•ã„。"/>
+ <string name="facebook_friends_no_connected" value="ç¾åœ¨ Facebook ã«æŽ¥ç¶šã•ã‚Œã¦ã„ã¾ã›ã‚“。「ステータスã€ã‚¿ãƒ–ã«é€²ã‚“ã§ã€ã“ã®æ©Ÿèƒ½ã‚’有効ã«ã—ã¦ãã ã•ã„。"/>
<accordion name="friends_accordion">
<accordion_tab name="tab_second_life_friends" title="SL ã®å‹ã ã¡"/>
<accordion_tab name="tab_suggested_friends" title="ã“れらã®äººã‚’ SL ã®å‹ã ã¡ã¨ã—ã¦è¿½åŠ "/>
diff --git a/indra/newview/skins/default/xui/ja/panel_facebook_photo.xml b/indra/newview/skins/default/xui/ja/panel_facebook_photo.xml
index f6d920bd5e..c48f13456b 100644
--- a/indra/newview/skins/default/xui/ja/panel_facebook_photo.xml
+++ b/indra/newview/skins/default/xui/ja/panel_facebook_photo.xml
@@ -1,26 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<panel name="panel_facebook_photo">
- <layout_stack name="stack_photo">
- <layout_panel name="snapshot_panel">
- <combo_box name="resolution_combobox" tool_tip="ç”»åƒè§£åƒåº¦">
- <combo_box.item label="ç¾åœ¨ã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦" name="CurrentWindow"/>
- <combo_box.item label="640x480" name="640x480"/>
- <combo_box.item label="800x600" name="800x600"/>
- <combo_box.item label="1024x768" name="1024x768"/>
- <combo_box.item label="1200x630" name="1200x630"/>
- </combo_box>
- <combo_box name="filters_combobox" tool_tip="ç”»åƒãƒ•ã‚£ãƒ«ã‚¿ãƒ¼">
- <combo_box.item label="フィルターãªã—" name="NoFilter"/>
- </combo_box>
- <button label="æ›´æ–°" name="new_snapshot_btn" tool_tip="クリックã—ã¦æ›´æ–°"/>
- <button label="プレビュー" name="big_preview_btn" tool_tip="クリックã—ã¦ãƒ—レビューを切り替ãˆã‚‹"/>
- <text name="caption_label">
- コメント (オプション):
- </text>
- </layout_panel>
- <layout_panel name="photo_button_panel">
- <button label="投稿" name="post_photo_btn"/>
- <button label="å–り消ã—" name="cancel_photo_btn"/>
- </layout_panel>
- </layout_stack>
+ <combo_box name="resolution_combobox" tool_tip="ç”»åƒè§£åƒåº¦">
+ <combo_box.item label="ç¾åœ¨ã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦" name="CurrentWindow"/>
+ <combo_box.item label="640x480" name="640x480"/>
+ <combo_box.item label="800x600" name="800x600"/>
+ <combo_box.item label="1024x768" name="1024x768"/>
+ <combo_box.item label="1200x630" name="1200x630"/>
+ </combo_box>
+ <combo_box name="filters_combobox" tool_tip="ç”»åƒãƒ•ã‚£ãƒ«ã‚¿ãƒ¼">
+ <combo_box.item label="フィルターãªã—" name="NoFilter"/>
+ </combo_box>
+ <button label="æ›´æ–°" name="new_snapshot_btn" tool_tip="クリックã—ã¦æ›´æ–°"/>
+ <button label="プレビュー" name="big_preview_btn" tool_tip="クリックã—ã¦ãƒ—レビューを切り替ãˆã‚‹"/>
+ <text name="caption_label">
+ コメント (オプション):
+ </text>
+ <button label="投稿" name="post_photo_btn"/>
+ <button label="å–り消ã—" name="cancel_photo_btn"/>
</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_facebook_place.xml b/indra/newview/skins/default/xui/ja/panel_facebook_place.xml
index e29f69101f..61138f90c1 100644
--- a/indra/newview/skins/default/xui/ja/panel_facebook_place.xml
+++ b/indra/newview/skins/default/xui/ja/panel_facebook_place.xml
@@ -1,17 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<panel name="panel_facebook_place">
- <layout_stack name="stack_place">
- <layout_panel name="place_detail_panel">
- <text name="place_caption_label">
- 自分ãŒã„る場所ã«ã¤ã„ã¦ä½•ã‹è¨€ã£ã¦ãã ã•ã„:
- </text>
- </layout_panel>
- <layout_panel name="place_map_panel">
- <check_box initial_value="false" label="" name="add_place_view_cb"/>
- </layout_panel>
- <layout_panel name="place_button_panel">
- <button label="投稿" name="post_place_btn"/>
- <button label="å–り消ã—" name="cancel_place_btn"/>
- </layout_panel>
- </layout_stack>
+ <text name="place_caption_label">
+ 自分ãŒã„る場所ã«ã¤ã„ã¦ä½•ã‹è¨€ã£ã¦ãã ã•ã„:
+ </text>
+ <check_box initial_value="false" label="場所ã®ä¿¯çž°å›³ã‚’å«ã‚ã‚‹" name="add_place_view_cb"/>
+ <button label="投稿" name="post_place_btn"/>
+ <button label="å–り消ã—" name="cancel_place_btn"/>
</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_facebook_status.xml b/indra/newview/skins/default/xui/ja/panel_facebook_status.xml
index 84e5ae0474..9d962c9d62 100644
--- a/indra/newview/skins/default/xui/ja/panel_facebook_status.xml
+++ b/indra/newview/skins/default/xui/ja/panel_facebook_status.xml
@@ -1,14 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<panel name="panel_facebook_status">
- <layout_stack name="stack_status">
- <layout_panel name="status_detail_panel">
- <text name="status_caption_label">
- 今ã€ä½•ã‚’考ãˆã¦ã„ã‚‹?
- </text>
- </layout_panel>
- <layout_panel name="status_button_panel">
- <button label="投稿" name="post_status_btn"/>
- <button label="å–り消ã—" name="cancel_status_btn"/>
- </layout_panel>
- </layout_stack>
+ <string name="facebook_connected" value="次ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ã¨ã—㦠Facebook ã«æŽ¥ç¶šï¼š"/>
+ <string name="facebook_disconnected" value="Facebook ã«æŽ¥ç¶šã—ã¦ã„ã¾ã›ã‚“"/>
+ <text name="account_caption_label">
+ Facebook ã«æŽ¥ç¶šã—ã¦ã„ã¾ã›ã‚“。
+ </text>
+ <panel name="panel_buttons">
+ <button label="接続..." name="connect_btn"/>
+ <button label="切断" name="disconnect_btn"/>
+ <text name="account_learn_more_label">
+ [http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-Share-Facebook/ta-p/2149711 Facebook ã¸ã®æŠ•ç¨¿ã«ã¤ã„ã¦]]
+ </text>
+ </panel>
+ <text name="status_caption_label">
+ 今ã€ä½•ã‚’考ãˆã¦ã„ã‚‹?
+ </text>
+ <button label="投稿" name="post_status_btn"/>
+ <button label="å–り消ã—" name="cancel_status_btn"/>
</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_flickr_photo.xml b/indra/newview/skins/default/xui/ja/panel_flickr_photo.xml
index 0deadad91d..16d873a8b1 100644
--- a/indra/newview/skins/default/xui/ja/panel_flickr_photo.xml
+++ b/indra/newview/skins/default/xui/ja/panel_flickr_photo.xml
@@ -1,41 +1,35 @@
<?xml version="1.0" encoding="utf-8"?>
<panel name="panel_flickr_photo">
- <layout_stack name="stack_photo">
- <layout_panel name="snapshot_panel">
- <combo_box name="resolution_combobox" tool_tip="ç”»åƒè§£åƒåº¦">
- <combo_box.item label="ç¾åœ¨ã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦" name="CurrentWindow"/>
- <combo_box.item label="640x480" name="640x480"/>
- <combo_box.item label="800x600" name="800x600"/>
- <combo_box.item label="1024x768" name="1024x768"/>
- </combo_box>
- <combo_box name="filters_combobox" tool_tip="ç”»åƒãƒ•ã‚£ãƒ«ã‚¿ãƒ¼">
- <combo_box.item label="フィルターãªã—" name="NoFilter"/>
- </combo_box>
- <button label="æ›´æ–°" name="new_snapshot_btn" tool_tip="クリックã—ã¦æ›´æ–°"/>
- <button label="プレビュー" name="big_preview_btn" tool_tip="クリックã—ã¦ãƒ—レビューを切り替ãˆã‚‹"/>
- <text name="title_label">
- タイトル:
- </text>
- <text name="description_label">
- 説明:
- </text>
- <check_box initial_value="true" label="SL ã®å ´æ‰€ã‚’説明ã®æœ€å¾Œã«å«ã‚ã‚‹" name="add_location_cb"/>
- <text name="tags_label">
- ã‚¿ã‚°:
- </text>
- <text name="tags_help_label">
- タグをスペースã§åŒºåˆ‡ã‚‹
+ <combo_box name="resolution_combobox" tool_tip="ç”»åƒè§£åƒåº¦">
+ <combo_box.item label="ç¾åœ¨ã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦" name="CurrentWindow"/>
+ <combo_box.item label="640x480" name="640x480"/>
+ <combo_box.item label="800x600" name="800x600"/>
+ <combo_box.item label="1024x768" name="1024x768"/>
+ </combo_box>
+ <combo_box name="filters_combobox" tool_tip="ç”»åƒãƒ•ã‚£ãƒ«ã‚¿ãƒ¼">
+ <combo_box.item label="フィルターãªã—" name="NoFilter"/>
+ </combo_box>
+ <button label="æ›´æ–°" name="new_snapshot_btn" tool_tip="クリックã—ã¦æ›´æ–°"/>
+ <button label="プレビュー" name="big_preview_btn" tool_tip="クリックã—ã¦ãƒ—レビューを切り替ãˆã‚‹"/>
+ <text name="title_label">
+ タイトル:
+ </text>
+ <text name="description_label">
+ 説明:
+ </text>
+ <check_box initial_value="true" label="SL ã®å ´æ‰€ã‚’説明ã®æœ€å¾Œã«å«ã‚ã‚‹" name="add_location_cb"/>
+ <text name="tags_label">
+ タグ:
+ </text>
+ <text name="tags_help_label">
+ タグをスペースã§åŒºåˆ‡ã‚‹
複数å˜èªžã®ã‚¿ã‚°ã« &quot;&quot; を使用
- </text>
- <combo_box name="rating_combobox" tool_tip="Flickr コンテンツã®ãƒ¬ãƒ¼ãƒ†ã‚£ãƒ³ã‚°åŒºåˆ†">
- <combo_box.item label="Flickr レーティング区分「Safeã€" name="SafeRating"/>
- <combo_box.item label="Flickr レーティング区分「Moderateã€" name="ModerateRating"/>
- <combo_box.item label="Flickr レーティング区分「Restrictedã€" name="RestrictedRating"/>
- </combo_box>
- </layout_panel>
- <layout_panel name="photo_button_panel">
- <button label="アップロード" name="post_photo_btn"/>
- <button label="å–り消ã—" name="cancel_photo_btn"/>
- </layout_panel>
- </layout_stack>
+ </text>
+ <combo_box name="rating_combobox" tool_tip="Flickr コンテンツã®ãƒ¬ãƒ¼ãƒ†ã‚£ãƒ³ã‚°åŒºåˆ†">
+ <combo_box.item label="Flickr レーティング区分「Safeã€" name="SafeRating"/>
+ <combo_box.item label="Flickr レーティング区分「Moderateã€" name="ModerateRating"/>
+ <combo_box.item label="Flickr レーティング区分「Restrictedã€" name="RestrictedRating"/>
+ </combo_box>
+ <button label="アップロード" name="post_photo_btn"/>
+ <button label="å–り消ã—" name="cancel_photo_btn"/>
</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/ja/panel_group_info_sidetray.xml
index ebcb36d950..bd1013d6ca 100755
--- a/indra/newview/skins/default/xui/ja/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/default/xui/ja/panel_group_info_sidetray.xml
@@ -23,6 +23,7 @@
<accordion_tab name="group_roles_tab" title="役割 &amp; メンãƒãƒ¼"/>
<accordion_tab name="group_notices_tab" title="通知"/>
<accordion_tab name="group_land_tab" title="土地・資産"/>
+ <accordion_tab name="group_experiences_tab" title="体験"/>
</accordion>
</layout_panel>
</layout_stack>
diff --git a/indra/newview/skins/default/xui/ja/panel_login.xml b/indra/newview/skins/default/xui/ja/panel_login.xml
index c5d5330eb4..5f2007e0da 100755
--- a/indra/newview/skins/default/xui/ja/panel_login.xml
+++ b/indra/newview/skins/default/xui/ja/panel_login.xml
@@ -1,26 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<panel name="panel_login">
- <panel.string name="forgot_password_url">
- http://secondlife.com/account/request.php?lang=ja
- </panel.string>
+ <panel.string name="forgot_password_url">http://secondlife.com/account/request.php?lang=ja</panel.string>
<layout_stack name="ui_stack">
<layout_panel name="ui_container">
<combo_box label="ユーザーå" name="username_combo" tool_tip="登録時ã«è‡ªåˆ†ã§é¸ã‚“ã ãƒ¦ãƒ¼ã‚¶ãƒ¼å(例:bobsmith12ã€Steller Sunshineãªã©ï¼‰"/>
<line_editor label="パスワード" name="password_edit"/>
- <check_box label="記憶ã™ã‚‹" name="remember_check"/>
- <text name="forgot_password_text">
- パスワードを忘れãŸå ´åˆ
- </text>
- <button label="ログイン" name="connect_btn"/>
- <text name="At_My_Last_Location_Label">
- å‰å›žã®å ´æ‰€
- </text>
<combo_box label="ãŠæ°—ã«å…¥ã‚Šã®å ´æ‰€" name="start_location_combo">
+ <combo_box.item label="最後ã«ãƒ­ã‚°ã‚¢ã‚¦ãƒˆã—ãŸå ´æ‰€" name="MyLastLocation"/>
<combo_box.item label="ホーム" name="MyHome"/>
</combo_box>
- <button label="ログイン" name="connect_favorite_btn"/>
- <line_editor label="場所を入力" name="location_edit"/>
- <button label="ログイン" name="connect_location_btn"/>
+ <button label="ログイン" name="connect_btn"/>
+ <check_box label="記憶ã™ã‚‹" name="remember_check"/>
+ <text name="forgot_password_text">パスワードを忘れãŸå ´åˆ</text>
<combo_box label="グリッドをé¸æŠž" name="server_combo"/>
</layout_panel>
</layout_stack>
diff --git a/indra/newview/skins/default/xui/ja/panel_marketplace_listings.xml b/indra/newview/skins/default/xui/ja/panel_marketplace_listings.xml
new file mode 100644
index 0000000000..a9218bebff
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_marketplace_listings.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="マーケットプレイス" name="Marketplace Panel">
+ <panel name="tool_panel">
+ <menu_button name="sort_btn" tool_tip="表示/並ã¹æ›¿ãˆã‚ªãƒ—ション"/>
+ <button name="add_btn" tool_tip="æ–°è¦ãƒªã‚¹ãƒˆãƒ•ã‚©ãƒ«ãƒ€ã®ä½œæˆ"/>
+ <button label="エラーを確èª" name="audit_btn" tool_tip="マーケットプレイスã®ãƒªã‚¹ãƒˆã‚’確èª"/>
+ </panel>
+ <panel name="tab_container_panel">
+ <filter_editor label="マーケットプレイスã®ãƒªã‚¹ãƒˆã‚’フィルタ" name="filter_editor"/>
+ </panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_marketplace_listings_inventory.xml b/indra/newview/skins/default/xui/ja/panel_marketplace_listings_inventory.xml
new file mode 100644
index 0000000000..43cb64d6ba
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_marketplace_listings_inventory.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<inventory_panel label="ã™ã¹ã¦" name="All Items" tool_tip="ã“ã“ã«ã‚¢ã‚¤ãƒ†ãƒ ã‚’ドラッグ&ドロップã—ã¦ãƒªã‚¹ãƒˆã«è¡¨ç¤ºã—ã¾ã™"/>
diff --git a/indra/newview/skins/default/xui/ja/panel_marketplace_listings_listed.xml b/indra/newview/skins/default/xui/ja/panel_marketplace_listings_listed.xml
new file mode 100644
index 0000000000..7f27231cbd
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_marketplace_listings_listed.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<inventory_panel label="リストã«æŽ²è¼‰" name="Active Items"/>
diff --git a/indra/newview/skins/default/xui/ja/panel_marketplace_listings_unassociated.xml b/indra/newview/skins/default/xui/ja/panel_marketplace_listings_unassociated.xml
new file mode 100644
index 0000000000..215be9ae6d
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_marketplace_listings_unassociated.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<inventory_panel label="関連付ã‘ã•ã‚Œã¦ã„ãªã„" name="Unassociated Items"/>
diff --git a/indra/newview/skins/default/xui/ja/panel_marketplace_listings_unlisted.xml b/indra/newview/skins/default/xui/ja/panel_marketplace_listings_unlisted.xml
new file mode 100644
index 0000000000..04530477f6
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_marketplace_listings_unlisted.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<inventory_panel label="リストã‹ã‚‰å‰Šé™¤æ¸ˆã¿" name="Inactive Items"/>
diff --git a/indra/newview/skins/default/xui/ja/panel_postcard_settings.xml b/indra/newview/skins/default/xui/ja/panel_postcard_settings.xml
index 314aaef7fd..f34fdc6b67 100755
--- a/indra/newview/skins/default/xui/ja/panel_postcard_settings.xml
+++ b/indra/newview/skins/default/xui/ja/panel_postcard_settings.xml
@@ -7,17 +7,7 @@
<combo_box.item label="1024x768" name="1024x768"/>
<combo_box.item label="カスタム" name="Custom"/>
</combo_box>
- <layout_stack name="postcard_image_params_ls">
- <layout_panel name="postcard_image_size_lp">
- <spinner label="å¹…" name="postcard_snapshot_width"/>
- <spinner label="高ã•" name="postcard_snapshot_height"/>
- <check_box label="縦横比ã®å›ºå®š" name="postcard_keep_aspect_check"/>
- </layout_panel>
- <layout_panel name="postcard_image_format_quality_lp">
- <slider label="画質" name="image_quality_slider"/>
- <text name="image_quality_level">
- ([QLVL])
- </text>
- </layout_panel>
- </layout_stack>
+ <spinner label="横幅 x 高ã•" name="postcard_snapshot_width"/>
+ <check_box label="縦横比ã®å›ºå®š" name="postcard_keep_aspect_check"/>
+ <slider label="å“質:" name="image_quality_slider"/>
</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_setup.xml b/indra/newview/skins/default/xui/ja/panel_preferences_setup.xml
index 2c0359cb15..c1ddf08465 100755
--- a/indra/newview/skins/default/xui/ja/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_setup.xml
@@ -14,9 +14,10 @@
<text name="Web:">
Web:
</text>
- <radio_group name="use_external_browser">
- <radio_item label="指定ã®ãƒ–ラウザ(IE ã‚„ Firefox)を使用" name="external" tool_tip="デフォルトã®ã‚·ã‚¹ãƒ†ãƒ  Web ブラウザã§ãƒ˜ãƒ«ãƒ—ã‚„ Web リンク先ãªã©ã‚’見ã¾ã™ã€‚全画é¢ã§èµ·å‹•ä¸­ã«ã¯ãŠã™ã™ã‚ã—ã¾ã›ã‚“。" value="true"/>
- <radio_item label="内蔵ブラウザを使用" name="internal" tool_tip="内蔵ブラウザã§ãƒ˜ãƒ«ãƒ—ã‚„ Web リンクãªã©ã‚’見ã¾ã™ã€‚[APP_NAME] 内ã«æ–°ã—ã„ウィンドウã§ã“ã®ãƒ–ラウザãŒé–‹ãã¾ã™ã€‚" value=""/>
+ <radio_group name="preferred_browser_behavior">
+ <radio_item label="ã™ã¹ã¦ã®ãƒªãƒ³ã‚¯ã«ãƒžã‚¤ ブラウザ (Chromeã€Firefoxã€IE) を使用" name="internal" tool_tip="デフォルトã®ã‚·ã‚¹ãƒ†ãƒ  Web ブラウザã§ãƒ˜ãƒ«ãƒ—ã‚„ Web リンク先ãªã©ã‚’見ã¾ã™ã€‚全画é¢ã§èµ·å‹•ä¸­ã«ã¯ãŠã™ã™ã‚ã—ã¾ã›ã‚“。" value="0"/>
+ <radio_item label="Second Life リンクã«ã®ã¿å†…蔵ブラウザを使用" name="external" tool_tip="ヘルプã€Web リンクãªã©ã«ã¯ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã‚·ã‚¹ãƒ†ãƒ ã®ãƒ–ラウザを使用ã—ã¾ã™ã€‚
+内蔵ブラウザ㯠LindenLab/SecondLife リンクã«ã®ã¿ä½¿ç”¨ã•ã‚Œã¾ã™ã€‚" value="1"/>
</radio_group>
<check_box initial_value="true" label="プラグインを有効ã«ã™ã‚‹" name="browser_plugins_enabled"/>
<check_box initial_value="true" label="Cookie ã‚’å—ã‘入れる" name="cookies_enabled"/>
diff --git a/indra/newview/skins/default/xui/ja/panel_region_experiences.xml b/indra/newview/skins/default/xui/ja/panel_region_experiences.xml
new file mode 100644
index 0000000000..f13c7bea4d
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_region_experiences.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="体験" name="Experiences">
+ <panel.string name="trusted_estate_text">
+ ã©ã‚“ãªä½“験ã§ã‚‚キーã«ãªã‚‹å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚
+
+キー体験ã«ã¯ã€ã“ã®ä¸å‹•ç”£ã§å‹•ä½œã™ã‚‹æ¨©é™ãŒã‚ã‚Šã¾ã™ã€‚
+
+ã•ã‚‰ã«ã€ä¸å‹•ç”£ã§ãƒ‘ブリックアクセスãŒè¨±å¯ã•ã‚Œãªã„å ´åˆã€ã‚­ãƒ¼ä½“験ã«å‚加ã™ã‚‹ä½äººã¯ä¸å‹•ç”£ã«å…¥ã£ã¦ã€ã‚­ãƒ¼ä½“験ã«ã„る間滞在ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚
+ </panel.string>
+ <panel.string name="allowed_estate_text">
+ ランドスコープã¨ãªã‚‹ä½“験ã®ã¿è¨±å¯ã•ã‚Œã¾ã™ã€‚
+
+許å¯ã•ã‚Œã‚‹ä½“験ã«ã¯ã€ã“ã®ä¸å‹•ç”£ã§å®Ÿè¡Œã™ã‚‹æ¨©é™ãŒã‚ã‚Šã¾ã™ã€‚
+ </panel.string>
+ <panel.string name="blocked_estate_text">
+ グリッドスコープ体験ã®ã¿ãƒ–ロックã§ãã¾ã™ã€‚
+
+ブロックã•ã‚ŒãŸä½“験ã¯ã€ã“ã®ä¸å‹•ç”£ã§ã¯å®Ÿè¡Œã§ãã¾ã›ã‚“。
+ </panel.string>
+ <panel.string name="estate_caption">
+ ã“ã®ã‚¿ãƒ–ã®è¨­å®šã¸ã®å¤‰æ›´ã¯ã€ä¸å‹•ç”£å†…ã®ã™ã¹ã¦ã®åœ°åŸŸã«å½±éŸ¿ã•ã‚Œã¾ã™ã€‚
+ </panel.string>
+ <panel.string name="allowed_parcel_text">
+ ランドスコープã¨ãªã‚‹ä½“験ã®ã¿è¨±å¯ã•ã‚Œã¾ã™ã€‚
+
+許å¯ã•ã‚ŒãŸä½“験ã«ã¯ã€ã“ã®ä¸å‹•ç”£ã§ãƒ–ロックã•ã‚Œã¦ã„ãªã„å ´åˆã€ã“ã®åŒºç”»ã§å®Ÿè¡Œã™ã‚‹æ¨©é™ãŒã‚ã‚Šã¾ã™ã€‚
+ </panel.string>
+ <panel.string name="blocked_parcel_text">
+ ä½äººã®ä½“験をブロックã§ãã¾ã™ã€‚
+
+ブロックã•ã‚ŒãŸä½“験ã¯ã€ã“ã®åŒºç”»ã§ã¯å®Ÿè¡Œã§ãã¾ã›ã‚“。
+ </panel.string>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_script_experience.xml b/indra/newview/skins/default/xui/ja/panel_script_experience.xml
new file mode 100644
index 0000000000..1c5ea2958b
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_script_experience.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<panel name="script_experience" title="体験">
+ <button label="体験" name="Expand Experience"/>
+ <check_box label="次ã®ä½“験を使用:" name="enable_xp"/>
+ <layout_stack name="xp_details">
+ <layout_panel>
+ <combo_box label="体験をé¸æŠž..." name="Experiences..."/>
+ </layout_panel>
+ </layout_stack>
+ <text name="No Experiences">
+ 体験ã®è²¢çŒ®è€…ã§ã¯ã‚ã‚Šã¾ã›ã‚“。
+ </text>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/ja/panel_snapshot_inventory.xml
index e496e6602b..a42dd12a9c 100755
--- a/indra/newview/skins/default/xui/ja/panel_snapshot_inventory.xml
+++ b/indra/newview/skins/default/xui/ja/panel_snapshot_inventory.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="panel_snapshot_inventory">
<text name="title">
- インベントリã«ä¿å­˜
+ インベントリ
</text>
<text name="hint_lbl">
ç”»åƒã‚’インベントリã«ä¿å­˜ã™ã‚‹ã«ã¯ L$[UPLOAD_COST] ã®è²»ç”¨ãŒã‹ã‹ã‚Šã¾ã™ã€‚ç”»åƒã‚’テクスãƒãƒ£ã¨ã—ã¦ä¿å­˜ã™ã‚‹ã«ã¯å¹³æ–¹å½¢å¼ã® 1 ã¤ã‚’é¸æŠžã—ã¦ãã ã•ã„。
@@ -13,8 +13,8 @@
<combo_box.item label="大(512x512)" name="Large(512x512)"/>
<combo_box.item label="カスタム" name="Custom"/>
</combo_box>
- <spinner label="å¹…" name="inventory_snapshot_width"/>
- <spinner label="高ã•" name="inventory_snapshot_height"/>
+ <spinner label="横幅 x 高ã•" name="inventory_snapshot_width"/>
+ <spinner label="" name="inventory_snapshot_height"/>
<check_box label="縦横比ã®å›ºå®š" name="inventory_keep_aspect_check"/>
<button label="å–り消ã—" name="cancel_btn"/>
<button label="ä¿å­˜" name="save_btn"/>
diff --git a/indra/newview/skins/default/xui/ja/panel_snapshot_local.xml b/indra/newview/skins/default/xui/ja/panel_snapshot_local.xml
index cb658fb6c9..d23056a3d5 100755
--- a/indra/newview/skins/default/xui/ja/panel_snapshot_local.xml
+++ b/indra/newview/skins/default/xui/ja/panel_snapshot_local.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="panel_snapshot_local">
<text name="title">
- コンピューターã«ä¿å­˜
+ ディスク
</text>
<combo_box label="解åƒåº¦" name="local_size_combo">
<combo_box.item label="ç¾åœ¨ã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦" name="CurrentWindow"/>
@@ -13,24 +13,17 @@
<combo_box.item label="1600x1200" name="1600x1200"/>
<combo_box.item label="カスタム" name="Custom"/>
</combo_box>
- <layout_stack name="local_image_params_ls">
- <layout_panel name="local_image_size_lp">
- <spinner label="å¹…" name="local_snapshot_width"/>
- <spinner label="高ã•" name="local_snapshot_height"/>
- <check_box label="縦横比ã®å›ºå®š" name="local_keep_aspect_check"/>
- </layout_panel>
- <layout_panel name="local_image_format_quality_lp">
- <combo_box label="書å¼" name="local_format_combo">
- <combo_box.item label="PNG(å¯é€†åœ§ç¸®ï¼‰" name="PNG"/>
- <combo_box.item label="JPEG" name="JPEG"/>
- <combo_box.item label="BMP(å¯é€†åœ§ç¸®ï¼‰" name="BMP"/>
- </combo_box>
- <slider label="画質" name="image_quality_slider"/>
- <text name="image_quality_level">
- ([QLVL])
- </text>
- </layout_panel>
- </layout_stack>
+ <spinner label="横幅 x 高ã•" name="local_snapshot_width"/>
+ <check_box label="縦横比ã®å›ºå®š" name="local_keep_aspect_check"/>
+ <text name="local_format_label">
+ フォーマット:
+ </text>
+ <combo_box label="書å¼" name="local_format_combo">
+ <combo_box.item label="PNG(å¯é€†åœ§ç¸®ï¼‰" name="PNG"/>
+ <combo_box.item label="JPEG" name="JPEG"/>
+ <combo_box.item label="BMP(å¯é€†åœ§ç¸®ï¼‰" name="BMP"/>
+ </combo_box>
+ <slider label="å“質:" name="image_quality_slider"/>
<button label="å–り消ã—" name="cancel_btn"/>
<flyout_button label="ä¿å­˜" name="save_btn" tool_tip="ç”»åƒã‚’ファイルã«ä¿å­˜">
<flyout_button.item label="ä¿å­˜" name="save_item"/>
diff --git a/indra/newview/skins/default/xui/ja/panel_snapshot_options.xml b/indra/newview/skins/default/xui/ja/panel_snapshot_options.xml
index 6ce492476b..492115bec0 100755
--- a/indra/newview/skins/default/xui/ja/panel_snapshot_options.xml
+++ b/indra/newview/skins/default/xui/ja/panel_snapshot_options.xml
@@ -1,16 +1,10 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="panel_snapshot_options">
- <button label="プロフィールフィードã«æŠ•ç¨¿ã™ã‚‹" name="save_to_profile_btn"/>
- <button label="メール" name="save_to_email_btn"/>
- <button label="インベントリã«ä¿å­˜ï¼ˆL$[Amount])" name="save_to_inventory_btn"/>
- <button label="コンピューターã«ä¿å­˜" name="save_to_computer_btn"/>
- <text name="send_to_facebook_textbox">
- 宛先: [secondlife:/// Facebook]
- </text>
- <text name="send_to_twitter_textbox">
- [secondlife:/// Twitter]
- </text>
- <text name="send_to_flickr_textbox">
- [secondlife:/// Flickr]
- </text>
+ <button label="ディスクã«ä¿å­˜" name="save_to_computer_btn"/>
+ <button label="æŒã¡ç‰©ã«ä¿å­˜ï¼ˆL$[Amount])" name="save_to_inventory_btn"/>
+ <button label="プロフィールã«ã‚¢ãƒƒãƒ—ロード" name="save_to_profile_btn"/>
+ <button label="Facebook ã«ã‚¢ãƒƒãƒ—ロード" name="send_to_facebook_btn"/>
+ <button label="Twitter ã«ã‚¢ãƒƒãƒ—ロード" name="send_to_twitter_btn"/>
+ <button label="Flickr ã«ã‚¢ãƒƒãƒ—ロード" name="send_to_flickr_btn"/>
+ <button label="メールã«ã‚ˆã‚Šé€ä¿¡" name="save_to_email_btn"/>
</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/ja/panel_snapshot_postcard.xml
index 1ddd723840..569c07ad47 100755
--- a/indra/newview/skins/default/xui/ja/panel_snapshot_postcard.xml
+++ b/indra/newview/skins/default/xui/ja/panel_snapshot_postcard.xml
@@ -10,8 +10,12 @@
é€ä¿¡ä¸­...
</string>
<text name="title">
- メール
+ E メール
</text>
- <button label="メッセージ" name="message_btn"/>
- <button label="設定" name="settings_btn"/>
+ <tab_container name="postcard_tabs">
+ <panel label="メッセージ" name="panel_postcard_message"/>
+ <panel label="設定" name="panel_postcard_settings"/>
+ </tab_container>
+ <button label="å–り消ã—" name="cancel_btn"/>
+ <button label="é€ä¿¡" name="send_btn"/>
</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_snapshot_profile.xml b/indra/newview/skins/default/xui/ja/panel_snapshot_profile.xml
index b860a6afe9..80d400c846 100755
--- a/indra/newview/skins/default/xui/ja/panel_snapshot_profile.xml
+++ b/indra/newview/skins/default/xui/ja/panel_snapshot_profile.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="panel_snapshot_profile">
<text name="title">
- プロフィールフィードã«æŠ•ç¨¿ã™ã‚‹
+ プロフィール
</text>
<combo_box label="解åƒåº¦" name="profile_size_combo">
<combo_box.item label="ç¾åœ¨ã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦" name="CurrentWindow"/>
@@ -10,19 +10,12 @@
<combo_box.item label="1024x768" name="1024x768"/>
<combo_box.item label="カスタム" name="Custom"/>
</combo_box>
- <layout_stack name="profile_image_params_ls">
- <layout_panel name="profile_image_size_lp">
- <spinner label="å¹…" name="profile_snapshot_width"/>
- <spinner label="高ã•" name="profile_snapshot_height"/>
- <check_box label="縦横比ã®å›ºå®š" name="profile_keep_aspect_check"/>
- </layout_panel>
- <layout_panel name="profile_image_metadata_lp">
- <text name="caption_label">
- キャプション:
- </text>
- <check_box initial_value="true" label="場所をå«ã‚€" name="add_location_cb"/>
- </layout_panel>
- </layout_stack>
+ <spinner label="横幅 x 高ã•" name="profile_snapshot_width"/>
+ <check_box label="縦横比ã®å›ºå®š" name="profile_keep_aspect_check"/>
+ <text name="caption_label">
+ キャプション:
+ </text>
+ <check_box initial_value="true" label="場所をå«ã‚€" name="add_location_cb"/>
<button label="å–り消ã—" name="cancel_btn"/>
<button label="投稿" name="post_btn"/>
</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_status_bar.xml b/indra/newview/skins/default/xui/ja/panel_status_bar.xml
index f09643d562..2e1446d450 100755
--- a/indra/newview/skins/default/xui/ja/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/ja/panel_status_bar.xml
@@ -1,28 +1,16 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="status">
- <panel.string name="packet_loss_tooltip">
- パケットæ失
- </panel.string>
- <panel.string name="bandwidth_tooltip">
- 帯域幅
- </panel.string>
- <panel.string name="time">
- [hour12, datetime, slt]:[min, datetime, slt] [ampm, datetime, slt] [timezone,datetime, slt]
- </panel.string>
- <panel.string name="timeTooltip">
- [year, datetime, slt] [month, datetime, slt] [day, datetime, slt] ([weekday, datetime, slt])
- </panel.string>
- <panel.string name="buycurrencylabel">
- L$ [AMT]
- </panel.string>
+ <panel.string name="packet_loss_tooltip">パケットæ失</panel.string>
+ <panel.string name="bandwidth_tooltip">帯域幅</panel.string>
+ <panel.string name="time">[hour12, datetime, slt]:[min, datetime, slt] [ampm, datetime, slt] [timezone,datetime, slt]</panel.string>
+ <panel.string name="timeTooltip">[year, datetime, slt] [month, datetime, slt] [day, datetime, slt] ([weekday, datetime, slt])</panel.string>
+ <panel.string name="buycurrencylabel">L$ [AMT]</panel.string>
<panel left="-370" name="balance_bg" width="160">
- <text name="balance" tool_tip="クリックã—㦠L$ 残高を更新" value="L$20"/>
+ <text name="balance" tool_tip="クリックã—㦠L$ 残高を更新" value="L$??"/>
<button label="L$ ã®è³¼å…¥" name="buyL" tool_tip="クリックã—㦠L$ を購入ã—ã¾ã™"/>
- <button label="店" name="goShop" tool_tip="Second Life マーケットプレイスを開ã" width="40"/>
+ <button label="店" name="goShop" tool_tip="Second Life マーケットプレイスを開ã" width="40"/>
</panel>
- <text name="TimeText" tool_tip="ç¾åœ¨æ™‚刻(太平洋)">
- 24:00 AM PST
- </text>
+ <text name="TimeText" tool_tip="ç¾åœ¨æ™‚刻(太平洋)">24:00 AM PST</text>
<button name="media_toggle_btn" tool_tip="ã™ã¹ã¦ã®ãƒ¡ãƒ‡ã‚£ã‚¢ã‚’開始・åœæ­¢ï¼ˆéŸ³æ¥½ã€ãƒ“デオã€Web ページ)"/>
<button name="volume_btn" tool_tip="グローãƒãƒ«éŸ³é‡è¨­å®š"/>
</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_twitter_photo.xml b/indra/newview/skins/default/xui/ja/panel_twitter_photo.xml
index 8e67d8fd19..cdb45e1853 100644
--- a/indra/newview/skins/default/xui/ja/panel_twitter_photo.xml
+++ b/indra/newview/skins/default/xui/ja/panel_twitter_photo.xml
@@ -1,32 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<panel name="panel_twitter_photo">
- <layout_stack name="stack_photo">
- <layout_panel name="text_panel">
- <text name="status_label">
- 何ãŒèµ·ãã¦ã„ã‚‹ã®ã§ã—ょã†ã‹?
- </text>
- <text name="status_counter_label">
- 140
- </text>
- <check_box initial_value="true" label="SL ã®å ´æ‰€ã‚’å«ã‚€" name="add_location_cb"/>
- <check_box initial_value="true" label="写真を掲載ã™ã‚‹" name="add_photo_cb"/>
- </layout_panel>
- <layout_panel name="snapshot_panel">
- <combo_box name="resolution_combobox" tool_tip="ç”»åƒè§£åƒåº¦">
- <combo_box.item label="ç¾åœ¨ã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦" name="CurrentWindow"/>
- <combo_box.item label="640x480" name="640x480"/>
- <combo_box.item label="800x600" name="800x600"/>
- <combo_box.item label="1024x768" name="1024x768"/>
- </combo_box>
- <combo_box name="filters_combobox" tool_tip="ç”»åƒãƒ•ã‚£ãƒ«ã‚¿ãƒ¼">
- <combo_box.item label="フィルターãªã—" name="NoFilter"/>
- </combo_box>
- <button label="æ›´æ–°" name="new_snapshot_btn" tool_tip="クリックã—ã¦æ›´æ–°"/>
- <button label="プレビュー" name="big_preview_btn" tool_tip="クリックã—ã¦ãƒ—レビューを切り替ãˆã‚‹"/>
- </layout_panel>
- <layout_panel name="photo_button_panel">
- <button label="ツイート" name="post_photo_btn"/>
- <button label="å–り消ã—" name="cancel_photo_btn"/>
- </layout_panel>
- </layout_stack>
+ <text name="status_label">
+ 何ãŒèµ·ãã¦ã„ã‚‹ã®ã§ã—ょã†ã‹?
+ </text>
+ <text name="status_counter_label">
+ 140
+ </text>
+ <check_box initial_value="true" label="SL ã®å ´æ‰€ã‚’å«ã‚€" name="add_location_cb"/>
+ <check_box initial_value="true" label="写真をå«ã‚ã‚‹" name="add_photo_cb"/>
+ <combo_box name="resolution_combobox" tool_tip="ç”»åƒè§£åƒåº¦">
+ <combo_box.item label="ç¾åœ¨ã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦" name="CurrentWindow"/>
+ <combo_box.item label="640x480" name="640x480"/>
+ <combo_box.item label="800x600" name="800x600"/>
+ <combo_box.item label="1024x768" name="1024x768"/>
+ </combo_box>
+ <combo_box name="filters_combobox" tool_tip="ç”»åƒãƒ•ã‚£ãƒ«ã‚¿ãƒ¼">
+ <combo_box.item label="フィルターãªã—" name="NoFilter"/>
+ </combo_box>
+ <button label="æ›´æ–°" name="new_snapshot_btn" tool_tip="クリックã—ã¦æ›´æ–°"/>
+ <button label="プレビュー" name="big_preview_btn" tool_tip="クリックã—ã¦ãƒ—レビューを切り替ãˆã‚‹"/>
+ <button label="ツイート" name="post_photo_btn"/>
+ <button label="å–り消ã—" name="cancel_photo_btn"/>
</panel>
diff --git a/indra/newview/skins/default/xui/ja/role_actions.xml b/indra/newview/skins/default/xui/ja/role_actions.xml
index e64460470c..eb2c12accc 100755
--- a/indra/newview/skins/default/xui/ja/role_actions.xml
+++ b/indra/newview/skins/default/xui/ja/role_actions.xml
@@ -71,4 +71,8 @@
<action description="グループボイスãƒãƒ£ãƒƒãƒˆã«å‚加ã™ã‚‹" longdescription=" ã“ã®èƒ½åŠ›ã‚’æŒã¤å½¹å‰²ã®ãƒ¡ãƒ³ãƒãƒ¼ã¯ã€ã‚°ãƒ«ãƒ¼ãƒ—ボイスãƒãƒ£ãƒƒãƒˆã‚»ãƒƒã‚·ãƒ§ãƒ³ã«å‚加ã§ãã¾ã™ã€‚ 注: ボイスãƒãƒ£ãƒƒãƒˆã‚»ãƒƒã‚·ãƒ§ãƒ³ã«ã‚¢ã‚¯ã‚»ã‚¹ã™ã‚‹ã«ã¯ã€ã‚°ãƒ«ãƒ¼ãƒ—ãƒãƒ£ãƒƒãƒˆã«å‚加ã™ã‚‹èƒ½åŠ›ãŒå¿…è¦ã§ã™ã€‚ " name="join voice chat" value="27"/>
<action description="グループãƒãƒ£ãƒƒãƒˆã‚’管ç†ã™ã‚‹" longdescription=" ã“ã®èƒ½åŠ›ã‚’æŒã¤å½¹å‰²ã®ãƒ¡ãƒ³ãƒãƒ¼ã¯ã€ã‚°ãƒ«ãƒ¼ãƒ—ボイスãƒãƒ£ãƒƒãƒˆã‚»ãƒƒã‚·ãƒ§ãƒ³ãŠã‚ˆã³ã‚°ãƒ«ãƒ¼ãƒ—テキストãƒãƒ£ãƒƒãƒˆã‚»ãƒƒã‚·ãƒ§ãƒ³ã¸ã®ã‚¢ã‚¯ã‚»ã‚¹ã‚„å‚加をコントロールã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ " name="moderate group chat" value="37"/>
</action_set>
+ <action_set description="ã“れらã®æ©Ÿèƒ½ã«ã¯ã€ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ã«ã‚ˆã‚Šæ‰€æœ‰ã•ã‚Œã‚‹ä½“験を変更ã™ã‚‹æ©Ÿèƒ½ãŒå«ã¾ã‚Œã¾ã™ã€‚" name="experience_tools_experience">
+ <action description="体験管ç†è€…" longdescription="ã“ã®æ©Ÿèƒ½ã‚’æŒã¤å½¹å‰²ã®ãƒ¡ãƒ³ãƒãƒ¼ã¯ã€ä½“験ã®ãƒ¡ã‚¿ãƒ‡ãƒ¼ã‚¿ã‚’編集ã§ãã¾ã™ã€‚" name="experience admin" value="49"/>
+ <action description="体験貢献者" longdescription="ã“ã®æ©Ÿèƒ½ã‚’æŒã¤å½¹å‰²ã®ãƒ¡ãƒ³ãƒãƒ¼ã¯ã€ä½“験ã®ã‚¹ã‚¯ãƒªãƒ—トをæä¾›ã§ãã¾ã™ã€‚" name="experience contributor" value="50"/>
+ </action_set>
</role_actions>
diff --git a/indra/newview/skins/default/xui/ja/sidepanel_item_info.xml b/indra/newview/skins/default/xui/ja/sidepanel_item_info.xml
index e70d91d258..d888470846 100755
--- a/indra/newview/skins/default/xui/ja/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/ja/sidepanel_item_info.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="item properties" title="アイテムã®ãƒ—ロフィール">
+ <panel.string name="loading_experience">
+ (ローディング)
+ </panel.string>
<panel.string name="unknown">
(ä¸æ˜Žï¼‰
</panel.string>
@@ -43,6 +46,9 @@
<text name="LabelAcquiredTitle">
å–得:
</text>
+ <text name="LabelItemExperienceTitle">
+ 体験:
+ </text>
<panel name="perms_inv">
<text name="perm_modify">
ã‚ãªãŸãŒã§ãã‚‹ã“ã¨ï¼š
@@ -66,8 +72,9 @@
<check_box label="å†è²©ãƒ»ãƒ—レゼント" name="CheckNextOwnerTransfer" tool_tip="次ã®æ‰€æœ‰è€…ã¯ã“ã®ã‚ªãƒ–ジェクトを他人ã«ã‚ã’ãŸã‚Šå†è²©ã§ãã¾ã™"/>
</panel>
<check_box label="販売中" name="CheckPurchase"/>
- <combo_box name="combobox sale copy">
+ <combo_box name="ComboBoxSaleType">
<combo_box.item label="コピー" name="Copy"/>
+ <combo_box.item label="コンテンツ" name="Contents"/>
<combo_box.item label="オリジナル" name="Original"/>
</combo_box>
<spinner label="価格: L$" name="Edit Cost"/>
diff --git a/indra/newview/skins/default/xui/ja/sidepanel_task_info.xml b/indra/newview/skins/default/xui/ja/sidepanel_task_info.xml
index 4f65c8477b..858307800b 100755
--- a/indra/newview/skins/default/xui/ja/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/ja/sidepanel_task_info.xml
@@ -1,71 +1,31 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="object properties" title="オブジェクトã®ãƒ—ロフィール">
- <panel.string name="text deed continued">
- 譲渡
- </panel.string>
- <panel.string name="text deed">
- 譲渡
- </panel.string>
- <panel.string name="text modify info 1">
- ã“ã®ã‚ªãƒ–ジェクトを修正ã§ãã¾ã™
- </panel.string>
- <panel.string name="text modify info 2">
- ã“れらã®ã‚ªãƒ–ジェクトを修正ã§ãã¾ã™
- </panel.string>
- <panel.string name="text modify info 3">
- ã“ã®ã‚ªãƒ–ジェクトを修正ã§ãã¾ã›ã‚“
- </panel.string>
- <panel.string name="text modify info 4">
- ã“れらã®ã‚ªãƒ–ジェクトを修正ã§ãã¾ã›ã‚“
- </panel.string>
- <panel.string name="text modify info 5">
- 地域(リージョン)ã®å¢ƒç•Œã‚’越ãˆã¦ã“ã®ã‚ªãƒ–ジェクトを修正ã§ãã¾ã›ã‚“
- </panel.string>
- <panel.string name="text modify info 6">
- 地域(リージョン)ã®å¢ƒç•Œã‚’越ãˆã¦ã“れらã®ã‚ªãƒ–ジェクトを修正ã§ãã¾ã›ã‚“
- </panel.string>
- <panel.string name="text modify warning">
- ã“ã®ã‚ªãƒ–ジェクトã«ã¯ã€ãƒ‘ーツãŒãƒªãƒ³ã‚¯ã•ã‚Œã¦ã„ã¾ã™
- </panel.string>
- <panel.string name="Cost Default">
- 価格: L$
- </panel.string>
- <panel.string name="Cost Total">
- åˆè¨ˆï¼š L$
- </panel.string>
- <panel.string name="Cost Per Unit">
- Price Per: L$
- </panel.string>
- <panel.string name="Cost Mixed">
- Mixed Price
- </panel.string>
- <panel.string name="Sale Mixed">
- Mixed Sale
- </panel.string>
+ <panel.string name="text deed continued">譲渡</panel.string>
+ <panel.string name="text deed">譲渡</panel.string>
+ <panel.string name="text modify info 1">ã“ã®ã‚ªãƒ–ジェクトを修正ã§ãã¾ã™</panel.string>
+ <panel.string name="text modify info 2">ã“れらã®ã‚ªãƒ–ジェクトを修正ã§ãã¾ã™</panel.string>
+ <panel.string name="text modify info 3">ã“ã®ã‚ªãƒ–ジェクトを修正ã§ãã¾ã›ã‚“</panel.string>
+ <panel.string name="text modify info 4">ã“れらã®ã‚ªãƒ–ジェクトを修正ã§ãã¾ã›ã‚“</panel.string>
+ <panel.string name="text modify info 5">地域(リージョン)ã®å¢ƒç•Œã‚’越ãˆã¦ã“ã®ã‚ªãƒ–ジェクトを修正ã§ãã¾ã›ã‚“</panel.string>
+ <panel.string name="text modify info 6">地域(リージョン)ã®å¢ƒç•Œã‚’越ãˆã¦ã“れらã®ã‚ªãƒ–ジェクトを修正ã§ãã¾ã›ã‚“</panel.string>
+ <panel.string name="text modify warning">ã“ã®ã‚ªãƒ–ジェクトã«ã¯ã€ãƒ‘ーツãŒãƒªãƒ³ã‚¯ã•ã‚Œã¦ã„ã¾ã™</panel.string>
+ <panel.string name="Cost Default">価格: L$</panel.string>
+ <panel.string name="Cost Total">åˆè¨ˆä¾¡æ ¼: L$</panel.string>
+ <panel.string name="Cost Per Unit">Price Per: L$</panel.string>
+ <panel.string name="Cost Mixed">Mixed Price</panel.string>
+ <panel.string name="Sale Mixed">Mixed Sale</panel.string>
<text name="title" value="オブジェクトã®ãƒ—ロフィール"/>
<text name="where" value="(インワールド)"/>
<panel label="" name="properties_panel">
- <text name="Name:">
- åå‰ï¼š
- </text>
- <text name="Description:">
- 説明:
- </text>
- <text name="CreatorNameLabel">
- 制作者:
- </text>
- <text name="Owner:">
- 所有者:
- </text>
- <text name="Group_label">
- グループ:
- </text>
+ <text name="Name:">åå‰ï¼š</text>
+ <text name="Description:">説明:</text>
+ <text name="CreatorNameLabel">制作者:</text>
+ <text name="Owner:">所有者:</text>
+ <text name="Group_label">グループ:</text>
<button name="button set group" tool_tip="ã“ã®ã‚ªãƒ–ジェクト権é™ã‚’共有ã™ã‚‹ã‚°ãƒ«ãƒ¼ãƒ—ã‚’é¸æŠžã—ã¾ã™"/>
<name_box initial_value="ローディング..." name="Group Name Proxy"/>
<button label="譲渡" label_selected="譲渡" name="button deed" tool_tip="ã“ã®ã‚¢ã‚¤ãƒ†ãƒ ã‚’譲渡ã™ã‚‹ã¨ã€Œæ¬¡ã®æ‰€æœ‰è€…ã€ã®æ¨©é™ãŒé©ç”¨ã•ã‚Œã¾ã™ã€‚ グループ共有オブジェクトã¯ã€ã‚°ãƒ«ãƒ¼ãƒ—ã®ã‚ªãƒ•ã‚£ã‚µãƒ¼ãŒè­²æ¸¡ã§ãã¾ã™ã€‚"/>
- <text name="label click action">
- クリックã§ï¼š
- </text>
+ <text name="label click action">クリックã§ï¼š</text>
<combo_box name="clickaction">
<combo_box.item label="触る(デフォルト)" name="Touch/grab(default)"/>
<combo_box.item label="オブジェクトã«åº§ã‚‹" name="Sitonobject"/>
@@ -75,21 +35,13 @@
<combo_box.item label="ズーム" name="Zoom"/>
</combo_box>
<panel name="perms_inv">
- <text name="perm_modify">
- ã“ã®ã‚ªãƒ–ジェクトを修正ã§ãã¾ã™
- </text>
- <text name="Anyone can:">
- 全員:
- </text>
+ <text name="perm_modify">ã“ã®ã‚ªãƒ–ジェクトを修正ã§ãã¾ã™</text>
+ <text name="Anyone can:">全員:</text>
<check_box label="コピー" name="checkbox allow everyone copy"/>
<check_box label="移動" name="checkbox allow everyone move"/>
- <text name="GroupLabel">
- グループ:
- </text>
+ <text name="GroupLabel">グループ:</text>
<check_box label="共有" name="checkbox share with group" tool_tip="設定ã—ãŸã‚°ãƒ«ãƒ¼ãƒ—ã®ãƒ¡ãƒ³ãƒãƒ¼å…¨å“¡ã«ã“ã®ã‚ªãƒ–ジェクトã®ä¿®æ­£æ¨©é™ã‚’与ãˆã¾ã™ã€‚ 譲渡ã—ãªã„é™ã‚Šã€å½¹å‰²åˆ¶é™ã‚’有効ã«ã¯ã§ãã¾ã›ã‚“。"/>
- <text name="NextOwnerLabel">
- 次ã®æ‰€æœ‰è€…:
- </text>
+ <text name="NextOwnerLabel">次ã®æ‰€æœ‰è€…:</text>
<check_box label="修正" name="checkbox next owner can modify"/>
<check_box label="コピー" name="checkbox next owner can copy"/>
<check_box label="å†è²©ãƒ»ãƒ—レゼント" name="checkbox next owner can transfer" tool_tip="次ã®æ‰€æœ‰è€…ã¯ã“ã®ã‚ªãƒ–ジェクトを他人ã«ã‚ã’ãŸã‚Šå†è²©ã§ãã¾ã™"/>
@@ -102,27 +54,13 @@
</combo_box>
<spinner label="価格: L$" name="Edit Cost"/>
<check_box label="検索ã«è¡¨ç¤º" name="search_check" tool_tip="ã“ã®ã‚ªãƒ–ジェクトを検索çµæžœã«è¡¨ç¤ºã—ã¾ã™"/>
- <text name="pathfinding_attributes_label">
- パスファインディング属性:
- </text>
- <text name="B:">
- B.
- </text>
- <text name="O:">
- O:
- </text>
- <text name="G:">
- G:
- </text>
- <text name="E:">
- E:
- </text>
- <text name="N:">
- N:
- </text>
- <text name="F:">
- F:
- </text>
+ <text name="pathfinding_attributes_label">パスファインディング属性:</text>
+ <text name="B:">B.</text>
+ <text name="O:">O:</text>
+ <text name="G:">G:</text>
+ <text name="E:">E:</text>
+ <text name="N:">N:</text>
+ <text name="F:">F:</text>
</panel>
<panel name="button_panel">
<button label="é–‹ã" name="open_btn"/>
diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml
index d046e11571..22eb9ce888 100755
--- a/indra/newview/skins/default/xui/ja/strings.xml
+++ b/indra/newview/skins/default/xui/ja/strings.xml
@@ -448,30 +448,51 @@ support@secondlife.com ã«ãŠå•ã„åˆã‚ã›ãã ã•ã„。
<string name="TooltipMustSingleDrop">
アイテム㯠1 ã¤ã ã‘ã“ã“ã«ãƒ‰ãƒ©ãƒƒã‚°ã§ãã¾ã™
</string>
+ <string name="TooltipTooManyWearables">
+ [AMOUNT] 以上ã®ã‚¢ã‚¤ãƒ†ãƒ ã‚’å«ã‚€ãƒ•ã‚©ãƒ«ãƒ€ã‚’装ç€ã§ãã¾ã›ã‚“。「詳細設定〠&gt; 「デãƒãƒƒã‚°è¨­å®šã‚’表示〠&gt; 「WearFolderLimitã€ã§ã“ã®åˆ¶é™ã‚’変更ã§ãã¾ã™ã€‚
+ </string>
<string name="TooltipPrice" value="L$[AMOUNT]:"/>
<string name="TooltipOutboxDragToWorld">
- マーãƒãƒ£ãƒ³ãƒˆãƒœãƒƒã‚¯ã‚¹å†…ã®ã‚¢ã‚¤ãƒ†ãƒ ã‚’ Rez ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“
+ マーケットプレイスã®ãƒªã‚¹ãƒˆãƒ•ã‚©ãƒ«ãƒ€ã‹ã‚‰ã‚¢ã‚¤ãƒ†ãƒ ã‚’ Rez ã§ãã¾ã›ã‚“
+ </string>
+ <string name="TooltipOutboxWorn">
+ ç€ã¦ã„るアイテムをマーケットプレイスã®ãƒªã‚¹ãƒˆãƒ•ã‚©ãƒ«ãƒ€ã«ç½®ãã“ã¨ã¯ã§ãã¾ã›ã‚“
+ </string>
+ <string name="TooltipOutboxFolderLevels">
+ ãƒã‚¹ãƒˆå…¥ã‚Šãƒ•ã‚©ãƒ«ãƒ€ã®æ·±ã•ãŒ [AMOUNT] 階層を超ãˆã¦ã„ã¾ã™å¿…è¦ã«å¿œã˜ã¦ã‚¢ã‚¤ãƒ†ãƒ ã‚’ç®±ã«å…¥ã‚Œã€ãƒ•ã‚©ãƒ«ãƒ€ã®éšŽå±¤ã‚’減らã—ã¾ã™ã€‚
+ </string>
+ <string name="TooltipOutboxTooManyFolders">
+ サブフォルダ数㌠[AMOUNT] 個を超ãˆã¦ã„ã¾ã™ã€‚å¿…è¦ã«å¿œã˜ã¦ã‚¢ã‚¤ãƒ†ãƒ ã‚’ç®±ã«å…¥ã‚Œã€ãƒªã‚¹ãƒˆã®ãƒ•ã‚©ãƒ«ãƒ€éšŽå±¤ã‚’減らã—ã¾ã™ã€‚
+ </string>
+ <string name="TooltipOutboxTooManyObjects">
+ アイテム数㌠[AMOUNT] 個を超ãˆã¦ã„ã¾ã™ã€‚1 ã¤ã®ãƒªã‚¹ãƒˆå†…㧠[AMOUNT] 個を超ãˆã‚‹ã‚¢ã‚¤ãƒ†ãƒ ã‚’販売ã™ã‚‹ãŸã‚ã«ã¯ã€ã„ãã¤ã‹ã®ã‚¢ã‚¤ãƒ†ãƒ ã‚’ç®±ã«å…¥ã‚Œã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚
+ </string>
+ <string name="TooltipOutboxTooManyStockItems">
+ 在庫アイテム数㌠[AMOUNT] 個を超ãˆã¦ã„ã¾ã™ã€‚
+ </string>
+ <string name="TooltipOutboxCannotDropOnRoot">
+ アイテムã¾ãŸã¯ãƒ•ã‚©ãƒ«ãƒ€ã¯ã€Œã™ã¹ã¦ã€ã‚¿ãƒ–ã«ã‚ˆã£ã¦ã®ã¿ãƒ‰ãƒ­ãƒƒãƒ—ã§ãã¾ã™ã€‚ã“ã®ã‚¿ãƒ–ã‚’é¸æŠžã—ã¦ã‹ã‚‰ã€ã‚‚ã†ä¸€åº¦ã‚¢ã‚¤ãƒ†ãƒ ã¾ãŸã¯ãƒ•ã‚©ãƒ«ãƒ€ã‚’é¸æŠžã—ã¦ãã ã•ã„。
</string>
<string name="TooltipOutboxNoTransfer">
- ã“れらオブジェクト㮠1 ã¤ã¾ãŸã¯è¤‡æ•°ã¯å£²ã‚Šæ¸¡ã—ãŸã‚Šè­²æ¸¡ã—ãŸã‚Šã§ããªã„ã‚‚ã®ã§ã™ã€‚
+ ã“れらã®ã‚ªãƒ–ジェクト㮠1 ã¤ã¾ãŸã¯è¤‡æ•°ã¯å£²ã‚Šæ¸¡ã—ãŸã‚Šè­²æ¸¡ã—ãŸã‚Šã§ããªã„ã‚‚ã®ã§ã™
</string>
<string name="TooltipOutboxNotInInventory">
- マーãƒãƒ£ãƒ³ãƒˆã‚¢ã‚¦ãƒˆãƒœãƒƒã‚¯ã‚¹ã§ã¯ã€ã”自分ã®ã‚¤ãƒ³ãƒ™ãƒ³ãƒˆãƒªã‹ã‚‰ã®ã‚¢ã‚¤ãƒ†ãƒ ã—ã‹å—ã‘入れるã“ã¨ãŒã§ãã¾ã›ã‚“
+ アイテムã¯ã‚¤ãƒ³ãƒ™ãƒ³ãƒˆãƒªã‹ã‚‰ãƒžãƒ¼ã‚±ãƒƒãƒˆãƒ—レイスã¸ã®ç§»å‹•ã®ã¿ã§ãã¾ã™
</string>
- <string name="TooltipOutboxWorn">
- ç€ç”¨ã—ã¦ã„るアイテムをマーãƒãƒ£ãƒ³ãƒˆã‚¢ã‚¦ãƒˆãƒœãƒƒã‚¯ã‚¹ã«å…¥ã‚Œã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“
+ <string name="TooltipOutboxLinked">
+ リンクã•ã‚ŒãŸç›¸æ‰‹ã¾ãŸã¯ãƒ•ã‚©ãƒ«ãƒ€ã‚’マーケットプレイスã«ç½®ãã“ã¨ã¯ã§ãã¾ã›ã‚“
</string>
<string name="TooltipOutboxCallingCard">
- コーリングカードをマーãƒãƒ£ãƒ³ãƒˆã‚¢ã‚¦ãƒˆãƒœãƒƒã‚¯ã‚¹ã«å…¥ã‚Œã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“
+ コーリングカードをマーケットプレイスã«ç½®ãã“ã¨ã¯ã§ãã¾ã›ã‚“
</string>
- <string name="TooltipOutboxFolderLevels">
- ãƒã‚¹ãƒˆå…¥ã‚Šãƒ•ã‚©ãƒ«ãƒ€ã®æ·±ã•ãŒ 3 を超ãˆã¦ã„ã¾ã™
+ <string name="TooltipOutboxDragActive">
+ 表示ã•ã‚Œã¦ã„るリストを移動ã§ãã¾ã›ã‚“
</string>
- <string name="TooltipOutboxTooManyFolders">
- 最上ä½ãƒ•ã‚©ãƒ«ãƒ€å†…ã®ã‚µãƒ–フォルダ数㌠20 を超ãˆã¦ã„ã¾ã™
+ <string name="TooltipOutboxCannotMoveRoot">
+ ルートフォルダをリストã«è¡¨ç¤ºã™ã‚‹ãƒžãƒ¼ã‚±ãƒƒãƒˆãƒ—レイスを移動ã§ãã¾ã›ã‚“
</string>
- <string name="TooltipOutboxTooManyObjects">
- 最上ä½ãƒ•ã‚©ãƒ«ãƒ€å†…ã®ã‚¢ã‚¤ãƒ†ãƒ æ•°ãŒ 200 を超ãˆã¦ã„ã¾ã™
+ <string name="TooltipOutboxMixedStock">
+ 在庫フォルダ内ã®ã‚¢ã‚¤ãƒ†ãƒ ã¯ã™ã¹ã¦åŒã˜ç¨®é¡žã¨æ¨©é™ã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“
</string>
<string name="TooltipDragOntoOwnChild">
フォルダをãã®å­ãƒ•ã‚©ãƒ«ãƒ€ã«ç§»å‹•ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“
@@ -1059,9 +1080,7 @@ support@secondlife.com ã«ãŠå•ã„åˆã‚ã›ãã ã•ã„。
<string name="AgentNameSubst">
(ã‚ãªãŸ)
</string>
- <string name="JoinAnExperience">
- 体験ã«å‚加ã™ã‚‹
- </string>
+ <string name="JoinAnExperience"/><!-- intentionally blank -->
<string name="SilentlyManageEstateAccess">
土地ã®ã‚¢ã‚¯ã‚»ã‚¹ãƒªã‚¹ãƒˆã‚’管ç†ã™ã‚‹ã¨ãã«ã‚¢ãƒ©ãƒ¼ãƒˆã‚’表示ã—ãªã„
</string>
@@ -1128,6 +1147,12 @@ support@secondlife.com ã«ãŠå•ã„åˆã‚ã›ãã ã•ã„。
<string name="bitmap_image_files">
ビットマップ画åƒ
</string>
+ <string name="png_image_files">
+ PNG ç”»åƒ
+ </string>
+ <string name="save_texture_image_files">
+ Targa ã¾ãŸã¯ PNG ç”»åƒ
+ </string>
<string name="avi_movie_file">
AVI ムービーファイル
</string>
@@ -1377,6 +1402,9 @@ support@secondlife.com ã«ãŠå•ã„åˆã‚ã›ãã ã•ã„。
<string name="FavoritesNoMatchingItems">
ã“ã“ã«ãƒ©ãƒ³ãƒ‰ãƒžãƒ¼ã‚¯ã‚’ドラッグã—ã¦ãŠæ°—ã«å…¥ã‚Šã«è¿½åŠ ã—ã¾ã™ã€‚
</string>
+ <string name="MarketplaceNoMatchingItems">
+ アイテムãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸã€‚検索文字列ã®ã‚¹ãƒšãƒ«ã‚’確èªã—ã¦ã€ã‚‚ã†ä¸€åº¦ã‚„ã‚Šç›´ã—ã¦ãã ã•ã„。
+ </string>
<string name="InventoryNoTexture">
インベントリ内ã«ã“ã®ãƒ†ã‚¯ã‚¹ãƒãƒ£ã®ã‚³ãƒ”ーãŒã‚ã‚Šã¾ã›ã‚“
</string>
@@ -1424,29 +1452,95 @@ support@secondlife.com ã«ãŠå•ã„åˆã‚ã›ãã ã•ã„。
<string name="InventoryOutboxError">
[[MARKETPLACE_CREATE_STORE_URL] マーケットプレイス ストア] ãŒã‚¨ãƒ©ãƒ¼ã‚’è¿”ã—ã¦ã„ã¾ã™ã€‚
</string>
+ <string name="InventoryMarketplaceError">
+ ã“ã®æ©Ÿèƒ½ã¯ã€ç¾åœ¨ã€ãƒ™ãƒ¼ã‚¿ç‰ˆã®æ©Ÿèƒ½ã§ã™ã€‚å‚加ã™ã‚‹ã«ã¯ã€ã“ã® [http://goo.gl/forms/FCQ7UXkakz Google form] ã«åå‰ã‚’追加ã—ã¦ãã ã•ã„。
+ </string>
+ <string name="InventoryMarketplaceListingsNoItemsTitle">
+ マーケットプレイスã®ãƒªã‚¹ãƒˆãƒ•ã‚©ãƒ«ãƒ€ãŒç©ºã§ã™ã€‚
+ </string>
+ <string name="InventoryMarketplaceListingsNoItems">
+ [[MARKETPLACE_DASHBOARD_URL] マーケットプレイス]ã«è²©å£²ã™ã‚‹ã‚¢ã‚¤ãƒ†ãƒ ã‚’一覧ã™ã‚‹ã«ã¯ã€ãƒ•ã‚©ãƒ«ãƒ€ã‚’ã“ã®ã‚¨ãƒªã‚¢ã«ãƒ‰ãƒ©ãƒƒã‚°ã—ã¾ã™ã€‚
+ </string>
+ <string name="Marketplace Validation Warning Stock">
+ ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãƒ•ã‚©ãƒ«ãƒ€ã«åœ¨åº«ãƒ•ã‚©ãƒ«ãƒ€ãŒå«ã¾ã‚Œãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“
+ </string>
+ <string name="Marketplace Validation Error Mixed Stock">
+ : エラー:在庫フォルダ内ã®ã™ã¹ã¦ã®ã‚¢ã‚¤ãƒ†ãƒ ã¯ã‚³ãƒ”ーä¸å¯ã§åŒã˜ç¨®é¡žã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“
+ </string>
+ <string name="Marketplace Validation Error Subfolder In Stock">
+ : エラー:在庫フォルダã«ã‚µãƒ–フォルダをå«ã‚ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“
+ </string>
+ <string name="Marketplace Validation Warning Empty">
+ : 警告:フォルダã«ã‚¢ã‚¤ãƒ†ãƒ ãŒå«ã¾ã‚Œã¦ã„ã¾ã›ã‚“
+ </string>
+ <string name="Marketplace Validation Warning Create Stock">
+ : 警告:在庫フォルダを作æˆã—ã¦ã„ã¾ã™
+ </string>
+ <string name="Marketplace Validation Warning Create Version">
+ : 警告:ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãƒ•ã‚©ãƒ«ãƒ€ä½œæˆä¸­
+ </string>
+ <string name="Marketplace Validation Warning Move">
+ : 警告:アイテム移動中
+ </string>
+ <string name="Marketplace Validation Warning Delete">
+ : 警告:フォルダã®ä¸­èº«ãŒåœ¨åº«ãƒ•ã‚©ãƒ«ãƒ€ã«ç§»ã•ã‚Œã¾ã—ãŸã€‚空ã®ãƒ•ã‚©ãƒ«ãƒ€ã‚’削除ã—ã¾ã™
+ </string>
+ <string name="Marketplace Validation Error Stock Item">
+ : エラー:在庫フォルダã«ã‚³ãƒ”ーä¸å¯ã‚¢ã‚¤ãƒ†ãƒ ã‚’å«ã‚ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™
+ </string>
+ <string name="Marketplace Validation Warning Unwrapped Item">
+ : 警告:ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãƒ•ã‚©ãƒ«ãƒ€ã«ã‚¢ã‚¤ãƒ†ãƒ ãŒå«ã¾ã‚Œã¦ã„ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“
+ </string>
+ <string name="Marketplace Validation Error">
+ : エラー:
+ </string>
+ <string name="Marketplace Validation Warning">
+ : 警告:
+ </string>
+ <string name="Marketplace Validation Error Empty Version">
+ : 警告:ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãƒ•ã‚©ãƒ«ãƒ€ã«ã¯ã€æœ€ä½Ž 1 アイテムãŒå«ã¾ã‚Œãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“
+ </string>
+ <string name="Marketplace Validation Error Empty Stock">
+ : 警告:在庫フォルダã«ã¯ã€æœ€ä½Ž 1 アイテムãŒå«ã¾ã‚Œã¦ã„ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“
+ </string>
+ <string name="Marketplace Validation No Error">
+ 報告ã™ã‚‹ã‚¨ãƒ©ãƒ¼ã¾ãŸã¯è­¦å‘Šã¯ã‚ã‚Šã¾ã›ã‚“
+ </string>
<string name="Marketplace Error None">
エラーãªã—
</string>
+ <string name="Marketplace Error Prefix">
+ エラー:
+ </string>
<string name="Marketplace Error Not Merchant">
- エラー:マーケットプレイスã«ã‚¢ã‚¤ãƒ†ãƒ ã‚’é€ã‚‹å‰ã«ã€ã‚ãªãŸè‡ªèº«ã‚’マーãƒãƒ£ãƒ³ãƒˆç™»éŒ²ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ï¼ˆç™»éŒ²ã¯ç„¡æ–™ã§ã™ï¼‰ã€‚
+ マーケットプレイスã«å•†å“ã‚’é€ã‚‹å‰ã«ã€ã‚ãªãŸè‡ªèº«ã‚’マーãƒãƒ£ãƒ³ãƒˆç™»éŒ²ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ï¼ˆç™»éŒ²ã¯ç„¡æ–™ã§ã™ï¼‰ã€‚
</string>
- <string name="Marketplace Error Empty Folder">
- エラー:ã“ã®ãƒ•ã‚©ãƒ«ãƒ€ã¯ç©ºã§ã™ã€‚
+ <string name="Marketplace Error Not Accepted">
+ アイテムをãã®ãƒ•ã‚©ãƒ«ãƒ€ã«ç§»å‹•ã§ãã¾ã›ã‚“。
</string>
- <string name="Marketplace Error Unassociated Products">
- エラー:ã‚ãªãŸã®ãƒžãƒ¼ãƒãƒ£ãƒ³ãƒˆã‚¢ã‚«ã‚¦ãƒ³ãƒˆã«ã¯ã€å•†å“ã«é–¢é€£ä»˜ã‘られã¦ã„ãªã„アイテムãŒå¤šã™ãŽã‚‹ãŸã‚ã€ã“ã®ã‚¢ã‚¤ãƒ†ãƒ ã‚’アップロードã§ãã¾ã›ã‚“ã§ã—ãŸã€‚ã“ã®ã‚¨ãƒ©ãƒ¼ã‚’解消ã™ã‚‹ã«ã¯ã€ãƒžãƒ¼ã‚±ãƒƒãƒˆãƒ—レイス㮠Web サイトã«ãƒ­ã‚°ã‚¤ãƒ³ã—ã€é–¢é€£ä»˜ã‘られã¦ã„ãªã„アイテムã®æ•°ã‚’減らã—ã¦ãã ã•ã„。
+ <string name="Marketplace Error Unsellable Item">
+ ã“ã®ã‚¢ã‚¤ãƒ†ãƒ ã‚’マーケットプレイスã§è²©å£²ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“。
</string>
- <string name="Marketplace Error Object Limit">
- エラー:ã“ã®ã‚¢ã‚¤ãƒ†ãƒ ã«å«ã¾ã‚Œã‚‹ã‚ªãƒ–ジェクトãŒå¤šã™ãŽã¾ã™ã€‚オブジェクトをã„ãã¤ã‹ãƒœãƒƒã‚¯ã‚¹ã«ã¾ã¨ã‚ã€ã‚ªãƒ–ジェクト数を200以下ã«æ¸›ã‚‰ã—ã¦ãã ã•ã„。
+ <string name="MarketplaceNoID">
+ Mkt ID ãªã—
</string>
- <string name="Marketplace Error Folder Depth">
- エラー:ã“ã®ã‚¢ã‚¤ãƒ†ãƒ ã¯ãƒã‚¹ãƒˆå…¥ã‚Šãƒ•ã‚©ãƒ«ãƒ€ã®éšŽå±¤ãŒå¤šã™ãŽã¾ã™ã€‚ãƒã‚¹ãƒˆå…¥ã‚Šãƒ•ã‚©ãƒ«ãƒ€ã‚’ 3 階層以内ã«ã¾ã¨ã‚ç›´ã—ã¦ãã ã•ã„。
+ <string name="MarketplaceLive">
+ リスト掲載済ã¿
</string>
- <string name="Marketplace Error Unsellable Item">
- エラー:ã“ã®ã‚¢ã‚¤ãƒ†ãƒ ã‚’マーケットプレイスã§è²©å£²ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“。
+ <string name="MarketplaceActive">
+ 有効
+ </string>
+ <string name="MarketplaceMax">
+ 最大
+ </string>
+ <string name="MarketplaceStock">
+ 在庫
</string>
- <string name="Marketplace Error Internal Import">
- エラー:ã“ã®ã‚¢ã‚¤ãƒ†ãƒ ã«é–¢ã—ã¦å•é¡ŒãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚ã—ã°ã‚‰ãã—ã¦ã‹ã‚‰ãŠè©¦ã—ãã ã•ã„。
+ <string name="MarketplaceNoStock">
+ 在庫ãªã—
+ </string>
+ <string name="MarketplaceUpdating">
+ アップデート中...
</string>
<string name="Open landmarks">
ランドマークを開ã
@@ -1467,6 +1561,7 @@ support@secondlife.com ã«ãŠå•ã„åˆã‚ã›ãã ã•ã„。
コンテンツãªã—
</string>
<string name="WornOnAttachmentPoint" value=" ([ATTACHMENT_POINT] ã«è£…ç€ä¸­ï¼‰"/>
+ <string name="AttachmentErrorMessage" value="([ATTACHMENT_ERROR])"/>
<string name="ActiveGesture" value="[GESLABEL] (アクティブ)"/>
<string name="PermYes">
ã¯ã„
@@ -1737,6 +1832,15 @@ support@secondlife.com ã«ãŠå•ã„åˆã‚ã›ãã ã•ã„。
<string name="Invalid Attachment">
装ç€å…ˆãŒæ­£ã—ãã‚ã‚Šã¾ã›ã‚“
</string>
+ <string name="ATTACHMENT_MISSING_ITEM">
+ エラー:アイテムãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“
+ </string>
+ <string name="ATTACHMENT_MISSING_BASE_ITEM">
+ エラー:ベースアイテムãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“
+ </string>
+ <string name="ATTACHMENT_NOT_ATTACHED">
+ エラー:オブジェクトã¯ç¾åœ¨ã®ã‚¢ã‚¦ãƒˆãƒ•ã‚£ãƒƒãƒˆå†…ã«ã‚ã‚Šã¾ã™ãŒã€æ·»ä»˜ã•ã‚Œã¦ã„ã¾ã›ã‚“
+ </string>
<string name="YearsMonthsOld">
[AGEYEARS] [AGEMONTHS]
</string>
@@ -1905,6 +2009,9 @@ support@secondlife.com ã«ãŠå•ã„åˆã‚ã›ãã ã•ã„。
<string name="SaveComplete">
ä¿å­˜å®Œäº†ã€‚
</string>
+ <string name="UploadFailed">
+ ファイルã®ã‚¢ãƒƒãƒ—ロードãŒå¤±æ•—ã—ã¾ã—ãŸ:
+ </string>
<string name="ObjectOutOfRange">
スクリプト(オブジェクトãŒç¯„囲外ã«ã‚ã‚Šã¾ã™ï¼‰
</string>
@@ -1914,6 +2021,9 @@ support@secondlife.com ã«ãŠå•ã„åˆã‚ã›ãã ã•ã„。
<string name="GroupsNone">
ãªã—
</string>
+ <string name="CompileNoExperiencePerm">
+ [EXPERIENCE] 体験ã«ã‚ˆã‚‹ [SCRIPT] スクリプトã®ã‚¹ã‚­ãƒƒãƒ—。
+ </string>
<string name="Group" value=" (グループ)"/>
<string name="Unknown">
(ä¸æ˜Žï¼‰
@@ -5065,6 +5175,9 @@ www.secondlife.com ã‹ã‚‰æœ€æ–°ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’ダウンロードã—ã¦ãã ã
<string name="Command_Marketplace_Label">
マーケットプレイス
</string>
+ <string name="Command_MarketplaceListings_Label">
+ マーケットプレイス
+ </string>
<string name="Command_MiniMap_Label">
ミニマップ
</string>
@@ -5152,6 +5265,9 @@ www.secondlife.com ã‹ã‚‰æœ€æ–°ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’ダウンロードã—ã¦ãã ã
<string name="Command_Marketplace_Tooltip">
ショッピングã«å‡ºæŽ›ã‘ã‚‹
</string>
+ <string name="Command_MarketplaceListings_Tooltip">
+ 創作アイテムを販売ã—ã¾ã™
+ </string>
<string name="Command_MiniMap_Tooltip">
è¿‘ãã®äººã‚’表示ã™ã‚‹
</string>
@@ -5275,4 +5391,85 @@ www.secondlife.com ã‹ã‚‰æœ€æ–°ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’ダウンロードã—ã¦ãã ã
<string name="loading_chat_logs">
ロード中...
</string>
+ <string name="experience_tools_experience">
+ 体験
+ </string>
+ <string name="ExperienceNameNull">
+ (体験ãªã—)
+ </string>
+ <string name="ExperienceNameUntitled">
+ (タイトルã®ãªã„体験)
+ </string>
+ <string name="Land-Scope">
+ ランドスコープ
+ </string>
+ <string name="Grid-Scope">
+ グリッドスコープ
+ </string>
+ <string name="Allowed_Experiences_Tab">
+ 許å¯
+ </string>
+ <string name="Blocked_Experiences_Tab">
+ åœæ­¢
+ </string>
+ <string name="Contrib_Experiences_Tab">
+ 貢献者
+ </string>
+ <string name="Admin_Experiences_Tab">
+ 管ç†
+ </string>
+ <string name="Recent_Experiences_Tab">
+ 最新
+ </string>
+ <string name="Owned_Experiences_Tab">
+ 所有
+ </string>
+ <string name="ExperiencesCounter">
+ ([EXPERIENCES], max [MAXEXPERIENCES])
+ </string>
+ <string name="ExperiencePermission1">
+ コントロールを引ã継ã
+ </string>
+ <string name="ExperiencePermission3">
+ ã‚¢ãƒã‚¿ãƒ¼ã§ã‚¢ãƒ‹ãƒ¡ãƒ¼ã‚·ãƒ§ãƒ³ã‚’トリガー
+ </string>
+ <string name="ExperiencePermission4">
+ ã‚¢ãƒã‚¿ãƒ¼ã«è£…ç€
+ </string>
+ <string name="ExperiencePermission9">
+ カメラ追従
+ </string>
+ <string name="ExperiencePermission10">
+ カメラã®ã‚³ãƒ³ãƒˆãƒ­ãƒ¼ãƒ«
+ </string>
+ <string name="ExperiencePermission11">
+ ã‚ãªãŸã‚’テレãƒãƒ¼ãƒˆ
+ </string>
+ <string name="ExperiencePermission12">
+ 体験ã®æ¨©é™ã‚’自動的ã«æ‰¿è«¾
+ </string>
+ <string name="ExperiencePermissionShortUnknown">
+ ãŒä¸æ˜Žãªæ“作を実行ã—ã¾ã—ãŸ: [Permission]
+ </string>
+ <string name="ExperiencePermissionShort1">
+ コントロールã™ã‚‹
+ </string>
+ <string name="ExperiencePermissionShort3">
+ アニメーションをトリガー
+ </string>
+ <string name="ExperiencePermissionShort4">
+ å–り付ã‘ã‚‹
+ </string>
+ <string name="ExperiencePermissionShort9">
+ カメラを追跡
+ </string>
+ <string name="ExperiencePermissionShort10">
+ カメラを制御
+ </string>
+ <string name="ExperiencePermissionShort11">
+ テレãƒãƒ¼ãƒˆ
+ </string>
+ <string name="ExperiencePermissionShort12">
+ 権é™
+ </string>
</strings>
diff --git a/indra/newview/skins/default/xui/ja/teleport_strings.xml b/indra/newview/skins/default/xui/ja/teleport_strings.xml
index 7868c25807..4555420ba8 100755
--- a/indra/newview/skins/default/xui/ja/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/ja/teleport_strings.xml
@@ -50,6 +50,9 @@
<message name="MustGetAgeRegion">
ã“ã®åœ°åŸŸï¼ˆãƒªãƒ¼ã‚¸ãƒ§ãƒ³ï¼‰ã«å…¥ã‚‹ã«ã¯ 18 æ‰ä»¥ä¸Šã§ã‚ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚
</message>
+ <message name="RegionTPSpecialUsageBlocked">
+ リージョンã«å…¥ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“。&apos;[REGION_NAME]&apos; ã¯ã‚¹ã‚­ãƒ« ゲーミング リージョンã§ã‚ã‚Šã€ã‚ãªãŸã¯ã“ã®ãƒªãƒ¼ã‚¸ãƒ§ãƒ³ã«å…¥ã‚‹ãŸã‚ã®ç‰¹å®šã®åŸºæº–を満ãŸã™å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚詳ã—ãã¯ã€[http://wiki.secondlife.com/wiki/Linden_Lab_Official:Skill_Gaming_in_Second_Life スキル ゲーミングã®ã‚ˆãã‚る質å•] ã‚’å‚ç…§ã—ã¦ãã ã•ã„。
+ </message>
</message_set>
<message_set name="progress">
<message name="sending_dest">
diff --git a/indra/newview/skins/default/xui/pl/floater_about.xml b/indra/newview/skins/default/xui/pl/floater_about.xml
index 61a72ff27d..f5098ba33c 100755
--- a/indra/newview/skins/default/xui/pl/floater_about.xml
+++ b/indra/newview/skins/default/xui/pl/floater_about.xml
@@ -1,81 +1,42 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="floater_about" title="O [CAPITALIZED_APP_NAME]">
- <floater.string name="AboutHeader">
- [APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2] ([VIEWER_VERSION_3]) [BUILD_DATE] [BUILD_TIME] ([CHANNEL])
-[[VIEWER_RELEASE_NOTES_URL] [ReleaseNotes]]
- </floater.string>
- <floater.string name="AboutCompiler">
- Buduj z [COMPILER] wersjÄ… [COMPILER_VERSION]
- </floater.string>
- <floater.string name="AboutPosition">
- Położenie [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1] w [REGION] zlokalizowanym w &lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt; ([HOSTIP])
-[SERVER_VERSION]
-[SERVER_RELEASE_NOTES_URL]
- </floater.string>
- <floater.string name="AboutSystem">
- Procesor: [CPU]
-Pamięć: [MEMORY_MB] MB
-Wersja OS: [OS_VERSION]
-Sprzedawca karty graficznej: [GRAPHICS_CARD_VENDOR]
-Karta graficzna: [GRAPHICS_CARD]
- </floater.string>
- <floater.string name="AboutDriver">
- Windows Sterownik karty graficznej: [GRAPHICS_DRIVER_VERSION]
- </floater.string>
- <floater.string name="AboutLibs">
- Wersja OpenGL: [OPENGL_VERSION]
-
-Wersja libcurl: [LIBCURL_VERSION]
-Wersja dekodera J2C: [J2C_VERSION]
-Wersja Audio Driver: [AUDIO_DRIVER_VERSION]
-Wersja Qt Webkit: [QT_WEBKIT_VERSION]
-Wersja serwera głosu: [VOICE_VERSION]
- </floater.string>
- <floater.string name="none">
- (żadne)
- </floater.string>
- <floater.string name="AboutTraffic">
- Stracone pakiety: [PACKETS_LOST,number,0]/[PACKETS_IN,number,0] ([PACKETS_PCT,number,1]%)
- </floater.string>
<tab_container name="about_tab">
<panel label="Info" name="support_panel">
<button label="Kopiuj do schowka" name="copy_btn"/>
</panel>
<panel label="Podziękowania" name="credits_panel">
- <text_editor name="credits_editor">
- Second Life zostało stworzone dla Was przez Philip, Tessa, Andrew, Cory, Ian, James, Phoenix, Ryan, Haney, Dan, Char, Ben, John, Tanya, Eddie, Richard, Mitch, Doug, Eric, Frank, Bruce, Aaron, Peter, Alice, Charlie, Debra, Eileen, Helen, Janet, Steffan, Steve, Tom, Mark, Hunter, Xenon, Burgess, Bill, Jim, Lee, Hamlet, Daniel, Jeff, Todd, Sarah, Tim, Stephanie, Colin, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Jack, Vektor, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Jesse, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Yuko, Makiko, Thomas, Harry, Seth, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Brad, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, Beez, Milo, Hermia, Red, Thrax, Gulliver, Joe, Sally, Paul, Jose, Rejean, Dore, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, Dustin, George, Del, Matthew, Cat, Jacqui, Adrian, Viola, Alfred, Noel, Irfan, Yool, Rika, Jane, Frontier, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Jeremy, JP, Jake, Anthony, Maurice, Madhavi, Leopard, Kyle, Joon, Bert, Belinda, Jon, Kristi, Bridie, Pramod, Socrates, Maria, Aric, Adreanne, Jay, Kari, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Colossus, Zen, BigPapi, Pastrami, Kurz, Mani, Neuro, Mel, Sardonyx, MJ, Rowan, Sgt, Elvis, Samuel, Leo, Bryan, Niko, Austin, Soft, Poppy, Rachel, Aki, Banzai, Alexa, Sue, Bender, CG, Angelo, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Rothman, Niall, Marin, Allison, Katie, Dawn, Dusty, Katt, Judy, Andrea, Ambroff, Infinity, Rico, Gail, Kalpana, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ, Maestro, Simone, Yang, T, Shannon, Nelson, Khanh, Scott, Courtney, Charlene, Quixote, Susan, Zed, Amanda, Katelin, Enkidu, Roxie, Esbee, JoRoan, Scarlet, Tay, Kevin, Wolfgang, Johnny, Ray, Andren, Merov, Bob, Rand, Howard, Callen, Heff, Galen, Newell, Dessie, Les, Michon, Jenelle, Geo, Siz, Shapiro, Pete, Calyle, Selene, Allen, Phoebe, Goldin, Kimmora, Dakota, Slaton, Lindquist, Zoey, Hari, Othello, Rohit, Sheldon, Petra, Viale, Gordon, Kaye, Pink, Ferny, Emerson, Davy, Bri, Chan, Juan, Robert, Terrence, Nathan, Carl, Ashley, JessieAnn, Huseby, Karina, Paris, Kurt, Rick, Lis, Kotler, Theeba, Lynx, Murphy, Doten, Taka, Norm, Jillian, Marcus, Mae, Novack, Esther, Perry, Dana, Ducot, Javier, Porter, Madison, Gecko, Dough, JR, Gisele, Crimp, Norie, Arch, Kimi, Fisher, Barbara, Jason, Peggy, Bernard, Jules, Leroy, Eva, Khederian, Campbell, Vogt, Masido, Karel, Torres, Lo, Breezer, Delby, Rountree, Anna, Servus, Rue, Itiaes, Chuck, Luna, Novella, Zaza, Wen, Gino, Lex, Cassandra, Limey, Nancy, Anukul, Silver, Brodesky, Jinsai, Squid, Gez, Rakesh, Ladan, Edelman, Marcet, Squire, Tatem, Tony, Jerm, Tia, Falcon, BK, Tiggs, Driscoll, Bacon, Timothee, Cru, Carmilla, Coyot, Webb, Kazu, Rudas, LJ, Sea, Ali Wallace, Bewest, Pup, Drub, Dragon, Inoshiro, Byron, Rhett, Xandix, Aimee, Fredrik, Thor, Teddy, Baron, Nelly, Ghengis, Epic, Eli, Stone, Grapes, Irie, Prep, Scobu, Valerie, Alain, and many others.
-
-Podziękowania dla następujących Rezydentów za pomoc w pracy nad obecną wersją Second Life: Drew Dwi, Zai Lynch, Latif Khalifa, Ellla McMahon, Harleen Gretzky, Squirrel Wood, Malarthi Behemoth, Dante Tucker, Buckaroo Mu, Eddi Decosta, Dirk, Talamasca, Torben Trautman, Irene Muni, Aralara Rajal, Aura Dirval, Cayu Cluny, Eva Rau, FreeSL Aeon, Frontera Thor, Inma Rau, Lunita Savira, Minerva Memel, Polo Gufler, Xiki Luik, Lilly Zenovka, Vick Forcella, Sasy Scarborough, Gentle Welinder, Elric Anatine, Techwolf Lupindo, Dusan Writer, WolfPup Lowenhar, Marianne McCann, Fiachra Lach, Sitearm Madonna, Sudane Erato, Sahkolihaa Contepomi, Sachi Vixen, Questar Utu, Dimitrio Lewis, Matto Destiny, Scrim Pinion, Radio Signals, Psi Merlin, Pixel Gausman, Mel Vanbeeck, Laurent Bechir, Lamorna Proctor, Lares Carter, Gwyneth Llewelyn, Hydra Shaftoe, Holger Gilruth, Gentle Heron, Carla Broek, Boroondas Gupte, Fury Rosewood, Flower Ducatillon, Colpo Wexler, gwampa Lomu, Borg Capalini, Beansy Twine, Ardy Lay, , 45ms Zhong, Adeon Writer, Aeonix Aeon, Ai Austin, Aiko Ying, Alexandrea Fride, Alliez Mysterio, Annie Milestone, Annika Genezzia, Ansariel Hiller, ArminasX Saiman, Arya Braveheart, Asaeda Meltingdots, Asturkon Jua, Avallyn Oakleaf, Avatar Quinzet, BabyA Littlething, Bacchus Ireto, Bazaar, Riva, Benjamin Bigdipper, Beth Walcher, Bezilon Kasei, Biancaluce Robbiani, Bill Walach, blakopal Galicia, Blitzckreed Levenque, Bryn Oh, Callipygian Christensen, Cap Carver, Carr Arbenlow, Chantal Harvey, Charles Courtois, Charlie Sazaland, Cherry Cheevers, ChickyBabes Zuzu, Christopher Organiser, Ciaran Laval, Clara Young, Celierra Darling, Corinne Helendale, Corro Moseley, Coughdrop Littlething, Darien Caldwell, Dartagan Shepherd, Debs Regent, Decro Schmooz, Denim Kamachi, DiJodi Dubratt, Dil Spitz, Edgware Marker, Egehan Dryke, Emma Portilo, Emmie Fairymeadow, Evangelista Emerald, Faelon Swordthain, Frenchimmo Sabra, Gaberoonie Zanzibar, Ganymedes Costagravas, Gene Frostbite, GeneJ Composer, Giggles Littlebird, Grady Echegaray, Guni Greenstein, Gypsy Tripsa, Hackshaven Harford, Ham Rambler, Han Shuffle, Hanglow Short, Hatzfeld Runo, herina Bode, Horatio Freund, Hypatia Callisto, Hypatia Pickens, Identity Euler, Imnotgoing Sideways, Innula Zenovka, Iyoba Tarantal, Jack Abraham, Jagga Meredith, Jennifer Boyle, Jeremy Marquez, Jessica Qin, Jinx Nordberg, Jo Bernandes, Jocial Sonnenkern, Joel Savard, Jondan Lundquist, Josef Munster, Josette Windlow, Juilan Tripsa, Juro Kothari, Justin RiversRunRed, Kagehi Kohn, Kaimen Takahe, Keklily Longfall, Ken Lavender, Kestral Karas, Khisme Nitely, Kimar Coba, Kithrak Kirkorian, Kitty Barnett, Kolor Fall, Komiko Okamoto, Korvel Noh, Larry Pixel, Leal Choche, len Starship, Lenae Munz, Lexi Frua, Lillie Cordeaux, Lizzy Macarthur, LSL Scientist, Luban Yiyuan, Luc Starsider, Maccus McCullough, Madison Blanc, Maggie Darwin, Mallory Destiny, Manx Wharton, Marc Claridge, Marc2 Sands, Matthew Anthony, Maxim RiversRunRed, Medhue Simoni, Melinda Latynina, Mencius Watts, Michi Lumin, Midian Farspire, Miles Glaz, Mindy Mathy, Mitch Wagner, Mo Hax, Mourna Biziou, Nao Noe, naofan Teardrop, Naomah Beaumont, Nathiel Siamendes, Nber Medici, Neko Link, Netpat Igaly, Neutron Chesnokov, Newfie Pendragon, Nicholai Laviscu, Nick Rhodes, Nicoladie Gymnast, Ollie Kubrick, Orenj Marat, Orion Delphis, Oryx Tempel, Parvati Silverweb, PeterPunk Mooney, Pixel Scientist, Pounce Teazle, Professor Noarlunga, Quantum Destiny, Quicksilver Hermes, Ralf Setsuko, RAT Quan, RedMokum Bravin, Revolution Perenti, Rezit Sideways, Rich Grainger, Rosco Teardrop, Rose Evans, Rudee Voom, RufusTT Horsefly, Saii Hallard, SaintLEOlions Zimer, Samm Larkham, Satanello Miami, SexySteven Morrisey, Sheet Spotter, Shnurui Troughton, sicarius Thorne, Sicarius Toxx, Sini Nubalo, SLB Wirefly, snowy Sidran, Soupa Segura, ST Mensing, Starshine Halasy, Stickman Ingmann, Synystyr Texan, Takeda Terrawyng, Tali Rosca, Templar Merlin, Tezcatlipoca Bisiani, Tiel Stonecutter, Tony Kembia, TouchaHoney Perhaps, Trey Reanimator, TriloByte Zanzibar, Trinity Dechou, Trinity Dejavu, Unlikely Quintessa, UsikuFarasi Kanarik, Veritas Raymaker, Vex Streeter, Viaticus Speculaas, Villain Baroque, Vixie Durant, Void Singer, Watty Berkson, Westley Schridde, Westley Streeter, Whimsy Winx, Winter Ventura, Wundur Primbee, xstorm Radek, YongYong Francois, Zak Westminster, Zana Kohime, Zaren Alexander, Zeja Pyle, ZenMondo Wormser, Zoex Flanagan, and many others.
-
+ <text name="linden_intro">Second Life zostało dla Ciebie stworzone przez Lindenów,
+z wkładem open source od::</text>
+ </panel>
+ <panel label="Licencje" name="licenses_panel">
+ <text_editor name="licenses_editor">3Dconnexion SDK Copyright (C) 1992-2009 3Dconnexion
+ APR Copyright (C) 2011 The Apache Software Foundation
+ Collada DOM Copyright 2006 Sony Computer Entertainment Inc.
+ cURL Copyright (C) 1996-2010, Daniel Stenberg, (daniel@haxx.se)
+ DBus/dbus-glib Copyright (C) 2002, 2003 CodeFactory AB / Copyright (C) 2003, 2004 Red Hat, Inc.
+ expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd.
+ FreeType Copyright (C) 1996-2002, 2006 David Turner, Robert Wilhelm, and Werner Lemberg.
+ GL Copyright (C) 1999-2004 Brian Paul.
+ GLOD Copyright (C) 2003-04 Jonathan Cohen, Nat Duca, Chris Niski, Johns Hopkins University and David Luebke, Brenden Schubert, University of Virginia.
+ google-perftools Copyright (c) 2005, Google Inc.
+ Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited.
+ jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW)
+ jpeglib Copyright (C) 1991-1998, Thomas G. Lane.
+ ogg/vorbis Copyright (C) 2002, Xiphophorus
+ OpenSSL Copyright (C) 1998-2008 The OpenSSL Project.
+ PCRE Copyright (c) 1997-2012 University of Cambridge
+ SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
+ SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
+ xmlrpc-epi Copyright (C) 2000 Epinions, Inc.
+ zlib Copyright (C) 1995-2012 Jean-loup Gailly and Mark Adler.
+ Second Life Viewer uses Havok (TM) Physics. (c)Copyright 1999-2010 Havok.com Inc. (and its Licensors). All Rights Reserved. See www.havok.com for details.
+ This software contains source code provided by NVIDIA Corporation.
-&quot;The work goes on, the cause endures, the hope still lives, and the dreams shall never die&quot; - Edward Kennedy
- </text_editor>
- </panel>
- <panel label="Licencje" name="licenses_panel">
- <text_editor name="credits_editor">
- 3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion
- APR Copyright (C) 2000-2004 The Apache Software Foundation
- cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel@haxx.se)
- expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd.
- FreeType Copyright (C) 1996-2002, The FreeType Project (www.freetype.org).
- GL Copyright (C) 1999-2004 Brian Paul.
- Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited.
- jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW)
- jpeglib Copyright (C) 1991-1998, Thomas G. Lane.
- ogg/vorbis Copyright (C) 2001, Xiphophorus
- OpenSSL Copyright (C) 1998-2002 The OpenSSL Project.
- SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
- SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- xmlrpc-epi Copyright (C) 2000 Epinions, Inc.
- zlib Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler.
- google-perftools Copyright (c) 2005, Google Inc.
-
- Wszystkie prawa zastrzeżone. Szczegóły w pliku licenses.txt.
+ All rights reserved. See licenses.txt for details.
- Programowanie dźwięku czatu: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
- </text_editor>
+ Voice chat Audio coding: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)</text_editor>
</panel>
</tab_container>
</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_associate_listing.xml b/indra/newview/skins/default/xui/pl/floater_associate_listing.xml
new file mode 100644
index 0000000000..b5464dd59b
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_associate_listing.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="associate listing" title="PRZYPISANE PRZEDMIOTY">
+ <text name="message">ID przedmiotu:</text>
+ <line_editor name="listing_id">Wpisz tutaj ID</line_editor>
+ <button label="OK" name="OK"/>
+ <button label="Anuluj" name="Cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_edit_hover_height.xml b/indra/newview/skins/default/xui/pl/floater_edit_hover_height.xml
new file mode 100644
index 0000000000..80e481c0bc
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_edit_hover_height.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="HoverHeight" title="USTAW UNIESIENIE">
+ <slider label="UnieÅ›" name="HoverHeightSlider"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/pl/floater_inventory_item_properties.xml
index 054d74b234..97d13c4dfe 100755
--- a/indra/newview/skins/default/xui/pl/floater_inventory_item_properties.xml
+++ b/indra/newview/skins/default/xui/pl/floater_inventory_item_properties.xml
@@ -1,67 +1,36 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="item properties" title="WÅAÅšCIWOÅšCI OBIEKTÓW W SZAFIE">
- <floater.string name="unknown">
- (nieznany)
- </floater.string>
- <floater.string name="public">
- (publiczny)
- </floater.string>
- <floater.string name="you_can">
- Opcje:
- </floater.string>
- <floater.string name="owner_can">
- Właściciel może:
- </floater.string>
- <floater.string name="acquiredDate">
- [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]
- </floater.string>
- <text name="LabelItemNameTitle">
- Nazwa:
- </text>
- <text name="LabelItemDescTitle">
- Opis:
- </text>
- <text name="LabelCreatorTitle">
- Twórca:
- </text>
+ <floater.string name="unknown">(nieznany)</floater.string>
+ <floater.string name="public">(publiczny)</floater.string>
+ <floater.string name="you_can">Opcje:</floater.string>
+ <floater.string name="owner_can">Właściciel może:</floater.string>
+ <floater.string name="acquiredDate">[wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]</floater.string>
+ <text name="LabelItemNameTitle">Nazwa:</text>
+ <text name="LabelItemDescTitle">Opis:</text>
+ <text name="LabelCreatorTitle">Twórca:</text>
<button label="Profil..." label_selected="" name="BtnCreator"/>
- <text name="LabelOwnerTitle">
- Właściciel:
- </text>
+ <text name="LabelOwnerTitle">Właściciel:</text>
<button label="Profil..." label_selected="" name="BtnOwner"/>
- <text name="LabelAcquiredTitle">
- Nabyte:
- </text>
- <text name="LabelAcquiredDate">
- Wed May 24 12:50:46 2006
- </text>
- <text name="OwnerLabel">
- Ty:
- </text>
+ <text name="LabelAcquiredTitle">Nabyte:</text>
+ <text name="LabelAcquiredDate">Wed May 24 12:50:46 2006</text>
+ <text name="OwnerLabel">Ty:</text>
<check_box label="Edytuj" name="CheckOwnerModify"/>
<check_box label="Kopiuj" name="CheckOwnerCopy"/>
<check_box label="Odsprzedaż" name="CheckOwnerTransfer"/>
- <text name="AnyoneLabel">
- Każdy:
- </text>
+ <text name="AnyoneLabel">Każdy:</text>
<check_box label="Kopiuj" name="CheckEveryoneCopy"/>
- <text name="GroupLabel">
- Grupa:
- </text>
+ <text name="GroupLabel">Grupa:</text>
<check_box label="Udostępnij" name="CheckShareWithGroup"/>
- <text name="NextOwnerLabel">
- Następny właściciel:
- </text>
+ <text name="NextOwnerLabel">Następny właściciel:</text>
<check_box label="Edytuj" name="CheckNextOwnerModify"/>
<check_box label="Kopiuje" name="CheckNextOwnerCopy"/>
<check_box label="Odsprzedaż" name="CheckNextOwnerTransfer"/>
<check_box label="Sprzedaż" name="CheckPurchase"/>
- <combo_box name="combobox sale copy">
- <combo_box.item label="Kopiuj" name="Copy"/>
- <combo_box.item label="Oryginalny" name="Original"/>
+ <combo_box name="ComboBoxSaleType">
+ <combo_box.item label="Kopia" name="Copy"/>
+ <combo_box.item label="Zawartość" name="Contents"/>
+ <combo_box.item label="Oryginał" name="Original"/>
</combo_box>
<spinner label="Cena:" name="Edit Cost"/>
- <text name="CurrencySymbol">
- L$
- </text>
+ <text name="CurrencySymbol">L$</text>
</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_item_properties.xml b/indra/newview/skins/default/xui/pl/floater_item_properties.xml
new file mode 100644
index 0000000000..8b0cf31a9a
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_item_properties.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Item Properties" title="WÅAÅšCIWOÅšCI"/>
diff --git a/indra/newview/skins/default/xui/pl/floater_marketplace_listings.xml b/indra/newview/skins/default/xui/pl/floater_marketplace_listings.xml
new file mode 100644
index 0000000000..1917a4985b
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_marketplace_listings.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_marketplace_listings" title="RZECZY NA MARKETPLACE">
+ <panel name="marketplace_listings_panel">
+ <panel>
+ <panel name="marketplace_listings_inventory_placeholder_panel">
+ <text name="marketplace_listings_inventory_placeholder_title">Wczytywanie...</text>
+ </panel>
+ </panel>
+ </panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_marketplace_validation.xml b/indra/newview/skins/default/xui/pl/floater_marketplace_validation.xml
new file mode 100644
index 0000000000..826c72f2cd
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_marketplace_validation.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_marketplace_validation" title="Sprawdź przedmioty na Marketplace">
+ <button label="OK" label_selected="OK" name="OK"/>
+ <text_editor name="validation_text">MARKETPLACE_VALIDATION_TEXT</text_editor>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_openobject.xml b/indra/newview/skins/default/xui/pl/floater_openobject.xml
index 8e94ae821c..20c9760e6f 100755
--- a/indra/newview/skins/default/xui/pl/floater_openobject.xml
+++ b/indra/newview/skins/default/xui/pl/floater_openobject.xml
@@ -3,6 +3,11 @@
<text name="object_name">
[DESC]:
</text>
- <button label="Kopiuj do Szafy" label_selected="Kopiuj do Szafy" name="copy_to_inventory_button"/>
- <button label="Kopiuj i zalóż" label_selected="Kopiuj i załóż" name="copy_and_wear_button"/>
+ <text name="border_note">
+ Kopiuj do Szafy i załóż
+ </text>
+ <button label="Dodaj do stroju" label_selected="Dodaj do stroju" name="copy_and_wear_button"/>
+ <button label="Zastąp strój" label_selected="Zastąp strój" name="copy_and_replace_button"/>
+ <button label="Tylko skopiuj do Szafy" label_selected="Tylko skopiuj do Szafy" name="copy_to_inventory_button"/>
+ <button label="Anuluj" label_selected="Anuluj" name="cancel_button"/>
</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_pay.xml b/indra/newview/skins/default/xui/pl/floater_pay.xml
index 38fe5286a4..cb9c0bd552 100755
--- a/indra/newview/skins/default/xui/pl/floater_pay.xml
+++ b/indra/newview/skins/default/xui/pl/floater_pay.xml
@@ -1,26 +1,18 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="Give Money" title="">
- <string name="payee_group">
- Zapłać grupie
- </string>
- <string name="payee_resident">
- Zapłać Rezydentowi
- </string>
- <text name="payee_label">
- Zapłać:
- </text>
- <icon name="icon_person" tool_tip="Osoba"/>
- <text name="payee_name">
- Przetestuj nazwę, która jest bardzo długa aby sprawdzić skracanie.
- </text>
- <button label="L$1" label_selected="L$1" name="fastpay 1"/>
- <button label="L$5" label_selected="L$5" name="fastpay 5"/>
- <button label="L$10" label_selected="L$10" name="fastpay 10"/>
- <button label="L$20" label_selected="L$20" name="fastpay 20"/>
- <text name="amount text">
- lub wybierz kwotÄ™:
- </text>
- <line_editor left="52" name="amount"/>
- <button label="Zapłać" label_selected="Zapłać" name="pay btn"/>
- <button label="Anuluj" label_selected="Anuluj" name="cancel btn"/>
+ <string name="payee_group">Zapłać grupie</string>
+ <string name="payee_resident">Zapłać Rezydentowi</string>
+ <text name="paying_text">PÅ‚acisz:</text>
+ <text name="payee_name">Przetestuj nazwę, która jest bardzo długa aby sprawdzić skracanie.</text>
+ <panel label="Szukaj" name="PatternsPanel">
+ <button label="Płać 1L$" label_selected="Płać 1L$" name="fastpay 1"/>
+ <button label="Płać 5L$" label_selected="Płać 5L$" name="fastpay 5"/>
+ <button label="Płać 10L$" label_selected="Płać 10L$" name="fastpay 10"/>
+ <button label="Płać 20L$" label_selected="Płać 20L$" name="fastpay 20"/>
+ </panel>
+ <panel label="Szukaj" name="InputPanel">
+ <text name="amount text">Inna kwota:</text>
+ <button label="Zapłać" label_selected="Zapłać" name="pay btn"/>
+ <button label="Anuluj" label_selected="Anuluj" name="cancel btn"/>
+ </panel>
</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_pay_object.xml b/indra/newview/skins/default/xui/pl/floater_pay_object.xml
index bf88348c87..d196e08fee 100755
--- a/indra/newview/skins/default/xui/pl/floater_pay_object.xml
+++ b/indra/newview/skins/default/xui/pl/floater_pay_object.xml
@@ -1,30 +1,21 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="Give Money" title="">
- <string halign="left" name="payee_group" width="100">
- Zapłać grupie
- </string>
- <string halign="left" name="payee_resident" width="120">
- Zapłać Rezydentowi
- </string>
- <icon name="icon_person" tool_tip="Osoba"/>
- <text left="125" name="payee_name">
- Ericacita Moostopolison
- </text>
- <text halign="left" left="5" name="object_name_label" width="95">
- Poprzez obiekt:
- </text>
+ <string halign="left" name="payee_group" width="100">Zapłać grupie</string>
+ <string halign="left" name="payee_resident" width="120">Zapłać Rezydentowi</string>
+ <text name="paying_text">PÅ‚acisz:</text>
+ <text left="125" name="payee_name">Ericacita Moostopolison</text>
+ <text halign="left" left="5" name="object_name_label" width="95">Poprzez obiekt:</text>
<icon name="icon_object" tool_tip="Obiekt"/>
- <text left="105" name="object_name_text">
- Poprzez obiekt
- </text>
- <button label="L$1" label_selected="L$1" left="105" name="fastpay 1"/>
- <button label="L$5" label_selected="L$5" left="190" name="fastpay 5"/>
- <button label="L$10" label_selected="L$10" left="105" name="fastpay 10"/>
- <button label="L$20" label_selected="L$20" left="190" name="fastpay 20"/>
- <text halign="left" left="5" name="amount text">
- lub wybierz kwotÄ™:
- </text>
- <line_editor left="50" name="amount" width="50"/>
- <button label="Zapłać" label_selected="Zapłać" name="pay btn"/>
- <button label="Anuluj" label_selected="Anuluj" name="cancel btn"/>
+ <text left="105" name="object_name_text">Poprzez obiekt</text>
+ <panel label="Szukaj" name="PatternsPanel">
+ <button label="Płać 1L$" label_selected="Płać 1L$" name="fastpay 1"/>
+ <button label="Płać 5L$" label_selected="Płać 5L$" name="fastpay 5"/>
+ <button label="Płać 10L$" label_selected="Płać 10L$" name="fastpay 10"/>
+ <button label="Płać 20L$" label_selected="Płać 20L$" name="fastpay 20"/>
+ </panel>
+ <panel label="Szukaj" name="InputPanel">
+ <text name="amount text">Inna kwota:</text>
+ <button label="Zapłać" label_selected="Zapłać" name="pay btn"/>
+ <button label="Anuluj" label_selected="Anuluj" name="cancel btn"/>
+ </panel>
</floater>
diff --git a/indra/newview/skins/default/xui/pl/menu_attachment_self.xml b/indra/newview/skins/default/xui/pl/menu_attachment_self.xml
index 163b3a231e..ecfc341d73 100755
--- a/indra/newview/skins/default/xui/pl/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/pl/menu_attachment_self.xml
@@ -8,6 +8,7 @@
<menu_item_call label="Mój wygląd" name="Change Outfit"/>
<menu_item_call label="Edytuj mój strój" name="Edit Outfit"/>
<menu_item_call label="Edytuj mój kształt" name="Edit My Shape"/>
+ <menu_item_call label="Uniesienie" name="Hover Height"/>
<menu_item_call label="Moi znajomi" name="Friends..."/>
<menu_item_call label="Moje grupy" name="Groups..."/>
<menu_item_call label="Mój profil" name="Profile..."/>
diff --git a/indra/newview/skins/default/xui/pl/menu_avatar_self.xml b/indra/newview/skins/default/xui/pl/menu_avatar_self.xml
index 8eb501c5b8..dafad57d98 100755
--- a/indra/newview/skins/default/xui/pl/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/pl/menu_avatar_self.xml
@@ -25,6 +25,7 @@
<menu_item_call label="Mój wygląd" name="Chenge Outfit"/>
<menu_item_call label="Edytuj mój strój" name="Edit Outfit"/>
<menu_item_call label="Edytuj mój kształt" name="Edit My Shape"/>
+ <menu_item_call label="Uniesienie" name="Hover Height"/>
<menu_item_call label="Moi znajomi" name="Friends..."/>
<menu_item_call label="Moje grupy" name="Groups..."/>
<menu_item_call label="Mój profil" name="Profile..."/>
diff --git a/indra/newview/skins/default/xui/pl/menu_inventory.xml b/indra/newview/skins/default/xui/pl/menu_inventory.xml
index 5492f78b26..a0c2b2c6c1 100755
--- a/indra/newview/skins/default/xui/pl/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/pl/menu_inventory.xml
@@ -1,5 +1,14 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<menu name="Popup">
+ <menu_item_call label="Utwórz nowy przedmiot" name="Marketplace Create Listing"/>
+ <menu_item_call label="Przypisz" name="Marketplace Associate Listing"/>
+ <menu_item_call label="Pobierz ponownie (odśwież)" name="Marketplace Get Listing"/>
+ <menu_item_call label="Zweryfikuj" name="Marketplace Check Listing"/>
+ <menu_item_call label="Edytuj przedmiot" name="Marketplace Edit Listing"/>
+ <menu_item_call label="Listuj" name="Marketplace List"/>
+ <menu_item_call label="Usuń z listy" name="Marketplace Unlist"/>
+ <menu_item_call label="Aktywuj" name="Marketplace Activate"/>
+ <menu_item_call label="Dezaktywuj" name="Marketplace Deactivate"/>
<menu_item_call label="Udostępnij" name="Share"/>
<menu_item_call label="Kupuj" name="Task Buy"/>
<menu_item_call label="Otwórz" name="Task Open"/>
@@ -81,5 +90,7 @@
<menu_item_call label="Edytuj" name="Wearable Edit"/>
<menu_item_call label="Dodaj" name="Wearable Add"/>
<menu_item_call label="Zdejmij" name="Take Off"/>
+ <menu_item_call label="Kopiuj do przedmiotów Marketplace" name="Marketplace Copy"/>
+ <menu_item_call label="Przenieś do przedmiotów Marketplace" name="Marketplace Move"/>
<menu_item_call label="--brak opcji--" name="--no options--"/>
</menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_marketplace_view.xml b/indra/newview/skins/default/xui/pl/menu_marketplace_view.xml
new file mode 100644
index 0000000000..b948074501
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/menu_marketplace_view.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_marketplace_sort">
+ <menu_item_check label="Sortuj według ilości (rosnąco)" name="sort_by_stock_amount"/>
+ <menu_item_check label="Pokaż tylko foldery" name="show_only_listing_folders"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_viewer.xml b/indra/newview/skins/default/xui/pl/menu_viewer.xml
index a354cca9ad..ef3fe71945 100755
--- a/indra/newview/skins/default/xui/pl/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/pl/menu_viewer.xml
@@ -1,48 +1,42 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<menu_bar name="Main Menu">
<menu label="Ja" name="Me">
- <menu_item_call label="Ustawienia" name="Preferences"/>
- <menu_item_call label="Dashboard" name="Manage My Account"/>
- <menu_item_call label="Kup L$" name="Buy and Sell L$"/>
<menu_item_call label="Mój Profil" name="Profile"/>
<menu_item_call label="Mój wygląd" name="ChangeOutfit"/>
<menu_item_check label="Moja Szafa" name="Inventory"/>
- <menu_item_check label="Moja Szafa" name="ShowSidetrayInventory"/>
- <menu_item_check label="Moje gesturki" name="Gestures"/>
- <menu_item_check label="Mój głos" name="ShowVoice"/>
<menu label="Ruch" name="Movement">
<menu_item_call label="Usiądź" name="Sit Down Here"/>
<menu_item_check label="Zacznij latać" name="Fly"/>
<menu_item_check label="Zawsze biegnij" name="Always Run"/>
<menu_item_call label="Zatrzymaj animacje" name="Stop Animating My Avatar"/>
</menu>
- <menu label="Mój Status" name="Status">
- <menu_item_call label="Tryb oddalenia" name="Set Away"/>
- <menu_item_call label="Tryb pracy" name="Set Busy"/>
- </menu>
+ <menu label="Mój Status" name="Status"/>
+ <menu_item_call label="Kup L$" name="Buy and Sell L$"/>
+ <menu_item_call label="Moje rzeczy na Marketplace" name="MarketplaceListings"/>
+ <menu_item_call label="Dashboard" name="Manage My Account"/>
+ <menu_item_call label="Ustawienia" name="Preferences"/>
<menu_item_call label="Wyłącz [APP_NAME]" name="Quit"/>
</menu>
<menu label="Komunikacja" name="Communicate">
- <menu_item_call label="Znajomi" name="My Friends"/>
- <menu_item_call label="Grupy" name="My Groups"/>
<menu_item_check label="Czat lokalny" name="Nearby Chat"/>
- <menu_item_call label="Osoby w pobliżu" name="Active Speakers"/>
+ <menu_item_check label="Znajomi" name="My Friends"/>
+ <menu_item_check label="Grupy" name="My Groups"/>
+ <menu_item_check label="Osoby w pobliżu" name="Active Speakers"/>
</menu>
<menu label="Åšwiat" name="World">
- <menu_item_check label="Mini-Mapa" name="Mini-Map"/>
+ <menu_item_call label="Zapamiętaj to miejsce (LM)" name="Create Landmark Here"/>
<menu_item_check label="Mapa Åšwiata" name="World Map"/>
+ <menu_item_check label="Mini-Mapa" name="Mini-Map"/>
<menu_item_check label="Szukaj" name="Search"/>
+ <menu_item_call label="Teleportuj do Miejsca Startu" name="Teleport Home"/>
+ <menu_item_call label="Ustaw Miejsce Startu" name="Set Home to Here"/>
<menu_item_call label="Zrób zdjęcie" name="Take Snapshot"/>
- <menu_item_call label="Zapamiętaj to miejsce (LM)" name="Create Landmark Here"/>
- <menu_item_separator/>
<menu_item_call label="Profil miejsca" name="Place Profile"/>
<menu_item_call label="O posiadłości" name="About Land"/>
<menu_item_call label="Region/MajÄ…tek" name="Region/Estate"/>
- <menu_item_call label="Kup posiadłość" name="Buy Land"/>
<menu_item_call label="Moje posiadłości" name="My Land"/>
+ <menu_item_call label="Kup posiadłość" name="Buy Land"/>
<menu label="Pokaż" name="LandShow">
- <menu_item_check label="Ustawienia ruchu" name="Movement Controls"/>
- <menu_item_check label="Zobacz ustawienia" name="Camera Controls"/>
<menu_item_check label="Linie bana" name="Ban Lines"/>
<menu_item_check label="Emitery" name="beacons"/>
<menu_item_check label="Granice posiadłości" name="Property Lines"/>
@@ -51,15 +45,11 @@
<menu_item_check label="Właściwości posiadłości" name="Parcel Properties"/>
<menu_item_check label="Menu Zaawansowane" name="Show Advanced Menu"/>
</menu>
- <menu_item_call label="Teleportuj do Miejsca Startu" name="Teleport Home"/>
- <menu_item_call label="Ustaw Miejsce Startu" name="Set Home to Here"/>
<menu label="Słońce" name="Sun">
- <menu_item_call label="Wschód Słońca" name="Sunrise"/>
- <menu_item_call label="Południe" name="Noon"/>
- <menu_item_call label="Zachód Słońca" name="Sunset"/>
- <menu_item_call label="Północ" name="Midnight"/>
- <menu_item_call label="Używaj czasu Regionu" name="Revert to Region Default"/>
- <menu_item_call label="Edytor środowiska" name="Environment Editor"/>
+ <menu_item_check label="Wschód Słońca" name="Sunrise"/>
+ <menu_item_check label="Południe" name="Noon"/>
+ <menu_item_check label="Zachód Słońca" name="Sunset"/>
+ <menu_item_check label="Północ" name="Midnight"/>
</menu>
</menu>
<menu label="Buduj" name="BuildTools">
@@ -86,7 +76,6 @@
<menu_item_call label="Kup" name="Menu Object Buy"/>
<menu_item_call label="Weź" name="Menu Object Take"/>
<menu_item_call label="Weź kopię" name="Take Copy"/>
- <menu_item_call label="Zapisz obiekt do Szafy" name="Save Object Back to My Inventory"/>
<menu_item_call label="Zapisz do treści obiektu" name="Save Object Back to Object Contents"/>
<menu_item_call label="Zwróć obiekt" name="Return Object back to Owner"/>
</menu>
@@ -116,17 +105,14 @@
<menu_item_call label="dźwięk (L$[COST])..." name="Upload Sound"/>
<menu_item_call label="animacjÄ™ (L$[COST])..." name="Upload Animation"/>
<menu_item_call label="zbiór plików (L$[COST] za jeden plik)..." name="Bulk Upload"/>
- <menu_item_call label="Ustaw domyślne pozwolenia ładowania" name="perm prefs"/>
</menu>
<menu_item_call label="Cofnij" name="Undo"/>
<menu_item_call label="Ponów" name="Redo"/>
</menu>
<menu label="Pomoc" name="Help">
- <menu_item_call label="[SECOND_LIFE] Portal Pomocy" name="Second Life Help"/>
- <menu_item_check label="WÅ‚Ä…cz podpowiedzi" name="Enable Hints"/>
<menu_item_call label="Złóż Raport o Nadużyciu" name="Report Abuse"/>
<menu_item_call label="Zgłoś błędy klienta" name="Report Bug"/>
- <menu_item_call label="Zderzenia, popchnięcia &amp; uderzenia" name="Bumps, Pushes &amp;amp; Hits"/>
+ <menu_item_call label="Zderzenia, popchnięcia i uderzenia" name="Bumps, Pushes &amp;amp; Hits"/>
<menu_item_call label="O [APP_NAME]" name="About Second Life"/>
</menu>
<menu label="Zaawansowane" name="Advanced">
@@ -147,7 +133,6 @@
<menu_item_check label="Ukryj czÄ…steczki" name="Hide Particles"/>
<menu_item_check label="Ukryj zaznaczone" name="Hide Selected"/>
<menu_item_check label="Pokaż przeźroczyste obiekty" name="Highlight Transparent"/>
- <menu_item_check label="Pokaż załączniki HUD" name="Show HUD Attachments"/>
<menu_item_check label="Pokaż celownik myszki" name="ShowCrosshairs"/>
</menu>
<menu label="Rodzaje renderowania" name="Rendering Types">
@@ -178,7 +163,6 @@
<menu_item_call label="Wyczyść bufor danych grupy" name="ClearGroupCache"/>
<menu_item_check label="Wygładzanie ruchu myszki" name="Mouse Smoothing"/>
<menu label="Skróty" name="Shortcuts">
- <menu_item_call label="Zwolnij klawisze" name="Release Keys"/>
<menu_item_check label="Pokaż menu Zaawansowane - skrót" name="Show Advanced Menu - legacy shortcut"/>
<menu_item_call label="Zamknij okno" name="Close Window"/>
<menu_item_call label="Zamknij wszystkie okna" name="Close All Windows"/>
@@ -199,8 +183,7 @@
<menu_item_check label="Konsola tekstur" name="Texture Console"/>
<menu_item_check label="Debugowanie zdarzeń konsoli" name="Debug Console"/>
<menu_item_call label="Konsola powiadomień" name="Notifications"/>
- <menu_item_check label="Konsola rozmiaru tekstury" name="Texture Size"/>
- <menu_item_check label="Konsola kategorii tekstur" name="Texture Category"/>
+ <menu_item_check label="Konsola debugowania regionu" name="Region Debug Console"/>
<menu_item_check label="Szybkie timery" name="Fast Timers"/>
<menu_item_check label="Pamięć" name="Memory"/>
<menu_item_call label="Info Regionu do debugowania konsoli" name="Region Info to Debug Console"/>
@@ -240,12 +223,10 @@
<menu_item_check label="Oświetlenie i cienie" name="Advanced Lighting Model"/>
<menu_item_check label="Cienie Słońca/Księżyca/Projektory" name="Shadows from Sun/Moon/Projectors"/>
<menu_item_check label="SSAO and wygładzanie cienia" name="SSAO and Shadow Smoothing"/>
- <menu_item_check label="Globalne oświetlenie (eksperymentalne)" name="Global Illumination"/>
<menu_item_check label="Automatyczne maski alpha (deferred)" name="Automatic Alpha Masks (deferred)"/>
<menu_item_check label="Automatyczne maski alpha (non-deferred)" name="Automatic Alpha Masks (non-deferred)"/>
<menu_item_check label="Tekstury animacji" name="Animation Textures"/>
<menu_item_check label="Wyłącz tekstury" name="Disable Textures"/>
- <menu_item_check label="Texture Atlas (experimental)" name="Texture Atlas"/>
<menu_item_check label="Renderowania załączonego światła" name="Render Attached Lights"/>
<menu_item_check label="Renderowanie załączonych cząsteczek" name="Render Attached Particles"/>
<menu_item_check label="Wyświetlaj obiekty odblaskowe" name="Hover Glow Objects"/>
@@ -253,7 +234,7 @@
<menu label="Sieć" name="Network">
<menu_item_check label="Zatrzymaj awatara" name="AgentPause"/>
<menu_item_call label="Upuść pakiet pamięci" name="Drop a Packet"/>
- </menu>
+ </menu>
<menu label="Åšwiat" name="DevelopWorld">
<menu_item_check label="Domyślne ustawienia środowiska Regionu" name="Sim Sun Override"/>
<menu_item_check label="Ustalona pogoda" name="Fixed Weather"/>
@@ -263,8 +244,6 @@
<menu_item_call label="Test przeglądarki mediów" name="Web Browser Test"/>
<menu_item_call label="Przeglądarka zawartości strony" name="Web Content Browser"/>
<menu_item_call label="Drukuj zaznaczone informacje o obiekcie" name="Print Selected Object Info"/>
- <menu_item_call label="Statystyki pamięci" name="Memory Stats"/>
- <menu_item_check label="Konsola debugowania regionu" name="Region Debug Console"/>
<menu_item_check label="Debugowanie zdarzeń klikania" name="Debug Clicks"/>
<menu_item_check label="Debugowanie zdarzeń myszy" name="Debug Mouse Events"/>
</menu>
@@ -289,7 +268,6 @@
</menu>
<menu_item_call label="Powrót do domyślnych parametrów" name="Force Params to Default"/>
<menu_item_check label="Info o animacji" name="Animation Info"/>
- <menu_item_check label="Wolne animacje" name="Slow Motion Animations"/>
<menu_item_check label="Wyłącz poziom detalu" name="Disable LOD"/>
<menu_item_check label="Pokaż szczegóły kolizji" name="Show Collision Skeleton"/>
<menu_item_check label="Wyświetl cel agenta" name="Display Agent Target"/>
diff --git a/indra/newview/skins/default/xui/pl/notifications.xml b/indra/newview/skins/default/xui/pl/notifications.xml
index f255b1b8ea..62fda0d601 100755
--- a/indra/newview/skins/default/xui/pl/notifications.xml
+++ b/indra/newview/skins/default/xui/pl/notifications.xml
@@ -28,7 +28,7 @@
<template name="okcancelignore">
<form>
<button name="OK_okcancelignore" text="$yestext"/>
- <button name="Cancel_okcancelignore" text="$canceltext"/>
+ <button name="Cancel_okcancelignore" text="$notext"/>
</form>
</template>
<template name="okhelpbuttons">
@@ -67,6 +67,10 @@ Szczegóły błędu: Błąd o nazwie &apos;[_NAME]&apos; nie został odnaleziony
[MESSAGE]
<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="Tak"/>
</notification>
+ <notification name="GenericAlertOK">
+ [MESSAGE]
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
<notification name="BadInstallation">
Podczas aktualizacji [APP_NAME] wystąpił błąd. Proszę odwiedzić stronę [http://get.secondlife.com pobierz najnowsza wersję] aby ściągnąć ostatnią wersję klienta.
<usetemplate name="okbutton" yestext="OK"/>
@@ -85,6 +89,88 @@ Upewnij się, że Twoje połączenie z internetem działa.
Zapisać zmiany dotyczące ubrania/części ciała?
<usetemplate canceltext="Anuluj" name="yesnocancelbuttons" notext="Nie Zapisuj" yestext="Zapisz"/>
</notification>
+ <notification name="StockPasteFailed">
+ Kopiowanie lub przeniesienie do folderu magazynowego nie powiodło się:
+
+ &apos;[ERROR_CODE]&apos;
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="MerchantPasteFailed">
+ Kopiowanie lub przenoszenie przedmiotów na Marketplace nie powiodło się:
+
+&apos;[ERROR_CODE]&apos;
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="MerchantTransactionFailed">
+ Transakcja z Marketplace nie powiodła się:
+
+ Powód: &apos;[ERROR_REASON]&apos;
+ [ERROR_DESCRIPTION]
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="MerchantUnprocessableEntity">
+ Wylistowanie tego produktu lub aktywowanie folderu z wersją nie było możliwe. Zazwyczaj jest to spowodowane brakującymi informacjami w formularzu z opisem przedmiotu, ale może to również wynikać z błędów w strukturze folderów. Zmień opis przedmiotu lub sprawdź foldery, aby znaleźć błędy.
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="MerchantListingFailed">
+ Listowanie na Marketplace nie powiodło się:
+
+ &apos;[ERROR_CODE]&apos;
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="MerchantFolderActivationFailed">
+ Aktywacja tego folderu wersji nie powiodła się:
+
+ &apos;[ERROR_CODE]&apos;
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="ConfirmMerchantActiveChange">
+ Jeśli kontynuujesz, to zmieni się aktywna zawartość tego przedmiotu. Czy chcesz kontynuować?
+ <usetemplate ignoretext="Potwierdź przed zmodyfikowaniem aktywnego przedmiotu na Marketplace" name="okcancelignore" notext="Anuluj" yestext="OK"/>
+ </notification>
+ <notification name="ConfirmMerchantMoveInventory">
+ Przedmioty przeciągnięte do okna listowania na Marketplace są przenoszone z ich oryginalnych lokalizacji, a nie kopiowane. Czy chcesz kontynuować?
+ <usetemplate ignoretext="Potwierdź, zanim prześlę na Marketplace przedmiot z mojej Szafy" name="okcancelignore" notext="Anuluj" yestext="OK"/>
+ </notification>
+ <notification name="ConfirmListingCutOrDelete">
+ Przeniesienie lub usunięcie folderu usunie również Twój przedmiot na Marketplace. Jeśli chcesz, aby przedmiot był ciągle widoczny na Marketplace musisz przesunąć lub usunąć zawartość folderu z wersją, którą chcesz zmodyfikować. Czy chcesz kontynuować?
+ <usetemplate ignoretext="Potwierdź, zanim usunę lub przeniosę przedmiot na Marketplace" name="okcancelignore" notext="Anuluj" yestext="OK"/>
+ </notification>
+ <notification name="ConfirmCopyToMarketplace">
+ Nie masz praw do skopiowania jednego lub więcej obiektów na Marketplace. Możesz je przenieść lub pozostawić.
+ <usetemplate canceltext="Anuluj" ignoretext="Potwierdź, zanim wyślę na Marketplace przedmioty bez praw kopiowania" name="yesnocancelbuttons" notext="Nie przenoś" yestext="Przenieś"/>
+ </notification>
+ <notification name="ConfirmMerchantUnlist">
+ Jeśli kontynuujesz, to ten przedmiot zostanie usunięty z listy. Czy chcesz kontynuować?
+ <usetemplate ignoretext="Potwierdź, zanim usunę z listy przedmiot na Marketplace" name="okcancelignore" notext="Anuluj" yestext="OK"/>
+ </notification>
+ <notification name="ConfirmMerchantClearVersion">
+ Jeśli kontynuujesz, to folder wersji tego przedmiotu zostanie zdeaktywowany. Czy chcesz kontynuować?
+ <usetemplate ignoretext="Potwierdź przed wyłączeniem folderu wersji dla przedmiotu na Marketplace" name="okcancelignore" notext="Anuluj" yestext="OK"/>
+ </notification>
+ <notification name="AlertMerchantListingNotUpdated">
+ Ten przedmiot nie może zostać zaktualizowany.
+[[URL] Kliknij tutaj] aby zaktualizować go na Marketplace.
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="AlertMerchantListingCannotWear">
+ Nie możesz założyć ubrań lub części ciała, które znajdują się w folderze listingów Marketplace.
+ </notification>
+ <notification name="AlertMerchantListingInvalidID">
+ Nieprawidłowy ID przedmiotu.
+ </notification>
+ <notification name="AlertMerchantListingActivateRequired">
+ Istnieje kilka, lub żadna, wersji folderu dla tego przedmiotu. Będziesz musiała/ wybrać i uaktywnić jedną oddzielnie później.
+ <usetemplate ignoretext="Powiadamiaj o aktywacji folderu wersji, gdy tworzÄ™ przedmiot z kilkoma folderami wersji" name="okignore" yestext="OK"/>
+ </notification>
+ <notification name="AlertMerchantStockFolderSplit">
+ Przedmioty z ograniczonymi zasobami magazynowymi różnych typów zostały rozdzielone do osobnych folderów, aby ogólna hierarchia katalogów umożliwiała ich listowanie.
+ <usetemplate ignoretext="Powiadom, gdy folder magazynowy jest dzielony przed listowaniem" name="okignore" yestext="OK"/>
+ </notification>
+ <notification name="AlertMerchantStockFolderEmpty">
+ Twój przedmiot został usunięty z listy, ponieważ nie ma go już w magazynie. Musisz dodać więcej jego jednostek do folderu magazynowego, aby można było go ponownie wyświetlać na liście.
+ <usetemplate ignoretext="Powiadom, gdy przedmiot jest zdjęty z listy, bo folder zasobów magazynowych jest pusty" name="okignore" yestext="OK"/>
+ </notification>
<notification name="CompileQueueSaveText">
W trakcie ładwania tekstu dla skryptu pojawił się problem z następującego powodu: [REASON]. Spróbuj ponownie za kilka minut.
</notification>
@@ -391,6 +477,10 @@ Pamiętaj: Opcja ta wyczyszcza bufor danych.
Zapisać zmiany?
<usetemplate canceltext="Anuluj" name="yesnocancelbuttons" notext="Nie zapisuj" yestext="Zapisz"/>
</notification>
+ <notification name="DeleteNotecard">
+ Usunąć notkę?
+ <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+ </notification>
<notification name="GestureSaveFailedTooManySteps">
Nie można zapisać gesturki.
Ta gesturka ma zbyt wiele etapów.
@@ -1075,9 +1165,6 @@ Przekazać tą posiadłość o powierzchni [AREA] m² grupie &apos;[GROUP_NAME]&
<notification name="DisplaySetToSafe">
Ustawienia grafiki zostały zmienione do bezpiecznego poziomu ponieważ opcja -safe została wybrana.
</notification>
- <notification name="DisplaySetToRecommended">
- Ustawienia grafiki zostały zmienione do zalecanego poziomu na podstawie konfiguracji Twojego systemu.
- </notification>
<notification name="ErrorMessage">
[ERROR_MESSAGE]
<usetemplate name="okbutton" yestext="OK"/>
@@ -1338,6 +1425,7 @@ W celu instalacji aktualizacji musi zostać wykonany restart [APP_NAME].
</notification>
<notification name="RequiredUpdateDownloadedDialog">
W celu instalacji aktualizacji musi zostać wykonany restart [APP_NAME].
+[[INFO_URL] Information about this update]
<usetemplate name="okbutton" yestext="OK"/>
</notification>
<notification name="DeedObjectToGroup">
@@ -1415,12 +1503,6 @@ Chcesz opuścić grupę?
Nie możesz zaoferować znajomości w tym momencie. Spróbuj jeszcze raz za chwilę.
<usetemplate name="okbutton" yestext="OK"/>
</notification>
- <notification name="BusyModeSet">
- Tryb Pracy jest włączony.
-Czat i IM będą ukryte. Wysłane IM będą otrzymywały Twoją odpowiedź Trybu Pracy. Propozycje teleportacji będą odrzucone.
-Dodatkowo, wszystkie podarowane dla Ciebie obiekty będą automatycznie zapisywane w folderze &quot;Kosz&quot; w Twojej szafie.
- <usetemplate ignoretext="Status zmieniony na Tryb pracy" name="okignore" yestext="OK"/>
- </notification>
<notification name="JoinedTooManyGroupsMember">
Należysz już do maksymalnej ilości grup. Opuść proszę przynajmniej jedną grupę żeby przyjąć członkostwo w tej grupie, albo odmów.
[NAME] oferuje Ci członkostwo w grupie.
@@ -1434,8 +1516,8 @@ Dodatkowo, wszystkie podarowane dla Ciebie obiekty będą automatycznie zapisywa
Wyrzuć tego Rezydenta, wysyłając następujący komunikat.
<form name="form">
<input name="message">
- Administrator wylogował Cię.
- </input>
+ Administrator wylogował Cię.
+ </input>
<button name="OK" text="OK"/>
<button name="Cancel" text="Anuluj"/>
</form>
@@ -1444,8 +1526,8 @@ Dodatkowo, wszystkie podarowane dla Ciebie obiekty będą automatycznie zapisywa
Z jakim komunikatem wyrzucić wszystkich użytkowników z regionu?
<form name="form">
<input name="message">
- Administrator wylogował Cię.
- </input>
+ Administrator wylogował Cię.
+ </input>
<button name="OK" text="OK"/>
<button name="Cancel" text="Anuluj"/>
</form>
@@ -1454,8 +1536,8 @@ Dodatkowo, wszystkie podarowane dla Ciebie obiekty będą automatycznie zapisywa
Unieruchom tego Rezydenta, wysyłając następujący komunikat.
<form name="form">
<input name="message">
- Unieruchomiono Cię. Nie możesz się ruszać ani rozmawiać. Administrator skontaktuje się z Tobą poprzez IM.
- </input>
+ Unieruchomiono Cię. Nie możesz się ruszać ani rozmawiać. Administrator skontaktuje się z Tobą poprzez IM.
+ </input>
<button name="OK" text="OK"/>
<button name="Cancel" text="Anuluj"/>
</form>
@@ -1464,8 +1546,8 @@ Dodatkowo, wszystkie podarowane dla Ciebie obiekty będą automatycznie zapisywa
Cofnij unieruchomienie tego Rezydenta, wysyłając następujący komunikat.
<form name="form">
<input name="message">
- Odblokowano CiÄ™.
- </input>
+ Odblokowano CiÄ™.
+ </input>
<button name="OK" text="OK"/>
<button name="Cancel" text="Anuluj"/>
</form>
@@ -1617,14 +1699,8 @@ Kontynuować?
Upewnij się, że masz zainstalowaną najnowszą wersję klienta i skorzystaj z [SECOND_LIFE]:Pomoc by uzyskać więcej informacji na temat dostępu do regionów z podanym rodzajem treści jaką zawiera.
<usetemplate name="okbutton" yestext="OK"/>
</notification>
- <notification name="RegionEntryAccessBlocked_KB">
- Ze względu na Twój wiek, nie jesteś uprawniony do przebywania w tym regionie.
-
-Skorzystaj z [SECOND_LIFE]:Pomoc by uzyskać więcej informacji na temat dostępu do regionów z podanym rodzajem treści jaką zawiera.
- <url name="url">
- https://support.secondlife.com/ics/support/default.asp?deptID=4417&amp;task=knowledge&amp;questionID=6010
- </url>
- <usetemplate ignoretext="Ze względu na Twój wiek, nie jesteś uprawniony do przebywania w tym regionie. Może być to wynikiem braku informacji na temat weryfikacji Twojego wieku." name="okcancelignore" notext="Zamknij" yestext="[SECOND_LIFE]:Pomoc"/>
+ <notification name="SLM_UPDATE_FOLDER">
+ [MESSAGE]
</notification>
<notification name="RegionEntryAccessBlocked_Notify">
Ze względu na Twój wiek, nie jesteś uprawniony do przebywania w tym regionie.
@@ -1648,15 +1724,6 @@ W celu uzyskania dostępu do tego regiony zmień proszę swój status ustawień
Upewnij się, że masz zainstalowaną najnowszą wersję klienta i skorzystaj z [SECOND_LIFE]:Pomoc by uzyskać więcej informacji na temat dostępu do regionów z podanym rodzajem treści jaką zawiera.
<usetemplate name="okbutton" yestext="OK"/>
</notification>
- <notification name="LandClaimAccessBlocked_KB">
- Ze względu na Twój wiek, nie możesz odzyskać tej posiadłości.
-
-Skorzystaj z [SECOND_LIFE]:Pomoc by uzyskać więcej informacji na temat dostępu do regionów z podanym rodzajem treści jaką zawiera.
- <url name="url">
- https://support.secondlife.com/ics/support/default.asp?deptID=4417&amp;task=knowledge&amp;questionID=6010
- </url>
- <usetemplate ignoretext="W związku ze statusem ustawień Twojego wieku, nie możesz odzyskać tej posiadłości." name="okcancelignore" notext="Zamknij" yestext="[SECOND_LIFE]:Pomoc"/>
- </notification>
<notification name="LandClaimAccessBlocked_Notify">
Ze względu na Twój wiek, nie możesz odzyskać tej posiadłości.
</notification>
@@ -1664,7 +1731,6 @@ Skorzystaj z [SECOND_LIFE]:Pomoc by uzyskać więcej informacji na temat dostęp
W związku ze statusem ustawień Twojego wieku, nie możesz odzyskać tej posiadłości.
Możesz wybrać &apos;Zmień Ustawienia&apos; by dokonać zmian w ustawieniach Twojego wieku by uzyskać dostęp do regionu. Wówczas będziesz w stanie znaleźć oraz mieć dostęp do [REGIONMATURITY] treści. Jeżeli zdecydujesz się na powrót do poprzednich ustawień, wybierz Ja &gt; Ustawienia &gt; Główne.
- <usetemplate ignoretext="Ze względu na Twój wiek, nie możesz odzyskać tej posiadłości." name="okcancelignore" notext="Zamknij" yestext="Zmień Ustawienia"/>
</notification>
<notification name="LandBuyAccessBlocked">
Ze względu na Twój wiek, nie możesz kupić tej posiadłości. Może być to wynikiem braku informacji na temat weryfikacji Twojego wieku.
@@ -1672,15 +1738,6 @@ Możesz wybrać &apos;Zmień Ustawienia&apos; by dokonać zmian w ustawieniach T
Upewnij się, że masz zainstalowaną najnowszą wersję klienta i skorzystaj z [SECOND_LIFE]:Pomoc by uzyskać więcej informacji na temat dostępu do regionów z podanym rodzajem treści jaką zawiera.
<usetemplate name="okbutton" yestext="OK"/>
</notification>
- <notification name="LandBuyAccessBlocked_KB">
- Ze względu na Twój wiek, nie możesz kupić tej posiadłości.
-
-Skorzystaj z [SECOND_LIFE]:Pomoc by uzyskać więcej informacji na temat dostępu do regionów z podanym rodzajem treści jaką zawiera.
- <url name="url">
- https://support.secondlife.com/ics/support/default.asp?deptID=4417&amp;task=knowledge&amp;questionID=6010
- </url>
- <usetemplate ignoretext="Ze względu na Twój wiek, nie możesz kupić tej posiadłości." name="okcancelignore" notext="Zamknij" yestext="[SECOND_LIFE]:Pomoc"/>
- </notification>
<notification name="LandBuyAccessBlocked_Notify">
Ze względu na Twój wiek, nie możesz kupić tej posiadłości.
</notification>
@@ -1688,7 +1745,6 @@ Skorzystaj z [SECOND_LIFE]:Pomoc by uzyskać więcej informacji na temat dostęp
W związku ze statusem ustawień Twojego wieku, nie możesz kupić tej posiadłości.
Możesz wybrać &apos;Zmień Ustawienia&apos; by dokonać zmian w ustawieniach Twojego wieku by uzyskać dostęp do regionu. Wówczas będziesz w stanie znaleźć oraz mieć dostęp do [REGIONMATURITY] treści. Jeżeli zdecydujesz się na powrót do poprzednich ustawień, wybierz Ja &gt; Ustawienia &gt; Główne.
- <usetemplate ignoretext="W związku ze statusem ustawień Twojego wieku, nie możesz kupić tej posiadłości." name="okcancelignore" notext="Zamknij" yestext="Zmień Ustawienia"/>
</notification>
<notification name="TooManyPrimsSelected">
Zbyt wiele wybranych obiektów. Wybierz [MAX_PRIM_COUNT] lub mniej i spróbuj ponownie
@@ -1849,6 +1905,10 @@ Przenieść obiekty szafy?
<ignore name="ignore" text="Opcja Zapłać Obiektowi została aktywowana podczas budowania obiektów bez skryptu z funkcją money()."/>
</form>
</notification>
+ <notification name="PayConfirmation">
+ Potwierdź, że na pewno chcesz zapłacić [AMOUNT]L$ dla [TARGET].
+ <usetemplate ignoretext="Potwierdź przed płaceniem (kwoty ponad 200 L$)" name="okcancelignore" notext="Anuluj" yestext="Płać"/>
+ </notification>
<notification name="OpenObjectCannotCopy">
W tym obiekcie nie ma elementów które możesz skopiować.
</notification>
@@ -1918,16 +1978,6 @@ Chcesz go zamienić na wybrany obiekt?
<button ignore="Nie zamieniaj" name="No" text="Anuluj"/>
</form>
</notification>
- <notification label="Ostrzeżenie Trybu Pracy" name="BusyModePay">
- Jesteś w Trybie pracy co oznacza, że nie dostaniesz żadnych obiektów w zamian za tą opłatę.
-
-Chcesz wyłączyć Tryb pracy przed zakończeniem tej tranzakcji?
- <form name="form">
- <ignore name="ignore" save_option="true" text="Jesteś w Trybie Pracy co oznacza, że nie dostaniesz żadnych obiektów w zamian za tą opłatę. Chcesz wyłączyć Tryb Pracy przed zakończeniem tej transakcji?"/>
- <button ignore="Zawsz wyłączaj tryb pracy" name="Yes" text="OK"/>
- <button ignore="Nie wyłączaj trybu pracy" name="No" text="Anuluj"/>
- </form>
- </notification>
<notification name="ConfirmDeleteProtectedCategory">
Ten folder &apos;[FOLDERNAME]&apos; to folder systemowy. Usunięcie foldera systemowego spowoduje niestabilność. Czy na pewno chcesz go skasować?
<usetemplate ignoretext="Potwierdź zanim folder systemu zostanie skasowany" name="okcancelignore" notext="Anuluj" yestext="OK"/>
@@ -1965,10 +2015,6 @@ Zamieść go na stronie internetowej żeby umożliwić innym łatwy dostęp do t
Chcesz zmienić zapisane ustawienia?
<usetemplate name="okcancelbuttons" notext="Nie" yestext="Tak"/>
</notification>
- <notification name="WLDeletePresetAlert">
- Chcesz usunąć [SKY]?
- <usetemplate name="okcancelbuttons" notext="Nie" yestext="Tak"/>
- </notification>
<notification name="WLNoEditDefault">
Nie możesz edytować lub usunąć domyślnych ustawień.
</notification>
@@ -1979,35 +2025,6 @@ Zamieść go na stronie internetowej żeby umożliwić innym łatwy dostęp do t
Efekt post-procesu już istnieje. Chcesz zapisać nowy na jego miejsce?
<usetemplate name="okcancelbuttons" notext="Nie" yestext="Tak"/>
</notification>
- <notification name="NewSkyPreset">
- Nazwij nowe niebo.
- <form name="form">
- <input name="message">
- Nowe ustawienie
- </input>
- <button name="OK" text="OK"/>
- <button name="Cancel" text="Anuluj"/>
- </form>
- </notification>
- <notification name="ExistsSkyPresetAlert">
- Ustawienie już istnieje!
- </notification>
- <notification name="NewWaterPreset">
- Nazwij nowe ustawienie wody.
- <form name="form">
- <input name="message">
- Nowe ustawienie
- </input>
- <button name="OK" text="OK"/>
- <button name="Cancel" text="Anuluj"/>
- </form>
- </notification>
- <notification name="ExistsWaterPresetAlert">
- Ustawienie już istnieje!
- </notification>
- <notification name="WaterNoEditDefault">
- Domyślne ustawienie nie może być zmienione ani usunięte.
- </notification>
<notification name="ChatterBoxSessionStartError">
BÅ‚Ä…d podczas rozpoczynania czatu/IM z [RECIPIENT].
[REASON]
@@ -2038,10 +2055,6 @@ Zamieść go na stronie internetowej żeby umożliwić innym łatwy dostęp do t
Nie masz dostępu do tej posiadłości ze względu na brak weryfikacji Twojego wieku. Czy chcesz odwiedzić stronę [SECOND_LIFE] żeby to zmienić?
[_URL]
- <url name="url" option="0">
- https://secondlife.com/account/verification.php
- </url>
- <usetemplate ignoretext="Brak weryfikacji wieku" name="okcancelignore" notext="Nie" yestext="Tak"/>
</notification>
<notification name="Cannot enter parcel: no payment info on file">
Nie masz dostępu do tej posiadłości ze względu na brak danych o Twoim koncie. Czy chcesz odwiedzić stronę [SECOND_LIFE] żeby to zmienić?
@@ -2076,12 +2089,6 @@ Zamieść go na stronie internetowej żeby umożliwić innym łatwy dostęp do t
<notification name="GroupNotice">
Temat: [SUBJECT], Treść: [MESSAGE]
</notification>
- <notification name="FriendOnline">
- &lt;nolink&gt;[NAME]&lt;/nolink&gt; jest w Second Life
- </notification>
- <notification name="FriendOffline">
- &lt;nolink&gt;[NAME]&lt;/nolink&gt; opuszcza Second Life
- </notification>
<notification name="AddSelfFriend">
Nie możesz dodać siebie do listy znajomych.
</notification>
@@ -2525,22 +2532,17 @@ Czy siÄ™ zgadzasz?
<form name="form">
<button name="Grant" text="Zaakceptuj"/>
<button name="Deny" text="Odmów"/>
- <button name="Details" text="Szczegóły..."/>
</form>
</notification>
<notification name="ScriptDialog">
[NAME]&apos;s &apos;&lt;nolink&gt;[TITLE]&lt;/nolink&gt;&apos;
[MESSAGE]
- <form name="form">
- <button name="Ignore" text="Zignoruj"/>
- </form>
+ <form name="form"/>
</notification>
<notification name="ScriptDialogGroup">
[GROUPNAME]&apos;s &apos;&lt;nolink&gt;[TITLE]&lt;/nolink&gt;&apos;
[MESSAGE]
- <form name="form">
- <button name="Ignore" text="Zignoruj"/>
- </form>
+ <form name="form"/>
</notification>
<notification name="BuyLindenDollarSuccess">
Dziękujemy za wpłatę!
@@ -2857,10 +2859,6 @@ Kliknij i przeciągnij gdziekolwiek aby obrócić widok.
<button name="cancel" text="Anuluj"/>
</form>
</notification>
- <notification label="" name="ModeChange">
- Zmiana trybu wymaga restartu.
- <usetemplate name="okcancelbuttons" notext="Nie zamykaj" yestext="Zamknij"/>
- </notification>
<notification label="" name="NoClassifieds">
Tworzenie i edycja reklam jest możliwa tylko w trybie zaawansowanym. Czy chcesz wylogować się i zmienić tryb? Opcja wyboru trybu życia jest widoczna na ekranie logowania.
<usetemplate name="okcancelbuttons" notext="Nie zamykaj" yestext="Zamknij"/>
@@ -2889,9 +2887,6 @@ Kliknij i przeciągnij gdziekolwiek aby obrócić widok.
Płacenie innym Rezydentom jest możliwe tylko w trybie zaawansowanym. Czy chcesz się wylogować i zmienić tryb? Opcja wyboru trybu życia jest widoczna na ekranie logowania.
<usetemplate name="okcancelbuttons" notext="Nie zamykaj" yestext="Zamknij"/>
</notification>
- <global name="UnsupportedCPU">
- - Prędkość Twojego CPU nie spełnia minimalnych wymagań.
- </global>
<global name="UnsupportedGLRequirements">
Wygląda na to, że Twój system nie spełnia wymagań sprzętowych [APP_NAME]. [APP_NAME] wymaga karty graficznej kompatybilnej z OpenGL z multiteksturami. Jeżeli masz taką kartę zainstaluj najnowsze sterowniki do niej i uaktualnienia systemu operacyjnego.
@@ -2916,4 +2911,16 @@ W innym przypadku możesz poszukać na mapie miejsca oznaczone jako &quot;Infohu
<global name="You died and have been teleported to your home location">
Nastąpiła śmierć i teleportacja do Miejsca Startu.
</global>
+ <notification name="TeleportedByAttachment">
+ You have been teleported by an attachment on [ITEM_ID]
+ <usetemplate ignoretext="Zostałeś/aś teleportowany/a przez dodatek" name="notifyignore"/>
+ </notification>
+ <notification name="TeleportedByObjectOnParcel">
+ You have been teleported by the object '[OBJECT_NAME]' on the parcel '[PARCEL_NAME]'
+ <usetemplate ignoretext="Zostałeś/aś teleportowany/a przez obiekt na działce" name="notifyignore"/>
+ </notification>
+ <notification name="DefaultObjectPermissions">
+ Wystąpił problem z zapisywaniem domyślnych zezwoleń obiektu: [REASON]. Spróbuj ustawić je ponownie później.
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
</notifications>
diff --git a/indra/newview/skins/default/xui/pl/panel_login.xml b/indra/newview/skins/default/xui/pl/panel_login.xml
index c87a3d3bd4..42809a8afb 100755
--- a/indra/newview/skins/default/xui/pl/panel_login.xml
+++ b/indra/newview/skins/default/xui/pl/panel_login.xml
@@ -1,48 +1,11 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8"?>
<panel name="panel_login">
- <panel.string name="forgot_password_url">
- http://secondlife.com/account/request.php
- </panel.string>
- <layout_stack name="login_widgets">
- <layout_panel name="login">
- <text name="log_in_text">
- POÅÄ„CZ
- </text>
- <text name="username_text">
- Użytkownik:
- </text>
- <combo_box name="username_combo" tool_tip="Nazwę użytkownika wybierasz przy rejestracji, np. bobsmith12 lub Steller Sunshine"/>
- <text name="password_text">
- Hasło:
- </text>
- </layout_panel>
- <layout_panel name="start_location_panel">
- <text name="start_location_text">
- Rozpocznij w:
- </text>
- <combo_box name="start_location_combo">
- <combo_box.item label="Ostatnie Miejsce" name="MyLastLocation"/>
- <combo_box.item label="Moje Miejsce Startu" name="MyHome"/>
- <combo_box.item label="&lt;Wpisz Region&gt;" name="Typeregionname"/>
+ <panel.string name="forgot_password_url">http://secondlife.com/account/request.php</panel.string>
+ <layout_stack name="ui_stack">
+ <layout_panel name="ui_container">
+ <combo_box label="My favorite places" name="start_location_combo">
+ <combo_box.item label="Ostatnia lokalizacja" name="MyLastLocation"/>
</combo_box>
</layout_panel>
- <layout_panel name="links_login_panel">
- <text name="login_help">
- Potrzebujesz pomocy z logowaniem siÄ™?
- </text>
- <text name="forgot_password_text">
- Zapomniałeś swojej nazwy użytkownika lub hasła?
- </text>
- <button label="Połącz" name="connect_btn"/>
- <check_box label="Zapamiętaj hasło" name="remember_check"/>
- </layout_panel>
- <layout_panel name="links">
- <text name="create_account_text">
- CREATE YǾUR ACCǾUNT
- </text>
- <button name="create_new_account_btn"
- label="Utwórz nowe konto"
- width="120"/>
- </layout_panel>
</layout_stack>
</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_marketplace_listings.xml b/indra/newview/skins/default/xui/pl/panel_marketplace_listings.xml
new file mode 100644
index 0000000000..7db98a106d
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_marketplace_listings.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Marketplace" name="Marketplace Panel">
+ <panel name="tool_panel">
+ <menu_button name="sort_btn" tool_tip="Opcje widoku/sortowania"/>
+ <button name="add_btn" tool_tip="Utwórz nowy folder"/>
+ <button label="Zweryfikuj" name="audit_btn" tool_tip="Sprawdź swoje przedmioty na Marketplace"/>
+ </panel>
+ <panel name="tab_container_panel">
+ <filter_editor label="Filtruj przedmioty" name="filter_editor"/>
+ </panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_marketplace_listings_inventory.xml b/indra/newview/skins/default/xui/pl/panel_marketplace_listings_inventory.xml
new file mode 100644
index 0000000000..be4be5b80f
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_marketplace_listings_inventory.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<inventory_panel label="WSZYSTKO" name="All Items" tool_tip="Przeciągnij tutaj przedmioty, aby je wylistować"/>
diff --git a/indra/newview/skins/default/xui/pl/panel_marketplace_listings_listed.xml b/indra/newview/skins/default/xui/pl/panel_marketplace_listings_listed.xml
new file mode 100644
index 0000000000..3b17298742
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_marketplace_listings_listed.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<inventory_panel label="NA LIÅšCIE" name="Active Items"/>
diff --git a/indra/newview/skins/default/xui/pl/panel_marketplace_listings_unassociated.xml b/indra/newview/skins/default/xui/pl/panel_marketplace_listings_unassociated.xml
new file mode 100644
index 0000000000..f818da6821
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_marketplace_listings_unassociated.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<inventory_panel label="NIEPRZYPISANE" name="Unassociated Items"/>
diff --git a/indra/newview/skins/default/xui/pl/panel_marketplace_listings_unlisted.xml b/indra/newview/skins/default/xui/pl/panel_marketplace_listings_unlisted.xml
new file mode 100644
index 0000000000..8031fe78f7
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_marketplace_listings_unlisted.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<inventory_panel label="UKRYTE" name="Inactive Items"/>
diff --git a/indra/newview/skins/default/xui/pl/panel_status_bar.xml b/indra/newview/skins/default/xui/pl/panel_status_bar.xml
index 6aa0d27bb8..e9b1ba89a5 100755
--- a/indra/newview/skins/default/xui/pl/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/pl/panel_status_bar.xml
@@ -1,33 +1,17 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="status">
- <panel.string name="StatBarDaysOfWeek">
- Niedziela:Poniedziałek:Wtorek:Środa:Czwartek:Piątek:Sobota
- </panel.string>
- <panel.string name="StatBarMonthsOfYear">
- Styczeń:Luty:Marzec:Kwiecień:Maj:Czerwiec:Lipiec:Styczeń:Wrzesień:Październik:Listopad:Grudzień
- </panel.string>
- <panel.string name="packet_loss_tooltip">
- Utracone pakiety
- </panel.string>
- <panel.string name="bandwidth_tooltip">
- Przepustowość
- </panel.string>
- <panel.string name="time">
- [hour12, datetime, slt]:[min, datetime, slt] [ampm, datetime, slt] [timezone,datetime, slt]
- </panel.string>
- <panel.string name="timeTooltip">
- [weekday, datetime, slt], [day, datetime, slt] [month, datetime, slt] [year, datetime, slt]
- </panel.string>
- <panel.string name="buycurrencylabel">
- L$ [AMT]
- </panel.string>
+ <panel.string name="StatBarDaysOfWeek">Niedziela:Poniedziałek:Wtorek:Środa:Czwartek:Piątek:Sobota</panel.string>
+ <panel.string name="StatBarMonthsOfYear">Styczeń:Luty:Marzec:Kwiecień:Maj:Czerwiec:Lipiec:Styczeń:Wrzesień:Październik:Listopad:Grudzień</panel.string>
+ <panel.string name="packet_loss_tooltip">Utracone pakiety</panel.string>
+ <panel.string name="bandwidth_tooltip">Przepustowość</panel.string>
+ <panel.string name="time">[hour12, datetime, slt]:[min, datetime, slt] [ampm, datetime, slt] [timezone,datetime, slt]</panel.string>
+ <panel.string name="timeTooltip">[weekday, datetime, slt], [day, datetime, slt] [month, datetime, slt] [year, datetime, slt]</panel.string>
+ <panel.string name="buycurrencylabel">L$ [AMT]</panel.string>
<panel name="balance_bg">
- <text name="balance" tool_tip="Kliknij aby odświeżyć bilans L$" value="L$20"/>
+ <text name="balance" tool_tip="Kliknij aby odświeżyć bilans L$" value="L$??"/>
<button label="Kup L$" name="buyL" tool_tip="Kliknij aby kupić więcej L$"/>
</panel>
- <text name="TimeText" tool_tip="Obecny czas (Pacyficzny)">
- 24:00 AM PST
- </text>
+ <text name="TimeText" tool_tip="Obecny czas (Pacyficzny)">24:00 AM PST</text>
<button name="media_toggle_btn" tool_tip="Start/Stop wszystkie media (Muzyka, Video, WWW)"/>
<button name="volume_btn" tool_tip="Regulacja głośności"/>
</panel>
diff --git a/indra/newview/skins/default/xui/pl/sidepanel_item_info.xml b/indra/newview/skins/default/xui/pl/sidepanel_item_info.xml
index 9ec3c480b7..4b3df5cde8 100755
--- a/indra/newview/skins/default/xui/pl/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/pl/sidepanel_item_info.xml
@@ -63,9 +63,10 @@
<check_box label="Sprzedaje/&#10;Oddaje" name="CheckNextOwnerTransfer" tool_tip="Następny właściciel może oddawać lub sprzedawać ten obiekt"/>
</panel>
<check_box label="Na sprzedaż" name="CheckPurchase"/>
- <combo_box name="combobox sale copy">
- <combo_box.item label="Kopiuje" name="Copy"/>
- <combo_box.item label="Oryginalny" name="Original"/>
+ <combo_box name="ComboBoxSaleType">
+ <combo_box.item label="Kopia" name="Copy"/>
+ <combo_box.item label="Zawartość" name="Contents"/>
+ <combo_box.item label="Oryginał" name="Original"/>
</combo_box>
<spinner label="Cena: L$" name="Edit Cost"/>
</panel>
diff --git a/indra/newview/skins/default/xui/pl/sidepanel_task_info.xml b/indra/newview/skins/default/xui/pl/sidepanel_task_info.xml
index eb8c9cdbbb..503541a96e 100755
--- a/indra/newview/skins/default/xui/pl/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/pl/sidepanel_task_info.xml
@@ -1,65 +1,29 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="object properties" title="Profil Obiektu">
- <panel.string name="text deed continued">
- Przypisz
- </panel.string>
- <panel.string name="text deed">
- Przypisz
- </panel.string>
- <panel.string name="text modify info 1">
- Możesz modyfikować ten obiekt
- </panel.string>
- <panel.string name="text modify info 2">
- Możesz modyfikować te obiekty
- </panel.string>
- <panel.string name="text modify info 3">
- Nie możesz modyfikować tego obiektu
- </panel.string>
- <panel.string name="text modify info 4">
- Nie możesz modyfikować tych obiektów
- </panel.string>
- <panel.string name="text modify warning">
- Ten obiekt ma części zgrupowane
- </panel.string>
- <panel.string name="Cost Default">
- Cena: L$
- </panel.string>
- <panel.string name="Cost Total">
- Cena całkowita: L$
- </panel.string>
- <panel.string name="Cost Per Unit">
- Cena za jednostkÄ™: L$
- </panel.string>
- <panel.string name="Cost Mixed">
- Cena mieszana
- </panel.string>
- <panel.string name="Sale Mixed">
- Sprzedaż mieszana
- </panel.string>
+ <panel.string name="text deed continued">Przypisz</panel.string>
+ <panel.string name="text deed">Przypisz</panel.string>
+ <panel.string name="text modify info 1">Możesz modyfikować ten obiekt</panel.string>
+ <panel.string name="text modify info 2">Możesz modyfikować te obiekty</panel.string>
+ <panel.string name="text modify info 3">Nie możesz modyfikować tego obiektu</panel.string>
+ <panel.string name="text modify info 4">Nie możesz modyfikować tych obiektów</panel.string>
+ <panel.string name="text modify warning">Ten obiekt ma części zgrupowane</panel.string>
+ <panel.string name="Cost Default">Cena: L$</panel.string>
+ <panel.string name="Cost Total">Suma: L$</panel.string>
+ <panel.string name="Cost Per Unit">Cena za jednostkÄ™: L$</panel.string>
+ <panel.string name="Cost Mixed">Cena mieszana</panel.string>
+ <panel.string name="Sale Mixed">Sprzedaż mieszana</panel.string>
<text name="title" value="Profil Obiektu"/>
<text name="where" value="(W Åšwiecie)"/>
<panel label="" name="properties_panel">
- <text name="Name:">
- Nazwa:
- </text>
- <text name="Description:">
- Opis:
- </text>
- <text name="CreatorNameLabel">
- Twórca:
- </text>
- <text name="Owner:">
- Właściciel:
- </text>
- <text name="Group_label">
- Grupa:
- </text>
+ <text name="Name:">Nazwa:</text>
+ <text name="Description:">Opis:</text>
+ <text name="CreatorNameLabel">Twórca:</text>
+ <text name="Owner:">Właściciel:</text>
+ <text name="Group_label">Grupa:</text>
<button name="button set group" tool_tip="Wybierz grupę by udostępnić jej prawa do tego obiektu"/>
<name_box initial_value="Åadowanie..." name="Group Name Proxy"/>
<button label="Przypisz" label_selected="Przypisz" name="button deed" tool_tip="Opcja przepisania udostępnia obiektowi takie same prawa jak zostały zaznaczone dla następnego właściciela. Obiekty udostępnione grupie mogą zostać przepisane dla grupy przez oficera grupy."/>
- <text name="label click action">
- Kliknij by:
- </text>
+ <text name="label click action">Kliknij by:</text>
<combo_box name="clickaction">
<combo_box.item label="Dotknij (domyślne)" name="Touch/grab(default)"/>
<combo_box.item label="Usiądź na obiekcie" name="Sitonobject"/>
@@ -68,21 +32,13 @@
<combo_box.item label="Otwórz" name="Open"/>
</combo_box>
<panel name="perms_inv">
- <text name="perm_modify">
- Możesz modyfikować ten obiekt
- </text>
- <text name="Anyone can:">
- Każdy:
- </text>
+ <text name="perm_modify">Możesz modyfikować ten obiekt</text>
+ <text name="Anyone can:">Każdy:</text>
<check_box label="Kopiuj" name="checkbox allow everyone copy"/>
<check_box label="Przesuń" name="checkbox allow everyone move"/>
- <text name="GroupLabel">
- Grupie:
- </text>
+ <text name="GroupLabel">Grupie:</text>
<check_box label="Udostępnij" name="checkbox share with group" tool_tip="Udostępnij prawa do modyfikacji tego obiektu wszystkim członkom, którzy posiadają przywilej modyfikacji obiektów grupy. By ograniczyć, przypisz obiekt do grupy."/>
- <text name="NextOwnerLabel">
- Następny Właściciel:
- </text>
+ <text name="NextOwnerLabel">Następny Właściciel:</text>
<check_box label="Modyfikuj" name="checkbox next owner can modify"/>
<check_box label="Kopiuj" name="checkbox next owner can copy"/>
<check_box label="Oddaj" name="checkbox next owner can transfer" tool_tip="Następny właściciel może sprzedać lub oddać ten obiekt"/>
@@ -95,24 +51,12 @@
</combo_box>
<spinner label="Cena: L$" name="Edit Cost"/>
<check_box label="Pokaż w wyszukiwarce" name="search_check" tool_tip="Udostępnij widzialność tego obiektu w wyszukiwarce"/>
- <text name="B:">
- B:
- </text>
- <text name="O:">
- O:
- </text>
- <text name="G:">
- G:
- </text>
- <text name="E:">
- E:
- </text>
- <text name="N:">
- N:
- </text>
- <text name="F:">
- F:
- </text>
+ <text name="B:">B:</text>
+ <text name="O:">O:</text>
+ <text name="G:">G:</text>
+ <text name="E:">E:</text>
+ <text name="N:">N:</text>
+ <text name="F:">F:</text>
</panel>
<panel name="button_panel">
<button label="Otwórz" name="open_btn"/>
diff --git a/indra/newview/skins/default/xui/pl/strings.xml b/indra/newview/skins/default/xui/pl/strings.xml
index f86e393646..7801d50457 100755
--- a/indra/newview/skins/default/xui/pl/strings.xml
+++ b/indra/newview/skins/default/xui/pl/strings.xml
@@ -182,6 +182,48 @@
Tylko pojedynczy obiekt może być tutaj przeciągnięty
</string>
<string name="TooltipPrice" value="L$[AMOUNT]:"/>
+ <string name="TooltipOutboxDragToWorld">
+ Nie możesz rezzować obiektów z folderu rzeczy na Marketplace
+ </string>
+ <string name="TooltipOutboxWorn">
+ Nie możesz umieszczać na Marketplace przedmiotów, które masz na sobie założone
+ </string>
+ <string name="TooltipOutboxFolderLevels">
+ Głębokość zagnieżdżonych folderów przekracza [AMOUNT]. Zmniejsz ilość zagdzieżdżeń; Spakuj przedmioty w pudełka, jeśli to pomoże.
+ </string>
+ <string name="TooltipOutboxTooManyFolders">
+ Ilość podfolderów w folderze najwyższego poziomu przekracza [AMOUNT]. Zmniejsz ilość folderów; Spakuj przedmioty w pudełka, jeśli to pomoże.
+ </string>
+ <string name="TooltipOutboxTooManyObjects">
+ Ilość pozycji w folderze najwyższego poziomu przekracza [AMOUNT]. Jeśli chcesz sprzedać więcej, niż [AMOUNT] przedmiotów jako jedną pozycję, to musisz je spakować w pudełka.
+ </string>
+ <string name="TooltipOutboxTooManyStockItems">
+ Ilość przedmiotów w folderze magazynowym przekracza [AMOUNT].
+ </string>
+ <string name="TooltipOutboxCannotDropOnRoot">
+ Możesz przenosić foldery lub przedmioty wyłącznie do karty WSZYSTKO. Wybierz teraz tą kartę i spróbuj ponownie.
+ </string>
+ <string name="TooltipOutboxNoTransfer">
+ Jeden lub kilka z tych obiektów nie może zostać sprzedany / przetransferowany
+ </string>
+ <string name="TooltipOutboxNotInInventory">
+ Marketplace akceptuje tylko przedmioty bezpośrednio z Twojej Szafy.
+ </string>
+ <string name="TooltipOutboxLinked">
+ Nie możesz sprzedać zlinkowanych folderów lub przedmiotów na Marketplace
+ </string>
+ <string name="TooltipOutboxCallingCard">
+ Nie możesz umieszczać wizytówek na Marketplace
+ </string>
+ <string name="TooltipOutboxDragActive">
+ Nie można przenieść wylistowanego przedmiotu
+ </string>
+ <string name="TooltipOutboxCannotMoveRoot">
+ Nie możesz przenieść folderu głównego przedmiotów na Marketplace
+ </string>
+ <string name="TooltipOutboxMixedStock">
+ Wszystkie przedmioty w folderze magazynowym muszą mieć ten sam typ i zezwolenia
+ </string>
<string name="TooltipHttpUrl">
Kliknij aby zobaczyć zawartość tej strony internetowej
</string>
@@ -429,9 +471,6 @@
<string name="AvatarAway">
Åšpi
</string>
- <string name="AvatarBusy">
- Pracuje
- </string>
<string name="AvatarMuted">
Wyciszony
</string>
@@ -723,6 +762,7 @@
<string name="ControlYourCamera">
Kontroluj kamerÄ™
</string>
+ <string name="JoinAnExperience"/><!-- intentionally blank -->
<string name="SIM_ACCESS_PG">
&apos;General&apos;
</string>
@@ -777,6 +817,12 @@
<string name="bitmap_image_files">
Obrazy bitmap
</string>
+ <string name="png_image_files">
+ Obrazy PNG
+ </string>
+ <string name="save_texture_image_files">
+ Obrazy Targa lub PNG
+ </string>
<string name="avi_movie_file">
Pliki filmowe AVI
</string>
@@ -798,18 +844,6 @@
<string name="choose_the_directory">
Wybierz katalog
</string>
- <string name="AvatarSetNotAway">
- Ustaw Nie Åšpij
- </string>
- <string name="AvatarSetAway">
- Åšpij
- </string>
- <string name="AvatarSetNotBusy">
- Ustawiaj Nie Pracuj
- </string>
- <string name="AvatarSetBusy">
- Pracuj
- </string>
<string name="shape">
Kształt
</string>
@@ -1032,10 +1066,102 @@
<string name="FavoritesNoMatchingItems">
Przeciągnij landmark tutaj aby dodać go do swoich ulubionych.
</string>
+ <string name="MarketplaceNoMatchingItems">
+ Niczego nie znaleziono. Sprawdź pisownię i spróbuj ponownie.
+ </string>
<string name="InventoryNoTexture">
Nie posiadasz kopii tej tekstury w Twojej Szafie.
</string>
- <string name="Unconstrained">Swobodny</string>
+ <string name="InventoryMarketplaceError">
+ Ta funkcjonalność jest obecnie w fazie Beta. Dodaj proszę swoje imię do tego [http://goo.gl/forms/FCQ7UXkakz formularza Google] (w języku angielskim), jeśli chcesz wziąć udział w programie Beta i pomóc.
+ </string>
+ <string name="InventoryMarketplaceListingsNoItemsTitle">
+ Twój folder przedmiotów na Marketplace jest pusty.
+ </string>
+ <string name="InventoryMarketplaceListingsNoItems">
+ Przeciągnij foldery do tego obszaru, aby dodać je na listę sprzedaży w [[MARKETPLACE_DASHBOARD_URL] Marketplace].
+ </string>
+ <string name="Marketplace Validation Warning Stock">
+ folder magazynowy musi być zawarty w folderze wersji
+ </string>
+ <string name="Marketplace Validation Error Mixed Stock">
+ : Błąd: wszystkie przedmioty w folderze magazynowym muszą mieć ten sam typ i być niekopiowalne
+ </string>
+ <string name="Marketplace Validation Error Subfolder In Stock">
+ : Błąd: folder magazynowy nie może zawierać podfolderów
+ </string>
+ <string name="Marketplace Validation Warning Empty">
+ : Uwaga: folder jest pusty
+ </string>
+ <string name="Marketplace Validation Warning Create Stock">
+ : Uwaga: tworzÄ™ folder magazynowy
+ </string>
+ <string name="Marketplace Validation Warning Create Version">
+ : Uwaga: tworzÄ™ folder wersji
+ </string>
+ <string name="Marketplace Validation Warning Move">
+ : Uwaga: przenoszÄ™ przedmioty
+ </string>
+ <string name="Marketplace Validation Warning Delete">
+ : Uwaga: zawartość folderu przeniesiona do folderu magazynowego, usuwam pusty katalog
+ </string>
+ <string name="Marketplace Validation Error Stock Item">
+ : Błąd: przedmioty bez praw kopiowania muszą się znajdować w folderze magazynowym
+ </string>
+ <string name="Marketplace Validation Warning Unwrapped Item">
+ : Uwaga: przedmioty muszą się znajdować w folderze wersji
+ </string>
+ <string name="Marketplace Validation Error">
+ : BÅ‚Ä…d:
+ </string>
+ <string name="Marketplace Validation Warning">
+ : Uwaga:
+ </string>
+ <string name="Marketplace Validation Error Empty Version">
+ : Uwaga: folder wersji musi zawierać przynajmniej jedną pozycję
+ </string>
+ <string name="Marketplace Validation Error Empty Stock">
+ : Uwaga: folder magazynowy musi zawierać przynajmniej jedną pozycję
+ </string>
+ <string name="Marketplace Validation No Error">
+ Brak błędów lub ostrzeżeń
+ </string>
+ <string name="Marketplace Error Prefix">
+ BÅ‚Ä…d:
+ </string>
+ <string name="Marketplace Error Not Merchant">
+ Przed wysłaniem przedmiotów na Marketplace musisz zostać kupcem (darmowe).
+ </string>
+ <string name="Marketplace Error Not Accepted">
+ Nie można przenieść tego przedmiotu.
+ </string>
+ <string name="Marketplace Error Unsellable Item">
+ Ta pozycja nie może być sprzedana na Marketplace.
+ </string>
+ <string name="MarketplaceNoID">
+ no Mkt ID
+ </string>
+ <string name="MarketplaceLive">
+ na liście
+ </string>
+ <string name="MarketplaceActive">
+ aktywne
+ </string>
+ <string name="MarketplaceMax">
+ maks
+ </string>
+ <string name="MarketplaceStock">
+ magazyn
+ </string>
+ <string name="MarketplaceNoStock">
+ brak w magazynie
+ </string>
+ <string name="MarketplaceUpdating">
+ aktualizacja...
+ </string>
+ <string name="Unconstrained">
+ Swobodny
+ </string>
<string name="no_transfer" value=" (brak oddawania)"/>
<string name="no_modify" value=" (brak modyfikowania)"/>
<string name="no_copy" value=" (brak kopiowania)"/>
@@ -1049,6 +1175,7 @@
Brak zawartości
</string>
<string name="WornOnAttachmentPoint" value=" (założony na [ATTACHMENT_POINT])"/>
+ <string name="AttachmentErrorMessage" value="([ATTACHMENT_ERROR])"/>
<string name="ActiveGesture" value="[GESLABEL] (aktywne)"/>
<string name="Chat Message" value="Czat:"/>
<string name="Sound" value=" Dźwięk :"/>
@@ -1286,6 +1413,15 @@
<string name="Invalid Attachment">
Nieważny punkt załącznika
</string>
+ <string name="ATTACHMENT_MISSING_ITEM">
+ BÅ‚Ä…d: brakujÄ…cy przedmiot
+ </string>
+ <string name="ATTACHMENT_MISSING_BASE_ITEM">
+ BÅ‚Ä…d: brakujÄ…ca baza przedmiotu
+ </string>
+ <string name="ATTACHMENT_NOT_ATTACHED">
+ Błąd: obiekt jest w obecnym stroju, ale nie jest założony
+ </string>
<string name="YearsMonthsOld">
[AGEYEARS] [AGEMONTHS]
</string>
@@ -1451,6 +1587,9 @@
<string name="SaveComplete">
Zapisywanie zakończone.
</string>
+ <string name="UploadFailed">
+ Åadowanie nieudane:
+ </string>
<string name="ObjectOutOfRange">
Skrypt (obiekt poza zasięgiem)
</string>
@@ -1675,9 +1814,6 @@
<string name="PanelContentsNewScript">
Nowy skrypt
</string>
- <string name="BusyModeResponseDefault">
- Rezydent, do którego wysłałeś wiadomość prywatną znajduje się w trybie pracy. Oznacza to, iż Twoja wiadomość zostanie zapisana do przejrzenia poźniej.
- </string>
<string name="MuteByName">
(Nazwa)
</string>
@@ -1780,9 +1916,6 @@
<string name="GroupMoneyDebits">
Debet
</string>
- <string name="ViewerObjectContents">
- Zawartość
- </string>
<string name="AcquiredItems">
Zdobyte obiekty
</string>
@@ -4338,4 +4471,10 @@ Spróbuj załączyć ścieżkę do edytora w cytowaniu.
<string name="ParticleHiding">
Ukryj czÄ…steczki
</string>
+ <string name="Command_MarketplaceListings_Label">
+ Marketplace
+ </string>
+ <string name="Command_MarketplaceListings_Tooltip">
+ Sprzedaj owoce swojej twórczości
+ </string>
</strings>
diff --git a/indra/newview/skins/default/xui/pt/floater_about.xml b/indra/newview/skins/default/xui/pt/floater_about.xml
index 47975a6386..1e2edd7a2f 100755
--- a/indra/newview/skins/default/xui/pt/floater_about.xml
+++ b/indra/newview/skins/default/xui/pt/floater_about.xml
@@ -1,73 +1,16 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="floater_about" title="SOBRE [CAPITALIZED_APP_NAME]">
- <floater.string name="AboutHeader">
- [APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2] ([VIEWER_VERSION_3]) [BUILD_DATE] [BUILD_TIME] ([CHANNEL])[[VIEWER_RELEASE_NOTES_URL] [ReleaseNotes]]
- </floater.string>
- <floater.string name="AboutCompiler">
- Construído com [COMPILER] versão [COMPILER_VERSION]
- </floater.string>
- <floater.string name="AboutPosition">
- Você está em [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1] em [REGION] localizado em &lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt; ([HOSTIP])
-SLURL: &lt;nolink&gt;[SLURL]&lt;/nolink&gt;
-(coordenadas globais [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1])
-[SERVER_VERSION]
-[SERVER_RELEASE_NOTES_URL]
- </floater.string>
- <floater.string name="AboutSystem">
- CPU: [CPU]
-Memória: [MEMORY_MB] MBs
-Versão OS: [OS_VERSION]
-Placa de vídeo: [GRAPHICS_CARD_VENDOR]
-Placa gráfica: [GRAPHICS_CARD]
- </floater.string>
- <floater.string name="AboutDriver">
- Versão do driver de vídeo Windows: [GRAPHICS_CARD_VENDOR]
- </floater.string>
- <floater.string name="AboutLibs">
- Versão OpenGL: [OPENGL_VERSION]
-
-Versão libcurl: [LIBCURL_VERSION]
-Versão J2C Decoder: [J2C_VERSION]
-Versão do driver de áudio: [AUDIO_DRIVER_VERSION]
-Versão Qt Webkit: [QT_WEBKIT_VERSION]
-Versão do servidor de voz: [VOICE_VERSION]
- </floater.string>
- <floater.string name="none">
- (nenhum)
- </floater.string>
- <floater.string name="AboutTraffic">
- Packets Lost: [PACKETS_LOST,number,0]/[PACKETS_IN,number,0] ([PACKETS_PCT,number,1]%)
- </floater.string>
- <floater.string name="ErrorFetchingServerReleaseNotesURL">
- Erro ao obter URL de notas de versão do servidor.
- </floater.string>
<tab_container name="about_tab">
<panel label="Info" name="support_panel">
<button label="Copiar" name="copy_btn"/>
</panel>
<panel label="Créditos" name="credits_panel">
- <text name="linden_intro">
- O Second Life é trazido a você pela Lindens:
- </text>
- <text_editor name="linden_names">
- Philip, Andrew, Doug, Richard, Phoenix, Ian, Mark, Robin, Dan, Char, Ryan, Eric, Jim, Lee, Jeff, Michael, Kelly, Steve, Catherine, Bub, Ramzi, Jill, Jeska, Don, Kona, Callum, Charity, Jack, Shawn, babbage, James, Lauren, Blue, Brent, Reuben, Pathfinder, Jesse, Patsy, Torley, Bo, Cyn, Jonathan, Gia, Annette, Ginsu, Harry, Lex, Runitai, Guy, Cornelius, Beth, Swiss, Thumper, Wendy, Teeple, Seth, Dee, Mia, Sally, Liana, Aura, Beez, Milo, Red, Gulliver, Marius, Joe, Jose, Dore, Justin, Nora, Morpheus, Lexie, Amber, Chris, Xan, Leyla, Walker, Sabin, Joshua, Hiromi, Tofu, Fritz, June, Jean, Ivy, Dez, Ken, Betsy, Which, Spike, Rob, Zee, Dustin, George, Claudia, del, Matthew, jane, jay, Adrian, Yool, Rika, Yoz, siobhan, Qarl, Benjamin, Beast, Everett, madhavi, Christopher, Izzy, stephany, Jeremy, sean, adreanne, Pramod, Tobin, sejong, Iridium, maurice, kj, Meta, kari, JP, bert, kyle, Jon, Socrates, Bridie, Ivan, maria, Aric, Coco, Periapse, sandy, Storrs, Lotte, Colossus, Brad, Pastrami, Zen, BigPapi, Banzai, Sardonyx, Mani, Garry, Jaime, Neuro, Samuel, Niko, CeeLo, Austin, Soft, Poppy, emma, tessa, angelo, kurz, alexa, Sue, CG, Blake, Erica, Brett, Bevis, kristen, Q, simon, Enus, MJ, laurap, Kip, Scouse, Ron, Ram, kend, Marty, Prospero, melissa, kraft, Nat, Seraph, Hamilton, Lordan, Green, miz, Ashlei, Trinity, Ekim, Echo, Charlie, Rowan, Rome, Jt, Doris, benoc, Christy, Bao, Kate, Tj, Patch, Cheah, Johan, Brandy, Angela, Oreh, Cogsworth, Lan, Mitchell, Space, Bambers, Einstein, Bender, Malbers, Matias, Maggie, Rothman, Milton, Niall, Marin, Allison, Mango, Andrea, Katt, Yi, Ambroff, Rico, Raymond, Gail, Christa, William, Dawn, Usi, Dynamike, M, Corr, Dante, Molly, kaylee, Danica, Kelv, Lil, jacob, Nya, Rodney, elsie, Blondin, Grant, Nyx, Devin, Monty, Minerva, Keira, Katie, Jenn, Makai, Clare, Joy, Cody, Gayathri, FJ, spider, Oskar, Landon, Jarv, Noelle, Al, Doc, Gray, Vir, t, Maestro, Simone, Shannon, yang, Courtney, Scott, charlene, Quixote, Susan, Zed, Amanda, Katelin, Esbee, JoRoan, Enkidu, roxie, Scarlet, Merov, Kevin, Judy, Rand, Newell, Les, Dessie, Galen, Michon, Geo, Siz, Calyle, Pete, Praveen, Callen, Sheldon, Pink, Nelson, jenelle, Terrence, Nathan, Juan, Sascha, Huseby, Karina, Kaye, Kotler, Lis, Darv, Charrell, Dakota, Kimmora, Theeba, Taka, Mae, Perry, Ducot, dana, Esther, Dough, gisele, Doten, Viale, Fisher, jessieann, ashley, Torres, delby, rountree, kurt, Slaton, Madison, Rue, Gino, Wen, Casssandra, Brodesky, Squid, Gez, Rakesh, Gecko, Ladan, Tony, Tatem, Squire, Falcon, BK, Crimp, Tiggs, Bacon, Coyot, Carmilla, Webb, Sea, Arch, Jillian, Jason, Bernard, Vogt, Peggy, dragon, Pup, xandix, Wallace, Bewest, Inoshiro, Rhett, AG, Aimee, Ghengis, Itiaes, Eli, Steffan, Epic, Grapes, Stone, Prep, Scobu, Robert, Alain, Carla, Vicky, Tia, Alec, Taras, Lisa, Oz, Ariane, Log, House, Kazu, Kim, Drofnas, Tyler, Campbell, Michele, Madeline, Nelly, Baron, Thor, Lori, Hele, Fredrik, Teddy, Pixie, Berry, Gabrielle, Alfonso, Brooke, Wolf, Ringo, Cru, Charlar, Rodvik, Gibson, Elise, Bagman, Greger, Leonidas, Jerm, Leslie, CB, Brenda, Durian, Carlo, mm, Zeeshan, Caleb, Max, Elikak, Mercille, Steph, Chase
- </text_editor>
- <text name="contrib_intro">
- com contribuições de código aberto de:
- </text>
- <text_editor name="contrib_names">
- Dummy Name substituído durante a execução
- </text_editor>
- <text name="trans_intro">
- e traduções de:
- </text>
- <text_editor name="trans_names">
- Dummy Name substituído durante a execução
- </text_editor>
+ <text name="linden_intro">O Second Life é trazido a você pela Lindens,
+com contribuições de código aberto de:</text>
+ <text_editor name="contrib_names">Dummy Name substituído durante a execução</text_editor>
</panel>
<panel label="Licenças" name="licenses_panel">
- <text_editor name="credits_editor">
- 3Dconnexion SDK Copyright (C) 1992-2009 3Dconnexion
+ <text_editor name="licenses_editor">3Dconnexion SDK Copyright (C) 1992-2009 3Dconnexion
APR Copyright (C) 2011 The Apache Software Foundation
Collada DOM Copyright 2006 Sony Computer Entertainment Inc.
cURL Copyright (C) 1996-2010, Daniel Stenberg, (daniel@haxx.se)
@@ -94,8 +37,7 @@ Versão do servidor de voz: [VOICE_VERSION]
Todos os direitos reservados. Consulte licenses.txt para obter detalhes.
- Codificação de áudio da conversa com voz: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
- </text_editor>
+ Codificação de áudio da conversa com voz: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)</text_editor>
</panel>
</tab_container>
</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_about_land.xml b/indra/newview/skins/default/xui/pt/floater_about_land.xml
index f48280840c..fee939ab46 100755
--- a/indra/newview/skins/default/xui/pt/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/pt/floater_about_land.xml
@@ -308,9 +308,6 @@ Apenas lotes maiores podem ser listados na busca.
<panel.string name="push_restrict_region_text">
Proibido empurrar (regulamento da região)
</panel.string>
- <panel.string name="see_avs_text">
- Avatares em outros lotes podem ver
- </panel.string>
<text name="allow_label">
Autorizar outros residentes a:
</text>
@@ -336,22 +333,6 @@ Apenas lotes maiores podem ser listados na busca.
<check_box label="Seguro (sem danos)" name="check safe" tool_tip="Se ativado, ajusta o terreno para Seguro, impedindo lutas com danos. Se não ativado, lutas com danos é habilitado."/>
<check_box label="Proibido empurrar" name="PushRestrictCheck" tool_tip="Evita scripts que empurram. Ativar essa opção ajuda a prevenir comportamentos desordeiros no seu terreno."/>
<check_box label="Mostrar terreno nos resultados de busca (L$30/semana)" name="ShowDirectoryCheck" tool_tip="Permitir que as pessoas vejam este terreno nos resultados de busca"/>
- <combo_box name="land category with adult">
- <combo_box.item label="Qualquer categoria" name="item0"/>
- <combo_box.item label="Locação Linden" name="item1"/>
- <combo_box.item label="Adulto" name="item2"/>
- <combo_box.item label="Artes e cultura" name="item3"/>
- <combo_box.item label="Negócios" name="item4"/>
- <combo_box.item label="Educacional" name="item5"/>
- <combo_box.item label="Jogos" name="item6"/>
- <combo_box.item label="Moradia" name="item7"/>
- <combo_box.item label="Amigável a novos usuários" name="item8"/>
- <combo_box.item label="Parques &amp; Natureza" name="item9"/>
- <combo_box.item label="Residencial" name="item10"/>
- <combo_box.item label="Compras" name="item11"/>
- <combo_box.item label="Aluguel" name="item13"/>
- <combo_box.item label="Outros" name="item12"/>
- </combo_box>
<combo_box name="land category">
<combo_box.item label="Qualquer categoria" name="item0"/>
<combo_box.item label="Locação Linden" name="item1"/>
@@ -451,15 +432,9 @@ Mídia:
<panel.string name="access_estate_defined">
(Definições do terreno)
</panel.string>
- <panel.string name="allow_public_access">
- Acesso para público: [MATURITY]) (Desmarcar esse item cria limites)
- </panel.string>
<panel.string name="estate_override">
Uma ou mais destas opções está definida no nível de propriedade.
</panel.string>
- <text name="Limit access to this parcel to:">
- Acesso a este lote
- </text>
<check_box label="Permitir acesso público (Desmarcar esse item cria limites)" name="public_access"/>
<text name="Only Allow">
Permitir acesso apenas para residentes que:
@@ -491,5 +466,6 @@ Mídia:
<button label="Tirar" label_selected="Tirar" name="remove_banned"/>
</panel>
</panel>
+ <panel label="EXPERIÊNCIAS" name="land_experiences_panel"/>
</tab_container>
</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_associate_listing.xml b/indra/newview/skins/default/xui/pt/floater_associate_listing.xml
new file mode 100644
index 0000000000..1fac5643b0
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_associate_listing.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="associate listing" title="ASSOCIAR LISTAGEM">
+ <text name="message">ID de listagem:</text>
+ <line_editor name="listing_id">Digite a ID aqui</line_editor>
+ <button label="OK" name="OK"/>
+ <button label="Cancelar" name="Cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_edit_hover_height.xml b/indra/newview/skins/default/xui/pt/floater_edit_hover_height.xml
new file mode 100644
index 0000000000..163ab440ea
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_edit_hover_height.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="HoverHeight" title="DEFINIR ALTURA DE FOCO">
+ <slider label="Altura" name="HoverHeightSlider"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_experience_search.xml b/indra/newview/skins/default/xui/pt/floater_experience_search.xml
new file mode 100644
index 0000000000..cf87717b45
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_experience_search.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="experiencepicker" title="ESCOLHER EXPERIÊNCIA"/>
diff --git a/indra/newview/skins/default/xui/pt/floater_experienceprofile.xml b/indra/newview/skins/default/xui/pt/floater_experienceprofile.xml
new file mode 100644
index 0000000000..97f8576b16
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_experienceprofile.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater title="EXPERIENCE PROFILE">
+ <floater.string name="empty_slurl">
+ (none)
+ </floater.string>
+ <floater.string name="maturity_icon_general">
+ &quot;Parcel_PG_Light&quot;
+ </floater.string>
+ <floater.string name="maturity_icon_moderate">
+ &quot;Parcel_M_Light&quot;
+ </floater.string>
+ <floater.string name="maturity_icon_adult">
+ &quot;Parcel_R_Light&quot;
+ </floater.string>
+ <text name="edit_title" value="Perfil de experiência"/>
+ <tab_container name="tab_container">
+ <panel name="panel_experience_info">
+ <scroll_container name="xp_scroll">
+ <panel name="scrolling_panel">
+ <layout_stack>
+ <layout_panel name="top panel">
+ <button label="Editar" name="edit_btn"/>
+ </layout_panel>
+ <layout_panel name="maturity panel">
+ <text name="ContentRating">
+ Classificação:
+ </text>
+ </layout_panel>
+ <layout_panel name="location panel">
+ <text name="Location">
+ Localização:
+ </text>
+ </layout_panel>
+ <layout_panel>
+ <text name="Owner">
+ Proprietário:
+ </text>
+ </layout_panel>
+ <layout_panel name="group_panel">
+ <text name="Group">
+ Grupo:
+ </text>
+ </layout_panel>
+ <layout_panel name="perm panel">
+ <button label="Permitir" name="allow_btn"/>
+ <button label="Ignorar" name="forget_btn"/>
+ <button label="Bloquear" name="block_btn"/>
+ <text name="privileged">
+ Essa experiência está disponível para todos os residentes.
+ </text>
+ <button label="Denunciar abuso" name="report_btn"/>
+ </layout_panel>
+ </layout_stack>
+ </panel>
+ </scroll_container>
+ </panel>
+ <panel name="edit_panel_experience_info">
+ <scroll_container name="edit_xp_scroll">
+ <panel name="edit_scrolling_panel">
+ <text name="edit_experience_title_label" value="Nome:"/>
+ <text name="edit_experience_desc_label" value="Descrição:"/>
+ <button label="Grupo" name="Group_btn"/>
+ <text name="edit_ContentRating">
+ Classificação:
+ </text>
+ <icons_combo_box label="Moderado" name="edit_ContentRatingText" tool_tip="Aumentar a classificação de maturidade sobre uma experiência redefinirá a permissão para todos os residentes que permitiram a experiência.">
+ <icons_combo_box.item label="Adulto" name="Adult" value="42"/>
+ <icons_combo_box.item label="Moderado" name="Mature" value="21"/>
+ <icons_combo_box.item label="Geral" name="PG" value="13"/>
+ </icons_combo_box>
+ <text name="edit_Location">
+ Localização:
+ </text>
+ <button label="Definir como atual" name="location_btn"/>
+ <button label="Limpar localização" name="clear_btn"/>
+ <check_box label="Ativar experiência" name="edit_enable_btn" tool_tip=""/>
+ <check_box label="Ocultar nos resultados de pesquisa" name="edit_private_btn"/>
+ <text name="changes" value="As alterações de experiência podem levar vários minutos para ser visualizadas em todas as regiões."/>
+ <button label="Retornar" name="cancel_btn"/>
+ <button label="Salvar" name="save_btn"/>
+ </panel>
+ </scroll_container>
+ </panel>
+ </tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_experiences.xml b/indra/newview/skins/default/xui/pt/floater_experiences.xml
new file mode 100644
index 0000000000..53be98e3f9
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_experiences.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_experiences" title="EXPERIÊNCIAS"/>
diff --git a/indra/newview/skins/default/xui/pt/floater_facebook.xml b/indra/newview/skins/default/xui/pt/floater_facebook.xml
index c211d75e9b..af30582237 100644
--- a/indra/newview/skins/default/xui/pt/floater_facebook.xml
+++ b/indra/newview/skins/default/xui/pt/floater_facebook.xml
@@ -1,20 +1,15 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="floater_facebook" title="PUBLICAR NO FACEBOOK">
- <panel name="background">
- <tab_container name="tabs">
- <panel label="STATUS" name="panel_facebook_status"/>
- <panel label="FOTO" name="panel_facebook_photo"/>
- <panel label="FAZER CHECK IN" name="panel_facebook_place"/>
- <panel label="AMIGOS" name="panel_facebook_friends"/>
- <panel label="CONTA" name="panel_facebook_account"/>
- </tab_container>
- <panel name="connection_status_panel">
- <text name="connection_error_text">
- Erro
- </text>
- <text name="connection_loading_text">
- Carregando...
- </text>
- </panel>
- </panel>
+ <tab_container name="tabs">
+ <panel label="STATUS" name="panel_facebook_status"/>
+ <panel label="FOTO" name="panel_facebook_photo"/>
+ <panel label="FAZER CHECK IN" name="panel_facebook_place"/>
+ <panel label="AMIGOS" name="panel_facebook_friends"/>
+ </tab_container>
+ <text name="connection_error_text">
+ Erro
+ </text>
+ <text name="connection_loading_text">
+ Carregando...
+ </text>
</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/pt/floater_inventory_item_properties.xml
index 8a8f1f5b34..5f04c08531 100755
--- a/indra/newview/skins/default/xui/pt/floater_inventory_item_properties.xml
+++ b/indra/newview/skins/default/xui/pt/floater_inventory_item_properties.xml
@@ -1,67 +1,36 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="item properties" title="PROPRIEDADES DE ITEM NO INVENTÃRIO">
- <floater.string name="unknown">
- (desconhecido)
- </floater.string>
- <floater.string name="public">
- (público)
- </floater.string>
- <floater.string name="you_can">
- Você pode:
- </floater.string>
- <floater.string name="owner_can">
- Proprietário pode :
- </floater.string>
- <floater.string name="acquiredDate">
- [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]
- </floater.string>
- <text name="LabelItemNameTitle">
- Nome:
- </text>
- <text name="LabelItemDescTitle">
- Descrição:
- </text>
- <text name="LabelCreatorTitle">
- Criador:
- </text>
+ <floater.string name="unknown">(desconhecido)</floater.string>
+ <floater.string name="public">(público)</floater.string>
+ <floater.string name="you_can">Você pode:</floater.string>
+ <floater.string name="owner_can">Proprietário pode :</floater.string>
+ <floater.string name="acquiredDate">[wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]</floater.string>
+ <text name="LabelItemNameTitle">Nome:</text>
+ <text name="LabelItemDescTitle">Descrição:</text>
+ <text name="LabelCreatorTitle">Criador:</text>
<button label="Perfil..." label_selected="" name="BtnCreator"/>
- <text name="LabelOwnerTitle">
- Dono:
- </text>
+ <text name="LabelOwnerTitle">Dono:</text>
<button label="Perfil..." label_selected="" name="BtnOwner"/>
- <text name="LabelAcquiredTitle">
- Adquirido:
- </text>
- <text name="LabelAcquiredDate">
- Qua Mai 24 12:50:46 2006
- </text>
- <text name="OwnerLabel">
- Você:
- </text>
+ <text name="LabelAcquiredTitle">Adquirido:</text>
+ <text name="LabelAcquiredDate">Qua Mai 24 12:50:46 2006</text>
+ <text name="OwnerLabel">Você:</text>
<check_box label="Editar" name="CheckOwnerModify"/>
<check_box label="Copiar" name="CheckOwnerCopy"/>
<check_box label="Revender" name="CheckOwnerTransfer"/>
- <text name="AnyoneLabel">
- Todos:
- </text>
+ <text name="AnyoneLabel">Todos:</text>
<check_box label="Cortar" name="CheckEveryoneCopy"/>
- <text name="GroupLabel">
- Grupo:
- </text>
+ <text name="GroupLabel">Grupo:</text>
<check_box label="Compartilhar" name="CheckShareWithGroup"/>
- <text name="NextOwnerLabel" width="230">
- Próximo proprietário:
- </text>
+ <text name="NextOwnerLabel" width="230">Próximo proprietário:</text>
<check_box label="Editar" name="CheckNextOwnerModify"/>
<check_box label="Copiar" name="CheckNextOwnerCopy"/>
<check_box label="Revender" name="CheckNextOwnerTransfer"/>
<check_box label="À venda" name="CheckPurchase"/>
- <combo_box name="combobox sale copy">
+ <combo_box name="ComboBoxSaleType">
<combo_box.item label="Cortar" name="Copy"/>
+ <combo_box.item label="Conteúdo" name="Contents"/>
<combo_box.item label="Original" name="Original"/>
</combo_box>
<spinner label="Preço:" name="Edit Cost"/>
- <text name="CurrencySymbol">
- L$
- </text>
+ <text name="CurrencySymbol">L$</text>
</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/pt/floater_inventory_view_finder.xml
index 71759abdc2..2bb95a5605 100755
--- a/indra/newview/skins/default/xui/pt/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/pt/floater_inventory_view_finder.xml
@@ -5,8 +5,8 @@
<check_box label="Roupas" name="check_clothing"/>
<check_box label="Gestos" name="check_gesture"/>
<check_box label="Landmarks" name="check_landmark"/>
- <check_box label="Meshes:" name="check_mesh"/>
<check_box label="Anotações" name="check_notecard"/>
+ <check_box label="Meshes:" name="check_mesh"/>
<check_box label="Objetos" name="check_object"/>
<check_box label="Scripts" name="check_script"/>
<check_box label="Sons" name="check_sound"/>
@@ -19,6 +19,10 @@
<text name="- OR -">
- OU -
</text>
+ <radio_group name="date_search_direction">
+ <radio_item label="Antes de" name="newer"/>
+ <radio_item label="Depois de" name="older"/>
+ </radio_group>
<spinner label="Horas Atrás" name="spin_hours_ago"/>
<spinner label="Dias Atrás" name="spin_days_ago"/>
<button label="Fechar" label_selected="Fechar" name="Close"/>
diff --git a/indra/newview/skins/default/xui/pt/floater_item_properties.xml b/indra/newview/skins/default/xui/pt/floater_item_properties.xml
new file mode 100644
index 0000000000..400196c3c3
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_item_properties.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Item Properties" title="PROPRIEDADES DO ITEM"/>
diff --git a/indra/newview/skins/default/xui/pt/floater_lagmeter.xml b/indra/newview/skins/default/xui/pt/floater_lagmeter.xml
index 9932318293..cdaec96c86 100644
--- a/indra/newview/skins/default/xui/pt/floater_lagmeter.xml
+++ b/indra/newview/skins/default/xui/pt/floater_lagmeter.xml
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="floater_lagmeter" title="LAG - Ãndice">
<floater.string name="max_title_msg">
- Medidor de Atraso
+ Lag Meter
</floater.string>
<floater.string name="max_width_px">
360
</floater.string>
<floater.string name="min_title_msg">
- Atraso
+ Lag
</floater.string>
<floater.string name="min_width_px">
90
@@ -22,28 +22,28 @@
15
</floater.string>
<floater.string name="client_frame_time_window_bg_msg">
- Normal, janela por baixo
+ Normal, janela em segundo plano
</floater.string>
<floater.string name="client_frame_time_critical_msg">
- Taxa de quadros do Cliente abaixo de [CLIENT_FRAME_RATE_CRITICAL]
+ Taxa de quadros do cliente menor que [CLIENT_FRAME_RATE_CRITICAL]
</floater.string>
<floater.string name="client_frame_time_warning_msg">
- Taxa de quadros do Cliente entre [CLIENT_FRAME_RATE_CRITICAL] e [CLIENT_FRAME_RATE_WARNING]
+ Taxa de quadros do cliente entre [CLIENT_FRAME_RATE_CRITICAL] e [CLIENT_FRAME_RATE_WARNING]
</floater.string>
<floater.string name="client_frame_time_normal_msg">
Normal
</floater.string>
<floater.string name="client_draw_distance_cause_msg">
- Causa possível: Distância de desenho ajustada muito alta
+ Possível causa: distância de desenho definida com um valor muito alto
</floater.string>
<floater.string name="client_texture_loading_cause_msg">
- Causa possível: Carregamento de Imagens
+ Possível causa: imagens em carregamento
</floater.string>
<floater.string name="client_texture_memory_cause_msg">
- Causa possível: Muitas imagens na memória
+ Possível causa: muitas imagens na memória
</floater.string>
<floater.string name="client_complex_objects_cause_msg">
- Causa possível: Muitos objetos complexos na cena
+ Possível causa: muitos objetos complexos na cena
</floater.string>
<floater.string name="network_text_msg">
Rede
@@ -55,10 +55,10 @@
5
</floater.string>
<floater.string name="network_packet_loss_critical_msg">
- Conexão está caindo para cerca de [NETWORK_PACKET_LOSS_CRITICAL]% de pacotes
+ A conexão está caindo devido a [NETWORK_PACKET_LOSS_CRITICAL]% de pacotes
</floater.string>
<floater.string name="network_packet_loss_warning_msg">
- Conexão está caindo [NETWORK_PACKET_LOSS_WARNING]%-[NETWORK_PACKET_LOSS_CRITICAL]% de pacotes
+ A conexão está caindo devido a [NETWORK_PACKET_LOSS_WARNING]%-[NETWORK_PACKET_LOSS_CRITICAL]% de pacotes
</floater.string>
<floater.string name="network_performance_normal_msg">
Normal
@@ -70,16 +70,16 @@
300
</floater.string>
<floater.string name="network_ping_critical_msg">
- Tempo de conexão de ping é cerca de [NETWORK_PING_CRITICAL] ms
+ Ping time da conexão com mais de [NETWORK_PING_CRITICAL] ms
</floater.string>
<floater.string name="network_ping_warning_msg">
- Tempo de conexão de ping é [NETWORK_PING_WARNING]-[NETWORK_PING_CRITICAL] ms
+ Ping time da conexão com mais de [NETWORK_PING_WARNING]-[NETWORK_PING_CRITICAL] ms
</floater.string>
<floater.string name="network_packet_loss_cause_msg">
- Possível conexão ruim ou &apos;Largura de Banda&apos; escolhida muito alta.
+ Possível conexão ruim ou pref de &apos;Banda larga&apos; muito alta
</floater.string>
<floater.string name="network_ping_cause_msg">
- Possível conexão ruim ou aplicativos compartilhando arquivos.
+ Possível conexão ruim ou app de compartilhamento de arquivo
</floater.string>
<floater.string name="server_text_msg">
Servidor
@@ -94,31 +94,31 @@
20
</floater.string>
<floater.string name="server_frame_time_critical_msg">
- Taxa de quadros abaixo de [SERVER_FRAME_RATE_CRITICAL]
+ Taxa de quadros de simulador abaixo de [SERVER_FRAME_RATE_CRITICAL]
</floater.string>
<floater.string name="server_frame_time_warning_msg">
- Taxa de quadros entre [SERVER_FRAME_RATE_CRITICAL] e [SERVER_FRAME_RATE_WARNING]
+ Taxa de quadros de simulador entre [SERVER_FRAME_RATE_CRITICAL] e [SERVER_FRAME_RATE_WARNING]
</floater.string>
<floater.string name="server_frame_time_normal_msg">
Normal
</floater.string>
<floater.string name="server_physics_cause_msg">
- Causa possível: Muitos objetos físicos
+ Possível causa: muitos objetos físicos
</floater.string>
<floater.string name="server_scripts_cause_msg">
- Causa possível: Muitos objetos com scripts
+ Possível causa: muitos objetos de script
</floater.string>
<floater.string name="server_net_cause_msg">
- Causa possível: Muito tráfego na rede
+ Possível causa: tráfego de rede intenso
</floater.string>
<floater.string name="server_agent_cause_msg">
- Causa possível: Muitas pessoas se movendo na região
+ Possível causa: muitas pessoas se movendo na região
</floater.string>
<floater.string name="server_images_cause_msg">
- Causa possível: Muitos cálculos de imagem
+ Possível causa: muitos cálculos de imagem
</floater.string>
<floater.string name="server_generic_cause_msg">
- Causa possível: Carga no simulador muito pesada
+ Possível causa: carga do simulador muito pesada
</floater.string>
<floater.string name="smaller_label">
&gt;&gt;
@@ -126,7 +126,7 @@
<floater.string name="bigger_label">
&lt;&lt;
</floater.string>
- <button label="" label_selected="" name="client_lagmeter" tool_tip="Status de atraso no Cliente"/>
+ <button label="" label_selected="" name="client_lagmeter" tool_tip="Status do lag do cliente"/>
<text name="client">
Cliente
</text>
@@ -134,7 +134,7 @@
Normal
</text>
<text left="30" name="client_lag_cause" right="-10"/>
- <button label="" label_selected="" name="network_lagmeter" tool_tip="Status de atraso na rede"/>
+ <button label="" label_selected="" name="network_lagmeter" tool_tip="Status do lag da rede"/>
<text name="network">
Rede
</text>
@@ -142,7 +142,7 @@
Normal
</text>
<text left="30" name="network_lag_cause" right="-10"/>
- <button label="" label_selected="" name="server_lagmeter" tool_tip="Status de atraso no servidor"/>
+ <button label="" label_selected="" name="server_lagmeter" tool_tip="Status do lag do servidor"/>
<text name="server">
Servidor
</text>
diff --git a/indra/newview/skins/default/xui/pt/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/pt/floater_live_lsleditor.xml
index 5ad116ac8a..635bc2d34b 100755
--- a/indra/newview/skins/default/xui/pt/floater_live_lsleditor.xml
+++ b/indra/newview/skins/default/xui/pt/floater_live_lsleditor.xml
@@ -9,7 +9,24 @@
<floater.string name="Title">
SCRIPT: [NAME]
</floater.string>
+ <floater.string name="experience_enabled">
+ Desmarque para remover a experiência atual
+ </floater.string>
+ <floater.string name="no_experiences">
+ Você não está autorizado a nenhuma experiência
+ </floater.string>
+ <floater.string name="add_experiences">
+ Selecione para adicionar uma experiência
+ </floater.string>
+ <floater.string name="show_experience_profile">
+ Clique para visualizar o perfil da experiência
+ </floater.string>
+ <floater.string name="loading">
+ Carregando...
+ </floater.string>
<button label="Resetar" label_selected="Resetar" name="Reset"/>
<check_box initial_value="true" label="Correndo" name="running"/>
<check_box initial_value="true" label="Mono" left="86" name="mono"/>
+ <check_box label="Usar experiência:" name="enable_xp"/>
+ <button label="&gt;" name="view_profile"/>
</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_marketplace_listings.xml b/indra/newview/skins/default/xui/pt/floater_marketplace_listings.xml
new file mode 100644
index 0000000000..fa4ac50ab0
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_marketplace_listings.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_marketplace_listings" title="LISTAGENS DO MARKETPLACE">
+ <panel name="marketplace_listings_panel">
+ <panel>
+ <panel name="marketplace_listings_inventory_placeholder_panel">
+ <text name="marketplace_listings_inventory_placeholder_title">Carregando...</text>
+ </panel>
+ </panel>
+ </panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_marketplace_validation.xml b/indra/newview/skins/default/xui/pt/floater_marketplace_validation.xml
new file mode 100644
index 0000000000..39e59a687f
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_marketplace_validation.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_marketplace_validation" title="Auditar Listagens do Marketplace">
+ <button label="OK" label_selected="OK" name="OK"/>
+ <text_editor name="validation_text">MARKETPLACE_VALIDATION_TEXT</text_editor>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_openobject.xml b/indra/newview/skins/default/xui/pt/floater_openobject.xml
index 0dc2852bac..e8b72700c9 100755
--- a/indra/newview/skins/default/xui/pt/floater_openobject.xml
+++ b/indra/newview/skins/default/xui/pt/floater_openobject.xml
@@ -3,6 +3,11 @@
<text name="object_name">
[DESC]:
</text>
- <button label="Copiar para Inventário" label_selected="Copiar para Inventário" name="copy_to_inventory_button" width="132"/>
- <button label="Copiar e Vestir" label_selected="Copiar e Vestir" left="152" name="copy_and_wear_button"/>
+ <text name="border_note">
+ Copiar para inventário e vestir
+ </text>
+ <button label="Adicionar ao look" label_selected="Adicionar ao look" left="152" name="copy_and_wear_button"/>
+ <button label="Substituir look" label_selected="Substituir look" name="copy_and_replace_button"/>
+ <button label="Apenas copiar para inventário" label_selected="Apenas copiar para inventário" name="copy_to_inventory_button" width="132"/>
+ <button label="Cancelar" label_selected="Cancelar" name="cancel_button"/>
</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_pay.xml b/indra/newview/skins/default/xui/pt/floater_pay.xml
index 8094ad376c..77e814b575 100755
--- a/indra/newview/skins/default/xui/pt/floater_pay.xml
+++ b/indra/newview/skins/default/xui/pt/floater_pay.xml
@@ -1,25 +1,18 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="Give Money" title="">
- <string name="payee_group">
- Pagar grupo
- </string>
- <string name="payee_resident">
- Pagar residente
- </string>
- <text left="5" name="payee_label">
- Pagar:
- </text>
- <icon name="icon_person" tool_tip="Pessoa"/>
- <text name="payee_name">
- Test Name That Is Extremely Long To Check Clipping
- </text>
- <button label="L$1" label_selected="L$1" name="fastpay 1"/>
- <button label="L$5" label_selected="L$5" name="fastpay 5"/>
- <button label="L$10" label_selected="L$10" name="fastpay 10"/>
- <button label="L$20" label_selected="L$20" name="fastpay 20"/>
- <text name="amount text">
- Outro valor:
- </text>
- <button label="Pagar" label_selected="Pagar" name="pay btn"/>
- <button label="Cancelar" label_selected="Cancelar" name="cancel btn"/>
+ <string name="payee_group">Pagar grupo</string>
+ <string name="payee_resident">Pagar residente</string>
+ <text name="paying_text">Você está pagando:</text>
+ <text name="payee_name">Test Name That Is Extremely Long To Check Clipping</text>
+ <panel label="Buscar" name="PatternsPanel">
+ <button label="Pagar L$ 1" label_selected="Pagar L$ 1" name="fastpay 1"/>
+ <button label="Pagar L$ 5" label_selected="Pagar L$ 5" name="fastpay 5"/>
+ <button label="Pagar L$ 10" label_selected="Pagar L$ 10" name="fastpay 10"/>
+ <button label="Pagar L$ 20" label_selected="Pagar L$ 20" name="fastpay 20"/>
+ </panel>
+ <panel label="Buscar" name="InputPanel">
+ <text name="amount text">Outro valor:</text>
+ <button label="Pagar" label_selected="Pagar" name="pay btn"/>
+ <button label="Cancelar" label_selected="Cancelar" name="cancel btn"/>
+ </panel>
</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_pay_object.xml b/indra/newview/skins/default/xui/pt/floater_pay_object.xml
index a5579f03bf..4f7fa6ca67 100755
--- a/indra/newview/skins/default/xui/pt/floater_pay_object.xml
+++ b/indra/newview/skins/default/xui/pt/floater_pay_object.xml
@@ -1,30 +1,21 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="Give Money" title="">
- <string halign="left" name="payee_group" width="100">
- Pagar grupo
- </string>
- <string halign="left" name="payee_resident" width="120">
- Pagar residente
- </string>
- <icon name="icon_person" tool_tip="Pessoa"/>
- <text left="105" name="payee_name">
- Ericacita Moostopolison
- </text>
- <text halign="left" left="5" name="object_name_label" width="95">
- Via objeto:
- </text>
+ <string halign="left" name="payee_group" width="100">Pagar grupo</string>
+ <string halign="left" name="payee_resident" width="120">Pagar residente</string>
+ <text name="paying_text">Você está pagando:</text>
+ <text left="105" name="payee_name">Ericacita Moostopolison</text>
+ <text halign="left" left="5" name="object_name_label" width="95">Via objeto:</text>
<icon name="icon_object" tool_tip="Objects"/>
- <text left="105" name="object_name_text">
- Meu objeto maravilho, fantástico e com nome comprido e imaginativo
- </text>
- <button label="L$1" label_selected="L$1" left="125" name="fastpay 1" width="70"/>
- <button label="L$5" label_selected="L$5" left="200" name="fastpay 5" width="70"/>
- <button label="L$10" label_selected="L$10" left="125" name="fastpay 10" width="70"/>
- <button label="L$20" label_selected="L$20" left="200" name="fastpay 20" width="70"/>
- <text halign="left" left="5" name="amount text">
- Outro valor:
- </text>
- <line_editor left="60" name="amount" width="50"/>
- <button label="Pagar" label_selected="Pagar" name="pay btn"/>
- <button label="Cancelar" label_selected="Cancelar" name="cancel btn"/>
+ <text left="105" name="object_name_text">Meu objeto maravilho, fantástico e com nome comprido e imaginativo</text>
+ <panel label="Buscar" name="PatternsPanel">
+ <button label="Pagar L$ 1" label_selected="Pagar L$ 1" name="fastpay 1"/>
+ <button label="Pagar L$ 5" label_selected="Pagar L$ 5" name="fastpay 5"/>
+ <button label="Pagar L$ 10" label_selected="Pagar L$ 10" name="fastpay 10"/>
+ <button label="Pagar L$ 20" label_selected="Pagar L$ 20" name="fastpay 20"/>
+ </panel>
+ <panel label="Buscar" name="InputPanel">
+ <text name="amount text">Outro valor:</text>
+ <button label="Pagar" label_selected="Pagar" name="pay btn"/>
+ <button label="Cancelar" label_selected="Cancelar" name="cancel btn"/>
+ </panel>
</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_report_abuse.xml b/indra/newview/skins/default/xui/pt/floater_report_abuse.xml
index e6d9961d0b..f30201fc33 100755
--- a/indra/newview/skins/default/xui/pt/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/pt/floater_report_abuse.xml
@@ -76,7 +76,7 @@
<combo_box.item label="Terreno &gt; Invasão &gt; Objetos ou texturas" name="Land__Encroachment__Objects_textures"/>
<combo_box.item label="Terra &gt; Invasão &gt; Partículas" name="Land__Encroachment__Particles"/>
<combo_box.item label="Terra &gt; Violação &gt; Ãrvores/plantas" name="Land__Encroachment__Trees_plants"/>
- <combo_box.item label="Apostas ou jogos de azar" name="Wagering_gambling"/>
+ <combo_box.item label="Violação da política sobre jogos" name="Wagering_gambling"/>
<combo_box.item label="Outro" name="Other"/>
</combo_box>
<text name="abuser_name_title">
diff --git a/indra/newview/skins/default/xui/pt/floater_snapshot.xml b/indra/newview/skins/default/xui/pt/floater_snapshot.xml
index 3dd7f69d50..e3812ed708 100755
--- a/indra/newview/skins/default/xui/pt/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/pt/floater_snapshot.xml
@@ -39,17 +39,8 @@
<string name="local_failed_str">
Falha ao salvar no computador.
</string>
- <button name="advanced_options_btn" tool_tip="Opções avançadas"/>
- <text name="image_res_text">
- [WIDTH] x [HEIGHT] px
- </text>
- <text name="file_size_label">
- [TAMANHO] KB
- </text>
+ <button label="ATUALIZAR" name="new_snapshot_btn"/>
<panel name="advanced_options_panel">
- <text name="advanced_options_label">
- OPÇÕES AVANÇADAS
- </text>
<text name="layer_type_label">
Capturar:
</text>
@@ -68,4 +59,10 @@
<combo_box.item label="Sem filtro" name="NoFilter"/>
</combo_box>
</panel>
+ <text name="image_res_text">
+ [WIDTH]px (largura) x [HEIGHT]px (altura)
+ </text>
+ <text name="file_size_label">
+ [TAMANHO] KB
+ </text>
</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_top_objects.xml b/indra/newview/skins/default/xui/pt/floater_top_objects.xml
index ef682714c6..f37b5be23f 100755
--- a/indra/newview/skins/default/xui/pt/floater_top_objects.xml
+++ b/indra/newview/skins/default/xui/pt/floater_top_objects.xml
@@ -21,6 +21,12 @@
<floater.string name="none_descriptor">
Nenhum encontrado.
</floater.string>
+ <floater.string name="URLs">
+ URLs
+ </floater.string>
+ <floater.string name="memory">
+ Memória (KB)
+ </floater.string>
<text name="title_text">
Carregando...
</text>
@@ -30,7 +36,7 @@
<scroll_list.columns label="Proprietário" name="owner"/>
<scroll_list.columns label="Local" name="location"/>
<scroll_list.columns label="Lote" name="parcel"/>
- <scroll_list.columns label="Tempo" name="time"/>
+ <scroll_list.columns label="Data" name="time"/>
<scroll_list.columns label="URLs" name="URLs"/>
<scroll_list.columns label="Memória (KB)" name="memory"/>
</scroll_list>
diff --git a/indra/newview/skins/default/xui/pt/floater_twitter.xml b/indra/newview/skins/default/xui/pt/floater_twitter.xml
index 4d7f9e323c..14bee3ffc3 100644
--- a/indra/newview/skins/default/xui/pt/floater_twitter.xml
+++ b/indra/newview/skins/default/xui/pt/floater_twitter.xml
@@ -1,17 +1,13 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="floater_twitter" title="TWITTER">
- <panel name="background">
- <tab_container name="tabs">
- <panel label="REDIGIR" name="panel_twitter_photo"/>
- <panel label="CONTA" name="panel_twitter_account"/>
- </tab_container>
- <panel name="connection_status_panel">
- <text name="connection_error_text">
- Erro
- </text>
- <text name="connection_loading_text">
- Carregando...
- </text>
- </panel>
- </panel>
+ <tab_container name="tabs">
+ <panel label="REDIGIR" name="panel_twitter_photo"/>
+ <panel label="CONTA" name="panel_twitter_account"/>
+ </tab_container>
+ <text name="connection_error_text">
+ Erro
+ </text>
+ <text name="connection_loading_text">
+ Carregando...
+ </text>
</floater>
diff --git a/indra/newview/skins/default/xui/pt/menu_attachment_self.xml b/indra/newview/skins/default/xui/pt/menu_attachment_self.xml
index 2d4cd670e6..ac79422110 100755
--- a/indra/newview/skins/default/xui/pt/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/pt/menu_attachment_self.xml
@@ -8,6 +8,7 @@
<menu_item_call label="Minha aparência" name="Change Outfit"/>
<menu_item_call label="Editar meu look" name="Edit Outfit"/>
<menu_item_call label="Editar meu corpo" name="Edit My Shape"/>
+ <menu_item_call label="Altura de foco" name="Hover Height"/>
<menu_item_call label="Meus amigos" name="Friends..."/>
<menu_item_call label="Meus grupos" name="Groups..."/>
<menu_item_call label="Meu perfil" name="Profile..."/>
diff --git a/indra/newview/skins/default/xui/pt/menu_avatar_self.xml b/indra/newview/skins/default/xui/pt/menu_avatar_self.xml
index 447b77657b..a0ac71e018 100755
--- a/indra/newview/skins/default/xui/pt/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/pt/menu_avatar_self.xml
@@ -25,6 +25,7 @@
<menu_item_call label="Minha aparência" name="Chenge Outfit"/>
<menu_item_call label="Editar meu look" name="Edit Outfit"/>
<menu_item_call label="Editar meu corpo" name="Edit My Shape"/>
+ <menu_item_call label="Altura de foco" name="Hover Height"/>
<menu_item_call label="Meus amigos" name="Friends..."/>
<menu_item_call label="Meus grupos" name="Groups..."/>
<menu_item_call label="Meu perfil" name="Profile..."/>
diff --git a/indra/newview/skins/default/xui/pt/menu_inventory.xml b/indra/newview/skins/default/xui/pt/menu_inventory.xml
index 636b356c8b..79261ceb1f 100755
--- a/indra/newview/skins/default/xui/pt/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/pt/menu_inventory.xml
@@ -1,5 +1,14 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<menu name="Popup">
+ <menu_item_call label="Criar listagem" name="Marketplace Create Listing"/>
+ <menu_item_call label="Associar listagem" name="Marketplace Associate Listing"/>
+ <menu_item_call label="Obter listagem (Atualizar)" name="Marketplace Get Listing"/>
+ <menu_item_call label="Verificar erros" name="Marketplace Check Listing"/>
+ <menu_item_call label="Editar listagem" name="Marketplace Edit Listing"/>
+ <menu_item_call label="Listar" name="Marketplace List"/>
+ <menu_item_call label="Parar de oferecer" name="Marketplace Unlist"/>
+ <menu_item_call label="Ativar" name="Marketplace Activate"/>
+ <menu_item_call label="Desativar" name="Marketplace Deactivate"/>
<menu_item_call label="Compartilhar" name="Share"/>
<menu_item_call label="Comprar" name="Task Buy"/>
<menu_item_call label="Abrir" name="Task Open"/>
@@ -87,6 +96,7 @@
<menu_item_call label="Adicionar" name="Wearable Add"/>
<menu_item_call label="Tirar" name="Take Off"/>
<menu_item_call label="Copiar para Caixa de saída do lojista" name="Merchant Copy"/>
- <menu_item_call label="Enviar para Mercado" name="Marketplace Send"/>
+ <menu_item_call label="Copiar para Listagens do Marketplace" name="Marketplace Copy"/>
+ <menu_item_call label="Mover para Listagens do Marketplace" name="Marketplace Move"/>
<menu_item_call label="--Sem opções--" name="--no options--"/>
</menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/pt/menu_inventory_gear_default.xml
index 6faea517fe..d3e6534912 100755
--- a/indra/newview/skins/default/xui/pt/menu_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/pt/menu_inventory_gear_default.xml
@@ -5,7 +5,7 @@
<menu_item_check label="Ordenar por mais recente" name="sort_by_recent"/>
<menu_item_check label="Sempre ordenar pastas por nome" name="sort_folders_by_name"/>
<menu_item_check label="Pastas do sistema no topo" name="sort_system_folders_to_top"/>
- <menu_item_call label="Mostrar filtros" name="show_filters"/>
+ <menu_item_call label="Mostrar filtros..." name="show_filters"/>
<menu_item_call label="Restabelecer filtros" name="reset_filters"/>
<menu_item_call label="Fechar todas as pastas" name="close_folders"/>
<menu_item_call label="Esvaziar achados e perdidos" name="empty_lostnfound"/>
diff --git a/indra/newview/skins/default/xui/pt/menu_marketplace_view.xml b/indra/newview/skins/default/xui/pt/menu_marketplace_view.xml
new file mode 100644
index 0000000000..2236df5c87
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/menu_marketplace_view.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_marketplace_sort">
+ <menu_item_check label="Ordenar por quantidade em estoque stock (baixo a alto)" name="sort_by_stock_amount"/>
+ <menu_item_check label="Exibir apenas pastas da listagem" name="show_only_listing_folders"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_url_experience.xml b/indra/newview/skins/default/xui/pt/menu_url_experience.xml
new file mode 100644
index 0000000000..1bbc27f267
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/menu_url_experience.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Url Popup">
+ <menu_item_call label="Copiar SLurl para área de transferência" name="url_copy"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_viewer.xml b/indra/newview/skins/default/xui/pt/menu_viewer.xml
index 0bbb9683a0..9b3b6077ed 100755
--- a/indra/newview/skins/default/xui/pt/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/pt/menu_viewer.xml
@@ -8,6 +8,7 @@
<menu_item_call label="Nova janela de inventário" name="NewInventoryWindow"/>
<menu_item_call label="Lugares..." name="Places"/>
<menu_item_call label="Destaques..." name="Picks"/>
+ <menu_item_call label="Experiências..." name="Experiences"/>
<menu_item_call label="Controles da câmera..." name="Camera Controls"/>
<menu label="Movimentos" name="Movement">
<menu_item_call label="Sentar" name="Sit Down Here"/>
@@ -22,6 +23,7 @@
</menu>
<menu_item_call label="Comprar L$..." name="Buy and Sell L$"/>
<menu_item_call label="Caixa de saída do lojista..." name="MerchantOutbox"/>
+ <menu_item_call label="Listagens do Marketplace..." name="MarketplaceListings"/>
<menu_item_call label="Painel da conta..." name="Manage My Account">
<menu_item_call.on_click name="ManageMyAccount_url" parameter="WebLaunchJoinNow,http://secondlife.com/account/index.php?lang=pt"/>
</menu_item_call>
@@ -48,7 +50,7 @@
<menu_item_check label="Amigos" name="My Friends"/>
<menu_item_check label="Grupos" name="My Groups"/>
<menu_item_check label="Pessoas próximas" name="Active Speakers"/>
- <menu_item_call label="Lista de bloqueados" name="Block List"/>
+ <menu_item_check label="Lista de bloqueados" name="Block List"/>
<menu_item_check label="Não perturbe" name="Do Not Disturb"/>
</menu>
<menu label="Mundo" name="World">
@@ -176,7 +178,7 @@
<menu_item_call label="Blogs do [SECOND_LIFE]" name="Second Life Blogs"/>
<menu_item_call label="Denunciar abuso" name="Report Abuse"/>
<menu_item_call label="Relatar bug" name="Report Bug"/>
- <menu_item_call label="Empurrões, trombadas e tapas" name="Bumps, Pushes &amp;amp; Hits"/>
+ <menu_item_call label="Bumps, Pushes &amp; Hits" name="Bumps, Pushes &amp;amp; Hits"/>
<menu_item_call label="Sobre [APP_NAME]" name="About Second Life"/>
</menu>
<menu label="Avançado" name="Advanced">
@@ -249,6 +251,7 @@
<menu_item_check label="Painel de textura" name="Texture Console"/>
<menu_item_check label="Console de depuração" name="Debug Console"/>
<menu_item_call label="Painel de avisos" name="Notifications"/>
+ <menu_item_check label="Console de depuração de região" name="Region Debug Console"/>
<menu_item_check label="Tempos" name="Fast Timers"/>
<menu_item_check label="Memória" name="Memory"/>
<menu_item_check label="Estatísticas da cena" name="Scene Statistics"/>
@@ -324,7 +327,7 @@
<menu label="Rede" name="Network">
<menu_item_check label="Pausar avatar" name="AgentPause"/>
<menu_item_call label="Drop a Packet" name="Drop a Packet"/>
- </menu>
+ </menu>
<menu label="Mundo" name="DevelopWorld">
<menu_item_check label="Impor sobre sol de simulação" name="Sim Sun Override"/>
<menu_item_check label="Clima fixo" name="Fixed Weather"/>
diff --git a/indra/newview/skins/default/xui/pt/mime_types.xml b/indra/newview/skins/default/xui/pt/mime_types.xml
index f9c0496eea..be387088bd 100755
--- a/indra/newview/skins/default/xui/pt/mime_types.xml
+++ b/indra/newview/skins/default/xui/pt/mime_types.xml
@@ -24,10 +24,10 @@
</widgetset>
<widgetset name="none">
<label name="none_label">
- Sem conteúdo disponível
+ Sem conteúdo
</label>
<tooltip name="none_tooltip">
- Não há mídia disponível aqui.
+ Sem mídia aqui
</tooltip>
</widgetset>
<widgetset name="image">
@@ -64,7 +64,7 @@
</mimetype>
<mimetype name="none/none">
<label name="none/none_label">
- - Nenhum -
+ - Nenhum -
</label>
</mimetype>
<mimetype name="audio/*">
diff --git a/indra/newview/skins/default/xui/pt/mime_types_linux.xml b/indra/newview/skins/default/xui/pt/mime_types_linux.xml
index 789843cbba..70dd03feab 100755
--- a/indra/newview/skins/default/xui/pt/mime_types_linux.xml
+++ b/indra/newview/skins/default/xui/pt/mime_types_linux.xml
@@ -44,6 +44,14 @@
Tocar clipe
</playtip>
</widgetset>
+ <widgetset name="none">
+ <label name="none_label">
+ Sem conteúdo
+ </label>
+ <tooltip name="none_tooltip">
+ Sem mídia aqui
+ </tooltip>
+ </widgetset>
<scheme name="rtsp">
<label name="rtsp_label">
Stream em tempo real
diff --git a/indra/newview/skins/default/xui/pt/mime_types_mac.xml b/indra/newview/skins/default/xui/pt/mime_types_mac.xml
index 34b40e94ab..17cb5f7093 100755
--- a/indra/newview/skins/default/xui/pt/mime_types_mac.xml
+++ b/indra/newview/skins/default/xui/pt/mime_types_mac.xml
@@ -44,6 +44,14 @@
Tocar o áudio desta localização
</playtip>
</widgetset>
+ <widgetset name="none">
+ <label name="none_label">
+ Sem conteúdo
+ </label>
+ <tooltip name="none_tooltip">
+ Sem mídia aqui
+ </tooltip>
+ </widgetset>
<scheme name="rtsp">
<label name="rtsp_label">
Real Time Streaming
diff --git a/indra/newview/skins/default/xui/pt/notifications.xml b/indra/newview/skins/default/xui/pt/notifications.xml
index 00c0b13670..29b85d9e97 100755
--- a/indra/newview/skins/default/xui/pt/notifications.xml
+++ b/indra/newview/skins/default/xui/pt/notifications.xml
@@ -72,6 +72,10 @@ Detalhes do erro: O aviso &apos;[_NAME]&apos; não foi localizado no arquivo not
[MESSAGE]
<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Sim"/>
</notification>
+ <notification name="GenericAlertOK">
+ [MESSAGE]
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
<notification name="BadInstallation">
Um erro ocorreu ao atualizar o [APP_NAME]. [http://get.secondlife.com Baixe a versão atual] do Visualizador.
<usetemplate name="okbutton" yestext="OK"/>
@@ -124,6 +128,88 @@ Nenhuma pasta foi enviada ao Marketplace devido a um erro do sistema ou da rede.
Ocorreu uma falha na inicialização do Marketplace devido a um erro do sistema ou da rede. Tente novamente mais tarde.
<usetemplate name="okbutton" yestext="OK"/>
</notification>
+ <notification name="StockPasteFailed">
+ Copiar ou mover para Pasta de estoque com falha com o erro:
+
+ &apos;[ERROR_CODE]&apos;
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="MerchantPasteFailed">
+ Copiar ou mover para Listagens do Marketplace com falha com o erro:
+
+ &apos;[ERROR_CODE]&apos;
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="MerchantTransactionFailed">
+ Ocorreu uma falha na transação com o Marketplace com o seguinte erro:
+
+ Motivo: &apos;[ERROR_REASON]&apos;
+ [ERROR_DESCRIPTION]
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="MerchantUnprocessableEntity">
+ Não foi possível listar este produto ou ativar a pasta de versões. Geralmente, isso é causado por ausência de informações no formulário de descrição da listagem, mas pode ser causado por erros na estrutura de pastas. Edite a listagem ou verifique se há erros na pasta de listagem.
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="MerchantListingFailed">
+ Falha ao listar no Marketplace com erro:
+
+ &apos;[ERROR_CODE]&apos;
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="MerchantFolderActivationFailed">
+ Falha ao ativar esta pasta de versões com erro:
+
+ &apos;[ERROR_CODE]&apos;
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="ConfirmMerchantActiveChange">
+ Esta ação alterará o conteúdo ativo desta listagem. Deseja continuar?
+ <usetemplate ignoretext="Confirmar antes de alterar uma listagem ativa no Marketplace" name="okcancelignore" notext="Cancelar" yestext="OK"/>
+ </notification>
+ <notification name="ConfirmMerchantMoveInventory">
+ Os itens arrastados para a janela Listagens do Marketplace são movidos de seus locais originais e não copiados. Deseja continuar?
+ <usetemplate ignoretext="Confirmar antes de mover um item do inventário para o Marketplace" name="okcancelignore" notext="Cancelar" yestext="OK"/>
+ </notification>
+ <notification name="ConfirmListingCutOrDelete">
+ Mover ou excluir uma pasta de listagem excluirá sua listagem do Marketplace. Se você deseja manter a listagem do Marketplace, mova ou exclua o conteúdo da pasta de versões que você deseja modificar. Deseja continuar?
+ <usetemplate ignoretext="Confirmar antes de mover ou excluir uma listagem do Marketplace" name="okcancelignore" notext="Cancelar" yestext="OK"/>
+ </notification>
+ <notification name="ConfirmCopyToMarketplace">
+ Você não tem permissão para copiar um ou mais deste itens para o Marketplace. Você pode movê-los ou deixá-los para trás.
+ <usetemplate canceltext="Cancelar" ignoretext="Confirmar antes de tentar copiar uma seleção que contenha itens de cópia proibida para o Marketplace" name="yesnocancelbuttons" notext="Não mover item(ns)" yestext="Mover item(ns)"/>
+ </notification>
+ <notification name="ConfirmMerchantUnlist">
+ Esta ação removerá esta listagem. Deseja continuar?
+ <usetemplate ignoretext="Confirmar antes de remover uma listagem ativa no Marketplace" name="okcancelignore" notext="Cancelar" yestext="OK"/>
+ </notification>
+ <notification name="ConfirmMerchantClearVersion">
+ Esta ação desativará a pasta de versões da listagem atual. Deseja continuar?
+ <usetemplate ignoretext="Confirmar antes de desativar a pasta de versões de uma listagem no Marketplace" name="okcancelignore" notext="Cancelar" yestext="OK"/>
+ </notification>
+ <notification name="AlertMerchantListingNotUpdated">
+ A listagem não pode ser atualizada.
+[[URL] Clique aqui] para editá-la no Marketplace.
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="AlertMerchantListingCannotWear">
+ Não é possível usar roupas ou partes do corpo que estejam na pasta Listagens do Marketplace.
+ </notification>
+ <notification name="AlertMerchantListingInvalidID">
+ ID de listagem inválida.
+ </notification>
+ <notification name="AlertMerchantListingActivateRequired">
+ Há várias pastas sem versão ou com várias versões nesta listagem. Você precisará selecionar e ativar uma delas separadamente mais tarde.
+ <usetemplate ignoretext="Alertar sobre a ativação da pasta de versões quando criar uma listagem com várias pastas de versões" name="okignore" yestext="OK"/>
+ </notification>
+ <notification name="AlertMerchantStockFolderSplit">
+ Separamos itens de estoque de tipos diferentes em pastas de estoque diferentes para que sua pasta fique organizada de maneira que possamos listá-la.
+ <usetemplate ignoretext="Alertar quando a pasta de estoque for dividida antes de ser listada" name="okignore" yestext="OK"/>
+ </notification>
+ <notification name="AlertMerchantStockFolderEmpty">
+ Removemos sua listagem porque o estoque está vazio. Você precisa adicionar mais unidades à pasta de estoque para que a listagem seja exibida novamente.
+ <usetemplate ignoretext="Alertar quando uma listagem não for listada porque a pasta de estoque está vazia" name="okignore" yestext="OK"/>
+ </notification>
<notification name="CompileQueueSaveText">
Houve um problema com o carregamento do texto para um script devido à seguinte razão: [REASON]. Por favor, tente novamente mais tarde.
</notification>
@@ -463,6 +549,10 @@ Nota: Este procedimento limpa o cache.
Salvar alterações?
<usetemplate canceltext="Cancelar" name="yesnocancelbuttons" notext="Não Salvar" yestext="Salvar"/>
</notification>
+ <notification name="DeleteNotecard">
+ Excluir nota?
+ <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
+ </notification>
<notification name="GestureSaveFailedTooManySteps">
Falha ao salvar Gesto.
Este gesto possui muitos passos.
@@ -569,6 +659,9 @@ Para aumentar a qualidade do vídeo, vá para Preferências &gt; Vídeo.
<notification name="RegionNoTerraforming">
A região [REGION] não permite ser aplainada.
</notification>
+ <notification name="ParcelNoTerraforming">
+ Você não está autorizado a terraplanar o terreno [PARCEL].
+ </notification>
<notification name="CannotCopyWarning">
Você não tem autorização para copiar os itens abaixo:
[ITEMS]
@@ -1817,6 +1910,30 @@ Isto mudará milhares de regiões e fará o spaceserver soluçar.
Remover o gerente da propriedade desta propriedade apenas ou para [ALL_ESTATES]?
<usetemplate canceltext="Cancelar" name="yesnocancelbuttons" notext="Todas as Propriedades" yestext="Esta Propriedade"/>
</notification>
+ <notification label="Selecionar propriedade" name="EstateAllowedExperienceAdd">
+ Adicionar à lista de permitidos apenas para essa propriedade ou para [ALL_ESTATES]?
+ <usetemplate canceltext="Cancelar" name="yesnocancelbuttons" notext="Todas as propriedades" yestext="Esta propriedade"/>
+ </notification>
+ <notification label="Selecionar propriedade" name="EstateAllowedExperienceRemove">
+ Remover da lista de permitidos apenas para essa propriedade ou para [ALL_ESTATES]?
+ <usetemplate canceltext="Cancelar" name="yesnocancelbuttons" notext="Todas as propriedades" yestext="Esta propriedade"/>
+ </notification>
+ <notification label="Selecionar propriedade" name="EstateBlockedExperienceAdd">
+ Adicionar à lista de bloqueados dessa propriedade apenas ou de [ALL_ESTATES]?
+ <usetemplate canceltext="Cancelar" name="yesnocancelbuttons" notext="Todas as propriedades" yestext="Esta propriedade"/>
+ </notification>
+ <notification label="Selecionar propriedade" name="EstateBlockedExperienceRemove">
+ Remover da lista de bloqueados para essa propriedade somente ou para [ALL_ESTATES]?
+ <usetemplate canceltext="Cancelar" name="yesnocancelbuttons" notext="Todas as propriedades" yestext="Esta propriedade"/>
+ </notification>
+ <notification label="Selecionar propriedade" name="EstateTrustedExperienceAdd">
+ Adicionar à lista-chave dessa propriedade apenas ou de [ALL_ESTATES]?
+ <usetemplate canceltext="Cancelar" name="yesnocancelbuttons" notext="Todas as propriedades" yestext="Esta propriedade"/>
+ </notification>
+ <notification label="Selecionar propriedade" name="EstateTrustedExperienceRemove">
+ Remover da lista-chave para essa propriedade somente ou para [ALL_ESTATES]?
+ <usetemplate canceltext="Cancelar" name="yesnocancelbuttons" notext="Todas as propriedades" yestext="Esta propriedade"/>
+ </notification>
<notification label="Confirmar expulsão" name="EstateKickUser">
Expulsar [EVIL_USER] desta propriedade?
<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Expulsar"/>
@@ -1829,6 +1946,9 @@ Isto mudará milhares de regiões e fará o spaceserver soluçar.
A região que você está tentando visitar tem conteúdo que excede suas preferências atuais. Você pode alterar suas preferências acessando Eu &gt; Preferências &gt; Geral.
<usetemplate name="okbutton" yestext="OK"/>
</notification>
+ <notification name="SLM_UPDATE_FOLDER">
+ [MESSAGE]
+ </notification>
<notification name="RegionEntryAccessBlocked_AdultsOnlyContent">
A região que você está tentando visitar tem conteúdo [REGIONMATURITY], acessível apenas para adultos.
<url name="url">
@@ -1891,6 +2011,10 @@ Isto mudará milhares de regiões e fará o spaceserver soluçar.
Estamos tendo dificuldades técnicas com seu teletransporte, pois suas preferências estão dessincronizadas com o servidor.
<usetemplate name="okbutton" yestext="OK"/>
</notification>
+ <notification name="RegionTPSpecialUsageBlocked">
+ Não é possível inserir a região. &apos;[REGION_NAME]&apos; é uma Região de Skill Gaming, portanto você deve atender certos critérios para poder entrar. Para maiores detalhes, consulte as [http://wiki.secondlife.com/wiki/Linden_Lab_Official:Skill_Gaming_in_Second_Life Skill Gaming FAQ].
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
<notification name="PreferredMaturityChanged">
Você não receberá mais notificações de que está prestes a visitar uma região com conteúdo [RATING]. Posteriormente você poderá alterar suas preferências de conteúdo acessando Eu &gt; Preferências &gt; Geral da barra do menu.
<usetemplate name="okbutton" yestext="OK"/>
@@ -2113,6 +2237,10 @@ Mover para o inventário o(s) item(s)?
<ignore name="ignore" text="Definir &apos;Pagar por objeto&apos; ao construir um objeto sem script money()"/>
</form>
</notification>
+ <notification name="PayConfirmation">
+ Confirme que você deseja pagar L$[AMOUNT] a [TARGET].
+ <usetemplate ignoretext="Confirmar antes de pagar (somas acima de L$ 200)" name="okcancelignore" notext="Cancelar" yestext="Pagar"/>
+ </notification>
<notification name="OpenObjectCannotCopy">
Não há itens neste objeto que você está autorizado a copiar.
</notification>
@@ -2198,6 +2326,9 @@ Você deseja substituí-lo pelo objeto selecionado?
<button ignore="Never Replace" name="No" text="Não"/>
</form>
</notification>
+ <notification name="TooManyWearables">
+ Você não pode usar uma pasta que contenha mais de [AMOUNT] itens. Você pode mudar esse limite em Avançado &gt; Mostrar configurações de depuração &gt; WearFolderLimit.
+ </notification>
<notification label="Aviso de modo Não perturbe" name="DoNotDisturbModePay">
Você ativou o Não perturbe. Você não receberá qualquer item oferecido em troca deste pagamento.
@@ -2803,7 +2934,7 @@ Se permanecer aqui, você será desconectado.
[MESSAGE]
-Do objeto: &lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;, de: [NAME]?
+Do objeto: &lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;, de: [NAME]
<form name="form">
<button name="Gotopage" text="Carregar"/>
<button name="Cancel" text="Cancelar"/>
@@ -2829,6 +2960,72 @@ OK?
<button name="Mute" text="Bloquear"/>
</form>
</notification>
+ <notification name="ExperienceAcquireFailed">
+ Não foi possível adquirir uma nova experiência:
+ [ERROR_MESSAGE]
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="NotInGroupExperienceProfileMessage">
+ Uma alteração do grupo de experiência foi ignorada porque o proprietário não é membro do grupo selecionado.
+ </notification>
+ <notification name="UneditableExperienceProfileMessage">
+ O campo não editável &apos;[field]&apos; foi ignorado ao atualizar o perfil de experiência.
+ </notification>
+ <notification name="RestrictedToOwnerExperienceProfileMessage">
+ Alterações ignoradas para o campo &apos;[field]&apos; que só podem ser definidas pelo proprietário da experiência.
+ </notification>
+ <notification name="MaturityRatingExceedsOwnerExperienceProfileMessage">
+ Você não pode definir a classificação de maturidade de uma experiência como sendo mais alta que a do proprietário.
+ </notification>
+ <notification name="RestrictedTermExperienceProfileMessage">
+ Os seguintes termos impediram a atualização do nome e/ou descrição do perfil de experiência: [extra_info]
+ </notification>
+ <notification name="TeleportedHomeExperienceRemoved">
+ Você foi teletransportado da região [region_name] por remover a experiência secondlife:///app/experience/[public_id]/profile e não tem mais permissão na região.
+ <form name="form">
+ <ignore name="ignore" text="Ejetar da região por remover uma experiência"/>
+ </form>
+ </notification>
+ <notification name="TrustedExperienceEntry">
+ Você recebeu permissão para a região [region_name] ao participar da experiência-chave secondlife:///app/experience/[public_id]/profile Remover essa experiência pode ejetá-lo da região.
+ <form name="form">
+ <ignore name="ignore" text="Permitido em uma região devido a uma experiência"/>
+ </form>
+ </notification>
+ <notification name="TrustedExperiencesAvailable">
+ Você não está autorizado a acessar esse destino. Você pode ser permitido na região aceitando uma das experiências abaixo:
+
+[EXPERIENCE_LIST]
+
+Outras experiências chave podem estar disponíveis.
+ </notification>
+ <notification name="ExperienceEvent">
+ Um objeto foi permitido para [EventType] pelo secondlife:///app/experience/[public_id]/profile experience.
+ Proprietário: secondlife:///app/agent/[OwnerID]/inspect
+ Nome do objeto: [ObjectName]
+ Nome do Terreno: [ParcelName]
+ </notification>
+ <notification name="ExperienceEventAttachment">
+ Um anexo teve permissão para executar [EventType] pelo secondlife:///app/experience/[public_id]/profile experience.
+ Proprietário: secondlife:///app/agent/[OwnerID]/inspect
+ </notification>
+ <notification name="ScriptQuestionExperience">
+ &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos;, um objeto de propriedade de &apos;[NAME]&apos;, solicita a sua participação na experiência [GRID_WIDE]:
+
+[EXPERIENCE]
+
+Quando a permissão for dada, você não irá mais visualizar essa mensagem novamente a não ser que seja revogada do perfil de experiência.
+
+Os scripts associados a essa experiência serão capazes de realizar o seguinte nas regiões onde a experiência esteja ativa:
+
+[QUESTIONS]Isso está bem?
+ <form name="form">
+ <button name="BlockExperience" text="Bloquear experiência"/>
+ <button name="Mute" text="Bloquear objeto"/>
+ <button name="Yes" text="Sim"/>
+ <button name="No" text="Não"/>
+ </form>
+ </notification>
<notification name="ScriptQuestionCaution">
Aviso: O objeto &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos; deseja obter acesso total à sua conta de dólares Linden. Se você conceder acesso, ele poderá remover fundos de sua conta a qualquer momento ou esvaziar sua conta completamente, continuamente e sem avisos adicionais.
@@ -3148,6 +3345,10 @@ Você carregou uma textura com [RESOLUTION] para o(a) &apos;[BODYREGION]&apos; e
( [EXISTENCE] segundos de vida )
Você carregou uma textura com [RESOLUTION] para o(a) &apos;[BODYREGION]&apos; em [TIME] segundos.
</notification>
+ <notification name="CannotUploadTexture">
+ Não foi possível carregar textura.
+[REASON]
+ </notification>
<notification name="LivePreviewUnavailable">
Não podemos exibir uma visualização desta textura, pois ela é cópia proibida e/ou transferência proibida.
<usetemplate ignoretext="Avise-me quando o modo Visualização em Tempo Real estiver indisponível para texturas de cópia proibida e/ou transferência proibida" name="okignore" yestext="OK"/>
@@ -3721,9 +3922,11 @@ Tente novamente em instantes.
</notification>
<notification name="TeleportedByAttachment">
Você foi teletransportado por um anexo em [ITEM_ID]
+ <usetemplate ignoretext="Teletransportar: Você foi teletransportado por um anexo" name="notifyignore"/>
</notification>
<notification name="TeleportedByObjectOnParcel">
Você foi teletransportado pelo objeto &apos;[OBJECT_NAME]&apos; no lote &apos;[PARCEL_NAME]&apos;
+ <usetemplate ignoretext="Teletransportar: Você foi teletransportado por um objeto em um lote" name="notifyignore"/>
</notification>
<notification name="TeleportedByObjectOwnedBy">
Você foi teletransportado pelo objeto &apos;[OBJECT_NAME]&apos; de propriedade de [OWNER_ID]
@@ -4055,7 +4258,7 @@ Tente selecionar uma quantidade menor de terreno.
<usetemplate ignoretext="Não foi possível mover arquivos. Caminho anterior restaurado." name="okignore" yestext="OK"/>
</notification>
<notification name="DefaultObjectPermissions">
- Ocorreu um problema ao salvar as permissões padrão devido ao seguinte motivo: [REASON]. Tente definir as permissões padrão mais tarde.
+ Ocorreu um problema ao salvar as permissões padrão do objeto: [REASON]. Tente definir as permissões padrão mais tarde.
<usetemplate name="okbutton" yestext="OK"/>
</notification>
<notification name="ChatHistoryIsBusyAlert">
diff --git a/indra/newview/skins/default/xui/pt/panel_experience_info.xml b/indra/newview/skins/default/xui/pt/panel_experience_info.xml
new file mode 100644
index 0000000000..7fad25dad6
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/panel_experience_info.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_experience_info">
+ <text name="title" value="Perfil de experiência"/>
+ <scroll_container name="xp_scroll">
+ <panel name="scrolling_panel">
+ <layout_stack>
+ <layout_panel>
+ <text name="experience_title" value="Kyle&apos;s Superhero RPG"/>
+ </layout_panel>
+ <layout_panel name="location panel">
+ <text name="Location">
+ Localização:
+ </text>
+ <text name="LocationTextText">
+ qualquer lugar
+ </text>
+ <button label="Teletransportar" name="teleport_btn"/>
+ <button label="Mapa" name="map_btn"/>
+ </layout_panel>
+ <layout_panel name="marketplace panel">
+ <text name="Location">
+ Loja do Marketplace
+ </text>
+ <text name="LocationTextText">
+ qualquer lugar
+ </text>
+ </layout_panel>
+ <layout_panel>
+ <text name="ContentRating">
+ Classificação:
+ </text>
+ <text name="ContentRatingText">
+ Adulto
+ </text>
+ <text name="Owner">
+ Proprietário:
+ </text>
+ <text name="OwnerText">
+ Kyle
+ </text>
+ <button label="Editar" name="edit_btn"/>
+ </layout_panel>
+ </layout_stack>
+ </panel>
+ </scroll_container>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_experience_list_editor.xml b/indra/newview/skins/default/xui/pt/panel_experience_list_editor.xml
new file mode 100644
index 0000000000..6e10cc583c
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/panel_experience_list_editor.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="experince_list_editor">
+ <panel.string name="loading">
+ Carregando...
+ </panel.string>
+ <panel.string name="panel_allowed">
+ Experiências permitidas:
+ </panel.string>
+ <panel.string name="panel_blocked">
+ Experiências bloqueadas:
+ </panel.string>
+ <panel.string name="panel_trusted">
+ Experiências-chave:
+ </panel.string>
+ <panel.string name="no_results">
+ (vazio)
+ </panel.string>
+ <text name="text_name">
+ Lista de experiências
+ </text>
+ <scroll_list name="experience_list">
+ <columns label="Nome" name="experience_name"/>
+ </scroll_list>
+ <button label="Adicionar..." name="btn_add"/>
+ <button label="Remover" name="btn_remove"/>
+ <button label="Perfil..." name="btn_profile"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_experience_list_item.xml b/indra/newview/skins/default/xui/pt/panel_experience_list_item.xml
new file mode 100644
index 0000000000..24022faeae
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/panel_experience_list_item.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Experiences">
+ <text name="experience_name">
+ Nome fictício
+ </text>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_experience_log.xml b/indra/newview/skins/default/xui/pt/panel_experience_log.xml
new file mode 100644
index 0000000000..97ef760716
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/panel_experience_log.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="EVENTS">
+ <string name="no_events" value="Sem eventos."/>
+ <string name="loading" value="Carregando..."/>
+ <layout_stack>
+ <layout_panel>
+ <scroll_list name="experience_log_list">
+ <columns label="Hora" name="time"/>
+ <columns label="Evento" name="event"/>
+ <columns label="Experiência" name="experience_name"/>
+ <columns label="Objeto" name="object_name"/>
+ </scroll_list>
+ <button label="Avisar" name="btn_notify"/>
+ <button label="Perfil" name="btn_profile_xp"/>
+ <button label="Denunciar" name="btn_report_xp"/>
+ </layout_panel>
+ <layout_panel name="button_panel">
+ <check_box label="Avisar sobre todos os eventos Dias" name="notify_all"/>
+ <button label="Limpar" name="btn_clear"/>
+ <button label="&lt;" name="btn_prev"/>
+ <button label="&gt;" name="btn_next"/>
+ </layout_panel>
+ </layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_experience_search.xml b/indra/newview/skins/default/xui/pt/panel_experience_search.xml
new file mode 100644
index 0000000000..e8d5ba63d5
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/panel_experience_search.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="SEARCH">
+ <string name="not_found">
+ &apos;[TEXT]&apos; não encontrado
+ </string>
+ <string name="no_results">
+ Sem resultados
+ </string>
+ <string name="searching">
+ Pesquisando...
+ </string>
+ <string name="loading">
+ Carregando...
+ </string>
+ <string name="maturity_icon_general">
+ &quot;Parcel_PG_Light&quot;
+ </string>
+ <string name="maturity_icon_moderate">
+ &quot;Parcel_M_Light&quot;
+ </string>
+ <string name="maturity_icon_adult">
+ &quot;Parcel_R_Light&quot;
+ </string>
+ <panel name="search_panel">
+ <button label="Ir" name="find"/>
+ <icons_combo_box label="Moderado" name="maturity">
+ <icons_combo_box.item label="Adulto" name="Adult" value="42"/>
+ <icons_combo_box.item label="Moderado" name="Mature" value="21"/>
+ <icons_combo_box.item label="Geral" name="PG" value="13"/>
+ </icons_combo_box>
+ <scroll_list name="search_results">
+ <columns label="Nome" name="experience_name"/>
+ <columns label="Proprietário" name="owner"/>
+ </scroll_list>
+ <button label="OK" label_selected="OK" name="ok_btn"/>
+ <button label="Cancelar" name="cancel_btn"/>
+ <button label="Exibir perfil" name="profile_btn"/>
+ <button label="&lt;" name="left_btn"/>
+ <button label="&gt;" name="right_btn"/>
+ </panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_experiences.xml b/indra/newview/skins/default/xui/pt/panel_experiences.xml
new file mode 100644
index 0000000000..cdf1a760d8
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/panel_experiences.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Experiences">
+ <string name="loading_experiences" value="Carregando experiências..."/>
+ <string name="no_experiences" value="Nenhuma experiência."/>
+ <string name="acquire" value="Adquirir uma experiência"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_facebook_friends.xml b/indra/newview/skins/default/xui/pt/panel_facebook_friends.xml
index 9cb7a8b7d1..8c5c24d08b 100644
--- a/indra/newview/skins/default/xui/pt/panel_facebook_friends.xml
+++ b/indra/newview/skins/default/xui/pt/panel_facebook_friends.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<panel name="panel_facebook_friends">
<string name="facebook_friends_empty" value="No momento, você não tem amigos do Facebook que também são residentes do Second Life. Convide seus amigos do Facebook para ingressar no Second Life hoje mesmo!"/>
- <string name="facebook_friends_no_connected" value="No momento, você não está conectado ao Facebook. Vá para a aba Conta para se conectar e ativar esse recurso."/>
+ <string name="facebook_friends_no_connected" value="No momento, você não está conectado ao Facebook. Vá para a aba Status para se conectar e ativar esse recurso."/>
<accordion name="friends_accordion">
<accordion_tab name="tab_second_life_friends" title="Amigos do SL"/>
<accordion_tab name="tab_suggested_friends" title="Adicionar essas pessoas como amigos do SL"/>
diff --git a/indra/newview/skins/default/xui/pt/panel_facebook_photo.xml b/indra/newview/skins/default/xui/pt/panel_facebook_photo.xml
index 22615e0769..cdf3222092 100644
--- a/indra/newview/skins/default/xui/pt/panel_facebook_photo.xml
+++ b/indra/newview/skins/default/xui/pt/panel_facebook_photo.xml
@@ -1,26 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<panel name="panel_facebook_photo">
- <layout_stack name="stack_photo">
- <layout_panel name="snapshot_panel">
- <combo_box name="resolution_combobox" tool_tip="Resolução da imagem">
- <combo_box.item label="Janela atual" name="CurrentWindow"/>
- <combo_box.item label="640x480" name="640x480"/>
- <combo_box.item label="800x600" name="800x600"/>
- <combo_box.item label="1024x768" name="1024x768"/>
- <combo_box.item label="1200x630" name="1200x630"/>
- </combo_box>
- <combo_box name="filters_combobox" tool_tip="Filtros de imagem">
- <combo_box.item label="Sem filtro" name="NoFilter"/>
- </combo_box>
- <button label="Atualizar" name="new_snapshot_btn" tool_tip="Clique para atualizar"/>
- <button label="Visualizar" name="big_preview_btn" tool_tip="Clique para alternar entre visualizações"/>
- <text name="caption_label">
- Comentário (opcional):
- </text>
- </layout_panel>
- <layout_panel name="photo_button_panel">
- <button label="Postar" name="post_photo_btn"/>
- <button label="Cancelar" name="cancel_photo_btn"/>
- </layout_panel>
- </layout_stack>
+ <combo_box name="resolution_combobox" tool_tip="Resolução da imagem">
+ <combo_box.item label="Janela atual" name="CurrentWindow"/>
+ <combo_box.item label="640x480" name="640x480"/>
+ <combo_box.item label="800x600" name="800x600"/>
+ <combo_box.item label="1024x768" name="1024x768"/>
+ <combo_box.item label="1200x630" name="1200x630"/>
+ </combo_box>
+ <combo_box name="filters_combobox" tool_tip="Filtros de imagem">
+ <combo_box.item label="Sem filtro" name="NoFilter"/>
+ </combo_box>
+ <button label="Atualizar" name="new_snapshot_btn" tool_tip="Clique para atualizar"/>
+ <button label="Visualizar" name="big_preview_btn" tool_tip="Clique para alternar entre visualizações"/>
+ <text name="caption_label">
+ Comentário (opcional):
+ </text>
+ <button label="Postar" name="post_photo_btn"/>
+ <button label="Cancelar" name="cancel_photo_btn"/>
</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_facebook_place.xml b/indra/newview/skins/default/xui/pt/panel_facebook_place.xml
index 97596d64c6..aa8b51d64b 100644
--- a/indra/newview/skins/default/xui/pt/panel_facebook_place.xml
+++ b/indra/newview/skins/default/xui/pt/panel_facebook_place.xml
@@ -1,17 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<panel name="panel_facebook_place">
- <layout_stack name="stack_place">
- <layout_panel name="place_detail_panel">
- <text name="place_caption_label">
- Diga algo sobre onde você está:
- </text>
- </layout_panel>
- <layout_panel name="place_map_panel">
- <check_box initial_value="false" label="" name="add_place_view_cb"/>
- </layout_panel>
- <layout_panel name="place_button_panel">
- <button label="Postar" name="post_place_btn"/>
- <button label="Cancelar" name="cancel_place_btn"/>
- </layout_panel>
- </layout_stack>
+ <text name="place_caption_label">
+ Diga algo sobre onde você está:
+ </text>
+ <check_box initial_value="false" label="Incluir vista abstrata da localização" name="add_place_view_cb"/>
+ <button label="Postar" name="post_place_btn"/>
+ <button label="Cancelar" name="cancel_place_btn"/>
</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_facebook_status.xml b/indra/newview/skins/default/xui/pt/panel_facebook_status.xml
index 251580666e..0bbaf1086c 100644
--- a/indra/newview/skins/default/xui/pt/panel_facebook_status.xml
+++ b/indra/newview/skins/default/xui/pt/panel_facebook_status.xml
@@ -1,14 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<panel name="panel_facebook_status">
- <layout_stack name="stack_status">
- <layout_panel name="status_detail_panel">
- <text name="status_caption_label">
- No que você está pensando?
- </text>
- </layout_panel>
- <layout_panel name="status_button_panel">
- <button label="Postar" name="post_status_btn"/>
- <button label="Cancelar" name="cancel_status_btn"/>
- </layout_panel>
- </layout_stack>
+ <string name="facebook_connected" value="Você está conectado ao Facebook como:"/>
+ <string name="facebook_disconnected" value="Não conectado ao Facebook"/>
+ <text name="account_caption_label">
+ Não conectado ao Facebook.
+ </text>
+ <panel name="panel_buttons">
+ <button label="Conectar..." name="connect_btn"/>
+ <button label="Desconectar" name="disconnect_btn"/>
+ <text name="account_learn_more_label">
+ [http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-Share-Facebook/ta-p/2149711 Aprenda a publicar no Facebook]
+ </text>
+ </panel>
+ <text name="status_caption_label">
+ No que você está pensando?
+ </text>
+ <button label="Postar" name="post_status_btn"/>
+ <button label="Cancelar" name="cancel_status_btn"/>
</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_flickr_photo.xml b/indra/newview/skins/default/xui/pt/panel_flickr_photo.xml
index 77d8afb47c..cbb3e362fe 100644
--- a/indra/newview/skins/default/xui/pt/panel_flickr_photo.xml
+++ b/indra/newview/skins/default/xui/pt/panel_flickr_photo.xml
@@ -1,41 +1,35 @@
<?xml version="1.0" encoding="utf-8"?>
<panel name="panel_flickr_photo">
- <layout_stack name="stack_photo">
- <layout_panel name="snapshot_panel">
- <combo_box name="resolution_combobox" tool_tip="Resolução da imagem">
- <combo_box.item label="Janela atual" name="CurrentWindow"/>
- <combo_box.item label="640x480" name="640x480"/>
- <combo_box.item label="800x600" name="800x600"/>
- <combo_box.item label="1024x768" name="1024x768"/>
- </combo_box>
- <combo_box name="filters_combobox" tool_tip="Filtros de imagem">
- <combo_box.item label="Sem filtro" name="NoFilter"/>
- </combo_box>
- <button label="Atualizar" name="new_snapshot_btn" tool_tip="Clique para atualizar"/>
- <button label="Visualizar" name="big_preview_btn" tool_tip="Clique para alternar entre visualizações"/>
- <text name="title_label">
- Título:
- </text>
- <text name="description_label">
- Descrição:
- </text>
- <check_box initial_value="true" label="Incluir localização do SL no final da descrição" name="add_location_cb"/>
- <text name="tags_label">
- Tags:
- </text>
- <text name="tags_help_label">
- Separe as tags com espaços
+ <combo_box name="resolution_combobox" tool_tip="Resolução da imagem">
+ <combo_box.item label="Janela atual" name="CurrentWindow"/>
+ <combo_box.item label="640x480" name="640x480"/>
+ <combo_box.item label="800x600" name="800x600"/>
+ <combo_box.item label="1024x768" name="1024x768"/>
+ </combo_box>
+ <combo_box name="filters_combobox" tool_tip="Filtros de imagem">
+ <combo_box.item label="Sem filtro" name="NoFilter"/>
+ </combo_box>
+ <button label="Atualizar" name="new_snapshot_btn" tool_tip="Clique para atualizar"/>
+ <button label="Visualizar" name="big_preview_btn" tool_tip="Clique para alternar entre visualizações"/>
+ <text name="title_label">
+ Título:
+ </text>
+ <text name="description_label">
+ Descrição:
+ </text>
+ <check_box initial_value="true" label="Incluir localização do SL no final da descrição" name="add_location_cb"/>
+ <text name="tags_label">
+ Tags:
+ </text>
+ <text name="tags_help_label">
+ Separe as tags com espaços
Use &quot;&quot; para tags com várias palavras
- </text>
- <combo_box name="rating_combobox" tool_tip="Classificação de conteúdo do Flickr">
- <combo_box.item label="Classificação segura do Flickr" name="SafeRating"/>
- <combo_box.item label="Classificação moderada do Flickr" name="ModerateRating"/>
- <combo_box.item label="Classificação restrita do Flickr" name="RestrictedRating"/>
- </combo_box>
- </layout_panel>
- <layout_panel name="photo_button_panel">
- <button label="Enviar" name="post_photo_btn"/>
- <button label="Cancelar" name="cancel_photo_btn"/>
- </layout_panel>
- </layout_stack>
+ </text>
+ <combo_box name="rating_combobox" tool_tip="Classificação de conteúdo do Flickr">
+ <combo_box.item label="Classificação segura do Flickr" name="SafeRating"/>
+ <combo_box.item label="Classificação moderada do Flickr" name="ModerateRating"/>
+ <combo_box.item label="Classificação restrita do Flickr" name="RestrictedRating"/>
+ </combo_box>
+ <button label="Enviar" name="post_photo_btn"/>
+ <button label="Cancelar" name="cancel_photo_btn"/>
</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/pt/panel_group_info_sidetray.xml
index 7d8531a482..d322c60ec0 100755
--- a/indra/newview/skins/default/xui/pt/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/default/xui/pt/panel_group_info_sidetray.xml
@@ -23,6 +23,7 @@
<accordion_tab name="group_roles_tab" title="Funções e membros"/>
<accordion_tab name="group_notices_tab" title="Avisos"/>
<accordion_tab name="group_land_tab" title="Terrenos/Bens"/>
+ <accordion_tab name="group_experiences_tab" title="Experiências"/>
</accordion>
</layout_panel>
</layout_stack>
diff --git a/indra/newview/skins/default/xui/pt/panel_login.xml b/indra/newview/skins/default/xui/pt/panel_login.xml
index 8ac3e57c4c..ffcf72b1b4 100755
--- a/indra/newview/skins/default/xui/pt/panel_login.xml
+++ b/indra/newview/skins/default/xui/pt/panel_login.xml
@@ -1,26 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<panel name="panel_login">
- <panel.string name="forgot_password_url">
- http://secondlife.com/account/request.php?lang=pt
- </panel.string>
+ <panel.string name="forgot_password_url">http://secondlife.com/account/request.php?lang=pt</panel.string>
<layout_stack name="ui_stack">
<layout_panel name="ui_container">
<combo_box label="Nome de usuário" name="username_combo" tool_tip="O nome de usuário que você escolheu ao fazer seu cadastro, como zecazc12 ou Magia Solar"/>
<line_editor label="Senha" name="password_edit"/>
- <check_box label="Lembrar-me" name="remember_check"/>
- <text name="forgot_password_text">
- Senha esquecida
- </text>
- <button label="Login" name="connect_btn"/>
- <text name="At_My_Last_Location_Label">
- no último local
- </text>
<combo_box label="Meus locais favoritos" name="start_location_combo">
+ <combo_box.item label="Última posição" name="MyLastLocation"/>
<combo_box.item label="Minha casa" name="MyHome"/>
</combo_box>
- <button label="Login" name="connect_favorite_btn"/>
- <line_editor label="Digite um local" name="location_edit"/>
- <button label="Login" name="connect_location_btn"/>
+ <button label="Login" name="connect_btn"/>
+ <check_box label="Lembrar-me" name="remember_check"/>
+ <text name="forgot_password_text">Senha esquecida</text>
<combo_box label="Selecionar grade" name="server_combo"/>
</layout_panel>
</layout_stack>
diff --git a/indra/newview/skins/default/xui/pt/panel_marketplace_listings.xml b/indra/newview/skins/default/xui/pt/panel_marketplace_listings.xml
new file mode 100644
index 0000000000..cfa0e10038
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/panel_marketplace_listings.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Marketplace" name="Marketplace Panel">
+ <panel name="tool_panel">
+ <menu_button name="sort_btn" tool_tip="Opções de exibição/ordenação"/>
+ <button name="add_btn" tool_tip="Cria uma nova pasta de listagem"/>
+ <button label="Verificar erros" name="audit_btn" tool_tip="Verificar suas listagens do Marketplace"/>
+ </panel>
+ <panel name="tab_container_panel">
+ <filter_editor label="Filtrar listagens do Marketplace" name="filter_editor"/>
+ </panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_marketplace_listings_inventory.xml b/indra/newview/skins/default/xui/pt/panel_marketplace_listings_inventory.xml
new file mode 100644
index 0000000000..5967f24628
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/panel_marketplace_listings_inventory.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<inventory_panel label="TUDO" name="All Items" tool_tip="Arraste e solte os itens aqui para listá-los"/>
diff --git a/indra/newview/skins/default/xui/pt/panel_marketplace_listings_listed.xml b/indra/newview/skins/default/xui/pt/panel_marketplace_listings_listed.xml
new file mode 100644
index 0000000000..6549f82b5c
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/panel_marketplace_listings_listed.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<inventory_panel label="PUBLICADA" name="Active Items"/>
diff --git a/indra/newview/skins/default/xui/pt/panel_marketplace_listings_unassociated.xml b/indra/newview/skins/default/xui/pt/panel_marketplace_listings_unassociated.xml
new file mode 100644
index 0000000000..1797be5ae8
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/panel_marketplace_listings_unassociated.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<inventory_panel label="DESASSOCIADA" name="Unassociated Items"/>
diff --git a/indra/newview/skins/default/xui/pt/panel_marketplace_listings_unlisted.xml b/indra/newview/skins/default/xui/pt/panel_marketplace_listings_unlisted.xml
new file mode 100644
index 0000000000..79b8557ec3
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/panel_marketplace_listings_unlisted.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<inventory_panel label="NÃO PUBLICADA" name="Inactive Items"/>
diff --git a/indra/newview/skins/default/xui/pt/panel_postcard_settings.xml b/indra/newview/skins/default/xui/pt/panel_postcard_settings.xml
index 3088b9a996..3608c96c6a 100755
--- a/indra/newview/skins/default/xui/pt/panel_postcard_settings.xml
+++ b/indra/newview/skins/default/xui/pt/panel_postcard_settings.xml
@@ -7,17 +7,7 @@
<combo_box.item label="1024x768" name="1024x768"/>
<combo_box.item label="Customizado" name="Custom"/>
</combo_box>
- <layout_stack name="postcard_image_params_ls">
- <layout_panel name="postcard_image_size_lp">
- <spinner label="Largura" name="postcard_snapshot_width"/>
- <spinner label="Altura" name="postcard_snapshot_height"/>
- <check_box label="Limitar proporções" name="postcard_keep_aspect_check"/>
- </layout_panel>
- <layout_panel name="postcard_image_format_quality_lp">
- <slider label="Qualidade da imagem" name="image_quality_slider"/>
- <text name="image_quality_level">
- ([QLVL])
- </text>
- </layout_panel>
- </layout_stack>
+ <spinner label="Largura X Altura" name="postcard_snapshot_width"/>
+ <check_box label="Limitar proporções" name="postcard_keep_aspect_check"/>
+ <slider label="Qualidade:" name="image_quality_slider"/>
</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_setup.xml b/indra/newview/skins/default/xui/pt/panel_preferences_setup.xml
index 1279e74e21..87f2a9bc8f 100755
--- a/indra/newview/skins/default/xui/pt/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_setup.xml
@@ -14,9 +14,9 @@
<text name="Web:">
Web:
</text>
- <radio_group name="use_external_browser">
- <radio_item label="Usar meu navegador (IE, Firefox, Safari)" name="external" tool_tip="Use o navegador incluso para consultar a ajuda, abrir links da web, etc. Uso em tela inteira não recomendado." value="true"/>
- <radio_item label="Usar navegador incluso" name="internal" tool_tip="Use este navegador para consultar a ajuda, abrir links da web, etc. As janelas abrem dentro do [APP_NAME]." value=""/>
+ <radio_group name="preferred_browser_behavior">
+ <radio_item label="Usar meu navegador (Chrome, Firefox, IE) para todos os links" name="internal" tool_tip="Use o navegador padrão do sistema para consultar a ajuda, abrir links da web etc. Uso em tela inteira não recomendado." value="0"/>
+ <radio_item label="Usar o navegador incorporado somente para links do SecondLife" name="external" tool_tip="Usar o navegador padrão do sistema para consultar a ajuda, abrir links da web etc. O navegador incorporado será usado somente para os links da LindenLab/SecondLife." value="1"/>
</radio_group>
<check_box initial_value="true" label="Habilitar plugins" name="browser_plugins_enabled"/>
<check_box initial_value="true" label="Aceitar cookies" name="cookies_enabled"/>
diff --git a/indra/newview/skins/default/xui/pt/panel_region_experiences.xml b/indra/newview/skins/default/xui/pt/panel_region_experiences.xml
new file mode 100644
index 0000000000..c7e252cd6f
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/panel_region_experiences.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Experiências" name="Experiences">
+ <panel.string name="trusted_estate_text">
+ Qualquer experiência pode ser chave.
+
+Experiências-chave têm permissão para serem executadas nessa propriedade.
+
+Além disso, se a propriedade não permitir acesso público, os residentes participantes de qualquer experiência-chave podem entrar e permanecer na propriedade, desde que estejam na experiência-chave.
+ </panel.string>
+ <panel.string name="allowed_estate_text">
+ Somente experiências dentro do terreno podem ser permitidas.
+
+Experiências permitidas têm permissão para ser executadas nessa propriedade.
+ </panel.string>
+ <panel.string name="blocked_estate_text">
+ Somente experiências dentro da grade podem ser bloqueadas.
+
+É possível que as experiências bloqueadas não sejam executadas nessa propriedade.
+ </panel.string>
+ <panel.string name="estate_caption">
+ Mudar as opções desta guia afeta todas as regiões desta propriedade.
+ </panel.string>
+ <panel.string name="allowed_parcel_text">
+ Somente experiências dentro do terreno podem ser permitidas.
+
+Experiências permitidas têm permissão para ser executadas nesse terreno se não estiverem bloqueadas pela propriedade.
+ </panel.string>
+ <panel.string name="blocked_parcel_text">
+ Qualquer experiência de residente pode ser bloqueada.
+
+É possível que as experiências bloqueadas não sejam executadas neste terreno.
+ </panel.string>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_script_experience.xml b/indra/newview/skins/default/xui/pt/panel_script_experience.xml
new file mode 100644
index 0000000000..8366306581
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/panel_script_experience.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<panel name="script_experience" title="EXPERIÊNCIA">
+ <button label="Experiência" name="Expand Experience"/>
+ <check_box label="Usa experiência(s)" name="enable_xp"/>
+ <layout_stack name="xp_details">
+ <layout_panel>
+ <combo_box label="Escolher experiência..." name="Experiences..."/>
+ </layout_panel>
+ </layout_stack>
+ <text name="No Experiences">
+ Você não é colaborador de nenhuma experiência.
+ </text>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/pt/panel_snapshot_inventory.xml
index 3c4bb18687..b038c628bc 100755
--- a/indra/newview/skins/default/xui/pt/panel_snapshot_inventory.xml
+++ b/indra/newview/skins/default/xui/pt/panel_snapshot_inventory.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="panel_snapshot_inventory">
<text name="title">
- Salvar no meu inventário
+ Inventário
</text>
<text name="hint_lbl">
Salvar uma imagem em seu inventário custa L$[UPLOAD_COST]. Para salvar sua imagem como uma textura, selecione um dos formatos quadrados.
@@ -13,8 +13,8 @@
<combo_box.item label="Grande (512x512)" name="Large(512x512)"/>
<combo_box.item label="Customizado" name="Custom"/>
</combo_box>
- <spinner label="Largura" name="inventory_snapshot_width"/>
- <spinner label="Altura" name="inventory_snapshot_height"/>
+ <spinner label="Largura X Altura" name="inventory_snapshot_width"/>
+ <spinner label="" name="inventory_snapshot_height"/>
<check_box label="Limitar proporções" name="inventory_keep_aspect_check"/>
<button label="Cancelar" name="cancel_btn"/>
<button label="Salvar" name="save_btn"/>
diff --git a/indra/newview/skins/default/xui/pt/panel_snapshot_local.xml b/indra/newview/skins/default/xui/pt/panel_snapshot_local.xml
index 36b5b0cbe6..c6dbec189d 100755
--- a/indra/newview/skins/default/xui/pt/panel_snapshot_local.xml
+++ b/indra/newview/skins/default/xui/pt/panel_snapshot_local.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="panel_snapshot_local">
<text name="title">
- Salvar no meu PC
+ Disco
</text>
<combo_box label="Resolução" name="local_size_combo">
<combo_box.item label="Janela atual" name="CurrentWindow"/>
@@ -13,24 +13,17 @@
<combo_box.item label="1600x1200" name="1600x1200"/>
<combo_box.item label="Customizado" name="Custom"/>
</combo_box>
- <layout_stack name="local_image_params_ls">
- <layout_panel name="local_image_size_lp">
- <spinner label="Largura" name="local_snapshot_width"/>
- <spinner label="Altura" name="local_snapshot_height"/>
- <check_box label="Limitar proporções" name="local_keep_aspect_check"/>
- </layout_panel>
- <layout_panel name="local_image_format_quality_lp">
- <combo_box label="Formato" name="local_format_combo">
- <combo_box.item label="PNG (sem perda)" name="PNG"/>
- <combo_box.item label="JPEG" name="JPEG"/>
- <combo_box.item label="BMP (sem perda)" name="BMP"/>
- </combo_box>
- <slider label="Qualidade da imagem" name="image_quality_slider"/>
- <text name="image_quality_level">
- ([QLVL])
- </text>
- </layout_panel>
- </layout_stack>
+ <spinner label="Largura X Altura" name="local_snapshot_width"/>
+ <check_box label="Limitar proporções" name="local_keep_aspect_check"/>
+ <text name="local_format_label">
+ Formato:
+ </text>
+ <combo_box label="Formato" name="local_format_combo">
+ <combo_box.item label="PNG (sem perda)" name="PNG"/>
+ <combo_box.item label="JPEG" name="JPEG"/>
+ <combo_box.item label="BMP (sem perda)" name="BMP"/>
+ </combo_box>
+ <slider label="Qualidade:" name="image_quality_slider"/>
<button label="Cancelar" name="cancel_btn"/>
<flyout_button label="Salvar" name="save_btn" tool_tip="Salvar imagem em um arquivo">
<flyout_button.item label="Salvar" name="save_item"/>
diff --git a/indra/newview/skins/default/xui/pt/panel_snapshot_options.xml b/indra/newview/skins/default/xui/pt/panel_snapshot_options.xml
index bce44d2ed6..d588e59f6d 100755
--- a/indra/newview/skins/default/xui/pt/panel_snapshot_options.xml
+++ b/indra/newview/skins/default/xui/pt/panel_snapshot_options.xml
@@ -1,16 +1,10 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="panel_snapshot_options">
- <button label="Postar no feed do meu perfil" name="save_to_profile_btn"/>
- <button label="E-mail" name="save_to_email_btn"/>
- <button label="Salvar em Meu inventário (L$[AMOUNT])" name="save_to_inventory_btn"/>
- <button label="Salvar no meu PC" name="save_to_computer_btn"/>
- <text name="send_to_facebook_textbox">
- Enviar para: [secondlife:/// Facebook]
- </text>
- <text name="send_to_twitter_textbox">
- [secondlife:/// Twitter]
- </text>
- <text name="send_to_flickr_textbox">
- [secondlife:/// Flickr]
- </text>
+ <button label="Salvar no disco" name="save_to_computer_btn"/>
+ <button label="Salvar em inventário (L$[AMOUNT])" name="save_to_inventory_btn"/>
+ <button label="Carregar no perfil" name="save_to_profile_btn"/>
+ <button label="Carregar no Facebook" name="send_to_facebook_btn"/>
+ <button label="Carregar no Twitter" name="send_to_twitter_btn"/>
+ <button label="Carregar no Flickr" name="send_to_flickr_btn"/>
+ <button label="Enviar por email" name="save_to_email_btn"/>
</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/pt/panel_snapshot_postcard.xml
index 12a648f600..ab1545a231 100755
--- a/indra/newview/skins/default/xui/pt/panel_snapshot_postcard.xml
+++ b/indra/newview/skins/default/xui/pt/panel_snapshot_postcard.xml
@@ -10,8 +10,12 @@
Enviando...
</string>
<text name="title">
- E-mail
+ Email
</text>
- <button label="Mensagem" name="message_btn"/>
- <button label="Configurações" name="settings_btn"/>
+ <tab_container name="postcard_tabs">
+ <panel label="Mensagem" name="panel_postcard_message"/>
+ <panel label="Configurações" name="panel_postcard_settings"/>
+ </tab_container>
+ <button label="Cancelar" name="cancel_btn"/>
+ <button label="Enviar" name="send_btn"/>
</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_snapshot_profile.xml b/indra/newview/skins/default/xui/pt/panel_snapshot_profile.xml
index 095b8fc75d..f1d7334752 100755
--- a/indra/newview/skins/default/xui/pt/panel_snapshot_profile.xml
+++ b/indra/newview/skins/default/xui/pt/panel_snapshot_profile.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="panel_snapshot_profile">
<text name="title">
- Postar no feed do meu perfil
+ Perfil
</text>
<combo_box label="Resolução" name="profile_size_combo">
<combo_box.item label="Janela atual" name="CurrentWindow"/>
@@ -10,19 +10,12 @@
<combo_box.item label="1024x768" name="1024x768"/>
<combo_box.item label="Customizado" name="Custom"/>
</combo_box>
- <layout_stack name="profile_image_params_ls">
- <layout_panel name="profile_image_size_lp">
- <spinner label="Largura" name="profile_snapshot_width"/>
- <spinner label="Altura" name="profile_snapshot_height"/>
- <check_box label="Limitar proporções" name="profile_keep_aspect_check"/>
- </layout_panel>
- <layout_panel name="profile_image_metadata_lp">
- <text name="caption_label">
- Legenda:
- </text>
- <check_box initial_value="true" label="Incluir local" name="add_location_cb"/>
- </layout_panel>
- </layout_stack>
+ <spinner label="Largura X Altura" name="profile_snapshot_width"/>
+ <check_box label="Limitar proporções" name="profile_keep_aspect_check"/>
+ <text name="caption_label">
+ Legenda:
+ </text>
+ <check_box initial_value="true" label="Incluir local" name="add_location_cb"/>
<button label="Cancelar" name="cancel_btn"/>
<button label="Postar" name="post_btn"/>
</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_status_bar.xml b/indra/newview/skins/default/xui/pt/panel_status_bar.xml
index cb9a6eb757..cfe52ff404 100755
--- a/indra/newview/skins/default/xui/pt/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/pt/panel_status_bar.xml
@@ -1,28 +1,16 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="status">
- <panel.string name="packet_loss_tooltip">
- Perda de pacote
- </panel.string>
- <panel.string name="bandwidth_tooltip">
- Banda
- </panel.string>
- <panel.string name="time">
- [hour12, datetime, slt]:[min, datetime, slt] [ampm, datetime, slt] [timezone,datetime, slt]
- </panel.string>
- <panel.string name="timeTooltip">
- [weekday, datetime, slt], [day, datetime, slt] [month, datetime, slt] [year, datetime, slt]
- </panel.string>
- <panel.string name="buycurrencylabel">
- L$ [AMT]
- </panel.string>
+ <panel.string name="packet_loss_tooltip">Perda de pacote</panel.string>
+ <panel.string name="bandwidth_tooltip">Banda</panel.string>
+ <panel.string name="time">[hour12, datetime, slt]:[min, datetime, slt] [ampm, datetime, slt] [timezone,datetime, slt]</panel.string>
+ <panel.string name="timeTooltip">[weekday, datetime, slt], [day, datetime, slt] [month, datetime, slt] [year, datetime, slt]</panel.string>
+ <panel.string name="buycurrencylabel">L$ [AMT]</panel.string>
<panel left="-410" name="balance_bg" width="200">
- <text name="balance" tool_tip="Atualizar saldo de L$" value="L$20"/>
+ <text name="balance" tool_tip="Atualizar saldo de L$" value="L$??"/>
<button label="Comprar L$" name="buyL" tool_tip="Comprar mais L$"/>
<button label="Comprar" name="goShop" tool_tip="Abrir Mercado do Second Life" width="80"/>
</panel>
- <text name="TimeText" tool_tip="Hora atual (Pacífico)">
- 24:00 AM PST
- </text>
+ <text name="TimeText" tool_tip="Hora atual (Pacífico)">24:00 AM PST</text>
<button name="media_toggle_btn" tool_tip="Tocar/Pausar todas mídias (música, vídeo, páginas web)"/>
<button name="volume_btn" tool_tip="Volume geral"/>
</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_twitter_photo.xml b/indra/newview/skins/default/xui/pt/panel_twitter_photo.xml
index 3958d5f0f9..7c4990f71e 100644
--- a/indra/newview/skins/default/xui/pt/panel_twitter_photo.xml
+++ b/indra/newview/skins/default/xui/pt/panel_twitter_photo.xml
@@ -1,32 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<panel name="panel_twitter_photo">
- <layout_stack name="stack_photo">
- <layout_panel name="text_panel">
- <text name="status_label">
- Próximas etapas?
- </text>
- <text name="status_counter_label">
- 140
- </text>
- <check_box initial_value="true" label="Incluir localização do SL" name="add_location_cb"/>
- <check_box initial_value="true" label="Incluir uma foto" name="add_photo_cb"/>
- </layout_panel>
- <layout_panel name="snapshot_panel">
- <combo_box name="resolution_combobox" tool_tip="Resolução da imagem">
- <combo_box.item label="Janela atual" name="CurrentWindow"/>
- <combo_box.item label="640x480" name="640x480"/>
- <combo_box.item label="800x600" name="800x600"/>
- <combo_box.item label="1024x768" name="1024x768"/>
- </combo_box>
- <combo_box name="filters_combobox" tool_tip="Filtros de imagem">
- <combo_box.item label="Sem filtro" name="NoFilter"/>
- </combo_box>
- <button label="Atualizar" name="new_snapshot_btn" tool_tip="Clique para atualizar"/>
- <button label="Visualizar" name="big_preview_btn" tool_tip="Clique para alternar entre visualizações"/>
- </layout_panel>
- <layout_panel name="photo_button_panel">
- <button label="Enviar tweet" name="post_photo_btn"/>
- <button label="Cancelar" name="cancel_photo_btn"/>
- </layout_panel>
- </layout_stack>
+ <text name="status_label">
+ Próximas etapas?
+ </text>
+ <text name="status_counter_label">
+ 140
+ </text>
+ <check_box initial_value="true" label="Incluir localização do SL" name="add_location_cb"/>
+ <check_box initial_value="true" label="Incluir uma foto" name="add_photo_cb"/>
+ <combo_box name="resolution_combobox" tool_tip="Resolução da imagem">
+ <combo_box.item label="Janela atual" name="CurrentWindow"/>
+ <combo_box.item label="640x480" name="640x480"/>
+ <combo_box.item label="800x600" name="800x600"/>
+ <combo_box.item label="1024x768" name="1024x768"/>
+ </combo_box>
+ <combo_box name="filters_combobox" tool_tip="Filtros de imagem">
+ <combo_box.item label="Sem filtro" name="NoFilter"/>
+ </combo_box>
+ <button label="Atualizar" name="new_snapshot_btn" tool_tip="Clique para atualizar"/>
+ <button label="Visualizar" name="big_preview_btn" tool_tip="Clique para alternar entre visualizações"/>
+ <button label="Enviar tweet" name="post_photo_btn"/>
+ <button label="Cancelar" name="cancel_photo_btn"/>
</panel>
diff --git a/indra/newview/skins/default/xui/pt/role_actions.xml b/indra/newview/skins/default/xui/pt/role_actions.xml
index 90e2264940..8d5bc061f9 100755
--- a/indra/newview/skins/default/xui/pt/role_actions.xml
+++ b/indra/newview/skins/default/xui/pt/role_actions.xml
@@ -66,4 +66,8 @@
<action description="Enviar aviso" longdescription="Membros que exercem cargos com esta função podem enviar avisos na seção Avisos." name="notices send" value="42"/>
<action description="Receber novos avisos e ver os anteriores" longdescription="Membros que exercem cargos com esta função podem receber e ler avisos antigos na seção Avisos." name="notices receive" value="43"/>
</action_set>
+ <action_set description="Estas funções incluem o poder de modificar as experiências desse grupo." name="experience_tools_experience">
+ <action description="Administrador de experiência" longdescription="Os membros em uma função com essa permissão podem editar os metadados de uma experiência." name="experience admin" value="49"/>
+ <action description="Colaborador de experiência" longdescription="Os membros em uma função com essa permissão podem contribuir com scripts para uma experiência." name="experience contributor" value="50"/>
+ </action_set>
</role_actions>
diff --git a/indra/newview/skins/default/xui/pt/sidepanel_item_info.xml b/indra/newview/skins/default/xui/pt/sidepanel_item_info.xml
index d3cb087108..47ffffaf15 100755
--- a/indra/newview/skins/default/xui/pt/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/pt/sidepanel_item_info.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="item properties" title="Perfil do item">
+ <panel.string name="loading_experience">
+ (carregando)
+ </panel.string>
<panel.string name="unknown">
(desconhecido)
</panel.string>
@@ -43,6 +46,9 @@
<text name="LabelAcquiredTitle">
Adquirido:
</text>
+ <text name="LabelItemExperienceTitle">
+ Experiência:
+ </text>
<panel name="perms_inv">
<text name="perm_modify">
Você pode:
@@ -66,8 +72,9 @@
<check_box label="Transferir" name="CheckNextOwnerTransfer" tool_tip="O próximo dono poderá revender ou dar este objeto"/>
</panel>
<check_box label="À venda" name="CheckPurchase"/>
- <combo_box name="combobox sale copy">
- <combo_box.item label="Copiar" name="Copy"/>
+ <combo_box name="ComboBoxSaleType">
+ <combo_box.item label="Cortar" name="Copy"/>
+ <combo_box.item label="Conteúdo" name="Contents"/>
<combo_box.item label="Original" name="Original"/>
</combo_box>
<spinner label="Preço: L$" name="Edit Cost"/>
diff --git a/indra/newview/skins/default/xui/pt/sidepanel_task_info.xml b/indra/newview/skins/default/xui/pt/sidepanel_task_info.xml
index f0fd438cef..bbfaa4a4f5 100755
--- a/indra/newview/skins/default/xui/pt/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/pt/sidepanel_task_info.xml
@@ -1,71 +1,31 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="object properties" title="Perfil do objeto">
- <panel.string name="text deed continued">
- Doar
- </panel.string>
- <panel.string name="text deed">
- Doar
- </panel.string>
- <panel.string name="text modify info 1">
- Você pode modificar este objeto
- </panel.string>
- <panel.string name="text modify info 2">
- Você pode modificar estes objetos
- </panel.string>
- <panel.string name="text modify info 3">
- Você não pode modificar este objeto
- </panel.string>
- <panel.string name="text modify info 4">
- Você não pode modificar estes objetos
- </panel.string>
- <panel.string name="text modify info 5">
- Não é possível modificar este objeto através de uma demarcação da região
- </panel.string>
- <panel.string name="text modify info 6">
- Não é possível modificar estes objetos através de uma demarcação da região
- </panel.string>
- <panel.string name="text modify warning">
- O objeto contém links ligando suas partes
- </panel.string>
- <panel.string name="Cost Default">
- Preço: L$
- </panel.string>
- <panel.string name="Cost Total">
- Preço total: L$
- </panel.string>
- <panel.string name="Cost Per Unit">
- Preço unitário: L$
- </panel.string>
- <panel.string name="Cost Mixed">
- Preço misto
- </panel.string>
- <panel.string name="Sale Mixed">
- Venda mista
- </panel.string>
+ <panel.string name="text deed continued">Doar</panel.string>
+ <panel.string name="text deed">Doar</panel.string>
+ <panel.string name="text modify info 1">Você pode modificar este objeto</panel.string>
+ <panel.string name="text modify info 2">Você pode modificar estes objetos</panel.string>
+ <panel.string name="text modify info 3">Você não pode modificar este objeto</panel.string>
+ <panel.string name="text modify info 4">Você não pode modificar estes objetos</panel.string>
+ <panel.string name="text modify info 5">Não é possível modificar este objeto através de uma demarcação da região</panel.string>
+ <panel.string name="text modify info 6">Não é possível modificar estes objetos através de uma demarcação da região</panel.string>
+ <panel.string name="text modify warning">O objeto contém links ligando suas partes</panel.string>
+ <panel.string name="Cost Default">Preço: L$</panel.string>
+ <panel.string name="Cost Total">Preço total: L$</panel.string>
+ <panel.string name="Cost Per Unit">Preço unitário: L$</panel.string>
+ <panel.string name="Cost Mixed">Preço misto</panel.string>
+ <panel.string name="Sale Mixed">Venda mista</panel.string>
<text name="title" value="Perfil do objeto"/>
<text name="where" value="(Inworld)"/>
<panel label="" name="properties_panel">
- <text name="Name:">
- Nome:
- </text>
- <text name="Description:">
- Descrição:
- </text>
- <text name="CreatorNameLabel">
- Criador:
- </text>
- <text name="Owner:">
- Proprietário:
- </text>
- <text name="Group_label">
- Grupo:
- </text>
+ <text name="Name:">Nome:</text>
+ <text name="Description:">Descrição:</text>
+ <text name="CreatorNameLabel">Criador:</text>
+ <text name="Owner:">Proprietário:</text>
+ <text name="Group_label">Grupo:</text>
<button name="button set group" tool_tip="Selecione o grupo que terá acesso à autorização do objeto"/>
<name_box initial_value="Carregando..." name="Group Name Proxy"/>
<button label="Doar" label_selected="Doar" name="button deed" tool_tip="Ao doar este item, o próximo dono terá permissões de próximo dono. Objetos de grupos podem ser doados por um oficial do grupo."/>
- <text name="label click action">
- Clique para:
- </text>
+ <text name="label click action">Clique para:</text>
<combo_box name="clickaction">
<combo_box.item label="Tocar (padrão)" name="Touch/grab(default)"/>
<combo_box.item label="Sentar em objeto" name="Sitonobject"/>
@@ -75,21 +35,13 @@
<combo_box.item label="Zoom" name="Zoom"/>
</combo_box>
<panel name="perms_inv">
- <text name="perm_modify">
- Você pode modificar este objeto
- </text>
- <text name="Anyone can:">
- Todos:
- </text>
+ <text name="perm_modify">Você pode modificar este objeto</text>
+ <text name="Anyone can:">Todos:</text>
<check_box label="Copiar" name="checkbox allow everyone copy"/>
<check_box label="Movimentar" name="checkbox allow everyone move"/>
- <text name="GroupLabel">
- Grupo:
- </text>
+ <text name="GroupLabel">Grupo:</text>
<check_box label="Compartilhar" name="checkbox share with group" tool_tip="Permitir que todos os membros do grupo tenham o seu nível de modificação para este objeto. Faça uma doação para ativar restrições de função."/>
- <text name="NextOwnerLabel">
- Próximo proprietário:
- </text>
+ <text name="NextOwnerLabel">Próximo proprietário:</text>
<check_box label="Modificar" name="checkbox next owner can modify"/>
<check_box label="Copiar" name="checkbox next owner can copy"/>
<check_box label="Transferir" name="checkbox next owner can transfer" tool_tip="O próximo dono poderá revender ou dar este objeto"/>
@@ -102,27 +54,13 @@
</combo_box>
<spinner label="Preço: L$" name="Edit Cost"/>
<check_box label="Mostrar nos resultados de busca" name="search_check" tool_tip="Incluir o objeto nos resultados de busca"/>
- <text name="pathfinding_attributes_label">
- Atributos do pathfinding:
- </text>
- <text name="B:">
- B:
- </text>
- <text name="O:">
- O:
- </text>
- <text name="G:">
- G:
- </text>
- <text name="E:">
- E:
- </text>
- <text name="N:">
- N:
- </text>
- <text name="F:">
- F:
- </text>
+ <text name="pathfinding_attributes_label">Atributos do pathfinding:</text>
+ <text name="B:">B:</text>
+ <text name="O:">O:</text>
+ <text name="G:">G:</text>
+ <text name="E:">E:</text>
+ <text name="N:">N:</text>
+ <text name="F:">F:</text>
</panel>
<panel name="button_panel">
<button label="Abrir" name="open_btn"/>
diff --git a/indra/newview/skins/default/xui/pt/strings.xml b/indra/newview/skins/default/xui/pt/strings.xml
index 577143b0dc..3eef691d8d 100755
--- a/indra/newview/skins/default/xui/pt/strings.xml
+++ b/indra/newview/skins/default/xui/pt/strings.xml
@@ -401,30 +401,51 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para
<string name="TooltipMustSingleDrop">
Apenas um item único pode ser arrastado para este local
</string>
+ <string name="TooltipTooManyWearables">
+ Você não pode usar uma pasta que contenha mais de [AMOUNT] itens. Você pode mudar esse limite em Avançado &gt; Mostrar configurações de depuração &gt; WearFolderLimit.
+ </string>
<string name="TooltipPrice" value="L$[AMOUNT]"/>
<string name="TooltipOutboxDragToWorld">
- Não é possível fazer rez do itens em sua caixa de saída do lojista
+ Não é possível fazer rez de itens da pasta Listagens do Marketplace
+ </string>
+ <string name="TooltipOutboxWorn">
+ Não é possível colocar itens que você estiver usando na pasta Listagens do Marketplace
+ </string>
+ <string name="TooltipOutboxFolderLevels">
+ A profundidade das pastas aninhadas excede [AMOUNT]. Diminua a profundidade das pastas dentro de pastas. Agrupe os itens se necessário.
+ </string>
+ <string name="TooltipOutboxTooManyFolders">
+ O número de subpastas excede [AMOUNT]. Diminua a o número de pastas em sua listagem. Agrupe os itens se necessário.
+ </string>
+ <string name="TooltipOutboxTooManyObjects">
+ O número de itens excede [AMOUNT]. Para vender mais que [AMOUNT] itens em uma listagem, você deve agrupar alguns deles.
+ </string>
+ <string name="TooltipOutboxTooManyStockItems">
+ O número de itens de estoque excede [AMOUNT].
+ </string>
+ <string name="TooltipOutboxCannotDropOnRoot">
+ Você pode soltar somente itens ou pastas na aba TUDO. Selecione essa aba e mova seus itens ou pastas novamente.
</string>
<string name="TooltipOutboxNoTransfer">
- Um ou mais destes objetos não podem ser vendidos ou transferidos.
+ Um ou mais objetos não podem ser vendidos ou transferidos
</string>
<string name="TooltipOutboxNotInInventory">
- Sua caixa de saída do lojista aceita apenas itens direto do seu inventário
+ É possível colocar somente itens do seu inventário no Marketplace
</string>
- <string name="TooltipOutboxWorn">
- Você não pode colocar os itens que está vestindo na sua caixa de saída do lojista
+ <string name="TooltipOutboxLinked">
+ Não é possível colocar itens ou pastas vinculadas no Marketplace
</string>
<string name="TooltipOutboxCallingCard">
- Não é possível colocar cartões de visita em sua caixa de saída do lojista
+ Não é possível colocar cartões de visitas no Marketplace
</string>
- <string name="TooltipOutboxFolderLevels">
- A profundidade das pastas aninhadas excede 3
+ <string name="TooltipOutboxDragActive">
+ Não é possível mover uma listagem publicada
</string>
- <string name="TooltipOutboxTooManyFolders">
- A contagem de subpastas na pasta de nível superior excede 20
+ <string name="TooltipOutboxCannotMoveRoot">
+ Não é possível mover a pasta raiz das listagens do Marketplace
</string>
- <string name="TooltipOutboxTooManyObjects">
- A contagem de itens na pasta de nível superior excede 200
+ <string name="TooltipOutboxMixedStock">
+ Todos os itens em uma pasta de estoque têm o mesmo tipo e permissão
</string>
<string name="TooltipDragOntoOwnChild">
Não é possível mover uma pasta para seu filho
@@ -1006,9 +1027,7 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para
<string name="AgentNameSubst">
(Você)
</string>
- <string name="JoinAnExperience">
- Participar de uma experiência
- </string>
+ <string name="JoinAnExperience"/><!-- intentionally blank -->
<string name="SilentlyManageEstateAccess">
Suprimir alertas ao gerenciar listas de acesso ao terreno
</string>
@@ -1075,6 +1094,12 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para
<string name="bitmap_image_files">
Imagens Bitmap
</string>
+ <string name="png_image_files">
+ Imagens PNG
+ </string>
+ <string name="save_texture_image_files">
+ Imagens targa ou PNG
+ </string>
<string name="avi_movie_file">
Arquivo de vídeo AVI
</string>
@@ -1324,6 +1349,9 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para
<string name="FavoritesNoMatchingItems">
Arraste um marco para adicioná-lo aos seus favoritos.
</string>
+ <string name="MarketplaceNoMatchingItems">
+ Nenhum item correspondente encontrado. Verifique a ortografia de sua cadeia de pesquisa e tente novamente.
+ </string>
<string name="InventoryNoTexture">
Você não possui uma cópia desta textura no seu inventário
</string>
@@ -1371,29 +1399,95 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para
<string name="InventoryOutboxError">
A loja [[MARKETPLACE_CREATE_STORE_URL] no Marketplace] está retornando erros.
</string>
+ <string name="InventoryMarketplaceError">
+ Esse recurso está em beta. Inscreva-se neste [http://goo.gl/forms/FCQ7UXkakz formulário do Google] se você deseja participar.
+ </string>
+ <string name="InventoryMarketplaceListingsNoItemsTitle">
+ Sua pasta Listagens do Marketplace está vazia.
+ </string>
+ <string name="InventoryMarketplaceListingsNoItems">
+ Arraste pastas para esta área para listá-las para venda no [Marketplace [MARKETPLACE_DASHBOARD_URL]].
+ </string>
+ <string name="Marketplace Validation Warning Stock">
+ a pasta de estoque deve estar em uma pasta de versões
+ </string>
+ <string name="Marketplace Validation Error Mixed Stock">
+ : Erro: todos os itens em uma pasta de estoque devem ser de cópia proibida e todos do mesmo tipo
+ </string>
+ <string name="Marketplace Validation Error Subfolder In Stock">
+ : Erro: a pasta de estoque não pode ter subpastas
+ </string>
+ <string name="Marketplace Validation Warning Empty">
+ : Aviso: a pasta não contém itens
+ </string>
+ <string name="Marketplace Validation Warning Create Stock">
+ : Aviso: criando pasta de estoque
+ </string>
+ <string name="Marketplace Validation Warning Create Version">
+ : Aviso: criando pasta de versões
+ </string>
+ <string name="Marketplace Validation Warning Move">
+ : Aviso: movendo itens
+ </string>
+ <string name="Marketplace Validation Warning Delete">
+ : Aviso: conteúdo da pasta transferido para pasta de estoque, removendo pasta vazia
+ </string>
+ <string name="Marketplace Validation Error Stock Item">
+ : Erro: itens de cópia proibida devem estar em uma pasta de estoque
+ </string>
+ <string name="Marketplace Validation Warning Unwrapped Item">
+ : Aviso: os itens devem estar em uma pasta de versões
+ </string>
+ <string name="Marketplace Validation Error">
+ : Erro:
+ </string>
+ <string name="Marketplace Validation Warning">
+ : Aviso:
+ </string>
+ <string name="Marketplace Validation Error Empty Version">
+ : Aviso: a pasta de versões deve conter pelo menos 1 item
+ </string>
+ <string name="Marketplace Validation Error Empty Stock">
+ : Aviso: a pasta de estoque deve conter pelo menos 1 item
+ </string>
+ <string name="Marketplace Validation No Error">
+ Não há erros ou avisos
+ </string>
<string name="Marketplace Error None">
Sem erros
</string>
+ <string name="Marketplace Error Prefix">
+ Erro:
+ </string>
<string name="Marketplace Error Not Merchant">
- Erro: antes de enviar os itens para o Mercado, é necessário que você se defina como um lojista (sem custos).
+ antes de enviar os itens para o Marketplace, é necessário que você se defina como um lojista (sem custos).
</string>
- <string name="Marketplace Error Empty Folder">
- Erro: esta pasta está vazia.
+ <string name="Marketplace Error Not Accepted">
+ Não é possível mover o item nessa pasta.
</string>
- <string name="Marketplace Error Unassociated Products">
- Erro: ocorreu uma falha ao enviar este item, pois sua conta de lojista tem muitos itens não associados a produtos. Para corrigir esse erro, faça o login no site do mercado e reduza a contagem de itens não associados.
+ <string name="Marketplace Error Unsellable Item">
+ Este item não pode ser vendido no Marketplace.
</string>
- <string name="Marketplace Error Object Limit">
- Erro: este item contém muitos objetos. Corrija esse erro unindo os objetos em caixa para reduzir a contagem total a menos de 200.
+ <string name="MarketplaceNoID">
+ no Mkt ID
</string>
- <string name="Marketplace Error Folder Depth">
- Erro: este item contém muitos níveis de pastas aninhadas. Reorganize-o em até 3 níveis de pastas aninhadas, no máximo.
+ <string name="MarketplaceLive">
+ publicada
</string>
- <string name="Marketplace Error Unsellable Item">
- Erro: este item não pode ser vendido no mercado.
+ <string name="MarketplaceActive">
+ ativo
+ </string>
+ <string name="MarketplaceMax">
+ máx
+ </string>
+ <string name="MarketplaceStock">
+ estoque
</string>
- <string name="Marketplace Error Internal Import">
- Erro: ocorreu um problema com este item. Tente novamente mais tarde.
+ <string name="MarketplaceNoStock">
+ esgotado
+ </string>
+ <string name="MarketplaceUpdating">
+ atualizando...
</string>
<string name="Open landmarks">
Marcos abertos
@@ -1414,6 +1508,7 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para
Nenhum conteúdo
</string>
<string name="WornOnAttachmentPoint" value="(vestido em [ATTACHMENT_POINT])"/>
+ <string name="AttachmentErrorMessage" value="([ATTACHMENT_ERROR])"/>
<string name="ActiveGesture" value="[GESLABEL] (ativado)"/>
<string name="Chat Message" value="Bate-papo:"/>
<string name="Sound" value="Som"/>
@@ -1678,6 +1773,15 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para
<string name="Invalid Attachment">
Ponto de encaixe inválido
</string>
+ <string name="ATTACHMENT_MISSING_ITEM">
+ Erro: item ausente
+ </string>
+ <string name="ATTACHMENT_MISSING_BASE_ITEM">
+ Erro: item base ausente
+ </string>
+ <string name="ATTACHMENT_NOT_ATTACHED">
+ Erro: o objeto está no look atual, mas não foi anexado
+ </string>
<string name="YearsMonthsOld">
[AGEYEARS] [AGEMONTHS] de idade
</string>
@@ -1846,6 +1950,9 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para
<string name="SaveComplete">
Salvo.
</string>
+ <string name="UploadFailed">
+ Falha ao carregar arquivo:
+ </string>
<string name="ObjectOutOfRange">
Script (objeto fora de alcance)
</string>
@@ -1855,6 +1962,9 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para
<string name="GroupsNone">
nenhum
</string>
+ <string name="CompileNoExperiencePerm">
+ Pulando script [SCRIPT] com experiência [EXPERIENCE]
+ </string>
<string name="Group" value="(grupo)"/>
<string name="Unknown">
(Desconhecido)
@@ -4936,6 +5046,9 @@ Tente colocar o caminho do editor entre aspas.
<string name="Command_Marketplace_Label">
Mercado
</string>
+ <string name="Command_MarketplaceListings_Label">
+ Marketplace
+ </string>
<string name="Command_MiniMap_Label">
Mini Mapa
</string>
@@ -5023,6 +5136,9 @@ Tente colocar o caminho do editor entre aspas.
<string name="Command_Marketplace_Tooltip">
Faça compras
</string>
+ <string name="Command_MarketplaceListings_Tooltip">
+ Venda suas criações
+ </string>
<string name="Command_MiniMap_Tooltip">
Mostrar quem está aqui
</string>
@@ -5146,4 +5262,85 @@ Tente colocar o caminho do editor entre aspas.
<string name="loading_chat_logs">
Carregando...
</string>
+ <string name="experience_tools_experience">
+ Experiência
+ </string>
+ <string name="ExperienceNameNull">
+ (nenhuma experiência)
+ </string>
+ <string name="ExperienceNameUntitled">
+ (experiência sem título)
+ </string>
+ <string name="Land-Scope">
+ Dentro do terreno
+ </string>
+ <string name="Grid-Scope">
+ Dentro da grade
+ </string>
+ <string name="Allowed_Experiences_Tab">
+ PERMITIDO
+ </string>
+ <string name="Blocked_Experiences_Tab">
+ BLOQUEADA
+ </string>
+ <string name="Contrib_Experiences_Tab">
+ COLABORADOR
+ </string>
+ <string name="Admin_Experiences_Tab">
+ ADMIN
+ </string>
+ <string name="Recent_Experiences_Tab">
+ RECENTES
+ </string>
+ <string name="Owned_Experiences_Tab">
+ PRÓPRIAS
+ </string>
+ <string name="ExperiencesCounter">
+ ([EXPERIENCES], máx. [MAXEXPERIENCES])
+ </string>
+ <string name="ExperiencePermission1">
+ assumir seus controles
+ </string>
+ <string name="ExperiencePermission3">
+ botão animações no seu avatar
+ </string>
+ <string name="ExperiencePermission4">
+ anexar ao avatar
+ </string>
+ <string name="ExperiencePermission9">
+ rastrear sua câmera
+ </string>
+ <string name="ExperiencePermission10">
+ controlar sua câmera
+ </string>
+ <string name="ExperiencePermission11">
+ teletransportar você
+ </string>
+ <string name="ExperiencePermission12">
+ aceitar automaticamente permissões de experiência
+ </string>
+ <string name="ExperiencePermissionShortUnknown">
+ realizar uma operação desconhecida: [Permission]
+ </string>
+ <string name="ExperiencePermissionShort1">
+ Assumir o controle
+ </string>
+ <string name="ExperiencePermissionShort3">
+ Botão animações
+ </string>
+ <string name="ExperiencePermissionShort4">
+ Anexar
+ </string>
+ <string name="ExperiencePermissionShort9">
+ Rastrear câmera
+ </string>
+ <string name="ExperiencePermissionShort10">
+ Câmera de controle
+ </string>
+ <string name="ExperiencePermissionShort11">
+ Teletransportar
+ </string>
+ <string name="ExperiencePermissionShort12">
+ Autorização
+ </string>
</strings>
diff --git a/indra/newview/skins/default/xui/pt/teleport_strings.xml b/indra/newview/skins/default/xui/pt/teleport_strings.xml
index 40fb4caebf..9e1fd593ef 100755
--- a/indra/newview/skins/default/xui/pt/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/pt/teleport_strings.xml
@@ -46,6 +46,9 @@ Vá para a &apos;Ilha Welcome Pública&apos; para repetir o tutorial.
<message name="MustGetAgeRegion">
Você deve ter 18 anos ou mais para acessar esta região.
</message>
+ <message name="RegionTPSpecialUsageBlocked">
+ Não é possível inserir a região. &apos;[REGION_NAME]&apos; é uma Região de Skill Gaming, portanto você deve atender certos critérios para poder entrar. Para maiores detalhes, consulte as [http://wiki.secondlife.com/wiki/Linden_Lab_Official:Skill_Gaming_in_Second_Life Skill Gaming FAQ].
+ </message>
</message_set>
<message_set name="progress">
<message name="sending_dest">
diff --git a/indra/newview/skins/default/xui/ru/floater_about.xml b/indra/newview/skins/default/xui/ru/floater_about.xml
index 9494106e96..0f75856a91 100755
--- a/indra/newview/skins/default/xui/ru/floater_about.xml
+++ b/indra/newview/skins/default/xui/ru/floater_about.xml
@@ -1,70 +1,16 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="floater_about" title="О [CAPITALIZED_APP_NAME]">
- <floater.string name="AboutHeader">
- [APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2] ([VIEWER_VERSION_3]) [BUILD_DATE] [BUILD_TIME] ([CHANNEL])
-[[VIEWER_RELEASE_NOTES_URL] [ReleaseNotes]]
- </floater.string>
- <floater.string name="AboutCompiler">
- ИÑпользован компилÑтор [COMPILER], верÑÐ¸Ñ [COMPILER_VERSION]
- </floater.string>
- <floater.string name="AboutPosition">
- Ð’Ñ‹ в точке [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1] в регионе «[REGION]», раÑположенном на &lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt; ([HOSTIP])
-SLURL: &lt;nolink&gt;[SLURL]&lt;/nolink&gt;
-(глобальные координаты [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1])
-[SERVER_VERSION]
-[SERVER_RELEASE_NOTES_URL]
- </floater.string>
- <floater.string name="AboutSystem">
- ЦП: [CPU]
-ПамÑÑ‚ÑŒ: [MEMORY_MB] МБ
-ВерÑÐ¸Ñ ÐžÐ¡: [OS_VERSION]
-Производитель графичеÑкой платы: [GRAPHICS_CARD_VENDOR]
-ГрафичеÑÐºÐ°Ñ Ð¿Ð»Ð°Ñ‚Ð°: [GRAPHICS_CARD]
- </floater.string>
- <floater.string name="AboutDriver">
- ВерÑÐ¸Ñ Ð³Ñ€Ð°Ñ„Ð¸Ñ‡ÐµÑкого драйвера Windows: [GRAPHICS_DRIVER_VERSION]
- </floater.string>
- <floater.string name="AboutLibs">
- ВерÑÐ¸Ñ OpenGL: [OPENGL_VERSION]
-ВерÑÐ¸Ñ libcurl: [LIBCURL_VERSION]
-ВерÑÐ¸Ñ Ð´ÐµÐºÐ¾Ð´ÐµÑ€Ð° J2C: [J2C_VERSION]
-ВерÑÐ¸Ñ Ð´Ñ€Ð°Ð¹Ð²ÐµÑ€Ð° звука: [AUDIO_DRIVER_VERSION]
-ВерÑÐ¸Ñ Qt Webkit: [QT_WEBKIT_VERSION]
-ВерÑÐ¸Ñ Ð³Ð¾Ð»Ð¾Ñового Ñервера: [VOICE_VERSION]
- </floater.string>
- <floater.string name="none">
- (нет)
- </floater.string>
- <floater.string name="AboutTraffic">
- ПотерÑно пакетов: [PACKETS_LOST,number,0]/[PACKETS_IN,number,0] ([PACKETS_PCT,number,1]%)
- </floater.string>
- <floater.string name="ErrorFetchingServerReleaseNotesURL">
- Ошибка при получении URL-адреÑа заметок о выпуÑке Ñервера.
- </floater.string>
<tab_container name="about_tab">
<panel label="Данные" name="support_panel">
<button label="Копировать в буфер обмена" name="copy_btn"/>
</panel>
<panel label="Создатели" name="credits_panel">
- <text name="linden_intro">
- Игра Second Life разработана лабораторией Lindens:
- </text>
- <text name="contrib_intro">
- в напиÑании открытого кода учаÑтвовали:
- </text>
- <text_editor name="contrib_names">
- ПÑевдо-Ð¸Ð¼Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¾ при запуÑке
- </text_editor>
- <text name="trans_intro">
- перевод:
- </text>
- <text_editor name="trans_names">
- ПÑевдо-Ð¸Ð¼Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¾ при запуÑке
- </text_editor>
+ <text name="linden_intro">Игра Second Life разработана лабораторией Lindens,
+в напиÑании открытого кода учаÑтвовали:</text>
+ <text_editor name="contrib_names">ПÑевдо-Ð¸Ð¼Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¾ при запуÑке</text_editor>
</panel>
<panel label="Лицензии" name="licenses_panel">
- <text_editor name="credits_editor">
- 3Dconnexion SDK (C) 1992-2009 3Dconnexion
+ <text_editor name="licenses_editor">3Dconnexion SDK (C) 1992-2009 3Dconnexion
APR (C) 2011 The Apache Software Foundation
Collada DOM (C) 2006 Sony Computer Entertainment Inc.
cURL (C) 1996-2010, Daniel Stenberg, (daniel@haxx.se)
@@ -91,8 +37,7 @@ SLURL: &lt;nolink&gt;[SLURL]&lt;/nolink&gt;
Ð’Ñе права защищены. Подробные ÑÐ²ÐµÐ´ÐµÐ½Ð¸Ñ Ñм. в файле licenses.txt.
- Кодирование звука Ð´Ð»Ñ Ð³Ð¾Ð»Ð¾Ñового чата: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
- </text_editor>
+ Кодирование звука Ð´Ð»Ñ Ð³Ð¾Ð»Ð¾Ñового чата: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)</text_editor>
</panel>
</tab_container>
</floater>
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 12691df684..86428da3ef 100755
--- a/indra/newview/skins/default/xui/ru/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/ru/floater_about_land.xml
@@ -331,22 +331,6 @@
<check_box label="БезопаÑно (нет повреждений)" name="check safe" tool_tip="ЕÑли отмечено, то Ð·ÐµÐ¼Ð»Ñ ÑчитаетÑÑ Ð±ÐµÐ·Ð¾Ð¿Ð°Ñной, отключены боевые повреждениÑ. ЕÑли не отмечено, то боевые Ð¿Ð¾Ð²Ñ€ÐµÐ¶Ð´ÐµÐ½Ð¸Ñ Ð²ÐºÐ»ÑŽÑ‡ÐµÐ½Ñ‹."/>
<check_box label="Ðе толкать" name="PushRestrictCheck" tool_tip="Запрещает Ñкриптам функцию толканиÑ. Этот параметр может оказатьÑÑ Ð¿Ð¾Ð»ÐµÐ·Ð½Ñ‹Ð¼ Ð´Ð»Ñ Ð¿Ñ€ÐµÐ´Ð¾Ñ‚Ð²Ñ€Ð°Ñ‰ÐµÐ½Ð¸Ñ Ð½ÐµÐ¶ÐµÐ»Ð°Ñ‚ÐµÐ»ÑŒÐ½Ð¾Ð³Ð¾ Ð¿Ð¾Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ð½Ð° вашей земле."/>
<check_box label="Показать меÑто в поиÑке (L$30/неделÑ)" name="ShowDirectoryCheck" tool_tip="Позволить людÑм видеть учаÑток в результатах поиÑка"/>
- <combo_box name="land category with adult">
- <combo_box.item label="Ð›ÑŽÐ±Ð°Ñ ÐºÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ" name="item0"/>
- <combo_box.item label="МеÑто Linden" name="item1"/>
- <combo_box.item label="ВзроÑлый" name="item2"/>
- <combo_box.item label="ИÑкуÑÑтво и культура" name="item3"/>
- <combo_box.item label="БизнеÑ" name="item4"/>
- <combo_box.item label="Образование" name="item5"/>
- <combo_box.item label="Игры" name="item6"/>
- <combo_box.item label="МеÑта вÑтреч" name="item7"/>
- <combo_box.item label="Ð”Ð»Ñ Ð½Ð¾Ð²Ð¸Ñ‡ÐºÐ¾Ð²" name="item8"/>
- <combo_box.item label="Парки и природа" name="item9"/>
- <combo_box.item label="Проживание" name="item10"/>
- <combo_box.item label="Покупки" name="item11"/>
- <combo_box.item label="Ðренда" name="item13"/>
- <combo_box.item label="Другое" name="item12"/>
- </combo_box>
<combo_box name="land category">
<combo_box.item label="Ð›ÑŽÐ±Ð°Ñ ÐºÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ" name="item0"/>
<combo_box.item label="МеÑто Linden" name="item1"/>
@@ -477,5 +461,6 @@
<button label="Удалить" label_selected="Удалить" name="remove_banned"/>
</panel>
</panel>
+ <panel label="ПРИКЛЮЧЕÐИЯ" name="land_experiences_panel"/>
</tab_container>
</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_associate_listing.xml b/indra/newview/skins/default/xui/ru/floater_associate_listing.xml
new file mode 100644
index 0000000000..fc9a19730b
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/floater_associate_listing.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="associate listing" title="СВЯЗÐТЬ СПИСОК">
+ <text name="message">ID ÑпиÑка:</text>
+ <line_editor name="listing_id">Введите ID</line_editor>
+ <button label="OK" name="OK"/>
+ <button label="Отмена" name="Cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_edit_hover_height.xml b/indra/newview/skins/default/xui/ru/floater_edit_hover_height.xml
new file mode 100644
index 0000000000..292128d295
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/floater_edit_hover_height.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="HoverHeight" title="ЗÐДÐЙТЕ ВЫСОТУ ПÐРЕÐИЯ">
+ <slider label="Ð’Ñ‹Ñота" name="HoverHeightSlider"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_experience_search.xml b/indra/newview/skins/default/xui/ru/floater_experience_search.xml
new file mode 100644
index 0000000000..77e3784b68
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/floater_experience_search.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="experiencepicker" title="ВЫБЕРИТЕ ПРИКЛЮЧЕÐИЕ"/>
diff --git a/indra/newview/skins/default/xui/ru/floater_experienceprofile.xml b/indra/newview/skins/default/xui/ru/floater_experienceprofile.xml
new file mode 100644
index 0000000000..c72d8b59b9
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/floater_experienceprofile.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater title="EXPERIENCE PROFILE">
+ <floater.string name="empty_slurl">
+ (нет)
+ </floater.string>
+ <floater.string name="maturity_icon_general">
+ &quot;Parcel_PG_Light&quot;
+ </floater.string>
+ <floater.string name="maturity_icon_moderate">
+ &quot;Parcel_M_Light&quot;
+ </floater.string>
+ <floater.string name="maturity_icon_adult">
+ &quot;Parcel_R_Light&quot;
+ </floater.string>
+ <text name="edit_title" value="Профиль приключениÑ"/>
+ <tab_container name="tab_container">
+ <panel name="panel_experience_info">
+ <scroll_container name="xp_scroll">
+ <panel name="scrolling_panel">
+ <layout_stack>
+ <layout_panel name="top panel">
+ <button label="Изменить" name="edit_btn"/>
+ </layout_panel>
+ <layout_panel name="maturity panel">
+ <text name="ContentRating">
+ Рейтинг:
+ </text>
+ </layout_panel>
+ <layout_panel name="location panel">
+ <text name="Location">
+ МеÑто:
+ </text>
+ </layout_panel>
+ <layout_panel>
+ <text name="Owner">
+ Владелец:
+ </text>
+ </layout_panel>
+ <layout_panel name="group_panel">
+ <text name="Group">
+ Группа:
+ </text>
+ </layout_panel>
+ <layout_panel name="perm panel">
+ <button label="Разрешить" name="allow_btn"/>
+ <button label="Забыть" name="forget_btn"/>
+ <button label="Заблокировать" name="block_btn"/>
+ <text name="privileged">
+ Это приключение включено Ð´Ð»Ñ Ð²Ñех жителей.
+ </text>
+ <button label="Жалоба" name="report_btn"/>
+ </layout_panel>
+ </layout_stack>
+ </panel>
+ </scroll_container>
+ </panel>
+ <panel name="edit_panel_experience_info">
+ <scroll_container name="edit_xp_scroll">
+ <panel name="edit_scrolling_panel">
+ <text name="edit_experience_title_label" value="Ðазвание:"/>
+ <text name="edit_experience_desc_label" value="ОпиÑание:"/>
+ <button label="Группа" name="Group_btn"/>
+ <text name="edit_ContentRating">
+ Рейтинг:
+ </text>
+ <icons_combo_box label="Умеренный" name="edit_ContentRatingText" tool_tip="При повышении рейтинга зрелоÑти Ð´Ð»Ñ Ð¿Ñ€Ð¸ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ ÑбраÑываетÑÑ Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¸Ðµ Ð´Ð»Ñ Ð²Ñех жителей, которые разрешили приключение.">
+ <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>
+ <text name="edit_Location">
+ МеÑто:
+ </text>
+ <button label="ПоÑтавить текущее меÑто" name="location_btn"/>
+ <button label="ОчиÑтить меÑто" name="clear_btn"/>
+ <check_box label="Включить приключение" name="edit_enable_btn" tool_tip=""/>
+ <check_box label="Скрыть при поиÑке" name="edit_private_btn"/>
+ <text name="changes" value="Отображение изменений Ð¿Ñ€Ð¸ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð²Ð¾ вÑех регионах может занÑÑ‚ÑŒ неÑколько минут."/>
+ <button label="Ðазад" name="cancel_btn"/>
+ <button label="Сохранить" name="save_btn"/>
+ </panel>
+ </scroll_container>
+ </panel>
+ </tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_experiences.xml b/indra/newview/skins/default/xui/ru/floater_experiences.xml
new file mode 100644
index 0000000000..f6fedfccc7
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/floater_experiences.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_experiences" title="ПРИКЛЮЧЕÐИЯ"/>
diff --git a/indra/newview/skins/default/xui/ru/floater_facebook.xml b/indra/newview/skins/default/xui/ru/floater_facebook.xml
index 20b9e4e151..cbf32cb682 100644
--- a/indra/newview/skins/default/xui/ru/floater_facebook.xml
+++ b/indra/newview/skins/default/xui/ru/floater_facebook.xml
@@ -1,20 +1,15 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="floater_facebook" title="ОПУБЛИКОВÐТЬ Ð’ FACEBOOK">
- <panel name="background">
- <tab_container name="tabs">
- <panel label="СТÐТУС" name="panel_facebook_status"/>
- <panel label="ФОТО" name="panel_facebook_photo"/>
- <panel label="ВХОД" name="panel_facebook_place"/>
- <panel label="ДРУЗЬЯ" name="panel_facebook_friends"/>
- <panel label="ÐККÐУÐТ" name="panel_facebook_account"/>
- </tab_container>
- <panel name="connection_status_panel">
- <text name="connection_error_text">
- Ошибка
- </text>
- <text name="connection_loading_text">
- Загрузка...
- </text>
- </panel>
- </panel>
+ <tab_container name="tabs">
+ <panel label="СТÐТУС" name="panel_facebook_status"/>
+ <panel label="ФОТО" name="panel_facebook_photo"/>
+ <panel label="ВХОД" name="panel_facebook_place"/>
+ <panel label="ДРУЗЬЯ" name="panel_facebook_friends"/>
+ </tab_container>
+ <text name="connection_error_text">
+ Ошибка
+ </text>
+ <text name="connection_loading_text">
+ Загрузка...
+ </text>
</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/ru/floater_inventory_item_properties.xml
index 9021b71fe2..c988825756 100755
--- a/indra/newview/skins/default/xui/ru/floater_inventory_item_properties.xml
+++ b/indra/newview/skins/default/xui/ru/floater_inventory_item_properties.xml
@@ -1,67 +1,36 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="item properties" title="СВОЙСТВРПРЕДМЕТÐ">
- <floater.string name="unknown">
- (неизвеÑтно)
- </floater.string>
- <floater.string name="public">
- (публичное)
- </floater.string>
- <floater.string name="you_can">
- Вы можете:
- </floater.string>
- <floater.string name="owner_can">
- Владелец может:
- </floater.string>
- <floater.string name="acquiredDate">
- [wkday,datetime,local], [day,datetime,local] [mth,datetime,local] [year,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local]
- </floater.string>
- <text name="LabelItemNameTitle">
- Ðазвание:
- </text>
- <text name="LabelItemDescTitle">
- ОпиÑание:
- </text>
- <text name="LabelCreatorTitle">
- Создатель:
- </text>
+ <floater.string name="unknown">(неизвеÑтно)</floater.string>
+ <floater.string name="public">(публичное)</floater.string>
+ <floater.string name="you_can">Вы можете:</floater.string>
+ <floater.string name="owner_can">Владелец может:</floater.string>
+ <floater.string name="acquiredDate">[wkday,datetime,local], [day,datetime,local] [mth,datetime,local] [year,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local]</floater.string>
+ <text name="LabelItemNameTitle">Ðазвание:</text>
+ <text name="LabelItemDescTitle">ОпиÑание:</text>
+ <text name="LabelCreatorTitle">Создатель:</text>
<button label="Профиль…" name="BtnCreator"/>
- <text name="LabelOwnerTitle">
- Владелец:
- </text>
+ <text name="LabelOwnerTitle">Владелец:</text>
<button label="Профиль…" name="BtnOwner"/>
- <text name="LabelAcquiredTitle">
- Приобретено:
- </text>
- <text name="LabelAcquiredDate">
- Ср 24 Май 12:50:46 2006
- </text>
- <text name="OwnerLabel">
- Ð’Ñ‹:
- </text>
+ <text name="LabelAcquiredTitle">Приобретено:</text>
+ <text name="LabelAcquiredDate">Ср 24 Май 12:50:46 2006</text>
+ <text name="OwnerLabel">Ð’Ñ‹:</text>
<check_box label="Изменить" name="CheckOwnerModify"/>
<check_box label="Копировать" name="CheckOwnerCopy"/>
<check_box label="Перепродать" name="CheckOwnerTransfer"/>
- <text name="AnyoneLabel">
- Ð’Ñе:
- </text>
+ <text name="AnyoneLabel">Ð’Ñе:</text>
<check_box label="Копировать" name="CheckEveryoneCopy"/>
- <text name="GroupLabel">
- Группа:
- </text>
+ <text name="GroupLabel">Группа:</text>
<check_box label="ПоделитьÑÑ" name="CheckShareWithGroup"/>
- <text name="NextOwnerLabel">
- Следующий владелец:
- </text>
+ <text name="NextOwnerLabel">Следующий владелец:</text>
<check_box label="Изменить" name="CheckNextOwnerModify"/>
<check_box label="Копировать" name="CheckNextOwnerCopy"/>
<check_box label="Перепродать" name="CheckNextOwnerTransfer"/>
<check_box label="Ð”Ð»Ñ Ð¿Ñ€Ð¾Ð´Ð°Ð¶Ð¸" name="CheckPurchase"/>
- <combo_box name="combobox sale copy">
+ <combo_box name="ComboBoxSaleType">
<combo_box.item label="Копировать" name="Copy"/>
+ <combo_box.item label="Содержимое" name="Contents"/>
<combo_box.item label="Оригинал" name="Original"/>
</combo_box>
<spinner label="Цена:" name="Edit Cost"/>
- <text name="CurrencySymbol">
- L$
- </text>
+ <text name="CurrencySymbol">L$</text>
</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/ru/floater_inventory_view_finder.xml
index 02068c57b8..aa0184fe34 100755
--- a/indra/newview/skins/default/xui/ru/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/ru/floater_inventory_view_finder.xml
@@ -5,8 +5,8 @@
<check_box label="Одежда" name="check_clothing"/>
<check_box label="ЖеÑÑ‚Ñ‹" name="check_gesture"/>
<check_box label="Закладки" name="check_landmark"/>
- <check_box label="Меши" name="check_mesh"/>
<check_box label="Заметки" name="check_notecard"/>
+ <check_box label="Меши" name="check_mesh"/>
<check_box label="Объекты" name="check_object"/>
<check_box label="Скрипты" name="check_script"/>
<check_box label="Звуки" name="check_sound"/>
@@ -19,6 +19,10 @@
<text name="- OR -">
- ИЛИ -
</text>
+ <radio_group name="date_search_direction">
+ <radio_item label="Ðовее, чем" name="newer"/>
+ <radio_item label="Старше, чем" name="older"/>
+ </radio_group>
<spinner label="ЧаÑов назад" name="spin_hours_ago"/>
<spinner label="Дней назад" name="spin_days_ago"/>
<button label="Закрыть" label_selected="Закрыть" name="Close"/>
diff --git a/indra/newview/skins/default/xui/ru/floater_item_properties.xml b/indra/newview/skins/default/xui/ru/floater_item_properties.xml
new file mode 100644
index 0000000000..abd75902fd
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/floater_item_properties.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Item Properties" title="СВОЙСТВРПРЕДМЕТÐ"/>
diff --git a/indra/newview/skins/default/xui/ru/floater_lagmeter.xml b/indra/newview/skins/default/xui/ru/floater_lagmeter.xml
index c420006a03..0cc9e56ff7 100644
--- a/indra/newview/skins/default/xui/ru/floater_lagmeter.xml
+++ b/indra/newview/skins/default/xui/ru/floater_lagmeter.xml
@@ -31,7 +31,7 @@
ЧаÑтота кадров клиента от [CLIENT_FRAME_RATE_CRITICAL] до [CLIENT_FRAME_RATE_WARNING]
</floater.string>
<floater.string name="client_frame_time_normal_msg">
- Ðормально
+ Ðормальный
</floater.string>
<floater.string name="client_draw_distance_cause_msg">
Ð’Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð°Ñ Ð¿Ñ€Ð¸Ñ‡Ð¸Ð½Ð°: дальноÑÑ‚ÑŒ отриÑовки Ñлишком велика
@@ -61,7 +61,7 @@
Сеть терÑет [NETWORK_PACKET_LOSS_WARNING]–[NETWORK_PACKET_LOSS_CRITICAL]% пакетов
</floater.string>
<floater.string name="network_performance_normal_msg">
- Ðормально
+ Ðормальный
</floater.string>
<floater.string name="network_ping_critical_ms">
600
@@ -100,7 +100,7 @@
ЧаÑтота кадров Ñервера [SERVER_FRAME_RATE_CRITICAL]–[SERVER_FRAME_RATE_WARNING]
</floater.string>
<floater.string name="server_frame_time_normal_msg">
- Ðормально
+ Ðормальный
</floater.string>
<floater.string name="server_physics_cause_msg">
Ð’Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð°Ñ Ð¿Ñ€Ð¸Ñ‡Ð¸Ð½Ð°: Ñлишком много физичеÑких объектов
@@ -131,21 +131,21 @@
Клиент
</text>
<text name="client_text">
- Ðормально
+ Ðормальный
</text>
<button name="network_lagmeter" tool_tip="Уровень лагов Ñети"/>
<text name="network">
Сеть
</text>
<text name="network_text">
- Ðормально
+ Ðормальный
</text>
<button name="server_lagmeter" tool_tip="Уровень лагов Ñервера"/>
<text name="server">
Сервер
</text>
<text name="server_text">
- Ðормально
+ Ðормальный
</text>
<button label="&gt;&gt;" name="minimize" tool_tip="Переключение размера"/>
</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/ru/floater_live_lsleditor.xml
index fb6e747592..30a196b1ca 100755
--- a/indra/newview/skins/default/xui/ru/floater_live_lsleditor.xml
+++ b/indra/newview/skins/default/xui/ru/floater_live_lsleditor.xml
@@ -9,7 +9,24 @@
<floater.string name="Title">
СКРИПТ: [NAME]
</floater.string>
+ <floater.string name="experience_enabled">
+ Снимите флажок Ð´Ð»Ñ ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ Ñ‚ÐµÐºÑƒÑ‰ÐµÐ³Ð¾ приключениÑ
+ </floater.string>
+ <floater.string name="no_experiences">
+ Вам не разрешено пользоватьÑÑ Ð¿Ñ€Ð¸ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñми
+ </floater.string>
+ <floater.string name="add_experiences">
+ Выберите, чтобы добавить приключение
+ </floater.string>
+ <floater.string name="show_experience_profile">
+ Щелкните Ð´Ð»Ñ Ð¿Ñ€Ð¾Ñмотра Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñ Ð¿Ñ€Ð¸ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ
+ </floater.string>
+ <floater.string name="loading">
+ Загрузка...
+ </floater.string>
<button label="СброÑ" label_selected="СброÑ" name="Reset"/>
<check_box initial_value="true" label="ВыполнÑетÑÑ" name="running"/>
<check_box initial_value="true" label="Моно" name="mono"/>
+ <check_box label="ИÑпользовать приключение:" name="enable_xp"/>
+ <button label="&gt;" name="view_profile"/>
</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_marketplace_listings.xml b/indra/newview/skins/default/xui/ru/floater_marketplace_listings.xml
new file mode 100644
index 0000000000..b231997307
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/floater_marketplace_listings.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_marketplace_listings" title="СПИСКИ ТОВÐРОВ Ð’ ТОРГОВОМ ЦЕÐТРЕ">
+ <panel name="marketplace_listings_panel">
+ <panel>
+ <panel name="marketplace_listings_inventory_placeholder_panel">
+ <text name="marketplace_listings_inventory_placeholder_title">Загрузка...</text>
+ </panel>
+ </panel>
+ </panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_marketplace_validation.xml b/indra/newview/skins/default/xui/ru/floater_marketplace_validation.xml
new file mode 100644
index 0000000000..6b293014bc
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/floater_marketplace_validation.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_marketplace_validation" title="Проверить ÑпиÑки товаров в торговом центре">
+ <button label="OK" label_selected="OK" name="OK"/>
+ <text_editor name="validation_text">MARKETPLACE_VALIDATION_TEXT</text_editor>
+</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_openobject.xml b/indra/newview/skins/default/xui/ru/floater_openobject.xml
index 5da308eecb..a4b6e2af11 100755
--- a/indra/newview/skins/default/xui/ru/floater_openobject.xml
+++ b/indra/newview/skins/default/xui/ru/floater_openobject.xml
@@ -3,6 +3,11 @@
<text name="object_name">
[DESC]:
</text>
- <button label="Копировать в инвентарь" label_selected="Копировать в инвентарь" name="copy_to_inventory_button"/>
- <button label="Копировать и надеть" label_selected="Копировать и надеть" name="copy_and_wear_button"/>
+ <text name="border_note">
+ Копировать в инвентарь и надеть
+ </text>
+ <button label="Добавить в коÑтюм" label_selected="Добавить в коÑтюм" name="copy_and_wear_button"/>
+ <button label="Заменить коÑтюм" label_selected="Заменить коÑтюм" name="copy_and_replace_button"/>
+ <button label="Только копировать в инвентарь" label_selected="Только копировать в инвентарь" name="copy_to_inventory_button"/>
+ <button label="Отмена" label_selected="Отмена" name="cancel_button"/>
</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_pay.xml b/indra/newview/skins/default/xui/ru/floater_pay.xml
index 1471a7e133..0a269b9e00 100755
--- a/indra/newview/skins/default/xui/ru/floater_pay.xml
+++ b/indra/newview/skins/default/xui/ru/floater_pay.xml
@@ -1,21 +1,18 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="Give Money">
- <string name="payee_group">
- Заплатить группе
- </string>
- <string name="payee_resident">
- Заплатить жителю
- </string>
- <text name="payee_name">
- Слишком длинное теÑтовое Ð¸Ð¼Ñ Ð´Ð»Ñ Ð¿Ñ€Ð¾Ð²ÐµÑ€ÐºÐ¸ обрезаниÑ
- </text>
- <button label="L$1" label_selected="L$1" name="fastpay 1"/>
- <button label="L$5" label_selected="L$5" name="fastpay 5"/>
- <button label="L$10" label_selected="L$10" name="fastpay 10"/>
- <button label="L$20" label_selected="L$20" name="fastpay 20"/>
- <text name="amount text">
- Или введите количеÑтво:
- </text>
- <button label="Заплатить" label_selected="Заплатить" name="pay btn"/>
- <button label="Отмена" label_selected="Отмена" name="cancel btn"/>
+ <string name="payee_group">Заплатить группе</string>
+ <string name="payee_resident">Заплатить жителю</string>
+ <text name="paying_text">Вы платите:</text>
+ <text name="payee_name">Слишком длинное теÑтовое Ð¸Ð¼Ñ Ð´Ð»Ñ Ð¿Ñ€Ð¾Ð²ÐµÑ€ÐºÐ¸ обрезаниÑ</text>
+ <panel label="ПоиÑк" name="PatternsPanel">
+ <button label="Оплатить L$ 1" label_selected="Оплатить L$ 1" name="fastpay 1"/>
+ <button label="Оплатить L$ 5" label_selected="Оплатить L$ 5" name="fastpay 5"/>
+ <button label="Оплатить L$ 10" label_selected="Оплатить L$ 10" name="fastpay 10"/>
+ <button label="Оплатить L$ 20" label_selected="Оплатить L$ 20" name="fastpay 20"/>
+ </panel>
+ <panel label="ПоиÑк" name="InputPanel">
+ <text name="amount text">Ð”Ñ€ÑƒÐ³Ð°Ñ Ñумма:</text>
+ <button label="Оплатить" label_selected="Оплатить" name="pay btn"/>
+ <button label="Отмена" label_selected="Отмена" name="cancel btn"/>
+ </panel>
</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_pay_object.xml b/indra/newview/skins/default/xui/ru/floater_pay_object.xml
index 7d2da44ac1..9a7b233ca2 100755
--- a/indra/newview/skins/default/xui/ru/floater_pay_object.xml
+++ b/indra/newview/skins/default/xui/ru/floater_pay_object.xml
@@ -1,28 +1,21 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="Give Money">
- <string name="payee_group">
- Заплатить группе
- </string>
- <string name="payee_resident">
- Заплатить жителю
- </string>
- <text name="payee_name">
- Ericacita Moostopolison
- </text>
- <text name="object_name_label">
- Через объект:
- </text>
+ <string name="payee_group">Заплатить группе</string>
+ <string name="payee_resident">Заплатить жителю</string>
+ <text name="paying_text">Вы платите:</text>
+ <text name="payee_name">Ericacita Moostopolison</text>
+ <text name="object_name_label">Через объект:</text>
<icon name="icon_object" tool_tip="Объекты"/>
- <text name="object_name_text">
- Мой офигенный объект Ñ Ð½ÐµÑпичеÑки длинным названием
- </text>
- <button label="L$1" label_selected="L$1" name="fastpay 1"/>
- <button label="L$5" label_selected="L$5" name="fastpay 5"/>
- <button label="L$10" label_selected="L$10" name="fastpay 10"/>
- <button label="L$20" label_selected="L$20" name="fastpay 20"/>
- <text name="amount text">
- Или введите количеÑтво:
- </text>
- <button label="Заплатить" label_selected="Заплатить" name="pay btn"/>
- <button label="Отмена" label_selected="Отмена" name="cancel btn"/>
+ <text name="object_name_text">Мой офигенный объект Ñ Ð½ÐµÑпичеÑки длинным названием</text>
+ <panel label="ПоиÑк" name="PatternsPanel">
+ <button label="Оплатить L$ 1" label_selected="Оплатить L$ 1" name="fastpay 1"/>
+ <button label="Оплатить L$ 5" label_selected="Оплатить L$ 5" name="fastpay 5"/>
+ <button label="Оплатить L$ 10" label_selected="Оплатить L$ 10" name="fastpay 10"/>
+ <button label="Оплатить L$ 20" label_selected="Оплатить L$ 20" name="fastpay 20"/>
+ </panel>
+ <panel label="ПоиÑк" name="InputPanel">
+ <text name="amount text">Ð”Ñ€ÑƒÐ³Ð°Ñ Ñумма:</text>
+ <button label="Оплатить" label_selected="Оплатить" name="pay btn"/>
+ <button label="Отмена" label_selected="Отмена" name="cancel btn"/>
+ </panel>
</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_report_abuse.xml b/indra/newview/skins/default/xui/ru/floater_report_abuse.xml
index abbdeca180..67d847aa6b 100755
--- a/indra/newview/skins/default/xui/ru/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/ru/floater_report_abuse.xml
@@ -67,7 +67,7 @@
<combo_box.item label="Ð—ÐµÐ¼Ð»Ñ &gt; ПоÑÑгательÑтво &gt; Объекты или текÑтуры" name="Land__Encroachment__Objects_textures"/>
<combo_box.item label="Ð—ÐµÐ¼Ð»Ñ &gt; ПоÑÑгательÑтво &gt; ЧаÑтицы" name="Land__Encroachment__Particles"/>
<combo_box.item label="Ð—ÐµÐ¼Ð»Ñ &gt; ПоÑÑгательÑтво &gt; ДеревьÑ/раÑтениÑ" name="Land__Encroachment__Trees_plants"/>
- <combo_box.item label="Пари или азартные игры" name="Wagering_gambling"/>
+ <combo_box.item label="Ðарушение политики игр" name="Wagering_gambling"/>
<combo_box.item label="Другое" name="Other"/>
</combo_box>
<text name="abuser_name_title">
diff --git a/indra/newview/skins/default/xui/ru/floater_snapshot.xml b/indra/newview/skins/default/xui/ru/floater_snapshot.xml
index 8933f94c0b..97de279b8f 100755
--- a/indra/newview/skins/default/xui/ru/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/ru/floater_snapshot.xml
@@ -39,17 +39,8 @@
<string name="local_failed_str">
Ðе удалоÑÑŒ Ñохранить на компьютере.
</string>
- <button name="advanced_options_btn" tool_tip="Дополнительные параметры"/>
- <text name="image_res_text">
- [WIDTH] x [HEIGHT] пикÑ.
- </text>
- <text name="file_size_label">
- [SIZE] КБ
- </text>
+ <button label="ОБÐОВИТЬ" name="new_snapshot_btn"/>
<panel name="advanced_options_panel">
- <text name="advanced_options_label">
- ДОПОЛÐИТЕЛЬÐЫЕ ПÐРÐМЕТРЫ
- </text>
<text name="layer_type_label">
Захват:
</text>
@@ -68,4 +59,10 @@
<combo_box.item label="Без фильтра" name="NoFilter"/>
</combo_box>
</panel>
+ <text name="image_res_text">
+ [WIDTH] (ширина) x [HEIGHT] (выÑота) пикÑ.
+ </text>
+ <text name="file_size_label">
+ [SIZE] КБ
+ </text>
</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_top_objects.xml b/indra/newview/skins/default/xui/ru/floater_top_objects.xml
index c7ece5c9c9..b045c5bff3 100755
--- a/indra/newview/skins/default/xui/ru/floater_top_objects.xml
+++ b/indra/newview/skins/default/xui/ru/floater_top_objects.xml
@@ -21,6 +21,12 @@
<floater.string name="none_descriptor">
Ðе найдено.
</floater.string>
+ <floater.string name="URLs">
+ URL-адреÑа
+ </floater.string>
+ <floater.string name="memory">
+ ПамÑÑ‚ÑŒ (КБ)
+ </floater.string>
<text name="title_text">
Загрузка...
</text>
@@ -30,7 +36,7 @@
<scroll_list.columns label="Владелец" name="owner"/>
<scroll_list.columns label="МеÑто" name="location"/>
<scroll_list.columns label="УчаÑток" name="parcel"/>
- <scroll_list.columns label="ВремÑ" name="time"/>
+ <scroll_list.columns label="Дата" name="time"/>
<scroll_list.columns label="URL-адреÑа" name="URLs"/>
<scroll_list.columns label="ПамÑÑ‚ÑŒ (КБ)" name="memory"/>
</scroll_list>
diff --git a/indra/newview/skins/default/xui/ru/floater_twitter.xml b/indra/newview/skins/default/xui/ru/floater_twitter.xml
index 748092ff1f..3b9493ce98 100644
--- a/indra/newview/skins/default/xui/ru/floater_twitter.xml
+++ b/indra/newview/skins/default/xui/ru/floater_twitter.xml
@@ -1,17 +1,13 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="floater_twitter" title="TWITTER">
- <panel name="background">
- <tab_container name="tabs">
- <panel label="ÐÐПИСÐТЬ" name="panel_twitter_photo"/>
- <panel label="ÐККÐУÐТ" name="panel_twitter_account"/>
- </tab_container>
- <panel name="connection_status_panel">
- <text name="connection_error_text">
- Ошибка
- </text>
- <text name="connection_loading_text">
- Загрузка...
- </text>
- </panel>
- </panel>
+ <tab_container name="tabs">
+ <panel label="ÐÐПИСÐТЬ" name="panel_twitter_photo"/>
+ <panel label="ÐККÐУÐТ" name="panel_twitter_account"/>
+ </tab_container>
+ <text name="connection_error_text">
+ Ошибка
+ </text>
+ <text name="connection_loading_text">
+ Загрузка...
+ </text>
</floater>
diff --git a/indra/newview/skins/default/xui/ru/menu_attachment_self.xml b/indra/newview/skins/default/xui/ru/menu_attachment_self.xml
index 2b1291a8d5..033d36484b 100755
--- a/indra/newview/skins/default/xui/ru/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/ru/menu_attachment_self.xml
@@ -8,6 +8,7 @@
<menu_item_call label="Мой внешний вид" name="Change Outfit"/>
<menu_item_call label="Изменить коÑтюм" name="Edit Outfit"/>
<menu_item_call label="Изменить фигуру" name="Edit My Shape"/>
+ <menu_item_call label="Ð’Ñ‹Ñота парениÑ" name="Hover Height"/>
<menu_item_call label="Мои друзьÑ" name="Friends..."/>
<menu_item_call label="Мои группы" name="Groups..."/>
<menu_item_call label="Мой профиль" name="Profile..."/>
diff --git a/indra/newview/skins/default/xui/ru/menu_avatar_self.xml b/indra/newview/skins/default/xui/ru/menu_avatar_self.xml
index e09117226c..8feaa3b99a 100755
--- a/indra/newview/skins/default/xui/ru/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/ru/menu_avatar_self.xml
@@ -25,6 +25,7 @@
<menu_item_call label="Мой внешний вид" name="Chenge Outfit"/>
<menu_item_call label="Изменить коÑтюм" name="Edit Outfit"/>
<menu_item_call label="Изменить фигуру" name="Edit My Shape"/>
+ <menu_item_call label="Ð’Ñ‹Ñота парениÑ" name="Hover Height"/>
<menu_item_call label="Мои друзьÑ" name="Friends..."/>
<menu_item_call label="Мои группы" name="Groups..."/>
<menu_item_call label="Мой профиль" name="Profile..."/>
diff --git a/indra/newview/skins/default/xui/ru/menu_inventory.xml b/indra/newview/skins/default/xui/ru/menu_inventory.xml
index 308549c254..b8cbef8246 100755
--- a/indra/newview/skins/default/xui/ru/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/ru/menu_inventory.xml
@@ -1,5 +1,14 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<menu name="Popup">
+ <menu_item_call label="Создать ÑпиÑок" name="Marketplace Create Listing"/>
+ <menu_item_call label="СвÑзать ÑпиÑок" name="Marketplace Associate Listing"/>
+ <menu_item_call label="Получить (обновить) ÑпиÑок" name="Marketplace Get Listing"/>
+ <menu_item_call label="Проверка на ошибки" name="Marketplace Check Listing"/>
+ <menu_item_call label="Изменить ÑпиÑок" name="Marketplace Edit Listing"/>
+ <menu_item_call label="Опубликовать" name="Marketplace List"/>
+ <menu_item_call label="Отменить публикацию" name="Marketplace Unlist"/>
+ <menu_item_call label="Ðктивировать" name="Marketplace Activate"/>
+ <menu_item_call label="Деактивировать" name="Marketplace Deactivate"/>
<menu_item_call label="ПоделитьÑÑ" name="Share"/>
<menu_item_call label="Купить" name="Task Buy"/>
<menu_item_call label="Открыть" name="Task Open"/>
@@ -87,6 +96,7 @@
<menu_item_call label="Добавить" name="Wearable Add"/>
<menu_item_call label="СнÑÑ‚ÑŒ" name="Take Off"/>
<menu_item_call label="Копировать в «Торговые иÑходÑщие»" name="Merchant Copy"/>
- <menu_item_call label="Отправить в торговый центр" name="Marketplace Send"/>
+ <menu_item_call label="Копировать в ÑпиÑки товаров торгового центра" name="Marketplace Copy"/>
+ <menu_item_call label="ПеремеÑтить в ÑпиÑки товаров торгового центра" name="Marketplace Move"/>
<menu_item_call label="- нет дейÑтвий -" name="--no options--"/>
</menu>
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 9fc0b6d44e..967374f8f5 100755
--- a/indra/newview/skins/default/xui/ru/menu_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/ru/menu_inventory_gear_default.xml
@@ -5,7 +5,7 @@
<menu_item_check label="Сортировать по времени" name="sort_by_recent"/>
<menu_item_check label="Ð’Ñегда Ñортировать папки по имени" name="sort_folders_by_name"/>
<menu_item_check label="Показывать ÑиÑтемные папки вверху" name="sort_system_folders_to_top"/>
- <menu_item_call label="Показать фильтры" name="show_filters"/>
+ <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="ОчиÑтить бюро находок" name="empty_lostnfound"/>
diff --git a/indra/newview/skins/default/xui/ru/menu_marketplace_view.xml b/indra/newview/skins/default/xui/ru/menu_marketplace_view.xml
new file mode 100644
index 0000000000..b299c8202f
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/menu_marketplace_view.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_marketplace_sort">
+ <menu_item_check label="Сортировать по объему запаÑов (от малых к большим)" name="sort_by_stock_amount"/>
+ <menu_item_check label="Показывать только папки ÑпиÑков" name="show_only_listing_folders"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_url_experience.xml b/indra/newview/skins/default/xui/ru/menu_url_experience.xml
new file mode 100644
index 0000000000..59af594c10
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/menu_url_experience.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Url Popup">
+ <menu_item_call label="Копировать URL-Ð°Ð´Ñ€ÐµÑ SL в буфер обмена" name="url_copy"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_viewer.xml b/indra/newview/skins/default/xui/ru/menu_viewer.xml
index 266a1fb877..958105a70f 100755
--- a/indra/newview/skins/default/xui/ru/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/ru/menu_viewer.xml
@@ -8,6 +8,7 @@
<menu_item_call label="Ðовое окно инвентарÑ" name="NewInventoryWindow"/>
<menu_item_call label="МеÑта..." name="Places"/>
<menu_item_call label="Подборка..." name="Picks"/>
+ <menu_item_call label="ПриключениÑ..." name="Experiences"/>
<menu_item_call label="Управление камерой..." name="Camera Controls"/>
<menu label="Движение" name="Movement">
<menu_item_call label="СеÑÑ‚ÑŒ" name="Sit Down Here"/>
@@ -22,6 +23,7 @@
</menu>
<menu_item_call label="Купить L$..." name="Buy and Sell L$"/>
<menu_item_call label="Торговые иÑходÑщие..." name="MerchantOutbox"/>
+ <menu_item_call label="СпиÑки товаров торгового центра..." name="MarketplaceListings"/>
<menu_item_call label="Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ð¾Ð½Ð½Ð°Ñ Ð¿Ð°Ð½ÐµÐ»ÑŒ аккаунта..." name="Manage My Account"/>
<menu_item_call label="ÐаÑтройки..." name="Preferences"/>
<menu_item_call label="Кнопки панели инÑтрументов..." name="Toolbars"/>
@@ -46,7 +48,7 @@
<menu_item_check label="ДрузьÑ" name="My Friends"/>
<menu_item_check label="Группы" name="My Groups"/>
<menu_item_check label="Люди неподалеку" name="Active Speakers"/>
- <menu_item_call label="Черный ÑпиÑок" name="Block List"/>
+ <menu_item_check label="Черный ÑпиÑок" name="Block List"/>
<menu_item_check label="Ðе беÑпокоить" name="Do Not Disturb"/>
</menu>
<menu label="Мир" name="World">
@@ -247,6 +249,7 @@
<menu_item_check label="КонÑоль текÑтур" name="Texture Console"/>
<menu_item_check label="КонÑоль отладки" name="Debug Console"/>
<menu_item_call label="КонÑоль уведомлений" name="Notifications"/>
+ <menu_item_check label="КонÑоль отладки региона" name="Region Debug Console"/>
<menu_item_check label="Оперативные таймеры" name="Fast Timers"/>
<menu_item_check label="ПамÑÑ‚ÑŒ" name="Memory"/>
<menu_item_check label="СтатиÑтика по Ñцене" name="Scene Statistics"/>
@@ -350,7 +353,7 @@
<menu_item_check label="Прикрепить объекты Ð´Ð»Ñ Ð¸Ð½Ñ‚ÐµÑ€Ð¿Ð¾Ð»Ñции" name="Ping Interpolate Object Positions"/>
<menu_item_call label="ОпуÑтить пакет" name="Drop a Packet"/>
</menu>
- <menu_item_call label="Дамп камеры Ñо Ñкриптами" name="Dump Scripted Camera"/>
+ <menu_item_call label="Дамп камеры Ñо Ñкриптами" name="Dump Scripted Camera"/>
<menu label="Диктофон" name="Recorder">
<menu_item_call label="Ðачать воÑпроизведение" name="Start Playback"/>
<menu_item_call label="ОÑтановить воÑпроизведение" name="Stop Playback"/>
diff --git a/indra/newview/skins/default/xui/ru/mime_types.xml b/indra/newview/skins/default/xui/ru/mime_types.xml
index 7ed23b5d53..9b120f2f40 100755
--- a/indra/newview/skins/default/xui/ru/mime_types.xml
+++ b/indra/newview/skins/default/xui/ru/mime_types.xml
@@ -44,6 +44,14 @@
ВоÑпроизвеÑти звук Ð´Ð»Ñ Ñтого меÑта
</playtip>
</widgetset>
+ <widgetset name="none">
+ <label name="none_label">
+ Ðет контента
+ </label>
+ <tooltip name="none_tooltip">
+ ЗдеÑÑŒ нет медиа
+ </tooltip>
+ </widgetset>
<scheme name="rtsp">
<label name="rtsp_label">
Поток RealTime
diff --git a/indra/newview/skins/default/xui/ru/mime_types_linux.xml b/indra/newview/skins/default/xui/ru/mime_types_linux.xml
index a42b0bb9cc..6feb64679c 100755
--- a/indra/newview/skins/default/xui/ru/mime_types_linux.xml
+++ b/indra/newview/skins/default/xui/ru/mime_types_linux.xml
@@ -44,6 +44,14 @@
ВоÑпроизвеÑти звук Ð´Ð»Ñ Ñтого меÑта
</playtip>
</widgetset>
+ <widgetset name="none">
+ <label name="none_label">
+ Ðет контента
+ </label>
+ <tooltip name="none_tooltip">
+ ЗдеÑÑŒ нет медиа
+ </tooltip>
+ </widgetset>
<scheme name="rtsp">
<label name="rtsp_label">
Поток RealTime
diff --git a/indra/newview/skins/default/xui/ru/mime_types_mac.xml b/indra/newview/skins/default/xui/ru/mime_types_mac.xml
index 7ed23b5d53..9b120f2f40 100755
--- a/indra/newview/skins/default/xui/ru/mime_types_mac.xml
+++ b/indra/newview/skins/default/xui/ru/mime_types_mac.xml
@@ -44,6 +44,14 @@
ВоÑпроизвеÑти звук Ð´Ð»Ñ Ñтого меÑта
</playtip>
</widgetset>
+ <widgetset name="none">
+ <label name="none_label">
+ Ðет контента
+ </label>
+ <tooltip name="none_tooltip">
+ ЗдеÑÑŒ нет медиа
+ </tooltip>
+ </widgetset>
<scheme name="rtsp">
<label name="rtsp_label">
Поток RealTime
diff --git a/indra/newview/skins/default/xui/ru/notifications.xml b/indra/newview/skins/default/xui/ru/notifications.xml
index c312bcbef4..acf3ce608f 100755
--- a/indra/newview/skins/default/xui/ru/notifications.xml
+++ b/indra/newview/skins/default/xui/ru/notifications.xml
@@ -73,6 +73,10 @@
[MESSAGE]
<usetemplate name="okcancelbuttons" notext="Отмена" yestext="Да"/>
</notification>
+ <notification name="GenericAlertOK">
+ [MESSAGE]
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
<notification name="BadInstallation">
Произошла ошибка при обновлении [APP_NAME]. [http://get.secondlife.com Загрузите поÑледнюю верÑию] клиента.
<usetemplate name="okbutton" yestext="OK"/>
@@ -125,6 +129,88 @@
Ðе удалоÑÑŒ инициализировать торговый центр из-за ошибки ÑиÑтемы или Ñети. Повторите попытку позже.
<usetemplate name="okbutton" yestext="OK"/>
</notification>
+ <notification name="StockPasteFailed">
+ Ðе удалоÑÑŒ Ñкопировать или перемеÑтить в папку запаÑов, ошибка:
+
+ &apos;[ERROR_CODE]&apos;
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="MerchantPasteFailed">
+ Ðе удалоÑÑŒ Ñкопировать или перемеÑтить в ÑпиÑки товаров торгового центра, ошибка:
+
+ &apos;[ERROR_CODE]&apos;
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="MerchantTransactionFailed">
+ Ðе удалоÑÑŒ выполнить транзакцию Ñ Ñ‚Ð¾Ñ€Ð³Ð¾Ð²Ñ‹Ð¼ центром, ошибка:
+
+ Причина: &apos;[ERROR_REASON]&apos;
+ [ERROR_DESCRIPTION]
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="MerchantUnprocessableEntity">
+ Ðе удалоÑÑŒ опубликовать Ñтот продукт или активировать папку верÑии. Обычно Ñто проиÑходит из-за отÑутÑÑ‚Ð²Ð¸Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ð¸ в форме опиÑÐ°Ð½Ð¸Ñ ÑпиÑка, но также может быть ÑвÑзано Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°Ð¼Ð¸ в Ñтруктуре папки. Отредактируйте ÑпиÑок или проверьте папку ÑпиÑка на отÑутÑтвие ошибок.
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="MerchantListingFailed">
+ Ðе удалоÑÑŒ опубликовать в торговом центре, ошибка:
+
+ &apos;[ERROR_CODE]&apos;
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="MerchantFolderActivationFailed">
+ Ðе удалоÑÑŒ активировать Ñту папку верÑии, ошибка:
+
+ &apos;[ERROR_CODE]&apos;
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="ConfirmMerchantActiveChange">
+ Это дейÑтвие вызовет изменение активного Ñодержимого данного ÑпиÑка. Продолжить?
+ <usetemplate ignoretext="Подтверждать Ñмену активного ÑпиÑка в торговом центре" name="okcancelignore" notext="Отмена" yestext="OK"/>
+ </notification>
+ <notification name="ConfirmMerchantMoveInventory">
+ При перетаÑкивании в окно ÑпиÑков товаров торгового центра предметы перемещаютÑÑ Ñо Ñвоего иÑходного меÑта, а не копируютÑÑ. Продолжить?
+ <usetemplate ignoretext="Подтверждать перемещение предмета из Ð¸Ð½Ð²ÐµÐ½Ñ‚Ð°Ñ€Ñ Ð² торговый центр" name="okcancelignore" notext="Отмена" yestext="OK"/>
+ </notification>
+ <notification name="ConfirmListingCutOrDelete">
+ Ð’ результате Ð¿ÐµÑ€ÐµÐ¼ÐµÑ‰ÐµÐ½Ð¸Ñ Ð¸Ð»Ð¸ ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ Ð¿Ð°Ð¿ÐºÐ¸ ÑпиÑка будет удален ваш ÑпиÑок товаров в торговом центре. ЕÑли требуетÑÑ Ñохранить ÑпиÑок в торговом центре, перемеÑтите или удалите Ñодержимое папки верÑии, которое необходимо изменить. Продолжить?
+ <usetemplate ignoretext="Подтверждать перемещение или удаление ÑпиÑка из торгового центра" name="okcancelignore" notext="Отмена" yestext="OK"/>
+ </notification>
+ <notification name="ConfirmCopyToMarketplace">
+ У Ð²Ð°Ñ Ð½ÐµÑ‚ прав на копирование Ñтих предметов в торговый центр. ПеремеÑтите их или оÑтавьте здеÑÑŒ.
+ <usetemplate canceltext="Отмена" ignoretext="Подтверждать попытку ÐºÐ¾Ð¿Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð½ÐµÐºÐ¾Ð¿Ð¸Ñ€ÑƒÐµÐ¼Ñ‹Ñ… предметов в торговый центр" name="yesnocancelbuttons" notext="Ðе перемещать предмет(Ñ‹)" yestext="ПеремеÑтить предмет(Ñ‹)"/>
+ </notification>
+ <notification name="ConfirmMerchantUnlist">
+ Это дейÑтвие вызовет отмену публикации ÑпиÑка. Продолжить?
+ <usetemplate ignoretext="Подтверждать отмену публикации активного ÑпиÑка в торговом центре" name="okcancelignore" notext="Отмена" yestext="OK"/>
+ </notification>
+ <notification name="ConfirmMerchantClearVersion">
+ Это дейÑтвие вызовет деактивацию папки верÑии текущего ÑпиÑка. Продолжить?
+ <usetemplate ignoretext="Подтверждать деактивирование папки верÑии ÑпиÑка в торговом центре" name="okcancelignore" notext="Отмена" yestext="OK"/>
+ </notification>
+ <notification name="AlertMerchantListingNotUpdated">
+ Ðе удалоÑÑŒ обновить Ñтот ÑпиÑок.
+[[URL] Щелкните здеÑÑŒ], чтобы изменить его в торговом центре.
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="AlertMerchantListingCannotWear">
+ ÐÐµÐ»ÑŒÐ·Ñ Ð½Ð°Ð´ÐµÑ‚ÑŒ одежду или чаÑÑ‚ÑŒ тела, еÑли они находÑÑ‚ÑÑ Ð² папке ÑпиÑков товаров торгового центра.
+ </notification>
+ <notification name="AlertMerchantListingInvalidID">
+ Ðеверный идентификатор ÑпиÑка.
+ </notification>
+ <notification name="AlertMerchantListingActivateRequired">
+ Ð’ Ñтом ÑпиÑке неÑколько папок верÑий или нет ни одной. СамоÑтоÑтельно выберите и активируйте одну папку позже.
+ <usetemplate ignoretext="Предупреждать об активировании папки верÑии, еÑли Ñоздан ÑпиÑок Ñ Ð½ÐµÑколькими папками верÑий" name="okignore" yestext="OK"/>
+ </notification>
+ <notification name="AlertMerchantStockFolderSplit">
+ Предметы разных типов раÑпределены по отдельным папкам запаÑов, поÑтому папка ÑиÑтематизирована так, чтобы ее можно было опубликовать.
+ <usetemplate ignoretext="Предупреждать о разделении папки запаÑов перед публикацией" name="okignore" yestext="OK"/>
+ </notification>
+ <notification name="AlertMerchantStockFolderEmpty">
+ ÐŸÑƒÐ±Ð»Ð¸ÐºÐ°Ñ†Ð¸Ñ Ð²Ð°ÑˆÐµÐ³Ð¾ ÑпиÑка прекращена, так как папка запаÑов пуÑта. Добавьте предметы в папку запаÑов, чтобы опубликовать ÑпиÑок Ñнова.
+ <usetemplate ignoretext="Оповещать о неудавшейÑÑ Ð¿ÑƒÐ±Ð»Ð¸ÐºÐ°Ñ†Ð¸Ð¸ ÑпиÑка из-за того, что папка запаÑов пуÑта" name="okignore" yestext="OK"/>
+ </notification>
<notification name="CompileQueueSaveText">
Ошибка при передаче текÑта Ñкрипта по Ñледующей причине: [REASON]. Повторите попытку позже.
</notification>
@@ -469,6 +555,10 @@
Сохранить изменениÑ?
<usetemplate canceltext="Отмена" name="yesnocancelbuttons" notext="Ðе ÑохранÑÑ‚ÑŒ" yestext="Сохранить"/>
</notification>
+ <notification name="DeleteNotecard">
+ Удалить заметку?
+ <usetemplate name="okcancelbuttons" notext="Отмена" yestext="OK"/>
+ </notification>
<notification name="GestureSaveFailedTooManySteps">
Ðе удалоÑÑŒ Ñохранить жеÑÑ‚.
ЖеÑÑ‚ Ñодержит Ñлишком много Ñтапов.
@@ -575,6 +665,9 @@
<notification name="RegionNoTerraforming">
В регионе [REGION] не разрешен терраформинг.
</notification>
+ <notification name="ParcelNoTerraforming">
+ Вам не разрешено терраформировать учаÑток [PARCEL].
+ </notification>
<notification name="CannotCopyWarning">
У Ð²Ð°Ñ Ð½ÐµÑ‚ Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¸Ñ Ð½Ð° копирование Ñледующих предметов:
[ITEMS]
@@ -1825,6 +1918,30 @@ http://secondlife.com/download.
Удалить менеджера только Ð´Ð»Ñ Ñтого Ð·ÐµÐ¼Ð»ÐµÐ²Ð»Ð°Ð´ÐµÐ½Ð¸Ñ Ð¸Ð»Ð¸ Ð´Ð»Ñ [ALL_ESTATES]?
<usetemplate canceltext="Отмена" name="yesnocancelbuttons" notext="Ð”Ð»Ñ Ð²Ñех землевладений" yestext="Ð”Ð»Ñ Ñтого землевладениÑ"/>
</notification>
+ <notification label="Выбрать землевладение" name="EstateAllowedExperienceAdd">
+ ВнеÑти в ÑпиÑок допущенных только Ð´Ð»Ñ Ñтого Ð·ÐµÐ¼Ð»ÐµÐ²Ð»Ð°Ð´ÐµÐ½Ð¸Ñ Ð¸Ð»Ð¸ Ð´Ð»Ñ [ALL_ESTATES]?
+ <usetemplate canceltext="Отмена" name="yesnocancelbuttons" notext="Ð”Ð»Ñ Ð²Ñех землевладений" yestext="Ð”Ð»Ñ Ñтого землевладениÑ"/>
+ </notification>
+ <notification label="Выбрать землевладение" name="EstateAllowedExperienceRemove">
+ Удалить из ÑпиÑка допущенных только Ð´Ð»Ñ Ñтого Ð·ÐµÐ¼Ð»ÐµÐ²Ð»Ð°Ð´ÐµÐ½Ð¸Ñ Ð¸Ð»Ð¸ Ð´Ð»Ñ [ALL_ESTATES]?
+ <usetemplate canceltext="Отмена" name="yesnocancelbuttons" notext="Ð”Ð»Ñ Ð²Ñех землевладений" yestext="Ð”Ð»Ñ Ñтого землевладениÑ"/>
+ </notification>
+ <notification label="Выбрать землевладение" name="EstateBlockedExperienceAdd">
+ ВнеÑти в ÑпиÑок заблокированных только Ð´Ð»Ñ Ñтого Ð·ÐµÐ¼Ð»ÐµÐ²Ð»Ð°Ð´ÐµÐ½Ð¸Ñ Ð¸Ð»Ð¸ Ð´Ð»Ñ [ALL_ESTATES]?
+ <usetemplate canceltext="Отмена" name="yesnocancelbuttons" notext="Ð”Ð»Ñ Ð²Ñех землевладений" yestext="Ð”Ð»Ñ Ñтого землевладениÑ"/>
+ </notification>
+ <notification label="Выбрать землевладение" name="EstateBlockedExperienceRemove">
+ Удалить из ÑпиÑка заблокированных только Ð´Ð»Ñ Ñтого Ð·ÐµÐ¼Ð»ÐµÐ²Ð»Ð°Ð´ÐµÐ½Ð¸Ñ Ð¸Ð»Ð¸ Ð´Ð»Ñ [ALL_ESTATES]?
+ <usetemplate canceltext="Отмена" name="yesnocancelbuttons" notext="Ð”Ð»Ñ Ð²Ñех землевладений" yestext="Ð”Ð»Ñ Ñтого землевладениÑ"/>
+ </notification>
+ <notification label="Выбрать землевладение" name="EstateTrustedExperienceAdd">
+ ВнеÑти в ключевой ÑпиÑок только Ð´Ð»Ñ Ñтого Ð·ÐµÐ¼Ð»ÐµÐ²Ð»Ð°Ð´ÐµÐ½Ð¸Ñ Ð¸Ð»Ð¸ Ð´Ð»Ñ [ALL_ESTATES]?
+ <usetemplate canceltext="Отмена" name="yesnocancelbuttons" notext="Ð”Ð»Ñ Ð²Ñех землевладений" yestext="Ð”Ð»Ñ Ñтого землевладениÑ"/>
+ </notification>
+ <notification label="Выбрать землевладение" name="EstateTrustedExperienceRemove">
+ Удалить из ключевой ÑпиÑок только Ð´Ð»Ñ Ñтого Ð·ÐµÐ¼Ð»ÐµÐ²Ð»Ð°Ð´ÐµÐ½Ð¸Ñ Ð¸Ð»Ð¸ Ð´Ð»Ñ [ALL_ESTATES]?
+ <usetemplate canceltext="Отмена" name="yesnocancelbuttons" notext="Ð”Ð»Ñ Ð²Ñех землевладений" yestext="Ð”Ð»Ñ Ñтого землевладениÑ"/>
+ </notification>
<notification label="Подтвердить выбраÑывание" name="EstateKickUser">
ВыброÑить Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ [EVIL_USER] из Ñтого землевладениÑ?
<usetemplate name="okcancelbuttons" notext="Отмена" yestext="OK"/>
@@ -1837,6 +1954,9 @@ http://secondlife.com/download.
Ð’Ñ‹ пытаетеÑÑŒ поÑетить регион, контент в котором не ÑоответÑтвует вашим наÑтройкам. Попробуйте изменить наÑтройки в меню «Я &gt; ÐаÑтройки &gt; Общие».
<usetemplate name="okbutton" yestext="OK"/>
</notification>
+ <notification name="SLM_UPDATE_FOLDER">
+ [MESSAGE]
+ </notification>
<notification name="RegionEntryAccessBlocked_AdultsOnlyContent">
Ð’Ñ‹ пытаетеÑÑŒ поÑетить регион, контент в котором имеет рейтинг [REGIONMATURITY] и предназначен только Ð´Ð»Ñ Ð²Ð·Ñ€Ð¾Ñлых.
<url name="url">
@@ -1899,6 +2019,10 @@ http://secondlife.com/download.
При телепортации возникли техничеÑкие проблемы, так как ваши наÑтройки не Ñинхронизированы Ñ Ñервером.
<usetemplate name="okbutton" yestext="OK"/>
</notification>
+ <notification name="RegionTPSpecialUsageBlocked">
+ Ðе удалоÑÑŒ войти в регион. «[REGION_NAME]» – Ñто регион развивающих игр, и Ð´Ð»Ñ Ð²Ñ…Ð¾Ð´Ð° в него надо ÑоответÑтвовать определенным уÑловиÑм. Подробнее Ñм. на Ñтранице [http://wiki.secondlife.com/wiki/Linden_Lab_Official:Skill_Gaming_in_Second_Life Skill Gaming FAQ].
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
<notification name="PreferredMaturityChanged">
Ð’Ñ‹ больше не будете получать уведомлений о поÑещении региона Ñ ÐºÐ¾Ð½Ñ‚ÐµÐ½Ñ‚Ð¾Ð¼ рейтинга [RATING]. ÐаÑтройки Ð´Ð»Ñ ÐºÐ¾Ð½Ñ‚ÐµÐ½Ñ‚Ð° можно изменить на будущее Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ команд меню «Я &gt; ÐаÑтройки &gt; Общие».
<usetemplate name="okbutton" yestext="OK"/>
@@ -2120,6 +2244,10 @@ http://secondlife.com/download.
<ignore name="ignore" text="УÑтановлено дейÑтвие «Заплатить за объект» при поÑтроении объекта без Ñкрипта money()"/>
</form>
</notification>
+ <notification name="PayConfirmation">
+ Подтвердите оплату L$[AMOUNT] Ð´Ð»Ñ [TARGET].
+ <usetemplate ignoretext="Подтверждать перед оплатой (Ð´Ð»Ñ Ñумм более L$200)" name="okcancelignore" notext="Отмена" yestext="Оплатить"/>
+ </notification>
<notification name="OpenObjectCannotCopy">
Ð’ Ñтом объекте нет вещей, которые вам разрешено копировать.
</notification>
@@ -2205,6 +2333,9 @@ http://secondlife.com/download.
<button ignore="Ðе заменÑÑ‚ÑŒ" name="No" text="Отмена"/>
</form>
</notification>
+ <notification name="TooManyWearables">
+ ÐÐµÐ»ÑŒÐ·Ñ Ð½Ð¾Ñить папку, Ñодержащую более [AMOUNT] вещей. Это ограничение можно изменить в меню «Дополнительно &gt; ÐаÑтройки отладки &gt; WearFolderLimit.
+ </notification>
<notification label="Предупреждение режима «Ðе беÑпокоить»" name="DoNotDisturbModePay">
Включен режим «Ðе беÑпокоить». Ð’Ñ‹ не будете получать никаких предметов, предлагаемых в обмен за Ñтот платеж.
@@ -2814,7 +2945,7 @@ http://secondlife.com/download.
[MESSAGE]
-Из объекта: &lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;, владелец: [NAME]?
+Из объекта: &lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;, владелец: [NAME]
<form name="form">
<button name="Gotopage" text="Перейти на Ñтраницу"/>
<button name="Cancel" text="Отмена"/>
@@ -2840,6 +2971,72 @@ http://secondlife.com/download.
<button name="Mute" text="Заблокировать"/>
</form>
</notification>
+ <notification name="ExperienceAcquireFailed">
+ Ðевозможно приобреÑти новое приключение:
+ [ERROR_MESSAGE]
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="NotInGroupExperienceProfileMessage">
+ Изменение в группе Ð¿Ñ€Ð¸ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð¸Ð³Ð½Ð¾Ñ€Ð¸Ñ€ÑƒÐµÑ‚ÑÑ, так как владелец не принадлежит к выбранной группе.
+ </notification>
+ <notification name="UneditableExperienceProfileMessage">
+ Ðередактируемое поле «[field]» игнорируетÑÑ Ð¿Ñ€Ð¸ обновлении Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñ Ð¿Ñ€Ð¸ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ.
+ </notification>
+ <notification name="RestrictedToOwnerExperienceProfileMessage">
+ ИгнорируютÑÑ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð² поле «[field]», которые может вноÑить только владелец приключениÑ.
+ </notification>
+ <notification name="MaturityRatingExceedsOwnerExperienceProfileMessage">
+ Ð’Ñ‹ не можете уÑтанавливать Ð´Ð»Ñ Ð¿Ñ€Ð¸ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ñ€ÐµÐ¹Ñ‚Ð¸Ð½Ð³ зрелоÑти выше, чем у владельца.
+ </notification>
+ <notification name="RestrictedTermExperienceProfileMessage">
+ Следующие уÑÐ»Ð¾Ð²Ð¸Ñ Ð½Ðµ допуÑкают обновление Ð½Ð°Ð·Ð²Ð°Ð½Ð¸Ñ Ð¸ (или) опиÑÐ°Ð½Ð¸Ñ Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñ Ð¿Ñ€Ð¸ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ: [extra_info]
+ </notification>
+ <notification name="TeleportedHomeExperienceRemoved">
+ Ð’Ñ‹ были телепортированы из региона [region_name] за удаление Ð¿Ñ€Ð¸ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ secondlife:///app/experience/[public_id]/profile. Вам больше не разрешено пребывание в Ñтом регионе.
+ <form name="form">
+ <ignore name="ignore" text="Выброшен из региона за удаление приключениÑ"/>
+ </form>
+ </notification>
+ <notification name="TrustedExperienceEntry">
+ Вам был разрешен вход в регион [region_name] путем учаÑÑ‚Ð¸Ñ Ð² ключевом приключении secondlife:///app/experience/[public_id]/profile. При удалении Ñтого Ð¿Ñ€Ð¸ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð²Ñ‹ можете быть выброшены из региона.
+ <form name="form">
+ <ignore name="ignore" text="Приключение разрешило вход в регион"/>
+ </form>
+ </notification>
+ <notification name="TrustedExperiencesAvailable">
+ У Ð²Ð°Ñ Ð½ÐµÑ‚ доÑтупа к Ñтому меÑту назначениÑ. Вам может быть разрешен вход в Ñтот регион при принÑтии Ñледующего приключениÑ:
+
+[EXPERIENCE_LIST]
+
+Могут быть доÑтупны Ñледующие ключевые приключениÑ.
+ </notification>
+ <notification name="ExperienceEvent">
+ Разрешен объект Ð´Ð»Ñ ÑÐ¾Ð±Ñ‹Ñ‚Ð¸Ñ [EventType] приключением secondlife:///app/experience/[public_id]/profile.
+ Владелец: secondlife:///app/agent/[OwnerID]/inspect
+ Ðазвание объекта: [ObjectName]
+ Ðазвание учаÑтка: [ParcelName]
+ </notification>
+ <notification name="ExperienceEventAttachment">
+ Разрешено приÑоединение Ð´Ð»Ñ ÑÐ¾Ð±Ñ‹Ñ‚Ð¸Ñ [EventType] приключением secondlife:///app/experience/[public_id]/profile.
+ Владелец: secondlife:///app/agent/[OwnerID]/inspect
+ </notification>
+ <notification name="ScriptQuestionExperience">
+ Объект «&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;», владелец которого – «[NAME]», требует вашего учаÑÑ‚Ð¸Ñ Ð² приключении [GRID_WIDE]:
+
+[EXPERIENCE]
+
+ПоÑле Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¸Ñ Ñто Ñообщение больше не будет отображатьÑÑ Ð´Ð»Ñ Ð´Ð°Ð½Ð½Ð¾Ð³Ð¾ приключениÑ, пока оно не будет отозвано из Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñ Ð¿Ñ€Ð¸ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ.
+
+Скрипты, ÑвÑзанные Ñ Ð´Ð°Ð½Ð½Ñ‹Ð¼ приключением, Ñмогут выполнÑÑ‚ÑŒ Ñледующие дейÑÑ‚Ð²Ð¸Ñ Ð² регионах, где активно приключение:
+
+[QUESTIONS]Это правильно?
+ <form name="form">
+ <button name="BlockExperience" text="Заблокировать приключение"/>
+ <button name="Mute" text="Заблокировать объект"/>
+ <button name="Yes" text="Да"/>
+ <button name="No" text="Ðет"/>
+ </form>
+ </notification>
<notification name="ScriptQuestionCaution">
Предупреждение. Объект «&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;» требует полного доÑтупа к вашему аккаунту Ð´Ð»Ñ Linden-долларов. ЕÑли разрешить такой доÑтуп, объект Ñможет в любое Ð²Ñ€ÐµÐ¼Ñ Ñнимать ÑредÑтва Ñ Ð²Ð°ÑˆÐµÐ³Ð¾ аккаунта или полноÑтью опуÑтошать его неоднократно и без предупреждениÑ.
@@ -3159,6 +3356,10 @@ http://secondlife.com/download.
( [EXISTENCE] Ñек. жизни )
Ð’Ñ‹ локально обновили готовую текÑтуру [RESOLUTION] Ð´Ð»Ñ Â«[BODYREGION]» через [TIME] Ñек.
</notification>
+ <notification name="CannotUploadTexture">
+ Ðевозможно загрузить текÑтуру.
+[REASON]
+ </notification>
<notification name="LivePreviewUnavailable">
ПроÑмотр Ñтой текÑтуры невозможен, так как запрещено ее копирование и/или переноÑ.
<usetemplate ignoretext="Предупреждать, еÑли режим проÑмотра вживую недоÑтупен Ð´Ð»Ñ Ñ‚ÐµÐºÑтур Ñ Ð·Ð°Ð¿Ñ€ÐµÑ‰ÐµÐ½Ð½Ñ‹Ð¼ копированием и/или переноÑом" name="okignore" yestext="OK"/>
@@ -3733,9 +3934,11 @@ http://secondlife.com/download.
</notification>
<notification name="TeleportedByAttachment">
Вы были телепортированы прикрепленным объектом [ITEM_ID]
+ <usetemplate ignoretext="ТелепортациÑ: вы были телепортированы прикрепленным объектом" name="notifyignore"/>
</notification>
<notification name="TeleportedByObjectOnParcel">
Ð’Ñ‹ были телепортированы объектом «[OBJECT_NAME]» на учаÑтке «[PARCEL_NAME]»
+ <usetemplate ignoretext="ТелепортациÑ: вы были телепортированы объектом на учаÑтке" name="notifyignore"/>
</notification>
<notification name="TeleportedByObjectOwnedBy">
Вы были телепортированы объектом «[OBJECT_NAME]», владелец – [OWNER_ID]
@@ -4067,7 +4270,7 @@ http://secondlife.com/download.
<usetemplate ignoretext="Ðевозможно перемеÑтить файлы. ВоÑÑтановлен прежний путь." name="okignore" yestext="OK"/>
</notification>
<notification name="DefaultObjectPermissions">
- Ошибка при Ñохранении Ñтандартных разрешений по Ñледующей причине: [REASON]. Попробуйте задать Ñтандартные Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¸Ñ Ñ‡ÐµÑ€ÐµÐ· некоторое времÑ.
+ Ошибка при Ñохранении Ñтандартных разрешений на объект: [REASON]. Попробуйте задать Ñтандартные Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¸Ñ Ñ‡ÐµÑ€ÐµÐ· некоторое времÑ.
<usetemplate name="okbutton" yestext="OK"/>
</notification>
<notification name="ChatHistoryIsBusyAlert">
diff --git a/indra/newview/skins/default/xui/ru/panel_experience_info.xml b/indra/newview/skins/default/xui/ru/panel_experience_info.xml
new file mode 100644
index 0000000000..bd5f81506e
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/panel_experience_info.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_experience_info">
+ <text name="title" value="Профиль приключениÑ"/>
+ <scroll_container name="xp_scroll">
+ <panel name="scrolling_panel">
+ <layout_stack>
+ <layout_panel>
+ <text name="experience_title" value="Kyle&apos;s Superhero RPG"/>
+ </layout_panel>
+ <layout_panel name="location panel">
+ <text name="Location">
+ МеÑто:
+ </text>
+ <text name="LocationTextText">
+ какое-то меÑто
+ </text>
+ <button label="ТелепортациÑ" name="teleport_btn"/>
+ <button label="Карта" name="map_btn"/>
+ </layout_panel>
+ <layout_panel name="marketplace panel">
+ <text name="Location">
+ Магазин торгового центра:
+ </text>
+ <text name="LocationTextText">
+ какое-то меÑто
+ </text>
+ </layout_panel>
+ <layout_panel>
+ <text name="ContentRating">
+ Рейтинг:
+ </text>
+ <text name="ContentRatingText">
+ Ð”Ð»Ñ Ð²Ð·Ñ€Ð¾Ñлых
+ </text>
+ <text name="Owner">
+ Владелец:
+ </text>
+ <text name="OwnerText">
+ Kyle
+ </text>
+ <button label="Изменить" name="edit_btn"/>
+ </layout_panel>
+ </layout_stack>
+ </panel>
+ </scroll_container>
+</panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_experience_list_editor.xml b/indra/newview/skins/default/xui/ru/panel_experience_list_editor.xml
new file mode 100644
index 0000000000..fdf3ec8188
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/panel_experience_list_editor.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="experince_list_editor">
+ <panel.string name="loading">
+ загрузка…
+ </panel.string>
+ <panel.string name="panel_allowed">
+ Разрешенные приключениÑ:
+ </panel.string>
+ <panel.string name="panel_blocked">
+ Заблокированные приключениÑ:
+ </panel.string>
+ <panel.string name="panel_trusted">
+ Ключевые приключениÑ:
+ </panel.string>
+ <panel.string name="no_results">
+ (пуÑто)
+ </panel.string>
+ <text name="text_name">
+ СпиÑок приключений
+ </text>
+ <scroll_list name="experience_list">
+ <columns label="Ðазвание" name="experience_name"/>
+ </scroll_list>
+ <button label="Добавить..." name="btn_add"/>
+ <button label="Удалить" name="btn_remove"/>
+ <button label="Профиль…" name="btn_profile"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_experience_list_item.xml b/indra/newview/skins/default/xui/ru/panel_experience_list_item.xml
new file mode 100644
index 0000000000..1af9915bf2
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/panel_experience_list_item.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Experiences">
+ <text name="experience_name">
+ ПÑевдо-имÑ
+ </text>
+</panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_experience_log.xml b/indra/newview/skins/default/xui/ru/panel_experience_log.xml
new file mode 100644
index 0000000000..043dd4db17
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/panel_experience_log.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="EVENTS">
+ <string name="no_events" value="Ðет Ñобытий."/>
+ <string name="loading" value="загрузка…"/>
+ <layout_stack>
+ <layout_panel>
+ <scroll_list name="experience_log_list">
+ <columns label="ВремÑ" name="time"/>
+ <columns label="Событие" name="event"/>
+ <columns label="Приключение" name="experience_name"/>
+ <columns label="Объект" name="object_name"/>
+ </scroll_list>
+ <button label="Уведомить" name="btn_notify"/>
+ <button label="Профиль" name="btn_profile_xp"/>
+ <button label="ПожаловатьÑÑ" name="btn_report_xp"/>
+ </layout_panel>
+ <layout_panel name="button_panel">
+ <check_box label="УведомлÑÑ‚ÑŒ обо вÑех ÑобытиÑÑ… дн." name="notify_all"/>
+ <button label="ОчиÑтить" name="btn_clear"/>
+ <button label="&lt;" name="btn_prev"/>
+ <button label="&gt;" name="btn_next"/>
+ </layout_panel>
+ </layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_experience_search.xml b/indra/newview/skins/default/xui/ru/panel_experience_search.xml
new file mode 100644
index 0000000000..38d047f509
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/panel_experience_search.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="SEARCH">
+ <string name="not_found">
+ ТекÑÑ‚ «[TEXT]» не найден
+ </string>
+ <string name="no_results">
+ Ðет результатов
+ </string>
+ <string name="searching">
+ ПоиÑк...
+ </string>
+ <string name="loading">
+ Загрузка...
+ </string>
+ <string name="maturity_icon_general">
+ &quot;Parcel_PG_Light&quot;
+ </string>
+ <string name="maturity_icon_moderate">
+ &quot;Parcel_M_Light&quot;
+ </string>
+ <string name="maturity_icon_adult">
+ &quot;Parcel_R_Light&quot;
+ </string>
+ <panel name="search_panel">
+ <button label="Перейти" name="find"/>
+ <icons_combo_box label="Умеренный" name="maturity">
+ <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>
+ <scroll_list name="search_results">
+ <columns label="Ðазвание" name="experience_name"/>
+ <columns label="Владелец" name="owner"/>
+ </scroll_list>
+ <button label="OK" label_selected="OK" name="ok_btn"/>
+ <button label="Отмена" name="cancel_btn"/>
+ <button label="ПоÑмотреть профиль" name="profile_btn"/>
+ <button label="&lt;" name="left_btn"/>
+ <button label="&gt;" name="right_btn"/>
+ </panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_experiences.xml b/indra/newview/skins/default/xui/ru/panel_experiences.xml
new file mode 100644
index 0000000000..56b962a77f
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/panel_experiences.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Experiences">
+ <string name="loading_experiences" value="Загрузка приключений..."/>
+ <string name="no_experiences" value="Ðет приключений."/>
+ <string name="acquire" value="ПриобреÑти приключение"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_facebook_friends.xml b/indra/newview/skins/default/xui/ru/panel_facebook_friends.xml
index 518452953d..746da8d523 100644
--- a/indra/newview/skins/default/xui/ru/panel_facebook_friends.xml
+++ b/indra/newview/skins/default/xui/ru/panel_facebook_friends.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<panel name="panel_facebook_friends">
<string name="facebook_friends_empty" value="Ð¡ÐµÐ¹Ñ‡Ð°Ñ Ñƒ Ð²Ð°Ñ Ð½ÐµÑ‚ друзей по Facebook, которые также были бы жителÑми Second Life. Предложите Ñвоим друзьÑм по Facebook приÑоединитьÑÑ Ðº Second Life!"/>
- <string name="facebook_friends_no_connected" value="Ð¡ÐµÐ¹Ñ‡Ð°Ñ Ð²Ñ‹ не подключены к Facebook. Перейдите на вкладку «Ðккаунт», чтобы подключитьÑÑ Ð¸ включить Ñту функцию."/>
+ <string name="facebook_friends_no_connected" value="Ð¡ÐµÐ¹Ñ‡Ð°Ñ Ð²Ñ‹ не подключены к Facebook. Перейдите на вкладку «СтатуÑ», чтобы подключитьÑÑ Ð¸ включить Ñту функцию."/>
<accordion name="friends_accordion">
<accordion_tab name="tab_second_life_friends" title="Ð”Ñ€ÑƒÐ·ÑŒÑ Ð¿Ð¾ SL"/>
<accordion_tab name="tab_suggested_friends" title="Добавить Ñтих людей как друзей по SL"/>
diff --git a/indra/newview/skins/default/xui/ru/panel_facebook_photo.xml b/indra/newview/skins/default/xui/ru/panel_facebook_photo.xml
index 783294be86..143a57fec7 100644
--- a/indra/newview/skins/default/xui/ru/panel_facebook_photo.xml
+++ b/indra/newview/skins/default/xui/ru/panel_facebook_photo.xml
@@ -1,26 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<panel name="panel_facebook_photo">
- <layout_stack name="stack_photo">
- <layout_panel name="snapshot_panel">
- <combo_box name="resolution_combobox" tool_tip="Разрешение изображениÑ">
- <combo_box.item label="Текущее окно" name="CurrentWindow"/>
- <combo_box.item label="640x480" name="640x480"/>
- <combo_box.item label="800x600" name="800x600"/>
- <combo_box.item label="1024x768" name="1024x768"/>
- <combo_box.item label="1200x630" name="1200x630"/>
- </combo_box>
- <combo_box name="filters_combobox" tool_tip="Фильтры изображений">
- <combo_box.item label="Без фильтра" name="NoFilter"/>
- </combo_box>
- <button label="Обновить" name="new_snapshot_btn" tool_tip="Щелкните Ð´Ð»Ñ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ"/>
- <button label="ПроÑмотр" name="big_preview_btn" tool_tip="Щелкните Ð´Ð»Ñ Ñмены вида"/>
- <text name="caption_label">
- Комментарий (не обÑзательно):
- </text>
- </layout_panel>
- <layout_panel name="photo_button_panel">
- <button label="Опубликовать" name="post_photo_btn"/>
- <button label="Отмена" name="cancel_photo_btn"/>
- </layout_panel>
- </layout_stack>
+ <combo_box name="resolution_combobox" tool_tip="Разрешение изображениÑ">
+ <combo_box.item label="Текущее окно" name="CurrentWindow"/>
+ <combo_box.item label="640x480" name="640x480"/>
+ <combo_box.item label="800x600" name="800x600"/>
+ <combo_box.item label="1024x768" name="1024x768"/>
+ <combo_box.item label="1200x630" name="1200x630"/>
+ </combo_box>
+ <combo_box name="filters_combobox" tool_tip="Фильтры изображений">
+ <combo_box.item label="Без фильтра" name="NoFilter"/>
+ </combo_box>
+ <button label="Обновить" name="new_snapshot_btn" tool_tip="Щелкните Ð´Ð»Ñ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ"/>
+ <button label="ПроÑмотр" name="big_preview_btn" tool_tip="Щелкните Ð´Ð»Ñ Ñмены вида"/>
+ <text name="caption_label">
+ Комментарий (не обÑзательно):
+ </text>
+ <button label="Опубликовать" name="post_photo_btn"/>
+ <button label="Отмена" name="cancel_photo_btn"/>
</panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_facebook_place.xml b/indra/newview/skins/default/xui/ru/panel_facebook_place.xml
index 913d327e92..7d0917a43a 100644
--- a/indra/newview/skins/default/xui/ru/panel_facebook_place.xml
+++ b/indra/newview/skins/default/xui/ru/panel_facebook_place.xml
@@ -1,17 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<panel name="panel_facebook_place">
- <layout_stack name="stack_place">
- <layout_panel name="place_detail_panel">
- <text name="place_caption_label">
- Ðапишите о том, где вы:
- </text>
- </layout_panel>
- <layout_panel name="place_map_panel">
- <check_box initial_value="false" label="" name="add_place_view_cb"/>
- </layout_panel>
- <layout_panel name="place_button_panel">
- <button label="Опубликовать" name="post_place_btn"/>
- <button label="Отмена" name="cancel_place_btn"/>
- </layout_panel>
- </layout_stack>
+ <text name="place_caption_label">
+ Ðапишите о том, где вы:
+ </text>
+ <check_box initial_value="false" label="Включить вид меÑта Ñверху" name="add_place_view_cb"/>
+ <button label="Опубликовать" name="post_place_btn"/>
+ <button label="Отмена" name="cancel_place_btn"/>
</panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_facebook_status.xml b/indra/newview/skins/default/xui/ru/panel_facebook_status.xml
index a59f132a01..c651a8087c 100644
--- a/indra/newview/skins/default/xui/ru/panel_facebook_status.xml
+++ b/indra/newview/skins/default/xui/ru/panel_facebook_status.xml
@@ -1,14 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<panel name="panel_facebook_status">
- <layout_stack name="stack_status">
- <layout_panel name="status_detail_panel">
- <text name="status_caption_label">
- О чем вы думаете?
- </text>
- </layout_panel>
- <layout_panel name="status_button_panel">
- <button label="Опубликовать" name="post_status_btn"/>
- <button label="Отмена" name="cancel_status_btn"/>
- </layout_panel>
- </layout_stack>
+ <string name="facebook_connected" value="Ð’Ñ‹ подключилиÑÑŒ к Facebook как:"/>
+ <string name="facebook_disconnected" value="Ðе подключено к Facebook"/>
+ <text name="account_caption_label">
+ Ðе подключено к Facebook.
+ </text>
+ <panel name="panel_buttons">
+ <button label="Подключение..." name="connect_btn"/>
+ <button label="Отключить" name="disconnect_btn"/>
+ <text name="account_learn_more_label">
+ [http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-Share-Facebook/ta-p/2149711 О публикации в Facebook]
+ </text>
+ </panel>
+ <text name="status_caption_label">
+ О чем вы думаете?
+ </text>
+ <button label="Опубликовать" name="post_status_btn"/>
+ <button label="Отмена" name="cancel_status_btn"/>
</panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_flickr_photo.xml b/indra/newview/skins/default/xui/ru/panel_flickr_photo.xml
index 0c93e28911..9dd68699ca 100644
--- a/indra/newview/skins/default/xui/ru/panel_flickr_photo.xml
+++ b/indra/newview/skins/default/xui/ru/panel_flickr_photo.xml
@@ -1,40 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<panel name="panel_flickr_photo">
- <layout_stack name="stack_photo">
- <layout_panel name="snapshot_panel">
- <combo_box name="resolution_combobox" tool_tip="Разрешение изображениÑ">
- <combo_box.item label="Текущее окно" name="CurrentWindow"/>
- <combo_box.item label="640x480" name="640x480"/>
- <combo_box.item label="800x600" name="800x600"/>
- <combo_box.item label="1024x768" name="1024x768"/>
- </combo_box>
- <combo_box name="filters_combobox" tool_tip="Фильтры изображений">
- <combo_box.item label="Без фильтра" name="NoFilter"/>
- </combo_box>
- <button label="Обновить" name="new_snapshot_btn" tool_tip="Щелкните Ð´Ð»Ñ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ"/>
- <button label="ПроÑмотр" name="big_preview_btn" tool_tip="Щелкните Ð´Ð»Ñ Ñмены вида"/>
- <text name="title_label">
- Ðазвание:
- </text>
- <text name="description_label">
- ОпиÑание:
- </text>
- <check_box initial_value="true" label="Добавить в конец опиÑÐ°Ð½Ð¸Ñ Ñ€Ð°Ñположение в SL" name="add_location_cb"/>
- <text name="tags_label">
- Теги:
- </text>
- <text name="tags_help_label">
- РазделÑйте теги пробелами. Теги из неÑкольких Ñлов заключайте в кавычки.
- </text>
- <combo_box name="rating_combobox" tool_tip="Рейтинг контента Flickr">
- <combo_box.item label="БезопаÑный рейтинг Flickr" name="SafeRating"/>
- <combo_box.item label="Умеренный рейтинг Flickr" name="ModerateRating"/>
- <combo_box.item label="Ограниченный рейтинг Flickr" name="RestrictedRating"/>
- </combo_box>
- </layout_panel>
- <layout_panel name="photo_button_panel">
- <button label="Передать" name="post_photo_btn"/>
- <button label="Отмена" name="cancel_photo_btn"/>
- </layout_panel>
- </layout_stack>
+ <combo_box name="resolution_combobox" tool_tip="Разрешение изображениÑ">
+ <combo_box.item label="Текущее окно" name="CurrentWindow"/>
+ <combo_box.item label="640x480" name="640x480"/>
+ <combo_box.item label="800x600" name="800x600"/>
+ <combo_box.item label="1024x768" name="1024x768"/>
+ </combo_box>
+ <combo_box name="filters_combobox" tool_tip="Фильтры изображений">
+ <combo_box.item label="Без фильтра" name="NoFilter"/>
+ </combo_box>
+ <button label="Обновить" name="new_snapshot_btn" tool_tip="Щелкните Ð´Ð»Ñ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ"/>
+ <button label="ПроÑмотр" name="big_preview_btn" tool_tip="Щелкните Ð´Ð»Ñ Ñмены вида"/>
+ <text name="title_label">
+ Ðазвание:
+ </text>
+ <text name="description_label">
+ ОпиÑание:
+ </text>
+ <check_box initial_value="true" label="Добавить в конец опиÑÐ°Ð½Ð¸Ñ Ñ€Ð°Ñположение в SL" name="add_location_cb"/>
+ <text name="tags_label">
+ Теги:
+ </text>
+ <text name="tags_help_label">
+ РазделÑйте теги пробелами. Теги из неÑкольких Ñлов заключайте в кавычки.
+ </text>
+ <combo_box name="rating_combobox" tool_tip="Рейтинг контента Flickr">
+ <combo_box.item label="БезопаÑный рейтинг Flickr" name="SafeRating"/>
+ <combo_box.item label="Умеренный рейтинг Flickr" name="ModerateRating"/>
+ <combo_box.item label="Ограниченный рейтинг Flickr" name="RestrictedRating"/>
+ </combo_box>
+ <button label="Передать" name="post_photo_btn"/>
+ <button label="Отмена" name="cancel_photo_btn"/>
</panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/ru/panel_group_info_sidetray.xml
index 16aaa71268..0ec667e3b2 100755
--- a/indra/newview/skins/default/xui/ru/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/default/xui/ru/panel_group_info_sidetray.xml
@@ -23,6 +23,7 @@
<accordion_tab name="group_roles_tab" title="Роли и учаÑтники"/>
<accordion_tab name="group_notices_tab" title="УведомлениÑ"/>
<accordion_tab name="group_land_tab" title="ЗемлÑ/активы"/>
+ <accordion_tab name="group_experiences_tab" title="ПриключениÑ"/>
</accordion>
</layout_panel>
</layout_stack>
diff --git a/indra/newview/skins/default/xui/ru/panel_login.xml b/indra/newview/skins/default/xui/ru/panel_login.xml
index a19304f2fd..2e0ae89b28 100755
--- a/indra/newview/skins/default/xui/ru/panel_login.xml
+++ b/indra/newview/skins/default/xui/ru/panel_login.xml
@@ -1,26 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<panel name="panel_login">
- <panel.string name="forgot_password_url">
- http://secondlife.com/account/request.php
- </panel.string>
+ <panel.string name="forgot_password_url">http://secondlife.com/account/request.php</panel.string>
<layout_stack name="ui_stack">
<layout_panel name="ui_container">
<combo_box label="Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ" name="username_combo" tool_tip="Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ, которое вы выбрали при региÑтрации, например, «bobsmith12» или «Steller Sunshine»"/>
<line_editor label="Пароль" name="password_edit"/>
- <check_box label="Запомнить менÑ" name="remember_check"/>
- <text name="forgot_password_text">
- Забыли пароль?
- </text>
- <button label="Войти" name="connect_btn"/>
- <text name="At_My_Last_Location_Label" font="SansSerifSmall">
- Ð’ поÑледнее меÑто
- </text>
<combo_box label="Мои любимые меÑта" name="start_location_combo">
+ <combo_box.item label="ПоÑледнее меÑтоположение" name="MyLastLocation"/>
<combo_box.item label="Мой дом" name="MyHome"/>
</combo_box>
- <button label="Войти" name="connect_favorite_btn"/>
- <line_editor label="Введите меÑтоположение" name="location_edit" font="SansSerifSmall" />
- <button label="Войти" name="connect_location_btn"/>
+ <button label="Войти" name="connect_btn"/>
+ <check_box label="Запомнить менÑ" name="remember_check"/>
+ <text name="forgot_password_text">Забыли пароль?</text>
<combo_box label="Выберите Ñетку" name="server_combo"/>
</layout_panel>
</layout_stack>
diff --git a/indra/newview/skins/default/xui/ru/panel_marketplace_listings.xml b/indra/newview/skins/default/xui/ru/panel_marketplace_listings.xml
new file mode 100644
index 0000000000..1f903b1046
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/panel_marketplace_listings.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Торговый центр" name="Marketplace Panel">
+ <panel name="tool_panel">
+ <menu_button name="sort_btn" tool_tip="Параметры проÑмотра/Ñортировки"/>
+ <button name="add_btn" tool_tip="Создать новую папку ÑпиÑка"/>
+ <button label="Проверка на ошибки" name="audit_btn" tool_tip="Проверьте Ñвои ÑпиÑки товаров в торговом центре"/>
+ </panel>
+ <panel name="tab_container_panel">
+ <filter_editor label="Фильтровать ÑпиÑки товаров в торговом центре" name="filter_editor"/>
+ </panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_marketplace_listings_inventory.xml b/indra/newview/skins/default/xui/ru/panel_marketplace_listings_inventory.xml
new file mode 100644
index 0000000000..ff7b30188f
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/panel_marketplace_listings_inventory.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<inventory_panel label="ВСЕ" name="All Items" tool_tip="Перетащите Ñюда предметы, чтобы внеÑти их в ÑпиÑок"/>
diff --git a/indra/newview/skins/default/xui/ru/panel_marketplace_listings_listed.xml b/indra/newview/skins/default/xui/ru/panel_marketplace_listings_listed.xml
new file mode 100644
index 0000000000..b42a82084f
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/panel_marketplace_listings_listed.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<inventory_panel label="ОПУБЛИКОВÐÐÐЫЕ" name="Active Items"/>
diff --git a/indra/newview/skins/default/xui/ru/panel_marketplace_listings_unassociated.xml b/indra/newview/skins/default/xui/ru/panel_marketplace_listings_unassociated.xml
new file mode 100644
index 0000000000..fc69e3c362
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/panel_marketplace_listings_unassociated.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<inventory_panel label="ÐЕ СВЯЗÐÐÐЫЕ" name="Unassociated Items"/>
diff --git a/indra/newview/skins/default/xui/ru/panel_marketplace_listings_unlisted.xml b/indra/newview/skins/default/xui/ru/panel_marketplace_listings_unlisted.xml
new file mode 100644
index 0000000000..c630129d44
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/panel_marketplace_listings_unlisted.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<inventory_panel label="ÐЕОПУБЛИКОВÐÐÐЫЕ" name="Inactive Items"/>
diff --git a/indra/newview/skins/default/xui/ru/panel_postcard_settings.xml b/indra/newview/skins/default/xui/ru/panel_postcard_settings.xml
index dc9d59008f..d95cdbcf0a 100755
--- a/indra/newview/skins/default/xui/ru/panel_postcard_settings.xml
+++ b/indra/newview/skins/default/xui/ru/panel_postcard_settings.xml
@@ -7,17 +7,7 @@
<combo_box.item label="1024x768" name="1024x768"/>
<combo_box.item label="Задать" name="Custom"/>
</combo_box>
- <layout_stack name="postcard_image_params_ls">
- <layout_panel name="postcard_image_size_lp">
- <spinner label="Ширина" name="postcard_snapshot_width"/>
- <spinner label="Ð’Ñ‹Ñота" name="postcard_snapshot_height"/>
- <check_box label="СохранÑÑ‚ÑŒ пропорции" name="postcard_keep_aspect_check"/>
- </layout_panel>
- <layout_panel name="postcard_image_format_quality_lp">
- <slider label="КачеÑтво изображениÑ" name="image_quality_slider"/>
- <text name="image_quality_level">
- ([QLVL])
- </text>
- </layout_panel>
- </layout_stack>
+ <spinner label="Ширина x Ð’Ñ‹Ñота" name="postcard_snapshot_width"/>
+ <check_box label="СохранÑÑ‚ÑŒ пропорции" name="postcard_keep_aspect_check"/>
+ <slider label="КачеÑтво:" name="image_quality_slider"/>
</panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_preferences_setup.xml b/indra/newview/skins/default/xui/ru/panel_preferences_setup.xml
index 1741397a84..d00f58dbff 100755
--- a/indra/newview/skins/default/xui/ru/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/ru/panel_preferences_setup.xml
@@ -14,9 +14,9 @@
<text name="Web:">
Браузер:
</text>
- <radio_group name="use_external_browser">
- <radio_item label="ИÑпользовать мой браузер (IE, Firefox, Safari)" name="external" tool_tip="Будет иÑпользоватьÑÑ Ð±Ñ€Ð°ÑƒÐ·ÐµÑ€, заданный в ÑиÑтеме по умолчанию. Ðе рекомендуетÑÑ, еÑли [APP_NAME] работает в полноÑкранном режиме." value="true"/>
- <radio_item label="ИÑпользовать вÑтроенный браузер" name="internal" tool_tip="Ð”Ð»Ñ Ð¿Ñ€Ð¾Ñмотра Ñправки, ÑÑылок на веб-Ñтраницы и Ñ‚. д. будет иÑпользоватьÑÑ Ð²Ñтроенный браузер. Этот браузер открываетÑÑ ÐºÐ°Ðº новое окно в [APP_NAME]." value=""/>
+ <radio_group name="preferred_browser_behavior">
+ <radio_item label="ИÑпользовать мой браузер (Chrome, Firefox, IE) Ð´Ð»Ñ Ð²Ñех ÑÑылок" name="internal" tool_tip="Будет иÑпользоватьÑÑ Ð±Ñ€Ð°ÑƒÐ·ÐµÑ€, заданный в ÑиÑтеме по умолчанию. Ðе рекомендуетÑÑ, еÑли [APP_NAME] работает в полноÑкранном режиме." value="0"/>
+ <radio_item label="ИÑпользовать вÑтроенный браузер только Ð´Ð»Ñ ÑÑылок Second Life" name="external" tool_tip="Стандартный браузер ÑиÑтемы будет иÑпользоватьÑÑ Ð´Ð»Ñ Ñправки, ÑÑылок Интернета и Ñ‚.д. Ð’Ñтроенный браузер будет иÑпользоватьÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ð´Ð»Ñ ÑÑылок LindenLab/SecondLife." value="1"/>
</radio_group>
<check_box initial_value="true" label="Разрешить плагины" name="browser_plugins_enabled"/>
<check_box initial_value="true" label="Принимать файлы cookie" name="cookies_enabled"/>
diff --git a/indra/newview/skins/default/xui/ru/panel_region_experiences.xml b/indra/newview/skins/default/xui/ru/panel_region_experiences.xml
new file mode 100644
index 0000000000..4fd70b5650
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/panel_region_experiences.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="ПриключениÑ" name="Experiences">
+ <panel.string name="trusted_estate_text">
+ Любое приключение может быть ключевым.
+
+У ключевых приключений еÑÑ‚ÑŒ разрешение на запуÑк в Ñтом землевладении.
+
+Кроме того, еÑли в землевладении не разрешен публичный доÑтуп, то жители, учаÑтвующие в любом ключевом приключении, могут входить в землевладение и оÑтаватьÑÑ Ð² нем до тех пор, пока они находÑÑ‚ÑÑ Ð² ключевом приключении.
+ </panel.string>
+ <panel.string name="allowed_estate_text">
+ Могут быть разрешены только приключениÑ, привÑзанные к земле.
+
+У разрешенных приключений еÑÑ‚ÑŒ разрешение на запуÑк в Ñтом землевладении.
+ </panel.string>
+ <panel.string name="blocked_estate_text">
+ Блокировать можно только привÑзанные к Ñетке приключениÑ.
+
+ЗапуÑк заблокированных приключений в Ñтом землевладении невозможен.
+ </panel.string>
+ <panel.string name="estate_caption">
+ Изменение параметров на Ñтой вкладке повлиÑет на вÑе регионы Ñтого землевладениÑ.
+ </panel.string>
+ <panel.string name="allowed_parcel_text">
+ Могут быть разрешены только приключениÑ, привÑзанные к земле.
+
+У разрешенных приключений еÑÑ‚ÑŒ разрешение на запуÑк на Ñтом учаÑтке, еÑли они не заблокированы землевладением.
+ </panel.string>
+ <panel.string name="blocked_parcel_text">
+ Любое приключение Ð¶Ð¸Ñ‚ÐµÐ»Ñ Ð¼Ð¾Ð¶ÐµÑ‚ быть заблокировано.
+
+ЗапуÑк заблокированных приключений на Ñтом учаÑтке невозможен.
+ </panel.string>
+</panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_script_experience.xml b/indra/newview/skins/default/xui/ru/panel_script_experience.xml
new file mode 100644
index 0000000000..f798884c6b
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/panel_script_experience.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<panel name="script_experience" title="ПРИКЛЮЧЕÐИЕ">
+ <button label="Приключение" name="Expand Experience"/>
+ <check_box label="ИÑпользуетÑÑ Ð¿Ñ€Ð¸ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ðµ" name="enable_xp"/>
+ <layout_stack name="xp_details">
+ <layout_panel>
+ <combo_box label="Выбрать приключение..." name="Experiences..."/>
+ </layout_panel>
+ </layout_stack>
+ <text name="No Experiences">
+ Ð’Ñ‹ не ÑвлÑетеÑÑŒ автором приключений.
+ </text>
+</panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/ru/panel_snapshot_inventory.xml
index 53a150c9f9..adc612dfd8 100755
--- a/indra/newview/skins/default/xui/ru/panel_snapshot_inventory.xml
+++ b/indra/newview/skins/default/xui/ru/panel_snapshot_inventory.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="panel_snapshot_inventory">
<text name="title">
- Сохранить в моем инвентаре
+ Инвентарь
</text>
<text name="hint_lbl">
Сохранение Ð¸Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ Ð² инвентаре Ñтоит L$[UPLOAD_COST]. Чтобы Ñохранить его как текÑтуру, выберите один из квадратных форматов.
@@ -13,8 +13,8 @@
<combo_box.item label="Большой (512x512)" name="Large(512x512)"/>
<combo_box.item label="Задать" name="Custom"/>
</combo_box>
- <spinner label="Ширина" name="inventory_snapshot_width"/>
- <spinner label="Ð’Ñ‹Ñота" name="inventory_snapshot_height"/>
+ <spinner label="Ширина x Ð’Ñ‹Ñота" name="inventory_snapshot_width"/>
+ <spinner label="" name="inventory_snapshot_height"/>
<check_box label="СохранÑÑ‚ÑŒ пропорции" name="inventory_keep_aspect_check"/>
<button label="Отмена" name="cancel_btn"/>
<button label="Сохранить" name="save_btn"/>
diff --git a/indra/newview/skins/default/xui/ru/panel_snapshot_local.xml b/indra/newview/skins/default/xui/ru/panel_snapshot_local.xml
index 446b9bb2fd..80ad8f7703 100755
--- a/indra/newview/skins/default/xui/ru/panel_snapshot_local.xml
+++ b/indra/newview/skins/default/xui/ru/panel_snapshot_local.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="panel_snapshot_local">
<text name="title">
- Сохранить на моем компьютере
+ ДиÑк
</text>
<combo_box label="Размер" name="local_size_combo">
<combo_box.item label="Текущее окно" name="CurrentWindow"/>
@@ -13,24 +13,17 @@
<combo_box.item label="1600x1200" name="1600x1200"/>
<combo_box.item label="Задать" name="Custom"/>
</combo_box>
- <layout_stack name="local_image_params_ls">
- <layout_panel name="local_image_size_lp">
- <spinner label="Ширина" name="local_snapshot_width"/>
- <spinner label="Ð’Ñ‹Ñота" name="local_snapshot_height"/>
- <check_box label="СохранÑÑ‚ÑŒ пропорции" name="local_keep_aspect_check"/>
- </layout_panel>
- <layout_panel name="local_image_format_quality_lp">
- <combo_box label="Формат" name="local_format_combo">
- <combo_box.item label="PNG (без потерь)" name="PNG"/>
- <combo_box.item label="JPEG" name="JPEG"/>
- <combo_box.item label="BMP (без потерь)" name="BMP"/>
- </combo_box>
- <slider label="КачеÑтво изображениÑ" name="image_quality_slider"/>
- <text name="image_quality_level">
- ([QLVL])
- </text>
- </layout_panel>
- </layout_stack>
+ <spinner label="Ширина x Ð’Ñ‹Ñота" name="local_snapshot_width"/>
+ <check_box label="СохранÑÑ‚ÑŒ пропорции" name="local_keep_aspect_check"/>
+ <text name="local_format_label">
+ Формат:
+ </text>
+ <combo_box label="Формат" name="local_format_combo">
+ <combo_box.item label="PNG (без потерь)" name="PNG"/>
+ <combo_box.item label="JPEG" name="JPEG"/>
+ <combo_box.item label="BMP (без потерь)" name="BMP"/>
+ </combo_box>
+ <slider label="КачеÑтво:" name="image_quality_slider"/>
<button label="Отмена" name="cancel_btn"/>
<flyout_button label="Сохранить" name="save_btn" tool_tip="Сохранить изображение в файл">
<flyout_button.item label="Сохранить" name="save_item"/>
diff --git a/indra/newview/skins/default/xui/ru/panel_snapshot_options.xml b/indra/newview/skins/default/xui/ru/panel_snapshot_options.xml
index 8cd69951ca..9a5bbf3bac 100755
--- a/indra/newview/skins/default/xui/ru/panel_snapshot_options.xml
+++ b/indra/newview/skins/default/xui/ru/panel_snapshot_options.xml
@@ -1,16 +1,10 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="panel_snapshot_options">
- <button label="ПомеÑтить в мой профиль" name="save_to_profile_btn"/>
+ <button label="Сохранить на диÑке" name="save_to_computer_btn"/>
+ <button label="Сохранить в инвентаре (L$[AMOUNT])" name="save_to_inventory_btn"/>
+ <button label="Загрузить в профиль" name="save_to_profile_btn"/>
+ <button label="Загрузить в Facebook" name="send_to_facebook_btn"/>
+ <button label="Загрузить в Twitter" name="send_to_twitter_btn"/>
+ <button label="Загрузить на Flickr" name="send_to_flickr_btn"/>
<button label="Отправить по почте" name="save_to_email_btn"/>
- <button label="Сохранить в моем инвентаре (L$[AMOUNT])" name="save_to_inventory_btn"/>
- <button label="Сохранить на моем компьютере" name="save_to_computer_btn"/>
- <text name="send_to_facebook_textbox">
- Отправить: [secondlife:/// Facebook]
- </text>
- <text name="send_to_twitter_textbox">
- [secondlife:/// Twitter]
- </text>
- <text name="send_to_flickr_textbox">
- [secondlife:/// Flickr]
- </text>
</panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/ru/panel_snapshot_postcard.xml
index 47f4caf8e3..8f6ab612ff 100755
--- a/indra/newview/skins/default/xui/ru/panel_snapshot_postcard.xml
+++ b/indra/newview/skins/default/xui/ru/panel_snapshot_postcard.xml
@@ -10,8 +10,12 @@
Отправка...
</string>
<text name="title">
- Электронное пиÑьмо
+ Почта
</text>
- <button label="Сообщение" name="message_btn"/>
- <button label="ÐаÑтройки" name="settings_btn"/>
+ <tab_container name="postcard_tabs">
+ <panel label="Сообщение" name="panel_postcard_message"/>
+ <panel label="ÐаÑтройки" name="panel_postcard_settings"/>
+ </tab_container>
+ <button label="Отмена" name="cancel_btn"/>
+ <button label="Отправить" name="send_btn"/>
</panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_snapshot_profile.xml b/indra/newview/skins/default/xui/ru/panel_snapshot_profile.xml
index 79a9ef58d0..6b3401aa5c 100755
--- a/indra/newview/skins/default/xui/ru/panel_snapshot_profile.xml
+++ b/indra/newview/skins/default/xui/ru/panel_snapshot_profile.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="panel_snapshot_profile">
<text name="title">
- ПомеÑтить в мой профиль
+ Профиль
</text>
<combo_box label="Размер" name="profile_size_combo">
<combo_box.item label="Текущее окно" name="CurrentWindow"/>
@@ -10,19 +10,12 @@
<combo_box.item label="1024x768" name="1024x768"/>
<combo_box.item label="Задать" name="Custom"/>
</combo_box>
- <layout_stack name="profile_image_params_ls">
- <layout_panel name="profile_image_size_lp">
- <spinner label="Ширина" name="profile_snapshot_width"/>
- <spinner label="Ð’Ñ‹Ñота" name="profile_snapshot_height"/>
- <check_box label="СохранÑÑ‚ÑŒ пропорции" name="profile_keep_aspect_check"/>
- </layout_panel>
- <layout_panel name="profile_image_metadata_lp">
- <text name="caption_label">
- ПодпиÑÑŒ:
- </text>
- <check_box initial_value="true" label="Включить раÑположение" name="add_location_cb"/>
- </layout_panel>
- </layout_stack>
+ <spinner label="Ширина x Ð’Ñ‹Ñота" name="profile_snapshot_width"/>
+ <check_box label="СохранÑÑ‚ÑŒ пропорции" name="profile_keep_aspect_check"/>
+ <text name="caption_label">
+ ПодпиÑÑŒ:
+ </text>
+ <check_box initial_value="true" label="Включить раÑположение" name="add_location_cb"/>
<button label="Отмена" name="cancel_btn"/>
<button label="Опубликовать" name="post_btn"/>
</panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_status_bar.xml b/indra/newview/skins/default/xui/ru/panel_status_bar.xml
index 9c84ff1fd8..630925fa60 100755
--- a/indra/newview/skins/default/xui/ru/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/ru/panel_status_bar.xml
@@ -1,28 +1,16 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="status">
- <panel.string name="packet_loss_tooltip">
- Потери пакетов
- </panel.string>
- <panel.string name="bandwidth_tooltip">
- Ширина канала
- </panel.string>
- <panel.string name="time">
- [hour, datetime, slt]:[min, datetime, slt] [timezone,datetime, slt]
- </panel.string>
- <panel.string name="timeTooltip">
- [weekday, datetime, slt], [day, datetime, slt] [month, datetime, slt] [year, datetime, slt]
- </panel.string>
- <panel.string name="buycurrencylabel">
- L$ [AMT]
- </panel.string>
+ <panel.string name="packet_loss_tooltip">Потери пакетов</panel.string>
+ <panel.string name="bandwidth_tooltip">Ширина канала</panel.string>
+ <panel.string name="time">[hour, datetime, slt]:[min, datetime, slt] [timezone,datetime, slt]</panel.string>
+ <panel.string name="timeTooltip">[weekday, datetime, slt], [day, datetime, slt] [month, datetime, slt] [year, datetime, slt]</panel.string>
+ <panel.string name="buycurrencylabel">L$ [AMT]</panel.string>
<panel left="-450" name="balance_bg" width="240">
- <text name="balance" tool_tip="Щелкните Ð´Ð»Ñ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð²Ð°ÑˆÐµÐ³Ð¾ баланÑа L$" value="L$20"/>
+ <text name="balance" tool_tip="Щелкните Ð´Ð»Ñ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð²Ð°ÑˆÐµÐ³Ð¾ баланÑа L$" value="L$??"/>
<button label="Купить L$" name="buyL" tool_tip="Щелкните Ð´Ð»Ñ Ð¿Ð¾ÐºÑƒÐ¿ÐºÐ¸ L$"/>
<button label="Торговый центр" name="goShop" tool_tip="Открыть торговый центр Second Life" width="121"/>
</panel>
- <text name="TimeText" tool_tip="Текущее Ð²Ñ€ÐµÐ¼Ñ (тихоокеанÑкое)">
- 00:00 (тихоокеанÑкое времÑ)
- </text>
+ <text name="TimeText" tool_tip="Текущее Ð²Ñ€ÐµÐ¼Ñ (тихоокеанÑкое)">00:00 (тихоокеанÑкое времÑ)</text>
<button name="media_toggle_btn" tool_tip="ЗапуÑк/оÑтановка вÑех медиа (музыка, видео, веб-Ñтраницы)"/>
<button name="volume_btn" tool_tip="РегулÑтор громкоÑти"/>
</panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_twitter_photo.xml b/indra/newview/skins/default/xui/ru/panel_twitter_photo.xml
index 564d02411d..6c9035323a 100644
--- a/indra/newview/skins/default/xui/ru/panel_twitter_photo.xml
+++ b/indra/newview/skins/default/xui/ru/panel_twitter_photo.xml
@@ -1,32 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<panel name="panel_twitter_photo">
- <layout_stack name="stack_photo">
- <layout_panel name="text_panel">
- <text name="status_label">
- Что ÑлучилоÑÑŒ?
- </text>
- <text name="status_counter_label">
- 140
- </text>
- <check_box initial_value="true" label="Включить раÑположение в SL" name="add_location_cb"/>
- <check_box initial_value="true" label="Включить фото" name="add_photo_cb"/>
- </layout_panel>
- <layout_panel name="snapshot_panel">
- <combo_box name="resolution_combobox" tool_tip="Разрешение изображениÑ">
- <combo_box.item label="Текущее окно" name="CurrentWindow"/>
- <combo_box.item label="640x480" name="640x480"/>
- <combo_box.item label="800x600" name="800x600"/>
- <combo_box.item label="1024x768" name="1024x768"/>
- </combo_box>
- <combo_box name="filters_combobox" tool_tip="Фильтры изображений">
- <combo_box.item label="Без фильтра" name="NoFilter"/>
- </combo_box>
- <button label="Обновить" name="new_snapshot_btn" tool_tip="Щелкните Ð´Ð»Ñ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ"/>
- <button label="ПроÑмотр" name="big_preview_btn" tool_tip="Щелкните Ð´Ð»Ñ Ñмены вида"/>
- </layout_panel>
- <layout_panel name="photo_button_panel">
- <button label="Твит" name="post_photo_btn"/>
- <button label="Отмена" name="cancel_photo_btn"/>
- </layout_panel>
- </layout_stack>
+ <text name="status_label">
+ Что ÑлучилоÑÑŒ?
+ </text>
+ <text name="status_counter_label">
+ 140
+ </text>
+ <check_box initial_value="true" label="Включить раÑположение в SL" name="add_location_cb"/>
+ <check_box initial_value="true" label="Включить фото" name="add_photo_cb"/>
+ <combo_box name="resolution_combobox" tool_tip="Разрешение изображениÑ">
+ <combo_box.item label="Текущее окно" name="CurrentWindow"/>
+ <combo_box.item label="640x480" name="640x480"/>
+ <combo_box.item label="800x600" name="800x600"/>
+ <combo_box.item label="1024x768" name="1024x768"/>
+ </combo_box>
+ <combo_box name="filters_combobox" tool_tip="Фильтры изображений">
+ <combo_box.item label="Без фильтра" name="NoFilter"/>
+ </combo_box>
+ <button label="Обновить" name="new_snapshot_btn" tool_tip="Щелкните Ð´Ð»Ñ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ"/>
+ <button label="ПроÑмотр" name="big_preview_btn" tool_tip="Щелкните Ð´Ð»Ñ Ñмены вида"/>
+ <button label="Твит" name="post_photo_btn"/>
+ <button label="Отмена" name="cancel_photo_btn"/>
</panel>
diff --git a/indra/newview/skins/default/xui/ru/role_actions.xml b/indra/newview/skins/default/xui/ru/role_actions.xml
index a4ac7411a3..c29cd6d0f4 100755
--- a/indra/newview/skins/default/xui/ru/role_actions.xml
+++ b/indra/newview/skins/default/xui/ru/role_actions.xml
@@ -71,4 +71,8 @@
<action description="ПриÑоединение к голоÑовому чату группы" longdescription="УчаÑтники роли Ñ Ñтой ÑпоÑобноÑтью могут приÑоединÑÑ‚ÑŒÑÑ Ðº ÑеанÑам голоÑового чата группы. ПРИМЕЧÐÐИЕ. СпоÑобноÑÑ‚ÑŒ «ПриÑоединение к чату группы» необходима Ð´Ð»Ñ Ð´Ð¾Ñтупа к ÑеанÑам голоÑового чата." name="join voice chat" value="27"/>
<action description="Moderate-чат группы" longdescription="УчаÑтники роли Ñ Ñтой ÑпоÑобноÑтью могут контролировать доÑтуп и учаÑтие в ÑеанÑах текÑтового и голоÑового чата группы." name="moderate group chat" value="37"/>
</action_set>
+ <action_set description="Эти ÑпоÑобноÑти включают право изменÑÑ‚ÑŒ приключениÑ, которыми владеет Ñта группа." name="experience_tools_experience">
+ <action description="ÐдминиÑтратор приключениÑ" longdescription="УчаÑтники роли Ñ Ñтой ÑпоÑобноÑтью могут редактировать метаданные приключениÑ." name="experience admin" value="49"/>
+ <action description="Ðвтор приключениÑ" longdescription="УчаÑтники роли Ñ Ñтой ÑпоÑобноÑтью могут Ñоздавать Ñкрипты Ð´Ð»Ñ Ð¿Ñ€Ð¸ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ." name="experience contributor" value="50"/>
+ </action_set>
</role_actions>
diff --git a/indra/newview/skins/default/xui/ru/sidepanel_item_info.xml b/indra/newview/skins/default/xui/ru/sidepanel_item_info.xml
index 0106ed50ac..c434dcd6a8 100755
--- a/indra/newview/skins/default/xui/ru/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/ru/sidepanel_item_info.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="item properties" title="Профиль объекта">
+ <panel.string name="loading_experience">
+ (загрузка)
+ </panel.string>
<panel.string name="unknown">
(неизвеÑтно)
</panel.string>
@@ -43,6 +46,9 @@
<text name="LabelAcquiredTitle">
Приобретено:
</text>
+ <text name="LabelItemExperienceTitle">
+ Приключение:
+ </text>
<panel name="perms_inv">
<text name="perm_modify">
Вы можете:
@@ -66,8 +72,9 @@
<check_box label="Передать" name="CheckNextOwnerTransfer" tool_tip="Следующий владелец может отдать или перепродать объект"/>
</panel>
<check_box label="Ð”Ð»Ñ Ð¿Ñ€Ð¾Ð´Ð°Ð¶Ð¸" name="CheckPurchase"/>
- <combo_box name="combobox sale copy">
+ <combo_box name="ComboBoxSaleType">
<combo_box.item label="Копировать" name="Copy"/>
+ <combo_box.item label="Содержимое" name="Contents"/>
<combo_box.item label="Оригинал" name="Original"/>
</combo_box>
<spinner label="Цена: L$" name="Edit Cost"/>
diff --git a/indra/newview/skins/default/xui/ru/sidepanel_task_info.xml b/indra/newview/skins/default/xui/ru/sidepanel_task_info.xml
index 5502530ca4..4059a800f0 100755
--- a/indra/newview/skins/default/xui/ru/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/ru/sidepanel_task_info.xml
@@ -1,71 +1,31 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="object properties" title="Профиль объекта">
- <panel.string name="text deed continued">
- Сделка
- </panel.string>
- <panel.string name="text deed">
- Сделка
- </panel.string>
- <panel.string name="text modify info 1">
- Этот объект можно изменÑÑ‚ÑŒ
- </panel.string>
- <panel.string name="text modify info 2">
- Эти объекты можно изменÑÑ‚ÑŒ
- </panel.string>
- <panel.string name="text modify info 3">
- Этот объект Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ð·Ð¼ÐµÐ½ÑÑ‚ÑŒ
- </panel.string>
- <panel.string name="text modify info 4">
- Эти объекты Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ð·Ð¼ÐµÐ½ÑÑ‚ÑŒ
- </panel.string>
- <panel.string name="text modify info 5">
- Этот объект Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ð·Ð¼ÐµÐ½ÑÑ‚ÑŒ через границу региона
- </panel.string>
- <panel.string name="text modify info 6">
- Эти объекты Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ð·Ð¼ÐµÐ½ÑÑ‚ÑŒ через границу региона
- </panel.string>
- <panel.string name="text modify warning">
- Этот объект Ñодержит объединенные чаÑти
- </panel.string>
- <panel.string name="Cost Default">
- Цена: L$
- </panel.string>
- <panel.string name="Cost Total">
- Ð’Ñего: L$
- </panel.string>
- <panel.string name="Cost Per Unit">
- Цена за: L$
- </panel.string>
- <panel.string name="Cost Mixed">
- Ð¡Ð¼ÐµÑˆÐ°Ð½Ð½Ð°Ñ Ñ†ÐµÐ½Ð°
- </panel.string>
- <panel.string name="Sale Mixed">
- Ð¡Ð¼ÐµÑˆÐ°Ð½Ð½Ð°Ñ Ð¿Ñ€Ð¾Ð´Ð°Ð¶Ð°
- </panel.string>
+ <panel.string name="text deed continued">Сделка</panel.string>
+ <panel.string name="text deed">Сделка</panel.string>
+ <panel.string name="text modify info 1">Этот объект можно изменÑÑ‚ÑŒ</panel.string>
+ <panel.string name="text modify info 2">Эти объекты можно изменÑÑ‚ÑŒ</panel.string>
+ <panel.string name="text modify info 3">Этот объект Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ð·Ð¼ÐµÐ½ÑÑ‚ÑŒ</panel.string>
+ <panel.string name="text modify info 4">Эти объекты Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ð·Ð¼ÐµÐ½ÑÑ‚ÑŒ</panel.string>
+ <panel.string name="text modify info 5">Этот объект Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ð·Ð¼ÐµÐ½ÑÑ‚ÑŒ через границу региона</panel.string>
+ <panel.string name="text modify info 6">Эти объекты Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ð·Ð¼ÐµÐ½ÑÑ‚ÑŒ через границу региона</panel.string>
+ <panel.string name="text modify warning">Этот объект Ñодержит объединенные чаÑти</panel.string>
+ <panel.string name="Cost Default">Цена: L$</panel.string>
+ <panel.string name="Cost Total">Ð˜Ñ‚Ð¾Ð³Ð¾Ð²Ð°Ñ Ñ†ÐµÐ½Ð°: L$</panel.string>
+ <panel.string name="Cost Per Unit">Цена за: L$</panel.string>
+ <panel.string name="Cost Mixed">Ð¡Ð¼ÐµÑˆÐ°Ð½Ð½Ð°Ñ Ñ†ÐµÐ½Ð°</panel.string>
+ <panel.string name="Sale Mixed">Ð¡Ð¼ÐµÑˆÐ°Ð½Ð½Ð°Ñ Ð¿Ñ€Ð¾Ð´Ð°Ð¶Ð°</panel.string>
<text name="title" value="Профиль объекта"/>
<text name="where" value="(в мире)"/>
<panel label="" name="properties_panel">
- <text name="Name:">
- Ðазвание:
- </text>
- <text name="Description:">
- ОпиÑание:
- </text>
- <text name="CreatorNameLabel">
- Создатель:
- </text>
- <text name="Owner:">
- Владелец:
- </text>
- <text name="Group_label">
- Группа:
- </text>
+ <text name="Name:">Ðазвание:</text>
+ <text name="Description:">ОпиÑание:</text>
+ <text name="CreatorNameLabel">Создатель:</text>
+ <text name="Owner:">Владелец:</text>
+ <text name="Group_label">Группа:</text>
<button name="button set group" tool_tip="Выберите группу Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐ´Ð°Ñ‡Ð¸ ей прав доÑтупа к объекту"/>
<name_box initial_value="Загрузка..." name="Group Name Proxy"/>
<button label="Сделка" label_selected="Сделка" name="button deed" tool_tip="Ð’ результате Ñделки объект передаетÑÑ Ð³Ñ€ÑƒÐ¿Ð¿Ðµ, при Ñтом права на него будут ÑоответÑтвовать правам Ñледующего владельца. Переданный группе объект может передаватьÑÑ Ð´Ð¾Ð»Ð¶Ð½Ð¾Ñтным лицом группы."/>
- <text name="label click action">
- ДейÑтвие по щелчку:
- </text>
+ <text name="label click action">ДейÑтвие по щелчку:</text>
<combo_box name="clickaction">
<combo_box.item label="КоÑнутьÑÑ (по умолчанию)" name="Touch/grab(default)"/>
<combo_box.item label="СеÑÑ‚ÑŒ на объект" name="Sitonobject"/>
@@ -75,21 +35,13 @@
<combo_box.item label="Приблизить" name="Zoom"/>
</combo_box>
<panel name="perms_inv">
- <text name="perm_modify">
- Этот объект можно изменÑÑ‚ÑŒ
- </text>
- <text name="Anyone can:">
- Ð’Ñе:
- </text>
+ <text name="perm_modify">Этот объект можно изменÑÑ‚ÑŒ</text>
+ <text name="Anyone can:">Ð’Ñе:</text>
<check_box label="Копировать" name="checkbox allow everyone copy"/>
<check_box label="ПеремеÑтить" name="checkbox allow everyone move"/>
- <text name="GroupLabel">
- Группа:
- </text>
+ <text name="GroupLabel">Группа:</text>
<check_box label="ПоделитьÑÑ" name="checkbox share with group" tool_tip="Позволить вÑем учаÑтникам выбранной группы получить уÑтановленные вам права на Ñтот объект. Ð”Ð»Ñ Ð²ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ñ€Ð¾Ð»ÐµÐ²Ñ‹Ñ… ограничений необходимо произвеÑти Ñделку."/>
- <text name="NextOwnerLabel">
- Следующий владелец:
- </text>
+ <text name="NextOwnerLabel">Следующий владелец:</text>
<check_box label="ИзменÑÑ‚ÑŒ" name="checkbox next owner can modify"/>
<check_box label="Копировать" name="checkbox next owner can copy"/>
<check_box label="Передать" name="checkbox next owner can transfer" tool_tip="Следующий владелец может отдать или перепродать объект"/>
@@ -102,27 +54,13 @@
</combo_box>
<spinner label="Цена: L$" name="Edit Cost"/>
<check_box label="Показать в результатах поиÑка" name="search_check" tool_tip="Показывать объект в результатах поиÑка"/>
- <text name="pathfinding_attributes_label">
- Ðтрибуты поиÑка пути:
- </text>
- <text name="B:">
- Ð:
- </text>
- <text name="O:">
- O:
- </text>
- <text name="G:">
- G:
- </text>
- <text name="E:">
- Ð’:
- </text>
- <text name="N:">
- С:
- </text>
- <text name="F:">
- F:
- </text>
+ <text name="pathfinding_attributes_label">Ðтрибуты поиÑка пути:</text>
+ <text name="B:">Ð:</text>
+ <text name="O:">O:</text>
+ <text name="G:">G:</text>
+ <text name="E:">Ð’:</text>
+ <text name="N:">С:</text>
+ <text name="F:">F:</text>
</panel>
<panel name="button_panel">
<button label="Открыть" name="open_btn"/>
diff --git a/indra/newview/skins/default/xui/ru/strings.xml b/indra/newview/skins/default/xui/ru/strings.xml
index b7daab33a9..0d64b2cae9 100755
--- a/indra/newview/skins/default/xui/ru/strings.xml
+++ b/indra/newview/skins/default/xui/ru/strings.xml
@@ -449,30 +449,51 @@ support@secondlife.com.
<string name="TooltipMustSingleDrop">
Сюда можно перетащить только одну вещь
</string>
+ <string name="TooltipTooManyWearables">
+ ÐÐµÐ»ÑŒÐ·Ñ Ð½Ð¾Ñить папку, Ñодержащую более [AMOUNT] вещей. Это ограничение можно изменить в меню «Дополнительно &gt; ÐаÑтройки отладки &gt; WearFolderLimit.
+ </string>
<string name="TooltipPrice" value="L$[AMOUNT]:"/>
<string name="TooltipOutboxDragToWorld">
- ÐÐµÐ»ÑŒÐ·Ñ Ð²Ñ‹Ð»Ð¾Ð¶Ð¸Ñ‚ÑŒ предметы из папке «Торговые иÑходÑщие»
+ ÐÐµÐ»ÑŒÐ·Ñ Ð²Ñ‹Ð»Ð¾Ð¶Ð¸Ñ‚ÑŒ предметы из папки ÑпиÑков товаров торгового центра
+ </string>
+ <string name="TooltipOutboxWorn">
+ ÐÐµÐ»ÑŒÐ·Ñ Ð¿Ð¾Ð¼ÐµÑтить предметы, которые вы ноÑите, в папку ÑпиÑков товаров торгового центра
+ </string>
+ <string name="TooltipOutboxFolderLevels">
+ Глубина Ð²Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð¿Ð°Ð¿Ð¾Ðº превышает [AMOUNT]. Уменьшите глубину вложениÑ; при необходимоÑти Ñгруппируйте предметы.
+ </string>
+ <string name="TooltipOutboxTooManyFolders">
+ КоличеÑтво подпапок не может превышать [AMOUNT]. Уменьшите количеÑтво папок в ÑпиÑке; при необходимоÑти Ñгруппируйте предметы.
+ </string>
+ <string name="TooltipOutboxTooManyObjects">
+ КоличеÑтво предметов не может превышать [AMOUNT]. Ð”Ð»Ñ Ð¿Ñ€Ð¾Ð´Ð°Ð¶Ð¸ более чем [AMOUNT] предм. в одном ÑпиÑке некоторые из них Ñледует Ñгруппировать.
+ </string>
+ <string name="TooltipOutboxTooManyStockItems">
+ КоличеÑтво предметов не может превышать [AMOUNT].
+ </string>
+ <string name="TooltipOutboxCannotDropOnRoot">
+ Можно перетаÑкивать предметы или папки только на вкладку «ВСЕ». Выберите Ñту вкладку и перемеÑтите предметы или папки Ñнова.
</string>
<string name="TooltipOutboxNoTransfer">
- ЧаÑÑ‚ÑŒ Ñтих объектов Ð½ÐµÐ»ÑŒÐ·Ñ Ð¿Ñ€Ð¾Ð´Ð°Ñ‚ÑŒ или передать.
+ ЧаÑÑ‚ÑŒ Ñтих объектов Ð½ÐµÐ»ÑŒÐ·Ñ Ð¿Ñ€Ð¾Ð´Ð°Ñ‚ÑŒ или передать
</string>
<string name="TooltipOutboxNotInInventory">
- Ваша папка «Торговые иÑходÑщие» может получать вещи только непоÑредÑтвенно из вашего инвентарÑ
+ Ð’ торговый центр можно помеÑтить только предметы из Ñвоего инвентарÑ
</string>
- <string name="TooltipOutboxWorn">
- ÐоÑимые предметы Ð½ÐµÐ»ÑŒÐ·Ñ Ð¿Ð¾Ð¼ÐµÑтить в папку «Торговые иÑходÑщие»
+ <string name="TooltipOutboxLinked">
+ ПривÑзанные предметы или папки Ð½ÐµÐ»ÑŒÐ·Ñ Ð¿Ð¾Ð¼ÐµÑтить в торговый центр
</string>
<string name="TooltipOutboxCallingCard">
- Визитки Ð½ÐµÐ»ÑŒÐ·Ñ Ð¿Ð¾Ð¼ÐµÑтить в папку «Торговые иÑходÑщие»
+ ÐÐµÐ»ÑŒÐ·Ñ Ð¿Ð¾Ð¼ÐµÑтить визитки в торговый центр
</string>
- <string name="TooltipOutboxFolderLevels">
- Глубина Ð²Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð¿Ð°Ð¿Ð¾Ðº превышает 3
+ <string name="TooltipOutboxDragActive">
+ Опубликованный ÑпиÑок Ð½ÐµÐ»ÑŒÐ·Ñ Ð¿ÐµÑ€ÐµÐ¼ÐµÑтить
</string>
- <string name="TooltipOutboxTooManyFolders">
- Ð’ папке верхнего ÑƒÑ€Ð¾Ð²Ð½Ñ Ð±Ð¾Ð»ÐµÐµ 20 подпапок
+ <string name="TooltipOutboxCannotMoveRoot">
+ Корневую папку ÑпиÑков товаров торгового центра Ð½ÐµÐ»ÑŒÐ·Ñ Ð¿ÐµÑ€ÐµÐ¼ÐµÑ‰Ð°Ñ‚ÑŒ
</string>
- <string name="TooltipOutboxTooManyObjects">
- Ð’ папке верхнего ÑƒÑ€Ð¾Ð²Ð½Ñ Ð±Ð¾Ð»ÐµÐµ 200 предметов
+ <string name="TooltipOutboxMixedStock">
+ У вÑех предметов в папке запаÑов должен быть один и тот же тип и разрешение
</string>
<string name="TooltipDragOntoOwnChild">
Папку Ð½ÐµÐ»ÑŒÐ·Ñ Ð¿ÐµÑ€ÐµÐ¼ÐµÑтить в ее подпапку
@@ -1057,9 +1078,7 @@ support@secondlife.com.
<string name="AgentNameSubst">
(Ð’Ñ‹)
</string>
- <string name="JoinAnExperience">
- ПриÑоединитеÑÑŒ
- </string>
+ <string name="JoinAnExperience"/><!-- intentionally blank -->
<string name="SilentlyManageEstateAccess">
Отключить Ð¸Ð·Ð²ÐµÑ‰ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¸ управлении ÑпиÑками доÑтупа к землевладениÑм
</string>
@@ -1126,6 +1145,12 @@ support@secondlife.com.
<string name="bitmap_image_files">
Ð˜Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ BMP
</string>
+ <string name="png_image_files">
+ Ð˜Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ PNG
+ </string>
+ <string name="save_texture_image_files">
+ Ð˜Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ Targa или PNG
+ </string>
<string name="avi_movie_file">
Видео AVI
</string>
@@ -1375,6 +1400,9 @@ support@secondlife.com.
<string name="FavoritesNoMatchingItems">
Перетащите Ñюда закладку, чтобы добавить ее в ÑпиÑок избранного.
</string>
+ <string name="MarketplaceNoMatchingItems">
+ Предметы не найдены. Проверьте правильноÑÑ‚ÑŒ Ñтроки поиÑка и повторите попытку.
+ </string>
<string name="InventoryNoTexture">
Ð’ вашем инвентаре нет копии Ñтой текÑтуры
</string>
@@ -1422,29 +1450,95 @@ support@secondlife.com.
<string name="InventoryOutboxError">
[[MARKETPLACE_CREATE_STORE_URL] Магазин] возвращает ошибки.
</string>
+ <string name="InventoryMarketplaceError">
+ Это бета-верÑÐ¸Ñ Ñ„ÑƒÐ½ÐºÑ†Ð¸Ð¸. ЕÑли вы хотите учаÑтвовать в ее теÑтировании, заполните Ñту [http://goo.gl/forms/FCQ7UXkakz форму Google].
+ </string>
+ <string name="InventoryMarketplaceListingsNoItemsTitle">
+ Папка ÑпиÑков товаров торгового центра пуÑта.
+ </string>
+ <string name="InventoryMarketplaceListingsNoItems">
+ Перетащите папки в Ñту облаÑÑ‚ÑŒ, чтобы выÑтавить их на продажу в [[MARKETPLACE_DASHBOARD_URL] Торговом центре].
+ </string>
+ <string name="Marketplace Validation Warning Stock">
+ Ð’ папке верÑии должна быть папка запаÑов
+ </string>
+ <string name="Marketplace Validation Error Mixed Stock">
+ : Ошибка: вÑе предметы в папке запаÑов должны быть некопируемыми и одного типа
+ </string>
+ <string name="Marketplace Validation Error Subfolder In Stock">
+ : Ошибка: папка запаÑов не может Ñодержать подпапки
+ </string>
+ <string name="Marketplace Validation Warning Empty">
+ : Предупреждение: папка не Ñодержит предметов
+ </string>
+ <string name="Marketplace Validation Warning Create Stock">
+ : Предупреждение: ÑоздаетÑÑ Ð¿Ð°Ð¿ÐºÐ° запаÑов
+ </string>
+ <string name="Marketplace Validation Warning Create Version">
+ : Предупреждение: ÑоздаетÑÑ Ð¿Ð°Ð¿ÐºÐ° верÑии
+ </string>
+ <string name="Marketplace Validation Warning Move">
+ : Предупреждение: перемещаютÑÑ Ð¿Ñ€ÐµÐ´Ð¼ÐµÑ‚Ñ‹
+ </string>
+ <string name="Marketplace Validation Warning Delete">
+ : Предупреждение: Ñодержимое папки переноÑитÑÑ Ð² папку запаÑов, пуÑÑ‚Ð°Ñ Ð¿Ð°Ð¿ÐºÐ° удалÑетÑÑ
+ </string>
+ <string name="Marketplace Validation Error Stock Item">
+ : Ошибка: в папке запаÑов должны ÑодержатьÑÑ Ð½ÐµÐºÐ¾Ð¿Ð¸Ñ€ÑƒÐµÐ¼Ñ‹Ðµ предметы
+ </string>
+ <string name="Marketplace Validation Warning Unwrapped Item">
+ : Предупреждение: в папке верÑии должны быть предметы
+ </string>
+ <string name="Marketplace Validation Error">
+ : Ошибка:
+ </string>
+ <string name="Marketplace Validation Warning">
+ : Предупреждение:
+ </string>
+ <string name="Marketplace Validation Error Empty Version">
+ : Предупреждение: папка верÑии должна Ñодержать Ñ…Ð¾Ñ‚Ñ Ð±Ñ‹ 1 предмет
+ </string>
+ <string name="Marketplace Validation Error Empty Stock">
+ : Предупреждение: папка запаÑов должна Ñодержать Ñ…Ð¾Ñ‚Ñ Ð±Ñ‹ 1 предмет
+ </string>
+ <string name="Marketplace Validation No Error">
+ Ðет ошибок и предупреждений
+ </string>
<string name="Marketplace Error None">
Ошибок нет
</string>
+ <string name="Marketplace Error Prefix">
+ Ошибка:
+ </string>
<string name="Marketplace Error Not Merchant">
- Ошибка. Прежде чем отправлÑÑ‚ÑŒ вещи в магазин, необходимо зарегиÑтрироватьÑÑ ÐºÐ°Ðº торговец (беÑплатно).
+ Прежде чем отправлÑÑ‚ÑŒ предметы в торговый центр, необходимо зарегиÑтрироватьÑÑ ÐºÐ°Ðº торговец (беÑплатно).
</string>
- <string name="Marketplace Error Empty Folder">
- Ошибка. Ð’ Ñтой папке нет контента.
+ <string name="Marketplace Error Not Accepted">
+ Ðевозможно перемеÑтить предмет в Ñту папку.
</string>
- <string name="Marketplace Error Unassociated Products">
- Ошибка. Ðе удаетÑÑ Ð¿ÐµÑ€ÐµÐ´Ð°Ñ‚ÑŒ Ñту вещь, поÑкольку в вашем торговом аккаунте Ñлишком много вещей, не ÑвÑзанных Ñ Ð¿Ñ€Ð¾Ð´ÑƒÐºÑ‚Ð°Ð¼Ð¸. Чтобы иÑправить Ñту ошибку, войдите на веб-Ñайт торгового центра и уменьшите чиÑло Ñвоих вещей, которые ни Ñ Ñ‡ÐµÐ¼ не ÑвÑзаны.
+ <string name="Marketplace Error Unsellable Item">
+ Этот предмет Ð½ÐµÐ»ÑŒÐ·Ñ Ð¿Ñ€Ð¾Ð´Ð°Ñ‚ÑŒ в торговом центре.
</string>
- <string name="Marketplace Error Object Limit">
- Ошибка. Эта вещь Ñодержит Ñлишком много объектов. ИÑправьте Ñту ошибку, Ñложив объекты в коробки и уменьшив их общее чиÑло (должно быть меньше 200).
+ <string name="MarketplaceNoID">
+ нет ID торг. центра
</string>
- <string name="Marketplace Error Folder Depth">
- Ошибка. Эта вещь Ñодержит Ñлишком много уровней вложенных папок. Измените Ñтруктуру так, чтобы уровней вложенных папок было не более 3.
+ <string name="MarketplaceLive">
+ опубликовано
</string>
- <string name="Marketplace Error Unsellable Item">
- Ошибка. Эту вещь Ð½ÐµÐ»ÑŒÐ·Ñ Ð¿Ñ€Ð¾Ð´Ð°Ñ‚ÑŒ в магазине.
+ <string name="MarketplaceActive">
+ активно
</string>
- <string name="Marketplace Error Internal Import">
- Ошибка. Эта вещь Ñоздает проблему. Повторите попытку позже.
+ <string name="MarketplaceMax">
+ макÑ.
+ </string>
+ <string name="MarketplaceStock">
+ запаÑ
+ </string>
+ <string name="MarketplaceNoStock">
+ нет в запаÑе
+ </string>
+ <string name="MarketplaceUpdating">
+ обновление...
</string>
<string name="Open landmarks">
Открыть закладки
@@ -1465,6 +1559,7 @@ support@secondlife.com.
Ðет контента
</string>
<string name="WornOnAttachmentPoint" value="(где ноÑитÑÑ: [ATTACHMENT_POINT])"/>
+ <string name="AttachmentErrorMessage" value="([ATTACHMENT_ERROR])"/>
<string name="ActiveGesture" value="[GESLABEL] (активно)"/>
<string name="PermYes">
Да
@@ -1735,6 +1830,15 @@ support@secondlife.com.
<string name="Invalid Attachment">
ÐÐµÐ²ÐµÑ€Ð½Ð°Ñ Ñ‚Ð¾Ñ‡ÐºÐ° приÑоединениÑ
</string>
+ <string name="ATTACHMENT_MISSING_ITEM">
+ Ошибка: отÑутÑтвует предмет
+ </string>
+ <string name="ATTACHMENT_MISSING_BASE_ITEM">
+ Ошибка: отÑутÑтвует базовый предмет
+ </string>
+ <string name="ATTACHMENT_NOT_ATTACHED">
+ Ошибка: объект входит в текущий коÑтюм, но не прикреплен
+ </string>
<string name="YearsMonthsOld">
[AGEYEARS] [AGEMONTHS]
</string>
@@ -1903,6 +2007,9 @@ support@secondlife.com.
<string name="SaveComplete">
Сохранение завершено.
</string>
+ <string name="UploadFailed">
+ Ðе удалоÑÑŒ загрузить файл:
+ </string>
<string name="ObjectOutOfRange">
Скрипт (объект вне облаÑти)
</string>
@@ -1912,6 +2019,9 @@ support@secondlife.com.
<string name="GroupsNone">
нет
</string>
+ <string name="CompileNoExperiencePerm">
+ ПропуÑк Ñкрипта [SCRIPT] Ñ Ð¿Ñ€Ð¸ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸ÐµÐ¼ [EXPERIENCE].
+ </string>
<string name="Group" value="(группа)"/>
<string name="Unknown">
(ÐеизвеÑтно)
@@ -5072,6 +5182,9 @@ support@secondlife.com.
<string name="Command_Marketplace_Label">
Торговый центр
</string>
+ <string name="Command_MarketplaceListings_Label">
+ Торговый центр
+ </string>
<string name="Command_MiniMap_Label">
Миникарта
</string>
@@ -5159,6 +5272,9 @@ support@secondlife.com.
<string name="Command_Marketplace_Tooltip">
Покупки
</string>
+ <string name="Command_MarketplaceListings_Tooltip">
+ Продайте Ñвои творениÑ
+ </string>
<string name="Command_MiniMap_Tooltip">
Показать людей поблизоÑти
</string>
@@ -5282,4 +5398,85 @@ support@secondlife.com.
<string name="loading_chat_logs">
Загрузка...
</string>
+ <string name="experience_tools_experience">
+ Приключение
+ </string>
+ <string name="ExperienceNameNull">
+ (без приключениÑ)
+ </string>
+ <string name="ExperienceNameUntitled">
+ (приключение без названиÑ)
+ </string>
+ <string name="Land-Scope">
+ ПривÑзано к земле
+ </string>
+ <string name="Grid-Scope">
+ ПривÑзано к Ñетке
+ </string>
+ <string name="Allowed_Experiences_Tab">
+ РÐЗРЕШЕÐÐЫЕ
+ </string>
+ <string name="Blocked_Experiences_Tab">
+ БЛОКИРОВÐÐÐЫЕ
+ </string>
+ <string name="Contrib_Experiences_Tab">
+ ÐВТОР
+ </string>
+ <string name="Admin_Experiences_Tab">
+ ÐДМИÐИСТРÐТОР
+ </string>
+ <string name="Recent_Experiences_Tab">
+ ÐЕДÐÐ’ÐИЕ
+ </string>
+ <string name="Owned_Experiences_Tab">
+ СОБСТВЕÐÐОСТЬ
+ </string>
+ <string name="ExperiencesCounter">
+ ([EXPERIENCES], макÑимум: [MAXEXPERIENCES])
+ </string>
+ <string name="ExperiencePermission1">
+ взÑÑ‚ÑŒ управление на ÑебÑ
+ </string>
+ <string name="ExperiencePermission3">
+ запуÑкать анимации на вашем аватаре
+ </string>
+ <string name="ExperiencePermission4">
+ прикрепить к аватару
+ </string>
+ <string name="ExperiencePermission9">
+ Ñледить за камерой
+ </string>
+ <string name="ExperiencePermission10">
+ управлÑÑ‚ÑŒ камерой
+ </string>
+ <string name="ExperiencePermission11">
+ телепортировать ваÑ
+ </string>
+ <string name="ExperiencePermission12">
+ автоматичеÑки принимать Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¸ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ
+ </string>
+ <string name="ExperiencePermissionShortUnknown">
+ выполнил неизвеÑтную операцию: [Permission]
+ </string>
+ <string name="ExperiencePermissionShort1">
+ ВзÑÑ‚ÑŒ на ÑебÑ
+ </string>
+ <string name="ExperiencePermissionShort3">
+ ЗапуÑк анимаций
+ </string>
+ <string name="ExperiencePermissionShort4">
+ ПриÑоединить
+ </string>
+ <string name="ExperiencePermissionShort9">
+ Слежение за камерой
+ </string>
+ <string name="ExperiencePermissionShort10">
+ Управление камерой
+ </string>
+ <string name="ExperiencePermissionShort11">
+ ТелепортациÑ
+ </string>
+ <string name="ExperiencePermissionShort12">
+ Разрешение
+ </string>
</strings>
diff --git a/indra/newview/skins/default/xui/ru/teleport_strings.xml b/indra/newview/skins/default/xui/ru/teleport_strings.xml
index 40c9267408..fc6cb2cf92 100755
--- a/indra/newview/skins/default/xui/ru/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/ru/teleport_strings.xml
@@ -48,6 +48,9 @@
<message name="MustGetAgeRegion">
Входить в Ñтот регион могут только жители 18 лет и Ñтарше.
</message>
+ <message name="RegionTPSpecialUsageBlocked">
+ Ðе удалоÑÑŒ войти в регион. «[REGION_NAME]» – Ñто регион развивающих игр, и Ð´Ð»Ñ Ð²Ñ…Ð¾Ð´Ð° в него надо ÑоответÑтвовать определенным уÑловиÑм. Подробнее Ñм. на Ñтранице [http://wiki.secondlife.com/wiki/Linden_Lab_Official:Skill_Gaming_in_Second_Life Skill Gaming FAQ].
+ </message>
</message_set>
<message_set name="progress">
<message name="sending_dest">
diff --git a/indra/newview/skins/default/xui/tr/floater_about.xml b/indra/newview/skins/default/xui/tr/floater_about.xml
index 7b925e8830..7034de64c9 100755
--- a/indra/newview/skins/default/xui/tr/floater_about.xml
+++ b/indra/newview/skins/default/xui/tr/floater_about.xml
@@ -1,71 +1,16 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="floater_about" title="[CAPITALIZED_APP_NAME] HAKKINDA">
- <floater.string name="AboutHeader">
- [APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2] ([VIEWER_VERSION_3]) [BUILD_DATE] [BUILD_TIME] ([CHANNEL])
-[[VIEWER_RELEASE_NOTES_URL] [Sürüm Notları]]
- </floater.string>
- <floater.string name="AboutCompiler">
- [COMPILER] [COMPILER_VERSION] sürümü ile oluşturuldu
- </floater.string>
- <floater.string name="AboutPosition">
- &lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt; ([HOSTIP]) üzerinde bulunan [REGION] içerisinde [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1] konumundasınız
-SLURL: &lt;nolink&gt;[SLURL]&lt;/nolink&gt;
-(küresel koordinatlar [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1])
-[SERVER_VERSION]
-[SERVER_RELEASE_NOTES_URL]
- </floater.string>
- <floater.string name="AboutSystem">
- CPU: [CPU]
-Bellek: [MEMORY_MB] MB
-İşl. Sis. Sürümü: [OS_VERSION]
-Grafik Kartı Üreticisi: [GRAPHICS_CARD_VENDOR]
-Grafik Kartı: [GRAPHICS_CARD]
- </floater.string>
- <floater.string name="AboutDriver">
- Windows Grafik Sürücüsü Sürümü: [GRAPHICS_DRIVER_VERSION]
- </floater.string>
- <floater.string name="AboutLibs">
- OpenGL Sürümü: [OPENGL_VERSION]
-
-libcurl Sürümü: [LIBCURL_VERSION]
-J2C Kod Çözücü Sürümü: [J2C_VERSION]
-Ses Sürücüsü Sürümü: [AUDIO_DRIVER_VERSION]
-Qt Web Kit Sürümü: [QT_WEBKIT_VERSION]
-Ses Sunucusu Sürümü: [VOICE_VERSION]
- </floater.string>
- <floater.string name="none">
- (hiçbiri)
- </floater.string>
- <floater.string name="AboutTraffic">
- Kaybolan Paketler: [PACKETS_LOST,number,0]/[PACKETS_IN,number,0] ([PACKETS_PCT,number,1]%)
- </floater.string>
- <floater.string name="ErrorFetchingServerReleaseNotesURL">
- Sunucu sürümü notları URL&apos;si alınırken hata oluştu.
- </floater.string>
<tab_container name="about_tab">
<panel label="Bilgi" name="support_panel">
<button label="Panoya Kopyala" name="copy_btn"/>
</panel>
<panel label="Katkıda Bulunanlar" name="credits_panel">
- <text name="linden_intro">
- Second Life, Linden&apos;lar tarafından geliştirilmiştir:
- </text>
- <text name="contrib_intro">
- 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:
- </text>
- <text_editor name="trans_names">
- Geçici Ad çalıştırma sırasında değiştirilir
- </text_editor>
+ <text name="linden_intro">Second Life, Lindens tarafından geliştirilmiştir ve
+açık kaynak kod katkısında bulunanlar şunlardır:</text>
+ <text_editor name="contrib_names">Geçici Ad çalıştırma sırasında değiştirilir</text_editor>
</panel>
<panel label="Lisanslar" name="licenses_panel">
- <text_editor name="credits_editor">
- 3Dconnexion SDK Telif Hakkı (C) 1992-2009 3Dconnexion
+ <text_editor name="licenses_editor">3Dconnexion SDK Telif Hakkı (C) 1992-2009 3Dconnexion
APR Telif Hakkı (C) 2011 The Apache Software Foundation
Collada DOM Telif Hakkı 2006 Sony Computer Entertainment Inc.
cURL Telif Hakkı (C) 1996-2010, Daniel Stenberg, (daniel@haxx.se)
@@ -92,8 +37,7 @@ Ses Sunucusu Sürümü: [VOICE_VERSION]
Tüm hakları saklıdır. Ayrıntılı bilgi için bkz. licenses.txt
- Sesli sohbet için Ses kodlaması: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
- </text_editor>
+ Sesli sohbet için Ses kodlaması: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)</text_editor>
</panel>
</tab_container>
</floater>
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 481fc540d0..090e135b3b 100755
--- a/indra/newview/skins/default/xui/tr/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/tr/floater_about_land.xml
@@ -331,22 +331,6 @@ Sadece büyük parseller aramada görünür.
<check_box label="Güvenli (hasar yok)" name="check safe" tool_tip="İşaretliyse, araziyi Güvenli moda getirerek hasar çarpışmasını etkinsizleştirir İşaretli değilse hasar çarpışması etkinleşir."/>
<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="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"/>
- <combo_box.item label="Ä°ÅŸ" name="item4"/>
- <combo_box.item label="EÄŸitim" name="item5"/>
- <combo_box.item label="Oyun" name="item6"/>
- <combo_box.item label="UÄŸrak Mekan" name="item7"/>
- <combo_box.item label="Yeni Gelenlere Yardım Sunan" name="item8"/>
- <combo_box.item label="Park ve DoÄŸa" name="item9"/>
- <combo_box.item label="YerleÅŸim" name="item10"/>
- <combo_box.item label="Alışveriş" name="item11"/>
- <combo_box.item label="Kiralık" name="item13"/>
- <combo_box.item label="DiÄŸer" name="item12"/>
- </combo_box>
<combo_box name="land category">
<combo_box.item label="Herh. Bir Kategori" name="item0"/>
<combo_box.item label="Linden Konumu" name="item1"/>
@@ -477,5 +461,6 @@ Sadece büyük parseller aramada görünür.
<button label="Kaldır" label_selected="Kaldır" name="remove_banned"/>
</panel>
</panel>
+ <panel label="DENEYÄ°MLER" name="land_experiences_panel"/>
</tab_container>
</floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_associate_listing.xml b/indra/newview/skins/default/xui/tr/floater_associate_listing.xml
new file mode 100644
index 0000000000..bf78929931
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/floater_associate_listing.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="associate listing" title="Ä°LANI Ä°LÄ°ÅžKÄ°LENDÄ°R">
+ <text name="message">Ä°lan KimliÄŸi:</text>
+ <line_editor name="listing_id">KimliÄŸi buraya girin</line_editor>
+ <button label="Tamam" name="OK"/>
+ <button label="Ä°ptal" name="Cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_edit_hover_height.xml b/indra/newview/skins/default/xui/tr/floater_edit_hover_height.xml
new file mode 100644
index 0000000000..237d886c45
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/floater_edit_hover_height.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="HoverHeight" title="KONUM YÜKSEKLİĞİNİ AYARLA">
+ <slider label="Yükseklik" name="HoverHeightSlider"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_experience_search.xml b/indra/newview/skins/default/xui/tr/floater_experience_search.xml
new file mode 100644
index 0000000000..0a025115d5
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/floater_experience_search.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="experiencepicker" title="DENEYİM SEÇİN"/>
diff --git a/indra/newview/skins/default/xui/tr/floater_experienceprofile.xml b/indra/newview/skins/default/xui/tr/floater_experienceprofile.xml
new file mode 100644
index 0000000000..641d61b8f3
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/floater_experienceprofile.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater title="EXPERIENCE PROFILE">
+ <floater.string name="empty_slurl">
+ (hiçbiri)
+ </floater.string>
+ <floater.string name="maturity_icon_general">
+ &quot;Parcel_PG_Light&quot;
+ </floater.string>
+ <floater.string name="maturity_icon_moderate">
+ &quot;Parcel_M_Light&quot;
+ </floater.string>
+ <floater.string name="maturity_icon_adult">
+ &quot;Parcel_R_Light&quot;
+ </floater.string>
+ <text name="edit_title" value="Deneyim Profili"/>
+ <tab_container name="tab_container">
+ <panel name="panel_experience_info">
+ <scroll_container name="xp_scroll">
+ <panel name="scrolling_panel">
+ <layout_stack>
+ <layout_panel name="top panel">
+ <button label="Düzenle" name="edit_btn"/>
+ </layout_panel>
+ <layout_panel name="maturity panel">
+ <text name="ContentRating">
+ Seviye:
+ </text>
+ </layout_panel>
+ <layout_panel name="location panel">
+ <text name="Location">
+ Konum:
+ </text>
+ </layout_panel>
+ <layout_panel>
+ <text name="Owner">
+ Sahip:
+ </text>
+ </layout_panel>
+ <layout_panel name="group_panel">
+ <text name="Group">
+ Grup:
+ </text>
+ </layout_panel>
+ <layout_panel name="perm panel">
+ <button label="Ä°zin Ver" name="allow_btn"/>
+ <button label="Unut" name="forget_btn"/>
+ <button label="Engelle" name="block_btn"/>
+ <text name="privileged">
+ Bu deneyim tüm sakinler için etkindir.
+ </text>
+ <button label="Kötüye Kullanımı Bildir" name="report_btn"/>
+ </layout_panel>
+ </layout_stack>
+ </panel>
+ </scroll_container>
+ </panel>
+ <panel name="edit_panel_experience_info">
+ <scroll_container name="edit_xp_scroll">
+ <panel name="edit_scrolling_panel">
+ <text name="edit_experience_title_label" value="Ad:"/>
+ <text name="edit_experience_desc_label" value="Açıklama:"/>
+ <button label="Grup" name="Group_btn"/>
+ <text name="edit_ContentRating">
+ Seviye:
+ </text>
+ <icons_combo_box label="Orta" name="edit_ContentRatingText" tool_tip="Bir deneyimin erişkinlik seviyesi artınca, o deneyime izin veren tüm sakinler için izinler sıfırlanır.">
+ <icons_combo_box.item label="YetiÅŸkin" name="Adult" value="42"/>
+ <icons_combo_box.item label="Orta" name="Mature" value="21"/>
+ <icons_combo_box.item label="Genel" name="PG" value="13"/>
+ </icons_combo_box>
+ <text name="edit_Location">
+ Konum:
+ </text>
+ <button label="Mevcut Olana Ayarla" name="location_btn"/>
+ <button label="Konumu Temizle" name="clear_btn"/>
+ <check_box label="Deneyimi EtkinleÅŸtir" name="edit_enable_btn" tool_tip=""/>
+ <check_box label="Aramalarda Gizle" name="edit_private_btn"/>
+ <text name="changes" value="Deneyim değişikliklerinin tüm bölgelerde görünmesi birkaç dakika alabilir."/>
+ <button label="Geri" name="cancel_btn"/>
+ <button label="Kaydet" name="save_btn"/>
+ </panel>
+ </scroll_container>
+ </panel>
+ </tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_experiences.xml b/indra/newview/skins/default/xui/tr/floater_experiences.xml
new file mode 100644
index 0000000000..eae3638cad
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/floater_experiences.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_experiences" title="DENEYÄ°MLER"/>
diff --git a/indra/newview/skins/default/xui/tr/floater_facebook.xml b/indra/newview/skins/default/xui/tr/floater_facebook.xml
index 87f69fc731..656a4a81c9 100644
--- a/indra/newview/skins/default/xui/tr/floater_facebook.xml
+++ b/indra/newview/skins/default/xui/tr/floater_facebook.xml
@@ -1,20 +1,15 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="floater_facebook" title="FACEBOOK&apos;TA YAYINLA">
- <panel name="background">
- <tab_container name="tabs">
- <panel label="DURUM" name="panel_facebook_status"/>
- <panel label="FOTOÄžRAF" name="panel_facebook_photo"/>
- <panel label="KONUMA GÄ°RÄ°Åž YAPIN" name="panel_facebook_place"/>
- <panel label="ARKADAÅžLAR" name="panel_facebook_friends"/>
- <panel label="HESAP" name="panel_facebook_account"/>
- </tab_container>
- <panel name="connection_status_panel">
- <text name="connection_error_text">
- Hata
- </text>
- <text name="connection_loading_text">
- Yükleniyor...
- </text>
- </panel>
- </panel>
+ <tab_container name="tabs">
+ <panel label="DURUM" name="panel_facebook_status"/>
+ <panel label="FOTOÄžRAF" name="panel_facebook_photo"/>
+ <panel label="KONUMA GÄ°RÄ°Åž YAPIN" name="panel_facebook_place"/>
+ <panel label="ARKADAÅžLAR" name="panel_facebook_friends"/>
+ </tab_container>
+ <text name="connection_error_text">
+ Hata
+ </text>
+ <text name="connection_loading_text">
+ Yükleniyor...
+ </text>
</floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/tr/floater_inventory_item_properties.xml
index e49fef1f46..c6a5515c6e 100755
--- a/indra/newview/skins/default/xui/tr/floater_inventory_item_properties.xml
+++ b/indra/newview/skins/default/xui/tr/floater_inventory_item_properties.xml
@@ -1,67 +1,36 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="item properties" title="ENVANTER ÖGESİ ÖZELLİKLERİ">
- <floater.string name="unknown">
- (bilinmiyor)
- </floater.string>
- <floater.string name="public">
- (kamuya açık)
- </floater.string>
- <floater.string name="you_can">
- Åžunu yapabilirsiniz:
- </floater.string>
- <floater.string name="owner_can">
- Sahip ÅŸunu yapabilir:
- </floater.string>
- <floater.string name="acquiredDate">
- [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]
- </floater.string>
- <text name="LabelItemNameTitle">
- Ad:
- </text>
- <text name="LabelItemDescTitle">
- Açıklama:
- </text>
- <text name="LabelCreatorTitle">
- OluÅŸturan:
- </text>
+ <floater.string name="unknown">(bilinmiyor)</floater.string>
+ <floater.string name="public">(kamuya açık)</floater.string>
+ <floater.string name="you_can">Åžunu yapabilirsiniz:</floater.string>
+ <floater.string name="owner_can">Sahip ÅŸunu yapabilir:</floater.string>
+ <floater.string name="acquiredDate">[wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]</floater.string>
+ <text name="LabelItemNameTitle">Ad:</text>
+ <text name="LabelItemDescTitle">Açıklama:</text>
+ <text name="LabelCreatorTitle">OluÅŸturan:</text>
<button label="Profil..." name="BtnCreator"/>
- <text name="LabelOwnerTitle">
- Sahip:
- </text>
+ <text name="LabelOwnerTitle">Sahip:</text>
<button label="Profil..." name="BtnOwner"/>
- <text name="LabelAcquiredTitle">
- Alınan:
- </text>
- <text name="LabelAcquiredDate">
- 24 Mayıs Çarş 12:50:46 2006
- </text>
- <text name="OwnerLabel">
- Siz:
- </text>
+ <text name="LabelAcquiredTitle">Alınan:</text>
+ <text name="LabelAcquiredDate">24 Mayıs Çarş 12:50:46 2006</text>
+ <text name="OwnerLabel">Siz:</text>
<check_box label="Düzenle" name="CheckOwnerModify"/>
<check_box label="Kopyala" name="CheckOwnerCopy"/>
<check_box label="Tekrar Sat" name="CheckOwnerTransfer"/>
- <text name="AnyoneLabel">
- Herkes:
- </text>
+ <text name="AnyoneLabel">Herkes:</text>
<check_box label="Kopyala" name="CheckEveryoneCopy"/>
- <text name="GroupLabel">
- Grup:
- </text>
+ <text name="GroupLabel">Grup:</text>
<check_box label="PaylaÅŸ" name="CheckShareWithGroup"/>
- <text name="NextOwnerLabel">
- Sonraki sahip:
- </text>
+ <text name="NextOwnerLabel">Sonraki sahip:</text>
<check_box label="Düzenle" name="CheckNextOwnerModify"/>
<check_box label="Kopyala" name="CheckNextOwnerCopy"/>
<check_box label="Tekrar Sat" name="CheckNextOwnerTransfer"/>
<check_box label="Satılık" name="CheckPurchase"/>
- <combo_box name="combobox sale copy">
+ <combo_box name="ComboBoxSaleType">
<combo_box.item label="Kopyala" name="Copy"/>
+ <combo_box.item label="İçerik" name="Contents"/>
<combo_box.item label="Orijinal" name="Original"/>
</combo_box>
<spinner label="Fiyat:" name="Edit Cost"/>
- <text name="CurrencySymbol">
- L$
- </text>
+ <text name="CurrencySymbol">L$</text>
</floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/tr/floater_inventory_view_finder.xml
index 9d1a556751..35f30f47cc 100755
--- a/indra/newview/skins/default/xui/tr/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/tr/floater_inventory_view_finder.xml
@@ -5,8 +5,8 @@
<check_box label="Giysiler" name="check_clothing"/>
<check_box label="Mimikler" name="check_gesture"/>
<check_box label="Yer Ä°mleri" name="check_landmark"/>
- <check_box label="Örgüler" name="check_mesh"/>
<check_box label="Not Kartları" name="check_notecard"/>
+ <check_box label="Örgüler" name="check_mesh"/>
<check_box label="Nesneler" name="check_object"/>
<check_box label="Komut Dosyaları" name="check_script"/>
<check_box label="Sesler" name="check_sound"/>
@@ -19,6 +19,10 @@
<text name="- OR -">
- VEYA -
</text>
+ <radio_group name="date_search_direction">
+ <radio_item label="Åžundan daha yeni:" name="newer"/>
+ <radio_item label="Åžundan daha eski:" name="older"/>
+ </radio_group>
<spinner label="Saat Önce" name="spin_hours_ago"/>
<spinner label="Gün Önce" name="spin_days_ago"/>
<button label="Kapat" label_selected="Kapat" name="Close"/>
diff --git a/indra/newview/skins/default/xui/tr/floater_item_properties.xml b/indra/newview/skins/default/xui/tr/floater_item_properties.xml
new file mode 100644
index 0000000000..3146384b33
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/floater_item_properties.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Item Properties" title="ÖĞE ÖZELLİKLERİ"/>
diff --git a/indra/newview/skins/default/xui/tr/floater_lagmeter.xml b/indra/newview/skins/default/xui/tr/floater_lagmeter.xml
index 736c50be90..a373a95b0c 100644
--- a/indra/newview/skins/default/xui/tr/floater_lagmeter.xml
+++ b/indra/newview/skins/default/xui/tr/floater_lagmeter.xml
@@ -28,7 +28,7 @@
İstemci kare hızı [CLIENT_FRAME_RATE_CRITICAL] altında
</floater.string>
<floater.string name="client_frame_time_warning_msg">
- İstemci kare hızı [CLIENT_FRAME_RATE_CRITICAL] ile [CLIENT_FRAME_RATE_WARNING] arasınad
+ İstemci kare hızı [CLIENT_FRAME_RATE_CRITICAL] ile [CLIENT_FRAME_RATE_WARNING] arasında
</floater.string>
<floater.string name="client_frame_time_normal_msg">
Normal
diff --git a/indra/newview/skins/default/xui/tr/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/tr/floater_live_lsleditor.xml
index 34c3e28a0b..760948edae 100755
--- a/indra/newview/skins/default/xui/tr/floater_live_lsleditor.xml
+++ b/indra/newview/skins/default/xui/tr/floater_live_lsleditor.xml
@@ -9,7 +9,24 @@
<floater.string name="Title">
KOMUT DOSYASI: [NAME]
</floater.string>
+ <floater.string name="experience_enabled">
+ Mevcut deneyimi kaldırmak için kutunun işaretini kaldırın
+ </floater.string>
+ <floater.string name="no_experiences">
+ Hiçbir deneyim için yetkiniz yok
+ </floater.string>
+ <floater.string name="add_experiences">
+ Ekleyeceğiniz deneyimi seçin
+ </floater.string>
+ <floater.string name="show_experience_profile">
+ Deneyim profilini görmek için tıklayın
+ </floater.string>
+ <floater.string name="loading">
+ Yükleniyor...
+ </floater.string>
<button label="Sıfırla" label_selected="Sıfırla" name="Reset"/>
<check_box initial_value="true" label="Çalışıyor" name="running"/>
<check_box initial_value="true" label="Mono" name="mono"/>
+ <check_box label="Deneyimi Kullanın:" name="enable_xp"/>
+ <button label="&gt;" name="view_profile"/>
</floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_marketplace_listings.xml b/indra/newview/skins/default/xui/tr/floater_marketplace_listings.xml
new file mode 100644
index 0000000000..f4837a300f
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/floater_marketplace_listings.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_marketplace_listings" title="PAZARYERÄ° Ä°LANLARI">
+ <panel name="marketplace_listings_panel">
+ <panel>
+ <panel name="marketplace_listings_inventory_placeholder_panel">
+ <text name="marketplace_listings_inventory_placeholder_title">Yükleniyor...</text>
+ </panel>
+ </panel>
+ </panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_marketplace_validation.xml b/indra/newview/skins/default/xui/tr/floater_marketplace_validation.xml
new file mode 100644
index 0000000000..ec563535d1
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/floater_marketplace_validation.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_marketplace_validation" title="Pazaryeri İlanlarını Denetle">
+ <button label="Tamam" label_selected="Tamam" name="OK"/>
+ <text_editor name="validation_text">MARKETPLACE_VALIDATION_TEXT</text_editor>
+</floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_openobject.xml b/indra/newview/skins/default/xui/tr/floater_openobject.xml
index 9980aee97f..3876439428 100755
--- a/indra/newview/skins/default/xui/tr/floater_openobject.xml
+++ b/indra/newview/skins/default/xui/tr/floater_openobject.xml
@@ -3,6 +3,11 @@
<text name="object_name">
[DESC]:
</text>
- <button label="Envantere Kopyala" label_selected="Envantere Kopyala" name="copy_to_inventory_button"/>
- <button label="Kopyala ve Giy" label_selected="Kopyala ve Giy" name="copy_and_wear_button"/>
+ <text name="border_note">
+ Envantere kopyala ve giy
+ </text>
+ <button label="Dış görünüme ekle" label_selected="Dış görünüme ekle" name="copy_and_wear_button"/>
+ <button label="Dış görünümü değiştir" label_selected="Dış görünümü değiştir" name="copy_and_replace_button"/>
+ <button label="Sadece envantere kopyala" label_selected="Sadece envantere kopyala" name="copy_to_inventory_button"/>
+ <button label="Ä°ptal" label_selected="Ä°ptal" name="cancel_button"/>
</floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_pay.xml b/indra/newview/skins/default/xui/tr/floater_pay.xml
index 6604e5c37a..63334db910 100755
--- a/indra/newview/skins/default/xui/tr/floater_pay.xml
+++ b/indra/newview/skins/default/xui/tr/floater_pay.xml
@@ -1,21 +1,18 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="Give Money">
- <string name="payee_group">
- Gruba Öde
- </string>
- <string name="payee_resident">
- Sakine Öde
- </string>
- <text name="payee_name">
- Kırpmayı Kontrol İçin Test Adı Çok Uzun
- </text>
- <button label="L$1" label_selected="L$1" name="fastpay 1"/>
- <button label="L$5" label_selected="L$5" name="fastpay 5"/>
- <button label="L$10" label_selected="L$10" name="fastpay 10"/>
- <button label="L$20" label_selected="L$20" name="fastpay 20"/>
- <text name="amount text">
- veya tutarı seç:
- </text>
- <button label="Öde" label_selected="Öde" name="pay btn"/>
- <button label="Ä°ptal" label_selected="Ä°ptal" name="cancel btn"/>
+ <string name="payee_group">Gruba Öde</string>
+ <string name="payee_resident">Sakine Öde</string>
+ <text name="paying_text">Ödeyeceğiniz miktar:</text>
+ <text name="payee_name">Kırpmayı Kontrol İçin Test Adı Çok Uzun</text>
+ <panel label="Ara" name="PatternsPanel">
+ <button label="1 L$ Öde" label_selected="1 L$ Öde" name="fastpay 1"/>
+ <button label="5 L$ Öde" label_selected="5 L$ Öde" name="fastpay 5"/>
+ <button label="10 L$ Öde" label_selected="10 L$ Öde" name="fastpay 10"/>
+ <button label="20 L$ Öde" label_selected="20 L$ Öde" name="fastpay 20"/>
+ </panel>
+ <panel label="Ara" name="InputPanel">
+ <text name="amount text">DiÄŸer bir tutar:</text>
+ <button label="Öde" label_selected="Öde" name="pay btn"/>
+ <button label="Ä°ptal" label_selected="Ä°ptal" name="cancel btn"/>
+ </panel>
</floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_pay_object.xml b/indra/newview/skins/default/xui/tr/floater_pay_object.xml
index 7772d3b101..d736ededfd 100755
--- a/indra/newview/skins/default/xui/tr/floater_pay_object.xml
+++ b/indra/newview/skins/default/xui/tr/floater_pay_object.xml
@@ -1,28 +1,21 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="Give Money">
- <string name="payee_group">
- Gruba Öde
- </string>
- <string name="payee_resident">
- Sakine Öde
- </string>
- <text name="payee_name">
- Ericacita Moostopolison
- </text>
- <text name="object_name_label">
- Nesne yoluyla:
- </text>
+ <string name="payee_group">Gruba Öde</string>
+ <string name="payee_resident">Sakine Öde</string>
+ <text name="paying_text">Ödeyeceğiniz miktar:</text>
+ <text name="payee_name">Ericacita Moostopolison</text>
+ <text name="object_name_label">Nesne yoluyla:</text>
<icon name="icon_object" tool_tip="Nesneler"/>
- <text name="object_name_text">
- Harika nesnem gerçekten uzun bir adla
- </text>
- <button label="L$1" label_selected="L$1" name="fastpay 1"/>
- <button label="L$5" label_selected="L$5" name="fastpay 5"/>
- <button label="L$10" label_selected="L$10" name="fastpay 10"/>
- <button label="L$20" label_selected="L$20" name="fastpay 20"/>
- <text name="amount text">
- veya tutarı seç:
- </text>
- <button label="Öde" label_selected="Öde" name="pay btn"/>
- <button label="Ä°ptal" label_selected="Ä°ptal" name="cancel btn"/>
+ <text name="object_name_text">Harika nesnem gerçekten uzun bir adla</text>
+ <panel label="Ara" name="PatternsPanel">
+ <button label="1 L$ Öde" label_selected="1 L$ Öde" name="fastpay 1"/>
+ <button label="5 L$ Öde" label_selected="5 L$ Öde" name="fastpay 5"/>
+ <button label="10 L$ Öde" label_selected="10 L$ Öde" name="fastpay 10"/>
+ <button label="20 L$ Öde" label_selected="20 L$ Öde" name="fastpay 20"/>
+ </panel>
+ <panel label="Ara" name="InputPanel">
+ <text name="amount text">DiÄŸer bir tutar:</text>
+ <button label="Öde" label_selected="Öde" name="pay btn"/>
+ <button label="Ä°ptal" label_selected="Ä°ptal" name="cancel btn"/>
+ </panel>
</floater>
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 ea598a5669..28bacca763 100755
--- a/indra/newview/skins/default/xui/tr/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/tr/floater_report_abuse.xml
@@ -67,7 +67,7 @@
<combo_box.item label="Arazi &gt; Tecavüz &gt; Nesneler veya dokular" name="Land__Encroachment__Objects_textures"/>
<combo_box.item label="Arazi &gt; Tecavvüz &gt; Parçacıklar" name="Land__Encroachment__Particles"/>
<combo_box.item label="Arazi &gt; Tecavvüz &gt; Ağaçlar/bitkiler" name="Land__Encroachment__Trees_plants"/>
- <combo_box.item label="Bahis veya Kumar" name="Wagering_gambling"/>
+ <combo_box.item label="Oyun Politikası İhlali" name="Wagering_gambling"/>
<combo_box.item label="DiÄŸer" name="Other"/>
</combo_box>
<text name="abuser_name_title">
diff --git a/indra/newview/skins/default/xui/tr/floater_snapshot.xml b/indra/newview/skins/default/xui/tr/floater_snapshot.xml
index 3f588522eb..be6c58e8cf 100755
--- a/indra/newview/skins/default/xui/tr/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/tr/floater_snapshot.xml
@@ -39,17 +39,8 @@
<string name="local_failed_str">
Bilgisayara kaydedilemedi.
</string>
- <button name="advanced_options_btn" tool_tip="Gelişmiş seçenekler"/>
- <text name="image_res_text">
- [WIDTH] x [HEIGHT] px
- </text>
- <text name="file_size_label">
- [SIZE] KB
- </text>
+ <button label="YENÄ°LE" name="new_snapshot_btn"/>
<panel name="advanced_options_panel">
- <text name="advanced_options_label">
- GELİŞMİŞ SEÇENEKLER
- </text>
<text name="layer_type_label">
Yakala:
</text>
@@ -68,4 +59,10 @@
<combo_box.item label="Filtre Yok" name="NoFilter"/>
</combo_box>
</panel>
+ <text name="image_res_text">
+ [WIDTH] px (genişlik) x [HEIGHT] px (yükseklik)
+ </text>
+ <text name="file_size_label">
+ [SIZE] KB
+ </text>
</floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_top_objects.xml b/indra/newview/skins/default/xui/tr/floater_top_objects.xml
index 19420c68e3..013e8d7ce1 100755
--- a/indra/newview/skins/default/xui/tr/floater_top_objects.xml
+++ b/indra/newview/skins/default/xui/tr/floater_top_objects.xml
@@ -21,6 +21,12 @@
<floater.string name="none_descriptor">
Hiçbiri bulunamadı.
</floater.string>
+ <floater.string name="URLs">
+ URL&apos;ler
+ </floater.string>
+ <floater.string name="memory">
+ Bellek (KB)
+ </floater.string>
<text name="title_text">
Yükleniyor...
</text>
@@ -30,7 +36,7 @@
<scroll_list.columns label="Sahip" name="owner"/>
<scroll_list.columns label="Konum" name="location"/>
<scroll_list.columns label="Parsel" name="parcel"/>
- <scroll_list.columns label="Süre" name="time"/>
+ <scroll_list.columns label="Tarih" name="time"/>
<scroll_list.columns label="URL&apos;ler" name="URLs"/>
<scroll_list.columns label="Bellek (KB)" name="memory"/>
</scroll_list>
diff --git a/indra/newview/skins/default/xui/tr/floater_twitter.xml b/indra/newview/skins/default/xui/tr/floater_twitter.xml
index 3060bd1c84..93c1b0b073 100644
--- a/indra/newview/skins/default/xui/tr/floater_twitter.xml
+++ b/indra/newview/skins/default/xui/tr/floater_twitter.xml
@@ -1,17 +1,13 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="floater_twitter" title="TWITTER">
- <panel name="background">
- <tab_container name="tabs">
- <panel label="OLUÅžTUR" name="panel_twitter_photo"/>
- <panel label="HESAP" name="panel_twitter_account"/>
- </tab_container>
- <panel name="connection_status_panel">
- <text name="connection_error_text">
- Hata
- </text>
- <text name="connection_loading_text">
- Yükleniyor...
- </text>
- </panel>
- </panel>
+ <tab_container name="tabs">
+ <panel label="OLUÅžTUR" name="panel_twitter_photo"/>
+ <panel label="HESAP" name="panel_twitter_account"/>
+ </tab_container>
+ <text name="connection_error_text">
+ Hata
+ </text>
+ <text name="connection_loading_text">
+ Yükleniyor...
+ </text>
</floater>
diff --git a/indra/newview/skins/default/xui/tr/menu_attachment_self.xml b/indra/newview/skins/default/xui/tr/menu_attachment_self.xml
index ff7c718979..c49f817a45 100755
--- a/indra/newview/skins/default/xui/tr/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/tr/menu_attachment_self.xml
@@ -8,6 +8,7 @@
<menu_item_call label="Görünümüm" name="Change Outfit"/>
<menu_item_call label="Dış Görünümümü Düzenle" name="Edit Outfit"/>
<menu_item_call label="Şeklimi Düzenle" name="Edit My Shape"/>
+ <menu_item_call label="Konum Yüksekliği" name="Hover Height"/>
<menu_item_call label="Arkadaşlarım" name="Friends..."/>
<menu_item_call label="Gruplarım" name="Groups..."/>
<menu_item_call label="Profilim" name="Profile..."/>
diff --git a/indra/newview/skins/default/xui/tr/menu_avatar_self.xml b/indra/newview/skins/default/xui/tr/menu_avatar_self.xml
index 6996dc612f..4dfa42c347 100755
--- a/indra/newview/skins/default/xui/tr/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/tr/menu_avatar_self.xml
@@ -25,6 +25,7 @@
<menu_item_call label="Görünümüm" name="Chenge Outfit"/>
<menu_item_call label="Dış Görünümümü Düzenle" name="Edit Outfit"/>
<menu_item_call label="Şeklimi Düzenle" name="Edit My Shape"/>
+ <menu_item_call label="Konum Yüksekliği" name="Hover Height"/>
<menu_item_call label="Arkadaşlarım" name="Friends..."/>
<menu_item_call label="Gruplarım" name="Groups..."/>
<menu_item_call label="Profilim" name="Profile..."/>
diff --git a/indra/newview/skins/default/xui/tr/menu_inventory.xml b/indra/newview/skins/default/xui/tr/menu_inventory.xml
index 7239c4be06..784e4d18a4 100755
--- a/indra/newview/skins/default/xui/tr/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/tr/menu_inventory.xml
@@ -1,5 +1,14 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<menu name="Popup">
+ <menu_item_call label="Ä°lan oluÅŸtur" name="Marketplace Create Listing"/>
+ <menu_item_call label="İlanı ilişkilendir" name="Marketplace Associate Listing"/>
+ <menu_item_call label="İlanı al (yenile)" name="Marketplace Get Listing"/>
+ <menu_item_call label="Hata kontrolü yap" name="Marketplace Check Listing"/>
+ <menu_item_call label="İlanı düzenle" name="Marketplace Edit Listing"/>
+ <menu_item_call label="Listele" name="Marketplace List"/>
+ <menu_item_call label="Listeden kaldır" name="Marketplace Unlist"/>
+ <menu_item_call label="EtkinleÅŸtir" name="Marketplace Activate"/>
+ <menu_item_call label="Devre Dışı Bırak" name="Marketplace Deactivate"/>
<menu_item_call label="PaylaÅŸ" name="Share"/>
<menu_item_call label="Satın Al" name="Task Buy"/>
<menu_item_call label="Aç" name="Task Open"/>
@@ -87,6 +96,7 @@
<menu_item_call label="Ekle" name="Wearable Add"/>
<menu_item_call label="Çıkar" name="Take Off"/>
<menu_item_call label="Satıcı Giden Kutusuna Kopyala" name="Merchant Copy"/>
- <menu_item_call label="Pazaryerine Gönder" name="Marketplace Send"/>
+ <menu_item_call label="Pazaryeri İlanlarına Kopyala" name="Marketplace Copy"/>
+ <menu_item_call label="Pazaryeri İlanlarına Taşı" name="Marketplace Move"/>
<menu_item_call label="--seçenek yok--" name="--no options--"/>
</menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/tr/menu_inventory_gear_default.xml
index 5f3e4e8789..ca66bc98c7 100755
--- a/indra/newview/skins/default/xui/tr/menu_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/tr/menu_inventory_gear_default.xml
@@ -5,7 +5,7 @@
<menu_item_check label="En Sonunculara Göre Sırala" name="sort_by_recent"/>
<menu_item_check label="Klasörleri Her Zaman Ada Göre Sırala" name="sort_folders_by_name"/>
<menu_item_check label="Sistem Klasörlerini Üste Sırala" name="sort_system_folders_to_top"/>
- <menu_item_call label="Filtreleri Göster" name="show_filters"/>
+ <menu_item_call label="Filtreleri Göster..." name="show_filters"/>
<menu_item_call label="Filtreleri Sıfırla" name="reset_filters"/>
<menu_item_call label="Tüm Klasörleri Kapat" name="close_folders"/>
<menu_item_call label="Kaybedip Bulduklarımı Boşalt" name="empty_lostnfound"/>
diff --git a/indra/newview/skins/default/xui/tr/menu_marketplace_view.xml b/indra/newview/skins/default/xui/tr/menu_marketplace_view.xml
new file mode 100644
index 0000000000..c114f50c92
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/menu_marketplace_view.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_marketplace_sort">
+ <menu_item_check label="Stok miktarına göre sırala (düşükten yükseğe)" name="sort_by_stock_amount"/>
+ <menu_item_check label="Sadece ilan klasörlerini göster" name="show_only_listing_folders"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_url_experience.xml b/indra/newview/skins/default/xui/tr/menu_url_experience.xml
new file mode 100644
index 0000000000..70ea4e6950
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/menu_url_experience.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Url Popup">
+ <menu_item_call label="SLurl&apos;yi Panoya Kopyala" name="url_copy"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_viewer.xml b/indra/newview/skins/default/xui/tr/menu_viewer.xml
index a488a0916f..cc8d8c895b 100755
--- a/indra/newview/skins/default/xui/tr/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/tr/menu_viewer.xml
@@ -8,6 +8,7 @@
<menu_item_call label="Yeni Envanter Penceresi" name="NewInventoryWindow"/>
<menu_item_call label="Yerler..." name="Places"/>
<menu_item_call label="Favoriler..." name="Picks"/>
+ <menu_item_call label="Deneyimler..." name="Experiences"/>
<menu_item_call label="Kamera Denetimleri..." name="Camera Controls"/>
<menu label="Hareket" name="Movement">
<menu_item_call label="Otur" name="Sit Down Here"/>
@@ -22,6 +23,7 @@
</menu>
<menu_item_call label="L$ Satın Al..." name="Buy and Sell L$"/>
<menu_item_call label="Satıcı Giden Kutusu..." name="MerchantOutbox"/>
+ <menu_item_call label="Pazaryeri ilanları..." name="MarketplaceListings"/>
<menu_item_call label="Hesap kontrol paneli..." name="Manage My Account"/>
<menu_item_call label="Tercihler..." name="Preferences"/>
<menu_item_call label="Araç çubuğu düğmeleri..." name="Toolbars"/>
@@ -46,7 +48,7 @@
<menu_item_check label="ArkadaÅŸlar" name="My Friends"/>
<menu_item_check label="Gruplar" name="My Groups"/>
<menu_item_check label="Yakındaki kişiler" name="Active Speakers"/>
- <menu_item_call label="Engelleme Listesi" name="Block List"/>
+ <menu_item_check label="Engelleme Listesi" name="Block List"/>
<menu_item_check label="Rahatsız Etme" name="Do Not Disturb"/>
</menu>
<menu label="Dünya" name="World">
@@ -248,6 +250,7 @@
<menu_item_check label="Doku Konsolu" name="Texture Console"/>
<menu_item_check label="Hata Ayıklama Konsolu" name="Debug Console"/>
<menu_item_call label="Bildirimler Konsolu" name="Notifications"/>
+ <menu_item_check label="Bölge Hata Ayıklama Konsolu" name="Region Debug Console"/>
<menu_item_check label="Hızlı Zamanlayıcılar" name="Fast Timers"/>
<menu_item_check label="Bellek" name="Memory"/>
<menu_item_check label="Sahne Ä°statistikleri" name="Scene Statistics"/>
@@ -351,7 +354,7 @@
<menu_item_check label="Nesne Konumlarını Ping İle İnterpole Edin" name="Ping Interpolate Object Positions"/>
<menu_item_call label="Paket Bırakın" name="Drop a Packet"/>
</menu>
- <menu_item_call label="Komut Dosyalı Kameranın Dökümünü Al" name="Dump Scripted Camera"/>
+ <menu_item_call label="Komut Dosyalı Kameranın Dökümünü Al" name="Dump Scripted Camera"/>
<menu label="Kaydedici" name="Recorder">
<menu_item_call label="Oynatmayı Başlat" name="Start Playback"/>
<menu_item_call label="Oynatmayı Durdur" name="Stop Playback"/>
diff --git a/indra/newview/skins/default/xui/tr/mime_types.xml b/indra/newview/skins/default/xui/tr/mime_types.xml
index c37f872a65..fa554d34fc 100755
--- a/indra/newview/skins/default/xui/tr/mime_types.xml
+++ b/indra/newview/skins/default/xui/tr/mime_types.xml
@@ -44,6 +44,14 @@
Bu konumdaki sesi çal
</playtip>
</widgetset>
+ <widgetset name="none">
+ <label name="none_label">
+ İçerik Yok
+ </label>
+ <tooltip name="none_tooltip">
+ Burada ortam öğesi yok
+ </tooltip>
+ </widgetset>
<scheme name="rtsp">
<label name="rtsp_label">
Gerçek Zamanlı Akış
diff --git a/indra/newview/skins/default/xui/tr/mime_types_linux.xml b/indra/newview/skins/default/xui/tr/mime_types_linux.xml
index c37f872a65..fa554d34fc 100755
--- a/indra/newview/skins/default/xui/tr/mime_types_linux.xml
+++ b/indra/newview/skins/default/xui/tr/mime_types_linux.xml
@@ -44,6 +44,14 @@
Bu konumdaki sesi çal
</playtip>
</widgetset>
+ <widgetset name="none">
+ <label name="none_label">
+ İçerik Yok
+ </label>
+ <tooltip name="none_tooltip">
+ Burada ortam öğesi yok
+ </tooltip>
+ </widgetset>
<scheme name="rtsp">
<label name="rtsp_label">
Gerçek Zamanlı Akış
diff --git a/indra/newview/skins/default/xui/tr/mime_types_mac.xml b/indra/newview/skins/default/xui/tr/mime_types_mac.xml
index c37f872a65..fa554d34fc 100755
--- a/indra/newview/skins/default/xui/tr/mime_types_mac.xml
+++ b/indra/newview/skins/default/xui/tr/mime_types_mac.xml
@@ -44,6 +44,14 @@
Bu konumdaki sesi çal
</playtip>
</widgetset>
+ <widgetset name="none">
+ <label name="none_label">
+ İçerik Yok
+ </label>
+ <tooltip name="none_tooltip">
+ Burada ortam öğesi yok
+ </tooltip>
+ </widgetset>
<scheme name="rtsp">
<label name="rtsp_label">
Gerçek Zamanlı Akış
diff --git a/indra/newview/skins/default/xui/tr/notifications.xml b/indra/newview/skins/default/xui/tr/notifications.xml
index 2364bd5acf..a6c69c7ab2 100755
--- a/indra/newview/skins/default/xui/tr/notifications.xml
+++ b/indra/newview/skins/default/xui/tr/notifications.xml
@@ -73,6 +73,10 @@ Hata ayrıntıları: &apos;[_NAME]&apos; adlı bildirim notifications.xml içind
[MESSAGE]
<usetemplate name="okcancelbuttons" notext="Ä°ptal" yestext="Evet"/>
</notification>
+ <notification name="GenericAlertOK">
+ [MESSAGE]
+ <usetemplate name="okbutton" yestext="Tamam"/>
+ </notification>
<notification name="BadInstallation">
[APP_NAME] güncellenirken bir hata oluştu. Lütfen Görüntüleyici&apos;nin [http://get.secondlife.com son sürümünü karşıdan yükleyin].
<usetemplate name="okbutton" yestext="Tamam"/>
@@ -125,6 +129,88 @@ Bir sistem veya ağ hatası nedeniyle Pazaryerine hiçbir klasör gönderilemedi
Bir sistem veya ağ hatası nedeniyle Pazaryeri başlatılamadı. Daha sonra tekrar deneyin.
<usetemplate name="okbutton" yestext="Tamam"/>
</notification>
+ <notification name="StockPasteFailed">
+ Stok Klasörüne kopyalama ya da taşıma başarısız oldu. Hata kodu:
+
+ &quot;[ERROR_CODE]&quot;
+ <usetemplate name="okbutton" yestext="Tamam"/>
+ </notification>
+ <notification name="MerchantPasteFailed">
+ Pazaryeri İlanlarına kopyalama ya da taşıma başarısız oldu. Hata kodu:
+
+ &quot;[ERROR_CODE]&quot;
+ <usetemplate name="okbutton" yestext="Tamam"/>
+ </notification>
+ <notification name="MerchantTransactionFailed">
+ Pazaryerinde yapılan işlem başarısız oldu. Hata kodu:
+
+ Neden: &quot;[ERROR_REASON]&quot;
+ [ERROR_DESCRIPTION]
+ <usetemplate name="okbutton" yestext="Tamam"/>
+ </notification>
+ <notification name="MerchantUnprocessableEntity">
+ Bu ürünü listeleyemiyoruz ya da sürüm klasörünü etkinleştiremiyoruz. Bu sorun genellikle ilan açıklama formunda eksik bilgi olmasından kaynaklanır ama klasör yapısındaki hatalar yüzünden de gerçekleşmiş olabilir. İlanı düzenleyin ya da ilan klasöründe hata olup olmadığını kontrol edin.
+ <usetemplate name="okbutton" yestext="Tamam"/>
+ </notification>
+ <notification name="MerchantListingFailed">
+ İlan Pazaryerinde yayınlanamadı. Hata kodu:
+
+ &quot;[ERROR_CODE]&quot;
+ <usetemplate name="okbutton" yestext="Tamam"/>
+ </notification>
+ <notification name="MerchantFolderActivationFailed">
+ Bu sürüm klasörünü etkinleştirilemedi. Hata kodu:
+
+ &quot;[ERROR_CODE]&quot;
+ <usetemplate name="okbutton" yestext="Tamam"/>
+ </notification>
+ <notification name="ConfirmMerchantActiveChange">
+ Bu eylem, bu ilanın etkin içeriğini değiştirecek. Devam etmek istiyor musunuz?
+ <usetemplate ignoretext="Pazaryerindeki etkin bir ilanı değiştirmek istediğimde doğrulama iste" name="okcancelignore" notext="İptal" yestext="Tamam"/>
+ </notification>
+ <notification name="ConfirmMerchantMoveInventory">
+ Pazaryeri İlanları penceresine sürüklenen öğeler kopyalanmaz, orijinal konumlarından buraya taşınırlar. Devam etmek istiyor musunuz?
+ <usetemplate ignoretext="Bir öğeyi envanterden Pazaryerine taşımak istediğimde doğrulama iste" name="okcancelignore" notext="İptal" yestext="Tamam"/>
+ </notification>
+ <notification name="ConfirmListingCutOrDelete">
+ Bir ilan klasörü taşınır veya silinirse, Pazaryerindeki ilanınız silinir. Pazaryeri ilanını saklamak isterseniz, değiştirmek istediğiniz sürüm klasörünün içeriğini taşıyın veya silin. Devam etmek istiyor musunuz?
+ <usetemplate ignoretext="Bir ilanı Pazaryerine taşımak ya da Pazaryerinden silmek istediğim zaman doğrulama iste" name="okcancelignore" notext="İptal" yestext="Tamam"/>
+ </notification>
+ <notification name="ConfirmCopyToMarketplace">
+ Bu öğelerden birini ya da birden fazlasını Pazaryerine kopyalama izniniz yok. Bunları taşıyabilir veya bırakabilirsiniz.
+ <usetemplate canceltext="İptal" ignoretext="Kopyalanamaz öğeler içeren bir seçimi Pazaryerine kopyalamaya çalıştığım zaman doğrulama iste" name="yesnocancelbuttons" notext="Öğeleri taşıma" yestext="Öğeleri taşı"/>
+ </notification>
+ <notification name="ConfirmMerchantUnlist">
+ Bu eylem ilanı listeden kaldıracak. Devam etmek istiyor musunuz?
+ <usetemplate ignoretext="Pazaryerindeki etkin bir ilanı listeden kaldırmak istediğimde doğrulama iste" name="okcancelignore" notext="İptal" yestext="Tamam"/>
+ </notification>
+ <notification name="ConfirmMerchantClearVersion">
+ Bu eylem, mevcut ilanın sürüm klasörünü devre dışı bırakacak. Devam etmek istiyor musunuz?
+ <usetemplate ignoretext="Pazaryerindeki bir ilanın sürüm klasörünü devre dışı bırakmak istediğimde doğrulama iste" name="okcancelignore" notext="İptal" yestext="Tamam"/>
+ </notification>
+ <notification name="AlertMerchantListingNotUpdated">
+ Bu ilan güncellenemedi.
+Bu öğeyi Pazaryeri üzerinde düzenlemek için [[URL] buraya tıklayın].
+ <usetemplate name="okbutton" yestext="Tamam"/>
+ </notification>
+ <notification name="AlertMerchantListingCannotWear">
+ Pazaryeri İlanları klasöründe bulunan giysileri ve vücut bölümlerini kullanamazsınız.
+ </notification>
+ <notification name="AlertMerchantListingInvalidID">
+ Geçersiz ilan kimliği.
+ </notification>
+ <notification name="AlertMerchantListingActivateRequired">
+ Bu ilanda ya birden fazla sürüm klasörü var ya da hiç sürüm klasörü yok. Daha sonra bir sürüm klasörünü bağımsız olarak seçip etkinleştirmeniz gerekiyor.
+ <usetemplate ignoretext="Birden fazla sürüm klasörü içeren bir ilan oluşturduğum zaman sürüm klasörünün etkinleştirilmesi hakkında uyar" name="okignore" yestext="Tamam"/>
+ </notification>
+ <notification name="AlertMerchantStockFolderSplit">
+ Farklı türdeki stok öğelerini ayrı stok klasörlerine yerleştirdik. Böylece klasörünüz listeleyebileceğimiz bir şekilde düzenlenir.
+ <usetemplate ignoretext="Stok klasörü listelenmeden önce bölündüğünde uyar" name="okignore" yestext="Tamam"/>
+ </notification>
+ <notification name="AlertMerchantStockFolderEmpty">
+ Stok boş olduğu için ilanınızı yayından kaldırdık. İlanı yeniden yayınlamak için stok klasörüne daha fazla birim eklemeniz gerekir.
+ <usetemplate ignoretext="Bir ilan, stok klasörü boş olduğu için listeden kaldırılınca uyar" name="okignore" yestext="Tamam"/>
+ </notification>
<notification name="CompileQueueSaveText">
Aşağıdaki nedenden dolayı, bir komut dosyası için metin karşıya yüklenirken bir sorun oluştu: [REASON]. Lütfen daha sonra tekrar deneyin.
</notification>
@@ -469,6 +555,10 @@ Not: Bu işlem önbelleği temizleyecek.
DeÄŸiÅŸiklikler Kaydedilsin mi?
<usetemplate canceltext="Ä°ptal" name="yesnocancelbuttons" notext="Kaydetme" yestext="Kaydet"/>
</notification>
+ <notification name="DeleteNotecard">
+ Not kartı silinsin mi?
+ <usetemplate name="okcancelbuttons" notext="Ä°ptal" yestext="Tamam"/>
+ </notification>
<notification name="GestureSaveFailedTooManySteps">
Mimik kaydedilemedi.
Bu mimikte çok fazla adım var.
@@ -575,6 +665,9 @@ Grafik Kalitesi, Tercihler &gt; Grafikler sekmesinden yükseltilebilir.
<notification name="RegionNoTerraforming">
[REGION] bölgesi yer şekillendirmeye izin vermiyor.
</notification>
+ <notification name="ParcelNoTerraforming">
+ [PARCEL] parseli üzerinde yer şekillendirmesi yapma izniniz bulunmuyor.
+ </notification>
<notification name="CannotCopyWarning">
Aşağıdaki öğeleri kopyalamak için gerekli izne sahip değilsiniz:
[ITEMS]
@@ -1825,6 +1918,30 @@ Binlerce bölgeyi değiştirecek ve alan sunucusunu kesintiye uğratacaktır.
Sadece bu gayrimenkul için mi gayrimenkul yöneticiliğinden çıkarılsın, yoksa [ALL_ESTATES] için mi?
<usetemplate canceltext="İptal" name="yesnocancelbuttons" notext="Tüm Gayrimenkuller" yestext="Bu Gayrimenkul"/>
</notification>
+ <notification label="Gayrimenkul seç" name="EstateAllowedExperienceAdd">
+ Sadece bu gayrimenkul için mi izin verilenler listesine eklensin, yoksa [ALL_ESTATES] için mi?
+ <usetemplate canceltext="İptal" name="yesnocancelbuttons" notext="Tüm Gayrimenkuller" yestext="Bu Gayrimenkul"/>
+ </notification>
+ <notification label="Gayrimenkul seç" name="EstateAllowedExperienceRemove">
+ Yalnızca bu gayrimenkul için mi izin verilenler listesinden çıkarılsın, yoksa [ALL_ESTATES] için mi?
+ <usetemplate canceltext="İptal" name="yesnocancelbuttons" notext="Tüm Gayrimenkuller" yestext="Bu Gayrimenkul"/>
+ </notification>
+ <notification label="Gayrimenkul seç" name="EstateBlockedExperienceAdd">
+ Yalnızca bu gayrimenkul için mi engellenenler listesine eklensin, yoksa [ALL_ESTATES] için mi?
+ <usetemplate canceltext="İptal" name="yesnocancelbuttons" notext="Tüm Gayrimenkuller" yestext="Bu Gayrimenkul"/>
+ </notification>
+ <notification label="Gayrimenkul seç" name="EstateBlockedExperienceRemove">
+ Yalnızca bu gayrimenkul için mi engellenenler listesinden çıkarılsın, yoksa [ALL_ESTATES] için mi?
+ <usetemplate canceltext="İptal" name="yesnocancelbuttons" notext="Tüm Gayrimenkuller" yestext="Bu Gayrimenkul"/>
+ </notification>
+ <notification label="Gayrimenkul seç" name="EstateTrustedExperienceAdd">
+ Yalnızca bu gayrimenkul için mi anahtar listesine eklensin, yoksa [ALL_ESTATES] için mi?
+ <usetemplate canceltext="İptal" name="yesnocancelbuttons" notext="Tüm Gayrimenkuller" yestext="Bu Gayrimenkul"/>
+ </notification>
+ <notification label="Gayrimenkul seç" name="EstateTrustedExperienceRemove">
+ Yalnızca bu gayrimenkul için mi anahtar listesine çıkarılsın, yoksa [ALL_ESTATES] için mi?
+ <usetemplate canceltext="İptal" name="yesnocancelbuttons" notext="Tüm Gayrimenkuller" yestext="Bu Gayrimenkul"/>
+ </notification>
<notification label="Çıkarmayı Onayla" name="EstateKickUser">
[EVIL_USER] bu gayrimenkulden çıkarılsın mı?
<usetemplate name="okcancelbuttons" notext="Ä°ptal" yestext="Tamam"/>
@@ -1837,6 +1954,9 @@ Binlerce bölgeyi değiştirecek ve alan sunucusunu kesintiye uğratacaktır.
Ziyaret etmeye çalıştığınız bölge, mevcut tercihlerinizi aşan içeriğe sahip. Ben &gt; Tercihler &gt; Genel sekmesini kullanarak tercihlerinizi değiştirebilirsiniz.
<usetemplate name="okbutton" yestext="Tamam"/>
</notification>
+ <notification name="SLM_UPDATE_FOLDER">
+ [MESSAGE]
+ </notification>
<notification name="RegionEntryAccessBlocked_AdultsOnlyContent">
Ziyaret etmeye çalıştığınız bölge [REGIONMATURITY] içeriğe sahip, buna sadece yetişkinler erişebilir.
<url name="url">
@@ -1899,6 +2019,10 @@ Binlerce bölgeyi değiştirecek ve alan sunucusunu kesintiye uğratacaktır.
Tercihleriniz ile sunucu arasında senkronizasyon eksikliği olduğu için ışınlama işleminizde teknik sorunlar yaşanıyoruz.
<usetemplate name="okbutton" yestext="Tamam"/>
</notification>
+ <notification name="RegionTPSpecialUsageBlocked">
+ Bölgeye girilemiyor. &quot;[REGION_NAME]&quot; bir Yetenek Oyunu Bölgesi. Buraya girebilmek için bazı ölçütleri karşılamanız gerekiyor. Ayrıntılar için lütfen [http://wiki.secondlife.com/wiki/Linden_Lab_Official:Skill_Gaming_in_Second_Life Skill Gaming FAQ] adresini ziyaret edin.
+ <usetemplate name="okbutton" yestext="Tamam"/>
+ </notification>
<notification name="PreferredMaturityChanged">
[RATING] içeriğine sahip bir bölgeyi ziyaret edeceğiniz hakkında başka bildirim almayacaksınız. Daha sonra menü çubuğunda Ben &gt; Tercihler &gt; Genel sekmesini kullanarak tercihlerinizi değiştirebilirsiniz.
<usetemplate name="okbutton" yestext="Tamam"/>
@@ -2120,6 +2244,10 @@ Envanter öğesi/öğeleri taşınsın mı?
<ignore name="ignore" text="Para() komut dosyası içermeyen bir nesne oluştururken &apos;Nesne için ödeme yap&apos; eylemi ayarladım"/>
</form>
</notification>
+ <notification name="PayConfirmation">
+ [TARGET] hedefine [AMOUNT]L$ ödemek istediğinizi doğrulayın.
+ <usetemplate ignoretext="Ödeme yapılmadan önce doğrulama iste (200L$ üzerinde tutarlar için)" name="okcancelignore" notext="İptal" yestext="Öde"/>
+ </notification>
<notification name="OpenObjectCannotCopy">
Bu nesne içinde kopyalama izniniz olan bir öğe yok.
</notification>
@@ -2205,6 +2333,9 @@ Bu nesneyi seçilen nesne ile değiştirmek istiyor musunuz?
<button ignore="Hiçbir Zaman Değiştirme" name="No" text="İptal"/>
</form>
</notification>
+ <notification name="TooManyWearables">
+ [AMOUNT] öğeden fazlasını içeren bir klasörü kullanamazsınız. Bu limiti Gelişmiş &gt; Hata Ayıklama Ayarlarını Göster &gt; KullanılabilirKlasörLimiti öğesinden değiştirebilirsiniz.
+ </notification>
<notification label="Rahatsız Etme Modu Uyarısı" name="DoNotDisturbModePay">
Rahatsız Etme seçeneğini devreye aldınız. Bu ödemenin karşılığında sunulan hiçbir öğeyi almayacaksınız.
@@ -2814,7 +2945,7 @@ Bu bölgede kalmaya devam ederseniz oturumunuz sonlandırılacak.
[MESSAGE]
-Åžu nesneden: &lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;, sahibi: [NAME]?
+Kaynak nesne: &lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;, sahibi: [NAME]
<form name="form">
<button name="Gotopage" text="Sayfaya git"/>
<button name="Cancel" text="Ä°ptal"/>
@@ -2840,6 +2971,72 @@ Kabul ediyor musunuz?
<button name="Mute" text="Engelle"/>
</form>
</notification>
+ <notification name="ExperienceAcquireFailed">
+ Yeni bir deneyim edinilemiyor:
+ [ERROR_MESSAGE]
+ <usetemplate name="okbutton" yestext="Tamam"/>
+ </notification>
+ <notification name="NotInGroupExperienceProfileMessage">
+ Deneyimin sahibi seçili grubun bir üyesi olmadığı için, deneyim grubunda yapılan bir değişiklik göz ardı edildi.
+ </notification>
+ <notification name="UneditableExperienceProfileMessage">
+ Deneyim profili güncellenirken, düzenlenebilir olmayan &quot;[field]&quot; alanı göz ardı edildi.
+ </notification>
+ <notification name="RestrictedToOwnerExperienceProfileMessage">
+ Yalnızca deneyimin sahibi tarafından ayarlanabilecek olan &quot;[field]&quot; alanında yapılan değişiklikler göz ardı edildi.
+ </notification>
+ <notification name="MaturityRatingExceedsOwnerExperienceProfileMessage">
+ Bir deneyimin erişkinlik seviyesini deneyimin sahibinin seviyesinden daha yüksek bir seviyeye ayarlayamazsınız.
+ </notification>
+ <notification name="RestrictedTermExperienceProfileMessage">
+ Aşağıdaki koşullar deneyim profili adının ve/veya açıklamasının güncellenmesini engelledi: [extra_info]
+ </notification>
+ <notification name="TeleportedHomeExperienceRemoved">
+ secondlife:///app/experience/[public_id]/profile deneyimini kaldırdığınız için [region_name] bölgesinden dışarı ışınlandınız ve artık bu bölgeye girme hakkınız yok.
+ <form name="form">
+ <ignore name="ignore" text="Bir deneyim kaldırıldığı için bölgeden çıkarıldı"/>
+ </form>
+ </notification>
+ <notification name="TrustedExperienceEntry">
+ secondlife:///app/experience/[public_id]/profile anahtar deneyimine katılarak [region_name] bölgesine giriş izni aldınız. Bu deneyimin kaldırılması bu bölgeden çıkarılmanıza neden olabilir.
+ <form name="form">
+ <ignore name="ignore" text="Bir deneyim bir bölgeye girme izni verdi"/>
+ </form>
+ </notification>
+ <notification name="TrustedExperiencesAvailable">
+ Bu hedef konuma erişim izniniz yok. Aşağıdaki bir deneyimi kabul ederek bölgeye giriş izni kazanabilirsiniz:
+
+[EXPERIENCE_LIST]
+
+BaÅŸka Anahtar Deneyimler de olabilir.
+ </notification>
+ <notification name="ExperienceEvent">
+ secondlife:///app/experience/[public_id]/profile deneyimiyle [EventType] için bir nesneye izin verildi.
+ Sahibi: secondlife:///app/agent/[OwnerID]/inspect
+ Nesne Adı: [ObjectName]
+ Parsel Adı: [ParcelName]
+ </notification>
+ <notification name="ExperienceEventAttachment">
+ secondlife:///app/experience/[public_id]/profile deneyimiyle [EventType] için bir eke izin verildi.
+ Sahibi: secondlife:///app/agent/[OwnerID]/inspect
+ </notification>
+ <notification name="ScriptQuestionExperience">
+ &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos;, &quot;[NAME]&quot; adlı kişiye ait bir nesne, [GRID_WIDE] deneyimine katılmanızı istiyor:
+
+[EXPERIENCE]
+
+İzin verildikten sonra, deneyim profilinden iptal edilmedikçe, bu deneyim için bu iletiyi bir daha görmezsiniz.
+
+Bu deneyimle ilişkili komut dosyaları deneyimin etkin olduğu bölgelerde aşağıdaki eylemleri gerçekleştirebilecek:
+
+[QUESTIONS]Kabul ediyor musunuz?
+ <form name="form">
+ <button name="BlockExperience" text="Deneyimi Engelle"/>
+ <button name="Mute" text="Nesneyi Engelle"/>
+ <button name="Yes" text="Evet"/>
+ <button name="No" text="Hayır"/>
+ </form>
+ </notification>
<notification name="ScriptQuestionCaution">
Uyarı: &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos; nesnesi, Linden Dolar hesabınıza tam erişim istiyor. Eğer erişime izin verirseniz, süregelen bir şekilde, ilave uyarı olmaksızın, hesabınızdan herhangi bir zamanda fon çekebilir veya hesabınızı tamamen boşaltabilir.
@@ -3159,6 +3356,10 @@ Lütfen ağ ve güvenlik duvarı ayarlarınızı kontrol edin.
( [EXISTENCE] saniyedir hayatta )
&apos;[BODYREGION]&apos; için [RESOLUTION] çözünürlükte kaydedilmiş bir dokuyu [TIME] saniye sonra yerel olarak güncellediniz.
</notification>
+ <notification name="CannotUploadTexture">
+ Doku karşıya yüklenemiyor.
+[REASON]
+ </notification>
<notification name="LivePreviewUnavailable">
Kopyalanamaz ve/veya aktarılamaz olduğu için bu dokunun bir önizlemesini görüntüleyemiyoruz.
<usetemplate ignoretext="Kopyalanamayan ve/veya aktarılamayan dokular için Canlı Önizleme modu mevcut olmayınca beni uyar" name="okignore" yestext="Tamam"/>
@@ -3727,9 +3928,11 @@ Lütfen bir dakika sonra tekrar deneyin.
</notification>
<notification name="TeleportedByAttachment">
You have been teleported by an attachment on [ITEM_ID]
+ <usetemplate ignoretext="Işınlama: Bir ek tarafından ışınlandınız" name="notifyignore"/>
</notification>
<notification name="TeleportedByObjectOnParcel">
&apos;[PARCEL_NAME]&apos; parseli üzerindeki &apos;[OBJECT_NAME]&apos; nesnesi tarafından ışınlandınız
+ <usetemplate ignoretext="Işınlama: Bir parsel üzerindeki bir nesne tarafından ışınlandınız" name="notifyignore"/>
</notification>
<notification name="TeleportedByObjectOwnedBy">
Sahibi [OWNER_ID] olan &apos;[OBJECT_NAME]&apos; nesnesi tarafından ışınlandınız
@@ -4061,7 +4264,7 @@ Daha küçük bir arazi parçası seçmeyi deneyin.
<usetemplate ignoretext="Dosyalar taşınamıyor. Önceki yol geri yüklendi." name="okignore" yestext="Tamam"/>
</notification>
<notification name="DefaultObjectPermissions">
- Aşağıdaki nedenden dolayı, varsayılan izinler kaydedilirken bir sorun oluştu: [REASON]. Varsayılan izinleri ayarlamayı lütfen daha sonra tekrar deneyin.
+ Varsayılan nesne izinleri kaydedilirken bir sorun oluştu: [REASON]. Varsayılan izinleri kaydetmeyi lütfen daha sonra tekrar deneyin.
<usetemplate name="okbutton" yestext="Tamam"/>
</notification>
<notification name="ChatHistoryIsBusyAlert">
diff --git a/indra/newview/skins/default/xui/tr/panel_experience_info.xml b/indra/newview/skins/default/xui/tr/panel_experience_info.xml
new file mode 100644
index 0000000000..0bce4fea8f
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/panel_experience_info.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_experience_info">
+ <text name="title" value="Deneyim Profili"/>
+ <scroll_container name="xp_scroll">
+ <panel name="scrolling_panel">
+ <layout_stack>
+ <layout_panel>
+ <text name="experience_title" value="Kyle&apos;s Superhero RPG"/>
+ </layout_panel>
+ <layout_panel name="location panel">
+ <text name="Location">
+ Konum:
+ </text>
+ <text name="LocationTextText">
+ bir yer
+ </text>
+ <button label="Işınla" name="teleport_btn"/>
+ <button label="Harita" name="map_btn"/>
+ </layout_panel>
+ <layout_panel name="marketplace panel">
+ <text name="Location">
+ Pazar yeri mağazası:
+ </text>
+ <text name="LocationTextText">
+ bir yer
+ </text>
+ </layout_panel>
+ <layout_panel>
+ <text name="ContentRating">
+ Seviye:
+ </text>
+ <text name="ContentRatingText">
+ YetiÅŸkin
+ </text>
+ <text name="Owner">
+ Sahip:
+ </text>
+ <text name="OwnerText">
+ Kyle
+ </text>
+ <button label="Düzenle" name="edit_btn"/>
+ </layout_panel>
+ </layout_stack>
+ </panel>
+ </scroll_container>
+</panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_experience_list_editor.xml b/indra/newview/skins/default/xui/tr/panel_experience_list_editor.xml
new file mode 100644
index 0000000000..5379fe4548
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/panel_experience_list_editor.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="experince_list_editor">
+ <panel.string name="loading">
+ yükleniyor...
+ </panel.string>
+ <panel.string name="panel_allowed">
+ Ä°zin Verilen Deneyimler:
+ </panel.string>
+ <panel.string name="panel_blocked">
+ Engellenen Deneyimler:
+ </panel.string>
+ <panel.string name="panel_trusted">
+ Anahtar Deneyimler:
+ </panel.string>
+ <panel.string name="no_results">
+ (boÅŸ)
+ </panel.string>
+ <text name="text_name">
+ Deneyim Listesi
+ </text>
+ <scroll_list name="experience_list">
+ <columns label="Ad" name="experience_name"/>
+ </scroll_list>
+ <button label="Ekle..." name="btn_add"/>
+ <button label="Kaldır" name="btn_remove"/>
+ <button label="Profil..." name="btn_profile"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_experience_list_item.xml b/indra/newview/skins/default/xui/tr/panel_experience_list_item.xml
new file mode 100644
index 0000000000..b904295f97
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/panel_experience_list_item.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Experiences">
+ <text name="experience_name">
+ Geçici Ad
+ </text>
+</panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_experience_log.xml b/indra/newview/skins/default/xui/tr/panel_experience_log.xml
new file mode 100644
index 0000000000..600530cf2d
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/panel_experience_log.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="EVENTS">
+ <string name="no_events" value="Olay yok."/>
+ <string name="loading" value="yükleniyor..."/>
+ <layout_stack>
+ <layout_panel>
+ <scroll_list name="experience_log_list">
+ <columns label="Süre" name="time"/>
+ <columns label="Etkinlik" name="event"/>
+ <columns label="Deneyim" name="experience_name"/>
+ <columns label="Nesne" name="object_name"/>
+ </scroll_list>
+ <button label="Bildir" name="btn_notify"/>
+ <button label="Profil" name="btn_profile_xp"/>
+ <button label="Raporla" name="btn_report_xp"/>
+ </layout_panel>
+ <layout_panel name="button_panel">
+ <check_box label="Tüm Olayları Bildir Gün" name="notify_all"/>
+ <button label="Temizle" name="btn_clear"/>
+ <button label="&lt;" name="btn_prev"/>
+ <button label="&gt;" name="btn_next"/>
+ </layout_panel>
+ </layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_experience_search.xml b/indra/newview/skins/default/xui/tr/panel_experience_search.xml
new file mode 100644
index 0000000000..7cc2bd1223
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/panel_experience_search.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="SEARCH">
+ <string name="not_found">
+ &quot;[TEXT]&quot; bulunamadı
+ </string>
+ <string name="no_results">
+ Sonuç yok
+ </string>
+ <string name="searching">
+ Arıyor...
+ </string>
+ <string name="loading">
+ Yükleniyor...
+ </string>
+ <string name="maturity_icon_general">
+ &quot;Parcel_PG_Light&quot;
+ </string>
+ <string name="maturity_icon_moderate">
+ &quot;Parcel_M_Light&quot;
+ </string>
+ <string name="maturity_icon_adult">
+ &quot;Parcel_R_Light&quot;
+ </string>
+ <panel name="search_panel">
+ <button label="Git" name="find"/>
+ <icons_combo_box label="Orta" name="maturity">
+ <icons_combo_box.item label="YetiÅŸkin" name="Adult" value="42"/>
+ <icons_combo_box.item label="Orta" name="Mature" value="21"/>
+ <icons_combo_box.item label="Genel" name="PG" value="13"/>
+ </icons_combo_box>
+ <scroll_list name="search_results">
+ <columns label="Ad" name="experience_name"/>
+ <columns label="Sahip" name="owner"/>
+ </scroll_list>
+ <button label="Tamam" label_selected="Tamam" name="ok_btn"/>
+ <button label="Ä°ptal" name="cancel_btn"/>
+ <button label="Profili Görüntüle" name="profile_btn"/>
+ <button label="&lt;" name="left_btn"/>
+ <button label="&gt;" name="right_btn"/>
+ </panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_experiences.xml b/indra/newview/skins/default/xui/tr/panel_experiences.xml
new file mode 100644
index 0000000000..15be61aad2
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/panel_experiences.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Experiences">
+ <string name="loading_experiences" value="Deneyimler yükleniyor..."/>
+ <string name="no_experiences" value="Deneyim yok."/>
+ <string name="acquire" value="Bir Deneyim Edin"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_facebook_friends.xml b/indra/newview/skins/default/xui/tr/panel_facebook_friends.xml
index 0a6b9ac600..8184d6d7cf 100644
--- a/indra/newview/skins/default/xui/tr/panel_facebook_friends.xml
+++ b/indra/newview/skins/default/xui/tr/panel_facebook_friends.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<panel name="panel_facebook_friends">
<string name="facebook_friends_empty" value="Şu an için aynı zamanda bir Second Life sakini olan hiçbir Facebook arkadaşınız yok. Facebook arkadaşlarınızı bugün Second Life&apos;a katılmaya davet edin!"/>
- <string name="facebook_friends_no_connected" value="Şu anda Facebook&apos;a bağlı değilsiniz. Bağlanmak ve bu özelliği etkinleştirmek için lütfen Hesap sekmesine gidin."/>
+ <string name="facebook_friends_no_connected" value="Şu anda Facebook&apos;a bağlı değilsiniz. Bağlanmak ve bu özelliği etkinleştirmek için lütfen Durum sekmesine gidin."/>
<accordion name="friends_accordion">
<accordion_tab name="tab_second_life_friends" title="SL arkadaşları"/>
<accordion_tab name="tab_suggested_friends" title="Bu kişileri SL arkadaşları olarak ekle"/>
diff --git a/indra/newview/skins/default/xui/tr/panel_facebook_photo.xml b/indra/newview/skins/default/xui/tr/panel_facebook_photo.xml
index 64732c5fc7..d772aff937 100644
--- a/indra/newview/skins/default/xui/tr/panel_facebook_photo.xml
+++ b/indra/newview/skins/default/xui/tr/panel_facebook_photo.xml
@@ -1,26 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<panel name="panel_facebook_photo">
- <layout_stack name="stack_photo">
- <layout_panel name="snapshot_panel">
- <combo_box name="resolution_combobox" tool_tip="Görüntü çözünürlüğü">
- <combo_box.item label="Mevcut Pencere" name="CurrentWindow"/>
- <combo_box.item label="640x480" name="640x480"/>
- <combo_box.item label="800x600" name="800x600"/>
- <combo_box.item label="1024x768" name="1024x768"/>
- <combo_box.item label="1200x630" name="1200x630"/>
- </combo_box>
- <combo_box name="filters_combobox" tool_tip="Görüntü filtreleri">
- <combo_box.item label="Filtre Yok" name="NoFilter"/>
- </combo_box>
- <button label="Yenile" name="new_snapshot_btn" tool_tip="Yenilemek için tıklayın"/>
- <button label="Önizleme" name="big_preview_btn" tool_tip="Önizleme ayarları arasında geçiş yapmak için tıklayın"/>
- <text name="caption_label">
- Yorum (isteğe bağlı):
- </text>
- </layout_panel>
- <layout_panel name="photo_button_panel">
- <button label="Yayınla" name="post_photo_btn"/>
- <button label="Ä°ptal" name="cancel_photo_btn"/>
- </layout_panel>
- </layout_stack>
+ <combo_box name="resolution_combobox" tool_tip="Görüntü çözünürlüğü">
+ <combo_box.item label="Mevcut Pencere" name="CurrentWindow"/>
+ <combo_box.item label="640x480" name="640x480"/>
+ <combo_box.item label="800x600" name="800x600"/>
+ <combo_box.item label="1024x768" name="1024x768"/>
+ <combo_box.item label="1200x630" name="1200x630"/>
+ </combo_box>
+ <combo_box name="filters_combobox" tool_tip="Görüntü filtreleri">
+ <combo_box.item label="Filtre Yok" name="NoFilter"/>
+ </combo_box>
+ <button label="Yenile" name="new_snapshot_btn" tool_tip="Yenilemek için tıklayın"/>
+ <button label="Önizleme" name="big_preview_btn" tool_tip="Önizleme ayarları arasında geçiş yapmak için tıklayın"/>
+ <text name="caption_label">
+ Yorum (isteğe bağlı):
+ </text>
+ <button label="Yayınla" name="post_photo_btn"/>
+ <button label="Ä°ptal" name="cancel_photo_btn"/>
</panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_facebook_place.xml b/indra/newview/skins/default/xui/tr/panel_facebook_place.xml
index 54c392c9d8..85b401a1a0 100644
--- a/indra/newview/skins/default/xui/tr/panel_facebook_place.xml
+++ b/indra/newview/skins/default/xui/tr/panel_facebook_place.xml
@@ -1,17 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<panel name="panel_facebook_place">
- <layout_stack name="stack_place">
- <layout_panel name="place_detail_panel">
- <text name="place_caption_label">
- Bulunduğunuz yer hakkında bir şeyler söyleyin:
- </text>
- </layout_panel>
- <layout_panel name="place_map_panel">
- <check_box initial_value="false" label="" name="add_place_view_cb"/>
- </layout_panel>
- <layout_panel name="place_button_panel">
- <button label="Yayınla" name="post_place_btn"/>
- <button label="Ä°ptal" name="cancel_place_btn"/>
- </layout_panel>
- </layout_stack>
+ <text name="place_caption_label">
+ Bulunduğunuz yer hakkında bir şeyler söyleyin:
+ </text>
+ <check_box initial_value="false" label="Konumun üstten görünümünü ekle" name="add_place_view_cb"/>
+ <button label="Yayınla" name="post_place_btn"/>
+ <button label="Ä°ptal" name="cancel_place_btn"/>
</panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_facebook_status.xml b/indra/newview/skins/default/xui/tr/panel_facebook_status.xml
index 9b95fe3a35..e6feff5949 100644
--- a/indra/newview/skins/default/xui/tr/panel_facebook_status.xml
+++ b/indra/newview/skins/default/xui/tr/panel_facebook_status.xml
@@ -1,14 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<panel name="panel_facebook_status">
- <layout_stack name="stack_status">
- <layout_panel name="status_detail_panel">
- <text name="status_caption_label">
- Ne düşünüyorsunuz?
- </text>
- </layout_panel>
- <layout_panel name="status_button_panel">
- <button label="Yayınla" name="post_status_btn"/>
- <button label="Ä°ptal" name="cancel_status_btn"/>
- </layout_panel>
- </layout_stack>
+ <string name="facebook_connected" value="Facebook&apos;a şu kimlikle bağlandınız:"/>
+ <string name="facebook_disconnected" value="Facebook&apos;a bağlanılmadı"/>
+ <text name="account_caption_label">
+ Facebook&apos;a bağlanılmadı.
+ </text>
+ <panel name="panel_buttons">
+ <button label="BaÄŸlan..." name="connect_btn"/>
+ <button label="Bağlantıyı kes" name="disconnect_btn"/>
+ <text name="account_learn_more_label">
+ [http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-Share-Facebook/ta-p/2149711 Facebook&apos;ta içerik yayınlama hakkında bilgi edinin]
+ </text>
+ </panel>
+ <text name="status_caption_label">
+ Ne düşünüyorsunuz?
+ </text>
+ <button label="Yayınla" name="post_status_btn"/>
+ <button label="Ä°ptal" name="cancel_status_btn"/>
</panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_flickr_photo.xml b/indra/newview/skins/default/xui/tr/panel_flickr_photo.xml
index 9ebc70c67c..cab1b24621 100644
--- a/indra/newview/skins/default/xui/tr/panel_flickr_photo.xml
+++ b/indra/newview/skins/default/xui/tr/panel_flickr_photo.xml
@@ -1,41 +1,35 @@
<?xml version="1.0" encoding="utf-8"?>
<panel name="panel_flickr_photo">
- <layout_stack name="stack_photo">
- <layout_panel name="snapshot_panel">
- <combo_box name="resolution_combobox" tool_tip="Görüntü çözünürlüğü">
- <combo_box.item label="Mevcut Pencere" name="CurrentWindow"/>
- <combo_box.item label="640x480" name="640x480"/>
- <combo_box.item label="800x600" name="800x600"/>
- <combo_box.item label="1024x768" name="1024x768"/>
- </combo_box>
- <combo_box name="filters_combobox" tool_tip="Görüntü filtreleri">
- <combo_box.item label="Filtre Yok" name="NoFilter"/>
- </combo_box>
- <button label="Yenile" name="new_snapshot_btn" tool_tip="Yenilemek için tıklayın"/>
- <button label="Önizleme" name="big_preview_btn" tool_tip="Önizleme ayarları arasında geçiş yapmak için tıklayın"/>
- <text name="title_label">
- Başlık:
- </text>
- <text name="description_label">
- Açıklama:
- </text>
- <check_box initial_value="true" label="Açıklamanın sonuna SL konumunu ekle" name="add_location_cb"/>
- <text name="tags_label">
- Etiketler:
- </text>
- <text name="tags_help_label">
- Etiketleri boşlukla ayır
+ <combo_box name="resolution_combobox" tool_tip="Görüntü çözünürlüğü">
+ <combo_box.item label="Mevcut Pencere" name="CurrentWindow"/>
+ <combo_box.item label="640x480" name="640x480"/>
+ <combo_box.item label="800x600" name="800x600"/>
+ <combo_box.item label="1024x768" name="1024x768"/>
+ </combo_box>
+ <combo_box name="filters_combobox" tool_tip="Görüntü filtreleri">
+ <combo_box.item label="Filtre Yok" name="NoFilter"/>
+ </combo_box>
+ <button label="Yenile" name="new_snapshot_btn" tool_tip="Yenilemek için tıklayın"/>
+ <button label="Önizleme" name="big_preview_btn" tool_tip="Önizleme ayarları arasında geçiş yapmak için tıklayın"/>
+ <text name="title_label">
+ Başlık:
+ </text>
+ <text name="description_label">
+ Açıklama:
+ </text>
+ <check_box initial_value="true" label="Açıklamanın sonuna SL konumunu ekle" name="add_location_cb"/>
+ <text name="tags_label">
+ Etiketler:
+ </text>
+ <text name="tags_help_label">
+ Etiketleri boşlukla ayır
Birden çok kelime içeren etiketler için &quot;&quot; kullan
- </text>
- <combo_box name="rating_combobox" tool_tip="Filckr içerik seviyesi">
- <combo_box.item label="Güvenli Flickr seviyesi" name="SafeRating"/>
- <combo_box.item label="Orta Flickr seviyesi" name="ModerateRating"/>
- <combo_box.item label="Kısıtlı Flickr seviyesi" name="RestrictedRating"/>
- </combo_box>
- </layout_panel>
- <layout_panel name="photo_button_panel">
- <button label="Karşıya Yükle" name="post_photo_btn"/>
- <button label="Ä°ptal" name="cancel_photo_btn"/>
- </layout_panel>
- </layout_stack>
+ </text>
+ <combo_box name="rating_combobox" tool_tip="Filckr içerik seviyesi">
+ <combo_box.item label="Güvenli Flickr seviyesi" name="SafeRating"/>
+ <combo_box.item label="Orta Flickr seviyesi" name="ModerateRating"/>
+ <combo_box.item label="Kısıtlı Flickr seviyesi" name="RestrictedRating"/>
+ </combo_box>
+ <button label="Karşıya Yükle" name="post_photo_btn"/>
+ <button label="Ä°ptal" name="cancel_photo_btn"/>
</panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/tr/panel_group_info_sidetray.xml
index e4697eaa21..d72bb2cf31 100755
--- a/indra/newview/skins/default/xui/tr/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/default/xui/tr/panel_group_info_sidetray.xml
@@ -23,6 +23,7 @@
<accordion_tab name="group_roles_tab" title="Roller ve Ãœyeler"/>
<accordion_tab name="group_notices_tab" title="Bildirimler"/>
<accordion_tab name="group_land_tab" title="Arazi/Varlıklar"/>
+ <accordion_tab name="group_experiences_tab" title="Deneyimler"/>
</accordion>
</layout_panel>
</layout_stack>
diff --git a/indra/newview/skins/default/xui/tr/panel_login.xml b/indra/newview/skins/default/xui/tr/panel_login.xml
index ce1519be89..8b320ce9aa 100755
--- a/indra/newview/skins/default/xui/tr/panel_login.xml
+++ b/indra/newview/skins/default/xui/tr/panel_login.xml
@@ -1,26 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<panel name="panel_login">
- <panel.string name="forgot_password_url">
- http://secondlife.com/account/request.php
- </panel.string>
+ <panel.string name="forgot_password_url">http://secondlife.com/account/request.php</panel.string>
<layout_stack name="ui_stack">
<layout_panel name="ui_container">
<combo_box label="Kullanıcı Adı" name="username_combo" tool_tip="Kaydolduğunuzda seçtiğiniz kullanıcı adı, örn. mustafayalcin12 veya Faruk Gungoren"/>
<line_editor label="Parola" name="password_edit"/>
- <check_box label="Beni hatırla" name="remember_check"/>
- <text name="forgot_password_text">
- Parolamı unuttum
- </text>
- <button label="Oturum Aç" name="connect_btn"/>
- <text name="At_My_Last_Location_Label">
- son konumum
- </text>
<combo_box label="Sık kullandığım yerler" name="start_location_combo">
+ <combo_box.item label="Son konumum" name="MyLastLocation"/>
<combo_box.item label="Ana konumum" name="MyHome"/>
</combo_box>
- <button label="Oturum Aç" name="connect_favorite_btn"/>
- <line_editor label="Bir yer adı yazın" name="location_edit"/>
- <button label="Oturum Aç" name="connect_location_btn"/>
+ <button label="Oturum Aç" name="connect_btn"/>
+ <check_box label="Beni hatırla" name="remember_check"/>
+ <text name="forgot_password_text">Parolamı unuttum</text>
<combo_box label="Ağ seç" name="server_combo"/>
</layout_panel>
</layout_stack>
diff --git a/indra/newview/skins/default/xui/tr/panel_marketplace_listings.xml b/indra/newview/skins/default/xui/tr/panel_marketplace_listings.xml
new file mode 100644
index 0000000000..50acc0f92a
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/panel_marketplace_listings.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Pazaryeri" name="Marketplace Panel">
+ <panel name="tool_panel">
+ <menu_button name="sort_btn" tool_tip="Seçenekleri görüntüleyin/sıralayın"/>
+ <button name="add_btn" tool_tip="Yeni bir ilan klasörü oluşturun"/>
+ <button label="Hatalara Karşı Kontrol Et" name="audit_btn" tool_tip="Pazaryeri ilanlarınızı kontrol edin"/>
+ </panel>
+ <panel name="tab_container_panel">
+ <filter_editor label="Pazaryeri İlanlarını Filtrele" name="filter_editor"/>
+ </panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_marketplace_listings_inventory.xml b/indra/newview/skins/default/xui/tr/panel_marketplace_listings_inventory.xml
new file mode 100644
index 0000000000..8d857d20f0
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/panel_marketplace_listings_inventory.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<inventory_panel label="TÜMÜ" name="All Items" tool_tip="Öğeleri listelemek için buraya sürükleyin ve bırakın"/>
diff --git a/indra/newview/skins/default/xui/tr/panel_marketplace_listings_listed.xml b/indra/newview/skins/default/xui/tr/panel_marketplace_listings_listed.xml
new file mode 100644
index 0000000000..c647a11246
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/panel_marketplace_listings_listed.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<inventory_panel label="LÄ°STELENMÄ°Åž" name="Active Items"/>
diff --git a/indra/newview/skins/default/xui/tr/panel_marketplace_listings_unassociated.xml b/indra/newview/skins/default/xui/tr/panel_marketplace_listings_unassociated.xml
new file mode 100644
index 0000000000..ec9213ff35
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/panel_marketplace_listings_unassociated.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<inventory_panel label="Ä°LÄ°ÅžKÄ°LENDÄ°RÄ°LMEMÄ°Åž" name="Unassociated Items"/>
diff --git a/indra/newview/skins/default/xui/tr/panel_marketplace_listings_unlisted.xml b/indra/newview/skins/default/xui/tr/panel_marketplace_listings_unlisted.xml
new file mode 100644
index 0000000000..d8c1b0a6d0
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/panel_marketplace_listings_unlisted.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<inventory_panel label="LÄ°STELENMEMÄ°Åž" name="Inactive Items"/>
diff --git a/indra/newview/skins/default/xui/tr/panel_postcard_settings.xml b/indra/newview/skins/default/xui/tr/panel_postcard_settings.xml
index bce0b21b9a..e1443217e8 100755
--- a/indra/newview/skins/default/xui/tr/panel_postcard_settings.xml
+++ b/indra/newview/skins/default/xui/tr/panel_postcard_settings.xml
@@ -7,17 +7,7 @@
<combo_box.item label="1024x768" name="1024x768"/>
<combo_box.item label="Özel" name="Custom"/>
</combo_box>
- <layout_stack name="postcard_image_params_ls">
- <layout_panel name="postcard_image_size_lp">
- <spinner label="GeniÅŸlik" name="postcard_snapshot_width"/>
- <spinner label="Yükseklik" name="postcard_snapshot_height"/>
- <check_box label="Oranları koru" name="postcard_keep_aspect_check"/>
- </layout_panel>
- <layout_panel name="postcard_image_format_quality_lp">
- <slider label="Görüntü kalitesi" name="image_quality_slider"/>
- <text name="image_quality_level">
- ([QLVL])
- </text>
- </layout_panel>
- </layout_stack>
+ <spinner label="Genişlik x Yükseklik" name="postcard_snapshot_width"/>
+ <check_box label="Oranları koru" name="postcard_keep_aspect_check"/>
+ <slider label="Kalite:" name="image_quality_slider"/>
</panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_preferences_setup.xml b/indra/newview/skins/default/xui/tr/panel_preferences_setup.xml
index 2039761748..acb20595f7 100755
--- a/indra/newview/skins/default/xui/tr/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/tr/panel_preferences_setup.xml
@@ -14,9 +14,9 @@
<text name="Web:">
Web:
</text>
- <radio_group name="use_external_browser">
- <radio_item label="Tarayıcımı kullan (IE, Firefox, Safari)" name="external" tool_tip="Yardım, web bağlantıları vs. için sistemin varsayılan web tarayıcısını kullanın. Tam ekran çalıştırılıyorsa tavsiye edilmez." value="true"/>
- <radio_item label="Yerleşik tarayıcıyı kullan" name="internal" tool_tip="Yardım, web bağlantıları vs. için dahili web tarayıcısını kullanın. Bu tarayıcı [APP_NAME] içerisinde yeni bir pencere olarak açılır." value=""/>
+ <radio_group name="preferred_browser_behavior">
+ <radio_item label="Tüm bağlantılar için kendi tarayıcımı kullan (Chrome, Firefox, IE)" name="internal" tool_tip="Yardım, web bağlantıları vb. için sistemin varsayılan web tarayıcısını kullanın. Tam ekran çalıştırılıyorsa tavsiye edilmez." value="0"/>
+ <radio_item label="Yerleşik tarayıcıyı yalnızca Second Life bağlantıları için kullan" name="external" tool_tip="Yardım, web bağlantıları vb. için sistemin varsayılan web tarayıcısını kullanın. Yerleşik tarayıcı yalnızca LindenLab/SecondLife bağlantıları için kullanılır." value="1"/>
</radio_group>
<check_box initial_value="true" label="Eklentileri etkinleÅŸtir" name="browser_plugins_enabled"/>
<check_box initial_value="true" label="Çerezleri kabul et" name="cookies_enabled"/>
diff --git a/indra/newview/skins/default/xui/tr/panel_region_experiences.xml b/indra/newview/skins/default/xui/tr/panel_region_experiences.xml
new file mode 100644
index 0000000000..406995c359
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/panel_region_experiences.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Deneyimler" name="Experiences">
+ <panel.string name="trusted_estate_text">
+ Her Deneyim bir Anahtar olabilir.
+
+Bu gayrimenkul üzerinde Anahtar Deneyimlerin çalıştırılma izni var.
+
+Ek olarak, gayrimenkul genel erişime izin vermiyorsa, herhangi bir Anahtar Deneyime katılan Sakinler gayrimenkule girebilir ve bir Anahtar Deneyime dahil oldukları sürece burada kalabilirler.
+ </panel.string>
+ <panel.string name="allowed_estate_text">
+ Yalnızca Arazi Kapsamındaki Deneyimlere İzin Verilebilir.
+
+Bu gayrimenkul üzerinde İzin Verilen Deneyimlerin çalıştırılma izni var.
+ </panel.string>
+ <panel.string name="blocked_estate_text">
+ Yalnızca Ağ Kapsamındaki Deneyimler Engellenebilir.
+
+Bu gayrimenkul üzerinde Engellenmiş Deneyimler çalıştırılamaz.
+ </panel.string>
+ <panel.string name="estate_caption">
+ Bu sekmedeki ayarlarda yapılan değişiklikler gayrimenkul içerisindeki tüm bölgeleri etkiler.
+ </panel.string>
+ <panel.string name="allowed_parcel_text">
+ Yalnızca Arazi Kapsamındaki Deneyimlere İzin Verilebilir.
+
+Gayrimenkul tarafından engellenmemişlerse, İzin Verilen Deneyimlerin bu parsel üzerinde çalıştırılma izni vardır.
+ </panel.string>
+ <panel.string name="blocked_parcel_text">
+ Sakinlerin Tüm Deneyimleri Engellenebilir.
+
+Engellenmiş Deneyimler bu parselde çalıştırılamaz.
+ </panel.string>
+</panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_script_experience.xml b/indra/newview/skins/default/xui/tr/panel_script_experience.xml
new file mode 100644
index 0000000000..1e7054c310
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/panel_script_experience.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<panel name="script_experience" title="DENEYÄ°M">
+ <button label="Deneyim" name="Expand Experience"/>
+ <check_box label="Deneyimi Kullanır" name="enable_xp"/>
+ <layout_stack name="xp_details">
+ <layout_panel>
+ <combo_box label="Deneyimi Seç..." name="Experiences..."/>
+ </layout_panel>
+ </layout_stack>
+ <text name="No Experiences">
+ Hiçbir deneyimde katkınız yok.
+ </text>
+</panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/tr/panel_snapshot_inventory.xml
index e3b22c639a..160cba8700 100755
--- a/indra/newview/skins/default/xui/tr/panel_snapshot_inventory.xml
+++ b/indra/newview/skins/default/xui/tr/panel_snapshot_inventory.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="panel_snapshot_inventory">
<text name="title">
- Envanterime Kaydet
+ Envanter
</text>
<text name="hint_lbl">
Bir görüntüyü envanterinize kaydetmenin maliyeti L$[UPLOAD_COST] olur. Görüntünüzü bir doku olarak kaydetmek için kare formatlardan birini seçin.
@@ -13,8 +13,8 @@
<combo_box.item label="Büyük (512x512)" name="Large(512x512)"/>
<combo_box.item label="Özel" name="Custom"/>
</combo_box>
- <spinner label="GeniÅŸlik" name="inventory_snapshot_width"/>
- <spinner label="Yükseklik" name="inventory_snapshot_height"/>
+ <spinner label="Genişlik x Yükseklik" name="inventory_snapshot_width"/>
+ <spinner label="" name="inventory_snapshot_height"/>
<check_box label="Oranları koru" name="inventory_keep_aspect_check"/>
<button label="Ä°ptal" name="cancel_btn"/>
<button label="Kaydet" name="save_btn"/>
diff --git a/indra/newview/skins/default/xui/tr/panel_snapshot_local.xml b/indra/newview/skins/default/xui/tr/panel_snapshot_local.xml
index 87d7677d73..a28e390ee5 100755
--- a/indra/newview/skins/default/xui/tr/panel_snapshot_local.xml
+++ b/indra/newview/skins/default/xui/tr/panel_snapshot_local.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="panel_snapshot_local">
<text name="title">
- Bilgisayarıma Kaydet
+ Disk
</text>
<combo_box label="Çözünürlük" name="local_size_combo">
<combo_box.item label="Mevcut Pencere" name="CurrentWindow"/>
@@ -13,24 +13,17 @@
<combo_box.item label="1600x1200" name="1600x1200"/>
<combo_box.item label="Özel" name="Custom"/>
</combo_box>
- <layout_stack name="local_image_params_ls">
- <layout_panel name="local_image_size_lp">
- <spinner label="GeniÅŸlik" name="local_snapshot_width"/>
- <spinner label="Yükseklik" name="local_snapshot_height"/>
- <check_box label="Oranları koru" name="local_keep_aspect_check"/>
- </layout_panel>
- <layout_panel name="local_image_format_quality_lp">
- <combo_box label="Format" name="local_format_combo">
- <combo_box.item label="PNG (Kayıpsız)" name="PNG"/>
- <combo_box.item label="JPEG" name="JPEG"/>
- <combo_box.item label="BMP (Kayıpsız)" name="BMP"/>
- </combo_box>
- <slider label="Görüntü kalitesi" name="image_quality_slider"/>
- <text name="image_quality_level">
- ([QLVL])
- </text>
- </layout_panel>
- </layout_stack>
+ <spinner label="Genişlik x Yükseklik" name="local_snapshot_width"/>
+ <check_box label="Oranları koru" name="local_keep_aspect_check"/>
+ <text name="local_format_label">
+ Format:
+ </text>
+ <combo_box label="Format" name="local_format_combo">
+ <combo_box.item label="PNG (Kayıpsız)" name="PNG"/>
+ <combo_box.item label="JPEG" name="JPEG"/>
+ <combo_box.item label="BMP (Kayıpsız)" name="BMP"/>
+ </combo_box>
+ <slider label="Kalite:" name="image_quality_slider"/>
<button label="Ä°ptal" name="cancel_btn"/>
<flyout_button label="Kaydet" name="save_btn" tool_tip="Görüntüyü bir dosyaya kaydet">
<flyout_button.item label="Kaydet" name="save_item"/>
diff --git a/indra/newview/skins/default/xui/tr/panel_snapshot_options.xml b/indra/newview/skins/default/xui/tr/panel_snapshot_options.xml
index 4bc1098ce9..db29e6908c 100755
--- a/indra/newview/skins/default/xui/tr/panel_snapshot_options.xml
+++ b/indra/newview/skins/default/xui/tr/panel_snapshot_options.xml
@@ -1,16 +1,10 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="panel_snapshot_options">
- <button label="Profil Akışımda Yayınla" name="save_to_profile_btn"/>
- <button label="E-posta" name="save_to_email_btn"/>
- <button label="Envanterime Kaydet (L$[AMOUNT])" name="save_to_inventory_btn"/>
- <button label="Bilgisayarıma Kaydet" name="save_to_computer_btn"/>
- <text name="send_to_facebook_textbox">
- Gönder: [secondlife:/// Facebook]
- </text>
- <text name="send_to_twitter_textbox">
- [secondlife:/// Twitter]
- </text>
- <text name="send_to_flickr_textbox">
- [secondlife:/// Flickr]
- </text>
+ <button label="Diske Kaydet" name="save_to_computer_btn"/>
+ <button label="Envantere Kaydet (L$[AMOUNT])" name="save_to_inventory_btn"/>
+ <button label="Profile Yükle" name="save_to_profile_btn"/>
+ <button label="Facebook&apos;a Yükle" name="send_to_facebook_btn"/>
+ <button label="Twitter&apos;a Yükle" name="send_to_twitter_btn"/>
+ <button label="Flickr&apos;a Yükle" name="send_to_flickr_btn"/>
+ <button label="E-postayla Gönder" name="save_to_email_btn"/>
</panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/tr/panel_snapshot_postcard.xml
index e999678a0d..ecb47b2218 100755
--- a/indra/newview/skins/default/xui/tr/panel_snapshot_postcard.xml
+++ b/indra/newview/skins/default/xui/tr/panel_snapshot_postcard.xml
@@ -12,6 +12,10 @@
<text name="title">
E-posta
</text>
- <button label="Ä°leti" name="message_btn"/>
- <button label="Ayarlar" name="settings_btn"/>
+ <tab_container name="postcard_tabs">
+ <panel label="Ä°leti" name="panel_postcard_message"/>
+ <panel label="Ayarlar" name="panel_postcard_settings"/>
+ </tab_container>
+ <button label="Ä°ptal" name="cancel_btn"/>
+ <button label="Gönder" name="send_btn"/>
</panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_snapshot_profile.xml b/indra/newview/skins/default/xui/tr/panel_snapshot_profile.xml
index 334fd52a48..ed8f25f255 100755
--- a/indra/newview/skins/default/xui/tr/panel_snapshot_profile.xml
+++ b/indra/newview/skins/default/xui/tr/panel_snapshot_profile.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="panel_snapshot_profile">
<text name="title">
- Profil Akışımda Yayınla
+ Profil
</text>
<combo_box label="Çözünürlük" name="profile_size_combo">
<combo_box.item label="Mevcut Pencere" name="CurrentWindow"/>
@@ -10,19 +10,12 @@
<combo_box.item label="1024x768" name="1024x768"/>
<combo_box.item label="Özel" name="Custom"/>
</combo_box>
- <layout_stack name="profile_image_params_ls">
- <layout_panel name="profile_image_size_lp">
- <spinner label="GeniÅŸlik" name="profile_snapshot_width"/>
- <spinner label="Yükseklik" name="profile_snapshot_height"/>
- <check_box label="Oranları koru" name="profile_keep_aspect_check"/>
- </layout_panel>
- <layout_panel name="profile_image_metadata_lp">
- <text name="caption_label">
- Resim yazısı:
- </text>
- <check_box initial_value="true" label="Konumu dahil et" name="add_location_cb"/>
- </layout_panel>
- </layout_stack>
+ <spinner label="Genişlik x Yükseklik" name="profile_snapshot_width"/>
+ <check_box label="Oranları koru" name="profile_keep_aspect_check"/>
+ <text name="caption_label">
+ Resim yazısı:
+ </text>
+ <check_box initial_value="true" label="Konumu dahil et" name="add_location_cb"/>
<button label="Ä°ptal" name="cancel_btn"/>
<button label="Yayınla" name="post_btn"/>
</panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_status_bar.xml b/indra/newview/skins/default/xui/tr/panel_status_bar.xml
index 178cbda4a2..9e2669ec2b 100755
--- a/indra/newview/skins/default/xui/tr/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/tr/panel_status_bar.xml
@@ -1,28 +1,16 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="status">
- <panel.string name="packet_loss_tooltip">
- Paket Kaybı
- </panel.string>
- <panel.string name="bandwidth_tooltip">
- Bant geniÅŸliÄŸi
- </panel.string>
- <panel.string name="time">
- [hour12, datetime, slt]:[min, datetime, slt] [ampm, datetime, slt] [timezone,datetime, slt]
- </panel.string>
- <panel.string name="timeTooltip">
- [weekday, datetime, slt], [day, datetime, slt] [month, datetime, slt] [year, datetime, slt]
- </panel.string>
- <panel.string name="buycurrencylabel">
- L$ [AMT]
- </panel.string>
+ <panel.string name="packet_loss_tooltip">Paket Kaybı</panel.string>
+ <panel.string name="bandwidth_tooltip">Bant geniÅŸliÄŸi</panel.string>
+ <panel.string name="time">[hour12, datetime, slt]:[min, datetime, slt] [ampm, datetime, slt] [timezone,datetime, slt]</panel.string>
+ <panel.string name="timeTooltip">[weekday, datetime, slt], [day, datetime, slt] [month, datetime, slt] [year, datetime, slt]</panel.string>
+ <panel.string name="buycurrencylabel">L$ [AMT]</panel.string>
<panel left="-425" name="balance_bg" width="215">
- <text name="balance" tool_tip="L$ bakiyenizi yenilemek için buraya tıklayın" value="L$20"/>
+ <text name="balance" tool_tip="L$ bakiyenizi yenilemek için buraya tıklayın" value="L$??"/>
<button label="L$ Satın Al" name="buyL" tool_tip="Daha fazla L$ satın almak için tıklayın"/>
<button label="Alışveriş yap" name="goShop" tool_tip="Second Life Pazaryeri Aç" width="95"/>
</panel>
- <text name="TimeText" tool_tip="Geçerli zaman (Pasifik)">
- 24:00 AM PST
- </text>
+ <text name="TimeText" tool_tip="Geçerli zaman (Pasifik)">24:00 AM PST</text>
<button name="media_toggle_btn" tool_tip="Tüm Ortam Öğelerini Başlat/Durdur (Müzik, Video, Web sayfaları)"/>
<button name="volume_btn" tool_tip="Küresel Ses Kontrolü"/>
</panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_twitter_photo.xml b/indra/newview/skins/default/xui/tr/panel_twitter_photo.xml
index 966e9b906d..511ecb690d 100644
--- a/indra/newview/skins/default/xui/tr/panel_twitter_photo.xml
+++ b/indra/newview/skins/default/xui/tr/panel_twitter_photo.xml
@@ -1,32 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<panel name="panel_twitter_photo">
- <layout_stack name="stack_photo">
- <layout_panel name="text_panel">
- <text name="status_label">
- Neler oluyor?
- </text>
- <text name="status_counter_label">
- 140
- </text>
- <check_box initial_value="true" label="SL konumunu dahil et" name="add_location_cb"/>
- <check_box initial_value="true" label="FotoÄŸraf ekle" name="add_photo_cb"/>
- </layout_panel>
- <layout_panel name="snapshot_panel">
- <combo_box name="resolution_combobox" tool_tip="Görüntü çözünürlüğü">
- <combo_box.item label="Mevcut Pencere" name="CurrentWindow"/>
- <combo_box.item label="640x480" name="640x480"/>
- <combo_box.item label="800x600" name="800x600"/>
- <combo_box.item label="1024x768" name="1024x768"/>
- </combo_box>
- <combo_box name="filters_combobox" tool_tip="Görüntü filtreleri">
- <combo_box.item label="Filtre Yok" name="NoFilter"/>
- </combo_box>
- <button label="Yenile" name="new_snapshot_btn" tool_tip="Yenilemek için tıklayın"/>
- <button label="Önizleme" name="big_preview_btn" tool_tip="Önizleme ayarları arasında geçiş yapmak için tıklayın"/>
- </layout_panel>
- <layout_panel name="photo_button_panel">
- <button label="Tweet" name="post_photo_btn"/>
- <button label="Ä°ptal" name="cancel_photo_btn"/>
- </layout_panel>
- </layout_stack>
+ <text name="status_label">
+ Neler oluyor?
+ </text>
+ <text name="status_counter_label">
+ 140
+ </text>
+ <check_box initial_value="true" label="SL konumunu dahil et" name="add_location_cb"/>
+ <check_box initial_value="true" label="FotoÄŸraf ekle" name="add_photo_cb"/>
+ <combo_box name="resolution_combobox" tool_tip="Görüntü çözünürlüğü">
+ <combo_box.item label="Mevcut Pencere" name="CurrentWindow"/>
+ <combo_box.item label="640x480" name="640x480"/>
+ <combo_box.item label="800x600" name="800x600"/>
+ <combo_box.item label="1024x768" name="1024x768"/>
+ </combo_box>
+ <combo_box name="filters_combobox" tool_tip="Görüntü filtreleri">
+ <combo_box.item label="Filtre Yok" name="NoFilter"/>
+ </combo_box>
+ <button label="Yenile" name="new_snapshot_btn" tool_tip="Yenilemek için tıklayın"/>
+ <button label="Önizleme" name="big_preview_btn" tool_tip="Önizleme ayarları arasında geçiş yapmak için tıklayın"/>
+ <button label="Tweet" name="post_photo_btn"/>
+ <button label="Ä°ptal" name="cancel_photo_btn"/>
</panel>
diff --git a/indra/newview/skins/default/xui/tr/role_actions.xml b/indra/newview/skins/default/xui/tr/role_actions.xml
index 8f063122dc..a7e381d6a0 100755
--- a/indra/newview/skins/default/xui/tr/role_actions.xml
+++ b/indra/newview/skins/default/xui/tr/role_actions.xml
@@ -71,4 +71,8 @@
<action description="Grup Sesli Sohbetine Katıl" longdescription="Bu Yeteneğe sahip bir Roldeki Üyeler grup sesli sohbet oturumlarına katılabilir. NOT: Sesli sohbet oturumuna erişim için Grup Sohbetine Katıl yeteneği gereklidir." name="join voice chat" value="27"/>
<action description="Grup Sohbetini Yönet" longdescription="Bu Yeteneğe sahip bir Roldeki Üyeler grup sesli ve yazılı sohbet oturumlarına errişimi ve katılımı kontrol edebilir." name="moderate group chat" value="37"/>
</action_set>
+ <action_set description="Bu Yetenekler&apos;e, grubun sahip olduğu deneyimleri değiştirme gücü de dahildir." name="experience_tools_experience">
+ <action description="Deneyim Yöneticisi" longdescription="Bu yeteneğe sahip bir roldeki üyeler bir deneyimin meta verilerini düzenleyebilirler." name="experience admin" value="49"/>
+ <action description="Deneyim Yardımcısı" longdescription="Bu yeteneğe sahip bir roldeki üyeler bir deneyimin komut dizilerine katkıda bulunabilirler." name="experience contributor" value="50"/>
+ </action_set>
</role_actions>
diff --git a/indra/newview/skins/default/xui/tr/sidepanel_item_info.xml b/indra/newview/skins/default/xui/tr/sidepanel_item_info.xml
index 86b684c497..92d57deb12 100755
--- a/indra/newview/skins/default/xui/tr/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/tr/sidepanel_item_info.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="item properties" title="Öğe Profili">
+ <panel.string name="loading_experience">
+ (yükleniyor)
+ </panel.string>
<panel.string name="unknown">
(bilinmiyor)
</panel.string>
@@ -43,6 +46,9 @@
<text name="LabelAcquiredTitle">
Alınan:
</text>
+ <text name="LabelItemExperienceTitle">
+ Deneyim:
+ </text>
<panel name="perms_inv">
<text name="perm_modify">
Åžunu yapabilirsiniz:
@@ -66,8 +72,9 @@
<check_box label="Aktar" name="CheckNextOwnerTransfer" tool_tip="Sonraki sahibi bu nesneyi verebilir veya tekrar satabilir"/>
</panel>
<check_box label="Satılık" name="CheckPurchase"/>
- <combo_box name="combobox sale copy">
+ <combo_box name="ComboBoxSaleType">
<combo_box.item label="Kopyala" name="Copy"/>
+ <combo_box.item label="İçerik" name="Contents"/>
<combo_box.item label="Orijinal" name="Original"/>
</combo_box>
<spinner label="Fiyat: L$" name="Edit Cost"/>
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 9a4cf54fa7..ddb4bbf160 100755
--- a/indra/newview/skins/default/xui/tr/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/tr/sidepanel_task_info.xml
@@ -1,71 +1,31 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="object properties" title="Nesne Profili">
- <panel.string name="text deed continued">
- Devret
- </panel.string>
- <panel.string name="text deed">
- Devret
- </panel.string>
- <panel.string name="text modify info 1">
- Bu nesneyi deÄŸiÅŸtirebilirsiniz
- </panel.string>
- <panel.string name="text modify info 2">
- Bu nesneleri deÄŸiÅŸtirebilirsiniz
- </panel.string>
- <panel.string name="text modify info 3">
- Bu nesneyi deÄŸiÅŸtiremezsiniz
- </panel.string>
- <panel.string name="text modify info 4">
- Bu nesneleri deÄŸiÅŸtiremezsiniz
- </panel.string>
- <panel.string name="text modify info 5">
- Bir bölge sınırı üzerinden bu nesneyi değiştiremezsiniz
- </panel.string>
- <panel.string name="text modify info 6">
- Bir bölge sınırı üzerinden bu nesneleri değiştiremezsiniz
- </panel.string>
- <panel.string name="text modify warning">
- Bu nesne bağlantılı parçalara sahip
- </panel.string>
- <panel.string name="Cost Default">
- Fiyat: L$
- </panel.string>
- <panel.string name="Cost Total">
- Toplam Fiyat: L$
- </panel.string>
- <panel.string name="Cost Per Unit">
- Birim Fiyatı: L$
- </panel.string>
- <panel.string name="Cost Mixed">
- Karma Fiyat
- </panel.string>
- <panel.string name="Sale Mixed">
- Karma Satış
- </panel.string>
+ <panel.string name="text deed continued">Devret</panel.string>
+ <panel.string name="text deed">Devret</panel.string>
+ <panel.string name="text modify info 1">Bu nesneyi deÄŸiÅŸtirebilirsiniz</panel.string>
+ <panel.string name="text modify info 2">Bu nesneleri deÄŸiÅŸtirebilirsiniz</panel.string>
+ <panel.string name="text modify info 3">Bu nesneyi deÄŸiÅŸtiremezsiniz</panel.string>
+ <panel.string name="text modify info 4">Bu nesneleri deÄŸiÅŸtiremezsiniz</panel.string>
+ <panel.string name="text modify info 5">Bir bölge sınırı üzerinden bu nesneyi değiştiremezsiniz</panel.string>
+ <panel.string name="text modify info 6">Bir bölge sınırı üzerinden bu nesneleri değiştiremezsiniz</panel.string>
+ <panel.string name="text modify warning">Bu nesne bağlantılı parçalara sahip</panel.string>
+ <panel.string name="Cost Default">Fiyat: L$</panel.string>
+ <panel.string name="Cost Total">Toplam Fiyat: L$</panel.string>
+ <panel.string name="Cost Per Unit">Birim Fiyatı: L$</panel.string>
+ <panel.string name="Cost Mixed">Karma Fiyat</panel.string>
+ <panel.string name="Sale Mixed">Karma Satış</panel.string>
<text name="title" value="Nesne Profili"/>
<text name="where" value="(SL Dünyası)"/>
<panel label="" name="properties_panel">
- <text name="Name:">
- Ad:
- </text>
- <text name="Description:">
- Açıklama:
- </text>
- <text name="CreatorNameLabel">
- OluÅŸturan:
- </text>
- <text name="Owner:">
- Sahip:
- </text>
- <text name="Group_label">
- Grup:
- </text>
+ <text name="Name:">Ad:</text>
+ <text name="Description:">Açıklama:</text>
+ <text name="CreatorNameLabel">OluÅŸturan:</text>
+ <text name="Owner:">Sahip:</text>
+ <text name="Group_label">Grup:</text>
<button name="button set group" tool_tip="Bu nesnenin izinlerini paylaşmak için bir grup seçin"/>
<name_box initial_value="Yükleniyor..." name="Group Name Proxy"/>
<button label="Devret" label_selected="Devret" name="button deed" tool_tip="Bu nesne devredilerek verildiğinde, nesnenin sonraki sahibi için izinler geçerli olur. Grup içerisinde paylaşılan nesneler bir grup yetkilisi tarafından devredilebilir."/>
- <text name="label click action">
- Şu eylem için tıklayın:
- </text>
+ <text name="label click action">Şu eylem için tıklayın:</text>
<combo_box name="clickaction">
<combo_box.item label="Dokun (varsayılan)" name="Touch/grab(default)"/>
<combo_box.item label="Nesnenin üzerine otur" name="Sitonobject"/>
@@ -75,21 +35,13 @@
<combo_box.item label="Yakınlaştır" name="Zoom"/>
</combo_box>
<panel name="perms_inv">
- <text name="perm_modify">
- Bu nesneyi deÄŸiÅŸtirebilirsiniz
- </text>
- <text name="Anyone can:">
- Herkes:
- </text>
+ <text name="perm_modify">Bu nesneyi deÄŸiÅŸtirebilirsiniz</text>
+ <text name="Anyone can:">Herkes:</text>
<check_box label="Kopyala" name="checkbox allow everyone copy"/>
<check_box label="Hareket Et" name="checkbox allow everyone move"/>
- <text name="GroupLabel">
- Grup:
- </text>
+ <text name="GroupLabel">Grup:</text>
<check_box label="Paylaş" name="checkbox share with group" tool_tip="Ayarlanan grubun tüm üyelerinin, bu nesne için değiştirme izinlerinizi paylaşmasına izin verir. Rol kısıtlamalarını etkinleştirmek için Devretme yapmalısınız."/>
- <text name="NextOwnerLabel">
- Sonraki sahip:
- </text>
+ <text name="NextOwnerLabel">Sonraki sahip:</text>
<check_box label="DeÄŸiÅŸtir" name="checkbox next owner can modify"/>
<check_box label="Kopyala" name="checkbox next owner can copy"/>
<check_box label="Aktar" name="checkbox next owner can transfer" tool_tip="Sonraki sahibi bu nesneyi verebilir veya tekrar satabilir"/>
@@ -102,27 +54,13 @@
</combo_box>
<spinner label="Fiyat: L$" name="Edit Cost"/>
<check_box label="Aramada göster" name="search_check" tool_tip="Kişiler arama sonuçlarında bu nesneyi görebilsin"/>
- <text name="pathfinding_attributes_label">
- Yol bulma özellikleri:
- </text>
- <text name="B:">
- B:
- </text>
- <text name="O:">
- O:
- </text>
- <text name="G:">
- G:
- </text>
- <text name="E:">
- E:
- </text>
- <text name="N:">
- N:
- </text>
- <text name="F:">
- F:
- </text>
+ <text name="pathfinding_attributes_label">Yol bulma özellikleri:</text>
+ <text name="B:">B:</text>
+ <text name="O:">O:</text>
+ <text name="G:">G:</text>
+ <text name="E:">E:</text>
+ <text name="N:">N:</text>
+ <text name="F:">F:</text>
</panel>
<panel name="button_panel">
<button label="Aç" name="open_btn"/>
diff --git a/indra/newview/skins/default/xui/tr/strings.xml b/indra/newview/skins/default/xui/tr/strings.xml
index c4fc76fe29..80fe2b3986 100755
--- a/indra/newview/skins/default/xui/tr/strings.xml
+++ b/indra/newview/skins/default/xui/tr/strings.xml
@@ -449,30 +449,51 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin.
<string name="TooltipMustSingleDrop">
Buraya sadece bir öğe sürüklenebilir.
</string>
+ <string name="TooltipTooManyWearables">
+ [AMOUNT] öğeden fazlasını içeren bir klasörü kullanamazsınız. Bu limiti Gelişmiş &gt; Hata Ayıklama Ayarlarını Göster &gt; KullanılabilirKlasörLimiti öğesinden değiştirebilirsiniz.
+ </string>
<string name="TooltipPrice" value="L$[AMOUNT]:"/>
<string name="TooltipOutboxDragToWorld">
- Satıcı giden kutunuzda öğeler oluşturamazsınız
+ Pazaryeri İlanları klasöründen öğe oluşturamazsınız
+ </string>
+ <string name="TooltipOutboxWorn">
+ Üzerinizde bulunan öğeleri Pazaryeri İlanları klasörüne koyamazsınız
+ </string>
+ <string name="TooltipOutboxFolderLevels">
+ İç içe geçmiş klasörlerin derinliği [AMOUNT] değerini geçiyor. İç içe geçmiş klasörlerin derinliğini azaltın; gerekirse öğeleri kutu içine alın.
+ </string>
+ <string name="TooltipOutboxTooManyFolders">
+ Alt klasör sayısı [AMOUNT] değerini geçiyor. İlanınızdaki klasör sayısını azaltın; gerekirse öğeleri kutu içine alın.
+ </string>
+ <string name="TooltipOutboxTooManyObjects">
+ Öğe sayısı [AMOUNT] değerini geçiyor. Bir ilanda [AMOUNT] öğeden fazlasını satmak için bazılarını kutu içine almalısınız.
+ </string>
+ <string name="TooltipOutboxTooManyStockItems">
+ Stok öğelerinin sayısı [AMOUNT] değerini geçiyor.
+ </string>
+ <string name="TooltipOutboxCannotDropOnRoot">
+ Öğeleri veya klasörleri sadece TÜMÜ sekmesine bırakabilirsiniz. Lütfen bu sekmeyi seçin ve öğelerinizi ya da klasörlerinizi yeniden taşıyın.
</string>
<string name="TooltipOutboxNoTransfer">
- Bu nesnelerden bir veya daha fazlası satılamaz veya aktarılamaz.
+ Bu nesnelerden bir veya daha fazlası satılamaz veya aktarılamaz
</string>
<string name="TooltipOutboxNotInInventory">
- Satıcı giden kutunuza sadece doğrudan kendi envanterinizden öğeler koyabilirsiniz
+ Pazaryerine sadece envanterinizdeki öğelerden koyabilirsiniz
</string>
- <string name="TooltipOutboxWorn">
- Giymekte olduğunuz öğeleri Satıcı giden kutunuza koyamazsınız.
+ <string name="TooltipOutboxLinked">
+ Bağlı öğeleri veya klasörleri Pazaryerine koyamazsınız
</string>
<string name="TooltipOutboxCallingCard">
- Satıcı giden kutunuza arama kartları koyamazsınız
+ Arama kartlarını Pazaryerine koyamazsınız
</string>
- <string name="TooltipOutboxFolderLevels">
- İç içe geçmiş klasörlerin derinliği üçü geçiyor
+ <string name="TooltipOutboxDragActive">
+ Listeye alınmış bir ilanı taşıyamazsınız
</string>
- <string name="TooltipOutboxTooManyFolders">
- Üst seviyedeki klasördeki alt klasör sayısı 20&apos;yi geçiyor
+ <string name="TooltipOutboxCannotMoveRoot">
+ Pazaryeri ilanları kök klasörünü taşıyamazsınız
</string>
- <string name="TooltipOutboxTooManyObjects">
- Üst seviyedeki klasördeki öğe sayısı 200&apos;ü geçiyor
+ <string name="TooltipOutboxMixedStock">
+ Bir stok klasöründeki tüm öğelerin tipi ve izni aynı olmalıdır
</string>
<string name="TooltipDragOntoOwnChild">
Bir klasörü alt klasörüne taşıyamazsınız
@@ -1057,9 +1078,7 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin.
<string name="AgentNameSubst">
(Siz)
</string>
- <string name="JoinAnExperience">
- Bir tecrübeye katıl
- </string>
+ <string name="JoinAnExperience"/><!-- intentionally blank -->
<string name="SilentlyManageEstateAccess">
Gayri menkul erişim listelerini yönetirken uyarıları bastır
</string>
@@ -1126,6 +1145,12 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin.
<string name="bitmap_image_files">
Bitmap Görüntüler
</string>
+ <string name="png_image_files">
+ PNG Görüntüleri
+ </string>
+ <string name="save_texture_image_files">
+ Targa veya PNG Görüntüleri
+ </string>
<string name="avi_movie_file">
AVI Film Dosyası
</string>
@@ -1375,6 +1400,9 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin.
<string name="FavoritesNoMatchingItems">
Bir yer imini favorilerinize eklemek için buraya sürükleyin.
</string>
+ <string name="MarketplaceNoMatchingItems">
+ Öğe bulunamadı. Arama dizenizin yazımını kontrol edin ve yeniden deneyin.
+ </string>
<string name="InventoryNoTexture">
Envanterinizde bu dokunun kopyası yok
</string>
@@ -1422,29 +1450,95 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin.
<string name="InventoryOutboxError">
[[MARKETPLACE_CREATE_STORE_URL] Mağazası] hata döndürüyor.
</string>
+ <string name="InventoryMarketplaceError">
+ Bu özellik şu anda Beta aşamasında. Katılmak istiyorsanız lütfen adınızı bu [http://goo.gl/forms/FCQ7UXkakz Google formuna] ekleyin.
+ </string>
+ <string name="InventoryMarketplaceListingsNoItemsTitle">
+ Pazaryeri İlanları klasörünüz boş.
+ </string>
+ <string name="InventoryMarketplaceListingsNoItems">
+ Klasörleri [[MARKETPLACE_DASHBOARD_URL] Pazaryerinde] satılık olarak listelemek için bu alana sürükleyin.
+ </string>
+ <string name="Marketplace Validation Warning Stock">
+ stok klasörü bir sürüm klasöründe bulunmalıdır
+ </string>
+ <string name="Marketplace Validation Error Mixed Stock">
+ : Hata: Bir stok klasöründeki tüm öğeler aynı tipte ve kopyalanamaz olmalıdır
+ </string>
+ <string name="Marketplace Validation Error Subfolder In Stock">
+ : Hata: stok klasörü alt klasörler içeremez
+ </string>
+ <string name="Marketplace Validation Warning Empty">
+ : Uyarı: Klasör hiçbir öğe içermiyor
+ </string>
+ <string name="Marketplace Validation Warning Create Stock">
+ : Uyarı: stok klasörü oluşturuluyor
+ </string>
+ <string name="Marketplace Validation Warning Create Version">
+ : Uyarı: sürüm klasörü oluşturuluyor
+ </string>
+ <string name="Marketplace Validation Warning Move">
+ : Uyarı: Öğeler taşınıyor
+ </string>
+ <string name="Marketplace Validation Warning Delete">
+ : Uyarı: klasör içeriği stok klasörüne aktarıldı, boş klasör kaldırılıyor
+ </string>
+ <string name="Marketplace Validation Error Stock Item">
+ : Hata: Kopyalanamaz öğeler stok klasöründe saklanmalıdır
+ </string>
+ <string name="Marketplace Validation Warning Unwrapped Item">
+ : Uyarı: Öğeler bir sürüm klasöründe bulunmalıdır
+ </string>
+ <string name="Marketplace Validation Error">
+ : Hata:
+ </string>
+ <string name="Marketplace Validation Warning">
+ : Uyarı:
+ </string>
+ <string name="Marketplace Validation Error Empty Version">
+ : Uyarı: sürüm klasörü en az 1 öğe içermelidir
+ </string>
+ <string name="Marketplace Validation Error Empty Stock">
+ : Uyarı: Stok klasörü en az 1 öğe içermelidir
+ </string>
+ <string name="Marketplace Validation No Error">
+ Raporlanacak hiçbir hata ya da uyarı yok
+ </string>
<string name="Marketplace Error None">
Hata yok
</string>
+ <string name="Marketplace Error Prefix">
+ Hata:
+ </string>
<string name="Marketplace Error Not Merchant">
- Hata: Öğeleri Pazaryerine göndermeden önce kendinizi bir satıcı olarak belirlemelisiniz (ücretsizdir).
+ Öğeleri Pazaryerine göndermeden önce kendinizi bir satıcı olarak belirtmeniz gerekir (ücretsizdir).
</string>
- <string name="Marketplace Error Empty Folder">
- Hata: Bu klasörün içeriği boş.
+ <string name="Marketplace Error Not Accepted">
+ Öğe bu klasöre taşınamıyor.
</string>
- <string name="Marketplace Error Unassociated Products">
- Hata: Bu öğe karşıya yüklenemedi çünkü satıcı hesabınızda ürünlerle ilişkisiz çok fazla öğe mevcut. Bu hatayı düzeltmek için Pazaryeri web sitesine oturum açın ve ilişkisiz öğe sayınızı azaltın.
+ <string name="Marketplace Error Unsellable Item">
+ Bu öğe Pazaryerinde satılamaz.
</string>
- <string name="Marketplace Error Object Limit">
- Hata: Bu öğe çok fazla nesne içeriyor. Bu hatayı düzeltmek için nesneleri birlikte kutulara yerleştirerek, toplam nesne sayısını 200&apos;ün altına düşürün.
+ <string name="MarketplaceNoID">
+ no Mkt ID
</string>
- <string name="Marketplace Error Folder Depth">
- Hata: Bu öğede çok fazla iç içe geçmiş klasör seviyesi var. Bunu tekrar düzenleyerek maksimum 3 iç içe geçmiş klasör seviyesine indirin.
+ <string name="MarketplaceLive">
+ listelenmiÅŸ
</string>
- <string name="Marketplace Error Unsellable Item">
- Hata: Bu öğe Pazaryerinde satılamaz.
+ <string name="MarketplaceActive">
+ etkin
</string>
- <string name="Marketplace Error Internal Import">
- Hata: Bu öğede bir sorun var. Daha sonra tekrar deneyin.
+ <string name="MarketplaceMax">
+ maks.
+ </string>
+ <string name="MarketplaceStock">
+ stok
+ </string>
+ <string name="MarketplaceNoStock">
+ stokta kalmadı
+ </string>
+ <string name="MarketplaceUpdating">
+ güncelleniyor...
</string>
<string name="Open landmarks">
Açık yer imleri
@@ -1465,6 +1559,7 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin.
İçerik yok
</string>
<string name="WornOnAttachmentPoint" value="([ATTACHMENT_POINT] üzerinde giyilmiş)"/>
+ <string name="AttachmentErrorMessage" value="([ATTACHMENT_ERROR])"/>
<string name="ActiveGesture" value="[GESLABEL] (etkin)"/>
<string name="PermYes">
Evet
@@ -1735,6 +1830,15 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin.
<string name="Invalid Attachment">
Geçersiz Aksesuar Noktası
</string>
+ <string name="ATTACHMENT_MISSING_ITEM">
+ Hata: eksik öğe
+ </string>
+ <string name="ATTACHMENT_MISSING_BASE_ITEM">
+ Hata: Eksik temel öğe
+ </string>
+ <string name="ATTACHMENT_NOT_ATTACHED">
+ Hata: Nesne mevcut dış görünüme dahil ama eklenmemiş
+ </string>
<string name="YearsMonthsOld">
[AGEYEARS] [AGEMONTHS]&apos;lık
</string>
@@ -1903,6 +2007,9 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin.
<string name="SaveComplete">
Kaydetme tamamlandı.
</string>
+ <string name="UploadFailed">
+ Dosya karşıya yüklenemedi:
+ </string>
<string name="ObjectOutOfRange">
Komut dosyası (nesne kapsam dışı)
</string>
@@ -1912,6 +2019,9 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin.
<string name="GroupsNone">
hiçbiri
</string>
+ <string name="CompileNoExperiencePerm">
+ [SCRIPT] komut dizisi [EXPERIENCE] deneyimiyle atlanıyor.
+ </string>
<string name="Group" value="(grup)"/>
<string name="Unknown">
(Bilinmiyor)
@@ -5073,6 +5183,9 @@ Düzenleyici yolunu çift tırnakla çevrelemeyi deneyin.
<string name="Command_Marketplace_Label">
Pazaryeri
</string>
+ <string name="Command_MarketplaceListings_Label">
+ Pazaryeri
+ </string>
<string name="Command_MiniMap_Label">
Mini-harita
</string>
@@ -5160,6 +5273,9 @@ Düzenleyici yolunu çift tırnakla çevrelemeyi deneyin.
<string name="Command_Marketplace_Tooltip">
Alışveriş yap
</string>
+ <string name="Command_MarketplaceListings_Tooltip">
+ Oluşturduğunuz öğeleri satın
+ </string>
<string name="Command_MiniMap_Tooltip">
Yakındaki kişileri göster
</string>
@@ -5283,4 +5399,85 @@ Düzenleyici yolunu çift tırnakla çevrelemeyi deneyin.
<string name="loading_chat_logs">
Yükleniyor...
</string>
+ <string name="experience_tools_experience">
+ Deneyim
+ </string>
+ <string name="ExperienceNameNull">
+ (deneyim yok)
+ </string>
+ <string name="ExperienceNameUntitled">
+ (başlıksız deneyim)
+ </string>
+ <string name="Land-Scope">
+ Arazi Kapsamında
+ </string>
+ <string name="Grid-Scope">
+ Ağ Kapsamında
+ </string>
+ <string name="Allowed_Experiences_Tab">
+ Ä°ZÄ°N VERÄ°LEN
+ </string>
+ <string name="Blocked_Experiences_Tab">
+ ENGELLENMÄ°Åž
+ </string>
+ <string name="Contrib_Experiences_Tab">
+ KATKIDA BULUNAN
+ </string>
+ <string name="Admin_Experiences_Tab">
+ YÖNETİCİ
+ </string>
+ <string name="Recent_Experiences_Tab">
+ SON
+ </string>
+ <string name="Owned_Experiences_Tab">
+ SAHÄ°BÄ°
+ </string>
+ <string name="ExperiencesCounter">
+ ([EXPERIENCES], maks. [MAXEXPERIENCES])
+ </string>
+ <string name="ExperiencePermission1">
+ kontrollerinizi ele alma
+ </string>
+ <string name="ExperiencePermission3">
+ avatarınızdaki animasyonları tetikleme
+ </string>
+ <string name="ExperiencePermission4">
+ avatarınıza ekleme
+ </string>
+ <string name="ExperiencePermission9">
+ kameranızı takip etmek
+ </string>
+ <string name="ExperiencePermission10">
+ kameranızı kontrol etme
+ </string>
+ <string name="ExperiencePermission11">
+ sizi ışınlama
+ </string>
+ <string name="ExperiencePermission12">
+ deneyim izinlerini otomatik olarak kabul et
+ </string>
+ <string name="ExperiencePermissionShortUnknown">
+ bilinmeyen bir işlem gerçekleştirdi: [Permission]
+ </string>
+ <string name="ExperiencePermissionShort1">
+ Kontrolü Al
+ </string>
+ <string name="ExperiencePermissionShort3">
+ Animasyonları Tetikle
+ </string>
+ <string name="ExperiencePermissionShort4">
+ Ekle
+ </string>
+ <string name="ExperiencePermissionShort9">
+ Kamera Takibi
+ </string>
+ <string name="ExperiencePermissionShort10">
+ Kamera Kontrolü
+ </string>
+ <string name="ExperiencePermissionShort11">
+ Işınla
+ </string>
+ <string name="ExperiencePermissionShort12">
+ Ä°zin
+ </string>
</strings>
diff --git a/indra/newview/skins/default/xui/tr/teleport_strings.xml b/indra/newview/skins/default/xui/tr/teleport_strings.xml
index 20d09b1ee2..e3a08e04b2 100755
--- a/indra/newview/skins/default/xui/tr/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/tr/teleport_strings.xml
@@ -48,6 +48,9 @@ Bir dakika sonra tekrar deneyin.
<message name="MustGetAgeRegion">
Bu bölgeye girebilmek için 18 veya üzeri bir yaşta olmanız gerekir.
</message>
+ <message name="RegionTPSpecialUsageBlocked">
+ Bölgeye girilemiyor. &quot;[REGION_NAME]&quot; bir Yetenek Oyunu Bölgesi. Buraya girebilmek için bazı ölçütleri karşılamanız gerekiyor. Ayrıntılar için lütfen [http://wiki.secondlife.com/wiki/Linden_Lab_Official:Skill_Gaming_in_Second_Life Skill Gaming FAQ] adresini ziyaret edin.
+ </message>
</message_set>
<message_set name="progress">
<message name="sending_dest">
diff --git a/indra/newview/skins/default/xui/zh/floater_about.xml b/indra/newview/skins/default/xui/zh/floater_about.xml
index 2dfb35fa54..250cbe67e0 100755
--- a/indra/newview/skins/default/xui/zh/floater_about.xml
+++ b/indra/newview/skins/default/xui/zh/floater_about.xml
@@ -1,71 +1,16 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="floater_about" title="關於 [CAPITALIZED_APP_NAME]">
- <floater.string name="AboutHeader">
- [APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2] ([VIEWER_VERSION_3]) [BUILD_DATE] [BUILD_TIME] ([CHANNEL])
-[[VIEWER_RELEASE_NOTES_URL] [ReleaseNotes]]
- </floater.string>
- <floater.string name="AboutCompiler">
- 以 [COMPILER_VERSION] 版本 [COMPILER] 建置
- </floater.string>
- <floater.string name="AboutPosition">
- ä½ çš„æ–¹ä½æ˜¯ [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1],地å€å:[REGION],主機:&lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt; ([HOSTIP])
-第二人生 URL:&lt;nolink&gt;[SLURL]&lt;/nolink&gt;
-(全域å標:[POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1])
-[SERVER_VERSION]
-[SERVER_RELEASE_NOTES_URL]
- </floater.string>
- <floater.string name="AboutSystem">
- CPU:[CPU]
-記憶體:[MEMORY_MB] MB
-作業系統版本:[OS_VERSION]
-顯示å¡ä¾›æ‡‰å•†ï¼š[GRAPHICS_CARD_VENDOR]
-顯示å¡ï¼š[GRAPHICS_CARD]
- </floater.string>
- <floater.string name="AboutDriver">
- Windows 顯示驅動程å¼ç‰ˆæœ¬ï¼š[GRAPHICS_DRIVER_VERSION]
- </floater.string>
- <floater.string name="AboutLibs">
- OpenGL 版本:[OPENGL_VERSION]
-
-libcurl 版本: [LIBCURL_VERSION]
-J2C 解碼器版本: [J2C_VERSION]
-音效驅動程å¼ç‰ˆæœ¬ï¼š [AUDIO_DRIVER_VERSION]
-Qt Webkit 版本: [QT_WEBKIT_VERSION]
-語音伺æœå™¨ç‰ˆæœ¬ï¼š [VOICE_VERSION]
- </floater.string>
- <floater.string name="none">
- (無)
- </floater.string>
- <floater.string name="AboutTraffic">
- å°åŒ…æ失:[PACKETS_LOST,number,0]/[PACKETS_IN,number,0] ([PACKETS_PCT,number,1]%)
- </floater.string>
- <floater.string name="ErrorFetchingServerReleaseNotesURL">
- æ“·å–伺æœå™¨ç‰ˆæœ¬èªªæ˜Ž URL 時出錯。
- </floater.string>
<tab_container name="about_tab">
<panel label="資訊" name="support_panel">
<button label="覆製到剪貼簿" name="copy_btn"/>
</panel>
<panel label="貸記" name="credits_panel">
- <text name="linden_intro">
- 「第二人生ã€ç”±ä»¥ä¸‹çš„ Linden 家æ—帶給你:
- </text>
- <text name="contrib_intro">
- 這些人士åšäº†é–‹æ”¾æºç¢¼çš„è²¢ç»ï¼š
- </text>
- <text_editor name="contrib_names">
- 執行時期被å–代的å‡å稱
- </text_editor>
- <text name="trans_intro">
- 以下人士æ供翻譯:
- </text>
- <text_editor name="trans_names">
- 執行時期被å–代的å‡å稱
- </text_editor>
+ <text name="linden_intro">Second Life 由以下的 Linden 家æ—帶給你:
+這些人士åšäº†é–‹æ”¾æºç¢¼çš„è²¢ç»ï¼š</text>
+ <text_editor name="contrib_names">執行時期被å–代的å‡å稱</text_editor>
</panel>
<panel label="許å¯" name="licenses_panel">
- <text_editor name="credits_editor">
- 3Dconnexion SDK Copyright (C) 1992-2009 3Dconnexion
+ <text_editor name="licenses_editor">3Dconnexion SDK Copyright (C) 1992-2009 3Dconnexion
APR Copyright (C) 2011 The Apache Software Foundation
Collada DOM Copyright 2006 Sony Computer Entertainment Inc.
cURL Copyright (C) 1996-2010, Daniel Stenberg, (daniel@haxx.se)
@@ -92,8 +37,7 @@ Qt Webkit 版本: [QT_WEBKIT_VERSION]
ä¿ç•™ä¸€åˆ‡æ¬Šåˆ©ã€‚ 詳情見 licenses.txt。
- 語音èŠå¤©éŸ³é »æŠ€è¡“:Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
- </text_editor>
+ 語音èŠå¤©éŸ³é »æŠ€è¡“:Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)</text_editor>
</panel>
</tab_container>
</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_about_land.xml b/indra/newview/skins/default/xui/zh/floater_about_land.xml
index 76db621951..a9d95e5b9b 100755
--- a/indra/newview/skins/default/xui/zh/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/zh/floater_about_land.xml
@@ -331,22 +331,6 @@
<check_box label="安全(無傷害)" name="check safe" tool_tip="若勾é¸ï¼Œå°‡æŠŠåœŸåœ°è¨­ç‚ºå®‰å…¨ï¼Œç¦çµ•å‚·å®³æ€§çš„戰鬥。 若未勾é¸ï¼Œå‰‡å…許傷害性的戰鬥。"/>
<check_box label="ç¦æ­¢æŽ¨æ’ž" name="PushRestrictCheck" tool_tip="ç¦æ­¢ä½¿ç”¨è…³æœ¬æŽ¨æ’žã€‚ 勾é¸é€™é¸é …å¯æœ‰æ•ˆé˜²æ­¢ä½ åœŸåœ°ä¸Šå‡ºç¾æ»‹äº‹è¡Œç‚ºã€‚"/>
<check_box label="將地點刊登顯示在æœå°‹ä¸­ï¼ˆL$30 / æ¯é€±ï¼‰" name="ShowDirectoryCheck" tool_tip="讓其他人å¯ä»¥åœ¨æœå°‹çµæžœä¸­çœ‹åˆ°é€™å¡Šåœ°æ®µ"/>
- <combo_box name="land category with adult">
- <combo_box.item label="任何類別" name="item0"/>
- <combo_box.item label="æž—ç™»ä½ç½®" name="item1"/>
- <combo_box.item label="完全æˆäºº" name="item2"/>
- <combo_box.item label="è—術與文化" name="item3"/>
- <combo_box.item label="商業" name="item4"/>
- <combo_box.item label="教育" name="item5"/>
- <combo_box.item label="éŠæˆ²" name="item6"/>
- <combo_box.item label="èšæœƒæ‰€" name="item7"/>
- <combo_box.item label="歡迎新手光臨" name="item8"/>
- <combo_box.item label="公園與自然景觀" name="item9"/>
- <combo_box.item label="ä½å®…" name="item10"/>
- <combo_box.item label="購物" name="item11"/>
- <combo_box.item label="出租" name="item13"/>
- <combo_box.item label="其他" name="item12"/>
- </combo_box>
<combo_box name="land category">
<combo_box.item label="任何類別" name="item0"/>
<combo_box.item label="æž—ç™»ä½ç½®" name="item1"/>
@@ -477,5 +461,6 @@
<button label="移除" label_selected="移除" name="remove_banned"/>
</panel>
</panel>
+ <panel label="體驗" name="land_experiences_panel"/>
</tab_container>
</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_associate_listing.xml b/indra/newview/skins/default/xui/zh/floater_associate_listing.xml
new file mode 100644
index 0000000000..ab0a84dd18
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_associate_listing.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="associate listing" title="è¯çµåˆŠç™»">
+ <text name="message">刊登 ID:</text>
+ <line_editor name="listing_id">在此éµå…¥ ID</line_editor>
+ <button label="確定" name="OK"/>
+ <button label="å–消" name="Cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_edit_hover_height.xml b/indra/newview/skins/default/xui/zh/floater_edit_hover_height.xml
new file mode 100644
index 0000000000..d7c4728183
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_edit_hover_height.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="HoverHeight" title="設定懸浮高度">
+ <slider label="高度" name="HoverHeightSlider"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_experience_search.xml b/indra/newview/skins/default/xui/zh/floater_experience_search.xml
new file mode 100644
index 0000000000..c65b64c98f
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_experience_search.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="experiencepicker" title="é¸æ“‡é«”é©—"/>
diff --git a/indra/newview/skins/default/xui/zh/floater_experienceprofile.xml b/indra/newview/skins/default/xui/zh/floater_experienceprofile.xml
new file mode 100644
index 0000000000..4d2b3331d7
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_experienceprofile.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater title="EXPERIENCE PROFILE">
+ <floater.string name="empty_slurl">
+ (無)
+ </floater.string>
+ <floater.string name="maturity_icon_general">
+ &quot;Parcel_PG_Light&quot;
+ </floater.string>
+ <floater.string name="maturity_icon_moderate">
+ &quot;Parcel_M_Light&quot;
+ </floater.string>
+ <floater.string name="maturity_icon_adult">
+ &quot;Parcel_R_Light&quot;
+ </floater.string>
+ <text name="edit_title" value="體驗簡覽"/>
+ <tab_container name="tab_container">
+ <panel name="panel_experience_info">
+ <scroll_container name="xp_scroll">
+ <panel name="scrolling_panel">
+ <layout_stack>
+ <layout_panel name="top panel">
+ <button label="編輯" name="edit_btn"/>
+ </layout_panel>
+ <layout_panel name="maturity panel">
+ <text name="ContentRating">
+ 分級:
+ </text>
+ </layout_panel>
+ <layout_panel name="location panel">
+ <text name="Location">
+ ä½ç½®ï¼š
+ </text>
+ </layout_panel>
+ <layout_panel>
+ <text name="Owner">
+ 所有人:
+ </text>
+ </layout_panel>
+ <layout_panel name="group_panel">
+ <text name="Group">
+ 群組:
+ </text>
+ </layout_panel>
+ <layout_panel name="perm panel">
+ <button label="å…許" name="allow_btn"/>
+ <button label="忘記" name="forget_btn"/>
+ <button label="å°éŽ–" name="block_btn"/>
+ <text name="privileged">
+ 所有居民å‡å¯ä½¿ç”¨é€™å€‹é«”驗。
+ </text>
+ <button label="é•è¦èˆ‰å ±" name="report_btn"/>
+ </layout_panel>
+ </layout_stack>
+ </panel>
+ </scroll_container>
+ </panel>
+ <panel name="edit_panel_experience_info">
+ <scroll_container name="edit_xp_scroll">
+ <panel name="edit_scrolling_panel">
+ <text name="edit_experience_title_label" value="å稱:"/>
+ <text name="edit_experience_desc_label" value="æ述:"/>
+ <button label="群組" name="Group_btn"/>
+ <text name="edit_ContentRating">
+ 分級:
+ </text>
+ <icons_combo_box label="é©åº¦æˆäºº" name="edit_ContentRatingText" tool_tip="æå‡é«”驗的內容分級將會é‡è¨­æ‰€æœ‰å·²å…許該體驗的居民的權é™ã€‚">
+ <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>
+ <text name="edit_Location">
+ ä½ç½®ï¼š
+ </text>
+ <button label="設定為目å‰ä½ç½®" name="location_btn"/>
+ <button label="清空ä½ç½®" name="clear_btn"/>
+ <check_box label="啟用體驗" name="edit_enable_btn" tool_tip=""/>
+ <check_box label="ä¸é¡¯ç¾åœ¨æœå°‹çµæžœ" name="edit_private_btn"/>
+ <text name="changes" value="體驗的變更çµæžœå¯èƒ½éœ€è¦æ•¸åˆ†é˜æ‰æœƒæ“´åŠæ‰€æœ‰åœ°å€ã€‚"/>
+ <button label="返回" name="cancel_btn"/>
+ <button label="儲存" name="save_btn"/>
+ </panel>
+ </scroll_container>
+ </panel>
+ </tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_experiences.xml b/indra/newview/skins/default/xui/zh/floater_experiences.xml
new file mode 100644
index 0000000000..995241797e
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_experiences.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_experiences" title="體驗"/>
diff --git a/indra/newview/skins/default/xui/zh/floater_facebook.xml b/indra/newview/skins/default/xui/zh/floater_facebook.xml
index 9847db9124..9a71a26333 100644
--- a/indra/newview/skins/default/xui/zh/floater_facebook.xml
+++ b/indra/newview/skins/default/xui/zh/floater_facebook.xml
@@ -1,20 +1,15 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="floater_facebook" title="發佈到臉書">
- <panel name="background">
- <tab_container name="tabs">
- <panel label="狀態" name="panel_facebook_status"/>
- <panel label="相片" name="panel_facebook_photo"/>
- <panel label="打å¡" name="panel_facebook_place"/>
- <panel label="朋å‹" name="panel_facebook_friends"/>
- <panel label="帳號" name="panel_facebook_account"/>
- </tab_container>
- <panel name="connection_status_panel">
- <text name="connection_error_text">
- 錯誤
- </text>
- <text name="connection_loading_text">
- 載入中…
- </text>
- </panel>
- </panel>
+ <tab_container name="tabs">
+ <panel label="狀態" name="panel_facebook_status"/>
+ <panel label="相片" name="panel_facebook_photo"/>
+ <panel label="打å¡" name="panel_facebook_place"/>
+ <panel label="朋å‹" name="panel_facebook_friends"/>
+ </tab_container>
+ <text name="connection_error_text">
+ 錯誤
+ </text>
+ <text name="connection_loading_text">
+ 載入中…
+ </text>
</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/zh/floater_inventory_item_properties.xml
index 6998df75f3..4f17b96579 100755
--- a/indra/newview/skins/default/xui/zh/floater_inventory_item_properties.xml
+++ b/indra/newview/skins/default/xui/zh/floater_inventory_item_properties.xml
@@ -1,67 +1,36 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="item properties" title="收ç´å€ç‰©å“屬性">
- <floater.string name="unknown">
- (未知)
- </floater.string>
- <floater.string name="public">
- (公開)
- </floater.string>
- <floater.string name="you_can">
- ä½ å¯ä»¥ï¼š
- </floater.string>
- <floater.string name="owner_can">
- 所有人å¯ä»¥ï¼š
- </floater.string>
- <floater.string name="acquiredDate">
- [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]
- </floater.string>
- <text name="LabelItemNameTitle">
- å稱:
- </text>
- <text name="LabelItemDescTitle">
- æ述:
- </text>
- <text name="LabelCreatorTitle">
- 創造者:
- </text>
+ <floater.string name="unknown">(未知)</floater.string>
+ <floater.string name="public">(公開)</floater.string>
+ <floater.string name="you_can">ä½ å¯ä»¥ï¼š</floater.string>
+ <floater.string name="owner_can">所有人å¯ä»¥ï¼š</floater.string>
+ <floater.string name="acquiredDate">[wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]</floater.string>
+ <text name="LabelItemNameTitle">å稱:</text>
+ <text name="LabelItemDescTitle">æ述:</text>
+ <text name="LabelCreatorTitle">創造者:</text>
<button label="檔案..." name="BtnCreator"/>
- <text name="LabelOwnerTitle">
- 所有人:
- </text>
+ <text name="LabelOwnerTitle">所有人:</text>
<button label="檔案..." name="BtnOwner"/>
- <text name="LabelAcquiredTitle">
- å–得於:
- </text>
- <text name="LabelAcquiredDate">
- Wed May 24 12:50:46 2006
- </text>
- <text name="OwnerLabel">
- 你:
- </text>
+ <text name="LabelAcquiredTitle">å–得於:</text>
+ <text name="LabelAcquiredDate">Wed May 24 12:50:46 2006</text>
+ <text name="OwnerLabel">你:</text>
<check_box label="編輯" name="CheckOwnerModify"/>
<check_box label="æšåº¨" name="CheckOwnerCopy"/>
<check_box label="轉售" name="CheckOwnerTransfer"/>
- <text name="AnyoneLabel">
- 任何人:
- </text>
+ <text name="AnyoneLabel">任何人:</text>
<check_box label="æšåº¨" name="CheckEveryoneCopy"/>
- <text name="GroupLabel">
- 群組:
- </text>
+ <text name="GroupLabel">群組:</text>
<check_box label="分享" name="CheckShareWithGroup"/>
- <text name="NextOwnerLabel">
- 下一個所有人:
- </text>
+ <text name="NextOwnerLabel">下一個所有人:</text>
<check_box label="編輯" name="CheckNextOwnerModify"/>
<check_box label="æšåº¨" name="CheckNextOwnerCopy"/>
<check_box label="轉售" name="CheckNextOwnerTransfer"/>
<check_box label="出售" name="CheckPurchase"/>
- <combo_box name="combobox sale copy">
- <combo_box.item label="æšåº¨" name="Copy"/>
+ <combo_box name="ComboBoxSaleType">
+ <combo_box.item label="複製" name="Copy"/>
+ <combo_box.item label="內容" name="Contents"/>
<combo_box.item label="原件" name="Original"/>
</combo_box>
<spinner label="價格:" name="Edit Cost"/>
- <text name="CurrencySymbol">
- L$
- </text>
+ <text name="CurrencySymbol">L$</text>
</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/zh/floater_inventory_view_finder.xml
index 6d1d18b67c..51dc73d971 100755
--- a/indra/newview/skins/default/xui/zh/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/zh/floater_inventory_view_finder.xml
@@ -5,8 +5,8 @@
<check_box label="æœè£" name="check_clothing"/>
<check_box label="姿勢" name="check_gesture"/>
<check_box label="地標" name="check_landmark"/>
- <check_box label="網é¢" name="check_mesh"/>
<check_box label="記事å¡" name="check_notecard"/>
+ <check_box label="網é¢" name="check_mesh"/>
<check_box label="物件" name="check_object"/>
<check_box label="腳本" name="check_script"/>
<check_box label="è²éŸ³" name="check_sound"/>
@@ -19,6 +19,10 @@
<text name="- OR -">
- 或 -
</text>
+ <radio_group name="date_search_direction">
+ <radio_item label="æ–°è¿‘æ–¼" name="newer"/>
+ <radio_item label="æ—©æ–¼" name="older"/>
+ </radio_group>
<spinner label="å°æ™‚å‰" name="spin_hours_ago"/>
<spinner label="天å‰" name="spin_days_ago"/>
<button label="關閉" label_selected="關閉" name="Close"/>
diff --git a/indra/newview/skins/default/xui/zh/floater_item_properties.xml b/indra/newview/skins/default/xui/zh/floater_item_properties.xml
new file mode 100644
index 0000000000..35dfae62b3
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_item_properties.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Item Properties" title="物å“屬性"/>
diff --git a/indra/newview/skins/default/xui/zh/floater_lagmeter.xml b/indra/newview/skins/default/xui/zh/floater_lagmeter.xml
index 6e58e7332f..e9a082288a 100644
--- a/indra/newview/skins/default/xui/zh/floater_lagmeter.xml
+++ b/indra/newview/skins/default/xui/zh/floater_lagmeter.xml
@@ -7,7 +7,7 @@
360
</floater.string>
<floater.string name="min_title_msg">
- Lag
+ 延é²
</floater.string>
<floater.string name="min_width_px">
90
@@ -22,28 +22,28 @@
15
</floater.string>
<floater.string name="client_frame_time_window_bg_msg">
- Normal, window in background
+ 正常,視窗ä½æ–¼èƒŒæ™¯
</floater.string>
<floater.string name="client_frame_time_critical_msg">
- Client frame rate below [CLIENT_FRAME_RATE_CRITICAL]
+ 客戶端幀率低於 [CLIENT_FRAME_RATE_CRITICAL]
</floater.string>
<floater.string name="client_frame_time_warning_msg">
- Client frame rate between [CLIENT_FRAME_RATE_CRITICAL] and [CLIENT_FRAME_RATE_WARNING]
+ 客戶端幀率介於 [CLIENT_FRAME_RATE_CRITICAL] 和 [CLIENT_FRAME_RATE_WARNING] 之間
</floater.string>
<floater.string name="client_frame_time_normal_msg">
正常
</floater.string>
<floater.string name="client_draw_distance_cause_msg">
- Possible cause: Draw distance set too high
+ å¯èƒ½åŽŸå› ï¼šå¯è¦–è·é›¢è¨­å¾—太é 
</floater.string>
<floater.string name="client_texture_loading_cause_msg">
- Possible cause: Images loading
+ å¯èƒ½åŽŸå› ï¼šæ­£åœ¨è¼‰å…¥åœ–åƒ
</floater.string>
<floater.string name="client_texture_memory_cause_msg">
- Possible cause: Too many images in memory
+ å¯èƒ½åŽŸå› ï¼šè¨˜æ†¶é«”裡圖åƒå¤ªå¤š
</floater.string>
<floater.string name="client_complex_objects_cause_msg">
- Possible cause: Too many complex objects in scene
+ å¯èƒ½åŽŸå› ï¼šå ´æ™¯å…§è¤‡é›œç‰©ä»¶å¤ªå¤š
</floater.string>
<floater.string name="network_text_msg">
網路
@@ -55,10 +55,10 @@
5
</floater.string>
<floater.string name="network_packet_loss_critical_msg">
- Connection is dropping over [NETWORK_PACKET_LOSS_CRITICAL]% of packets
+ 這次連通丟失了至少 [NETWORK_PACKET_LOSS_CRITICAL]% çš„å°åŒ…
</floater.string>
<floater.string name="network_packet_loss_warning_msg">
- Connection is dropping [NETWORK_PACKET_LOSS_WARNING]%-[NETWORK_PACKET_LOSS_CRITICAL]% of packets
+ 這次連通丟失了 [NETWORK_PACKET_LOSS_WARNING]%-[NETWORK_PACKET_LOSS_CRITICAL]% çš„å°åŒ…
</floater.string>
<floater.string name="network_performance_normal_msg">
正常
@@ -70,16 +70,16 @@
300
</floater.string>
<floater.string name="network_ping_critical_msg">
- Connection ping time is over [NETWORK_PING_CRITICAL] ms
+ æŽ¢æ¸¬é€£é€šå›žæ‡‰æ™‚é–“è¶…éŽ [NETWORK_PING_CRITICAL] 毫秒
</floater.string>
<floater.string name="network_ping_warning_msg">
- Connection ping time is [NETWORK_PING_WARNING]-[NETWORK_PING_CRITICAL] ms
+ 探測連通回應時間為 [NETWORK_PING_WARNING]-[NETWORK_PING_CRITICAL] 毫秒
</floater.string>
<floater.string name="network_packet_loss_cause_msg">
- Possible bad connection or &apos;Bandwidth&apos; pref too high.
+ å¯èƒ½é€£é€šä¸è‰¯ï¼Œæˆ–所設的å好連通頻寬éŽé«˜ã€‚
</floater.string>
<floater.string name="network_ping_cause_msg">
- Possible bad connection or file-sharing app.
+ å¯èƒ½é€£é€šä¸è‰¯ï¼Œæˆ–使用檔案分享應用程å¼ã€‚
</floater.string>
<floater.string name="server_text_msg">
伺æœå™¨
diff --git a/indra/newview/skins/default/xui/zh/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/zh/floater_live_lsleditor.xml
index f4a7ba5cca..e971b166f7 100755
--- a/indra/newview/skins/default/xui/zh/floater_live_lsleditor.xml
+++ b/indra/newview/skins/default/xui/zh/floater_live_lsleditor.xml
@@ -9,7 +9,24 @@
<floater.string name="Title">
腳本:[NAME]
</floater.string>
+ <floater.string name="experience_enabled">
+ 清除勾é¸å³å¯ç§»é™¤ç›®å‰çš„體驗
+ </floater.string>
+ <floater.string name="no_experiences">
+ 你未經授權使用任何體驗
+ </floater.string>
+ <floater.string name="add_experiences">
+ é¸å–新增一個體驗
+ </floater.string>
+ <floater.string name="show_experience_profile">
+ 點按å³å¯ç°¡è¦½è©²é«”é©—
+ </floater.string>
+ <floater.string name="loading">
+ 載入中…
+ </floater.string>
<button label="é‡è¨­" label_selected="é‡è¨­" name="Reset"/>
<check_box initial_value="true" label="執行中" name="running"/>
<check_box initial_value="true" label="Mono" name="mono"/>
+ <check_box label="使用體驗:" name="enable_xp"/>
+ <button label="&gt;" name="view_profile"/>
</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_marketplace_listings.xml b/indra/newview/skins/default/xui/zh/floater_marketplace_listings.xml
new file mode 100644
index 0000000000..6da718f230
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_marketplace_listings.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_marketplace_listings" title="MARKETPLACE 刊登">
+ <panel name="marketplace_listings_panel">
+ <panel>
+ <panel name="marketplace_listings_inventory_placeholder_panel">
+ <text name="marketplace_listings_inventory_placeholder_title">載入中…</text>
+ </panel>
+ </panel>
+ </panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_marketplace_validation.xml b/indra/newview/skins/default/xui/zh/floater_marketplace_validation.xml
new file mode 100644
index 0000000000..ef89de95ad
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_marketplace_validation.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_marketplace_validation" title="查核 Marketplace 刊登清單">
+ <button label="確定" label_selected="確定" name="OK"/>
+ <text_editor name="validation_text">MARKETPLACE_VALIDATION_TEXT</text_editor>
+</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_openobject.xml b/indra/newview/skins/default/xui/zh/floater_openobject.xml
index ce6869487a..29140eceb9 100755
--- a/indra/newview/skins/default/xui/zh/floater_openobject.xml
+++ b/indra/newview/skins/default/xui/zh/floater_openobject.xml
@@ -3,6 +3,11 @@
<text name="object_name">
[DESC]:
</text>
- <button label="覆製到收ç´å€" label_selected="覆製到收ç´å€" name="copy_to_inventory_button"/>
- <button label="覆製且穿上" label_selected="覆製且穿上" name="copy_and_wear_button"/>
+ <text name="border_note">
+ 複製到收ç´å€ä¸¦åŠ ä»¥ç©¿æˆ´
+ </text>
+ <button label="新增到è£æ‰®" label_selected="新增到è£æ‰®" name="copy_and_wear_button"/>
+ <button label="å–代è£æ‰®" label_selected="å–代è£æ‰®" name="copy_and_replace_button"/>
+ <button label="åªè¤‡è£½åˆ°æ”¶ç´å€" label_selected="åªè¤‡è£½åˆ°æ”¶ç´å€" name="copy_to_inventory_button"/>
+ <button label="å–消" label_selected="å–消" name="cancel_button"/>
</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_pay.xml b/indra/newview/skins/default/xui/zh/floater_pay.xml
index 69427605a4..026ead9574 100755
--- a/indra/newview/skins/default/xui/zh/floater_pay.xml
+++ b/indra/newview/skins/default/xui/zh/floater_pay.xml
@@ -1,21 +1,18 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="Give Money">
- <string name="payee_group">
- 支付群組
- </string>
- <string name="payee_resident">
- 支付居民
- </string>
- <text name="payee_name">
- 測試一個長度éžå¸¸éžå¸¸éžå¸¸é•·çš„å稱,檢查是å¦è¢«åˆ‡æ–·
- </text>
- <button label="L$1" label_selected="L$1" name="fastpay 1"/>
- <button label="L$5" label_selected="L$5" name="fastpay 5"/>
- <button label="L$10" label_selected="L$10" name="fastpay 10"/>
- <button label="L$20" label_selected="L$20" name="fastpay 20"/>
- <text name="amount text">
- 或é¸æ“‡ä¸€å€‹é‡‘é¡ï¼š
- </text>
- <button label="支付" label_selected="支付" name="pay btn"/>
- <button label="å–消" label_selected="å–消" name="cancel btn"/>
+ <string name="payee_group">支付群組</string>
+ <string name="payee_resident">支付居民</string>
+ <text name="paying_text">你正在支付:</text>
+ <text name="payee_name">測試一個長度éžå¸¸éžå¸¸éžå¸¸é•·çš„å稱,檢查是å¦è¢«åˆ‡æ–·</text>
+ <panel label="æœå°‹" name="PatternsPanel">
+ <button label="支付 L$ 1" label_selected="支付 L$ 1" name="fastpay 1"/>
+ <button label="支付 L$ 5" label_selected="支付 L$ 5" name="fastpay 5"/>
+ <button label="支付 L$ 10" label_selected="支付 L$ 10" name="fastpay 10"/>
+ <button label="支付 L$ 20" label_selected="支付 L$ 20" name="fastpay 20"/>
+ </panel>
+ <panel label="æœå°‹" name="InputPanel">
+ <text name="amount text">其他金é¡ï¼š</text>
+ <button label="支付" label_selected="支付" name="pay btn"/>
+ <button label="å–消" label_selected="å–消" name="cancel btn"/>
+ </panel>
</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_pay_object.xml b/indra/newview/skins/default/xui/zh/floater_pay_object.xml
index 7d20b44bc6..c32243a115 100755
--- a/indra/newview/skins/default/xui/zh/floater_pay_object.xml
+++ b/indra/newview/skins/default/xui/zh/floater_pay_object.xml
@@ -1,28 +1,21 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="Give Money">
- <string name="payee_group">
- 支付群組
- </string>
- <string name="payee_resident">
- 支付居民
- </string>
- <text name="payee_name">
- Ericacita Moostopolison
- </text>
- <text name="object_name_label">
- 經由物件:
- </text>
+ <string name="payee_group">支付群組</string>
+ <string name="payee_resident">支付居民</string>
+ <text name="paying_text">你正在支付:</text>
+ <text name="payee_name">Ericacita Moostopolison</text>
+ <text name="object_name_label">經由物件:</text>
<icon name="icon_object" tool_tip="物件"/>
- <text name="object_name_text">
- 這是我å稱很長很長很長很長的一個很棒的物件
- </text>
- <button label="L$1" label_selected="L$1" name="fastpay 1"/>
- <button label="L$5" label_selected="L$5" name="fastpay 5"/>
- <button label="L$10" label_selected="L$10" name="fastpay 10"/>
- <button label="L$20" label_selected="L$20" name="fastpay 20"/>
- <text name="amount text">
- 或é¸æ“‡ä¸€å€‹é‡‘é¡ï¼š
- </text>
- <button label="支付" label_selected="支付" name="pay btn"/>
- <button label="å–消" label_selected="å–消" name="cancel btn"/>
+ <text name="object_name_text">這是我å稱很長很長很長很長的一個很棒的物件</text>
+ <panel label="æœå°‹" name="PatternsPanel">
+ <button label="支付 L$ 1" label_selected="支付 L$ 1" name="fastpay 1"/>
+ <button label="支付 L$ 5" label_selected="支付 L$ 5" name="fastpay 5"/>
+ <button label="支付 L$ 10" label_selected="支付 L$ 10" name="fastpay 10"/>
+ <button label="支付 L$ 20" label_selected="支付 L$ 20" name="fastpay 20"/>
+ </panel>
+ <panel label="æœå°‹" name="InputPanel">
+ <text name="amount text">其他金é¡ï¼š</text>
+ <button label="支付" label_selected="支付" name="pay btn"/>
+ <button label="å–消" label_selected="å–消" name="cancel btn"/>
+ </panel>
</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_report_abuse.xml b/indra/newview/skins/default/xui/zh/floater_report_abuse.xml
index d4b5a2f990..347b40e675 100755
--- a/indra/newview/skins/default/xui/zh/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/zh/floater_report_abuse.xml
@@ -67,7 +67,7 @@
<combo_box.item label="土地 &gt; 侵佔 &gt; 物件或æ質" name="Land__Encroachment__Objects_textures"/>
<combo_box.item label="土地 &gt; 侵佔 &gt; ç²’å­" name="Land__Encroachment__Particles"/>
<combo_box.item label="土地 &gt; 侵佔 &gt; 樹種 / æ¤ç‰©" name="Land__Encroachment__Trees_plants"/>
- <combo_box.item label="下注或賭åš" name="Wagering_gambling"/>
+ <combo_box.item label="é•åéŠæˆ²è¦å‰‡" name="Wagering_gambling"/>
<combo_box.item label="其他" name="Other"/>
</combo_box>
<text name="abuser_name_title">
diff --git a/indra/newview/skins/default/xui/zh/floater_snapshot.xml b/indra/newview/skins/default/xui/zh/floater_snapshot.xml
index a65227bbd4..4090248083 100755
--- a/indra/newview/skins/default/xui/zh/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/zh/floater_snapshot.xml
@@ -39,17 +39,8 @@
<string name="local_failed_str">
無法儲入電腦。
</string>
- <button name="advanced_options_btn" tool_tip="進階é¸é …"/>
- <text name="image_res_text">
- [WIDTH] x [HEIGHT] åƒç´ 
- </text>
- <text name="file_size_label">
- [SIZE] KB
- </text>
+ <button label="刷新" name="new_snapshot_btn"/>
<panel name="advanced_options_panel">
- <text name="advanced_options_label">
- 進階é¸é …
- </text>
<text name="layer_type_label">
æ“·å–快照:
</text>
@@ -68,4 +59,10 @@
<combo_box.item label="ä¸ç”¨æ¿¾é¡" name="NoFilter"/>
</combo_box>
</panel>
+ <text name="image_res_text">
+ [WIDTH] åƒç´ ï¼ˆå¯¬ï¼‰ x [HEIGHT] åƒç´ ï¼ˆé«˜ï¼‰
+ </text>
+ <text name="file_size_label">
+ [SIZE] KB
+ </text>
</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_top_objects.xml b/indra/newview/skins/default/xui/zh/floater_top_objects.xml
index 6f50be0855..58530f00c1 100755
--- a/indra/newview/skins/default/xui/zh/floater_top_objects.xml
+++ b/indra/newview/skins/default/xui/zh/floater_top_objects.xml
@@ -21,6 +21,12 @@
<floater.string name="none_descriptor">
查無çµæžœã€‚
</floater.string>
+ <floater.string name="URLs">
+ URL
+ </floater.string>
+ <floater.string name="memory">
+ 記憶體 (KB)
+ </floater.string>
<text name="title_text">
載入中...
</text>
@@ -30,7 +36,7 @@
<scroll_list.columns label="所有人" name="owner"/>
<scroll_list.columns label="ä½ç½®" name="location"/>
<scroll_list.columns label="地段" name="parcel"/>
- <scroll_list.columns label="時間" name="time"/>
+ <scroll_list.columns label="日期" name="time"/>
<scroll_list.columns label="URL" name="URLs"/>
<scroll_list.columns label="記憶體 (KB)" name="memory"/>
</scroll_list>
diff --git a/indra/newview/skins/default/xui/zh/floater_twitter.xml b/indra/newview/skins/default/xui/zh/floater_twitter.xml
index 0df68ba9be..ac49b2a967 100644
--- a/indra/newview/skins/default/xui/zh/floater_twitter.xml
+++ b/indra/newview/skins/default/xui/zh/floater_twitter.xml
@@ -1,17 +1,13 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="floater_twitter" title="推特">
- <panel name="background">
- <tab_container name="tabs">
- <panel label="編撰" name="panel_twitter_photo"/>
- <panel label="帳號" name="panel_twitter_account"/>
- </tab_container>
- <panel name="connection_status_panel">
- <text name="connection_error_text">
- 錯誤
- </text>
- <text name="connection_loading_text">
- 載入中…
- </text>
- </panel>
- </panel>
+ <tab_container name="tabs">
+ <panel label="編撰" name="panel_twitter_photo"/>
+ <panel label="帳號" name="panel_twitter_account"/>
+ </tab_container>
+ <text name="connection_error_text">
+ 錯誤
+ </text>
+ <text name="connection_loading_text">
+ 載入中…
+ </text>
</floater>
diff --git a/indra/newview/skins/default/xui/zh/menu_attachment_self.xml b/indra/newview/skins/default/xui/zh/menu_attachment_self.xml
index eb1bad0ca2..d9e6eff897 100755
--- a/indra/newview/skins/default/xui/zh/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/zh/menu_attachment_self.xml
@@ -8,6 +8,7 @@
<menu_item_call label="我的外觀" name="Change Outfit"/>
<menu_item_call label="編輯我的è£æ‰®" name="Edit Outfit"/>
<menu_item_call label="編輯我的體形" name="Edit My Shape"/>
+ <menu_item_call label="懸浮高度" name="Hover Height"/>
<menu_item_call label="我的朋å‹" name="Friends..."/>
<menu_item_call label="我的群組" name="Groups..."/>
<menu_item_call label="我的個人檔案" name="Profile..."/>
diff --git a/indra/newview/skins/default/xui/zh/menu_avatar_self.xml b/indra/newview/skins/default/xui/zh/menu_avatar_self.xml
index 68d0600141..a644a45df6 100755
--- a/indra/newview/skins/default/xui/zh/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/zh/menu_avatar_self.xml
@@ -25,6 +25,7 @@
<menu_item_call label="我的外觀" name="Chenge Outfit"/>
<menu_item_call label="編輯我的è£æ‰®" name="Edit Outfit"/>
<menu_item_call label="編輯我的體形" name="Edit My Shape"/>
+ <menu_item_call label="懸浮高度" name="Hover Height"/>
<menu_item_call label="我的朋å‹" name="Friends..."/>
<menu_item_call label="我的群組" name="Groups..."/>
<menu_item_call label="我的個人檔案" name="Profile..."/>
diff --git a/indra/newview/skins/default/xui/zh/menu_inventory.xml b/indra/newview/skins/default/xui/zh/menu_inventory.xml
index 478f987035..b346e82b77 100755
--- a/indra/newview/skins/default/xui/zh/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/zh/menu_inventory.xml
@@ -1,5 +1,14 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<menu name="Popup">
+ <menu_item_call label="新建刊登" name="Marketplace Create Listing"/>
+ <menu_item_call label="è¯çµåˆŠç™»" name="Marketplace Associate Listing"/>
+ <menu_item_call label="å–得(刷新)刊登" name="Marketplace Get Listing"/>
+ <menu_item_call label="檢查是å¦æœ‰èª¤" name="Marketplace Check Listing"/>
+ <menu_item_call label="編輯刊登" name="Marketplace Edit Listing"/>
+ <menu_item_call label="刊登" name="Marketplace List"/>
+ <menu_item_call label="åœæ­¢åˆŠç™»" name="Marketplace Unlist"/>
+ <menu_item_call label="啟用" name="Marketplace Activate"/>
+ <menu_item_call label="åœç”¨" name="Marketplace Deactivate"/>
<menu_item_call label="分享" name="Share"/>
<menu_item_call label="購買" name="Task Buy"/>
<menu_item_call label="打開" name="Task Open"/>
@@ -87,6 +96,7 @@
<menu_item_call label="添加" name="Wearable Add"/>
<menu_item_call label="脫下" name="Take Off"/>
<menu_item_call label="複製到商家發件匣" name="Merchant Copy"/>
- <menu_item_call label="é€å¾€ç¬¬äºŒäººç”Ÿè³¼ç‰©å¸‚集" name="Marketplace Send"/>
+ <menu_item_call label="複製到 Marketplace 刊登" name="Marketplace Copy"/>
+ <menu_item_call label="移到 Marketplace 刊登" name="Marketplace Move"/>
<menu_item_call label="-- ç„¡é¸é … --" name="--no options--"/>
</menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/zh/menu_inventory_gear_default.xml
index 8ad0e7324f..a4461f8c6a 100755
--- a/indra/newview/skins/default/xui/zh/menu_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/zh/menu_inventory_gear_default.xml
@@ -5,7 +5,7 @@
<menu_item_check label="ä¾æœ€è¿‘排åº" name="sort_by_recent"/>
<menu_item_check label="總是由å稱排åºè³‡æ–™å¤¾" name="sort_folders_by_name"/>
<menu_item_check label="系統資料夾排åºåˆ°æœ€ä¸Šæ–¹" name="sort_system_folders_to_top"/>
- <menu_item_call label="顯示éŽæ¿¾å™¨" name="show_filters"/>
+ <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"/>
diff --git a/indra/newview/skins/default/xui/zh/menu_marketplace_view.xml b/indra/newview/skins/default/xui/zh/menu_marketplace_view.xml
new file mode 100644
index 0000000000..5396b2a866
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/menu_marketplace_view.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_marketplace_sort">
+ <menu_item_check label="按存é‡æŽ’åºï¼ˆç”±å°‘到多)" name="sort_by_stock_amount"/>
+ <menu_item_check label="åªé¡¯ç¤ºåˆŠç™»è³‡æ–™å¤¾" name="show_only_listing_folders"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_url_experience.xml b/indra/newview/skins/default/xui/zh/menu_url_experience.xml
new file mode 100644
index 0000000000..97ff33b921
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/menu_url_experience.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Url Popup">
+ <menu_item_call label="覆製 SLurl 到剪貼簿" name="url_copy"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_viewer.xml b/indra/newview/skins/default/xui/zh/menu_viewer.xml
index adc29a3944..e94f52a401 100755
--- a/indra/newview/skins/default/xui/zh/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/zh/menu_viewer.xml
@@ -8,6 +8,7 @@
<menu_item_call label="新收ç´å€è¦–窗" name="NewInventoryWindow"/>
<menu_item_call label="地點…" name="Places"/>
<menu_item_call label="ç²¾é¸åœ°é»žâ€¦" name="Picks"/>
+ <menu_item_call label="體驗…" name="Experiences"/>
<menu_item_call label="æ”影機控制…" name="Camera Controls"/>
<menu label="動作" name="Movement">
<menu_item_call label="å下" name="Sit Down Here"/>
@@ -22,6 +23,7 @@
</menu>
<menu_item_call label="購買 L$…" name="Buy and Sell L$"/>
<menu_item_call label="商家發件匣…" name="MerchantOutbox"/>
+ <menu_item_call label="Marketplace 刊登…" name="MarketplaceListings"/>
<menu_item_call label="帳戶主控臺…" name="Manage My Account"/>
<menu_item_call label="å好設定…" name="Preferences"/>
<menu_item_call label="工具列按鈕…" name="Toolbars"/>
@@ -46,7 +48,7 @@
<menu_item_check label="朋å‹" name="My Friends"/>
<menu_item_check label="群組" name="My Groups"/>
<menu_item_check label="附近的人群" name="Active Speakers"/>
- <menu_item_call label="å°éŽ–清單" name="Block List"/>
+ <menu_item_check label="å°éŽ–清單" name="Block List"/>
<menu_item_check label="請勿打擾" name="Do Not Disturb"/>
</menu>
<menu label="世界" name="World">
@@ -248,6 +250,7 @@
<menu_item_check label="æ質控制å°" name="Texture Console"/>
<menu_item_check label="除錯控制å°" name="Debug Console"/>
<menu_item_call label="通知控制å°" name="Notifications"/>
+ <menu_item_check label="地å€é™¤éŒ¯æŽ§åˆ¶å°" name="Region Debug Console"/>
<menu_item_check label="快速碼錶" name="Fast Timers"/>
<menu_item_check label="記憶體" name="Memory"/>
<menu_item_check label="場景統計資料" name="Scene Statistics"/>
@@ -351,7 +354,7 @@
<menu_item_check label="探詢內æ’物件ä½ç½®" name="Ping Interpolate Object Positions"/>
<menu_item_call label="丟出一個å°åŒ…" name="Drop a Packet"/>
</menu>
- <menu_item_call label="傾å°è…³æœ¬æŽ§åˆ¶çš„æ”影機" name="Dump Scripted Camera"/>
+ <menu_item_call label="傾å°è…³æœ¬æŽ§åˆ¶çš„æ”影機" name="Dump Scripted Camera"/>
<menu label="錄製器" name="Recorder">
<menu_item_call label="開始播放" name="Start Playback"/>
<menu_item_call label="åœæ­¢æ’­æ”¾" name="Stop Playback"/>
diff --git a/indra/newview/skins/default/xui/zh/mime_types.xml b/indra/newview/skins/default/xui/zh/mime_types.xml
index 70af2d2f19..8967475abb 100755
--- a/indra/newview/skins/default/xui/zh/mime_types.xml
+++ b/indra/newview/skins/default/xui/zh/mime_types.xml
@@ -44,6 +44,14 @@
播放這個ä½ç½®çš„音頻
</playtip>
</widgetset>
+ <widgetset name="none">
+ <label name="none_label">
+ 無內容
+ </label>
+ <tooltip name="none_tooltip">
+ 此處無媒體
+ </tooltip>
+ </widgetset>
<scheme name="rtsp">
<label name="rtsp_label">
å³æ™‚串æµ
diff --git a/indra/newview/skins/default/xui/zh/mime_types_linux.xml b/indra/newview/skins/default/xui/zh/mime_types_linux.xml
index 70af2d2f19..8967475abb 100755
--- a/indra/newview/skins/default/xui/zh/mime_types_linux.xml
+++ b/indra/newview/skins/default/xui/zh/mime_types_linux.xml
@@ -44,6 +44,14 @@
播放這個ä½ç½®çš„音頻
</playtip>
</widgetset>
+ <widgetset name="none">
+ <label name="none_label">
+ 無內容
+ </label>
+ <tooltip name="none_tooltip">
+ 此處無媒體
+ </tooltip>
+ </widgetset>
<scheme name="rtsp">
<label name="rtsp_label">
å³æ™‚串æµ
diff --git a/indra/newview/skins/default/xui/zh/mime_types_mac.xml b/indra/newview/skins/default/xui/zh/mime_types_mac.xml
index 70af2d2f19..8967475abb 100755
--- a/indra/newview/skins/default/xui/zh/mime_types_mac.xml
+++ b/indra/newview/skins/default/xui/zh/mime_types_mac.xml
@@ -44,6 +44,14 @@
播放這個ä½ç½®çš„音頻
</playtip>
</widgetset>
+ <widgetset name="none">
+ <label name="none_label">
+ 無內容
+ </label>
+ <tooltip name="none_tooltip">
+ 此處無媒體
+ </tooltip>
+ </widgetset>
<scheme name="rtsp">
<label name="rtsp_label">
å³æ™‚串æµ
diff --git a/indra/newview/skins/default/xui/zh/notifications.xml b/indra/newview/skins/default/xui/zh/notifications.xml
index bd05725e2b..179f01e90d 100755
--- a/indra/newview/skins/default/xui/zh/notifications.xml
+++ b/indra/newview/skins/default/xui/zh/notifications.xml
@@ -73,6 +73,10 @@
[MESSAGE]
<usetemplate name="okcancelbuttons" notext="å–消" yestext="是"/>
</notification>
+ <notification name="GenericAlertOK">
+ [MESSAGE]
+ <usetemplate name="okbutton" yestext="確定"/>
+ </notification>
<notification name="BadInstallation">
[APP_NAME] 更新時出錯。 請 [http://get.secondlife.com 下載] 最新版本的 Viewer。
<usetemplate name="okbutton" yestext="確定"/>
@@ -125,6 +129,88 @@
購物市集åˆå§‹åŒ–失敗,系統或網路出錯。 è«‹ç¨å€™å†è©¦ä¸€æ¬¡ã€‚
<usetemplate name="okbutton" yestext="確定"/>
</notification>
+ <notification name="StockPasteFailed">
+ 複製或移到é™é‡è³‡æ–™å¤¾æ™‚發生å•é¡Œï¼š
+
+ &apos;[ERROR_CODE]&apos;
+ <usetemplate name="okbutton" yestext="確定"/>
+ </notification>
+ <notification name="MerchantPasteFailed">
+ 複製或移到 Marketplace 刊登時發生å•é¡Œï¼š
+
+ &apos;[ERROR_CODE]&apos;
+ <usetemplate name="okbutton" yestext="確定"/>
+ </notification>
+ <notification name="MerchantTransactionFailed">
+ 和 Marketplace 進行的交易發生如下錯誤:
+
+ 原因:&apos;[ERROR_REASON]&apos;
+ [ERROR_DESCRIPTION]
+ <usetemplate name="okbutton" yestext="確定"/>
+ </notification>
+ <notification name="MerchantUnprocessableEntity">
+ 我們無法刊登這產å“或啓用版本資料夾。 通常這是因為刊登內容表的資料ä¸é½Šï¼Œä½†ä¹Ÿå¯èƒ½å› ç‚ºè³‡æ–™å¤¾çµæ§‹æœ‰éŒ¯æ‰€è‡´ã€‚ 請編輯刊登內容或檢查刊登資料夾看是å¦æœ‰èª¤ã€‚
+ <usetemplate name="okbutton" yestext="確定"/>
+ </notification>
+ <notification name="MerchantListingFailed">
+ 刊登到 Marketplace 時,發生錯誤:
+
+ &apos;[ERROR_CODE]&apos;
+ <usetemplate name="okbutton" yestext="確定"/>
+ </notification>
+ <notification name="MerchantFolderActivationFailed">
+ 啓用此版本資料夾時發生錯誤:
+
+ &apos;[ERROR_CODE]&apos;
+ <usetemplate name="okbutton" yestext="確定"/>
+ </notification>
+ <notification name="ConfirmMerchantActiveChange">
+ 這個動作會改變此刊登的內容。 你確定è¦ç¹¼çºŒå—Žï¼Ÿ
+ <usetemplate ignoretext="在我變更 Marketplace 的一項刊登內容之å‰ï¼Œå…ˆè·Ÿæˆ‘確èª" name="okcancelignore" notext="å–消" yestext="確定"/>
+ </notification>
+ <notification name="ConfirmMerchantMoveInventory">
+ 你拖曳到 Marketplace 刊登視窗的物項,會從原來的ä½ç½®ç§»å‡ºä¾†ï¼Œä¸æœƒè¢«è¤‡è£½ã€‚ 你確定è¦ç¹¼çºŒå—Žï¼Ÿ
+ <usetemplate ignoretext="在我把物項從收ç´å€ç§»åˆ° Marketplace 之å‰ï¼Œå…ˆè·Ÿæˆ‘確èª" name="okcancelignore" notext="å–消" yestext="確定"/>
+ </notification>
+ <notification name="ConfirmListingCutOrDelete">
+ 移動或刪除刊登資料夾將會刪除你的 Marketplace 刊登。 如你希望ä¿ç•™ Marketplace 刊登,請改而移動或刪除所想修改的版本資料夾的內容。 你確定è¦ç¹¼çºŒå—Žï¼Ÿ
+ <usetemplate ignoretext="在我把物項從 Marketplace 移出或刪除之å‰ï¼Œå…ˆè·Ÿæˆ‘確èª" name="okcancelignore" notext="å–消" yestext="確定"/>
+ </notification>
+ <notification name="ConfirmCopyToMarketplace">
+ 你無權將這些物項的一或多個複製到 Marketplace。 ä½ å¯ä»¥ç§»å‹•é€™äº›ç‰©é …,或ä¿ç•™ä¸å‹•ã€‚
+ <usetemplate canceltext="å–消" ignoretext="我試著é¸æ“‡è¤‡è£½åˆ° Marketplace 的內容如果å«æœ‰ã€Œç¦æ­¢è¤‡è£½ã€çš„物項,先å‘我確èª" name="yesnocancelbuttons" notext="ä¿ç•™ä¸ç§»å‹•ç‰©é …" yestext="移動物項"/>
+ </notification>
+ <notification name="ConfirmMerchantUnlist">
+ 這動作會åœç™»é€™å€‹åˆŠç™»ã€‚ 你確定è¦ç¹¼çºŒå—Žï¼Ÿ
+ <usetemplate ignoretext="在我åœç™» Marketplace çš„ç¾æœ‰åˆŠç™»å…§å®¹å‰ï¼Œå…ˆè·Ÿæˆ‘確èª" name="okcancelignore" notext="å–消" yestext="確定"/>
+ </notification>
+ <notification name="ConfirmMerchantClearVersion">
+ 這個動作會åœç”¨æ­¤åˆŠç™»çš„版本資料夾。 你確定è¦ç¹¼çºŒå—Žï¼Ÿ
+ <usetemplate ignoretext="在我åœç”¨ Marketplace æŸé …刊登的版本資料夾之å‰ï¼Œå…ˆè·Ÿæˆ‘確èªã€‚" name="okcancelignore" notext="å–消" yestext="確定"/>
+ </notification>
+ <notification name="AlertMerchantListingNotUpdated">
+ 這刊登無法更新。
+[[URL] 點按這裡]å³å¯åœ¨ Marketplace 進行編輯。
+ <usetemplate name="okbutton" yestext="確定"/>
+ </notification>
+ <notification name="AlertMerchantListingCannotWear">
+ ä½ ä¸èƒ½ç©¿æˆ´ä½åœ¨ Marketplace 刊登資料夾裡的衣物或身體部ä½ã€‚
+ </notification>
+ <notification name="AlertMerchantListingInvalidID">
+ 無效的刊登 ID。
+ </notification>
+ <notification name="AlertMerchantListingActivateRequired">
+ 這個刊登有多個版本資料夾或缺少版本資料夾。 你事後必須é¸æ“‡ä¸€å€‹åŠ ä»¥å•“用。
+ <usetemplate ignoretext="當我è¦æ–°å»ºå¸¶æœ‰å¤šå€‹ç‰ˆæœ¬è³‡æ–™å¤¾çš„刊登å‰ï¼Œæ醒我啓動一個版本資料夾" name="okignore" yestext="確定"/>
+ </notification>
+ <notification name="AlertMerchantStockFolderSplit">
+ 我們已經將ä¸åŒé¡žåž‹çš„é™é‡ç‰©é …分開放置到ä¸åŒçš„å­˜é‡è³‡æ–™å¤¾ï¼Œé€™æ¨£ä½ çš„資料夾æ‰èƒ½å¤ åˆŠç™»ã€‚
+ <usetemplate ignoretext="刊登å‰æŠŠé™é‡è³‡æ–™å¤¾ä¸€åˆ†ç‚ºäºŒæ™‚,告知我" name="okignore" yestext="確定"/>
+ </notification>
+ <notification name="AlertMerchantStockFolderEmpty">
+ 因為存é‡çˆ²é›¶ï¼Œæˆ‘們已經把你的刊登物下架。 你若希望é‡æ–°åˆŠç™»ï¼Œå¿…須先增加存é‡ã€‚
+ <usetemplate ignoretext="é™é‡è³‡æ–™å¤¾å¦‚æžœæˆç©ºã€å°Žè‡´åˆŠç™»ç‰©ä¸‹æž¶ï¼Œå‘ŠçŸ¥æˆ‘" name="okignore" yestext="確定"/>
+ </notification>
<notification name="CompileQueueSaveText">
上傳腳本文字時出å•é¡Œï¼ŒåŽŸå› ï¼š[REASON]。 è«‹ç¨å€™å†è©¦ä¸€æ¬¡ã€‚
</notification>
@@ -469,6 +555,10 @@
儲存變更?
<usetemplate canceltext="å–消" name="yesnocancelbuttons" notext="ä¸è¦å„²å­˜" yestext="儲存"/>
</notification>
+ <notification name="DeleteNotecard">
+ 刪除記事å¡ï¼Ÿ
+ <usetemplate name="okcancelbuttons" notext="å–消" yestext="確定"/>
+ </notification>
<notification name="GestureSaveFailedTooManySteps">
姿勢儲存失敗。
這個姿勢步驟太多。
@@ -575,6 +665,9 @@
<notification name="RegionNoTerraforming">
這個 [REGION] 地å€ä¸¦ä¸å…許變更地形。
</notification>
+ <notification name="ParcelNoTerraforming">
+ 你無權é‡å°åœ°æ®µ [PARCEL] 進行土地變形。
+ </notification>
<notification name="CannotCopyWarning">
你沒有權é™è¤‡è£½ä»¥ä¸‹é …目:
[ITEMS]
@@ -1816,6 +1909,30 @@ SHA1 指紋:[MD5_DIGEST]
僅é‡å°é€™å€‹é ˜åœ°æˆ–é‡å° [ALL_ESTATES] 移除領地管ç†äººï¼Ÿ
<usetemplate canceltext="å–消" name="yesnocancelbuttons" notext="全部領地" yestext="這個領地"/>
</notification>
+ <notification label="é¸æ“‡é ˜åœ°" name="EstateAllowedExperienceAdd">
+ 僅é‡å°é€™å€‹é ˜åœ°æˆ–é‡å° [ALL_ESTATES] 將它新增到å…許清單?
+ <usetemplate canceltext="å–消" name="yesnocancelbuttons" notext="全部領地" yestext="這個領地"/>
+ </notification>
+ <notification label="é¸æ“‡é ˜åœ°" name="EstateAllowedExperienceRemove">
+ 僅é‡å°é€™å€‹é ˜åœ°æˆ–é‡å° [ALL_ESTATES] 將它從å…許清單中移除?
+ <usetemplate canceltext="å–消" name="yesnocancelbuttons" notext="全部領地" yestext="這個領地"/>
+ </notification>
+ <notification label="é¸æ“‡é ˜åœ°" name="EstateBlockedExperienceAdd">
+ 僅é‡å°é€™å€‹é ˜åœ°æˆ–é‡å° [ALL_ESTATES] 將它新增到å°éŽ–清單?
+ <usetemplate canceltext="å–消" name="yesnocancelbuttons" notext="全部領地" yestext="這個領地"/>
+ </notification>
+ <notification label="é¸æ“‡é ˜åœ°" name="EstateBlockedExperienceRemove">
+ 僅é‡å°é€™å€‹é ˜åœ°æˆ–é‡å° [ALL_ESTATES] 將它從å°éŽ–清單中移除?
+ <usetemplate canceltext="å–消" name="yesnocancelbuttons" notext="全部領地" yestext="這個領地"/>
+ </notification>
+ <notification label="é¸æ“‡é ˜åœ°" name="EstateTrustedExperienceAdd">
+ 僅é‡å°é€™å€‹é ˜åœ°æˆ–é‡å° [ALL_ESTATES] 將它新增到金鑰清單?
+ <usetemplate canceltext="å–消" name="yesnocancelbuttons" notext="全部領地" yestext="這個領地"/>
+ </notification>
+ <notification label="é¸æ“‡é ˜åœ°" name="EstateTrustedExperienceRemove">
+ 僅é‡å°é€™å€‹é ˜åœ°æˆ–é‡å° [ALL_ESTATES] 將它從金鑰清單中移除?
+ <usetemplate canceltext="å–消" name="yesnocancelbuttons" notext="全部領地" yestext="這個領地"/>
+ </notification>
<notification label="確èªè¸¢å‡º" name="EstateKickUser">
將 [EVIL_USER] 由這領地踢出?
<usetemplate name="okcancelbuttons" notext="å–消" yestext="確定"/>
@@ -1828,6 +1945,9 @@ SHA1 指紋:[MD5_DIGEST]
你所欲å‰å¾€çš„地å€å«æœ‰è¶…éŽä½ ç›®å‰å好的分級的內容。 ä½ å¯ä»¥åˆ°ã€Œæˆ‘自己 &gt; å好設定 &gt; 一般設定ã€è®Šæ›´ä½ çš„å好設定。
<usetemplate name="okbutton" yestext="確定"/>
</notification>
+ <notification name="SLM_UPDATE_FOLDER">
+ [MESSAGE]
+ </notification>
<notification name="RegionEntryAccessBlocked_AdultsOnlyContent">
你所欲å‰å¾€çš„地å€å«æœ‰ [REGIONMATURITY] 的分級內容,僅é™æˆäººã€‚
<url name="url">
@@ -1890,6 +2010,10 @@ SHA1 指紋:[MD5_DIGEST]
發生技術å•é¡Œï¼Œä½ çš„å好設定和伺æœå™¨ä¸Šçš„ä¸ä¸€è‡´ã€‚
<usetemplate name="okbutton" yestext="確定"/>
</notification>
+ <notification name="RegionTPSpecialUsageBlocked">
+ 無法進入地å€ã€‚ &apos;[REGION_NAME]&apos; 是個「技巧性åšå¥•ã€(Skill Gaming)地å€ï¼Œä½ å¿…須符åˆä¸€å®šæ¢ä»¶æ‰å¯é€²å…¥ã€‚ 欲知詳情,請åƒé–± [http://wiki.secondlife.com/wiki/Linden_Lab_Official:Skill_Gaming_in_Second_Life 技巧性åšå¥•å¸¸è¦‹å•é¡Œé›†]。
+ <usetemplate name="okbutton" yestext="確定"/>
+ </notification>
<notification name="PreferredMaturityChanged">
ä½ å°‡ä¸å†æ”¶åˆ°é€šçŸ¥ï¼Œå‘ŠçŸ¥ä½ å³å°‡é€²å…¥ä¸€å€‹ [RATING] 內容分級的地å€ã€‚ ä½ å¯ä»¥åˆ°é¸å–®åˆ—底下的「我自己 &gt; å好設定 &gt; 一般設定ã€è®Šæ›´ä½ çš„內容å好。
<usetemplate name="okbutton" yestext="確定"/>
@@ -2111,6 +2235,10 @@ SHA1 指紋:[MD5_DIGEST]
<ignore name="ignore" text="我在創建ä¸å« money() 腳本的物件時設定了「支付物件ã€å‹•ä½œ"/>
</form>
</notification>
+ <notification name="PayConfirmation">
+ 確èªä½ çœŸè¦æ”¯ä»˜ L$[AMOUNT] 給 [TARGET]。
+ <usetemplate ignoretext="付款å‰è·Ÿæˆ‘確èªï¼ˆè¶…éŽ L$200 的總é¡ï¼‰" name="okcancelignore" notext="å–消" yestext="支付"/>
+ </notification>
<notification name="OpenObjectCannotCopy">
這物件中沒有任何准許你複製的物項。
</notification>
@@ -2196,6 +2324,9 @@ SHA1 指紋:[MD5_DIGEST]
<button ignore="絕ä¸å–代" name="No" text="å–消"/>
</form>
</notification>
+ <notification name="TooManyWearables">
+ ä½ ä¸èƒ½å°å«è¶…éŽ [AMOUNT] 個物項的資料夾作穿戴動作。 欲變更此上é™ï¼Œå¯åˆ°ã€Œé€²éšŽã€&gt;「顯示除錯設定ã€&gt;「WearFolderLimitã€ã€‚
+ </notification>
<notification label="「請勿打擾ã€æ¨¡å¼è­¦å‘Š" name="DoNotDisturbModePay">
你已開啟「請勿打擾ã€ã€‚ ä½ å°‡ä¸æœƒæ”¶åˆ°ä»»ä½•ä»˜æ¬¾è³¼è²·çš„物項。
@@ -2804,7 +2935,7 @@ SHA1 指紋:[MD5_DIGEST]
[MESSAGE]
-來æºç‰©ä»¶ï¼š&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;(所有人是 [NAME])?
+來æºç‰©ä»¶ï¼š&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;(所有人:[NAME])
<form name="form">
<button name="Gotopage" text="å‰å¾€é é¢"/>
<button name="Cancel" text="å–消"/>
@@ -2830,6 +2961,72 @@ SHA1 指紋:[MD5_DIGEST]
<button name="Mute" text="å°éŽ–"/>
</form>
</notification>
+ <notification name="ExperienceAcquireFailed">
+ 無法å–得新的體驗:
+ [ERROR_MESSAGE]
+ <usetemplate name="okbutton" yestext="確定"/>
+ </notification>
+ <notification name="NotInGroupExperienceProfileMessage">
+ å·²å–消å°é«”驗群組的變更,因為æ“有人ä¸æ˜¯æ‰€é¸ç¾¤çµ„çš„æˆå“¡ã€‚
+ </notification>
+ <notification name="UneditableExperienceProfileMessage">
+ 已在更新體驗簡覽時忽略ä¸å¯ç·¨è¼¯çš„æ¬„ä½ &apos;[field]&apos;。
+ </notification>
+ <notification name="RestrictedToOwnerExperienceProfileMessage">
+ 已忽略å°æ¬„ä½ &apos;[field]&apos; 的變更,åªæœ‰é«”é©—æ“有人å¯ä½œæ­¤è®Šæ›´ã€‚
+ </notification>
+ <notification name="MaturityRatingExceedsOwnerExperienceProfileMessage">
+ ä½ ä¸èƒ½å°‡é«”驗的內容分級設定為比æ“有人所設更高的等級。
+ </notification>
+ <notification name="RestrictedTermExperienceProfileMessage">
+ 以下項目導致無法更新體驗的å稱或æ述:[extra_info]
+ </notification>
+ <notification name="TeleportedHomeExperienceRemoved">
+ 你已移除金鑰體驗 secondlife:///app/experience/[public_id]/profile,因此被瞬間傳é€é›¢é–‹ [region_name] 地å€ï¼Œå› ç‚ºä½ å·²ç„¡æ¬ŠçºŒç•™ã€‚
+ <form name="form">
+ <ignore name="ignore" text="移除體驗後,已被踢出地å€"/>
+ </form>
+ </notification>
+ <notification name="TrustedExperienceEntry">
+ ä½ å·²åƒèˆ‡é‡‘鑰體驗 secondlife:///app/experience/[public_id]/profile,因此ç²å‡†é€²å…¥ [region_name] 地å€ï¼Œè‹¥ç§»é™¤æ­¤é«”驗,你å¯èƒ½æœƒè¢«è¸¢å‡ºåœ°å€ã€‚
+ <form name="form">
+ <ignore name="ignore" text="å·²é€éŽé«”é©—ç²å‡†é€²å…¥åœ°å€"/>
+ </form>
+ </notification>
+ <notification name="TrustedExperiencesAvailable">
+ 你並沒有權é™é€²å…¥æ­¤ç›®çš„地。 若接å—以下一項體驗,å¯ç²å‡†é€²å…¥è©²åœ°å€ï¼š
+
+[EXPERIENCE_LIST]
+
+å¯èƒ½æœ‰å…¶ä»–金鑰體驗供é¸æ“‡ã€‚
+ </notification>
+ <notification name="ExperienceEvent">
+ 一個物件已得到 secondlife:///app/experience/[public_id]/profile 體驗å…許,å¯ä»¥[EventType]。
+ 所有人:secondlife:///app/agent/[OwnerID]/inspect
+ 物件å稱:[ObjectName]
+ 地段å稱:[ParcelName]
+ </notification>
+ <notification name="ExperienceEventAttachment">
+ 一個附件已得到 secondlife:///app/experience/[public_id]/profile 體驗å…許,å¯ä»¥[EventType]。
+ 所有人:secondlife:///app/agent/[OwnerID]/inspect
+ </notification>
+ <notification name="ScriptQuestionExperience">
+ &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos;,一個由 &apos;[NAME]&apos; æ“有的物件,邀請你åƒèˆ‡ä»¥ä¸‹çš„ [GRID_WIDE] 體驗:
+
+[EXPERIENCE]
+
+å…准之後,除éžåœ¨ã€Œé«”驗簡覽ã€æ’¤éŠ·è©²æ¬Šé™ï¼Œå¦å‰‡ä½ å°‡ä¸å†çœ‹åˆ°æ­¤è¨Šæ¯ã€‚
+
+本體驗的相關腳本,將å¯åœ¨å•Ÿç”¨æœ¬é«”驗的地å€é€²è¡Œä»¥ä¸‹å‹•ä½œï¼š
+
+[QUESTIONS] 你是å¦åŒæ„?
+ <form name="form">
+ <button name="BlockExperience" text="å°éŽ–體驗"/>
+ <button name="Mute" text="å°éŽ–物件"/>
+ <button name="Yes" text="是"/>
+ <button name="No" text="å¦"/>
+ </form>
+ </notification>
<notification name="ScriptQuestionCaution">
警告:物件 &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos; è¦æ±‚全權存å–你的林登幣帳戶。 你如果å…許存å–帳戶,它將å¯åœ¨ä»»ä½•æ™‚候從你帳戶å–走資金,或完全加以清空,或定期å–走部分資金,且ä¸æœƒç™¼å‡ºè­¦å‘Šã€‚
@@ -3149,6 +3346,10 @@ SHA1 指紋:[MD5_DIGEST]
(存續 [EXISTENCE] 秒é˜ï¼‰
你在 [TIME] 秒é˜å¾Œåœ¨æœ¬åœ°ç‚º &apos;[BODYREGION]&apos; 更新了一個 [RESOLUTION] 的定貌æ質。
</notification>
+ <notification name="CannotUploadTexture">
+ 無法上傳質料。
+[REASON]
+ </notification>
<notification name="LivePreviewUnavailable">
我們無法顯示這個æ質的é è¦½ï¼Œå› ç‚ºå®ƒè¨­ç‚ºã€Œç¦æ­¢è¤‡è£½ã€ä¸” / 或「ç¦æ­¢è½‰ç§»ã€ã€‚
<usetemplate ignoretext="「ç¦æ­¢è¤‡è£½ã€å’Œã€Œç¦æ­¢è½‰ç§»ã€çš„æ質若ä¸èƒ½ä½¿ç”¨å¯¦æ™‚é è¦½æ¨¡å¼ï¼Œè«‹çµ¦æˆ‘警示。" name="okignore" yestext="確定"/>
@@ -3724,9 +3925,11 @@ SHA1 指紋:[MD5_DIGEST]
</notification>
<notification name="TeleportedByAttachment">
ä½ å·²æˆåŠŸè¢« [ITEM_ID] 上的一個附件瞬間傳é€
+ <usetemplate ignoretext="瞬間傳é€ï¼šä½ å·²æˆåŠŸè¢«ä¸€å€‹é™„件瞬間傳é€" name="notifyignore"/>
</notification>
<notification name="TeleportedByObjectOnParcel">
ä½ å·²æˆåŠŸè¢« &apos;[PARCEL_NAME]&apos; 地段的物件 &apos;[OBJECT_NAME]&apos; 瞬間傳é€
+ <usetemplate ignoretext="瞬間傳é€ï¼šä½ å·²è¢«ä¸€å€‹ç‰©ä»¶æˆ–地段瞬間傳é€æˆåŠŸ" name="notifyignore"/>
</notification>
<notification name="TeleportedByObjectOwnedBy">
ä½ å·²æˆåŠŸè¢« [OWNER_ID] æ“有的物件 &apos;[OBJECT_NAME]&apos; 瞬間傳é€
@@ -4058,7 +4261,7 @@ SHA1 指紋:[MD5_DIGEST]
<usetemplate ignoretext="無法移動檔案。 å·²æ¢å¾©å‰ä¸€å€‹è·¯å¾‘。" name="okignore" yestext="確定"/>
</notification>
<notification name="DefaultObjectPermissions">
- 儲存é è¨­æ¬Šé™æ™‚出å•é¡Œï¼ŒåŽŸå› ï¼š[REASON]。 è«‹ç¨å¾Œå†å˜—試儲存é è¨­æ¬Šé™ã€‚
+ 儲存é è¨­ç‰©ä»¶æ¬Šé™æ™‚出å•é¡Œï¼ŒåŽŸå› ï¼š[REASON]。 è«‹ç¨å¾Œå†å˜—試儲存é è¨­æ¬Šé™ã€‚
<usetemplate name="okbutton" yestext="確定"/>
</notification>
<notification name="ChatHistoryIsBusyAlert">
diff --git a/indra/newview/skins/default/xui/zh/panel_experience_info.xml b/indra/newview/skins/default/xui/zh/panel_experience_info.xml
new file mode 100644
index 0000000000..04d22c46ea
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/panel_experience_info.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_experience_info">
+ <text name="title" value="體驗簡覽"/>
+ <scroll_container name="xp_scroll">
+ <panel name="scrolling_panel">
+ <layout_stack>
+ <layout_panel>
+ <text name="experience_title" value="Kyle&apos;s Superhero RPG"/>
+ </layout_panel>
+ <layout_panel name="location panel">
+ <text name="Location">
+ ä½ç½®ï¼š
+ </text>
+ <text name="LocationTextText">
+ æŸæŸåœ°é»ž
+ </text>
+ <button label="瞬間傳é€" name="teleport_btn"/>
+ <button label="地圖" name="map_btn"/>
+ </layout_panel>
+ <layout_panel name="marketplace panel">
+ <text name="Location">
+ 第二人生購物市集商店:
+ </text>
+ <text name="LocationTextText">
+ æŸæŸåœ°é»ž
+ </text>
+ </layout_panel>
+ <layout_panel>
+ <text name="ContentRating">
+ 分級:
+ </text>
+ <text name="ContentRatingText">
+ 完全æˆäºº
+ </text>
+ <text name="Owner">
+ 所有人:
+ </text>
+ <text name="OwnerText">
+ Kyle
+ </text>
+ <button label="編輯" name="edit_btn"/>
+ </layout_panel>
+ </layout_stack>
+ </panel>
+ </scroll_container>
+</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_experience_list_editor.xml b/indra/newview/skins/default/xui/zh/panel_experience_list_editor.xml
new file mode 100644
index 0000000000..469f942578
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/panel_experience_list_editor.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="experince_list_editor">
+ <panel.string name="loading">
+ 載入中...
+ </panel.string>
+ <panel.string name="panel_allowed">
+ å…許的體驗:
+ </panel.string>
+ <panel.string name="panel_blocked">
+ å°éŽ–的體驗:
+ </panel.string>
+ <panel.string name="panel_trusted">
+ 金鑰體驗:
+ </panel.string>
+ <panel.string name="no_results">
+ (空白)
+ </panel.string>
+ <text name="text_name">
+ 體驗清單
+ </text>
+ <scroll_list name="experience_list">
+ <columns label="å稱" name="experience_name"/>
+ </scroll_list>
+ <button label="添加..." name="btn_add"/>
+ <button label="移除" name="btn_remove"/>
+ <button label="檔案..." name="btn_profile"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_experience_list_item.xml b/indra/newview/skins/default/xui/zh/panel_experience_list_item.xml
new file mode 100644
index 0000000000..3ec619b8de
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/panel_experience_list_item.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Experiences">
+ <text name="experience_name">
+ 測試用å稱
+ </text>
+</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_experience_log.xml b/indra/newview/skins/default/xui/zh/panel_experience_log.xml
new file mode 100644
index 0000000000..791dcd0a2e
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/panel_experience_log.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="EVENTS">
+ <string name="no_events" value="無活動。"/>
+ <string name="loading" value="載入中..."/>
+ <layout_stack>
+ <layout_panel>
+ <scroll_list name="experience_log_list">
+ <columns label="時間" name="time"/>
+ <columns label="活動" name="event"/>
+ <columns label="體驗" name="experience_name"/>
+ <columns label="物件" name="object_name"/>
+ </scroll_list>
+ <button label="通知" name="btn_notify"/>
+ <button label="簡覽" name="btn_profile_xp"/>
+ <button label="回報" name="btn_report_xp"/>
+ </layout_panel>
+ <layout_panel name="button_panel">
+ <check_box label="å°æ‰€æœ‰æ´»å‹•ä½œé€šçŸ¥ 天數" name="notify_all"/>
+ <button label="清除" name="btn_clear"/>
+ <button label="&lt;" name="btn_prev"/>
+ <button label="&gt;" name="btn_next"/>
+ </layout_panel>
+ </layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_experience_search.xml b/indra/newview/skins/default/xui/zh/panel_experience_search.xml
new file mode 100644
index 0000000000..9b0145748e
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/panel_experience_search.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="SEARCH">
+ <string name="not_found">
+ 查無「[TEXT]ã€
+ </string>
+ <string name="no_results">
+ 沒有çµæžœ
+ </string>
+ <string name="searching">
+ æœå°‹ä¸­...
+ </string>
+ <string name="loading">
+ 載入中…
+ </string>
+ <string name="maturity_icon_general">
+ &quot;Parcel_PG_Light&quot;
+ </string>
+ <string name="maturity_icon_moderate">
+ &quot;Parcel_M_Light&quot;
+ </string>
+ <string name="maturity_icon_adult">
+ &quot;Parcel_R_Light&quot;
+ </string>
+ <panel name="search_panel">
+ <button label="å‰å¾€" name="find"/>
+ <icons_combo_box label="é©åº¦æˆäºº" name="maturity">
+ <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>
+ <scroll_list name="search_results">
+ <columns label="å稱" name="experience_name"/>
+ <columns label="所有人" name="owner"/>
+ </scroll_list>
+ <button label="確定" label_selected="確定" name="ok_btn"/>
+ <button label="å–消" name="cancel_btn"/>
+ <button label="察看簡覽" name="profile_btn"/>
+ <button label="&lt;" name="left_btn"/>
+ <button label="&gt;" name="right_btn"/>
+ </panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_experiences.xml b/indra/newview/skins/default/xui/zh/panel_experiences.xml
new file mode 100644
index 0000000000..bb1df97058
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/panel_experiences.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Experiences">
+ <string name="loading_experiences" value="體驗載入中..."/>
+ <string name="no_experiences" value="未設體驗。"/>
+ <string name="acquire" value="å–得體驗"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_facebook_photo.xml b/indra/newview/skins/default/xui/zh/panel_facebook_photo.xml
index d43fcf4665..85d2ac36f3 100644
--- a/indra/newview/skins/default/xui/zh/panel_facebook_photo.xml
+++ b/indra/newview/skins/default/xui/zh/panel_facebook_photo.xml
@@ -1,26 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<panel name="panel_facebook_photo">
- <layout_stack name="stack_photo">
- <layout_panel name="snapshot_panel">
- <combo_box name="resolution_combobox" tool_tip="圖åƒè§£æžåº¦">
- <combo_box.item label="ç›®å‰è¦–窗" name="CurrentWindow"/>
- <combo_box.item label="640x480" name="640x480"/>
- <combo_box.item label="800x600" name="800x600"/>
- <combo_box.item label="1024x768" name="1024x768"/>
- <combo_box.item label="1200x630" name="1200x630"/>
- </combo_box>
- <combo_box name="filters_combobox" tool_tip="圖åƒæ¿¾é¡">
- <combo_box.item label="ä¸ç”¨æ¿¾é¡" name="NoFilter"/>
- </combo_box>
- <button label="é‡æ–°æ•´ç†" name="new_snapshot_btn" tool_tip="點按å³å¯åˆ·æ–°"/>
- <button label="é è¦½" name="big_preview_btn" tool_tip="點按å³å¯åˆ‡æ›é è¦½"/>
- <text name="caption_label">
- 說明(å¯ç•™ç©ºï¼‰ï¼š
- </text>
- </layout_panel>
- <layout_panel name="photo_button_panel">
- <button label="發佈" name="post_photo_btn"/>
- <button label="å–消" name="cancel_photo_btn"/>
- </layout_panel>
- </layout_stack>
+ <combo_box name="resolution_combobox" tool_tip="圖åƒè§£æžåº¦">
+ <combo_box.item label="ç›®å‰è¦–窗" name="CurrentWindow"/>
+ <combo_box.item label="640x480" name="640x480"/>
+ <combo_box.item label="800x600" name="800x600"/>
+ <combo_box.item label="1024x768" name="1024x768"/>
+ <combo_box.item label="1200x630" name="1200x630"/>
+ </combo_box>
+ <combo_box name="filters_combobox" tool_tip="圖åƒæ¿¾é¡">
+ <combo_box.item label="ä¸ç”¨æ¿¾é¡" name="NoFilter"/>
+ </combo_box>
+ <button label="刷新" name="new_snapshot_btn" tool_tip="點按å³å¯åˆ·æ–°"/>
+ <button label="é è¦½" name="big_preview_btn" tool_tip="點按å³å¯åˆ‡æ›é è¦½"/>
+ <text name="caption_label">
+ 說明(å¯ç•™ç©ºï¼‰ï¼š
+ </text>
+ <button label="發佈" name="post_photo_btn"/>
+ <button label="å–消" name="cancel_photo_btn"/>
</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_facebook_place.xml b/indra/newview/skins/default/xui/zh/panel_facebook_place.xml
index 27bd789af1..56d4d687ef 100644
--- a/indra/newview/skins/default/xui/zh/panel_facebook_place.xml
+++ b/indra/newview/skins/default/xui/zh/panel_facebook_place.xml
@@ -1,17 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<panel name="panel_facebook_place">
- <layout_stack name="stack_place">
- <layout_panel name="place_detail_panel">
- <text name="place_caption_label">
- æ述一下你所在的地方:
- </text>
- </layout_panel>
- <layout_panel name="place_map_panel">
- <check_box initial_value="false" label="" name="add_place_view_cb"/>
- </layout_panel>
- <layout_panel name="place_button_panel">
- <button label="發佈" name="post_place_btn"/>
- <button label="å–消" name="cancel_place_btn"/>
- </layout_panel>
- </layout_stack>
+ <text name="place_caption_label">
+ æ述一下你所在的地方:
+ </text>
+ <check_box initial_value="false" label="包括地點的俯瞰圖" name="add_place_view_cb"/>
+ <button label="發佈" name="post_place_btn"/>
+ <button label="å–消" name="cancel_place_btn"/>
</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_facebook_status.xml b/indra/newview/skins/default/xui/zh/panel_facebook_status.xml
index b947b49a4f..3a7cbd07b0 100644
--- a/indra/newview/skins/default/xui/zh/panel_facebook_status.xml
+++ b/indra/newview/skins/default/xui/zh/panel_facebook_status.xml
@@ -1,14 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<panel name="panel_facebook_status">
- <layout_stack name="stack_status">
- <layout_panel name="status_detail_panel">
- <text name="status_caption_label">
- 你在想些什麼?
- </text>
- </layout_panel>
- <layout_panel name="status_button_panel">
- <button label="發佈" name="post_status_btn"/>
- <button label="å–消" name="cancel_status_btn"/>
- </layout_panel>
- </layout_stack>
+ <string name="facebook_connected" value="å·²æˆåŠŸé€£é€šè‡‰æ›¸ï¼Œèº«åˆ†ç‚ºï¼š"/>
+ <string name="facebook_disconnected" value="未連通臉書"/>
+ <text name="account_caption_label">
+ 未連通臉書。
+ </text>
+ <panel name="panel_buttons">
+ <button label="連通…" name="connect_btn"/>
+ <button label="中斷" name="disconnect_btn"/>
+ <text name="account_learn_more_label">
+ [http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-Share-Facebook/ta-p/2149711 如何發佈到臉書]
+ </text>
+ </panel>
+ <text name="status_caption_label">
+ 你在想些什麼?
+ </text>
+ <button label="發佈" name="post_status_btn"/>
+ <button label="å–消" name="cancel_status_btn"/>
</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_flickr_photo.xml b/indra/newview/skins/default/xui/zh/panel_flickr_photo.xml
index 75738abebc..ece239a29f 100644
--- a/indra/newview/skins/default/xui/zh/panel_flickr_photo.xml
+++ b/indra/newview/skins/default/xui/zh/panel_flickr_photo.xml
@@ -1,41 +1,35 @@
<?xml version="1.0" encoding="utf-8"?>
<panel name="panel_flickr_photo">
- <layout_stack name="stack_photo">
- <layout_panel name="snapshot_panel">
- <combo_box name="resolution_combobox" tool_tip="圖åƒè§£æžåº¦">
- <combo_box.item label="ç›®å‰è¦–窗" name="CurrentWindow"/>
- <combo_box.item label="640x480" name="640x480"/>
- <combo_box.item label="800x600" name="800x600"/>
- <combo_box.item label="1024x768" name="1024x768"/>
- </combo_box>
- <combo_box name="filters_combobox" tool_tip="圖åƒæ¿¾é¡">
- <combo_box.item label="ä¸ç”¨æ¿¾é¡" name="NoFilter"/>
- </combo_box>
- <button label="刷新" name="new_snapshot_btn" tool_tip="點按å³å¯åˆ·æ–°"/>
- <button label="é è¦½" name="big_preview_btn" tool_tip="點按å³å¯åˆ‡æ›é è¦½"/>
- <text name="title_label">
- 標題:
- </text>
- <text name="description_label">
- æ述:
- </text>
- <check_box initial_value="true" label="在æè¿°çµå°¾åŠ ä¸Šç¬¬äºŒäººç”Ÿçš„地點" name="add_location_cb"/>
- <text name="tags_label">
- 標籤:
- </text>
- <text name="tags_help_label">
- ä¸åŒæ¨™ç±¤ä¹‹é–“以åŠå½¢ç©ºæ ¼åˆ†éš”
+ <combo_box name="resolution_combobox" tool_tip="圖åƒè§£æžåº¦">
+ <combo_box.item label="ç›®å‰è¦–窗" name="CurrentWindow"/>
+ <combo_box.item label="640x480" name="640x480"/>
+ <combo_box.item label="800x600" name="800x600"/>
+ <combo_box.item label="1024x768" name="1024x768"/>
+ </combo_box>
+ <combo_box name="filters_combobox" tool_tip="圖åƒæ¿¾é¡">
+ <combo_box.item label="ä¸ç”¨æ¿¾é¡" name="NoFilter"/>
+ </combo_box>
+ <button label="刷新" name="new_snapshot_btn" tool_tip="點按å³å¯åˆ·æ–°"/>
+ <button label="é è¦½" name="big_preview_btn" tool_tip="點按å³å¯åˆ‡æ›é è¦½"/>
+ <text name="title_label">
+ 標題:
+ </text>
+ <text name="description_label">
+ æ述:
+ </text>
+ <check_box initial_value="true" label="在æè¿°çµå°¾åŠ ä¸Šç¬¬äºŒäººç”Ÿçš„地點" name="add_location_cb"/>
+ <text name="tags_label">
+ 標籤:
+ </text>
+ <text name="tags_help_label">
+ ä¸åŒæ¨™ç±¤ä¹‹é–“以åŠå½¢ç©ºæ ¼åˆ†éš”
標籤若å«ç©ºæ ¼ï¼Œç”¨ &quot;&quot; åŠå½¢ç¬¦è™Ÿæ‹¬ä½
- </text>
- <combo_box name="rating_combobox" tool_tip="Flickr 內容分級">
- <combo_box.item label="安全級 Flickr 內容" name="SafeRating"/>
- <combo_box.item label="é©ä¸­ç´š Flickr 內容" name="ModerateRating"/>
- <combo_box.item label="é™åˆ¶ç´š Flickr 內容" name="RestrictedRating"/>
- </combo_box>
- </layout_panel>
- <layout_panel name="photo_button_panel">
- <button label="上傳" name="post_photo_btn"/>
- <button label="å–消" name="cancel_photo_btn"/>
- </layout_panel>
- </layout_stack>
+ </text>
+ <combo_box name="rating_combobox" tool_tip="Flickr 內容分級">
+ <combo_box.item label="安全級 Flickr 內容" name="SafeRating"/>
+ <combo_box.item label="é©ä¸­ç´š Flickr 內容" name="ModerateRating"/>
+ <combo_box.item label="é™åˆ¶ç´š Flickr 內容" name="RestrictedRating"/>
+ </combo_box>
+ <button label="上傳" name="post_photo_btn"/>
+ <button label="å–消" name="cancel_photo_btn"/>
</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/zh/panel_group_info_sidetray.xml
index 43e3507961..1fb0b3f5bb 100755
--- a/indra/newview/skins/default/xui/zh/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/default/xui/zh/panel_group_info_sidetray.xml
@@ -23,6 +23,7 @@
<accordion_tab name="group_roles_tab" title="角色與æˆå“¡"/>
<accordion_tab name="group_notices_tab" title="通知"/>
<accordion_tab name="group_land_tab" title="土地 / 資產"/>
+ <accordion_tab name="group_experiences_tab" title="體驗"/>
</accordion>
</layout_panel>
</layout_stack>
diff --git a/indra/newview/skins/default/xui/zh/panel_login.xml b/indra/newview/skins/default/xui/zh/panel_login.xml
index 09a1af5cf8..5292e5fc38 100755
--- a/indra/newview/skins/default/xui/zh/panel_login.xml
+++ b/indra/newview/skins/default/xui/zh/panel_login.xml
@@ -1,26 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<panel name="panel_login">
- <panel.string name="forgot_password_url">
- http://secondlife.com/account/request.php
- </panel.string>
+ <panel.string name="forgot_password_url">http://secondlife.com/account/request.php</panel.string>
<layout_stack name="ui_stack">
<layout_panel name="ui_container">
<combo_box label="使用者å稱" name="username_combo" tool_tip="使用者å稱是你註冊時所挑é¸çš„,例如 bobsmith12 或 Steller Sunshine"/>
<line_editor label="密碼" name="password_edit"/>
- <check_box label="記得我" name="remember_check"/>
- <text name="forgot_password_text">
- 忘記密碼
- </text>
- <button label="登入" name="connect_btn"/>
- <text name="At_My_Last_Location_Label">
- 到我上次去的地點
- </text>
<combo_box label="我的最愛" name="start_location_combo">
+ <combo_box.item label="我上一次ä½ç½®" name="MyLastLocation"/>
<combo_box.item label="我的家" name="MyHome"/>
</combo_box>
- <button label="登入" name="connect_favorite_btn"/>
- <line_editor label="éµå…¥ä¸€å€‹åœ°é»ž" name="location_edit"/>
- <button label="登入" name="connect_location_btn"/>
+ <button label="登入" name="connect_btn"/>
+ <check_box label="記得我" name="remember_check"/>
+ <text name="forgot_password_text">忘記密碼</text>
<combo_box label="é¸æ“‡æ¨¡æ“¬ä¸–ç•Œ" name="server_combo"/>
</layout_panel>
</layout_stack>
diff --git a/indra/newview/skins/default/xui/zh/panel_marketplace_listings.xml b/indra/newview/skins/default/xui/zh/panel_marketplace_listings.xml
new file mode 100644
index 0000000000..2eae87c6a0
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/panel_marketplace_listings.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Marketplace" name="Marketplace Panel">
+ <panel name="tool_panel">
+ <menu_button name="sort_btn" tool_tip="檢視/排åºçš„é¸é …"/>
+ <button name="add_btn" tool_tip="新建一個刊登資料夾"/>
+ <button label="檢查是å¦æœ‰èª¤" name="audit_btn" tool_tip="檢查你的 Marketplace 刊登"/>
+ </panel>
+ <panel name="tab_container_panel">
+ <filter_editor label="éŽæ¿¾ Marketplace 刊登清單" name="filter_editor"/>
+ </panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_marketplace_listings_inventory.xml b/indra/newview/skins/default/xui/zh/panel_marketplace_listings_inventory.xml
new file mode 100644
index 0000000000..a052a50bd1
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/panel_marketplace_listings_inventory.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<inventory_panel label="全部" name="All Items" tool_tip="拖曳並置放物å“到這裡,å³å¯åˆŠç™»"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_marketplace_listings_listed.xml b/indra/newview/skins/default/xui/zh/panel_marketplace_listings_listed.xml
new file mode 100644
index 0000000000..3adc66a1d4
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/panel_marketplace_listings_listed.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<inventory_panel label="已刊登" name="Active Items"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_marketplace_listings_unassociated.xml b/indra/newview/skins/default/xui/zh/panel_marketplace_listings_unassociated.xml
new file mode 100644
index 0000000000..d582e6615c
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/panel_marketplace_listings_unassociated.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<inventory_panel label="å·²å–消è¯çµ" name="Unassociated Items"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_marketplace_listings_unlisted.xml b/indra/newview/skins/default/xui/zh/panel_marketplace_listings_unlisted.xml
new file mode 100644
index 0000000000..6d00f3d9b7
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/panel_marketplace_listings_unlisted.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<inventory_panel label="未刊登" name="Inactive Items"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_postcard_settings.xml b/indra/newview/skins/default/xui/zh/panel_postcard_settings.xml
index 900ab3a54e..8ab122ccc3 100755
--- a/indra/newview/skins/default/xui/zh/panel_postcard_settings.xml
+++ b/indra/newview/skins/default/xui/zh/panel_postcard_settings.xml
@@ -7,17 +7,7 @@
<combo_box.item label="1024x768" name="1024x768"/>
<combo_box.item label="自訂" name="Custom"/>
</combo_box>
- <layout_stack name="postcard_image_params_ls">
- <layout_panel name="postcard_image_size_lp">
- <spinner label="寬" name="postcard_snapshot_width"/>
- <spinner label="高度" name="postcard_snapshot_height"/>
- <check_box label="鎖ä½æ¯”例" name="postcard_keep_aspect_check"/>
- </layout_panel>
- <layout_panel name="postcard_image_format_quality_lp">
- <slider label="圖åƒå“質" name="image_quality_slider"/>
- <text name="image_quality_level">
- ([QLVL])
- </text>
- </layout_panel>
- </layout_stack>
+ <spinner label="寬 x 高" name="postcard_snapshot_width"/>
+ <check_box label="鎖ä½æ¯”例" name="postcard_keep_aspect_check"/>
+ <slider label="清晰度:" name="image_quality_slider"/>
</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_setup.xml b/indra/newview/skins/default/xui/zh/panel_preferences_setup.xml
index ab4d9a881d..fcbed76d49 100755
--- a/indra/newview/skins/default/xui/zh/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_setup.xml
@@ -14,9 +14,9 @@
<text name="Web:">
網é ï¼š
</text>
- <radio_group name="use_external_browser">
- <radio_item label="使用我的網é ç€è¦½å™¨ï¼ˆä¾‹å¦‚ IE, Firefox, Safari)" name="external" tool_tip="使用系統é è¨­çš„ç€è¦½å™¨ç€è¦½å¹«åŠ©ï¼Œé–‹å•Ÿç¶²é ã€‚全螢幕模å¼ä¸‹ä¸å»ºè­°é€™éº¼åšã€‚" value="true"/>
- <radio_item label="使用內建網é ç€è¦½å™¨" name="internal" tool_tip="使用內建的ç€è¦½å™¨ç€è¦½å¹«åŠ©ï¼Œé–‹å•Ÿç¶²é ã€‚該ç€è¦½å™¨å°‡é€éŽ [APP_NAME] 開啟新視窗。" value=""/>
+ <radio_group name="preferred_browser_behavior">
+ <radio_item label="所有連çµéƒ½ç”¨æˆ‘的網é ç€è¦½å™¨ï¼ˆä¾‹å¦‚ Chromeã€Firefoxã€IE)開啟" name="internal" tool_tip="使用系統é è¨­çš„ç€è¦½å™¨ç€è¦½å¹«åŠ©ï¼Œé–‹å•Ÿç¶²é ã€‚全螢幕模å¼ä¸‹ä¸å»ºè­°é€™éº¼åšã€‚" value="0"/>
+ <radio_item label="僅在開啟第二人生連çµæ™‚使用內建ç€è¦½å™¨" name="external" tool_tip="使用系統é è¨­çš„ç€è¦½å™¨ç€è¦½å¹«åŠ©ï¼Œé–‹å•Ÿç¶²é ã€‚僅在開啟 LindenLab/SecondLife 的連çµæ™‚æ‰æœƒä½¿ç”¨å…§å»ºç€è¦½å™¨ã€‚" value="1"/>
</radio_group>
<check_box initial_value="true" label="啟用外掛" name="browser_plugins_enabled"/>
<check_box initial_value="true" label="æŽ¥å— cookies" name="cookies_enabled"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_region_experiences.xml b/indra/newview/skins/default/xui/zh/panel_region_experiences.xml
new file mode 100644
index 0000000000..7b1b697fd6
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/panel_region_experiences.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="體驗" name="Experiences">
+ <panel.string name="trusted_estate_text">
+ 任何體驗都å¯ä»¥æˆç‚ºé‡‘鑰體驗。
+
+金鑰體驗å¯åœ¨æ­¤é ˜åœ°åŸ·è¡Œã€‚
+
+此外,å³ä½¿é€™å€‹é ˜åœ°å¹³å¸¸ä¸é–‹æ”¾é€²å…¥ï¼Œåƒèˆ‡ä»»ä½•é‘°åŒ™é«”驗的居民,åªè¦ç¶­æŒè™•åœ¨ã€Œé‡‘鑰體驗ã€ç‹€æ…‹ï¼Œä»å¯é€²å…¥é ˜åœ°åœç•™ã€‚
+ </panel.string>
+ <panel.string name="allowed_estate_text">
+ åªå…准「土地範åœã€çš„體驗。
+
+ç²å‡†çš„體驗å¯åœ¨æ­¤é ˜åœ°åŸ·è¡Œã€‚
+ </panel.string>
+ <panel.string name="blocked_estate_text">
+ åªå°éŽ–「網格範åœã€çš„體驗。
+
+é­å°éŽ–的體驗ä¸å¾—在此領地執行。
+ </panel.string>
+ <panel.string name="estate_caption">
+ 變更此夜籤中的設定會影響這個領地內的全部地å€è¨­å®šã€‚
+ </panel.string>
+ <panel.string name="allowed_parcel_text">
+ åªå…准「土地範åœã€çš„體驗。
+
+ç²å‡†çš„體驗若未被領地å°éŽ–,就å¯åœ¨æ­¤åœ°æ®µåŸ·è¡Œã€‚
+ </panel.string>
+ <panel.string name="blocked_parcel_text">
+ 任何居民的體驗都å¯ä»¥åŠ ä»¥å°éŽ–。
+
+é­å°éŽ–的體驗ä¸å¾—在此地段執行。
+ </panel.string>
+</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_script_experience.xml b/indra/newview/skins/default/xui/zh/panel_script_experience.xml
new file mode 100644
index 0000000000..40fd0a90de
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/panel_script_experience.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<panel name="script_experience" title="體驗">
+ <button label="體驗" name="Expand Experience"/>
+ <check_box label="使用體驗" name="enable_xp"/>
+ <layout_stack name="xp_details">
+ <layout_panel>
+ <combo_box label="é¸æ“‡é«”驗…" name="Experiences..."/>
+ </layout_panel>
+ </layout_stack>
+ <text name="No Experiences">
+ 你尚未å°ä»»ä½•é«”驗作貢ç»ã€‚
+ </text>
+</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/zh/panel_snapshot_inventory.xml
index 20fb9b494a..9c45c54a5e 100755
--- a/indra/newview/skins/default/xui/zh/panel_snapshot_inventory.xml
+++ b/indra/newview/skins/default/xui/zh/panel_snapshot_inventory.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="panel_snapshot_inventory">
<text name="title">
- 儲存到我的收ç´å€
+ 收ç´å€
</text>
<text name="hint_lbl">
將圖åƒå„²å­˜åˆ°æ”¶ç´å€çš„費用為 L$[UPLOAD_COST]。 è‹¥è¦å°‡åœ–åƒå­˜ç‚ºæ質,請é¸æ“‡ä¸€å€‹æ­£æ–¹æ ¼å¼ã€‚
@@ -13,8 +13,8 @@
<combo_box.item label="大(512x512)" name="Large(512x512)"/>
<combo_box.item label="自訂" name="Custom"/>
</combo_box>
- <spinner label="寬" name="inventory_snapshot_width"/>
- <spinner label="高度" name="inventory_snapshot_height"/>
+ <spinner label="寬 x 高" name="inventory_snapshot_width"/>
+ <spinner label="" name="inventory_snapshot_height"/>
<check_box label="鎖ä½æ¯”例" name="inventory_keep_aspect_check"/>
<button label="å–消" name="cancel_btn"/>
<button label="儲存" name="save_btn"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_snapshot_local.xml b/indra/newview/skins/default/xui/zh/panel_snapshot_local.xml
index a929c9a3fb..691ab8bac7 100755
--- a/indra/newview/skins/default/xui/zh/panel_snapshot_local.xml
+++ b/indra/newview/skins/default/xui/zh/panel_snapshot_local.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="panel_snapshot_local">
<text name="title">
- 儲存到電腦上
+ 硬碟
</text>
<combo_box label="解æžåº¦" name="local_size_combo">
<combo_box.item label="ç›®å‰è¦–窗" name="CurrentWindow"/>
@@ -13,24 +13,17 @@
<combo_box.item label="1600x1200" name="1600x1200"/>
<combo_box.item label="自訂" name="Custom"/>
</combo_box>
- <layout_stack name="local_image_params_ls">
- <layout_panel name="local_image_size_lp">
- <spinner label="寬" name="local_snapshot_width"/>
- <spinner label="高度" name="local_snapshot_height"/>
- <check_box label="鎖ä½æ¯”例" name="local_keep_aspect_check"/>
- </layout_panel>
- <layout_panel name="local_image_format_quality_lp">
- <combo_box label="æ ¼å¼" name="local_format_combo">
- <combo_box.item label="PNG(零失真)" name="PNG"/>
- <combo_box.item label="JPEG" name="JPEG"/>
- <combo_box.item label="BMP(零失真)" name="BMP"/>
- </combo_box>
- <slider label="圖åƒå“質" name="image_quality_slider"/>
- <text name="image_quality_level">
- ([QLVL])
- </text>
- </layout_panel>
- </layout_stack>
+ <spinner label="寬 x 高" name="local_snapshot_width"/>
+ <check_box label="鎖ä½æ¯”例" name="local_keep_aspect_check"/>
+ <text name="local_format_label">
+ æ ¼å¼
+ </text>
+ <combo_box label="æ ¼å¼" name="local_format_combo">
+ <combo_box.item label="PNG(零失真)" name="PNG"/>
+ <combo_box.item label="JPEG" name="JPEG"/>
+ <combo_box.item label="BMP(零失真)" name="BMP"/>
+ </combo_box>
+ <slider label="清晰度:" name="image_quality_slider"/>
<button label="å–消" name="cancel_btn"/>
<flyout_button label="儲存" name="save_btn" tool_tip="儲存圖åƒåˆ°æª”案">
<flyout_button.item label="儲存" name="save_item"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_snapshot_options.xml b/indra/newview/skins/default/xui/zh/panel_snapshot_options.xml
index 43d7280373..a5a1cbfb51 100755
--- a/indra/newview/skins/default/xui/zh/panel_snapshot_options.xml
+++ b/indra/newview/skins/default/xui/zh/panel_snapshot_options.xml
@@ -1,16 +1,10 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="panel_snapshot_options">
- <button label="é€è‡³æˆ‘的檔案訊æ¯ç™¼ä½ˆ" name="save_to_profile_btn"/>
- <button label="電郵" name="save_to_email_btn"/>
- <button label="儲存到我的收ç´å€ï¼ˆL$[AMOUNT])" name="save_to_inventory_btn"/>
- <button label="儲存到電腦上" name="save_to_computer_btn"/>
- <text name="send_to_facebook_textbox">
- [secondlife:/// 臉書(Facebook)]
- </text>
- <text name="send_to_twitter_textbox">
- [secondlife:/// 推特(Twitter)]
- </text>
- <text name="send_to_flickr_textbox">
- [secondlife:/// Flickr]
- </text>
+ <button label="儲存到硬碟" name="save_to_computer_btn"/>
+ <button label="儲存到收ç´å€ï¼ˆL$[AMOUNT])" name="save_to_inventory_btn"/>
+ <button label="上傳到簡覽" name="save_to_profile_btn"/>
+ <button label="上傳到臉書" name="send_to_facebook_btn"/>
+ <button label="上傳到推特" name="send_to_twitter_btn"/>
+ <button label="上傳到 Flickr" name="send_to_flickr_btn"/>
+ <button label="用電郵傳é€" name="save_to_email_btn"/>
</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/zh/panel_snapshot_postcard.xml
index 853a856104..77f8b335db 100755
--- a/indra/newview/skins/default/xui/zh/panel_snapshot_postcard.xml
+++ b/indra/newview/skins/default/xui/zh/panel_snapshot_postcard.xml
@@ -12,6 +12,10 @@
<text name="title">
電郵
</text>
- <button label="訊æ¯" name="message_btn"/>
- <button label="設定" name="settings_btn"/>
+ <tab_container name="postcard_tabs">
+ <panel label="訊æ¯" name="panel_postcard_message"/>
+ <panel label="設定" name="panel_postcard_settings"/>
+ </tab_container>
+ <button label="å–消" name="cancel_btn"/>
+ <button label="é€å‡º" name="send_btn"/>
</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_snapshot_profile.xml b/indra/newview/skins/default/xui/zh/panel_snapshot_profile.xml
index 6f64a4e83c..1f202572f5 100755
--- a/indra/newview/skins/default/xui/zh/panel_snapshot_profile.xml
+++ b/indra/newview/skins/default/xui/zh/panel_snapshot_profile.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="panel_snapshot_profile">
<text name="title">
- é€è‡³æˆ‘的檔案訊æ¯ç™¼ä½ˆ
+ 簡覽
</text>
<combo_box label="解æžåº¦" name="profile_size_combo">
<combo_box.item label="ç›®å‰è¦–窗" name="CurrentWindow"/>
@@ -10,19 +10,12 @@
<combo_box.item label="1024x768" name="1024x768"/>
<combo_box.item label="自訂" name="Custom"/>
</combo_box>
- <layout_stack name="profile_image_params_ls">
- <layout_panel name="profile_image_size_lp">
- <spinner label="寬" name="profile_snapshot_width"/>
- <spinner label="高度" name="profile_snapshot_height"/>
- <check_box label="鎖ä½æ¯”例" name="profile_keep_aspect_check"/>
- </layout_panel>
- <layout_panel name="profile_image_metadata_lp">
- <text name="caption_label">
- 內容敘述:
- </text>
- <check_box initial_value="true" label="加入所在ä½ç½®" name="add_location_cb"/>
- </layout_panel>
- </layout_stack>
+ <spinner label="寬 x 高" name="profile_snapshot_width"/>
+ <check_box label="鎖ä½æ¯”例" name="profile_keep_aspect_check"/>
+ <text name="caption_label">
+ 內容敘述:
+ </text>
+ <check_box initial_value="true" label="加入所在ä½ç½®" name="add_location_cb"/>
<button label="å–消" name="cancel_btn"/>
<button label="發佈" name="post_btn"/>
</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_status_bar.xml b/indra/newview/skins/default/xui/zh/panel_status_bar.xml
index b4cdff9d6b..2de31eb526 100755
--- a/indra/newview/skins/default/xui/zh/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/zh/panel_status_bar.xml
@@ -1,28 +1,16 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="status">
- <panel.string name="packet_loss_tooltip">
- å°åŒ…æ失
- </panel.string>
- <panel.string name="bandwidth_tooltip">
- 頻寬
- </panel.string>
- <panel.string name="time">
- [hour12, datetime, slt]:[min, datetime, slt] [ampm, datetime, slt] [timezone,datetime, slt]
- </panel.string>
- <panel.string name="timeTooltip">
- [weekday, datetime, slt], [day, datetime, slt] [month, datetime, slt] [year, datetime, slt]
- </panel.string>
- <panel.string name="buycurrencylabel">
- L$ [AMT]
- </panel.string>
+ <panel.string name="packet_loss_tooltip">å°åŒ…æ失</panel.string>
+ <panel.string name="bandwidth_tooltip">頻寬</panel.string>
+ <panel.string name="time">[hour12, datetime, slt]:[min, datetime, slt] [ampm, datetime, slt] [timezone,datetime, slt]</panel.string>
+ <panel.string name="timeTooltip">[weekday, datetime, slt], [day, datetime, slt] [month, datetime, slt] [year, datetime, slt]</panel.string>
+ <panel.string name="buycurrencylabel">L$ [AMT]</panel.string>
<panel name="balance_bg">
- <text name="balance" tool_tip="點按以é‡æ–°æ›´æ–°ä½ çš„ L$ 帳戶餘é¡" value="L$20"/>
+ <text name="balance" tool_tip="點按以é‡æ–°æ›´æ–°ä½ çš„ L$ 帳戶餘é¡" value="L$??"/>
<button label="購買 L$" name="buyL" tool_tip="點按以購買更多 L$"/>
<button label="購物" name="goShop" tool_tip="打開第二人生購物市集"/>
</panel>
- <text name="TimeText" tool_tip="ç›®å‰æ™‚å€ï¼ˆå¤ªå¹³æ´‹ï¼‰">
- 24:00 AM PST
- </text>
+ <text name="TimeText" tool_tip="ç›®å‰æ™‚å€ï¼ˆå¤ªå¹³æ´‹ï¼‰">24:00 AM PST</text>
<button name="media_toggle_btn" tool_tip="開始/åœæ­¢å…¨éƒ¨åª’體(音樂ã€å½±ç‰‡ã€ç¶²é ï¼‰"/>
<button name="volume_btn" tool_tip="全域音é‡æŽ§åˆ¶"/>
</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_twitter_photo.xml b/indra/newview/skins/default/xui/zh/panel_twitter_photo.xml
index d015f4aa95..19eb23eac7 100644
--- a/indra/newview/skins/default/xui/zh/panel_twitter_photo.xml
+++ b/indra/newview/skins/default/xui/zh/panel_twitter_photo.xml
@@ -1,32 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<panel name="panel_twitter_photo">
- <layout_stack name="stack_photo">
- <layout_panel name="text_panel">
- <text name="status_label">
- 說一說你正在åšä»€éº¼
- </text>
- <text name="status_counter_label">
- 140
- </text>
- <check_box initial_value="true" label="加入所在ä½ç½®" name="add_location_cb"/>
- <check_box initial_value="true" label="附上照片" name="add_photo_cb"/>
- </layout_panel>
- <layout_panel name="snapshot_panel">
- <combo_box name="resolution_combobox" tool_tip="圖åƒè§£æžåº¦">
- <combo_box.item label="ç›®å‰è¦–窗" name="CurrentWindow"/>
- <combo_box.item label="640x480" name="640x480"/>
- <combo_box.item label="800x600" name="800x600"/>
- <combo_box.item label="1024x768" name="1024x768"/>
- </combo_box>
- <combo_box name="filters_combobox" tool_tip="圖åƒæ¿¾é¡">
- <combo_box.item label="ä¸ç”¨æ¿¾é¡" name="NoFilter"/>
- </combo_box>
- <button label="刷新" name="new_snapshot_btn" tool_tip="點按å³å¯åˆ·æ–°"/>
- <button label="é è¦½" name="big_preview_btn" tool_tip="點按å³å¯åˆ‡æ›é è¦½"/>
- </layout_panel>
- <layout_panel name="photo_button_panel">
- <button label="發到推特" name="post_photo_btn"/>
- <button label="å–消" name="cancel_photo_btn"/>
- </layout_panel>
- </layout_stack>
+ <text name="status_label">
+ 說一說你正在åšä»€éº¼
+ </text>
+ <text name="status_counter_label">
+ 140
+ </text>
+ <check_box initial_value="true" label="加入所在ä½ç½®" name="add_location_cb"/>
+ <check_box initial_value="true" label="附上照片" name="add_photo_cb"/>
+ <combo_box name="resolution_combobox" tool_tip="圖åƒè§£æžåº¦">
+ <combo_box.item label="ç›®å‰è¦–窗" name="CurrentWindow"/>
+ <combo_box.item label="640x480" name="640x480"/>
+ <combo_box.item label="800x600" name="800x600"/>
+ <combo_box.item label="1024x768" name="1024x768"/>
+ </combo_box>
+ <combo_box name="filters_combobox" tool_tip="圖åƒæ¿¾é¡">
+ <combo_box.item label="ä¸ç”¨æ¿¾é¡" name="NoFilter"/>
+ </combo_box>
+ <button label="刷新" name="new_snapshot_btn" tool_tip="點按å³å¯åˆ·æ–°"/>
+ <button label="é è¦½" name="big_preview_btn" tool_tip="點按å³å¯åˆ‡æ›é è¦½"/>
+ <button label="發到推特" name="post_photo_btn"/>
+ <button label="å–消" name="cancel_photo_btn"/>
</panel>
diff --git a/indra/newview/skins/default/xui/zh/role_actions.xml b/indra/newview/skins/default/xui/zh/role_actions.xml
index 96f931f73f..0a3ef8c710 100755
--- a/indra/newview/skins/default/xui/zh/role_actions.xml
+++ b/indra/newview/skins/default/xui/zh/role_actions.xml
@@ -71,4 +71,8 @@
<action description="加入群組語音èŠå¤©" longdescription="身負具這能力的角色的æˆå“¡ï¼Œå¯ä»¥åŠ å…¥ç¾¤çµ„的語音èŠå¤©æœƒè©±ã€‚ 注æ„:欲加入語音èŠå¤©æœƒè©±ï¼Œéœ€æœ‰ã€ŒåŠ å…¥ç¾¤çµ„èŠå¤©ã€èƒ½åŠ›ã€‚" name="join voice chat" value="27"/>
<action description="é©åº¦æˆäººå…§å®¹çš„群組èŠå¤©" longdescription="身負具這能力的角色的æˆå“¡ï¼Œå¯ä»¥æŽ§åˆ¶èª°å¯åŠ å…¥ç¾¤çµ„語音和文字èŠå¤©æœƒè©±ã€‚" name="moderate group chat" value="37"/>
</action_set>
+ <action_set description="這些能力包括修改本群組所æ“有的體驗的權é™" name="experience_tools_experience">
+ <action description="體驗管ç†" longdescription="擔任有此能力的角色的æˆå“¡ï¼Œå¯ä»¥ç·¨è¼¯ä¸€å€‹é«”驗的元資料。" name="experience admin" value="49"/>
+ <action description="體驗貢ç»è€…" longdescription="擔任有此能力的角色的æˆå“¡ï¼Œå¯ä»¥ç‚ºä¸€å€‹é«”é©—è²¢ç»è…³æœ¬ã€‚" name="experience contributor" value="50"/>
+ </action_set>
</role_actions>
diff --git a/indra/newview/skins/default/xui/zh/sidepanel_item_info.xml b/indra/newview/skins/default/xui/zh/sidepanel_item_info.xml
index 1b093e0ecd..9c5798d256 100755
--- a/indra/newview/skins/default/xui/zh/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/zh/sidepanel_item_info.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="item properties" title="物å“檔案">
+ <panel.string name="loading_experience">
+ (載入中)
+ </panel.string>
<panel.string name="unknown">
(未知)
</panel.string>
@@ -43,17 +46,20 @@
<text name="LabelAcquiredTitle">
å–得於:
</text>
+ <text name="LabelItemExperienceTitle">
+ 體驗:
+ </text>
<panel name="perms_inv">
<text name="perm_modify">
ä½ å¯ä»¥ï¼š
</text>
<check_box label="修改" name="CheckOwnerModify"/>
- <check_box label="æšåº¨" name="CheckOwnerCopy"/>
+ <check_box label="複製" name="CheckOwnerCopy"/>
<check_box label="轉移" name="CheckOwnerTransfer"/>
<text name="AnyoneLabel">
任何人:
</text>
- <check_box label="æšåº¨" name="CheckEveryoneCopy"/>
+ <check_box label="複製" name="CheckEveryoneCopy"/>
<text name="GroupLabel">
群組:
</text>
@@ -62,12 +68,13 @@
下一個所有人:
</text>
<check_box label="修改" name="CheckNextOwnerModify"/>
- <check_box label="æšåº¨" name="CheckNextOwnerCopy"/>
+ <check_box label="複製" name="CheckNextOwnerCopy"/>
<check_box label="轉移" name="CheckNextOwnerTransfer" tool_tip="下一個所有人å¯è´ˆé€æˆ–轉售這個物件"/>
</panel>
<check_box label="出售" name="CheckPurchase"/>
- <combo_box name="combobox sale copy">
- <combo_box.item label="æšåº¨" name="Copy"/>
+ <combo_box name="ComboBoxSaleType">
+ <combo_box.item label="複製" name="Copy"/>
+ <combo_box.item label="內容" name="Contents"/>
<combo_box.item label="原件" name="Original"/>
</combo_box>
<spinner label="價格: L$" name="Edit Cost"/>
diff --git a/indra/newview/skins/default/xui/zh/sidepanel_task_info.xml b/indra/newview/skins/default/xui/zh/sidepanel_task_info.xml
index 60f44a3d88..0884f1789b 100755
--- a/indra/newview/skins/default/xui/zh/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/zh/sidepanel_task_info.xml
@@ -1,71 +1,31 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="object properties" title="物件檔案">
- <panel.string name="text deed continued">
- 讓渡
- </panel.string>
- <panel.string name="text deed">
- 讓渡
- </panel.string>
- <panel.string name="text modify info 1">
- 你能修改這個物件
- </panel.string>
- <panel.string name="text modify info 2">
- 你能修改這些物件
- </panel.string>
- <panel.string name="text modify info 3">
- ä½ ä¸èƒ½ä¿®æ”¹é€™å€‹ç‰©ä»¶
- </panel.string>
- <panel.string name="text modify info 4">
- ä½ ä¸èƒ½ä¿®æ”¹é€™äº›ç‰©ä»¶
- </panel.string>
- <panel.string name="text modify info 5">
- 無法跨地å€ä¿®æ”¹é€™å€‹ç‰©ä»¶
- </panel.string>
- <panel.string name="text modify info 6">
- 無法跨地å€ä¿®æ”¹é€™äº›ç‰©ä»¶
- </panel.string>
- <panel.string name="text modify warning">
- 這個物件å«æœ‰è¯çµçš„部分
- </panel.string>
- <panel.string name="Cost Default">
- 價格: L$
- </panel.string>
- <panel.string name="Cost Total">
- 總價:L$
- </panel.string>
- <panel.string name="Cost Per Unit">
- 單價:L$
- </panel.string>
- <panel.string name="Cost Mixed">
- æ··åˆåƒ¹æ ¼
- </panel.string>
- <panel.string name="Sale Mixed">
- æ··åˆéŠ·å”®
- </panel.string>
+ <panel.string name="text deed continued">讓渡</panel.string>
+ <panel.string name="text deed">讓渡</panel.string>
+ <panel.string name="text modify info 1">你能修改這個物件</panel.string>
+ <panel.string name="text modify info 2">你能修改這些物件</panel.string>
+ <panel.string name="text modify info 3">ä½ ä¸èƒ½ä¿®æ”¹é€™å€‹ç‰©ä»¶</panel.string>
+ <panel.string name="text modify info 4">ä½ ä¸èƒ½ä¿®æ”¹é€™äº›ç‰©ä»¶</panel.string>
+ <panel.string name="text modify info 5">無法跨地å€ä¿®æ”¹é€™å€‹ç‰©ä»¶</panel.string>
+ <panel.string name="text modify info 6">無法跨地å€ä¿®æ”¹é€™äº›ç‰©ä»¶</panel.string>
+ <panel.string name="text modify warning">這個物件å«æœ‰è¯çµçš„部分</panel.string>
+ <panel.string name="Cost Default">價格: L$</panel.string>
+ <panel.string name="Cost Total">總價格:L$</panel.string>
+ <panel.string name="Cost Per Unit">單價:L$</panel.string>
+ <panel.string name="Cost Mixed">æ··åˆåƒ¹æ ¼</panel.string>
+ <panel.string name="Sale Mixed">æ··åˆéŠ·å”®</panel.string>
<text name="title" value="物件檔案"/>
<text name="where" value="(在虛擬世界)"/>
<panel label="" name="properties_panel">
- <text name="Name:">
- å稱:
- </text>
- <text name="Description:">
- æ述:
- </text>
- <text name="CreatorNameLabel">
- 創造者:
- </text>
- <text name="Owner:">
- 所有人:
- </text>
- <text name="Group_label">
- 群組:
- </text>
+ <text name="Name:">å稱:</text>
+ <text name="Description:">æ述:</text>
+ <text name="CreatorNameLabel">創造者:</text>
+ <text name="Owner:">所有人:</text>
+ <text name="Group_label">群組:</text>
<button name="button set group" tool_tip="é¸æ“‡ä¸€å€‹ç¾¤çµ„以分享這物件的權é™"/>
<name_box initial_value="載入中..." name="Group Name Proxy"/>
<button label="讓渡" label_selected="讓渡" name="button deed" tool_tip="「讓渡ã€æœƒæŠŠé€™ç‰©ä»¶è´ˆé€å‡ºåŽ»ä¸¦è³¦äºˆã€Œä¸‹ä¸€å€‹æ‰€æœ‰äººã€æ¬Šé™ã€‚ 群組所分享的物件å¯ç”±ç¾¤çµ„è·å“¡åŠ ä»¥è®“渡。"/>
- <text name="label click action">
- 點按以:
- </text>
+ <text name="label click action">點按以:</text>
<combo_box name="clickaction">
<combo_box.item label="觸碰(é è¨­ï¼‰" name="Touch/grab(default)"/>
<combo_box.item label="å在物件上" name="Sitonobject"/>
@@ -75,21 +35,13 @@
<combo_box.item label="縮放" name="Zoom"/>
</combo_box>
<panel name="perms_inv">
- <text name="perm_modify">
- 你能修改這個物件
- </text>
- <text name="Anyone can:">
- 任何人:
- </text>
+ <text name="perm_modify">你能修改這個物件</text>
+ <text name="Anyone can:">任何人:</text>
<check_box label="æšåº¨" name="checkbox allow everyone copy"/>
<check_box label="移動" name="checkbox allow everyone move"/>
- <text name="GroupLabel">
- 群組:
- </text>
+ <text name="GroupLabel">群組:</text>
<check_box label="分享" name="checkbox share with group" tool_tip="å…許此群組所有æˆå“¡å…±äº«ä½ ä¿®æ”¹æ­¤ç‰©ä»¶çš„權é™ã€‚ 你必須讓渡æ‰èƒ½å•Ÿå‹•è§’色é™åˆ¶ã€‚"/>
- <text name="NextOwnerLabel">
- 下一個所有人:
- </text>
+ <text name="NextOwnerLabel">下一個所有人:</text>
<check_box label="修改" name="checkbox next owner can modify"/>
<check_box label="æšåº¨" name="checkbox next owner can copy"/>
<check_box label="轉移" name="checkbox next owner can transfer" tool_tip="下一個所有人å¯è´ˆé€æˆ–轉售這個物件"/>
@@ -102,27 +54,13 @@
</combo_box>
<spinner label="價格: L$" name="Edit Cost"/>
<check_box label="顯示在æœå°‹ä¸­" name="search_check" tool_tip="讓其他人å¯ä»¥åœ¨æœå°‹çµæžœä¸­å¯Ÿçœ‹åˆ°æ­¤ç‰©ä»¶"/>
- <text name="pathfinding_attributes_label">
- 尋徑屬性:
- </text>
- <text name="B:">
- B:
- </text>
- <text name="O:">
- O:
- </text>
- <text name="G:">
- G:
- </text>
- <text name="E:">
- E:
- </text>
- <text name="N:">
- N:
- </text>
- <text name="F:">
- F:
- </text>
+ <text name="pathfinding_attributes_label">尋徑屬性:</text>
+ <text name="B:">B:</text>
+ <text name="O:">O:</text>
+ <text name="G:">G:</text>
+ <text name="E:">E:</text>
+ <text name="N:">N:</text>
+ <text name="F:">F:</text>
</panel>
<panel name="button_panel">
<button label="打開" name="open_btn"/>
diff --git a/indra/newview/skins/default/xui/zh/strings.xml b/indra/newview/skins/default/xui/zh/strings.xml
index ad2c331ee4..6493864b92 100755
--- a/indra/newview/skins/default/xui/zh/strings.xml
+++ b/indra/newview/skins/default/xui/zh/strings.xml
@@ -444,30 +444,51 @@ http://secondlife.com/viewer-access-faq
<string name="TooltipMustSingleDrop">
åªæœ‰ä¸€å€‹ç‰©å“å¯ä»¥è¢«æ‹–曳到此處
</string>
+ <string name="TooltipTooManyWearables">
+ ä½ ä¸èƒ½å°å«è¶…éŽ [AMOUNT] 個物項的資料夾作穿戴動作。 欲變更此上é™ï¼Œå¯åˆ°ã€Œé€²éšŽã€&gt;「顯示除錯設定ã€&gt;「WearFolderLimitã€ã€‚
+ </string>
<string name="TooltipPrice" value="L$[AMOUNT]:"/>
<string name="TooltipOutboxDragToWorld">
- 商家發件匣內的物項無法產生到虛擬世界
+ ä½ ä¸èƒ½å¾ž Marketplace 的刊登資料夾產生物件。
+ </string>
+ <string name="TooltipOutboxWorn">
+ ä½ ä¸èƒ½æŠŠæ­£åœ¨ç©¿æˆ´çš„物件放到 Marketplace 的刊登資料夾
+ </string>
+ <string name="TooltipOutboxFolderLevels">
+ å·¢ç‹€è³‡æ–™å¤¾æ·±åº¦è¶…éŽ [AMOUNT]。 請減少巢狀資料夾的深度,必è¦çš„話請把物件併整起來。
+ </string>
+ <string name="TooltipOutboxTooManyFolders">
+ å­è³‡æ–™å¤¾æ•¸ç›®è¶…éŽ [AMOUNT]。 請減少刊登的資料夾數目,必è¦çš„話請把物件併整起來。
+ </string>
+ <string name="TooltipOutboxTooManyObjects">
+ ç‰©ä»¶æ•¸ç›®è¶…éŽ [AMOUNT]。 若想在åŒä¸€åˆŠç™»ä¸­å‡ºå”®è¶…éŽ [AMOUNT] 個物件,你需è¦æŠŠç‰©ä»¶ä½µæ•´èµ·ä¾†ã€‚
+ </string>
+ <string name="TooltipOutboxTooManyStockItems">
+ é™é‡ç‰©ä»¶æ•¸ç›®è¶…éŽ [AMOUNT]。
+ </string>
+ <string name="TooltipOutboxCannotDropOnRoot">
+ ä½ åªèƒ½æŠŠç‰©é …或資料夾拖放到「所有ã€(ALL)é ç±¤ è«‹é¸å–該é ç±¤ï¼Œå†ç§»å‹•ä½ çš„物項或資料夾。
</string>
<string name="TooltipOutboxNoTransfer">
- 至少一個物件無法出售或轉移。
+ 至少一個物件無法出售或轉移
</string>
<string name="TooltipOutboxNotInInventory">
- 你的商家發件匣åªèƒ½æŽ¥å—直接來自收ç´å€çš„物項。
+ ä½ åªèƒ½å°‡ç‰©ä»¶å¾žæ”¶ç´å€æ”¾åˆ° Marketplace。
</string>
- <string name="TooltipOutboxWorn">
- 你穿著中的物項無法放入商家發件匣。
+ <string name="TooltipOutboxLinked">
+ ä½ ä¸èƒ½æŠŠè¯çµçš„物件或資料夾放到 Marketplace
</string>
<string name="TooltipOutboxCallingCard">
- å片ä¸å¾—放入商家發件匣
+ ä½ ä¸èƒ½æŠŠå片放到 Marketplace
</string>
- <string name="TooltipOutboxFolderLevels">
- å·¢ç‹€è³‡æ–™å¤¾æ·±åº¦è¶…éŽ 3
+ <string name="TooltipOutboxDragActive">
+ 已登出的刊登內容ä¸å¾—移動
</string>
- <string name="TooltipOutboxTooManyFolders">
- 頂層資料夾的å­è³‡æ–™å¤¾æ•¸ç›®è¶…éŽ 20
+ <string name="TooltipOutboxCannotMoveRoot">
+ ä½ ä¸èƒ½ç§»å‹• Marketplace 刊登的根目錄
</string>
- <string name="TooltipOutboxTooManyObjects">
- é ‚å±¤è³‡æ–™å¤¾ç‰©é …æ•¸ç›®è¶…éŽ 200
+ <string name="TooltipOutboxMixedStock">
+ é™é‡è³‡æ–™å¤¾çš„所有物件必須是相åŒçš„類型和權é™
</string>
<string name="TooltipDragOntoOwnChild">
資料夾ä¸å¾—移到其å­è³‡æ–™å¤¾åº•ä¸‹
@@ -1052,9 +1073,7 @@ http://secondlife.com/viewer-access-faq
<string name="AgentNameSubst">
(你)
</string>
- <string name="JoinAnExperience">
- 加入體驗
- </string>
+ <string name="JoinAnExperience"/><!-- intentionally blank -->
<string name="SilentlyManageEstateAccess">
管ç†é ˜å‡ºå…¥è¨±å¯å單時,ä¸é¡¯ç¤ºè­¦ç¤º
</string>
@@ -1121,6 +1140,12 @@ http://secondlife.com/viewer-access-faq
<string name="bitmap_image_files">
Bitmap 圖åƒ
</string>
+ <string name="png_image_files">
+ PNG 圖åƒ
+ </string>
+ <string name="save_texture_image_files">
+ Targa 或 PNG 圖åƒ
+ </string>
<string name="avi_movie_file">
AVI 視頻檔案
</string>
@@ -1370,6 +1395,9 @@ http://secondlife.com/viewer-access-faq
<string name="FavoritesNoMatchingItems">
將一個地標拖曳到這裡,加進「我的最愛ã€ã€‚
</string>
+ <string name="MarketplaceNoMatchingItems">
+ 找ä¸åˆ°ç‰©é …。 請檢查æœå°‹å­—串的拼寫,å†è©¦ä¸€æ¬¡ã€‚
+ </string>
<string name="InventoryNoTexture">
你的收ç´å€è£¡æ²’有這個æ質的副本
</string>
@@ -1417,29 +1445,95 @@ http://secondlife.com/viewer-access-faq
<string name="InventoryOutboxError">
[[MARKETPLACE_CREATE_STORE_URL] 購物市集商店]正傳回錯誤。
</string>
+ <string name="InventoryMarketplaceError">
+ 這功能尚在 Beta 測試階段。 如你想åƒèˆ‡ï¼Œè«‹åˆ°é€™å€‹[http://goo.gl/forms/FCQ7UXkakz Google 表單]填寫姓å。
+ </string>
+ <string name="InventoryMarketplaceListingsNoItemsTitle">
+ 你的 Marketplace 刊登資料夾是空的。
+ </string>
+ <string name="InventoryMarketplaceListingsNoItems">
+ 將資料夾拖曳到這個å€åŸŸï¼Œå³å¯åœ¨[[MARKETPLACE_DASHBOARD_URL] Marketplace]刊登出售。
+ </string>
+ <string name="Marketplace Validation Warning Stock">
+ é™é‡è³‡æ–™å¤¾å¿…須放在版本資料夾裡
+ </string>
+ <string name="Marketplace Validation Error Mixed Stock">
+ :錯誤:é™é‡è³‡æ–™å¤¾çš„所有物件必須是「ç¦æ­¢è¤‡è£½ã€ä¸”åŒä¸€é¡žåž‹
+ </string>
+ <string name="Marketplace Validation Error Subfolder In Stock">
+ :錯誤:é™é‡è³‡æ–™å¤¾ä¸å¾—å«æœ‰å­è³‡æ–™å¤¾
+ </string>
+ <string name="Marketplace Validation Warning Empty">
+ :警告:資料夾裡沒有æ±è¥¿
+ </string>
+ <string name="Marketplace Validation Warning Create Stock">
+ :警告:新建é™é‡è³‡æ–™å¤¾
+ </string>
+ <string name="Marketplace Validation Warning Create Version">
+ :警告:新建版本資料夾
+ </string>
+ <string name="Marketplace Validation Warning Move">
+ :警告:移動物項
+ </string>
+ <string name="Marketplace Validation Warning Delete">
+ :警告:資料夾內容已轉移到é™é‡è³‡æ–™å¤¾ï¼Œç©ºçš„資料夾已移除
+ </string>
+ <string name="Marketplace Validation Error Stock Item">
+ :錯誤:「ç¦æ­¢è¤‡è£½ã€ç‰©ä»¶å¿…須放在é™é‡è³‡æ–™å¤¾è£¡
+ </string>
+ <string name="Marketplace Validation Warning Unwrapped Item">
+ :警告:物項必須放在一個版本資料夾裡
+ </string>
+ <string name="Marketplace Validation Error">
+ :錯誤:
+ </string>
+ <string name="Marketplace Validation Warning">
+ :警告:
+ </string>
+ <string name="Marketplace Validation Error Empty Version">
+ :警告:版本資料夾必須包å«è‡³å°‘一個物項
+ </string>
+ <string name="Marketplace Validation Error Empty Stock">
+ :警告:é™é‡è³‡æ–™å¤¾å¿…須包å«è‡³å°‘一個物項
+ </string>
+ <string name="Marketplace Validation No Error">
+ 沒有需è¦å ±å‘Šçš„錯誤或警告
+ </string>
<string name="Marketplace Error None">
零錯誤
</string>
+ <string name="Marketplace Error Prefix">
+ 錯誤:
+ </string>
<string name="Marketplace Error Not Merchant">
- 發生錯誤:將物項é€å¾€ç¬¬äºŒäººç”Ÿè³¼ç‰©å¸‚集之å‰ï¼Œä½ å¿…é ˆå–得商家的身份(å…費)。
+ 將物件移到 Marketplace å‰ï¼Œä½ å¿…é ˆå–得商家的身份(å…費)。
</string>
- <string name="Marketplace Error Empty Folder">
- 錯誤:此資料夾沒有內容。
+ <string name="Marketplace Error Not Accepted">
+ 無法移動該資料夾的物項。
</string>
- <string name="Marketplace Error Unassociated Products">
- 錯誤:此物項上傳失敗,因為你的商家帳戶有太多和產å“ç„¡é—œè¯çš„物項。 è¦è§£æ±ºé€™å€‹å•é¡Œï¼Œè«‹ç™»å…¥ç¬¬äºŒäººç”Ÿè³¼ç‰©å¸‚集網站,減低你的無關è¯ç‰©é …數目。
+ <string name="Marketplace Error Unsellable Item">
+ 此物項無法在 Marketplace 出售。
</string>
- <string name="Marketplace Error Object Limit">
- 錯誤:此物項包å«å¤ªå¤šç‰©ä»¶ã€‚ è¦è§£æ±ºé€™éŒ¯èª¤ï¼Œè«‹å°‡ç‰©ä»¶è£ç®±ï¼Œä½¿ç¸½ç‰©ä»¶æ•¸ç›®ä¸è¶…éŽ 200。
+ <string name="MarketplaceNoID">
+ 沒有 Mkt ID
</string>
- <string name="Marketplace Error Folder Depth">
- 錯誤:此物項å«æœ‰å¤ªå¤šå±¤çš„巢狀資料夾。 請加以é‡æ–°æ•´ç†ï¼Œè‡³å¤šå…許 3 層的巢狀資料夾。
+ <string name="MarketplaceLive">
+ 已刊登
</string>
- <string name="Marketplace Error Unsellable Item">
- 錯誤:此物項無法在第二人生購物市集出售。
+ <string name="MarketplaceActive">
+ 使用中
+ </string>
+ <string name="MarketplaceMax">
+ 最多
</string>
- <string name="Marketplace Error Internal Import">
- 錯誤:這個物項有å•é¡Œã€‚ è«‹ç¨å€™å†è©¦ä¸€æ¬¡ã€‚
+ <string name="MarketplaceStock">
+ é™é‡
+ </string>
+ <string name="MarketplaceNoStock">
+ 缺貨
+ </string>
+ <string name="MarketplaceUpdating">
+ 正在更新…
</string>
<string name="Open landmarks">
開啟地標
@@ -1460,6 +1554,7 @@ http://secondlife.com/viewer-access-faq
無內容
</string>
<string name="WornOnAttachmentPoint" value="(已穿 [ATTACHMENT_POINT])"/>
+ <string name="AttachmentErrorMessage" value="([ATTACHMENT_ERROR])"/>
<string name="ActiveGesture" value="[GESLABEL](使用中)"/>
<string name="PermYes">
是
@@ -1730,6 +1825,15 @@ http://secondlife.com/viewer-access-faq
<string name="Invalid Attachment">
無效的附接點
</string>
+ <string name="ATTACHMENT_MISSING_ITEM">
+ 錯誤:缺少物件
+ </string>
+ <string name="ATTACHMENT_MISSING_BASE_ITEM">
+ 錯誤:缺少基本物項
+ </string>
+ <string name="ATTACHMENT_NOT_ATTACHED">
+ 錯誤:物件在目å‰çš„è£æ‰®è£¡ï¼Œå¯æ˜¯å»æœªé™„è‘—
+ </string>
<string name="YearsMonthsOld">
年齡:[AGEYEARS] 年 [AGEMONTHS] 月
</string>
@@ -1898,6 +2002,9 @@ http://secondlife.com/viewer-access-faq
<string name="SaveComplete">
儲存完畢。
</string>
+ <string name="UploadFailed">
+ 檔案上傳失敗:
+ </string>
<string name="ObjectOutOfRange">
腳本(物件超出範åœï¼‰
</string>
@@ -1907,6 +2014,9 @@ http://secondlife.com/viewer-access-faq
<string name="GroupsNone">
ç„¡
</string>
+ <string name="CompileNoExperiencePerm">
+ ç•¥éŽé«”é©— [EXPERIENCE] 的腳本 [SCRIPT]。
+ </string>
<string name="Group" value="(群組)"/>
<string name="Unknown">
(未知)
@@ -4396,7 +4506,7 @@ http://secondlife.com/viewer-access-faq
女性姿勢
</string>
<string name="Other Gestures">
- 其他���勢
+ 其他姿勢
</string>
<string name="Speech Gestures">
演說姿勢
@@ -4658,7 +4768,7 @@ http://secondlife.com/viewer-access-faq
刪除所é¸å–的物å“?
</string>
<string name="DeleteItem">
- 刪除所é¸å–的物���?
+ 刪除所é¸å–的物å“?
</string>
<string name="EmptyOutfitText">
沒有任何物å“在這個è£æ‰®å…§
@@ -5070,6 +5180,9 @@ http://secondlife.com/viewer-access-faq
<string name="Command_Marketplace_Label">
第二人生購物市集
</string>
+ <string name="Command_MarketplaceListings_Label">
+ Marketplace
+ </string>
<string name="Command_MiniMap_Label">
迷你地圖
</string>
@@ -5157,6 +5270,9 @@ http://secondlife.com/viewer-access-faq
<string name="Command_Marketplace_Tooltip">
å‰å¾€è³¼ç‰©
</string>
+ <string name="Command_MarketplaceListings_Tooltip">
+ 出售你的創作物
+ </string>
<string name="Command_MiniMap_Tooltip">
顯示附近的人
</string>
@@ -5280,4 +5396,85 @@ http://secondlife.com/viewer-access-faq
<string name="loading_chat_logs">
載入中…
</string>
+ <string name="experience_tools_experience">
+ 體驗
+ </string>
+ <string name="ExperienceNameNull">
+ (沒有體驗)
+ </string>
+ <string name="ExperienceNameUntitled">
+ (無å的體驗)
+ </string>
+ <string name="Land-Scope">
+ 土地範åœåž‹
+ </string>
+ <string name="Grid-Scope">
+ 網格範åœåž‹
+ </string>
+ <string name="Allowed_Experiences_Tab">
+ 准許
+ </string>
+ <string name="Blocked_Experiences_Tab">
+ å·²å°éŽ–çš„
+ </string>
+ <string name="Contrib_Experiences_Tab">
+ è²¢ç»è€…
+ </string>
+ <string name="Admin_Experiences_Tab">
+ 管ç†å“¡
+ </string>
+ <string name="Recent_Experiences_Tab">
+ 最近
+ </string>
+ <string name="Owned_Experiences_Tab">
+ æ“有
+ </string>
+ <string name="ExperiencesCounter">
+ ([EXPERIENCES] 項,最多 [MAXEXPERIENCES] 項)
+ </string>
+ <string name="ExperiencePermission1">
+ å–å¾—ä½ çš„å„項控制
+ </string>
+ <string name="ExperiencePermission3">
+ å°ä½ çš„化身觸發動作
+ </string>
+ <string name="ExperiencePermission4">
+ 附著到你的化身
+ </string>
+ <string name="ExperiencePermission9">
+ 追蹤你的æ”影機
+ </string>
+ <string name="ExperiencePermission10">
+ 控制你的æ”影機
+ </string>
+ <string name="ExperiencePermission11">
+ 瞬間傳é€ä½ æœ¬äºº
+ </string>
+ <string name="ExperiencePermission12">
+ 自動接å—å„種體驗權é™
+ </string>
+ <string name="ExperiencePermissionShortUnknown">
+ 進行了未知的æ“作:[Permission]
+ </string>
+ <string name="ExperiencePermissionShort1">
+ å–得控制
+ </string>
+ <string name="ExperiencePermissionShort3">
+ 觸發動作
+ </string>
+ <string name="ExperiencePermissionShort4">
+ 附著
+ </string>
+ <string name="ExperiencePermissionShort9">
+ 追蹤æ”影機
+ </string>
+ <string name="ExperiencePermissionShort10">
+ 控制æ”影機
+ </string>
+ <string name="ExperiencePermissionShort11">
+ 瞬間傳é€
+ </string>
+ <string name="ExperiencePermissionShort12">
+ 權é™
+ </string>
</strings>
diff --git a/indra/newview/skins/default/xui/zh/teleport_strings.xml b/indra/newview/skins/default/xui/zh/teleport_strings.xml
index 37080a8d0c..61db294272 100755
--- a/indra/newview/skins/default/xui/zh/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/zh/teleport_strings.xml
@@ -48,6 +48,9 @@
<message name="MustGetAgeRegion">
你必須年滿 18 æ­²æ‰å¯é€²å…¥é€™åœ°å€ã€‚
</message>
+ <message name="RegionTPSpecialUsageBlocked">
+ 無法進入地å€ã€‚ &apos;[REGION_NAME]&apos; 是個「技巧性åšå¥•ã€(Skill Gaming)地å€ï¼Œä½ å¿…須符åˆä¸€å®šæ¢ä»¶æ‰å¯é€²å…¥ã€‚ 欲知詳情,請åƒé–± [http://wiki.secondlife.com/wiki/Linden_Lab_Official:Skill_Gaming_in_Second_Life 技巧性åšå¥•å¸¸è¦‹å•é¡Œé›†]。
+ </message>
</message_set>
<message_set name="progress">
<message name="sending_dest">