diff options
Diffstat (limited to 'indra/newview/skins/default/xui')
4327 files changed, 15541 insertions, 6931 deletions
diff --git a/indra/newview/skins/default/xui/da/floater_about.xml b/indra/newview/skins/default/xui/da/floater_about.xml index 9206690c8f..8ed0b629e4 100755..100644 --- a/indra/newview/skins/default/xui/da/floater_about.xml +++ b/indra/newview/skins/default/xui/da/floater_about.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="floater_about" title="OM [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]) + [APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2].[VIEWER_VERSION_3] ([CHANNEL]) [[VIEWER_RELEASE_NOTES_URL] [ReleaseNotes]] </floater.string> <floater.string name="AboutCompiler"> diff --git a/indra/newview/skins/default/xui/da/floater_about_land.xml b/indra/newview/skins/default/xui/da/floater_about_land.xml index 5b9e618666..5b9e618666 100755..100644 --- a/indra/newview/skins/default/xui/da/floater_about_land.xml +++ b/indra/newview/skins/default/xui/da/floater_about_land.xml diff --git a/indra/newview/skins/default/xui/da/floater_activeim.xml b/indra/newview/skins/default/xui/da/floater_activeim.xml index 6fdac8d880..6fdac8d880 100755..100644 --- a/indra/newview/skins/default/xui/da/floater_activeim.xml +++ b/indra/newview/skins/default/xui/da/floater_activeim.xml diff --git a/indra/newview/skins/default/xui/da/floater_animation_preview.xml b/indra/newview/skins/default/xui/da/floater_animation_preview.xml index adf96841c0..adf96841c0 100755..100644 --- a/indra/newview/skins/default/xui/da/floater_animation_preview.xml +++ b/indra/newview/skins/default/xui/da/floater_animation_preview.xml diff --git a/indra/newview/skins/default/xui/da/floater_auction.xml b/indra/newview/skins/default/xui/da/floater_auction.xml index e74e8a991b..e74e8a991b 100755..100644 --- a/indra/newview/skins/default/xui/da/floater_auction.xml +++ b/indra/newview/skins/default/xui/da/floater_auction.xml diff --git a/indra/newview/skins/default/xui/da/floater_avatar_picker.xml b/indra/newview/skins/default/xui/da/floater_avatar_picker.xml index e97089f61e..e97089f61e 100755..100644 --- a/indra/newview/skins/default/xui/da/floater_avatar_picker.xml +++ b/indra/newview/skins/default/xui/da/floater_avatar_picker.xml diff --git a/indra/newview/skins/default/xui/da/floater_avatar_textures.xml b/indra/newview/skins/default/xui/da/floater_avatar_textures.xml index d0d766eaab..d0d766eaab 100755..100644 --- a/indra/newview/skins/default/xui/da/floater_avatar_textures.xml +++ b/indra/newview/skins/default/xui/da/floater_avatar_textures.xml diff --git a/indra/newview/skins/default/xui/da/floater_beacons.xml b/indra/newview/skins/default/xui/da/floater_beacons.xml index 5100a6df1f..5100a6df1f 100755..100644 --- a/indra/newview/skins/default/xui/da/floater_beacons.xml +++ b/indra/newview/skins/default/xui/da/floater_beacons.xml diff --git a/indra/newview/skins/default/xui/da/floater_build_options.xml b/indra/newview/skins/default/xui/da/floater_build_options.xml index d3c3ac1899..d3c3ac1899 100755..100644 --- a/indra/newview/skins/default/xui/da/floater_build_options.xml +++ b/indra/newview/skins/default/xui/da/floater_build_options.xml diff --git a/indra/newview/skins/default/xui/da/floater_bulk_perms.xml b/indra/newview/skins/default/xui/da/floater_bulk_perms.xml index 58a1c1b73e..58a1c1b73e 100755..100644 --- a/indra/newview/skins/default/xui/da/floater_bulk_perms.xml +++ b/indra/newview/skins/default/xui/da/floater_bulk_perms.xml diff --git a/indra/newview/skins/default/xui/da/floater_bumps.xml b/indra/newview/skins/default/xui/da/floater_bumps.xml index 6b265832cd..6b265832cd 100755..100644 --- a/indra/newview/skins/default/xui/da/floater_bumps.xml +++ b/indra/newview/skins/default/xui/da/floater_bumps.xml diff --git a/indra/newview/skins/default/xui/da/floater_buy_contents.xml b/indra/newview/skins/default/xui/da/floater_buy_contents.xml index 085fa2f9cc..085fa2f9cc 100755..100644 --- a/indra/newview/skins/default/xui/da/floater_buy_contents.xml +++ b/indra/newview/skins/default/xui/da/floater_buy_contents.xml diff --git a/indra/newview/skins/default/xui/da/floater_buy_currency.xml b/indra/newview/skins/default/xui/da/floater_buy_currency.xml index 3c0428b2b0..3c0428b2b0 100755..100644 --- a/indra/newview/skins/default/xui/da/floater_buy_currency.xml +++ b/indra/newview/skins/default/xui/da/floater_buy_currency.xml diff --git a/indra/newview/skins/default/xui/da/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/da/floater_buy_currency_html.xml index e32b25ca17..e32b25ca17 100755..100644 --- a/indra/newview/skins/default/xui/da/floater_buy_currency_html.xml +++ b/indra/newview/skins/default/xui/da/floater_buy_currency_html.xml diff --git a/indra/newview/skins/default/xui/da/floater_buy_land.xml b/indra/newview/skins/default/xui/da/floater_buy_land.xml index f6ee78fa6d..f6ee78fa6d 100755..100644 --- a/indra/newview/skins/default/xui/da/floater_buy_land.xml +++ b/indra/newview/skins/default/xui/da/floater_buy_land.xml diff --git a/indra/newview/skins/default/xui/da/floater_buy_object.xml b/indra/newview/skins/default/xui/da/floater_buy_object.xml index 7eb4787139..7eb4787139 100755..100644 --- a/indra/newview/skins/default/xui/da/floater_buy_object.xml +++ b/indra/newview/skins/default/xui/da/floater_buy_object.xml diff --git a/indra/newview/skins/default/xui/da/floater_camera.xml b/indra/newview/skins/default/xui/da/floater_camera.xml index b5d5e8bc08..b5d5e8bc08 100755..100644 --- a/indra/newview/skins/default/xui/da/floater_camera.xml +++ b/indra/newview/skins/default/xui/da/floater_camera.xml diff --git a/indra/newview/skins/default/xui/da/floater_choose_group.xml b/indra/newview/skins/default/xui/da/floater_choose_group.xml index 1ccda4f1d7..1ccda4f1d7 100755..100644 --- a/indra/newview/skins/default/xui/da/floater_choose_group.xml +++ b/indra/newview/skins/default/xui/da/floater_choose_group.xml diff --git a/indra/newview/skins/default/xui/da/floater_color_picker.xml b/indra/newview/skins/default/xui/da/floater_color_picker.xml index f744b06277..f744b06277 100755..100644 --- a/indra/newview/skins/default/xui/da/floater_color_picker.xml +++ b/indra/newview/skins/default/xui/da/floater_color_picker.xml diff --git a/indra/newview/skins/default/xui/da/floater_critical.xml b/indra/newview/skins/default/xui/da/floater_critical.xml index 8c2672f39f..8c2672f39f 100755..100644 --- a/indra/newview/skins/default/xui/da/floater_critical.xml +++ b/indra/newview/skins/default/xui/da/floater_critical.xml diff --git a/indra/newview/skins/default/xui/da/floater_display_name.xml b/indra/newview/skins/default/xui/da/floater_display_name.xml index e848006d8b..e848006d8b 100755..100644 --- a/indra/newview/skins/default/xui/da/floater_display_name.xml +++ b/indra/newview/skins/default/xui/da/floater_display_name.xml diff --git a/indra/newview/skins/default/xui/da/floater_event.xml b/indra/newview/skins/default/xui/da/floater_event.xml index a9eddaaf8d..a9eddaaf8d 100755..100644 --- a/indra/newview/skins/default/xui/da/floater_event.xml +++ b/indra/newview/skins/default/xui/da/floater_event.xml diff --git a/indra/newview/skins/default/xui/da/floater_font_test.xml b/indra/newview/skins/default/xui/da/floater_font_test.xml index 591d07188c..591d07188c 100755..100644 --- a/indra/newview/skins/default/xui/da/floater_font_test.xml +++ b/indra/newview/skins/default/xui/da/floater_font_test.xml diff --git a/indra/newview/skins/default/xui/da/floater_gesture.xml b/indra/newview/skins/default/xui/da/floater_gesture.xml index b7075e356a..b7075e356a 100755..100644 --- a/indra/newview/skins/default/xui/da/floater_gesture.xml +++ b/indra/newview/skins/default/xui/da/floater_gesture.xml diff --git a/indra/newview/skins/default/xui/da/floater_god_tools.xml b/indra/newview/skins/default/xui/da/floater_god_tools.xml index 5d3453e327..5d3453e327 100755..100644 --- a/indra/newview/skins/default/xui/da/floater_god_tools.xml +++ b/indra/newview/skins/default/xui/da/floater_god_tools.xml diff --git a/indra/newview/skins/default/xui/da/floater_hardware_settings.xml b/indra/newview/skins/default/xui/da/floater_hardware_settings.xml index a5942eb625..a5942eb625 100755..100644 --- a/indra/newview/skins/default/xui/da/floater_hardware_settings.xml +++ b/indra/newview/skins/default/xui/da/floater_hardware_settings.xml diff --git a/indra/newview/skins/default/xui/da/floater_help_browser.xml b/indra/newview/skins/default/xui/da/floater_help_browser.xml index 4eba4aee1f..4eba4aee1f 100755..100644 --- a/indra/newview/skins/default/xui/da/floater_help_browser.xml +++ b/indra/newview/skins/default/xui/da/floater_help_browser.xml diff --git a/indra/newview/skins/default/xui/da/floater_hud.xml b/indra/newview/skins/default/xui/da/floater_hud.xml index c70da45955..c70da45955 100755..100644 --- a/indra/newview/skins/default/xui/da/floater_hud.xml +++ b/indra/newview/skins/default/xui/da/floater_hud.xml diff --git a/indra/newview/skins/default/xui/da/floater_im_container.xml b/indra/newview/skins/default/xui/da/floater_im_container.xml index 28b2f7f7eb..28b2f7f7eb 100755..100644 --- a/indra/newview/skins/default/xui/da/floater_im_container.xml +++ b/indra/newview/skins/default/xui/da/floater_im_container.xml diff --git a/indra/newview/skins/default/xui/da/floater_im_session.xml b/indra/newview/skins/default/xui/da/floater_im_session.xml index 16df7e4b03..16df7e4b03 100755..100644 --- a/indra/newview/skins/default/xui/da/floater_im_session.xml +++ b/indra/newview/skins/default/xui/da/floater_im_session.xml diff --git a/indra/newview/skins/default/xui/da/floater_image_preview.xml b/indra/newview/skins/default/xui/da/floater_image_preview.xml index 5355127ef5..5355127ef5 100755..100644 --- a/indra/newview/skins/default/xui/da/floater_image_preview.xml +++ b/indra/newview/skins/default/xui/da/floater_image_preview.xml diff --git a/indra/newview/skins/default/xui/da/floater_import_collada.xml b/indra/newview/skins/default/xui/da/floater_import_collada.xml index ebc7c86388..ebc7c86388 100755..100644 --- a/indra/newview/skins/default/xui/da/floater_import_collada.xml +++ b/indra/newview/skins/default/xui/da/floater_import_collada.xml diff --git a/indra/newview/skins/default/xui/da/floater_incoming_call.xml b/indra/newview/skins/default/xui/da/floater_incoming_call.xml index dd8cb6f97a..dd8cb6f97a 100755..100644 --- a/indra/newview/skins/default/xui/da/floater_incoming_call.xml +++ b/indra/newview/skins/default/xui/da/floater_incoming_call.xml diff --git a/indra/newview/skins/default/xui/da/floater_inspect.xml b/indra/newview/skins/default/xui/da/floater_inspect.xml index d0dca8863a..d0dca8863a 100755..100644 --- a/indra/newview/skins/default/xui/da/floater_inspect.xml +++ b/indra/newview/skins/default/xui/da/floater_inspect.xml diff --git a/indra/newview/skins/default/xui/da/floater_inventory.xml b/indra/newview/skins/default/xui/da/floater_inventory.xml index 3a4b0fbd6b..3a4b0fbd6b 100755..100644 --- a/indra/newview/skins/default/xui/da/floater_inventory.xml +++ b/indra/newview/skins/default/xui/da/floater_inventory.xml diff --git a/indra/newview/skins/default/xui/da/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/da/floater_inventory_item_properties.xml index 59dcc87140..59dcc87140 100755..100644 --- a/indra/newview/skins/default/xui/da/floater_inventory_item_properties.xml +++ b/indra/newview/skins/default/xui/da/floater_inventory_item_properties.xml diff --git a/indra/newview/skins/default/xui/da/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/da/floater_inventory_view_finder.xml index 655701bb96..655701bb96 100755..100644 --- a/indra/newview/skins/default/xui/da/floater_inventory_view_finder.xml +++ b/indra/newview/skins/default/xui/da/floater_inventory_view_finder.xml diff --git a/indra/newview/skins/default/xui/da/floater_joystick.xml b/indra/newview/skins/default/xui/da/floater_joystick.xml index 49e1397e9f..49e1397e9f 100755..100644 --- a/indra/newview/skins/default/xui/da/floater_joystick.xml +++ b/indra/newview/skins/default/xui/da/floater_joystick.xml diff --git a/indra/newview/skins/default/xui/da/floater_land_holdings.xml b/indra/newview/skins/default/xui/da/floater_land_holdings.xml index b3c12627f7..b3c12627f7 100755..100644 --- a/indra/newview/skins/default/xui/da/floater_land_holdings.xml +++ b/indra/newview/skins/default/xui/da/floater_land_holdings.xml diff --git a/indra/newview/skins/default/xui/da/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/da/floater_live_lsleditor.xml index 0cc13fd736..0cc13fd736 100755..100644 --- a/indra/newview/skins/default/xui/da/floater_live_lsleditor.xml +++ b/indra/newview/skins/default/xui/da/floater_live_lsleditor.xml diff --git a/indra/newview/skins/default/xui/da/floater_lsl_guide.xml b/indra/newview/skins/default/xui/da/floater_lsl_guide.xml index 2594d6bb9d..2594d6bb9d 100755..100644 --- a/indra/newview/skins/default/xui/da/floater_lsl_guide.xml +++ b/indra/newview/skins/default/xui/da/floater_lsl_guide.xml diff --git a/indra/newview/skins/default/xui/da/floater_map.xml b/indra/newview/skins/default/xui/da/floater_map.xml index 4912d73ba0..4912d73ba0 100755..100644 --- a/indra/newview/skins/default/xui/da/floater_map.xml +++ b/indra/newview/skins/default/xui/da/floater_map.xml diff --git a/indra/newview/skins/default/xui/da/floater_media_browser.xml b/indra/newview/skins/default/xui/da/floater_media_browser.xml index d3028c32f9..d3028c32f9 100755..100644 --- a/indra/newview/skins/default/xui/da/floater_media_browser.xml +++ b/indra/newview/skins/default/xui/da/floater_media_browser.xml diff --git a/indra/newview/skins/default/xui/da/floater_media_settings.xml b/indra/newview/skins/default/xui/da/floater_media_settings.xml index 67c122b9d5..67c122b9d5 100755..100644 --- a/indra/newview/skins/default/xui/da/floater_media_settings.xml +++ b/indra/newview/skins/default/xui/da/floater_media_settings.xml diff --git a/indra/newview/skins/default/xui/da/floater_mem_leaking.xml b/indra/newview/skins/default/xui/da/floater_mem_leaking.xml index 60bb3149a5..60bb3149a5 100755..100644 --- a/indra/newview/skins/default/xui/da/floater_mem_leaking.xml +++ b/indra/newview/skins/default/xui/da/floater_mem_leaking.xml diff --git a/indra/newview/skins/default/xui/da/floater_model_preview.xml b/indra/newview/skins/default/xui/da/floater_model_preview.xml index a98c70ff52..a98c70ff52 100755..100644 --- a/indra/newview/skins/default/xui/da/floater_model_preview.xml +++ b/indra/newview/skins/default/xui/da/floater_model_preview.xml diff --git a/indra/newview/skins/default/xui/da/floater_moveview.xml b/indra/newview/skins/default/xui/da/floater_moveview.xml index 14d3604b43..14d3604b43 100755..100644 --- a/indra/newview/skins/default/xui/da/floater_moveview.xml +++ b/indra/newview/skins/default/xui/da/floater_moveview.xml diff --git a/indra/newview/skins/default/xui/da/floater_mute_object.xml b/indra/newview/skins/default/xui/da/floater_mute_object.xml index 3b3f670792..3b3f670792 100755..100644 --- a/indra/newview/skins/default/xui/da/floater_mute_object.xml +++ b/indra/newview/skins/default/xui/da/floater_mute_object.xml diff --git a/indra/newview/skins/default/xui/da/floater_nearby_chat.xml b/indra/newview/skins/default/xui/da/floater_nearby_chat.xml index 76bc40edac..76bc40edac 100755..100644 --- a/indra/newview/skins/default/xui/da/floater_nearby_chat.xml +++ b/indra/newview/skins/default/xui/da/floater_nearby_chat.xml diff --git a/indra/newview/skins/default/xui/da/floater_openobject.xml b/indra/newview/skins/default/xui/da/floater_openobject.xml index 92fdd1e0a6..92fdd1e0a6 100755..100644 --- a/indra/newview/skins/default/xui/da/floater_openobject.xml +++ b/indra/newview/skins/default/xui/da/floater_openobject.xml diff --git a/indra/newview/skins/default/xui/da/floater_outgoing_call.xml b/indra/newview/skins/default/xui/da/floater_outgoing_call.xml index a5545668a2..a5545668a2 100755..100644 --- a/indra/newview/skins/default/xui/da/floater_outgoing_call.xml +++ b/indra/newview/skins/default/xui/da/floater_outgoing_call.xml diff --git a/indra/newview/skins/default/xui/da/floater_pay.xml b/indra/newview/skins/default/xui/da/floater_pay.xml index 96ec106803..96ec106803 100755..100644 --- a/indra/newview/skins/default/xui/da/floater_pay.xml +++ b/indra/newview/skins/default/xui/da/floater_pay.xml diff --git a/indra/newview/skins/default/xui/da/floater_pay_object.xml b/indra/newview/skins/default/xui/da/floater_pay_object.xml index 260b257c33..260b257c33 100755..100644 --- a/indra/newview/skins/default/xui/da/floater_pay_object.xml +++ b/indra/newview/skins/default/xui/da/floater_pay_object.xml diff --git a/indra/newview/skins/default/xui/da/floater_perm_prefs.xml b/indra/newview/skins/default/xui/da/floater_perm_prefs.xml index eecddbcdb0..eecddbcdb0 100755..100644 --- a/indra/newview/skins/default/xui/da/floater_perm_prefs.xml +++ b/indra/newview/skins/default/xui/da/floater_perm_prefs.xml diff --git a/indra/newview/skins/default/xui/da/floater_postcard.xml b/indra/newview/skins/default/xui/da/floater_postcard.xml index 44b0fd4faa..44b0fd4faa 100755..100644 --- a/indra/newview/skins/default/xui/da/floater_postcard.xml +++ b/indra/newview/skins/default/xui/da/floater_postcard.xml diff --git a/indra/newview/skins/default/xui/da/floater_preferences.xml b/indra/newview/skins/default/xui/da/floater_preferences.xml index 6caac14cf5..6caac14cf5 100755..100644 --- a/indra/newview/skins/default/xui/da/floater_preferences.xml +++ b/indra/newview/skins/default/xui/da/floater_preferences.xml diff --git a/indra/newview/skins/default/xui/da/floater_preview_animation.xml b/indra/newview/skins/default/xui/da/floater_preview_animation.xml index 436843decc..436843decc 100755..100644 --- a/indra/newview/skins/default/xui/da/floater_preview_animation.xml +++ b/indra/newview/skins/default/xui/da/floater_preview_animation.xml diff --git a/indra/newview/skins/default/xui/da/floater_preview_gesture.xml b/indra/newview/skins/default/xui/da/floater_preview_gesture.xml index bd2b194717..bd2b194717 100755..100644 --- a/indra/newview/skins/default/xui/da/floater_preview_gesture.xml +++ b/indra/newview/skins/default/xui/da/floater_preview_gesture.xml diff --git a/indra/newview/skins/default/xui/da/floater_preview_notecard.xml b/indra/newview/skins/default/xui/da/floater_preview_notecard.xml index 5a0f5a32c0..5a0f5a32c0 100755..100644 --- a/indra/newview/skins/default/xui/da/floater_preview_notecard.xml +++ b/indra/newview/skins/default/xui/da/floater_preview_notecard.xml diff --git a/indra/newview/skins/default/xui/da/floater_preview_sound.xml b/indra/newview/skins/default/xui/da/floater_preview_sound.xml index 21f7656462..21f7656462 100755..100644 --- a/indra/newview/skins/default/xui/da/floater_preview_sound.xml +++ b/indra/newview/skins/default/xui/da/floater_preview_sound.xml diff --git a/indra/newview/skins/default/xui/da/floater_preview_texture.xml b/indra/newview/skins/default/xui/da/floater_preview_texture.xml index 48cf53f563..48cf53f563 100755..100644 --- a/indra/newview/skins/default/xui/da/floater_preview_texture.xml +++ b/indra/newview/skins/default/xui/da/floater_preview_texture.xml diff --git a/indra/newview/skins/default/xui/da/floater_price_for_listing.xml b/indra/newview/skins/default/xui/da/floater_price_for_listing.xml index b091fa09b5..b091fa09b5 100755..100644 --- a/indra/newview/skins/default/xui/da/floater_price_for_listing.xml +++ b/indra/newview/skins/default/xui/da/floater_price_for_listing.xml diff --git a/indra/newview/skins/default/xui/da/floater_publish_classified.xml b/indra/newview/skins/default/xui/da/floater_publish_classified.xml index 0f65e6c18a..0f65e6c18a 100755..100644 --- a/indra/newview/skins/default/xui/da/floater_publish_classified.xml +++ b/indra/newview/skins/default/xui/da/floater_publish_classified.xml diff --git a/indra/newview/skins/default/xui/da/floater_region_debug_console.xml b/indra/newview/skins/default/xui/da/floater_region_debug_console.xml index 71313f4fea..71313f4fea 100755..100644 --- a/indra/newview/skins/default/xui/da/floater_region_debug_console.xml +++ b/indra/newview/skins/default/xui/da/floater_region_debug_console.xml diff --git a/indra/newview/skins/default/xui/da/floater_region_info.xml b/indra/newview/skins/default/xui/da/floater_region_info.xml index ae00f90f16..ae00f90f16 100755..100644 --- a/indra/newview/skins/default/xui/da/floater_region_info.xml +++ b/indra/newview/skins/default/xui/da/floater_region_info.xml diff --git a/indra/newview/skins/default/xui/da/floater_report_abuse.xml b/indra/newview/skins/default/xui/da/floater_report_abuse.xml index 07978792b9..07978792b9 100755..100644 --- a/indra/newview/skins/default/xui/da/floater_report_abuse.xml +++ b/indra/newview/skins/default/xui/da/floater_report_abuse.xml diff --git a/indra/newview/skins/default/xui/da/floater_script_debug.xml b/indra/newview/skins/default/xui/da/floater_script_debug.xml index df60a2e23f..df60a2e23f 100755..100644 --- a/indra/newview/skins/default/xui/da/floater_script_debug.xml +++ b/indra/newview/skins/default/xui/da/floater_script_debug.xml diff --git a/indra/newview/skins/default/xui/da/floater_script_debug_panel.xml b/indra/newview/skins/default/xui/da/floater_script_debug_panel.xml index e70a30fa24..e70a30fa24 100755..100644 --- a/indra/newview/skins/default/xui/da/floater_script_debug_panel.xml +++ b/indra/newview/skins/default/xui/da/floater_script_debug_panel.xml diff --git a/indra/newview/skins/default/xui/da/floater_script_limits.xml b/indra/newview/skins/default/xui/da/floater_script_limits.xml index a7f86a782a..a7f86a782a 100755..100644 --- a/indra/newview/skins/default/xui/da/floater_script_limits.xml +++ b/indra/newview/skins/default/xui/da/floater_script_limits.xml diff --git a/indra/newview/skins/default/xui/da/floater_script_preview.xml b/indra/newview/skins/default/xui/da/floater_script_preview.xml index 1aacab6915..1aacab6915 100755..100644 --- a/indra/newview/skins/default/xui/da/floater_script_preview.xml +++ b/indra/newview/skins/default/xui/da/floater_script_preview.xml diff --git a/indra/newview/skins/default/xui/da/floater_script_queue.xml b/indra/newview/skins/default/xui/da/floater_script_queue.xml index 1ff5494458..1ff5494458 100755..100644 --- a/indra/newview/skins/default/xui/da/floater_script_queue.xml +++ b/indra/newview/skins/default/xui/da/floater_script_queue.xml diff --git a/indra/newview/skins/default/xui/da/floater_script_search.xml b/indra/newview/skins/default/xui/da/floater_script_search.xml index f1605cac34..f1605cac34 100755..100644 --- a/indra/newview/skins/default/xui/da/floater_script_search.xml +++ b/indra/newview/skins/default/xui/da/floater_script_search.xml diff --git a/indra/newview/skins/default/xui/da/floater_search.xml b/indra/newview/skins/default/xui/da/floater_search.xml index 80a30b1aa1..80a30b1aa1 100755..100644 --- a/indra/newview/skins/default/xui/da/floater_search.xml +++ b/indra/newview/skins/default/xui/da/floater_search.xml diff --git a/indra/newview/skins/default/xui/da/floater_select_key.xml b/indra/newview/skins/default/xui/da/floater_select_key.xml index 9f7aad5e03..9f7aad5e03 100755..100644 --- a/indra/newview/skins/default/xui/da/floater_select_key.xml +++ b/indra/newview/skins/default/xui/da/floater_select_key.xml diff --git a/indra/newview/skins/default/xui/da/floater_sell_land.xml b/indra/newview/skins/default/xui/da/floater_sell_land.xml index 873e6d7995..873e6d7995 100755..100644 --- a/indra/newview/skins/default/xui/da/floater_sell_land.xml +++ b/indra/newview/skins/default/xui/da/floater_sell_land.xml diff --git a/indra/newview/skins/default/xui/da/floater_settings_debug.xml b/indra/newview/skins/default/xui/da/floater_settings_debug.xml index f7eda56e48..f7eda56e48 100755..100644 --- a/indra/newview/skins/default/xui/da/floater_settings_debug.xml +++ b/indra/newview/skins/default/xui/da/floater_settings_debug.xml diff --git a/indra/newview/skins/default/xui/da/floater_snapshot.xml b/indra/newview/skins/default/xui/da/floater_snapshot.xml index 926c2429ac..926c2429ac 100755..100644 --- a/indra/newview/skins/default/xui/da/floater_snapshot.xml +++ b/indra/newview/skins/default/xui/da/floater_snapshot.xml diff --git a/indra/newview/skins/default/xui/da/floater_sound_devices.xml b/indra/newview/skins/default/xui/da/floater_sound_devices.xml index cb4cbba570..cb4cbba570 100755..100644 --- a/indra/newview/skins/default/xui/da/floater_sound_devices.xml +++ b/indra/newview/skins/default/xui/da/floater_sound_devices.xml diff --git a/indra/newview/skins/default/xui/da/floater_sound_preview.xml b/indra/newview/skins/default/xui/da/floater_sound_preview.xml index 5f74f28a23..5f74f28a23 100755..100644 --- a/indra/newview/skins/default/xui/da/floater_sound_preview.xml +++ b/indra/newview/skins/default/xui/da/floater_sound_preview.xml diff --git a/indra/newview/skins/default/xui/da/floater_stats.xml b/indra/newview/skins/default/xui/da/floater_stats.xml index fe3fa9626e..fe3fa9626e 100755..100644 --- a/indra/newview/skins/default/xui/da/floater_stats.xml +++ b/indra/newview/skins/default/xui/da/floater_stats.xml diff --git a/indra/newview/skins/default/xui/da/floater_sys_well.xml b/indra/newview/skins/default/xui/da/floater_sys_well.xml index f203c2504f..f203c2504f 100755..100644 --- a/indra/newview/skins/default/xui/da/floater_sys_well.xml +++ b/indra/newview/skins/default/xui/da/floater_sys_well.xml diff --git a/indra/newview/skins/default/xui/da/floater_telehub.xml b/indra/newview/skins/default/xui/da/floater_telehub.xml index 5a0e89aa98..5a0e89aa98 100755..100644 --- a/indra/newview/skins/default/xui/da/floater_telehub.xml +++ b/indra/newview/skins/default/xui/da/floater_telehub.xml diff --git a/indra/newview/skins/default/xui/da/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/da/floater_texture_ctrl.xml index fbc7fe2319..fbc7fe2319 100755..100644 --- a/indra/newview/skins/default/xui/da/floater_texture_ctrl.xml +++ b/indra/newview/skins/default/xui/da/floater_texture_ctrl.xml diff --git a/indra/newview/skins/default/xui/da/floater_tools.xml b/indra/newview/skins/default/xui/da/floater_tools.xml index 9be129bbf6..9be129bbf6 100755..100644 --- a/indra/newview/skins/default/xui/da/floater_tools.xml +++ b/indra/newview/skins/default/xui/da/floater_tools.xml diff --git a/indra/newview/skins/default/xui/da/floater_top_objects.xml b/indra/newview/skins/default/xui/da/floater_top_objects.xml index 86c24d2c19..86c24d2c19 100755..100644 --- a/indra/newview/skins/default/xui/da/floater_top_objects.xml +++ b/indra/newview/skins/default/xui/da/floater_top_objects.xml diff --git a/indra/newview/skins/default/xui/da/floater_tos.xml b/indra/newview/skins/default/xui/da/floater_tos.xml index af9ee0bd06..af9ee0bd06 100755..100644 --- a/indra/newview/skins/default/xui/da/floater_tos.xml +++ b/indra/newview/skins/default/xui/da/floater_tos.xml diff --git a/indra/newview/skins/default/xui/da/floater_url_entry.xml b/indra/newview/skins/default/xui/da/floater_url_entry.xml index 30b3b7184b..30b3b7184b 100755..100644 --- a/indra/newview/skins/default/xui/da/floater_url_entry.xml +++ b/indra/newview/skins/default/xui/da/floater_url_entry.xml diff --git a/indra/newview/skins/default/xui/da/floater_voice_controls.xml b/indra/newview/skins/default/xui/da/floater_voice_controls.xml index 69de696bf5..69de696bf5 100755..100644 --- a/indra/newview/skins/default/xui/da/floater_voice_controls.xml +++ b/indra/newview/skins/default/xui/da/floater_voice_controls.xml diff --git a/indra/newview/skins/default/xui/da/floater_voice_effect.xml b/indra/newview/skins/default/xui/da/floater_voice_effect.xml index 86ad251103..86ad251103 100755..100644 --- a/indra/newview/skins/default/xui/da/floater_voice_effect.xml +++ b/indra/newview/skins/default/xui/da/floater_voice_effect.xml diff --git a/indra/newview/skins/default/xui/da/floater_web_content.xml b/indra/newview/skins/default/xui/da/floater_web_content.xml index 74092e88ec..74092e88ec 100755..100644 --- a/indra/newview/skins/default/xui/da/floater_web_content.xml +++ b/indra/newview/skins/default/xui/da/floater_web_content.xml diff --git a/indra/newview/skins/default/xui/da/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/da/floater_whitelist_entry.xml index 443e84b64a..443e84b64a 100755..100644 --- a/indra/newview/skins/default/xui/da/floater_whitelist_entry.xml +++ b/indra/newview/skins/default/xui/da/floater_whitelist_entry.xml diff --git a/indra/newview/skins/default/xui/da/floater_window_size.xml b/indra/newview/skins/default/xui/da/floater_window_size.xml index db8ead21bd..db8ead21bd 100755..100644 --- a/indra/newview/skins/default/xui/da/floater_window_size.xml +++ b/indra/newview/skins/default/xui/da/floater_window_size.xml diff --git a/indra/newview/skins/default/xui/da/floater_world_map.xml b/indra/newview/skins/default/xui/da/floater_world_map.xml index 97364e0f9f..97364e0f9f 100755..100644 --- a/indra/newview/skins/default/xui/da/floater_world_map.xml +++ b/indra/newview/skins/default/xui/da/floater_world_map.xml diff --git a/indra/newview/skins/default/xui/da/inspect_avatar.xml b/indra/newview/skins/default/xui/da/inspect_avatar.xml index dc1ed562eb..dc1ed562eb 100755..100644 --- a/indra/newview/skins/default/xui/da/inspect_avatar.xml +++ b/indra/newview/skins/default/xui/da/inspect_avatar.xml diff --git a/indra/newview/skins/default/xui/da/inspect_group.xml b/indra/newview/skins/default/xui/da/inspect_group.xml index 486c5d8784..486c5d8784 100755..100644 --- a/indra/newview/skins/default/xui/da/inspect_group.xml +++ b/indra/newview/skins/default/xui/da/inspect_group.xml diff --git a/indra/newview/skins/default/xui/da/inspect_object.xml b/indra/newview/skins/default/xui/da/inspect_object.xml index 78ccc5b869..78ccc5b869 100755..100644 --- a/indra/newview/skins/default/xui/da/inspect_object.xml +++ b/indra/newview/skins/default/xui/da/inspect_object.xml diff --git a/indra/newview/skins/default/xui/da/inspect_remote_object.xml b/indra/newview/skins/default/xui/da/inspect_remote_object.xml index a06452afe6..a06452afe6 100755..100644 --- a/indra/newview/skins/default/xui/da/inspect_remote_object.xml +++ b/indra/newview/skins/default/xui/da/inspect_remote_object.xml diff --git a/indra/newview/skins/default/xui/da/language_settings.xml b/indra/newview/skins/default/xui/da/language_settings.xml index 0e3cbfd2d2..0e3cbfd2d2 100755..100644 --- a/indra/newview/skins/default/xui/da/language_settings.xml +++ b/indra/newview/skins/default/xui/da/language_settings.xml diff --git a/indra/newview/skins/default/xui/da/menu_add_wearable_gear.xml b/indra/newview/skins/default/xui/da/menu_add_wearable_gear.xml index 1e8301dc4c..1e8301dc4c 100755..100644 --- a/indra/newview/skins/default/xui/da/menu_add_wearable_gear.xml +++ b/indra/newview/skins/default/xui/da/menu_add_wearable_gear.xml diff --git a/indra/newview/skins/default/xui/da/menu_attachment_other.xml b/indra/newview/skins/default/xui/da/menu_attachment_other.xml index ca7b184942..ca7b184942 100755..100644 --- a/indra/newview/skins/default/xui/da/menu_attachment_other.xml +++ b/indra/newview/skins/default/xui/da/menu_attachment_other.xml diff --git a/indra/newview/skins/default/xui/da/menu_attachment_self.xml b/indra/newview/skins/default/xui/da/menu_attachment_self.xml index 35ba27f9e2..35ba27f9e2 100755..100644 --- a/indra/newview/skins/default/xui/da/menu_attachment_self.xml +++ b/indra/newview/skins/default/xui/da/menu_attachment_self.xml diff --git a/indra/newview/skins/default/xui/da/menu_avatar_icon.xml b/indra/newview/skins/default/xui/da/menu_avatar_icon.xml index 26b58ce1ab..26b58ce1ab 100755..100644 --- a/indra/newview/skins/default/xui/da/menu_avatar_icon.xml +++ b/indra/newview/skins/default/xui/da/menu_avatar_icon.xml diff --git a/indra/newview/skins/default/xui/da/menu_avatar_other.xml b/indra/newview/skins/default/xui/da/menu_avatar_other.xml index a778dedf0b..a778dedf0b 100755..100644 --- a/indra/newview/skins/default/xui/da/menu_avatar_other.xml +++ b/indra/newview/skins/default/xui/da/menu_avatar_other.xml diff --git a/indra/newview/skins/default/xui/da/menu_avatar_self.xml b/indra/newview/skins/default/xui/da/menu_avatar_self.xml index 4e6b42a744..4e6b42a744 100755..100644 --- a/indra/newview/skins/default/xui/da/menu_avatar_self.xml +++ b/indra/newview/skins/default/xui/da/menu_avatar_self.xml diff --git a/indra/newview/skins/default/xui/da/menu_bottomtray.xml b/indra/newview/skins/default/xui/da/menu_bottomtray.xml index a0d74db36d..a0d74db36d 100755..100644 --- a/indra/newview/skins/default/xui/da/menu_bottomtray.xml +++ b/indra/newview/skins/default/xui/da/menu_bottomtray.xml diff --git a/indra/newview/skins/default/xui/da/menu_cof_attachment.xml b/indra/newview/skins/default/xui/da/menu_cof_attachment.xml index 9d7fc0f223..9d7fc0f223 100755..100644 --- a/indra/newview/skins/default/xui/da/menu_cof_attachment.xml +++ b/indra/newview/skins/default/xui/da/menu_cof_attachment.xml diff --git a/indra/newview/skins/default/xui/da/menu_cof_body_part.xml b/indra/newview/skins/default/xui/da/menu_cof_body_part.xml index 0e90d5a3ae..0e90d5a3ae 100755..100644 --- a/indra/newview/skins/default/xui/da/menu_cof_body_part.xml +++ b/indra/newview/skins/default/xui/da/menu_cof_body_part.xml diff --git a/indra/newview/skins/default/xui/da/menu_cof_clothing.xml b/indra/newview/skins/default/xui/da/menu_cof_clothing.xml index 16c225b7d9..16c225b7d9 100755..100644 --- a/indra/newview/skins/default/xui/da/menu_cof_clothing.xml +++ b/indra/newview/skins/default/xui/da/menu_cof_clothing.xml diff --git a/indra/newview/skins/default/xui/da/menu_cof_gear.xml b/indra/newview/skins/default/xui/da/menu_cof_gear.xml index f44369fd84..f44369fd84 100755..100644 --- a/indra/newview/skins/default/xui/da/menu_cof_gear.xml +++ b/indra/newview/skins/default/xui/da/menu_cof_gear.xml diff --git a/indra/newview/skins/default/xui/da/menu_edit.xml b/indra/newview/skins/default/xui/da/menu_edit.xml index 3752f42b1c..3752f42b1c 100755..100644 --- a/indra/newview/skins/default/xui/da/menu_edit.xml +++ b/indra/newview/skins/default/xui/da/menu_edit.xml diff --git a/indra/newview/skins/default/xui/da/menu_favorites.xml b/indra/newview/skins/default/xui/da/menu_favorites.xml index a4793e294c..a4793e294c 100755..100644 --- a/indra/newview/skins/default/xui/da/menu_favorites.xml +++ b/indra/newview/skins/default/xui/da/menu_favorites.xml diff --git a/indra/newview/skins/default/xui/da/menu_gesture_gear.xml b/indra/newview/skins/default/xui/da/menu_gesture_gear.xml index a9010e99b6..a9010e99b6 100755..100644 --- a/indra/newview/skins/default/xui/da/menu_gesture_gear.xml +++ b/indra/newview/skins/default/xui/da/menu_gesture_gear.xml diff --git a/indra/newview/skins/default/xui/da/menu_group_plus.xml b/indra/newview/skins/default/xui/da/menu_group_plus.xml index 97fbec1ed1..97fbec1ed1 100755..100644 --- a/indra/newview/skins/default/xui/da/menu_group_plus.xml +++ b/indra/newview/skins/default/xui/da/menu_group_plus.xml diff --git a/indra/newview/skins/default/xui/da/menu_hide_navbar.xml b/indra/newview/skins/default/xui/da/menu_hide_navbar.xml index d96a8a8a17..d96a8a8a17 100755..100644 --- a/indra/newview/skins/default/xui/da/menu_hide_navbar.xml +++ b/indra/newview/skins/default/xui/da/menu_hide_navbar.xml diff --git a/indra/newview/skins/default/xui/da/menu_imchiclet_adhoc.xml b/indra/newview/skins/default/xui/da/menu_imchiclet_adhoc.xml index f64a6ad455..f64a6ad455 100755..100644 --- a/indra/newview/skins/default/xui/da/menu_imchiclet_adhoc.xml +++ b/indra/newview/skins/default/xui/da/menu_imchiclet_adhoc.xml diff --git a/indra/newview/skins/default/xui/da/menu_imchiclet_group.xml b/indra/newview/skins/default/xui/da/menu_imchiclet_group.xml index b89d9a5789..b89d9a5789 100755..100644 --- a/indra/newview/skins/default/xui/da/menu_imchiclet_group.xml +++ b/indra/newview/skins/default/xui/da/menu_imchiclet_group.xml diff --git a/indra/newview/skins/default/xui/da/menu_imchiclet_p2p.xml b/indra/newview/skins/default/xui/da/menu_imchiclet_p2p.xml index 6ebc40a8dd..6ebc40a8dd 100755..100644 --- a/indra/newview/skins/default/xui/da/menu_imchiclet_p2p.xml +++ b/indra/newview/skins/default/xui/da/menu_imchiclet_p2p.xml diff --git a/indra/newview/skins/default/xui/da/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/da/menu_inspect_avatar_gear.xml index 8da35adb1b..8da35adb1b 100755..100644 --- a/indra/newview/skins/default/xui/da/menu_inspect_avatar_gear.xml +++ b/indra/newview/skins/default/xui/da/menu_inspect_avatar_gear.xml diff --git a/indra/newview/skins/default/xui/da/menu_inspect_object_gear.xml b/indra/newview/skins/default/xui/da/menu_inspect_object_gear.xml index e28842836d..e28842836d 100755..100644 --- a/indra/newview/skins/default/xui/da/menu_inspect_object_gear.xml +++ b/indra/newview/skins/default/xui/da/menu_inspect_object_gear.xml diff --git a/indra/newview/skins/default/xui/da/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/da/menu_inspect_self_gear.xml index 887c6484bc..887c6484bc 100755..100644 --- a/indra/newview/skins/default/xui/da/menu_inspect_self_gear.xml +++ b/indra/newview/skins/default/xui/da/menu_inspect_self_gear.xml diff --git a/indra/newview/skins/default/xui/da/menu_inv_offer_chiclet.xml b/indra/newview/skins/default/xui/da/menu_inv_offer_chiclet.xml index c3b03232bf..c3b03232bf 100755..100644 --- a/indra/newview/skins/default/xui/da/menu_inv_offer_chiclet.xml +++ b/indra/newview/skins/default/xui/da/menu_inv_offer_chiclet.xml diff --git a/indra/newview/skins/default/xui/da/menu_inventory.xml b/indra/newview/skins/default/xui/da/menu_inventory.xml index f9bdf36f1f..f9bdf36f1f 100755..100644 --- a/indra/newview/skins/default/xui/da/menu_inventory.xml +++ b/indra/newview/skins/default/xui/da/menu_inventory.xml diff --git a/indra/newview/skins/default/xui/da/menu_inventory_add.xml b/indra/newview/skins/default/xui/da/menu_inventory_add.xml index eca03d3ee9..eca03d3ee9 100755..100644 --- a/indra/newview/skins/default/xui/da/menu_inventory_add.xml +++ b/indra/newview/skins/default/xui/da/menu_inventory_add.xml diff --git a/indra/newview/skins/default/xui/da/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/da/menu_inventory_gear_default.xml index 4809b24463..4809b24463 100755..100644 --- a/indra/newview/skins/default/xui/da/menu_inventory_gear_default.xml +++ b/indra/newview/skins/default/xui/da/menu_inventory_gear_default.xml diff --git a/indra/newview/skins/default/xui/da/menu_land.xml b/indra/newview/skins/default/xui/da/menu_land.xml index 1548f18f89..1548f18f89 100755..100644 --- a/indra/newview/skins/default/xui/da/menu_land.xml +++ b/indra/newview/skins/default/xui/da/menu_land.xml diff --git a/indra/newview/skins/default/xui/da/menu_landmark.xml b/indra/newview/skins/default/xui/da/menu_landmark.xml index 3cf2ffe375..3cf2ffe375 100755..100644 --- a/indra/newview/skins/default/xui/da/menu_landmark.xml +++ b/indra/newview/skins/default/xui/da/menu_landmark.xml diff --git a/indra/newview/skins/default/xui/da/menu_login.xml b/indra/newview/skins/default/xui/da/menu_login.xml index 0b7a5040ae..0b7a5040ae 100755..100644 --- a/indra/newview/skins/default/xui/da/menu_login.xml +++ b/indra/newview/skins/default/xui/da/menu_login.xml diff --git a/indra/newview/skins/default/xui/da/menu_media_ctrl.xml b/indra/newview/skins/default/xui/da/menu_media_ctrl.xml index 788b1c4b59..788b1c4b59 100755..100644 --- a/indra/newview/skins/default/xui/da/menu_media_ctrl.xml +++ b/indra/newview/skins/default/xui/da/menu_media_ctrl.xml diff --git a/indra/newview/skins/default/xui/da/menu_mini_map.xml b/indra/newview/skins/default/xui/da/menu_mini_map.xml index 186dbd476a..186dbd476a 100755..100644 --- a/indra/newview/skins/default/xui/da/menu_mini_map.xml +++ b/indra/newview/skins/default/xui/da/menu_mini_map.xml diff --git a/indra/newview/skins/default/xui/da/menu_model_import_gear_default.xml b/indra/newview/skins/default/xui/da/menu_model_import_gear_default.xml index d9626692d5..d9626692d5 100755..100644 --- a/indra/newview/skins/default/xui/da/menu_model_import_gear_default.xml +++ b/indra/newview/skins/default/xui/da/menu_model_import_gear_default.xml diff --git a/indra/newview/skins/default/xui/da/menu_navbar.xml b/indra/newview/skins/default/xui/da/menu_navbar.xml index c04206824a..c04206824a 100755..100644 --- a/indra/newview/skins/default/xui/da/menu_navbar.xml +++ b/indra/newview/skins/default/xui/da/menu_navbar.xml diff --git a/indra/newview/skins/default/xui/da/menu_nearby_chat.xml b/indra/newview/skins/default/xui/da/menu_nearby_chat.xml index be532ad406..be532ad406 100755..100644 --- a/indra/newview/skins/default/xui/da/menu_nearby_chat.xml +++ b/indra/newview/skins/default/xui/da/menu_nearby_chat.xml diff --git a/indra/newview/skins/default/xui/da/menu_notification_well_button.xml b/indra/newview/skins/default/xui/da/menu_notification_well_button.xml index 40b35b5fdd..40b35b5fdd 100755..100644 --- a/indra/newview/skins/default/xui/da/menu_notification_well_button.xml +++ b/indra/newview/skins/default/xui/da/menu_notification_well_button.xml diff --git a/indra/newview/skins/default/xui/da/menu_object.xml b/indra/newview/skins/default/xui/da/menu_object.xml index ba62ccf90c..ba62ccf90c 100755..100644 --- a/indra/newview/skins/default/xui/da/menu_object.xml +++ b/indra/newview/skins/default/xui/da/menu_object.xml diff --git a/indra/newview/skins/default/xui/da/menu_object_icon.xml b/indra/newview/skins/default/xui/da/menu_object_icon.xml index 08aeb633b6..08aeb633b6 100755..100644 --- a/indra/newview/skins/default/xui/da/menu_object_icon.xml +++ b/indra/newview/skins/default/xui/da/menu_object_icon.xml diff --git a/indra/newview/skins/default/xui/da/menu_outfit_gear.xml b/indra/newview/skins/default/xui/da/menu_outfit_gear.xml index 0b0fff3b93..0b0fff3b93 100755..100644 --- a/indra/newview/skins/default/xui/da/menu_outfit_gear.xml +++ b/indra/newview/skins/default/xui/da/menu_outfit_gear.xml diff --git a/indra/newview/skins/default/xui/da/menu_outfit_tab.xml b/indra/newview/skins/default/xui/da/menu_outfit_tab.xml index d6a6f2724f..d6a6f2724f 100755..100644 --- a/indra/newview/skins/default/xui/da/menu_outfit_tab.xml +++ b/indra/newview/skins/default/xui/da/menu_outfit_tab.xml diff --git a/indra/newview/skins/default/xui/da/menu_participant_list.xml b/indra/newview/skins/default/xui/da/menu_participant_list.xml index 5951d3ffb9..5951d3ffb9 100755..100644 --- a/indra/newview/skins/default/xui/da/menu_participant_list.xml +++ b/indra/newview/skins/default/xui/da/menu_participant_list.xml diff --git a/indra/newview/skins/default/xui/da/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/da/menu_people_friends_view_sort.xml index 32c5e6a6c7..32c5e6a6c7 100755..100644 --- a/indra/newview/skins/default/xui/da/menu_people_friends_view_sort.xml +++ b/indra/newview/skins/default/xui/da/menu_people_friends_view_sort.xml diff --git a/indra/newview/skins/default/xui/da/menu_people_groups.xml b/indra/newview/skins/default/xui/da/menu_people_groups.xml index 841f58b619..841f58b619 100755..100644 --- a/indra/newview/skins/default/xui/da/menu_people_groups.xml +++ b/indra/newview/skins/default/xui/da/menu_people_groups.xml diff --git a/indra/newview/skins/default/xui/da/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/da/menu_people_groups_view_sort.xml index 0b9a791530..0b9a791530 100755..100644 --- a/indra/newview/skins/default/xui/da/menu_people_groups_view_sort.xml +++ b/indra/newview/skins/default/xui/da/menu_people_groups_view_sort.xml diff --git a/indra/newview/skins/default/xui/da/menu_people_nearby.xml b/indra/newview/skins/default/xui/da/menu_people_nearby.xml index 5470c32761..5470c32761 100755..100644 --- a/indra/newview/skins/default/xui/da/menu_people_nearby.xml +++ b/indra/newview/skins/default/xui/da/menu_people_nearby.xml diff --git a/indra/newview/skins/default/xui/da/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/da/menu_people_nearby_multiselect.xml index 9318a0e340..9318a0e340 100755..100644 --- a/indra/newview/skins/default/xui/da/menu_people_nearby_multiselect.xml +++ b/indra/newview/skins/default/xui/da/menu_people_nearby_multiselect.xml diff --git a/indra/newview/skins/default/xui/da/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/da/menu_people_nearby_view_sort.xml index 2f35ff3c92..2f35ff3c92 100755..100644 --- a/indra/newview/skins/default/xui/da/menu_people_nearby_view_sort.xml +++ b/indra/newview/skins/default/xui/da/menu_people_nearby_view_sort.xml diff --git a/indra/newview/skins/default/xui/da/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/da/menu_people_recent_view_sort.xml index d081f637f2..d081f637f2 100755..100644 --- a/indra/newview/skins/default/xui/da/menu_people_recent_view_sort.xml +++ b/indra/newview/skins/default/xui/da/menu_people_recent_view_sort.xml diff --git a/indra/newview/skins/default/xui/da/menu_picks.xml b/indra/newview/skins/default/xui/da/menu_picks.xml index 81ee900773..81ee900773 100755..100644 --- a/indra/newview/skins/default/xui/da/menu_picks.xml +++ b/indra/newview/skins/default/xui/da/menu_picks.xml diff --git a/indra/newview/skins/default/xui/da/menu_picks_plus.xml b/indra/newview/skins/default/xui/da/menu_picks_plus.xml index d95071fbbb..d95071fbbb 100755..100644 --- a/indra/newview/skins/default/xui/da/menu_picks_plus.xml +++ b/indra/newview/skins/default/xui/da/menu_picks_plus.xml diff --git a/indra/newview/skins/default/xui/da/menu_place.xml b/indra/newview/skins/default/xui/da/menu_place.xml index b87964ac14..b87964ac14 100755..100644 --- a/indra/newview/skins/default/xui/da/menu_place.xml +++ b/indra/newview/skins/default/xui/da/menu_place.xml diff --git a/indra/newview/skins/default/xui/da/menu_place_add_button.xml b/indra/newview/skins/default/xui/da/menu_place_add_button.xml index 7ad2253550..7ad2253550 100755..100644 --- a/indra/newview/skins/default/xui/da/menu_place_add_button.xml +++ b/indra/newview/skins/default/xui/da/menu_place_add_button.xml diff --git a/indra/newview/skins/default/xui/da/menu_places_gear_folder.xml b/indra/newview/skins/default/xui/da/menu_places_gear_folder.xml index 5f573c2363..5f573c2363 100755..100644 --- a/indra/newview/skins/default/xui/da/menu_places_gear_folder.xml +++ b/indra/newview/skins/default/xui/da/menu_places_gear_folder.xml diff --git a/indra/newview/skins/default/xui/da/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/da/menu_places_gear_landmark.xml index 13dbcdd42e..13dbcdd42e 100755..100644 --- a/indra/newview/skins/default/xui/da/menu_places_gear_landmark.xml +++ b/indra/newview/skins/default/xui/da/menu_places_gear_landmark.xml diff --git a/indra/newview/skins/default/xui/da/menu_profile_overflow.xml b/indra/newview/skins/default/xui/da/menu_profile_overflow.xml index 6745007c99..6745007c99 100755..100644 --- a/indra/newview/skins/default/xui/da/menu_profile_overflow.xml +++ b/indra/newview/skins/default/xui/da/menu_profile_overflow.xml diff --git a/indra/newview/skins/default/xui/da/menu_save_outfit.xml b/indra/newview/skins/default/xui/da/menu_save_outfit.xml index 188229b586..188229b586 100755..100644 --- a/indra/newview/skins/default/xui/da/menu_save_outfit.xml +++ b/indra/newview/skins/default/xui/da/menu_save_outfit.xml diff --git a/indra/newview/skins/default/xui/da/menu_script_chiclet.xml b/indra/newview/skins/default/xui/da/menu_script_chiclet.xml index cdd3212373..cdd3212373 100755..100644 --- a/indra/newview/skins/default/xui/da/menu_script_chiclet.xml +++ b/indra/newview/skins/default/xui/da/menu_script_chiclet.xml diff --git a/indra/newview/skins/default/xui/da/menu_slurl.xml b/indra/newview/skins/default/xui/da/menu_slurl.xml index a9302e111e..a9302e111e 100755..100644 --- a/indra/newview/skins/default/xui/da/menu_slurl.xml +++ b/indra/newview/skins/default/xui/da/menu_slurl.xml diff --git a/indra/newview/skins/default/xui/da/menu_teleport_history_gear.xml b/indra/newview/skins/default/xui/da/menu_teleport_history_gear.xml index a1c25fea69..a1c25fea69 100755..100644 --- a/indra/newview/skins/default/xui/da/menu_teleport_history_gear.xml +++ b/indra/newview/skins/default/xui/da/menu_teleport_history_gear.xml diff --git a/indra/newview/skins/default/xui/da/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/da/menu_teleport_history_item.xml index dbaec62087..dbaec62087 100755..100644 --- a/indra/newview/skins/default/xui/da/menu_teleport_history_item.xml +++ b/indra/newview/skins/default/xui/da/menu_teleport_history_item.xml diff --git a/indra/newview/skins/default/xui/da/menu_teleport_history_tab.xml b/indra/newview/skins/default/xui/da/menu_teleport_history_tab.xml index c4d4bb4b5b..c4d4bb4b5b 100755..100644 --- a/indra/newview/skins/default/xui/da/menu_teleport_history_tab.xml +++ b/indra/newview/skins/default/xui/da/menu_teleport_history_tab.xml diff --git a/indra/newview/skins/default/xui/da/menu_text_editor.xml b/indra/newview/skins/default/xui/da/menu_text_editor.xml index 3ff31ea232..3ff31ea232 100755..100644 --- a/indra/newview/skins/default/xui/da/menu_text_editor.xml +++ b/indra/newview/skins/default/xui/da/menu_text_editor.xml diff --git a/indra/newview/skins/default/xui/da/menu_topinfobar.xml b/indra/newview/skins/default/xui/da/menu_topinfobar.xml index 08d1c25d6f..08d1c25d6f 100755..100644 --- a/indra/newview/skins/default/xui/da/menu_topinfobar.xml +++ b/indra/newview/skins/default/xui/da/menu_topinfobar.xml diff --git a/indra/newview/skins/default/xui/da/menu_url_agent.xml b/indra/newview/skins/default/xui/da/menu_url_agent.xml index 491586f3b4..491586f3b4 100755..100644 --- a/indra/newview/skins/default/xui/da/menu_url_agent.xml +++ b/indra/newview/skins/default/xui/da/menu_url_agent.xml diff --git a/indra/newview/skins/default/xui/da/menu_url_group.xml b/indra/newview/skins/default/xui/da/menu_url_group.xml index c776159b0a..c776159b0a 100755..100644 --- a/indra/newview/skins/default/xui/da/menu_url_group.xml +++ b/indra/newview/skins/default/xui/da/menu_url_group.xml diff --git a/indra/newview/skins/default/xui/da/menu_url_http.xml b/indra/newview/skins/default/xui/da/menu_url_http.xml index 4398777a39..4398777a39 100755..100644 --- a/indra/newview/skins/default/xui/da/menu_url_http.xml +++ b/indra/newview/skins/default/xui/da/menu_url_http.xml diff --git a/indra/newview/skins/default/xui/da/menu_url_inventory.xml b/indra/newview/skins/default/xui/da/menu_url_inventory.xml index 9a7de23e06..9a7de23e06 100755..100644 --- a/indra/newview/skins/default/xui/da/menu_url_inventory.xml +++ b/indra/newview/skins/default/xui/da/menu_url_inventory.xml diff --git a/indra/newview/skins/default/xui/da/menu_url_map.xml b/indra/newview/skins/default/xui/da/menu_url_map.xml index ff4a4d5174..ff4a4d5174 100755..100644 --- a/indra/newview/skins/default/xui/da/menu_url_map.xml +++ b/indra/newview/skins/default/xui/da/menu_url_map.xml diff --git a/indra/newview/skins/default/xui/da/menu_url_objectim.xml b/indra/newview/skins/default/xui/da/menu_url_objectim.xml index e27cf84959..e27cf84959 100755..100644 --- a/indra/newview/skins/default/xui/da/menu_url_objectim.xml +++ b/indra/newview/skins/default/xui/da/menu_url_objectim.xml diff --git a/indra/newview/skins/default/xui/da/menu_url_parcel.xml b/indra/newview/skins/default/xui/da/menu_url_parcel.xml index 0f21e14f66..0f21e14f66 100755..100644 --- a/indra/newview/skins/default/xui/da/menu_url_parcel.xml +++ b/indra/newview/skins/default/xui/da/menu_url_parcel.xml diff --git a/indra/newview/skins/default/xui/da/menu_url_slapp.xml b/indra/newview/skins/default/xui/da/menu_url_slapp.xml index dd25db2aa7..dd25db2aa7 100755..100644 --- a/indra/newview/skins/default/xui/da/menu_url_slapp.xml +++ b/indra/newview/skins/default/xui/da/menu_url_slapp.xml diff --git a/indra/newview/skins/default/xui/da/menu_url_slurl.xml b/indra/newview/skins/default/xui/da/menu_url_slurl.xml index 8d84a138bb..8d84a138bb 100755..100644 --- a/indra/newview/skins/default/xui/da/menu_url_slurl.xml +++ b/indra/newview/skins/default/xui/da/menu_url_slurl.xml diff --git a/indra/newview/skins/default/xui/da/menu_url_teleport.xml b/indra/newview/skins/default/xui/da/menu_url_teleport.xml index e0ca7b920d..e0ca7b920d 100755..100644 --- a/indra/newview/skins/default/xui/da/menu_url_teleport.xml +++ b/indra/newview/skins/default/xui/da/menu_url_teleport.xml diff --git a/indra/newview/skins/default/xui/da/menu_viewer.xml b/indra/newview/skins/default/xui/da/menu_viewer.xml index aa6bc53672..299322001b 100755..100644 --- a/indra/newview/skins/default/xui/da/menu_viewer.xml +++ b/indra/newview/skins/default/xui/da/menu_viewer.xml @@ -37,7 +37,7 @@ <menu_item_separator/> <menu_item_call label="Profil for sted" name="Place Profile"/> <menu_item_call label="Om land" name="About Land"/> - <menu_item_call label="Region/Estate" name="Region/Estate"/> + <menu_item_call label="Region/Estate" name="RegionEstate"/> <menu_item_call label="Køb dette land" name="Buy Land"/> <menu_item_call label="Mit land" name="My Land"/> <menu label="Vis" name="LandShow"> diff --git a/indra/newview/skins/default/xui/da/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/da/menu_wearable_list_item.xml index 63f4b0b388..63f4b0b388 100755..100644 --- a/indra/newview/skins/default/xui/da/menu_wearable_list_item.xml +++ b/indra/newview/skins/default/xui/da/menu_wearable_list_item.xml diff --git a/indra/newview/skins/default/xui/da/menu_wearing_gear.xml b/indra/newview/skins/default/xui/da/menu_wearing_gear.xml index 515a15b287..515a15b287 100755..100644 --- a/indra/newview/skins/default/xui/da/menu_wearing_gear.xml +++ b/indra/newview/skins/default/xui/da/menu_wearing_gear.xml diff --git a/indra/newview/skins/default/xui/da/menu_wearing_tab.xml b/indra/newview/skins/default/xui/da/menu_wearing_tab.xml index c0db7b6842..c0db7b6842 100755..100644 --- a/indra/newview/skins/default/xui/da/menu_wearing_tab.xml +++ b/indra/newview/skins/default/xui/da/menu_wearing_tab.xml diff --git a/indra/newview/skins/default/xui/da/mime_types.xml b/indra/newview/skins/default/xui/da/mime_types.xml index 0b00a29f07..0b00a29f07 100755..100644 --- a/indra/newview/skins/default/xui/da/mime_types.xml +++ b/indra/newview/skins/default/xui/da/mime_types.xml diff --git a/indra/newview/skins/default/xui/da/mime_types_linux.xml b/indra/newview/skins/default/xui/da/mime_types_linux.xml index 69a0fb23f6..69a0fb23f6 100755..100644 --- a/indra/newview/skins/default/xui/da/mime_types_linux.xml +++ b/indra/newview/skins/default/xui/da/mime_types_linux.xml diff --git a/indra/newview/skins/default/xui/da/mime_types_mac.xml b/indra/newview/skins/default/xui/da/mime_types_mac.xml index bd9981b045..bd9981b045 100755..100644 --- a/indra/newview/skins/default/xui/da/mime_types_mac.xml +++ b/indra/newview/skins/default/xui/da/mime_types_mac.xml diff --git a/indra/newview/skins/default/xui/da/notifications.xml b/indra/newview/skins/default/xui/da/notifications.xml index 33b876bdb9..aad3b9d062 100755..100644 --- a/indra/newview/skins/default/xui/da/notifications.xml +++ b/indra/newview/skins/default/xui/da/notifications.xml @@ -1311,9 +1311,6 @@ Prøv igen om lidt. <notification name="NoValidCircuit"> Ingen gyldig kode for kredsløb. </notification> - <notification name="NoValidTimestamp"> - Ikke et gyldigt klokkeslæt. - </notification> <notification name="NoPendingConnection"> Kunne ikke skabe fast forbindelse. </notification> diff --git a/indra/newview/skins/default/xui/da/outfit_accordion_tab.xml b/indra/newview/skins/default/xui/da/outfit_accordion_tab.xml index e2d1f26d42..e2d1f26d42 100755..100644 --- a/indra/newview/skins/default/xui/da/outfit_accordion_tab.xml +++ b/indra/newview/skins/default/xui/da/outfit_accordion_tab.xml diff --git a/indra/newview/skins/default/xui/da/panel_active_object_row.xml b/indra/newview/skins/default/xui/da/panel_active_object_row.xml index 9c27ea7fe2..9c27ea7fe2 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_active_object_row.xml +++ b/indra/newview/skins/default/xui/da/panel_active_object_row.xml diff --git a/indra/newview/skins/default/xui/da/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/da/panel_adhoc_control_panel.xml index 1953fad31f..1953fad31f 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_adhoc_control_panel.xml +++ b/indra/newview/skins/default/xui/da/panel_adhoc_control_panel.xml diff --git a/indra/newview/skins/default/xui/da/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/da/panel_avatar_list_item.xml index 890f4a2f0a..890f4a2f0a 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_avatar_list_item.xml +++ b/indra/newview/skins/default/xui/da/panel_avatar_list_item.xml diff --git a/indra/newview/skins/default/xui/da/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/da/panel_block_list_sidetray.xml index 4f5041ad54..4f5041ad54 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_block_list_sidetray.xml +++ b/indra/newview/skins/default/xui/da/panel_block_list_sidetray.xml diff --git a/indra/newview/skins/default/xui/da/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/da/panel_body_parts_list_item.xml index d2ade170d1..d2ade170d1 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_body_parts_list_item.xml +++ b/indra/newview/skins/default/xui/da/panel_body_parts_list_item.xml diff --git a/indra/newview/skins/default/xui/da/panel_bodyparts_list_button_bar.xml b/indra/newview/skins/default/xui/da/panel_bodyparts_list_button_bar.xml index 4cbcdebbe4..4cbcdebbe4 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_bodyparts_list_button_bar.xml +++ b/indra/newview/skins/default/xui/da/panel_bodyparts_list_button_bar.xml diff --git a/indra/newview/skins/default/xui/da/panel_bottomtray.xml b/indra/newview/skins/default/xui/da/panel_bottomtray.xml index 3cd9d55dd0..3cd9d55dd0 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_bottomtray.xml +++ b/indra/newview/skins/default/xui/da/panel_bottomtray.xml diff --git a/indra/newview/skins/default/xui/da/panel_bottomtray_lite.xml b/indra/newview/skins/default/xui/da/panel_bottomtray_lite.xml index bd31253ca4..bd31253ca4 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_bottomtray_lite.xml +++ b/indra/newview/skins/default/xui/da/panel_bottomtray_lite.xml diff --git a/indra/newview/skins/default/xui/da/panel_classified_info.xml b/indra/newview/skins/default/xui/da/panel_classified_info.xml index a54d320ffd..a54d320ffd 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_classified_info.xml +++ b/indra/newview/skins/default/xui/da/panel_classified_info.xml diff --git a/indra/newview/skins/default/xui/da/panel_clothing_list_button_bar.xml b/indra/newview/skins/default/xui/da/panel_clothing_list_button_bar.xml index c08d095c66..c08d095c66 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_clothing_list_button_bar.xml +++ b/indra/newview/skins/default/xui/da/panel_clothing_list_button_bar.xml diff --git a/indra/newview/skins/default/xui/da/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/da/panel_clothing_list_item.xml index 88b0636e9e..88b0636e9e 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_clothing_list_item.xml +++ b/indra/newview/skins/default/xui/da/panel_clothing_list_item.xml diff --git a/indra/newview/skins/default/xui/da/panel_cof_wearables.xml b/indra/newview/skins/default/xui/da/panel_cof_wearables.xml index 92d78b01a2..92d78b01a2 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_cof_wearables.xml +++ b/indra/newview/skins/default/xui/da/panel_cof_wearables.xml diff --git a/indra/newview/skins/default/xui/da/panel_deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/da/panel_deletable_wearable_list_item.xml index 700ad4fa14..700ad4fa14 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_deletable_wearable_list_item.xml +++ b/indra/newview/skins/default/xui/da/panel_deletable_wearable_list_item.xml diff --git a/indra/newview/skins/default/xui/da/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/da/panel_dummy_clothing_list_item.xml index dd8d86cfbf..dd8d86cfbf 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_dummy_clothing_list_item.xml +++ b/indra/newview/skins/default/xui/da/panel_dummy_clothing_list_item.xml diff --git a/indra/newview/skins/default/xui/da/panel_edit_alpha.xml b/indra/newview/skins/default/xui/da/panel_edit_alpha.xml index 0f60a6df51..0f60a6df51 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_edit_alpha.xml +++ b/indra/newview/skins/default/xui/da/panel_edit_alpha.xml diff --git a/indra/newview/skins/default/xui/da/panel_edit_classified.xml b/indra/newview/skins/default/xui/da/panel_edit_classified.xml index fc4780a34e..fc4780a34e 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_edit_classified.xml +++ b/indra/newview/skins/default/xui/da/panel_edit_classified.xml diff --git a/indra/newview/skins/default/xui/da/panel_edit_eyes.xml b/indra/newview/skins/default/xui/da/panel_edit_eyes.xml index d801118cea..d801118cea 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_edit_eyes.xml +++ b/indra/newview/skins/default/xui/da/panel_edit_eyes.xml diff --git a/indra/newview/skins/default/xui/da/panel_edit_gloves.xml b/indra/newview/skins/default/xui/da/panel_edit_gloves.xml index 36f58428a6..36f58428a6 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_edit_gloves.xml +++ b/indra/newview/skins/default/xui/da/panel_edit_gloves.xml diff --git a/indra/newview/skins/default/xui/da/panel_edit_hair.xml b/indra/newview/skins/default/xui/da/panel_edit_hair.xml index e91e6324e8..e91e6324e8 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_edit_hair.xml +++ b/indra/newview/skins/default/xui/da/panel_edit_hair.xml diff --git a/indra/newview/skins/default/xui/da/panel_edit_jacket.xml b/indra/newview/skins/default/xui/da/panel_edit_jacket.xml index 4e7336747d..4e7336747d 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_edit_jacket.xml +++ b/indra/newview/skins/default/xui/da/panel_edit_jacket.xml diff --git a/indra/newview/skins/default/xui/da/panel_edit_pants.xml b/indra/newview/skins/default/xui/da/panel_edit_pants.xml index 61056e9e6c..61056e9e6c 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_edit_pants.xml +++ b/indra/newview/skins/default/xui/da/panel_edit_pants.xml diff --git a/indra/newview/skins/default/xui/da/panel_edit_physics.xml b/indra/newview/skins/default/xui/da/panel_edit_physics.xml index 16c9b16fa3..16c9b16fa3 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_edit_physics.xml +++ b/indra/newview/skins/default/xui/da/panel_edit_physics.xml diff --git a/indra/newview/skins/default/xui/da/panel_edit_pick.xml b/indra/newview/skins/default/xui/da/panel_edit_pick.xml index 3036f30240..3036f30240 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_edit_pick.xml +++ b/indra/newview/skins/default/xui/da/panel_edit_pick.xml diff --git a/indra/newview/skins/default/xui/da/panel_edit_profile.xml b/indra/newview/skins/default/xui/da/panel_edit_profile.xml index 14fd48ba2f..14fd48ba2f 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_edit_profile.xml +++ b/indra/newview/skins/default/xui/da/panel_edit_profile.xml diff --git a/indra/newview/skins/default/xui/da/panel_edit_shape.xml b/indra/newview/skins/default/xui/da/panel_edit_shape.xml index 7c1ffe5cfa..7c1ffe5cfa 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_edit_shape.xml +++ b/indra/newview/skins/default/xui/da/panel_edit_shape.xml diff --git a/indra/newview/skins/default/xui/da/panel_edit_shirt.xml b/indra/newview/skins/default/xui/da/panel_edit_shirt.xml index 4dfb47aab2..4dfb47aab2 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_edit_shirt.xml +++ b/indra/newview/skins/default/xui/da/panel_edit_shirt.xml diff --git a/indra/newview/skins/default/xui/da/panel_edit_shoes.xml b/indra/newview/skins/default/xui/da/panel_edit_shoes.xml index 653ea421b5..653ea421b5 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_edit_shoes.xml +++ b/indra/newview/skins/default/xui/da/panel_edit_shoes.xml diff --git a/indra/newview/skins/default/xui/da/panel_edit_skin.xml b/indra/newview/skins/default/xui/da/panel_edit_skin.xml index 608e1d6e0b..608e1d6e0b 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_edit_skin.xml +++ b/indra/newview/skins/default/xui/da/panel_edit_skin.xml diff --git a/indra/newview/skins/default/xui/da/panel_edit_skirt.xml b/indra/newview/skins/default/xui/da/panel_edit_skirt.xml index e80e60efd8..e80e60efd8 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_edit_skirt.xml +++ b/indra/newview/skins/default/xui/da/panel_edit_skirt.xml diff --git a/indra/newview/skins/default/xui/da/panel_edit_socks.xml b/indra/newview/skins/default/xui/da/panel_edit_socks.xml index 82a7341317..82a7341317 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_edit_socks.xml +++ b/indra/newview/skins/default/xui/da/panel_edit_socks.xml diff --git a/indra/newview/skins/default/xui/da/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/da/panel_edit_tattoo.xml index d4a12209db..d4a12209db 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_edit_tattoo.xml +++ b/indra/newview/skins/default/xui/da/panel_edit_tattoo.xml diff --git a/indra/newview/skins/default/xui/da/panel_edit_underpants.xml b/indra/newview/skins/default/xui/da/panel_edit_underpants.xml index aacfae79e1..aacfae79e1 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_edit_underpants.xml +++ b/indra/newview/skins/default/xui/da/panel_edit_underpants.xml diff --git a/indra/newview/skins/default/xui/da/panel_edit_undershirt.xml b/indra/newview/skins/default/xui/da/panel_edit_undershirt.xml index a9db5d2ab0..a9db5d2ab0 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_edit_undershirt.xml +++ b/indra/newview/skins/default/xui/da/panel_edit_undershirt.xml diff --git a/indra/newview/skins/default/xui/da/panel_edit_wearable.xml b/indra/newview/skins/default/xui/da/panel_edit_wearable.xml index 906870e6d9..906870e6d9 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_edit_wearable.xml +++ b/indra/newview/skins/default/xui/da/panel_edit_wearable.xml diff --git a/indra/newview/skins/default/xui/da/panel_group_control_panel.xml b/indra/newview/skins/default/xui/da/panel_group_control_panel.xml index 26fe4f6ebe..26fe4f6ebe 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_group_control_panel.xml +++ b/indra/newview/skins/default/xui/da/panel_group_control_panel.xml diff --git a/indra/newview/skins/default/xui/da/panel_group_general.xml b/indra/newview/skins/default/xui/da/panel_group_general.xml index eccddb55c8..eccddb55c8 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_group_general.xml +++ b/indra/newview/skins/default/xui/da/panel_group_general.xml diff --git a/indra/newview/skins/default/xui/da/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/da/panel_group_info_sidetray.xml index 3d561f1e5b..3d561f1e5b 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_group_info_sidetray.xml +++ b/indra/newview/skins/default/xui/da/panel_group_info_sidetray.xml diff --git a/indra/newview/skins/default/xui/da/panel_group_invite.xml b/indra/newview/skins/default/xui/da/panel_group_invite.xml index 49daf6c9f2..49daf6c9f2 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_group_invite.xml +++ b/indra/newview/skins/default/xui/da/panel_group_invite.xml diff --git a/indra/newview/skins/default/xui/da/panel_group_land_money.xml b/indra/newview/skins/default/xui/da/panel_group_land_money.xml index 49d415e515..49d415e515 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_group_land_money.xml +++ b/indra/newview/skins/default/xui/da/panel_group_land_money.xml diff --git a/indra/newview/skins/default/xui/da/panel_group_list_item.xml b/indra/newview/skins/default/xui/da/panel_group_list_item.xml index e77e548340..e77e548340 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_group_list_item.xml +++ b/indra/newview/skins/default/xui/da/panel_group_list_item.xml diff --git a/indra/newview/skins/default/xui/da/panel_group_notices.xml b/indra/newview/skins/default/xui/da/panel_group_notices.xml index 0a0b8f5e04..0a0b8f5e04 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_group_notices.xml +++ b/indra/newview/skins/default/xui/da/panel_group_notices.xml diff --git a/indra/newview/skins/default/xui/da/panel_group_notify.xml b/indra/newview/skins/default/xui/da/panel_group_notify.xml index 8a684ca031..8a684ca031 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_group_notify.xml +++ b/indra/newview/skins/default/xui/da/panel_group_notify.xml diff --git a/indra/newview/skins/default/xui/da/panel_group_roles.xml b/indra/newview/skins/default/xui/da/panel_group_roles.xml index ebc773f7ed..ebc773f7ed 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_group_roles.xml +++ b/indra/newview/skins/default/xui/da/panel_group_roles.xml diff --git a/indra/newview/skins/default/xui/da/panel_im_control_panel.xml b/indra/newview/skins/default/xui/da/panel_im_control_panel.xml index 5cecb93d40..5cecb93d40 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_im_control_panel.xml +++ b/indra/newview/skins/default/xui/da/panel_im_control_panel.xml diff --git a/indra/newview/skins/default/xui/da/panel_inventory_item.xml b/indra/newview/skins/default/xui/da/panel_inventory_item.xml index d18047fbcf..d18047fbcf 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_inventory_item.xml +++ b/indra/newview/skins/default/xui/da/panel_inventory_item.xml diff --git a/indra/newview/skins/default/xui/da/panel_landmark_info.xml b/indra/newview/skins/default/xui/da/panel_landmark_info.xml index 8503a41763..8503a41763 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_landmark_info.xml +++ b/indra/newview/skins/default/xui/da/panel_landmark_info.xml diff --git a/indra/newview/skins/default/xui/da/panel_landmarks.xml b/indra/newview/skins/default/xui/da/panel_landmarks.xml index e9e5e506fd..e9e5e506fd 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_landmarks.xml +++ b/indra/newview/skins/default/xui/da/panel_landmarks.xml diff --git a/indra/newview/skins/default/xui/da/panel_login.xml b/indra/newview/skins/default/xui/da/panel_login.xml index b7cb76d4cb..b7cb76d4cb 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_login.xml +++ b/indra/newview/skins/default/xui/da/panel_login.xml diff --git a/indra/newview/skins/default/xui/da/panel_main_inventory.xml b/indra/newview/skins/default/xui/da/panel_main_inventory.xml index d6406939c1..d6406939c1 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/da/panel_main_inventory.xml diff --git a/indra/newview/skins/default/xui/da/panel_me.xml b/indra/newview/skins/default/xui/da/panel_me.xml index f98ced5f91..f98ced5f91 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_me.xml +++ b/indra/newview/skins/default/xui/da/panel_me.xml diff --git a/indra/newview/skins/default/xui/da/panel_media_settings_general.xml b/indra/newview/skins/default/xui/da/panel_media_settings_general.xml index 48f08b9dfd..48f08b9dfd 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_media_settings_general.xml +++ b/indra/newview/skins/default/xui/da/panel_media_settings_general.xml diff --git a/indra/newview/skins/default/xui/da/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/da/panel_media_settings_permissions.xml index 84468eb2a7..84468eb2a7 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_media_settings_permissions.xml +++ b/indra/newview/skins/default/xui/da/panel_media_settings_permissions.xml diff --git a/indra/newview/skins/default/xui/da/panel_media_settings_security.xml b/indra/newview/skins/default/xui/da/panel_media_settings_security.xml index 1b64888271..1b64888271 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_media_settings_security.xml +++ b/indra/newview/skins/default/xui/da/panel_media_settings_security.xml diff --git a/indra/newview/skins/default/xui/da/panel_navigation_bar.xml b/indra/newview/skins/default/xui/da/panel_navigation_bar.xml index 2ee87433a4..2ee87433a4 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_navigation_bar.xml +++ b/indra/newview/skins/default/xui/da/panel_navigation_bar.xml diff --git a/indra/newview/skins/default/xui/da/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/da/panel_nearby_chat_bar.xml index eb104201f8..eb104201f8 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_nearby_chat_bar.xml +++ b/indra/newview/skins/default/xui/da/panel_nearby_chat_bar.xml diff --git a/indra/newview/skins/default/xui/da/panel_nearby_media.xml b/indra/newview/skins/default/xui/da/panel_nearby_media.xml index ef8ed3ad07..ef8ed3ad07 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_nearby_media.xml +++ b/indra/newview/skins/default/xui/da/panel_nearby_media.xml diff --git a/indra/newview/skins/default/xui/da/panel_notify_textbox.xml b/indra/newview/skins/default/xui/da/panel_notify_textbox.xml index 30ad4ff9f6..30ad4ff9f6 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_notify_textbox.xml +++ b/indra/newview/skins/default/xui/da/panel_notify_textbox.xml diff --git a/indra/newview/skins/default/xui/da/panel_online_status_toast.xml b/indra/newview/skins/default/xui/da/panel_online_status_toast.xml index fdc489f375..fdc489f375 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_online_status_toast.xml +++ b/indra/newview/skins/default/xui/da/panel_online_status_toast.xml diff --git a/indra/newview/skins/default/xui/da/panel_outfit_edit.xml b/indra/newview/skins/default/xui/da/panel_outfit_edit.xml index 3736ea06ba..3736ea06ba 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_outfit_edit.xml +++ b/indra/newview/skins/default/xui/da/panel_outfit_edit.xml diff --git a/indra/newview/skins/default/xui/da/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/da/panel_outfits_inventory.xml index 055c42c003..055c42c003 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_outfits_inventory.xml +++ b/indra/newview/skins/default/xui/da/panel_outfits_inventory.xml diff --git a/indra/newview/skins/default/xui/da/panel_outfits_inventory_gear_default.xml b/indra/newview/skins/default/xui/da/panel_outfits_inventory_gear_default.xml index 7b6469023b..7b6469023b 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_outfits_inventory_gear_default.xml +++ b/indra/newview/skins/default/xui/da/panel_outfits_inventory_gear_default.xml diff --git a/indra/newview/skins/default/xui/da/panel_outfits_list.xml b/indra/newview/skins/default/xui/da/panel_outfits_list.xml index 72caedb461..72caedb461 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_outfits_list.xml +++ b/indra/newview/skins/default/xui/da/panel_outfits_list.xml diff --git a/indra/newview/skins/default/xui/da/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/da/panel_outfits_wearing.xml index 8d25efa97b..8d25efa97b 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_outfits_wearing.xml +++ b/indra/newview/skins/default/xui/da/panel_outfits_wearing.xml diff --git a/indra/newview/skins/default/xui/da/panel_people.xml b/indra/newview/skins/default/xui/da/panel_people.xml index 66a128cd13..66a128cd13 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_people.xml +++ b/indra/newview/skins/default/xui/da/panel_people.xml diff --git a/indra/newview/skins/default/xui/da/panel_pick_info.xml b/indra/newview/skins/default/xui/da/panel_pick_info.xml index 8a5141f967..8a5141f967 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_pick_info.xml +++ b/indra/newview/skins/default/xui/da/panel_pick_info.xml diff --git a/indra/newview/skins/default/xui/da/panel_picks.xml b/indra/newview/skins/default/xui/da/panel_picks.xml index 8af68ee69a..8af68ee69a 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_picks.xml +++ b/indra/newview/skins/default/xui/da/panel_picks.xml diff --git a/indra/newview/skins/default/xui/da/panel_place_profile.xml b/indra/newview/skins/default/xui/da/panel_place_profile.xml index 8dd0fb2d21..8dd0fb2d21 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_place_profile.xml +++ b/indra/newview/skins/default/xui/da/panel_place_profile.xml diff --git a/indra/newview/skins/default/xui/da/panel_places.xml b/indra/newview/skins/default/xui/da/panel_places.xml index c555f2fb09..c555f2fb09 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_places.xml +++ b/indra/newview/skins/default/xui/da/panel_places.xml diff --git a/indra/newview/skins/default/xui/da/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/da/panel_preferences_advanced.xml index 48106c7dfe..48106c7dfe 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/da/panel_preferences_advanced.xml diff --git a/indra/newview/skins/default/xui/da/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/da/panel_preferences_alerts.xml index 7caa17d514..7caa17d514 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_preferences_alerts.xml +++ b/indra/newview/skins/default/xui/da/panel_preferences_alerts.xml diff --git a/indra/newview/skins/default/xui/da/panel_preferences_chat.xml b/indra/newview/skins/default/xui/da/panel_preferences_chat.xml index 890a3038ef..890a3038ef 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/da/panel_preferences_chat.xml diff --git a/indra/newview/skins/default/xui/da/panel_preferences_colors.xml b/indra/newview/skins/default/xui/da/panel_preferences_colors.xml index cc3dc480bc..cc3dc480bc 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_preferences_colors.xml +++ b/indra/newview/skins/default/xui/da/panel_preferences_colors.xml diff --git a/indra/newview/skins/default/xui/da/panel_preferences_general.xml b/indra/newview/skins/default/xui/da/panel_preferences_general.xml index 5702d48e97..5702d48e97 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/da/panel_preferences_general.xml diff --git a/indra/newview/skins/default/xui/da/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/da/panel_preferences_graphics1.xml index e494b2b755..e494b2b755 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/da/panel_preferences_graphics1.xml diff --git a/indra/newview/skins/default/xui/da/panel_preferences_move.xml b/indra/newview/skins/default/xui/da/panel_preferences_move.xml index 98dfed92c1..98dfed92c1 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_preferences_move.xml +++ b/indra/newview/skins/default/xui/da/panel_preferences_move.xml diff --git a/indra/newview/skins/default/xui/da/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/da/panel_preferences_privacy.xml index 6d48180707..6d48180707 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_preferences_privacy.xml +++ b/indra/newview/skins/default/xui/da/panel_preferences_privacy.xml diff --git a/indra/newview/skins/default/xui/da/panel_preferences_setup.xml b/indra/newview/skins/default/xui/da/panel_preferences_setup.xml index 7be9a9d555..7be9a9d555 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_preferences_setup.xml +++ b/indra/newview/skins/default/xui/da/panel_preferences_setup.xml diff --git a/indra/newview/skins/default/xui/da/panel_preferences_sound.xml b/indra/newview/skins/default/xui/da/panel_preferences_sound.xml index 26d2ae4abd..26d2ae4abd 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/da/panel_preferences_sound.xml diff --git a/indra/newview/skins/default/xui/da/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/da/panel_prim_media_controls.xml index cfb32500c6..cfb32500c6 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_prim_media_controls.xml +++ b/indra/newview/skins/default/xui/da/panel_prim_media_controls.xml diff --git a/indra/newview/skins/default/xui/da/panel_region_covenant.xml b/indra/newview/skins/default/xui/da/panel_region_covenant.xml index 4b9c7539ea..4b9c7539ea 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_region_covenant.xml +++ b/indra/newview/skins/default/xui/da/panel_region_covenant.xml diff --git a/indra/newview/skins/default/xui/da/panel_region_debug.xml b/indra/newview/skins/default/xui/da/panel_region_debug.xml index 08e2d1e263..08e2d1e263 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_region_debug.xml +++ b/indra/newview/skins/default/xui/da/panel_region_debug.xml diff --git a/indra/newview/skins/default/xui/da/panel_region_estate.xml b/indra/newview/skins/default/xui/da/panel_region_estate.xml index 65948ce481..65948ce481 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_region_estate.xml +++ b/indra/newview/skins/default/xui/da/panel_region_estate.xml diff --git a/indra/newview/skins/default/xui/da/panel_region_general.xml b/indra/newview/skins/default/xui/da/panel_region_general.xml index 667c88c5b1..667c88c5b1 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_region_general.xml +++ b/indra/newview/skins/default/xui/da/panel_region_general.xml diff --git a/indra/newview/skins/default/xui/da/panel_region_terrain.xml b/indra/newview/skins/default/xui/da/panel_region_terrain.xml index 14ef0060b1..14ef0060b1 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_region_terrain.xml +++ b/indra/newview/skins/default/xui/da/panel_region_terrain.xml diff --git a/indra/newview/skins/default/xui/da/panel_region_texture.xml b/indra/newview/skins/default/xui/da/panel_region_texture.xml index 45946fd222..45946fd222 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_region_texture.xml +++ b/indra/newview/skins/default/xui/da/panel_region_texture.xml diff --git a/indra/newview/skins/default/xui/da/panel_script_ed.xml b/indra/newview/skins/default/xui/da/panel_script_ed.xml index 3dec4bf101..3dec4bf101 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_script_ed.xml +++ b/indra/newview/skins/default/xui/da/panel_script_ed.xml diff --git a/indra/newview/skins/default/xui/da/panel_script_limits_my_avatar.xml b/indra/newview/skins/default/xui/da/panel_script_limits_my_avatar.xml index 821c82ccda..821c82ccda 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_script_limits_my_avatar.xml +++ b/indra/newview/skins/default/xui/da/panel_script_limits_my_avatar.xml diff --git a/indra/newview/skins/default/xui/da/panel_script_limits_region_memory.xml b/indra/newview/skins/default/xui/da/panel_script_limits_region_memory.xml index 91fc76dbb4..91fc76dbb4 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_script_limits_region_memory.xml +++ b/indra/newview/skins/default/xui/da/panel_script_limits_region_memory.xml diff --git a/indra/newview/skins/default/xui/da/panel_scrolling_param.xml b/indra/newview/skins/default/xui/da/panel_scrolling_param.xml index 99f61b938b..99f61b938b 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_scrolling_param.xml +++ b/indra/newview/skins/default/xui/da/panel_scrolling_param.xml diff --git a/indra/newview/skins/default/xui/da/panel_scrolling_param_base.xml b/indra/newview/skins/default/xui/da/panel_scrolling_param_base.xml index fa659040ea..fa659040ea 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_scrolling_param_base.xml +++ b/indra/newview/skins/default/xui/da/panel_scrolling_param_base.xml diff --git a/indra/newview/skins/default/xui/da/panel_side_tray.xml b/indra/newview/skins/default/xui/da/panel_side_tray.xml index 66c3e69904..66c3e69904 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_side_tray.xml +++ b/indra/newview/skins/default/xui/da/panel_side_tray.xml diff --git a/indra/newview/skins/default/xui/da/panel_side_tray_tab_caption.xml b/indra/newview/skins/default/xui/da/panel_side_tray_tab_caption.xml index ce3a1d8b4e..ce3a1d8b4e 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_side_tray_tab_caption.xml +++ b/indra/newview/skins/default/xui/da/panel_side_tray_tab_caption.xml diff --git a/indra/newview/skins/default/xui/da/panel_sound_devices.xml b/indra/newview/skins/default/xui/da/panel_sound_devices.xml index 27b7666a1f..27b7666a1f 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_sound_devices.xml +++ b/indra/newview/skins/default/xui/da/panel_sound_devices.xml diff --git a/indra/newview/skins/default/xui/da/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/da/panel_stand_stop_flying.xml index f25639d56f..f25639d56f 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_stand_stop_flying.xml +++ b/indra/newview/skins/default/xui/da/panel_stand_stop_flying.xml diff --git a/indra/newview/skins/default/xui/da/panel_status_bar.xml b/indra/newview/skins/default/xui/da/panel_status_bar.xml index 6e7bdfc188..6e7bdfc188 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/da/panel_status_bar.xml diff --git a/indra/newview/skins/default/xui/da/panel_teleport_history.xml b/indra/newview/skins/default/xui/da/panel_teleport_history.xml index e6e78028f5..e6e78028f5 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_teleport_history.xml +++ b/indra/newview/skins/default/xui/da/panel_teleport_history.xml diff --git a/indra/newview/skins/default/xui/da/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/da/panel_teleport_history_item.xml index 8148588c86..8148588c86 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_teleport_history_item.xml +++ b/indra/newview/skins/default/xui/da/panel_teleport_history_item.xml diff --git a/indra/newview/skins/default/xui/da/panel_voice_effect.xml b/indra/newview/skins/default/xui/da/panel_voice_effect.xml index 50f561ec7f..50f561ec7f 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_voice_effect.xml +++ b/indra/newview/skins/default/xui/da/panel_voice_effect.xml diff --git a/indra/newview/skins/default/xui/da/panel_world_map.xml b/indra/newview/skins/default/xui/da/panel_world_map.xml index 138b922df1..138b922df1 100755..100644 --- a/indra/newview/skins/default/xui/da/panel_world_map.xml +++ b/indra/newview/skins/default/xui/da/panel_world_map.xml diff --git a/indra/newview/skins/default/xui/da/role_actions.xml b/indra/newview/skins/default/xui/da/role_actions.xml index 7e581200a5..7e581200a5 100755..100644 --- a/indra/newview/skins/default/xui/da/role_actions.xml +++ b/indra/newview/skins/default/xui/da/role_actions.xml diff --git a/indra/newview/skins/default/xui/da/sidepanel_appearance.xml b/indra/newview/skins/default/xui/da/sidepanel_appearance.xml index c5caefe070..c5caefe070 100755..100644 --- a/indra/newview/skins/default/xui/da/sidepanel_appearance.xml +++ b/indra/newview/skins/default/xui/da/sidepanel_appearance.xml diff --git a/indra/newview/skins/default/xui/da/sidepanel_inventory.xml b/indra/newview/skins/default/xui/da/sidepanel_inventory.xml index b4b494cafa..b4b494cafa 100755..100644 --- a/indra/newview/skins/default/xui/da/sidepanel_inventory.xml +++ b/indra/newview/skins/default/xui/da/sidepanel_inventory.xml diff --git a/indra/newview/skins/default/xui/da/sidepanel_item_info.xml b/indra/newview/skins/default/xui/da/sidepanel_item_info.xml index d52845160b..d52845160b 100755..100644 --- a/indra/newview/skins/default/xui/da/sidepanel_item_info.xml +++ b/indra/newview/skins/default/xui/da/sidepanel_item_info.xml diff --git a/indra/newview/skins/default/xui/da/sidepanel_task_info.xml b/indra/newview/skins/default/xui/da/sidepanel_task_info.xml index f80d5aeb15..f80d5aeb15 100755..100644 --- a/indra/newview/skins/default/xui/da/sidepanel_task_info.xml +++ b/indra/newview/skins/default/xui/da/sidepanel_task_info.xml diff --git a/indra/newview/skins/default/xui/da/strings.xml b/indra/newview/skins/default/xui/da/strings.xml index 74d160dfae..74d160dfae 100755..100644 --- a/indra/newview/skins/default/xui/da/strings.xml +++ b/indra/newview/skins/default/xui/da/strings.xml diff --git a/indra/newview/skins/default/xui/da/teleport_strings.xml b/indra/newview/skins/default/xui/da/teleport_strings.xml index 0d89fae986..0d89fae986 100755..100644 --- a/indra/newview/skins/default/xui/da/teleport_strings.xml +++ b/indra/newview/skins/default/xui/da/teleport_strings.xml diff --git a/indra/newview/skins/default/xui/da/xui_version.xml b/indra/newview/skins/default/xui/da/xui_version.xml index 0e777751d3..0e777751d3 100755..100644 --- a/indra/newview/skins/default/xui/da/xui_version.xml +++ b/indra/newview/skins/default/xui/da/xui_version.xml 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..100644 --- 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 <nolink>[HOSTNAME]</nolink> ([HOSTIP]) -SLURL: <nolink>[SLURL]</nolink> -(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..100644 --- 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 & 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_activeim.xml b/indra/newview/skins/default/xui/de/floater_activeim.xml index 416e31b2d6..416e31b2d6 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_activeim.xml +++ b/indra/newview/skins/default/xui/de/floater_activeim.xml diff --git a/indra/newview/skins/default/xui/de/floater_animation_anim_preview.xml b/indra/newview/skins/default/xui/de/floater_animation_anim_preview.xml index 3dc554b120..3dc554b120 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_animation_anim_preview.xml +++ b/indra/newview/skins/default/xui/de/floater_animation_anim_preview.xml diff --git a/indra/newview/skins/default/xui/de/floater_animation_bvh_preview.xml b/indra/newview/skins/default/xui/de/floater_animation_bvh_preview.xml index 9a6f5e0166..d427376574 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_animation_bvh_preview.xml +++ b/indra/newview/skins/default/xui/de/floater_animation_bvh_preview.xml @@ -141,35 +141,35 @@ Maximal erlaubt sind [MAX_LENGTH] Sekunden. Ausdruck </text> <combo_box name="emote_combo" tool_tip="Steuert Gesichtsregungen während der Animation"> - <item label="(Keine)" name="[None]" value=""/> - <item label="Aaaaah" name="Aaaaah" value="Aaaaah"/> - <item label="Ängstlich" name="Afraid" value="Ängstlich"/> - <item label="Verärgert" name="Angry" value="Verärgert"/> - <item label="Grinst" name="BigSmile" value="Grinst"/> - <item label="Gelangweilt" name="Bored" value="Gelangweilt"/> - <item label="Weinen" name="Cry" value="Weinen"/> - <item label="Verachtung" name="Disdain" value="Verachtung"/> - <item label="Verlegen" name="Embarrassed" value="Verlegen"/> - <item label="Stirnrunzeln" name="Frown" value="Stirnrunzeln"/> - <item label="Küssen" name="Kiss" value="Küssen"/> - <item label="Lachen" name="Laugh" value="Lachen"/> - <item label="Bäääh" name="Plllppt" value="Bäääh"/> - <item label="Angewidert" name="Repulsed" value="Angewidert"/> - <item label="Traurig" name="Sad" value="Traurig"/> - <item label="Achselzucken" name="Shrug" value="Achselzucken"/> - <item label="Lächeln" name="Smile" value="Lächeln"/> - <item label="Überraschung" name="Surprise" value="Überraschung"/> - <item label="Zwinkern" name="Wink" value="Zwinkern"/> - <item label="Sorgenvoll" name="Worry" value="Sorgenvoll"/> + <item label="(Keine)" name="[None]"/> + <item label="Aaaaah" name="Aaaaah"/> + <item label="Ängstlich" name="Afraid"/> + <item label="Verärgert" name="Angry"/> + <item label="Grinst" name="BigSmile"/> + <item label="Gelangweilt" name="Bored"/> + <item label="Weinen" name="Cry"/> + <item label="Verachtung" name="Disdain"/> + <item label="Verlegen" name="Embarrassed"/> + <item label="Stirnrunzeln" name="Frown"/> + <item label="Küssen" name="Kiss"/> + <item label="Lachen" name="Laugh"/> + <item label="Bäääh" name="Plllppt"/> + <item label="Angewidert" name="Repulsed"/> + <item label="Traurig" name="Sad"/> + <item label="Achselzucken" name="Shrug"/> + <item label="Lächeln" name="Smile"/> + <item label="Überraschung" name="Surprise"/> + <item label="Zwinkern" name="Wink"/> + <item label="Sorgenvoll" name="Worry"/> </combo_box> <text name="preview_label"> Vorschau während: </text> <combo_box name="preview_base_anim" tool_tip="Hiermit können Sie das Verhalten Ihres Avatars testen, während Ihr Avatar normale Bewegungen ausführt."> - <item label="Stehen" name="Standing" value="Stehen"/> - <item label="Gehen" name="Walking" value="Gehen"/> - <item label="Sitzen" name="Sitting" value="Sitzen"/> - <item label="Fliegen" name="Flying" value="Fliegen"/> + <item label="Stehen" name="Standing"/> + <item label="Gehen" name="Walking"/> + <item label="Sitzen" name="Sitting"/> + <item label="Fliegen" name="Flying"/> </combo_box> <spinner label="Einblenden (s)" name="ease_in_time" tool_tip="Einblendungszeit für Animationen (in Sekunden)"/> <spinner label="Ausblenden (s)" name="ease_out_time" tool_tip="Ausblendungszeit für Animationen (in Sekunden)"/> 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_auction.xml b/indra/newview/skins/default/xui/de/floater_auction.xml index 8ededff319..8ededff319 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_auction.xml +++ b/indra/newview/skins/default/xui/de/floater_auction.xml diff --git a/indra/newview/skins/default/xui/de/floater_autoreplace.xml b/indra/newview/skins/default/xui/de/floater_autoreplace.xml index 0c774990ef..0c774990ef 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_autoreplace.xml +++ b/indra/newview/skins/default/xui/de/floater_autoreplace.xml diff --git a/indra/newview/skins/default/xui/de/floater_avatar.xml b/indra/newview/skins/default/xui/de/floater_avatar.xml index ba0dd54d96..ba0dd54d96 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_avatar.xml +++ b/indra/newview/skins/default/xui/de/floater_avatar.xml diff --git a/indra/newview/skins/default/xui/de/floater_avatar_picker.xml b/indra/newview/skins/default/xui/de/floater_avatar_picker.xml index f66b87b76c..f66b87b76c 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_avatar_picker.xml +++ b/indra/newview/skins/default/xui/de/floater_avatar_picker.xml diff --git a/indra/newview/skins/default/xui/de/floater_avatar_textures.xml b/indra/newview/skins/default/xui/de/floater_avatar_textures.xml index 8235eacde0..8235eacde0 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_avatar_textures.xml +++ b/indra/newview/skins/default/xui/de/floater_avatar_textures.xml diff --git a/indra/newview/skins/default/xui/de/floater_beacons.xml b/indra/newview/skins/default/xui/de/floater_beacons.xml index 1a052bd814..1a052bd814 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_beacons.xml +++ b/indra/newview/skins/default/xui/de/floater_beacons.xml diff --git a/indra/newview/skins/default/xui/de/floater_build_options.xml b/indra/newview/skins/default/xui/de/floater_build_options.xml index 939fd5dee4..939fd5dee4 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_build_options.xml +++ b/indra/newview/skins/default/xui/de/floater_build_options.xml diff --git a/indra/newview/skins/default/xui/de/floater_bulk_perms.xml b/indra/newview/skins/default/xui/de/floater_bulk_perms.xml index 27a74c874e..27a74c874e 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_bulk_perms.xml +++ b/indra/newview/skins/default/xui/de/floater_bulk_perms.xml diff --git a/indra/newview/skins/default/xui/de/floater_bumps.xml b/indra/newview/skins/default/xui/de/floater_bumps.xml index 5d02511ab1..5d02511ab1 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_bumps.xml +++ b/indra/newview/skins/default/xui/de/floater_bumps.xml diff --git a/indra/newview/skins/default/xui/de/floater_buy_contents.xml b/indra/newview/skins/default/xui/de/floater_buy_contents.xml index bd6ace6bda..bd6ace6bda 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_buy_contents.xml +++ b/indra/newview/skins/default/xui/de/floater_buy_contents.xml diff --git a/indra/newview/skins/default/xui/de/floater_buy_currency.xml b/indra/newview/skins/default/xui/de/floater_buy_currency.xml index 65926c088c..65926c088c 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_buy_currency.xml +++ b/indra/newview/skins/default/xui/de/floater_buy_currency.xml diff --git a/indra/newview/skins/default/xui/de/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/de/floater_buy_currency_html.xml index 38d3bdd77f..38d3bdd77f 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_buy_currency_html.xml +++ b/indra/newview/skins/default/xui/de/floater_buy_currency_html.xml diff --git a/indra/newview/skins/default/xui/de/floater_buy_land.xml b/indra/newview/skins/default/xui/de/floater_buy_land.xml index ca4ee8981b..ca4ee8981b 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_buy_land.xml +++ b/indra/newview/skins/default/xui/de/floater_buy_land.xml diff --git a/indra/newview/skins/default/xui/de/floater_buy_object.xml b/indra/newview/skins/default/xui/de/floater_buy_object.xml index 29b49f57b3..29b49f57b3 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_buy_object.xml +++ b/indra/newview/skins/default/xui/de/floater_buy_object.xml diff --git a/indra/newview/skins/default/xui/de/floater_camera.xml b/indra/newview/skins/default/xui/de/floater_camera.xml index 163ef87d8c..163ef87d8c 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_camera.xml +++ b/indra/newview/skins/default/xui/de/floater_camera.xml diff --git a/indra/newview/skins/default/xui/de/floater_chat_bar.xml b/indra/newview/skins/default/xui/de/floater_chat_bar.xml index ab77d4dae5..ab77d4dae5 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_chat_bar.xml +++ b/indra/newview/skins/default/xui/de/floater_chat_bar.xml diff --git a/indra/newview/skins/default/xui/de/floater_choose_group.xml b/indra/newview/skins/default/xui/de/floater_choose_group.xml index 3d76b645fe..3d76b645fe 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_choose_group.xml +++ b/indra/newview/skins/default/xui/de/floater_choose_group.xml diff --git a/indra/newview/skins/default/xui/de/floater_color_picker.xml b/indra/newview/skins/default/xui/de/floater_color_picker.xml index 0fe154b531..0fe154b531 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_color_picker.xml +++ b/indra/newview/skins/default/xui/de/floater_color_picker.xml diff --git a/indra/newview/skins/default/xui/de/floater_critical.xml b/indra/newview/skins/default/xui/de/floater_critical.xml index 0b147926dd..0b147926dd 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_critical.xml +++ b/indra/newview/skins/default/xui/de/floater_critical.xml diff --git a/indra/newview/skins/default/xui/de/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/de/floater_delete_env_preset.xml index cc14ce640d..cc14ce640d 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_delete_env_preset.xml +++ b/indra/newview/skins/default/xui/de/floater_delete_env_preset.xml diff --git a/indra/newview/skins/default/xui/de/floater_destinations.xml b/indra/newview/skins/default/xui/de/floater_destinations.xml index 57881488fd..57881488fd 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_destinations.xml +++ b/indra/newview/skins/default/xui/de/floater_destinations.xml diff --git a/indra/newview/skins/default/xui/de/floater_display_name.xml b/indra/newview/skins/default/xui/de/floater_display_name.xml index 4c2914fccb..4c2914fccb 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_display_name.xml +++ b/indra/newview/skins/default/xui/de/floater_display_name.xml diff --git a/indra/newview/skins/default/xui/de/floater_edit_day_cycle.xml b/indra/newview/skins/default/xui/de/floater_edit_day_cycle.xml index 8b29428c24..8b29428c24 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_edit_day_cycle.xml +++ b/indra/newview/skins/default/xui/de/floater_edit_day_cycle.xml 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_edit_sky_preset.xml b/indra/newview/skins/default/xui/de/floater_edit_sky_preset.xml index ea4c5f7ebc..ea4c5f7ebc 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_edit_sky_preset.xml +++ b/indra/newview/skins/default/xui/de/floater_edit_sky_preset.xml diff --git a/indra/newview/skins/default/xui/de/floater_edit_water_preset.xml b/indra/newview/skins/default/xui/de/floater_edit_water_preset.xml index 9b9d5e7d77..9b9d5e7d77 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_edit_water_preset.xml +++ b/indra/newview/skins/default/xui/de/floater_edit_water_preset.xml diff --git a/indra/newview/skins/default/xui/de/floater_environment_settings.xml b/indra/newview/skins/default/xui/de/floater_environment_settings.xml index 946416980a..946416980a 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_environment_settings.xml +++ b/indra/newview/skins/default/xui/de/floater_environment_settings.xml diff --git a/indra/newview/skins/default/xui/de/floater_event.xml b/indra/newview/skins/default/xui/de/floater_event.xml index 5b3267d7c9..5b3267d7c9 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_event.xml +++ b/indra/newview/skins/default/xui/de/floater_event.xml 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"> + "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 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_fast_timers.xml b/indra/newview/skins/default/xui/de/floater_fast_timers.xml index e61e542688..e61e542688 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_fast_timers.xml +++ b/indra/newview/skins/default/xui/de/floater_fast_timers.xml diff --git a/indra/newview/skins/default/xui/de/floater_font_test.xml b/indra/newview/skins/default/xui/de/floater_font_test.xml index 29357b8ee0..29357b8ee0 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_font_test.xml +++ b/indra/newview/skins/default/xui/de/floater_font_test.xml diff --git a/indra/newview/skins/default/xui/de/floater_gesture.xml b/indra/newview/skins/default/xui/de/floater_gesture.xml index 7b35da8d5c..7b35da8d5c 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_gesture.xml +++ b/indra/newview/skins/default/xui/de/floater_gesture.xml diff --git a/indra/newview/skins/default/xui/de/floater_god_tools.xml b/indra/newview/skins/default/xui/de/floater_god_tools.xml index 8cb1af9f7d..8cb1af9f7d 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_god_tools.xml +++ b/indra/newview/skins/default/xui/de/floater_god_tools.xml diff --git a/indra/newview/skins/default/xui/de/floater_hardware_settings.xml b/indra/newview/skins/default/xui/de/floater_hardware_settings.xml index fd6c9a0875..fd6c9a0875 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_hardware_settings.xml +++ b/indra/newview/skins/default/xui/de/floater_hardware_settings.xml diff --git a/indra/newview/skins/default/xui/de/floater_help_browser.xml b/indra/newview/skins/default/xui/de/floater_help_browser.xml index d55a3b0a26..d55a3b0a26 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_help_browser.xml +++ b/indra/newview/skins/default/xui/de/floater_help_browser.xml diff --git a/indra/newview/skins/default/xui/de/floater_how_to.xml b/indra/newview/skins/default/xui/de/floater_how_to.xml index caea221f83..caea221f83 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_how_to.xml +++ b/indra/newview/skins/default/xui/de/floater_how_to.xml diff --git a/indra/newview/skins/default/xui/de/floater_hud.xml b/indra/newview/skins/default/xui/de/floater_hud.xml index 8a10eccabe..8a10eccabe 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_hud.xml +++ b/indra/newview/skins/default/xui/de/floater_hud.xml diff --git a/indra/newview/skins/default/xui/de/floater_im_container.xml b/indra/newview/skins/default/xui/de/floater_im_container.xml index 5bf916c8e9..5bf916c8e9 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_im_container.xml +++ b/indra/newview/skins/default/xui/de/floater_im_container.xml diff --git a/indra/newview/skins/default/xui/de/floater_im_session.xml b/indra/newview/skins/default/xui/de/floater_im_session.xml index b07b74bf4a..b07b74bf4a 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_im_session.xml +++ b/indra/newview/skins/default/xui/de/floater_im_session.xml diff --git a/indra/newview/skins/default/xui/de/floater_image_preview.xml b/indra/newview/skins/default/xui/de/floater_image_preview.xml index d581c6051b..d581c6051b 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_image_preview.xml +++ b/indra/newview/skins/default/xui/de/floater_image_preview.xml diff --git a/indra/newview/skins/default/xui/de/floater_import_collada.xml b/indra/newview/skins/default/xui/de/floater_import_collada.xml index 8b1313c7b5..8b1313c7b5 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_import_collada.xml +++ b/indra/newview/skins/default/xui/de/floater_import_collada.xml diff --git a/indra/newview/skins/default/xui/de/floater_incoming_call.xml b/indra/newview/skins/default/xui/de/floater_incoming_call.xml index f13842f479..f13842f479 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_incoming_call.xml +++ b/indra/newview/skins/default/xui/de/floater_incoming_call.xml diff --git a/indra/newview/skins/default/xui/de/floater_inspect.xml b/indra/newview/skins/default/xui/de/floater_inspect.xml index da97ceb2d8..da97ceb2d8 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_inspect.xml +++ b/indra/newview/skins/default/xui/de/floater_inspect.xml 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..100644 --- 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..100644 --- 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_joystick.xml b/indra/newview/skins/default/xui/de/floater_joystick.xml index 2efc11df29..2efc11df29 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_joystick.xml +++ b/indra/newview/skins/default/xui/de/floater_joystick.xml 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"> >> @@ -147,5 +147,5 @@ <text name="server_text"> Normal </text> - <button label=">> " name="minimize" tool_tip="Fenstergröße ändern"/> + <button label=">>" name="minimize" tool_tip="Fenstergröße ändern"/> </floater> diff --git a/indra/newview/skins/default/xui/de/floater_land_holdings.xml b/indra/newview/skins/default/xui/de/floater_land_holdings.xml index 73559407a9..73559407a9 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_land_holdings.xml +++ b/indra/newview/skins/default/xui/de/floater_land_holdings.xml 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..100644 --- 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=">" name="view_profile"/> </floater> diff --git a/indra/newview/skins/default/xui/de/floater_lsl_guide.xml b/indra/newview/skins/default/xui/de/floater_lsl_guide.xml index 73c21edc67..73c21edc67 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_lsl_guide.xml +++ b/indra/newview/skins/default/xui/de/floater_lsl_guide.xml diff --git a/indra/newview/skins/default/xui/de/floater_map.xml b/indra/newview/skins/default/xui/de/floater_map.xml index c4c42af66d..c4c42af66d 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_map.xml +++ b/indra/newview/skins/default/xui/de/floater_map.xml 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_media_browser.xml b/indra/newview/skins/default/xui/de/floater_media_browser.xml index 2d438dfe21..2d438dfe21 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_media_browser.xml +++ b/indra/newview/skins/default/xui/de/floater_media_browser.xml diff --git a/indra/newview/skins/default/xui/de/floater_media_settings.xml b/indra/newview/skins/default/xui/de/floater_media_settings.xml index 1b98ed7973..1b98ed7973 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_media_settings.xml +++ b/indra/newview/skins/default/xui/de/floater_media_settings.xml diff --git a/indra/newview/skins/default/xui/de/floater_mem_leaking.xml b/indra/newview/skins/default/xui/de/floater_mem_leaking.xml index fdc9b950b6..fdc9b950b6 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_mem_leaking.xml +++ b/indra/newview/skins/default/xui/de/floater_mem_leaking.xml diff --git a/indra/newview/skins/default/xui/de/floater_merchant_outbox.xml b/indra/newview/skins/default/xui/de/floater_merchant_outbox.xml index a412b530a4..a412b530a4 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_merchant_outbox.xml +++ b/indra/newview/skins/default/xui/de/floater_merchant_outbox.xml diff --git a/indra/newview/skins/default/xui/de/floater_model_preview.xml b/indra/newview/skins/default/xui/de/floater_model_preview.xml index 4285462bc8..4285462bc8 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_model_preview.xml +++ b/indra/newview/skins/default/xui/de/floater_model_preview.xml diff --git a/indra/newview/skins/default/xui/de/floater_moveview.xml b/indra/newview/skins/default/xui/de/floater_moveview.xml index c1c8271310..c1c8271310 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_moveview.xml +++ b/indra/newview/skins/default/xui/de/floater_moveview.xml diff --git a/indra/newview/skins/default/xui/de/floater_mute_object.xml b/indra/newview/skins/default/xui/de/floater_mute_object.xml index 3f1af3dc63..3f1af3dc63 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_mute_object.xml +++ b/indra/newview/skins/default/xui/de/floater_mute_object.xml diff --git a/indra/newview/skins/default/xui/de/floater_my_appearance.xml b/indra/newview/skins/default/xui/de/floater_my_appearance.xml index e26b2434cc..e26b2434cc 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_my_appearance.xml +++ b/indra/newview/skins/default/xui/de/floater_my_appearance.xml diff --git a/indra/newview/skins/default/xui/de/floater_my_inventory.xml b/indra/newview/skins/default/xui/de/floater_my_inventory.xml index 0cfa17562e..0cfa17562e 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_my_inventory.xml +++ b/indra/newview/skins/default/xui/de/floater_my_inventory.xml diff --git a/indra/newview/skins/default/xui/de/floater_notification.xml b/indra/newview/skins/default/xui/de/floater_notification.xml index 7752d22b52..7752d22b52 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_notification.xml +++ b/indra/newview/skins/default/xui/de/floater_notification.xml diff --git a/indra/newview/skins/default/xui/de/floater_notifications_console.xml b/indra/newview/skins/default/xui/de/floater_notifications_console.xml index e271cdace2..e271cdace2 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_notifications_console.xml +++ b/indra/newview/skins/default/xui/de/floater_notifications_console.xml diff --git a/indra/newview/skins/default/xui/de/floater_object_weights.xml b/indra/newview/skins/default/xui/de/floater_object_weights.xml index e6641d3d18..e6641d3d18 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_object_weights.xml +++ b/indra/newview/skins/default/xui/de/floater_object_weights.xml 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..100644 --- 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_outfit_save_as.xml b/indra/newview/skins/default/xui/de/floater_outfit_save_as.xml index 7481e6d4b7..7481e6d4b7 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_outfit_save_as.xml +++ b/indra/newview/skins/default/xui/de/floater_outfit_save_as.xml diff --git a/indra/newview/skins/default/xui/de/floater_outgoing_call.xml b/indra/newview/skins/default/xui/de/floater_outgoing_call.xml index 81079a3c52..81079a3c52 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_outgoing_call.xml +++ b/indra/newview/skins/default/xui/de/floater_outgoing_call.xml diff --git a/indra/newview/skins/default/xui/de/floater_pathfinding_characters.xml b/indra/newview/skins/default/xui/de/floater_pathfinding_characters.xml index 7096dbc156..7096dbc156 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_pathfinding_characters.xml +++ b/indra/newview/skins/default/xui/de/floater_pathfinding_characters.xml diff --git a/indra/newview/skins/default/xui/de/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/de/floater_pathfinding_console.xml index ebf8f01632..ebf8f01632 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_pathfinding_console.xml +++ b/indra/newview/skins/default/xui/de/floater_pathfinding_console.xml diff --git a/indra/newview/skins/default/xui/de/floater_pathfinding_linksets.xml b/indra/newview/skins/default/xui/de/floater_pathfinding_linksets.xml index 0d3ba59efb..0d3ba59efb 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_pathfinding_linksets.xml +++ b/indra/newview/skins/default/xui/de/floater_pathfinding_linksets.xml 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..100644 --- 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..100644 --- 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_people.xml b/indra/newview/skins/default/xui/de/floater_people.xml index fd1db148ac..fd1db148ac 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_people.xml +++ b/indra/newview/skins/default/xui/de/floater_people.xml diff --git a/indra/newview/skins/default/xui/de/floater_perm_prefs.xml b/indra/newview/skins/default/xui/de/floater_perm_prefs.xml index 9be22f3ccb..9be22f3ccb 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_perm_prefs.xml +++ b/indra/newview/skins/default/xui/de/floater_perm_prefs.xml diff --git a/indra/newview/skins/default/xui/de/floater_picks.xml b/indra/newview/skins/default/xui/de/floater_picks.xml index 2521920e83..2521920e83 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_picks.xml +++ b/indra/newview/skins/default/xui/de/floater_picks.xml diff --git a/indra/newview/skins/default/xui/de/floater_places.xml b/indra/newview/skins/default/xui/de/floater_places.xml index 80a1490afd..80a1490afd 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_places.xml +++ b/indra/newview/skins/default/xui/de/floater_places.xml diff --git a/indra/newview/skins/default/xui/de/floater_post_process.xml b/indra/newview/skins/default/xui/de/floater_post_process.xml index a6ed8cc3df..a6ed8cc3df 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_post_process.xml +++ b/indra/newview/skins/default/xui/de/floater_post_process.xml diff --git a/indra/newview/skins/default/xui/de/floater_preferences.xml b/indra/newview/skins/default/xui/de/floater_preferences.xml index 3624c4c968..3624c4c968 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_preferences.xml +++ b/indra/newview/skins/default/xui/de/floater_preferences.xml diff --git a/indra/newview/skins/default/xui/de/floater_preferences_proxy.xml b/indra/newview/skins/default/xui/de/floater_preferences_proxy.xml index cdefb470c2..cdefb470c2 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_preferences_proxy.xml +++ b/indra/newview/skins/default/xui/de/floater_preferences_proxy.xml diff --git a/indra/newview/skins/default/xui/de/floater_preview_animation.xml b/indra/newview/skins/default/xui/de/floater_preview_animation.xml index 2dd47a27ad..2dd47a27ad 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_preview_animation.xml +++ b/indra/newview/skins/default/xui/de/floater_preview_animation.xml diff --git a/indra/newview/skins/default/xui/de/floater_preview_gesture.xml b/indra/newview/skins/default/xui/de/floater_preview_gesture.xml index 76dc623ca4..76dc623ca4 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_preview_gesture.xml +++ b/indra/newview/skins/default/xui/de/floater_preview_gesture.xml diff --git a/indra/newview/skins/default/xui/de/floater_preview_notecard.xml b/indra/newview/skins/default/xui/de/floater_preview_notecard.xml index 14e666fd22..14e666fd22 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_preview_notecard.xml +++ b/indra/newview/skins/default/xui/de/floater_preview_notecard.xml diff --git a/indra/newview/skins/default/xui/de/floater_preview_sound.xml b/indra/newview/skins/default/xui/de/floater_preview_sound.xml index 4629ec4a04..4629ec4a04 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_preview_sound.xml +++ b/indra/newview/skins/default/xui/de/floater_preview_sound.xml diff --git a/indra/newview/skins/default/xui/de/floater_preview_texture.xml b/indra/newview/skins/default/xui/de/floater_preview_texture.xml index 526c0813bd..526c0813bd 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_preview_texture.xml +++ b/indra/newview/skins/default/xui/de/floater_preview_texture.xml diff --git a/indra/newview/skins/default/xui/de/floater_price_for_listing.xml b/indra/newview/skins/default/xui/de/floater_price_for_listing.xml index bdd772a9c2..bdd772a9c2 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_price_for_listing.xml +++ b/indra/newview/skins/default/xui/de/floater_price_for_listing.xml diff --git a/indra/newview/skins/default/xui/de/floater_publish_classified.xml b/indra/newview/skins/default/xui/de/floater_publish_classified.xml index d91535ebc3..d91535ebc3 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_publish_classified.xml +++ b/indra/newview/skins/default/xui/de/floater_publish_classified.xml diff --git a/indra/newview/skins/default/xui/de/floater_region_debug_console.xml b/indra/newview/skins/default/xui/de/floater_region_debug_console.xml index b8a1a89c30..b8a1a89c30 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_region_debug_console.xml +++ b/indra/newview/skins/default/xui/de/floater_region_debug_console.xml diff --git a/indra/newview/skins/default/xui/de/floater_region_info.xml b/indra/newview/skins/default/xui/de/floater_region_info.xml index c0dc47a67d..c0dc47a67d 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_region_info.xml +++ b/indra/newview/skins/default/xui/de/floater_region_info.xml 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..100644 --- 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 > Unbefugte Nutzung > Objekte oder Texturen" name="Land__Encroachment__Objects_textures"/> <combo_box.item label="Land > Unbefugte Nutzung > Partikel" name="Land__Encroachment__Particles"/> <combo_box.item label="Land > Unbefugte Nutzung > 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_script_debug.xml b/indra/newview/skins/default/xui/de/floater_script_debug.xml index 585a6c36ea..585a6c36ea 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_script_debug.xml +++ b/indra/newview/skins/default/xui/de/floater_script_debug.xml diff --git a/indra/newview/skins/default/xui/de/floater_script_debug_panel.xml b/indra/newview/skins/default/xui/de/floater_script_debug_panel.xml index e70a30fa24..e70a30fa24 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_script_debug_panel.xml +++ b/indra/newview/skins/default/xui/de/floater_script_debug_panel.xml diff --git a/indra/newview/skins/default/xui/de/floater_script_limits.xml b/indra/newview/skins/default/xui/de/floater_script_limits.xml index 94a24a97ae..94a24a97ae 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_script_limits.xml +++ b/indra/newview/skins/default/xui/de/floater_script_limits.xml diff --git a/indra/newview/skins/default/xui/de/floater_script_preview.xml b/indra/newview/skins/default/xui/de/floater_script_preview.xml index e0bcd42523..e0bcd42523 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_script_preview.xml +++ b/indra/newview/skins/default/xui/de/floater_script_preview.xml diff --git a/indra/newview/skins/default/xui/de/floater_script_queue.xml b/indra/newview/skins/default/xui/de/floater_script_queue.xml index f267fe4b7c..f267fe4b7c 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_script_queue.xml +++ b/indra/newview/skins/default/xui/de/floater_script_queue.xml diff --git a/indra/newview/skins/default/xui/de/floater_script_search.xml b/indra/newview/skins/default/xui/de/floater_script_search.xml index ffae96f6a1..ffae96f6a1 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_script_search.xml +++ b/indra/newview/skins/default/xui/de/floater_script_search.xml diff --git a/indra/newview/skins/default/xui/de/floater_search.xml b/indra/newview/skins/default/xui/de/floater_search.xml index bd39bf2bce..bd39bf2bce 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_search.xml +++ b/indra/newview/skins/default/xui/de/floater_search.xml diff --git a/indra/newview/skins/default/xui/de/floater_select_key.xml b/indra/newview/skins/default/xui/de/floater_select_key.xml index 8ab9db520a..8ab9db520a 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_select_key.xml +++ b/indra/newview/skins/default/xui/de/floater_select_key.xml diff --git a/indra/newview/skins/default/xui/de/floater_sell_land.xml b/indra/newview/skins/default/xui/de/floater_sell_land.xml index 646138eaad..646138eaad 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_sell_land.xml +++ b/indra/newview/skins/default/xui/de/floater_sell_land.xml diff --git a/indra/newview/skins/default/xui/de/floater_settings_debug.xml b/indra/newview/skins/default/xui/de/floater_settings_debug.xml index 004e54a339..004e54a339 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_settings_debug.xml +++ b/indra/newview/skins/default/xui/de/floater_settings_debug.xml 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..100644 --- 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_sound_devices.xml b/indra/newview/skins/default/xui/de/floater_sound_devices.xml index 22ccb2c1a2..22ccb2c1a2 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_sound_devices.xml +++ b/indra/newview/skins/default/xui/de/floater_sound_devices.xml diff --git a/indra/newview/skins/default/xui/de/floater_sound_preview.xml b/indra/newview/skins/default/xui/de/floater_sound_preview.xml index 1070c93405..1070c93405 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_sound_preview.xml +++ b/indra/newview/skins/default/xui/de/floater_sound_preview.xml diff --git a/indra/newview/skins/default/xui/de/floater_spellcheck.xml b/indra/newview/skins/default/xui/de/floater_spellcheck.xml index 213db277b6..213db277b6 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_spellcheck.xml +++ b/indra/newview/skins/default/xui/de/floater_spellcheck.xml diff --git a/indra/newview/skins/default/xui/de/floater_spellcheck_import.xml b/indra/newview/skins/default/xui/de/floater_spellcheck_import.xml index 374c0fc0d2..374c0fc0d2 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_spellcheck_import.xml +++ b/indra/newview/skins/default/xui/de/floater_spellcheck_import.xml diff --git a/indra/newview/skins/default/xui/de/floater_stats.xml b/indra/newview/skins/default/xui/de/floater_stats.xml index 4e6f56cd94..4e6f56cd94 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_stats.xml +++ b/indra/newview/skins/default/xui/de/floater_stats.xml diff --git a/indra/newview/skins/default/xui/de/floater_sys_well.xml b/indra/newview/skins/default/xui/de/floater_sys_well.xml index ec79b862b4..ec79b862b4 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_sys_well.xml +++ b/indra/newview/skins/default/xui/de/floater_sys_well.xml diff --git a/indra/newview/skins/default/xui/de/floater_telehub.xml b/indra/newview/skins/default/xui/de/floater_telehub.xml index 83d37b2ce4..83d37b2ce4 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_telehub.xml +++ b/indra/newview/skins/default/xui/de/floater_telehub.xml diff --git a/indra/newview/skins/default/xui/de/floater_test_layout_stacks.xml b/indra/newview/skins/default/xui/de/floater_test_layout_stacks.xml index 429447c378..429447c378 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_test_layout_stacks.xml +++ b/indra/newview/skins/default/xui/de/floater_test_layout_stacks.xml diff --git a/indra/newview/skins/default/xui/de/floater_test_text_vertical_aligment.xml b/indra/newview/skins/default/xui/de/floater_test_text_vertical_aligment.xml index 506d2b013a..506d2b013a 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_test_text_vertical_aligment.xml +++ b/indra/newview/skins/default/xui/de/floater_test_text_vertical_aligment.xml diff --git a/indra/newview/skins/default/xui/de/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/de/floater_texture_ctrl.xml index b794d879f0..b794d879f0 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_texture_ctrl.xml +++ b/indra/newview/skins/default/xui/de/floater_texture_ctrl.xml diff --git a/indra/newview/skins/default/xui/de/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/de/floater_texture_fetch_debugger.xml index 97b0364832..97b0364832 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_texture_fetch_debugger.xml +++ b/indra/newview/skins/default/xui/de/floater_texture_fetch_debugger.xml diff --git a/indra/newview/skins/default/xui/de/floater_tools.xml b/indra/newview/skins/default/xui/de/floater_tools.xml index 7dd5938601..7dd5938601 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_tools.xml +++ b/indra/newview/skins/default/xui/de/floater_tools.xml 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..100644 --- 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_tos.xml b/indra/newview/skins/default/xui/de/floater_tos.xml index ba329371f8..ba329371f8 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_tos.xml +++ b/indra/newview/skins/default/xui/de/floater_tos.xml diff --git a/indra/newview/skins/default/xui/de/floater_toybox.xml b/indra/newview/skins/default/xui/de/floater_toybox.xml index 90e50804d6..90e50804d6 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_toybox.xml +++ b/indra/newview/skins/default/xui/de/floater_toybox.xml diff --git a/indra/newview/skins/default/xui/de/floater_translation_settings.xml b/indra/newview/skins/default/xui/de/floater_translation_settings.xml index 3d5d1d46a8..3d5d1d46a8 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_translation_settings.xml +++ b/indra/newview/skins/default/xui/de/floater_translation_settings.xml 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/floater_url_entry.xml b/indra/newview/skins/default/xui/de/floater_url_entry.xml index f5fa449c85..f5fa449c85 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_url_entry.xml +++ b/indra/newview/skins/default/xui/de/floater_url_entry.xml diff --git a/indra/newview/skins/default/xui/de/floater_voice_controls.xml b/indra/newview/skins/default/xui/de/floater_voice_controls.xml index 5efda4136e..5efda4136e 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_voice_controls.xml +++ b/indra/newview/skins/default/xui/de/floater_voice_controls.xml diff --git a/indra/newview/skins/default/xui/de/floater_voice_effect.xml b/indra/newview/skins/default/xui/de/floater_voice_effect.xml index 8d37950480..8d37950480 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_voice_effect.xml +++ b/indra/newview/skins/default/xui/de/floater_voice_effect.xml diff --git a/indra/newview/skins/default/xui/de/floater_web_content.xml b/indra/newview/skins/default/xui/de/floater_web_content.xml index 6ab119eeab..6ab119eeab 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_web_content.xml +++ b/indra/newview/skins/default/xui/de/floater_web_content.xml diff --git a/indra/newview/skins/default/xui/de/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/de/floater_whitelist_entry.xml index 1332509529..1332509529 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_whitelist_entry.xml +++ b/indra/newview/skins/default/xui/de/floater_whitelist_entry.xml diff --git a/indra/newview/skins/default/xui/de/floater_window_size.xml b/indra/newview/skins/default/xui/de/floater_window_size.xml index 6502f002a1..6502f002a1 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_window_size.xml +++ b/indra/newview/skins/default/xui/de/floater_window_size.xml diff --git a/indra/newview/skins/default/xui/de/floater_world_map.xml b/indra/newview/skins/default/xui/de/floater_world_map.xml index befa46651a..befa46651a 100755..100644 --- a/indra/newview/skins/default/xui/de/floater_world_map.xml +++ b/indra/newview/skins/default/xui/de/floater_world_map.xml diff --git a/indra/newview/skins/default/xui/de/inspect_avatar.xml b/indra/newview/skins/default/xui/de/inspect_avatar.xml index 4b8fd8a0ad..4b8fd8a0ad 100755..100644 --- a/indra/newview/skins/default/xui/de/inspect_avatar.xml +++ b/indra/newview/skins/default/xui/de/inspect_avatar.xml diff --git a/indra/newview/skins/default/xui/de/inspect_group.xml b/indra/newview/skins/default/xui/de/inspect_group.xml index 60fa8ff0d8..60fa8ff0d8 100755..100644 --- a/indra/newview/skins/default/xui/de/inspect_group.xml +++ b/indra/newview/skins/default/xui/de/inspect_group.xml diff --git a/indra/newview/skins/default/xui/de/inspect_object.xml b/indra/newview/skins/default/xui/de/inspect_object.xml index 72b8235828..72b8235828 100755..100644 --- a/indra/newview/skins/default/xui/de/inspect_object.xml +++ b/indra/newview/skins/default/xui/de/inspect_object.xml diff --git a/indra/newview/skins/default/xui/de/inspect_remote_object.xml b/indra/newview/skins/default/xui/de/inspect_remote_object.xml index 9fe05455eb..9fe05455eb 100755..100644 --- a/indra/newview/skins/default/xui/de/inspect_remote_object.xml +++ b/indra/newview/skins/default/xui/de/inspect_remote_object.xml diff --git a/indra/newview/skins/default/xui/de/language_settings.xml b/indra/newview/skins/default/xui/de/language_settings.xml index f9346eef7d..f9346eef7d 100755..100644 --- a/indra/newview/skins/default/xui/de/language_settings.xml +++ b/indra/newview/skins/default/xui/de/language_settings.xml diff --git a/indra/newview/skins/default/xui/de/menu_add_wearable_gear.xml b/indra/newview/skins/default/xui/de/menu_add_wearable_gear.xml index f3775a05ec..f3775a05ec 100755..100644 --- a/indra/newview/skins/default/xui/de/menu_add_wearable_gear.xml +++ b/indra/newview/skins/default/xui/de/menu_add_wearable_gear.xml diff --git a/indra/newview/skins/default/xui/de/menu_attachment_other.xml b/indra/newview/skins/default/xui/de/menu_attachment_other.xml index 4c125c8b5d..4c125c8b5d 100755..100644 --- a/indra/newview/skins/default/xui/de/menu_attachment_other.xml +++ b/indra/newview/skins/default/xui/de/menu_attachment_other.xml 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..100644 --- 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_icon.xml b/indra/newview/skins/default/xui/de/menu_avatar_icon.xml index ad47f1d37d..ad47f1d37d 100755..100644 --- a/indra/newview/skins/default/xui/de/menu_avatar_icon.xml +++ b/indra/newview/skins/default/xui/de/menu_avatar_icon.xml diff --git a/indra/newview/skins/default/xui/de/menu_avatar_other.xml b/indra/newview/skins/default/xui/de/menu_avatar_other.xml index 65dc054ed5..65dc054ed5 100755..100644 --- a/indra/newview/skins/default/xui/de/menu_avatar_other.xml +++ b/indra/newview/skins/default/xui/de/menu_avatar_other.xml 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..100644 --- 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_cof_attachment.xml b/indra/newview/skins/default/xui/de/menu_cof_attachment.xml index 05d3dfca9d..05d3dfca9d 100755..100644 --- a/indra/newview/skins/default/xui/de/menu_cof_attachment.xml +++ b/indra/newview/skins/default/xui/de/menu_cof_attachment.xml diff --git a/indra/newview/skins/default/xui/de/menu_cof_body_part.xml b/indra/newview/skins/default/xui/de/menu_cof_body_part.xml index 07960a525c..07960a525c 100755..100644 --- a/indra/newview/skins/default/xui/de/menu_cof_body_part.xml +++ b/indra/newview/skins/default/xui/de/menu_cof_body_part.xml diff --git a/indra/newview/skins/default/xui/de/menu_cof_clothing.xml b/indra/newview/skins/default/xui/de/menu_cof_clothing.xml index 7fced273a7..7fced273a7 100755..100644 --- a/indra/newview/skins/default/xui/de/menu_cof_clothing.xml +++ b/indra/newview/skins/default/xui/de/menu_cof_clothing.xml diff --git a/indra/newview/skins/default/xui/de/menu_cof_gear.xml b/indra/newview/skins/default/xui/de/menu_cof_gear.xml index 2dd871b2ea..2dd871b2ea 100755..100644 --- a/indra/newview/skins/default/xui/de/menu_cof_gear.xml +++ b/indra/newview/skins/default/xui/de/menu_cof_gear.xml diff --git a/indra/newview/skins/default/xui/de/menu_edit.xml b/indra/newview/skins/default/xui/de/menu_edit.xml index 37f68d68d5..37f68d68d5 100755..100644 --- a/indra/newview/skins/default/xui/de/menu_edit.xml +++ b/indra/newview/skins/default/xui/de/menu_edit.xml diff --git a/indra/newview/skins/default/xui/de/menu_favorites.xml b/indra/newview/skins/default/xui/de/menu_favorites.xml index 0d0491d2eb..0d0491d2eb 100755..100644 --- a/indra/newview/skins/default/xui/de/menu_favorites.xml +++ b/indra/newview/skins/default/xui/de/menu_favorites.xml diff --git a/indra/newview/skins/default/xui/de/menu_gesture_gear.xml b/indra/newview/skins/default/xui/de/menu_gesture_gear.xml index 953c0eeed5..953c0eeed5 100755..100644 --- a/indra/newview/skins/default/xui/de/menu_gesture_gear.xml +++ b/indra/newview/skins/default/xui/de/menu_gesture_gear.xml diff --git a/indra/newview/skins/default/xui/de/menu_group_plus.xml b/indra/newview/skins/default/xui/de/menu_group_plus.xml index 583ee793be..583ee793be 100755..100644 --- a/indra/newview/skins/default/xui/de/menu_group_plus.xml +++ b/indra/newview/skins/default/xui/de/menu_group_plus.xml diff --git a/indra/newview/skins/default/xui/de/menu_hide_navbar.xml b/indra/newview/skins/default/xui/de/menu_hide_navbar.xml index 33d55e85bd..33d55e85bd 100755..100644 --- a/indra/newview/skins/default/xui/de/menu_hide_navbar.xml +++ b/indra/newview/skins/default/xui/de/menu_hide_navbar.xml diff --git a/indra/newview/skins/default/xui/de/menu_imchiclet_adhoc.xml b/indra/newview/skins/default/xui/de/menu_imchiclet_adhoc.xml index 11f93f47b4..11f93f47b4 100755..100644 --- a/indra/newview/skins/default/xui/de/menu_imchiclet_adhoc.xml +++ b/indra/newview/skins/default/xui/de/menu_imchiclet_adhoc.xml diff --git a/indra/newview/skins/default/xui/de/menu_imchiclet_group.xml b/indra/newview/skins/default/xui/de/menu_imchiclet_group.xml index 81ef3b6569..81ef3b6569 100755..100644 --- a/indra/newview/skins/default/xui/de/menu_imchiclet_group.xml +++ b/indra/newview/skins/default/xui/de/menu_imchiclet_group.xml diff --git a/indra/newview/skins/default/xui/de/menu_imchiclet_p2p.xml b/indra/newview/skins/default/xui/de/menu_imchiclet_p2p.xml index d123238246..d123238246 100755..100644 --- a/indra/newview/skins/default/xui/de/menu_imchiclet_p2p.xml +++ b/indra/newview/skins/default/xui/de/menu_imchiclet_p2p.xml diff --git a/indra/newview/skins/default/xui/de/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/de/menu_inspect_avatar_gear.xml index 641a0ceebe..641a0ceebe 100755..100644 --- a/indra/newview/skins/default/xui/de/menu_inspect_avatar_gear.xml +++ b/indra/newview/skins/default/xui/de/menu_inspect_avatar_gear.xml diff --git a/indra/newview/skins/default/xui/de/menu_inspect_object_gear.xml b/indra/newview/skins/default/xui/de/menu_inspect_object_gear.xml index 73e0029b76..73e0029b76 100755..100644 --- a/indra/newview/skins/default/xui/de/menu_inspect_object_gear.xml +++ b/indra/newview/skins/default/xui/de/menu_inspect_object_gear.xml diff --git a/indra/newview/skins/default/xui/de/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/de/menu_inspect_self_gear.xml index 5979194bfb..5979194bfb 100755..100644 --- a/indra/newview/skins/default/xui/de/menu_inspect_self_gear.xml +++ b/indra/newview/skins/default/xui/de/menu_inspect_self_gear.xml diff --git a/indra/newview/skins/default/xui/de/menu_inv_offer_chiclet.xml b/indra/newview/skins/default/xui/de/menu_inv_offer_chiclet.xml index 71cff7136b..71cff7136b 100755..100644 --- a/indra/newview/skins/default/xui/de/menu_inv_offer_chiclet.xml +++ b/indra/newview/skins/default/xui/de/menu_inv_offer_chiclet.xml 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..100644 --- 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_add.xml b/indra/newview/skins/default/xui/de/menu_inventory_add.xml index af70c08ba1..af70c08ba1 100755..100644 --- a/indra/newview/skins/default/xui/de/menu_inventory_add.xml +++ b/indra/newview/skins/default/xui/de/menu_inventory_add.xml 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..100644 --- 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_land.xml b/indra/newview/skins/default/xui/de/menu_land.xml index 0bbf8c666e..0bbf8c666e 100755..100644 --- a/indra/newview/skins/default/xui/de/menu_land.xml +++ b/indra/newview/skins/default/xui/de/menu_land.xml diff --git a/indra/newview/skins/default/xui/de/menu_landmark.xml b/indra/newview/skins/default/xui/de/menu_landmark.xml index 2aff0eec95..2aff0eec95 100755..100644 --- a/indra/newview/skins/default/xui/de/menu_landmark.xml +++ b/indra/newview/skins/default/xui/de/menu_landmark.xml diff --git a/indra/newview/skins/default/xui/de/menu_login.xml b/indra/newview/skins/default/xui/de/menu_login.xml index 329ea20179..329ea20179 100755..100644 --- a/indra/newview/skins/default/xui/de/menu_login.xml +++ b/indra/newview/skins/default/xui/de/menu_login.xml 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_media_ctrl.xml b/indra/newview/skins/default/xui/de/menu_media_ctrl.xml index 59c1c2ee86..59c1c2ee86 100755..100644 --- a/indra/newview/skins/default/xui/de/menu_media_ctrl.xml +++ b/indra/newview/skins/default/xui/de/menu_media_ctrl.xml diff --git a/indra/newview/skins/default/xui/de/menu_mini_map.xml b/indra/newview/skins/default/xui/de/menu_mini_map.xml index 2e0d72c40c..2e0d72c40c 100755..100644 --- a/indra/newview/skins/default/xui/de/menu_mini_map.xml +++ b/indra/newview/skins/default/xui/de/menu_mini_map.xml diff --git a/indra/newview/skins/default/xui/de/menu_model_import_gear_default.xml b/indra/newview/skins/default/xui/de/menu_model_import_gear_default.xml index e1faeedcde..e1faeedcde 100755..100644 --- a/indra/newview/skins/default/xui/de/menu_model_import_gear_default.xml +++ b/indra/newview/skins/default/xui/de/menu_model_import_gear_default.xml diff --git a/indra/newview/skins/default/xui/de/menu_navbar.xml b/indra/newview/skins/default/xui/de/menu_navbar.xml index 5175f34b41..5175f34b41 100755..100644 --- a/indra/newview/skins/default/xui/de/menu_navbar.xml +++ b/indra/newview/skins/default/xui/de/menu_navbar.xml diff --git a/indra/newview/skins/default/xui/de/menu_nearby_chat.xml b/indra/newview/skins/default/xui/de/menu_nearby_chat.xml index 99d6428c3f..99d6428c3f 100755..100644 --- a/indra/newview/skins/default/xui/de/menu_nearby_chat.xml +++ b/indra/newview/skins/default/xui/de/menu_nearby_chat.xml diff --git a/indra/newview/skins/default/xui/de/menu_notification_well_button.xml b/indra/newview/skins/default/xui/de/menu_notification_well_button.xml index 0f2784f160..0f2784f160 100755..100644 --- a/indra/newview/skins/default/xui/de/menu_notification_well_button.xml +++ b/indra/newview/skins/default/xui/de/menu_notification_well_button.xml diff --git a/indra/newview/skins/default/xui/de/menu_object.xml b/indra/newview/skins/default/xui/de/menu_object.xml index dbf78f406b..dbf78f406b 100755..100644 --- a/indra/newview/skins/default/xui/de/menu_object.xml +++ b/indra/newview/skins/default/xui/de/menu_object.xml diff --git a/indra/newview/skins/default/xui/de/menu_object_icon.xml b/indra/newview/skins/default/xui/de/menu_object_icon.xml index f92fa0f82b..f92fa0f82b 100755..100644 --- a/indra/newview/skins/default/xui/de/menu_object_icon.xml +++ b/indra/newview/skins/default/xui/de/menu_object_icon.xml diff --git a/indra/newview/skins/default/xui/de/menu_outfit_gear.xml b/indra/newview/skins/default/xui/de/menu_outfit_gear.xml index 0cf3c09882..0cf3c09882 100755..100644 --- a/indra/newview/skins/default/xui/de/menu_outfit_gear.xml +++ b/indra/newview/skins/default/xui/de/menu_outfit_gear.xml diff --git a/indra/newview/skins/default/xui/de/menu_outfit_tab.xml b/indra/newview/skins/default/xui/de/menu_outfit_tab.xml index 32a65c96fc..32a65c96fc 100755..100644 --- a/indra/newview/skins/default/xui/de/menu_outfit_tab.xml +++ b/indra/newview/skins/default/xui/de/menu_outfit_tab.xml diff --git a/indra/newview/skins/default/xui/de/menu_participant_list.xml b/indra/newview/skins/default/xui/de/menu_participant_list.xml index 160f2f97be..160f2f97be 100755..100644 --- a/indra/newview/skins/default/xui/de/menu_participant_list.xml +++ b/indra/newview/skins/default/xui/de/menu_participant_list.xml diff --git a/indra/newview/skins/default/xui/de/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/de/menu_people_friends_view_sort.xml index 84d9d8938c..84d9d8938c 100755..100644 --- a/indra/newview/skins/default/xui/de/menu_people_friends_view_sort.xml +++ b/indra/newview/skins/default/xui/de/menu_people_friends_view_sort.xml diff --git a/indra/newview/skins/default/xui/de/menu_people_groups.xml b/indra/newview/skins/default/xui/de/menu_people_groups.xml index a69c82d3d8..a69c82d3d8 100755..100644 --- a/indra/newview/skins/default/xui/de/menu_people_groups.xml +++ b/indra/newview/skins/default/xui/de/menu_people_groups.xml diff --git a/indra/newview/skins/default/xui/de/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/de/menu_people_groups_view_sort.xml index b68597d8aa..b68597d8aa 100755..100644 --- a/indra/newview/skins/default/xui/de/menu_people_groups_view_sort.xml +++ b/indra/newview/skins/default/xui/de/menu_people_groups_view_sort.xml diff --git a/indra/newview/skins/default/xui/de/menu_people_nearby.xml b/indra/newview/skins/default/xui/de/menu_people_nearby.xml index cdbb3ae917..cdbb3ae917 100755..100644 --- a/indra/newview/skins/default/xui/de/menu_people_nearby.xml +++ b/indra/newview/skins/default/xui/de/menu_people_nearby.xml diff --git a/indra/newview/skins/default/xui/de/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/de/menu_people_nearby_multiselect.xml index ba6578e2d1..ba6578e2d1 100755..100644 --- a/indra/newview/skins/default/xui/de/menu_people_nearby_multiselect.xml +++ b/indra/newview/skins/default/xui/de/menu_people_nearby_multiselect.xml diff --git a/indra/newview/skins/default/xui/de/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/de/menu_people_nearby_view_sort.xml index a001544f3e..a001544f3e 100755..100644 --- a/indra/newview/skins/default/xui/de/menu_people_nearby_view_sort.xml +++ b/indra/newview/skins/default/xui/de/menu_people_nearby_view_sort.xml diff --git a/indra/newview/skins/default/xui/de/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/de/menu_people_recent_view_sort.xml index 1ef020f5e1..1ef020f5e1 100755..100644 --- a/indra/newview/skins/default/xui/de/menu_people_recent_view_sort.xml +++ b/indra/newview/skins/default/xui/de/menu_people_recent_view_sort.xml diff --git a/indra/newview/skins/default/xui/de/menu_picks.xml b/indra/newview/skins/default/xui/de/menu_picks.xml index 9aec4c83b0..9aec4c83b0 100755..100644 --- a/indra/newview/skins/default/xui/de/menu_picks.xml +++ b/indra/newview/skins/default/xui/de/menu_picks.xml diff --git a/indra/newview/skins/default/xui/de/menu_picks_plus.xml b/indra/newview/skins/default/xui/de/menu_picks_plus.xml index 385ff25b95..385ff25b95 100755..100644 --- a/indra/newview/skins/default/xui/de/menu_picks_plus.xml +++ b/indra/newview/skins/default/xui/de/menu_picks_plus.xml diff --git a/indra/newview/skins/default/xui/de/menu_place.xml b/indra/newview/skins/default/xui/de/menu_place.xml index d9c85f5b92..d9c85f5b92 100755..100644 --- a/indra/newview/skins/default/xui/de/menu_place.xml +++ b/indra/newview/skins/default/xui/de/menu_place.xml diff --git a/indra/newview/skins/default/xui/de/menu_place_add_button.xml b/indra/newview/skins/default/xui/de/menu_place_add_button.xml index 7c0ff4a46a..7c0ff4a46a 100755..100644 --- a/indra/newview/skins/default/xui/de/menu_place_add_button.xml +++ b/indra/newview/skins/default/xui/de/menu_place_add_button.xml diff --git a/indra/newview/skins/default/xui/de/menu_places_gear_folder.xml b/indra/newview/skins/default/xui/de/menu_places_gear_folder.xml index 892f075d3c..892f075d3c 100755..100644 --- a/indra/newview/skins/default/xui/de/menu_places_gear_folder.xml +++ b/indra/newview/skins/default/xui/de/menu_places_gear_folder.xml diff --git a/indra/newview/skins/default/xui/de/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/de/menu_places_gear_landmark.xml index 8955f797a2..8955f797a2 100755..100644 --- a/indra/newview/skins/default/xui/de/menu_places_gear_landmark.xml +++ b/indra/newview/skins/default/xui/de/menu_places_gear_landmark.xml diff --git a/indra/newview/skins/default/xui/de/menu_profile_overflow.xml b/indra/newview/skins/default/xui/de/menu_profile_overflow.xml index 9f3fcbca1d..9f3fcbca1d 100755..100644 --- a/indra/newview/skins/default/xui/de/menu_profile_overflow.xml +++ b/indra/newview/skins/default/xui/de/menu_profile_overflow.xml diff --git a/indra/newview/skins/default/xui/de/menu_save_outfit.xml b/indra/newview/skins/default/xui/de/menu_save_outfit.xml index 986c78b318..986c78b318 100755..100644 --- a/indra/newview/skins/default/xui/de/menu_save_outfit.xml +++ b/indra/newview/skins/default/xui/de/menu_save_outfit.xml diff --git a/indra/newview/skins/default/xui/de/menu_script_chiclet.xml b/indra/newview/skins/default/xui/de/menu_script_chiclet.xml index 3256aa1a87..3256aa1a87 100755..100644 --- a/indra/newview/skins/default/xui/de/menu_script_chiclet.xml +++ b/indra/newview/skins/default/xui/de/menu_script_chiclet.xml diff --git a/indra/newview/skins/default/xui/de/menu_slurl.xml b/indra/newview/skins/default/xui/de/menu_slurl.xml index b2ec017f9f..b2ec017f9f 100755..100644 --- a/indra/newview/skins/default/xui/de/menu_slurl.xml +++ b/indra/newview/skins/default/xui/de/menu_slurl.xml diff --git a/indra/newview/skins/default/xui/de/menu_teleport_history_gear.xml b/indra/newview/skins/default/xui/de/menu_teleport_history_gear.xml index 68b8e21802..68b8e21802 100755..100644 --- a/indra/newview/skins/default/xui/de/menu_teleport_history_gear.xml +++ b/indra/newview/skins/default/xui/de/menu_teleport_history_gear.xml diff --git a/indra/newview/skins/default/xui/de/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/de/menu_teleport_history_item.xml index 1d7e3059c0..1d7e3059c0 100755..100644 --- a/indra/newview/skins/default/xui/de/menu_teleport_history_item.xml +++ b/indra/newview/skins/default/xui/de/menu_teleport_history_item.xml diff --git a/indra/newview/skins/default/xui/de/menu_teleport_history_tab.xml b/indra/newview/skins/default/xui/de/menu_teleport_history_tab.xml index 194dd16fd1..194dd16fd1 100755..100644 --- a/indra/newview/skins/default/xui/de/menu_teleport_history_tab.xml +++ b/indra/newview/skins/default/xui/de/menu_teleport_history_tab.xml diff --git a/indra/newview/skins/default/xui/de/menu_text_editor.xml b/indra/newview/skins/default/xui/de/menu_text_editor.xml index 2e33ed3416..2e33ed3416 100755..100644 --- a/indra/newview/skins/default/xui/de/menu_text_editor.xml +++ b/indra/newview/skins/default/xui/de/menu_text_editor.xml diff --git a/indra/newview/skins/default/xui/de/menu_toolbars.xml b/indra/newview/skins/default/xui/de/menu_toolbars.xml index 3fb48e26b2..3fb48e26b2 100755..100644 --- a/indra/newview/skins/default/xui/de/menu_toolbars.xml +++ b/indra/newview/skins/default/xui/de/menu_toolbars.xml diff --git a/indra/newview/skins/default/xui/de/menu_topinfobar.xml b/indra/newview/skins/default/xui/de/menu_topinfobar.xml index 5b0a724244..5b0a724244 100755..100644 --- a/indra/newview/skins/default/xui/de/menu_topinfobar.xml +++ b/indra/newview/skins/default/xui/de/menu_topinfobar.xml diff --git a/indra/newview/skins/default/xui/de/menu_url_agent.xml b/indra/newview/skins/default/xui/de/menu_url_agent.xml index ddb072ba8f..ddb072ba8f 100755..100644 --- a/indra/newview/skins/default/xui/de/menu_url_agent.xml +++ b/indra/newview/skins/default/xui/de/menu_url_agent.xml 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_url_group.xml b/indra/newview/skins/default/xui/de/menu_url_group.xml index 6bd86414bc..6bd86414bc 100755..100644 --- a/indra/newview/skins/default/xui/de/menu_url_group.xml +++ b/indra/newview/skins/default/xui/de/menu_url_group.xml diff --git a/indra/newview/skins/default/xui/de/menu_url_http.xml b/indra/newview/skins/default/xui/de/menu_url_http.xml index 30eb1668a5..30eb1668a5 100755..100644 --- a/indra/newview/skins/default/xui/de/menu_url_http.xml +++ b/indra/newview/skins/default/xui/de/menu_url_http.xml diff --git a/indra/newview/skins/default/xui/de/menu_url_inventory.xml b/indra/newview/skins/default/xui/de/menu_url_inventory.xml index dc069df02b..dc069df02b 100755..100644 --- a/indra/newview/skins/default/xui/de/menu_url_inventory.xml +++ b/indra/newview/skins/default/xui/de/menu_url_inventory.xml diff --git a/indra/newview/skins/default/xui/de/menu_url_map.xml b/indra/newview/skins/default/xui/de/menu_url_map.xml index 2f6ffcd450..2f6ffcd450 100755..100644 --- a/indra/newview/skins/default/xui/de/menu_url_map.xml +++ b/indra/newview/skins/default/xui/de/menu_url_map.xml diff --git a/indra/newview/skins/default/xui/de/menu_url_objectim.xml b/indra/newview/skins/default/xui/de/menu_url_objectim.xml index fc01ea8444..fc01ea8444 100755..100644 --- a/indra/newview/skins/default/xui/de/menu_url_objectim.xml +++ b/indra/newview/skins/default/xui/de/menu_url_objectim.xml diff --git a/indra/newview/skins/default/xui/de/menu_url_parcel.xml b/indra/newview/skins/default/xui/de/menu_url_parcel.xml index 9169bca24f..9169bca24f 100755..100644 --- a/indra/newview/skins/default/xui/de/menu_url_parcel.xml +++ b/indra/newview/skins/default/xui/de/menu_url_parcel.xml diff --git a/indra/newview/skins/default/xui/de/menu_url_slapp.xml b/indra/newview/skins/default/xui/de/menu_url_slapp.xml index 72e916b902..72e916b902 100755..100644 --- a/indra/newview/skins/default/xui/de/menu_url_slapp.xml +++ b/indra/newview/skins/default/xui/de/menu_url_slapp.xml diff --git a/indra/newview/skins/default/xui/de/menu_url_slurl.xml b/indra/newview/skins/default/xui/de/menu_url_slurl.xml index 5d48230ebf..5d48230ebf 100755..100644 --- a/indra/newview/skins/default/xui/de/menu_url_slurl.xml +++ b/indra/newview/skins/default/xui/de/menu_url_slurl.xml diff --git a/indra/newview/skins/default/xui/de/menu_url_teleport.xml b/indra/newview/skins/default/xui/de/menu_url_teleport.xml index 4cc1ecc70e..4cc1ecc70e 100755..100644 --- a/indra/newview/skins/default/xui/de/menu_url_teleport.xml +++ b/indra/newview/skins/default/xui/de/menu_url_teleport.xml diff --git a/indra/newview/skins/default/xui/de/menu_viewer.xml b/indra/newview/skins/default/xui/de/menu_viewer.xml index 50a6dafa91..956530c990 100755..100644 --- a/indra/newview/skins/default/xui/de/menu_viewer.xml +++ b/indra/newview/skins/default/xui/de/menu_viewer.xml @@ -8,13 +8,14 @@ <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"/> <menu_item_check label="Fliegen" name="Fly"/> <menu_item_check label="Immer rennen" name="Always Run"/> <menu_item_call label="Animation meines Avatars stoppen" name="Stop Animating My Avatar"/> - <menu_item_call label="Gehen/Rennen/Fliegen..." name="Walk / run / fly"/> + <menu_item_call label="Gehen/Rennen/Fliegen..." name="WalkRunFly"/> </menu> <menu label="Status" name="Status"> <menu_item_check label="Abwesend" name="Away"/> @@ -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"> @@ -62,7 +64,7 @@ <menu_item_call label="Foto" name="Take Snapshot"/> <menu_item_call label="Ortsprofil" name="Place Profile"/> <menu_item_call label="Landinformationen" name="About Land"/> - <menu_item_call label="Region/Grundbesitz" name="Region/Estate"/> + <menu_item_call label="Region/Grundbesitz" name="RegionEstate"/> <menu_item_call label="Mein Landbesitz..." name="My Land"/> <menu_item_call label="Dieses Land kaufen" name="Buy Land"/> <menu label="Anzeigen" name="LandShow"> @@ -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/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/de/menu_wearable_list_item.xml index 283e454a06..283e454a06 100755..100644 --- a/indra/newview/skins/default/xui/de/menu_wearable_list_item.xml +++ b/indra/newview/skins/default/xui/de/menu_wearable_list_item.xml diff --git a/indra/newview/skins/default/xui/de/menu_wearing_gear.xml b/indra/newview/skins/default/xui/de/menu_wearing_gear.xml index dacf898b6a..dacf898b6a 100755..100644 --- a/indra/newview/skins/default/xui/de/menu_wearing_gear.xml +++ b/indra/newview/skins/default/xui/de/menu_wearing_gear.xml diff --git a/indra/newview/skins/default/xui/de/menu_wearing_tab.xml b/indra/newview/skins/default/xui/de/menu_wearing_tab.xml index 695451a105..695451a105 100755..100644 --- a/indra/newview/skins/default/xui/de/menu_wearing_tab.xml +++ b/indra/newview/skins/default/xui/de/menu_wearing_tab.xml 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..100644 --- 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..100644 --- 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..100644 --- 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..fa7db0a8a3 100755..100644 --- 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 '[_NAME]' 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 > 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“ > „Einstellungen“ > „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“ > „Einstellungen“ > „Allgemein“). <usetemplate name="okbutton" yestext="OK"/> @@ -2136,6 +2260,10 @@ Inventarobjekt(e) verschieben? <ignore name="ignore" text="Ich habe die Aktion „Objekt bezahlen" 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“ > „Debug-Einstellungen anzeigen“ > „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. @@ -2671,9 +2802,6 @@ Versuchen Sie es in einigen Minuten erneut. <notification name="NoValidCircuit"> Kein gültiger Verbindungscode. </notification> - <notification name="NoValidTimestamp"> - Kein gültiger Zeitstempel. - </notification> <notification name="NoPendingConnection"> Verbindung kann nicht hergestellt werden. </notification> @@ -2828,7 +2956,7 @@ Wenn Sie in dieser Region bleiben, werden Sie abgemeldet. [MESSAGE] -Von Objekt: <nolink>[OBJECTNAME]</nolink>, Eigentümer: [NAME]? +Von Objekt: <nolink>[OBJECTNAME]</nolink>, Eigentümer: [NAME] <form name="form"> <button name="Gotopage" text="Zur Seite"/> <button name="Cancel" text="Abbrechen"/> @@ -2854,6 +2982,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"> + „<nolink>[OBJECTNAME]</nolink>“, 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 „<nolink>[OBJECTNAME]</nolink>“ 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 +3368,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 +3945,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 +4281,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/outfit_accordion_tab.xml b/indra/newview/skins/default/xui/de/outfit_accordion_tab.xml index bac885e5d8..bac885e5d8 100755..100644 --- a/indra/newview/skins/default/xui/de/outfit_accordion_tab.xml +++ b/indra/newview/skins/default/xui/de/outfit_accordion_tab.xml diff --git a/indra/newview/skins/default/xui/de/panel_active_object_row.xml b/indra/newview/skins/default/xui/de/panel_active_object_row.xml index 00de705a30..00de705a30 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_active_object_row.xml +++ b/indra/newview/skins/default/xui/de/panel_active_object_row.xml diff --git a/indra/newview/skins/default/xui/de/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/de/panel_adhoc_control_panel.xml index 6ad18781f5..6ad18781f5 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_adhoc_control_panel.xml +++ b/indra/newview/skins/default/xui/de/panel_adhoc_control_panel.xml diff --git a/indra/newview/skins/default/xui/de/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/de/panel_avatar_list_item.xml index 79a2ebe9df..79a2ebe9df 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_avatar_list_item.xml +++ b/indra/newview/skins/default/xui/de/panel_avatar_list_item.xml diff --git a/indra/newview/skins/default/xui/de/panel_avatar_tag.xml b/indra/newview/skins/default/xui/de/panel_avatar_tag.xml index 09f930ec01..09f930ec01 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_avatar_tag.xml +++ b/indra/newview/skins/default/xui/de/panel_avatar_tag.xml diff --git a/indra/newview/skins/default/xui/de/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/de/panel_block_list_sidetray.xml index c105a5b8a3..c105a5b8a3 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_block_list_sidetray.xml +++ b/indra/newview/skins/default/xui/de/panel_block_list_sidetray.xml diff --git a/indra/newview/skins/default/xui/de/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/de/panel_body_parts_list_item.xml index 799586f021..799586f021 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_body_parts_list_item.xml +++ b/indra/newview/skins/default/xui/de/panel_body_parts_list_item.xml diff --git a/indra/newview/skins/default/xui/de/panel_bodyparts_list_button_bar.xml b/indra/newview/skins/default/xui/de/panel_bodyparts_list_button_bar.xml index 4d7e65405a..4d7e65405a 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_bodyparts_list_button_bar.xml +++ b/indra/newview/skins/default/xui/de/panel_bodyparts_list_button_bar.xml diff --git a/indra/newview/skins/default/xui/de/panel_bottomtray_lite.xml b/indra/newview/skins/default/xui/de/panel_bottomtray_lite.xml index 9c84105254..9c84105254 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_bottomtray_lite.xml +++ b/indra/newview/skins/default/xui/de/panel_bottomtray_lite.xml diff --git a/indra/newview/skins/default/xui/de/panel_chat_header.xml b/indra/newview/skins/default/xui/de/panel_chat_header.xml index 7916bf5155..7916bf5155 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_chat_header.xml +++ b/indra/newview/skins/default/xui/de/panel_chat_header.xml diff --git a/indra/newview/skins/default/xui/de/panel_chiclet_bar.xml b/indra/newview/skins/default/xui/de/panel_chiclet_bar.xml index bcc6772bb9..bcc6772bb9 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_chiclet_bar.xml +++ b/indra/newview/skins/default/xui/de/panel_chiclet_bar.xml diff --git a/indra/newview/skins/default/xui/de/panel_classified_info.xml b/indra/newview/skins/default/xui/de/panel_classified_info.xml index 007e9d69f0..007e9d69f0 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_classified_info.xml +++ b/indra/newview/skins/default/xui/de/panel_classified_info.xml diff --git a/indra/newview/skins/default/xui/de/panel_clothing_list_button_bar.xml b/indra/newview/skins/default/xui/de/panel_clothing_list_button_bar.xml index fc45c9ce79..fc45c9ce79 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_clothing_list_button_bar.xml +++ b/indra/newview/skins/default/xui/de/panel_clothing_list_button_bar.xml diff --git a/indra/newview/skins/default/xui/de/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/de/panel_clothing_list_item.xml index 945acb02d7..945acb02d7 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_clothing_list_item.xml +++ b/indra/newview/skins/default/xui/de/panel_clothing_list_item.xml diff --git a/indra/newview/skins/default/xui/de/panel_cof_wearables.xml b/indra/newview/skins/default/xui/de/panel_cof_wearables.xml index 12294a43ce..12294a43ce 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_cof_wearables.xml +++ b/indra/newview/skins/default/xui/de/panel_cof_wearables.xml diff --git a/indra/newview/skins/default/xui/de/panel_deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/de/panel_deletable_wearable_list_item.xml index a27252e23e..a27252e23e 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_deletable_wearable_list_item.xml +++ b/indra/newview/skins/default/xui/de/panel_deletable_wearable_list_item.xml diff --git a/indra/newview/skins/default/xui/de/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/de/panel_dummy_clothing_list_item.xml index b7ad1bdc1b..b7ad1bdc1b 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_dummy_clothing_list_item.xml +++ b/indra/newview/skins/default/xui/de/panel_dummy_clothing_list_item.xml diff --git a/indra/newview/skins/default/xui/de/panel_edit_alpha.xml b/indra/newview/skins/default/xui/de/panel_edit_alpha.xml index 4c6facf5e3..4c6facf5e3 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_edit_alpha.xml +++ b/indra/newview/skins/default/xui/de/panel_edit_alpha.xml diff --git a/indra/newview/skins/default/xui/de/panel_edit_classified.xml b/indra/newview/skins/default/xui/de/panel_edit_classified.xml index bd270697ea..bd270697ea 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_edit_classified.xml +++ b/indra/newview/skins/default/xui/de/panel_edit_classified.xml diff --git a/indra/newview/skins/default/xui/de/panel_edit_eyes.xml b/indra/newview/skins/default/xui/de/panel_edit_eyes.xml index 69bcf2fb71..69bcf2fb71 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_edit_eyes.xml +++ b/indra/newview/skins/default/xui/de/panel_edit_eyes.xml diff --git a/indra/newview/skins/default/xui/de/panel_edit_gloves.xml b/indra/newview/skins/default/xui/de/panel_edit_gloves.xml index fb7d18f66c..fb7d18f66c 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_edit_gloves.xml +++ b/indra/newview/skins/default/xui/de/panel_edit_gloves.xml diff --git a/indra/newview/skins/default/xui/de/panel_edit_hair.xml b/indra/newview/skins/default/xui/de/panel_edit_hair.xml index d6efde8306..d6efde8306 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_edit_hair.xml +++ b/indra/newview/skins/default/xui/de/panel_edit_hair.xml diff --git a/indra/newview/skins/default/xui/de/panel_edit_jacket.xml b/indra/newview/skins/default/xui/de/panel_edit_jacket.xml index 1b7c1d79a5..1b7c1d79a5 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_edit_jacket.xml +++ b/indra/newview/skins/default/xui/de/panel_edit_jacket.xml diff --git a/indra/newview/skins/default/xui/de/panel_edit_pants.xml b/indra/newview/skins/default/xui/de/panel_edit_pants.xml index 533cf20412..533cf20412 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_edit_pants.xml +++ b/indra/newview/skins/default/xui/de/panel_edit_pants.xml diff --git a/indra/newview/skins/default/xui/de/panel_edit_physics.xml b/indra/newview/skins/default/xui/de/panel_edit_physics.xml index bd9c84577a..bd9c84577a 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_edit_physics.xml +++ b/indra/newview/skins/default/xui/de/panel_edit_physics.xml diff --git a/indra/newview/skins/default/xui/de/panel_edit_pick.xml b/indra/newview/skins/default/xui/de/panel_edit_pick.xml index aafffc7ae3..aafffc7ae3 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_edit_pick.xml +++ b/indra/newview/skins/default/xui/de/panel_edit_pick.xml diff --git a/indra/newview/skins/default/xui/de/panel_edit_profile.xml b/indra/newview/skins/default/xui/de/panel_edit_profile.xml index 03974e7f7f..03974e7f7f 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_edit_profile.xml +++ b/indra/newview/skins/default/xui/de/panel_edit_profile.xml diff --git a/indra/newview/skins/default/xui/de/panel_edit_shape.xml b/indra/newview/skins/default/xui/de/panel_edit_shape.xml index 80d3b29cad..80d3b29cad 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_edit_shape.xml +++ b/indra/newview/skins/default/xui/de/panel_edit_shape.xml diff --git a/indra/newview/skins/default/xui/de/panel_edit_shirt.xml b/indra/newview/skins/default/xui/de/panel_edit_shirt.xml index 4f140a2b01..4f140a2b01 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_edit_shirt.xml +++ b/indra/newview/skins/default/xui/de/panel_edit_shirt.xml diff --git a/indra/newview/skins/default/xui/de/panel_edit_shoes.xml b/indra/newview/skins/default/xui/de/panel_edit_shoes.xml index abedb8d89e..abedb8d89e 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_edit_shoes.xml +++ b/indra/newview/skins/default/xui/de/panel_edit_shoes.xml diff --git a/indra/newview/skins/default/xui/de/panel_edit_skin.xml b/indra/newview/skins/default/xui/de/panel_edit_skin.xml index 60f6919485..60f6919485 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_edit_skin.xml +++ b/indra/newview/skins/default/xui/de/panel_edit_skin.xml diff --git a/indra/newview/skins/default/xui/de/panel_edit_skirt.xml b/indra/newview/skins/default/xui/de/panel_edit_skirt.xml index 07ce8a7436..07ce8a7436 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_edit_skirt.xml +++ b/indra/newview/skins/default/xui/de/panel_edit_skirt.xml diff --git a/indra/newview/skins/default/xui/de/panel_edit_socks.xml b/indra/newview/skins/default/xui/de/panel_edit_socks.xml index 4e72b63f49..4e72b63f49 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_edit_socks.xml +++ b/indra/newview/skins/default/xui/de/panel_edit_socks.xml diff --git a/indra/newview/skins/default/xui/de/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/de/panel_edit_tattoo.xml index 075a9d752a..075a9d752a 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_edit_tattoo.xml +++ b/indra/newview/skins/default/xui/de/panel_edit_tattoo.xml diff --git a/indra/newview/skins/default/xui/de/panel_edit_underpants.xml b/indra/newview/skins/default/xui/de/panel_edit_underpants.xml index 1fad0ccedb..1fad0ccedb 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_edit_underpants.xml +++ b/indra/newview/skins/default/xui/de/panel_edit_underpants.xml diff --git a/indra/newview/skins/default/xui/de/panel_edit_undershirt.xml b/indra/newview/skins/default/xui/de/panel_edit_undershirt.xml index 9d193ffedb..9d193ffedb 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_edit_undershirt.xml +++ b/indra/newview/skins/default/xui/de/panel_edit_undershirt.xml diff --git a/indra/newview/skins/default/xui/de/panel_edit_wearable.xml b/indra/newview/skins/default/xui/de/panel_edit_wearable.xml index 94a79a0bbd..94a79a0bbd 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_edit_wearable.xml +++ b/indra/newview/skins/default/xui/de/panel_edit_wearable.xml 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'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="<" name="btn_prev"/> + <button label=">" 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"> + "Parcel_PG_Light" + </string> + <string name="maturity_icon_moderate"> + "Parcel_M_Light" + </string> + <string name="maturity_icon_adult"> + "Parcel_R_Light" + </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="<" name="left_btn"/> + <button label=">" 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, "" 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_control_panel.xml b/indra/newview/skins/default/xui/de/panel_group_control_panel.xml index 9cb72fafff..9cb72fafff 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_group_control_panel.xml +++ b/indra/newview/skins/default/xui/de/panel_group_control_panel.xml diff --git a/indra/newview/skins/default/xui/de/panel_group_general.xml b/indra/newview/skins/default/xui/de/panel_group_general.xml index 9d4301de73..9d4301de73 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_group_general.xml +++ b/indra/newview/skins/default/xui/de/panel_group_general.xml 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..100644 --- 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_group_invite.xml b/indra/newview/skins/default/xui/de/panel_group_invite.xml index d67eaa662c..d67eaa662c 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_group_invite.xml +++ b/indra/newview/skins/default/xui/de/panel_group_invite.xml diff --git a/indra/newview/skins/default/xui/de/panel_group_land_money.xml b/indra/newview/skins/default/xui/de/panel_group_land_money.xml index d9d237be2e..d9d237be2e 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_group_land_money.xml +++ b/indra/newview/skins/default/xui/de/panel_group_land_money.xml diff --git a/indra/newview/skins/default/xui/de/panel_group_list_item.xml b/indra/newview/skins/default/xui/de/panel_group_list_item.xml index fc911a64df..fc911a64df 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_group_list_item.xml +++ b/indra/newview/skins/default/xui/de/panel_group_list_item.xml diff --git a/indra/newview/skins/default/xui/de/panel_group_notices.xml b/indra/newview/skins/default/xui/de/panel_group_notices.xml index df423cc69a..df423cc69a 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_group_notices.xml +++ b/indra/newview/skins/default/xui/de/panel_group_notices.xml diff --git a/indra/newview/skins/default/xui/de/panel_group_notify.xml b/indra/newview/skins/default/xui/de/panel_group_notify.xml index 9c05e99786..9c05e99786 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_group_notify.xml +++ b/indra/newview/skins/default/xui/de/panel_group_notify.xml diff --git a/indra/newview/skins/default/xui/de/panel_group_roles.xml b/indra/newview/skins/default/xui/de/panel_group_roles.xml index 2f3268164c..2f3268164c 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_group_roles.xml +++ b/indra/newview/skins/default/xui/de/panel_group_roles.xml diff --git a/indra/newview/skins/default/xui/de/panel_im_control_panel.xml b/indra/newview/skins/default/xui/de/panel_im_control_panel.xml index abf8011d9d..abf8011d9d 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_im_control_panel.xml +++ b/indra/newview/skins/default/xui/de/panel_im_control_panel.xml diff --git a/indra/newview/skins/default/xui/de/panel_instant_message.xml b/indra/newview/skins/default/xui/de/panel_instant_message.xml index 372def78ca..372def78ca 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_instant_message.xml +++ b/indra/newview/skins/default/xui/de/panel_instant_message.xml diff --git a/indra/newview/skins/default/xui/de/panel_inventory_item.xml b/indra/newview/skins/default/xui/de/panel_inventory_item.xml index d18047fbcf..d18047fbcf 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_inventory_item.xml +++ b/indra/newview/skins/default/xui/de/panel_inventory_item.xml diff --git a/indra/newview/skins/default/xui/de/panel_landmark_info.xml b/indra/newview/skins/default/xui/de/panel_landmark_info.xml index 10cf34c170..10cf34c170 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_landmark_info.xml +++ b/indra/newview/skins/default/xui/de/panel_landmark_info.xml diff --git a/indra/newview/skins/default/xui/de/panel_landmarks.xml b/indra/newview/skins/default/xui/de/panel_landmarks.xml index c1f8a20728..c1f8a20728 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_landmarks.xml +++ b/indra/newview/skins/default/xui/de/panel_landmarks.xml 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..100644 --- 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_main_inventory.xml b/indra/newview/skins/default/xui/de/panel_main_inventory.xml index 2f00782ef0..2f00782ef0 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/de/panel_main_inventory.xml 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_me.xml b/indra/newview/skins/default/xui/de/panel_me.xml index f49446fbbf..f49446fbbf 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_me.xml +++ b/indra/newview/skins/default/xui/de/panel_me.xml diff --git a/indra/newview/skins/default/xui/de/panel_media_settings_general.xml b/indra/newview/skins/default/xui/de/panel_media_settings_general.xml index 75c9057571..75c9057571 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_media_settings_general.xml +++ b/indra/newview/skins/default/xui/de/panel_media_settings_general.xml diff --git a/indra/newview/skins/default/xui/de/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/de/panel_media_settings_permissions.xml index dd408b8275..dd408b8275 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_media_settings_permissions.xml +++ b/indra/newview/skins/default/xui/de/panel_media_settings_permissions.xml diff --git a/indra/newview/skins/default/xui/de/panel_media_settings_security.xml b/indra/newview/skins/default/xui/de/panel_media_settings_security.xml index adc0d22ce6..adc0d22ce6 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_media_settings_security.xml +++ b/indra/newview/skins/default/xui/de/panel_media_settings_security.xml diff --git a/indra/newview/skins/default/xui/de/panel_navigation_bar.xml b/indra/newview/skins/default/xui/de/panel_navigation_bar.xml index 53794b6619..53794b6619 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_navigation_bar.xml +++ b/indra/newview/skins/default/xui/de/panel_navigation_bar.xml diff --git a/indra/newview/skins/default/xui/de/panel_nearby_chat.xml b/indra/newview/skins/default/xui/de/panel_nearby_chat.xml index 07ad761791..07ad761791 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_nearby_chat.xml +++ b/indra/newview/skins/default/xui/de/panel_nearby_chat.xml diff --git a/indra/newview/skins/default/xui/de/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/de/panel_nearby_chat_bar.xml index 69cf6d98de..69cf6d98de 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_nearby_chat_bar.xml +++ b/indra/newview/skins/default/xui/de/panel_nearby_chat_bar.xml diff --git a/indra/newview/skins/default/xui/de/panel_nearby_media.xml b/indra/newview/skins/default/xui/de/panel_nearby_media.xml index 90885c7192..90885c7192 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_nearby_media.xml +++ b/indra/newview/skins/default/xui/de/panel_nearby_media.xml diff --git a/indra/newview/skins/default/xui/de/panel_notifications_channel.xml b/indra/newview/skins/default/xui/de/panel_notifications_channel.xml index 35bd76ce70..35bd76ce70 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_notifications_channel.xml +++ b/indra/newview/skins/default/xui/de/panel_notifications_channel.xml diff --git a/indra/newview/skins/default/xui/de/panel_notify_textbox.xml b/indra/newview/skins/default/xui/de/panel_notify_textbox.xml index da672a0309..da672a0309 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_notify_textbox.xml +++ b/indra/newview/skins/default/xui/de/panel_notify_textbox.xml diff --git a/indra/newview/skins/default/xui/de/panel_online_status_toast.xml b/indra/newview/skins/default/xui/de/panel_online_status_toast.xml index 7c7448c061..7c7448c061 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_online_status_toast.xml +++ b/indra/newview/skins/default/xui/de/panel_online_status_toast.xml diff --git a/indra/newview/skins/default/xui/de/panel_outbox_inventory.xml b/indra/newview/skins/default/xui/de/panel_outbox_inventory.xml index 4006022ffc..4006022ffc 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_outbox_inventory.xml +++ b/indra/newview/skins/default/xui/de/panel_outbox_inventory.xml diff --git a/indra/newview/skins/default/xui/de/panel_outfit_edit.xml b/indra/newview/skins/default/xui/de/panel_outfit_edit.xml index 1af0492aa1..1af0492aa1 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_outfit_edit.xml +++ b/indra/newview/skins/default/xui/de/panel_outfit_edit.xml diff --git a/indra/newview/skins/default/xui/de/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/de/panel_outfits_inventory.xml index d5158b2d97..d5158b2d97 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_outfits_inventory.xml +++ b/indra/newview/skins/default/xui/de/panel_outfits_inventory.xml diff --git a/indra/newview/skins/default/xui/de/panel_outfits_inventory_gear_default.xml b/indra/newview/skins/default/xui/de/panel_outfits_inventory_gear_default.xml index ad0e039070..ad0e039070 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_outfits_inventory_gear_default.xml +++ b/indra/newview/skins/default/xui/de/panel_outfits_inventory_gear_default.xml diff --git a/indra/newview/skins/default/xui/de/panel_outfits_list.xml b/indra/newview/skins/default/xui/de/panel_outfits_list.xml index ea3a938be9..ea3a938be9 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_outfits_list.xml +++ b/indra/newview/skins/default/xui/de/panel_outfits_list.xml diff --git a/indra/newview/skins/default/xui/de/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/de/panel_outfits_wearing.xml index 27141796a8..27141796a8 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_outfits_wearing.xml +++ b/indra/newview/skins/default/xui/de/panel_outfits_wearing.xml diff --git a/indra/newview/skins/default/xui/de/panel_people.xml b/indra/newview/skins/default/xui/de/panel_people.xml index 2d56d6b7d2..2d56d6b7d2 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_people.xml +++ b/indra/newview/skins/default/xui/de/panel_people.xml diff --git a/indra/newview/skins/default/xui/de/panel_pick_info.xml b/indra/newview/skins/default/xui/de/panel_pick_info.xml index f215c43a3d..f215c43a3d 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_pick_info.xml +++ b/indra/newview/skins/default/xui/de/panel_pick_info.xml diff --git a/indra/newview/skins/default/xui/de/panel_picks.xml b/indra/newview/skins/default/xui/de/panel_picks.xml index 6aaa3151a8..6aaa3151a8 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_picks.xml +++ b/indra/newview/skins/default/xui/de/panel_picks.xml diff --git a/indra/newview/skins/default/xui/de/panel_place_profile.xml b/indra/newview/skins/default/xui/de/panel_place_profile.xml index 4077fdab36..4077fdab36 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_place_profile.xml +++ b/indra/newview/skins/default/xui/de/panel_place_profile.xml diff --git a/indra/newview/skins/default/xui/de/panel_places.xml b/indra/newview/skins/default/xui/de/panel_places.xml index 602ffff94d..602ffff94d 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_places.xml +++ b/indra/newview/skins/default/xui/de/panel_places.xml diff --git a/indra/newview/skins/default/xui/de/panel_postcard_message.xml b/indra/newview/skins/default/xui/de/panel_postcard_message.xml index b34dc776de..b34dc776de 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_postcard_message.xml +++ b/indra/newview/skins/default/xui/de/panel_postcard_message.xml 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..100644 --- 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_advanced.xml b/indra/newview/skins/default/xui/de/panel_preferences_advanced.xml index 60e4fb19a7..60e4fb19a7 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/de/panel_preferences_advanced.xml diff --git a/indra/newview/skins/default/xui/de/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/de/panel_preferences_alerts.xml index fcb45e26be..fcb45e26be 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_preferences_alerts.xml +++ b/indra/newview/skins/default/xui/de/panel_preferences_alerts.xml diff --git a/indra/newview/skins/default/xui/de/panel_preferences_chat.xml b/indra/newview/skins/default/xui/de/panel_preferences_chat.xml index 8eb815fd1b..8eb815fd1b 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/de/panel_preferences_chat.xml diff --git a/indra/newview/skins/default/xui/de/panel_preferences_colors.xml b/indra/newview/skins/default/xui/de/panel_preferences_colors.xml index 19c5efcb05..19c5efcb05 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_preferences_colors.xml +++ b/indra/newview/skins/default/xui/de/panel_preferences_colors.xml diff --git a/indra/newview/skins/default/xui/de/panel_preferences_general.xml b/indra/newview/skins/default/xui/de/panel_preferences_general.xml index 2587ea0ced..2587ea0ced 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/de/panel_preferences_general.xml diff --git a/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml index f3746a7c82..f3746a7c82 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml diff --git a/indra/newview/skins/default/xui/de/panel_preferences_move.xml b/indra/newview/skins/default/xui/de/panel_preferences_move.xml index 3e248f0bf0..3e248f0bf0 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_preferences_move.xml +++ b/indra/newview/skins/default/xui/de/panel_preferences_move.xml diff --git a/indra/newview/skins/default/xui/de/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/de/panel_preferences_privacy.xml index 7ac6708321..7ac6708321 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_preferences_privacy.xml +++ b/indra/newview/skins/default/xui/de/panel_preferences_privacy.xml 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..100644 --- 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_preferences_sound.xml b/indra/newview/skins/default/xui/de/panel_preferences_sound.xml index 1e6a03c99f..1e6a03c99f 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/de/panel_preferences_sound.xml diff --git a/indra/newview/skins/default/xui/de/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/de/panel_prim_media_controls.xml index c85f2762b1..c85f2762b1 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_prim_media_controls.xml +++ b/indra/newview/skins/default/xui/de/panel_prim_media_controls.xml diff --git a/indra/newview/skins/default/xui/de/panel_region_covenant.xml b/indra/newview/skins/default/xui/de/panel_region_covenant.xml index 225c98b84f..225c98b84f 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_region_covenant.xml +++ b/indra/newview/skins/default/xui/de/panel_region_covenant.xml diff --git a/indra/newview/skins/default/xui/de/panel_region_debug.xml b/indra/newview/skins/default/xui/de/panel_region_debug.xml index d4b0ed907e..d4b0ed907e 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_region_debug.xml +++ b/indra/newview/skins/default/xui/de/panel_region_debug.xml diff --git a/indra/newview/skins/default/xui/de/panel_region_environment.xml b/indra/newview/skins/default/xui/de/panel_region_environment.xml index daadd30f62..daadd30f62 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_region_environment.xml +++ b/indra/newview/skins/default/xui/de/panel_region_environment.xml diff --git a/indra/newview/skins/default/xui/de/panel_region_estate.xml b/indra/newview/skins/default/xui/de/panel_region_estate.xml index b087451391..b087451391 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_region_estate.xml +++ b/indra/newview/skins/default/xui/de/panel_region_estate.xml 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_region_general.xml b/indra/newview/skins/default/xui/de/panel_region_general.xml index 6324e90029..6324e90029 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_region_general.xml +++ b/indra/newview/skins/default/xui/de/panel_region_general.xml diff --git a/indra/newview/skins/default/xui/de/panel_region_terrain.xml b/indra/newview/skins/default/xui/de/panel_region_terrain.xml index 7801be30e4..7801be30e4 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_region_terrain.xml +++ b/indra/newview/skins/default/xui/de/panel_region_terrain.xml diff --git a/indra/newview/skins/default/xui/de/panel_script_ed.xml b/indra/newview/skins/default/xui/de/panel_script_ed.xml index 8975cd40f8..8975cd40f8 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_script_ed.xml +++ b/indra/newview/skins/default/xui/de/panel_script_ed.xml 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_script_limits_my_avatar.xml b/indra/newview/skins/default/xui/de/panel_script_limits_my_avatar.xml index c91eb98e9c..c91eb98e9c 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_script_limits_my_avatar.xml +++ b/indra/newview/skins/default/xui/de/panel_script_limits_my_avatar.xml diff --git a/indra/newview/skins/default/xui/de/panel_script_limits_region_memory.xml b/indra/newview/skins/default/xui/de/panel_script_limits_region_memory.xml index 8d7cc1bf9a..8d7cc1bf9a 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_script_limits_region_memory.xml +++ b/indra/newview/skins/default/xui/de/panel_script_limits_region_memory.xml diff --git a/indra/newview/skins/default/xui/de/panel_script_question_toast.xml b/indra/newview/skins/default/xui/de/panel_script_question_toast.xml index a2d0237da0..a2d0237da0 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_script_question_toast.xml +++ b/indra/newview/skins/default/xui/de/panel_script_question_toast.xml diff --git a/indra/newview/skins/default/xui/de/panel_scrolling_param.xml b/indra/newview/skins/default/xui/de/panel_scrolling_param.xml index 50590b8d73..50590b8d73 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_scrolling_param.xml +++ b/indra/newview/skins/default/xui/de/panel_scrolling_param.xml diff --git a/indra/newview/skins/default/xui/de/panel_scrolling_param_base.xml b/indra/newview/skins/default/xui/de/panel_scrolling_param_base.xml index fa659040ea..fa659040ea 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_scrolling_param_base.xml +++ b/indra/newview/skins/default/xui/de/panel_scrolling_param_base.xml diff --git a/indra/newview/skins/default/xui/de/panel_side_tray_tab_caption.xml b/indra/newview/skins/default/xui/de/panel_side_tray_tab_caption.xml index 652fb7c836..652fb7c836 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_side_tray_tab_caption.xml +++ b/indra/newview/skins/default/xui/de/panel_side_tray_tab_caption.xml diff --git a/indra/newview/skins/default/xui/de/panel_sidetray_home_tab.xml b/indra/newview/skins/default/xui/de/panel_sidetray_home_tab.xml index cf3080a4f9..cf3080a4f9 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_sidetray_home_tab.xml +++ b/indra/newview/skins/default/xui/de/panel_sidetray_home_tab.xml 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..100644 --- 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..100644 --- 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..100644 --- 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..100644 --- 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..100644 --- 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_sound_devices.xml b/indra/newview/skins/default/xui/de/panel_sound_devices.xml index b739b6197f..b739b6197f 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_sound_devices.xml +++ b/indra/newview/skins/default/xui/de/panel_sound_devices.xml diff --git a/indra/newview/skins/default/xui/de/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/de/panel_stand_stop_flying.xml index be21429007..be21429007 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_stand_stop_flying.xml +++ b/indra/newview/skins/default/xui/de/panel_stand_stop_flying.xml 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..100644 --- 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_sys_well_item.xml b/indra/newview/skins/default/xui/de/panel_sys_well_item.xml index 504f1727e2..504f1727e2 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_sys_well_item.xml +++ b/indra/newview/skins/default/xui/de/panel_sys_well_item.xml diff --git a/indra/newview/skins/default/xui/de/panel_teleport_history.xml b/indra/newview/skins/default/xui/de/panel_teleport_history.xml index 4d721f2af6..4d721f2af6 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_teleport_history.xml +++ b/indra/newview/skins/default/xui/de/panel_teleport_history.xml diff --git a/indra/newview/skins/default/xui/de/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/de/panel_teleport_history_item.xml index 5a402d02a1..5a402d02a1 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_teleport_history_item.xml +++ b/indra/newview/skins/default/xui/de/panel_teleport_history_item.xml 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/panel_voice_effect.xml b/indra/newview/skins/default/xui/de/panel_voice_effect.xml index 533deb8597..533deb8597 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_voice_effect.xml +++ b/indra/newview/skins/default/xui/de/panel_voice_effect.xml diff --git a/indra/newview/skins/default/xui/de/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/de/panel_volume_pulldown.xml index 3d43200e48..3d43200e48 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_volume_pulldown.xml +++ b/indra/newview/skins/default/xui/de/panel_volume_pulldown.xml diff --git a/indra/newview/skins/default/xui/de/panel_world_map.xml b/indra/newview/skins/default/xui/de/panel_world_map.xml index 35fe3d3ffc..35fe3d3ffc 100755..100644 --- a/indra/newview/skins/default/xui/de/panel_world_map.xml +++ b/indra/newview/skins/default/xui/de/panel_world_map.xml 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..100644 --- 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_appearance.xml b/indra/newview/skins/default/xui/de/sidepanel_appearance.xml index 7fb9b34e0a..7fb9b34e0a 100755..100644 --- a/indra/newview/skins/default/xui/de/sidepanel_appearance.xml +++ b/indra/newview/skins/default/xui/de/sidepanel_appearance.xml diff --git a/indra/newview/skins/default/xui/de/sidepanel_inventory.xml b/indra/newview/skins/default/xui/de/sidepanel_inventory.xml index 94c3c75254..94c3c75254 100755..100644 --- a/indra/newview/skins/default/xui/de/sidepanel_inventory.xml +++ b/indra/newview/skins/default/xui/de/sidepanel_inventory.xml 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..100644 --- 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..100644 --- 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..8ff9a3969a 100755..100644 --- a/indra/newview/skins/default/xui/de/strings.xml +++ b/indra/newview/skins/default/xui/de/strings.xml @@ -38,7 +38,7 @@ Grafikinitialisierung fehlgeschlagen. Bitte aktualisieren Sie Ihren Grafiktreiber. </string> <string name="AboutHeader"> - [APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2] ([VIEWER_VERSION_3]) [BUILD_DATE] [BUILD_TIME] ([CHANNEL]) + [APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2].[VIEWER_VERSION_3] [BUILD_DATE] [BUILD_TIME] ([CHANNEL]) [[VIEWER_RELEASE_NOTES_URL] [ReleaseNotes]] </string> <string name="AboutCompiler"> @@ -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“ > „Debug-Einstellungen anzeigen“ > „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..100644 --- 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/de/xui_version.xml b/indra/newview/skins/default/xui/de/xui_version.xml index 0e777751d3..0e777751d3 100755..100644 --- a/indra/newview/skins/default/xui/de/xui_version.xml +++ b/indra/newview/skins/default/xui/de/xui_version.xml diff --git a/indra/newview/skins/default/xui/en/accordion_drag.xml b/indra/newview/skins/default/xui/en/accordion_drag.xml index e8a705e744..e8a705e744 100755..100644 --- a/indra/newview/skins/default/xui/en/accordion_drag.xml +++ b/indra/newview/skins/default/xui/en/accordion_drag.xml diff --git a/indra/newview/skins/default/xui/en/accordion_parent.xml b/indra/newview/skins/default/xui/en/accordion_parent.xml index e17a0dd351..e17a0dd351 100755..100644 --- a/indra/newview/skins/default/xui/en/accordion_parent.xml +++ b/indra/newview/skins/default/xui/en/accordion_parent.xml diff --git a/indra/newview/skins/default/xui/en/alert_button.xml b/indra/newview/skins/default/xui/en/alert_button.xml index a60e9afab1..a60e9afab1 100755..100644 --- a/indra/newview/skins/default/xui/en/alert_button.xml +++ b/indra/newview/skins/default/xui/en/alert_button.xml diff --git a/indra/newview/skins/default/xui/en/alert_check_box.xml b/indra/newview/skins/default/xui/en/alert_check_box.xml index 5535a5dc2a..5535a5dc2a 100755..100644 --- a/indra/newview/skins/default/xui/en/alert_check_box.xml +++ b/indra/newview/skins/default/xui/en/alert_check_box.xml diff --git a/indra/newview/skins/default/xui/en/alert_icon.xml b/indra/newview/skins/default/xui/en/alert_icon.xml index b0886fce06..b0886fce06 100755..100644 --- a/indra/newview/skins/default/xui/en/alert_icon.xml +++ b/indra/newview/skins/default/xui/en/alert_icon.xml diff --git a/indra/newview/skins/default/xui/en/alert_line_editor.xml b/indra/newview/skins/default/xui/en/alert_line_editor.xml index 54dbc698c8..54dbc698c8 100755..100644 --- a/indra/newview/skins/default/xui/en/alert_line_editor.xml +++ b/indra/newview/skins/default/xui/en/alert_line_editor.xml diff --git a/indra/newview/skins/default/xui/en/favorites_bar_button.xml b/indra/newview/skins/default/xui/en/favorites_bar_button.xml index e7dd62eb64..e7dd62eb64 100755..100644 --- a/indra/newview/skins/default/xui/en/favorites_bar_button.xml +++ b/indra/newview/skins/default/xui/en/favorites_bar_button.xml diff --git a/indra/newview/skins/default/xui/en/floater_aaa.xml b/indra/newview/skins/default/xui/en/floater_aaa.xml index d11373ce1d..d11373ce1d 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_aaa.xml +++ b/indra/newview/skins/default/xui/en/floater_aaa.xml diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml index 60f36770bb..ec87b3684e 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_about.xml +++ b/indra/newview/skins/default/xui/en/floater_about.xml @@ -43,6 +43,14 @@ top_pad="5" height="25" width="180" /> + <button + follows="left|top" + label="Check for updates" + name="update_btn" + left_pad="70" + top_delta="0" + height="25" + width="180" /> </panel> <panel border="true" 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..384ae6bb1e 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_about_land.xml +++ b/indra/newview/skins/default/xui/en/floater_about_land.xml @@ -2,13 +2,13 @@ <floater positioning="cascading" can_tear_off="false" - height="420" + height="396" layout="topleft" name="floaterland" help_topic="floaterland" save_rect="true" title="ABOUT LAND" - width="490"> + width="634"> <floater.string name="maturity_icon_general"> "Parcel_PG_Dark" @@ -23,15 +23,15 @@ </floater.string> <floater.string name="Minutes"> - [MINUTES] minutes + [MINUTES] min. </floater.string> <floater.string name="Minute"> - minute + min. </floater.string> <floater.string name="Seconds"> - [SECONDS] seconds + [SECONDS] sec. </floater.string> <floater.string name="Remaining"> @@ -39,17 +39,18 @@ </floater.string> <tab_container follows="all" - height="410" + halign="left" + height="386" layout="topleft" left="0" name="landtab" - tab_position="top" - tab_height="25" - tab_min_width="67" - top="10" - width="489"> + tab_position="left" + tab_width="140" + tab_padding_right="3" + top="6" + width="633"> <panel - border="false" + border="true" follows="all" label="GENERAL" layout="topleft" @@ -145,7 +146,7 @@ Description: </text> <text_editor - follows="left|top|right" + follows="left|top" height="52" layout="topleft" left_pad="2" @@ -281,7 +282,7 @@ label="Set" layout="topleft" left_pad="4" - right="-10" + right="-154" name="Set..." width="90" top_delta="-2"/> @@ -302,7 +303,7 @@ label="Deed" layout="topleft" left_pad="2" - right="-10" + right="-154" name="Deed..." tool_tip="You may only deed land if you are an officer in the selected group." top_delta="-2" @@ -365,7 +366,7 @@ label="Sell Land" layout="topleft" left_pad="5" - right="-10" + right="-154" name="Sell Land..." width="145" top_delta="-25"/> @@ -412,7 +413,7 @@ label="Cancel Land Sale" label_selected="Cancel Land Sale" layout="topleft" - right="-10" + right="-154" name="Cancel Land Sale" left_pad="5" top_pad="7" @@ -527,7 +528,7 @@ height="23" label="Buy For Group" layout="topleft" - right="-10" + right="-154" name="Buy For Group..." top_delta="0" width="180" /> @@ -547,7 +548,7 @@ height="23" label="Abandon Land" layout="topleft" - right="-10" + right="-154" name="Abandon Land..." top_pad="-47" width="180" /> @@ -645,8 +646,8 @@ type="string" length="1" enabled="false" - follows="all" - height="200" + follows="top|left" + height="175" layout="topleft" left="10" max_length="65535" @@ -663,7 +664,7 @@ halign="right" layout="topleft" right="-10" - top_pad="0" + top_pad="25" mouse_opaque="false" name="covenant_timestamp_text" width="460"> @@ -930,7 +931,7 @@ label_selected="Show" layout="topleft" name="ShowOwner" - right="-140" + right="-284" width="60" top_delta="-6"/> <button @@ -941,7 +942,7 @@ label="Return" layout="topleft" name="ReturnOwner..." - right="-10" + right="-154" tool_tip="Return objects to their owners." width="119" top_delta="0"/> @@ -978,7 +979,7 @@ label_selected="Show" layout="topleft" name="ShowGroup" - right="-140" + right="-284" width="60" top_delta="-6"/> <button @@ -989,7 +990,7 @@ label="Return" layout="topleft" name="ReturnGroup..." - right="-10" + right="-154" tool_tip="Return objects to their owners." width="119" top_delta="0"/> @@ -1026,7 +1027,7 @@ label_selected="Show" layout="topleft" name="ShowOther" - right="-140" + right="-284" width="60" top_delta="-6"/> <button @@ -1037,7 +1038,7 @@ label="Return" layout="topleft" name="ReturnOther..." - right="-10" + right="-154" tool_tip="Return objects to their owners." width="119" top_delta="0"/> @@ -1122,13 +1123,13 @@ left_pad="6" name="Return objects..." top_delta="0" - right="-10" + right="-154" width="164" /> <name_list column_padding="0" draw_heading="true" - follows="all" - height="180" + follows="top|left" + height="150" layout="topleft" left="10" name="owner list" @@ -1321,8 +1322,8 @@ Only large parcels can be listed in search. <panel bevel_style="none" border="true" - top="146" - bottom="146" + top="121" + bottom="121" follows="left|bottom|right" left="20" right="-20"/> @@ -1357,7 +1358,7 @@ Only large parcels can be listed in search. enabled="true" height="23" layout="topleft" - left="20" + left="164" top="194" name="land category" visible="true" @@ -1494,7 +1495,7 @@ Only large parcels can be listed in search. label_selected="Set" layout="topleft" name="Set" - left="255" + left="399" tool_tip="Sets the landing point where visitors arrive. Sets to your avatar's location inside this parcel." width="50" /> <button @@ -1525,6 +1526,7 @@ Only large parcels can be listed in search. layout="topleft" name="landing type" top_pad="0" + left="399" tool_tip="Teleport Routing -- select how to handle teleports onto your land" width="120"> <combo_box.item @@ -1568,7 +1570,7 @@ Only large parcels can be listed in search. <combo_box height="23" layout="topleft" - left_pad="0" + left_pad="144" name="media type" tool_tip="Specify if the URL is a movie, web page, or other media" width="120" @@ -1577,7 +1579,7 @@ Only large parcels can be listed in search. follows="left|top" height="16" layout="topleft" - left_pad="10" + left_pad="-134" name="mime_type" width="200" /> <text @@ -1607,7 +1609,7 @@ Only large parcels can be listed in search. height="23" label="Set" layout="topleft" - left_pad="5" + left_pad="149" name="set_media_url" width="70" top_delta="0"/> @@ -1952,7 +1954,7 @@ Only large parcels can be listed in search. <combo_box height="23" layout="topleft" - left_pad="22" + left_pad="166" name="pass_combo" top_delta="0" width="100"> @@ -2013,7 +2015,7 @@ Only large parcels can be listed in search. name="AllowedText" top="0" width="230"> - Allowed Residents + Allowed Residents ([COUNT]) </text> <name_list column_padding="0" @@ -2050,7 +2052,7 @@ Only large parcels can be listed in search. follows="top|right" height="170" width="240" - left_pad="2"> + left_pad="146"> <text type="string" length="1" @@ -2062,7 +2064,7 @@ Only large parcels can be listed in search. name="BanCheck" top="0" width="200"> - Banned Residents + Banned Residents ([COUNT]) </text> <name_list column_padding="0" @@ -2096,5 +2098,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_activeim.xml b/indra/newview/skins/default/xui/en/floater_activeim.xml index b79c5d9a19..b79c5d9a19 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_activeim.xml +++ b/indra/newview/skins/default/xui/en/floater_activeim.xml diff --git a/indra/newview/skins/default/xui/en/floater_animation_anim_preview.xml b/indra/newview/skins/default/xui/en/floater_animation_anim_preview.xml index b5538a511c..b5538a511c 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_animation_anim_preview.xml +++ b/indra/newview/skins/default/xui/en/floater_animation_anim_preview.xml diff --git a/indra/newview/skins/default/xui/en/floater_animation_bvh_preview.xml b/indra/newview/skins/default/xui/en/floater_animation_bvh_preview.xml index cb6b2f6ebc..cb6b2f6ebc 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_animation_bvh_preview.xml +++ b/indra/newview/skins/default/xui/en/floater_animation_bvh_preview.xml 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 100644 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_auction.xml b/indra/newview/skins/default/xui/en/floater_auction.xml index 9c6d114c4c..9c6d114c4c 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_auction.xml +++ b/indra/newview/skins/default/xui/en/floater_auction.xml diff --git a/indra/newview/skins/default/xui/en/floater_autoreplace.xml b/indra/newview/skins/default/xui/en/floater_autoreplace.xml index 0bfefc8abe..0bfefc8abe 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_autoreplace.xml +++ b/indra/newview/skins/default/xui/en/floater_autoreplace.xml diff --git a/indra/newview/skins/default/xui/en/floater_avatar.xml b/indra/newview/skins/default/xui/en/floater_avatar.xml index cd5cca02bd..cd5cca02bd 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_avatar.xml +++ b/indra/newview/skins/default/xui/en/floater_avatar.xml diff --git a/indra/newview/skins/default/xui/en/floater_avatar_picker.xml b/indra/newview/skins/default/xui/en/floater_avatar_picker.xml index 1a55dc2e2c..1a55dc2e2c 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_avatar_picker.xml +++ b/indra/newview/skins/default/xui/en/floater_avatar_picker.xml diff --git a/indra/newview/skins/default/xui/en/floater_avatar_textures.xml b/indra/newview/skins/default/xui/en/floater_avatar_textures.xml index bac3ea86f1..bac3ea86f1 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_avatar_textures.xml +++ b/indra/newview/skins/default/xui/en/floater_avatar_textures.xml diff --git a/indra/newview/skins/default/xui/en/floater_beacons.xml b/indra/newview/skins/default/xui/en/floater_beacons.xml index 3d29356b22..3d29356b22 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_beacons.xml +++ b/indra/newview/skins/default/xui/en/floater_beacons.xml diff --git a/indra/newview/skins/default/xui/en/floater_build_options.xml b/indra/newview/skins/default/xui/en/floater_build_options.xml index 38428b36fc..38428b36fc 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_build_options.xml +++ b/indra/newview/skins/default/xui/en/floater_build_options.xml diff --git a/indra/newview/skins/default/xui/en/floater_bulk_perms.xml b/indra/newview/skins/default/xui/en/floater_bulk_perms.xml index e7ab3cacdc..e7ab3cacdc 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_bulk_perms.xml +++ b/indra/newview/skins/default/xui/en/floater_bulk_perms.xml diff --git a/indra/newview/skins/default/xui/en/floater_bumps.xml b/indra/newview/skins/default/xui/en/floater_bumps.xml index 1f2fe62b3c..126e3aac48 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_bumps.xml +++ b/indra/newview/skins/default/xui/en/floater_bumps.xml @@ -7,7 +7,7 @@ help_topic="floater_bumps" save_rect="true" title="BUMPS, PUSHES & HITS" - width="400"> + width="420"> <floater.string name="none_detected"> None detected @@ -34,7 +34,7 @@ </floater.string> <floater.string name="timeStr"> - [[hour,datetime,slt]:[min,datetime,slt]] + [[hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt]] </floater.string> <scroll_list draw_border="false" @@ -45,5 +45,5 @@ multi_select="true" name="bump_list" top="20" - width="388" /> + width="408" /> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_buy_contents.xml b/indra/newview/skins/default/xui/en/floater_buy_contents.xml index ac96a70805..ac96a70805 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_buy_contents.xml +++ b/indra/newview/skins/default/xui/en/floater_buy_contents.xml diff --git a/indra/newview/skins/default/xui/en/floater_buy_currency.xml b/indra/newview/skins/default/xui/en/floater_buy_currency.xml index 553c5d51d0..553c5d51d0 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_buy_currency.xml +++ b/indra/newview/skins/default/xui/en/floater_buy_currency.xml diff --git a/indra/newview/skins/default/xui/en/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/en/floater_buy_currency_html.xml index 0637eedfb2..0637eedfb2 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_buy_currency_html.xml +++ b/indra/newview/skins/default/xui/en/floater_buy_currency_html.xml diff --git a/indra/newview/skins/default/xui/en/floater_buy_land.xml b/indra/newview/skins/default/xui/en/floater_buy_land.xml index 22cc058e46..22cc058e46 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_buy_land.xml +++ b/indra/newview/skins/default/xui/en/floater_buy_land.xml diff --git a/indra/newview/skins/default/xui/en/floater_buy_object.xml b/indra/newview/skins/default/xui/en/floater_buy_object.xml index 49be4290c7..49be4290c7 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_buy_object.xml +++ b/indra/newview/skins/default/xui/en/floater_buy_object.xml diff --git a/indra/newview/skins/default/xui/en/floater_camera.xml b/indra/newview/skins/default/xui/en/floater_camera.xml index 521389d7b3..521389d7b3 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_camera.xml +++ b/indra/newview/skins/default/xui/en/floater_camera.xml diff --git a/indra/newview/skins/default/xui/en/floater_choose_group.xml b/indra/newview/skins/default/xui/en/floater_choose_group.xml index 2cf6e682fd..2cf6e682fd 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_choose_group.xml +++ b/indra/newview/skins/default/xui/en/floater_choose_group.xml diff --git a/indra/newview/skins/default/xui/en/floater_color_picker.xml b/indra/newview/skins/default/xui/en/floater_color_picker.xml index e06d10606a..e06d10606a 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_color_picker.xml +++ b/indra/newview/skins/default/xui/en/floater_color_picker.xml diff --git a/indra/newview/skins/default/xui/en/floater_conversation_log.xml b/indra/newview/skins/default/xui/en/floater_conversation_log.xml index 19a4cbc119..19a4cbc119 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_conversation_log.xml +++ b/indra/newview/skins/default/xui/en/floater_conversation_log.xml diff --git a/indra/newview/skins/default/xui/en/floater_conversation_preview.xml b/indra/newview/skins/default/xui/en/floater_conversation_preview.xml index 99ad59a7a3..99ad59a7a3 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_conversation_preview.xml +++ b/indra/newview/skins/default/xui/en/floater_conversation_preview.xml diff --git a/indra/newview/skins/default/xui/en/floater_critical.xml b/indra/newview/skins/default/xui/en/floater_critical.xml index 143bcb4430..143bcb4430 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_critical.xml +++ b/indra/newview/skins/default/xui/en/floater_critical.xml diff --git a/indra/newview/skins/default/xui/en/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/en/floater_delete_env_preset.xml index b5de4166f6..b5de4166f6 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_delete_env_preset.xml +++ b/indra/newview/skins/default/xui/en/floater_delete_env_preset.xml diff --git a/indra/newview/skins/default/xui/en/floater_destinations.xml b/indra/newview/skins/default/xui/en/floater_destinations.xml index 94ebaa9cb2..94ebaa9cb2 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_destinations.xml +++ b/indra/newview/skins/default/xui/en/floater_destinations.xml diff --git a/indra/newview/skins/default/xui/en/floater_display_name.xml b/indra/newview/skins/default/xui/en/floater_display_name.xml index 9a9fd32a77..9a9fd32a77 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_display_name.xml +++ b/indra/newview/skins/default/xui/en/floater_display_name.xml diff --git a/indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml index d9a3ad0c4b..d9a3ad0c4b 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml +++ b/indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml diff --git a/indra/newview/skins/default/xui/en/floater_edit_hover_height.xml b/indra/newview/skins/default/xui/en/floater_edit_hover_height.xml index 8ec6735a01..8ec6735a01 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_edit_hover_height.xml +++ b/indra/newview/skins/default/xui/en/floater_edit_hover_height.xml diff --git a/indra/newview/skins/default/xui/en/floater_edit_sky_preset.xml b/indra/newview/skins/default/xui/en/floater_edit_sky_preset.xml index 56233d91ee..56233d91ee 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_edit_sky_preset.xml +++ b/indra/newview/skins/default/xui/en/floater_edit_sky_preset.xml diff --git a/indra/newview/skins/default/xui/en/floater_edit_water_preset.xml b/indra/newview/skins/default/xui/en/floater_edit_water_preset.xml index 905983e7fa..905983e7fa 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_edit_water_preset.xml +++ b/indra/newview/skins/default/xui/en/floater_edit_water_preset.xml diff --git a/indra/newview/skins/default/xui/en/floater_environment_settings.xml b/indra/newview/skins/default/xui/en/floater_environment_settings.xml index 1b1cafaca6..1b1cafaca6 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_environment_settings.xml +++ b/indra/newview/skins/default/xui/en/floater_environment_settings.xml diff --git a/indra/newview/skins/default/xui/en/floater_event.xml b/indra/newview/skins/default/xui/en/floater_event.xml index cf61b7d24d..cf61b7d24d 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_event.xml +++ b/indra/newview/skins/default/xui/en/floater_event.xml 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..442da887c5 --- /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" + + 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_fast_timers.xml b/indra/newview/skins/default/xui/en/floater_fast_timers.xml index 671f116df3..671f116df3 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_fast_timers.xml +++ b/indra/newview/skins/default/xui/en/floater_fast_timers.xml diff --git a/indra/newview/skins/default/xui/en/floater_font_test.xml b/indra/newview/skins/default/xui/en/floater_font_test.xml index 3ab19ec9d9..3ab19ec9d9 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_font_test.xml +++ b/indra/newview/skins/default/xui/en/floater_font_test.xml diff --git a/indra/newview/skins/default/xui/en/floater_gesture.xml b/indra/newview/skins/default/xui/en/floater_gesture.xml index 200e9b9537..200e9b9537 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_gesture.xml +++ b/indra/newview/skins/default/xui/en/floater_gesture.xml diff --git a/indra/newview/skins/default/xui/en/floater_god_tools.xml b/indra/newview/skins/default/xui/en/floater_god_tools.xml index e7131e20cb..e7131e20cb 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_god_tools.xml +++ b/indra/newview/skins/default/xui/en/floater_god_tools.xml diff --git a/indra/newview/skins/default/xui/en/floater_hardware_settings.xml b/indra/newview/skins/default/xui/en/floater_hardware_settings.xml index 9deb0d2030..dcd6d98581 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_hardware_settings.xml +++ b/indra/newview/skins/default/xui/en/floater_hardware_settings.xml @@ -191,8 +191,18 @@ label="OK" label_selected="OK" layout="topleft" - left="-102" + right="-105" name="OK" top="192" width="90" /> + <button + follows="right|bottom" + height="22" + label="Cancel" + label_selected="Cancel" + layout="topleft" + left_pad="5" + name="Cancel" + right="-10" + width="90" /> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_help_browser.xml b/indra/newview/skins/default/xui/en/floater_help_browser.xml index c06cb63f8a..c06cb63f8a 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_help_browser.xml +++ b/indra/newview/skins/default/xui/en/floater_help_browser.xml diff --git a/indra/newview/skins/default/xui/en/floater_how_to.xml b/indra/newview/skins/default/xui/en/floater_how_to.xml index 8c0077a8cc..8c0077a8cc 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_how_to.xml +++ b/indra/newview/skins/default/xui/en/floater_how_to.xml diff --git a/indra/newview/skins/default/xui/en/floater_hud.xml b/indra/newview/skins/default/xui/en/floater_hud.xml index e2d860881a..e2d860881a 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_hud.xml +++ b/indra/newview/skins/default/xui/en/floater_hud.xml diff --git a/indra/newview/skins/default/xui/en/floater_im_container.xml b/indra/newview/skins/default/xui/en/floater_im_container.xml index 28c89868bd..28c89868bd 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_im_container.xml +++ b/indra/newview/skins/default/xui/en/floater_im_container.xml diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml index c64ee5565a..c64ee5565a 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_im_session.xml +++ b/indra/newview/skins/default/xui/en/floater_im_session.xml diff --git a/indra/newview/skins/default/xui/en/floater_image_preview.xml b/indra/newview/skins/default/xui/en/floater_image_preview.xml index 44d2c14cc8..44d2c14cc8 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_image_preview.xml +++ b/indra/newview/skins/default/xui/en/floater_image_preview.xml diff --git a/indra/newview/skins/default/xui/en/floater_import_collada.xml b/indra/newview/skins/default/xui/en/floater_import_collada.xml index 441ab6a2de..441ab6a2de 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_import_collada.xml +++ b/indra/newview/skins/default/xui/en/floater_import_collada.xml diff --git a/indra/newview/skins/default/xui/en/floater_incoming_call.xml b/indra/newview/skins/default/xui/en/floater_incoming_call.xml index a7864381a9..a7864381a9 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_incoming_call.xml +++ b/indra/newview/skins/default/xui/en/floater_incoming_call.xml diff --git a/indra/newview/skins/default/xui/en/floater_inspect.xml b/indra/newview/skins/default/xui/en/floater_inspect.xml index bea35e5fc1..bea35e5fc1 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_inspect.xml +++ b/indra/newview/skins/default/xui/en/floater_inspect.xml diff --git a/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml index 6667238232..6667238232 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml +++ b/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml diff --git a/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml index 17bc818cc1..17bc818cc1 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml +++ b/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml 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 100644 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_joystick.xml b/indra/newview/skins/default/xui/en/floater_joystick.xml index 3dfdf8e1a5..3dfdf8e1a5 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_joystick.xml +++ b/indra/newview/skins/default/xui/en/floater_joystick.xml diff --git a/indra/newview/skins/default/xui/en/floater_land_holdings.xml b/indra/newview/skins/default/xui/en/floater_land_holdings.xml index 390ec9ab7d..390ec9ab7d 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_land_holdings.xml +++ b/indra/newview/skins/default/xui/en/floater_land_holdings.xml 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..100644 --- 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 "no copy". 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 "no copy". 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=">" + 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_lsl_guide.xml b/indra/newview/skins/default/xui/en/floater_lsl_guide.xml index e9676777f4..e9676777f4 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_lsl_guide.xml +++ b/indra/newview/skins/default/xui/en/floater_lsl_guide.xml diff --git a/indra/newview/skins/default/xui/en/floater_map.xml b/indra/newview/skins/default/xui/en/floater_map.xml index b8893e11d9..b8893e11d9 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_map.xml +++ b/indra/newview/skins/default/xui/en/floater_map.xml 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 100644 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 100644 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/floater_media_browser.xml b/indra/newview/skins/default/xui/en/floater_media_browser.xml index ce788654aa..ce788654aa 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_media_browser.xml +++ b/indra/newview/skins/default/xui/en/floater_media_browser.xml diff --git a/indra/newview/skins/default/xui/en/floater_media_settings.xml b/indra/newview/skins/default/xui/en/floater_media_settings.xml index 0e03c0ab6d..0e03c0ab6d 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_media_settings.xml +++ b/indra/newview/skins/default/xui/en/floater_media_settings.xml diff --git a/indra/newview/skins/default/xui/en/floater_mem_leaking.xml b/indra/newview/skins/default/xui/en/floater_mem_leaking.xml index fb7d09a21e..fb7d09a21e 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_mem_leaking.xml +++ b/indra/newview/skins/default/xui/en/floater_mem_leaking.xml diff --git a/indra/newview/skins/default/xui/en/floater_merchant_outbox.xml b/indra/newview/skins/default/xui/en/floater_merchant_outbox.xml index b98f280b56..b98f280b56 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_merchant_outbox.xml +++ b/indra/newview/skins/default/xui/en/floater_merchant_outbox.xml diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml index a4acd1df78..7183b2f1f9 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_model_preview.xml +++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml @@ -31,6 +31,7 @@ <string name="mesh_status_too_many_vertices">Level of detail has too many vertices.</string> <string name="mesh_status_missing_lod">Missing required level of detail.</string> <string name="mesh_status_invalid_material_list">LOD materials are not a subset of reference model.</string> + <string name="phys_status_vertex_limit_exceeded">Some physical hulls exceed vertex limitations.</string> <string name="layer_all">All</string> <!-- Text to display in physics layer combo box for "all layers" --> <string name="decomposing">Analyzing...</string> <string name="simplifying">Simplifying...</string> @@ -66,7 +67,7 @@ follows="top|left" layout="topleft" height="19" - max_length_bytes="64" + max_length_bytes="63" name="description_form" prevalidate_callback="ascii" top_pad="5" @@ -1027,19 +1028,19 @@ bg_alpha_color="0 0 0 0" bg_opaque_color="0 0 0 0.3" follows="left|top" - height="16" + height="19" layout="topleft" left="18" name="physics info" - top_pad="15" - width="589"> + top_pad="12" + width="319"> <text follows="top|left" height="15" layout="topleft" left="0" text_color="White" - top_pad="0" + top_pad="3" name="results_text" width="50"> Results: @@ -1077,6 +1078,33 @@ Hulls: [HULLS] </text> </panel> + <panel + bg_alpha_color="0 0 0 0" + bg_opaque_color="0 0 0 0.3" + follows="left|top" + height="19" + layout="topleft" + left_pad="5" + top_delta="0" + name="physics message" + width="270"> + <icon + follows="left|top" + height="16" + left="0" + layout="topleft" + name="physics_status_message_icon" + top_pad="0" + width="16" /> + <text + follows="left|top" + height="15" + layout="topleft" + left_pad="2" + name="physics_status_message_text" + width="252" + top_delta="3"/> + </panel> </panel> <!-- MODIFIERS PANEL --> <panel diff --git a/indra/newview/skins/default/xui/en/floater_moveview.xml b/indra/newview/skins/default/xui/en/floater_moveview.xml index 5e84283ab0..5e84283ab0 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_moveview.xml +++ b/indra/newview/skins/default/xui/en/floater_moveview.xml diff --git a/indra/newview/skins/default/xui/en/floater_mute_object.xml b/indra/newview/skins/default/xui/en/floater_mute_object.xml index 22b0a1783f..22b0a1783f 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_mute_object.xml +++ b/indra/newview/skins/default/xui/en/floater_mute_object.xml diff --git a/indra/newview/skins/default/xui/en/floater_my_appearance.xml b/indra/newview/skins/default/xui/en/floater_my_appearance.xml index fdea7a821a..fdea7a821a 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_my_appearance.xml +++ b/indra/newview/skins/default/xui/en/floater_my_appearance.xml diff --git a/indra/newview/skins/default/xui/en/floater_my_inventory.xml b/indra/newview/skins/default/xui/en/floater_my_inventory.xml index 178987962b..f182d27da8 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_my_inventory.xml +++ b/indra/newview/skins/default/xui/en/floater_my_inventory.xml @@ -6,7 +6,7 @@ height="570" help_topic="sidebar_inventory" min_width="333" - min_height="570" + min_height="590" name="floater_my_inventory" save_rect="true" save_visibility="true" diff --git a/indra/newview/skins/default/xui/en/floater_my_web_profile.xml b/indra/newview/skins/default/xui/en/floater_my_web_profile.xml index df46fc198f..df46fc198f 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_my_web_profile.xml +++ b/indra/newview/skins/default/xui/en/floater_my_web_profile.xml diff --git a/indra/newview/skins/default/xui/en/floater_notification.xml b/indra/newview/skins/default/xui/en/floater_notification.xml index 1f9ddecac2..1f9ddecac2 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_notification.xml +++ b/indra/newview/skins/default/xui/en/floater_notification.xml diff --git a/indra/newview/skins/default/xui/en/floater_notifications_console.xml b/indra/newview/skins/default/xui/en/floater_notifications_console.xml index e243ccd2f9..e243ccd2f9 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_notifications_console.xml +++ b/indra/newview/skins/default/xui/en/floater_notifications_console.xml diff --git a/indra/newview/skins/default/xui/en/floater_notifications_tabbed.xml b/indra/newview/skins/default/xui/en/floater_notifications_tabbed.xml new file mode 100644 index 0000000000..c17d2a1f37 --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_notifications_tabbed.xml @@ -0,0 +1,154 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater + legacy_header_height="18" + bevel_style="in" + layout="topleft" + name="floater_notifications_tabbed" + help_topic="notification_chiclet" + save_rect="true" + title="NOTIFICATIONS" + width="350" + min_width="435" + height="550" + min_height="150" + can_minimize="false" + can_tear_off="false" + can_resize="true" + can_drag_on_left="false" + can_dock="true" + save_dock_state="true" + save_visibility="true" + single_instance="true" +> + <floater.string + name="system_tab_title"> + System ([COUNT]) + </floater.string> + <floater.string + name="transactions_tab_title"> + Transactions ([COUNT]) + </floater.string> + <floater.string + name="group_invitations_tab_title"> + Invitations ([COUNT]) + </floater.string> + <floater.string + name="group_notices_tab_title"> + Group ([COUNT]) + </floater.string> + + <string + name="title_notification_tabbed_window"> + NOTIFICATIONS + </string> + <layout_stack + width="336" + height="533" + enabled="true" + orientation="vertical" + name="TabButtonsStack" + follows="left|top|right|bottom" + top="17"> + <layout_panel + width="336" + height="530" + enabled="true" + name="TabButtonsLayoutPanel"> + <tab_container + follows="left|top|right|bottom" + halign="center" + layout="topleft" + tab_position="top" + left="7" + top="7" + width="336" + height="491" + mouse_opaque="true" + name="notifications_tab_container"> + <panel + border="true" + bevel_style="none" + follows="left|top|right|bottom" + label="System (0)" + layout="topleft" + name="system_notification_list_tab"> + <notification_list_view + color="FloaterDefaultBackgroundColor" + follows="all" + layout="topleft" + name="system_notification_list" + left="0" + top="5" + height="0" + width="330"/> + </panel> + <panel + border="true" + bevel_style="none" + follows="left|top|right|bottom" + label="Transactions (0)" + layout="topleft" + name="transaction_notifications_tab"> + <notification_list_view + color="FloaterDefaultBackgroundColor" + follows="all" + layout="topleft" + name="transaction_notification_list" + left="0" + top="5" + height="0" + width="328"/> + </panel> + <panel + border="true" + bevel_style="none" + follows="left|top|right|bottom" + label="Invitations (0)" + layout="topleft" + name="group_invite_notifications_tab"> + <notification_list_view + color="FloaterDefaultBackgroundColor" + follows="all" + layout="topleft" + name="group_invite_notification_list" + left="0" + top="5" + height="0" + width="328"/> + </panel> + <panel + border="true" + bevel_style="none" + follows="left|top|right|bottom" + label="Group (0)" + layout="topleft" + name="group_notice_notifications_tab"> + <notification_list_view + color="FloaterDefaultBackgroundColor" + follows="all" + layout="topleft" + name="group_notice_notification_list" + left="0" + top="5" + height="0" + width="328"/> + </panel> + </tab_container> + + <layout_stack width="336" height="26" enabled="true" orientation="horizontal" follows="left|right" name="ButtonsStack"> + <layout_panel width="336" height="30" enabled="true" name="CondenseAllButtonPanel"> + <button width="93" height="21" left="2" label="Collapse all" name="collapse_all_button"> + </button> + </layout_panel> + <layout_panel width="336" height="30" enabled="true" name="GapLayoutPanel"> + <panel width="90" height="21" left="2" label="Gap Panel" border="false" name="GapPanel"> + </panel> + </layout_panel> + <layout_panel width="336" height="30" enabled="true" name="DeleteAllButtonPanel"> + <button width="93" height="21" left="2" label="Delete all" name="delete_all_button"> + </button> + </layout_panel> + </layout_stack> + </layout_panel> + </layout_stack> +</floater> diff --git a/indra/newview/skins/default/xui/en/floater_object_weights.xml b/indra/newview/skins/default/xui/en/floater_object_weights.xml index eb283a1043..eb283a1043 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_object_weights.xml +++ b/indra/newview/skins/default/xui/en/floater_object_weights.xml diff --git a/indra/newview/skins/default/xui/en/floater_openobject.xml b/indra/newview/skins/default/xui/en/floater_openobject.xml index 912db80bcc..912db80bcc 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_openobject.xml +++ b/indra/newview/skins/default/xui/en/floater_openobject.xml diff --git a/indra/newview/skins/default/xui/en/floater_outfit_save_as.xml b/indra/newview/skins/default/xui/en/floater_outfit_save_as.xml index bbe280582b..bbe280582b 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_outfit_save_as.xml +++ b/indra/newview/skins/default/xui/en/floater_outfit_save_as.xml diff --git a/indra/newview/skins/default/xui/en/floater_outgoing_call.xml b/indra/newview/skins/default/xui/en/floater_outgoing_call.xml index ffbb6aa28b..ffbb6aa28b 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_outgoing_call.xml +++ b/indra/newview/skins/default/xui/en/floater_outgoing_call.xml diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml index 46ee113b69..46ee113b69 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml +++ b/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml index 2629313069..2629313069 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml +++ b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml index 4a457fb929..4a457fb929 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml +++ b/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml diff --git a/indra/newview/skins/default/xui/en/floater_pay.xml b/indra/newview/skins/default/xui/en/floater_pay.xml index 9d91f801a6..9d91f801a6 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_pay.xml +++ b/indra/newview/skins/default/xui/en/floater_pay.xml diff --git a/indra/newview/skins/default/xui/en/floater_pay_object.xml b/indra/newview/skins/default/xui/en/floater_pay_object.xml index f1e27b918e..f1e27b918e 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_pay_object.xml +++ b/indra/newview/skins/default/xui/en/floater_pay_object.xml diff --git a/indra/newview/skins/default/xui/en/floater_people.xml b/indra/newview/skins/default/xui/en/floater_people.xml index 701233ba4a..701233ba4a 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_people.xml +++ b/indra/newview/skins/default/xui/en/floater_people.xml diff --git a/indra/newview/skins/default/xui/en/floater_picks.xml b/indra/newview/skins/default/xui/en/floater_picks.xml index 984894b016..984894b016 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_picks.xml +++ b/indra/newview/skins/default/xui/en/floater_picks.xml diff --git a/indra/newview/skins/default/xui/en/floater_places.xml b/indra/newview/skins/default/xui/en/floater_places.xml index 31dd6d2c64..31dd6d2c64 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_places.xml +++ b/indra/newview/skins/default/xui/en/floater_places.xml diff --git a/indra/newview/skins/default/xui/en/floater_post_process.xml b/indra/newview/skins/default/xui/en/floater_post_process.xml index 05943a10d3..05943a10d3 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_post_process.xml +++ b/indra/newview/skins/default/xui/en/floater_post_process.xml diff --git a/indra/newview/skins/default/xui/en/floater_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml index bd6faf4ed8..bd6faf4ed8 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_preferences.xml +++ b/indra/newview/skins/default/xui/en/floater_preferences.xml diff --git a/indra/newview/skins/default/xui/en/floater_preferences_proxy.xml b/indra/newview/skins/default/xui/en/floater_preferences_proxy.xml index 93bfe53aae..93bfe53aae 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_preferences_proxy.xml +++ b/indra/newview/skins/default/xui/en/floater_preferences_proxy.xml diff --git a/indra/newview/skins/default/xui/en/floater_preview_animation.xml b/indra/newview/skins/default/xui/en/floater_preview_animation.xml index 3ea5f54f2c..3ea5f54f2c 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_preview_animation.xml +++ b/indra/newview/skins/default/xui/en/floater_preview_animation.xml diff --git a/indra/newview/skins/default/xui/en/floater_preview_gesture.xml b/indra/newview/skins/default/xui/en/floater_preview_gesture.xml index c4ac936334..c4ac936334 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_preview_gesture.xml +++ b/indra/newview/skins/default/xui/en/floater_preview_gesture.xml diff --git a/indra/newview/skins/default/xui/en/floater_preview_notecard.xml b/indra/newview/skins/default/xui/en/floater_preview_notecard.xml index 2e1c8ce670..2e1c8ce670 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_preview_notecard.xml +++ b/indra/newview/skins/default/xui/en/floater_preview_notecard.xml diff --git a/indra/newview/skins/default/xui/en/floater_preview_sound.xml b/indra/newview/skins/default/xui/en/floater_preview_sound.xml index 83a1f5a96f..83a1f5a96f 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_preview_sound.xml +++ b/indra/newview/skins/default/xui/en/floater_preview_sound.xml diff --git a/indra/newview/skins/default/xui/en/floater_preview_texture.xml b/indra/newview/skins/default/xui/en/floater_preview_texture.xml index e1e7e1c8c8..e1e7e1c8c8 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_preview_texture.xml +++ b/indra/newview/skins/default/xui/en/floater_preview_texture.xml diff --git a/indra/newview/skins/default/xui/en/floater_price_for_listing.xml b/indra/newview/skins/default/xui/en/floater_price_for_listing.xml index 6312366b86..6312366b86 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_price_for_listing.xml +++ b/indra/newview/skins/default/xui/en/floater_price_for_listing.xml diff --git a/indra/newview/skins/default/xui/en/floater_publish_classified.xml b/indra/newview/skins/default/xui/en/floater_publish_classified.xml index 322e34272c..322e34272c 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_publish_classified.xml +++ b/indra/newview/skins/default/xui/en/floater_publish_classified.xml diff --git a/indra/newview/skins/default/xui/en/floater_region_debug_console.xml b/indra/newview/skins/default/xui/en/floater_region_debug_console.xml index 11172d8a3e..11172d8a3e 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_region_debug_console.xml +++ b/indra/newview/skins/default/xui/en/floater_region_debug_console.xml diff --git a/indra/newview/skins/default/xui/en/floater_region_info.xml b/indra/newview/skins/default/xui/en/floater_region_info.xml index 3b58cd08f6..3b58cd08f6 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_region_info.xml +++ b/indra/newview/skins/default/xui/en/floater_region_info.xml diff --git a/indra/newview/skins/default/xui/en/floater_report_abuse.xml b/indra/newview/skins/default/xui/en/floater_report_abuse.xml index af62c7a9bc..af62c7a9bc 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_report_abuse.xml +++ b/indra/newview/skins/default/xui/en/floater_report_abuse.xml diff --git a/indra/newview/skins/default/xui/en/floater_script.xml b/indra/newview/skins/default/xui/en/floater_script.xml index bd4edb81c8..bd4edb81c8 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_script.xml +++ b/indra/newview/skins/default/xui/en/floater_script.xml diff --git a/indra/newview/skins/default/xui/en/floater_script_debug.xml b/indra/newview/skins/default/xui/en/floater_script_debug.xml index 53d4925214..53d4925214 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_script_debug.xml +++ b/indra/newview/skins/default/xui/en/floater_script_debug.xml diff --git a/indra/newview/skins/default/xui/en/floater_script_debug_panel.xml b/indra/newview/skins/default/xui/en/floater_script_debug_panel.xml index b5dd2f97b9..b5dd2f97b9 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_script_debug_panel.xml +++ b/indra/newview/skins/default/xui/en/floater_script_debug_panel.xml diff --git a/indra/newview/skins/default/xui/en/floater_script_limits.xml b/indra/newview/skins/default/xui/en/floater_script_limits.xml index 6b36cdfcc5..6b36cdfcc5 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_script_limits.xml +++ b/indra/newview/skins/default/xui/en/floater_script_limits.xml diff --git a/indra/newview/skins/default/xui/en/floater_script_preview.xml b/indra/newview/skins/default/xui/en/floater_script_preview.xml index 91a9e67e4c..91a9e67e4c 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_script_preview.xml +++ b/indra/newview/skins/default/xui/en/floater_script_preview.xml diff --git a/indra/newview/skins/default/xui/en/floater_script_queue.xml b/indra/newview/skins/default/xui/en/floater_script_queue.xml index f4aca7bb3d..f4aca7bb3d 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_script_queue.xml +++ b/indra/newview/skins/default/xui/en/floater_script_queue.xml diff --git a/indra/newview/skins/default/xui/en/floater_script_search.xml b/indra/newview/skins/default/xui/en/floater_script_search.xml index ade0156bc7..ade0156bc7 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_script_search.xml +++ b/indra/newview/skins/default/xui/en/floater_script_search.xml diff --git a/indra/newview/skins/default/xui/en/floater_search.xml b/indra/newview/skins/default/xui/en/floater_search.xml index c3e7028dc5..c3e7028dc5 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_search.xml +++ b/indra/newview/skins/default/xui/en/floater_search.xml diff --git a/indra/newview/skins/default/xui/en/floater_select_key.xml b/indra/newview/skins/default/xui/en/floater_select_key.xml index 4e89df5a73..4e89df5a73 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_select_key.xml +++ b/indra/newview/skins/default/xui/en/floater_select_key.xml diff --git a/indra/newview/skins/default/xui/en/floater_sell_land.xml b/indra/newview/skins/default/xui/en/floater_sell_land.xml index 52de9ddd47..52de9ddd47 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_sell_land.xml +++ b/indra/newview/skins/default/xui/en/floater_sell_land.xml diff --git a/indra/newview/skins/default/xui/en/floater_settings_debug.xml b/indra/newview/skins/default/xui/en/floater_settings_debug.xml index 3ed2bd7206..3ed2bd7206 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_settings_debug.xml +++ b/indra/newview/skins/default/xui/en/floater_settings_debug.xml diff --git a/indra/newview/skins/default/xui/en/floater_side_bar_tab.xml b/indra/newview/skins/default/xui/en/floater_side_bar_tab.xml index 9f14e9ae0a..9f14e9ae0a 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_side_bar_tab.xml +++ b/indra/newview/skins/default/xui/en/floater_side_bar_tab.xml diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml index 76adaad57c..76adaad57c 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_snapshot.xml +++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml diff --git a/indra/newview/skins/default/xui/en/floater_sound_devices.xml b/indra/newview/skins/default/xui/en/floater_sound_devices.xml index dec0e9b6c6..dec0e9b6c6 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_sound_devices.xml +++ b/indra/newview/skins/default/xui/en/floater_sound_devices.xml diff --git a/indra/newview/skins/default/xui/en/floater_sound_preview.xml b/indra/newview/skins/default/xui/en/floater_sound_preview.xml index af791466b6..af791466b6 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_sound_preview.xml +++ b/indra/newview/skins/default/xui/en/floater_sound_preview.xml diff --git a/indra/newview/skins/default/xui/en/floater_spellcheck.xml b/indra/newview/skins/default/xui/en/floater_spellcheck.xml index 76a350dd29..76a350dd29 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_spellcheck.xml +++ b/indra/newview/skins/default/xui/en/floater_spellcheck.xml diff --git a/indra/newview/skins/default/xui/en/floater_spellcheck_import.xml b/indra/newview/skins/default/xui/en/floater_spellcheck_import.xml index b54090015d..b54090015d 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_spellcheck_import.xml +++ b/indra/newview/skins/default/xui/en/floater_spellcheck_import.xml diff --git a/indra/newview/skins/default/xui/en/floater_stats.xml b/indra/newview/skins/default/xui/en/floater_stats.xml index 90f9591f29..90f9591f29 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_stats.xml +++ b/indra/newview/skins/default/xui/en/floater_stats.xml diff --git a/indra/newview/skins/default/xui/en/floater_sys_well.xml b/indra/newview/skins/default/xui/en/floater_sys_well.xml index ecedb27438..2c5176cf01 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_sys_well.xml +++ b/indra/newview/skins/default/xui/en/floater_sys_well.xml @@ -23,10 +23,6 @@ name="title_im_well_window"> CONVERSATIONS </string> - <string - name="title_notification_well_window"> - NOTIFICATIONS - </string> <flat_list_view color="FloaterDefaultBackgroundColor" diff --git a/indra/newview/skins/default/xui/en/floater_telehub.xml b/indra/newview/skins/default/xui/en/floater_telehub.xml index 547613fb67..547613fb67 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_telehub.xml +++ b/indra/newview/skins/default/xui/en/floater_telehub.xml diff --git a/indra/newview/skins/default/xui/en/floater_test_button.xml b/indra/newview/skins/default/xui/en/floater_test_button.xml index 9bc05107a2..9bc05107a2 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_test_button.xml +++ b/indra/newview/skins/default/xui/en/floater_test_button.xml diff --git a/indra/newview/skins/default/xui/en/floater_test_checkbox.xml b/indra/newview/skins/default/xui/en/floater_test_checkbox.xml index 95aaadfcf3..95aaadfcf3 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_test_checkbox.xml +++ b/indra/newview/skins/default/xui/en/floater_test_checkbox.xml diff --git a/indra/newview/skins/default/xui/en/floater_test_combobox.xml b/indra/newview/skins/default/xui/en/floater_test_combobox.xml index 45e2e34da7..45e2e34da7 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_test_combobox.xml +++ b/indra/newview/skins/default/xui/en/floater_test_combobox.xml diff --git a/indra/newview/skins/default/xui/en/floater_test_inspectors.xml b/indra/newview/skins/default/xui/en/floater_test_inspectors.xml index 209285da2e..209285da2e 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_test_inspectors.xml +++ b/indra/newview/skins/default/xui/en/floater_test_inspectors.xml diff --git a/indra/newview/skins/default/xui/en/floater_test_layout.xml b/indra/newview/skins/default/xui/en/floater_test_layout.xml index 94f7e0b798..94f7e0b798 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_test_layout.xml +++ b/indra/newview/skins/default/xui/en/floater_test_layout.xml diff --git a/indra/newview/skins/default/xui/en/floater_test_layout_stacks.xml b/indra/newview/skins/default/xui/en/floater_test_layout_stacks.xml index a04050e7eb..a04050e7eb 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_test_layout_stacks.xml +++ b/indra/newview/skins/default/xui/en/floater_test_layout_stacks.xml diff --git a/indra/newview/skins/default/xui/en/floater_test_line_editor.xml b/indra/newview/skins/default/xui/en/floater_test_line_editor.xml index 2894ad2a32..2894ad2a32 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_test_line_editor.xml +++ b/indra/newview/skins/default/xui/en/floater_test_line_editor.xml diff --git a/indra/newview/skins/default/xui/en/floater_test_list_view.xml b/indra/newview/skins/default/xui/en/floater_test_list_view.xml index 32ccc31dfd..32ccc31dfd 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_test_list_view.xml +++ b/indra/newview/skins/default/xui/en/floater_test_list_view.xml diff --git a/indra/newview/skins/default/xui/en/floater_test_navigation_bar.xml b/indra/newview/skins/default/xui/en/floater_test_navigation_bar.xml index f4a50ecc96..f4a50ecc96 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_test_navigation_bar.xml +++ b/indra/newview/skins/default/xui/en/floater_test_navigation_bar.xml diff --git a/indra/newview/skins/default/xui/en/floater_test_radiogroup.xml b/indra/newview/skins/default/xui/en/floater_test_radiogroup.xml index db14ecae83..db14ecae83 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_test_radiogroup.xml +++ b/indra/newview/skins/default/xui/en/floater_test_radiogroup.xml diff --git a/indra/newview/skins/default/xui/en/floater_test_slider.xml b/indra/newview/skins/default/xui/en/floater_test_slider.xml index 20bd555a03..20bd555a03 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_test_slider.xml +++ b/indra/newview/skins/default/xui/en/floater_test_slider.xml diff --git a/indra/newview/skins/default/xui/en/floater_test_spinner.xml b/indra/newview/skins/default/xui/en/floater_test_spinner.xml index acd49aa492..acd49aa492 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_test_spinner.xml +++ b/indra/newview/skins/default/xui/en/floater_test_spinner.xml diff --git a/indra/newview/skins/default/xui/en/floater_test_text_editor.xml b/indra/newview/skins/default/xui/en/floater_test_text_editor.xml index e1fefc3631..e1fefc3631 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_test_text_editor.xml +++ b/indra/newview/skins/default/xui/en/floater_test_text_editor.xml diff --git a/indra/newview/skins/default/xui/en/floater_test_text_vertical_aligment.xml b/indra/newview/skins/default/xui/en/floater_test_text_vertical_aligment.xml index d11373ce1d..d11373ce1d 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_test_text_vertical_aligment.xml +++ b/indra/newview/skins/default/xui/en/floater_test_text_vertical_aligment.xml diff --git a/indra/newview/skins/default/xui/en/floater_test_textbox.xml b/indra/newview/skins/default/xui/en/floater_test_textbox.xml index 1d31fbd6dc..1d31fbd6dc 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_test_textbox.xml +++ b/indra/newview/skins/default/xui/en/floater_test_textbox.xml diff --git a/indra/newview/skins/default/xui/en/floater_test_toolbar.xml b/indra/newview/skins/default/xui/en/floater_test_toolbar.xml index 067c1fed82..067c1fed82 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_test_toolbar.xml +++ b/indra/newview/skins/default/xui/en/floater_test_toolbar.xml diff --git a/indra/newview/skins/default/xui/en/floater_test_widgets.xml b/indra/newview/skins/default/xui/en/floater_test_widgets.xml index 10854f5a49..10854f5a49 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_test_widgets.xml +++ b/indra/newview/skins/default/xui/en/floater_test_widgets.xml diff --git a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml index 6021ba0a5a..6021ba0a5a 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml +++ b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml diff --git a/indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml index 1ea256b8b3..1ea256b8b3 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml +++ b/indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml index 3c28233875..3c28233875 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_tools.xml +++ b/indra/newview/skins/default/xui/en/floater_tools.xml diff --git a/indra/newview/skins/default/xui/en/floater_top_objects.xml b/indra/newview/skins/default/xui/en/floater_top_objects.xml index 36ceddd305..36ceddd305 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_top_objects.xml +++ b/indra/newview/skins/default/xui/en/floater_top_objects.xml diff --git a/indra/newview/skins/default/xui/en/floater_tos.xml b/indra/newview/skins/default/xui/en/floater_tos.xml index af1617eb39..590d9d1844 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_tos.xml +++ b/indra/newview/skins/default/xui/en/floater_tos.xml @@ -57,6 +57,21 @@ width="552"> Please read the following Terms of Service and Privacy Policy carefully. To continue logging in to [SECOND_LIFE], you must accept the agreement. </text> + <text + type="string" + length="1" + follows="left|top" + font="SansSerif" + height="30" + layout="topleft" + left="16" + name="external_tos_required" + visible="false" + top="32" + word_wrap="true" + width="552"> + You will need to go to my.secondlife.com and log in to accept the Terms of Service before you can proceed. Thank you! + </text> <web_browser trusted_content="true" follows="left|top" diff --git a/indra/newview/skins/default/xui/en/floater_toybox.xml b/indra/newview/skins/default/xui/en/floater_toybox.xml index bc19d6e79f..bc19d6e79f 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_toybox.xml +++ b/indra/newview/skins/default/xui/en/floater_toybox.xml diff --git a/indra/newview/skins/default/xui/en/floater_translation_settings.xml b/indra/newview/skins/default/xui/en/floater_translation_settings.xml index a212ce7889..a212ce7889 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_translation_settings.xml +++ b/indra/newview/skins/default/xui/en/floater_translation_settings.xml diff --git a/indra/newview/skins/default/xui/en/floater_ui_preview.xml b/indra/newview/skins/default/xui/en/floater_ui_preview.xml index eb01294831..eb01294831 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_ui_preview.xml +++ b/indra/newview/skins/default/xui/en/floater_ui_preview.xml diff --git a/indra/newview/skins/default/xui/en/floater_url_entry.xml b/indra/newview/skins/default/xui/en/floater_url_entry.xml index 29fb29fabf..29fb29fabf 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_url_entry.xml +++ b/indra/newview/skins/default/xui/en/floater_url_entry.xml diff --git a/indra/newview/skins/default/xui/en/floater_voice_chat_volume.xml b/indra/newview/skins/default/xui/en/floater_voice_chat_volume.xml index 5c71fd3bc6..5c71fd3bc6 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_voice_chat_volume.xml +++ b/indra/newview/skins/default/xui/en/floater_voice_chat_volume.xml diff --git a/indra/newview/skins/default/xui/en/floater_voice_effect.xml b/indra/newview/skins/default/xui/en/floater_voice_effect.xml index 146c3d7e30..146c3d7e30 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_voice_effect.xml +++ b/indra/newview/skins/default/xui/en/floater_voice_effect.xml diff --git a/indra/newview/skins/default/xui/en/floater_voice_volume.xml b/indra/newview/skins/default/xui/en/floater_voice_volume.xml index 9346295d5b..9346295d5b 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_voice_volume.xml +++ b/indra/newview/skins/default/xui/en/floater_voice_volume.xml diff --git a/indra/newview/skins/default/xui/en/floater_web_content.xml b/indra/newview/skins/default/xui/en/floater_web_content.xml index a80440e844..a80440e844 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_web_content.xml +++ b/indra/newview/skins/default/xui/en/floater_web_content.xml diff --git a/indra/newview/skins/default/xui/en/floater_web_profile.xml b/indra/newview/skins/default/xui/en/floater_web_profile.xml index d0225f78a9..d0225f78a9 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_web_profile.xml +++ b/indra/newview/skins/default/xui/en/floater_web_profile.xml diff --git a/indra/newview/skins/default/xui/en/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/en/floater_whitelist_entry.xml index 897d959b98..897d959b98 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_whitelist_entry.xml +++ b/indra/newview/skins/default/xui/en/floater_whitelist_entry.xml diff --git a/indra/newview/skins/default/xui/en/floater_window_size.xml b/indra/newview/skins/default/xui/en/floater_window_size.xml index 115fe413f3..115fe413f3 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_window_size.xml +++ b/indra/newview/skins/default/xui/en/floater_window_size.xml diff --git a/indra/newview/skins/default/xui/en/floater_world_map.xml b/indra/newview/skins/default/xui/en/floater_world_map.xml index 83407069d2..83407069d2 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_world_map.xml +++ b/indra/newview/skins/default/xui/en/floater_world_map.xml diff --git a/indra/newview/skins/default/xui/en/fonts.xml b/indra/newview/skins/default/xui/en/fonts.xml index ebbb53729d..ebbb53729d 100755..100644 --- a/indra/newview/skins/default/xui/en/fonts.xml +++ b/indra/newview/skins/default/xui/en/fonts.xml diff --git a/indra/newview/skins/default/xui/en/inspect_avatar.xml b/indra/newview/skins/default/xui/en/inspect_avatar.xml index ef4f19cd4c..ef4f19cd4c 100755..100644 --- a/indra/newview/skins/default/xui/en/inspect_avatar.xml +++ b/indra/newview/skins/default/xui/en/inspect_avatar.xml diff --git a/indra/newview/skins/default/xui/en/inspect_group.xml b/indra/newview/skins/default/xui/en/inspect_group.xml index 324ff3eabd..324ff3eabd 100755..100644 --- a/indra/newview/skins/default/xui/en/inspect_group.xml +++ b/indra/newview/skins/default/xui/en/inspect_group.xml diff --git a/indra/newview/skins/default/xui/en/inspect_object.xml b/indra/newview/skins/default/xui/en/inspect_object.xml index bfeb8fc470..bfeb8fc470 100755..100644 --- a/indra/newview/skins/default/xui/en/inspect_object.xml +++ b/indra/newview/skins/default/xui/en/inspect_object.xml diff --git a/indra/newview/skins/default/xui/en/inspect_remote_object.xml b/indra/newview/skins/default/xui/en/inspect_remote_object.xml index e83257d2a0..e83257d2a0 100755..100644 --- a/indra/newview/skins/default/xui/en/inspect_remote_object.xml +++ b/indra/newview/skins/default/xui/en/inspect_remote_object.xml diff --git a/indra/newview/skins/default/xui/en/inspect_toast.xml b/indra/newview/skins/default/xui/en/inspect_toast.xml index 0221397a8c..0221397a8c 100755..100644 --- a/indra/newview/skins/default/xui/en/inspect_toast.xml +++ b/indra/newview/skins/default/xui/en/inspect_toast.xml diff --git a/indra/newview/skins/default/xui/en/inspector_info_ctrl.xml b/indra/newview/skins/default/xui/en/inspector_info_ctrl.xml index a7ecc39ed8..a7ecc39ed8 100755..100644 --- a/indra/newview/skins/default/xui/en/inspector_info_ctrl.xml +++ b/indra/newview/skins/default/xui/en/inspector_info_ctrl.xml diff --git a/indra/newview/skins/default/xui/en/language_settings.xml b/indra/newview/skins/default/xui/en/language_settings.xml index 51779e4bfd..51779e4bfd 100755..100644 --- a/indra/newview/skins/default/xui/en/language_settings.xml +++ b/indra/newview/skins/default/xui/en/language_settings.xml diff --git a/indra/newview/skins/default/xui/en/main_view.xml b/indra/newview/skins/default/xui/en/main_view.xml index 9885e37cea..9885e37cea 100755..100644 --- a/indra/newview/skins/default/xui/en/main_view.xml +++ b/indra/newview/skins/default/xui/en/main_view.xml diff --git a/indra/newview/skins/default/xui/en/menu_add_wearable_gear.xml b/indra/newview/skins/default/xui/en/menu_add_wearable_gear.xml index 5033ea9546..5033ea9546 100755..100644 --- a/indra/newview/skins/default/xui/en/menu_add_wearable_gear.xml +++ b/indra/newview/skins/default/xui/en/menu_add_wearable_gear.xml diff --git a/indra/newview/skins/default/xui/en/menu_attachment_other.xml b/indra/newview/skins/default/xui/en/menu_attachment_other.xml index ba91b0b5d9..ba91b0b5d9 100755..100644 --- a/indra/newview/skins/default/xui/en/menu_attachment_other.xml +++ b/indra/newview/skins/default/xui/en/menu_attachment_other.xml diff --git a/indra/newview/skins/default/xui/en/menu_attachment_self.xml b/indra/newview/skins/default/xui/en/menu_attachment_self.xml index c6ae844d67..c6ae844d67 100755..100644 --- a/indra/newview/skins/default/xui/en/menu_attachment_self.xml +++ b/indra/newview/skins/default/xui/en/menu_attachment_self.xml diff --git a/indra/newview/skins/default/xui/en/menu_avatar_icon.xml b/indra/newview/skins/default/xui/en/menu_avatar_icon.xml index 410caa7290..410caa7290 100755..100644 --- a/indra/newview/skins/default/xui/en/menu_avatar_icon.xml +++ b/indra/newview/skins/default/xui/en/menu_avatar_icon.xml diff --git a/indra/newview/skins/default/xui/en/menu_avatar_other.xml b/indra/newview/skins/default/xui/en/menu_avatar_other.xml index cfbbe41f95..cfbbe41f95 100755..100644 --- a/indra/newview/skins/default/xui/en/menu_avatar_other.xml +++ b/indra/newview/skins/default/xui/en/menu_avatar_other.xml diff --git a/indra/newview/skins/default/xui/en/menu_avatar_self.xml b/indra/newview/skins/default/xui/en/menu_avatar_self.xml index d3b0b07f70..d3b0b07f70 100755..100644 --- a/indra/newview/skins/default/xui/en/menu_avatar_self.xml +++ b/indra/newview/skins/default/xui/en/menu_avatar_self.xml diff --git a/indra/newview/skins/default/xui/en/menu_cof_attachment.xml b/indra/newview/skins/default/xui/en/menu_cof_attachment.xml index c402100fb1..c402100fb1 100755..100644 --- a/indra/newview/skins/default/xui/en/menu_cof_attachment.xml +++ b/indra/newview/skins/default/xui/en/menu_cof_attachment.xml diff --git a/indra/newview/skins/default/xui/en/menu_cof_body_part.xml b/indra/newview/skins/default/xui/en/menu_cof_body_part.xml index f0e8461360..f0e8461360 100755..100644 --- a/indra/newview/skins/default/xui/en/menu_cof_body_part.xml +++ b/indra/newview/skins/default/xui/en/menu_cof_body_part.xml diff --git a/indra/newview/skins/default/xui/en/menu_cof_clothing.xml b/indra/newview/skins/default/xui/en/menu_cof_clothing.xml index 206d49e8c7..206d49e8c7 100755..100644 --- a/indra/newview/skins/default/xui/en/menu_cof_clothing.xml +++ b/indra/newview/skins/default/xui/en/menu_cof_clothing.xml diff --git a/indra/newview/skins/default/xui/en/menu_cof_gear.xml b/indra/newview/skins/default/xui/en/menu_cof_gear.xml index 45cf780557..45cf780557 100755..100644 --- a/indra/newview/skins/default/xui/en/menu_cof_gear.xml +++ b/indra/newview/skins/default/xui/en/menu_cof_gear.xml diff --git a/indra/newview/skins/default/xui/en/menu_conversation.xml b/indra/newview/skins/default/xui/en/menu_conversation.xml index ed362b36e5..ed362b36e5 100755..100644 --- a/indra/newview/skins/default/xui/en/menu_conversation.xml +++ b/indra/newview/skins/default/xui/en/menu_conversation.xml diff --git a/indra/newview/skins/default/xui/en/menu_conversation_log_gear.xml b/indra/newview/skins/default/xui/en/menu_conversation_log_gear.xml index a1a3afbf68..a1a3afbf68 100755..100644 --- a/indra/newview/skins/default/xui/en/menu_conversation_log_gear.xml +++ b/indra/newview/skins/default/xui/en/menu_conversation_log_gear.xml diff --git a/indra/newview/skins/default/xui/en/menu_conversation_log_view.xml b/indra/newview/skins/default/xui/en/menu_conversation_log_view.xml index ce65b23971..ce65b23971 100755..100644 --- a/indra/newview/skins/default/xui/en/menu_conversation_log_view.xml +++ b/indra/newview/skins/default/xui/en/menu_conversation_log_view.xml diff --git a/indra/newview/skins/default/xui/en/menu_edit.xml b/indra/newview/skins/default/xui/en/menu_edit.xml index 99061e089a..99061e089a 100755..100644 --- a/indra/newview/skins/default/xui/en/menu_edit.xml +++ b/indra/newview/skins/default/xui/en/menu_edit.xml diff --git a/indra/newview/skins/default/xui/en/menu_favorites.xml b/indra/newview/skins/default/xui/en/menu_favorites.xml index be380e11e5..be380e11e5 100755..100644 --- a/indra/newview/skins/default/xui/en/menu_favorites.xml +++ b/indra/newview/skins/default/xui/en/menu_favorites.xml diff --git a/indra/newview/skins/default/xui/en/menu_gesture_gear.xml b/indra/newview/skins/default/xui/en/menu_gesture_gear.xml index b08d21e8f4..b08d21e8f4 100755..100644 --- a/indra/newview/skins/default/xui/en/menu_gesture_gear.xml +++ b/indra/newview/skins/default/xui/en/menu_gesture_gear.xml diff --git a/indra/newview/skins/default/xui/en/menu_group_plus.xml b/indra/newview/skins/default/xui/en/menu_group_plus.xml index eca9e7f3c9..eca9e7f3c9 100755..100644 --- a/indra/newview/skins/default/xui/en/menu_group_plus.xml +++ b/indra/newview/skins/default/xui/en/menu_group_plus.xml diff --git a/indra/newview/skins/default/xui/en/menu_hide_navbar.xml b/indra/newview/skins/default/xui/en/menu_hide_navbar.xml index b517fd7957..b517fd7957 100755..100644 --- a/indra/newview/skins/default/xui/en/menu_hide_navbar.xml +++ b/indra/newview/skins/default/xui/en/menu_hide_navbar.xml diff --git a/indra/newview/skins/default/xui/en/menu_im_conversation.xml b/indra/newview/skins/default/xui/en/menu_im_conversation.xml index 43287c6ec3..43287c6ec3 100755..100644 --- a/indra/newview/skins/default/xui/en/menu_im_conversation.xml +++ b/indra/newview/skins/default/xui/en/menu_im_conversation.xml diff --git a/indra/newview/skins/default/xui/en/menu_im_session_showmodes.xml b/indra/newview/skins/default/xui/en/menu_im_session_showmodes.xml index b0adca0e0e..b0adca0e0e 100755..100644 --- a/indra/newview/skins/default/xui/en/menu_im_session_showmodes.xml +++ b/indra/newview/skins/default/xui/en/menu_im_session_showmodes.xml diff --git a/indra/newview/skins/default/xui/en/menu_imchiclet_adhoc.xml b/indra/newview/skins/default/xui/en/menu_imchiclet_adhoc.xml index eb5e31b57d..eb5e31b57d 100755..100644 --- a/indra/newview/skins/default/xui/en/menu_imchiclet_adhoc.xml +++ b/indra/newview/skins/default/xui/en/menu_imchiclet_adhoc.xml diff --git a/indra/newview/skins/default/xui/en/menu_imchiclet_group.xml b/indra/newview/skins/default/xui/en/menu_imchiclet_group.xml index 8cbe62cfb0..8cbe62cfb0 100755..100644 --- a/indra/newview/skins/default/xui/en/menu_imchiclet_group.xml +++ b/indra/newview/skins/default/xui/en/menu_imchiclet_group.xml diff --git a/indra/newview/skins/default/xui/en/menu_imchiclet_p2p.xml b/indra/newview/skins/default/xui/en/menu_imchiclet_p2p.xml index 038b8328cb..038b8328cb 100755..100644 --- a/indra/newview/skins/default/xui/en/menu_imchiclet_p2p.xml +++ b/indra/newview/skins/default/xui/en/menu_imchiclet_p2p.xml diff --git a/indra/newview/skins/default/xui/en/menu_inspect_object_gear.xml b/indra/newview/skins/default/xui/en/menu_inspect_object_gear.xml index 2c420aa1e3..2c420aa1e3 100755..100644 --- a/indra/newview/skins/default/xui/en/menu_inspect_object_gear.xml +++ b/indra/newview/skins/default/xui/en/menu_inspect_object_gear.xml diff --git a/indra/newview/skins/default/xui/en/menu_inv_offer_chiclet.xml b/indra/newview/skins/default/xui/en/menu_inv_offer_chiclet.xml index 45a0a6635b..45a0a6635b 100755..100644 --- a/indra/newview/skins/default/xui/en/menu_inv_offer_chiclet.xml +++ b/indra/newview/skins/default/xui/en/menu_inv_offer_chiclet.xml diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml index 7099db63ab..61002bf1b5 100755..100644 --- 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" @@ -490,14 +565,6 @@ <menu_item_call label="Delete" layout="topleft" - name="Remove Link"> - <menu_item_call.on_click - function="Inventory.DoToSelected" - parameter="delete" /> - </menu_item_call> - <menu_item_call - label="Delete" - layout="topleft" name="Delete"> <menu_item_call.on_click function="Inventory.DoToSelected" @@ -710,20 +777,20 @@ layout="topleft" name="Marketplace Separator" /> <menu_item_call - label="Copy to Merchant Outbox" - layout="topleft" - name="Merchant Copy"> + label="Copy to Marketplace Listings" + layout="topleft" + name="Marketplace Copy"> <menu_item_call.on_click - function="Inventory.DoToSelected" - parameter="copy_to_outbox" /> + function="Inventory.DoToSelected" + parameter="copy_to_marketplace_listings" /> </menu_item_call> <menu_item_call - label="Send to Marketplace" - layout="topleft" - name="Marketplace Send"> + label="Move to Marketplace Listings" + layout="topleft" + name="Marketplace Move"> <menu_item_call.on_click - function="Inventory.DoToSelected" - parameter="send_to_marketplace" /> + 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_inventory_add.xml b/indra/newview/skins/default/xui/en/menu_inventory_add.xml index afeb1bf226..afeb1bf226 100755..100644 --- a/indra/newview/skins/default/xui/en/menu_inventory_add.xml +++ b/indra/newview/skins/default/xui/en/menu_inventory_add.xml diff --git a/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml index 06d0b849a3..06d0b849a3 100755..100644 --- a/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml +++ b/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml diff --git a/indra/newview/skins/default/xui/en/menu_land.xml b/indra/newview/skins/default/xui/en/menu_land.xml index 2ad5cbbe95..2ad5cbbe95 100755..100644 --- a/indra/newview/skins/default/xui/en/menu_land.xml +++ b/indra/newview/skins/default/xui/en/menu_land.xml diff --git a/indra/newview/skins/default/xui/en/menu_landmark.xml b/indra/newview/skins/default/xui/en/menu_landmark.xml index 93b6db222a..93b6db222a 100755..100644 --- a/indra/newview/skins/default/xui/en/menu_landmark.xml +++ b/indra/newview/skins/default/xui/en/menu_landmark.xml diff --git a/indra/newview/skins/default/xui/en/menu_login.xml b/indra/newview/skins/default/xui/en/menu_login.xml index e91eea04d1..419ec359a6 100755..100644 --- a/indra/newview/skins/default/xui/en/menu_login.xml +++ b/indra/newview/skins/default/xui/en/menu_login.xml @@ -108,6 +108,12 @@ function="Floater.Show" parameter="sl_about" /> </menu_item_call> + <menu_item_call + label="Check for Updates" + name="Check for Updates"> + <menu_item_call.on_click + function="Advanced.CheckViewerUpdates"/> + </menu_item_call> </menu> <menu_item_check label="Show Debug Menu" @@ -230,7 +236,7 @@ name="Web Content Floater Debug Test"> <menu_item_call.on_click function="Advanced.WebContentTest" - parameter="http://google.com"/> + parameter="https://callum-linden.s3.amazonaws.com/ceftests.html"/> </menu_item_call> <menu create_jump_keys="true" 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 100644 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_media_ctrl.xml b/indra/newview/skins/default/xui/en/menu_media_ctrl.xml index 960da4bd7a..960da4bd7a 100755..100644 --- a/indra/newview/skins/default/xui/en/menu_media_ctrl.xml +++ b/indra/newview/skins/default/xui/en/menu_media_ctrl.xml diff --git a/indra/newview/skins/default/xui/en/menu_mini_map.xml b/indra/newview/skins/default/xui/en/menu_mini_map.xml index ea263d05ce..ea263d05ce 100755..100644 --- a/indra/newview/skins/default/xui/en/menu_mini_map.xml +++ b/indra/newview/skins/default/xui/en/menu_mini_map.xml diff --git a/indra/newview/skins/default/xui/en/menu_model_import_gear_default.xml b/indra/newview/skins/default/xui/en/menu_model_import_gear_default.xml index 2650903f88..2650903f88 100755..100644 --- a/indra/newview/skins/default/xui/en/menu_model_import_gear_default.xml +++ b/indra/newview/skins/default/xui/en/menu_model_import_gear_default.xml diff --git a/indra/newview/skins/default/xui/en/menu_navbar.xml b/indra/newview/skins/default/xui/en/menu_navbar.xml index b71b866c4b..b71b866c4b 100755..100644 --- a/indra/newview/skins/default/xui/en/menu_navbar.xml +++ b/indra/newview/skins/default/xui/en/menu_navbar.xml diff --git a/indra/newview/skins/default/xui/en/menu_nearby_chat.xml b/indra/newview/skins/default/xui/en/menu_nearby_chat.xml index ff89e20ea5..ff89e20ea5 100755..100644 --- a/indra/newview/skins/default/xui/en/menu_nearby_chat.xml +++ b/indra/newview/skins/default/xui/en/menu_nearby_chat.xml diff --git a/indra/newview/skins/default/xui/en/menu_notification_well_button.xml b/indra/newview/skins/default/xui/en/menu_notification_well_button.xml index 263ac40f4e..263ac40f4e 100755..100644 --- a/indra/newview/skins/default/xui/en/menu_notification_well_button.xml +++ b/indra/newview/skins/default/xui/en/menu_notification_well_button.xml diff --git a/indra/newview/skins/default/xui/en/menu_object.xml b/indra/newview/skins/default/xui/en/menu_object.xml index dc9622a27d..dc9622a27d 100755..100644 --- a/indra/newview/skins/default/xui/en/menu_object.xml +++ b/indra/newview/skins/default/xui/en/menu_object.xml diff --git a/indra/newview/skins/default/xui/en/menu_object_icon.xml b/indra/newview/skins/default/xui/en/menu_object_icon.xml index 2d4f1792c2..2d4f1792c2 100755..100644 --- a/indra/newview/skins/default/xui/en/menu_object_icon.xml +++ b/indra/newview/skins/default/xui/en/menu_object_icon.xml diff --git a/indra/newview/skins/default/xui/en/menu_outfit_gear.xml b/indra/newview/skins/default/xui/en/menu_outfit_gear.xml index 3b8ace6308..3b8ace6308 100755..100644 --- a/indra/newview/skins/default/xui/en/menu_outfit_gear.xml +++ b/indra/newview/skins/default/xui/en/menu_outfit_gear.xml diff --git a/indra/newview/skins/default/xui/en/menu_outfit_tab.xml b/indra/newview/skins/default/xui/en/menu_outfit_tab.xml index 8c8bb29baf..8c8bb29baf 100755..100644 --- a/indra/newview/skins/default/xui/en/menu_outfit_tab.xml +++ b/indra/newview/skins/default/xui/en/menu_outfit_tab.xml diff --git a/indra/newview/skins/default/xui/en/menu_participant_list.xml b/indra/newview/skins/default/xui/en/menu_participant_list.xml index 2c32d9d303..2c32d9d303 100755..100644 --- a/indra/newview/skins/default/xui/en/menu_participant_list.xml +++ b/indra/newview/skins/default/xui/en/menu_participant_list.xml diff --git a/indra/newview/skins/default/xui/en/menu_participant_view.xml b/indra/newview/skins/default/xui/en/menu_participant_view.xml index 7ea87ee05c..7ea87ee05c 100755..100644 --- a/indra/newview/skins/default/xui/en/menu_participant_view.xml +++ b/indra/newview/skins/default/xui/en/menu_participant_view.xml diff --git a/indra/newview/skins/default/xui/en/menu_people_blocked_gear.xml b/indra/newview/skins/default/xui/en/menu_people_blocked_gear.xml index 63295ea27b..63295ea27b 100755..100644 --- a/indra/newview/skins/default/xui/en/menu_people_blocked_gear.xml +++ b/indra/newview/skins/default/xui/en/menu_people_blocked_gear.xml diff --git a/indra/newview/skins/default/xui/en/menu_people_blocked_plus.xml b/indra/newview/skins/default/xui/en/menu_people_blocked_plus.xml index 0c7155667e..0c7155667e 100755..100644 --- a/indra/newview/skins/default/xui/en/menu_people_blocked_plus.xml +++ b/indra/newview/skins/default/xui/en/menu_people_blocked_plus.xml diff --git a/indra/newview/skins/default/xui/en/menu_people_blocked_view.xml b/indra/newview/skins/default/xui/en/menu_people_blocked_view.xml index 2efb70ee37..2efb70ee37 100755..100644 --- a/indra/newview/skins/default/xui/en/menu_people_blocked_view.xml +++ b/indra/newview/skins/default/xui/en/menu_people_blocked_view.xml diff --git a/indra/newview/skins/default/xui/en/menu_people_friends_view.xml b/indra/newview/skins/default/xui/en/menu_people_friends_view.xml index 8790fde7c5..8790fde7c5 100755..100644 --- a/indra/newview/skins/default/xui/en/menu_people_friends_view.xml +++ b/indra/newview/skins/default/xui/en/menu_people_friends_view.xml diff --git a/indra/newview/skins/default/xui/en/menu_people_groups.xml b/indra/newview/skins/default/xui/en/menu_people_groups.xml index 1e0364b84e..1e0364b84e 100755..100644 --- a/indra/newview/skins/default/xui/en/menu_people_groups.xml +++ b/indra/newview/skins/default/xui/en/menu_people_groups.xml diff --git a/indra/newview/skins/default/xui/en/menu_people_groups_view.xml b/indra/newview/skins/default/xui/en/menu_people_groups_view.xml index 73f79f1e70..73f79f1e70 100755..100644 --- a/indra/newview/skins/default/xui/en/menu_people_groups_view.xml +++ b/indra/newview/skins/default/xui/en/menu_people_groups_view.xml diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby.xml b/indra/newview/skins/default/xui/en/menu_people_nearby.xml index f12226ebeb..f12226ebeb 100755..100644 --- a/indra/newview/skins/default/xui/en/menu_people_nearby.xml +++ b/indra/newview/skins/default/xui/en/menu_people_nearby.xml diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/en/menu_people_nearby_multiselect.xml index 5f973088fd..5f973088fd 100755..100644 --- a/indra/newview/skins/default/xui/en/menu_people_nearby_multiselect.xml +++ b/indra/newview/skins/default/xui/en/menu_people_nearby_multiselect.xml diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby_view.xml b/indra/newview/skins/default/xui/en/menu_people_nearby_view.xml index da88ca9f4d..da88ca9f4d 100755..100644 --- a/indra/newview/skins/default/xui/en/menu_people_nearby_view.xml +++ b/indra/newview/skins/default/xui/en/menu_people_nearby_view.xml diff --git a/indra/newview/skins/default/xui/en/menu_people_recent_view.xml b/indra/newview/skins/default/xui/en/menu_people_recent_view.xml index 1dbc90dd2b..1dbc90dd2b 100755..100644 --- a/indra/newview/skins/default/xui/en/menu_people_recent_view.xml +++ b/indra/newview/skins/default/xui/en/menu_people_recent_view.xml diff --git a/indra/newview/skins/default/xui/en/menu_picks.xml b/indra/newview/skins/default/xui/en/menu_picks.xml index ebb49c9004..ebb49c9004 100755..100644 --- a/indra/newview/skins/default/xui/en/menu_picks.xml +++ b/indra/newview/skins/default/xui/en/menu_picks.xml diff --git a/indra/newview/skins/default/xui/en/menu_picks_plus.xml b/indra/newview/skins/default/xui/en/menu_picks_plus.xml index f3b207e36c..f3b207e36c 100755..100644 --- a/indra/newview/skins/default/xui/en/menu_picks_plus.xml +++ b/indra/newview/skins/default/xui/en/menu_picks_plus.xml diff --git a/indra/newview/skins/default/xui/en/menu_place.xml b/indra/newview/skins/default/xui/en/menu_place.xml index 288811d2f6..288811d2f6 100755..100644 --- a/indra/newview/skins/default/xui/en/menu_place.xml +++ b/indra/newview/skins/default/xui/en/menu_place.xml diff --git a/indra/newview/skins/default/xui/en/menu_place_add_button.xml b/indra/newview/skins/default/xui/en/menu_place_add_button.xml index e3a39a1242..e3a39a1242 100755..100644 --- a/indra/newview/skins/default/xui/en/menu_place_add_button.xml +++ b/indra/newview/skins/default/xui/en/menu_place_add_button.xml diff --git a/indra/newview/skins/default/xui/en/menu_places_gear_folder.xml b/indra/newview/skins/default/xui/en/menu_places_gear_folder.xml index 1aeb166e01..1aeb166e01 100755..100644 --- a/indra/newview/skins/default/xui/en/menu_places_gear_folder.xml +++ b/indra/newview/skins/default/xui/en/menu_places_gear_folder.xml diff --git a/indra/newview/skins/default/xui/en/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/en/menu_places_gear_landmark.xml index ff5fdd3795..ff5fdd3795 100755..100644 --- a/indra/newview/skins/default/xui/en/menu_places_gear_landmark.xml +++ b/indra/newview/skins/default/xui/en/menu_places_gear_landmark.xml diff --git a/indra/newview/skins/default/xui/en/menu_profile_overflow.xml b/indra/newview/skins/default/xui/en/menu_profile_overflow.xml index b0b7b554b0..b0b7b554b0 100755..100644 --- a/indra/newview/skins/default/xui/en/menu_profile_overflow.xml +++ b/indra/newview/skins/default/xui/en/menu_profile_overflow.xml diff --git a/indra/newview/skins/default/xui/en/menu_save_outfit.xml b/indra/newview/skins/default/xui/en/menu_save_outfit.xml index 6285bf7417..6285bf7417 100755..100644 --- a/indra/newview/skins/default/xui/en/menu_save_outfit.xml +++ b/indra/newview/skins/default/xui/en/menu_save_outfit.xml diff --git a/indra/newview/skins/default/xui/en/menu_script_chiclet.xml b/indra/newview/skins/default/xui/en/menu_script_chiclet.xml index db29d9cebc..db29d9cebc 100755..100644 --- a/indra/newview/skins/default/xui/en/menu_script_chiclet.xml +++ b/indra/newview/skins/default/xui/en/menu_script_chiclet.xml diff --git a/indra/newview/skins/default/xui/en/menu_slurl.xml b/indra/newview/skins/default/xui/en/menu_slurl.xml index ee37d49946..ee37d49946 100755..100644 --- a/indra/newview/skins/default/xui/en/menu_slurl.xml +++ b/indra/newview/skins/default/xui/en/menu_slurl.xml diff --git a/indra/newview/skins/default/xui/en/menu_teleport_history_gear.xml b/indra/newview/skins/default/xui/en/menu_teleport_history_gear.xml index bc7d4fe33b..bc7d4fe33b 100755..100644 --- a/indra/newview/skins/default/xui/en/menu_teleport_history_gear.xml +++ b/indra/newview/skins/default/xui/en/menu_teleport_history_gear.xml diff --git a/indra/newview/skins/default/xui/en/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/en/menu_teleport_history_item.xml index f939c3996d..f939c3996d 100755..100644 --- a/indra/newview/skins/default/xui/en/menu_teleport_history_item.xml +++ b/indra/newview/skins/default/xui/en/menu_teleport_history_item.xml diff --git a/indra/newview/skins/default/xui/en/menu_teleport_history_tab.xml b/indra/newview/skins/default/xui/en/menu_teleport_history_tab.xml index ecc1d8a954..ecc1d8a954 100755..100644 --- a/indra/newview/skins/default/xui/en/menu_teleport_history_tab.xml +++ b/indra/newview/skins/default/xui/en/menu_teleport_history_tab.xml diff --git a/indra/newview/skins/default/xui/en/menu_text_editor.xml b/indra/newview/skins/default/xui/en/menu_text_editor.xml index 70b40dd89b..70b40dd89b 100755..100644 --- a/indra/newview/skins/default/xui/en/menu_text_editor.xml +++ b/indra/newview/skins/default/xui/en/menu_text_editor.xml diff --git a/indra/newview/skins/default/xui/en/menu_toolbars.xml b/indra/newview/skins/default/xui/en/menu_toolbars.xml index fbe40a7244..fbe40a7244 100755..100644 --- a/indra/newview/skins/default/xui/en/menu_toolbars.xml +++ b/indra/newview/skins/default/xui/en/menu_toolbars.xml diff --git a/indra/newview/skins/default/xui/en/menu_topinfobar.xml b/indra/newview/skins/default/xui/en/menu_topinfobar.xml index cbe249ed4d..cbe249ed4d 100755..100644 --- a/indra/newview/skins/default/xui/en/menu_topinfobar.xml +++ b/indra/newview/skins/default/xui/en/menu_topinfobar.xml diff --git a/indra/newview/skins/default/xui/en/menu_url_agent.xml b/indra/newview/skins/default/xui/en/menu_url_agent.xml index e8b6116026..e8b6116026 100755..100644 --- a/indra/newview/skins/default/xui/en/menu_url_agent.xml +++ b/indra/newview/skins/default/xui/en/menu_url_agent.xml diff --git a/indra/newview/skins/default/xui/en/menu_url_email.xml b/indra/newview/skins/default/xui/en/menu_url_email.xml new file mode 100644 index 0000000000..6467fe5c90 --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_url_email.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<context_menu + layout="topleft" + name="Email Popup"> + <menu_item_call + label="Compose Email in an External client" + layout="topleft" + name="email_open_external"> + <menu_item_call.on_click + function="Url.OpenExternal" /> + </menu_item_call> + <menu_item_separator + layout="topleft" /> + <menu_item_call + label="Copy Email to clipboard" + layout="topleft" + name="email_copy"> + <menu_item_call.on_click + function="Url.CopyLabel" /> + </menu_item_call> +</context_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_url_group.xml b/indra/newview/skins/default/xui/en/menu_url_group.xml index 2cb125ce09..2cb125ce09 100755..100644 --- a/indra/newview/skins/default/xui/en/menu_url_group.xml +++ b/indra/newview/skins/default/xui/en/menu_url_group.xml diff --git a/indra/newview/skins/default/xui/en/menu_url_http.xml b/indra/newview/skins/default/xui/en/menu_url_http.xml index 7a4b1e619b..7a4b1e619b 100755..100644 --- a/indra/newview/skins/default/xui/en/menu_url_http.xml +++ b/indra/newview/skins/default/xui/en/menu_url_http.xml diff --git a/indra/newview/skins/default/xui/en/menu_url_inventory.xml b/indra/newview/skins/default/xui/en/menu_url_inventory.xml index cf9d1d5881..cf9d1d5881 100755..100644 --- a/indra/newview/skins/default/xui/en/menu_url_inventory.xml +++ b/indra/newview/skins/default/xui/en/menu_url_inventory.xml diff --git a/indra/newview/skins/default/xui/en/menu_url_map.xml b/indra/newview/skins/default/xui/en/menu_url_map.xml index 2ca9e3b3fe..2ca9e3b3fe 100755..100644 --- a/indra/newview/skins/default/xui/en/menu_url_map.xml +++ b/indra/newview/skins/default/xui/en/menu_url_map.xml diff --git a/indra/newview/skins/default/xui/en/menu_url_objectim.xml b/indra/newview/skins/default/xui/en/menu_url_objectim.xml index b9d003b841..b9d003b841 100755..100644 --- a/indra/newview/skins/default/xui/en/menu_url_objectim.xml +++ b/indra/newview/skins/default/xui/en/menu_url_objectim.xml diff --git a/indra/newview/skins/default/xui/en/menu_url_parcel.xml b/indra/newview/skins/default/xui/en/menu_url_parcel.xml index f477c310fb..f477c310fb 100755..100644 --- a/indra/newview/skins/default/xui/en/menu_url_parcel.xml +++ b/indra/newview/skins/default/xui/en/menu_url_parcel.xml diff --git a/indra/newview/skins/default/xui/en/menu_url_slapp.xml b/indra/newview/skins/default/xui/en/menu_url_slapp.xml index 6d1060b633..6d1060b633 100755..100644 --- a/indra/newview/skins/default/xui/en/menu_url_slapp.xml +++ b/indra/newview/skins/default/xui/en/menu_url_slapp.xml diff --git a/indra/newview/skins/default/xui/en/menu_url_slurl.xml b/indra/newview/skins/default/xui/en/menu_url_slurl.xml index 98abc206a5..98abc206a5 100755..100644 --- a/indra/newview/skins/default/xui/en/menu_url_slurl.xml +++ b/indra/newview/skins/default/xui/en/menu_url_slurl.xml diff --git a/indra/newview/skins/default/xui/en/menu_url_teleport.xml b/indra/newview/skins/default/xui/en/menu_url_teleport.xml index 289e32bcf4..289e32bcf4 100755..100644 --- a/indra/newview/skins/default/xui/en/menu_url_teleport.xml +++ b/indra/newview/skins/default/xui/en/menu_url_teleport.xml diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index b75d614dcc..8de9a1a99a 100755..100644 --- 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..." @@ -127,7 +134,7 @@ </menu_item_call> <menu_item_call label="Walk / run / fly..." - name="Walk / run / fly"> + name="WalkRunFly"> <menu_item_call.on_click function="Floater.ToggleOrBringToFront" parameter="moveview" /> @@ -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"> @@ -495,7 +509,7 @@ </menu_item_call> <menu_item_call label="Region / Estate" - name="Region/Estate"> + name="RegionEstate"> <menu_item_call.on_click function="Floater.Show" parameter="region_info" /> @@ -1432,6 +1446,12 @@ function="Floater.Show" parameter="sl_about" /> </menu_item_call> + <menu_item_call + label="Check for Updates" + name="Check for Updates"> + <menu_item_call.on_click + function="Advanced.CheckViewerUpdates"/> + </menu_item_call> </menu> <menu create_jump_keys="true" @@ -3171,7 +3191,7 @@ shortcut="control|shift|Z"> <menu_item_call.on_click function="Advanced.WebContentTest" - parameter="http://google.com"/> + parameter="https://callum-linden.s3.amazonaws.com/ceftests.html"/> </menu_item_call> <menu_item_call label="FB Connect Test" diff --git a/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml index aa56b4ba63..aa56b4ba63 100755..100644 --- a/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml +++ b/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml diff --git a/indra/newview/skins/default/xui/en/menu_wearing_gear.xml b/indra/newview/skins/default/xui/en/menu_wearing_gear.xml index 0e858ccf10..0e858ccf10 100755..100644 --- a/indra/newview/skins/default/xui/en/menu_wearing_gear.xml +++ b/indra/newview/skins/default/xui/en/menu_wearing_gear.xml diff --git a/indra/newview/skins/default/xui/en/menu_wearing_tab.xml b/indra/newview/skins/default/xui/en/menu_wearing_tab.xml index 2d54e69601..2d54e69601 100755..100644 --- a/indra/newview/skins/default/xui/en/menu_wearing_tab.xml +++ b/indra/newview/skins/default/xui/en/menu_wearing_tab.xml diff --git a/indra/newview/skins/default/xui/en/mime_types.xml b/indra/newview/skins/default/xui/en/mime_types.xml index f5f2223330..7cb4a6e53b 100755..100644 --- a/indra/newview/skins/default/xui/en/mime_types.xml +++ b/indra/newview/skins/default/xui/en/mime_types.xml @@ -7,7 +7,7 @@ none </defaultwidget> <defaultimpl> - media_plugin_webkit + media_plugin_cef </defaultimpl> <widgetset name="web"> <label name="web_label"> @@ -141,7 +141,7 @@ none </widgettype> <impl> - media_plugin_webkit + media_plugin_cef </impl> </mimetype> <mimetype name="none/none"> @@ -152,7 +152,7 @@ none </widgettype> <impl> - media_plugin_webkit + media_plugin_cef </impl> </mimetype> <mimetype name="audio/*"> @@ -185,7 +185,7 @@ image </widgettype> <impl> - media_plugin_webkit + media_plugin_cef </impl> </mimetype> <mimetype menu="1" name="video/vnd.secondlife.qt.legacy"> @@ -207,7 +207,7 @@ web </widgettype> <impl> - media_plugin_webkit + media_plugin_cef </impl> </mimetype> <mimetype name="application/ogg"> @@ -229,7 +229,7 @@ image </widgettype> <impl> - media_plugin_webkit + media_plugin_cef </impl> </mimetype> <mimetype name="application/postscript"> @@ -240,7 +240,7 @@ image </widgettype> <impl> - media_plugin_webkit + media_plugin_cef </impl> </mimetype> <mimetype name="application/rtf"> @@ -251,7 +251,7 @@ image </widgettype> <impl> - media_plugin_webkit + media_plugin_cef </impl> </mimetype> <mimetype name="application/smil"> @@ -262,7 +262,7 @@ movie </widgettype> <impl> - media_plugin_webkit + media_plugin_cef </impl> </mimetype> <mimetype name="application/xhtml+xml"> @@ -273,7 +273,7 @@ web </widgettype> <impl> - media_plugin_webkit + media_plugin_cef </impl> </mimetype> <mimetype name="application/x-director"> @@ -284,7 +284,7 @@ image </widgettype> <impl> - media_plugin_webkit + media_plugin_cef </impl> </mimetype> <mimetype name="audio/mid"> @@ -339,7 +339,7 @@ image </widgettype> <impl> - media_plugin_webkit + media_plugin_cef </impl> </mimetype> <mimetype menu="1" name="image/gif"> @@ -350,7 +350,7 @@ image </widgettype> <impl> - media_plugin_webkit + media_plugin_cef </impl> </mimetype> <mimetype menu="1" name="image/jpeg"> @@ -361,7 +361,7 @@ image </widgettype> <impl> - media_plugin_webkit + media_plugin_cef </impl> </mimetype> <mimetype menu="1" name="image/png"> @@ -372,7 +372,7 @@ image </widgettype> <impl> - media_plugin_webkit + media_plugin_cef </impl> </mimetype> <mimetype name="image/svg+xml"> @@ -383,7 +383,7 @@ image </widgettype> <impl> - media_plugin_webkit + media_plugin_cef </impl> </mimetype> <mimetype menu="1" name="image/tiff"> @@ -394,7 +394,7 @@ image </widgettype> <impl> - media_plugin_webkit + media_plugin_cef </impl> </mimetype> <mimetype menu="1" name="text/html"> @@ -405,7 +405,7 @@ web </widgettype> <impl> - media_plugin_webkit + media_plugin_cef </impl> </mimetype> <mimetype menu="1" name="text/plain"> @@ -416,7 +416,7 @@ text </widgettype> <impl> - media_plugin_webkit + media_plugin_cef </impl> </mimetype> <mimetype name="text/xml"> @@ -427,7 +427,7 @@ text </widgettype> <impl> - media_plugin_webkit + media_plugin_cef </impl> </mimetype> <mimetype menu="1" name="video/mpeg"> diff --git a/indra/newview/skins/default/xui/en/mime_types_linux.xml b/indra/newview/skins/default/xui/en/mime_types_linux.xml index 84aeaf3b54..84aeaf3b54 100755..100644 --- a/indra/newview/skins/default/xui/en/mime_types_linux.xml +++ b/indra/newview/skins/default/xui/en/mime_types_linux.xml diff --git a/indra/newview/skins/default/xui/en/mime_types_mac.xml b/indra/newview/skins/default/xui/en/mime_types_mac.xml index 90230f12dd..f71c24b2e4 100755..100644 --- a/indra/newview/skins/default/xui/en/mime_types_mac.xml +++ b/indra/newview/skins/default/xui/en/mime_types_mac.xml @@ -7,7 +7,7 @@ none </defaultwidget> <defaultimpl> - media_plugin_webkit + media_plugin_cef </defaultimpl> <widgetset name="web"> <label name="web_label"> @@ -152,7 +152,7 @@ none </widgettype> <impl> - media_plugin_webkit + media_plugin_cef </impl> </mimetype> <mimetype name="audio/*"> @@ -185,7 +185,7 @@ image </widgettype> <impl> - media_plugin_webkit + media_plugin_cef </impl> </mimetype> <mimetype menu="1" name="video/vnd.secondlife.qt.legacy"> @@ -207,7 +207,7 @@ web </widgettype> <impl> - media_plugin_webkit + media_plugin_cef </impl> </mimetype> <mimetype name="application/ogg"> @@ -229,7 +229,7 @@ image </widgettype> <impl> - media_plugin_webkit + media_plugin_cef </impl> </mimetype> <mimetype name="application/postscript"> @@ -240,7 +240,7 @@ image </widgettype> <impl> - media_plugin_webkit + media_plugin_cef </impl> </mimetype> <mimetype name="application/rtf"> @@ -251,7 +251,7 @@ image </widgettype> <impl> - media_plugin_webkit + media_plugin_cef </impl> </mimetype> <mimetype name="application/smil"> @@ -262,7 +262,7 @@ movie </widgettype> <impl> - media_plugin_webkit + media_plugin_cef </impl> </mimetype> <mimetype name="application/xhtml+xml"> @@ -273,7 +273,7 @@ web </widgettype> <impl> - media_plugin_webkit + media_plugin_cef </impl> </mimetype> <mimetype name="application/x-director"> @@ -284,7 +284,7 @@ image </widgettype> <impl> - media_plugin_webkit + media_plugin_cef </impl> </mimetype> <mimetype name="audio/mid"> @@ -339,7 +339,7 @@ image </widgettype> <impl> - media_plugin_webkit + media_plugin_cef </impl> </mimetype> <mimetype menu="1" name="image/gif"> @@ -350,7 +350,7 @@ image </widgettype> <impl> - media_plugin_webkit + media_plugin_cef </impl> </mimetype> <mimetype menu="1" name="image/jpeg"> @@ -361,7 +361,7 @@ image </widgettype> <impl> - media_plugin_webkit + media_plugin_cef </impl> </mimetype> <mimetype menu="1" name="image/png"> @@ -372,7 +372,7 @@ image </widgettype> <impl> - media_plugin_webkit + media_plugin_cef </impl> </mimetype> <mimetype name="image/svg+xml"> @@ -383,7 +383,7 @@ image </widgettype> <impl> - media_plugin_webkit + media_plugin_cef </impl> </mimetype> <mimetype menu="1" name="image/tiff"> @@ -394,7 +394,7 @@ image </widgettype> <impl> - media_plugin_webkit + media_plugin_cef </impl> </mimetype> <mimetype menu="1" name="text/html"> @@ -405,7 +405,7 @@ web </widgettype> <impl> - media_plugin_webkit + media_plugin_cef </impl> </mimetype> <mimetype menu="1" name="text/plain"> @@ -416,7 +416,7 @@ text </widgettype> <impl> - media_plugin_webkit + media_plugin_cef </impl> </mimetype> <mimetype name="text/xml"> @@ -427,7 +427,7 @@ text </widgettype> <impl> - media_plugin_webkit + media_plugin_cef </impl> </mimetype> <mimetype menu="1" name="video/mpeg"> diff --git a/indra/newview/skins/default/xui/en/notification_visibility.xml b/indra/newview/skins/default/xui/en/notification_visibility.xml index db292100d7..db292100d7 100755..100644 --- a/indra/newview/skins/default/xui/en/notification_visibility.xml +++ b/indra/newview/skins/default/xui/en/notification_visibility.xml diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 28565a85c6..b4c5cba1fd 100755..100644 --- 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 : + + '[ERROR_CODE]' + + <usetemplate + name="okbutton" + yestext="OK"/> + </notification> + + <notification + icon="OutboxStatus_Error" + name="MerchantPasteFailed" + type="outbox"> + Copy or move to Marketplace Listings failed with error : + + '[ERROR_CODE]' + + <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 : '[ERROR_REASON]' + [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 : + + '[ERROR_CODE]' + + <usetemplate + name="okbutton" + yestext="OK"/> + </notification> + + <notification + icon="OutboxStatus_Error" + name="MerchantFolderActivationFailed" + type="outbox"> + Activating this version folder failed with error : + + '[ERROR_CODE]' + + <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"> @@ -577,6 +819,33 @@ If you no longer wish to have these abilities granted to this role, disable them notext="Cancel" yestext="Eject"/> </notification> + + <notification + icon="alertmodal.tga" + name="BanGroupMemberWarning" + type="alertmodal"> + You are about to ban [AVATAR_NAME] from the group. + <tag>group</tag> + <tag>confirm</tag> + <usetemplate + ignoretext="Confirm banning a participant from group" + name="okcancelignore" + notext="Cancel" + yestext="Ban"/> + </notification> + <notification + icon="alertmodal.tga" + name="BanGroupMembersWarning" + type="alertmodal"> + You are about to ban [COUNT] members from group. + <tag>group</tag> + <tag>confirm</tag> + <usetemplate + ignoretext="Confirm banning multiple members from group" + name="okcancelignore" + notext="Cancel" + yestext="Ban"/> + </notification> <notification icon="alertmodal.tga" @@ -783,7 +1052,7 @@ Objects: [N] icon="alertmodal.tga" name="ReturnAllTopObjects" type="alertmodal"> -Are you sure you want to return all listed objects back to their owner's inventory? +Are you sure you want to return all listed objects back to their owner's inventory? This will return ALL scripted objects in the region! <tag>confirm</tag> <usetemplate name="okcancelbuttons" @@ -1323,11 +1592,24 @@ The object may be out of range or may have been deleted. icon="alertmodal.tga" name="CannotDownloadFile" type="alertmodal"> -Unable to download file - <tag>fail</tag> + Unable to download file + <tag>fail</tag> </notification> <notification + name="MediaFileDownloadUnsupported" + label="" + type="alert"> + <unique/> + <tag>confirm</tag> + You have requested a file download, which is not supported within [SECOND_LIFE]. + <usetemplate + ignoretext="Warn about unsupported file downloads" + name="okignore" + yestext="OK"/> + </notification> + + <notification icon="alertmodal.tga" name="CannotWriteFile" type="alertmodal"> @@ -3650,6 +3932,53 @@ see [[INFO_URL] Information about this update] name="okbutton" yestext="OK"/> </notification> + + <notification + icon="alertmodal.tga" + name="UpdateDownloadInProgress" + type="alertmodal"> +An update is available! +It's downloading in the background and we will prompt you to restart your viewer to finish installing it as soon as it's ready. + <tag>confirm</tag> + <usetemplate + name="okbutton" + yestext="OK"/> + </notification> + + <notification + icon="alertmodal.tga" + name="UpdateDownloadComplete" + type="alertmodal"> +An update was downloaded. It will be installed during restart. + <tag>confirm</tag> + <usetemplate + name="okbutton" + yestext="OK"/> + </notification> + + <notification + icon="alertmodal.tga" + name="UpdateCheckError" + type="alertmodal"> +An error occured while checking for update. +Please try again later. + <tag>confirm</tag> + <usetemplate + name="okbutton" + yestext="OK"/> + </notification> + + <notification + icon="alertmodal.tga" + name="UpdateViewerUpToDate" + type="alertmodal"> +Your viewer is up to date! +If you can't wait to try out the latest features and fixes, check out the Alternate Viewers page. http://wiki.secondlife.com/wiki/Linden_Lab_Official:Alternate_Viewers. + <tag>confirm</tag> + <usetemplate + name="okbutton" + yestext="OK"/> + </notification> <notification icon="alertmodal.tga" @@ -3975,6 +4304,21 @@ You have reached your maximum number of groups. Please leave some group before j <notification icon="alert.tga" + name="GroupLimitInfo" + type="alert"> +The group limit for base accounts is [MAX_BASIC], and for [https://secondlife.com/premium/ premium] +accounts is [MAX_PREMIUM]. +If you downgraded your account, you will need to get below [MAX_BASIC] group limit before you can join more. + +[https://secondlife.com/my/account/membership.php Upgrade today!] + <tag>group</tag> + <usetemplate + name="okbutton" + yestext="Close"/> + </notification> + + <notification + icon="alert.tga" name="KickUser" type="alert"> <tag>win</tag> @@ -4468,6 +4812,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 +4931,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"> @@ -5376,16 +5811,19 @@ You cannot undo this action. notext="Cancel" yestext="OK"/> </notification> - + <notification - icon="alertmodal.tga" - name="HelpReportAbuseEmailLL" - type="alert"> + icon="alertmodal.tga" + name="ConfirmUnlink" + type="alertmodal"> <unique/> - -Use this tool to report violations of the [http://secondlife.com/corporate/tos.php Terms of Service] and [http://secondlife.com/corporate/cs.php Community Standards]. - -All reported abuses are investigated and resolved. + This is a large selection with linksets. If you unlink it, you may not be able to link it again. You may wish to take copies of linksets into your inventory as a precaution. + <tag>confirm</tag> + <usetemplate + ignoretext="Confirm when unlinking a linkset" + name="okcancelignore" + notext="Cancel" + yestext="Unlink"/> </notification> <notification @@ -6693,15 +7131,6 @@ No valid circuit code. <notification icon="notify.tga" - name="NoValidTimestamp" - persist="true" - type="notify"> - <tag>fail</tag> -No valid timestamp. - </notification> - - <notification - icon="notify.tga" name="NoPendingConnection" persist="true" type="notify"> @@ -7173,6 +7602,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"> +'<nolink>[OBJECTNAME]</nolink>', an object owned by '[NAME]', 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" @@ -7783,9 +8360,8 @@ Select residents to share with. name="MeshUploadError" icon="alert.tga" type="alert"> - [LABEL] failed to upload: [MESSAGE] [IDENTIFIER] - -See the log file for details. + [LABEL] failed to upload: [MESSAGE] [IDENTIFIER] +[DETAILS]See SecondLife.log for details </notification> <notification @@ -8026,7 +8602,7 @@ We cannot display a preview of this texture because it is no-copy and/or no-tran <notification icon="alertmodal.tga" name="ConfirmLeaveCall" - type="alert"> + type="alertmodal"> Are you sure you want to leave this call? <tag>confirm</tag> <tag>voice</tag> diff --git a/indra/newview/skins/default/xui/en/outfit_accordion_tab.xml b/indra/newview/skins/default/xui/en/outfit_accordion_tab.xml index 2a24c74feb..2a24c74feb 100755..100644 --- a/indra/newview/skins/default/xui/en/outfit_accordion_tab.xml +++ b/indra/newview/skins/default/xui/en/outfit_accordion_tab.xml diff --git a/indra/newview/skins/default/xui/en/panel_active_object_row.xml b/indra/newview/skins/default/xui/en/panel_active_object_row.xml index 3e3271b181..3e3271b181 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_active_object_row.xml +++ b/indra/newview/skins/default/xui/en/panel_active_object_row.xml diff --git a/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml index aa1b929412..aa1b929412 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml +++ b/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml diff --git a/indra/newview/skins/default/xui/en/panel_avatar_tag.xml b/indra/newview/skins/default/xui/en/panel_avatar_tag.xml index b779b08a63..b779b08a63 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_avatar_tag.xml +++ b/indra/newview/skins/default/xui/en/panel_avatar_tag.xml diff --git a/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml index 53d0252215..53d0252215 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml +++ b/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml diff --git a/indra/newview/skins/default/xui/en/panel_blocked_list_item.xml b/indra/newview/skins/default/xui/en/panel_blocked_list_item.xml index 752321b949..752321b949 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_blocked_list_item.xml +++ b/indra/newview/skins/default/xui/en/panel_blocked_list_item.xml diff --git a/indra/newview/skins/default/xui/en/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/en/panel_body_parts_list_item.xml index 216a265164..216a265164 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_body_parts_list_item.xml +++ b/indra/newview/skins/default/xui/en/panel_body_parts_list_item.xml diff --git a/indra/newview/skins/default/xui/en/panel_bodyparts_list_button_bar.xml b/indra/newview/skins/default/xui/en/panel_bodyparts_list_button_bar.xml index dc123f13f4..dc123f13f4 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_bodyparts_list_button_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_bodyparts_list_button_bar.xml diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray_lite.xml b/indra/newview/skins/default/xui/en/panel_bottomtray_lite.xml index 1c0b205c4f..1c0b205c4f 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_bottomtray_lite.xml +++ b/indra/newview/skins/default/xui/en/panel_bottomtray_lite.xml diff --git a/indra/newview/skins/default/xui/en/panel_chat_header.xml b/indra/newview/skins/default/xui/en/panel_chat_header.xml index 5c5c718bdf..5c5c718bdf 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_chat_header.xml +++ b/indra/newview/skins/default/xui/en/panel_chat_header.xml diff --git a/indra/newview/skins/default/xui/en/panel_chat_item.xml b/indra/newview/skins/default/xui/en/panel_chat_item.xml index 1ef99649e6..1ef99649e6 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_chat_item.xml +++ b/indra/newview/skins/default/xui/en/panel_chat_item.xml diff --git a/indra/newview/skins/default/xui/en/panel_chat_separator.xml b/indra/newview/skins/default/xui/en/panel_chat_separator.xml index 357dbc07cc..357dbc07cc 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_chat_separator.xml +++ b/indra/newview/skins/default/xui/en/panel_chat_separator.xml diff --git a/indra/newview/skins/default/xui/en/panel_chiclet_bar.xml b/indra/newview/skins/default/xui/en/panel_chiclet_bar.xml index fc321fdd23..fc321fdd23 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_chiclet_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_chiclet_bar.xml diff --git a/indra/newview/skins/default/xui/en/panel_classified_info.xml b/indra/newview/skins/default/xui/en/panel_classified_info.xml index d4a2745d1d..d4a2745d1d 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_classified_info.xml +++ b/indra/newview/skins/default/xui/en/panel_classified_info.xml diff --git a/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml b/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml index 27c653bc35..27c653bc35 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml +++ b/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml diff --git a/indra/newview/skins/default/xui/en/panel_clothing_list_button_bar.xml b/indra/newview/skins/default/xui/en/panel_clothing_list_button_bar.xml index 5b3f0b17a9..5b3f0b17a9 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_clothing_list_button_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_clothing_list_button_bar.xml diff --git a/indra/newview/skins/default/xui/en/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/en/panel_clothing_list_item.xml index cc0541e65c..cc0541e65c 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_clothing_list_item.xml +++ b/indra/newview/skins/default/xui/en/panel_clothing_list_item.xml diff --git a/indra/newview/skins/default/xui/en/panel_cof_wearables.xml b/indra/newview/skins/default/xui/en/panel_cof_wearables.xml index aa8e3d07a6..aa8e3d07a6 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_cof_wearables.xml +++ b/indra/newview/skins/default/xui/en/panel_cof_wearables.xml diff --git a/indra/newview/skins/default/xui/en/panel_conversation_list_item.xml b/indra/newview/skins/default/xui/en/panel_conversation_list_item.xml index 4372cf69bf..4372cf69bf 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_conversation_list_item.xml +++ b/indra/newview/skins/default/xui/en/panel_conversation_list_item.xml diff --git a/indra/newview/skins/default/xui/en/panel_conversation_log_list_item.xml b/indra/newview/skins/default/xui/en/panel_conversation_log_list_item.xml index 78d4c174d2..78d4c174d2 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_conversation_log_list_item.xml +++ b/indra/newview/skins/default/xui/en/panel_conversation_log_list_item.xml diff --git a/indra/newview/skins/default/xui/en/panel_deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/en/panel_deletable_wearable_list_item.xml index de2ff0afc9..de2ff0afc9 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_deletable_wearable_list_item.xml +++ b/indra/newview/skins/default/xui/en/panel_deletable_wearable_list_item.xml diff --git a/indra/newview/skins/default/xui/en/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/en/panel_dummy_clothing_list_item.xml index 4b05ab27e4..4b05ab27e4 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_dummy_clothing_list_item.xml +++ b/indra/newview/skins/default/xui/en/panel_dummy_clothing_list_item.xml diff --git a/indra/newview/skins/default/xui/en/panel_edit_alpha.xml b/indra/newview/skins/default/xui/en/panel_edit_alpha.xml index 813aa5d7a9..813aa5d7a9 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_edit_alpha.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_alpha.xml diff --git a/indra/newview/skins/default/xui/en/panel_edit_classified.xml b/indra/newview/skins/default/xui/en/panel_edit_classified.xml index 3509eaa285..3509eaa285 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_edit_classified.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_classified.xml diff --git a/indra/newview/skins/default/xui/en/panel_edit_eyes.xml b/indra/newview/skins/default/xui/en/panel_edit_eyes.xml index f173a2f3cb..f173a2f3cb 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_edit_eyes.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_eyes.xml diff --git a/indra/newview/skins/default/xui/en/panel_edit_gloves.xml b/indra/newview/skins/default/xui/en/panel_edit_gloves.xml index 8c0c543d71..8c0c543d71 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_edit_gloves.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_gloves.xml diff --git a/indra/newview/skins/default/xui/en/panel_edit_hair.xml b/indra/newview/skins/default/xui/en/panel_edit_hair.xml index 6bb5d2fa9b..6bb5d2fa9b 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_edit_hair.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_hair.xml diff --git a/indra/newview/skins/default/xui/en/panel_edit_jacket.xml b/indra/newview/skins/default/xui/en/panel_edit_jacket.xml index 0f8c37c691..0f8c37c691 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_edit_jacket.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_jacket.xml diff --git a/indra/newview/skins/default/xui/en/panel_edit_pants.xml b/indra/newview/skins/default/xui/en/panel_edit_pants.xml index dd749a9259..dd749a9259 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_edit_pants.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_pants.xml diff --git a/indra/newview/skins/default/xui/en/panel_edit_physics.xml b/indra/newview/skins/default/xui/en/panel_edit_physics.xml index 0092ceb0dd..0092ceb0dd 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_edit_physics.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_physics.xml diff --git a/indra/newview/skins/default/xui/en/panel_edit_pick.xml b/indra/newview/skins/default/xui/en/panel_edit_pick.xml index 553c112e6f..553c112e6f 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_edit_pick.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_pick.xml diff --git a/indra/newview/skins/default/xui/en/panel_edit_profile.xml b/indra/newview/skins/default/xui/en/panel_edit_profile.xml index 2c7c8133d1..2c7c8133d1 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_edit_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_profile.xml diff --git a/indra/newview/skins/default/xui/en/panel_edit_shape.xml b/indra/newview/skins/default/xui/en/panel_edit_shape.xml index d295f5fe4a..d295f5fe4a 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_edit_shape.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_shape.xml diff --git a/indra/newview/skins/default/xui/en/panel_edit_shirt.xml b/indra/newview/skins/default/xui/en/panel_edit_shirt.xml index 5424b805e1..5424b805e1 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_edit_shirt.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_shirt.xml diff --git a/indra/newview/skins/default/xui/en/panel_edit_shoes.xml b/indra/newview/skins/default/xui/en/panel_edit_shoes.xml index 859e7454a4..859e7454a4 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_edit_shoes.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_shoes.xml diff --git a/indra/newview/skins/default/xui/en/panel_edit_skin.xml b/indra/newview/skins/default/xui/en/panel_edit_skin.xml index b61f65a3d1..b61f65a3d1 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_edit_skin.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_skin.xml diff --git a/indra/newview/skins/default/xui/en/panel_edit_skirt.xml b/indra/newview/skins/default/xui/en/panel_edit_skirt.xml index 76d66cc5dc..76d66cc5dc 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_edit_skirt.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_skirt.xml diff --git a/indra/newview/skins/default/xui/en/panel_edit_socks.xml b/indra/newview/skins/default/xui/en/panel_edit_socks.xml index 5f978174b3..5f978174b3 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_edit_socks.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_socks.xml diff --git a/indra/newview/skins/default/xui/en/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/en/panel_edit_tattoo.xml index 97f1a1a658..97f1a1a658 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_edit_tattoo.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_tattoo.xml diff --git a/indra/newview/skins/default/xui/en/panel_edit_underpants.xml b/indra/newview/skins/default/xui/en/panel_edit_underpants.xml index 16f28377fb..16f28377fb 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_edit_underpants.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_underpants.xml diff --git a/indra/newview/skins/default/xui/en/panel_edit_undershirt.xml b/indra/newview/skins/default/xui/en/panel_edit_undershirt.xml index 059485cfb4..059485cfb4 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_edit_undershirt.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_undershirt.xml diff --git a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml index f34b913218..f34b913218 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml 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..c357f9e7d5 --- /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> + <name_list + draw_heading="false" + left="3" + width="225" + height="75" + follows="all" + name="experience_list"> + <name_list.columns + width="225" + user_resize="false" + name="experience_name" + label="Name"/> + </name_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="<" + enabled="false"/> + <button + top="5" + layout="topleft" + follows="top|left" + name="btn_next" + label=">" + 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"> + '[TEXT]' 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="<" + name="left_btn" + width="23" + left_pad="3" + enabled="false"/> + <button + follows="left|bottom" + height="23" + label=">" + 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_generic_tip.xml b/indra/newview/skins/default/xui/en/panel_generic_tip.xml index eea92895f5..eea92895f5 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_generic_tip.xml +++ b/indra/newview/skins/default/xui/en/panel_generic_tip.xml diff --git a/indra/newview/skins/default/xui/en/panel_group_general.xml b/indra/newview/skins/default/xui/en/panel_group_general.xml index 26f54bacbc..26f54bacbc 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_group_general.xml +++ b/indra/newview/skins/default/xui/en/panel_group_general.xml 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..100644 --- 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_group_invite.xml b/indra/newview/skins/default/xui/en/panel_group_invite.xml index ebb460deb0..ebb460deb0 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_group_invite.xml +++ b/indra/newview/skins/default/xui/en/panel_group_invite.xml diff --git a/indra/newview/skins/default/xui/en/panel_group_land_money.xml b/indra/newview/skins/default/xui/en/panel_group_land_money.xml index d4da55e32e..d4da55e32e 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_group_land_money.xml +++ b/indra/newview/skins/default/xui/en/panel_group_land_money.xml diff --git a/indra/newview/skins/default/xui/en/panel_group_list_item.xml b/indra/newview/skins/default/xui/en/panel_group_list_item.xml index cfe3aeb7c9..cfe3aeb7c9 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_group_list_item.xml +++ b/indra/newview/skins/default/xui/en/panel_group_list_item.xml diff --git a/indra/newview/skins/default/xui/en/panel_group_notices.xml b/indra/newview/skins/default/xui/en/panel_group_notices.xml index c8ce5cdebf..c8ce5cdebf 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_group_notices.xml +++ b/indra/newview/skins/default/xui/en/panel_group_notices.xml diff --git a/indra/newview/skins/default/xui/en/panel_group_notify.xml b/indra/newview/skins/default/xui/en/panel_group_notify.xml index cded4cf31a..cded4cf31a 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_group_notify.xml +++ b/indra/newview/skins/default/xui/en/panel_group_notify.xml diff --git a/indra/newview/skins/default/xui/en/panel_group_roles.xml b/indra/newview/skins/default/xui/en/panel_group_roles.xml index dac4371a38..dac4371a38 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_group_roles.xml +++ b/indra/newview/skins/default/xui/en/panel_group_roles.xml diff --git a/indra/newview/skins/default/xui/en/panel_hint.xml b/indra/newview/skins/default/xui/en/panel_hint.xml index f7434f0330..f7434f0330 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_hint.xml +++ b/indra/newview/skins/default/xui/en/panel_hint.xml diff --git a/indra/newview/skins/default/xui/en/panel_hint_image.xml b/indra/newview/skins/default/xui/en/panel_hint_image.xml index df05d50dc5..df05d50dc5 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_hint_image.xml +++ b/indra/newview/skins/default/xui/en/panel_hint_image.xml diff --git a/indra/newview/skins/default/xui/en/panel_hud.xml b/indra/newview/skins/default/xui/en/panel_hud.xml index 3e9614a9b7..3e9614a9b7 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_hud.xml +++ b/indra/newview/skins/default/xui/en/panel_hud.xml diff --git a/indra/newview/skins/default/xui/en/panel_inbox_inventory.xml b/indra/newview/skins/default/xui/en/panel_inbox_inventory.xml index 433a3181cd..433a3181cd 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_inbox_inventory.xml +++ b/indra/newview/skins/default/xui/en/panel_inbox_inventory.xml diff --git a/indra/newview/skins/default/xui/en/panel_instant_message.xml b/indra/newview/skins/default/xui/en/panel_instant_message.xml index 2e5d650902..2e5d650902 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_instant_message.xml +++ b/indra/newview/skins/default/xui/en/panel_instant_message.xml diff --git a/indra/newview/skins/default/xui/en/panel_inventory_item.xml b/indra/newview/skins/default/xui/en/panel_inventory_item.xml index 2e38835810..2e38835810 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_inventory_item.xml +++ b/indra/newview/skins/default/xui/en/panel_inventory_item.xml diff --git a/indra/newview/skins/default/xui/en/panel_landmark_info.xml b/indra/newview/skins/default/xui/en/panel_landmark_info.xml index fd6e96b9a7..fd6e96b9a7 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_landmark_info.xml +++ b/indra/newview/skins/default/xui/en/panel_landmark_info.xml diff --git a/indra/newview/skins/default/xui/en/panel_landmarks.xml b/indra/newview/skins/default/xui/en/panel_landmarks.xml index 67a09949ce..67a09949ce 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_landmarks.xml +++ b/indra/newview/skins/default/xui/en/panel_landmarks.xml diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml index 183ae2e824..183ae2e824 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_login.xml +++ b/indra/newview/skins/default/xui/en/panel_login.xml diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml index 0518688f45..0a85477bf4 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml @@ -21,7 +21,7 @@ </panel.string> <panel.string name="ItemcountUnknown"> - + Fetched [ITEM_COUNT] Items [FILTER] </panel.string> <text type="string" 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 100644 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 100644 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 100644 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 100644 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 100644 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_me.xml b/indra/newview/skins/default/xui/en/panel_me.xml index 23e7814cad..23e7814cad 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_me.xml +++ b/indra/newview/skins/default/xui/en/panel_me.xml diff --git a/indra/newview/skins/default/xui/en/panel_media_settings_general.xml b/indra/newview/skins/default/xui/en/panel_media_settings_general.xml index e844a15118..e844a15118 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_media_settings_general.xml +++ b/indra/newview/skins/default/xui/en/panel_media_settings_general.xml diff --git a/indra/newview/skins/default/xui/en/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/en/panel_media_settings_permissions.xml index d3a58fed58..d3a58fed58 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_media_settings_permissions.xml +++ b/indra/newview/skins/default/xui/en/panel_media_settings_permissions.xml diff --git a/indra/newview/skins/default/xui/en/panel_media_settings_security.xml b/indra/newview/skins/default/xui/en/panel_media_settings_security.xml index 1f580831f9..1f580831f9 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_media_settings_security.xml +++ b/indra/newview/skins/default/xui/en/panel_media_settings_security.xml diff --git a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml index c7edba21f8..c7edba21f8 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml diff --git a/indra/newview/skins/default/xui/en/panel_nearby_chat.xml b/indra/newview/skins/default/xui/en/panel_nearby_chat.xml index 4de56b424e..4de56b424e 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_nearby_chat.xml +++ b/indra/newview/skins/default/xui/en/panel_nearby_chat.xml diff --git a/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml index 1e43db08f7..1e43db08f7 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml diff --git a/indra/newview/skins/default/xui/en/panel_nearby_media.xml b/indra/newview/skins/default/xui/en/panel_nearby_media.xml index d1cb64f7ad..d1cb64f7ad 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_nearby_media.xml +++ b/indra/newview/skins/default/xui/en/panel_nearby_media.xml diff --git a/indra/newview/skins/default/xui/en/panel_notification.xml b/indra/newview/skins/default/xui/en/panel_notification.xml index 94c468e1bb..94c468e1bb 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_notification.xml +++ b/indra/newview/skins/default/xui/en/panel_notification.xml diff --git a/indra/newview/skins/default/xui/en/panel_notification_list_item.xml b/indra/newview/skins/default/xui/en/panel_notification_list_item.xml new file mode 100644 index 0000000000..efaaefd0e4 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_notification_list_item.xml @@ -0,0 +1,143 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- All our XML is utf-8 encoded. --> +<panel + translate="false" + name="main_panel" + title="panel_notification_list_item" + visible="true" + top="0" + left="0" + width="331" + height="202" + layout="topleft" + follows="left|top|right|bottom" > + <!-- background_opaque="false" --> + <!-- background_visible="true"> --> + <!-- bg_alpha_color="PanelNotificationListItem"> --> + <panel.string + name="sender_resident_text"> + Sender: "[SENDER_RESIDENT]" + </panel.string> + <panel.string + name="group_name_text"> + Group: "[GROUP_NAME]" + </panel.string> + <panel.string + name="group_fee_text"> + Fee: [GROUP_FEE] + </panel.string> + <panel.string + name="item_condensed_height"> + 50 + </panel.string> + <panel.string + name="item_expanded_height"> + 87 + </panel.string> + <panel.string + name="expanded_height_resize_for_attachment"> + 27 + </panel.string> + + <panel top="0" left="0" width="331" height="196" bevel_style="none" layout="topleft" follows="left|top|right|bottom" name="panel_total_view"> + <layout_stack top="0" left="0" width="331" height="196" orientation="vertical" follows="left|top|right|bottom" name="item_vertical_stack"> + <layout_panel top="0" left="0" height="30" follows="left|top|right|bottom" layout="topleft" name="layout_panel_condensed_view" visible="false" background_opaque="false" background_visible="true" bg_alpha_color="SysWellItemUnselected"> + <panel border="true" top="0" left="5" height="30" bevel_style="none" layout="topleft" follows="left|top|right|bottom" name="panel_condensed_view"> + <layout_stack top="0" left="0" width="325" height="50" orientation="horizontal" follows="left|top|right|bottom" name="horizontal_stack"> + <layout_panel width="30" height="39" follows="left|top|right|bottom" name="layout_panel_right"> + <group_icon left="5" top="6" width="25" height="25" mouse_opaque="true" name="group_icon" tool_tip="Group" default_icon_name="Generic_Group" visible="true"/> + <avatar_icon left="5" top="6" width="25" height="25" mouse_opaque="true" name="avatar_icon" tool_tip="Avatar" default_icon_name="Generic_Person" visible="false"/> + <icon left="5" top="6" width="25" height="25" mouse_opaque="true" name="system_notification_icon" tool_tip="Icon" image_name="System_Notification" visible="false"/> + </layout_panel> + <layout_panel width="260" height="50" name="layout_panel_middle"> + <panel border="false" top="0" width="260" height="38" bevel_style="none" follows="left|top|right" layout="topleft" name="main_info_panel"> + <panel border="false" top="0" left="0" width="260" height="19" bevel_style="none" follows="left|top|right|bottom" layout="topleft" name="notification_title_panel"> + <text allow_scroll="false" font="SansSerifSmall" top="6" left="0" width="260" height="12" layout="topleft" follows="right|left" text_color="White" + use_ellipses="true" word_wrap="true" mouse_opaque="false" name="notification_title" > + Group Name:Notice Title N o t i c e T i t l e N o t i c e T i t l e N o t i c e T i t l e N oticeTitle + </text> + <icon top="1" left="242" width="21" height="21" image_name="Icon_Attachment_Small" follows="right" mouse_opaque="true" name="attachment_icon" tool_tip="Attachment" visible="false"/> + </panel> + <panel border="false" top="23" left="0" width="260" height="15" bevel_style="none" follows="left|top|right|bottom" layout="topleft" name="sender_time_panel"> + <text allow_scroll="false" font="SansSerifSmall" top="0" left="0" width="170" height="13" layout="topleft" follows="right|left" + use_ellipses="true" word_wrap="false" mouse_opaque="false" name="sender_or_fee_box" visible="false"> + Sender: "Resident R e s i d e n t R e s i d e n t" + </text> + <text allow_scroll="false" font="SansSerifSmall" top="0" right="-5" width="95" height="13" follows="right" halign="right" layout="topleft" left_pad="5" + name="notification_time" value="2014/12/24 23:30" /> + </panel> + </panel> + </layout_panel> + <layout_panel width="18" height="48" follows="right|top|bottom" name="layout_panel_right"> + <panel top="0" left="0" width="17" height="39" follows="left|top|right|bottom" layout="topleft" name="close_expand_panel"> + <button top="0" left="0" width="17" height="17" layout="topleft" follows="top" name="close_btn" mouse_opaque="true" + tab_stop="false" image_unselected="Icon_Close_Foreground" image_selected="Icon_Close_Press" /> + <button bottom="-16" right="15" width="17" height="17" layout="topleft" follows="bottom" name="expand_btn" mouse_opaque="true" + tab_stop="false" image_unselected="Notification_Expand" image_selected="Notification_Expand" /> + </panel> + </layout_panel> + </layout_stack> + </panel> + </layout_panel> + <layout_panel top="0" left="0" height="196" follows="left|top|right|bottom" layout="topleft" name="layout_panel_expanded_view" visible="true" background_opaque="false" background_visible="true" bg_alpha_color="SysWellItemUnselected"> + <panel border="true" top="0" left="5" height="196" bevel_style="none" follows="left|top|right|bottom" layout="topleft" name="panel_expanded_view"> + <layout_stack top="0" left="0" width="325" height="196" orientation="horizontal" follows="left|top|right|bottom" name="horizontal_stack"> + <layout_panel width="30" height="170" follows="left|top|bottom" name="layout_panel_right_exp"> + <group_icon left="5" top="6" width="25" height="25" mouse_opaque="true" name="group_icon_exp" tool_tip="Group" default_icon_name="Generic_Group" visible="true"/> + <avatar_icon left="5" top="6" width="25" height="25" mouse_opaque="true" name="avatar_icon_exp" tool_tip="Avatar" default_icon_name="Generic_Person" visible="false"/> + <icon left="5" top="6" width="25" height="25" mouse_opaque="true" name="system_notification_icon_exp" tool_tip="Icon" image_name="System_Notification" visible="false"/> + <icon left="12" top="144" width="20" height="20" name="attachment_icon_exp" tool_tip="Attachment" image_name="Icon_Attachment_Large" follows="left" mouse_opaque="true" visible="false"/> + </layout_panel> + <layout_panel width="230" height="196" follows="left|top|right|bottom" name="layout_panel_middle_exp"> + <panel border="false" top="0" width="230" height="196" bevel_style="none" follows="left|top|right|bottom" layout="topleft" name="main_info_panel_expanded"> + <panel border="false" top="0" left="0" width="230" height="30" bevel_style="none" follows="left|top|right" layout="topleft" name="notification_title_panel_exp" > + <text allow_scroll="false" font="SansSerif" top="6" left="0" width="233" height="10" layout="topleft" follows="right|left" text_color="White" + use_ellipses="true" word_wrap="false" mouse_opaque="false" name="notification_title_exp"> + Notice Title Notice Title N o t i c e T i t l e N o t i c e T i t l e + </text> + <text allow_scroll="false" font="SansSerif" left="0" width="233" height="10" layout="topleft" follows="right|left" text_color="White" + use_ellipses="true" word_wrap="false" mouse_opaque="false" name="group_name_exp" parse_urls="false" visible="false"> + Group Name Group Name Group Na m e e + </text> + </panel> + <panel border="false" left="0" width="230" height="15" bevel_style="none" follows="left|top|right" layout="topleft" name="sender_time_panel_exp"> + <text allow_scroll="false" font="SansSerifSmall" top="0" left="0" width="145" height="13" layout="topleft" follows="right|left" + use_ellipses="true" word_wrap="false" mouse_opaque="false" name="sender_or_fee_box_exp" visible="false"> + Sender: "Resident R e s i d e n t R e s i d e n t" + </text> + <text allow_scroll="false" font="SansSerifSmall" top="0" right="-1" width="95" height="13" follows="right" halign="right" layout="topleft" left_pad="5" + name="notification_time_exp" value="2014/12/24 23:30" /> + </panel> + <panel border="false" left="0" height="115" width="230" bevel_style="none" follows="all" layout="topleft" name="notification_text_panel_exp" visible="true"> + <chat_editor is_expandable="true" top="0" left="0" width="230" height="110" layout="topleft" follows="left|right" + word_wrap="true" max_length="65536" name="notification_text_exp" parse_urls="true"> + Notice text goes here b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla. bla bla bla bla bla bla bla bla bla bla bla bla bla . + </chat_editor> + </panel> + <panel border="false" left="1" bottom="-5" width="230" height="22" bevel_style="none" follows="left|right|bottom" layout="topleft" name="attachment_panel" visible="false"> + <text allow_scroll="false" font="SansSerifSmall" top="4" left="5" width="220" height="12" layout="topleft" follows="left|top|right|bottom" + use_ellipses="true" word_wrap="true" max_length="96" name="attachment_text"> + Attachment goes here b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla. bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla . + </text> + </panel> + <panel border="false" left="1" bottom="-5" height="55" bevel_style="none" follows="left|right|bottom" layout="topleft" name="button_panel" visible="false"> + <button top="2" left="0" width="65" height="23" layout="topleft" follows="left|top|bottom" name="join_btn" mouse_opaque="true" tab_stop="false" label = "Join"/> + <button top="2" left_pad="12" width="65" height="23" layout="topleft" follows="left|top|bottom" name="decline_btn" mouse_opaque="true" tab_stop="false" label = "Decline"/> + <button top="2" left_pad="12" width="65" height="23" layout="topleft" follows="left|top|bottom" name="info_btn" mouse_opaque="true" tab_stop="false" label = "Info"/> + </panel> + </panel> + </layout_panel> + <layout_panel width="18" follows="right|top|bottom" name="layout_panel_left_exp"> + <panel top="0" left="0" width="17" follows="left|top|right|bottom" layout="topleft" name="close_expand_panel_exp"> + <button top="0" left="2" width="17" height="17" layout="topleft" follows="top" name="close_expanded_btn" mouse_opaque="true" + tab_stop="false" image_unselected="Icon_Close_Foreground" image_selected="Icon_Close_Press" /> + <button bottom="5" left="0" width="17" height="17" layout="topleft" follows="bottom" name="condense_btn" mouse_opaque="true" + tab_stop="false" image_unselected="Notification_Condense" image_selected="Notification_Condense" /> + </panel> + </layout_panel> + </layout_stack> + </panel> + </layout_panel> + </layout_stack> + </panel> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_notifications_channel.xml b/indra/newview/skins/default/xui/en/panel_notifications_channel.xml index c3dc588ba2..c3dc588ba2 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_notifications_channel.xml +++ b/indra/newview/skins/default/xui/en/panel_notifications_channel.xml diff --git a/indra/newview/skins/default/xui/en/panel_notify_textbox.xml b/indra/newview/skins/default/xui/en/panel_notify_textbox.xml index d5b6057233..d5b6057233 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_notify_textbox.xml +++ b/indra/newview/skins/default/xui/en/panel_notify_textbox.xml diff --git a/indra/newview/skins/default/xui/en/panel_online_status_toast.xml b/indra/newview/skins/default/xui/en/panel_online_status_toast.xml index dadbd9c9ab..dadbd9c9ab 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_online_status_toast.xml +++ b/indra/newview/skins/default/xui/en/panel_online_status_toast.xml 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..100644 --- 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_outfit_edit.xml b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml index 3f13cea58e..3f13cea58e 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml +++ b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml diff --git a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml index 405d9513db..405d9513db 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml +++ b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml diff --git a/indra/newview/skins/default/xui/en/panel_outfits_inventory_gear_default.xml b/indra/newview/skins/default/xui/en/panel_outfits_inventory_gear_default.xml index 2c7a51f0e7..2c7a51f0e7 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_outfits_inventory_gear_default.xml +++ b/indra/newview/skins/default/xui/en/panel_outfits_inventory_gear_default.xml diff --git a/indra/newview/skins/default/xui/en/panel_outfits_list.xml b/indra/newview/skins/default/xui/en/panel_outfits_list.xml index a0096adc01..a0096adc01 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_outfits_list.xml +++ b/indra/newview/skins/default/xui/en/panel_outfits_list.xml diff --git a/indra/newview/skins/default/xui/en/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/en/panel_outfits_wearing.xml index d85b778db2..d85b778db2 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_outfits_wearing.xml +++ b/indra/newview/skins/default/xui/en/panel_outfits_wearing.xml diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml index 2d4665c128..2cb06d6877 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_people.xml +++ b/indra/newview/skins/default/xui/en/panel_people.xml @@ -53,6 +53,9 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M <string name="AltMiniMapToolTipMsg" value="[REGION](Double-click to teleport, shift-drag to pan)"/> + <string + name="GroupCountWithInfo" + value="You belong to [COUNT] groups, and can join [REMAINING] more. [secondlife:/// Want more?]"/> <tab_container bottom="-10" follows="all" diff --git a/indra/newview/skins/default/xui/en/panel_pick_info.xml b/indra/newview/skins/default/xui/en/panel_pick_info.xml index 79d190e1e0..79d190e1e0 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_pick_info.xml +++ b/indra/newview/skins/default/xui/en/panel_pick_info.xml diff --git a/indra/newview/skins/default/xui/en/panel_pick_list_item.xml b/indra/newview/skins/default/xui/en/panel_pick_list_item.xml index 43d580844f..43d580844f 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_pick_list_item.xml +++ b/indra/newview/skins/default/xui/en/panel_pick_list_item.xml diff --git a/indra/newview/skins/default/xui/en/panel_picks.xml b/indra/newview/skins/default/xui/en/panel_picks.xml index 8def96cada..8def96cada 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_picks.xml +++ b/indra/newview/skins/default/xui/en/panel_picks.xml diff --git a/indra/newview/skins/default/xui/en/panel_place_profile.xml b/indra/newview/skins/default/xui/en/panel_place_profile.xml index 0dd75b1b55..0dd75b1b55 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_place_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_place_profile.xml diff --git a/indra/newview/skins/default/xui/en/panel_places.xml b/indra/newview/skins/default/xui/en/panel_places.xml index 7d171490e8..7d171490e8 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_places.xml +++ b/indra/newview/skins/default/xui/en/panel_places.xml diff --git a/indra/newview/skins/default/xui/en/panel_postcard_message.xml b/indra/newview/skins/default/xui/en/panel_postcard_message.xml index 331a08b4bb..331a08b4bb 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_postcard_message.xml +++ b/indra/newview/skins/default/xui/en/panel_postcard_message.xml diff --git a/indra/newview/skins/default/xui/en/panel_postcard_settings.xml b/indra/newview/skins/default/xui/en/panel_postcard_settings.xml index 525149d7ee..525149d7ee 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_postcard_settings.xml +++ b/indra/newview/skins/default/xui/en/panel_postcard_settings.xml diff --git a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml index 2e778014c5..3e96160834 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml @@ -216,7 +216,7 @@ control_name="QAMode" follows="top|left" height="15" - label="Show Developer Menu" + label="Show Develop Menu" layout="topleft" left="30" name="show_develop_menu_check" diff --git a/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml index 714dca7fac..714dca7fac 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml index 8e867259c5..8e867259c5 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml diff --git a/indra/newview/skins/default/xui/en/panel_preferences_colors.xml b/indra/newview/skins/default/xui/en/panel_preferences_colors.xml index 9e825fe516..9e825fe516 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_colors.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_colors.xml diff --git a/indra/newview/skins/default/xui/en/panel_preferences_general.xml b/indra/newview/skins/default/xui/en/panel_preferences_general.xml index f6665a1d5d..f6665a1d5d 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml index 6c485c0595..6c485c0595 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml diff --git a/indra/newview/skins/default/xui/en/panel_preferences_move.xml b/indra/newview/skins/default/xui/en/panel_preferences_move.xml index 8794e3bf95..8794e3bf95 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_move.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_move.xml diff --git a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml index 323da2be38..323da2be38 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml diff --git a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml index 1e9a1aa27c..45b2b6ec27 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml @@ -224,19 +224,6 @@ radio_style="false" width="400" top_pad="5"/> - <check_box - top_delta="4" - enabled="true" - follows="left|top" - height="14" - initial_value="false" - control_name="MediaEnablePopups" - label="Enable media browser pop-ups" - left_delta="0" - mouse_opaque="true" - name="media_popup_enabled" - width="400" - top_pad="5"/> <text type="string" length="1" @@ -270,7 +257,7 @@ value="1" /> --> <combo_box.item - label="Download and install updates manually" + label="I will download and install updates manually" name="Install_manual" value="0" /> </combo_box> diff --git a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml index 615abbaa89..615abbaa89 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml diff --git a/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml index 8f90521bb2..8f90521bb2 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml +++ b/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml diff --git a/indra/newview/skins/default/xui/en/panel_progress.xml b/indra/newview/skins/default/xui/en/panel_progress.xml index 860caf2d21..860caf2d21 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_progress.xml +++ b/indra/newview/skins/default/xui/en/panel_progress.xml diff --git a/indra/newview/skins/default/xui/en/panel_region_covenant.xml b/indra/newview/skins/default/xui/en/panel_region_covenant.xml index 112f12500d..112f12500d 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_region_covenant.xml +++ b/indra/newview/skins/default/xui/en/panel_region_covenant.xml diff --git a/indra/newview/skins/default/xui/en/panel_region_debug.xml b/indra/newview/skins/default/xui/en/panel_region_debug.xml index fea5f1b19f..fea5f1b19f 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_region_debug.xml +++ b/indra/newview/skins/default/xui/en/panel_region_debug.xml diff --git a/indra/newview/skins/default/xui/en/panel_region_environment.xml b/indra/newview/skins/default/xui/en/panel_region_environment.xml index aa38c49fae..aa38c49fae 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_region_environment.xml +++ b/indra/newview/skins/default/xui/en/panel_region_environment.xml diff --git a/indra/newview/skins/default/xui/en/panel_region_estate.xml b/indra/newview/skins/default/xui/en/panel_region_estate.xml index 76a82212ae..76a82212ae 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_region_estate.xml +++ b/indra/newview/skins/default/xui/en/panel_region_estate.xml 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_region_general.xml b/indra/newview/skins/default/xui/en/panel_region_general.xml index 489d286e67..489d286e67 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_region_general.xml +++ b/indra/newview/skins/default/xui/en/panel_region_general.xml diff --git a/indra/newview/skins/default/xui/en/panel_region_terrain.xml b/indra/newview/skins/default/xui/en/panel_region_terrain.xml index 5d060c0a0d..5d060c0a0d 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_region_terrain.xml +++ b/indra/newview/skins/default/xui/en/panel_region_terrain.xml 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..100644 --- 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 "no copy". 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 "no copy". 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/panel_script_limits_my_avatar.xml b/indra/newview/skins/default/xui/en/panel_script_limits_my_avatar.xml index 629d8567d1..629d8567d1 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_script_limits_my_avatar.xml +++ b/indra/newview/skins/default/xui/en/panel_script_limits_my_avatar.xml diff --git a/indra/newview/skins/default/xui/en/panel_script_limits_region_memory.xml b/indra/newview/skins/default/xui/en/panel_script_limits_region_memory.xml index c5e8bf5803..c5e8bf5803 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_script_limits_region_memory.xml +++ b/indra/newview/skins/default/xui/en/panel_script_limits_region_memory.xml diff --git a/indra/newview/skins/default/xui/en/panel_script_question_toast.xml b/indra/newview/skins/default/xui/en/panel_script_question_toast.xml index b0436bb6dc..b0436bb6dc 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_script_question_toast.xml +++ b/indra/newview/skins/default/xui/en/panel_script_question_toast.xml diff --git a/indra/newview/skins/default/xui/en/panel_scrolling_param.xml b/indra/newview/skins/default/xui/en/panel_scrolling_param.xml index a8cd380f20..a8cd380f20 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_scrolling_param.xml +++ b/indra/newview/skins/default/xui/en/panel_scrolling_param.xml diff --git a/indra/newview/skins/default/xui/en/panel_scrolling_param_base.xml b/indra/newview/skins/default/xui/en/panel_scrolling_param_base.xml index 1351f75623..1351f75623 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_scrolling_param_base.xml +++ b/indra/newview/skins/default/xui/en/panel_scrolling_param_base.xml diff --git a/indra/newview/skins/default/xui/en/panel_side_tray_tab_caption.xml b/indra/newview/skins/default/xui/en/panel_side_tray_tab_caption.xml index 557b04d281..557b04d281 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_side_tray_tab_caption.xml +++ b/indra/newview/skins/default/xui/en/panel_side_tray_tab_caption.xml diff --git a/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml b/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml index 912f81f915..912f81f915 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml +++ b/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml index ea579c6dae..d019a0a310 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml +++ b/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml @@ -60,6 +60,10 @@ name="Large(512x512)" value="[i512,i512]" /> <combo_box.item + label="Current Window(512x512)" + name="CurrentWindow" + value="[i0,i0]" /> + <combo_box.item label="Custom" name="Custom" value="[i-1,i-1]" /> diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_local.xml b/indra/newview/skins/default/xui/en/panel_snapshot_local.xml index 188c9f8707..188c9f8707 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_snapshot_local.xml +++ b/indra/newview/skins/default/xui/en/panel_snapshot_local.xml diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_options.xml b/indra/newview/skins/default/xui/en/panel_snapshot_options.xml index 265217ef60..265217ef60 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_snapshot_options.xml +++ b/indra/newview/skins/default/xui/en/panel_snapshot_options.xml diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/en/panel_snapshot_postcard.xml index 975b08be05..975b08be05 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_snapshot_postcard.xml +++ b/indra/newview/skins/default/xui/en/panel_snapshot_postcard.xml diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_profile.xml b/indra/newview/skins/default/xui/en/panel_snapshot_profile.xml index d86cb92981..d86cb92981 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_snapshot_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_snapshot_profile.xml diff --git a/indra/newview/skins/default/xui/en/panel_sound_devices.xml b/indra/newview/skins/default/xui/en/panel_sound_devices.xml index 46cbc1e87f..46cbc1e87f 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_sound_devices.xml +++ b/indra/newview/skins/default/xui/en/panel_sound_devices.xml diff --git a/indra/newview/skins/default/xui/en/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/en/panel_stand_stop_flying.xml index 07642946f8..07642946f8 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_stand_stop_flying.xml +++ b/indra/newview/skins/default/xui/en/panel_stand_stop_flying.xml diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml index dbf7bc031f..dbf7bc031f 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml diff --git a/indra/newview/skins/default/xui/en/panel_sys_well_item.xml b/indra/newview/skins/default/xui/en/panel_sys_well_item.xml index 007b73a4bc..007b73a4bc 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_sys_well_item.xml +++ b/indra/newview/skins/default/xui/en/panel_sys_well_item.xml diff --git a/indra/newview/skins/default/xui/en/panel_teleport_history.xml b/indra/newview/skins/default/xui/en/panel_teleport_history.xml index 768efc2f3f..768efc2f3f 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_teleport_history.xml +++ b/indra/newview/skins/default/xui/en/panel_teleport_history.xml diff --git a/indra/newview/skins/default/xui/en/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/en/panel_teleport_history_item.xml index 5c728718ef..5c728718ef 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_teleport_history_item.xml +++ b/indra/newview/skins/default/xui/en/panel_teleport_history_item.xml diff --git a/indra/newview/skins/default/xui/en/panel_toast.xml b/indra/newview/skins/default/xui/en/panel_toast.xml index 37a904bca8..37a904bca8 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_toast.xml +++ b/indra/newview/skins/default/xui/en/panel_toast.xml diff --git a/indra/newview/skins/default/xui/en/panel_toolbar_view.xml b/indra/newview/skins/default/xui/en/panel_toolbar_view.xml index f5c559fe1d..f5c559fe1d 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_toolbar_view.xml +++ b/indra/newview/skins/default/xui/en/panel_toolbar_view.xml diff --git a/indra/newview/skins/default/xui/en/panel_tools_texture.xml b/indra/newview/skins/default/xui/en/panel_tools_texture.xml index cb6b2fafd8..2dae1025ec 100644 --- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml +++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml @@ -117,26 +117,37 @@ name="Media" value="Media" /> </combo_box> - <combo_box - height="23" - layout="topleft" - left_pad="10" - name="combobox mattype" - top_delta="0" - width="155"> - <combo_box.item - label="Texture (diffuse)" - name="Texture (diffuse)" - value="Texture (diffuse)" /> - <combo_box.item - label="Bumpiness (normal)" - name="Bumpiness (normal)" - value="Bumpiness (normal)" /> - <combo_box.item - label="Shininess (specular)" - name="Shininess (specular)" - value="Shininess (specular)" /> - </combo_box> + <radio_group + control_name="ComboMaterialType" + height="50" + layout="topleft" + left_pad="20" + top_delta="-10" + width="150" + visible = "false" + name="radio_material_type"> + <radio_item + label="Texture (diffuse)" + name="Texture (diffuse)" + top="0" + layout="topleft" + height="16" + value="0"/> + <radio_item + label="Bumpiness (normal)" + layout="topleft" + top_pad="1" + height="16" + name="Bumpiness (normal)" + value="1"/> + <radio_item + label="Shininess (specular)" + name="Shininess (specular)" + height="16" + layout="topleft" + top_pad="1" + value="2"/> + </radio_group> <texture_picker can_apply_immediately="true" default_image_name="Default" @@ -148,7 +159,7 @@ left="10" name="texture control" tool_tip="Click to choose a picture" - top_pad="8" + top_pad="7" width="64" /> <text type="string" @@ -350,7 +361,7 @@ name="label shininess" left_pad="10" text_readonly_color="LabelDisabledColor" - top_delta="6" + top_delta="4" width="90"> Shininess </text> @@ -394,7 +405,7 @@ left_delta="-100" name="label glossiness" text_readonly_color="LabelDisabledColor" - top_pad="8" + top_pad="7" width="116"> Glossiness </text> @@ -520,7 +531,7 @@ left="10" name="tex gen" text_readonly_color="LabelDisabledColor" - top_pad="60" + top_pad="46" width="140"> Mapping </text> diff --git a/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml b/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml index fc527f5f9d..fc527f5f9d 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml diff --git a/indra/newview/skins/default/xui/en/panel_voice_effect.xml b/indra/newview/skins/default/xui/en/panel_voice_effect.xml index 93e79b7328..93e79b7328 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_voice_effect.xml +++ b/indra/newview/skins/default/xui/en/panel_voice_effect.xml diff --git a/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml index 6adede0362..6adede0362 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml +++ b/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml diff --git a/indra/newview/skins/default/xui/en/panel_world_map.xml b/indra/newview/skins/default/xui/en/panel_world_map.xml index 16860a6117..16860a6117 100755..100644 --- a/indra/newview/skins/default/xui/en/panel_world_map.xml +++ b/indra/newview/skins/default/xui/en/panel_world_map.xml 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..100644 --- 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_appearance.xml b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml index 1d98a84e25..1d98a84e25 100755..100644 --- a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml +++ b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml index d3e24a19ef..d3e24a19ef 100755..100644 --- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml +++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml 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..100644 --- 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/sidepanel_task_info.xml b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml index b84dce222f..b84dce222f 100755..100644 --- a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml +++ b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index f77678e5f8..60e2c0dcc7 100755..100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -22,10 +22,11 @@ <!-- about dialog/support string--> <string name="AboutHeader"> -[APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2] ([VIEWER_VERSION_3]) [BUILD_DATE] [BUILD_TIME] ([CHANNEL]) +[APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2].[VIEWER_VERSION_3] ([CHANNEL]) [[VIEWER_RELEASE_NOTES_URL] [ReleaseNotes]] </string> - <string name="AboutCompiler">Built with [COMPILER] version [COMPILER_VERSION]</string> + <string name="BuildConfig">Build Configuration [BUILD_CONFIG]</string> + <string name="AboutPosition"> You are at [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1] in [REGION] located at <nolink>[HOSTNAME]</nolink> ([HOSTIP]) SLURL: <nolink>[SLURL]</nolink> @@ -47,15 +48,15 @@ Graphics Card: [GRAPHICS_CARD] <string name="AboutLibs"> OpenGL Version: [OPENGL_VERSION] -libcurl Version: [LIBCURL_VERSION] J2C Decoder Version: [J2C_VERSION] Audio Driver Version: [AUDIO_DRIVER_VERSION] -Qt Webkit Version: [QT_WEBKIT_VERSION] +LLCEFLib/CEF Version: [LLCEFLIB_VERSION] Voice Server Version: [VOICE_VERSION] </string> <string name="AboutTraffic">Packets Lost: [PACKETS_LOST,number,0]/[PACKETS_IN,number,0] ([PACKETS_PCT,number,1]%)</string> <string name="ErrorFetchingServerReleaseNotesURL">Error fetching server release notes URL.</string> - + <string name="BuildConfiguration">Build Configuration</string> + <!-- progress --> <string name="ProgressRestoring">Restoring...</string> <string name="ProgressChangingResolution">Changing resolution...</string> @@ -96,7 +97,10 @@ Voice Server Version: [VOICE_VERSION] <string name="LoginFailed">Login failed.</string> <string name="Quit">Quit</string> <string name="create_account_url">http://join.secondlife.com/?sourceid=[sourceid]</string> - + + <string name="AgniGridLabel">Second Life Main Grid (Agni)</string> + <string name="AditiGridLabel">Second Life Beta Test Grid (Aditi)</string> + <string name="ViewerDownloadURL">http://secondlife.com/download</string> <string name="LoginFailedViewerNotPermitted"> The viewer you are using can no longer access Second Life. Please visit the following page to download a new viewer: @@ -235,15 +239,22 @@ Please try logging in again in a minute.</string> <string name="TooltipMustSingleDrop">Only a single item can be dragged here</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="TooltipSLIcon">This links to a page on the official SecondLife.com or LindenLab.com domain.</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> @@ -268,6 +279,7 @@ Please try logging in again in a minute.</string> <string name="TooltipMapUrl">Click to view this location on a map</string> <string name="TooltipSLAPP">Click to run the secondlife:// command</string> <string name="CurrentURL" value=" CurrentURL: [CurrentURL]" /> + <string name="TooltipEmail">Click to compose an email</string> <!-- text for SLURL labels --> <string name="SLurlLabelTeleport">Teleport to</string> @@ -489,7 +501,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 +2268,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 +2296,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 +2542,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 +3998,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 +4029,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 +4078,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. @@ -4046,5 +4121,17 @@ Try enclosing path to the editor with double quotes. <string name="loading_chat_logs"> Loading... </string> - - </strings> + + <string name="Mav_Details_MAV_FOUND_DEGENERATE_TRIANGLES"> + The physics shape contains triangles which are too small. Try simplifying the physics model. + </string> + + <string name="Mav_Details_MAV_CONFIRMATION_DATA_MISMATCH"> + The physics shape contains bad confirmation data. Try to correct the physics model. + </string> + + <string name="Mav_Details_MAV_UNKNOWN_VERSION"> + The physics shape does not have correct version. Set the correct version for the physics model. + </string> + +</strings> diff --git a/indra/newview/skins/default/xui/en/teleport_strings.xml b/indra/newview/skins/default/xui/en/teleport_strings.xml index 5a9a16d344..5a9a16d344 100755..100644 --- a/indra/newview/skins/default/xui/en/teleport_strings.xml +++ b/indra/newview/skins/default/xui/en/teleport_strings.xml diff --git a/indra/newview/skins/default/xui/en/widgets/accordion.xml b/indra/newview/skins/default/xui/en/widgets/accordion.xml index 55dde492ca..55dde492ca 100755..100644 --- a/indra/newview/skins/default/xui/en/widgets/accordion.xml +++ b/indra/newview/skins/default/xui/en/widgets/accordion.xml diff --git a/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml b/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml index 6f68c99021..6f68c99021 100755..100644 --- a/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml +++ b/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml diff --git a/indra/newview/skins/default/xui/en/widgets/avatar_icon.xml b/indra/newview/skins/default/xui/en/widgets/avatar_icon.xml index 7f8fac04d0..7f8fac04d0 100755..100644 --- a/indra/newview/skins/default/xui/en/widgets/avatar_icon.xml +++ b/indra/newview/skins/default/xui/en/widgets/avatar_icon.xml diff --git a/indra/newview/skins/default/xui/en/widgets/avatar_list_item.xml b/indra/newview/skins/default/xui/en/widgets/avatar_list_item.xml index 8a4ccb19f9..8a4ccb19f9 100755..100644 --- a/indra/newview/skins/default/xui/en/widgets/avatar_list_item.xml +++ b/indra/newview/skins/default/xui/en/widgets/avatar_list_item.xml diff --git a/indra/newview/skins/default/xui/en/widgets/badge.xml b/indra/newview/skins/default/xui/en/widgets/badge.xml index 738d150f64..738d150f64 100755..100644 --- a/indra/newview/skins/default/xui/en/widgets/badge.xml +++ b/indra/newview/skins/default/xui/en/widgets/badge.xml diff --git a/indra/newview/skins/default/xui/en/widgets/bodyparts_list_item.xml b/indra/newview/skins/default/xui/en/widgets/bodyparts_list_item.xml index 0016a8cf53..0016a8cf53 100755..100644 --- a/indra/newview/skins/default/xui/en/widgets/bodyparts_list_item.xml +++ b/indra/newview/skins/default/xui/en/widgets/bodyparts_list_item.xml diff --git a/indra/newview/skins/default/xui/en/widgets/button.xml b/indra/newview/skins/default/xui/en/widgets/button.xml index 2b2c3faf91..2b2c3faf91 100755..100644 --- a/indra/newview/skins/default/xui/en/widgets/button.xml +++ b/indra/newview/skins/default/xui/en/widgets/button.xml diff --git a/indra/newview/skins/default/xui/en/widgets/chat_editor.xml b/indra/newview/skins/default/xui/en/widgets/chat_editor.xml index f9facb593a..f9facb593a 100755..100644 --- a/indra/newview/skins/default/xui/en/widgets/chat_editor.xml +++ b/indra/newview/skins/default/xui/en/widgets/chat_editor.xml diff --git a/indra/newview/skins/default/xui/en/widgets/chat_history.xml b/indra/newview/skins/default/xui/en/widgets/chat_history.xml index c0a948931c..c0a948931c 100755..100644 --- a/indra/newview/skins/default/xui/en/widgets/chat_history.xml +++ b/indra/newview/skins/default/xui/en/widgets/chat_history.xml diff --git a/indra/newview/skins/default/xui/en/widgets/check_box.xml b/indra/newview/skins/default/xui/en/widgets/check_box.xml index 8947024e45..8947024e45 100755..100644 --- a/indra/newview/skins/default/xui/en/widgets/check_box.xml +++ b/indra/newview/skins/default/xui/en/widgets/check_box.xml diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_offer.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_offer.xml index 4bc295f747..4bc295f747 100755..100644 --- a/indra/newview/skins/default/xui/en/widgets/chiclet_offer.xml +++ b/indra/newview/skins/default/xui/en/widgets/chiclet_offer.xml diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_panel.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_panel.xml index 5f51f4afd9..5f51f4afd9 100755..100644 --- a/indra/newview/skins/default/xui/en/widgets/chiclet_panel.xml +++ b/indra/newview/skins/default/xui/en/widgets/chiclet_panel.xml diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml index db6a9434df..db6a9434df 100755..100644 --- a/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml +++ b/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml diff --git a/indra/newview/skins/default/xui/en/widgets/clothing_list_item.xml b/indra/newview/skins/default/xui/en/widgets/clothing_list_item.xml index d83f44737e..d83f44737e 100755..100644 --- a/indra/newview/skins/default/xui/en/widgets/clothing_list_item.xml +++ b/indra/newview/skins/default/xui/en/widgets/clothing_list_item.xml diff --git a/indra/newview/skins/default/xui/en/widgets/color_swatch.xml b/indra/newview/skins/default/xui/en/widgets/color_swatch.xml index ab3de1eaab..ab3de1eaab 100755..100644 --- a/indra/newview/skins/default/xui/en/widgets/color_swatch.xml +++ b/indra/newview/skins/default/xui/en/widgets/color_swatch.xml diff --git a/indra/newview/skins/default/xui/en/widgets/combo_box.xml b/indra/newview/skins/default/xui/en/widgets/combo_box.xml index 65f9a143e9..65f9a143e9 100755..100644 --- a/indra/newview/skins/default/xui/en/widgets/combo_box.xml +++ b/indra/newview/skins/default/xui/en/widgets/combo_box.xml diff --git a/indra/newview/skins/default/xui/en/widgets/context_menu.xml b/indra/newview/skins/default/xui/en/widgets/context_menu.xml index 459706c689..459706c689 100755..100644 --- a/indra/newview/skins/default/xui/en/widgets/context_menu.xml +++ b/indra/newview/skins/default/xui/en/widgets/context_menu.xml diff --git a/indra/newview/skins/default/xui/en/widgets/conversation_view_session.xml b/indra/newview/skins/default/xui/en/widgets/conversation_view_session.xml index b8c39eec1d..b8c39eec1d 100755..100644 --- a/indra/newview/skins/default/xui/en/widgets/conversation_view_session.xml +++ b/indra/newview/skins/default/xui/en/widgets/conversation_view_session.xml diff --git a/indra/newview/skins/default/xui/en/widgets/deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/en/widgets/deletable_wearable_list_item.xml index 0534485ddd..0534485ddd 100755..100644 --- a/indra/newview/skins/default/xui/en/widgets/deletable_wearable_list_item.xml +++ b/indra/newview/skins/default/xui/en/widgets/deletable_wearable_list_item.xml diff --git a/indra/newview/skins/default/xui/en/widgets/drop_down.xml b/indra/newview/skins/default/xui/en/widgets/drop_down.xml index 602250ace6..602250ace6 100755..100644 --- a/indra/newview/skins/default/xui/en/widgets/drop_down.xml +++ b/indra/newview/skins/default/xui/en/widgets/drop_down.xml diff --git a/indra/newview/skins/default/xui/en/widgets/dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/en/widgets/dummy_clothing_list_item.xml index 8c805da048..8c805da048 100755..100644 --- a/indra/newview/skins/default/xui/en/widgets/dummy_clothing_list_item.xml +++ b/indra/newview/skins/default/xui/en/widgets/dummy_clothing_list_item.xml diff --git a/indra/newview/skins/default/xui/en/widgets/expandable_text.xml b/indra/newview/skins/default/xui/en/widgets/expandable_text.xml index c6331ec87b..c6331ec87b 100755..100644 --- a/indra/newview/skins/default/xui/en/widgets/expandable_text.xml +++ b/indra/newview/skins/default/xui/en/widgets/expandable_text.xml diff --git a/indra/newview/skins/default/xui/en/widgets/filter_editor.xml b/indra/newview/skins/default/xui/en/widgets/filter_editor.xml index 2cc4abdd30..2cc4abdd30 100755..100644 --- a/indra/newview/skins/default/xui/en/widgets/filter_editor.xml +++ b/indra/newview/skins/default/xui/en/widgets/filter_editor.xml diff --git a/indra/newview/skins/default/xui/en/widgets/flat_list_view.xml b/indra/newview/skins/default/xui/en/widgets/flat_list_view.xml index e05ddf9815..e05ddf9815 100755..100644 --- a/indra/newview/skins/default/xui/en/widgets/flat_list_view.xml +++ b/indra/newview/skins/default/xui/en/widgets/flat_list_view.xml diff --git a/indra/newview/skins/default/xui/en/widgets/floater.xml b/indra/newview/skins/default/xui/en/widgets/floater.xml index 807b67d112..807b67d112 100755..100644 --- a/indra/newview/skins/default/xui/en/widgets/floater.xml +++ b/indra/newview/skins/default/xui/en/widgets/floater.xml diff --git a/indra/newview/skins/default/xui/en/widgets/flyout_button.xml b/indra/newview/skins/default/xui/en/widgets/flyout_button.xml index 83df10e417..83df10e417 100755..100644 --- a/indra/newview/skins/default/xui/en/widgets/flyout_button.xml +++ b/indra/newview/skins/default/xui/en/widgets/flyout_button.xml diff --git a/indra/newview/skins/default/xui/en/widgets/folder_view_item.xml b/indra/newview/skins/default/xui/en/widgets/folder_view_item.xml index bbd53ccb12..bbd53ccb12 100755..100644 --- a/indra/newview/skins/default/xui/en/widgets/folder_view_item.xml +++ b/indra/newview/skins/default/xui/en/widgets/folder_view_item.xml diff --git a/indra/newview/skins/default/xui/en/widgets/gesture_combo_list.xml b/indra/newview/skins/default/xui/en/widgets/gesture_combo_list.xml index 808683864d..808683864d 100755..100644 --- a/indra/newview/skins/default/xui/en/widgets/gesture_combo_list.xml +++ b/indra/newview/skins/default/xui/en/widgets/gesture_combo_list.xml diff --git a/indra/newview/skins/default/xui/en/widgets/group_icon.xml b/indra/newview/skins/default/xui/en/widgets/group_icon.xml index 36ee6dd7eb..36ee6dd7eb 100755..100644 --- a/indra/newview/skins/default/xui/en/widgets/group_icon.xml +++ b/indra/newview/skins/default/xui/en/widgets/group_icon.xml diff --git a/indra/newview/skins/default/xui/en/widgets/hint_popup.xml b/indra/newview/skins/default/xui/en/widgets/hint_popup.xml index 92080df154..92080df154 100755..100644 --- a/indra/newview/skins/default/xui/en/widgets/hint_popup.xml +++ b/indra/newview/skins/default/xui/en/widgets/hint_popup.xml diff --git a/indra/newview/skins/default/xui/en/widgets/icon.xml b/indra/newview/skins/default/xui/en/widgets/icon.xml index cf8edfcedb..cf8edfcedb 100755..100644 --- a/indra/newview/skins/default/xui/en/widgets/icon.xml +++ b/indra/newview/skins/default/xui/en/widgets/icon.xml diff --git a/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_folder.xml b/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_folder.xml index 590a4730a9..590a4730a9 100755..100644 --- a/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_folder.xml +++ b/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_folder.xml diff --git a/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_item.xml b/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_item.xml index 7a7a6e9a09..7a7a6e9a09 100755..100644 --- a/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_item.xml +++ b/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_item.xml 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..100644 --- 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/inspector.xml b/indra/newview/skins/default/xui/en/widgets/inspector.xml index 8c171c387f..8c171c387f 100755..100644 --- a/indra/newview/skins/default/xui/en/widgets/inspector.xml +++ b/indra/newview/skins/default/xui/en/widgets/inspector.xml diff --git a/indra/newview/skins/default/xui/en/widgets/inventory_list_item.xml b/indra/newview/skins/default/xui/en/widgets/inventory_list_item.xml index da9059c819..da9059c819 100755..100644 --- a/indra/newview/skins/default/xui/en/widgets/inventory_list_item.xml +++ b/indra/newview/skins/default/xui/en/widgets/inventory_list_item.xml 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..100644 --- 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/en/widgets/joystick_rotate.xml b/indra/newview/skins/default/xui/en/widgets/joystick_rotate.xml index a190da3909..a190da3909 100755..100644 --- a/indra/newview/skins/default/xui/en/widgets/joystick_rotate.xml +++ b/indra/newview/skins/default/xui/en/widgets/joystick_rotate.xml diff --git a/indra/newview/skins/default/xui/en/widgets/layout_stack.xml b/indra/newview/skins/default/xui/en/widgets/layout_stack.xml index 48bcb46533..48bcb46533 100755..100644 --- a/indra/newview/skins/default/xui/en/widgets/layout_stack.xml +++ b/indra/newview/skins/default/xui/en/widgets/layout_stack.xml diff --git a/indra/newview/skins/default/xui/en/widgets/line_editor.xml b/indra/newview/skins/default/xui/en/widgets/line_editor.xml index a054960bf8..a054960bf8 100755..100644 --- a/indra/newview/skins/default/xui/en/widgets/line_editor.xml +++ b/indra/newview/skins/default/xui/en/widgets/line_editor.xml diff --git a/indra/newview/skins/default/xui/en/widgets/list_view.xml b/indra/newview/skins/default/xui/en/widgets/list_view.xml index 2e976bc755..2e976bc755 100755..100644 --- a/indra/newview/skins/default/xui/en/widgets/list_view.xml +++ b/indra/newview/skins/default/xui/en/widgets/list_view.xml diff --git a/indra/newview/skins/default/xui/en/widgets/loading_indicator.xml b/indra/newview/skins/default/xui/en/widgets/loading_indicator.xml index ea1d89c975..ea1d89c975 100755..100644 --- a/indra/newview/skins/default/xui/en/widgets/loading_indicator.xml +++ b/indra/newview/skins/default/xui/en/widgets/loading_indicator.xml diff --git a/indra/newview/skins/default/xui/en/widgets/location_input.xml b/indra/newview/skins/default/xui/en/widgets/location_input.xml index 61ec046649..61ec046649 100755..100644 --- a/indra/newview/skins/default/xui/en/widgets/location_input.xml +++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml diff --git a/indra/newview/skins/default/xui/en/widgets/menu.xml b/indra/newview/skins/default/xui/en/widgets/menu.xml index 13ac84beb2..13ac84beb2 100755..100644 --- a/indra/newview/skins/default/xui/en/widgets/menu.xml +++ b/indra/newview/skins/default/xui/en/widgets/menu.xml diff --git a/indra/newview/skins/default/xui/en/widgets/menu_bar.xml b/indra/newview/skins/default/xui/en/widgets/menu_bar.xml index 27efa72563..27efa72563 100755..100644 --- a/indra/newview/skins/default/xui/en/widgets/menu_bar.xml +++ b/indra/newview/skins/default/xui/en/widgets/menu_bar.xml diff --git a/indra/newview/skins/default/xui/en/widgets/menu_item.xml b/indra/newview/skins/default/xui/en/widgets/menu_item.xml index 563f3dc5c2..563f3dc5c2 100755..100644 --- a/indra/newview/skins/default/xui/en/widgets/menu_item.xml +++ b/indra/newview/skins/default/xui/en/widgets/menu_item.xml diff --git a/indra/newview/skins/default/xui/en/widgets/menu_item_call.xml b/indra/newview/skins/default/xui/en/widgets/menu_item_call.xml index 24bda97f44..24bda97f44 100755..100644 --- a/indra/newview/skins/default/xui/en/widgets/menu_item_call.xml +++ b/indra/newview/skins/default/xui/en/widgets/menu_item_call.xml diff --git a/indra/newview/skins/default/xui/en/widgets/menu_item_check.xml b/indra/newview/skins/default/xui/en/widgets/menu_item_check.xml index f6b06cb50b..f6b06cb50b 100755..100644 --- a/indra/newview/skins/default/xui/en/widgets/menu_item_check.xml +++ b/indra/newview/skins/default/xui/en/widgets/menu_item_check.xml diff --git a/indra/newview/skins/default/xui/en/widgets/menu_item_separator.xml b/indra/newview/skins/default/xui/en/widgets/menu_item_separator.xml index 7452d685eb..7452d685eb 100755..100644 --- a/indra/newview/skins/default/xui/en/widgets/menu_item_separator.xml +++ b/indra/newview/skins/default/xui/en/widgets/menu_item_separator.xml diff --git a/indra/newview/skins/default/xui/en/widgets/menu_item_tear_off.xml b/indra/newview/skins/default/xui/en/widgets/menu_item_tear_off.xml index 72af3924c1..72af3924c1 100755..100644 --- a/indra/newview/skins/default/xui/en/widgets/menu_item_tear_off.xml +++ b/indra/newview/skins/default/xui/en/widgets/menu_item_tear_off.xml diff --git a/indra/newview/skins/default/xui/en/widgets/multi_slider.xml b/indra/newview/skins/default/xui/en/widgets/multi_slider.xml index 90b0625982..90b0625982 100755..100644 --- a/indra/newview/skins/default/xui/en/widgets/multi_slider.xml +++ b/indra/newview/skins/default/xui/en/widgets/multi_slider.xml diff --git a/indra/newview/skins/default/xui/en/widgets/multi_slider_bar.xml b/indra/newview/skins/default/xui/en/widgets/multi_slider_bar.xml index bbcb008df4..bbcb008df4 100755..100644 --- a/indra/newview/skins/default/xui/en/widgets/multi_slider_bar.xml +++ b/indra/newview/skins/default/xui/en/widgets/multi_slider_bar.xml diff --git a/indra/newview/skins/default/xui/en/widgets/name_editor.xml b/indra/newview/skins/default/xui/en/widgets/name_editor.xml index 21ba5c77f8..21ba5c77f8 100755..100644 --- a/indra/newview/skins/default/xui/en/widgets/name_editor.xml +++ b/indra/newview/skins/default/xui/en/widgets/name_editor.xml diff --git a/indra/newview/skins/default/xui/en/widgets/name_list.xml b/indra/newview/skins/default/xui/en/widgets/name_list.xml index 3ae0f68227..3ae0f68227 100755..100644 --- a/indra/newview/skins/default/xui/en/widgets/name_list.xml +++ b/indra/newview/skins/default/xui/en/widgets/name_list.xml diff --git a/indra/newview/skins/default/xui/en/widgets/notification_list_view.xml b/indra/newview/skins/default/xui/en/widgets/notification_list_view.xml new file mode 100644 index 0000000000..150225af27 --- /dev/null +++ b/indra/newview/skins/default/xui/en/widgets/notification_list_view.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<notification_list_view + allow_select="false" + color="PanelFocusBackgroundColor" + item_pad="0" + keep_one_selected="false" + multi_select="false" + opaque="true"> + <flat_list_view + color="FloaterDefaultBackgroundColor" + follows="all" + layout="topleft" + name="notification_list" + left="1" + top="20" + height="0" + width="318"/> +</notification_list_view>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/widgets/output_monitor.xml b/indra/newview/skins/default/xui/en/widgets/output_monitor.xml index 9d71ceca2f..9d71ceca2f 100755..100644 --- a/indra/newview/skins/default/xui/en/widgets/output_monitor.xml +++ b/indra/newview/skins/default/xui/en/widgets/output_monitor.xml diff --git a/indra/newview/skins/default/xui/en/widgets/panel.xml b/indra/newview/skins/default/xui/en/widgets/panel.xml index b36f723831..b36f723831 100755..100644 --- a/indra/newview/skins/default/xui/en/widgets/panel.xml +++ b/indra/newview/skins/default/xui/en/widgets/panel.xml diff --git a/indra/newview/skins/default/xui/en/widgets/panel_camera_item.xml b/indra/newview/skins/default/xui/en/widgets/panel_camera_item.xml index 98707b8495..98707b8495 100755..100644 --- a/indra/newview/skins/default/xui/en/widgets/panel_camera_item.xml +++ b/indra/newview/skins/default/xui/en/widgets/panel_camera_item.xml diff --git a/indra/newview/skins/default/xui/en/widgets/progress_bar.xml b/indra/newview/skins/default/xui/en/widgets/progress_bar.xml index 339e53fbb8..339e53fbb8 100755..100644 --- a/indra/newview/skins/default/xui/en/widgets/progress_bar.xml +++ b/indra/newview/skins/default/xui/en/widgets/progress_bar.xml diff --git a/indra/newview/skins/default/xui/en/widgets/radio_group.xml b/indra/newview/skins/default/xui/en/widgets/radio_group.xml index ab3184d34b..ab3184d34b 100755..100644 --- a/indra/newview/skins/default/xui/en/widgets/radio_group.xml +++ b/indra/newview/skins/default/xui/en/widgets/radio_group.xml diff --git a/indra/newview/skins/default/xui/en/widgets/radio_item.xml b/indra/newview/skins/default/xui/en/widgets/radio_item.xml index 3ddf18b2cb..3ddf18b2cb 100755..100644 --- a/indra/newview/skins/default/xui/en/widgets/radio_item.xml +++ b/indra/newview/skins/default/xui/en/widgets/radio_item.xml diff --git a/indra/newview/skins/default/xui/en/widgets/scroll_bar.xml b/indra/newview/skins/default/xui/en/widgets/scroll_bar.xml index 682dcf40d8..682dcf40d8 100755..100644 --- a/indra/newview/skins/default/xui/en/widgets/scroll_bar.xml +++ b/indra/newview/skins/default/xui/en/widgets/scroll_bar.xml diff --git a/indra/newview/skins/default/xui/en/widgets/scroll_column_header.xml b/indra/newview/skins/default/xui/en/widgets/scroll_column_header.xml index 8a48fcb32d..8a48fcb32d 100755..100644 --- a/indra/newview/skins/default/xui/en/widgets/scroll_column_header.xml +++ b/indra/newview/skins/default/xui/en/widgets/scroll_column_header.xml diff --git a/indra/newview/skins/default/xui/en/widgets/scroll_container.xml b/indra/newview/skins/default/xui/en/widgets/scroll_container.xml index a6d096a964..a6d096a964 100755..100644 --- a/indra/newview/skins/default/xui/en/widgets/scroll_container.xml +++ b/indra/newview/skins/default/xui/en/widgets/scroll_container.xml diff --git a/indra/newview/skins/default/xui/en/widgets/scroll_list.xml b/indra/newview/skins/default/xui/en/widgets/scroll_list.xml index e43989c6c7..e43989c6c7 100755..100644 --- a/indra/newview/skins/default/xui/en/widgets/scroll_list.xml +++ b/indra/newview/skins/default/xui/en/widgets/scroll_list.xml diff --git a/indra/newview/skins/default/xui/en/widgets/scrolling_panel_list.xml b/indra/newview/skins/default/xui/en/widgets/scrolling_panel_list.xml index 40cbf5977a..40cbf5977a 100755..100644 --- a/indra/newview/skins/default/xui/en/widgets/scrolling_panel_list.xml +++ b/indra/newview/skins/default/xui/en/widgets/scrolling_panel_list.xml diff --git a/indra/newview/skins/default/xui/en/widgets/search_combo_box.xml b/indra/newview/skins/default/xui/en/widgets/search_combo_box.xml index ce84cfedc0..ce84cfedc0 100755..100644 --- a/indra/newview/skins/default/xui/en/widgets/search_combo_box.xml +++ b/indra/newview/skins/default/xui/en/widgets/search_combo_box.xml diff --git a/indra/newview/skins/default/xui/en/widgets/search_editor.xml b/indra/newview/skins/default/xui/en/widgets/search_editor.xml index faa0404b35..faa0404b35 100755..100644 --- a/indra/newview/skins/default/xui/en/widgets/search_editor.xml +++ b/indra/newview/skins/default/xui/en/widgets/search_editor.xml diff --git a/indra/newview/skins/default/xui/en/widgets/side_tray.xml b/indra/newview/skins/default/xui/en/widgets/side_tray.xml index 022564c12f..022564c12f 100755..100644 --- a/indra/newview/skins/default/xui/en/widgets/side_tray.xml +++ b/indra/newview/skins/default/xui/en/widgets/side_tray.xml diff --git a/indra/newview/skins/default/xui/en/widgets/sidetray_tab.xml b/indra/newview/skins/default/xui/en/widgets/sidetray_tab.xml index aa8461d367..aa8461d367 100755..100644 --- a/indra/newview/skins/default/xui/en/widgets/sidetray_tab.xml +++ b/indra/newview/skins/default/xui/en/widgets/sidetray_tab.xml diff --git a/indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml b/indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml index a120b1aec8..a120b1aec8 100755..100644 --- a/indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml +++ b/indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml diff --git a/indra/newview/skins/default/xui/en/widgets/slider.xml b/indra/newview/skins/default/xui/en/widgets/slider.xml index f735d09476..f735d09476 100755..100644 --- a/indra/newview/skins/default/xui/en/widgets/slider.xml +++ b/indra/newview/skins/default/xui/en/widgets/slider.xml diff --git a/indra/newview/skins/default/xui/en/widgets/slider_bar.xml b/indra/newview/skins/default/xui/en/widgets/slider_bar.xml index 0335213ed6..0335213ed6 100755..100644 --- a/indra/newview/skins/default/xui/en/widgets/slider_bar.xml +++ b/indra/newview/skins/default/xui/en/widgets/slider_bar.xml diff --git a/indra/newview/skins/default/xui/en/widgets/spinner.xml b/indra/newview/skins/default/xui/en/widgets/spinner.xml index d7af6077e5..d7af6077e5 100755..100644 --- a/indra/newview/skins/default/xui/en/widgets/spinner.xml +++ b/indra/newview/skins/default/xui/en/widgets/spinner.xml diff --git a/indra/newview/skins/default/xui/en/widgets/split_button.xml b/indra/newview/skins/default/xui/en/widgets/split_button.xml index 2ff9ada90a..2ff9ada90a 100755..100644 --- a/indra/newview/skins/default/xui/en/widgets/split_button.xml +++ b/indra/newview/skins/default/xui/en/widgets/split_button.xml diff --git a/indra/newview/skins/default/xui/en/widgets/tab_container.xml b/indra/newview/skins/default/xui/en/widgets/tab_container.xml index 0586119681..0586119681 100755..100644 --- a/indra/newview/skins/default/xui/en/widgets/tab_container.xml +++ b/indra/newview/skins/default/xui/en/widgets/tab_container.xml diff --git a/indra/newview/skins/default/xui/en/widgets/talk_button.xml b/indra/newview/skins/default/xui/en/widgets/talk_button.xml index d792e9f29c..d792e9f29c 100755..100644 --- a/indra/newview/skins/default/xui/en/widgets/talk_button.xml +++ b/indra/newview/skins/default/xui/en/widgets/talk_button.xml diff --git a/indra/newview/skins/default/xui/en/widgets/teleport_history_menu_item.xml b/indra/newview/skins/default/xui/en/widgets/teleport_history_menu_item.xml index 4f574d75d5..4f574d75d5 100755..100644 --- a/indra/newview/skins/default/xui/en/widgets/teleport_history_menu_item.xml +++ b/indra/newview/skins/default/xui/en/widgets/teleport_history_menu_item.xml diff --git a/indra/newview/skins/default/xui/en/widgets/text.xml b/indra/newview/skins/default/xui/en/widgets/text.xml index 2102074674..2102074674 100755..100644 --- a/indra/newview/skins/default/xui/en/widgets/text.xml +++ b/indra/newview/skins/default/xui/en/widgets/text.xml diff --git a/indra/newview/skins/default/xui/en/widgets/text_editor.xml b/indra/newview/skins/default/xui/en/widgets/text_editor.xml index 100571cc01..100571cc01 100755..100644 --- a/indra/newview/skins/default/xui/en/widgets/text_editor.xml +++ b/indra/newview/skins/default/xui/en/widgets/text_editor.xml diff --git a/indra/newview/skins/default/xui/en/widgets/textbase.xml b/indra/newview/skins/default/xui/en/widgets/textbase.xml index b2da2147c1..b2da2147c1 100755..100644 --- a/indra/newview/skins/default/xui/en/widgets/textbase.xml +++ b/indra/newview/skins/default/xui/en/widgets/textbase.xml diff --git a/indra/newview/skins/default/xui/en/widgets/texture_picker.xml b/indra/newview/skins/default/xui/en/widgets/texture_picker.xml index ba2fdf4f1f..ba2fdf4f1f 100755..100644 --- a/indra/newview/skins/default/xui/en/widgets/texture_picker.xml +++ b/indra/newview/skins/default/xui/en/widgets/texture_picker.xml diff --git a/indra/newview/skins/default/xui/en/widgets/time.xml b/indra/newview/skins/default/xui/en/widgets/time.xml index b5bdd564a6..b5bdd564a6 100755..100644 --- a/indra/newview/skins/default/xui/en/widgets/time.xml +++ b/indra/newview/skins/default/xui/en/widgets/time.xml diff --git a/indra/newview/skins/default/xui/en/widgets/toggleable_menu.xml b/indra/newview/skins/default/xui/en/widgets/toggleable_menu.xml index 48950a98ad..48950a98ad 100755..100644 --- a/indra/newview/skins/default/xui/en/widgets/toggleable_menu.xml +++ b/indra/newview/skins/default/xui/en/widgets/toggleable_menu.xml diff --git a/indra/newview/skins/default/xui/en/widgets/tool_tip.xml b/indra/newview/skins/default/xui/en/widgets/tool_tip.xml index 9ca15ae50d..9ca15ae50d 100755..100644 --- a/indra/newview/skins/default/xui/en/widgets/tool_tip.xml +++ b/indra/newview/skins/default/xui/en/widgets/tool_tip.xml diff --git a/indra/newview/skins/default/xui/en/widgets/toolbar.xml b/indra/newview/skins/default/xui/en/widgets/toolbar.xml index 0ace37a5dc..0ace37a5dc 100755..100644 --- a/indra/newview/skins/default/xui/en/widgets/toolbar.xml +++ b/indra/newview/skins/default/xui/en/widgets/toolbar.xml diff --git a/indra/newview/skins/default/xui/en/widgets/ui_ctrl.xml b/indra/newview/skins/default/xui/en/widgets/ui_ctrl.xml index f4dbb8f404..f4dbb8f404 100755..100644 --- a/indra/newview/skins/default/xui/en/widgets/ui_ctrl.xml +++ b/indra/newview/skins/default/xui/en/widgets/ui_ctrl.xml diff --git a/indra/newview/skins/default/xui/en/widgets/view_border.xml b/indra/newview/skins/default/xui/en/widgets/view_border.xml index bf40e3086b..bf40e3086b 100755..100644 --- a/indra/newview/skins/default/xui/en/widgets/view_border.xml +++ b/indra/newview/skins/default/xui/en/widgets/view_border.xml diff --git a/indra/newview/skins/default/xui/en/widgets/web_browser.xml b/indra/newview/skins/default/xui/en/widgets/web_browser.xml index 676fafd828..676fafd828 100755..100644 --- a/indra/newview/skins/default/xui/en/widgets/web_browser.xml +++ b/indra/newview/skins/default/xui/en/widgets/web_browser.xml diff --git a/indra/newview/skins/default/xui/en/widgets/window_shade.xml b/indra/newview/skins/default/xui/en/widgets/window_shade.xml index 23eb2f13fb..23eb2f13fb 100755..100644 --- a/indra/newview/skins/default/xui/en/widgets/window_shade.xml +++ b/indra/newview/skins/default/xui/en/widgets/window_shade.xml diff --git a/indra/newview/skins/default/xui/en/xui_version.xml b/indra/newview/skins/default/xui/en/xui_version.xml index 0e777751d3..0e777751d3 100755..100644 --- a/indra/newview/skins/default/xui/en/xui_version.xml +++ b/indra/newview/skins/default/xui/en/xui_version.xml 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..100644 --- 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 <nolink>[HOSTNAME]</nolink> ([HOSTIP]) -SLURL: <nolink>[SLURL]</nolink> -(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..100644 --- 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 'empujones' (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 'seguro', desactivando el daño en combate. Si no, se activa el daño en combate."/> <check_box label="Sin 'empujones'" 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_activeim.xml b/indra/newview/skins/default/xui/es/floater_activeim.xml index 988786c1ae..988786c1ae 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_activeim.xml +++ b/indra/newview/skins/default/xui/es/floater_activeim.xml 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_auction.xml b/indra/newview/skins/default/xui/es/floater_auction.xml index 6faf19dbb5..6faf19dbb5 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_auction.xml +++ b/indra/newview/skins/default/xui/es/floater_auction.xml diff --git a/indra/newview/skins/default/xui/es/floater_autoreplace.xml b/indra/newview/skins/default/xui/es/floater_autoreplace.xml index 15abccc376..15abccc376 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_autoreplace.xml +++ b/indra/newview/skins/default/xui/es/floater_autoreplace.xml diff --git a/indra/newview/skins/default/xui/es/floater_avatar.xml b/indra/newview/skins/default/xui/es/floater_avatar.xml index 21d202309f..21d202309f 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_avatar.xml +++ b/indra/newview/skins/default/xui/es/floater_avatar.xml diff --git a/indra/newview/skins/default/xui/es/floater_avatar_picker.xml b/indra/newview/skins/default/xui/es/floater_avatar_picker.xml index 49fce5d4ec..49fce5d4ec 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_avatar_picker.xml +++ b/indra/newview/skins/default/xui/es/floater_avatar_picker.xml diff --git a/indra/newview/skins/default/xui/es/floater_avatar_textures.xml b/indra/newview/skins/default/xui/es/floater_avatar_textures.xml index 54ef34264c..54ef34264c 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_avatar_textures.xml +++ b/indra/newview/skins/default/xui/es/floater_avatar_textures.xml diff --git a/indra/newview/skins/default/xui/es/floater_beacons.xml b/indra/newview/skins/default/xui/es/floater_beacons.xml index 49f990c84d..49f990c84d 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_beacons.xml +++ b/indra/newview/skins/default/xui/es/floater_beacons.xml diff --git a/indra/newview/skins/default/xui/es/floater_build_options.xml b/indra/newview/skins/default/xui/es/floater_build_options.xml index a3e656cc17..a3e656cc17 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_build_options.xml +++ b/indra/newview/skins/default/xui/es/floater_build_options.xml diff --git a/indra/newview/skins/default/xui/es/floater_bulk_perms.xml b/indra/newview/skins/default/xui/es/floater_bulk_perms.xml index 5cd8b3c01f..5cd8b3c01f 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_bulk_perms.xml +++ b/indra/newview/skins/default/xui/es/floater_bulk_perms.xml diff --git a/indra/newview/skins/default/xui/es/floater_bumps.xml b/indra/newview/skins/default/xui/es/floater_bumps.xml index 6d4196ca7c..6d4196ca7c 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_bumps.xml +++ b/indra/newview/skins/default/xui/es/floater_bumps.xml diff --git a/indra/newview/skins/default/xui/es/floater_buy_contents.xml b/indra/newview/skins/default/xui/es/floater_buy_contents.xml index 3563d4bd0f..3563d4bd0f 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_buy_contents.xml +++ b/indra/newview/skins/default/xui/es/floater_buy_contents.xml diff --git a/indra/newview/skins/default/xui/es/floater_buy_currency.xml b/indra/newview/skins/default/xui/es/floater_buy_currency.xml index 2c8848265f..2c8848265f 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_buy_currency.xml +++ b/indra/newview/skins/default/xui/es/floater_buy_currency.xml diff --git a/indra/newview/skins/default/xui/es/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/es/floater_buy_currency_html.xml index 08ea67d4cb..08ea67d4cb 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_buy_currency_html.xml +++ b/indra/newview/skins/default/xui/es/floater_buy_currency_html.xml diff --git a/indra/newview/skins/default/xui/es/floater_buy_land.xml b/indra/newview/skins/default/xui/es/floater_buy_land.xml index 005fe90318..005fe90318 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_buy_land.xml +++ b/indra/newview/skins/default/xui/es/floater_buy_land.xml diff --git a/indra/newview/skins/default/xui/es/floater_buy_object.xml b/indra/newview/skins/default/xui/es/floater_buy_object.xml index a774bc6d05..a774bc6d05 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_buy_object.xml +++ b/indra/newview/skins/default/xui/es/floater_buy_object.xml diff --git a/indra/newview/skins/default/xui/es/floater_camera.xml b/indra/newview/skins/default/xui/es/floater_camera.xml index b0704ab788..b0704ab788 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_camera.xml +++ b/indra/newview/skins/default/xui/es/floater_camera.xml diff --git a/indra/newview/skins/default/xui/es/floater_chat_bar.xml b/indra/newview/skins/default/xui/es/floater_chat_bar.xml index 02369c9a43..02369c9a43 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_chat_bar.xml +++ b/indra/newview/skins/default/xui/es/floater_chat_bar.xml diff --git a/indra/newview/skins/default/xui/es/floater_choose_group.xml b/indra/newview/skins/default/xui/es/floater_choose_group.xml index a5967b814e..a5967b814e 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_choose_group.xml +++ b/indra/newview/skins/default/xui/es/floater_choose_group.xml diff --git a/indra/newview/skins/default/xui/es/floater_color_picker.xml b/indra/newview/skins/default/xui/es/floater_color_picker.xml index ed168c09d5..ed168c09d5 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_color_picker.xml +++ b/indra/newview/skins/default/xui/es/floater_color_picker.xml diff --git a/indra/newview/skins/default/xui/es/floater_critical.xml b/indra/newview/skins/default/xui/es/floater_critical.xml index e5cbea8810..e5cbea8810 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_critical.xml +++ b/indra/newview/skins/default/xui/es/floater_critical.xml diff --git a/indra/newview/skins/default/xui/es/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/es/floater_delete_env_preset.xml index 5e7df8530e..5e7df8530e 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_delete_env_preset.xml +++ b/indra/newview/skins/default/xui/es/floater_delete_env_preset.xml diff --git a/indra/newview/skins/default/xui/es/floater_destinations.xml b/indra/newview/skins/default/xui/es/floater_destinations.xml index df18698d2f..df18698d2f 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_destinations.xml +++ b/indra/newview/skins/default/xui/es/floater_destinations.xml diff --git a/indra/newview/skins/default/xui/es/floater_display_name.xml b/indra/newview/skins/default/xui/es/floater_display_name.xml index f1a31a6776..f1a31a6776 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_display_name.xml +++ b/indra/newview/skins/default/xui/es/floater_display_name.xml diff --git a/indra/newview/skins/default/xui/es/floater_edit_day_cycle.xml b/indra/newview/skins/default/xui/es/floater_edit_day_cycle.xml index 6ac46351db..6ac46351db 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_edit_day_cycle.xml +++ b/indra/newview/skins/default/xui/es/floater_edit_day_cycle.xml 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_edit_sky_preset.xml b/indra/newview/skins/default/xui/es/floater_edit_sky_preset.xml index d2197b80fa..d2197b80fa 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_edit_sky_preset.xml +++ b/indra/newview/skins/default/xui/es/floater_edit_sky_preset.xml diff --git a/indra/newview/skins/default/xui/es/floater_edit_water_preset.xml b/indra/newview/skins/default/xui/es/floater_edit_water_preset.xml index f90ad59f78..f90ad59f78 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_edit_water_preset.xml +++ b/indra/newview/skins/default/xui/es/floater_edit_water_preset.xml diff --git a/indra/newview/skins/default/xui/es/floater_environment_settings.xml b/indra/newview/skins/default/xui/es/floater_environment_settings.xml index a9c5705d52..a9c5705d52 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_environment_settings.xml +++ b/indra/newview/skins/default/xui/es/floater_environment_settings.xml diff --git a/indra/newview/skins/default/xui/es/floater_event.xml b/indra/newview/skins/default/xui/es/floater_event.xml index d2724bf8b0..d2724bf8b0 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_event.xml +++ b/indra/newview/skins/default/xui/es/floater_event.xml 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"> + "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 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_fast_timers.xml b/indra/newview/skins/default/xui/es/floater_fast_timers.xml index eeb39583ef..eeb39583ef 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_fast_timers.xml +++ b/indra/newview/skins/default/xui/es/floater_fast_timers.xml diff --git a/indra/newview/skins/default/xui/es/floater_font_test.xml b/indra/newview/skins/default/xui/es/floater_font_test.xml index 9a665321a4..9a665321a4 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_font_test.xml +++ b/indra/newview/skins/default/xui/es/floater_font_test.xml diff --git a/indra/newview/skins/default/xui/es/floater_gesture.xml b/indra/newview/skins/default/xui/es/floater_gesture.xml index d90de8c9f4..d90de8c9f4 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_gesture.xml +++ b/indra/newview/skins/default/xui/es/floater_gesture.xml diff --git a/indra/newview/skins/default/xui/es/floater_god_tools.xml b/indra/newview/skins/default/xui/es/floater_god_tools.xml index 218a5effe8..218a5effe8 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_god_tools.xml +++ b/indra/newview/skins/default/xui/es/floater_god_tools.xml diff --git a/indra/newview/skins/default/xui/es/floater_hardware_settings.xml b/indra/newview/skins/default/xui/es/floater_hardware_settings.xml index c2327c96c4..c2327c96c4 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_hardware_settings.xml +++ b/indra/newview/skins/default/xui/es/floater_hardware_settings.xml diff --git a/indra/newview/skins/default/xui/es/floater_help_browser.xml b/indra/newview/skins/default/xui/es/floater_help_browser.xml index 5ebd7ad6e0..5ebd7ad6e0 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_help_browser.xml +++ b/indra/newview/skins/default/xui/es/floater_help_browser.xml diff --git a/indra/newview/skins/default/xui/es/floater_how_to.xml b/indra/newview/skins/default/xui/es/floater_how_to.xml index 4a57dc3643..4a57dc3643 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_how_to.xml +++ b/indra/newview/skins/default/xui/es/floater_how_to.xml diff --git a/indra/newview/skins/default/xui/es/floater_hud.xml b/indra/newview/skins/default/xui/es/floater_hud.xml index e458913452..e458913452 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_hud.xml +++ b/indra/newview/skins/default/xui/es/floater_hud.xml diff --git a/indra/newview/skins/default/xui/es/floater_im_container.xml b/indra/newview/skins/default/xui/es/floater_im_container.xml index f772441141..f772441141 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_im_container.xml +++ b/indra/newview/skins/default/xui/es/floater_im_container.xml diff --git a/indra/newview/skins/default/xui/es/floater_im_session.xml b/indra/newview/skins/default/xui/es/floater_im_session.xml index e5f48e3fd5..e5f48e3fd5 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_im_session.xml +++ b/indra/newview/skins/default/xui/es/floater_im_session.xml diff --git a/indra/newview/skins/default/xui/es/floater_image_preview.xml b/indra/newview/skins/default/xui/es/floater_image_preview.xml index 84c5bfc824..84c5bfc824 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_image_preview.xml +++ b/indra/newview/skins/default/xui/es/floater_image_preview.xml diff --git a/indra/newview/skins/default/xui/es/floater_import_collada.xml b/indra/newview/skins/default/xui/es/floater_import_collada.xml index 7e9a00797a..7e9a00797a 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_import_collada.xml +++ b/indra/newview/skins/default/xui/es/floater_import_collada.xml diff --git a/indra/newview/skins/default/xui/es/floater_incoming_call.xml b/indra/newview/skins/default/xui/es/floater_incoming_call.xml index acbb25b713..acbb25b713 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_incoming_call.xml +++ b/indra/newview/skins/default/xui/es/floater_incoming_call.xml diff --git a/indra/newview/skins/default/xui/es/floater_inspect.xml b/indra/newview/skins/default/xui/es/floater_inspect.xml index d95653ddd0..d95653ddd0 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_inspect.xml +++ b/indra/newview/skins/default/xui/es/floater_inspect.xml 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..100644 --- 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..100644 --- 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_joystick.xml b/indra/newview/skins/default/xui/es/floater_joystick.xml index 2c1804bd90..2c1804bd90 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_joystick.xml +++ b/indra/newview/skins/default/xui/es/floater_joystick.xml 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 'Bandwidth' 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"> >> @@ -126,7 +126,7 @@ <floater.string name="bigger_label"> << </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_land_holdings.xml b/indra/newview/skins/default/xui/es/floater_land_holdings.xml index ed7055b3a1..ed7055b3a1 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_land_holdings.xml +++ b/indra/newview/skins/default/xui/es/floater_land_holdings.xml 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..100644 --- 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=">" name="view_profile"/> </floater> diff --git a/indra/newview/skins/default/xui/es/floater_lsl_guide.xml b/indra/newview/skins/default/xui/es/floater_lsl_guide.xml index 43a7ede030..43a7ede030 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_lsl_guide.xml +++ b/indra/newview/skins/default/xui/es/floater_lsl_guide.xml diff --git a/indra/newview/skins/default/xui/es/floater_map.xml b/indra/newview/skins/default/xui/es/floater_map.xml index 69f638418e..69f638418e 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_map.xml +++ b/indra/newview/skins/default/xui/es/floater_map.xml 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_media_browser.xml b/indra/newview/skins/default/xui/es/floater_media_browser.xml index 9c4ef1eb2f..9c4ef1eb2f 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_media_browser.xml +++ b/indra/newview/skins/default/xui/es/floater_media_browser.xml diff --git a/indra/newview/skins/default/xui/es/floater_media_settings.xml b/indra/newview/skins/default/xui/es/floater_media_settings.xml index 3f7cef5785..3f7cef5785 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_media_settings.xml +++ b/indra/newview/skins/default/xui/es/floater_media_settings.xml diff --git a/indra/newview/skins/default/xui/es/floater_mem_leaking.xml b/indra/newview/skins/default/xui/es/floater_mem_leaking.xml index da8ba780bc..da8ba780bc 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_mem_leaking.xml +++ b/indra/newview/skins/default/xui/es/floater_mem_leaking.xml diff --git a/indra/newview/skins/default/xui/es/floater_merchant_outbox.xml b/indra/newview/skins/default/xui/es/floater_merchant_outbox.xml index a7c17fc136..a7c17fc136 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_merchant_outbox.xml +++ b/indra/newview/skins/default/xui/es/floater_merchant_outbox.xml diff --git a/indra/newview/skins/default/xui/es/floater_model_preview.xml b/indra/newview/skins/default/xui/es/floater_model_preview.xml index e2313bce99..e2313bce99 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_model_preview.xml +++ b/indra/newview/skins/default/xui/es/floater_model_preview.xml diff --git a/indra/newview/skins/default/xui/es/floater_moveview.xml b/indra/newview/skins/default/xui/es/floater_moveview.xml index 0e7b950bd3..0e7b950bd3 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_moveview.xml +++ b/indra/newview/skins/default/xui/es/floater_moveview.xml diff --git a/indra/newview/skins/default/xui/es/floater_mute_object.xml b/indra/newview/skins/default/xui/es/floater_mute_object.xml index 4cd16a59ed..4cd16a59ed 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_mute_object.xml +++ b/indra/newview/skins/default/xui/es/floater_mute_object.xml diff --git a/indra/newview/skins/default/xui/es/floater_my_appearance.xml b/indra/newview/skins/default/xui/es/floater_my_appearance.xml index 774babf04e..774babf04e 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_my_appearance.xml +++ b/indra/newview/skins/default/xui/es/floater_my_appearance.xml diff --git a/indra/newview/skins/default/xui/es/floater_my_inventory.xml b/indra/newview/skins/default/xui/es/floater_my_inventory.xml index 0efd9f1c6d..0efd9f1c6d 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_my_inventory.xml +++ b/indra/newview/skins/default/xui/es/floater_my_inventory.xml diff --git a/indra/newview/skins/default/xui/es/floater_object_weights.xml b/indra/newview/skins/default/xui/es/floater_object_weights.xml index 50c4f0518d..50c4f0518d 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_object_weights.xml +++ b/indra/newview/skins/default/xui/es/floater_object_weights.xml 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..100644 --- 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_outfit_save_as.xml b/indra/newview/skins/default/xui/es/floater_outfit_save_as.xml index f48d0d2d0c..f48d0d2d0c 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_outfit_save_as.xml +++ b/indra/newview/skins/default/xui/es/floater_outfit_save_as.xml diff --git a/indra/newview/skins/default/xui/es/floater_outgoing_call.xml b/indra/newview/skins/default/xui/es/floater_outgoing_call.xml index 5fd9dba9ac..5fd9dba9ac 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_outgoing_call.xml +++ b/indra/newview/skins/default/xui/es/floater_outgoing_call.xml diff --git a/indra/newview/skins/default/xui/es/floater_pathfinding_characters.xml b/indra/newview/skins/default/xui/es/floater_pathfinding_characters.xml index e3ee0563d2..e3ee0563d2 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_pathfinding_characters.xml +++ b/indra/newview/skins/default/xui/es/floater_pathfinding_characters.xml diff --git a/indra/newview/skins/default/xui/es/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/es/floater_pathfinding_console.xml index e93ecc9e10..e93ecc9e10 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_pathfinding_console.xml +++ b/indra/newview/skins/default/xui/es/floater_pathfinding_console.xml diff --git a/indra/newview/skins/default/xui/es/floater_pathfinding_linksets.xml b/indra/newview/skins/default/xui/es/floater_pathfinding_linksets.xml index e6f864eef5..e6f864eef5 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_pathfinding_linksets.xml +++ b/indra/newview/skins/default/xui/es/floater_pathfinding_linksets.xml 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..100644 --- 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..100644 --- 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_people.xml b/indra/newview/skins/default/xui/es/floater_people.xml index f5a3eab008..f5a3eab008 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_people.xml +++ b/indra/newview/skins/default/xui/es/floater_people.xml diff --git a/indra/newview/skins/default/xui/es/floater_perm_prefs.xml b/indra/newview/skins/default/xui/es/floater_perm_prefs.xml index 93e2088aba..93e2088aba 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_perm_prefs.xml +++ b/indra/newview/skins/default/xui/es/floater_perm_prefs.xml diff --git a/indra/newview/skins/default/xui/es/floater_picks.xml b/indra/newview/skins/default/xui/es/floater_picks.xml index 255aa5dcdc..255aa5dcdc 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_picks.xml +++ b/indra/newview/skins/default/xui/es/floater_picks.xml diff --git a/indra/newview/skins/default/xui/es/floater_places.xml b/indra/newview/skins/default/xui/es/floater_places.xml index 12c6548205..12c6548205 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_places.xml +++ b/indra/newview/skins/default/xui/es/floater_places.xml diff --git a/indra/newview/skins/default/xui/es/floater_post_process.xml b/indra/newview/skins/default/xui/es/floater_post_process.xml index 5c62ccde36..5c62ccde36 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_post_process.xml +++ b/indra/newview/skins/default/xui/es/floater_post_process.xml diff --git a/indra/newview/skins/default/xui/es/floater_preferences.xml b/indra/newview/skins/default/xui/es/floater_preferences.xml index 372680f55d..372680f55d 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_preferences.xml +++ b/indra/newview/skins/default/xui/es/floater_preferences.xml diff --git a/indra/newview/skins/default/xui/es/floater_preferences_proxy.xml b/indra/newview/skins/default/xui/es/floater_preferences_proxy.xml index f656f5d662..f656f5d662 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_preferences_proxy.xml +++ b/indra/newview/skins/default/xui/es/floater_preferences_proxy.xml diff --git a/indra/newview/skins/default/xui/es/floater_preview_animation.xml b/indra/newview/skins/default/xui/es/floater_preview_animation.xml index c3f377a71a..c3f377a71a 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_preview_animation.xml +++ b/indra/newview/skins/default/xui/es/floater_preview_animation.xml diff --git a/indra/newview/skins/default/xui/es/floater_preview_gesture.xml b/indra/newview/skins/default/xui/es/floater_preview_gesture.xml index bd13262dcd..bd13262dcd 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_preview_gesture.xml +++ b/indra/newview/skins/default/xui/es/floater_preview_gesture.xml diff --git a/indra/newview/skins/default/xui/es/floater_preview_notecard.xml b/indra/newview/skins/default/xui/es/floater_preview_notecard.xml index d05a023279..d05a023279 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_preview_notecard.xml +++ b/indra/newview/skins/default/xui/es/floater_preview_notecard.xml diff --git a/indra/newview/skins/default/xui/es/floater_preview_sound.xml b/indra/newview/skins/default/xui/es/floater_preview_sound.xml index 62525c9536..62525c9536 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_preview_sound.xml +++ b/indra/newview/skins/default/xui/es/floater_preview_sound.xml diff --git a/indra/newview/skins/default/xui/es/floater_preview_texture.xml b/indra/newview/skins/default/xui/es/floater_preview_texture.xml index 4012191c78..4012191c78 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_preview_texture.xml +++ b/indra/newview/skins/default/xui/es/floater_preview_texture.xml diff --git a/indra/newview/skins/default/xui/es/floater_price_for_listing.xml b/indra/newview/skins/default/xui/es/floater_price_for_listing.xml index 8d6cdc86c0..8d6cdc86c0 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_price_for_listing.xml +++ b/indra/newview/skins/default/xui/es/floater_price_for_listing.xml diff --git a/indra/newview/skins/default/xui/es/floater_publish_classified.xml b/indra/newview/skins/default/xui/es/floater_publish_classified.xml index a1645f0c64..a1645f0c64 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_publish_classified.xml +++ b/indra/newview/skins/default/xui/es/floater_publish_classified.xml diff --git a/indra/newview/skins/default/xui/es/floater_region_debug_console.xml b/indra/newview/skins/default/xui/es/floater_region_debug_console.xml index 40851f897e..40851f897e 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_region_debug_console.xml +++ b/indra/newview/skins/default/xui/es/floater_region_debug_console.xml diff --git a/indra/newview/skins/default/xui/es/floater_region_info.xml b/indra/newview/skins/default/xui/es/floater_region_info.xml index 46d0839238..46d0839238 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_region_info.xml +++ b/indra/newview/skins/default/xui/es/floater_region_info.xml 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..100644 --- 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 > Invasión > Objetos o texturas" name="Land__Encroachment__Objects_textures"/> <combo_box.item label="Terreno > Invasión > Partículas" name="Land__Encroachment__Particles"/> <combo_box.item label="Terreno > Invasión > Á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_script_debug.xml b/indra/newview/skins/default/xui/es/floater_script_debug.xml index e7eddfd9f3..e7eddfd9f3 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_script_debug.xml +++ b/indra/newview/skins/default/xui/es/floater_script_debug.xml diff --git a/indra/newview/skins/default/xui/es/floater_script_debug_panel.xml b/indra/newview/skins/default/xui/es/floater_script_debug_panel.xml index db9fd5f36e..db9fd5f36e 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_script_debug_panel.xml +++ b/indra/newview/skins/default/xui/es/floater_script_debug_panel.xml diff --git a/indra/newview/skins/default/xui/es/floater_script_limits.xml b/indra/newview/skins/default/xui/es/floater_script_limits.xml index 410f7b5e36..410f7b5e36 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_script_limits.xml +++ b/indra/newview/skins/default/xui/es/floater_script_limits.xml diff --git a/indra/newview/skins/default/xui/es/floater_script_preview.xml b/indra/newview/skins/default/xui/es/floater_script_preview.xml index 5c190a4682..5c190a4682 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_script_preview.xml +++ b/indra/newview/skins/default/xui/es/floater_script_preview.xml diff --git a/indra/newview/skins/default/xui/es/floater_script_queue.xml b/indra/newview/skins/default/xui/es/floater_script_queue.xml index 39c84103c4..39c84103c4 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_script_queue.xml +++ b/indra/newview/skins/default/xui/es/floater_script_queue.xml diff --git a/indra/newview/skins/default/xui/es/floater_script_search.xml b/indra/newview/skins/default/xui/es/floater_script_search.xml index 1ab6682023..1ab6682023 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_script_search.xml +++ b/indra/newview/skins/default/xui/es/floater_script_search.xml diff --git a/indra/newview/skins/default/xui/es/floater_search.xml b/indra/newview/skins/default/xui/es/floater_search.xml index e24d8064a1..e24d8064a1 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_search.xml +++ b/indra/newview/skins/default/xui/es/floater_search.xml diff --git a/indra/newview/skins/default/xui/es/floater_select_key.xml b/indra/newview/skins/default/xui/es/floater_select_key.xml index 6503a3d5cb..6503a3d5cb 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_select_key.xml +++ b/indra/newview/skins/default/xui/es/floater_select_key.xml diff --git a/indra/newview/skins/default/xui/es/floater_sell_land.xml b/indra/newview/skins/default/xui/es/floater_sell_land.xml index d883683945..d883683945 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_sell_land.xml +++ b/indra/newview/skins/default/xui/es/floater_sell_land.xml diff --git a/indra/newview/skins/default/xui/es/floater_settings_debug.xml b/indra/newview/skins/default/xui/es/floater_settings_debug.xml index 1da2e491e1..1da2e491e1 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_settings_debug.xml +++ b/indra/newview/skins/default/xui/es/floater_settings_debug.xml 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..100644 --- 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_sound_devices.xml b/indra/newview/skins/default/xui/es/floater_sound_devices.xml index 0291f9e796..0291f9e796 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_sound_devices.xml +++ b/indra/newview/skins/default/xui/es/floater_sound_devices.xml diff --git a/indra/newview/skins/default/xui/es/floater_sound_preview.xml b/indra/newview/skins/default/xui/es/floater_sound_preview.xml index 8b8d9f13ce..8b8d9f13ce 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_sound_preview.xml +++ b/indra/newview/skins/default/xui/es/floater_sound_preview.xml diff --git a/indra/newview/skins/default/xui/es/floater_spellcheck.xml b/indra/newview/skins/default/xui/es/floater_spellcheck.xml index b664b96928..b664b96928 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_spellcheck.xml +++ b/indra/newview/skins/default/xui/es/floater_spellcheck.xml diff --git a/indra/newview/skins/default/xui/es/floater_spellcheck_import.xml b/indra/newview/skins/default/xui/es/floater_spellcheck_import.xml index bd86ed00da..bd86ed00da 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_spellcheck_import.xml +++ b/indra/newview/skins/default/xui/es/floater_spellcheck_import.xml diff --git a/indra/newview/skins/default/xui/es/floater_stats.xml b/indra/newview/skins/default/xui/es/floater_stats.xml index d1c5e867db..d1c5e867db 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_stats.xml +++ b/indra/newview/skins/default/xui/es/floater_stats.xml diff --git a/indra/newview/skins/default/xui/es/floater_sys_well.xml b/indra/newview/skins/default/xui/es/floater_sys_well.xml index 8c8190be55..8c8190be55 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_sys_well.xml +++ b/indra/newview/skins/default/xui/es/floater_sys_well.xml diff --git a/indra/newview/skins/default/xui/es/floater_telehub.xml b/indra/newview/skins/default/xui/es/floater_telehub.xml index 87cc9c1659..87cc9c1659 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_telehub.xml +++ b/indra/newview/skins/default/xui/es/floater_telehub.xml diff --git a/indra/newview/skins/default/xui/es/floater_test_layout_stacks.xml b/indra/newview/skins/default/xui/es/floater_test_layout_stacks.xml index b479d5f6d6..b479d5f6d6 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_test_layout_stacks.xml +++ b/indra/newview/skins/default/xui/es/floater_test_layout_stacks.xml diff --git a/indra/newview/skins/default/xui/es/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/es/floater_texture_ctrl.xml index 01b024bc3e..01b024bc3e 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_texture_ctrl.xml +++ b/indra/newview/skins/default/xui/es/floater_texture_ctrl.xml diff --git a/indra/newview/skins/default/xui/es/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/es/floater_texture_fetch_debugger.xml index 59aaf7f74a..59aaf7f74a 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_texture_fetch_debugger.xml +++ b/indra/newview/skins/default/xui/es/floater_texture_fetch_debugger.xml diff --git a/indra/newview/skins/default/xui/es/floater_tools.xml b/indra/newview/skins/default/xui/es/floater_tools.xml index 159619decc..159619decc 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_tools.xml +++ b/indra/newview/skins/default/xui/es/floater_tools.xml 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..100644 --- 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_tos.xml b/indra/newview/skins/default/xui/es/floater_tos.xml index 89092201d9..89092201d9 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_tos.xml +++ b/indra/newview/skins/default/xui/es/floater_tos.xml diff --git a/indra/newview/skins/default/xui/es/floater_toybox.xml b/indra/newview/skins/default/xui/es/floater_toybox.xml index 7275b0546b..7275b0546b 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_toybox.xml +++ b/indra/newview/skins/default/xui/es/floater_toybox.xml diff --git a/indra/newview/skins/default/xui/es/floater_translation_settings.xml b/indra/newview/skins/default/xui/es/floater_translation_settings.xml index 765c9a05a2..765c9a05a2 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_translation_settings.xml +++ b/indra/newview/skins/default/xui/es/floater_translation_settings.xml 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/floater_url_entry.xml b/indra/newview/skins/default/xui/es/floater_url_entry.xml index f7c85ff068..f7c85ff068 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_url_entry.xml +++ b/indra/newview/skins/default/xui/es/floater_url_entry.xml diff --git a/indra/newview/skins/default/xui/es/floater_voice_controls.xml b/indra/newview/skins/default/xui/es/floater_voice_controls.xml index eff21239be..eff21239be 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_voice_controls.xml +++ b/indra/newview/skins/default/xui/es/floater_voice_controls.xml diff --git a/indra/newview/skins/default/xui/es/floater_voice_effect.xml b/indra/newview/skins/default/xui/es/floater_voice_effect.xml index 02ebe80ff7..02ebe80ff7 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_voice_effect.xml +++ b/indra/newview/skins/default/xui/es/floater_voice_effect.xml diff --git a/indra/newview/skins/default/xui/es/floater_web_content.xml b/indra/newview/skins/default/xui/es/floater_web_content.xml index 5e02fad2dd..5e02fad2dd 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_web_content.xml +++ b/indra/newview/skins/default/xui/es/floater_web_content.xml diff --git a/indra/newview/skins/default/xui/es/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/es/floater_whitelist_entry.xml index 7dc47ca367..7dc47ca367 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_whitelist_entry.xml +++ b/indra/newview/skins/default/xui/es/floater_whitelist_entry.xml diff --git a/indra/newview/skins/default/xui/es/floater_window_size.xml b/indra/newview/skins/default/xui/es/floater_window_size.xml index 6c1ad02319..6c1ad02319 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_window_size.xml +++ b/indra/newview/skins/default/xui/es/floater_window_size.xml diff --git a/indra/newview/skins/default/xui/es/floater_world_map.xml b/indra/newview/skins/default/xui/es/floater_world_map.xml index acc63e52a0..acc63e52a0 100755..100644 --- a/indra/newview/skins/default/xui/es/floater_world_map.xml +++ b/indra/newview/skins/default/xui/es/floater_world_map.xml diff --git a/indra/newview/skins/default/xui/es/inspect_avatar.xml b/indra/newview/skins/default/xui/es/inspect_avatar.xml index 1d70fa6a90..1d70fa6a90 100755..100644 --- a/indra/newview/skins/default/xui/es/inspect_avatar.xml +++ b/indra/newview/skins/default/xui/es/inspect_avatar.xml diff --git a/indra/newview/skins/default/xui/es/inspect_group.xml b/indra/newview/skins/default/xui/es/inspect_group.xml index ba10b19f41..ba10b19f41 100755..100644 --- a/indra/newview/skins/default/xui/es/inspect_group.xml +++ b/indra/newview/skins/default/xui/es/inspect_group.xml diff --git a/indra/newview/skins/default/xui/es/inspect_object.xml b/indra/newview/skins/default/xui/es/inspect_object.xml index d608b4a0f7..d608b4a0f7 100755..100644 --- a/indra/newview/skins/default/xui/es/inspect_object.xml +++ b/indra/newview/skins/default/xui/es/inspect_object.xml diff --git a/indra/newview/skins/default/xui/es/inspect_remote_object.xml b/indra/newview/skins/default/xui/es/inspect_remote_object.xml index f814e84a6f..f814e84a6f 100755..100644 --- a/indra/newview/skins/default/xui/es/inspect_remote_object.xml +++ b/indra/newview/skins/default/xui/es/inspect_remote_object.xml diff --git a/indra/newview/skins/default/xui/es/language_settings.xml b/indra/newview/skins/default/xui/es/language_settings.xml index 997293a741..997293a741 100755..100644 --- a/indra/newview/skins/default/xui/es/language_settings.xml +++ b/indra/newview/skins/default/xui/es/language_settings.xml diff --git a/indra/newview/skins/default/xui/es/menu_add_wearable_gear.xml b/indra/newview/skins/default/xui/es/menu_add_wearable_gear.xml index f2367c72a3..f2367c72a3 100755..100644 --- a/indra/newview/skins/default/xui/es/menu_add_wearable_gear.xml +++ b/indra/newview/skins/default/xui/es/menu_add_wearable_gear.xml diff --git a/indra/newview/skins/default/xui/es/menu_attachment_other.xml b/indra/newview/skins/default/xui/es/menu_attachment_other.xml index 7698348c00..7698348c00 100755..100644 --- a/indra/newview/skins/default/xui/es/menu_attachment_other.xml +++ b/indra/newview/skins/default/xui/es/menu_attachment_other.xml 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..100644 --- 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_icon.xml b/indra/newview/skins/default/xui/es/menu_avatar_icon.xml index e3299b0a6b..e3299b0a6b 100755..100644 --- a/indra/newview/skins/default/xui/es/menu_avatar_icon.xml +++ b/indra/newview/skins/default/xui/es/menu_avatar_icon.xml diff --git a/indra/newview/skins/default/xui/es/menu_avatar_other.xml b/indra/newview/skins/default/xui/es/menu_avatar_other.xml index 244099214a..244099214a 100755..100644 --- a/indra/newview/skins/default/xui/es/menu_avatar_other.xml +++ b/indra/newview/skins/default/xui/es/menu_avatar_other.xml 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..100644 --- 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_cof_attachment.xml b/indra/newview/skins/default/xui/es/menu_cof_attachment.xml index 7541530601..7541530601 100755..100644 --- a/indra/newview/skins/default/xui/es/menu_cof_attachment.xml +++ b/indra/newview/skins/default/xui/es/menu_cof_attachment.xml diff --git a/indra/newview/skins/default/xui/es/menu_cof_body_part.xml b/indra/newview/skins/default/xui/es/menu_cof_body_part.xml index 56b95bdc3b..56b95bdc3b 100755..100644 --- a/indra/newview/skins/default/xui/es/menu_cof_body_part.xml +++ b/indra/newview/skins/default/xui/es/menu_cof_body_part.xml diff --git a/indra/newview/skins/default/xui/es/menu_cof_clothing.xml b/indra/newview/skins/default/xui/es/menu_cof_clothing.xml index 3c0c588284..3c0c588284 100755..100644 --- a/indra/newview/skins/default/xui/es/menu_cof_clothing.xml +++ b/indra/newview/skins/default/xui/es/menu_cof_clothing.xml diff --git a/indra/newview/skins/default/xui/es/menu_cof_gear.xml b/indra/newview/skins/default/xui/es/menu_cof_gear.xml index a889992b8a..a889992b8a 100755..100644 --- a/indra/newview/skins/default/xui/es/menu_cof_gear.xml +++ b/indra/newview/skins/default/xui/es/menu_cof_gear.xml diff --git a/indra/newview/skins/default/xui/es/menu_edit.xml b/indra/newview/skins/default/xui/es/menu_edit.xml index 96fc9d8881..96fc9d8881 100755..100644 --- a/indra/newview/skins/default/xui/es/menu_edit.xml +++ b/indra/newview/skins/default/xui/es/menu_edit.xml diff --git a/indra/newview/skins/default/xui/es/menu_favorites.xml b/indra/newview/skins/default/xui/es/menu_favorites.xml index 85210d5c49..85210d5c49 100755..100644 --- a/indra/newview/skins/default/xui/es/menu_favorites.xml +++ b/indra/newview/skins/default/xui/es/menu_favorites.xml diff --git a/indra/newview/skins/default/xui/es/menu_gesture_gear.xml b/indra/newview/skins/default/xui/es/menu_gesture_gear.xml index 24706eb2c8..24706eb2c8 100755..100644 --- a/indra/newview/skins/default/xui/es/menu_gesture_gear.xml +++ b/indra/newview/skins/default/xui/es/menu_gesture_gear.xml diff --git a/indra/newview/skins/default/xui/es/menu_group_plus.xml b/indra/newview/skins/default/xui/es/menu_group_plus.xml index 6b26ba42c4..6b26ba42c4 100755..100644 --- a/indra/newview/skins/default/xui/es/menu_group_plus.xml +++ b/indra/newview/skins/default/xui/es/menu_group_plus.xml diff --git a/indra/newview/skins/default/xui/es/menu_hide_navbar.xml b/indra/newview/skins/default/xui/es/menu_hide_navbar.xml index 9945908c4f..9945908c4f 100755..100644 --- a/indra/newview/skins/default/xui/es/menu_hide_navbar.xml +++ b/indra/newview/skins/default/xui/es/menu_hide_navbar.xml diff --git a/indra/newview/skins/default/xui/es/menu_imchiclet_adhoc.xml b/indra/newview/skins/default/xui/es/menu_imchiclet_adhoc.xml index e11e9bdc58..e11e9bdc58 100755..100644 --- a/indra/newview/skins/default/xui/es/menu_imchiclet_adhoc.xml +++ b/indra/newview/skins/default/xui/es/menu_imchiclet_adhoc.xml diff --git a/indra/newview/skins/default/xui/es/menu_imchiclet_group.xml b/indra/newview/skins/default/xui/es/menu_imchiclet_group.xml index a5e60ea40b..a5e60ea40b 100755..100644 --- a/indra/newview/skins/default/xui/es/menu_imchiclet_group.xml +++ b/indra/newview/skins/default/xui/es/menu_imchiclet_group.xml diff --git a/indra/newview/skins/default/xui/es/menu_imchiclet_p2p.xml b/indra/newview/skins/default/xui/es/menu_imchiclet_p2p.xml index 492801026c..492801026c 100755..100644 --- a/indra/newview/skins/default/xui/es/menu_imchiclet_p2p.xml +++ b/indra/newview/skins/default/xui/es/menu_imchiclet_p2p.xml diff --git a/indra/newview/skins/default/xui/es/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/es/menu_inspect_avatar_gear.xml index 82fc8ddd39..82fc8ddd39 100755..100644 --- a/indra/newview/skins/default/xui/es/menu_inspect_avatar_gear.xml +++ b/indra/newview/skins/default/xui/es/menu_inspect_avatar_gear.xml diff --git a/indra/newview/skins/default/xui/es/menu_inspect_object_gear.xml b/indra/newview/skins/default/xui/es/menu_inspect_object_gear.xml index 9d0a8c50ef..9d0a8c50ef 100755..100644 --- a/indra/newview/skins/default/xui/es/menu_inspect_object_gear.xml +++ b/indra/newview/skins/default/xui/es/menu_inspect_object_gear.xml diff --git a/indra/newview/skins/default/xui/es/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/es/menu_inspect_self_gear.xml index 29ad718fdd..29ad718fdd 100755..100644 --- a/indra/newview/skins/default/xui/es/menu_inspect_self_gear.xml +++ b/indra/newview/skins/default/xui/es/menu_inspect_self_gear.xml diff --git a/indra/newview/skins/default/xui/es/menu_inv_offer_chiclet.xml b/indra/newview/skins/default/xui/es/menu_inv_offer_chiclet.xml index 20d99afde1..20d99afde1 100755..100644 --- a/indra/newview/skins/default/xui/es/menu_inv_offer_chiclet.xml +++ b/indra/newview/skins/default/xui/es/menu_inv_offer_chiclet.xml 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..100644 --- 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_add.xml b/indra/newview/skins/default/xui/es/menu_inventory_add.xml index f17cfe4ceb..f17cfe4ceb 100755..100644 --- a/indra/newview/skins/default/xui/es/menu_inventory_add.xml +++ b/indra/newview/skins/default/xui/es/menu_inventory_add.xml 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..100644 --- 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_land.xml b/indra/newview/skins/default/xui/es/menu_land.xml index 2097628356..2097628356 100755..100644 --- a/indra/newview/skins/default/xui/es/menu_land.xml +++ b/indra/newview/skins/default/xui/es/menu_land.xml diff --git a/indra/newview/skins/default/xui/es/menu_landmark.xml b/indra/newview/skins/default/xui/es/menu_landmark.xml index f69b1539b8..f69b1539b8 100755..100644 --- a/indra/newview/skins/default/xui/es/menu_landmark.xml +++ b/indra/newview/skins/default/xui/es/menu_landmark.xml diff --git a/indra/newview/skins/default/xui/es/menu_login.xml b/indra/newview/skins/default/xui/es/menu_login.xml index 336572f0cb..336572f0cb 100755..100644 --- a/indra/newview/skins/default/xui/es/menu_login.xml +++ b/indra/newview/skins/default/xui/es/menu_login.xml 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_media_ctrl.xml b/indra/newview/skins/default/xui/es/menu_media_ctrl.xml index b4dfe9907a..b4dfe9907a 100755..100644 --- a/indra/newview/skins/default/xui/es/menu_media_ctrl.xml +++ b/indra/newview/skins/default/xui/es/menu_media_ctrl.xml diff --git a/indra/newview/skins/default/xui/es/menu_mini_map.xml b/indra/newview/skins/default/xui/es/menu_mini_map.xml index 07d1b08572..07d1b08572 100755..100644 --- a/indra/newview/skins/default/xui/es/menu_mini_map.xml +++ b/indra/newview/skins/default/xui/es/menu_mini_map.xml diff --git a/indra/newview/skins/default/xui/es/menu_model_import_gear_default.xml b/indra/newview/skins/default/xui/es/menu_model_import_gear_default.xml index 0d4f1314c9..0d4f1314c9 100755..100644 --- a/indra/newview/skins/default/xui/es/menu_model_import_gear_default.xml +++ b/indra/newview/skins/default/xui/es/menu_model_import_gear_default.xml diff --git a/indra/newview/skins/default/xui/es/menu_navbar.xml b/indra/newview/skins/default/xui/es/menu_navbar.xml index 63e5468020..63e5468020 100755..100644 --- a/indra/newview/skins/default/xui/es/menu_navbar.xml +++ b/indra/newview/skins/default/xui/es/menu_navbar.xml diff --git a/indra/newview/skins/default/xui/es/menu_nearby_chat.xml b/indra/newview/skins/default/xui/es/menu_nearby_chat.xml index 94b281b6c7..94b281b6c7 100755..100644 --- a/indra/newview/skins/default/xui/es/menu_nearby_chat.xml +++ b/indra/newview/skins/default/xui/es/menu_nearby_chat.xml diff --git a/indra/newview/skins/default/xui/es/menu_notification_well_button.xml b/indra/newview/skins/default/xui/es/menu_notification_well_button.xml index 0562d35be7..0562d35be7 100755..100644 --- a/indra/newview/skins/default/xui/es/menu_notification_well_button.xml +++ b/indra/newview/skins/default/xui/es/menu_notification_well_button.xml diff --git a/indra/newview/skins/default/xui/es/menu_object.xml b/indra/newview/skins/default/xui/es/menu_object.xml index 0de9907660..0de9907660 100755..100644 --- a/indra/newview/skins/default/xui/es/menu_object.xml +++ b/indra/newview/skins/default/xui/es/menu_object.xml diff --git a/indra/newview/skins/default/xui/es/menu_object_icon.xml b/indra/newview/skins/default/xui/es/menu_object_icon.xml index a99c889bb0..a99c889bb0 100755..100644 --- a/indra/newview/skins/default/xui/es/menu_object_icon.xml +++ b/indra/newview/skins/default/xui/es/menu_object_icon.xml diff --git a/indra/newview/skins/default/xui/es/menu_outfit_gear.xml b/indra/newview/skins/default/xui/es/menu_outfit_gear.xml index 56e64c729f..56e64c729f 100755..100644 --- a/indra/newview/skins/default/xui/es/menu_outfit_gear.xml +++ b/indra/newview/skins/default/xui/es/menu_outfit_gear.xml diff --git a/indra/newview/skins/default/xui/es/menu_outfit_tab.xml b/indra/newview/skins/default/xui/es/menu_outfit_tab.xml index 4136082a62..4136082a62 100755..100644 --- a/indra/newview/skins/default/xui/es/menu_outfit_tab.xml +++ b/indra/newview/skins/default/xui/es/menu_outfit_tab.xml diff --git a/indra/newview/skins/default/xui/es/menu_participant_list.xml b/indra/newview/skins/default/xui/es/menu_participant_list.xml index f6eedd1170..f6eedd1170 100755..100644 --- a/indra/newview/skins/default/xui/es/menu_participant_list.xml +++ b/indra/newview/skins/default/xui/es/menu_participant_list.xml diff --git a/indra/newview/skins/default/xui/es/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/es/menu_people_friends_view_sort.xml index 3899ad9e96..3899ad9e96 100755..100644 --- a/indra/newview/skins/default/xui/es/menu_people_friends_view_sort.xml +++ b/indra/newview/skins/default/xui/es/menu_people_friends_view_sort.xml diff --git a/indra/newview/skins/default/xui/es/menu_people_groups.xml b/indra/newview/skins/default/xui/es/menu_people_groups.xml index 125e25cd1a..125e25cd1a 100755..100644 --- a/indra/newview/skins/default/xui/es/menu_people_groups.xml +++ b/indra/newview/skins/default/xui/es/menu_people_groups.xml diff --git a/indra/newview/skins/default/xui/es/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/es/menu_people_groups_view_sort.xml index 1bd3efb611..1bd3efb611 100755..100644 --- a/indra/newview/skins/default/xui/es/menu_people_groups_view_sort.xml +++ b/indra/newview/skins/default/xui/es/menu_people_groups_view_sort.xml diff --git a/indra/newview/skins/default/xui/es/menu_people_nearby.xml b/indra/newview/skins/default/xui/es/menu_people_nearby.xml index 09bb119d5a..09bb119d5a 100755..100644 --- a/indra/newview/skins/default/xui/es/menu_people_nearby.xml +++ b/indra/newview/skins/default/xui/es/menu_people_nearby.xml diff --git a/indra/newview/skins/default/xui/es/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/es/menu_people_nearby_multiselect.xml index 9df160f5ad..9df160f5ad 100755..100644 --- a/indra/newview/skins/default/xui/es/menu_people_nearby_multiselect.xml +++ b/indra/newview/skins/default/xui/es/menu_people_nearby_multiselect.xml diff --git a/indra/newview/skins/default/xui/es/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/es/menu_people_nearby_view_sort.xml index 1403e4db01..1403e4db01 100755..100644 --- a/indra/newview/skins/default/xui/es/menu_people_nearby_view_sort.xml +++ b/indra/newview/skins/default/xui/es/menu_people_nearby_view_sort.xml diff --git a/indra/newview/skins/default/xui/es/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/es/menu_people_recent_view_sort.xml index e4aaa89110..e4aaa89110 100755..100644 --- a/indra/newview/skins/default/xui/es/menu_people_recent_view_sort.xml +++ b/indra/newview/skins/default/xui/es/menu_people_recent_view_sort.xml diff --git a/indra/newview/skins/default/xui/es/menu_picks.xml b/indra/newview/skins/default/xui/es/menu_picks.xml index 9da68d7c9b..9da68d7c9b 100755..100644 --- a/indra/newview/skins/default/xui/es/menu_picks.xml +++ b/indra/newview/skins/default/xui/es/menu_picks.xml diff --git a/indra/newview/skins/default/xui/es/menu_picks_plus.xml b/indra/newview/skins/default/xui/es/menu_picks_plus.xml index cc59bf1d29..cc59bf1d29 100755..100644 --- a/indra/newview/skins/default/xui/es/menu_picks_plus.xml +++ b/indra/newview/skins/default/xui/es/menu_picks_plus.xml diff --git a/indra/newview/skins/default/xui/es/menu_place.xml b/indra/newview/skins/default/xui/es/menu_place.xml index 675f0699e9..675f0699e9 100755..100644 --- a/indra/newview/skins/default/xui/es/menu_place.xml +++ b/indra/newview/skins/default/xui/es/menu_place.xml diff --git a/indra/newview/skins/default/xui/es/menu_place_add_button.xml b/indra/newview/skins/default/xui/es/menu_place_add_button.xml index 4b2f908a06..4b2f908a06 100755..100644 --- a/indra/newview/skins/default/xui/es/menu_place_add_button.xml +++ b/indra/newview/skins/default/xui/es/menu_place_add_button.xml diff --git a/indra/newview/skins/default/xui/es/menu_places_gear_folder.xml b/indra/newview/skins/default/xui/es/menu_places_gear_folder.xml index 4051ff4075..4051ff4075 100755..100644 --- a/indra/newview/skins/default/xui/es/menu_places_gear_folder.xml +++ b/indra/newview/skins/default/xui/es/menu_places_gear_folder.xml diff --git a/indra/newview/skins/default/xui/es/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/es/menu_places_gear_landmark.xml index c92bd19787..c92bd19787 100755..100644 --- a/indra/newview/skins/default/xui/es/menu_places_gear_landmark.xml +++ b/indra/newview/skins/default/xui/es/menu_places_gear_landmark.xml diff --git a/indra/newview/skins/default/xui/es/menu_profile_overflow.xml b/indra/newview/skins/default/xui/es/menu_profile_overflow.xml index 5ee8c50949..5ee8c50949 100755..100644 --- a/indra/newview/skins/default/xui/es/menu_profile_overflow.xml +++ b/indra/newview/skins/default/xui/es/menu_profile_overflow.xml diff --git a/indra/newview/skins/default/xui/es/menu_save_outfit.xml b/indra/newview/skins/default/xui/es/menu_save_outfit.xml index a04ec75b60..a04ec75b60 100755..100644 --- a/indra/newview/skins/default/xui/es/menu_save_outfit.xml +++ b/indra/newview/skins/default/xui/es/menu_save_outfit.xml diff --git a/indra/newview/skins/default/xui/es/menu_script_chiclet.xml b/indra/newview/skins/default/xui/es/menu_script_chiclet.xml index f517baf566..f517baf566 100755..100644 --- a/indra/newview/skins/default/xui/es/menu_script_chiclet.xml +++ b/indra/newview/skins/default/xui/es/menu_script_chiclet.xml diff --git a/indra/newview/skins/default/xui/es/menu_slurl.xml b/indra/newview/skins/default/xui/es/menu_slurl.xml index ca19acec6e..ca19acec6e 100755..100644 --- a/indra/newview/skins/default/xui/es/menu_slurl.xml +++ b/indra/newview/skins/default/xui/es/menu_slurl.xml diff --git a/indra/newview/skins/default/xui/es/menu_teleport_history_gear.xml b/indra/newview/skins/default/xui/es/menu_teleport_history_gear.xml index b708f3bc20..b708f3bc20 100755..100644 --- a/indra/newview/skins/default/xui/es/menu_teleport_history_gear.xml +++ b/indra/newview/skins/default/xui/es/menu_teleport_history_gear.xml diff --git a/indra/newview/skins/default/xui/es/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/es/menu_teleport_history_item.xml index 1ff555b727..1ff555b727 100755..100644 --- a/indra/newview/skins/default/xui/es/menu_teleport_history_item.xml +++ b/indra/newview/skins/default/xui/es/menu_teleport_history_item.xml diff --git a/indra/newview/skins/default/xui/es/menu_teleport_history_tab.xml b/indra/newview/skins/default/xui/es/menu_teleport_history_tab.xml index 17e90422a5..17e90422a5 100755..100644 --- a/indra/newview/skins/default/xui/es/menu_teleport_history_tab.xml +++ b/indra/newview/skins/default/xui/es/menu_teleport_history_tab.xml diff --git a/indra/newview/skins/default/xui/es/menu_text_editor.xml b/indra/newview/skins/default/xui/es/menu_text_editor.xml index 6253463725..6253463725 100755..100644 --- a/indra/newview/skins/default/xui/es/menu_text_editor.xml +++ b/indra/newview/skins/default/xui/es/menu_text_editor.xml diff --git a/indra/newview/skins/default/xui/es/menu_toolbars.xml b/indra/newview/skins/default/xui/es/menu_toolbars.xml index 63f3dc43bd..63f3dc43bd 100755..100644 --- a/indra/newview/skins/default/xui/es/menu_toolbars.xml +++ b/indra/newview/skins/default/xui/es/menu_toolbars.xml diff --git a/indra/newview/skins/default/xui/es/menu_topinfobar.xml b/indra/newview/skins/default/xui/es/menu_topinfobar.xml index 2125fd51b2..2125fd51b2 100755..100644 --- a/indra/newview/skins/default/xui/es/menu_topinfobar.xml +++ b/indra/newview/skins/default/xui/es/menu_topinfobar.xml diff --git a/indra/newview/skins/default/xui/es/menu_url_agent.xml b/indra/newview/skins/default/xui/es/menu_url_agent.xml index 610d65465d..610d65465d 100755..100644 --- a/indra/newview/skins/default/xui/es/menu_url_agent.xml +++ b/indra/newview/skins/default/xui/es/menu_url_agent.xml 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_url_group.xml b/indra/newview/skins/default/xui/es/menu_url_group.xml index 79374b9739..79374b9739 100755..100644 --- a/indra/newview/skins/default/xui/es/menu_url_group.xml +++ b/indra/newview/skins/default/xui/es/menu_url_group.xml diff --git a/indra/newview/skins/default/xui/es/menu_url_http.xml b/indra/newview/skins/default/xui/es/menu_url_http.xml index 585c059ff3..585c059ff3 100755..100644 --- a/indra/newview/skins/default/xui/es/menu_url_http.xml +++ b/indra/newview/skins/default/xui/es/menu_url_http.xml diff --git a/indra/newview/skins/default/xui/es/menu_url_inventory.xml b/indra/newview/skins/default/xui/es/menu_url_inventory.xml index 13a8711c76..13a8711c76 100755..100644 --- a/indra/newview/skins/default/xui/es/menu_url_inventory.xml +++ b/indra/newview/skins/default/xui/es/menu_url_inventory.xml diff --git a/indra/newview/skins/default/xui/es/menu_url_map.xml b/indra/newview/skins/default/xui/es/menu_url_map.xml index f96a0c7170..f96a0c7170 100755..100644 --- a/indra/newview/skins/default/xui/es/menu_url_map.xml +++ b/indra/newview/skins/default/xui/es/menu_url_map.xml diff --git a/indra/newview/skins/default/xui/es/menu_url_objectim.xml b/indra/newview/skins/default/xui/es/menu_url_objectim.xml index c3c8439ea2..c3c8439ea2 100755..100644 --- a/indra/newview/skins/default/xui/es/menu_url_objectim.xml +++ b/indra/newview/skins/default/xui/es/menu_url_objectim.xml diff --git a/indra/newview/skins/default/xui/es/menu_url_parcel.xml b/indra/newview/skins/default/xui/es/menu_url_parcel.xml index 9e789ef8ee..9e789ef8ee 100755..100644 --- a/indra/newview/skins/default/xui/es/menu_url_parcel.xml +++ b/indra/newview/skins/default/xui/es/menu_url_parcel.xml diff --git a/indra/newview/skins/default/xui/es/menu_url_slapp.xml b/indra/newview/skins/default/xui/es/menu_url_slapp.xml index 7147dcd3cf..7147dcd3cf 100755..100644 --- a/indra/newview/skins/default/xui/es/menu_url_slapp.xml +++ b/indra/newview/skins/default/xui/es/menu_url_slapp.xml diff --git a/indra/newview/skins/default/xui/es/menu_url_slurl.xml b/indra/newview/skins/default/xui/es/menu_url_slurl.xml index 4ab47c2f61..4ab47c2f61 100755..100644 --- a/indra/newview/skins/default/xui/es/menu_url_slurl.xml +++ b/indra/newview/skins/default/xui/es/menu_url_slurl.xml diff --git a/indra/newview/skins/default/xui/es/menu_url_teleport.xml b/indra/newview/skins/default/xui/es/menu_url_teleport.xml index 8f86a91be3..8f86a91be3 100755..100644 --- a/indra/newview/skins/default/xui/es/menu_url_teleport.xml +++ b/indra/newview/skins/default/xui/es/menu_url_teleport.xml diff --git a/indra/newview/skins/default/xui/es/menu_viewer.xml b/indra/newview/skins/default/xui/es/menu_viewer.xml index 9596a8277e..f6ebb498ec 100755..100644 --- a/indra/newview/skins/default/xui/es/menu_viewer.xml +++ b/indra/newview/skins/default/xui/es/menu_viewer.xml @@ -8,19 +8,21 @@ <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"/> <menu_item_check label="Volar" name="Fly"/> <menu_item_check label="Correr siempre" name="Always Run"/> <menu_item_call label="Parar mis animaciones" name="Stop Animating My Avatar"/> - <menu_item_call label="Caminar / Correr / Volar..." name="Walk / run / fly"/> + <menu_item_call label="Caminar / Correr / Volar..." name="WalkRunFly"/> </menu> <menu label="Estado" name="Status"> <menu_item_check label="Ausente" name="Away"/> <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"> @@ -61,7 +63,7 @@ <menu_item_call label="Foto" name="Take Snapshot"/> <menu_item_call label="Perfil del lugar" name="Place Profile"/> <menu_item_call label="Acerca del terreno" name="About Land"/> - <menu_item_call label="Región/Estado" name="Region/Estate"/> + <menu_item_call label="Región/Estado" name="RegionEstate"/> <menu_item_call label="Mis terrenos..." name="My Land"/> <menu_item_call label="Comprar este terreno" name="Buy Land"/> <menu label="Mostrar" name="LandShow"> @@ -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/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/es/menu_wearable_list_item.xml index 4bffa689e7..4bffa689e7 100755..100644 --- a/indra/newview/skins/default/xui/es/menu_wearable_list_item.xml +++ b/indra/newview/skins/default/xui/es/menu_wearable_list_item.xml diff --git a/indra/newview/skins/default/xui/es/menu_wearing_gear.xml b/indra/newview/skins/default/xui/es/menu_wearing_gear.xml index ec13f99a01..ec13f99a01 100755..100644 --- a/indra/newview/skins/default/xui/es/menu_wearing_gear.xml +++ b/indra/newview/skins/default/xui/es/menu_wearing_gear.xml diff --git a/indra/newview/skins/default/xui/es/menu_wearing_tab.xml b/indra/newview/skins/default/xui/es/menu_wearing_tab.xml index 64fd7ce4cf..64fd7ce4cf 100755..100644 --- a/indra/newview/skins/default/xui/es/menu_wearing_tab.xml +++ b/indra/newview/skins/default/xui/es/menu_wearing_tab.xml 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..100644 --- 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..100644 --- 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 'Real Time' 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..100644 --- 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 'Real Time' diff --git a/indra/newview/skins/default/xui/es/notifications.xml b/indra/newview/skins/default/xui/es/notifications.xml index 01407dc69e..1e367b33fc 100755..100644 --- 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 '[_NAME]' 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: + + '[ERROR_CODE]' + <usetemplate name="okbutton" yestext="OK"/> + </notification> + <notification name="MerchantPasteFailed"> + Ha ocurrido el siguiente error al copiar o mover a artículos del Mercado: + + '[ERROR_CODE]' + <usetemplate name="okbutton" yestext="OK"/> + </notification> + <notification name="MerchantTransactionFailed"> + La transacción con el Mercado ha fallado por el siguiente error: + + Motivo: '[ERROR_REASON]' + [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: + + '[ERROR_CODE]' + <usetemplate name="okbutton" yestext="OK"/> + </notification> + <notification name="MerchantFolderActivationFailed"> + Ha ocurrido el siguiente error al activar esta carpeta de versión: + + '[ERROR_CODE]' + <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 > 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 > Preferencias > 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. '[REGION_NAME]' 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 > Preferencias > 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 'Pagar al objeto' 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 > Mostrar las configuraciones del depurador > 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. @@ -2665,9 +2796,6 @@ Por favor, vuelve a intentarlo en unos momentos. <notification name="NoValidCircuit"> Circuito de código inválido. </notification> - <notification name="NoValidTimestamp"> - Fecha inválida. - </notification> <notification name="NoPendingConnection"> No se puede crear la conexión. </notification> @@ -2822,7 +2950,7 @@ Si permaneces en esta región serás desconectado. [MESSAGE] -Del objeto: <nolink>[OBJECTNAME]</nolink>, propietario: [NAME]? +Del objeto: <nolink>[OBJECTNAME]</nolink>, propietario: [NAME] <form name="form"> <button name="Gotopage" text="Cargar"/> <button name="Cancel" text="Cancelar"/> @@ -2848,6 +2976,72 @@ Del objeto: <nolink>[OBJECTNAME]</nolink>, 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 '[field]' se ha omitido al actualizar el perfil de la experiencia. + </notification> + <notification name="RestrictedToOwnerExperienceProfileMessage"> + Cambios omitidos en el campo '[field]' 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"> + '<nolink>[OBJECTNAME]</nolink>', un objeto de propiedad de '[NAME]', 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 '<nolink>[OBJECTNAME]</nolink>' 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 +3354,10 @@ Has actualizado una textura obtenida mediante bake de [RESOLUTION] para '[B ( [EXISTENCE] segundos con vida ) Has actualizado de manera local una textura obtenida mediante bake de [RESOLUTION] para '[BODYREGION]' 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 'no copiable' y/o 'no transferible'. <usetemplate ignoretext="Advertirme si el modo Vista previa inmediata no está disponible para las texturas 'no copiable' y/o 'no transferible'" name="okignore" yestext="OK"/> @@ -3732,9 +3930,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 '[OBJECT_NAME]' de la parcela '[PARCEL_NAME]' + <usetemplate ignoretext="Teleportarme: has sido teleportado por un objeto de una parcela" name="notifyignore"/> </notification> <notification name="TeleportedByObjectOwnedBy"> Has sido teleportado por el objeto '[OBJECT_NAME]' que es propiedad de [OWNER_ID] @@ -4066,7 +4266,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/outfit_accordion_tab.xml b/indra/newview/skins/default/xui/es/outfit_accordion_tab.xml index bac885e5d8..bac885e5d8 100755..100644 --- a/indra/newview/skins/default/xui/es/outfit_accordion_tab.xml +++ b/indra/newview/skins/default/xui/es/outfit_accordion_tab.xml diff --git a/indra/newview/skins/default/xui/es/panel_active_object_row.xml b/indra/newview/skins/default/xui/es/panel_active_object_row.xml index 8d4fadb101..8d4fadb101 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_active_object_row.xml +++ b/indra/newview/skins/default/xui/es/panel_active_object_row.xml diff --git a/indra/newview/skins/default/xui/es/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/es/panel_adhoc_control_panel.xml index c64a93e0e5..c64a93e0e5 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_adhoc_control_panel.xml +++ b/indra/newview/skins/default/xui/es/panel_adhoc_control_panel.xml diff --git a/indra/newview/skins/default/xui/es/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/es/panel_avatar_list_item.xml index c73e34b299..c73e34b299 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_avatar_list_item.xml +++ b/indra/newview/skins/default/xui/es/panel_avatar_list_item.xml diff --git a/indra/newview/skins/default/xui/es/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/es/panel_block_list_sidetray.xml index a3de14ae67..a3de14ae67 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_block_list_sidetray.xml +++ b/indra/newview/skins/default/xui/es/panel_block_list_sidetray.xml diff --git a/indra/newview/skins/default/xui/es/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/es/panel_body_parts_list_item.xml index 8f4e0101aa..8f4e0101aa 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_body_parts_list_item.xml +++ b/indra/newview/skins/default/xui/es/panel_body_parts_list_item.xml diff --git a/indra/newview/skins/default/xui/es/panel_bodyparts_list_button_bar.xml b/indra/newview/skins/default/xui/es/panel_bodyparts_list_button_bar.xml index 66ae7d868b..66ae7d868b 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_bodyparts_list_button_bar.xml +++ b/indra/newview/skins/default/xui/es/panel_bodyparts_list_button_bar.xml diff --git a/indra/newview/skins/default/xui/es/panel_bottomtray_lite.xml b/indra/newview/skins/default/xui/es/panel_bottomtray_lite.xml index 8d1b84a5fd..8d1b84a5fd 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_bottomtray_lite.xml +++ b/indra/newview/skins/default/xui/es/panel_bottomtray_lite.xml diff --git a/indra/newview/skins/default/xui/es/panel_chiclet_bar.xml b/indra/newview/skins/default/xui/es/panel_chiclet_bar.xml index eaaa5dbe78..eaaa5dbe78 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_chiclet_bar.xml +++ b/indra/newview/skins/default/xui/es/panel_chiclet_bar.xml diff --git a/indra/newview/skins/default/xui/es/panel_classified_info.xml b/indra/newview/skins/default/xui/es/panel_classified_info.xml index 3c168b9e53..3c168b9e53 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_classified_info.xml +++ b/indra/newview/skins/default/xui/es/panel_classified_info.xml diff --git a/indra/newview/skins/default/xui/es/panel_clothing_list_button_bar.xml b/indra/newview/skins/default/xui/es/panel_clothing_list_button_bar.xml index d3b3d31bd9..d3b3d31bd9 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_clothing_list_button_bar.xml +++ b/indra/newview/skins/default/xui/es/panel_clothing_list_button_bar.xml diff --git a/indra/newview/skins/default/xui/es/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/es/panel_clothing_list_item.xml index 959b83d658..959b83d658 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_clothing_list_item.xml +++ b/indra/newview/skins/default/xui/es/panel_clothing_list_item.xml diff --git a/indra/newview/skins/default/xui/es/panel_cof_wearables.xml b/indra/newview/skins/default/xui/es/panel_cof_wearables.xml index a2994894c1..a2994894c1 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_cof_wearables.xml +++ b/indra/newview/skins/default/xui/es/panel_cof_wearables.xml diff --git a/indra/newview/skins/default/xui/es/panel_deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/es/panel_deletable_wearable_list_item.xml index d1d7d8ec82..d1d7d8ec82 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_deletable_wearable_list_item.xml +++ b/indra/newview/skins/default/xui/es/panel_deletable_wearable_list_item.xml diff --git a/indra/newview/skins/default/xui/es/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/es/panel_dummy_clothing_list_item.xml index bc3046978c..bc3046978c 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_dummy_clothing_list_item.xml +++ b/indra/newview/skins/default/xui/es/panel_dummy_clothing_list_item.xml diff --git a/indra/newview/skins/default/xui/es/panel_edit_alpha.xml b/indra/newview/skins/default/xui/es/panel_edit_alpha.xml index 829c206ae1..829c206ae1 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_edit_alpha.xml +++ b/indra/newview/skins/default/xui/es/panel_edit_alpha.xml diff --git a/indra/newview/skins/default/xui/es/panel_edit_classified.xml b/indra/newview/skins/default/xui/es/panel_edit_classified.xml index ffad843732..ffad843732 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_edit_classified.xml +++ b/indra/newview/skins/default/xui/es/panel_edit_classified.xml diff --git a/indra/newview/skins/default/xui/es/panel_edit_eyes.xml b/indra/newview/skins/default/xui/es/panel_edit_eyes.xml index 29a416f698..29a416f698 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_edit_eyes.xml +++ b/indra/newview/skins/default/xui/es/panel_edit_eyes.xml diff --git a/indra/newview/skins/default/xui/es/panel_edit_gloves.xml b/indra/newview/skins/default/xui/es/panel_edit_gloves.xml index d536a862f5..d536a862f5 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_edit_gloves.xml +++ b/indra/newview/skins/default/xui/es/panel_edit_gloves.xml diff --git a/indra/newview/skins/default/xui/es/panel_edit_hair.xml b/indra/newview/skins/default/xui/es/panel_edit_hair.xml index 25af1ea8cb..25af1ea8cb 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_edit_hair.xml +++ b/indra/newview/skins/default/xui/es/panel_edit_hair.xml diff --git a/indra/newview/skins/default/xui/es/panel_edit_jacket.xml b/indra/newview/skins/default/xui/es/panel_edit_jacket.xml index 22a46a2f75..22a46a2f75 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_edit_jacket.xml +++ b/indra/newview/skins/default/xui/es/panel_edit_jacket.xml diff --git a/indra/newview/skins/default/xui/es/panel_edit_pants.xml b/indra/newview/skins/default/xui/es/panel_edit_pants.xml index fb35e0953b..fb35e0953b 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_edit_pants.xml +++ b/indra/newview/skins/default/xui/es/panel_edit_pants.xml diff --git a/indra/newview/skins/default/xui/es/panel_edit_physics.xml b/indra/newview/skins/default/xui/es/panel_edit_physics.xml index dfb5ab330a..dfb5ab330a 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_edit_physics.xml +++ b/indra/newview/skins/default/xui/es/panel_edit_physics.xml diff --git a/indra/newview/skins/default/xui/es/panel_edit_pick.xml b/indra/newview/skins/default/xui/es/panel_edit_pick.xml index cda465da9c..cda465da9c 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_edit_pick.xml +++ b/indra/newview/skins/default/xui/es/panel_edit_pick.xml diff --git a/indra/newview/skins/default/xui/es/panel_edit_profile.xml b/indra/newview/skins/default/xui/es/panel_edit_profile.xml index 8e5e09cfec..8e5e09cfec 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_edit_profile.xml +++ b/indra/newview/skins/default/xui/es/panel_edit_profile.xml diff --git a/indra/newview/skins/default/xui/es/panel_edit_shape.xml b/indra/newview/skins/default/xui/es/panel_edit_shape.xml index 368be35ed9..368be35ed9 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_edit_shape.xml +++ b/indra/newview/skins/default/xui/es/panel_edit_shape.xml diff --git a/indra/newview/skins/default/xui/es/panel_edit_shirt.xml b/indra/newview/skins/default/xui/es/panel_edit_shirt.xml index 73b712374e..73b712374e 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_edit_shirt.xml +++ b/indra/newview/skins/default/xui/es/panel_edit_shirt.xml diff --git a/indra/newview/skins/default/xui/es/panel_edit_shoes.xml b/indra/newview/skins/default/xui/es/panel_edit_shoes.xml index 5e457612d5..5e457612d5 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_edit_shoes.xml +++ b/indra/newview/skins/default/xui/es/panel_edit_shoes.xml diff --git a/indra/newview/skins/default/xui/es/panel_edit_skin.xml b/indra/newview/skins/default/xui/es/panel_edit_skin.xml index 8d895a6152..8d895a6152 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_edit_skin.xml +++ b/indra/newview/skins/default/xui/es/panel_edit_skin.xml diff --git a/indra/newview/skins/default/xui/es/panel_edit_skirt.xml b/indra/newview/skins/default/xui/es/panel_edit_skirt.xml index 416d174298..416d174298 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_edit_skirt.xml +++ b/indra/newview/skins/default/xui/es/panel_edit_skirt.xml diff --git a/indra/newview/skins/default/xui/es/panel_edit_socks.xml b/indra/newview/skins/default/xui/es/panel_edit_socks.xml index ac9b2a773e..ac9b2a773e 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_edit_socks.xml +++ b/indra/newview/skins/default/xui/es/panel_edit_socks.xml diff --git a/indra/newview/skins/default/xui/es/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/es/panel_edit_tattoo.xml index 8776dd6c10..8776dd6c10 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_edit_tattoo.xml +++ b/indra/newview/skins/default/xui/es/panel_edit_tattoo.xml diff --git a/indra/newview/skins/default/xui/es/panel_edit_underpants.xml b/indra/newview/skins/default/xui/es/panel_edit_underpants.xml index aac8af44b9..aac8af44b9 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_edit_underpants.xml +++ b/indra/newview/skins/default/xui/es/panel_edit_underpants.xml diff --git a/indra/newview/skins/default/xui/es/panel_edit_undershirt.xml b/indra/newview/skins/default/xui/es/panel_edit_undershirt.xml index c26c554c1a..c26c554c1a 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_edit_undershirt.xml +++ b/indra/newview/skins/default/xui/es/panel_edit_undershirt.xml diff --git a/indra/newview/skins/default/xui/es/panel_edit_wearable.xml b/indra/newview/skins/default/xui/es/panel_edit_wearable.xml index 799512968d..799512968d 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_edit_wearable.xml +++ b/indra/newview/skins/default/xui/es/panel_edit_wearable.xml 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'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="<" name="btn_prev"/> + <button label=">" 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"> + '[TEXT]' 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"> + "Parcel_PG_Light" + </string> + <string name="maturity_icon_moderate"> + "Parcel_M_Light" + </string> + <string name="maturity_icon_adult"> + "Parcel_R_Light" + </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="<" name="left_btn"/> + <button label=">" 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 "" 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_control_panel.xml b/indra/newview/skins/default/xui/es/panel_group_control_panel.xml index b398293175..b398293175 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_group_control_panel.xml +++ b/indra/newview/skins/default/xui/es/panel_group_control_panel.xml diff --git a/indra/newview/skins/default/xui/es/panel_group_general.xml b/indra/newview/skins/default/xui/es/panel_group_general.xml index b00c300c85..b00c300c85 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_group_general.xml +++ b/indra/newview/skins/default/xui/es/panel_group_general.xml 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..100644 --- 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_group_invite.xml b/indra/newview/skins/default/xui/es/panel_group_invite.xml index 8ddeb5a1de..8ddeb5a1de 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_group_invite.xml +++ b/indra/newview/skins/default/xui/es/panel_group_invite.xml diff --git a/indra/newview/skins/default/xui/es/panel_group_land_money.xml b/indra/newview/skins/default/xui/es/panel_group_land_money.xml index 3afb0f5665..3afb0f5665 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_group_land_money.xml +++ b/indra/newview/skins/default/xui/es/panel_group_land_money.xml diff --git a/indra/newview/skins/default/xui/es/panel_group_list_item.xml b/indra/newview/skins/default/xui/es/panel_group_list_item.xml index 4d682068d7..4d682068d7 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_group_list_item.xml +++ b/indra/newview/skins/default/xui/es/panel_group_list_item.xml diff --git a/indra/newview/skins/default/xui/es/panel_group_notices.xml b/indra/newview/skins/default/xui/es/panel_group_notices.xml index 1eaa69abff..1eaa69abff 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_group_notices.xml +++ b/indra/newview/skins/default/xui/es/panel_group_notices.xml diff --git a/indra/newview/skins/default/xui/es/panel_group_notify.xml b/indra/newview/skins/default/xui/es/panel_group_notify.xml index 7bdacbd1e0..7bdacbd1e0 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_group_notify.xml +++ b/indra/newview/skins/default/xui/es/panel_group_notify.xml diff --git a/indra/newview/skins/default/xui/es/panel_group_roles.xml b/indra/newview/skins/default/xui/es/panel_group_roles.xml index 54a5566600..54a5566600 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_group_roles.xml +++ b/indra/newview/skins/default/xui/es/panel_group_roles.xml diff --git a/indra/newview/skins/default/xui/es/panel_im_control_panel.xml b/indra/newview/skins/default/xui/es/panel_im_control_panel.xml index f218324d50..f218324d50 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_im_control_panel.xml +++ b/indra/newview/skins/default/xui/es/panel_im_control_panel.xml diff --git a/indra/newview/skins/default/xui/es/panel_inventory_item.xml b/indra/newview/skins/default/xui/es/panel_inventory_item.xml index d18047fbcf..d18047fbcf 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_inventory_item.xml +++ b/indra/newview/skins/default/xui/es/panel_inventory_item.xml diff --git a/indra/newview/skins/default/xui/es/panel_landmark_info.xml b/indra/newview/skins/default/xui/es/panel_landmark_info.xml index 1a0ac3ba79..1a0ac3ba79 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_landmark_info.xml +++ b/indra/newview/skins/default/xui/es/panel_landmark_info.xml diff --git a/indra/newview/skins/default/xui/es/panel_landmarks.xml b/indra/newview/skins/default/xui/es/panel_landmarks.xml index b92685f0ae..b92685f0ae 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_landmarks.xml +++ b/indra/newview/skins/default/xui/es/panel_landmarks.xml 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..100644 --- 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_main_inventory.xml b/indra/newview/skins/default/xui/es/panel_main_inventory.xml index 7e318a150b..7e318a150b 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/es/panel_main_inventory.xml 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_me.xml b/indra/newview/skins/default/xui/es/panel_me.xml index 850cd6ec71..850cd6ec71 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_me.xml +++ b/indra/newview/skins/default/xui/es/panel_me.xml diff --git a/indra/newview/skins/default/xui/es/panel_media_settings_general.xml b/indra/newview/skins/default/xui/es/panel_media_settings_general.xml index afc11a4250..afc11a4250 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_media_settings_general.xml +++ b/indra/newview/skins/default/xui/es/panel_media_settings_general.xml diff --git a/indra/newview/skins/default/xui/es/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/es/panel_media_settings_permissions.xml index ec9edbfa15..ec9edbfa15 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_media_settings_permissions.xml +++ b/indra/newview/skins/default/xui/es/panel_media_settings_permissions.xml diff --git a/indra/newview/skins/default/xui/es/panel_media_settings_security.xml b/indra/newview/skins/default/xui/es/panel_media_settings_security.xml index a1a3ec86cf..a1a3ec86cf 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_media_settings_security.xml +++ b/indra/newview/skins/default/xui/es/panel_media_settings_security.xml diff --git a/indra/newview/skins/default/xui/es/panel_navigation_bar.xml b/indra/newview/skins/default/xui/es/panel_navigation_bar.xml index d36c6283bc..d36c6283bc 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_navigation_bar.xml +++ b/indra/newview/skins/default/xui/es/panel_navigation_bar.xml diff --git a/indra/newview/skins/default/xui/es/panel_nearby_chat.xml b/indra/newview/skins/default/xui/es/panel_nearby_chat.xml index 4220ab3c9f..4220ab3c9f 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_nearby_chat.xml +++ b/indra/newview/skins/default/xui/es/panel_nearby_chat.xml diff --git a/indra/newview/skins/default/xui/es/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/es/panel_nearby_chat_bar.xml index e6ca59f912..e6ca59f912 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_nearby_chat_bar.xml +++ b/indra/newview/skins/default/xui/es/panel_nearby_chat_bar.xml diff --git a/indra/newview/skins/default/xui/es/panel_nearby_media.xml b/indra/newview/skins/default/xui/es/panel_nearby_media.xml index 8d4f9eda18..8d4f9eda18 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_nearby_media.xml +++ b/indra/newview/skins/default/xui/es/panel_nearby_media.xml diff --git a/indra/newview/skins/default/xui/es/panel_notify_textbox.xml b/indra/newview/skins/default/xui/es/panel_notify_textbox.xml index dc7c873303..dc7c873303 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_notify_textbox.xml +++ b/indra/newview/skins/default/xui/es/panel_notify_textbox.xml diff --git a/indra/newview/skins/default/xui/es/panel_online_status_toast.xml b/indra/newview/skins/default/xui/es/panel_online_status_toast.xml index fdc489f375..fdc489f375 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_online_status_toast.xml +++ b/indra/newview/skins/default/xui/es/panel_online_status_toast.xml diff --git a/indra/newview/skins/default/xui/es/panel_outbox_inventory.xml b/indra/newview/skins/default/xui/es/panel_outbox_inventory.xml index 9e2f3c3adc..9e2f3c3adc 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_outbox_inventory.xml +++ b/indra/newview/skins/default/xui/es/panel_outbox_inventory.xml diff --git a/indra/newview/skins/default/xui/es/panel_outfit_edit.xml b/indra/newview/skins/default/xui/es/panel_outfit_edit.xml index 9e669995aa..9e669995aa 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_outfit_edit.xml +++ b/indra/newview/skins/default/xui/es/panel_outfit_edit.xml diff --git a/indra/newview/skins/default/xui/es/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/es/panel_outfits_inventory.xml index 1107e72b54..1107e72b54 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_outfits_inventory.xml +++ b/indra/newview/skins/default/xui/es/panel_outfits_inventory.xml diff --git a/indra/newview/skins/default/xui/es/panel_outfits_inventory_gear_default.xml b/indra/newview/skins/default/xui/es/panel_outfits_inventory_gear_default.xml index 8f805c3d18..8f805c3d18 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_outfits_inventory_gear_default.xml +++ b/indra/newview/skins/default/xui/es/panel_outfits_inventory_gear_default.xml diff --git a/indra/newview/skins/default/xui/es/panel_outfits_list.xml b/indra/newview/skins/default/xui/es/panel_outfits_list.xml index 3f8057f242..3f8057f242 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_outfits_list.xml +++ b/indra/newview/skins/default/xui/es/panel_outfits_list.xml diff --git a/indra/newview/skins/default/xui/es/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/es/panel_outfits_wearing.xml index 8cea619bd5..8cea619bd5 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_outfits_wearing.xml +++ b/indra/newview/skins/default/xui/es/panel_outfits_wearing.xml diff --git a/indra/newview/skins/default/xui/es/panel_people.xml b/indra/newview/skins/default/xui/es/panel_people.xml index 06150f7619..06150f7619 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_people.xml +++ b/indra/newview/skins/default/xui/es/panel_people.xml diff --git a/indra/newview/skins/default/xui/es/panel_pick_info.xml b/indra/newview/skins/default/xui/es/panel_pick_info.xml index 3450279b4a..3450279b4a 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_pick_info.xml +++ b/indra/newview/skins/default/xui/es/panel_pick_info.xml diff --git a/indra/newview/skins/default/xui/es/panel_picks.xml b/indra/newview/skins/default/xui/es/panel_picks.xml index 904cdd12f1..904cdd12f1 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_picks.xml +++ b/indra/newview/skins/default/xui/es/panel_picks.xml diff --git a/indra/newview/skins/default/xui/es/panel_place_profile.xml b/indra/newview/skins/default/xui/es/panel_place_profile.xml index e1cf1332e2..e1cf1332e2 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_place_profile.xml +++ b/indra/newview/skins/default/xui/es/panel_place_profile.xml diff --git a/indra/newview/skins/default/xui/es/panel_places.xml b/indra/newview/skins/default/xui/es/panel_places.xml index e9984b4512..e9984b4512 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_places.xml +++ b/indra/newview/skins/default/xui/es/panel_places.xml diff --git a/indra/newview/skins/default/xui/es/panel_postcard_message.xml b/indra/newview/skins/default/xui/es/panel_postcard_message.xml index 7316d91f5c..7316d91f5c 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_postcard_message.xml +++ b/indra/newview/skins/default/xui/es/panel_postcard_message.xml 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..100644 --- 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_advanced.xml b/indra/newview/skins/default/xui/es/panel_preferences_advanced.xml index 2599d951d7..2599d951d7 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/es/panel_preferences_advanced.xml diff --git a/indra/newview/skins/default/xui/es/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/es/panel_preferences_alerts.xml index f34edf149e..f34edf149e 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_preferences_alerts.xml +++ b/indra/newview/skins/default/xui/es/panel_preferences_alerts.xml diff --git a/indra/newview/skins/default/xui/es/panel_preferences_chat.xml b/indra/newview/skins/default/xui/es/panel_preferences_chat.xml index 7feff9005c..7feff9005c 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/es/panel_preferences_chat.xml diff --git a/indra/newview/skins/default/xui/es/panel_preferences_colors.xml b/indra/newview/skins/default/xui/es/panel_preferences_colors.xml index d47a6d718a..d47a6d718a 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_preferences_colors.xml +++ b/indra/newview/skins/default/xui/es/panel_preferences_colors.xml diff --git a/indra/newview/skins/default/xui/es/panel_preferences_general.xml b/indra/newview/skins/default/xui/es/panel_preferences_general.xml index e68faf6e99..e68faf6e99 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/es/panel_preferences_general.xml diff --git a/indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml index a9eab74e2b..a9eab74e2b 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml diff --git a/indra/newview/skins/default/xui/es/panel_preferences_move.xml b/indra/newview/skins/default/xui/es/panel_preferences_move.xml index b2ff6b61c2..b2ff6b61c2 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_preferences_move.xml +++ b/indra/newview/skins/default/xui/es/panel_preferences_move.xml diff --git a/indra/newview/skins/default/xui/es/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/es/panel_preferences_privacy.xml index db98ee088e..db98ee088e 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_preferences_privacy.xml +++ b/indra/newview/skins/default/xui/es/panel_preferences_privacy.xml 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..100644 --- 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 'cookies'" name="cookies_enabled"/> diff --git a/indra/newview/skins/default/xui/es/panel_preferences_sound.xml b/indra/newview/skins/default/xui/es/panel_preferences_sound.xml index dcd6984715..dcd6984715 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/es/panel_preferences_sound.xml diff --git a/indra/newview/skins/default/xui/es/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/es/panel_prim_media_controls.xml index 90b9e475e7..90b9e475e7 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_prim_media_controls.xml +++ b/indra/newview/skins/default/xui/es/panel_prim_media_controls.xml diff --git a/indra/newview/skins/default/xui/es/panel_region_covenant.xml b/indra/newview/skins/default/xui/es/panel_region_covenant.xml index 2beacda235..2beacda235 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_region_covenant.xml +++ b/indra/newview/skins/default/xui/es/panel_region_covenant.xml diff --git a/indra/newview/skins/default/xui/es/panel_region_debug.xml b/indra/newview/skins/default/xui/es/panel_region_debug.xml index 2a98fb808d..2a98fb808d 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_region_debug.xml +++ b/indra/newview/skins/default/xui/es/panel_region_debug.xml diff --git a/indra/newview/skins/default/xui/es/panel_region_environment.xml b/indra/newview/skins/default/xui/es/panel_region_environment.xml index a73f1deed4..a73f1deed4 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_region_environment.xml +++ b/indra/newview/skins/default/xui/es/panel_region_environment.xml diff --git a/indra/newview/skins/default/xui/es/panel_region_estate.xml b/indra/newview/skins/default/xui/es/panel_region_estate.xml index 6089dfb8db..6089dfb8db 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_region_estate.xml +++ b/indra/newview/skins/default/xui/es/panel_region_estate.xml 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_region_general.xml b/indra/newview/skins/default/xui/es/panel_region_general.xml index 82149e1c7c..82149e1c7c 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_region_general.xml +++ b/indra/newview/skins/default/xui/es/panel_region_general.xml diff --git a/indra/newview/skins/default/xui/es/panel_region_terrain.xml b/indra/newview/skins/default/xui/es/panel_region_terrain.xml index cb6c03dbb5..cb6c03dbb5 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_region_terrain.xml +++ b/indra/newview/skins/default/xui/es/panel_region_terrain.xml diff --git a/indra/newview/skins/default/xui/es/panel_script_ed.xml b/indra/newview/skins/default/xui/es/panel_script_ed.xml index 89e9304693..89e9304693 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_script_ed.xml +++ b/indra/newview/skins/default/xui/es/panel_script_ed.xml 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_script_limits_my_avatar.xml b/indra/newview/skins/default/xui/es/panel_script_limits_my_avatar.xml index 9334d58af2..9334d58af2 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_script_limits_my_avatar.xml +++ b/indra/newview/skins/default/xui/es/panel_script_limits_my_avatar.xml diff --git a/indra/newview/skins/default/xui/es/panel_script_limits_region_memory.xml b/indra/newview/skins/default/xui/es/panel_script_limits_region_memory.xml index 37dc0a576c..37dc0a576c 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_script_limits_region_memory.xml +++ b/indra/newview/skins/default/xui/es/panel_script_limits_region_memory.xml diff --git a/indra/newview/skins/default/xui/es/panel_script_question_toast.xml b/indra/newview/skins/default/xui/es/panel_script_question_toast.xml index a2d0237da0..a2d0237da0 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_script_question_toast.xml +++ b/indra/newview/skins/default/xui/es/panel_script_question_toast.xml diff --git a/indra/newview/skins/default/xui/es/panel_scrolling_param.xml b/indra/newview/skins/default/xui/es/panel_scrolling_param.xml index bafd4e5e55..bafd4e5e55 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_scrolling_param.xml +++ b/indra/newview/skins/default/xui/es/panel_scrolling_param.xml diff --git a/indra/newview/skins/default/xui/es/panel_scrolling_param_base.xml b/indra/newview/skins/default/xui/es/panel_scrolling_param_base.xml index fa659040ea..fa659040ea 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_scrolling_param_base.xml +++ b/indra/newview/skins/default/xui/es/panel_scrolling_param_base.xml diff --git a/indra/newview/skins/default/xui/es/panel_side_tray_tab_caption.xml b/indra/newview/skins/default/xui/es/panel_side_tray_tab_caption.xml index 775e343dc9..775e343dc9 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_side_tray_tab_caption.xml +++ b/indra/newview/skins/default/xui/es/panel_side_tray_tab_caption.xml 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..100644 --- 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..100644 --- 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..100644 --- 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..100644 --- 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..100644 --- 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_sound_devices.xml b/indra/newview/skins/default/xui/es/panel_sound_devices.xml index 9531b99cc8..9531b99cc8 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_sound_devices.xml +++ b/indra/newview/skins/default/xui/es/panel_sound_devices.xml diff --git a/indra/newview/skins/default/xui/es/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/es/panel_stand_stop_flying.xml index 350aec9c69..350aec9c69 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_stand_stop_flying.xml +++ b/indra/newview/skins/default/xui/es/panel_stand_stop_flying.xml 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..100644 --- 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_teleport_history.xml b/indra/newview/skins/default/xui/es/panel_teleport_history.xml index 364451b26b..364451b26b 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_teleport_history.xml +++ b/indra/newview/skins/default/xui/es/panel_teleport_history.xml diff --git a/indra/newview/skins/default/xui/es/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/es/panel_teleport_history_item.xml index b5917319e0..b5917319e0 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_teleport_history_item.xml +++ b/indra/newview/skins/default/xui/es/panel_teleport_history_item.xml 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/panel_voice_effect.xml b/indra/newview/skins/default/xui/es/panel_voice_effect.xml index 94a0428941..94a0428941 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_voice_effect.xml +++ b/indra/newview/skins/default/xui/es/panel_voice_effect.xml diff --git a/indra/newview/skins/default/xui/es/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/es/panel_volume_pulldown.xml index 426783aa8e..426783aa8e 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_volume_pulldown.xml +++ b/indra/newview/skins/default/xui/es/panel_volume_pulldown.xml diff --git a/indra/newview/skins/default/xui/es/panel_world_map.xml b/indra/newview/skins/default/xui/es/panel_world_map.xml index b1dea02210..b1dea02210 100755..100644 --- a/indra/newview/skins/default/xui/es/panel_world_map.xml +++ b/indra/newview/skins/default/xui/es/panel_world_map.xml 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..100644 --- 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 'Abrir chat de grupo'." 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_appearance.xml b/indra/newview/skins/default/xui/es/sidepanel_appearance.xml index bdef89c392..bdef89c392 100755..100644 --- a/indra/newview/skins/default/xui/es/sidepanel_appearance.xml +++ b/indra/newview/skins/default/xui/es/sidepanel_appearance.xml diff --git a/indra/newview/skins/default/xui/es/sidepanel_inventory.xml b/indra/newview/skins/default/xui/es/sidepanel_inventory.xml index 1e25a4a4a2..1e25a4a4a2 100755..100644 --- a/indra/newview/skins/default/xui/es/sidepanel_inventory.xml +++ b/indra/newview/skins/default/xui/es/sidepanel_inventory.xml 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..100644 --- 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..100644 --- 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..bda88fad7c 100755..100644 --- a/indra/newview/skins/default/xui/es/strings.xml +++ b/indra/newview/skins/default/xui/es/strings.xml @@ -29,7 +29,7 @@ Error de inicialización de gráficos. Actualiza tu controlador de gráficos. </string> <string name="AboutHeader"> - [APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2] ([VIEWER_VERSION_3]) [BUILD_DATE] [BUILD_TIME] ([CHANNEL]) + [APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2].[VIEWER_VERSION_3] [BUILD_DATE] [BUILD_TIME] ([CHANNEL]) [[VIEWER_RELEASE_NOTES_URL] [ReleaseNotes]] </string> <string name="AboutCompiler"> @@ -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 > Mostrar las configuraciones del depurador > 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..100644 --- 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. '[REGION_NAME]' 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/es/xui_version.xml b/indra/newview/skins/default/xui/es/xui_version.xml index 0e777751d3..0e777751d3 100755..100644 --- a/indra/newview/skins/default/xui/es/xui_version.xml +++ b/indra/newview/skins/default/xui/es/xui_version.xml 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..100644 --- 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 à <nolink>[HOSTNAME]</nolink> ([HOSTIP]) -SLURL : <nolink>[SLURL]</nolink> -(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'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'exécution - </text_editor> - <text name="trans_intro"> - Participation aux traductions : - </text> - <text_editor name="trans_names"> - Dummy Name remplacé au moment de l'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'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'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..100644 --- 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'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'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'accès public ([MATURITY]) (Remarque : des lignes d'interdiction seront créées si cette case n'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'accès public (des lignes d'interdiction seront créées si cette case n'est pas cochée)" name="public_access"/> <text name="Only Allow"> Conditions d'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_activeim.xml b/indra/newview/skins/default/xui/fr/floater_activeim.xml index 18e3d66bb7..18e3d66bb7 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_activeim.xml +++ b/indra/newview/skins/default/xui/fr/floater_activeim.xml diff --git a/indra/newview/skins/default/xui/fr/floater_animation_anim_preview.xml b/indra/newview/skins/default/xui/fr/floater_animation_anim_preview.xml index e82518ce80..e82518ce80 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_animation_anim_preview.xml +++ b/indra/newview/skins/default/xui/fr/floater_animation_anim_preview.xml diff --git a/indra/newview/skins/default/xui/fr/floater_animation_bvh_preview.xml b/indra/newview/skins/default/xui/fr/floater_animation_bvh_preview.xml index 84c40b5987..a20b8cdf72 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_animation_bvh_preview.xml +++ b/indra/newview/skins/default/xui/fr/floater_animation_bvh_preview.xml @@ -141,35 +141,35 @@ La limite maximale est de [MAX_LENGTH] secondes. Expression </text> <combo_box name="emote_combo" tool_tip="Contrôle ce que fait le visage pendant l'animation."> - <item label="(Aucune)" name="[None]" value=""/> - <item label="Aaaaah" name="Aaaaah" value="Aaaaah"/> - <item label="Effrayé" name="Afraid" value="Effrayé"/> - <item label="En colère" name="Angry" value="En colère"/> - <item label="Grand sourire" name="BigSmile" value="Grand sourire"/> - <item label="Ennui" name="Bored" value="Ennui"/> - <item label="Pleurer" name="Cry" value="Pleurer"/> - <item label="Mépris" name="Disdain" value="Mépris"/> - <item label="Gêne" name="Embarrassed" value="Gêne"/> - <item label="Froncer les sourcils" name="Frown" value="Froncer les sourcils"/> - <item label="Embrasser" name="Kiss" value="Embrasser"/> - <item label="Rire" name="Laugh" value="Rire"/> - <item label="Tirer la langue" name="Plllppt" value="Tirer la langue"/> - <item label="Dégoût" name="Repulsed" value="Dégoût"/> - <item label="Triste" name="Sad" value="Triste"/> - <item label="Hausser les épaules" name="Shrug" value="Hausser les épaules"/> - <item label="Sourire" name="Smile" value="Sourire"/> - <item label="Surprise" name="Surprise" value="Surprise"/> - <item label="Clin d'œil" name="Wink" value="Clin d'œil"/> - <item label="Inquiétude" name="Worry" value="Inquiétude"/> + <item label="(Aucune)" name="[None]"/> + <item label="Aaaaah" name="Aaaaah"/> + <item label="Effrayé" name="Afraid"/> + <item label="En colère" name="Angry"/> + <item label="Grand sourire" name="BigSmile"/> + <item label="Ennui" name="Bored"/> + <item label="Pleurer" name="Cry"/> + <item label="Mépris" name="Disdain"/> + <item label="Gêne" name="Embarrassed"/> + <item label="Froncer les sourcils" name="Frown"/> + <item label="Embrasser" name="Kiss"/> + <item label="Rire" name="Laugh"/> + <item label="Tirer la langue" name="Plllppt"/> + <item label="Dégoût" name="Repulsed"/> + <item label="Triste" name="Sad"/> + <item label="Hausser les épaules" name="Shrug"/> + <item label="Sourire" name="Smile"/> + <item label="Surprise" name="Surprise"/> + <item label="Clin d'œil" name="Wink"/> + <item label="Inquiétude" name="Worry"/> </combo_box> <text name="preview_label"> Aperçu </text> <combo_box name="preview_base_anim" tool_tip="Permet de tester le comportement de l'animation lorsque votre avatar effectue certaines actions courantes."> - <item label="Debout" name="Standing" value="Debout"/> - <item label="En marche" name="Walking" value="En marche"/> - <item label="Assis" name="Sitting" value="Assis"/> - <item label="En vol" name="Flying" value="En vol"/> + <item label="Debout" name="Standing"/> + <item label="En marche" name="Walking"/> + <item label="Assis" name="Sitting"/> + <item label="En vol" name="Flying"/> </combo_box> <spinner label="Transition début (s)" name="ease_in_time" tool_tip="Durée (en secondes) de l'entrée en fondu de l'animation."/> <spinner label="Transition fin (s)" name="ease_out_time" tool_tip="Durée (en secondes) de la sortie en fondu de l'animation."/> 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'ANNONCE"> + <text name="message">ID d'annonce :</text> + <line_editor name="listing_id">Saisir l'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_auction.xml b/indra/newview/skins/default/xui/fr/floater_auction.xml index 6cef2a3591..6cef2a3591 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_auction.xml +++ b/indra/newview/skins/default/xui/fr/floater_auction.xml diff --git a/indra/newview/skins/default/xui/fr/floater_autoreplace.xml b/indra/newview/skins/default/xui/fr/floater_autoreplace.xml index 1d19181692..1d19181692 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_autoreplace.xml +++ b/indra/newview/skins/default/xui/fr/floater_autoreplace.xml diff --git a/indra/newview/skins/default/xui/fr/floater_avatar.xml b/indra/newview/skins/default/xui/fr/floater_avatar.xml index 7cbb50a3d6..7cbb50a3d6 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_avatar.xml +++ b/indra/newview/skins/default/xui/fr/floater_avatar.xml diff --git a/indra/newview/skins/default/xui/fr/floater_avatar_picker.xml b/indra/newview/skins/default/xui/fr/floater_avatar_picker.xml index 74de4ddb1c..74de4ddb1c 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_avatar_picker.xml +++ b/indra/newview/skins/default/xui/fr/floater_avatar_picker.xml diff --git a/indra/newview/skins/default/xui/fr/floater_avatar_textures.xml b/indra/newview/skins/default/xui/fr/floater_avatar_textures.xml index e1786eafc7..e1786eafc7 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_avatar_textures.xml +++ b/indra/newview/skins/default/xui/fr/floater_avatar_textures.xml diff --git a/indra/newview/skins/default/xui/fr/floater_beacons.xml b/indra/newview/skins/default/xui/fr/floater_beacons.xml index ebd4dab683..ebd4dab683 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_beacons.xml +++ b/indra/newview/skins/default/xui/fr/floater_beacons.xml diff --git a/indra/newview/skins/default/xui/fr/floater_build_options.xml b/indra/newview/skins/default/xui/fr/floater_build_options.xml index a200ed192f..a200ed192f 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_build_options.xml +++ b/indra/newview/skins/default/xui/fr/floater_build_options.xml diff --git a/indra/newview/skins/default/xui/fr/floater_bulk_perms.xml b/indra/newview/skins/default/xui/fr/floater_bulk_perms.xml index 7ee4441758..7ee4441758 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_bulk_perms.xml +++ b/indra/newview/skins/default/xui/fr/floater_bulk_perms.xml diff --git a/indra/newview/skins/default/xui/fr/floater_bumps.xml b/indra/newview/skins/default/xui/fr/floater_bumps.xml index 32714ea09c..32714ea09c 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_bumps.xml +++ b/indra/newview/skins/default/xui/fr/floater_bumps.xml diff --git a/indra/newview/skins/default/xui/fr/floater_buy_contents.xml b/indra/newview/skins/default/xui/fr/floater_buy_contents.xml index 0436dc8a91..0436dc8a91 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_buy_contents.xml +++ b/indra/newview/skins/default/xui/fr/floater_buy_contents.xml diff --git a/indra/newview/skins/default/xui/fr/floater_buy_currency.xml b/indra/newview/skins/default/xui/fr/floater_buy_currency.xml index 148a5a35d2..148a5a35d2 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_buy_currency.xml +++ b/indra/newview/skins/default/xui/fr/floater_buy_currency.xml diff --git a/indra/newview/skins/default/xui/fr/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/fr/floater_buy_currency_html.xml index 953fca3544..953fca3544 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_buy_currency_html.xml +++ b/indra/newview/skins/default/xui/fr/floater_buy_currency_html.xml diff --git a/indra/newview/skins/default/xui/fr/floater_buy_land.xml b/indra/newview/skins/default/xui/fr/floater_buy_land.xml index b7f8f36f81..b7f8f36f81 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_buy_land.xml +++ b/indra/newview/skins/default/xui/fr/floater_buy_land.xml diff --git a/indra/newview/skins/default/xui/fr/floater_buy_object.xml b/indra/newview/skins/default/xui/fr/floater_buy_object.xml index 519e741a25..519e741a25 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_buy_object.xml +++ b/indra/newview/skins/default/xui/fr/floater_buy_object.xml diff --git a/indra/newview/skins/default/xui/fr/floater_camera.xml b/indra/newview/skins/default/xui/fr/floater_camera.xml index 893e389f69..893e389f69 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_camera.xml +++ b/indra/newview/skins/default/xui/fr/floater_camera.xml diff --git a/indra/newview/skins/default/xui/fr/floater_chat_bar.xml b/indra/newview/skins/default/xui/fr/floater_chat_bar.xml index 7dcb9a280d..7dcb9a280d 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_chat_bar.xml +++ b/indra/newview/skins/default/xui/fr/floater_chat_bar.xml diff --git a/indra/newview/skins/default/xui/fr/floater_choose_group.xml b/indra/newview/skins/default/xui/fr/floater_choose_group.xml index b73bedd7b5..b73bedd7b5 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_choose_group.xml +++ b/indra/newview/skins/default/xui/fr/floater_choose_group.xml diff --git a/indra/newview/skins/default/xui/fr/floater_color_picker.xml b/indra/newview/skins/default/xui/fr/floater_color_picker.xml index c54e3e9ce0..c54e3e9ce0 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_color_picker.xml +++ b/indra/newview/skins/default/xui/fr/floater_color_picker.xml diff --git a/indra/newview/skins/default/xui/fr/floater_critical.xml b/indra/newview/skins/default/xui/fr/floater_critical.xml index 6d30d97048..6d30d97048 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_critical.xml +++ b/indra/newview/skins/default/xui/fr/floater_critical.xml diff --git a/indra/newview/skins/default/xui/fr/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/fr/floater_delete_env_preset.xml index 035bdbe5f3..035bdbe5f3 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_delete_env_preset.xml +++ b/indra/newview/skins/default/xui/fr/floater_delete_env_preset.xml diff --git a/indra/newview/skins/default/xui/fr/floater_destinations.xml b/indra/newview/skins/default/xui/fr/floater_destinations.xml index 25e6c90a8e..25e6c90a8e 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_destinations.xml +++ b/indra/newview/skins/default/xui/fr/floater_destinations.xml diff --git a/indra/newview/skins/default/xui/fr/floater_display_name.xml b/indra/newview/skins/default/xui/fr/floater_display_name.xml index eebe7abf2c..eebe7abf2c 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_display_name.xml +++ b/indra/newview/skins/default/xui/fr/floater_display_name.xml diff --git a/indra/newview/skins/default/xui/fr/floater_edit_day_cycle.xml b/indra/newview/skins/default/xui/fr/floater_edit_day_cycle.xml index 5ec68458e1..5ec68458e1 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_edit_day_cycle.xml +++ b/indra/newview/skins/default/xui/fr/floater_edit_day_cycle.xml 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_edit_sky_preset.xml b/indra/newview/skins/default/xui/fr/floater_edit_sky_preset.xml index 4ec9bbb3dd..4ec9bbb3dd 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_edit_sky_preset.xml +++ b/indra/newview/skins/default/xui/fr/floater_edit_sky_preset.xml diff --git a/indra/newview/skins/default/xui/fr/floater_edit_water_preset.xml b/indra/newview/skins/default/xui/fr/floater_edit_water_preset.xml index 81d9d34cfb..81d9d34cfb 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_edit_water_preset.xml +++ b/indra/newview/skins/default/xui/fr/floater_edit_water_preset.xml diff --git a/indra/newview/skins/default/xui/fr/floater_environment_settings.xml b/indra/newview/skins/default/xui/fr/floater_environment_settings.xml index ea12749d27..ea12749d27 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_environment_settings.xml +++ b/indra/newview/skins/default/xui/fr/floater_environment_settings.xml diff --git a/indra/newview/skins/default/xui/fr/floater_event.xml b/indra/newview/skins/default/xui/fr/floater_event.xml index 67d70ac003..67d70ac003 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_event.xml +++ b/indra/newview/skins/default/xui/fr/floater_event.xml 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"> + "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 name="edit_title" value="Profil de l'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'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'emplacement actuel" name="location_btn"/> + <button label="Effacer l'emplacement" name="clear_btn"/> + <check_box label="Activer l'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'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_fast_timers.xml b/indra/newview/skins/default/xui/fr/floater_fast_timers.xml index 0100b10557..0100b10557 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_fast_timers.xml +++ b/indra/newview/skins/default/xui/fr/floater_fast_timers.xml diff --git a/indra/newview/skins/default/xui/fr/floater_font_test.xml b/indra/newview/skins/default/xui/fr/floater_font_test.xml index 974a5ca3a2..974a5ca3a2 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_font_test.xml +++ b/indra/newview/skins/default/xui/fr/floater_font_test.xml diff --git a/indra/newview/skins/default/xui/fr/floater_gesture.xml b/indra/newview/skins/default/xui/fr/floater_gesture.xml index 5ead1cae3a..5ead1cae3a 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_gesture.xml +++ b/indra/newview/skins/default/xui/fr/floater_gesture.xml diff --git a/indra/newview/skins/default/xui/fr/floater_god_tools.xml b/indra/newview/skins/default/xui/fr/floater_god_tools.xml index 0d21a8af32..0d21a8af32 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_god_tools.xml +++ b/indra/newview/skins/default/xui/fr/floater_god_tools.xml diff --git a/indra/newview/skins/default/xui/fr/floater_hardware_settings.xml b/indra/newview/skins/default/xui/fr/floater_hardware_settings.xml index bb146556ba..bb146556ba 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_hardware_settings.xml +++ b/indra/newview/skins/default/xui/fr/floater_hardware_settings.xml diff --git a/indra/newview/skins/default/xui/fr/floater_help_browser.xml b/indra/newview/skins/default/xui/fr/floater_help_browser.xml index 11caca640c..11caca640c 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_help_browser.xml +++ b/indra/newview/skins/default/xui/fr/floater_help_browser.xml diff --git a/indra/newview/skins/default/xui/fr/floater_how_to.xml b/indra/newview/skins/default/xui/fr/floater_how_to.xml index a414212ba0..a414212ba0 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_how_to.xml +++ b/indra/newview/skins/default/xui/fr/floater_how_to.xml diff --git a/indra/newview/skins/default/xui/fr/floater_hud.xml b/indra/newview/skins/default/xui/fr/floater_hud.xml index f212f113b3..f212f113b3 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_hud.xml +++ b/indra/newview/skins/default/xui/fr/floater_hud.xml diff --git a/indra/newview/skins/default/xui/fr/floater_im_container.xml b/indra/newview/skins/default/xui/fr/floater_im_container.xml index f0b17e8437..f0b17e8437 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_im_container.xml +++ b/indra/newview/skins/default/xui/fr/floater_im_container.xml diff --git a/indra/newview/skins/default/xui/fr/floater_im_session.xml b/indra/newview/skins/default/xui/fr/floater_im_session.xml index 6d98f0a846..6d98f0a846 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_im_session.xml +++ b/indra/newview/skins/default/xui/fr/floater_im_session.xml diff --git a/indra/newview/skins/default/xui/fr/floater_image_preview.xml b/indra/newview/skins/default/xui/fr/floater_image_preview.xml index 3d405f358d..3d405f358d 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_image_preview.xml +++ b/indra/newview/skins/default/xui/fr/floater_image_preview.xml diff --git a/indra/newview/skins/default/xui/fr/floater_import_collada.xml b/indra/newview/skins/default/xui/fr/floater_import_collada.xml index 03804c4bd5..03804c4bd5 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_import_collada.xml +++ b/indra/newview/skins/default/xui/fr/floater_import_collada.xml diff --git a/indra/newview/skins/default/xui/fr/floater_incoming_call.xml b/indra/newview/skins/default/xui/fr/floater_incoming_call.xml index 9e6946ba9e..9e6946ba9e 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_incoming_call.xml +++ b/indra/newview/skins/default/xui/fr/floater_incoming_call.xml diff --git a/indra/newview/skins/default/xui/fr/floater_inspect.xml b/indra/newview/skins/default/xui/fr/floater_inspect.xml index 9b1bdf106d..9b1bdf106d 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_inspect.xml +++ b/indra/newview/skins/default/xui/fr/floater_inspect.xml 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..100644 --- 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'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'importe qui : - </text> + <text name="AnyoneLabel" width="80">N'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..100644 --- 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'ARTICLE"/> diff --git a/indra/newview/skins/default/xui/fr/floater_joystick.xml b/indra/newview/skins/default/xui/fr/floater_joystick.xml index 02ac21bf82..02ac21bf82 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_joystick.xml +++ b/indra/newview/skins/default/xui/fr/floater_joystick.xml 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'affichage trop élevée + Cause possible : la limite d'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'images en mémoire + Cause possible : trop d'images en mémoire </floater.string> <floater.string name="client_complex_objects_cause_msg"> - Cause possible : trop d'objets complexes + Cause possible : trop d'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 >[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 < [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'objets physiques + Cause possible : trop d'objets physiques </floater.string> <floater.string name="server_scripts_cause_msg"> - Cause possible : trop d'objets scriptés + Cause possible : trop d'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'images + Cause possible : trop de calculs d'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"> >> @@ -126,21 +126,21 @@ <floater.string name="bigger_label"> << </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_land_holdings.xml b/indra/newview/skins/default/xui/fr/floater_land_holdings.xml index ff728e3aaa..ff728e3aaa 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_land_holdings.xml +++ b/indra/newview/skins/default/xui/fr/floater_land_holdings.xml 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..100644 --- 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'expérience actuelle + </floater.string> + <floater.string name="no_experiences"> + Vous n'ê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'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=">" name="view_profile"/> </floater> diff --git a/indra/newview/skins/default/xui/fr/floater_lsl_guide.xml b/indra/newview/skins/default/xui/fr/floater_lsl_guide.xml index 71d2c42578..71d2c42578 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_lsl_guide.xml +++ b/indra/newview/skins/default/xui/fr/floater_lsl_guide.xml diff --git a/indra/newview/skins/default/xui/fr/floater_map.xml b/indra/newview/skins/default/xui/fr/floater_map.xml index dbd3dd9406..dbd3dd9406 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_map.xml +++ b/indra/newview/skins/default/xui/fr/floater_map.xml 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_media_browser.xml b/indra/newview/skins/default/xui/fr/floater_media_browser.xml index 58535eddf5..58535eddf5 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_media_browser.xml +++ b/indra/newview/skins/default/xui/fr/floater_media_browser.xml diff --git a/indra/newview/skins/default/xui/fr/floater_media_settings.xml b/indra/newview/skins/default/xui/fr/floater_media_settings.xml index 27db5ea995..27db5ea995 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_media_settings.xml +++ b/indra/newview/skins/default/xui/fr/floater_media_settings.xml diff --git a/indra/newview/skins/default/xui/fr/floater_mem_leaking.xml b/indra/newview/skins/default/xui/fr/floater_mem_leaking.xml index d03c4d7544..d03c4d7544 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_mem_leaking.xml +++ b/indra/newview/skins/default/xui/fr/floater_mem_leaking.xml diff --git a/indra/newview/skins/default/xui/fr/floater_merchant_outbox.xml b/indra/newview/skins/default/xui/fr/floater_merchant_outbox.xml index b491dd6aed..b491dd6aed 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_merchant_outbox.xml +++ b/indra/newview/skins/default/xui/fr/floater_merchant_outbox.xml diff --git a/indra/newview/skins/default/xui/fr/floater_model_preview.xml b/indra/newview/skins/default/xui/fr/floater_model_preview.xml index bd3dae6599..bd3dae6599 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_model_preview.xml +++ b/indra/newview/skins/default/xui/fr/floater_model_preview.xml diff --git a/indra/newview/skins/default/xui/fr/floater_moveview.xml b/indra/newview/skins/default/xui/fr/floater_moveview.xml index 853af2afdf..853af2afdf 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_moveview.xml +++ b/indra/newview/skins/default/xui/fr/floater_moveview.xml diff --git a/indra/newview/skins/default/xui/fr/floater_mute_object.xml b/indra/newview/skins/default/xui/fr/floater_mute_object.xml index f4db3201a8..f4db3201a8 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_mute_object.xml +++ b/indra/newview/skins/default/xui/fr/floater_mute_object.xml diff --git a/indra/newview/skins/default/xui/fr/floater_my_appearance.xml b/indra/newview/skins/default/xui/fr/floater_my_appearance.xml index 53ff58e307..53ff58e307 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_my_appearance.xml +++ b/indra/newview/skins/default/xui/fr/floater_my_appearance.xml diff --git a/indra/newview/skins/default/xui/fr/floater_my_inventory.xml b/indra/newview/skins/default/xui/fr/floater_my_inventory.xml index d514d08081..d514d08081 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_my_inventory.xml +++ b/indra/newview/skins/default/xui/fr/floater_my_inventory.xml diff --git a/indra/newview/skins/default/xui/fr/floater_notification.xml b/indra/newview/skins/default/xui/fr/floater_notification.xml index fe4b5f9bd6..fe4b5f9bd6 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_notification.xml +++ b/indra/newview/skins/default/xui/fr/floater_notification.xml diff --git a/indra/newview/skins/default/xui/fr/floater_notifications_console.xml b/indra/newview/skins/default/xui/fr/floater_notifications_console.xml index e040e948f5..e040e948f5 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_notifications_console.xml +++ b/indra/newview/skins/default/xui/fr/floater_notifications_console.xml diff --git a/indra/newview/skins/default/xui/fr/floater_object_weights.xml b/indra/newview/skins/default/xui/fr/floater_object_weights.xml index 2667188308..2667188308 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_object_weights.xml +++ b/indra/newview/skins/default/xui/fr/floater_object_weights.xml 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..100644 --- 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'inventaire" label_selected="Copier vers l'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'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'inventaire" label_selected="Copier uniquement dans l'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_outfit_save_as.xml b/indra/newview/skins/default/xui/fr/floater_outfit_save_as.xml index 72018f5de5..72018f5de5 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_outfit_save_as.xml +++ b/indra/newview/skins/default/xui/fr/floater_outfit_save_as.xml diff --git a/indra/newview/skins/default/xui/fr/floater_outgoing_call.xml b/indra/newview/skins/default/xui/fr/floater_outgoing_call.xml index 089d710f17..089d710f17 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_outgoing_call.xml +++ b/indra/newview/skins/default/xui/fr/floater_outgoing_call.xml diff --git a/indra/newview/skins/default/xui/fr/floater_pathfinding_characters.xml b/indra/newview/skins/default/xui/fr/floater_pathfinding_characters.xml index 7c9109c011..7c9109c011 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_pathfinding_characters.xml +++ b/indra/newview/skins/default/xui/fr/floater_pathfinding_characters.xml diff --git a/indra/newview/skins/default/xui/fr/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/fr/floater_pathfinding_console.xml index 02d969dc08..02d969dc08 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_pathfinding_console.xml +++ b/indra/newview/skins/default/xui/fr/floater_pathfinding_console.xml diff --git a/indra/newview/skins/default/xui/fr/floater_pathfinding_linksets.xml b/indra/newview/skins/default/xui/fr/floater_pathfinding_linksets.xml index 894ec6dd9c..894ec6dd9c 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_pathfinding_linksets.xml +++ b/indra/newview/skins/default/xui/fr/floater_pathfinding_linksets.xml 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..100644 --- 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..100644 --- 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_people.xml b/indra/newview/skins/default/xui/fr/floater_people.xml index 58701c06b2..58701c06b2 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_people.xml +++ b/indra/newview/skins/default/xui/fr/floater_people.xml diff --git a/indra/newview/skins/default/xui/fr/floater_perm_prefs.xml b/indra/newview/skins/default/xui/fr/floater_perm_prefs.xml index 36bec80561..36bec80561 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_perm_prefs.xml +++ b/indra/newview/skins/default/xui/fr/floater_perm_prefs.xml diff --git a/indra/newview/skins/default/xui/fr/floater_picks.xml b/indra/newview/skins/default/xui/fr/floater_picks.xml index f058ff668b..f058ff668b 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_picks.xml +++ b/indra/newview/skins/default/xui/fr/floater_picks.xml diff --git a/indra/newview/skins/default/xui/fr/floater_places.xml b/indra/newview/skins/default/xui/fr/floater_places.xml index 9e649aca47..9e649aca47 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_places.xml +++ b/indra/newview/skins/default/xui/fr/floater_places.xml diff --git a/indra/newview/skins/default/xui/fr/floater_post_process.xml b/indra/newview/skins/default/xui/fr/floater_post_process.xml index a22c7512e5..a22c7512e5 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_post_process.xml +++ b/indra/newview/skins/default/xui/fr/floater_post_process.xml diff --git a/indra/newview/skins/default/xui/fr/floater_preferences.xml b/indra/newview/skins/default/xui/fr/floater_preferences.xml index 0f9fb1334b..0f9fb1334b 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_preferences.xml +++ b/indra/newview/skins/default/xui/fr/floater_preferences.xml diff --git a/indra/newview/skins/default/xui/fr/floater_preferences_proxy.xml b/indra/newview/skins/default/xui/fr/floater_preferences_proxy.xml index 020bdf928b..020bdf928b 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_preferences_proxy.xml +++ b/indra/newview/skins/default/xui/fr/floater_preferences_proxy.xml diff --git a/indra/newview/skins/default/xui/fr/floater_preview_animation.xml b/indra/newview/skins/default/xui/fr/floater_preview_animation.xml index 6488089c06..6488089c06 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_preview_animation.xml +++ b/indra/newview/skins/default/xui/fr/floater_preview_animation.xml diff --git a/indra/newview/skins/default/xui/fr/floater_preview_gesture.xml b/indra/newview/skins/default/xui/fr/floater_preview_gesture.xml index 6287f10f3e..6287f10f3e 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_preview_gesture.xml +++ b/indra/newview/skins/default/xui/fr/floater_preview_gesture.xml diff --git a/indra/newview/skins/default/xui/fr/floater_preview_notecard.xml b/indra/newview/skins/default/xui/fr/floater_preview_notecard.xml index 5646ad45eb..5646ad45eb 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_preview_notecard.xml +++ b/indra/newview/skins/default/xui/fr/floater_preview_notecard.xml diff --git a/indra/newview/skins/default/xui/fr/floater_preview_sound.xml b/indra/newview/skins/default/xui/fr/floater_preview_sound.xml index a215f92df1..a215f92df1 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_preview_sound.xml +++ b/indra/newview/skins/default/xui/fr/floater_preview_sound.xml diff --git a/indra/newview/skins/default/xui/fr/floater_preview_texture.xml b/indra/newview/skins/default/xui/fr/floater_preview_texture.xml index 9fc9d14026..9fc9d14026 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_preview_texture.xml +++ b/indra/newview/skins/default/xui/fr/floater_preview_texture.xml diff --git a/indra/newview/skins/default/xui/fr/floater_price_for_listing.xml b/indra/newview/skins/default/xui/fr/floater_price_for_listing.xml index a6e598dd2b..a6e598dd2b 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_price_for_listing.xml +++ b/indra/newview/skins/default/xui/fr/floater_price_for_listing.xml diff --git a/indra/newview/skins/default/xui/fr/floater_publish_classified.xml b/indra/newview/skins/default/xui/fr/floater_publish_classified.xml index d4d8652434..d4d8652434 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_publish_classified.xml +++ b/indra/newview/skins/default/xui/fr/floater_publish_classified.xml diff --git a/indra/newview/skins/default/xui/fr/floater_region_debug_console.xml b/indra/newview/skins/default/xui/fr/floater_region_debug_console.xml index 1747155b60..1747155b60 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_region_debug_console.xml +++ b/indra/newview/skins/default/xui/fr/floater_region_debug_console.xml diff --git a/indra/newview/skins/default/xui/fr/floater_region_info.xml b/indra/newview/skins/default/xui/fr/floater_region_info.xml index c2663174d4..c2663174d4 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_region_info.xml +++ b/indra/newview/skins/default/xui/fr/floater_region_info.xml 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..100644 --- 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 > Empiètement > Objets ou textures" name="Land__Encroachment__Objects_textures"/> <combo_box.item label="Terrain > Empiètement > Particules" name="Land__Encroachment__Particles"/> <combo_box.item label="Terrain > Empiètement > Arbres/plantes" name="Land__Encroachment__Trees_plants"/> - <combo_box.item label="Paris ou jeux d'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_script_debug.xml b/indra/newview/skins/default/xui/fr/floater_script_debug.xml index e257aac6c4..e257aac6c4 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_script_debug.xml +++ b/indra/newview/skins/default/xui/fr/floater_script_debug.xml diff --git a/indra/newview/skins/default/xui/fr/floater_script_debug_panel.xml b/indra/newview/skins/default/xui/fr/floater_script_debug_panel.xml index e70a30fa24..e70a30fa24 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_script_debug_panel.xml +++ b/indra/newview/skins/default/xui/fr/floater_script_debug_panel.xml diff --git a/indra/newview/skins/default/xui/fr/floater_script_limits.xml b/indra/newview/skins/default/xui/fr/floater_script_limits.xml index cc3aaa6653..cc3aaa6653 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_script_limits.xml +++ b/indra/newview/skins/default/xui/fr/floater_script_limits.xml diff --git a/indra/newview/skins/default/xui/fr/floater_script_preview.xml b/indra/newview/skins/default/xui/fr/floater_script_preview.xml index 7b6bc73677..7b6bc73677 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_script_preview.xml +++ b/indra/newview/skins/default/xui/fr/floater_script_preview.xml diff --git a/indra/newview/skins/default/xui/fr/floater_script_queue.xml b/indra/newview/skins/default/xui/fr/floater_script_queue.xml index b9a8165457..b9a8165457 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_script_queue.xml +++ b/indra/newview/skins/default/xui/fr/floater_script_queue.xml diff --git a/indra/newview/skins/default/xui/fr/floater_script_search.xml b/indra/newview/skins/default/xui/fr/floater_script_search.xml index 09b903f41c..09b903f41c 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_script_search.xml +++ b/indra/newview/skins/default/xui/fr/floater_script_search.xml diff --git a/indra/newview/skins/default/xui/fr/floater_search.xml b/indra/newview/skins/default/xui/fr/floater_search.xml index 32800182ea..32800182ea 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_search.xml +++ b/indra/newview/skins/default/xui/fr/floater_search.xml diff --git a/indra/newview/skins/default/xui/fr/floater_select_key.xml b/indra/newview/skins/default/xui/fr/floater_select_key.xml index 664bc0a723..664bc0a723 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_select_key.xml +++ b/indra/newview/skins/default/xui/fr/floater_select_key.xml diff --git a/indra/newview/skins/default/xui/fr/floater_sell_land.xml b/indra/newview/skins/default/xui/fr/floater_sell_land.xml index c5fb0ea0d4..c5fb0ea0d4 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_sell_land.xml +++ b/indra/newview/skins/default/xui/fr/floater_sell_land.xml diff --git a/indra/newview/skins/default/xui/fr/floater_settings_debug.xml b/indra/newview/skins/default/xui/fr/floater_settings_debug.xml index 995837e9ee..995837e9ee 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_settings_debug.xml +++ b/indra/newview/skins/default/xui/fr/floater_settings_debug.xml 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..100644 --- 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'enregistrement sur l'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_sound_devices.xml b/indra/newview/skins/default/xui/fr/floater_sound_devices.xml index 080ade9dd4..080ade9dd4 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_sound_devices.xml +++ b/indra/newview/skins/default/xui/fr/floater_sound_devices.xml diff --git a/indra/newview/skins/default/xui/fr/floater_sound_preview.xml b/indra/newview/skins/default/xui/fr/floater_sound_preview.xml index 6f0fb3421f..6f0fb3421f 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_sound_preview.xml +++ b/indra/newview/skins/default/xui/fr/floater_sound_preview.xml diff --git a/indra/newview/skins/default/xui/fr/floater_spellcheck.xml b/indra/newview/skins/default/xui/fr/floater_spellcheck.xml index 635db52ffa..635db52ffa 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_spellcheck.xml +++ b/indra/newview/skins/default/xui/fr/floater_spellcheck.xml diff --git a/indra/newview/skins/default/xui/fr/floater_spellcheck_import.xml b/indra/newview/skins/default/xui/fr/floater_spellcheck_import.xml index c8c76c672d..c8c76c672d 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_spellcheck_import.xml +++ b/indra/newview/skins/default/xui/fr/floater_spellcheck_import.xml diff --git a/indra/newview/skins/default/xui/fr/floater_stats.xml b/indra/newview/skins/default/xui/fr/floater_stats.xml index fae17e3608..fae17e3608 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_stats.xml +++ b/indra/newview/skins/default/xui/fr/floater_stats.xml diff --git a/indra/newview/skins/default/xui/fr/floater_sys_well.xml b/indra/newview/skins/default/xui/fr/floater_sys_well.xml index dbdd32974c..dbdd32974c 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_sys_well.xml +++ b/indra/newview/skins/default/xui/fr/floater_sys_well.xml diff --git a/indra/newview/skins/default/xui/fr/floater_telehub.xml b/indra/newview/skins/default/xui/fr/floater_telehub.xml index c529ca2736..c529ca2736 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_telehub.xml +++ b/indra/newview/skins/default/xui/fr/floater_telehub.xml diff --git a/indra/newview/skins/default/xui/fr/floater_test_layout_stacks.xml b/indra/newview/skins/default/xui/fr/floater_test_layout_stacks.xml index b479d5f6d6..b479d5f6d6 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_test_layout_stacks.xml +++ b/indra/newview/skins/default/xui/fr/floater_test_layout_stacks.xml diff --git a/indra/newview/skins/default/xui/fr/floater_test_text_vertical_aligment.xml b/indra/newview/skins/default/xui/fr/floater_test_text_vertical_aligment.xml index 702170ef52..702170ef52 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_test_text_vertical_aligment.xml +++ b/indra/newview/skins/default/xui/fr/floater_test_text_vertical_aligment.xml diff --git a/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml index eace67026c..eace67026c 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml +++ b/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml diff --git a/indra/newview/skins/default/xui/fr/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/fr/floater_texture_fetch_debugger.xml index caae15ea17..caae15ea17 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_texture_fetch_debugger.xml +++ b/indra/newview/skins/default/xui/fr/floater_texture_fetch_debugger.xml diff --git a/indra/newview/skins/default/xui/fr/floater_tools.xml b/indra/newview/skins/default/xui/fr/floater_tools.xml index b254a178f9..b254a178f9 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_tools.xml +++ b/indra/newview/skins/default/xui/fr/floater_tools.xml 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..100644 --- 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_tos.xml b/indra/newview/skins/default/xui/fr/floater_tos.xml index 6d58cf77ca..6d58cf77ca 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_tos.xml +++ b/indra/newview/skins/default/xui/fr/floater_tos.xml diff --git a/indra/newview/skins/default/xui/fr/floater_toybox.xml b/indra/newview/skins/default/xui/fr/floater_toybox.xml index f99d3d30b5..f99d3d30b5 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_toybox.xml +++ b/indra/newview/skins/default/xui/fr/floater_toybox.xml diff --git a/indra/newview/skins/default/xui/fr/floater_translation_settings.xml b/indra/newview/skins/default/xui/fr/floater_translation_settings.xml index c7582f110f..c7582f110f 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_translation_settings.xml +++ b/indra/newview/skins/default/xui/fr/floater_translation_settings.xml 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/floater_url_entry.xml b/indra/newview/skins/default/xui/fr/floater_url_entry.xml index 4b2be14569..4b2be14569 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_url_entry.xml +++ b/indra/newview/skins/default/xui/fr/floater_url_entry.xml diff --git a/indra/newview/skins/default/xui/fr/floater_voice_controls.xml b/indra/newview/skins/default/xui/fr/floater_voice_controls.xml index fc4de4a5a6..fc4de4a5a6 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_voice_controls.xml +++ b/indra/newview/skins/default/xui/fr/floater_voice_controls.xml diff --git a/indra/newview/skins/default/xui/fr/floater_voice_effect.xml b/indra/newview/skins/default/xui/fr/floater_voice_effect.xml index f9a76d127e..f9a76d127e 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_voice_effect.xml +++ b/indra/newview/skins/default/xui/fr/floater_voice_effect.xml diff --git a/indra/newview/skins/default/xui/fr/floater_web_content.xml b/indra/newview/skins/default/xui/fr/floater_web_content.xml index 65dfafe760..65dfafe760 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_web_content.xml +++ b/indra/newview/skins/default/xui/fr/floater_web_content.xml diff --git a/indra/newview/skins/default/xui/fr/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/fr/floater_whitelist_entry.xml index 99e4954555..99e4954555 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_whitelist_entry.xml +++ b/indra/newview/skins/default/xui/fr/floater_whitelist_entry.xml diff --git a/indra/newview/skins/default/xui/fr/floater_window_size.xml b/indra/newview/skins/default/xui/fr/floater_window_size.xml index 11c2e439bd..11c2e439bd 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_window_size.xml +++ b/indra/newview/skins/default/xui/fr/floater_window_size.xml diff --git a/indra/newview/skins/default/xui/fr/floater_world_map.xml b/indra/newview/skins/default/xui/fr/floater_world_map.xml index f5dab91924..f5dab91924 100755..100644 --- a/indra/newview/skins/default/xui/fr/floater_world_map.xml +++ b/indra/newview/skins/default/xui/fr/floater_world_map.xml diff --git a/indra/newview/skins/default/xui/fr/fonts.xml b/indra/newview/skins/default/xui/fr/fonts.xml index cccb45b973..cccb45b973 100755..100644 --- a/indra/newview/skins/default/xui/fr/fonts.xml +++ b/indra/newview/skins/default/xui/fr/fonts.xml diff --git a/indra/newview/skins/default/xui/fr/inspect_avatar.xml b/indra/newview/skins/default/xui/fr/inspect_avatar.xml index 553646f8e9..553646f8e9 100755..100644 --- a/indra/newview/skins/default/xui/fr/inspect_avatar.xml +++ b/indra/newview/skins/default/xui/fr/inspect_avatar.xml diff --git a/indra/newview/skins/default/xui/fr/inspect_group.xml b/indra/newview/skins/default/xui/fr/inspect_group.xml index e8c528c1ac..e8c528c1ac 100755..100644 --- a/indra/newview/skins/default/xui/fr/inspect_group.xml +++ b/indra/newview/skins/default/xui/fr/inspect_group.xml diff --git a/indra/newview/skins/default/xui/fr/inspect_object.xml b/indra/newview/skins/default/xui/fr/inspect_object.xml index b66af7a2bf..b66af7a2bf 100755..100644 --- a/indra/newview/skins/default/xui/fr/inspect_object.xml +++ b/indra/newview/skins/default/xui/fr/inspect_object.xml diff --git a/indra/newview/skins/default/xui/fr/inspect_remote_object.xml b/indra/newview/skins/default/xui/fr/inspect_remote_object.xml index 6d7cfadc04..6d7cfadc04 100755..100644 --- a/indra/newview/skins/default/xui/fr/inspect_remote_object.xml +++ b/indra/newview/skins/default/xui/fr/inspect_remote_object.xml diff --git a/indra/newview/skins/default/xui/fr/language_settings.xml b/indra/newview/skins/default/xui/fr/language_settings.xml index fdac9d65a7..fdac9d65a7 100755..100644 --- a/indra/newview/skins/default/xui/fr/language_settings.xml +++ b/indra/newview/skins/default/xui/fr/language_settings.xml diff --git a/indra/newview/skins/default/xui/fr/menu_add_wearable_gear.xml b/indra/newview/skins/default/xui/fr/menu_add_wearable_gear.xml index 7e7993175e..7e7993175e 100755..100644 --- a/indra/newview/skins/default/xui/fr/menu_add_wearable_gear.xml +++ b/indra/newview/skins/default/xui/fr/menu_add_wearable_gear.xml diff --git a/indra/newview/skins/default/xui/fr/menu_attachment_other.xml b/indra/newview/skins/default/xui/fr/menu_attachment_other.xml index 0450be28e0..0450be28e0 100755..100644 --- a/indra/newview/skins/default/xui/fr/menu_attachment_other.xml +++ b/indra/newview/skins/default/xui/fr/menu_attachment_other.xml 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..100644 --- 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_icon.xml b/indra/newview/skins/default/xui/fr/menu_avatar_icon.xml index 072ac0a6ae..072ac0a6ae 100755..100644 --- a/indra/newview/skins/default/xui/fr/menu_avatar_icon.xml +++ b/indra/newview/skins/default/xui/fr/menu_avatar_icon.xml diff --git a/indra/newview/skins/default/xui/fr/menu_avatar_other.xml b/indra/newview/skins/default/xui/fr/menu_avatar_other.xml index 1f5c1724f8..1f5c1724f8 100755..100644 --- a/indra/newview/skins/default/xui/fr/menu_avatar_other.xml +++ b/indra/newview/skins/default/xui/fr/menu_avatar_other.xml 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..100644 --- 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_cof_attachment.xml b/indra/newview/skins/default/xui/fr/menu_cof_attachment.xml index a4ead48b6b..a4ead48b6b 100755..100644 --- a/indra/newview/skins/default/xui/fr/menu_cof_attachment.xml +++ b/indra/newview/skins/default/xui/fr/menu_cof_attachment.xml diff --git a/indra/newview/skins/default/xui/fr/menu_cof_body_part.xml b/indra/newview/skins/default/xui/fr/menu_cof_body_part.xml index 4b6907fcc6..4b6907fcc6 100755..100644 --- a/indra/newview/skins/default/xui/fr/menu_cof_body_part.xml +++ b/indra/newview/skins/default/xui/fr/menu_cof_body_part.xml diff --git a/indra/newview/skins/default/xui/fr/menu_cof_clothing.xml b/indra/newview/skins/default/xui/fr/menu_cof_clothing.xml index 03cc569704..03cc569704 100755..100644 --- a/indra/newview/skins/default/xui/fr/menu_cof_clothing.xml +++ b/indra/newview/skins/default/xui/fr/menu_cof_clothing.xml diff --git a/indra/newview/skins/default/xui/fr/menu_cof_gear.xml b/indra/newview/skins/default/xui/fr/menu_cof_gear.xml index fea0486d8a..fea0486d8a 100755..100644 --- a/indra/newview/skins/default/xui/fr/menu_cof_gear.xml +++ b/indra/newview/skins/default/xui/fr/menu_cof_gear.xml diff --git a/indra/newview/skins/default/xui/fr/menu_edit.xml b/indra/newview/skins/default/xui/fr/menu_edit.xml index 56669f31e1..56669f31e1 100755..100644 --- a/indra/newview/skins/default/xui/fr/menu_edit.xml +++ b/indra/newview/skins/default/xui/fr/menu_edit.xml diff --git a/indra/newview/skins/default/xui/fr/menu_favorites.xml b/indra/newview/skins/default/xui/fr/menu_favorites.xml index 5f1545fde7..5f1545fde7 100755..100644 --- a/indra/newview/skins/default/xui/fr/menu_favorites.xml +++ b/indra/newview/skins/default/xui/fr/menu_favorites.xml diff --git a/indra/newview/skins/default/xui/fr/menu_gesture_gear.xml b/indra/newview/skins/default/xui/fr/menu_gesture_gear.xml index 062dd0f005..062dd0f005 100755..100644 --- a/indra/newview/skins/default/xui/fr/menu_gesture_gear.xml +++ b/indra/newview/skins/default/xui/fr/menu_gesture_gear.xml diff --git a/indra/newview/skins/default/xui/fr/menu_group_plus.xml b/indra/newview/skins/default/xui/fr/menu_group_plus.xml index ad76f11d79..ad76f11d79 100755..100644 --- a/indra/newview/skins/default/xui/fr/menu_group_plus.xml +++ b/indra/newview/skins/default/xui/fr/menu_group_plus.xml diff --git a/indra/newview/skins/default/xui/fr/menu_hide_navbar.xml b/indra/newview/skins/default/xui/fr/menu_hide_navbar.xml index 09c9f5084a..09c9f5084a 100755..100644 --- a/indra/newview/skins/default/xui/fr/menu_hide_navbar.xml +++ b/indra/newview/skins/default/xui/fr/menu_hide_navbar.xml diff --git a/indra/newview/skins/default/xui/fr/menu_imchiclet_adhoc.xml b/indra/newview/skins/default/xui/fr/menu_imchiclet_adhoc.xml index 4d9a103058..4d9a103058 100755..100644 --- a/indra/newview/skins/default/xui/fr/menu_imchiclet_adhoc.xml +++ b/indra/newview/skins/default/xui/fr/menu_imchiclet_adhoc.xml diff --git a/indra/newview/skins/default/xui/fr/menu_imchiclet_group.xml b/indra/newview/skins/default/xui/fr/menu_imchiclet_group.xml index 59f97d8b48..59f97d8b48 100755..100644 --- a/indra/newview/skins/default/xui/fr/menu_imchiclet_group.xml +++ b/indra/newview/skins/default/xui/fr/menu_imchiclet_group.xml diff --git a/indra/newview/skins/default/xui/fr/menu_imchiclet_p2p.xml b/indra/newview/skins/default/xui/fr/menu_imchiclet_p2p.xml index ecc8cee413..ecc8cee413 100755..100644 --- a/indra/newview/skins/default/xui/fr/menu_imchiclet_p2p.xml +++ b/indra/newview/skins/default/xui/fr/menu_imchiclet_p2p.xml diff --git a/indra/newview/skins/default/xui/fr/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/fr/menu_inspect_avatar_gear.xml index 53f22bb44a..53f22bb44a 100755..100644 --- a/indra/newview/skins/default/xui/fr/menu_inspect_avatar_gear.xml +++ b/indra/newview/skins/default/xui/fr/menu_inspect_avatar_gear.xml diff --git a/indra/newview/skins/default/xui/fr/menu_inspect_object_gear.xml b/indra/newview/skins/default/xui/fr/menu_inspect_object_gear.xml index f3b974aba5..f3b974aba5 100755..100644 --- a/indra/newview/skins/default/xui/fr/menu_inspect_object_gear.xml +++ b/indra/newview/skins/default/xui/fr/menu_inspect_object_gear.xml diff --git a/indra/newview/skins/default/xui/fr/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/fr/menu_inspect_self_gear.xml index ac70df472d..ac70df472d 100755..100644 --- a/indra/newview/skins/default/xui/fr/menu_inspect_self_gear.xml +++ b/indra/newview/skins/default/xui/fr/menu_inspect_self_gear.xml diff --git a/indra/newview/skins/default/xui/fr/menu_inv_offer_chiclet.xml b/indra/newview/skins/default/xui/fr/menu_inv_offer_chiclet.xml index a9b2883cca..a9b2883cca 100755..100644 --- a/indra/newview/skins/default/xui/fr/menu_inv_offer_chiclet.xml +++ b/indra/newview/skins/default/xui/fr/menu_inv_offer_chiclet.xml 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..100644 --- 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'annonce" name="Marketplace Associate Listing"/> + <menu_item_call label="Obtenir (actualiser) l'annonce" name="Marketplace Get Listing"/> + <menu_item_call label="Consultez les erreurs" name="Marketplace Check Listing"/> + <menu_item_call label="Modifier l'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'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_add.xml b/indra/newview/skins/default/xui/fr/menu_inventory_add.xml index 1076af44d9..1076af44d9 100755..100644 --- a/indra/newview/skins/default/xui/fr/menu_inventory_add.xml +++ b/indra/newview/skins/default/xui/fr/menu_inventory_add.xml 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..100644 --- 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_land.xml b/indra/newview/skins/default/xui/fr/menu_land.xml index 7beaf00c58..7beaf00c58 100755..100644 --- a/indra/newview/skins/default/xui/fr/menu_land.xml +++ b/indra/newview/skins/default/xui/fr/menu_land.xml diff --git a/indra/newview/skins/default/xui/fr/menu_landmark.xml b/indra/newview/skins/default/xui/fr/menu_landmark.xml index 73eaa4af7e..73eaa4af7e 100755..100644 --- a/indra/newview/skins/default/xui/fr/menu_landmark.xml +++ b/indra/newview/skins/default/xui/fr/menu_landmark.xml diff --git a/indra/newview/skins/default/xui/fr/menu_login.xml b/indra/newview/skins/default/xui/fr/menu_login.xml index 5e9969627d..5e9969627d 100755..100644 --- a/indra/newview/skins/default/xui/fr/menu_login.xml +++ b/indra/newview/skins/default/xui/fr/menu_login.xml 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'annonces" name="show_only_listing_folders"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/fr/menu_media_ctrl.xml b/indra/newview/skins/default/xui/fr/menu_media_ctrl.xml index 1941ad2cbf..1941ad2cbf 100755..100644 --- a/indra/newview/skins/default/xui/fr/menu_media_ctrl.xml +++ b/indra/newview/skins/default/xui/fr/menu_media_ctrl.xml diff --git a/indra/newview/skins/default/xui/fr/menu_mini_map.xml b/indra/newview/skins/default/xui/fr/menu_mini_map.xml index b9d0a70383..b9d0a70383 100755..100644 --- a/indra/newview/skins/default/xui/fr/menu_mini_map.xml +++ b/indra/newview/skins/default/xui/fr/menu_mini_map.xml diff --git a/indra/newview/skins/default/xui/fr/menu_model_import_gear_default.xml b/indra/newview/skins/default/xui/fr/menu_model_import_gear_default.xml index af6bfcd028..af6bfcd028 100755..100644 --- a/indra/newview/skins/default/xui/fr/menu_model_import_gear_default.xml +++ b/indra/newview/skins/default/xui/fr/menu_model_import_gear_default.xml diff --git a/indra/newview/skins/default/xui/fr/menu_navbar.xml b/indra/newview/skins/default/xui/fr/menu_navbar.xml index 08d810b653..08d810b653 100755..100644 --- a/indra/newview/skins/default/xui/fr/menu_navbar.xml +++ b/indra/newview/skins/default/xui/fr/menu_navbar.xml diff --git a/indra/newview/skins/default/xui/fr/menu_nearby_chat.xml b/indra/newview/skins/default/xui/fr/menu_nearby_chat.xml index 99e22aeff7..99e22aeff7 100755..100644 --- a/indra/newview/skins/default/xui/fr/menu_nearby_chat.xml +++ b/indra/newview/skins/default/xui/fr/menu_nearby_chat.xml diff --git a/indra/newview/skins/default/xui/fr/menu_notification_well_button.xml b/indra/newview/skins/default/xui/fr/menu_notification_well_button.xml index 323bfdbf16..323bfdbf16 100755..100644 --- a/indra/newview/skins/default/xui/fr/menu_notification_well_button.xml +++ b/indra/newview/skins/default/xui/fr/menu_notification_well_button.xml diff --git a/indra/newview/skins/default/xui/fr/menu_object.xml b/indra/newview/skins/default/xui/fr/menu_object.xml index 27e801d959..27e801d959 100755..100644 --- a/indra/newview/skins/default/xui/fr/menu_object.xml +++ b/indra/newview/skins/default/xui/fr/menu_object.xml diff --git a/indra/newview/skins/default/xui/fr/menu_object_icon.xml b/indra/newview/skins/default/xui/fr/menu_object_icon.xml index 7c94930160..7c94930160 100755..100644 --- a/indra/newview/skins/default/xui/fr/menu_object_icon.xml +++ b/indra/newview/skins/default/xui/fr/menu_object_icon.xml diff --git a/indra/newview/skins/default/xui/fr/menu_outfit_gear.xml b/indra/newview/skins/default/xui/fr/menu_outfit_gear.xml index 21b19eded6..21b19eded6 100755..100644 --- a/indra/newview/skins/default/xui/fr/menu_outfit_gear.xml +++ b/indra/newview/skins/default/xui/fr/menu_outfit_gear.xml diff --git a/indra/newview/skins/default/xui/fr/menu_outfit_tab.xml b/indra/newview/skins/default/xui/fr/menu_outfit_tab.xml index 2a7f618e07..2a7f618e07 100755..100644 --- a/indra/newview/skins/default/xui/fr/menu_outfit_tab.xml +++ b/indra/newview/skins/default/xui/fr/menu_outfit_tab.xml diff --git a/indra/newview/skins/default/xui/fr/menu_participant_list.xml b/indra/newview/skins/default/xui/fr/menu_participant_list.xml index f91a30f6bb..f91a30f6bb 100755..100644 --- a/indra/newview/skins/default/xui/fr/menu_participant_list.xml +++ b/indra/newview/skins/default/xui/fr/menu_participant_list.xml diff --git a/indra/newview/skins/default/xui/fr/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/fr/menu_people_friends_view_sort.xml index a6170a6c16..a6170a6c16 100755..100644 --- a/indra/newview/skins/default/xui/fr/menu_people_friends_view_sort.xml +++ b/indra/newview/skins/default/xui/fr/menu_people_friends_view_sort.xml diff --git a/indra/newview/skins/default/xui/fr/menu_people_groups.xml b/indra/newview/skins/default/xui/fr/menu_people_groups.xml index 8e32f065fa..8e32f065fa 100755..100644 --- a/indra/newview/skins/default/xui/fr/menu_people_groups.xml +++ b/indra/newview/skins/default/xui/fr/menu_people_groups.xml diff --git a/indra/newview/skins/default/xui/fr/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/fr/menu_people_groups_view_sort.xml index 34f949cf2c..34f949cf2c 100755..100644 --- a/indra/newview/skins/default/xui/fr/menu_people_groups_view_sort.xml +++ b/indra/newview/skins/default/xui/fr/menu_people_groups_view_sort.xml diff --git a/indra/newview/skins/default/xui/fr/menu_people_nearby.xml b/indra/newview/skins/default/xui/fr/menu_people_nearby.xml index 6f7d02ef74..6f7d02ef74 100755..100644 --- a/indra/newview/skins/default/xui/fr/menu_people_nearby.xml +++ b/indra/newview/skins/default/xui/fr/menu_people_nearby.xml diff --git a/indra/newview/skins/default/xui/fr/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/fr/menu_people_nearby_multiselect.xml index 37abf831c2..37abf831c2 100755..100644 --- a/indra/newview/skins/default/xui/fr/menu_people_nearby_multiselect.xml +++ b/indra/newview/skins/default/xui/fr/menu_people_nearby_multiselect.xml diff --git a/indra/newview/skins/default/xui/fr/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/fr/menu_people_nearby_view_sort.xml index 8bb466b8d6..8bb466b8d6 100755..100644 --- a/indra/newview/skins/default/xui/fr/menu_people_nearby_view_sort.xml +++ b/indra/newview/skins/default/xui/fr/menu_people_nearby_view_sort.xml diff --git a/indra/newview/skins/default/xui/fr/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/fr/menu_people_recent_view_sort.xml index 93b90ae61c..93b90ae61c 100755..100644 --- a/indra/newview/skins/default/xui/fr/menu_people_recent_view_sort.xml +++ b/indra/newview/skins/default/xui/fr/menu_people_recent_view_sort.xml diff --git a/indra/newview/skins/default/xui/fr/menu_picks.xml b/indra/newview/skins/default/xui/fr/menu_picks.xml index 7d7174d43c..7d7174d43c 100755..100644 --- a/indra/newview/skins/default/xui/fr/menu_picks.xml +++ b/indra/newview/skins/default/xui/fr/menu_picks.xml diff --git a/indra/newview/skins/default/xui/fr/menu_picks_plus.xml b/indra/newview/skins/default/xui/fr/menu_picks_plus.xml index b6cde6d6e2..b6cde6d6e2 100755..100644 --- a/indra/newview/skins/default/xui/fr/menu_picks_plus.xml +++ b/indra/newview/skins/default/xui/fr/menu_picks_plus.xml diff --git a/indra/newview/skins/default/xui/fr/menu_place.xml b/indra/newview/skins/default/xui/fr/menu_place.xml index 6b0f4db752..6b0f4db752 100755..100644 --- a/indra/newview/skins/default/xui/fr/menu_place.xml +++ b/indra/newview/skins/default/xui/fr/menu_place.xml diff --git a/indra/newview/skins/default/xui/fr/menu_place_add_button.xml b/indra/newview/skins/default/xui/fr/menu_place_add_button.xml index 92f9e7719d..92f9e7719d 100755..100644 --- a/indra/newview/skins/default/xui/fr/menu_place_add_button.xml +++ b/indra/newview/skins/default/xui/fr/menu_place_add_button.xml diff --git a/indra/newview/skins/default/xui/fr/menu_places_gear_folder.xml b/indra/newview/skins/default/xui/fr/menu_places_gear_folder.xml index 3fdf3bf3c4..3fdf3bf3c4 100755..100644 --- a/indra/newview/skins/default/xui/fr/menu_places_gear_folder.xml +++ b/indra/newview/skins/default/xui/fr/menu_places_gear_folder.xml diff --git a/indra/newview/skins/default/xui/fr/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/fr/menu_places_gear_landmark.xml index b48f6ea693..b48f6ea693 100755..100644 --- a/indra/newview/skins/default/xui/fr/menu_places_gear_landmark.xml +++ b/indra/newview/skins/default/xui/fr/menu_places_gear_landmark.xml diff --git a/indra/newview/skins/default/xui/fr/menu_profile_overflow.xml b/indra/newview/skins/default/xui/fr/menu_profile_overflow.xml index ddf898b791..ddf898b791 100755..100644 --- a/indra/newview/skins/default/xui/fr/menu_profile_overflow.xml +++ b/indra/newview/skins/default/xui/fr/menu_profile_overflow.xml diff --git a/indra/newview/skins/default/xui/fr/menu_save_outfit.xml b/indra/newview/skins/default/xui/fr/menu_save_outfit.xml index f78db411b3..f78db411b3 100755..100644 --- a/indra/newview/skins/default/xui/fr/menu_save_outfit.xml +++ b/indra/newview/skins/default/xui/fr/menu_save_outfit.xml diff --git a/indra/newview/skins/default/xui/fr/menu_script_chiclet.xml b/indra/newview/skins/default/xui/fr/menu_script_chiclet.xml index 46efa30bd6..46efa30bd6 100755..100644 --- a/indra/newview/skins/default/xui/fr/menu_script_chiclet.xml +++ b/indra/newview/skins/default/xui/fr/menu_script_chiclet.xml diff --git a/indra/newview/skins/default/xui/fr/menu_slurl.xml b/indra/newview/skins/default/xui/fr/menu_slurl.xml index ddfa5c0849..ddfa5c0849 100755..100644 --- a/indra/newview/skins/default/xui/fr/menu_slurl.xml +++ b/indra/newview/skins/default/xui/fr/menu_slurl.xml diff --git a/indra/newview/skins/default/xui/fr/menu_teleport_history_gear.xml b/indra/newview/skins/default/xui/fr/menu_teleport_history_gear.xml index 3dea662cc2..3dea662cc2 100755..100644 --- a/indra/newview/skins/default/xui/fr/menu_teleport_history_gear.xml +++ b/indra/newview/skins/default/xui/fr/menu_teleport_history_gear.xml diff --git a/indra/newview/skins/default/xui/fr/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/fr/menu_teleport_history_item.xml index ba8ed9b3f8..ba8ed9b3f8 100755..100644 --- a/indra/newview/skins/default/xui/fr/menu_teleport_history_item.xml +++ b/indra/newview/skins/default/xui/fr/menu_teleport_history_item.xml diff --git a/indra/newview/skins/default/xui/fr/menu_teleport_history_tab.xml b/indra/newview/skins/default/xui/fr/menu_teleport_history_tab.xml index 369680985d..369680985d 100755..100644 --- a/indra/newview/skins/default/xui/fr/menu_teleport_history_tab.xml +++ b/indra/newview/skins/default/xui/fr/menu_teleport_history_tab.xml diff --git a/indra/newview/skins/default/xui/fr/menu_text_editor.xml b/indra/newview/skins/default/xui/fr/menu_text_editor.xml index c31b0c8556..c31b0c8556 100755..100644 --- a/indra/newview/skins/default/xui/fr/menu_text_editor.xml +++ b/indra/newview/skins/default/xui/fr/menu_text_editor.xml diff --git a/indra/newview/skins/default/xui/fr/menu_toolbars.xml b/indra/newview/skins/default/xui/fr/menu_toolbars.xml index f74d206d56..f74d206d56 100755..100644 --- a/indra/newview/skins/default/xui/fr/menu_toolbars.xml +++ b/indra/newview/skins/default/xui/fr/menu_toolbars.xml diff --git a/indra/newview/skins/default/xui/fr/menu_topinfobar.xml b/indra/newview/skins/default/xui/fr/menu_topinfobar.xml index dc68f40fe7..dc68f40fe7 100755..100644 --- a/indra/newview/skins/default/xui/fr/menu_topinfobar.xml +++ b/indra/newview/skins/default/xui/fr/menu_topinfobar.xml diff --git a/indra/newview/skins/default/xui/fr/menu_url_agent.xml b/indra/newview/skins/default/xui/fr/menu_url_agent.xml index 2c7443c6ca..2c7443c6ca 100755..100644 --- a/indra/newview/skins/default/xui/fr/menu_url_agent.xml +++ b/indra/newview/skins/default/xui/fr/menu_url_agent.xml 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_url_group.xml b/indra/newview/skins/default/xui/fr/menu_url_group.xml index de90c3ff7e..de90c3ff7e 100755..100644 --- a/indra/newview/skins/default/xui/fr/menu_url_group.xml +++ b/indra/newview/skins/default/xui/fr/menu_url_group.xml diff --git a/indra/newview/skins/default/xui/fr/menu_url_http.xml b/indra/newview/skins/default/xui/fr/menu_url_http.xml index 5e96352999..5e96352999 100755..100644 --- a/indra/newview/skins/default/xui/fr/menu_url_http.xml +++ b/indra/newview/skins/default/xui/fr/menu_url_http.xml diff --git a/indra/newview/skins/default/xui/fr/menu_url_inventory.xml b/indra/newview/skins/default/xui/fr/menu_url_inventory.xml index 8ab88b4be7..8ab88b4be7 100755..100644 --- a/indra/newview/skins/default/xui/fr/menu_url_inventory.xml +++ b/indra/newview/skins/default/xui/fr/menu_url_inventory.xml diff --git a/indra/newview/skins/default/xui/fr/menu_url_map.xml b/indra/newview/skins/default/xui/fr/menu_url_map.xml index 67e6986f5d..67e6986f5d 100755..100644 --- a/indra/newview/skins/default/xui/fr/menu_url_map.xml +++ b/indra/newview/skins/default/xui/fr/menu_url_map.xml diff --git a/indra/newview/skins/default/xui/fr/menu_url_objectim.xml b/indra/newview/skins/default/xui/fr/menu_url_objectim.xml index 5d745ef5f8..5d745ef5f8 100755..100644 --- a/indra/newview/skins/default/xui/fr/menu_url_objectim.xml +++ b/indra/newview/skins/default/xui/fr/menu_url_objectim.xml diff --git a/indra/newview/skins/default/xui/fr/menu_url_parcel.xml b/indra/newview/skins/default/xui/fr/menu_url_parcel.xml index 07b0eeca49..07b0eeca49 100755..100644 --- a/indra/newview/skins/default/xui/fr/menu_url_parcel.xml +++ b/indra/newview/skins/default/xui/fr/menu_url_parcel.xml diff --git a/indra/newview/skins/default/xui/fr/menu_url_slapp.xml b/indra/newview/skins/default/xui/fr/menu_url_slapp.xml index f4b7e212ca..f4b7e212ca 100755..100644 --- a/indra/newview/skins/default/xui/fr/menu_url_slapp.xml +++ b/indra/newview/skins/default/xui/fr/menu_url_slapp.xml diff --git a/indra/newview/skins/default/xui/fr/menu_url_slurl.xml b/indra/newview/skins/default/xui/fr/menu_url_slurl.xml index e44943cf15..e44943cf15 100755..100644 --- a/indra/newview/skins/default/xui/fr/menu_url_slurl.xml +++ b/indra/newview/skins/default/xui/fr/menu_url_slurl.xml diff --git a/indra/newview/skins/default/xui/fr/menu_url_teleport.xml b/indra/newview/skins/default/xui/fr/menu_url_teleport.xml index a5075a2740..a5075a2740 100755..100644 --- a/indra/newview/skins/default/xui/fr/menu_url_teleport.xml +++ b/indra/newview/skins/default/xui/fr/menu_url_teleport.xml diff --git a/indra/newview/skins/default/xui/fr/menu_viewer.xml b/indra/newview/skins/default/xui/fr/menu_viewer.xml index 2c30fe07b4..788cdbf856 100755..100644 --- a/indra/newview/skins/default/xui/fr/menu_viewer.xml +++ b/indra/newview/skins/default/xui/fr/menu_viewer.xml @@ -8,13 +8,14 @@ <menu_item_call label="Nouvelle fenêtre d'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'asseoir" name="Sit Down Here"/> <menu_item_check label="Voler" name="Fly"/> <menu_item_check label="Toujours courir" name="Always Run"/> <menu_item_call label="Arrêter mon animation" name="Stop Animating My Avatar"/> - <menu_item_call label="Marcher / Courir / Voler..." name="Walk / run / fly"/> + <menu_item_call label="Marcher / Courir / Voler..." name="WalkRunFly"/> </menu> <menu label="Statut" name="Status"> <menu_item_check label="Absent" name="Away"/> @@ -22,6 +23,7 @@ </menu> <menu_item_call label="Acheter des L$..." name="Buy and Sell L$"/> <menu_item_call label="Boîte d'envoi vendeur..." name="MerchantOutbox"/> + <menu_item_call label="Annonces de Place du marché..." name="MarketplaceListings"/> <menu_item_call label="Page d'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"> @@ -62,7 +64,7 @@ <menu_item_call label="Photo" name="Take Snapshot"/> <menu_item_call label="Profil du lieu" name="Place Profile"/> <menu_item_call label="À propos du terrain" name="About Land"/> - <menu_item_call label="Région/Domaine" name="Region/Estate"/> + <menu_item_call label="Région/Domaine" name="RegionEstate"/> <menu_item_call label="Mes terrains..." name="My Land"/> <menu_item_call label="Acheter ce terrain" name="Buy Land"/> <menu label="Afficher" name="LandShow"> @@ -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/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/fr/menu_wearable_list_item.xml index 187cb4bcd2..187cb4bcd2 100755..100644 --- a/indra/newview/skins/default/xui/fr/menu_wearable_list_item.xml +++ b/indra/newview/skins/default/xui/fr/menu_wearable_list_item.xml diff --git a/indra/newview/skins/default/xui/fr/menu_wearing_gear.xml b/indra/newview/skins/default/xui/fr/menu_wearing_gear.xml index c3d9d908b0..c3d9d908b0 100755..100644 --- a/indra/newview/skins/default/xui/fr/menu_wearing_gear.xml +++ b/indra/newview/skins/default/xui/fr/menu_wearing_gear.xml diff --git a/indra/newview/skins/default/xui/fr/menu_wearing_tab.xml b/indra/newview/skins/default/xui/fr/menu_wearing_tab.xml index 4d88445506..4d88445506 100755..100644 --- a/indra/newview/skins/default/xui/fr/menu_wearing_tab.xml +++ b/indra/newview/skins/default/xui/fr/menu_wearing_tab.xml diff --git a/indra/newview/skins/default/xui/fr/mime_types.xml b/indra/newview/skins/default/xui/fr/mime_types.xml index 322887fb76..322887fb76 100755..100644 --- a/indra/newview/skins/default/xui/fr/mime_types.xml +++ b/indra/newview/skins/default/xui/fr/mime_types.xml 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..100644 --- 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..100644 --- 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..29e6fe1979 100755..100644 --- 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'erreur : La notification, appelée '[_NAME]', 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'a été envoyé vers la Place du marché en raison d'u L'initialisation de la Place du marché a échoué en raison d'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 : + + '[ERROR_CODE]' + <usetemplate name="okbutton" yestext="OK"/> + </notification> + <notification name="MerchantPasteFailed"> + Échec de la copie ou du déplacement vers les annonces Place du marché. Erreur : + + '[ERROR_CODE]' + <usetemplate name="okbutton" yestext="OK"/> + </notification> + <notification name="MerchantTransactionFailed"> + La transaction avec la Place du marché a échoué en raison de l'erreur suivante : + + Motif : '[ERROR_REASON]' + [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'annonce, mais parfois à cause d'erreurs dans la structure du dossier. Modifiez l'annonce ou consultez les erreurs du dossier de l'annonce. + <usetemplate name="okbutton" yestext="OK"/> + </notification> + <notification name="MerchantListingFailed"> + Échec de la publication d'une annonce sur la Place du marché. Erreur : + + '[ERROR_CODE]' + <usetemplate name="okbutton" yestext="OK"/> + </notification> + <notification name="MerchantFolderActivationFailed"> + Échec de l'activation de ce dossier de version. Erreur : + + '[ERROR_CODE]' + <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'origine, et non copiés. Voulez-vous continuer ? + <usetemplate ignoretext="Confirmer avant que je ne déplace un article de l'inventaire vers la Place du marché" name="okcancelignore" notext="Annuler" yestext="OK"/> + </notification> + <notification name="ConfirmListingCutOrDelete"> + Le déplacement ou la suppression d'un dossier d'annonces supprimera votre annonce de la Place du marché. Si vous souhaitez conserver l'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'ê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'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'annonce active. Voulez-vous continuer ? + <usetemplate ignoretext="Confirmer avant que je ne désactive le dossier de version d'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'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'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'unités au dossier de stock pour publier à nouveau l'annonce. + <usetemplate ignoretext="Alerter lorsqu'une annonce n'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'enregistrement du geste a échoué. Il y a trop d'étapes dans ce geste. @@ -574,6 +664,9 @@ La qualité des graphiques peut être augmentée à la section Préférences > <notification name="RegionNoTerraforming"> Le terraformage est interdit dans la région [REGION]. </notification> + <notification name="ParcelNoTerraforming"> + Vous n'êtes pas autorisé(e) à terraformer la parcelle [PARCEL]. + </notification> <notification name="CannotCopyWarning"> Vous n'ê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 > Préférences > 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'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'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'avenir en accédant à Moi > Préférences > Général, à partir de la barre de menus. <usetemplate name="okbutton" yestext="OK"/> @@ -2120,6 +2244,10 @@ Déplacer les objets de l'inventaire ? <ignore name="ignore" text="Je définis l'action du clic Payer l'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'êtes autorisé à copier aucun élément dans cet objet. </notification> @@ -2205,6 +2333,9 @@ Voulez-vous le remplacer par l'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é > Afficher les paramètres de débogage > 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. @@ -2657,9 +2788,6 @@ Veuillez réessayer dans quelques minutes. <notification name="NoValidCircuit"> Aucun code de circuit valide. </notification> - <notification name="NoValidTimestamp"> - Timestamp non valide. - </notification> <notification name="NoPendingConnection"> Impossible de créer la connexion en attente. </notification> @@ -2814,7 +2942,7 @@ Si vous restez dans cette région, vous serez déconnecté(e). [MESSAGE] -Venant de l'objet : <nolink>[OBJECTNAME]</nolink>, propriétaire : [NAME] ? +Venant de l'objet : <nolink>[OBJECTNAME]</nolink>, propriétaire : [NAME] <form name="form"> <button name="Gotopage" text="Charger"/> <button name="Cancel" text="Annuler"/> @@ -2840,6 +2968,72 @@ Acceptez-vous ? <button name="Mute" text="Interdire"/> </form> </notification> + <notification name="ExperienceAcquireFailed"> + Impossible d'acquérir une nouvelle expérience : + [ERROR_MESSAGE] + <usetemplate name="okbutton" yestext="OK"/> + </notification> + <notification name="NotInGroupExperienceProfileMessage"> + Une modification du groupe de l'expérience a été ignorée, car le propriétaire n'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'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'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'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'expérience secondlife:///app/experience/[public_id]/profile et n'ê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'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'expérience avec clé secondlife:///app/experience/[public_id]/profile. Si vous supprimez cette expérience, vous risquez d'ê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'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'autres expériences avec clé soient disponibles. + </notification> + <notification name="ExperienceEvent"> + Un objet a été autorisé à [EventType] par l'expérience secondlife:///app/experience/[public_id]/profile. + Propriétaire : secondlife:///app/agent/[OwnerID]/inspect + Nom de l'objet : [ObjectName] + Nom de la parcelle : [ParcelName] + </notification> + <notification name="ExperienceEventAttachment"> + Une pièce jointe a été autorisée à [EventType] par l'expérience secondlife:///app/experience/[public_id]/profile. + Propriétaire : secondlife:///app/agent/[OwnerID]/inspect + </notification> + <notification name="ScriptQuestionExperience"> + « <nolink>[OBJECTNAME]</nolink> », un objet appartenant à « [NAME] », demande votre participation à l'expérience [GRID_WIDE] : + +[EXPERIENCE] + +Une fois l'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'expérience. + +Les scripts associés à cette expérience pourront effectuer les actions suivantes dans les régions dans lesquelles l'expérience est active : + +[QUESTIONS]Acceptez-vous ? + <form name="form"> + <button name="BlockExperience" text="Bloquer l'expérience"/> + <button name="Mute" text="Ignorer l'objet"/> + <button name="Yes" text="Oui"/> + <button name="No" text="Non"/> + </form> + </notification> <notification name="ScriptQuestionCaution"> Avertissement : l'objet <nolink>[OBJECTNAME]</nolink> 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 +3353,10 @@ Texture figée de [RESOLUTION] chargée pour [BODYREGION] au bout de [TIME] seco ([EXISTENCE] secondes d'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'afficher un aperçu de cette texture car il s'agit d'une texture sans copie et/ou transfert. <usetemplate ignoretext="M'avertir que le mode Aperçu en direct n'est pas disponible pour les textures sans copie et/ou transfert" name="okignore" yestext="OK"/> @@ -3733,9 +3931,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'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'objet [OBJECT_NAME] appartenant à [OWNER_ID]. @@ -4067,7 +4267,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'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'enregistrement des droits d'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/outfit_accordion_tab.xml b/indra/newview/skins/default/xui/fr/outfit_accordion_tab.xml index bac885e5d8..bac885e5d8 100755..100644 --- a/indra/newview/skins/default/xui/fr/outfit_accordion_tab.xml +++ b/indra/newview/skins/default/xui/fr/outfit_accordion_tab.xml diff --git a/indra/newview/skins/default/xui/fr/panel_active_object_row.xml b/indra/newview/skins/default/xui/fr/panel_active_object_row.xml index 0baa8353d9..0baa8353d9 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_active_object_row.xml +++ b/indra/newview/skins/default/xui/fr/panel_active_object_row.xml diff --git a/indra/newview/skins/default/xui/fr/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/fr/panel_adhoc_control_panel.xml index 4191ba42f9..4191ba42f9 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_adhoc_control_panel.xml +++ b/indra/newview/skins/default/xui/fr/panel_adhoc_control_panel.xml diff --git a/indra/newview/skins/default/xui/fr/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/fr/panel_avatar_list_item.xml index c8fa9f340f..c8fa9f340f 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_avatar_list_item.xml +++ b/indra/newview/skins/default/xui/fr/panel_avatar_list_item.xml diff --git a/indra/newview/skins/default/xui/fr/panel_avatar_tag.xml b/indra/newview/skins/default/xui/fr/panel_avatar_tag.xml index 20a355b11d..20a355b11d 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_avatar_tag.xml +++ b/indra/newview/skins/default/xui/fr/panel_avatar_tag.xml diff --git a/indra/newview/skins/default/xui/fr/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/fr/panel_block_list_sidetray.xml index 0e2b5a9c93..0e2b5a9c93 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_block_list_sidetray.xml +++ b/indra/newview/skins/default/xui/fr/panel_block_list_sidetray.xml diff --git a/indra/newview/skins/default/xui/fr/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/fr/panel_body_parts_list_item.xml index 377f85368f..377f85368f 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_body_parts_list_item.xml +++ b/indra/newview/skins/default/xui/fr/panel_body_parts_list_item.xml diff --git a/indra/newview/skins/default/xui/fr/panel_bodyparts_list_button_bar.xml b/indra/newview/skins/default/xui/fr/panel_bodyparts_list_button_bar.xml index 5e7442b877..5e7442b877 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_bodyparts_list_button_bar.xml +++ b/indra/newview/skins/default/xui/fr/panel_bodyparts_list_button_bar.xml diff --git a/indra/newview/skins/default/xui/fr/panel_bottomtray_lite.xml b/indra/newview/skins/default/xui/fr/panel_bottomtray_lite.xml index 5b6d37ce00..5b6d37ce00 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_bottomtray_lite.xml +++ b/indra/newview/skins/default/xui/fr/panel_bottomtray_lite.xml diff --git a/indra/newview/skins/default/xui/fr/panel_chat_header.xml b/indra/newview/skins/default/xui/fr/panel_chat_header.xml index 7916bf5155..7916bf5155 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_chat_header.xml +++ b/indra/newview/skins/default/xui/fr/panel_chat_header.xml diff --git a/indra/newview/skins/default/xui/fr/panel_chiclet_bar.xml b/indra/newview/skins/default/xui/fr/panel_chiclet_bar.xml index de21996404..de21996404 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_chiclet_bar.xml +++ b/indra/newview/skins/default/xui/fr/panel_chiclet_bar.xml diff --git a/indra/newview/skins/default/xui/fr/panel_classified_info.xml b/indra/newview/skins/default/xui/fr/panel_classified_info.xml index c4265be877..c4265be877 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_classified_info.xml +++ b/indra/newview/skins/default/xui/fr/panel_classified_info.xml diff --git a/indra/newview/skins/default/xui/fr/panel_clothing_list_button_bar.xml b/indra/newview/skins/default/xui/fr/panel_clothing_list_button_bar.xml index 0b58a4e40b..0b58a4e40b 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_clothing_list_button_bar.xml +++ b/indra/newview/skins/default/xui/fr/panel_clothing_list_button_bar.xml diff --git a/indra/newview/skins/default/xui/fr/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/fr/panel_clothing_list_item.xml index b23cb91c6f..b23cb91c6f 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_clothing_list_item.xml +++ b/indra/newview/skins/default/xui/fr/panel_clothing_list_item.xml diff --git a/indra/newview/skins/default/xui/fr/panel_cof_wearables.xml b/indra/newview/skins/default/xui/fr/panel_cof_wearables.xml index c1085aa461..c1085aa461 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_cof_wearables.xml +++ b/indra/newview/skins/default/xui/fr/panel_cof_wearables.xml diff --git a/indra/newview/skins/default/xui/fr/panel_deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/fr/panel_deletable_wearable_list_item.xml index e1fa769f2f..e1fa769f2f 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_deletable_wearable_list_item.xml +++ b/indra/newview/skins/default/xui/fr/panel_deletable_wearable_list_item.xml diff --git a/indra/newview/skins/default/xui/fr/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/fr/panel_dummy_clothing_list_item.xml index bc0edda5b6..bc0edda5b6 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_dummy_clothing_list_item.xml +++ b/indra/newview/skins/default/xui/fr/panel_dummy_clothing_list_item.xml diff --git a/indra/newview/skins/default/xui/fr/panel_edit_alpha.xml b/indra/newview/skins/default/xui/fr/panel_edit_alpha.xml index a8b95c66fb..a8b95c66fb 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_edit_alpha.xml +++ b/indra/newview/skins/default/xui/fr/panel_edit_alpha.xml diff --git a/indra/newview/skins/default/xui/fr/panel_edit_classified.xml b/indra/newview/skins/default/xui/fr/panel_edit_classified.xml index 7b58f2e825..7b58f2e825 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_edit_classified.xml +++ b/indra/newview/skins/default/xui/fr/panel_edit_classified.xml diff --git a/indra/newview/skins/default/xui/fr/panel_edit_eyes.xml b/indra/newview/skins/default/xui/fr/panel_edit_eyes.xml index 549864e237..549864e237 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_edit_eyes.xml +++ b/indra/newview/skins/default/xui/fr/panel_edit_eyes.xml diff --git a/indra/newview/skins/default/xui/fr/panel_edit_gloves.xml b/indra/newview/skins/default/xui/fr/panel_edit_gloves.xml index 68a7ac54e2..68a7ac54e2 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_edit_gloves.xml +++ b/indra/newview/skins/default/xui/fr/panel_edit_gloves.xml diff --git a/indra/newview/skins/default/xui/fr/panel_edit_hair.xml b/indra/newview/skins/default/xui/fr/panel_edit_hair.xml index 575cbabc88..575cbabc88 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_edit_hair.xml +++ b/indra/newview/skins/default/xui/fr/panel_edit_hair.xml diff --git a/indra/newview/skins/default/xui/fr/panel_edit_jacket.xml b/indra/newview/skins/default/xui/fr/panel_edit_jacket.xml index 7e467b130c..7e467b130c 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_edit_jacket.xml +++ b/indra/newview/skins/default/xui/fr/panel_edit_jacket.xml diff --git a/indra/newview/skins/default/xui/fr/panel_edit_pants.xml b/indra/newview/skins/default/xui/fr/panel_edit_pants.xml index 60d8e947f8..60d8e947f8 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_edit_pants.xml +++ b/indra/newview/skins/default/xui/fr/panel_edit_pants.xml diff --git a/indra/newview/skins/default/xui/fr/panel_edit_physics.xml b/indra/newview/skins/default/xui/fr/panel_edit_physics.xml index d79f7df90a..d79f7df90a 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_edit_physics.xml +++ b/indra/newview/skins/default/xui/fr/panel_edit_physics.xml diff --git a/indra/newview/skins/default/xui/fr/panel_edit_pick.xml b/indra/newview/skins/default/xui/fr/panel_edit_pick.xml index 247e18da82..247e18da82 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_edit_pick.xml +++ b/indra/newview/skins/default/xui/fr/panel_edit_pick.xml diff --git a/indra/newview/skins/default/xui/fr/panel_edit_profile.xml b/indra/newview/skins/default/xui/fr/panel_edit_profile.xml index 9e63c88221..9e63c88221 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_edit_profile.xml +++ b/indra/newview/skins/default/xui/fr/panel_edit_profile.xml diff --git a/indra/newview/skins/default/xui/fr/panel_edit_shape.xml b/indra/newview/skins/default/xui/fr/panel_edit_shape.xml index 6a5f71a36b..6a5f71a36b 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_edit_shape.xml +++ b/indra/newview/skins/default/xui/fr/panel_edit_shape.xml diff --git a/indra/newview/skins/default/xui/fr/panel_edit_shirt.xml b/indra/newview/skins/default/xui/fr/panel_edit_shirt.xml index 9a263f6148..9a263f6148 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_edit_shirt.xml +++ b/indra/newview/skins/default/xui/fr/panel_edit_shirt.xml diff --git a/indra/newview/skins/default/xui/fr/panel_edit_shoes.xml b/indra/newview/skins/default/xui/fr/panel_edit_shoes.xml index 3eb70923ef..3eb70923ef 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_edit_shoes.xml +++ b/indra/newview/skins/default/xui/fr/panel_edit_shoes.xml diff --git a/indra/newview/skins/default/xui/fr/panel_edit_skin.xml b/indra/newview/skins/default/xui/fr/panel_edit_skin.xml index f5f2738319..f5f2738319 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_edit_skin.xml +++ b/indra/newview/skins/default/xui/fr/panel_edit_skin.xml diff --git a/indra/newview/skins/default/xui/fr/panel_edit_skirt.xml b/indra/newview/skins/default/xui/fr/panel_edit_skirt.xml index f562d67937..f562d67937 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_edit_skirt.xml +++ b/indra/newview/skins/default/xui/fr/panel_edit_skirt.xml diff --git a/indra/newview/skins/default/xui/fr/panel_edit_socks.xml b/indra/newview/skins/default/xui/fr/panel_edit_socks.xml index f97047ae28..f97047ae28 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_edit_socks.xml +++ b/indra/newview/skins/default/xui/fr/panel_edit_socks.xml diff --git a/indra/newview/skins/default/xui/fr/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/fr/panel_edit_tattoo.xml index 086542dee2..086542dee2 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_edit_tattoo.xml +++ b/indra/newview/skins/default/xui/fr/panel_edit_tattoo.xml diff --git a/indra/newview/skins/default/xui/fr/panel_edit_underpants.xml b/indra/newview/skins/default/xui/fr/panel_edit_underpants.xml index c83ce04885..c83ce04885 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_edit_underpants.xml +++ b/indra/newview/skins/default/xui/fr/panel_edit_underpants.xml diff --git a/indra/newview/skins/default/xui/fr/panel_edit_undershirt.xml b/indra/newview/skins/default/xui/fr/panel_edit_undershirt.xml index 689b7b81f4..689b7b81f4 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_edit_undershirt.xml +++ b/indra/newview/skins/default/xui/fr/panel_edit_undershirt.xml diff --git a/indra/newview/skins/default/xui/fr/panel_edit_wearable.xml b/indra/newview/skins/default/xui/fr/panel_edit_wearable.xml index def158cf68..def158cf68 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_edit_wearable.xml +++ b/indra/newview/skins/default/xui/fr/panel_edit_wearable.xml 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'expérience"/> + <scroll_container name="xp_scroll"> + <panel name="scrolling_panel"> + <layout_stack> + <layout_panel> + <text name="experience_title" value="Kyle'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="<" name="btn_prev"/> + <button label=">" 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"> + '[TEXT]' 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"> + "Parcel_PG_Light" + </string> + <string name="maturity_icon_moderate"> + "Parcel_M_Light" + </string> + <string name="maturity_icon_adult"> + "Parcel_R_Light" + </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="<" name="left_btn"/> + <button label=">" 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'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'êtes pas connecté(e) à Facebook. Allez à l'onglet Compte pour vous connecter et activer cette fonctionnalité."/> + <string name="facebook_friends_no_connected" value="Vous n'êtes pas connecté(e) à Facebook. Allez à l'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'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'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'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'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'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'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'aperçu"/> - <text name="title_label"> - Titre : - </text> - <text name="description_label"> - Description : - </text> - <check_box initial_value="true" label="Inclure l'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'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'aperçu"/> + <text name="title_label"> + Titre : + </text> + <text name="description_label"> + Description : + </text> + <check_box initial_value="true" label="Inclure l'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 "" 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_control_panel.xml b/indra/newview/skins/default/xui/fr/panel_group_control_panel.xml index 3e66b3c72a..3e66b3c72a 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_group_control_panel.xml +++ b/indra/newview/skins/default/xui/fr/panel_group_control_panel.xml diff --git a/indra/newview/skins/default/xui/fr/panel_group_general.xml b/indra/newview/skins/default/xui/fr/panel_group_general.xml index a2655dcd45..a2655dcd45 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_group_general.xml +++ b/indra/newview/skins/default/xui/fr/panel_group_general.xml 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..100644 --- 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_group_invite.xml b/indra/newview/skins/default/xui/fr/panel_group_invite.xml index 5851856a03..5851856a03 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_group_invite.xml +++ b/indra/newview/skins/default/xui/fr/panel_group_invite.xml diff --git a/indra/newview/skins/default/xui/fr/panel_group_land_money.xml b/indra/newview/skins/default/xui/fr/panel_group_land_money.xml index 4011d1b8c7..4011d1b8c7 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_group_land_money.xml +++ b/indra/newview/skins/default/xui/fr/panel_group_land_money.xml diff --git a/indra/newview/skins/default/xui/fr/panel_group_list_item.xml b/indra/newview/skins/default/xui/fr/panel_group_list_item.xml index b1b32af7c6..b1b32af7c6 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_group_list_item.xml +++ b/indra/newview/skins/default/xui/fr/panel_group_list_item.xml diff --git a/indra/newview/skins/default/xui/fr/panel_group_notices.xml b/indra/newview/skins/default/xui/fr/panel_group_notices.xml index 3364dd9dbc..3364dd9dbc 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_group_notices.xml +++ b/indra/newview/skins/default/xui/fr/panel_group_notices.xml diff --git a/indra/newview/skins/default/xui/fr/panel_group_notify.xml b/indra/newview/skins/default/xui/fr/panel_group_notify.xml index 08a49f908c..08a49f908c 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_group_notify.xml +++ b/indra/newview/skins/default/xui/fr/panel_group_notify.xml diff --git a/indra/newview/skins/default/xui/fr/panel_group_roles.xml b/indra/newview/skins/default/xui/fr/panel_group_roles.xml index 3e66190c8d..3e66190c8d 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_group_roles.xml +++ b/indra/newview/skins/default/xui/fr/panel_group_roles.xml diff --git a/indra/newview/skins/default/xui/fr/panel_im_control_panel.xml b/indra/newview/skins/default/xui/fr/panel_im_control_panel.xml index 1f2169e22c..1f2169e22c 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_im_control_panel.xml +++ b/indra/newview/skins/default/xui/fr/panel_im_control_panel.xml diff --git a/indra/newview/skins/default/xui/fr/panel_instant_message.xml b/indra/newview/skins/default/xui/fr/panel_instant_message.xml index 305d2d853c..305d2d853c 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_instant_message.xml +++ b/indra/newview/skins/default/xui/fr/panel_instant_message.xml diff --git a/indra/newview/skins/default/xui/fr/panel_inventory_item.xml b/indra/newview/skins/default/xui/fr/panel_inventory_item.xml index d18047fbcf..d18047fbcf 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_inventory_item.xml +++ b/indra/newview/skins/default/xui/fr/panel_inventory_item.xml diff --git a/indra/newview/skins/default/xui/fr/panel_landmark_info.xml b/indra/newview/skins/default/xui/fr/panel_landmark_info.xml index 60507f191d..60507f191d 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_landmark_info.xml +++ b/indra/newview/skins/default/xui/fr/panel_landmark_info.xml diff --git a/indra/newview/skins/default/xui/fr/panel_landmarks.xml b/indra/newview/skins/default/xui/fr/panel_landmarks.xml index 7501e54f11..7501e54f11 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_landmarks.xml +++ b/indra/newview/skins/default/xui/fr/panel_landmarks.xml diff --git a/indra/newview/skins/default/xui/fr/panel_login.xml b/indra/newview/skins/default/xui/fr/panel_login.xml index b39920fe13..2b8249c8a9 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_login.xml +++ b/indra/newview/skins/default/xui/fr/panel_login.xml @@ -1,27 +1,18 @@ <?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'utilisateur" name="username_combo" tool_tip="Nom d'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"/> - <combo_box label="Sélectionner la grille" name="server_combo"/> + <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" left_pad="20"/> </layout_panel> </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/fr/panel_main_inventory.xml b/indra/newview/skins/default/xui/fr/panel_main_inventory.xml index db7d254b7a..db7d254b7a 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/fr/panel_main_inventory.xml 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'affichage/de tri"/> + <button name="add_btn" tool_tip="Créer un nouveau dossier d'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_me.xml b/indra/newview/skins/default/xui/fr/panel_me.xml index 5676986228..5676986228 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_me.xml +++ b/indra/newview/skins/default/xui/fr/panel_me.xml diff --git a/indra/newview/skins/default/xui/fr/panel_media_settings_general.xml b/indra/newview/skins/default/xui/fr/panel_media_settings_general.xml index e048e66810..e048e66810 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_media_settings_general.xml +++ b/indra/newview/skins/default/xui/fr/panel_media_settings_general.xml diff --git a/indra/newview/skins/default/xui/fr/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/fr/panel_media_settings_permissions.xml index 8f1b436ba1..8f1b436ba1 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_media_settings_permissions.xml +++ b/indra/newview/skins/default/xui/fr/panel_media_settings_permissions.xml diff --git a/indra/newview/skins/default/xui/fr/panel_media_settings_security.xml b/indra/newview/skins/default/xui/fr/panel_media_settings_security.xml index 9d070b7aff..9d070b7aff 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_media_settings_security.xml +++ b/indra/newview/skins/default/xui/fr/panel_media_settings_security.xml diff --git a/indra/newview/skins/default/xui/fr/panel_navigation_bar.xml b/indra/newview/skins/default/xui/fr/panel_navigation_bar.xml index ecb1e9813a..ecb1e9813a 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_navigation_bar.xml +++ b/indra/newview/skins/default/xui/fr/panel_navigation_bar.xml diff --git a/indra/newview/skins/default/xui/fr/panel_nearby_chat.xml b/indra/newview/skins/default/xui/fr/panel_nearby_chat.xml index b02e53269b..b02e53269b 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_nearby_chat.xml +++ b/indra/newview/skins/default/xui/fr/panel_nearby_chat.xml diff --git a/indra/newview/skins/default/xui/fr/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/fr/panel_nearby_chat_bar.xml index 762dee01bb..762dee01bb 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_nearby_chat_bar.xml +++ b/indra/newview/skins/default/xui/fr/panel_nearby_chat_bar.xml diff --git a/indra/newview/skins/default/xui/fr/panel_nearby_media.xml b/indra/newview/skins/default/xui/fr/panel_nearby_media.xml index 7b7b67041a..7b7b67041a 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_nearby_media.xml +++ b/indra/newview/skins/default/xui/fr/panel_nearby_media.xml diff --git a/indra/newview/skins/default/xui/fr/panel_notifications_channel.xml b/indra/newview/skins/default/xui/fr/panel_notifications_channel.xml index 110e017050..110e017050 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_notifications_channel.xml +++ b/indra/newview/skins/default/xui/fr/panel_notifications_channel.xml diff --git a/indra/newview/skins/default/xui/fr/panel_notify_textbox.xml b/indra/newview/skins/default/xui/fr/panel_notify_textbox.xml index 6ce09cde4b..6ce09cde4b 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_notify_textbox.xml +++ b/indra/newview/skins/default/xui/fr/panel_notify_textbox.xml diff --git a/indra/newview/skins/default/xui/fr/panel_online_status_toast.xml b/indra/newview/skins/default/xui/fr/panel_online_status_toast.xml index fdc489f375..fdc489f375 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_online_status_toast.xml +++ b/indra/newview/skins/default/xui/fr/panel_online_status_toast.xml diff --git a/indra/newview/skins/default/xui/fr/panel_outbox_inventory.xml b/indra/newview/skins/default/xui/fr/panel_outbox_inventory.xml index d947dbceb8..d947dbceb8 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_outbox_inventory.xml +++ b/indra/newview/skins/default/xui/fr/panel_outbox_inventory.xml diff --git a/indra/newview/skins/default/xui/fr/panel_outfit_edit.xml b/indra/newview/skins/default/xui/fr/panel_outfit_edit.xml index 39bc7ef8af..39bc7ef8af 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_outfit_edit.xml +++ b/indra/newview/skins/default/xui/fr/panel_outfit_edit.xml diff --git a/indra/newview/skins/default/xui/fr/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/fr/panel_outfits_inventory.xml index 1bc553c8c0..1bc553c8c0 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_outfits_inventory.xml +++ b/indra/newview/skins/default/xui/fr/panel_outfits_inventory.xml diff --git a/indra/newview/skins/default/xui/fr/panel_outfits_inventory_gear_default.xml b/indra/newview/skins/default/xui/fr/panel_outfits_inventory_gear_default.xml index 4703559111..4703559111 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_outfits_inventory_gear_default.xml +++ b/indra/newview/skins/default/xui/fr/panel_outfits_inventory_gear_default.xml diff --git a/indra/newview/skins/default/xui/fr/panel_outfits_list.xml b/indra/newview/skins/default/xui/fr/panel_outfits_list.xml index 416353e1d4..416353e1d4 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_outfits_list.xml +++ b/indra/newview/skins/default/xui/fr/panel_outfits_list.xml diff --git a/indra/newview/skins/default/xui/fr/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/fr/panel_outfits_wearing.xml index 874bab2daa..874bab2daa 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_outfits_wearing.xml +++ b/indra/newview/skins/default/xui/fr/panel_outfits_wearing.xml diff --git a/indra/newview/skins/default/xui/fr/panel_people.xml b/indra/newview/skins/default/xui/fr/panel_people.xml index e306a00183..e306a00183 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_people.xml +++ b/indra/newview/skins/default/xui/fr/panel_people.xml diff --git a/indra/newview/skins/default/xui/fr/panel_pick_info.xml b/indra/newview/skins/default/xui/fr/panel_pick_info.xml index 1de9b243f1..1de9b243f1 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_pick_info.xml +++ b/indra/newview/skins/default/xui/fr/panel_pick_info.xml diff --git a/indra/newview/skins/default/xui/fr/panel_picks.xml b/indra/newview/skins/default/xui/fr/panel_picks.xml index fb277f653f..fb277f653f 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_picks.xml +++ b/indra/newview/skins/default/xui/fr/panel_picks.xml diff --git a/indra/newview/skins/default/xui/fr/panel_place_profile.xml b/indra/newview/skins/default/xui/fr/panel_place_profile.xml index 30be838896..30be838896 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_place_profile.xml +++ b/indra/newview/skins/default/xui/fr/panel_place_profile.xml diff --git a/indra/newview/skins/default/xui/fr/panel_places.xml b/indra/newview/skins/default/xui/fr/panel_places.xml index 5ec48c44c7..5ec48c44c7 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_places.xml +++ b/indra/newview/skins/default/xui/fr/panel_places.xml diff --git a/indra/newview/skins/default/xui/fr/panel_postcard_message.xml b/indra/newview/skins/default/xui/fr/panel_postcard_message.xml index 0f8397cfb4..0f8397cfb4 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_postcard_message.xml +++ b/indra/newview/skins/default/xui/fr/panel_postcard_message.xml 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..100644 --- 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_advanced.xml b/indra/newview/skins/default/xui/fr/panel_preferences_advanced.xml index 67bcfb0879..67bcfb0879 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/fr/panel_preferences_advanced.xml diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/fr/panel_preferences_alerts.xml index 901a92ed1b..901a92ed1b 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_preferences_alerts.xml +++ b/indra/newview/skins/default/xui/fr/panel_preferences_alerts.xml diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml b/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml index 52c6ed24b9..52c6ed24b9 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_colors.xml b/indra/newview/skins/default/xui/fr/panel_preferences_colors.xml index e50fd2b6f3..e50fd2b6f3 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_preferences_colors.xml +++ b/indra/newview/skins/default/xui/fr/panel_preferences_colors.xml diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_general.xml b/indra/newview/skins/default/xui/fr/panel_preferences_general.xml index 11b1bd9b87..11b1bd9b87 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/fr/panel_preferences_general.xml diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml index 4946b09814..4946b09814 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_move.xml b/indra/newview/skins/default/xui/fr/panel_preferences_move.xml index 80aed90a2d..80aed90a2d 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_preferences_move.xml +++ b/indra/newview/skins/default/xui/fr/panel_preferences_move.xml diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/fr/panel_preferences_privacy.xml index 0a78a1bb93..0a78a1bb93 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_preferences_privacy.xml +++ b/indra/newview/skins/default/xui/fr/panel_preferences_privacy.xml 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..100644 --- 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'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'aide, ouvrir des liens, etc. Ce navigateur s'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'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'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_preferences_sound.xml b/indra/newview/skins/default/xui/fr/panel_preferences_sound.xml index 37eb6bbeb0..37eb6bbeb0 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/fr/panel_preferences_sound.xml diff --git a/indra/newview/skins/default/xui/fr/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/fr/panel_prim_media_controls.xml index ad744b7760..ad744b7760 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_prim_media_controls.xml +++ b/indra/newview/skins/default/xui/fr/panel_prim_media_controls.xml diff --git a/indra/newview/skins/default/xui/fr/panel_region_covenant.xml b/indra/newview/skins/default/xui/fr/panel_region_covenant.xml index a30306d116..a30306d116 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_region_covenant.xml +++ b/indra/newview/skins/default/xui/fr/panel_region_covenant.xml diff --git a/indra/newview/skins/default/xui/fr/panel_region_debug.xml b/indra/newview/skins/default/xui/fr/panel_region_debug.xml index 461ada3108..461ada3108 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_region_debug.xml +++ b/indra/newview/skins/default/xui/fr/panel_region_debug.xml diff --git a/indra/newview/skins/default/xui/fr/panel_region_environment.xml b/indra/newview/skins/default/xui/fr/panel_region_environment.xml index 085a308786..085a308786 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_region_environment.xml +++ b/indra/newview/skins/default/xui/fr/panel_region_environment.xml diff --git a/indra/newview/skins/default/xui/fr/panel_region_estate.xml b/indra/newview/skins/default/xui/fr/panel_region_estate.xml index be89020ac7..be89020ac7 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_region_estate.xml +++ b/indra/newview/skins/default/xui/fr/panel_region_estate.xml 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'exécuter dans ce domaine. + +En outre, si le domaine n'autorise pas l'accès public, les résidents participant à une expérience avec clé peuvent pénétrer dans ce domaine et y rester tant qu'ils participent à ladite expérience. + </panel.string> + <panel.string name="allowed_estate_text"> + Seules les expériences à l'échelle des terrains peuvent être autorisées. + +Les expériences autorisées peuvent s'exécuter dans ce domaine. + </panel.string> + <panel.string name="blocked_estate_text"> + Seules les expériences à l'échelle de la grille peuvent être bloquées. + +Les expériences bloquées ne peuvent pas s'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'échelle des terrains peuvent être autorisées. + +Les expériences autorisées peuvent s'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'exécuter dans cette parcelle. + </panel.string> +</panel> diff --git a/indra/newview/skins/default/xui/fr/panel_region_general.xml b/indra/newview/skins/default/xui/fr/panel_region_general.xml index e9dcd6ab5a..e9dcd6ab5a 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_region_general.xml +++ b/indra/newview/skins/default/xui/fr/panel_region_general.xml diff --git a/indra/newview/skins/default/xui/fr/panel_region_terrain.xml b/indra/newview/skins/default/xui/fr/panel_region_terrain.xml index 97f486d3a3..97f486d3a3 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_region_terrain.xml +++ b/indra/newview/skins/default/xui/fr/panel_region_terrain.xml diff --git a/indra/newview/skins/default/xui/fr/panel_script_ed.xml b/indra/newview/skins/default/xui/fr/panel_script_ed.xml index 0a33463cbb..0a33463cbb 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_script_ed.xml +++ b/indra/newview/skins/default/xui/fr/panel_script_ed.xml 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_script_limits_my_avatar.xml b/indra/newview/skins/default/xui/fr/panel_script_limits_my_avatar.xml index e541fae31f..e541fae31f 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_script_limits_my_avatar.xml +++ b/indra/newview/skins/default/xui/fr/panel_script_limits_my_avatar.xml diff --git a/indra/newview/skins/default/xui/fr/panel_script_limits_region_memory.xml b/indra/newview/skins/default/xui/fr/panel_script_limits_region_memory.xml index 751abd6f1d..751abd6f1d 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_script_limits_region_memory.xml +++ b/indra/newview/skins/default/xui/fr/panel_script_limits_region_memory.xml diff --git a/indra/newview/skins/default/xui/fr/panel_script_question_toast.xml b/indra/newview/skins/default/xui/fr/panel_script_question_toast.xml index a2d0237da0..a2d0237da0 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_script_question_toast.xml +++ b/indra/newview/skins/default/xui/fr/panel_script_question_toast.xml diff --git a/indra/newview/skins/default/xui/fr/panel_scrolling_param.xml b/indra/newview/skins/default/xui/fr/panel_scrolling_param.xml index 8febdccbed..8febdccbed 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_scrolling_param.xml +++ b/indra/newview/skins/default/xui/fr/panel_scrolling_param.xml diff --git a/indra/newview/skins/default/xui/fr/panel_scrolling_param_base.xml b/indra/newview/skins/default/xui/fr/panel_scrolling_param_base.xml index fa659040ea..fa659040ea 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_scrolling_param_base.xml +++ b/indra/newview/skins/default/xui/fr/panel_scrolling_param_base.xml diff --git a/indra/newview/skins/default/xui/fr/panel_side_tray_tab_caption.xml b/indra/newview/skins/default/xui/fr/panel_side_tray_tab_caption.xml index 45efbdc980..45efbdc980 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_side_tray_tab_caption.xml +++ b/indra/newview/skins/default/xui/fr/panel_side_tray_tab_caption.xml diff --git a/indra/newview/skins/default/xui/fr/panel_sidetray_home_tab.xml b/indra/newview/skins/default/xui/fr/panel_sidetray_home_tab.xml index 48bcff1c09..48bcff1c09 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_sidetray_home_tab.xml +++ b/indra/newview/skins/default/xui/fr/panel_sidetray_home_tab.xml 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..100644 --- 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'inventaire + Inventaire </text> <text name="hint_lbl"> L'enregistrement d'une image dans l'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..100644 --- 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'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'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..100644 --- 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'inventaire ([AMOUNT] L$)" name="save_to_inventory_btn"/> - <button label="Enreg. sur l'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..100644 --- 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..100644 --- 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'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'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_sound_devices.xml b/indra/newview/skins/default/xui/fr/panel_sound_devices.xml index 460b269f7c..460b269f7c 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_sound_devices.xml +++ b/indra/newview/skins/default/xui/fr/panel_sound_devices.xml diff --git a/indra/newview/skins/default/xui/fr/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/fr/panel_stand_stop_flying.xml index ee4e8a6be6..ee4e8a6be6 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_stand_stop_flying.xml +++ b/indra/newview/skins/default/xui/fr/panel_stand_stop_flying.xml 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..100644 --- 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_sys_well_item.xml b/indra/newview/skins/default/xui/fr/panel_sys_well_item.xml index 81db7c8989..81db7c8989 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_sys_well_item.xml +++ b/indra/newview/skins/default/xui/fr/panel_sys_well_item.xml diff --git a/indra/newview/skins/default/xui/fr/panel_teleport_history.xml b/indra/newview/skins/default/xui/fr/panel_teleport_history.xml index cf1266a460..cf1266a460 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_teleport_history.xml +++ b/indra/newview/skins/default/xui/fr/panel_teleport_history.xml diff --git a/indra/newview/skins/default/xui/fr/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/fr/panel_teleport_history_item.xml index b3b528d448..b3b528d448 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_teleport_history_item.xml +++ b/indra/newview/skins/default/xui/fr/panel_teleport_history_item.xml 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'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'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'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'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'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'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/panel_voice_effect.xml b/indra/newview/skins/default/xui/fr/panel_voice_effect.xml index a134854706..a134854706 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_voice_effect.xml +++ b/indra/newview/skins/default/xui/fr/panel_voice_effect.xml diff --git a/indra/newview/skins/default/xui/fr/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/fr/panel_volume_pulldown.xml index e05c93a4ac..e05c93a4ac 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_volume_pulldown.xml +++ b/indra/newview/skins/default/xui/fr/panel_volume_pulldown.xml diff --git a/indra/newview/skins/default/xui/fr/panel_world_map.xml b/indra/newview/skins/default/xui/fr/panel_world_map.xml index 972aae1fab..972aae1fab 100755..100644 --- a/indra/newview/skins/default/xui/fr/panel_world_map.xml +++ b/indra/newview/skins/default/xui/fr/panel_world_map.xml 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..100644 --- 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'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'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'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_appearance.xml b/indra/newview/skins/default/xui/fr/sidepanel_appearance.xml index 5e1ac55a97..5e1ac55a97 100755..100644 --- a/indra/newview/skins/default/xui/fr/sidepanel_appearance.xml +++ b/indra/newview/skins/default/xui/fr/sidepanel_appearance.xml diff --git a/indra/newview/skins/default/xui/fr/sidepanel_inventory.xml b/indra/newview/skins/default/xui/fr/sidepanel_inventory.xml index 372d61263f..372d61263f 100755..100644 --- a/indra/newview/skins/default/xui/fr/sidepanel_inventory.xml +++ b/indra/newview/skins/default/xui/fr/sidepanel_inventory.xml 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..100644 --- 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'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..100644 --- 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'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'une région - </panel.string> - <panel.string name="text modify info 6"> - Impossible de modifier ces objets au-delà de la frontière d'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'une région</panel.string> + <panel.string name="text modify info 6">Impossible de modifier ces objets au-delà de la frontière d'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'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'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'asseoir sur l'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'importe qui : - </text> + <text name="perm_modify">Vous pouvez modifier cet objet</text> + <text name="Anyone can:">N'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'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..7b8a262a05 100755..100644 --- a/indra/newview/skins/default/xui/fr/strings.xml +++ b/indra/newview/skins/default/xui/fr/strings.xml @@ -38,7 +38,7 @@ Échec d'initialisation des graphiques. Veuillez mettre votre pilote graphique à jour. </string> <string name="AboutHeader"> - [APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2] ([VIEWER_VERSION_3]) [BUILD_DATE] [BUILD_TIME] ([CHANNEL]) + [APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2].[VIEWER_VERSION_3] [BUILD_DATE] [BUILD_TIME] ([CHANNEL]) [[VIEWER_RELEASE_NOTES_URL] [Notes de version]] </string> <string name="AboutCompiler"> @@ -449,30 +449,51 @@ Veuillez réessayer de vous connecter dans une minute. <string name="TooltipMustSingleDrop"> Impossible de faire glisser plus d'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é > Afficher les paramètres de débogage > WearFolderLimit. + </string> <string name="TooltipPrice" value="[AMOUNT] L$ :"/> <string name="TooltipOutboxDragToWorld"> - Impossible de rezzer des articles dans la boîte d'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'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'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'articles dépasse [AMOUNT]. Pour pouvoir vendre plus de [AMOUNT] articles au sein d'une même annonce, vous devez placer certains de ces articles dans une boîte. + </string> + <string name="TooltipOutboxTooManyStockItems"> + Le nombre d'articles de stock dépasse [AMOUNT]. + </string> + <string name="TooltipOutboxCannotDropOnRoot"> + Vous ne pouvez déposer des articles ou des dossiers que dans l'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'envoi vendeur n'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'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'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'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'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'ajouter à vos Favoris. </string> + <string name="MarketplaceNoMatchingItems"> + Aucun article trouvé. Vérifiez l'orthographe de votre chaîne de recherche et réessayez. + </string> <string name="InventoryNoTexture"> Vous n'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'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'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'erreur ni d'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'envoyer des articles vers la Place du marché, vous devez vous configurer comme vendeur (gratuit). + Avant d'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'article dans ce dossier. </string> - <string name="Marketplace Error Unassociated Products"> - Erreur : le chargement de cet article a échoué en raison d'un nombre trop important d'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'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'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'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'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'objet est dans une tenue actuelle, mais il n'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'ignorer le script [SCRIPT] avec l'expérience [EXPERIENCE]. + </string> <string name="Group" value=" (groupe)"/> <string name="Unknown"> (Inconnu) @@ -5066,6 +5176,9 @@ Essayez avec le chemin d'accès à l'é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'accès à l'é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'accès à l'é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'échelle des terrains + </string> + <string name="Grid-Scope"> + À l'é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'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..100644 --- 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'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'adresse]. + </message> </message_set> <message_set name="progress"> <message name="sending_dest"> diff --git a/indra/newview/skins/default/xui/fr/xui_version.xml b/indra/newview/skins/default/xui/fr/xui_version.xml index 0e777751d3..0e777751d3 100755..100644 --- a/indra/newview/skins/default/xui/fr/xui_version.xml +++ b/indra/newview/skins/default/xui/fr/xui_version.xml 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..100644 --- 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 <nolink>[HOSTNAME]</nolink> ([HOSTIP]) -SLURL: <nolink>[SLURL]</nolink> -(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'avvio - </text_editor> - <text name="trans_intro"> - e le traduzioni da: - </text> - <text_editor name="trans_names"> - Dummy Name sostituito all'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'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..100644 --- 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 'sicuro', 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 & 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'accesso pubblico (se si rimuove la selezione vengono create linee di espulsione)" name="public_access"/> <text name="Only Allow"> Consenti l'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_activeim.xml b/indra/newview/skins/default/xui/it/floater_activeim.xml index 0c1f0448e1..0c1f0448e1 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_activeim.xml +++ b/indra/newview/skins/default/xui/it/floater_activeim.xml diff --git a/indra/newview/skins/default/xui/it/floater_animation_anim_preview.xml b/indra/newview/skins/default/xui/it/floater_animation_anim_preview.xml index a2bce00141..a2bce00141 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_animation_anim_preview.xml +++ b/indra/newview/skins/default/xui/it/floater_animation_anim_preview.xml diff --git a/indra/newview/skins/default/xui/it/floater_animation_bvh_preview.xml b/indra/newview/skins/default/xui/it/floater_animation_bvh_preview.xml index a4319f2e77..34ee9aaed5 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_animation_bvh_preview.xml +++ b/indra/newview/skins/default/xui/it/floater_animation_bvh_preview.xml @@ -141,35 +141,35 @@ La lunghezza massima dell'animazione è [MAX_LENGTH] secondi. Espressione </text> <combo_box name="emote_combo" tool_tip="Definisce ciò che fa il viso durante l'animazione"> - <item label="(Nulla)" name="[None]" value=""/> - <item label="Aaaaah" name="Aaaaah" value="Aaaaah"/> - <item label="Spavento" name="Afraid" value="Spavento"/> - <item label="Arrabbiato" name="Angry" value="Arrabbiato"/> - <item label="Grande sorriso" name="BigSmile" value="Grande sorriso"/> - <item label="Annoiato" name="Bored" value="Annoiato"/> - <item label="Pianto" name="Cry" value="Pianto"/> - <item label="Disdegno" name="Disdain" value="Disdegno"/> - <item label="Imbarazzato" name="Embarrassed" value="Imbarazzato"/> - <item label="Accigliato" name="Frown" value="Accigliato"/> - <item label="Bacio" name="Kiss" value="Bacio"/> - <item label="Risata" name="Laugh" value="Risata"/> - <item label="Linguaccia" name="Plllppt" value="Linguaccia"/> - <item label="Repulsione" name="Repulsed" value="Repulsione"/> - <item label="Triste" name="Sad" value="Triste"/> - <item label="Scrollata di spalle" name="Shrug" value="Scrollata di spalle"/> - <item label="Sorriso" name="Smile" value="Sorriso"/> - <item label="Stupore" name="Surprise" value="Stupore"/> - <item label="Occhiolino" name="Wink" value="Occhiolino"/> - <item label="Preoccupato" name="Worry" value="Preoccupato"/> + <item label="(Nulla)" name="[None]"/> + <item label="Aaaaah" name="Aaaaah"/> + <item label="Spavento" name="Afraid" /> + <item label="Arrabbiato" name="Angry"/> + <item label="Grande sorriso" name="BigSmile"/> + <item label="Annoiato" name="Bored"/> + <item label="Pianto" name="Cry"/> + <item label="Disdegno" name="Disdain"/> + <item label="Imbarazzato" name="Embarrassed"/> + <item label="Accigliato" name="Frown"/> + <item label="Bacio" name="Kiss"/> + <item label="Risata" name="Laugh"/> + <item label="Linguaccia" name="Plllppt"/> + <item label="Repulsione" name="Repulsed"/> + <item label="Triste" name="Sad"/> + <item label="Scrollata di spalle" name="Shrug"/> + <item label="Sorriso" name="Smile"/> + <item label="Stupore" name="Surprise"/> + <item label="Occhiolino" name="Wink"/> + <item label="Preoccupato" name="Worry"/> </combo_box> <text name="preview_label"> Anteprima mentre </text> <combo_box name="preview_base_anim" tool_tip="Prova il comportamento dell'animazione mentre l'avatar esegue attività comuni."> - <item label="In piedi" name="Standing" value="In piedi"/> - <item label="Camminare" name="Walking" value="Camminare"/> - <item label="Seduto" name="Sitting" value="Seduto"/> - <item label="Volare" name="Flying" value="Volare"/> + <item label="In piedi" name="Standing"/> + <item label="Camminare" name="Walking"/> + <item label="Seduto" name="Sitting"/> + <item label="Volare" name="Flying"/> </combo_box> <spinner label="Transizione in ingresso (sec)" name="ease_in_time" tool_tip="Durata (in secondi) della fusione in entrata delle animazioni"/> <spinner label="Transizione in uscita (sec)" name="ease_out_time" tool_tip="Durata (in secondi) della fusione in uscita delle animazioni"/> 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'ID</line_editor> + <button label="OK" name="OK"/> + <button label="Annulla" name="Cancel"/> +</floater> diff --git a/indra/newview/skins/default/xui/it/floater_auction.xml b/indra/newview/skins/default/xui/it/floater_auction.xml index 4cad8b744d..4cad8b744d 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_auction.xml +++ b/indra/newview/skins/default/xui/it/floater_auction.xml diff --git a/indra/newview/skins/default/xui/it/floater_autoreplace.xml b/indra/newview/skins/default/xui/it/floater_autoreplace.xml index 559a42cfae..559a42cfae 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_autoreplace.xml +++ b/indra/newview/skins/default/xui/it/floater_autoreplace.xml diff --git a/indra/newview/skins/default/xui/it/floater_avatar.xml b/indra/newview/skins/default/xui/it/floater_avatar.xml index d7445cfb2b..d7445cfb2b 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_avatar.xml +++ b/indra/newview/skins/default/xui/it/floater_avatar.xml diff --git a/indra/newview/skins/default/xui/it/floater_avatar_picker.xml b/indra/newview/skins/default/xui/it/floater_avatar_picker.xml index 5a542d6a27..5a542d6a27 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_avatar_picker.xml +++ b/indra/newview/skins/default/xui/it/floater_avatar_picker.xml diff --git a/indra/newview/skins/default/xui/it/floater_avatar_textures.xml b/indra/newview/skins/default/xui/it/floater_avatar_textures.xml index b6376973cd..b6376973cd 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_avatar_textures.xml +++ b/indra/newview/skins/default/xui/it/floater_avatar_textures.xml diff --git a/indra/newview/skins/default/xui/it/floater_beacons.xml b/indra/newview/skins/default/xui/it/floater_beacons.xml index b7ab265cc2..b7ab265cc2 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_beacons.xml +++ b/indra/newview/skins/default/xui/it/floater_beacons.xml diff --git a/indra/newview/skins/default/xui/it/floater_build_options.xml b/indra/newview/skins/default/xui/it/floater_build_options.xml index 080e396642..080e396642 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_build_options.xml +++ b/indra/newview/skins/default/xui/it/floater_build_options.xml diff --git a/indra/newview/skins/default/xui/it/floater_bulk_perms.xml b/indra/newview/skins/default/xui/it/floater_bulk_perms.xml index 399eb15802..399eb15802 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_bulk_perms.xml +++ b/indra/newview/skins/default/xui/it/floater_bulk_perms.xml diff --git a/indra/newview/skins/default/xui/it/floater_bumps.xml b/indra/newview/skins/default/xui/it/floater_bumps.xml index ae66148659..ae66148659 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_bumps.xml +++ b/indra/newview/skins/default/xui/it/floater_bumps.xml diff --git a/indra/newview/skins/default/xui/it/floater_buy_contents.xml b/indra/newview/skins/default/xui/it/floater_buy_contents.xml index 84ed85e362..84ed85e362 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_buy_contents.xml +++ b/indra/newview/skins/default/xui/it/floater_buy_contents.xml diff --git a/indra/newview/skins/default/xui/it/floater_buy_currency.xml b/indra/newview/skins/default/xui/it/floater_buy_currency.xml index 743969f557..743969f557 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_buy_currency.xml +++ b/indra/newview/skins/default/xui/it/floater_buy_currency.xml diff --git a/indra/newview/skins/default/xui/it/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/it/floater_buy_currency_html.xml index 4a1bf33403..4a1bf33403 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_buy_currency_html.xml +++ b/indra/newview/skins/default/xui/it/floater_buy_currency_html.xml diff --git a/indra/newview/skins/default/xui/it/floater_buy_land.xml b/indra/newview/skins/default/xui/it/floater_buy_land.xml index 3940c43a3d..3940c43a3d 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_buy_land.xml +++ b/indra/newview/skins/default/xui/it/floater_buy_land.xml diff --git a/indra/newview/skins/default/xui/it/floater_buy_object.xml b/indra/newview/skins/default/xui/it/floater_buy_object.xml index e7cbd68b38..e7cbd68b38 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_buy_object.xml +++ b/indra/newview/skins/default/xui/it/floater_buy_object.xml diff --git a/indra/newview/skins/default/xui/it/floater_camera.xml b/indra/newview/skins/default/xui/it/floater_camera.xml index be03857bc9..be03857bc9 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_camera.xml +++ b/indra/newview/skins/default/xui/it/floater_camera.xml diff --git a/indra/newview/skins/default/xui/it/floater_chat_bar.xml b/indra/newview/skins/default/xui/it/floater_chat_bar.xml index b47e32ce90..b47e32ce90 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_chat_bar.xml +++ b/indra/newview/skins/default/xui/it/floater_chat_bar.xml diff --git a/indra/newview/skins/default/xui/it/floater_choose_group.xml b/indra/newview/skins/default/xui/it/floater_choose_group.xml index 00f2692295..00f2692295 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_choose_group.xml +++ b/indra/newview/skins/default/xui/it/floater_choose_group.xml diff --git a/indra/newview/skins/default/xui/it/floater_color_picker.xml b/indra/newview/skins/default/xui/it/floater_color_picker.xml index 38d4a0a037..38d4a0a037 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_color_picker.xml +++ b/indra/newview/skins/default/xui/it/floater_color_picker.xml diff --git a/indra/newview/skins/default/xui/it/floater_critical.xml b/indra/newview/skins/default/xui/it/floater_critical.xml index 82850b0ada..82850b0ada 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_critical.xml +++ b/indra/newview/skins/default/xui/it/floater_critical.xml diff --git a/indra/newview/skins/default/xui/it/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/it/floater_delete_env_preset.xml index 71071825af..71071825af 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_delete_env_preset.xml +++ b/indra/newview/skins/default/xui/it/floater_delete_env_preset.xml diff --git a/indra/newview/skins/default/xui/it/floater_destinations.xml b/indra/newview/skins/default/xui/it/floater_destinations.xml index 242403e431..242403e431 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_destinations.xml +++ b/indra/newview/skins/default/xui/it/floater_destinations.xml diff --git a/indra/newview/skins/default/xui/it/floater_display_name.xml b/indra/newview/skins/default/xui/it/floater_display_name.xml index 3e0c43e741..3e0c43e741 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_display_name.xml +++ b/indra/newview/skins/default/xui/it/floater_display_name.xml diff --git a/indra/newview/skins/default/xui/it/floater_edit_day_cycle.xml b/indra/newview/skins/default/xui/it/floater_edit_day_cycle.xml index c922b2e4f7..c922b2e4f7 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_edit_day_cycle.xml +++ b/indra/newview/skins/default/xui/it/floater_edit_day_cycle.xml 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_edit_sky_preset.xml b/indra/newview/skins/default/xui/it/floater_edit_sky_preset.xml index 571027fd29..571027fd29 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_edit_sky_preset.xml +++ b/indra/newview/skins/default/xui/it/floater_edit_sky_preset.xml diff --git a/indra/newview/skins/default/xui/it/floater_edit_water_preset.xml b/indra/newview/skins/default/xui/it/floater_edit_water_preset.xml index 7bffc60ba2..7bffc60ba2 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_edit_water_preset.xml +++ b/indra/newview/skins/default/xui/it/floater_edit_water_preset.xml diff --git a/indra/newview/skins/default/xui/it/floater_environment_settings.xml b/indra/newview/skins/default/xui/it/floater_environment_settings.xml index f191078fad..f191078fad 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_environment_settings.xml +++ b/indra/newview/skins/default/xui/it/floater_environment_settings.xml diff --git a/indra/newview/skins/default/xui/it/floater_event.xml b/indra/newview/skins/default/xui/it/floater_event.xml index b64f429870..b64f429870 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_event.xml +++ b/indra/newview/skins/default/xui/it/floater_event.xml 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"> + "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 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'esperienza, vengono ripristinate le autorizzazioni per tutti i residenti che hanno consentito l'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_fast_timers.xml b/indra/newview/skins/default/xui/it/floater_fast_timers.xml index 52ab6b0c3d..52ab6b0c3d 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_fast_timers.xml +++ b/indra/newview/skins/default/xui/it/floater_fast_timers.xml diff --git a/indra/newview/skins/default/xui/it/floater_font_test.xml b/indra/newview/skins/default/xui/it/floater_font_test.xml index 859c068b11..859c068b11 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_font_test.xml +++ b/indra/newview/skins/default/xui/it/floater_font_test.xml diff --git a/indra/newview/skins/default/xui/it/floater_gesture.xml b/indra/newview/skins/default/xui/it/floater_gesture.xml index b9419ebc22..b9419ebc22 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_gesture.xml +++ b/indra/newview/skins/default/xui/it/floater_gesture.xml diff --git a/indra/newview/skins/default/xui/it/floater_god_tools.xml b/indra/newview/skins/default/xui/it/floater_god_tools.xml index 32c79936cf..32c79936cf 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_god_tools.xml +++ b/indra/newview/skins/default/xui/it/floater_god_tools.xml diff --git a/indra/newview/skins/default/xui/it/floater_hardware_settings.xml b/indra/newview/skins/default/xui/it/floater_hardware_settings.xml index edbbc354cf..edbbc354cf 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_hardware_settings.xml +++ b/indra/newview/skins/default/xui/it/floater_hardware_settings.xml diff --git a/indra/newview/skins/default/xui/it/floater_help_browser.xml b/indra/newview/skins/default/xui/it/floater_help_browser.xml index 008643afac..008643afac 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_help_browser.xml +++ b/indra/newview/skins/default/xui/it/floater_help_browser.xml diff --git a/indra/newview/skins/default/xui/it/floater_how_to.xml b/indra/newview/skins/default/xui/it/floater_how_to.xml index 8f0e210571..8f0e210571 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_how_to.xml +++ b/indra/newview/skins/default/xui/it/floater_how_to.xml diff --git a/indra/newview/skins/default/xui/it/floater_hud.xml b/indra/newview/skins/default/xui/it/floater_hud.xml index 437d2d6496..437d2d6496 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_hud.xml +++ b/indra/newview/skins/default/xui/it/floater_hud.xml diff --git a/indra/newview/skins/default/xui/it/floater_im_container.xml b/indra/newview/skins/default/xui/it/floater_im_container.xml index 10cf1b7f7e..10cf1b7f7e 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_im_container.xml +++ b/indra/newview/skins/default/xui/it/floater_im_container.xml diff --git a/indra/newview/skins/default/xui/it/floater_im_session.xml b/indra/newview/skins/default/xui/it/floater_im_session.xml index 71f90accde..71f90accde 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_im_session.xml +++ b/indra/newview/skins/default/xui/it/floater_im_session.xml diff --git a/indra/newview/skins/default/xui/it/floater_image_preview.xml b/indra/newview/skins/default/xui/it/floater_image_preview.xml index ee7be7b155..ee7be7b155 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_image_preview.xml +++ b/indra/newview/skins/default/xui/it/floater_image_preview.xml diff --git a/indra/newview/skins/default/xui/it/floater_import_collada.xml b/indra/newview/skins/default/xui/it/floater_import_collada.xml index eb4d0c0fdb..eb4d0c0fdb 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_import_collada.xml +++ b/indra/newview/skins/default/xui/it/floater_import_collada.xml diff --git a/indra/newview/skins/default/xui/it/floater_incoming_call.xml b/indra/newview/skins/default/xui/it/floater_incoming_call.xml index 566920209d..566920209d 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_incoming_call.xml +++ b/indra/newview/skins/default/xui/it/floater_incoming_call.xml diff --git a/indra/newview/skins/default/xui/it/floater_inspect.xml b/indra/newview/skins/default/xui/it/floater_inspect.xml index bae993d2be..bae993d2be 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_inspect.xml +++ b/indra/newview/skins/default/xui/it/floater_inspect.xml 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..100644 --- 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'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..100644 --- 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'ARTICOLO"/> diff --git a/indra/newview/skins/default/xui/it/floater_joystick.xml b/indra/newview/skins/default/xui/it/floater_joystick.xml index 3d60ded7ab..3d60ded7ab 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_joystick.xml +++ b/indra/newview/skins/default/xui/it/floater_joystick.xml 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'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"> >> @@ -126,7 +126,7 @@ <floater.string name="bigger_label"> << </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_land_holdings.xml b/indra/newview/skins/default/xui/it/floater_land_holdings.xml index 1b2f2605f7..1b2f2605f7 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_land_holdings.xml +++ b/indra/newview/skins/default/xui/it/floater_land_holdings.xml 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..100644 --- 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'esperienza corrente + </floater.string> + <floater.string name="no_experiences"> + Non hai l'autorizzazione necessaria per alcuna esperienza + </floater.string> + <floater.string name="add_experiences"> + Seleziona per aggiungere un'esperienza + </floater.string> + <floater.string name="show_experience_profile"> + Clicca per vedere il profilo dell'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=">" name="view_profile"/> </floater> diff --git a/indra/newview/skins/default/xui/it/floater_lsl_guide.xml b/indra/newview/skins/default/xui/it/floater_lsl_guide.xml index 47fe2de051..47fe2de051 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_lsl_guide.xml +++ b/indra/newview/skins/default/xui/it/floater_lsl_guide.xml diff --git a/indra/newview/skins/default/xui/it/floater_map.xml b/indra/newview/skins/default/xui/it/floater_map.xml index 5e4e4abca4..5e4e4abca4 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_map.xml +++ b/indra/newview/skins/default/xui/it/floater_map.xml 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_media_browser.xml b/indra/newview/skins/default/xui/it/floater_media_browser.xml index 0a8c0f1c41..0a8c0f1c41 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_media_browser.xml +++ b/indra/newview/skins/default/xui/it/floater_media_browser.xml diff --git a/indra/newview/skins/default/xui/it/floater_media_settings.xml b/indra/newview/skins/default/xui/it/floater_media_settings.xml index d521502a4c..d521502a4c 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_media_settings.xml +++ b/indra/newview/skins/default/xui/it/floater_media_settings.xml diff --git a/indra/newview/skins/default/xui/it/floater_mem_leaking.xml b/indra/newview/skins/default/xui/it/floater_mem_leaking.xml index 63074d5a4c..63074d5a4c 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_mem_leaking.xml +++ b/indra/newview/skins/default/xui/it/floater_mem_leaking.xml diff --git a/indra/newview/skins/default/xui/it/floater_merchant_outbox.xml b/indra/newview/skins/default/xui/it/floater_merchant_outbox.xml index 02f257d466..02f257d466 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_merchant_outbox.xml +++ b/indra/newview/skins/default/xui/it/floater_merchant_outbox.xml diff --git a/indra/newview/skins/default/xui/it/floater_model_preview.xml b/indra/newview/skins/default/xui/it/floater_model_preview.xml index e8df4d2d4b..e8df4d2d4b 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_model_preview.xml +++ b/indra/newview/skins/default/xui/it/floater_model_preview.xml diff --git a/indra/newview/skins/default/xui/it/floater_moveview.xml b/indra/newview/skins/default/xui/it/floater_moveview.xml index 1237bd06a9..1237bd06a9 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_moveview.xml +++ b/indra/newview/skins/default/xui/it/floater_moveview.xml diff --git a/indra/newview/skins/default/xui/it/floater_mute_object.xml b/indra/newview/skins/default/xui/it/floater_mute_object.xml index dd1a2b67d7..dd1a2b67d7 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_mute_object.xml +++ b/indra/newview/skins/default/xui/it/floater_mute_object.xml diff --git a/indra/newview/skins/default/xui/it/floater_my_appearance.xml b/indra/newview/skins/default/xui/it/floater_my_appearance.xml index 39ddd6186a..39ddd6186a 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_my_appearance.xml +++ b/indra/newview/skins/default/xui/it/floater_my_appearance.xml diff --git a/indra/newview/skins/default/xui/it/floater_my_inventory.xml b/indra/newview/skins/default/xui/it/floater_my_inventory.xml index 0efd9f1c6d..0efd9f1c6d 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_my_inventory.xml +++ b/indra/newview/skins/default/xui/it/floater_my_inventory.xml diff --git a/indra/newview/skins/default/xui/it/floater_object_weights.xml b/indra/newview/skins/default/xui/it/floater_object_weights.xml index fdcb732dee..fdcb732dee 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_object_weights.xml +++ b/indra/newview/skins/default/xui/it/floater_object_weights.xml 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..100644 --- 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'inventario" label_selected="Copia nell'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'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'inventario" label_selected="Crea solo la copia nell'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_outfit_save_as.xml b/indra/newview/skins/default/xui/it/floater_outfit_save_as.xml index 55bb5adb1e..55bb5adb1e 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_outfit_save_as.xml +++ b/indra/newview/skins/default/xui/it/floater_outfit_save_as.xml diff --git a/indra/newview/skins/default/xui/it/floater_outgoing_call.xml b/indra/newview/skins/default/xui/it/floater_outgoing_call.xml index cdb180bacd..cdb180bacd 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_outgoing_call.xml +++ b/indra/newview/skins/default/xui/it/floater_outgoing_call.xml diff --git a/indra/newview/skins/default/xui/it/floater_pathfinding_characters.xml b/indra/newview/skins/default/xui/it/floater_pathfinding_characters.xml index 5122954edb..5122954edb 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_pathfinding_characters.xml +++ b/indra/newview/skins/default/xui/it/floater_pathfinding_characters.xml diff --git a/indra/newview/skins/default/xui/it/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/it/floater_pathfinding_console.xml index 77be220a2a..77be220a2a 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_pathfinding_console.xml +++ b/indra/newview/skins/default/xui/it/floater_pathfinding_console.xml diff --git a/indra/newview/skins/default/xui/it/floater_pathfinding_linksets.xml b/indra/newview/skins/default/xui/it/floater_pathfinding_linksets.xml index 7edac3ff46..7edac3ff46 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_pathfinding_linksets.xml +++ b/indra/newview/skins/default/xui/it/floater_pathfinding_linksets.xml 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..100644 --- 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..100644 --- 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'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'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_people.xml b/indra/newview/skins/default/xui/it/floater_people.xml index 1acc3cbf19..1acc3cbf19 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_people.xml +++ b/indra/newview/skins/default/xui/it/floater_people.xml diff --git a/indra/newview/skins/default/xui/it/floater_perm_prefs.xml b/indra/newview/skins/default/xui/it/floater_perm_prefs.xml index a02b3b5075..a02b3b5075 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_perm_prefs.xml +++ b/indra/newview/skins/default/xui/it/floater_perm_prefs.xml diff --git a/indra/newview/skins/default/xui/it/floater_picks.xml b/indra/newview/skins/default/xui/it/floater_picks.xml index dfc539da66..dfc539da66 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_picks.xml +++ b/indra/newview/skins/default/xui/it/floater_picks.xml diff --git a/indra/newview/skins/default/xui/it/floater_places.xml b/indra/newview/skins/default/xui/it/floater_places.xml index cd46cf8b59..cd46cf8b59 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_places.xml +++ b/indra/newview/skins/default/xui/it/floater_places.xml diff --git a/indra/newview/skins/default/xui/it/floater_post_process.xml b/indra/newview/skins/default/xui/it/floater_post_process.xml index 3aa8b29101..3aa8b29101 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_post_process.xml +++ b/indra/newview/skins/default/xui/it/floater_post_process.xml diff --git a/indra/newview/skins/default/xui/it/floater_preferences.xml b/indra/newview/skins/default/xui/it/floater_preferences.xml index 7a1d2966ed..7a1d2966ed 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_preferences.xml +++ b/indra/newview/skins/default/xui/it/floater_preferences.xml diff --git a/indra/newview/skins/default/xui/it/floater_preferences_proxy.xml b/indra/newview/skins/default/xui/it/floater_preferences_proxy.xml index 86ea8064b1..86ea8064b1 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_preferences_proxy.xml +++ b/indra/newview/skins/default/xui/it/floater_preferences_proxy.xml diff --git a/indra/newview/skins/default/xui/it/floater_preview_animation.xml b/indra/newview/skins/default/xui/it/floater_preview_animation.xml index ed609c70fa..ed609c70fa 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_preview_animation.xml +++ b/indra/newview/skins/default/xui/it/floater_preview_animation.xml diff --git a/indra/newview/skins/default/xui/it/floater_preview_gesture.xml b/indra/newview/skins/default/xui/it/floater_preview_gesture.xml index 2172b9848b..2172b9848b 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_preview_gesture.xml +++ b/indra/newview/skins/default/xui/it/floater_preview_gesture.xml diff --git a/indra/newview/skins/default/xui/it/floater_preview_notecard.xml b/indra/newview/skins/default/xui/it/floater_preview_notecard.xml index 7ec229f9d3..7ec229f9d3 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_preview_notecard.xml +++ b/indra/newview/skins/default/xui/it/floater_preview_notecard.xml diff --git a/indra/newview/skins/default/xui/it/floater_preview_sound.xml b/indra/newview/skins/default/xui/it/floater_preview_sound.xml index 8eb9573e54..8eb9573e54 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_preview_sound.xml +++ b/indra/newview/skins/default/xui/it/floater_preview_sound.xml diff --git a/indra/newview/skins/default/xui/it/floater_preview_texture.xml b/indra/newview/skins/default/xui/it/floater_preview_texture.xml index 5b4054514e..5b4054514e 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_preview_texture.xml +++ b/indra/newview/skins/default/xui/it/floater_preview_texture.xml diff --git a/indra/newview/skins/default/xui/it/floater_price_for_listing.xml b/indra/newview/skins/default/xui/it/floater_price_for_listing.xml index 06c838a981..06c838a981 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_price_for_listing.xml +++ b/indra/newview/skins/default/xui/it/floater_price_for_listing.xml diff --git a/indra/newview/skins/default/xui/it/floater_publish_classified.xml b/indra/newview/skins/default/xui/it/floater_publish_classified.xml index c371e28caa..c371e28caa 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_publish_classified.xml +++ b/indra/newview/skins/default/xui/it/floater_publish_classified.xml diff --git a/indra/newview/skins/default/xui/it/floater_region_debug_console.xml b/indra/newview/skins/default/xui/it/floater_region_debug_console.xml index 6efa10290b..6efa10290b 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_region_debug_console.xml +++ b/indra/newview/skins/default/xui/it/floater_region_debug_console.xml diff --git a/indra/newview/skins/default/xui/it/floater_region_info.xml b/indra/newview/skins/default/xui/it/floater_region_info.xml index dc2c24ca56..dc2c24ca56 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_region_info.xml +++ b/indra/newview/skins/default/xui/it/floater_region_info.xml 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..100644 --- 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 > Invasione > Oggetti o texture" name="Land__Encroachment__Objects_textures"/> <combo_box.item label="Terreno > Invasione > Particelle" name="Land__Encroachment__Particles"/> <combo_box.item label="Terreno > Invasione > Alberi/piante" name="Land__Encroachment__Trees_plants"/> - <combo_box.item label="Scommesse o gioco d'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_script_debug.xml b/indra/newview/skins/default/xui/it/floater_script_debug.xml index 89bf80da5e..89bf80da5e 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_script_debug.xml +++ b/indra/newview/skins/default/xui/it/floater_script_debug.xml diff --git a/indra/newview/skins/default/xui/it/floater_script_debug_panel.xml b/indra/newview/skins/default/xui/it/floater_script_debug_panel.xml index e70a30fa24..e70a30fa24 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_script_debug_panel.xml +++ b/indra/newview/skins/default/xui/it/floater_script_debug_panel.xml diff --git a/indra/newview/skins/default/xui/it/floater_script_limits.xml b/indra/newview/skins/default/xui/it/floater_script_limits.xml index 2383b85bb7..2383b85bb7 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_script_limits.xml +++ b/indra/newview/skins/default/xui/it/floater_script_limits.xml diff --git a/indra/newview/skins/default/xui/it/floater_script_preview.xml b/indra/newview/skins/default/xui/it/floater_script_preview.xml index d007774f43..d007774f43 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_script_preview.xml +++ b/indra/newview/skins/default/xui/it/floater_script_preview.xml diff --git a/indra/newview/skins/default/xui/it/floater_script_queue.xml b/indra/newview/skins/default/xui/it/floater_script_queue.xml index f4117d30a2..f4117d30a2 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_script_queue.xml +++ b/indra/newview/skins/default/xui/it/floater_script_queue.xml diff --git a/indra/newview/skins/default/xui/it/floater_script_search.xml b/indra/newview/skins/default/xui/it/floater_script_search.xml index 3d0b02877e..3d0b02877e 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_script_search.xml +++ b/indra/newview/skins/default/xui/it/floater_script_search.xml diff --git a/indra/newview/skins/default/xui/it/floater_search.xml b/indra/newview/skins/default/xui/it/floater_search.xml index ac3dc17aa3..ac3dc17aa3 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_search.xml +++ b/indra/newview/skins/default/xui/it/floater_search.xml diff --git a/indra/newview/skins/default/xui/it/floater_select_key.xml b/indra/newview/skins/default/xui/it/floater_select_key.xml index 014bc76ffb..014bc76ffb 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_select_key.xml +++ b/indra/newview/skins/default/xui/it/floater_select_key.xml diff --git a/indra/newview/skins/default/xui/it/floater_sell_land.xml b/indra/newview/skins/default/xui/it/floater_sell_land.xml index 106ae0373c..106ae0373c 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_sell_land.xml +++ b/indra/newview/skins/default/xui/it/floater_sell_land.xml diff --git a/indra/newview/skins/default/xui/it/floater_settings_debug.xml b/indra/newview/skins/default/xui/it/floater_settings_debug.xml index 489d52d3b8..489d52d3b8 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_settings_debug.xml +++ b/indra/newview/skins/default/xui/it/floater_settings_debug.xml 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..100644 --- 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_sound_devices.xml b/indra/newview/skins/default/xui/it/floater_sound_devices.xml index 9799b48d89..9799b48d89 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_sound_devices.xml +++ b/indra/newview/skins/default/xui/it/floater_sound_devices.xml diff --git a/indra/newview/skins/default/xui/it/floater_sound_preview.xml b/indra/newview/skins/default/xui/it/floater_sound_preview.xml index 221e5e5b53..221e5e5b53 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_sound_preview.xml +++ b/indra/newview/skins/default/xui/it/floater_sound_preview.xml diff --git a/indra/newview/skins/default/xui/it/floater_spellcheck.xml b/indra/newview/skins/default/xui/it/floater_spellcheck.xml index 2a8557b0fc..2a8557b0fc 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_spellcheck.xml +++ b/indra/newview/skins/default/xui/it/floater_spellcheck.xml diff --git a/indra/newview/skins/default/xui/it/floater_spellcheck_import.xml b/indra/newview/skins/default/xui/it/floater_spellcheck_import.xml index c04fc249a7..c04fc249a7 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_spellcheck_import.xml +++ b/indra/newview/skins/default/xui/it/floater_spellcheck_import.xml 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..100644 --- 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_sys_well.xml b/indra/newview/skins/default/xui/it/floater_sys_well.xml index e1c0b89902..e1c0b89902 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_sys_well.xml +++ b/indra/newview/skins/default/xui/it/floater_sys_well.xml diff --git a/indra/newview/skins/default/xui/it/floater_telehub.xml b/indra/newview/skins/default/xui/it/floater_telehub.xml index 15312a8959..15312a8959 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_telehub.xml +++ b/indra/newview/skins/default/xui/it/floater_telehub.xml diff --git a/indra/newview/skins/default/xui/it/floater_test_layout_stacks.xml b/indra/newview/skins/default/xui/it/floater_test_layout_stacks.xml index b479d5f6d6..b479d5f6d6 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_test_layout_stacks.xml +++ b/indra/newview/skins/default/xui/it/floater_test_layout_stacks.xml diff --git a/indra/newview/skins/default/xui/it/floater_test_text_vertical_aligment.xml b/indra/newview/skins/default/xui/it/floater_test_text_vertical_aligment.xml index 23da6f7588..23da6f7588 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_test_text_vertical_aligment.xml +++ b/indra/newview/skins/default/xui/it/floater_test_text_vertical_aligment.xml diff --git a/indra/newview/skins/default/xui/it/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/it/floater_texture_ctrl.xml index 27a17868a7..27a17868a7 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_texture_ctrl.xml +++ b/indra/newview/skins/default/xui/it/floater_texture_ctrl.xml diff --git a/indra/newview/skins/default/xui/it/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/it/floater_texture_fetch_debugger.xml index 49b6453319..49b6453319 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_texture_fetch_debugger.xml +++ b/indra/newview/skins/default/xui/it/floater_texture_fetch_debugger.xml diff --git a/indra/newview/skins/default/xui/it/floater_tools.xml b/indra/newview/skins/default/xui/it/floater_tools.xml index efd1ea808a..efd1ea808a 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_tools.xml +++ b/indra/newview/skins/default/xui/it/floater_tools.xml 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..100644 --- 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_tos.xml b/indra/newview/skins/default/xui/it/floater_tos.xml index 28a2dfdda2..28a2dfdda2 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_tos.xml +++ b/indra/newview/skins/default/xui/it/floater_tos.xml diff --git a/indra/newview/skins/default/xui/it/floater_toybox.xml b/indra/newview/skins/default/xui/it/floater_toybox.xml index 269e2831d0..269e2831d0 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_toybox.xml +++ b/indra/newview/skins/default/xui/it/floater_toybox.xml diff --git a/indra/newview/skins/default/xui/it/floater_translation_settings.xml b/indra/newview/skins/default/xui/it/floater_translation_settings.xml index a0a34da723..a0a34da723 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_translation_settings.xml +++ b/indra/newview/skins/default/xui/it/floater_translation_settings.xml 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/floater_url_entry.xml b/indra/newview/skins/default/xui/it/floater_url_entry.xml index 9ad1a0dce5..9ad1a0dce5 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_url_entry.xml +++ b/indra/newview/skins/default/xui/it/floater_url_entry.xml diff --git a/indra/newview/skins/default/xui/it/floater_voice_controls.xml b/indra/newview/skins/default/xui/it/floater_voice_controls.xml index 77973eef1e..77973eef1e 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_voice_controls.xml +++ b/indra/newview/skins/default/xui/it/floater_voice_controls.xml diff --git a/indra/newview/skins/default/xui/it/floater_voice_effect.xml b/indra/newview/skins/default/xui/it/floater_voice_effect.xml index f102622f5d..f102622f5d 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_voice_effect.xml +++ b/indra/newview/skins/default/xui/it/floater_voice_effect.xml diff --git a/indra/newview/skins/default/xui/it/floater_web_content.xml b/indra/newview/skins/default/xui/it/floater_web_content.xml index 5603e85417..5603e85417 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_web_content.xml +++ b/indra/newview/skins/default/xui/it/floater_web_content.xml diff --git a/indra/newview/skins/default/xui/it/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/it/floater_whitelist_entry.xml index 9abc968b94..9abc968b94 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_whitelist_entry.xml +++ b/indra/newview/skins/default/xui/it/floater_whitelist_entry.xml diff --git a/indra/newview/skins/default/xui/it/floater_window_size.xml b/indra/newview/skins/default/xui/it/floater_window_size.xml index fef423aefe..fef423aefe 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_window_size.xml +++ b/indra/newview/skins/default/xui/it/floater_window_size.xml diff --git a/indra/newview/skins/default/xui/it/floater_world_map.xml b/indra/newview/skins/default/xui/it/floater_world_map.xml index 8da17a4034..8da17a4034 100755..100644 --- a/indra/newview/skins/default/xui/it/floater_world_map.xml +++ b/indra/newview/skins/default/xui/it/floater_world_map.xml diff --git a/indra/newview/skins/default/xui/it/inspect_avatar.xml b/indra/newview/skins/default/xui/it/inspect_avatar.xml index 6f52aaef74..6f52aaef74 100755..100644 --- a/indra/newview/skins/default/xui/it/inspect_avatar.xml +++ b/indra/newview/skins/default/xui/it/inspect_avatar.xml diff --git a/indra/newview/skins/default/xui/it/inspect_group.xml b/indra/newview/skins/default/xui/it/inspect_group.xml index 2416f4bb12..2416f4bb12 100755..100644 --- a/indra/newview/skins/default/xui/it/inspect_group.xml +++ b/indra/newview/skins/default/xui/it/inspect_group.xml diff --git a/indra/newview/skins/default/xui/it/inspect_object.xml b/indra/newview/skins/default/xui/it/inspect_object.xml index d8ab10cfda..d8ab10cfda 100755..100644 --- a/indra/newview/skins/default/xui/it/inspect_object.xml +++ b/indra/newview/skins/default/xui/it/inspect_object.xml diff --git a/indra/newview/skins/default/xui/it/inspect_remote_object.xml b/indra/newview/skins/default/xui/it/inspect_remote_object.xml index b2d96ad757..b2d96ad757 100755..100644 --- a/indra/newview/skins/default/xui/it/inspect_remote_object.xml +++ b/indra/newview/skins/default/xui/it/inspect_remote_object.xml diff --git a/indra/newview/skins/default/xui/it/language_settings.xml b/indra/newview/skins/default/xui/it/language_settings.xml index 5f448fa828..5f448fa828 100755..100644 --- a/indra/newview/skins/default/xui/it/language_settings.xml +++ b/indra/newview/skins/default/xui/it/language_settings.xml diff --git a/indra/newview/skins/default/xui/it/menu_add_wearable_gear.xml b/indra/newview/skins/default/xui/it/menu_add_wearable_gear.xml index 46abd7deed..46abd7deed 100755..100644 --- a/indra/newview/skins/default/xui/it/menu_add_wearable_gear.xml +++ b/indra/newview/skins/default/xui/it/menu_add_wearable_gear.xml diff --git a/indra/newview/skins/default/xui/it/menu_attachment_other.xml b/indra/newview/skins/default/xui/it/menu_attachment_other.xml index d4ce25e6a5..d4ce25e6a5 100755..100644 --- a/indra/newview/skins/default/xui/it/menu_attachment_other.xml +++ b/indra/newview/skins/default/xui/it/menu_attachment_other.xml 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..100644 --- 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_icon.xml b/indra/newview/skins/default/xui/it/menu_avatar_icon.xml index 215eb836c8..215eb836c8 100755..100644 --- a/indra/newview/skins/default/xui/it/menu_avatar_icon.xml +++ b/indra/newview/skins/default/xui/it/menu_avatar_icon.xml diff --git a/indra/newview/skins/default/xui/it/menu_avatar_other.xml b/indra/newview/skins/default/xui/it/menu_avatar_other.xml index a2b864b3e1..a2b864b3e1 100755..100644 --- a/indra/newview/skins/default/xui/it/menu_avatar_other.xml +++ b/indra/newview/skins/default/xui/it/menu_avatar_other.xml 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..100644 --- 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_cof_attachment.xml b/indra/newview/skins/default/xui/it/menu_cof_attachment.xml index 699490c8f1..699490c8f1 100755..100644 --- a/indra/newview/skins/default/xui/it/menu_cof_attachment.xml +++ b/indra/newview/skins/default/xui/it/menu_cof_attachment.xml diff --git a/indra/newview/skins/default/xui/it/menu_cof_body_part.xml b/indra/newview/skins/default/xui/it/menu_cof_body_part.xml index 1e3658ef45..1e3658ef45 100755..100644 --- a/indra/newview/skins/default/xui/it/menu_cof_body_part.xml +++ b/indra/newview/skins/default/xui/it/menu_cof_body_part.xml diff --git a/indra/newview/skins/default/xui/it/menu_cof_clothing.xml b/indra/newview/skins/default/xui/it/menu_cof_clothing.xml index 1e16ce8ed1..1e16ce8ed1 100755..100644 --- a/indra/newview/skins/default/xui/it/menu_cof_clothing.xml +++ b/indra/newview/skins/default/xui/it/menu_cof_clothing.xml diff --git a/indra/newview/skins/default/xui/it/menu_cof_gear.xml b/indra/newview/skins/default/xui/it/menu_cof_gear.xml index 984e4a1611..984e4a1611 100755..100644 --- a/indra/newview/skins/default/xui/it/menu_cof_gear.xml +++ b/indra/newview/skins/default/xui/it/menu_cof_gear.xml diff --git a/indra/newview/skins/default/xui/it/menu_edit.xml b/indra/newview/skins/default/xui/it/menu_edit.xml index ffb20a02e9..ffb20a02e9 100755..100644 --- a/indra/newview/skins/default/xui/it/menu_edit.xml +++ b/indra/newview/skins/default/xui/it/menu_edit.xml diff --git a/indra/newview/skins/default/xui/it/menu_favorites.xml b/indra/newview/skins/default/xui/it/menu_favorites.xml index 7813ef44b5..7813ef44b5 100755..100644 --- a/indra/newview/skins/default/xui/it/menu_favorites.xml +++ b/indra/newview/skins/default/xui/it/menu_favorites.xml diff --git a/indra/newview/skins/default/xui/it/menu_gesture_gear.xml b/indra/newview/skins/default/xui/it/menu_gesture_gear.xml index 7cfcc6287e..7cfcc6287e 100755..100644 --- a/indra/newview/skins/default/xui/it/menu_gesture_gear.xml +++ b/indra/newview/skins/default/xui/it/menu_gesture_gear.xml diff --git a/indra/newview/skins/default/xui/it/menu_group_plus.xml b/indra/newview/skins/default/xui/it/menu_group_plus.xml index 3b76fb94a9..3b76fb94a9 100755..100644 --- a/indra/newview/skins/default/xui/it/menu_group_plus.xml +++ b/indra/newview/skins/default/xui/it/menu_group_plus.xml diff --git a/indra/newview/skins/default/xui/it/menu_hide_navbar.xml b/indra/newview/skins/default/xui/it/menu_hide_navbar.xml index 48f6691fd8..48f6691fd8 100755..100644 --- a/indra/newview/skins/default/xui/it/menu_hide_navbar.xml +++ b/indra/newview/skins/default/xui/it/menu_hide_navbar.xml diff --git a/indra/newview/skins/default/xui/it/menu_imchiclet_adhoc.xml b/indra/newview/skins/default/xui/it/menu_imchiclet_adhoc.xml index f78ed8489f..f78ed8489f 100755..100644 --- a/indra/newview/skins/default/xui/it/menu_imchiclet_adhoc.xml +++ b/indra/newview/skins/default/xui/it/menu_imchiclet_adhoc.xml diff --git a/indra/newview/skins/default/xui/it/menu_imchiclet_group.xml b/indra/newview/skins/default/xui/it/menu_imchiclet_group.xml index baa4e671b0..baa4e671b0 100755..100644 --- a/indra/newview/skins/default/xui/it/menu_imchiclet_group.xml +++ b/indra/newview/skins/default/xui/it/menu_imchiclet_group.xml diff --git a/indra/newview/skins/default/xui/it/menu_imchiclet_p2p.xml b/indra/newview/skins/default/xui/it/menu_imchiclet_p2p.xml index 2eacbb09ad..2eacbb09ad 100755..100644 --- a/indra/newview/skins/default/xui/it/menu_imchiclet_p2p.xml +++ b/indra/newview/skins/default/xui/it/menu_imchiclet_p2p.xml diff --git a/indra/newview/skins/default/xui/it/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/it/menu_inspect_avatar_gear.xml index 1f10734c4a..1f10734c4a 100755..100644 --- a/indra/newview/skins/default/xui/it/menu_inspect_avatar_gear.xml +++ b/indra/newview/skins/default/xui/it/menu_inspect_avatar_gear.xml diff --git a/indra/newview/skins/default/xui/it/menu_inspect_object_gear.xml b/indra/newview/skins/default/xui/it/menu_inspect_object_gear.xml index 4740c9bf67..4740c9bf67 100755..100644 --- a/indra/newview/skins/default/xui/it/menu_inspect_object_gear.xml +++ b/indra/newview/skins/default/xui/it/menu_inspect_object_gear.xml diff --git a/indra/newview/skins/default/xui/it/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/it/menu_inspect_self_gear.xml index 4f62ccaa9c..4f62ccaa9c 100755..100644 --- a/indra/newview/skins/default/xui/it/menu_inspect_self_gear.xml +++ b/indra/newview/skins/default/xui/it/menu_inspect_self_gear.xml diff --git a/indra/newview/skins/default/xui/it/menu_inv_offer_chiclet.xml b/indra/newview/skins/default/xui/it/menu_inv_offer_chiclet.xml index 471640eff5..471640eff5 100755..100644 --- a/indra/newview/skins/default/xui/it/menu_inv_offer_chiclet.xml +++ b/indra/newview/skins/default/xui/it/menu_inv_offer_chiclet.xml 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..100644 --- 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_add.xml b/indra/newview/skins/default/xui/it/menu_inventory_add.xml index 62da61cd6b..62da61cd6b 100755..100644 --- a/indra/newview/skins/default/xui/it/menu_inventory_add.xml +++ b/indra/newview/skins/default/xui/it/menu_inventory_add.xml 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..100644 --- 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'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_land.xml b/indra/newview/skins/default/xui/it/menu_land.xml index 816849a7b5..816849a7b5 100755..100644 --- a/indra/newview/skins/default/xui/it/menu_land.xml +++ b/indra/newview/skins/default/xui/it/menu_land.xml diff --git a/indra/newview/skins/default/xui/it/menu_landmark.xml b/indra/newview/skins/default/xui/it/menu_landmark.xml index b3cddab783..b3cddab783 100755..100644 --- a/indra/newview/skins/default/xui/it/menu_landmark.xml +++ b/indra/newview/skins/default/xui/it/menu_landmark.xml diff --git a/indra/newview/skins/default/xui/it/menu_login.xml b/indra/newview/skins/default/xui/it/menu_login.xml index 126089aa6a..126089aa6a 100755..100644 --- a/indra/newview/skins/default/xui/it/menu_login.xml +++ b/indra/newview/skins/default/xui/it/menu_login.xml 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_media_ctrl.xml b/indra/newview/skins/default/xui/it/menu_media_ctrl.xml index aa9e583f8e..aa9e583f8e 100755..100644 --- a/indra/newview/skins/default/xui/it/menu_media_ctrl.xml +++ b/indra/newview/skins/default/xui/it/menu_media_ctrl.xml diff --git a/indra/newview/skins/default/xui/it/menu_mini_map.xml b/indra/newview/skins/default/xui/it/menu_mini_map.xml index 561b80e046..561b80e046 100755..100644 --- a/indra/newview/skins/default/xui/it/menu_mini_map.xml +++ b/indra/newview/skins/default/xui/it/menu_mini_map.xml diff --git a/indra/newview/skins/default/xui/it/menu_model_import_gear_default.xml b/indra/newview/skins/default/xui/it/menu_model_import_gear_default.xml index 5012e6450f..5012e6450f 100755..100644 --- a/indra/newview/skins/default/xui/it/menu_model_import_gear_default.xml +++ b/indra/newview/skins/default/xui/it/menu_model_import_gear_default.xml diff --git a/indra/newview/skins/default/xui/it/menu_navbar.xml b/indra/newview/skins/default/xui/it/menu_navbar.xml index e42d913a6f..e42d913a6f 100755..100644 --- a/indra/newview/skins/default/xui/it/menu_navbar.xml +++ b/indra/newview/skins/default/xui/it/menu_navbar.xml diff --git a/indra/newview/skins/default/xui/it/menu_nearby_chat.xml b/indra/newview/skins/default/xui/it/menu_nearby_chat.xml index 719a6d3261..719a6d3261 100755..100644 --- a/indra/newview/skins/default/xui/it/menu_nearby_chat.xml +++ b/indra/newview/skins/default/xui/it/menu_nearby_chat.xml diff --git a/indra/newview/skins/default/xui/it/menu_notification_well_button.xml b/indra/newview/skins/default/xui/it/menu_notification_well_button.xml index 8c82e30f0e..8c82e30f0e 100755..100644 --- a/indra/newview/skins/default/xui/it/menu_notification_well_button.xml +++ b/indra/newview/skins/default/xui/it/menu_notification_well_button.xml diff --git a/indra/newview/skins/default/xui/it/menu_object.xml b/indra/newview/skins/default/xui/it/menu_object.xml index 537cc2dd8e..537cc2dd8e 100755..100644 --- a/indra/newview/skins/default/xui/it/menu_object.xml +++ b/indra/newview/skins/default/xui/it/menu_object.xml diff --git a/indra/newview/skins/default/xui/it/menu_object_icon.xml b/indra/newview/skins/default/xui/it/menu_object_icon.xml index 9623775af4..9623775af4 100755..100644 --- a/indra/newview/skins/default/xui/it/menu_object_icon.xml +++ b/indra/newview/skins/default/xui/it/menu_object_icon.xml diff --git a/indra/newview/skins/default/xui/it/menu_outfit_gear.xml b/indra/newview/skins/default/xui/it/menu_outfit_gear.xml index 3ac0c5ce69..3ac0c5ce69 100755..100644 --- a/indra/newview/skins/default/xui/it/menu_outfit_gear.xml +++ b/indra/newview/skins/default/xui/it/menu_outfit_gear.xml diff --git a/indra/newview/skins/default/xui/it/menu_outfit_tab.xml b/indra/newview/skins/default/xui/it/menu_outfit_tab.xml index 8166cf20ed..8166cf20ed 100755..100644 --- a/indra/newview/skins/default/xui/it/menu_outfit_tab.xml +++ b/indra/newview/skins/default/xui/it/menu_outfit_tab.xml diff --git a/indra/newview/skins/default/xui/it/menu_participant_list.xml b/indra/newview/skins/default/xui/it/menu_participant_list.xml index 1b057c4077..1b057c4077 100755..100644 --- a/indra/newview/skins/default/xui/it/menu_participant_list.xml +++ b/indra/newview/skins/default/xui/it/menu_participant_list.xml diff --git a/indra/newview/skins/default/xui/it/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/it/menu_people_friends_view_sort.xml index 3a799f44eb..3a799f44eb 100755..100644 --- a/indra/newview/skins/default/xui/it/menu_people_friends_view_sort.xml +++ b/indra/newview/skins/default/xui/it/menu_people_friends_view_sort.xml diff --git a/indra/newview/skins/default/xui/it/menu_people_groups.xml b/indra/newview/skins/default/xui/it/menu_people_groups.xml index 8ca7537ee0..8ca7537ee0 100755..100644 --- a/indra/newview/skins/default/xui/it/menu_people_groups.xml +++ b/indra/newview/skins/default/xui/it/menu_people_groups.xml diff --git a/indra/newview/skins/default/xui/it/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/it/menu_people_groups_view_sort.xml index d31ddaf1aa..d31ddaf1aa 100755..100644 --- a/indra/newview/skins/default/xui/it/menu_people_groups_view_sort.xml +++ b/indra/newview/skins/default/xui/it/menu_people_groups_view_sort.xml diff --git a/indra/newview/skins/default/xui/it/menu_people_nearby.xml b/indra/newview/skins/default/xui/it/menu_people_nearby.xml index 1c09b1cfe2..1c09b1cfe2 100755..100644 --- a/indra/newview/skins/default/xui/it/menu_people_nearby.xml +++ b/indra/newview/skins/default/xui/it/menu_people_nearby.xml diff --git a/indra/newview/skins/default/xui/it/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/it/menu_people_nearby_multiselect.xml index b9ce70167f..b9ce70167f 100755..100644 --- a/indra/newview/skins/default/xui/it/menu_people_nearby_multiselect.xml +++ b/indra/newview/skins/default/xui/it/menu_people_nearby_multiselect.xml diff --git a/indra/newview/skins/default/xui/it/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/it/menu_people_nearby_view_sort.xml index 2b5c235706..2b5c235706 100755..100644 --- a/indra/newview/skins/default/xui/it/menu_people_nearby_view_sort.xml +++ b/indra/newview/skins/default/xui/it/menu_people_nearby_view_sort.xml diff --git a/indra/newview/skins/default/xui/it/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/it/menu_people_recent_view_sort.xml index 7fccd1621a..7fccd1621a 100755..100644 --- a/indra/newview/skins/default/xui/it/menu_people_recent_view_sort.xml +++ b/indra/newview/skins/default/xui/it/menu_people_recent_view_sort.xml diff --git a/indra/newview/skins/default/xui/it/menu_picks.xml b/indra/newview/skins/default/xui/it/menu_picks.xml index 000d219ed0..000d219ed0 100755..100644 --- a/indra/newview/skins/default/xui/it/menu_picks.xml +++ b/indra/newview/skins/default/xui/it/menu_picks.xml diff --git a/indra/newview/skins/default/xui/it/menu_picks_plus.xml b/indra/newview/skins/default/xui/it/menu_picks_plus.xml index 7fbd5abd57..7fbd5abd57 100755..100644 --- a/indra/newview/skins/default/xui/it/menu_picks_plus.xml +++ b/indra/newview/skins/default/xui/it/menu_picks_plus.xml diff --git a/indra/newview/skins/default/xui/it/menu_place.xml b/indra/newview/skins/default/xui/it/menu_place.xml index 5381a4effa..5381a4effa 100755..100644 --- a/indra/newview/skins/default/xui/it/menu_place.xml +++ b/indra/newview/skins/default/xui/it/menu_place.xml diff --git a/indra/newview/skins/default/xui/it/menu_place_add_button.xml b/indra/newview/skins/default/xui/it/menu_place_add_button.xml index 0e783c0000..0e783c0000 100755..100644 --- a/indra/newview/skins/default/xui/it/menu_place_add_button.xml +++ b/indra/newview/skins/default/xui/it/menu_place_add_button.xml diff --git a/indra/newview/skins/default/xui/it/menu_places_gear_folder.xml b/indra/newview/skins/default/xui/it/menu_places_gear_folder.xml index 23757d47e0..23757d47e0 100755..100644 --- a/indra/newview/skins/default/xui/it/menu_places_gear_folder.xml +++ b/indra/newview/skins/default/xui/it/menu_places_gear_folder.xml diff --git a/indra/newview/skins/default/xui/it/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/it/menu_places_gear_landmark.xml index a458b1a768..a458b1a768 100755..100644 --- a/indra/newview/skins/default/xui/it/menu_places_gear_landmark.xml +++ b/indra/newview/skins/default/xui/it/menu_places_gear_landmark.xml diff --git a/indra/newview/skins/default/xui/it/menu_profile_overflow.xml b/indra/newview/skins/default/xui/it/menu_profile_overflow.xml index 56b695c597..56b695c597 100755..100644 --- a/indra/newview/skins/default/xui/it/menu_profile_overflow.xml +++ b/indra/newview/skins/default/xui/it/menu_profile_overflow.xml diff --git a/indra/newview/skins/default/xui/it/menu_save_outfit.xml b/indra/newview/skins/default/xui/it/menu_save_outfit.xml index 4882a8ac64..4882a8ac64 100755..100644 --- a/indra/newview/skins/default/xui/it/menu_save_outfit.xml +++ b/indra/newview/skins/default/xui/it/menu_save_outfit.xml diff --git a/indra/newview/skins/default/xui/it/menu_script_chiclet.xml b/indra/newview/skins/default/xui/it/menu_script_chiclet.xml index 604f754ba8..604f754ba8 100755..100644 --- a/indra/newview/skins/default/xui/it/menu_script_chiclet.xml +++ b/indra/newview/skins/default/xui/it/menu_script_chiclet.xml diff --git a/indra/newview/skins/default/xui/it/menu_slurl.xml b/indra/newview/skins/default/xui/it/menu_slurl.xml index be83133efc..be83133efc 100755..100644 --- a/indra/newview/skins/default/xui/it/menu_slurl.xml +++ b/indra/newview/skins/default/xui/it/menu_slurl.xml diff --git a/indra/newview/skins/default/xui/it/menu_teleport_history_gear.xml b/indra/newview/skins/default/xui/it/menu_teleport_history_gear.xml index 409a62c31b..409a62c31b 100755..100644 --- a/indra/newview/skins/default/xui/it/menu_teleport_history_gear.xml +++ b/indra/newview/skins/default/xui/it/menu_teleport_history_gear.xml diff --git a/indra/newview/skins/default/xui/it/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/it/menu_teleport_history_item.xml index 31236895fa..31236895fa 100755..100644 --- a/indra/newview/skins/default/xui/it/menu_teleport_history_item.xml +++ b/indra/newview/skins/default/xui/it/menu_teleport_history_item.xml diff --git a/indra/newview/skins/default/xui/it/menu_teleport_history_tab.xml b/indra/newview/skins/default/xui/it/menu_teleport_history_tab.xml index c221f141a6..c221f141a6 100755..100644 --- a/indra/newview/skins/default/xui/it/menu_teleport_history_tab.xml +++ b/indra/newview/skins/default/xui/it/menu_teleport_history_tab.xml diff --git a/indra/newview/skins/default/xui/it/menu_text_editor.xml b/indra/newview/skins/default/xui/it/menu_text_editor.xml index 5b61da914e..5b61da914e 100755..100644 --- a/indra/newview/skins/default/xui/it/menu_text_editor.xml +++ b/indra/newview/skins/default/xui/it/menu_text_editor.xml diff --git a/indra/newview/skins/default/xui/it/menu_toolbars.xml b/indra/newview/skins/default/xui/it/menu_toolbars.xml index 604ca763d1..604ca763d1 100755..100644 --- a/indra/newview/skins/default/xui/it/menu_toolbars.xml +++ b/indra/newview/skins/default/xui/it/menu_toolbars.xml diff --git a/indra/newview/skins/default/xui/it/menu_topinfobar.xml b/indra/newview/skins/default/xui/it/menu_topinfobar.xml index 0beb9314de..0beb9314de 100755..100644 --- a/indra/newview/skins/default/xui/it/menu_topinfobar.xml +++ b/indra/newview/skins/default/xui/it/menu_topinfobar.xml diff --git a/indra/newview/skins/default/xui/it/menu_url_agent.xml b/indra/newview/skins/default/xui/it/menu_url_agent.xml index e5c20fb9e9..e5c20fb9e9 100755..100644 --- a/indra/newview/skins/default/xui/it/menu_url_agent.xml +++ b/indra/newview/skins/default/xui/it/menu_url_agent.xml 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_url_group.xml b/indra/newview/skins/default/xui/it/menu_url_group.xml index d9a792ebdf..d9a792ebdf 100755..100644 --- a/indra/newview/skins/default/xui/it/menu_url_group.xml +++ b/indra/newview/skins/default/xui/it/menu_url_group.xml diff --git a/indra/newview/skins/default/xui/it/menu_url_http.xml b/indra/newview/skins/default/xui/it/menu_url_http.xml index e0153d9169..e0153d9169 100755..100644 --- a/indra/newview/skins/default/xui/it/menu_url_http.xml +++ b/indra/newview/skins/default/xui/it/menu_url_http.xml diff --git a/indra/newview/skins/default/xui/it/menu_url_inventory.xml b/indra/newview/skins/default/xui/it/menu_url_inventory.xml index a45a6bbc10..a45a6bbc10 100755..100644 --- a/indra/newview/skins/default/xui/it/menu_url_inventory.xml +++ b/indra/newview/skins/default/xui/it/menu_url_inventory.xml diff --git a/indra/newview/skins/default/xui/it/menu_url_map.xml b/indra/newview/skins/default/xui/it/menu_url_map.xml index cb7935b3ed..cb7935b3ed 100755..100644 --- a/indra/newview/skins/default/xui/it/menu_url_map.xml +++ b/indra/newview/skins/default/xui/it/menu_url_map.xml diff --git a/indra/newview/skins/default/xui/it/menu_url_objectim.xml b/indra/newview/skins/default/xui/it/menu_url_objectim.xml index 116b652172..116b652172 100755..100644 --- a/indra/newview/skins/default/xui/it/menu_url_objectim.xml +++ b/indra/newview/skins/default/xui/it/menu_url_objectim.xml diff --git a/indra/newview/skins/default/xui/it/menu_url_parcel.xml b/indra/newview/skins/default/xui/it/menu_url_parcel.xml index a032c33585..a032c33585 100755..100644 --- a/indra/newview/skins/default/xui/it/menu_url_parcel.xml +++ b/indra/newview/skins/default/xui/it/menu_url_parcel.xml diff --git a/indra/newview/skins/default/xui/it/menu_url_slapp.xml b/indra/newview/skins/default/xui/it/menu_url_slapp.xml index b368aa9141..b368aa9141 100755..100644 --- a/indra/newview/skins/default/xui/it/menu_url_slapp.xml +++ b/indra/newview/skins/default/xui/it/menu_url_slapp.xml diff --git a/indra/newview/skins/default/xui/it/menu_url_slurl.xml b/indra/newview/skins/default/xui/it/menu_url_slurl.xml index 355c7dbed9..355c7dbed9 100755..100644 --- a/indra/newview/skins/default/xui/it/menu_url_slurl.xml +++ b/indra/newview/skins/default/xui/it/menu_url_slurl.xml diff --git a/indra/newview/skins/default/xui/it/menu_url_teleport.xml b/indra/newview/skins/default/xui/it/menu_url_teleport.xml index c129e61f25..c129e61f25 100755..100644 --- a/indra/newview/skins/default/xui/it/menu_url_teleport.xml +++ b/indra/newview/skins/default/xui/it/menu_url_teleport.xml diff --git a/indra/newview/skins/default/xui/it/menu_viewer.xml b/indra/newview/skins/default/xui/it/menu_viewer.xml index d25e11e7a4..18ddad5ee8 100755..100644 --- a/indra/newview/skins/default/xui/it/menu_viewer.xml +++ b/indra/newview/skins/default/xui/it/menu_viewer.xml @@ -8,13 +8,14 @@ <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"/> <menu_item_check label="Vola" name="Fly"/> <menu_item_check label="Corri sempre" name="Always Run"/> <menu_item_call label="Ferma animazione" name="Stop Animating My Avatar"/> - <menu_item_call label="Cammina / corri / vola..." name="Walk / run / fly"/> + <menu_item_call label="Cammina / corri / vola..." name="WalkRunFly"/> </menu> <menu label="Stato" name="Status"> <menu_item_check label="Assente" name="Away"/> @@ -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'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"> @@ -62,7 +64,7 @@ <menu_item_call label="Istantanea" name="Take Snapshot"/> <menu_item_call label="Profilo del luogo" name="Place Profile"/> <menu_item_call label="Informazioni sul terreno" name="About Land"/> - <menu_item_call label="Regione/proprietà immobiliare" name="Region/Estate"/> + <menu_item_call label="Regione/proprietà immobiliare" name="RegionEstate"/> <menu_item_call label="Terreni posseduti..." name="My Land"/> <menu_item_call label="Acquista questo terreno" name="Buy Land"/> <menu label="Mostra" name="LandShow"> @@ -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/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/it/menu_wearable_list_item.xml index c9a02d8a86..c9a02d8a86 100755..100644 --- a/indra/newview/skins/default/xui/it/menu_wearable_list_item.xml +++ b/indra/newview/skins/default/xui/it/menu_wearable_list_item.xml diff --git a/indra/newview/skins/default/xui/it/menu_wearing_gear.xml b/indra/newview/skins/default/xui/it/menu_wearing_gear.xml index de25f88aca..de25f88aca 100755..100644 --- a/indra/newview/skins/default/xui/it/menu_wearing_gear.xml +++ b/indra/newview/skins/default/xui/it/menu_wearing_gear.xml diff --git a/indra/newview/skins/default/xui/it/menu_wearing_tab.xml b/indra/newview/skins/default/xui/it/menu_wearing_tab.xml index 4a5366091f..4a5366091f 100755..100644 --- a/indra/newview/skins/default/xui/it/menu_wearing_tab.xml +++ b/indra/newview/skins/default/xui/it/menu_wearing_tab.xml 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..100644 --- 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..100644 --- 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'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..100644 --- 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'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..61131b09c3 100755..100644 --- 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 '[_NAME]' 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'errore durante il tentativo di aggiornamento. [http://get.secondlife.com Scarica l'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'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'errore seguente: + + '[ERROR_CODE]' + <usetemplate name="okbutton" yestext="OK"/> + </notification> + <notification name="MerchantPasteFailed"> + Impossibile copiare o spostare gli annunci Marketplace a causa dell'errore seguente: + + '[ERROR_CODE]' + <usetemplate name="okbutton" yestext="OK"/> + </notification> + <notification name="MerchantTransactionFailed"> + La transazione in Marketplace non è riuscita a causa dell'errore seguente: + + Motivo: '[ERROR_REASON]' + [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'annuncio, ma potrebbero esserci errori nella struttura delle cartelle. Modifica l'annuncio oppure verifica che non ci siano problemi legati alla cartella dell'annuncio. + <usetemplate name="okbutton" yestext="OK"/> + </notification> + <notification name="MerchantListingFailed"> + Aggiunta annuncio a Marketplace non riuscita a causa dell'errore seguente: + + '[ERROR_CODE]' + <usetemplate name="okbutton" yestext="OK"/> + </notification> + <notification name="MerchantFolderActivationFailed"> + L'attivazione di questa cartella di versione non è riuscita a causa dell'errore: + + '[ERROR_CODE]' + <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'inventario a Marketplace" name="okcancelignore" notext="Annulla" yestext="OK"/> + </notification> + <notification name="ConfirmListingCutOrDelete"> + Se sposti o elimini la cartella dell'annuncio, l'annuncio su Marketplace verrà eliminato. Per mantenere l'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'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'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'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'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'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'annuncio. + <usetemplate ignoretext="Avverti quando la cartella di magazzino viene suddivisa prima della pubblicazione dell'annuncio" name="okignore" yestext="OK"/> + </notification> + <notification name="AlertMerchantStockFolderEmpty"> + L'annuncio è stato rimosso perché il magazzino è esaurito. Aggiungi altre unità alla cartella di magazzino prima di pubblicare nuovamente l'annuncio. + <usetemplate ignoretext="Avverti quando un annuncio viene rimosso perché la cartella di magazzino è vuota" name="okignore" yestext="OK"/> + </notification> <notification name="CompileQueueSaveText"> C'è 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 > 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'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'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'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'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'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'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'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 > Preferenze > 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. '[REGION_NAME]' è 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 > Preferenze > Generale nella barra del menu. <usetemplate name="okbutton" yestext="OK"/> @@ -2126,6 +2250,10 @@ Trasferisci gli elementi nell'inventario? <ignore name="ignore" text="Ho impostato l'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'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 > Mostra impostazioni di debug > 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. @@ -2662,9 +2793,6 @@ Riprova tra qualche istante. <notification name="NoValidCircuit"> Nessun codice circuito valido. </notification> - <notification name="NoValidTimestamp"> - Nessuna data/timestamp valido. - </notification> <notification name="NoPendingConnection"> Impossibile creare la connessione in sospeso. </notification> @@ -2819,7 +2947,7 @@ Se rimani qui verrai scollegato da Second Life. [MESSAGE] -Dall'oggetto: <nolink>[OBJECTNAME]</nolink>, proprietario: [NAME]? +Dall'oggetto: <nolink>[OBJECTNAME]</nolink>, proprietario: [NAME] <form name="form"> <button name="Gotopage" text="Caricare"/> <button name="Cancel" text="Annulla"/> @@ -2845,6 +2973,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 '[field]' è stato ignorato durante l'aggiornamento del profilo esperienza. + </notification> + <notification name="RestrictedToOwnerExperienceProfileMessage"> + Ignorate le modifiche apportate al campo '[field]', che può essere impostato solo dal proprietario dell'esperienza. + </notification> + <notification name="MaturityRatingExceedsOwnerExperienceProfileMessage"> + Non puoi impostare la categoria di accesso di un'esperienza a un livello maggiore di quello del proprietario. + </notification> + <notification name="RestrictedTermExperienceProfileMessage"> + I termini seguenti hanno impedito l'aggiornamento del nome o della descrizione del profilo dell'esperienza: [extra_info] + </notification> + <notification name="TeleportedHomeExperienceRemoved"> + Sei stato teleportato dalla regione [region_name] per aver rimosso l'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'esperienza"/> + </form> + </notification> + <notification name="TrustedExperienceEntry"> + Ti è stato consentito l'accesso alla regione [region_name] grazie alla partecipazione all'esperienza chiave secondlife:///app/experience/[public_id]/profile. Se rimuovi l'esperienza, sarai passibile di espulsione dalla regione. + <form name="form"> + <ignore name="ignore" text="Può accedere a una regione grazie a un'esperienza"/> + </form> + </notification> + <notification name="TrustedExperiencesAvailable"> + Non puoi accedere a questa destinazione. Potresti accedere alla regione accettando un'esperienza nell'elenco seguente: + +[EXPERIENCE_LIST] + +Potrebbero essere disponibili altre esperienze chiave. + </notification> + <notification name="ExperienceEvent"> + L'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'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"> + '<nolink>[OBJECTNAME]</nolink>', un oggetto posseduto da '[NAME]', richiede la tua partecipazione all'esperienza [GRID_WIDE]: + +[EXPERIENCE] + +Una volta concessa l'autorizzazione, questo messaggio non verrà più visualizzato per questa esperienza, a meno che l'autorizzazione non venga revocata nel profilo dell'esperienza. + +Gli script associati a questa esperienza potranno fare quanto segue nelle regioni in cui è attiva l'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'oggetto '<nolink>[OBJECTNAME]</nolink>' ha richiesto accesso completo al tuo account in Dollari Linden. Se consenti l'accesso, potrà rimuovere fondi dal tuo account in qualunque momento e anche svuotare completamente l'account, per un periodo illimitato e senza ulteriori avvisi. @@ -3164,6 +3358,10 @@ Hai caricato una texture [RESOLUTION] completata per '[BODYREGION]' do ( In esistenza da [EXISTENCE] secondi) Hai aggiornato localmente una texture [RESOLUTION] completata per '[BODYREGION]' dopo [TIME] secondi. </notification> + <notification name="CannotUploadTexture"> + Impossibile caricare la texture. +[REASON] + </notification> <notification name="LivePreviewUnavailable"> Non possiamo mostrare un'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 +3937,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'oggetto '[OBJECT_NAME]' sul lotto '[PARCEL_NAME]' + <usetemplate ignoretext="Teleport: sei stato teleportato su un lotto da un oggetto" name="notifyignore"/> </notification> <notification name="TeleportedByObjectOwnedBy"> Sei stato teleportato dall'oggetto '[OBJECT_NAME]' di proprietà di [OWNER_ID] @@ -4073,7 +4273,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'oggetto: [REASON]. Riprova più tardi. <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="ChatHistoryIsBusyAlert"> diff --git a/indra/newview/skins/default/xui/it/outfit_accordion_tab.xml b/indra/newview/skins/default/xui/it/outfit_accordion_tab.xml index bac885e5d8..bac885e5d8 100755..100644 --- a/indra/newview/skins/default/xui/it/outfit_accordion_tab.xml +++ b/indra/newview/skins/default/xui/it/outfit_accordion_tab.xml diff --git a/indra/newview/skins/default/xui/it/panel_active_object_row.xml b/indra/newview/skins/default/xui/it/panel_active_object_row.xml index b8cca6f01a..b8cca6f01a 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_active_object_row.xml +++ b/indra/newview/skins/default/xui/it/panel_active_object_row.xml diff --git a/indra/newview/skins/default/xui/it/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/it/panel_adhoc_control_panel.xml index be001d09f8..be001d09f8 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_adhoc_control_panel.xml +++ b/indra/newview/skins/default/xui/it/panel_adhoc_control_panel.xml diff --git a/indra/newview/skins/default/xui/it/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/it/panel_avatar_list_item.xml index cfceb5b982..cfceb5b982 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_avatar_list_item.xml +++ b/indra/newview/skins/default/xui/it/panel_avatar_list_item.xml diff --git a/indra/newview/skins/default/xui/it/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/it/panel_block_list_sidetray.xml index 7ca2d3b57b..7ca2d3b57b 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_block_list_sidetray.xml +++ b/indra/newview/skins/default/xui/it/panel_block_list_sidetray.xml diff --git a/indra/newview/skins/default/xui/it/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/it/panel_body_parts_list_item.xml index b44c4c29e6..b44c4c29e6 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_body_parts_list_item.xml +++ b/indra/newview/skins/default/xui/it/panel_body_parts_list_item.xml diff --git a/indra/newview/skins/default/xui/it/panel_bodyparts_list_button_bar.xml b/indra/newview/skins/default/xui/it/panel_bodyparts_list_button_bar.xml index 8fc23d34f1..8fc23d34f1 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_bodyparts_list_button_bar.xml +++ b/indra/newview/skins/default/xui/it/panel_bodyparts_list_button_bar.xml diff --git a/indra/newview/skins/default/xui/it/panel_bottomtray_lite.xml b/indra/newview/skins/default/xui/it/panel_bottomtray_lite.xml index ff576c7dd2..ff576c7dd2 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_bottomtray_lite.xml +++ b/indra/newview/skins/default/xui/it/panel_bottomtray_lite.xml diff --git a/indra/newview/skins/default/xui/it/panel_chiclet_bar.xml b/indra/newview/skins/default/xui/it/panel_chiclet_bar.xml index 66bf3f140f..66bf3f140f 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_chiclet_bar.xml +++ b/indra/newview/skins/default/xui/it/panel_chiclet_bar.xml diff --git a/indra/newview/skins/default/xui/it/panel_classified_info.xml b/indra/newview/skins/default/xui/it/panel_classified_info.xml index a7cf51c4b9..a7cf51c4b9 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_classified_info.xml +++ b/indra/newview/skins/default/xui/it/panel_classified_info.xml diff --git a/indra/newview/skins/default/xui/it/panel_clothing_list_button_bar.xml b/indra/newview/skins/default/xui/it/panel_clothing_list_button_bar.xml index e9d9795b3a..e9d9795b3a 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_clothing_list_button_bar.xml +++ b/indra/newview/skins/default/xui/it/panel_clothing_list_button_bar.xml diff --git a/indra/newview/skins/default/xui/it/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/it/panel_clothing_list_item.xml index 7667e95663..7667e95663 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_clothing_list_item.xml +++ b/indra/newview/skins/default/xui/it/panel_clothing_list_item.xml diff --git a/indra/newview/skins/default/xui/it/panel_cof_wearables.xml b/indra/newview/skins/default/xui/it/panel_cof_wearables.xml index d914a5740f..d914a5740f 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_cof_wearables.xml +++ b/indra/newview/skins/default/xui/it/panel_cof_wearables.xml diff --git a/indra/newview/skins/default/xui/it/panel_deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/it/panel_deletable_wearable_list_item.xml index cbcaa0689a..cbcaa0689a 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_deletable_wearable_list_item.xml +++ b/indra/newview/skins/default/xui/it/panel_deletable_wearable_list_item.xml diff --git a/indra/newview/skins/default/xui/it/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/it/panel_dummy_clothing_list_item.xml index eb3af5f2a5..eb3af5f2a5 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_dummy_clothing_list_item.xml +++ b/indra/newview/skins/default/xui/it/panel_dummy_clothing_list_item.xml diff --git a/indra/newview/skins/default/xui/it/panel_edit_alpha.xml b/indra/newview/skins/default/xui/it/panel_edit_alpha.xml index 6daa0cf8fd..6daa0cf8fd 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_edit_alpha.xml +++ b/indra/newview/skins/default/xui/it/panel_edit_alpha.xml diff --git a/indra/newview/skins/default/xui/it/panel_edit_classified.xml b/indra/newview/skins/default/xui/it/panel_edit_classified.xml index ad827696ff..ad827696ff 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_edit_classified.xml +++ b/indra/newview/skins/default/xui/it/panel_edit_classified.xml diff --git a/indra/newview/skins/default/xui/it/panel_edit_eyes.xml b/indra/newview/skins/default/xui/it/panel_edit_eyes.xml index 9f31bb7dc7..9f31bb7dc7 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_edit_eyes.xml +++ b/indra/newview/skins/default/xui/it/panel_edit_eyes.xml diff --git a/indra/newview/skins/default/xui/it/panel_edit_gloves.xml b/indra/newview/skins/default/xui/it/panel_edit_gloves.xml index 366a82f7aa..366a82f7aa 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_edit_gloves.xml +++ b/indra/newview/skins/default/xui/it/panel_edit_gloves.xml diff --git a/indra/newview/skins/default/xui/it/panel_edit_hair.xml b/indra/newview/skins/default/xui/it/panel_edit_hair.xml index 50e2e7e4b3..50e2e7e4b3 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_edit_hair.xml +++ b/indra/newview/skins/default/xui/it/panel_edit_hair.xml diff --git a/indra/newview/skins/default/xui/it/panel_edit_jacket.xml b/indra/newview/skins/default/xui/it/panel_edit_jacket.xml index 337720d068..337720d068 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_edit_jacket.xml +++ b/indra/newview/skins/default/xui/it/panel_edit_jacket.xml diff --git a/indra/newview/skins/default/xui/it/panel_edit_pants.xml b/indra/newview/skins/default/xui/it/panel_edit_pants.xml index 21b5b7c026..21b5b7c026 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_edit_pants.xml +++ b/indra/newview/skins/default/xui/it/panel_edit_pants.xml diff --git a/indra/newview/skins/default/xui/it/panel_edit_physics.xml b/indra/newview/skins/default/xui/it/panel_edit_physics.xml index 669a2c0eab..669a2c0eab 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_edit_physics.xml +++ b/indra/newview/skins/default/xui/it/panel_edit_physics.xml diff --git a/indra/newview/skins/default/xui/it/panel_edit_pick.xml b/indra/newview/skins/default/xui/it/panel_edit_pick.xml index 145b8cf4e3..145b8cf4e3 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_edit_pick.xml +++ b/indra/newview/skins/default/xui/it/panel_edit_pick.xml diff --git a/indra/newview/skins/default/xui/it/panel_edit_profile.xml b/indra/newview/skins/default/xui/it/panel_edit_profile.xml index 545e96a8f1..545e96a8f1 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_edit_profile.xml +++ b/indra/newview/skins/default/xui/it/panel_edit_profile.xml diff --git a/indra/newview/skins/default/xui/it/panel_edit_shape.xml b/indra/newview/skins/default/xui/it/panel_edit_shape.xml index fd6a7af69c..fd6a7af69c 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_edit_shape.xml +++ b/indra/newview/skins/default/xui/it/panel_edit_shape.xml diff --git a/indra/newview/skins/default/xui/it/panel_edit_shirt.xml b/indra/newview/skins/default/xui/it/panel_edit_shirt.xml index 1777c0147f..1777c0147f 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_edit_shirt.xml +++ b/indra/newview/skins/default/xui/it/panel_edit_shirt.xml diff --git a/indra/newview/skins/default/xui/it/panel_edit_shoes.xml b/indra/newview/skins/default/xui/it/panel_edit_shoes.xml index c79408b94a..c79408b94a 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_edit_shoes.xml +++ b/indra/newview/skins/default/xui/it/panel_edit_shoes.xml diff --git a/indra/newview/skins/default/xui/it/panel_edit_skin.xml b/indra/newview/skins/default/xui/it/panel_edit_skin.xml index 466eff2708..466eff2708 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_edit_skin.xml +++ b/indra/newview/skins/default/xui/it/panel_edit_skin.xml diff --git a/indra/newview/skins/default/xui/it/panel_edit_skirt.xml b/indra/newview/skins/default/xui/it/panel_edit_skirt.xml index 87cdd16676..87cdd16676 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_edit_skirt.xml +++ b/indra/newview/skins/default/xui/it/panel_edit_skirt.xml diff --git a/indra/newview/skins/default/xui/it/panel_edit_socks.xml b/indra/newview/skins/default/xui/it/panel_edit_socks.xml index f61a72ed76..f61a72ed76 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_edit_socks.xml +++ b/indra/newview/skins/default/xui/it/panel_edit_socks.xml diff --git a/indra/newview/skins/default/xui/it/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/it/panel_edit_tattoo.xml index d76fb62c53..d76fb62c53 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_edit_tattoo.xml +++ b/indra/newview/skins/default/xui/it/panel_edit_tattoo.xml diff --git a/indra/newview/skins/default/xui/it/panel_edit_underpants.xml b/indra/newview/skins/default/xui/it/panel_edit_underpants.xml index 924344e3c0..924344e3c0 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_edit_underpants.xml +++ b/indra/newview/skins/default/xui/it/panel_edit_underpants.xml diff --git a/indra/newview/skins/default/xui/it/panel_edit_undershirt.xml b/indra/newview/skins/default/xui/it/panel_edit_undershirt.xml index 2f22c03294..2f22c03294 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_edit_undershirt.xml +++ b/indra/newview/skins/default/xui/it/panel_edit_undershirt.xml diff --git a/indra/newview/skins/default/xui/it/panel_edit_wearable.xml b/indra/newview/skins/default/xui/it/panel_edit_wearable.xml index e54dc26d05..e54dc26d05 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_edit_wearable.xml +++ b/indra/newview/skins/default/xui/it/panel_edit_wearable.xml 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'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="<" name="btn_prev"/> + <button label=">" 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"> + '[TEXT]' 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"> + "Parcel_PG_Light" + </string> + <string name="maturity_icon_moderate"> + "Parcel_M_Light" + </string> + <string name="maturity_icon_adult"> + "Parcel_R_Light" + </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="<" name="left_btn"/> + <button label=">" 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'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'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'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'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'anteprima"/> - <text name="title_label"> - Titolo: - </text> - <text name="description_label"> - Descrizione: - </text> - <check_box initial_value="true" label="Includi l'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'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 "" 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_control_panel.xml b/indra/newview/skins/default/xui/it/panel_group_control_panel.xml index 2d17e4a0cd..2d17e4a0cd 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_group_control_panel.xml +++ b/indra/newview/skins/default/xui/it/panel_group_control_panel.xml diff --git a/indra/newview/skins/default/xui/it/panel_group_general.xml b/indra/newview/skins/default/xui/it/panel_group_general.xml index 49baa73811..49baa73811 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_group_general.xml +++ b/indra/newview/skins/default/xui/it/panel_group_general.xml 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..100644 --- 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_group_invite.xml b/indra/newview/skins/default/xui/it/panel_group_invite.xml index 01edb7391a..01edb7391a 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_group_invite.xml +++ b/indra/newview/skins/default/xui/it/panel_group_invite.xml diff --git a/indra/newview/skins/default/xui/it/panel_group_land_money.xml b/indra/newview/skins/default/xui/it/panel_group_land_money.xml index 27675a18f5..27675a18f5 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_group_land_money.xml +++ b/indra/newview/skins/default/xui/it/panel_group_land_money.xml diff --git a/indra/newview/skins/default/xui/it/panel_group_list_item.xml b/indra/newview/skins/default/xui/it/panel_group_list_item.xml index 72e644008c..72e644008c 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_group_list_item.xml +++ b/indra/newview/skins/default/xui/it/panel_group_list_item.xml diff --git a/indra/newview/skins/default/xui/it/panel_group_notices.xml b/indra/newview/skins/default/xui/it/panel_group_notices.xml index 524f7d2822..524f7d2822 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_group_notices.xml +++ b/indra/newview/skins/default/xui/it/panel_group_notices.xml diff --git a/indra/newview/skins/default/xui/it/panel_group_notify.xml b/indra/newview/skins/default/xui/it/panel_group_notify.xml index 91a41353a5..91a41353a5 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_group_notify.xml +++ b/indra/newview/skins/default/xui/it/panel_group_notify.xml diff --git a/indra/newview/skins/default/xui/it/panel_group_roles.xml b/indra/newview/skins/default/xui/it/panel_group_roles.xml index 4d414d47ce..4d414d47ce 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_group_roles.xml +++ b/indra/newview/skins/default/xui/it/panel_group_roles.xml diff --git a/indra/newview/skins/default/xui/it/panel_im_control_panel.xml b/indra/newview/skins/default/xui/it/panel_im_control_panel.xml index 76b28eab24..76b28eab24 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_im_control_panel.xml +++ b/indra/newview/skins/default/xui/it/panel_im_control_panel.xml diff --git a/indra/newview/skins/default/xui/it/panel_inventory_item.xml b/indra/newview/skins/default/xui/it/panel_inventory_item.xml index d18047fbcf..d18047fbcf 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_inventory_item.xml +++ b/indra/newview/skins/default/xui/it/panel_inventory_item.xml diff --git a/indra/newview/skins/default/xui/it/panel_landmark_info.xml b/indra/newview/skins/default/xui/it/panel_landmark_info.xml index b4c5ab01bc..b4c5ab01bc 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_landmark_info.xml +++ b/indra/newview/skins/default/xui/it/panel_landmark_info.xml diff --git a/indra/newview/skins/default/xui/it/panel_landmarks.xml b/indra/newview/skins/default/xui/it/panel_landmarks.xml index 5617105c31..5617105c31 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_landmarks.xml +++ b/indra/newview/skins/default/xui/it/panel_landmarks.xml 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..100644 --- 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'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'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_main_inventory.xml b/indra/newview/skins/default/xui/it/panel_main_inventory.xml index 446b51ffa3..446b51ffa3 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/it/panel_main_inventory.xml 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_me.xml b/indra/newview/skins/default/xui/it/panel_me.xml index a134f6f1de..a134f6f1de 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_me.xml +++ b/indra/newview/skins/default/xui/it/panel_me.xml diff --git a/indra/newview/skins/default/xui/it/panel_media_settings_general.xml b/indra/newview/skins/default/xui/it/panel_media_settings_general.xml index f11b2415ee..f11b2415ee 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_media_settings_general.xml +++ b/indra/newview/skins/default/xui/it/panel_media_settings_general.xml diff --git a/indra/newview/skins/default/xui/it/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/it/panel_media_settings_permissions.xml index 0f0f1c9fe4..0f0f1c9fe4 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_media_settings_permissions.xml +++ b/indra/newview/skins/default/xui/it/panel_media_settings_permissions.xml diff --git a/indra/newview/skins/default/xui/it/panel_media_settings_security.xml b/indra/newview/skins/default/xui/it/panel_media_settings_security.xml index 785cd048a1..785cd048a1 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_media_settings_security.xml +++ b/indra/newview/skins/default/xui/it/panel_media_settings_security.xml diff --git a/indra/newview/skins/default/xui/it/panel_navigation_bar.xml b/indra/newview/skins/default/xui/it/panel_navigation_bar.xml index 0299e2a532..0299e2a532 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_navigation_bar.xml +++ b/indra/newview/skins/default/xui/it/panel_navigation_bar.xml diff --git a/indra/newview/skins/default/xui/it/panel_nearby_chat.xml b/indra/newview/skins/default/xui/it/panel_nearby_chat.xml index d46a15c735..d46a15c735 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_nearby_chat.xml +++ b/indra/newview/skins/default/xui/it/panel_nearby_chat.xml diff --git a/indra/newview/skins/default/xui/it/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/it/panel_nearby_chat_bar.xml index 1fef88870a..1fef88870a 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_nearby_chat_bar.xml +++ b/indra/newview/skins/default/xui/it/panel_nearby_chat_bar.xml diff --git a/indra/newview/skins/default/xui/it/panel_nearby_media.xml b/indra/newview/skins/default/xui/it/panel_nearby_media.xml index 03421456f9..03421456f9 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_nearby_media.xml +++ b/indra/newview/skins/default/xui/it/panel_nearby_media.xml diff --git a/indra/newview/skins/default/xui/it/panel_notify_textbox.xml b/indra/newview/skins/default/xui/it/panel_notify_textbox.xml index ef27262010..ef27262010 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_notify_textbox.xml +++ b/indra/newview/skins/default/xui/it/panel_notify_textbox.xml diff --git a/indra/newview/skins/default/xui/it/panel_online_status_toast.xml b/indra/newview/skins/default/xui/it/panel_online_status_toast.xml index fdc489f375..fdc489f375 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_online_status_toast.xml +++ b/indra/newview/skins/default/xui/it/panel_online_status_toast.xml diff --git a/indra/newview/skins/default/xui/it/panel_outbox_inventory.xml b/indra/newview/skins/default/xui/it/panel_outbox_inventory.xml index af5e05336e..af5e05336e 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_outbox_inventory.xml +++ b/indra/newview/skins/default/xui/it/panel_outbox_inventory.xml diff --git a/indra/newview/skins/default/xui/it/panel_outfit_edit.xml b/indra/newview/skins/default/xui/it/panel_outfit_edit.xml index 446c211b1c..446c211b1c 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_outfit_edit.xml +++ b/indra/newview/skins/default/xui/it/panel_outfit_edit.xml diff --git a/indra/newview/skins/default/xui/it/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/it/panel_outfits_inventory.xml index c7821bc363..c7821bc363 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_outfits_inventory.xml +++ b/indra/newview/skins/default/xui/it/panel_outfits_inventory.xml diff --git a/indra/newview/skins/default/xui/it/panel_outfits_inventory_gear_default.xml b/indra/newview/skins/default/xui/it/panel_outfits_inventory_gear_default.xml index 9e1a45b129..9e1a45b129 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_outfits_inventory_gear_default.xml +++ b/indra/newview/skins/default/xui/it/panel_outfits_inventory_gear_default.xml diff --git a/indra/newview/skins/default/xui/it/panel_outfits_list.xml b/indra/newview/skins/default/xui/it/panel_outfits_list.xml index d0c275e29f..d0c275e29f 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_outfits_list.xml +++ b/indra/newview/skins/default/xui/it/panel_outfits_list.xml diff --git a/indra/newview/skins/default/xui/it/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/it/panel_outfits_wearing.xml index 3bbf2446f5..3bbf2446f5 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_outfits_wearing.xml +++ b/indra/newview/skins/default/xui/it/panel_outfits_wearing.xml diff --git a/indra/newview/skins/default/xui/it/panel_people.xml b/indra/newview/skins/default/xui/it/panel_people.xml index 2f40d4bdc4..2f40d4bdc4 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_people.xml +++ b/indra/newview/skins/default/xui/it/panel_people.xml diff --git a/indra/newview/skins/default/xui/it/panel_pick_info.xml b/indra/newview/skins/default/xui/it/panel_pick_info.xml index ca9959a581..ca9959a581 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_pick_info.xml +++ b/indra/newview/skins/default/xui/it/panel_pick_info.xml diff --git a/indra/newview/skins/default/xui/it/panel_picks.xml b/indra/newview/skins/default/xui/it/panel_picks.xml index 3faf28a948..3faf28a948 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_picks.xml +++ b/indra/newview/skins/default/xui/it/panel_picks.xml diff --git a/indra/newview/skins/default/xui/it/panel_place_profile.xml b/indra/newview/skins/default/xui/it/panel_place_profile.xml index 890dfc2458..890dfc2458 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_place_profile.xml +++ b/indra/newview/skins/default/xui/it/panel_place_profile.xml diff --git a/indra/newview/skins/default/xui/it/panel_places.xml b/indra/newview/skins/default/xui/it/panel_places.xml index 69995fb5de..69995fb5de 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_places.xml +++ b/indra/newview/skins/default/xui/it/panel_places.xml diff --git a/indra/newview/skins/default/xui/it/panel_postcard_message.xml b/indra/newview/skins/default/xui/it/panel_postcard_message.xml index c720f4822d..c720f4822d 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_postcard_message.xml +++ b/indra/newview/skins/default/xui/it/panel_postcard_message.xml 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..100644 --- 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'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_advanced.xml b/indra/newview/skins/default/xui/it/panel_preferences_advanced.xml index ccca27cbfd..ccca27cbfd 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/it/panel_preferences_advanced.xml diff --git a/indra/newview/skins/default/xui/it/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/it/panel_preferences_alerts.xml index fd1fd57761..fd1fd57761 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_preferences_alerts.xml +++ b/indra/newview/skins/default/xui/it/panel_preferences_alerts.xml diff --git a/indra/newview/skins/default/xui/it/panel_preferences_chat.xml b/indra/newview/skins/default/xui/it/panel_preferences_chat.xml index 09d7c96370..09d7c96370 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/it/panel_preferences_chat.xml diff --git a/indra/newview/skins/default/xui/it/panel_preferences_colors.xml b/indra/newview/skins/default/xui/it/panel_preferences_colors.xml index 016970d9a3..016970d9a3 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_preferences_colors.xml +++ b/indra/newview/skins/default/xui/it/panel_preferences_colors.xml diff --git a/indra/newview/skins/default/xui/it/panel_preferences_general.xml b/indra/newview/skins/default/xui/it/panel_preferences_general.xml index ef999d03c0..ef999d03c0 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/it/panel_preferences_general.xml diff --git a/indra/newview/skins/default/xui/it/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/it/panel_preferences_graphics1.xml index 2978c48db6..2978c48db6 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/it/panel_preferences_graphics1.xml diff --git a/indra/newview/skins/default/xui/it/panel_preferences_move.xml b/indra/newview/skins/default/xui/it/panel_preferences_move.xml index 8d172bb8bb..8d172bb8bb 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_preferences_move.xml +++ b/indra/newview/skins/default/xui/it/panel_preferences_move.xml diff --git a/indra/newview/skins/default/xui/it/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/it/panel_preferences_privacy.xml index 2a73b66c9e..2a73b66c9e 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_preferences_privacy.xml +++ b/indra/newview/skins/default/xui/it/panel_preferences_privacy.xml 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..100644 --- 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'aiuto, per i link Web e così via. Sconsigliato durante l'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'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'aiuto, per i link Web e così via. Sconsigliato durante l'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'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_preferences_sound.xml b/indra/newview/skins/default/xui/it/panel_preferences_sound.xml index d00512aaf7..d00512aaf7 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/it/panel_preferences_sound.xml diff --git a/indra/newview/skins/default/xui/it/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/it/panel_prim_media_controls.xml index 4620d72977..4620d72977 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_prim_media_controls.xml +++ b/indra/newview/skins/default/xui/it/panel_prim_media_controls.xml diff --git a/indra/newview/skins/default/xui/it/panel_region_covenant.xml b/indra/newview/skins/default/xui/it/panel_region_covenant.xml index 0d3117ca7a..0d3117ca7a 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_region_covenant.xml +++ b/indra/newview/skins/default/xui/it/panel_region_covenant.xml diff --git a/indra/newview/skins/default/xui/it/panel_region_debug.xml b/indra/newview/skins/default/xui/it/panel_region_debug.xml index ca39cf6d05..ca39cf6d05 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_region_debug.xml +++ b/indra/newview/skins/default/xui/it/panel_region_debug.xml diff --git a/indra/newview/skins/default/xui/it/panel_region_environment.xml b/indra/newview/skins/default/xui/it/panel_region_environment.xml index 81bc8253f4..81bc8253f4 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_region_environment.xml +++ b/indra/newview/skins/default/xui/it/panel_region_environment.xml diff --git a/indra/newview/skins/default/xui/it/panel_region_estate.xml b/indra/newview/skins/default/xui/it/panel_region_estate.xml index 98d9b86cfc..98d9b86cfc 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_region_estate.xml +++ b/indra/newview/skins/default/xui/it/panel_region_estate.xml 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'esperienza chiave. + +Le esperienze chiave dispongono di autorizzazione per l'esecuzione in questa proprietà immobiliare. + +Inoltre, se la proprietà immobiliare non consente l'accesso pubblico, i Residenti che partecipano a un'esperienza chiave possono accedere alla proprietà e restarvi per tutto il tempo durante il quale partecipano all'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'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'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_region_general.xml b/indra/newview/skins/default/xui/it/panel_region_general.xml index 3e2f593d2f..3e2f593d2f 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_region_general.xml +++ b/indra/newview/skins/default/xui/it/panel_region_general.xml diff --git a/indra/newview/skins/default/xui/it/panel_region_terrain.xml b/indra/newview/skins/default/xui/it/panel_region_terrain.xml index c61ac3ecce..c61ac3ecce 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_region_terrain.xml +++ b/indra/newview/skins/default/xui/it/panel_region_terrain.xml diff --git a/indra/newview/skins/default/xui/it/panel_script_ed.xml b/indra/newview/skins/default/xui/it/panel_script_ed.xml index 3cbdadbac8..3cbdadbac8 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_script_ed.xml +++ b/indra/newview/skins/default/xui/it/panel_script_ed.xml 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_script_limits_my_avatar.xml b/indra/newview/skins/default/xui/it/panel_script_limits_my_avatar.xml index 98096a391a..98096a391a 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_script_limits_my_avatar.xml +++ b/indra/newview/skins/default/xui/it/panel_script_limits_my_avatar.xml diff --git a/indra/newview/skins/default/xui/it/panel_script_limits_region_memory.xml b/indra/newview/skins/default/xui/it/panel_script_limits_region_memory.xml index df7b0eae1c..df7b0eae1c 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_script_limits_region_memory.xml +++ b/indra/newview/skins/default/xui/it/panel_script_limits_region_memory.xml diff --git a/indra/newview/skins/default/xui/it/panel_script_question_toast.xml b/indra/newview/skins/default/xui/it/panel_script_question_toast.xml index a2d0237da0..a2d0237da0 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_script_question_toast.xml +++ b/indra/newview/skins/default/xui/it/panel_script_question_toast.xml diff --git a/indra/newview/skins/default/xui/it/panel_scrolling_param.xml b/indra/newview/skins/default/xui/it/panel_scrolling_param.xml index b5f8c8d6f0..b5f8c8d6f0 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_scrolling_param.xml +++ b/indra/newview/skins/default/xui/it/panel_scrolling_param.xml diff --git a/indra/newview/skins/default/xui/it/panel_scrolling_param_base.xml b/indra/newview/skins/default/xui/it/panel_scrolling_param_base.xml index fa659040ea..fa659040ea 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_scrolling_param_base.xml +++ b/indra/newview/skins/default/xui/it/panel_scrolling_param_base.xml diff --git a/indra/newview/skins/default/xui/it/panel_side_tray_tab_caption.xml b/indra/newview/skins/default/xui/it/panel_side_tray_tab_caption.xml index 3c7874e093..3c7874e093 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_side_tray_tab_caption.xml +++ b/indra/newview/skins/default/xui/it/panel_side_tray_tab_caption.xml 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..100644 --- 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'inventario + Inventario </text> <text name="hint_lbl"> Salvare un'immagine nell'inventario costa L$[UPLOAD_COST]. Per salvare l'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..100644 --- 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'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..100644 --- 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'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..100644 --- 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..100644 --- 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_sound_devices.xml b/indra/newview/skins/default/xui/it/panel_sound_devices.xml index b1934fd515..b1934fd515 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_sound_devices.xml +++ b/indra/newview/skins/default/xui/it/panel_sound_devices.xml diff --git a/indra/newview/skins/default/xui/it/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/it/panel_stand_stop_flying.xml index e4ff7019ec..e4ff7019ec 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_stand_stop_flying.xml +++ b/indra/newview/skins/default/xui/it/panel_stand_stop_flying.xml 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..100644 --- 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_teleport_history.xml b/indra/newview/skins/default/xui/it/panel_teleport_history.xml index f4fa59babe..f4fa59babe 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_teleport_history.xml +++ b/indra/newview/skins/default/xui/it/panel_teleport_history.xml diff --git a/indra/newview/skins/default/xui/it/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/it/panel_teleport_history_item.xml index 050298ffcf..050298ffcf 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_teleport_history_item.xml +++ b/indra/newview/skins/default/xui/it/panel_teleport_history_item.xml 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'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'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'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/panel_voice_effect.xml b/indra/newview/skins/default/xui/it/panel_voice_effect.xml index b43f766e5e..b43f766e5e 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_voice_effect.xml +++ b/indra/newview/skins/default/xui/it/panel_voice_effect.xml diff --git a/indra/newview/skins/default/xui/it/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/it/panel_volume_pulldown.xml index bc17fc0c89..bc17fc0c89 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_volume_pulldown.xml +++ b/indra/newview/skins/default/xui/it/panel_volume_pulldown.xml diff --git a/indra/newview/skins/default/xui/it/panel_world_map.xml b/indra/newview/skins/default/xui/it/panel_world_map.xml index 642af75028..642af75028 100755..100644 --- a/indra/newview/skins/default/xui/it/panel_world_map.xml +++ b/indra/newview/skins/default/xui/it/panel_world_map.xml 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..100644 --- 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'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'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'esperienza." name="experience contributor" value="50"/> + </action_set> </role_actions> diff --git a/indra/newview/skins/default/xui/it/sidepanel_appearance.xml b/indra/newview/skins/default/xui/it/sidepanel_appearance.xml index 220a6f84af..220a6f84af 100755..100644 --- a/indra/newview/skins/default/xui/it/sidepanel_appearance.xml +++ b/indra/newview/skins/default/xui/it/sidepanel_appearance.xml diff --git a/indra/newview/skins/default/xui/it/sidepanel_inventory.xml b/indra/newview/skins/default/xui/it/sidepanel_inventory.xml index 2f00a023bb..2f00a023bb 100755..100644 --- a/indra/newview/skins/default/xui/it/sidepanel_inventory.xml +++ b/indra/newview/skins/default/xui/it/sidepanel_inventory.xml 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..100644 --- 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..100644 --- 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'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'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'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'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..78028127b2 100755..100644 --- a/indra/newview/skins/default/xui/it/strings.xml +++ b/indra/newview/skins/default/xui/it/strings.xml @@ -35,7 +35,7 @@ Inizializzazione grafica non riuscita. Aggiorna il driver della scheda grafica! </string> <string name="AboutHeader"> - [APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2] ([VIEWER_VERSION_3]) [BUILD_DATE] [BUILD_TIME] ([CHANNEL]) + [APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2].[VIEWER_VERSION_3] [BUILD_DATE] [BUILD_TIME] ([CHANNEL]) [[VIEWER_RELEASE_NOTES_URL] [ReleaseNotes]] </string> <string name="AboutCompiler"> @@ -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 > Mostra impostazioni di debug > 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'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'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'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'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'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'esperienza [EXPERIENCE]. + </string> <string name="Group" value="(gruppo)"/> <string name="Unknown"> (Sconosciuto) @@ -4979,6 +5089,9 @@ Prova a racchiudere il percorso dell'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'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'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'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..100644 --- 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'esercitazione, visita 'Welcome Island Public'. <message name="MustGetAgeRegion"> Per poter entrare in questa regione devi avere almeno 18 anni. </message> + <message name="RegionTPSpecialUsageBlocked"> + Impossibile entrare nella regione. '[REGION_NAME]' è 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..100644 --- 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] です。位置は <nolink>[HOSTNAME]</nolink> です。（[HOSTIP]） -SLURL:<nolink>[SLURL]</nolink> -(グローバル座標 [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..100644 --- 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_activeim.xml b/indra/newview/skins/default/xui/ja/floater_activeim.xml index 1c743e1fd2..1c743e1fd2 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_activeim.xml +++ b/indra/newview/skins/default/xui/ja/floater_activeim.xml diff --git a/indra/newview/skins/default/xui/ja/floater_animation_anim_preview.xml b/indra/newview/skins/default/xui/ja/floater_animation_anim_preview.xml index 2bada303ae..2bada303ae 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_animation_anim_preview.xml +++ b/indra/newview/skins/default/xui/ja/floater_animation_anim_preview.xml diff --git a/indra/newview/skins/default/xui/ja/floater_animation_bvh_preview.xml b/indra/newview/skins/default/xui/ja/floater_animation_bvh_preview.xml index f74bab3598..20c7298462 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_animation_bvh_preview.xml +++ b/indra/newview/skins/default/xui/ja/floater_animation_bvh_preview.xml @@ -141,35 +141,35 @@ 表情 </text> <combo_box name="emote_combo" tool_tip="アニメーション再生中の顔の表情を決めます"> - <item label="（なし）" name="[None]" value=""/> - <item label="アーーーーー" name="Aaaaah" value="アーーーーー"/> - <item label="恐れる" name="Afraid" value="恐れる"/> - <item label="怒る" name="Angry" value="怒る"/> - <item label="満面の笑み" name="BigSmile" value="満面の笑み"/> - <item label="退屈" name="Bored" value="退屈"/> - <item label="泣く" name="Cry" value="泣く"/> - <item label="軽蔑" name="Disdain" value="軽蔑"/> - <item label="恥ずかしがる" name="Embarrassed" value="恥ずかしがる"/> - <item label="しかめっ面" name="Frown" value="しかめっ面"/> - <item label="キス" name="Kiss" value="キス"/> - <item label="笑う" name="Laugh" value="笑う"/> - <item label="むかつく" name="Plllppt" value="むかつく"/> - <item label="嫌悪感" name="Repulsed" value="嫌悪感"/> - <item label="悲しい" name="Sad" value="悲しい"/> - <item label="肩をすくめる" name="Shrug" value="肩をすくめる"/> - <item label="微笑む" name="Smile" value="微笑む"/> - <item label="驚く" name="Surprise" value="驚く"/> - <item label="ウィンク" name="Wink" value="ウィンク"/> - <item label="心配する" name="Worry" value="心配する"/> + <item label="（なし）" name="[None]"/> + <item label="アーーーーー" name="Aaaaah"/> + <item label="恐れる" name="Afraid"/> + <item label="怒る" name="Angry"/> + <item label="満面の笑み" name="BigSmile"/> + <item label="退屈" name="Bored"/> + <item label="泣く" name="Cry"/> + <item label="軽蔑" name="Disdain"/> + <item label="恥ずかしがる" name="Embarrassed"/> + <item label="しかめっ面" name="Frown"/> + <item label="キス" name="Kiss"/> + <item label="笑う" name="Laugh"/> + <item label="むかつく" name="Plllppt"/> + <item label="嫌悪感" name="Repulsed"/> + <item label="悲しい" name="Sad"/> + <item label="肩をすくめる" name="Shrug"/> + <item label="微笑む" name="Smile"/> + <item label="驚く" name="Surprise"/> + <item label="ウィンク" name="Wink"/> + <item label="心配する" name="Worry"/> </combo_box> <text name="preview_label"> プレビュー中の動作 </text> <combo_box name="preview_base_anim" tool_tip="これを使用して、アバターが一般的なアクションを実行している間にアニメーションの動作をテストします。"> - <item label="立つ" name="Standing" value="立つ"/> - <item label="歩く" name="Walking" value="歩く"/> - <item label="座る" name="Sitting" value="座る"/> - <item label="飛ぶ" name="Flying" value="飛ぶ"/> + <item label="立つ" name="Standing"/> + <item label="歩く" name="Walking"/> + <item label="座る" name="Sitting"/> + <item label="飛ぶ" name="Flying"/> </combo_box> <spinner label="イーズイン（秒）" name="ease_in_time" tool_tip="アニメーションのブレンドイン時間（秒）"/> <spinner label="イーズアウト（秒）" name="ease_out_time" tool_tip="アニメーションのブレンドアウト時間（秒）"/> 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_auction.xml b/indra/newview/skins/default/xui/ja/floater_auction.xml index e9aa287f2c..e9aa287f2c 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_auction.xml +++ b/indra/newview/skins/default/xui/ja/floater_auction.xml diff --git a/indra/newview/skins/default/xui/ja/floater_autoreplace.xml b/indra/newview/skins/default/xui/ja/floater_autoreplace.xml index 21abf59160..21abf59160 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_autoreplace.xml +++ b/indra/newview/skins/default/xui/ja/floater_autoreplace.xml diff --git a/indra/newview/skins/default/xui/ja/floater_avatar.xml b/indra/newview/skins/default/xui/ja/floater_avatar.xml index d289580506..d289580506 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_avatar.xml +++ b/indra/newview/skins/default/xui/ja/floater_avatar.xml diff --git a/indra/newview/skins/default/xui/ja/floater_avatar_picker.xml b/indra/newview/skins/default/xui/ja/floater_avatar_picker.xml index 4bd6b4e053..4bd6b4e053 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_avatar_picker.xml +++ b/indra/newview/skins/default/xui/ja/floater_avatar_picker.xml diff --git a/indra/newview/skins/default/xui/ja/floater_avatar_textures.xml b/indra/newview/skins/default/xui/ja/floater_avatar_textures.xml index 5c23b77498..5c23b77498 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_avatar_textures.xml +++ b/indra/newview/skins/default/xui/ja/floater_avatar_textures.xml diff --git a/indra/newview/skins/default/xui/ja/floater_beacons.xml b/indra/newview/skins/default/xui/ja/floater_beacons.xml index a55698e3d0..a55698e3d0 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_beacons.xml +++ b/indra/newview/skins/default/xui/ja/floater_beacons.xml diff --git a/indra/newview/skins/default/xui/ja/floater_build_options.xml b/indra/newview/skins/default/xui/ja/floater_build_options.xml index 6865409e7a..6865409e7a 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_build_options.xml +++ b/indra/newview/skins/default/xui/ja/floater_build_options.xml diff --git a/indra/newview/skins/default/xui/ja/floater_bulk_perms.xml b/indra/newview/skins/default/xui/ja/floater_bulk_perms.xml index 1b5a745cc4..1b5a745cc4 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_bulk_perms.xml +++ b/indra/newview/skins/default/xui/ja/floater_bulk_perms.xml diff --git a/indra/newview/skins/default/xui/ja/floater_bumps.xml b/indra/newview/skins/default/xui/ja/floater_bumps.xml index fd12a9e69a..fd12a9e69a 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_bumps.xml +++ b/indra/newview/skins/default/xui/ja/floater_bumps.xml diff --git a/indra/newview/skins/default/xui/ja/floater_buy_contents.xml b/indra/newview/skins/default/xui/ja/floater_buy_contents.xml index 7e4932c78f..7e4932c78f 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_buy_contents.xml +++ b/indra/newview/skins/default/xui/ja/floater_buy_contents.xml diff --git a/indra/newview/skins/default/xui/ja/floater_buy_currency.xml b/indra/newview/skins/default/xui/ja/floater_buy_currency.xml index a472f163e3..a472f163e3 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_buy_currency.xml +++ b/indra/newview/skins/default/xui/ja/floater_buy_currency.xml diff --git a/indra/newview/skins/default/xui/ja/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/ja/floater_buy_currency_html.xml index 37fd6826e5..37fd6826e5 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_buy_currency_html.xml +++ b/indra/newview/skins/default/xui/ja/floater_buy_currency_html.xml diff --git a/indra/newview/skins/default/xui/ja/floater_buy_land.xml b/indra/newview/skins/default/xui/ja/floater_buy_land.xml index 34f9d38de1..34f9d38de1 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_buy_land.xml +++ b/indra/newview/skins/default/xui/ja/floater_buy_land.xml diff --git a/indra/newview/skins/default/xui/ja/floater_buy_object.xml b/indra/newview/skins/default/xui/ja/floater_buy_object.xml index ce269df6da..ce269df6da 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_buy_object.xml +++ b/indra/newview/skins/default/xui/ja/floater_buy_object.xml diff --git a/indra/newview/skins/default/xui/ja/floater_camera.xml b/indra/newview/skins/default/xui/ja/floater_camera.xml index 982e5ce42b..982e5ce42b 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_camera.xml +++ b/indra/newview/skins/default/xui/ja/floater_camera.xml diff --git a/indra/newview/skins/default/xui/ja/floater_chat_bar.xml b/indra/newview/skins/default/xui/ja/floater_chat_bar.xml index 9f5df6fb85..9f5df6fb85 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_chat_bar.xml +++ b/indra/newview/skins/default/xui/ja/floater_chat_bar.xml diff --git a/indra/newview/skins/default/xui/ja/floater_choose_group.xml b/indra/newview/skins/default/xui/ja/floater_choose_group.xml index 7d91cb69ed..7d91cb69ed 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_choose_group.xml +++ b/indra/newview/skins/default/xui/ja/floater_choose_group.xml diff --git a/indra/newview/skins/default/xui/ja/floater_color_picker.xml b/indra/newview/skins/default/xui/ja/floater_color_picker.xml index dc87d27a15..dc87d27a15 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_color_picker.xml +++ b/indra/newview/skins/default/xui/ja/floater_color_picker.xml diff --git a/indra/newview/skins/default/xui/ja/floater_critical.xml b/indra/newview/skins/default/xui/ja/floater_critical.xml index f69c24622a..f69c24622a 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_critical.xml +++ b/indra/newview/skins/default/xui/ja/floater_critical.xml diff --git a/indra/newview/skins/default/xui/ja/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/ja/floater_delete_env_preset.xml index eb39d1b336..eb39d1b336 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_delete_env_preset.xml +++ b/indra/newview/skins/default/xui/ja/floater_delete_env_preset.xml diff --git a/indra/newview/skins/default/xui/ja/floater_destinations.xml b/indra/newview/skins/default/xui/ja/floater_destinations.xml index b7f6ad4d4e..b7f6ad4d4e 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_destinations.xml +++ b/indra/newview/skins/default/xui/ja/floater_destinations.xml diff --git a/indra/newview/skins/default/xui/ja/floater_display_name.xml b/indra/newview/skins/default/xui/ja/floater_display_name.xml index cc71b1cd9f..cc71b1cd9f 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_display_name.xml +++ b/indra/newview/skins/default/xui/ja/floater_display_name.xml diff --git a/indra/newview/skins/default/xui/ja/floater_edit_day_cycle.xml b/indra/newview/skins/default/xui/ja/floater_edit_day_cycle.xml index fd601672b6..fd601672b6 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_edit_day_cycle.xml +++ b/indra/newview/skins/default/xui/ja/floater_edit_day_cycle.xml 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_edit_sky_preset.xml b/indra/newview/skins/default/xui/ja/floater_edit_sky_preset.xml index 68d0c70baa..68d0c70baa 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_edit_sky_preset.xml +++ b/indra/newview/skins/default/xui/ja/floater_edit_sky_preset.xml diff --git a/indra/newview/skins/default/xui/ja/floater_edit_water_preset.xml b/indra/newview/skins/default/xui/ja/floater_edit_water_preset.xml index eddfbd4298..eddfbd4298 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_edit_water_preset.xml +++ b/indra/newview/skins/default/xui/ja/floater_edit_water_preset.xml diff --git a/indra/newview/skins/default/xui/ja/floater_environment_settings.xml b/indra/newview/skins/default/xui/ja/floater_environment_settings.xml index 0e3803119f..0e3803119f 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_environment_settings.xml +++ b/indra/newview/skins/default/xui/ja/floater_environment_settings.xml diff --git a/indra/newview/skins/default/xui/ja/floater_event.xml b/indra/newview/skins/default/xui/ja/floater_event.xml index ca50ba8ef8..ca50ba8ef8 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_event.xml +++ b/indra/newview/skins/default/xui/ja/floater_event.xml 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"> + "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 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_fast_timers.xml b/indra/newview/skins/default/xui/ja/floater_fast_timers.xml index 5f538ecdb0..5f538ecdb0 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_fast_timers.xml +++ b/indra/newview/skins/default/xui/ja/floater_fast_timers.xml diff --git a/indra/newview/skins/default/xui/ja/floater_font_test.xml b/indra/newview/skins/default/xui/ja/floater_font_test.xml index b853f395dd..b853f395dd 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_font_test.xml +++ b/indra/newview/skins/default/xui/ja/floater_font_test.xml diff --git a/indra/newview/skins/default/xui/ja/floater_gesture.xml b/indra/newview/skins/default/xui/ja/floater_gesture.xml index 1ed5ad31db..1ed5ad31db 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_gesture.xml +++ b/indra/newview/skins/default/xui/ja/floater_gesture.xml diff --git a/indra/newview/skins/default/xui/ja/floater_god_tools.xml b/indra/newview/skins/default/xui/ja/floater_god_tools.xml index 9e5d473db7..9e5d473db7 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_god_tools.xml +++ b/indra/newview/skins/default/xui/ja/floater_god_tools.xml diff --git a/indra/newview/skins/default/xui/ja/floater_hardware_settings.xml b/indra/newview/skins/default/xui/ja/floater_hardware_settings.xml index c8b8e918e0..c8b8e918e0 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_hardware_settings.xml +++ b/indra/newview/skins/default/xui/ja/floater_hardware_settings.xml diff --git a/indra/newview/skins/default/xui/ja/floater_help_browser.xml b/indra/newview/skins/default/xui/ja/floater_help_browser.xml index 15200d7ef7..15200d7ef7 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_help_browser.xml +++ b/indra/newview/skins/default/xui/ja/floater_help_browser.xml diff --git a/indra/newview/skins/default/xui/ja/floater_how_to.xml b/indra/newview/skins/default/xui/ja/floater_how_to.xml index 4cebe27226..4cebe27226 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_how_to.xml +++ b/indra/newview/skins/default/xui/ja/floater_how_to.xml diff --git a/indra/newview/skins/default/xui/ja/floater_hud.xml b/indra/newview/skins/default/xui/ja/floater_hud.xml index e3841c2cd9..e3841c2cd9 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_hud.xml +++ b/indra/newview/skins/default/xui/ja/floater_hud.xml diff --git a/indra/newview/skins/default/xui/ja/floater_im_container.xml b/indra/newview/skins/default/xui/ja/floater_im_container.xml index a155efdc1e..a155efdc1e 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_im_container.xml +++ b/indra/newview/skins/default/xui/ja/floater_im_container.xml diff --git a/indra/newview/skins/default/xui/ja/floater_im_session.xml b/indra/newview/skins/default/xui/ja/floater_im_session.xml index 7ed46f7f01..7ed46f7f01 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_im_session.xml +++ b/indra/newview/skins/default/xui/ja/floater_im_session.xml diff --git a/indra/newview/skins/default/xui/ja/floater_image_preview.xml b/indra/newview/skins/default/xui/ja/floater_image_preview.xml index 1ffc27fd70..1ffc27fd70 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_image_preview.xml +++ b/indra/newview/skins/default/xui/ja/floater_image_preview.xml diff --git a/indra/newview/skins/default/xui/ja/floater_import_collada.xml b/indra/newview/skins/default/xui/ja/floater_import_collada.xml index 65edafb169..65edafb169 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_import_collada.xml +++ b/indra/newview/skins/default/xui/ja/floater_import_collada.xml diff --git a/indra/newview/skins/default/xui/ja/floater_incoming_call.xml b/indra/newview/skins/default/xui/ja/floater_incoming_call.xml index 308f6f9a3d..308f6f9a3d 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_incoming_call.xml +++ b/indra/newview/skins/default/xui/ja/floater_incoming_call.xml diff --git a/indra/newview/skins/default/xui/ja/floater_inspect.xml b/indra/newview/skins/default/xui/ja/floater_inspect.xml index b3825c0b7f..b3825c0b7f 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_inspect.xml +++ b/indra/newview/skins/default/xui/ja/floater_inspect.xml 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..100644 --- 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..100644 --- 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_joystick.xml b/indra/newview/skins/default/xui/ja/floater_joystick.xml index daa480ef5a..daa480ef5a 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_joystick.xml +++ b/indra/newview/skins/default/xui/ja/floater_joystick.xml 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"> - 接続不良になっているか、帯域幅設定が高すぎます。 + 接続不良または '帯域幅' の設定が高すぎる可能性があります </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"> >> @@ -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=">> " name="minimize" tool_tip="フローターのサイズをトグル"/> + <button label=">>" name="minimize" tool_tip="フローターのサイズをトグル"/> </floater> diff --git a/indra/newview/skins/default/xui/ja/floater_land_holdings.xml b/indra/newview/skins/default/xui/ja/floater_land_holdings.xml index aca916f22f..aca916f22f 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_land_holdings.xml +++ b/indra/newview/skins/default/xui/ja/floater_land_holdings.xml 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..100644 --- 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=">" name="view_profile"/> </floater> diff --git a/indra/newview/skins/default/xui/ja/floater_lsl_guide.xml b/indra/newview/skins/default/xui/ja/floater_lsl_guide.xml index 5773752788..5773752788 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_lsl_guide.xml +++ b/indra/newview/skins/default/xui/ja/floater_lsl_guide.xml diff --git a/indra/newview/skins/default/xui/ja/floater_map.xml b/indra/newview/skins/default/xui/ja/floater_map.xml index 1122203446..1122203446 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_map.xml +++ b/indra/newview/skins/default/xui/ja/floater_map.xml 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_media_browser.xml b/indra/newview/skins/default/xui/ja/floater_media_browser.xml index c4731b73a3..c4731b73a3 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_media_browser.xml +++ b/indra/newview/skins/default/xui/ja/floater_media_browser.xml diff --git a/indra/newview/skins/default/xui/ja/floater_media_settings.xml b/indra/newview/skins/default/xui/ja/floater_media_settings.xml index 46ac1a8dfd..46ac1a8dfd 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_media_settings.xml +++ b/indra/newview/skins/default/xui/ja/floater_media_settings.xml diff --git a/indra/newview/skins/default/xui/ja/floater_mem_leaking.xml b/indra/newview/skins/default/xui/ja/floater_mem_leaking.xml index f48bb94e32..f48bb94e32 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_mem_leaking.xml +++ b/indra/newview/skins/default/xui/ja/floater_mem_leaking.xml diff --git a/indra/newview/skins/default/xui/ja/floater_merchant_outbox.xml b/indra/newview/skins/default/xui/ja/floater_merchant_outbox.xml index c59a3dc0ab..c59a3dc0ab 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_merchant_outbox.xml +++ b/indra/newview/skins/default/xui/ja/floater_merchant_outbox.xml diff --git a/indra/newview/skins/default/xui/ja/floater_model_preview.xml b/indra/newview/skins/default/xui/ja/floater_model_preview.xml index 942cc91317..942cc91317 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_model_preview.xml +++ b/indra/newview/skins/default/xui/ja/floater_model_preview.xml diff --git a/indra/newview/skins/default/xui/ja/floater_moveview.xml b/indra/newview/skins/default/xui/ja/floater_moveview.xml index aed3b78a14..aed3b78a14 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_moveview.xml +++ b/indra/newview/skins/default/xui/ja/floater_moveview.xml diff --git a/indra/newview/skins/default/xui/ja/floater_mute_object.xml b/indra/newview/skins/default/xui/ja/floater_mute_object.xml index 04ffd5254d..04ffd5254d 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_mute_object.xml +++ b/indra/newview/skins/default/xui/ja/floater_mute_object.xml diff --git a/indra/newview/skins/default/xui/ja/floater_my_appearance.xml b/indra/newview/skins/default/xui/ja/floater_my_appearance.xml index c9a0ecefd7..c9a0ecefd7 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_my_appearance.xml +++ b/indra/newview/skins/default/xui/ja/floater_my_appearance.xml diff --git a/indra/newview/skins/default/xui/ja/floater_my_inventory.xml b/indra/newview/skins/default/xui/ja/floater_my_inventory.xml index d708fc3dec..d708fc3dec 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_my_inventory.xml +++ b/indra/newview/skins/default/xui/ja/floater_my_inventory.xml diff --git a/indra/newview/skins/default/xui/ja/floater_notification.xml b/indra/newview/skins/default/xui/ja/floater_notification.xml index 0f37b30f52..0f37b30f52 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_notification.xml +++ b/indra/newview/skins/default/xui/ja/floater_notification.xml diff --git a/indra/newview/skins/default/xui/ja/floater_notifications_console.xml b/indra/newview/skins/default/xui/ja/floater_notifications_console.xml index c9d9ea7acb..c9d9ea7acb 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_notifications_console.xml +++ b/indra/newview/skins/default/xui/ja/floater_notifications_console.xml diff --git a/indra/newview/skins/default/xui/ja/floater_object_weights.xml b/indra/newview/skins/default/xui/ja/floater_object_weights.xml index d727a268fb..d727a268fb 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_object_weights.xml +++ b/indra/newview/skins/default/xui/ja/floater_object_weights.xml 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..100644 --- 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_outfit_save_as.xml b/indra/newview/skins/default/xui/ja/floater_outfit_save_as.xml index 70555e6ded..70555e6ded 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_outfit_save_as.xml +++ b/indra/newview/skins/default/xui/ja/floater_outfit_save_as.xml diff --git a/indra/newview/skins/default/xui/ja/floater_outgoing_call.xml b/indra/newview/skins/default/xui/ja/floater_outgoing_call.xml index f1a05e0eec..f1a05e0eec 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_outgoing_call.xml +++ b/indra/newview/skins/default/xui/ja/floater_outgoing_call.xml diff --git a/indra/newview/skins/default/xui/ja/floater_pathfinding_characters.xml b/indra/newview/skins/default/xui/ja/floater_pathfinding_characters.xml index ada96b5b62..ada96b5b62 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_pathfinding_characters.xml +++ b/indra/newview/skins/default/xui/ja/floater_pathfinding_characters.xml diff --git a/indra/newview/skins/default/xui/ja/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/ja/floater_pathfinding_console.xml index ec107f3e6b..ec107f3e6b 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_pathfinding_console.xml +++ b/indra/newview/skins/default/xui/ja/floater_pathfinding_console.xml diff --git a/indra/newview/skins/default/xui/ja/floater_pathfinding_linksets.xml b/indra/newview/skins/default/xui/ja/floater_pathfinding_linksets.xml index 4441d5e738..4441d5e738 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_pathfinding_linksets.xml +++ b/indra/newview/skins/default/xui/ja/floater_pathfinding_linksets.xml 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..100644 --- 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..100644 --- 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_people.xml b/indra/newview/skins/default/xui/ja/floater_people.xml index b180658ab7..b180658ab7 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_people.xml +++ b/indra/newview/skins/default/xui/ja/floater_people.xml diff --git a/indra/newview/skins/default/xui/ja/floater_perm_prefs.xml b/indra/newview/skins/default/xui/ja/floater_perm_prefs.xml index 98cda25a81..98cda25a81 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_perm_prefs.xml +++ b/indra/newview/skins/default/xui/ja/floater_perm_prefs.xml diff --git a/indra/newview/skins/default/xui/ja/floater_picks.xml b/indra/newview/skins/default/xui/ja/floater_picks.xml index 359585eb86..359585eb86 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_picks.xml +++ b/indra/newview/skins/default/xui/ja/floater_picks.xml diff --git a/indra/newview/skins/default/xui/ja/floater_places.xml b/indra/newview/skins/default/xui/ja/floater_places.xml index 0d167444db..0d167444db 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_places.xml +++ b/indra/newview/skins/default/xui/ja/floater_places.xml diff --git a/indra/newview/skins/default/xui/ja/floater_post_process.xml b/indra/newview/skins/default/xui/ja/floater_post_process.xml index 7c4d9c78ee..7c4d9c78ee 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_post_process.xml +++ b/indra/newview/skins/default/xui/ja/floater_post_process.xml diff --git a/indra/newview/skins/default/xui/ja/floater_preferences.xml b/indra/newview/skins/default/xui/ja/floater_preferences.xml index d48a8241ec..d48a8241ec 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_preferences.xml +++ b/indra/newview/skins/default/xui/ja/floater_preferences.xml diff --git a/indra/newview/skins/default/xui/ja/floater_preferences_proxy.xml b/indra/newview/skins/default/xui/ja/floater_preferences_proxy.xml index 4638fd002e..4638fd002e 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_preferences_proxy.xml +++ b/indra/newview/skins/default/xui/ja/floater_preferences_proxy.xml diff --git a/indra/newview/skins/default/xui/ja/floater_preview_animation.xml b/indra/newview/skins/default/xui/ja/floater_preview_animation.xml index a3042f66ea..a3042f66ea 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_preview_animation.xml +++ b/indra/newview/skins/default/xui/ja/floater_preview_animation.xml diff --git a/indra/newview/skins/default/xui/ja/floater_preview_gesture.xml b/indra/newview/skins/default/xui/ja/floater_preview_gesture.xml index 59ce36b022..59ce36b022 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_preview_gesture.xml +++ b/indra/newview/skins/default/xui/ja/floater_preview_gesture.xml diff --git a/indra/newview/skins/default/xui/ja/floater_preview_notecard.xml b/indra/newview/skins/default/xui/ja/floater_preview_notecard.xml index ae8ae9f7b5..ae8ae9f7b5 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_preview_notecard.xml +++ b/indra/newview/skins/default/xui/ja/floater_preview_notecard.xml diff --git a/indra/newview/skins/default/xui/ja/floater_preview_sound.xml b/indra/newview/skins/default/xui/ja/floater_preview_sound.xml index 5c0f05cec6..5c0f05cec6 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_preview_sound.xml +++ b/indra/newview/skins/default/xui/ja/floater_preview_sound.xml diff --git a/indra/newview/skins/default/xui/ja/floater_preview_texture.xml b/indra/newview/skins/default/xui/ja/floater_preview_texture.xml index 4617fd1d92..4617fd1d92 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_preview_texture.xml +++ b/indra/newview/skins/default/xui/ja/floater_preview_texture.xml diff --git a/indra/newview/skins/default/xui/ja/floater_price_for_listing.xml b/indra/newview/skins/default/xui/ja/floater_price_for_listing.xml index 10a46247a7..10a46247a7 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_price_for_listing.xml +++ b/indra/newview/skins/default/xui/ja/floater_price_for_listing.xml diff --git a/indra/newview/skins/default/xui/ja/floater_publish_classified.xml b/indra/newview/skins/default/xui/ja/floater_publish_classified.xml index f33406da51..f33406da51 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_publish_classified.xml +++ b/indra/newview/skins/default/xui/ja/floater_publish_classified.xml diff --git a/indra/newview/skins/default/xui/ja/floater_region_debug_console.xml b/indra/newview/skins/default/xui/ja/floater_region_debug_console.xml index 4edb4972e4..4edb4972e4 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_region_debug_console.xml +++ b/indra/newview/skins/default/xui/ja/floater_region_debug_console.xml diff --git a/indra/newview/skins/default/xui/ja/floater_region_info.xml b/indra/newview/skins/default/xui/ja/floater_region_info.xml index d08c51c61e..d08c51c61e 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_region_info.xml +++ b/indra/newview/skins/default/xui/ja/floater_region_info.xml 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..100644 --- 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="土地 > 不法侵入 > オブジェクトまたはテクスチャ" 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_script_debug.xml b/indra/newview/skins/default/xui/ja/floater_script_debug.xml index 0ac7a988e0..0ac7a988e0 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_script_debug.xml +++ b/indra/newview/skins/default/xui/ja/floater_script_debug.xml diff --git a/indra/newview/skins/default/xui/ja/floater_script_debug_panel.xml b/indra/newview/skins/default/xui/ja/floater_script_debug_panel.xml index e70a30fa24..e70a30fa24 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_script_debug_panel.xml +++ b/indra/newview/skins/default/xui/ja/floater_script_debug_panel.xml diff --git a/indra/newview/skins/default/xui/ja/floater_script_limits.xml b/indra/newview/skins/default/xui/ja/floater_script_limits.xml index 7ccd858af7..7ccd858af7 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_script_limits.xml +++ b/indra/newview/skins/default/xui/ja/floater_script_limits.xml diff --git a/indra/newview/skins/default/xui/ja/floater_script_preview.xml b/indra/newview/skins/default/xui/ja/floater_script_preview.xml index 656357aa17..656357aa17 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_script_preview.xml +++ b/indra/newview/skins/default/xui/ja/floater_script_preview.xml diff --git a/indra/newview/skins/default/xui/ja/floater_script_queue.xml b/indra/newview/skins/default/xui/ja/floater_script_queue.xml index 97e79fb483..97e79fb483 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_script_queue.xml +++ b/indra/newview/skins/default/xui/ja/floater_script_queue.xml diff --git a/indra/newview/skins/default/xui/ja/floater_script_search.xml b/indra/newview/skins/default/xui/ja/floater_script_search.xml index bc4f48c995..bc4f48c995 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_script_search.xml +++ b/indra/newview/skins/default/xui/ja/floater_script_search.xml diff --git a/indra/newview/skins/default/xui/ja/floater_search.xml b/indra/newview/skins/default/xui/ja/floater_search.xml index 0723be0068..0723be0068 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_search.xml +++ b/indra/newview/skins/default/xui/ja/floater_search.xml diff --git a/indra/newview/skins/default/xui/ja/floater_select_key.xml b/indra/newview/skins/default/xui/ja/floater_select_key.xml index d41be86873..d41be86873 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_select_key.xml +++ b/indra/newview/skins/default/xui/ja/floater_select_key.xml diff --git a/indra/newview/skins/default/xui/ja/floater_sell_land.xml b/indra/newview/skins/default/xui/ja/floater_sell_land.xml index aa368eef11..aa368eef11 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_sell_land.xml +++ b/indra/newview/skins/default/xui/ja/floater_sell_land.xml diff --git a/indra/newview/skins/default/xui/ja/floater_settings_debug.xml b/indra/newview/skins/default/xui/ja/floater_settings_debug.xml index cb7950bf53..cb7950bf53 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_settings_debug.xml +++ b/indra/newview/skins/default/xui/ja/floater_settings_debug.xml 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..100644 --- 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_sound_devices.xml b/indra/newview/skins/default/xui/ja/floater_sound_devices.xml index 28d2388bed..28d2388bed 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_sound_devices.xml +++ b/indra/newview/skins/default/xui/ja/floater_sound_devices.xml diff --git a/indra/newview/skins/default/xui/ja/floater_sound_preview.xml b/indra/newview/skins/default/xui/ja/floater_sound_preview.xml index 7d83309c46..7d83309c46 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_sound_preview.xml +++ b/indra/newview/skins/default/xui/ja/floater_sound_preview.xml diff --git a/indra/newview/skins/default/xui/ja/floater_spellcheck.xml b/indra/newview/skins/default/xui/ja/floater_spellcheck.xml index 31fbef9bcf..31fbef9bcf 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_spellcheck.xml +++ b/indra/newview/skins/default/xui/ja/floater_spellcheck.xml diff --git a/indra/newview/skins/default/xui/ja/floater_spellcheck_import.xml b/indra/newview/skins/default/xui/ja/floater_spellcheck_import.xml index febe153d25..febe153d25 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_spellcheck_import.xml +++ b/indra/newview/skins/default/xui/ja/floater_spellcheck_import.xml diff --git a/indra/newview/skins/default/xui/ja/floater_stats.xml b/indra/newview/skins/default/xui/ja/floater_stats.xml index 3bc343639b..3bc343639b 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_stats.xml +++ b/indra/newview/skins/default/xui/ja/floater_stats.xml diff --git a/indra/newview/skins/default/xui/ja/floater_sys_well.xml b/indra/newview/skins/default/xui/ja/floater_sys_well.xml index 45e97bdf5d..45e97bdf5d 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_sys_well.xml +++ b/indra/newview/skins/default/xui/ja/floater_sys_well.xml diff --git a/indra/newview/skins/default/xui/ja/floater_telehub.xml b/indra/newview/skins/default/xui/ja/floater_telehub.xml index 7318083771..7318083771 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_telehub.xml +++ b/indra/newview/skins/default/xui/ja/floater_telehub.xml diff --git a/indra/newview/skins/default/xui/ja/floater_test_layout_stacks.xml b/indra/newview/skins/default/xui/ja/floater_test_layout_stacks.xml index 31b5bbd3bf..31b5bbd3bf 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_test_layout_stacks.xml +++ b/indra/newview/skins/default/xui/ja/floater_test_layout_stacks.xml diff --git a/indra/newview/skins/default/xui/ja/floater_test_text_vertical_aligment.xml b/indra/newview/skins/default/xui/ja/floater_test_text_vertical_aligment.xml index 40fd8e9f93..40fd8e9f93 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_test_text_vertical_aligment.xml +++ b/indra/newview/skins/default/xui/ja/floater_test_text_vertical_aligment.xml diff --git a/indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml index 37233d3e68..37233d3e68 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml +++ b/indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml diff --git a/indra/newview/skins/default/xui/ja/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/ja/floater_texture_fetch_debugger.xml index adc35137b5..adc35137b5 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_texture_fetch_debugger.xml +++ b/indra/newview/skins/default/xui/ja/floater_texture_fetch_debugger.xml diff --git a/indra/newview/skins/default/xui/ja/floater_tools.xml b/indra/newview/skins/default/xui/ja/floater_tools.xml index eeaa361649..eeaa361649 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_tools.xml +++ b/indra/newview/skins/default/xui/ja/floater_tools.xml 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..100644 --- 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_tos.xml b/indra/newview/skins/default/xui/ja/floater_tos.xml index ae064724c0..ae064724c0 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_tos.xml +++ b/indra/newview/skins/default/xui/ja/floater_tos.xml diff --git a/indra/newview/skins/default/xui/ja/floater_toybox.xml b/indra/newview/skins/default/xui/ja/floater_toybox.xml index 682352ec82..682352ec82 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_toybox.xml +++ b/indra/newview/skins/default/xui/ja/floater_toybox.xml diff --git a/indra/newview/skins/default/xui/ja/floater_translation_settings.xml b/indra/newview/skins/default/xui/ja/floater_translation_settings.xml index 27143086ac..27143086ac 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_translation_settings.xml +++ b/indra/newview/skins/default/xui/ja/floater_translation_settings.xml 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/floater_url_entry.xml b/indra/newview/skins/default/xui/ja/floater_url_entry.xml index 8e09e4748a..8e09e4748a 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_url_entry.xml +++ b/indra/newview/skins/default/xui/ja/floater_url_entry.xml diff --git a/indra/newview/skins/default/xui/ja/floater_voice_controls.xml b/indra/newview/skins/default/xui/ja/floater_voice_controls.xml index f7d3fd11e0..f7d3fd11e0 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_voice_controls.xml +++ b/indra/newview/skins/default/xui/ja/floater_voice_controls.xml diff --git a/indra/newview/skins/default/xui/ja/floater_voice_effect.xml b/indra/newview/skins/default/xui/ja/floater_voice_effect.xml index b38ea9331a..b38ea9331a 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_voice_effect.xml +++ b/indra/newview/skins/default/xui/ja/floater_voice_effect.xml diff --git a/indra/newview/skins/default/xui/ja/floater_web_content.xml b/indra/newview/skins/default/xui/ja/floater_web_content.xml index 48fe8aee78..48fe8aee78 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_web_content.xml +++ b/indra/newview/skins/default/xui/ja/floater_web_content.xml diff --git a/indra/newview/skins/default/xui/ja/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/ja/floater_whitelist_entry.xml index 34aba9d485..34aba9d485 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_whitelist_entry.xml +++ b/indra/newview/skins/default/xui/ja/floater_whitelist_entry.xml diff --git a/indra/newview/skins/default/xui/ja/floater_window_size.xml b/indra/newview/skins/default/xui/ja/floater_window_size.xml index 416813d6cc..416813d6cc 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_window_size.xml +++ b/indra/newview/skins/default/xui/ja/floater_window_size.xml diff --git a/indra/newview/skins/default/xui/ja/floater_world_map.xml b/indra/newview/skins/default/xui/ja/floater_world_map.xml index cc07596adc..cc07596adc 100755..100644 --- a/indra/newview/skins/default/xui/ja/floater_world_map.xml +++ b/indra/newview/skins/default/xui/ja/floater_world_map.xml diff --git a/indra/newview/skins/default/xui/ja/inspect_avatar.xml b/indra/newview/skins/default/xui/ja/inspect_avatar.xml index 42b67cd333..42b67cd333 100755..100644 --- a/indra/newview/skins/default/xui/ja/inspect_avatar.xml +++ b/indra/newview/skins/default/xui/ja/inspect_avatar.xml diff --git a/indra/newview/skins/default/xui/ja/inspect_group.xml b/indra/newview/skins/default/xui/ja/inspect_group.xml index be628befdf..be628befdf 100755..100644 --- a/indra/newview/skins/default/xui/ja/inspect_group.xml +++ b/indra/newview/skins/default/xui/ja/inspect_group.xml diff --git a/indra/newview/skins/default/xui/ja/inspect_object.xml b/indra/newview/skins/default/xui/ja/inspect_object.xml index e6999ac9b1..e6999ac9b1 100755..100644 --- a/indra/newview/skins/default/xui/ja/inspect_object.xml +++ b/indra/newview/skins/default/xui/ja/inspect_object.xml diff --git a/indra/newview/skins/default/xui/ja/inspect_remote_object.xml b/indra/newview/skins/default/xui/ja/inspect_remote_object.xml index 483d3fec52..483d3fec52 100755..100644 --- a/indra/newview/skins/default/xui/ja/inspect_remote_object.xml +++ b/indra/newview/skins/default/xui/ja/inspect_remote_object.xml diff --git a/indra/newview/skins/default/xui/ja/language_settings.xml b/indra/newview/skins/default/xui/ja/language_settings.xml index 91e8f4be7c..91e8f4be7c 100755..100644 --- a/indra/newview/skins/default/xui/ja/language_settings.xml +++ b/indra/newview/skins/default/xui/ja/language_settings.xml diff --git a/indra/newview/skins/default/xui/ja/menu_add_wearable_gear.xml b/indra/newview/skins/default/xui/ja/menu_add_wearable_gear.xml index 982a03c6a8..982a03c6a8 100755..100644 --- a/indra/newview/skins/default/xui/ja/menu_add_wearable_gear.xml +++ b/indra/newview/skins/default/xui/ja/menu_add_wearable_gear.xml diff --git a/indra/newview/skins/default/xui/ja/menu_attachment_other.xml b/indra/newview/skins/default/xui/ja/menu_attachment_other.xml index 930af10692..930af10692 100755..100644 --- a/indra/newview/skins/default/xui/ja/menu_attachment_other.xml +++ b/indra/newview/skins/default/xui/ja/menu_attachment_other.xml 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..100644 --- 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_icon.xml b/indra/newview/skins/default/xui/ja/menu_avatar_icon.xml index 80ce080e39..80ce080e39 100755..100644 --- a/indra/newview/skins/default/xui/ja/menu_avatar_icon.xml +++ b/indra/newview/skins/default/xui/ja/menu_avatar_icon.xml diff --git a/indra/newview/skins/default/xui/ja/menu_avatar_other.xml b/indra/newview/skins/default/xui/ja/menu_avatar_other.xml index f9cadc36ac..f9cadc36ac 100755..100644 --- a/indra/newview/skins/default/xui/ja/menu_avatar_other.xml +++ b/indra/newview/skins/default/xui/ja/menu_avatar_other.xml 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..100644 --- 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_cof_attachment.xml b/indra/newview/skins/default/xui/ja/menu_cof_attachment.xml index e786d02e40..e786d02e40 100755..100644 --- a/indra/newview/skins/default/xui/ja/menu_cof_attachment.xml +++ b/indra/newview/skins/default/xui/ja/menu_cof_attachment.xml diff --git a/indra/newview/skins/default/xui/ja/menu_cof_body_part.xml b/indra/newview/skins/default/xui/ja/menu_cof_body_part.xml index eb5faa2545..eb5faa2545 100755..100644 --- a/indra/newview/skins/default/xui/ja/menu_cof_body_part.xml +++ b/indra/newview/skins/default/xui/ja/menu_cof_body_part.xml diff --git a/indra/newview/skins/default/xui/ja/menu_cof_clothing.xml b/indra/newview/skins/default/xui/ja/menu_cof_clothing.xml index d984342896..d984342896 100755..100644 --- a/indra/newview/skins/default/xui/ja/menu_cof_clothing.xml +++ b/indra/newview/skins/default/xui/ja/menu_cof_clothing.xml diff --git a/indra/newview/skins/default/xui/ja/menu_cof_gear.xml b/indra/newview/skins/default/xui/ja/menu_cof_gear.xml index 07bcefd9b3..07bcefd9b3 100755..100644 --- a/indra/newview/skins/default/xui/ja/menu_cof_gear.xml +++ b/indra/newview/skins/default/xui/ja/menu_cof_gear.xml diff --git a/indra/newview/skins/default/xui/ja/menu_edit.xml b/indra/newview/skins/default/xui/ja/menu_edit.xml index c2ef0179b2..c2ef0179b2 100755..100644 --- a/indra/newview/skins/default/xui/ja/menu_edit.xml +++ b/indra/newview/skins/default/xui/ja/menu_edit.xml diff --git a/indra/newview/skins/default/xui/ja/menu_favorites.xml b/indra/newview/skins/default/xui/ja/menu_favorites.xml index 4708b1446c..4708b1446c 100755..100644 --- a/indra/newview/skins/default/xui/ja/menu_favorites.xml +++ b/indra/newview/skins/default/xui/ja/menu_favorites.xml diff --git a/indra/newview/skins/default/xui/ja/menu_gesture_gear.xml b/indra/newview/skins/default/xui/ja/menu_gesture_gear.xml index abf490a247..abf490a247 100755..100644 --- a/indra/newview/skins/default/xui/ja/menu_gesture_gear.xml +++ b/indra/newview/skins/default/xui/ja/menu_gesture_gear.xml diff --git a/indra/newview/skins/default/xui/ja/menu_group_plus.xml b/indra/newview/skins/default/xui/ja/menu_group_plus.xml index 3787f7d645..3787f7d645 100755..100644 --- a/indra/newview/skins/default/xui/ja/menu_group_plus.xml +++ b/indra/newview/skins/default/xui/ja/menu_group_plus.xml diff --git a/indra/newview/skins/default/xui/ja/menu_hide_navbar.xml b/indra/newview/skins/default/xui/ja/menu_hide_navbar.xml index 2e633ae1b2..2e633ae1b2 100755..100644 --- a/indra/newview/skins/default/xui/ja/menu_hide_navbar.xml +++ b/indra/newview/skins/default/xui/ja/menu_hide_navbar.xml diff --git a/indra/newview/skins/default/xui/ja/menu_imchiclet_adhoc.xml b/indra/newview/skins/default/xui/ja/menu_imchiclet_adhoc.xml index 8cd6fa4a27..8cd6fa4a27 100755..100644 --- a/indra/newview/skins/default/xui/ja/menu_imchiclet_adhoc.xml +++ b/indra/newview/skins/default/xui/ja/menu_imchiclet_adhoc.xml diff --git a/indra/newview/skins/default/xui/ja/menu_imchiclet_group.xml b/indra/newview/skins/default/xui/ja/menu_imchiclet_group.xml index 5bcb96f083..5bcb96f083 100755..100644 --- a/indra/newview/skins/default/xui/ja/menu_imchiclet_group.xml +++ b/indra/newview/skins/default/xui/ja/menu_imchiclet_group.xml diff --git a/indra/newview/skins/default/xui/ja/menu_imchiclet_p2p.xml b/indra/newview/skins/default/xui/ja/menu_imchiclet_p2p.xml index 5453f998fa..5453f998fa 100755..100644 --- a/indra/newview/skins/default/xui/ja/menu_imchiclet_p2p.xml +++ b/indra/newview/skins/default/xui/ja/menu_imchiclet_p2p.xml diff --git a/indra/newview/skins/default/xui/ja/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/ja/menu_inspect_avatar_gear.xml index 9d0d0f10a6..9d0d0f10a6 100755..100644 --- a/indra/newview/skins/default/xui/ja/menu_inspect_avatar_gear.xml +++ b/indra/newview/skins/default/xui/ja/menu_inspect_avatar_gear.xml diff --git a/indra/newview/skins/default/xui/ja/menu_inspect_object_gear.xml b/indra/newview/skins/default/xui/ja/menu_inspect_object_gear.xml index 5a0519ba19..5a0519ba19 100755..100644 --- a/indra/newview/skins/default/xui/ja/menu_inspect_object_gear.xml +++ b/indra/newview/skins/default/xui/ja/menu_inspect_object_gear.xml diff --git a/indra/newview/skins/default/xui/ja/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/ja/menu_inspect_self_gear.xml index e3e206f3aa..e3e206f3aa 100755..100644 --- a/indra/newview/skins/default/xui/ja/menu_inspect_self_gear.xml +++ b/indra/newview/skins/default/xui/ja/menu_inspect_self_gear.xml diff --git a/indra/newview/skins/default/xui/ja/menu_inv_offer_chiclet.xml b/indra/newview/skins/default/xui/ja/menu_inv_offer_chiclet.xml index 9a4a8138f5..9a4a8138f5 100755..100644 --- a/indra/newview/skins/default/xui/ja/menu_inv_offer_chiclet.xml +++ b/indra/newview/skins/default/xui/ja/menu_inv_offer_chiclet.xml 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..100644 --- 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_add.xml b/indra/newview/skins/default/xui/ja/menu_inventory_add.xml index ae5ddbb78f..ae5ddbb78f 100755..100644 --- a/indra/newview/skins/default/xui/ja/menu_inventory_add.xml +++ b/indra/newview/skins/default/xui/ja/menu_inventory_add.xml 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..100644 --- 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_land.xml b/indra/newview/skins/default/xui/ja/menu_land.xml index 3754bd7fa4..3754bd7fa4 100755..100644 --- a/indra/newview/skins/default/xui/ja/menu_land.xml +++ b/indra/newview/skins/default/xui/ja/menu_land.xml diff --git a/indra/newview/skins/default/xui/ja/menu_landmark.xml b/indra/newview/skins/default/xui/ja/menu_landmark.xml index c134422955..c134422955 100755..100644 --- a/indra/newview/skins/default/xui/ja/menu_landmark.xml +++ b/indra/newview/skins/default/xui/ja/menu_landmark.xml diff --git a/indra/newview/skins/default/xui/ja/menu_login.xml b/indra/newview/skins/default/xui/ja/menu_login.xml index cd8bd52f91..cd8bd52f91 100755..100644 --- a/indra/newview/skins/default/xui/ja/menu_login.xml +++ b/indra/newview/skins/default/xui/ja/menu_login.xml 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_media_ctrl.xml b/indra/newview/skins/default/xui/ja/menu_media_ctrl.xml index faae4ef717..faae4ef717 100755..100644 --- a/indra/newview/skins/default/xui/ja/menu_media_ctrl.xml +++ b/indra/newview/skins/default/xui/ja/menu_media_ctrl.xml diff --git a/indra/newview/skins/default/xui/ja/menu_mini_map.xml b/indra/newview/skins/default/xui/ja/menu_mini_map.xml index 2e733ee24b..2e733ee24b 100755..100644 --- a/indra/newview/skins/default/xui/ja/menu_mini_map.xml +++ b/indra/newview/skins/default/xui/ja/menu_mini_map.xml diff --git a/indra/newview/skins/default/xui/ja/menu_model_import_gear_default.xml b/indra/newview/skins/default/xui/ja/menu_model_import_gear_default.xml index 43f86e84bf..43f86e84bf 100755..100644 --- a/indra/newview/skins/default/xui/ja/menu_model_import_gear_default.xml +++ b/indra/newview/skins/default/xui/ja/menu_model_import_gear_default.xml diff --git a/indra/newview/skins/default/xui/ja/menu_navbar.xml b/indra/newview/skins/default/xui/ja/menu_navbar.xml index 9ae2e58198..9ae2e58198 100755..100644 --- a/indra/newview/skins/default/xui/ja/menu_navbar.xml +++ b/indra/newview/skins/default/xui/ja/menu_navbar.xml diff --git a/indra/newview/skins/default/xui/ja/menu_nearby_chat.xml b/indra/newview/skins/default/xui/ja/menu_nearby_chat.xml index c2e4a27686..c2e4a27686 100755..100644 --- a/indra/newview/skins/default/xui/ja/menu_nearby_chat.xml +++ b/indra/newview/skins/default/xui/ja/menu_nearby_chat.xml diff --git a/indra/newview/skins/default/xui/ja/menu_notification_well_button.xml b/indra/newview/skins/default/xui/ja/menu_notification_well_button.xml index 913bae8958..913bae8958 100755..100644 --- a/indra/newview/skins/default/xui/ja/menu_notification_well_button.xml +++ b/indra/newview/skins/default/xui/ja/menu_notification_well_button.xml diff --git a/indra/newview/skins/default/xui/ja/menu_object.xml b/indra/newview/skins/default/xui/ja/menu_object.xml index ae02edefe2..ae02edefe2 100755..100644 --- a/indra/newview/skins/default/xui/ja/menu_object.xml +++ b/indra/newview/skins/default/xui/ja/menu_object.xml diff --git a/indra/newview/skins/default/xui/ja/menu_object_icon.xml b/indra/newview/skins/default/xui/ja/menu_object_icon.xml index 6448e9244e..6448e9244e 100755..100644 --- a/indra/newview/skins/default/xui/ja/menu_object_icon.xml +++ b/indra/newview/skins/default/xui/ja/menu_object_icon.xml diff --git a/indra/newview/skins/default/xui/ja/menu_outfit_gear.xml b/indra/newview/skins/default/xui/ja/menu_outfit_gear.xml index 1969ae2a10..1969ae2a10 100755..100644 --- a/indra/newview/skins/default/xui/ja/menu_outfit_gear.xml +++ b/indra/newview/skins/default/xui/ja/menu_outfit_gear.xml diff --git a/indra/newview/skins/default/xui/ja/menu_outfit_tab.xml b/indra/newview/skins/default/xui/ja/menu_outfit_tab.xml index 9491c22f31..9491c22f31 100755..100644 --- a/indra/newview/skins/default/xui/ja/menu_outfit_tab.xml +++ b/indra/newview/skins/default/xui/ja/menu_outfit_tab.xml diff --git a/indra/newview/skins/default/xui/ja/menu_participant_list.xml b/indra/newview/skins/default/xui/ja/menu_participant_list.xml index 64d8ded722..64d8ded722 100755..100644 --- a/indra/newview/skins/default/xui/ja/menu_participant_list.xml +++ b/indra/newview/skins/default/xui/ja/menu_participant_list.xml diff --git a/indra/newview/skins/default/xui/ja/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/ja/menu_people_friends_view_sort.xml index 76340e4d76..76340e4d76 100755..100644 --- a/indra/newview/skins/default/xui/ja/menu_people_friends_view_sort.xml +++ b/indra/newview/skins/default/xui/ja/menu_people_friends_view_sort.xml diff --git a/indra/newview/skins/default/xui/ja/menu_people_groups.xml b/indra/newview/skins/default/xui/ja/menu_people_groups.xml index 2c0c85ba28..2c0c85ba28 100755..100644 --- a/indra/newview/skins/default/xui/ja/menu_people_groups.xml +++ b/indra/newview/skins/default/xui/ja/menu_people_groups.xml diff --git a/indra/newview/skins/default/xui/ja/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/ja/menu_people_groups_view_sort.xml index bfc7d15017..bfc7d15017 100755..100644 --- a/indra/newview/skins/default/xui/ja/menu_people_groups_view_sort.xml +++ b/indra/newview/skins/default/xui/ja/menu_people_groups_view_sort.xml diff --git a/indra/newview/skins/default/xui/ja/menu_people_nearby.xml b/indra/newview/skins/default/xui/ja/menu_people_nearby.xml index 972ab767bf..972ab767bf 100755..100644 --- a/indra/newview/skins/default/xui/ja/menu_people_nearby.xml +++ b/indra/newview/skins/default/xui/ja/menu_people_nearby.xml diff --git a/indra/newview/skins/default/xui/ja/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/ja/menu_people_nearby_multiselect.xml index fe85e278cf..fe85e278cf 100755..100644 --- a/indra/newview/skins/default/xui/ja/menu_people_nearby_multiselect.xml +++ b/indra/newview/skins/default/xui/ja/menu_people_nearby_multiselect.xml diff --git a/indra/newview/skins/default/xui/ja/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/ja/menu_people_nearby_view_sort.xml index 44c5438509..44c5438509 100755..100644 --- a/indra/newview/skins/default/xui/ja/menu_people_nearby_view_sort.xml +++ b/indra/newview/skins/default/xui/ja/menu_people_nearby_view_sort.xml diff --git a/indra/newview/skins/default/xui/ja/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/ja/menu_people_recent_view_sort.xml index b4f177a068..b4f177a068 100755..100644 --- a/indra/newview/skins/default/xui/ja/menu_people_recent_view_sort.xml +++ b/indra/newview/skins/default/xui/ja/menu_people_recent_view_sort.xml diff --git a/indra/newview/skins/default/xui/ja/menu_picks.xml b/indra/newview/skins/default/xui/ja/menu_picks.xml index 011d3d2526..011d3d2526 100755..100644 --- a/indra/newview/skins/default/xui/ja/menu_picks.xml +++ b/indra/newview/skins/default/xui/ja/menu_picks.xml diff --git a/indra/newview/skins/default/xui/ja/menu_picks_plus.xml b/indra/newview/skins/default/xui/ja/menu_picks_plus.xml index 84bf90fea0..84bf90fea0 100755..100644 --- a/indra/newview/skins/default/xui/ja/menu_picks_plus.xml +++ b/indra/newview/skins/default/xui/ja/menu_picks_plus.xml diff --git a/indra/newview/skins/default/xui/ja/menu_place.xml b/indra/newview/skins/default/xui/ja/menu_place.xml index a9f05e126d..a9f05e126d 100755..100644 --- a/indra/newview/skins/default/xui/ja/menu_place.xml +++ b/indra/newview/skins/default/xui/ja/menu_place.xml diff --git a/indra/newview/skins/default/xui/ja/menu_place_add_button.xml b/indra/newview/skins/default/xui/ja/menu_place_add_button.xml index d5ce88b055..d5ce88b055 100755..100644 --- a/indra/newview/skins/default/xui/ja/menu_place_add_button.xml +++ b/indra/newview/skins/default/xui/ja/menu_place_add_button.xml diff --git a/indra/newview/skins/default/xui/ja/menu_places_gear_folder.xml b/indra/newview/skins/default/xui/ja/menu_places_gear_folder.xml index c455204722..c455204722 100755..100644 --- a/indra/newview/skins/default/xui/ja/menu_places_gear_folder.xml +++ b/indra/newview/skins/default/xui/ja/menu_places_gear_folder.xml diff --git a/indra/newview/skins/default/xui/ja/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/ja/menu_places_gear_landmark.xml index 579f2c2cbd..579f2c2cbd 100755..100644 --- a/indra/newview/skins/default/xui/ja/menu_places_gear_landmark.xml +++ b/indra/newview/skins/default/xui/ja/menu_places_gear_landmark.xml diff --git a/indra/newview/skins/default/xui/ja/menu_profile_overflow.xml b/indra/newview/skins/default/xui/ja/menu_profile_overflow.xml index 9d3a5dda1c..9d3a5dda1c 100755..100644 --- a/indra/newview/skins/default/xui/ja/menu_profile_overflow.xml +++ b/indra/newview/skins/default/xui/ja/menu_profile_overflow.xml diff --git a/indra/newview/skins/default/xui/ja/menu_save_outfit.xml b/indra/newview/skins/default/xui/ja/menu_save_outfit.xml index 6513d9264a..6513d9264a 100755..100644 --- a/indra/newview/skins/default/xui/ja/menu_save_outfit.xml +++ b/indra/newview/skins/default/xui/ja/menu_save_outfit.xml diff --git a/indra/newview/skins/default/xui/ja/menu_script_chiclet.xml b/indra/newview/skins/default/xui/ja/menu_script_chiclet.xml index a89dd0bcbe..a89dd0bcbe 100755..100644 --- a/indra/newview/skins/default/xui/ja/menu_script_chiclet.xml +++ b/indra/newview/skins/default/xui/ja/menu_script_chiclet.xml diff --git a/indra/newview/skins/default/xui/ja/menu_slurl.xml b/indra/newview/skins/default/xui/ja/menu_slurl.xml index 61ba3085d9..61ba3085d9 100755..100644 --- a/indra/newview/skins/default/xui/ja/menu_slurl.xml +++ b/indra/newview/skins/default/xui/ja/menu_slurl.xml diff --git a/indra/newview/skins/default/xui/ja/menu_teleport_history_gear.xml b/indra/newview/skins/default/xui/ja/menu_teleport_history_gear.xml index 901eab9166..901eab9166 100755..100644 --- a/indra/newview/skins/default/xui/ja/menu_teleport_history_gear.xml +++ b/indra/newview/skins/default/xui/ja/menu_teleport_history_gear.xml diff --git a/indra/newview/skins/default/xui/ja/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/ja/menu_teleport_history_item.xml index 61642048b8..61642048b8 100755..100644 --- a/indra/newview/skins/default/xui/ja/menu_teleport_history_item.xml +++ b/indra/newview/skins/default/xui/ja/menu_teleport_history_item.xml diff --git a/indra/newview/skins/default/xui/ja/menu_teleport_history_tab.xml b/indra/newview/skins/default/xui/ja/menu_teleport_history_tab.xml index 4dd44d2ec8..4dd44d2ec8 100755..100644 --- a/indra/newview/skins/default/xui/ja/menu_teleport_history_tab.xml +++ b/indra/newview/skins/default/xui/ja/menu_teleport_history_tab.xml diff --git a/indra/newview/skins/default/xui/ja/menu_text_editor.xml b/indra/newview/skins/default/xui/ja/menu_text_editor.xml index eda973c888..eda973c888 100755..100644 --- a/indra/newview/skins/default/xui/ja/menu_text_editor.xml +++ b/indra/newview/skins/default/xui/ja/menu_text_editor.xml diff --git a/indra/newview/skins/default/xui/ja/menu_toolbars.xml b/indra/newview/skins/default/xui/ja/menu_toolbars.xml index d5363a5131..d5363a5131 100755..100644 --- a/indra/newview/skins/default/xui/ja/menu_toolbars.xml +++ b/indra/newview/skins/default/xui/ja/menu_toolbars.xml diff --git a/indra/newview/skins/default/xui/ja/menu_topinfobar.xml b/indra/newview/skins/default/xui/ja/menu_topinfobar.xml index 1a67a2a8f7..1a67a2a8f7 100755..100644 --- a/indra/newview/skins/default/xui/ja/menu_topinfobar.xml +++ b/indra/newview/skins/default/xui/ja/menu_topinfobar.xml diff --git a/indra/newview/skins/default/xui/ja/menu_url_agent.xml b/indra/newview/skins/default/xui/ja/menu_url_agent.xml index 639602ce3c..639602ce3c 100755..100644 --- a/indra/newview/skins/default/xui/ja/menu_url_agent.xml +++ b/indra/newview/skins/default/xui/ja/menu_url_agent.xml 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_url_group.xml b/indra/newview/skins/default/xui/ja/menu_url_group.xml index 1dd3d79438..1dd3d79438 100755..100644 --- a/indra/newview/skins/default/xui/ja/menu_url_group.xml +++ b/indra/newview/skins/default/xui/ja/menu_url_group.xml diff --git a/indra/newview/skins/default/xui/ja/menu_url_http.xml b/indra/newview/skins/default/xui/ja/menu_url_http.xml index c3da8a8686..c3da8a8686 100755..100644 --- a/indra/newview/skins/default/xui/ja/menu_url_http.xml +++ b/indra/newview/skins/default/xui/ja/menu_url_http.xml diff --git a/indra/newview/skins/default/xui/ja/menu_url_inventory.xml b/indra/newview/skins/default/xui/ja/menu_url_inventory.xml index 147ab44a1b..147ab44a1b 100755..100644 --- a/indra/newview/skins/default/xui/ja/menu_url_inventory.xml +++ b/indra/newview/skins/default/xui/ja/menu_url_inventory.xml diff --git a/indra/newview/skins/default/xui/ja/menu_url_map.xml b/indra/newview/skins/default/xui/ja/menu_url_map.xml index 8d41e1a571..8d41e1a571 100755..100644 --- a/indra/newview/skins/default/xui/ja/menu_url_map.xml +++ b/indra/newview/skins/default/xui/ja/menu_url_map.xml diff --git a/indra/newview/skins/default/xui/ja/menu_url_objectim.xml b/indra/newview/skins/default/xui/ja/menu_url_objectim.xml index a02ca8415d..a02ca8415d 100755..100644 --- a/indra/newview/skins/default/xui/ja/menu_url_objectim.xml +++ b/indra/newview/skins/default/xui/ja/menu_url_objectim.xml diff --git a/indra/newview/skins/default/xui/ja/menu_url_parcel.xml b/indra/newview/skins/default/xui/ja/menu_url_parcel.xml index 8d264059d3..8d264059d3 100755..100644 --- a/indra/newview/skins/default/xui/ja/menu_url_parcel.xml +++ b/indra/newview/skins/default/xui/ja/menu_url_parcel.xml diff --git a/indra/newview/skins/default/xui/ja/menu_url_slapp.xml b/indra/newview/skins/default/xui/ja/menu_url_slapp.xml index a516c5a075..a516c5a075 100755..100644 --- a/indra/newview/skins/default/xui/ja/menu_url_slapp.xml +++ b/indra/newview/skins/default/xui/ja/menu_url_slapp.xml diff --git a/indra/newview/skins/default/xui/ja/menu_url_slurl.xml b/indra/newview/skins/default/xui/ja/menu_url_slurl.xml index 2c857ec915..2c857ec915 100755..100644 --- a/indra/newview/skins/default/xui/ja/menu_url_slurl.xml +++ b/indra/newview/skins/default/xui/ja/menu_url_slurl.xml diff --git a/indra/newview/skins/default/xui/ja/menu_url_teleport.xml b/indra/newview/skins/default/xui/ja/menu_url_teleport.xml index c3507a9a33..c3507a9a33 100755..100644 --- a/indra/newview/skins/default/xui/ja/menu_url_teleport.xml +++ b/indra/newview/skins/default/xui/ja/menu_url_teleport.xml diff --git a/indra/newview/skins/default/xui/ja/menu_viewer.xml b/indra/newview/skins/default/xui/ja/menu_viewer.xml index 0b85c693f0..0384dc1efc 100755..100644 --- a/indra/newview/skins/default/xui/ja/menu_viewer.xml +++ b/indra/newview/skins/default/xui/ja/menu_viewer.xml @@ -8,13 +8,14 @@ <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"/> <menu_item_check label="飛ぶ" name="Fly"/> <menu_item_check label="常に走る" name="Always Run"/> <menu_item_call label="私のアニメーションを停止する" name="Stop Animating My Avatar"/> - <menu_item_call label="歩行／走行／飛行..." name="Walk / run / fly"/> + <menu_item_call label="歩行／走行／飛行..." name="WalkRunFly"/> </menu> <menu label="ログイン" name="Status"> <menu_item_check label="一時退席中" name="Away"/> @@ -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"> @@ -62,7 +64,7 @@ <menu_item_call label="スナップショット" name="Take Snapshot"/> <menu_item_call label="場所のプロフィール" name="Place Profile"/> <menu_item_call label="土地情報" name="About Land"/> - <menu_item_call label="地域 / 不動産" name="Region/Estate"/> + <menu_item_call label="地域 / 不動産" name="RegionEstate"/> <menu_item_call label="保有地..." name="My Land"/> <menu_item_call label="この土地を購入" name="Buy Land"/> <menu label="表示" name="LandShow"> @@ -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/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/ja/menu_wearable_list_item.xml index c402fa0b6d..c402fa0b6d 100755..100644 --- a/indra/newview/skins/default/xui/ja/menu_wearable_list_item.xml +++ b/indra/newview/skins/default/xui/ja/menu_wearable_list_item.xml diff --git a/indra/newview/skins/default/xui/ja/menu_wearing_gear.xml b/indra/newview/skins/default/xui/ja/menu_wearing_gear.xml index 5334042dc9..5334042dc9 100755..100644 --- a/indra/newview/skins/default/xui/ja/menu_wearing_gear.xml +++ b/indra/newview/skins/default/xui/ja/menu_wearing_gear.xml diff --git a/indra/newview/skins/default/xui/ja/menu_wearing_tab.xml b/indra/newview/skins/default/xui/ja/menu_wearing_tab.xml index 9effed1f42..9effed1f42 100755..100644 --- a/indra/newview/skins/default/xui/ja/menu_wearing_tab.xml +++ b/indra/newview/skins/default/xui/ja/menu_wearing_tab.xml 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..100644 --- 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..100644 --- 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..100644 --- 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..5f0ce7a73b 100755..100644 --- 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"> + 在庫フォルダへのコピーまたは移動がエラーにより失敗しました: + +'[ERROR_CODE]' + <usetemplate name="okbutton" yestext="OK"/> + </notification> + <notification name="MerchantPasteFailed"> + マーケットプレイスのリストへのコピーまたは移動がエラーにより失敗しました: + +'[ERROR_CODE]' + <usetemplate name="okbutton" yestext="OK"/> + </notification> + <notification name="MerchantTransactionFailed"> + マーケットプレイスによる取引が次のエラーにより失敗しました: + +理由：'[ERROR_REASON]' +[ERROR_DESCRIPTION] + <usetemplate name="okbutton" yestext="OK"/> + </notification> + <notification name="MerchantUnprocessableEntity"> + この製品をリストに表示できないか、バージョンフォルダを有効にできません。通常、これはリスト説明フォームに情報が不足しているために起こりますが、フォルダ構造のエラーが原因の場合もあります。リストを編集するか、リストフォルダにエラーがないか確認してください。 + <usetemplate name="okbutton" yestext="OK"/> + </notification> + <notification name="MerchantListingFailed"> + マーケットプレイスへのリスト表示が次のエラーで失敗しました : + +'[ERROR_CODE]' + <usetemplate name="okbutton" yestext="OK"/> + </notification> + <notification name="MerchantFolderActivationFailed"> + このバージョンフォルダの有効化が次のエラーにより失敗しました : + +'[ERROR_CODE]' + <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 を参照してくだ 訪問しようとしている地域（リージョン）には現在の環境設定を超えるコンテンツが含まれています。「ミー」 > 「環境設定」 > 「一般」を選択して、環境設定を変更できます。 <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"> + リージョンに入ることができません。'[REGION_NAME]' はスキル ゲーミング リージョンであり、あなたはこのリージョンに入るための特定の基準を満たす必要があります。詳しくは、[http://wiki.secondlife.com/wiki/Linden_Lab_Official:Skill_Gaming_in_Second_Life スキル ゲーミングのよくある質問] を参照してください。 + <usetemplate name="okbutton" yestext="OK"/> + </notification> <notification name="PreferredMaturityChanged"> 今後、[RATING] コンテンツ付きの地域（リージョン）を訪問しようとしているという通知を受け取りません。後でメニューバーの「ミー」 > 「環境設定」 > 「一般」を使用して、コンテンツの環境設定を変更できます。 <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] 以上のアイテムを含むフォルダを装着できません。「詳細設定」 > 「デバッグ設定を表示」 > 「WearFolderLimit」でこの制限を変更できます。 + </notification> <notification label="「通知を受けない」モードの警告" name="DoNotDisturbModePay"> 「通知を受けない」をオンにします。この支払との交換で提供されるアイテムが受信されなくなります。 @@ -2705,9 +2836,6 @@ Web ページにリンクすると、他人がこの場所に簡単にアクセ <notification name="NoValidCircuit"> 回路コードが無効です。 </notification> - <notification name="NoValidTimestamp"> - タイムスタンプが無効です。 - </notification> <notification name="NoPendingConnection"> 接続を生成できません。 </notification> @@ -2862,7 +2990,7 @@ Web ページにリンクすると、他人がこの場所に簡単にアクセ [MESSAGE] -送信元のオブジェクト：<nolink>[OBJECTNAME]</nolink>、所有者：[NAME]? +送信元のオブジェクト：<nolink>[OBJECTNAME]</nolink>、所有者：[NAME] <form name="form"> <button name="Gotopage" text="ページに移動"/> <button name="Cancel" text="取り消し"/> @@ -2888,6 +3016,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"> + 体験プロフィールを更新するときに、編集不可の '[field]' フィールドが無視されました。 + </notification> + <notification name="RestrictedToOwnerExperienceProfileMessage"> + 体験の所有者のみが設定できる '[field]'フィールドへの変更を無視しました。 + </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] が所有する「<nolink>[OBJECTNAME]</nolink>」 というオブジェクトが、[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"> 警告:オブジェクト '<nolink>[OBJECTNAME]</nolink>' は、あなたのリンデンドルアカウントへのフルアクセスを要求しています。アクセスを許可すると、このオブジェクトは、特に警告を発せずに単発で、随時アカウントから資金を削除するか、アカウントを完全に空にします。 @@ -3204,6 +3398,10 @@ M キーを押して変更します。 ( 作成後[EXISTENCE]秒経過） '[BODYREGION]'の[RESOLUTION]のベークドテクスチャは[TIME]秒後にローカルに更新されました。 </notification> + <notification name="CannotUploadTexture"> + テクスチャをアップロードできません。 +[REASON] + </notification> <notification name="LivePreviewUnavailable"> コピー不可および/または転送不可のため、このテクスチャを表示できません。 <usetemplate ignoretext="コピー不可および/または転送不可テクスチャでライブプレビューモードを使用できないことを警告する" name="okignore" yestext="OK"/> @@ -3773,9 +3971,11 @@ M キーを押して変更します。 </notification> <notification name="TeleportedByAttachment"> [ITEM_ID] へのアタッチメントによって、あなたはテレポートされています。 + <usetemplate ignoretext="テレポート：アタッチメントによりテレポートされました" name="notifyignore"/> </notification> <notification name="TeleportedByObjectOnParcel"> 区画 '[PARCEL_NAME]' のオブジェクト '[OBJECT_NAME]' によって、あなたはテレポートされています。 + <usetemplate ignoretext="テレポート：区画上のオブジェクトによりテレポートされました" name="notifyignore"/> </notification> <notification name="TeleportedByObjectOwnedBy"> [OWNER_ID] が所有しているオブジェクト '[OBJECT_NAME]' によって、あなたはテレポートされています。 @@ -4107,7 +4307,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/outfit_accordion_tab.xml b/indra/newview/skins/default/xui/ja/outfit_accordion_tab.xml index bac885e5d8..bac885e5d8 100755..100644 --- a/indra/newview/skins/default/xui/ja/outfit_accordion_tab.xml +++ b/indra/newview/skins/default/xui/ja/outfit_accordion_tab.xml diff --git a/indra/newview/skins/default/xui/ja/panel_active_object_row.xml b/indra/newview/skins/default/xui/ja/panel_active_object_row.xml index 90491e84c5..90491e84c5 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_active_object_row.xml +++ b/indra/newview/skins/default/xui/ja/panel_active_object_row.xml diff --git a/indra/newview/skins/default/xui/ja/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/ja/panel_adhoc_control_panel.xml index 17e1283d24..17e1283d24 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_adhoc_control_panel.xml +++ b/indra/newview/skins/default/xui/ja/panel_adhoc_control_panel.xml diff --git a/indra/newview/skins/default/xui/ja/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/ja/panel_avatar_list_item.xml index 3ef8eba19f..3ef8eba19f 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_avatar_list_item.xml +++ b/indra/newview/skins/default/xui/ja/panel_avatar_list_item.xml diff --git a/indra/newview/skins/default/xui/ja/panel_avatar_tag.xml b/indra/newview/skins/default/xui/ja/panel_avatar_tag.xml index fd91ea97d1..fd91ea97d1 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_avatar_tag.xml +++ b/indra/newview/skins/default/xui/ja/panel_avatar_tag.xml diff --git a/indra/newview/skins/default/xui/ja/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/ja/panel_block_list_sidetray.xml index 9263e5f347..9263e5f347 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_block_list_sidetray.xml +++ b/indra/newview/skins/default/xui/ja/panel_block_list_sidetray.xml diff --git a/indra/newview/skins/default/xui/ja/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/ja/panel_body_parts_list_item.xml index 95a5a26d4e..95a5a26d4e 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_body_parts_list_item.xml +++ b/indra/newview/skins/default/xui/ja/panel_body_parts_list_item.xml diff --git a/indra/newview/skins/default/xui/ja/panel_bodyparts_list_button_bar.xml b/indra/newview/skins/default/xui/ja/panel_bodyparts_list_button_bar.xml index 42d8a21660..42d8a21660 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_bodyparts_list_button_bar.xml +++ b/indra/newview/skins/default/xui/ja/panel_bodyparts_list_button_bar.xml diff --git a/indra/newview/skins/default/xui/ja/panel_bottomtray_lite.xml b/indra/newview/skins/default/xui/ja/panel_bottomtray_lite.xml index 6eca8adfe5..6eca8adfe5 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_bottomtray_lite.xml +++ b/indra/newview/skins/default/xui/ja/panel_bottomtray_lite.xml diff --git a/indra/newview/skins/default/xui/ja/panel_chat_header.xml b/indra/newview/skins/default/xui/ja/panel_chat_header.xml index 7916bf5155..7916bf5155 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_chat_header.xml +++ b/indra/newview/skins/default/xui/ja/panel_chat_header.xml diff --git a/indra/newview/skins/default/xui/ja/panel_chiclet_bar.xml b/indra/newview/skins/default/xui/ja/panel_chiclet_bar.xml index 6717ba9ba3..6717ba9ba3 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_chiclet_bar.xml +++ b/indra/newview/skins/default/xui/ja/panel_chiclet_bar.xml diff --git a/indra/newview/skins/default/xui/ja/panel_classified_info.xml b/indra/newview/skins/default/xui/ja/panel_classified_info.xml index 57a255afde..57a255afde 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_classified_info.xml +++ b/indra/newview/skins/default/xui/ja/panel_classified_info.xml diff --git a/indra/newview/skins/default/xui/ja/panel_clothing_list_button_bar.xml b/indra/newview/skins/default/xui/ja/panel_clothing_list_button_bar.xml index 2159f17fec..2159f17fec 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_clothing_list_button_bar.xml +++ b/indra/newview/skins/default/xui/ja/panel_clothing_list_button_bar.xml diff --git a/indra/newview/skins/default/xui/ja/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/ja/panel_clothing_list_item.xml index 158b2fa6ac..158b2fa6ac 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_clothing_list_item.xml +++ b/indra/newview/skins/default/xui/ja/panel_clothing_list_item.xml diff --git a/indra/newview/skins/default/xui/ja/panel_cof_wearables.xml b/indra/newview/skins/default/xui/ja/panel_cof_wearables.xml index b9bc10c220..b9bc10c220 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_cof_wearables.xml +++ b/indra/newview/skins/default/xui/ja/panel_cof_wearables.xml diff --git a/indra/newview/skins/default/xui/ja/panel_deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/ja/panel_deletable_wearable_list_item.xml index a1e30283ee..a1e30283ee 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_deletable_wearable_list_item.xml +++ b/indra/newview/skins/default/xui/ja/panel_deletable_wearable_list_item.xml diff --git a/indra/newview/skins/default/xui/ja/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/ja/panel_dummy_clothing_list_item.xml index 0395d4edd8..0395d4edd8 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_dummy_clothing_list_item.xml +++ b/indra/newview/skins/default/xui/ja/panel_dummy_clothing_list_item.xml diff --git a/indra/newview/skins/default/xui/ja/panel_edit_alpha.xml b/indra/newview/skins/default/xui/ja/panel_edit_alpha.xml index 7250da69a4..7250da69a4 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_edit_alpha.xml +++ b/indra/newview/skins/default/xui/ja/panel_edit_alpha.xml diff --git a/indra/newview/skins/default/xui/ja/panel_edit_classified.xml b/indra/newview/skins/default/xui/ja/panel_edit_classified.xml index b556b68e02..b556b68e02 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_edit_classified.xml +++ b/indra/newview/skins/default/xui/ja/panel_edit_classified.xml diff --git a/indra/newview/skins/default/xui/ja/panel_edit_eyes.xml b/indra/newview/skins/default/xui/ja/panel_edit_eyes.xml index 94967999a1..94967999a1 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_edit_eyes.xml +++ b/indra/newview/skins/default/xui/ja/panel_edit_eyes.xml diff --git a/indra/newview/skins/default/xui/ja/panel_edit_gloves.xml b/indra/newview/skins/default/xui/ja/panel_edit_gloves.xml index 72eb120c3d..72eb120c3d 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_edit_gloves.xml +++ b/indra/newview/skins/default/xui/ja/panel_edit_gloves.xml diff --git a/indra/newview/skins/default/xui/ja/panel_edit_hair.xml b/indra/newview/skins/default/xui/ja/panel_edit_hair.xml index f73f760192..f73f760192 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_edit_hair.xml +++ b/indra/newview/skins/default/xui/ja/panel_edit_hair.xml diff --git a/indra/newview/skins/default/xui/ja/panel_edit_jacket.xml b/indra/newview/skins/default/xui/ja/panel_edit_jacket.xml index ee39e9435c..ee39e9435c 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_edit_jacket.xml +++ b/indra/newview/skins/default/xui/ja/panel_edit_jacket.xml diff --git a/indra/newview/skins/default/xui/ja/panel_edit_pants.xml b/indra/newview/skins/default/xui/ja/panel_edit_pants.xml index 6a1789c9f4..6a1789c9f4 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_edit_pants.xml +++ b/indra/newview/skins/default/xui/ja/panel_edit_pants.xml diff --git a/indra/newview/skins/default/xui/ja/panel_edit_physics.xml b/indra/newview/skins/default/xui/ja/panel_edit_physics.xml index 6ebf0062dc..6ebf0062dc 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_edit_physics.xml +++ b/indra/newview/skins/default/xui/ja/panel_edit_physics.xml diff --git a/indra/newview/skins/default/xui/ja/panel_edit_pick.xml b/indra/newview/skins/default/xui/ja/panel_edit_pick.xml index 39ea1df1e3..39ea1df1e3 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_edit_pick.xml +++ b/indra/newview/skins/default/xui/ja/panel_edit_pick.xml diff --git a/indra/newview/skins/default/xui/ja/panel_edit_profile.xml b/indra/newview/skins/default/xui/ja/panel_edit_profile.xml index 4cbd7f793b..4cbd7f793b 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_edit_profile.xml +++ b/indra/newview/skins/default/xui/ja/panel_edit_profile.xml diff --git a/indra/newview/skins/default/xui/ja/panel_edit_shape.xml b/indra/newview/skins/default/xui/ja/panel_edit_shape.xml index 5a3a949150..5a3a949150 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_edit_shape.xml +++ b/indra/newview/skins/default/xui/ja/panel_edit_shape.xml diff --git a/indra/newview/skins/default/xui/ja/panel_edit_shirt.xml b/indra/newview/skins/default/xui/ja/panel_edit_shirt.xml index f33daa4eba..f33daa4eba 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_edit_shirt.xml +++ b/indra/newview/skins/default/xui/ja/panel_edit_shirt.xml diff --git a/indra/newview/skins/default/xui/ja/panel_edit_shoes.xml b/indra/newview/skins/default/xui/ja/panel_edit_shoes.xml index c7626189af..c7626189af 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_edit_shoes.xml +++ b/indra/newview/skins/default/xui/ja/panel_edit_shoes.xml diff --git a/indra/newview/skins/default/xui/ja/panel_edit_skin.xml b/indra/newview/skins/default/xui/ja/panel_edit_skin.xml index 7573132576..7573132576 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_edit_skin.xml +++ b/indra/newview/skins/default/xui/ja/panel_edit_skin.xml diff --git a/indra/newview/skins/default/xui/ja/panel_edit_skirt.xml b/indra/newview/skins/default/xui/ja/panel_edit_skirt.xml index 6efc4ce99a..6efc4ce99a 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_edit_skirt.xml +++ b/indra/newview/skins/default/xui/ja/panel_edit_skirt.xml diff --git a/indra/newview/skins/default/xui/ja/panel_edit_socks.xml b/indra/newview/skins/default/xui/ja/panel_edit_socks.xml index 71fc7c5682..71fc7c5682 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_edit_socks.xml +++ b/indra/newview/skins/default/xui/ja/panel_edit_socks.xml diff --git a/indra/newview/skins/default/xui/ja/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/ja/panel_edit_tattoo.xml index f4cfe6d83f..f4cfe6d83f 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_edit_tattoo.xml +++ b/indra/newview/skins/default/xui/ja/panel_edit_tattoo.xml diff --git a/indra/newview/skins/default/xui/ja/panel_edit_underpants.xml b/indra/newview/skins/default/xui/ja/panel_edit_underpants.xml index f345a81922..f345a81922 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_edit_underpants.xml +++ b/indra/newview/skins/default/xui/ja/panel_edit_underpants.xml diff --git a/indra/newview/skins/default/xui/ja/panel_edit_undershirt.xml b/indra/newview/skins/default/xui/ja/panel_edit_undershirt.xml index 66b2ffa8ba..66b2ffa8ba 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_edit_undershirt.xml +++ b/indra/newview/skins/default/xui/ja/panel_edit_undershirt.xml diff --git a/indra/newview/skins/default/xui/ja/panel_edit_wearable.xml b/indra/newview/skins/default/xui/ja/panel_edit_wearable.xml index 000dac7b5b..000dac7b5b 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_edit_wearable.xml +++ b/indra/newview/skins/default/xui/ja/panel_edit_wearable.xml 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'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="<" name="btn_prev"/> + <button label=">" 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"> + "Parcel_PG_Light" + </string> + <string name="maturity_icon_moderate"> + "Parcel_M_Light" + </string> + <string name="maturity_icon_adult"> + "Parcel_R_Light" + </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="<" name="left_btn"/> + <button label=">" 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"> + タグをスペースで区切る 複数単語のタグに "" を使用 - </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_control_panel.xml b/indra/newview/skins/default/xui/ja/panel_group_control_panel.xml index 49749732c9..49749732c9 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_group_control_panel.xml +++ b/indra/newview/skins/default/xui/ja/panel_group_control_panel.xml diff --git a/indra/newview/skins/default/xui/ja/panel_group_general.xml b/indra/newview/skins/default/xui/ja/panel_group_general.xml index a1bfb67823..a1bfb67823 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_group_general.xml +++ b/indra/newview/skins/default/xui/ja/panel_group_general.xml 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..100644 --- 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="役割 & メンバー"/> <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_group_invite.xml b/indra/newview/skins/default/xui/ja/panel_group_invite.xml index 2639454a01..2639454a01 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_group_invite.xml +++ b/indra/newview/skins/default/xui/ja/panel_group_invite.xml diff --git a/indra/newview/skins/default/xui/ja/panel_group_land_money.xml b/indra/newview/skins/default/xui/ja/panel_group_land_money.xml index 82be58a0fb..82be58a0fb 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_group_land_money.xml +++ b/indra/newview/skins/default/xui/ja/panel_group_land_money.xml diff --git a/indra/newview/skins/default/xui/ja/panel_group_list_item.xml b/indra/newview/skins/default/xui/ja/panel_group_list_item.xml index 77d3d8f391..77d3d8f391 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_group_list_item.xml +++ b/indra/newview/skins/default/xui/ja/panel_group_list_item.xml diff --git a/indra/newview/skins/default/xui/ja/panel_group_notices.xml b/indra/newview/skins/default/xui/ja/panel_group_notices.xml index ddad6c1f9b..ddad6c1f9b 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_group_notices.xml +++ b/indra/newview/skins/default/xui/ja/panel_group_notices.xml diff --git a/indra/newview/skins/default/xui/ja/panel_group_notify.xml b/indra/newview/skins/default/xui/ja/panel_group_notify.xml index 7135ae780d..7135ae780d 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_group_notify.xml +++ b/indra/newview/skins/default/xui/ja/panel_group_notify.xml diff --git a/indra/newview/skins/default/xui/ja/panel_group_roles.xml b/indra/newview/skins/default/xui/ja/panel_group_roles.xml index 0e231b5b4f..0e231b5b4f 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_group_roles.xml +++ b/indra/newview/skins/default/xui/ja/panel_group_roles.xml diff --git a/indra/newview/skins/default/xui/ja/panel_im_control_panel.xml b/indra/newview/skins/default/xui/ja/panel_im_control_panel.xml index f2429ac12a..f2429ac12a 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_im_control_panel.xml +++ b/indra/newview/skins/default/xui/ja/panel_im_control_panel.xml diff --git a/indra/newview/skins/default/xui/ja/panel_instant_message.xml b/indra/newview/skins/default/xui/ja/panel_instant_message.xml index bf4cbcdc46..bf4cbcdc46 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_instant_message.xml +++ b/indra/newview/skins/default/xui/ja/panel_instant_message.xml diff --git a/indra/newview/skins/default/xui/ja/panel_inventory_item.xml b/indra/newview/skins/default/xui/ja/panel_inventory_item.xml index d18047fbcf..d18047fbcf 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_inventory_item.xml +++ b/indra/newview/skins/default/xui/ja/panel_inventory_item.xml diff --git a/indra/newview/skins/default/xui/ja/panel_landmark_info.xml b/indra/newview/skins/default/xui/ja/panel_landmark_info.xml index 7fca66f90f..7fca66f90f 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_landmark_info.xml +++ b/indra/newview/skins/default/xui/ja/panel_landmark_info.xml diff --git a/indra/newview/skins/default/xui/ja/panel_landmarks.xml b/indra/newview/skins/default/xui/ja/panel_landmarks.xml index 24d6ff23ae..24d6ff23ae 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_landmarks.xml +++ b/indra/newview/skins/default/xui/ja/panel_landmarks.xml 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..100644 --- 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_main_inventory.xml b/indra/newview/skins/default/xui/ja/panel_main_inventory.xml index f908262f4f..f908262f4f 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/ja/panel_main_inventory.xml 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_me.xml b/indra/newview/skins/default/xui/ja/panel_me.xml index 3df1ae8048..3df1ae8048 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_me.xml +++ b/indra/newview/skins/default/xui/ja/panel_me.xml diff --git a/indra/newview/skins/default/xui/ja/panel_media_settings_general.xml b/indra/newview/skins/default/xui/ja/panel_media_settings_general.xml index 6321dbb048..6321dbb048 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_media_settings_general.xml +++ b/indra/newview/skins/default/xui/ja/panel_media_settings_general.xml diff --git a/indra/newview/skins/default/xui/ja/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/ja/panel_media_settings_permissions.xml index 11d9ed4c16..11d9ed4c16 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_media_settings_permissions.xml +++ b/indra/newview/skins/default/xui/ja/panel_media_settings_permissions.xml diff --git a/indra/newview/skins/default/xui/ja/panel_media_settings_security.xml b/indra/newview/skins/default/xui/ja/panel_media_settings_security.xml index ea4fdb9ce5..ea4fdb9ce5 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_media_settings_security.xml +++ b/indra/newview/skins/default/xui/ja/panel_media_settings_security.xml diff --git a/indra/newview/skins/default/xui/ja/panel_navigation_bar.xml b/indra/newview/skins/default/xui/ja/panel_navigation_bar.xml index 51402b2e00..51402b2e00 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_navigation_bar.xml +++ b/indra/newview/skins/default/xui/ja/panel_navigation_bar.xml diff --git a/indra/newview/skins/default/xui/ja/panel_nearby_chat.xml b/indra/newview/skins/default/xui/ja/panel_nearby_chat.xml index 4048b48d3a..4048b48d3a 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_nearby_chat.xml +++ b/indra/newview/skins/default/xui/ja/panel_nearby_chat.xml diff --git a/indra/newview/skins/default/xui/ja/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/ja/panel_nearby_chat_bar.xml index 201fb0a376..201fb0a376 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_nearby_chat_bar.xml +++ b/indra/newview/skins/default/xui/ja/panel_nearby_chat_bar.xml diff --git a/indra/newview/skins/default/xui/ja/panel_nearby_media.xml b/indra/newview/skins/default/xui/ja/panel_nearby_media.xml index c29ec64304..c29ec64304 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_nearby_media.xml +++ b/indra/newview/skins/default/xui/ja/panel_nearby_media.xml diff --git a/indra/newview/skins/default/xui/ja/panel_notifications_channel.xml b/indra/newview/skins/default/xui/ja/panel_notifications_channel.xml index aff427ed49..aff427ed49 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_notifications_channel.xml +++ b/indra/newview/skins/default/xui/ja/panel_notifications_channel.xml diff --git a/indra/newview/skins/default/xui/ja/panel_notify_textbox.xml b/indra/newview/skins/default/xui/ja/panel_notify_textbox.xml index 8e0cf4bc9d..8e0cf4bc9d 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_notify_textbox.xml +++ b/indra/newview/skins/default/xui/ja/panel_notify_textbox.xml diff --git a/indra/newview/skins/default/xui/ja/panel_online_status_toast.xml b/indra/newview/skins/default/xui/ja/panel_online_status_toast.xml index fdc489f375..fdc489f375 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_online_status_toast.xml +++ b/indra/newview/skins/default/xui/ja/panel_online_status_toast.xml diff --git a/indra/newview/skins/default/xui/ja/panel_outbox_inventory.xml b/indra/newview/skins/default/xui/ja/panel_outbox_inventory.xml index 1a14283113..1a14283113 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_outbox_inventory.xml +++ b/indra/newview/skins/default/xui/ja/panel_outbox_inventory.xml diff --git a/indra/newview/skins/default/xui/ja/panel_outfit_edit.xml b/indra/newview/skins/default/xui/ja/panel_outfit_edit.xml index e89ce0c479..e89ce0c479 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_outfit_edit.xml +++ b/indra/newview/skins/default/xui/ja/panel_outfit_edit.xml diff --git a/indra/newview/skins/default/xui/ja/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/ja/panel_outfits_inventory.xml index 93df0ba2bd..93df0ba2bd 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_outfits_inventory.xml +++ b/indra/newview/skins/default/xui/ja/panel_outfits_inventory.xml diff --git a/indra/newview/skins/default/xui/ja/panel_outfits_inventory_gear_default.xml b/indra/newview/skins/default/xui/ja/panel_outfits_inventory_gear_default.xml index e8caab0696..e8caab0696 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_outfits_inventory_gear_default.xml +++ b/indra/newview/skins/default/xui/ja/panel_outfits_inventory_gear_default.xml diff --git a/indra/newview/skins/default/xui/ja/panel_outfits_list.xml b/indra/newview/skins/default/xui/ja/panel_outfits_list.xml index df9ef40113..df9ef40113 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_outfits_list.xml +++ b/indra/newview/skins/default/xui/ja/panel_outfits_list.xml diff --git a/indra/newview/skins/default/xui/ja/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/ja/panel_outfits_wearing.xml index fd03e6b89e..fd03e6b89e 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_outfits_wearing.xml +++ b/indra/newview/skins/default/xui/ja/panel_outfits_wearing.xml diff --git a/indra/newview/skins/default/xui/ja/panel_people.xml b/indra/newview/skins/default/xui/ja/panel_people.xml index dd8fd41681..dd8fd41681 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_people.xml +++ b/indra/newview/skins/default/xui/ja/panel_people.xml diff --git a/indra/newview/skins/default/xui/ja/panel_pick_info.xml b/indra/newview/skins/default/xui/ja/panel_pick_info.xml index e7b5d1929d..e7b5d1929d 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_pick_info.xml +++ b/indra/newview/skins/default/xui/ja/panel_pick_info.xml diff --git a/indra/newview/skins/default/xui/ja/panel_picks.xml b/indra/newview/skins/default/xui/ja/panel_picks.xml index c6eaaeef41..c6eaaeef41 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_picks.xml +++ b/indra/newview/skins/default/xui/ja/panel_picks.xml diff --git a/indra/newview/skins/default/xui/ja/panel_place_profile.xml b/indra/newview/skins/default/xui/ja/panel_place_profile.xml index 7235bc0f18..7235bc0f18 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_place_profile.xml +++ b/indra/newview/skins/default/xui/ja/panel_place_profile.xml diff --git a/indra/newview/skins/default/xui/ja/panel_places.xml b/indra/newview/skins/default/xui/ja/panel_places.xml index 9d3925afdc..9d3925afdc 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_places.xml +++ b/indra/newview/skins/default/xui/ja/panel_places.xml diff --git a/indra/newview/skins/default/xui/ja/panel_postcard_message.xml b/indra/newview/skins/default/xui/ja/panel_postcard_message.xml index b7c3f48557..b7c3f48557 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_postcard_message.xml +++ b/indra/newview/skins/default/xui/ja/panel_postcard_message.xml 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..100644 --- 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_advanced.xml b/indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml index 6e8797ec5e..6e8797ec5e 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/ja/panel_preferences_alerts.xml index 7fd2e31698..7fd2e31698 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_preferences_alerts.xml +++ b/indra/newview/skins/default/xui/ja/panel_preferences_alerts.xml diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml b/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml index 1c3204ea04..1c3204ea04 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_colors.xml b/indra/newview/skins/default/xui/ja/panel_preferences_colors.xml index 9f6abf8fcb..9f6abf8fcb 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_preferences_colors.xml +++ b/indra/newview/skins/default/xui/ja/panel_preferences_colors.xml diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_general.xml b/indra/newview/skins/default/xui/ja/panel_preferences_general.xml index 39bc05c845..39bc05c845 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/ja/panel_preferences_general.xml diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml index 15017e330e..15017e330e 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_move.xml b/indra/newview/skins/default/xui/ja/panel_preferences_move.xml index 121bebfd52..121bebfd52 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_preferences_move.xml +++ b/indra/newview/skins/default/xui/ja/panel_preferences_move.xml diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/ja/panel_preferences_privacy.xml index 2db6a688f3..2db6a688f3 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_preferences_privacy.xml +++ b/indra/newview/skins/default/xui/ja/panel_preferences_privacy.xml 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..100644 --- 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_preferences_sound.xml b/indra/newview/skins/default/xui/ja/panel_preferences_sound.xml index 3a4c360ccc..3a4c360ccc 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/ja/panel_preferences_sound.xml diff --git a/indra/newview/skins/default/xui/ja/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/ja/panel_prim_media_controls.xml index 5506373eb0..5506373eb0 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_prim_media_controls.xml +++ b/indra/newview/skins/default/xui/ja/panel_prim_media_controls.xml diff --git a/indra/newview/skins/default/xui/ja/panel_region_covenant.xml b/indra/newview/skins/default/xui/ja/panel_region_covenant.xml index 5214f79141..5214f79141 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_region_covenant.xml +++ b/indra/newview/skins/default/xui/ja/panel_region_covenant.xml diff --git a/indra/newview/skins/default/xui/ja/panel_region_debug.xml b/indra/newview/skins/default/xui/ja/panel_region_debug.xml index 908af3d66a..908af3d66a 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_region_debug.xml +++ b/indra/newview/skins/default/xui/ja/panel_region_debug.xml diff --git a/indra/newview/skins/default/xui/ja/panel_region_environment.xml b/indra/newview/skins/default/xui/ja/panel_region_environment.xml index f6ef3f0934..f6ef3f0934 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_region_environment.xml +++ b/indra/newview/skins/default/xui/ja/panel_region_environment.xml diff --git a/indra/newview/skins/default/xui/ja/panel_region_estate.xml b/indra/newview/skins/default/xui/ja/panel_region_estate.xml index b5cc6b9765..b5cc6b9765 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_region_estate.xml +++ b/indra/newview/skins/default/xui/ja/panel_region_estate.xml 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_region_general.xml b/indra/newview/skins/default/xui/ja/panel_region_general.xml index d23007dc6b..d23007dc6b 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_region_general.xml +++ b/indra/newview/skins/default/xui/ja/panel_region_general.xml diff --git a/indra/newview/skins/default/xui/ja/panel_region_terrain.xml b/indra/newview/skins/default/xui/ja/panel_region_terrain.xml index fb853c1925..fb853c1925 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_region_terrain.xml +++ b/indra/newview/skins/default/xui/ja/panel_region_terrain.xml diff --git a/indra/newview/skins/default/xui/ja/panel_script_ed.xml b/indra/newview/skins/default/xui/ja/panel_script_ed.xml index 3aa20d0a3c..3aa20d0a3c 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_script_ed.xml +++ b/indra/newview/skins/default/xui/ja/panel_script_ed.xml 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_script_limits_my_avatar.xml b/indra/newview/skins/default/xui/ja/panel_script_limits_my_avatar.xml index 494884c187..494884c187 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_script_limits_my_avatar.xml +++ b/indra/newview/skins/default/xui/ja/panel_script_limits_my_avatar.xml diff --git a/indra/newview/skins/default/xui/ja/panel_script_limits_region_memory.xml b/indra/newview/skins/default/xui/ja/panel_script_limits_region_memory.xml index d91eba9699..d91eba9699 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_script_limits_region_memory.xml +++ b/indra/newview/skins/default/xui/ja/panel_script_limits_region_memory.xml diff --git a/indra/newview/skins/default/xui/ja/panel_script_question_toast.xml b/indra/newview/skins/default/xui/ja/panel_script_question_toast.xml index a2d0237da0..a2d0237da0 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_script_question_toast.xml +++ b/indra/newview/skins/default/xui/ja/panel_script_question_toast.xml diff --git a/indra/newview/skins/default/xui/ja/panel_scrolling_param.xml b/indra/newview/skins/default/xui/ja/panel_scrolling_param.xml index b698fa762d..b698fa762d 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_scrolling_param.xml +++ b/indra/newview/skins/default/xui/ja/panel_scrolling_param.xml diff --git a/indra/newview/skins/default/xui/ja/panel_scrolling_param_base.xml b/indra/newview/skins/default/xui/ja/panel_scrolling_param_base.xml index fa659040ea..fa659040ea 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_scrolling_param_base.xml +++ b/indra/newview/skins/default/xui/ja/panel_scrolling_param_base.xml diff --git a/indra/newview/skins/default/xui/ja/panel_side_tray_tab_caption.xml b/indra/newview/skins/default/xui/ja/panel_side_tray_tab_caption.xml index d06db8ccb1..d06db8ccb1 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_side_tray_tab_caption.xml +++ b/indra/newview/skins/default/xui/ja/panel_side_tray_tab_caption.xml diff --git a/indra/newview/skins/default/xui/ja/panel_sidetray_home_tab.xml b/indra/newview/skins/default/xui/ja/panel_sidetray_home_tab.xml index ea17cd6526..ea17cd6526 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_sidetray_home_tab.xml +++ b/indra/newview/skins/default/xui/ja/panel_sidetray_home_tab.xml 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..100644 --- 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..100644 --- 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..100644 --- 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..100644 --- 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..100644 --- 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_sound_devices.xml b/indra/newview/skins/default/xui/ja/panel_sound_devices.xml index 0824504235..0824504235 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_sound_devices.xml +++ b/indra/newview/skins/default/xui/ja/panel_sound_devices.xml diff --git a/indra/newview/skins/default/xui/ja/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/ja/panel_stand_stop_flying.xml index 2308aff19b..2308aff19b 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_stand_stop_flying.xml +++ b/indra/newview/skins/default/xui/ja/panel_stand_stop_flying.xml 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..100644 --- 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_sys_well_item.xml b/indra/newview/skins/default/xui/ja/panel_sys_well_item.xml index 81db7c8989..81db7c8989 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_sys_well_item.xml +++ b/indra/newview/skins/default/xui/ja/panel_sys_well_item.xml diff --git a/indra/newview/skins/default/xui/ja/panel_teleport_history.xml b/indra/newview/skins/default/xui/ja/panel_teleport_history.xml index 58e396877c..58e396877c 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_teleport_history.xml +++ b/indra/newview/skins/default/xui/ja/panel_teleport_history.xml diff --git a/indra/newview/skins/default/xui/ja/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/ja/panel_teleport_history_item.xml index 0340bfe754..0340bfe754 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_teleport_history_item.xml +++ b/indra/newview/skins/default/xui/ja/panel_teleport_history_item.xml 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/panel_voice_effect.xml b/indra/newview/skins/default/xui/ja/panel_voice_effect.xml index 530f0fb59d..530f0fb59d 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_voice_effect.xml +++ b/indra/newview/skins/default/xui/ja/panel_voice_effect.xml diff --git a/indra/newview/skins/default/xui/ja/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/ja/panel_volume_pulldown.xml index 967dedf061..967dedf061 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_volume_pulldown.xml +++ b/indra/newview/skins/default/xui/ja/panel_volume_pulldown.xml diff --git a/indra/newview/skins/default/xui/ja/panel_world_map.xml b/indra/newview/skins/default/xui/ja/panel_world_map.xml index 8ff853193a..8ff853193a 100755..100644 --- a/indra/newview/skins/default/xui/ja/panel_world_map.xml +++ b/indra/newview/skins/default/xui/ja/panel_world_map.xml 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..100644 --- 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_appearance.xml b/indra/newview/skins/default/xui/ja/sidepanel_appearance.xml index 30cef9ccc0..30cef9ccc0 100755..100644 --- a/indra/newview/skins/default/xui/ja/sidepanel_appearance.xml +++ b/indra/newview/skins/default/xui/ja/sidepanel_appearance.xml diff --git a/indra/newview/skins/default/xui/ja/sidepanel_inventory.xml b/indra/newview/skins/default/xui/ja/sidepanel_inventory.xml index 5aa0e86a5b..5aa0e86a5b 100755..100644 --- a/indra/newview/skins/default/xui/ja/sidepanel_inventory.xml +++ b/indra/newview/skins/default/xui/ja/sidepanel_inventory.xml 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..100644 --- 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..100644 --- 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..c294158d74 100755..100644 --- a/indra/newview/skins/default/xui/ja/strings.xml +++ b/indra/newview/skins/default/xui/ja/strings.xml @@ -38,7 +38,7 @@ グラフィックを初期化できませんでした。グラフィックドライバを更新してください。 </string> <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]] + [APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2].[VIEWER_VERSION_3] [BUILD_DATE] [BUILD_TIME] ([CHANNEL])[[VIEWER_RELEASE_NOTES_URL] [ReleaseNotes]] </string> <string name="AboutCompiler"> コンパイラー [COMPILER] [COMPILER_VERSION] バージョン @@ -448,30 +448,51 @@ support@secondlife.com にお問い合わせください。 <string name="TooltipMustSingleDrop"> アイテムは 1 つだけここにドラッグできます </string> + <string name="TooltipTooManyWearables"> + [AMOUNT] 以上のアイテムを含むフォルダを装着できません。「詳細設定」 > 「デバッグ設定を表示」 > 「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..100644 --- 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"> + リージョンに入ることができません。'[REGION_NAME]' はスキル ゲーミング リージョンであり、あなたはこのリージョンに入るための特定の基準を満たす必要があります。詳しくは、[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/ja/xui_version.xml b/indra/newview/skins/default/xui/ja/xui_version.xml index 0e777751d3..0e777751d3 100755..100644 --- a/indra/newview/skins/default/xui/ja/xui_version.xml +++ b/indra/newview/skins/default/xui/ja/xui_version.xml 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..100644 --- 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 <nolink>[HOSTNAME]</nolink> ([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. -"The work goes on, the cause endures, the hope still lives, and the dreams shall never die" - 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_about_land.xml b/indra/newview/skins/default/xui/pl/floater_about_land.xml index badff11a59..badff11a59 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_about_land.xml +++ b/indra/newview/skins/default/xui/pl/floater_about_land.xml diff --git a/indra/newview/skins/default/xui/pl/floater_activeim.xml b/indra/newview/skins/default/xui/pl/floater_activeim.xml index 2a34409f8b..2a34409f8b 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_activeim.xml +++ b/indra/newview/skins/default/xui/pl/floater_activeim.xml diff --git a/indra/newview/skins/default/xui/pl/floater_animation_preview.xml b/indra/newview/skins/default/xui/pl/floater_animation_preview.xml index 3402d8d31f..3402d8d31f 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_animation_preview.xml +++ b/indra/newview/skins/default/xui/pl/floater_animation_preview.xml 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_auction.xml b/indra/newview/skins/default/xui/pl/floater_auction.xml index 9399fa1115..9399fa1115 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_auction.xml +++ b/indra/newview/skins/default/xui/pl/floater_auction.xml diff --git a/indra/newview/skins/default/xui/pl/floater_avatar_picker.xml b/indra/newview/skins/default/xui/pl/floater_avatar_picker.xml index da0e947683..da0e947683 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_avatar_picker.xml +++ b/indra/newview/skins/default/xui/pl/floater_avatar_picker.xml diff --git a/indra/newview/skins/default/xui/pl/floater_avatar_textures.xml b/indra/newview/skins/default/xui/pl/floater_avatar_textures.xml index 45b9e066e9..45b9e066e9 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_avatar_textures.xml +++ b/indra/newview/skins/default/xui/pl/floater_avatar_textures.xml diff --git a/indra/newview/skins/default/xui/pl/floater_beacons.xml b/indra/newview/skins/default/xui/pl/floater_beacons.xml index e6286a6ac1..e6286a6ac1 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_beacons.xml +++ b/indra/newview/skins/default/xui/pl/floater_beacons.xml diff --git a/indra/newview/skins/default/xui/pl/floater_build_options.xml b/indra/newview/skins/default/xui/pl/floater_build_options.xml index 5d296aa725..5d296aa725 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_build_options.xml +++ b/indra/newview/skins/default/xui/pl/floater_build_options.xml diff --git a/indra/newview/skins/default/xui/pl/floater_bulk_perms.xml b/indra/newview/skins/default/xui/pl/floater_bulk_perms.xml index 1c24e0b35e..1c24e0b35e 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_bulk_perms.xml +++ b/indra/newview/skins/default/xui/pl/floater_bulk_perms.xml diff --git a/indra/newview/skins/default/xui/pl/floater_bumps.xml b/indra/newview/skins/default/xui/pl/floater_bumps.xml index c1045ece9a..c1045ece9a 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_bumps.xml +++ b/indra/newview/skins/default/xui/pl/floater_bumps.xml diff --git a/indra/newview/skins/default/xui/pl/floater_buy_contents.xml b/indra/newview/skins/default/xui/pl/floater_buy_contents.xml index 94f2b50450..94f2b50450 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_buy_contents.xml +++ b/indra/newview/skins/default/xui/pl/floater_buy_contents.xml diff --git a/indra/newview/skins/default/xui/pl/floater_buy_currency.xml b/indra/newview/skins/default/xui/pl/floater_buy_currency.xml index 3e51761b37..3e51761b37 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_buy_currency.xml +++ b/indra/newview/skins/default/xui/pl/floater_buy_currency.xml diff --git a/indra/newview/skins/default/xui/pl/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/pl/floater_buy_currency_html.xml index 36ac88f7f6..36ac88f7f6 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_buy_currency_html.xml +++ b/indra/newview/skins/default/xui/pl/floater_buy_currency_html.xml diff --git a/indra/newview/skins/default/xui/pl/floater_buy_land.xml b/indra/newview/skins/default/xui/pl/floater_buy_land.xml index 7b4f459b4e..7b4f459b4e 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_buy_land.xml +++ b/indra/newview/skins/default/xui/pl/floater_buy_land.xml diff --git a/indra/newview/skins/default/xui/pl/floater_buy_object.xml b/indra/newview/skins/default/xui/pl/floater_buy_object.xml index 85861d9e76..85861d9e76 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_buy_object.xml +++ b/indra/newview/skins/default/xui/pl/floater_buy_object.xml diff --git a/indra/newview/skins/default/xui/pl/floater_camera.xml b/indra/newview/skins/default/xui/pl/floater_camera.xml index 60f3cd0fff..60f3cd0fff 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_camera.xml +++ b/indra/newview/skins/default/xui/pl/floater_camera.xml diff --git a/indra/newview/skins/default/xui/pl/floater_choose_group.xml b/indra/newview/skins/default/xui/pl/floater_choose_group.xml index 877cedc0bc..877cedc0bc 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_choose_group.xml +++ b/indra/newview/skins/default/xui/pl/floater_choose_group.xml diff --git a/indra/newview/skins/default/xui/pl/floater_color_picker.xml b/indra/newview/skins/default/xui/pl/floater_color_picker.xml index a607ca982f..a607ca982f 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_color_picker.xml +++ b/indra/newview/skins/default/xui/pl/floater_color_picker.xml diff --git a/indra/newview/skins/default/xui/pl/floater_critical.xml b/indra/newview/skins/default/xui/pl/floater_critical.xml index 8221a4e1bd..8221a4e1bd 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_critical.xml +++ b/indra/newview/skins/default/xui/pl/floater_critical.xml diff --git a/indra/newview/skins/default/xui/pl/floater_display_name.xml b/indra/newview/skins/default/xui/pl/floater_display_name.xml index ea28e65728..ea28e65728 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_display_name.xml +++ b/indra/newview/skins/default/xui/pl/floater_display_name.xml 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_event.xml b/indra/newview/skins/default/xui/pl/floater_event.xml index d278114969..d278114969 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_event.xml +++ b/indra/newview/skins/default/xui/pl/floater_event.xml diff --git a/indra/newview/skins/default/xui/pl/floater_font_test.xml b/indra/newview/skins/default/xui/pl/floater_font_test.xml index 019cee3e1e..019cee3e1e 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_font_test.xml +++ b/indra/newview/skins/default/xui/pl/floater_font_test.xml diff --git a/indra/newview/skins/default/xui/pl/floater_gesture.xml b/indra/newview/skins/default/xui/pl/floater_gesture.xml index 0c27e4d0bb..0c27e4d0bb 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_gesture.xml +++ b/indra/newview/skins/default/xui/pl/floater_gesture.xml diff --git a/indra/newview/skins/default/xui/pl/floater_god_tools.xml b/indra/newview/skins/default/xui/pl/floater_god_tools.xml index 828898de54..828898de54 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_god_tools.xml +++ b/indra/newview/skins/default/xui/pl/floater_god_tools.xml diff --git a/indra/newview/skins/default/xui/pl/floater_hardware_settings.xml b/indra/newview/skins/default/xui/pl/floater_hardware_settings.xml index 471d2c39ba..471d2c39ba 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_hardware_settings.xml +++ b/indra/newview/skins/default/xui/pl/floater_hardware_settings.xml diff --git a/indra/newview/skins/default/xui/pl/floater_help_browser.xml b/indra/newview/skins/default/xui/pl/floater_help_browser.xml index dfd5f907e5..dfd5f907e5 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_help_browser.xml +++ b/indra/newview/skins/default/xui/pl/floater_help_browser.xml diff --git a/indra/newview/skins/default/xui/pl/floater_hud.xml b/indra/newview/skins/default/xui/pl/floater_hud.xml index a5d85aca4e..a5d85aca4e 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_hud.xml +++ b/indra/newview/skins/default/xui/pl/floater_hud.xml diff --git a/indra/newview/skins/default/xui/pl/floater_im_container.xml b/indra/newview/skins/default/xui/pl/floater_im_container.xml index ddf0790fa8..ddf0790fa8 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_im_container.xml +++ b/indra/newview/skins/default/xui/pl/floater_im_container.xml diff --git a/indra/newview/skins/default/xui/pl/floater_im_session.xml b/indra/newview/skins/default/xui/pl/floater_im_session.xml index 9041ff7416..9041ff7416 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_im_session.xml +++ b/indra/newview/skins/default/xui/pl/floater_im_session.xml diff --git a/indra/newview/skins/default/xui/pl/floater_image_preview.xml b/indra/newview/skins/default/xui/pl/floater_image_preview.xml index ba9724ff9a..ba9724ff9a 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_image_preview.xml +++ b/indra/newview/skins/default/xui/pl/floater_image_preview.xml diff --git a/indra/newview/skins/default/xui/pl/floater_incoming_call.xml b/indra/newview/skins/default/xui/pl/floater_incoming_call.xml index b06b6d713d..b06b6d713d 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_incoming_call.xml +++ b/indra/newview/skins/default/xui/pl/floater_incoming_call.xml diff --git a/indra/newview/skins/default/xui/pl/floater_inspect.xml b/indra/newview/skins/default/xui/pl/floater_inspect.xml index 2c66f2851d..2c66f2851d 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_inspect.xml +++ b/indra/newview/skins/default/xui/pl/floater_inspect.xml diff --git a/indra/newview/skins/default/xui/pl/floater_inventory.xml b/indra/newview/skins/default/xui/pl/floater_inventory.xml index c42f57fb55..c42f57fb55 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_inventory.xml +++ b/indra/newview/skins/default/xui/pl/floater_inventory.xml 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..100644 --- 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_inventory_view_finder.xml b/indra/newview/skins/default/xui/pl/floater_inventory_view_finder.xml index bd7b221c5d..bd7b221c5d 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_inventory_view_finder.xml +++ b/indra/newview/skins/default/xui/pl/floater_inventory_view_finder.xml 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_joystick.xml b/indra/newview/skins/default/xui/pl/floater_joystick.xml index 2b1e362b98..2b1e362b98 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_joystick.xml +++ b/indra/newview/skins/default/xui/pl/floater_joystick.xml diff --git a/indra/newview/skins/default/xui/pl/floater_land_holdings.xml b/indra/newview/skins/default/xui/pl/floater_land_holdings.xml index 72a078949a..72a078949a 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_land_holdings.xml +++ b/indra/newview/skins/default/xui/pl/floater_land_holdings.xml diff --git a/indra/newview/skins/default/xui/pl/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/pl/floater_live_lsleditor.xml index e03c5faaeb..e03c5faaeb 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_live_lsleditor.xml +++ b/indra/newview/skins/default/xui/pl/floater_live_lsleditor.xml diff --git a/indra/newview/skins/default/xui/pl/floater_lsl_guide.xml b/indra/newview/skins/default/xui/pl/floater_lsl_guide.xml index 7b1b395f87..7b1b395f87 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_lsl_guide.xml +++ b/indra/newview/skins/default/xui/pl/floater_lsl_guide.xml diff --git a/indra/newview/skins/default/xui/pl/floater_map.xml b/indra/newview/skins/default/xui/pl/floater_map.xml index e01c4c8a82..e01c4c8a82 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_map.xml +++ b/indra/newview/skins/default/xui/pl/floater_map.xml 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_media_browser.xml b/indra/newview/skins/default/xui/pl/floater_media_browser.xml index 9787736ad8..9787736ad8 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_media_browser.xml +++ b/indra/newview/skins/default/xui/pl/floater_media_browser.xml diff --git a/indra/newview/skins/default/xui/pl/floater_media_settings.xml b/indra/newview/skins/default/xui/pl/floater_media_settings.xml index 5a36331c9a..5a36331c9a 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_media_settings.xml +++ b/indra/newview/skins/default/xui/pl/floater_media_settings.xml diff --git a/indra/newview/skins/default/xui/pl/floater_mem_leaking.xml b/indra/newview/skins/default/xui/pl/floater_mem_leaking.xml index 9ce99692d0..9ce99692d0 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_mem_leaking.xml +++ b/indra/newview/skins/default/xui/pl/floater_mem_leaking.xml diff --git a/indra/newview/skins/default/xui/pl/floater_moveview.xml b/indra/newview/skins/default/xui/pl/floater_moveview.xml index 592814dbc0..592814dbc0 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_moveview.xml +++ b/indra/newview/skins/default/xui/pl/floater_moveview.xml diff --git a/indra/newview/skins/default/xui/pl/floater_mute_object.xml b/indra/newview/skins/default/xui/pl/floater_mute_object.xml index 4af5872ef5..4af5872ef5 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_mute_object.xml +++ b/indra/newview/skins/default/xui/pl/floater_mute_object.xml diff --git a/indra/newview/skins/default/xui/pl/floater_nearby_chat.xml b/indra/newview/skins/default/xui/pl/floater_nearby_chat.xml index 214d465f1c..214d465f1c 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_nearby_chat.xml +++ b/indra/newview/skins/default/xui/pl/floater_nearby_chat.xml 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..100644 --- 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_outgoing_call.xml b/indra/newview/skins/default/xui/pl/floater_outgoing_call.xml index de0b4d08c0..de0b4d08c0 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_outgoing_call.xml +++ b/indra/newview/skins/default/xui/pl/floater_outgoing_call.xml 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..100644 --- 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..100644 --- 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/floater_perm_prefs.xml b/indra/newview/skins/default/xui/pl/floater_perm_prefs.xml index 2128cfa3c8..2128cfa3c8 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_perm_prefs.xml +++ b/indra/newview/skins/default/xui/pl/floater_perm_prefs.xml diff --git a/indra/newview/skins/default/xui/pl/floater_post_process.xml b/indra/newview/skins/default/xui/pl/floater_post_process.xml index e3dce84933..e3dce84933 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_post_process.xml +++ b/indra/newview/skins/default/xui/pl/floater_post_process.xml diff --git a/indra/newview/skins/default/xui/pl/floater_postcard.xml b/indra/newview/skins/default/xui/pl/floater_postcard.xml index fe796c6fa0..fe796c6fa0 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_postcard.xml +++ b/indra/newview/skins/default/xui/pl/floater_postcard.xml diff --git a/indra/newview/skins/default/xui/pl/floater_preferences.xml b/indra/newview/skins/default/xui/pl/floater_preferences.xml index 930a5c76b0..930a5c76b0 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_preferences.xml +++ b/indra/newview/skins/default/xui/pl/floater_preferences.xml diff --git a/indra/newview/skins/default/xui/pl/floater_preview_animation.xml b/indra/newview/skins/default/xui/pl/floater_preview_animation.xml index d276b1f63a..d276b1f63a 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_preview_animation.xml +++ b/indra/newview/skins/default/xui/pl/floater_preview_animation.xml diff --git a/indra/newview/skins/default/xui/pl/floater_preview_gesture.xml b/indra/newview/skins/default/xui/pl/floater_preview_gesture.xml index 8171225666..8171225666 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_preview_gesture.xml +++ b/indra/newview/skins/default/xui/pl/floater_preview_gesture.xml diff --git a/indra/newview/skins/default/xui/pl/floater_preview_notecard.xml b/indra/newview/skins/default/xui/pl/floater_preview_notecard.xml index b3275cb7b5..b3275cb7b5 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_preview_notecard.xml +++ b/indra/newview/skins/default/xui/pl/floater_preview_notecard.xml diff --git a/indra/newview/skins/default/xui/pl/floater_preview_sound.xml b/indra/newview/skins/default/xui/pl/floater_preview_sound.xml index 3825fe742e..3825fe742e 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_preview_sound.xml +++ b/indra/newview/skins/default/xui/pl/floater_preview_sound.xml diff --git a/indra/newview/skins/default/xui/pl/floater_preview_texture.xml b/indra/newview/skins/default/xui/pl/floater_preview_texture.xml index e58acee139..e58acee139 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_preview_texture.xml +++ b/indra/newview/skins/default/xui/pl/floater_preview_texture.xml diff --git a/indra/newview/skins/default/xui/pl/floater_publish_classified.xml b/indra/newview/skins/default/xui/pl/floater_publish_classified.xml index cfdac165cd..cfdac165cd 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_publish_classified.xml +++ b/indra/newview/skins/default/xui/pl/floater_publish_classified.xml diff --git a/indra/newview/skins/default/xui/pl/floater_region_debug_console.xml b/indra/newview/skins/default/xui/pl/floater_region_debug_console.xml index ce1f3c0ac7..ce1f3c0ac7 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_region_debug_console.xml +++ b/indra/newview/skins/default/xui/pl/floater_region_debug_console.xml diff --git a/indra/newview/skins/default/xui/pl/floater_region_info.xml b/indra/newview/skins/default/xui/pl/floater_region_info.xml index a1f7785f48..a1f7785f48 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_region_info.xml +++ b/indra/newview/skins/default/xui/pl/floater_region_info.xml diff --git a/indra/newview/skins/default/xui/pl/floater_report_abuse.xml b/indra/newview/skins/default/xui/pl/floater_report_abuse.xml index a5b96601b8..a5b96601b8 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_report_abuse.xml +++ b/indra/newview/skins/default/xui/pl/floater_report_abuse.xml diff --git a/indra/newview/skins/default/xui/pl/floater_script_debug.xml b/indra/newview/skins/default/xui/pl/floater_script_debug.xml index 714a600262..714a600262 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_script_debug.xml +++ b/indra/newview/skins/default/xui/pl/floater_script_debug.xml diff --git a/indra/newview/skins/default/xui/pl/floater_script_debug_panel.xml b/indra/newview/skins/default/xui/pl/floater_script_debug_panel.xml index e70a30fa24..e70a30fa24 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_script_debug_panel.xml +++ b/indra/newview/skins/default/xui/pl/floater_script_debug_panel.xml diff --git a/indra/newview/skins/default/xui/pl/floater_script_limits.xml b/indra/newview/skins/default/xui/pl/floater_script_limits.xml index dd13d641a0..dd13d641a0 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_script_limits.xml +++ b/indra/newview/skins/default/xui/pl/floater_script_limits.xml diff --git a/indra/newview/skins/default/xui/pl/floater_script_preview.xml b/indra/newview/skins/default/xui/pl/floater_script_preview.xml index eb6a1df77b..eb6a1df77b 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_script_preview.xml +++ b/indra/newview/skins/default/xui/pl/floater_script_preview.xml diff --git a/indra/newview/skins/default/xui/pl/floater_script_queue.xml b/indra/newview/skins/default/xui/pl/floater_script_queue.xml index bdfdba569e..bdfdba569e 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_script_queue.xml +++ b/indra/newview/skins/default/xui/pl/floater_script_queue.xml diff --git a/indra/newview/skins/default/xui/pl/floater_script_search.xml b/indra/newview/skins/default/xui/pl/floater_script_search.xml index 901d61a137..901d61a137 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_script_search.xml +++ b/indra/newview/skins/default/xui/pl/floater_script_search.xml diff --git a/indra/newview/skins/default/xui/pl/floater_search.xml b/indra/newview/skins/default/xui/pl/floater_search.xml index a0198670e4..a0198670e4 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_search.xml +++ b/indra/newview/skins/default/xui/pl/floater_search.xml diff --git a/indra/newview/skins/default/xui/pl/floater_select_key.xml b/indra/newview/skins/default/xui/pl/floater_select_key.xml index 190ad61352..190ad61352 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_select_key.xml +++ b/indra/newview/skins/default/xui/pl/floater_select_key.xml diff --git a/indra/newview/skins/default/xui/pl/floater_sell_land.xml b/indra/newview/skins/default/xui/pl/floater_sell_land.xml index 2201c4b0ad..2201c4b0ad 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_sell_land.xml +++ b/indra/newview/skins/default/xui/pl/floater_sell_land.xml diff --git a/indra/newview/skins/default/xui/pl/floater_settings_debug.xml b/indra/newview/skins/default/xui/pl/floater_settings_debug.xml index 131f92d56f..131f92d56f 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_settings_debug.xml +++ b/indra/newview/skins/default/xui/pl/floater_settings_debug.xml diff --git a/indra/newview/skins/default/xui/pl/floater_snapshot.xml b/indra/newview/skins/default/xui/pl/floater_snapshot.xml index be92ef917d..be92ef917d 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_snapshot.xml +++ b/indra/newview/skins/default/xui/pl/floater_snapshot.xml diff --git a/indra/newview/skins/default/xui/pl/floater_sound_preview.xml b/indra/newview/skins/default/xui/pl/floater_sound_preview.xml index ac041dff6a..ac041dff6a 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_sound_preview.xml +++ b/indra/newview/skins/default/xui/pl/floater_sound_preview.xml diff --git a/indra/newview/skins/default/xui/pl/floater_stats.xml b/indra/newview/skins/default/xui/pl/floater_stats.xml index 886a30e5d9..886a30e5d9 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_stats.xml +++ b/indra/newview/skins/default/xui/pl/floater_stats.xml diff --git a/indra/newview/skins/default/xui/pl/floater_sys_well.xml b/indra/newview/skins/default/xui/pl/floater_sys_well.xml index e6c73af4f3..e6c73af4f3 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_sys_well.xml +++ b/indra/newview/skins/default/xui/pl/floater_sys_well.xml diff --git a/indra/newview/skins/default/xui/pl/floater_telehub.xml b/indra/newview/skins/default/xui/pl/floater_telehub.xml index 32cc08810d..32cc08810d 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_telehub.xml +++ b/indra/newview/skins/default/xui/pl/floater_telehub.xml diff --git a/indra/newview/skins/default/xui/pl/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/pl/floater_texture_ctrl.xml index 52c0cb8a93..52c0cb8a93 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_texture_ctrl.xml +++ b/indra/newview/skins/default/xui/pl/floater_texture_ctrl.xml diff --git a/indra/newview/skins/default/xui/pl/floater_tools.xml b/indra/newview/skins/default/xui/pl/floater_tools.xml index 69d5c23f9c..69d5c23f9c 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_tools.xml +++ b/indra/newview/skins/default/xui/pl/floater_tools.xml diff --git a/indra/newview/skins/default/xui/pl/floater_top_objects.xml b/indra/newview/skins/default/xui/pl/floater_top_objects.xml index 2b06ae9f78..2b06ae9f78 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_top_objects.xml +++ b/indra/newview/skins/default/xui/pl/floater_top_objects.xml diff --git a/indra/newview/skins/default/xui/pl/floater_tos.xml b/indra/newview/skins/default/xui/pl/floater_tos.xml index 8cdf267f4b..8cdf267f4b 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_tos.xml +++ b/indra/newview/skins/default/xui/pl/floater_tos.xml diff --git a/indra/newview/skins/default/xui/pl/floater_url_entry.xml b/indra/newview/skins/default/xui/pl/floater_url_entry.xml index fc170d8d1b..fc170d8d1b 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_url_entry.xml +++ b/indra/newview/skins/default/xui/pl/floater_url_entry.xml diff --git a/indra/newview/skins/default/xui/pl/floater_voice_controls.xml b/indra/newview/skins/default/xui/pl/floater_voice_controls.xml index 2155d56f27..2155d56f27 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_voice_controls.xml +++ b/indra/newview/skins/default/xui/pl/floater_voice_controls.xml diff --git a/indra/newview/skins/default/xui/pl/floater_voice_effect.xml b/indra/newview/skins/default/xui/pl/floater_voice_effect.xml index e2d1fb77e9..e2d1fb77e9 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_voice_effect.xml +++ b/indra/newview/skins/default/xui/pl/floater_voice_effect.xml diff --git a/indra/newview/skins/default/xui/pl/floater_web_content.xml b/indra/newview/skins/default/xui/pl/floater_web_content.xml index 4cc8d0b27b..4cc8d0b27b 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_web_content.xml +++ b/indra/newview/skins/default/xui/pl/floater_web_content.xml diff --git a/indra/newview/skins/default/xui/pl/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/pl/floater_whitelist_entry.xml index 4081b8a37e..4081b8a37e 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_whitelist_entry.xml +++ b/indra/newview/skins/default/xui/pl/floater_whitelist_entry.xml diff --git a/indra/newview/skins/default/xui/pl/floater_window_size.xml b/indra/newview/skins/default/xui/pl/floater_window_size.xml index 2a6c257e54..2a6c257e54 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_window_size.xml +++ b/indra/newview/skins/default/xui/pl/floater_window_size.xml diff --git a/indra/newview/skins/default/xui/pl/floater_world_map.xml b/indra/newview/skins/default/xui/pl/floater_world_map.xml index 4f53337365..4f53337365 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_world_map.xml +++ b/indra/newview/skins/default/xui/pl/floater_world_map.xml diff --git a/indra/newview/skins/default/xui/pl/inspect_avatar.xml b/indra/newview/skins/default/xui/pl/inspect_avatar.xml index 5e982c0185..5e982c0185 100755..100644 --- a/indra/newview/skins/default/xui/pl/inspect_avatar.xml +++ b/indra/newview/skins/default/xui/pl/inspect_avatar.xml diff --git a/indra/newview/skins/default/xui/pl/inspect_group.xml b/indra/newview/skins/default/xui/pl/inspect_group.xml index 63c79acc8c..63c79acc8c 100755..100644 --- a/indra/newview/skins/default/xui/pl/inspect_group.xml +++ b/indra/newview/skins/default/xui/pl/inspect_group.xml diff --git a/indra/newview/skins/default/xui/pl/inspect_object.xml b/indra/newview/skins/default/xui/pl/inspect_object.xml index 23d8ce7700..23d8ce7700 100755..100644 --- a/indra/newview/skins/default/xui/pl/inspect_object.xml +++ b/indra/newview/skins/default/xui/pl/inspect_object.xml diff --git a/indra/newview/skins/default/xui/pl/inspect_remote_object.xml b/indra/newview/skins/default/xui/pl/inspect_remote_object.xml index 0d570940c1..0d570940c1 100755..100644 --- a/indra/newview/skins/default/xui/pl/inspect_remote_object.xml +++ b/indra/newview/skins/default/xui/pl/inspect_remote_object.xml diff --git a/indra/newview/skins/default/xui/pl/language_settings.xml b/indra/newview/skins/default/xui/pl/language_settings.xml index 93051d1317..93051d1317 100755..100644 --- a/indra/newview/skins/default/xui/pl/language_settings.xml +++ b/indra/newview/skins/default/xui/pl/language_settings.xml diff --git a/indra/newview/skins/default/xui/pl/menu_add_wearable_gear.xml b/indra/newview/skins/default/xui/pl/menu_add_wearable_gear.xml index 7c572b4fc9..7c572b4fc9 100755..100644 --- a/indra/newview/skins/default/xui/pl/menu_add_wearable_gear.xml +++ b/indra/newview/skins/default/xui/pl/menu_add_wearable_gear.xml diff --git a/indra/newview/skins/default/xui/pl/menu_attachment_other.xml b/indra/newview/skins/default/xui/pl/menu_attachment_other.xml index aacdad97e3..aacdad97e3 100755..100644 --- a/indra/newview/skins/default/xui/pl/menu_attachment_other.xml +++ b/indra/newview/skins/default/xui/pl/menu_attachment_other.xml 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..100644 --- 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_icon.xml b/indra/newview/skins/default/xui/pl/menu_avatar_icon.xml index e8d2b14231..e8d2b14231 100755..100644 --- a/indra/newview/skins/default/xui/pl/menu_avatar_icon.xml +++ b/indra/newview/skins/default/xui/pl/menu_avatar_icon.xml diff --git a/indra/newview/skins/default/xui/pl/menu_avatar_other.xml b/indra/newview/skins/default/xui/pl/menu_avatar_other.xml index dcf7921bad..dcf7921bad 100755..100644 --- a/indra/newview/skins/default/xui/pl/menu_avatar_other.xml +++ b/indra/newview/skins/default/xui/pl/menu_avatar_other.xml 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..100644 --- 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_bottomtray.xml b/indra/newview/skins/default/xui/pl/menu_bottomtray.xml index 1ec5883cfe..1ec5883cfe 100755..100644 --- a/indra/newview/skins/default/xui/pl/menu_bottomtray.xml +++ b/indra/newview/skins/default/xui/pl/menu_bottomtray.xml diff --git a/indra/newview/skins/default/xui/pl/menu_cof_attachment.xml b/indra/newview/skins/default/xui/pl/menu_cof_attachment.xml index 4e5407601b..4e5407601b 100755..100644 --- a/indra/newview/skins/default/xui/pl/menu_cof_attachment.xml +++ b/indra/newview/skins/default/xui/pl/menu_cof_attachment.xml diff --git a/indra/newview/skins/default/xui/pl/menu_cof_body_part.xml b/indra/newview/skins/default/xui/pl/menu_cof_body_part.xml index ee60d3feb6..ee60d3feb6 100755..100644 --- a/indra/newview/skins/default/xui/pl/menu_cof_body_part.xml +++ b/indra/newview/skins/default/xui/pl/menu_cof_body_part.xml diff --git a/indra/newview/skins/default/xui/pl/menu_cof_clothing.xml b/indra/newview/skins/default/xui/pl/menu_cof_clothing.xml index ad43900137..ad43900137 100755..100644 --- a/indra/newview/skins/default/xui/pl/menu_cof_clothing.xml +++ b/indra/newview/skins/default/xui/pl/menu_cof_clothing.xml diff --git a/indra/newview/skins/default/xui/pl/menu_cof_gear.xml b/indra/newview/skins/default/xui/pl/menu_cof_gear.xml index 9fba39be1a..9fba39be1a 100755..100644 --- a/indra/newview/skins/default/xui/pl/menu_cof_gear.xml +++ b/indra/newview/skins/default/xui/pl/menu_cof_gear.xml diff --git a/indra/newview/skins/default/xui/pl/menu_edit.xml b/indra/newview/skins/default/xui/pl/menu_edit.xml index 578e270fed..578e270fed 100755..100644 --- a/indra/newview/skins/default/xui/pl/menu_edit.xml +++ b/indra/newview/skins/default/xui/pl/menu_edit.xml diff --git a/indra/newview/skins/default/xui/pl/menu_favorites.xml b/indra/newview/skins/default/xui/pl/menu_favorites.xml index 7310ff5c27..7310ff5c27 100755..100644 --- a/indra/newview/skins/default/xui/pl/menu_favorites.xml +++ b/indra/newview/skins/default/xui/pl/menu_favorites.xml diff --git a/indra/newview/skins/default/xui/pl/menu_gesture_gear.xml b/indra/newview/skins/default/xui/pl/menu_gesture_gear.xml index a72dec22fc..a72dec22fc 100755..100644 --- a/indra/newview/skins/default/xui/pl/menu_gesture_gear.xml +++ b/indra/newview/skins/default/xui/pl/menu_gesture_gear.xml diff --git a/indra/newview/skins/default/xui/pl/menu_group_plus.xml b/indra/newview/skins/default/xui/pl/menu_group_plus.xml index 83be4d38c5..83be4d38c5 100755..100644 --- a/indra/newview/skins/default/xui/pl/menu_group_plus.xml +++ b/indra/newview/skins/default/xui/pl/menu_group_plus.xml diff --git a/indra/newview/skins/default/xui/pl/menu_hide_navbar.xml b/indra/newview/skins/default/xui/pl/menu_hide_navbar.xml index 19d9510cd3..19d9510cd3 100755..100644 --- a/indra/newview/skins/default/xui/pl/menu_hide_navbar.xml +++ b/indra/newview/skins/default/xui/pl/menu_hide_navbar.xml diff --git a/indra/newview/skins/default/xui/pl/menu_imchiclet_adhoc.xml b/indra/newview/skins/default/xui/pl/menu_imchiclet_adhoc.xml index 4ead44878a..4ead44878a 100755..100644 --- a/indra/newview/skins/default/xui/pl/menu_imchiclet_adhoc.xml +++ b/indra/newview/skins/default/xui/pl/menu_imchiclet_adhoc.xml diff --git a/indra/newview/skins/default/xui/pl/menu_imchiclet_group.xml b/indra/newview/skins/default/xui/pl/menu_imchiclet_group.xml index 2b9a362123..2b9a362123 100755..100644 --- a/indra/newview/skins/default/xui/pl/menu_imchiclet_group.xml +++ b/indra/newview/skins/default/xui/pl/menu_imchiclet_group.xml diff --git a/indra/newview/skins/default/xui/pl/menu_imchiclet_p2p.xml b/indra/newview/skins/default/xui/pl/menu_imchiclet_p2p.xml index 8924d6db3e..8924d6db3e 100755..100644 --- a/indra/newview/skins/default/xui/pl/menu_imchiclet_p2p.xml +++ b/indra/newview/skins/default/xui/pl/menu_imchiclet_p2p.xml diff --git a/indra/newview/skins/default/xui/pl/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/pl/menu_inspect_avatar_gear.xml index 59560f236c..59560f236c 100755..100644 --- a/indra/newview/skins/default/xui/pl/menu_inspect_avatar_gear.xml +++ b/indra/newview/skins/default/xui/pl/menu_inspect_avatar_gear.xml diff --git a/indra/newview/skins/default/xui/pl/menu_inspect_object_gear.xml b/indra/newview/skins/default/xui/pl/menu_inspect_object_gear.xml index c12bd490ff..c12bd490ff 100755..100644 --- a/indra/newview/skins/default/xui/pl/menu_inspect_object_gear.xml +++ b/indra/newview/skins/default/xui/pl/menu_inspect_object_gear.xml diff --git a/indra/newview/skins/default/xui/pl/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/pl/menu_inspect_self_gear.xml index c4ef9761d9..c4ef9761d9 100755..100644 --- a/indra/newview/skins/default/xui/pl/menu_inspect_self_gear.xml +++ b/indra/newview/skins/default/xui/pl/menu_inspect_self_gear.xml diff --git a/indra/newview/skins/default/xui/pl/menu_inv_offer_chiclet.xml b/indra/newview/skins/default/xui/pl/menu_inv_offer_chiclet.xml index 5ef0f2f7a4..5ef0f2f7a4 100755..100644 --- a/indra/newview/skins/default/xui/pl/menu_inv_offer_chiclet.xml +++ b/indra/newview/skins/default/xui/pl/menu_inv_offer_chiclet.xml 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..100644 --- 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_inventory_add.xml b/indra/newview/skins/default/xui/pl/menu_inventory_add.xml index 04f9b94f7c..04f9b94f7c 100755..100644 --- a/indra/newview/skins/default/xui/pl/menu_inventory_add.xml +++ b/indra/newview/skins/default/xui/pl/menu_inventory_add.xml diff --git a/indra/newview/skins/default/xui/pl/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/pl/menu_inventory_gear_default.xml index 591c3a81d5..591c3a81d5 100755..100644 --- a/indra/newview/skins/default/xui/pl/menu_inventory_gear_default.xml +++ b/indra/newview/skins/default/xui/pl/menu_inventory_gear_default.xml diff --git a/indra/newview/skins/default/xui/pl/menu_land.xml b/indra/newview/skins/default/xui/pl/menu_land.xml index cbfecaee56..cbfecaee56 100755..100644 --- a/indra/newview/skins/default/xui/pl/menu_land.xml +++ b/indra/newview/skins/default/xui/pl/menu_land.xml diff --git a/indra/newview/skins/default/xui/pl/menu_landmark.xml b/indra/newview/skins/default/xui/pl/menu_landmark.xml index aa5808390c..aa5808390c 100755..100644 --- a/indra/newview/skins/default/xui/pl/menu_landmark.xml +++ b/indra/newview/skins/default/xui/pl/menu_landmark.xml diff --git a/indra/newview/skins/default/xui/pl/menu_login.xml b/indra/newview/skins/default/xui/pl/menu_login.xml index e50b694641..e50b694641 100755..100644 --- a/indra/newview/skins/default/xui/pl/menu_login.xml +++ b/indra/newview/skins/default/xui/pl/menu_login.xml 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_media_ctrl.xml b/indra/newview/skins/default/xui/pl/menu_media_ctrl.xml index 60dc3673a9..60dc3673a9 100755..100644 --- a/indra/newview/skins/default/xui/pl/menu_media_ctrl.xml +++ b/indra/newview/skins/default/xui/pl/menu_media_ctrl.xml diff --git a/indra/newview/skins/default/xui/pl/menu_mini_map.xml b/indra/newview/skins/default/xui/pl/menu_mini_map.xml index 8f86965416..8f86965416 100755..100644 --- a/indra/newview/skins/default/xui/pl/menu_mini_map.xml +++ b/indra/newview/skins/default/xui/pl/menu_mini_map.xml diff --git a/indra/newview/skins/default/xui/pl/menu_navbar.xml b/indra/newview/skins/default/xui/pl/menu_navbar.xml index 1d434670ee..1d434670ee 100755..100644 --- a/indra/newview/skins/default/xui/pl/menu_navbar.xml +++ b/indra/newview/skins/default/xui/pl/menu_navbar.xml diff --git a/indra/newview/skins/default/xui/pl/menu_nearby_chat.xml b/indra/newview/skins/default/xui/pl/menu_nearby_chat.xml index fe5bc6ba6f..fe5bc6ba6f 100755..100644 --- a/indra/newview/skins/default/xui/pl/menu_nearby_chat.xml +++ b/indra/newview/skins/default/xui/pl/menu_nearby_chat.xml diff --git a/indra/newview/skins/default/xui/pl/menu_notification_well_button.xml b/indra/newview/skins/default/xui/pl/menu_notification_well_button.xml index bd3d42f9b1..bd3d42f9b1 100755..100644 --- a/indra/newview/skins/default/xui/pl/menu_notification_well_button.xml +++ b/indra/newview/skins/default/xui/pl/menu_notification_well_button.xml diff --git a/indra/newview/skins/default/xui/pl/menu_object.xml b/indra/newview/skins/default/xui/pl/menu_object.xml index 3da6c5c890..3da6c5c890 100755..100644 --- a/indra/newview/skins/default/xui/pl/menu_object.xml +++ b/indra/newview/skins/default/xui/pl/menu_object.xml diff --git a/indra/newview/skins/default/xui/pl/menu_object_icon.xml b/indra/newview/skins/default/xui/pl/menu_object_icon.xml index b499bca2db..b499bca2db 100755..100644 --- a/indra/newview/skins/default/xui/pl/menu_object_icon.xml +++ b/indra/newview/skins/default/xui/pl/menu_object_icon.xml diff --git a/indra/newview/skins/default/xui/pl/menu_outfit_gear.xml b/indra/newview/skins/default/xui/pl/menu_outfit_gear.xml index c093557e86..c093557e86 100755..100644 --- a/indra/newview/skins/default/xui/pl/menu_outfit_gear.xml +++ b/indra/newview/skins/default/xui/pl/menu_outfit_gear.xml diff --git a/indra/newview/skins/default/xui/pl/menu_outfit_tab.xml b/indra/newview/skins/default/xui/pl/menu_outfit_tab.xml index 998e25f38e..998e25f38e 100755..100644 --- a/indra/newview/skins/default/xui/pl/menu_outfit_tab.xml +++ b/indra/newview/skins/default/xui/pl/menu_outfit_tab.xml diff --git a/indra/newview/skins/default/xui/pl/menu_participant_list.xml b/indra/newview/skins/default/xui/pl/menu_participant_list.xml index 9e59102788..9e59102788 100755..100644 --- a/indra/newview/skins/default/xui/pl/menu_participant_list.xml +++ b/indra/newview/skins/default/xui/pl/menu_participant_list.xml diff --git a/indra/newview/skins/default/xui/pl/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/pl/menu_people_friends_view_sort.xml index b62b85d30a..b62b85d30a 100755..100644 --- a/indra/newview/skins/default/xui/pl/menu_people_friends_view_sort.xml +++ b/indra/newview/skins/default/xui/pl/menu_people_friends_view_sort.xml diff --git a/indra/newview/skins/default/xui/pl/menu_people_groups.xml b/indra/newview/skins/default/xui/pl/menu_people_groups.xml index ace5ebf888..ace5ebf888 100755..100644 --- a/indra/newview/skins/default/xui/pl/menu_people_groups.xml +++ b/indra/newview/skins/default/xui/pl/menu_people_groups.xml diff --git a/indra/newview/skins/default/xui/pl/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/pl/menu_people_groups_view_sort.xml index c70ea2315f..c70ea2315f 100755..100644 --- a/indra/newview/skins/default/xui/pl/menu_people_groups_view_sort.xml +++ b/indra/newview/skins/default/xui/pl/menu_people_groups_view_sort.xml diff --git a/indra/newview/skins/default/xui/pl/menu_people_nearby.xml b/indra/newview/skins/default/xui/pl/menu_people_nearby.xml index a8cc6b4a60..a8cc6b4a60 100755..100644 --- a/indra/newview/skins/default/xui/pl/menu_people_nearby.xml +++ b/indra/newview/skins/default/xui/pl/menu_people_nearby.xml diff --git a/indra/newview/skins/default/xui/pl/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/pl/menu_people_nearby_multiselect.xml index dcfc48fb60..dcfc48fb60 100755..100644 --- a/indra/newview/skins/default/xui/pl/menu_people_nearby_multiselect.xml +++ b/indra/newview/skins/default/xui/pl/menu_people_nearby_multiselect.xml diff --git a/indra/newview/skins/default/xui/pl/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/pl/menu_people_nearby_view_sort.xml index 8ec3820f84..8ec3820f84 100755..100644 --- a/indra/newview/skins/default/xui/pl/menu_people_nearby_view_sort.xml +++ b/indra/newview/skins/default/xui/pl/menu_people_nearby_view_sort.xml diff --git a/indra/newview/skins/default/xui/pl/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/pl/menu_people_recent_view_sort.xml index b474a556bd..b474a556bd 100755..100644 --- a/indra/newview/skins/default/xui/pl/menu_people_recent_view_sort.xml +++ b/indra/newview/skins/default/xui/pl/menu_people_recent_view_sort.xml diff --git a/indra/newview/skins/default/xui/pl/menu_picks.xml b/indra/newview/skins/default/xui/pl/menu_picks.xml index 6f6e4b7fa8..6f6e4b7fa8 100755..100644 --- a/indra/newview/skins/default/xui/pl/menu_picks.xml +++ b/indra/newview/skins/default/xui/pl/menu_picks.xml diff --git a/indra/newview/skins/default/xui/pl/menu_picks_plus.xml b/indra/newview/skins/default/xui/pl/menu_picks_plus.xml index e9c00f51a9..e9c00f51a9 100755..100644 --- a/indra/newview/skins/default/xui/pl/menu_picks_plus.xml +++ b/indra/newview/skins/default/xui/pl/menu_picks_plus.xml diff --git a/indra/newview/skins/default/xui/pl/menu_place.xml b/indra/newview/skins/default/xui/pl/menu_place.xml index c3b72d6abb..c3b72d6abb 100755..100644 --- a/indra/newview/skins/default/xui/pl/menu_place.xml +++ b/indra/newview/skins/default/xui/pl/menu_place.xml diff --git a/indra/newview/skins/default/xui/pl/menu_place_add_button.xml b/indra/newview/skins/default/xui/pl/menu_place_add_button.xml index 3d0c1c87fb..3d0c1c87fb 100755..100644 --- a/indra/newview/skins/default/xui/pl/menu_place_add_button.xml +++ b/indra/newview/skins/default/xui/pl/menu_place_add_button.xml diff --git a/indra/newview/skins/default/xui/pl/menu_places_gear_folder.xml b/indra/newview/skins/default/xui/pl/menu_places_gear_folder.xml index d1f283b7aa..d1f283b7aa 100755..100644 --- a/indra/newview/skins/default/xui/pl/menu_places_gear_folder.xml +++ b/indra/newview/skins/default/xui/pl/menu_places_gear_folder.xml diff --git a/indra/newview/skins/default/xui/pl/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/pl/menu_places_gear_landmark.xml index 0139d3a987..0139d3a987 100755..100644 --- a/indra/newview/skins/default/xui/pl/menu_places_gear_landmark.xml +++ b/indra/newview/skins/default/xui/pl/menu_places_gear_landmark.xml diff --git a/indra/newview/skins/default/xui/pl/menu_profile_overflow.xml b/indra/newview/skins/default/xui/pl/menu_profile_overflow.xml index ef836c8ecf..ef836c8ecf 100755..100644 --- a/indra/newview/skins/default/xui/pl/menu_profile_overflow.xml +++ b/indra/newview/skins/default/xui/pl/menu_profile_overflow.xml diff --git a/indra/newview/skins/default/xui/pl/menu_save_outfit.xml b/indra/newview/skins/default/xui/pl/menu_save_outfit.xml index 4bc65eca38..4bc65eca38 100755..100644 --- a/indra/newview/skins/default/xui/pl/menu_save_outfit.xml +++ b/indra/newview/skins/default/xui/pl/menu_save_outfit.xml diff --git a/indra/newview/skins/default/xui/pl/menu_script_chiclet.xml b/indra/newview/skins/default/xui/pl/menu_script_chiclet.xml index 256500a402..256500a402 100755..100644 --- a/indra/newview/skins/default/xui/pl/menu_script_chiclet.xml +++ b/indra/newview/skins/default/xui/pl/menu_script_chiclet.xml diff --git a/indra/newview/skins/default/xui/pl/menu_slurl.xml b/indra/newview/skins/default/xui/pl/menu_slurl.xml index 862f538aa7..862f538aa7 100755..100644 --- a/indra/newview/skins/default/xui/pl/menu_slurl.xml +++ b/indra/newview/skins/default/xui/pl/menu_slurl.xml diff --git a/indra/newview/skins/default/xui/pl/menu_teleport_history_gear.xml b/indra/newview/skins/default/xui/pl/menu_teleport_history_gear.xml index 0e58592d46..0e58592d46 100755..100644 --- a/indra/newview/skins/default/xui/pl/menu_teleport_history_gear.xml +++ b/indra/newview/skins/default/xui/pl/menu_teleport_history_gear.xml diff --git a/indra/newview/skins/default/xui/pl/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/pl/menu_teleport_history_item.xml index cd36c116b0..cd36c116b0 100755..100644 --- a/indra/newview/skins/default/xui/pl/menu_teleport_history_item.xml +++ b/indra/newview/skins/default/xui/pl/menu_teleport_history_item.xml diff --git a/indra/newview/skins/default/xui/pl/menu_teleport_history_tab.xml b/indra/newview/skins/default/xui/pl/menu_teleport_history_tab.xml index b12df08d6a..b12df08d6a 100755..100644 --- a/indra/newview/skins/default/xui/pl/menu_teleport_history_tab.xml +++ b/indra/newview/skins/default/xui/pl/menu_teleport_history_tab.xml diff --git a/indra/newview/skins/default/xui/pl/menu_text_editor.xml b/indra/newview/skins/default/xui/pl/menu_text_editor.xml index 812f87bc1a..812f87bc1a 100755..100644 --- a/indra/newview/skins/default/xui/pl/menu_text_editor.xml +++ b/indra/newview/skins/default/xui/pl/menu_text_editor.xml diff --git a/indra/newview/skins/default/xui/pl/menu_topinfobar.xml b/indra/newview/skins/default/xui/pl/menu_topinfobar.xml index 53536c8f1c..53536c8f1c 100755..100644 --- a/indra/newview/skins/default/xui/pl/menu_topinfobar.xml +++ b/indra/newview/skins/default/xui/pl/menu_topinfobar.xml diff --git a/indra/newview/skins/default/xui/pl/menu_url_agent.xml b/indra/newview/skins/default/xui/pl/menu_url_agent.xml index db729be725..db729be725 100755..100644 --- a/indra/newview/skins/default/xui/pl/menu_url_agent.xml +++ b/indra/newview/skins/default/xui/pl/menu_url_agent.xml diff --git a/indra/newview/skins/default/xui/pl/menu_url_group.xml b/indra/newview/skins/default/xui/pl/menu_url_group.xml index f340b3296a..f340b3296a 100755..100644 --- a/indra/newview/skins/default/xui/pl/menu_url_group.xml +++ b/indra/newview/skins/default/xui/pl/menu_url_group.xml diff --git a/indra/newview/skins/default/xui/pl/menu_url_http.xml b/indra/newview/skins/default/xui/pl/menu_url_http.xml index e73f7b6745..e73f7b6745 100755..100644 --- a/indra/newview/skins/default/xui/pl/menu_url_http.xml +++ b/indra/newview/skins/default/xui/pl/menu_url_http.xml diff --git a/indra/newview/skins/default/xui/pl/menu_url_inventory.xml b/indra/newview/skins/default/xui/pl/menu_url_inventory.xml index e36fa0dd2b..e36fa0dd2b 100755..100644 --- a/indra/newview/skins/default/xui/pl/menu_url_inventory.xml +++ b/indra/newview/skins/default/xui/pl/menu_url_inventory.xml diff --git a/indra/newview/skins/default/xui/pl/menu_url_map.xml b/indra/newview/skins/default/xui/pl/menu_url_map.xml index 179ab1f676..179ab1f676 100755..100644 --- a/indra/newview/skins/default/xui/pl/menu_url_map.xml +++ b/indra/newview/skins/default/xui/pl/menu_url_map.xml diff --git a/indra/newview/skins/default/xui/pl/menu_url_objectim.xml b/indra/newview/skins/default/xui/pl/menu_url_objectim.xml index 7576208a9e..7576208a9e 100755..100644 --- a/indra/newview/skins/default/xui/pl/menu_url_objectim.xml +++ b/indra/newview/skins/default/xui/pl/menu_url_objectim.xml diff --git a/indra/newview/skins/default/xui/pl/menu_url_parcel.xml b/indra/newview/skins/default/xui/pl/menu_url_parcel.xml index 1b8dd62137..1b8dd62137 100755..100644 --- a/indra/newview/skins/default/xui/pl/menu_url_parcel.xml +++ b/indra/newview/skins/default/xui/pl/menu_url_parcel.xml diff --git a/indra/newview/skins/default/xui/pl/menu_url_slapp.xml b/indra/newview/skins/default/xui/pl/menu_url_slapp.xml index eb83245c48..eb83245c48 100755..100644 --- a/indra/newview/skins/default/xui/pl/menu_url_slapp.xml +++ b/indra/newview/skins/default/xui/pl/menu_url_slapp.xml diff --git a/indra/newview/skins/default/xui/pl/menu_url_slurl.xml b/indra/newview/skins/default/xui/pl/menu_url_slurl.xml index 4d4a5b4c4d..4d4a5b4c4d 100755..100644 --- a/indra/newview/skins/default/xui/pl/menu_url_slurl.xml +++ b/indra/newview/skins/default/xui/pl/menu_url_slurl.xml diff --git a/indra/newview/skins/default/xui/pl/menu_url_teleport.xml b/indra/newview/skins/default/xui/pl/menu_url_teleport.xml index e225546930..e225546930 100755..100644 --- a/indra/newview/skins/default/xui/pl/menu_url_teleport.xml +++ b/indra/newview/skins/default/xui/pl/menu_url_teleport.xml diff --git a/indra/newview/skins/default/xui/pl/menu_viewer.xml b/indra/newview/skins/default/xui/pl/menu_viewer.xml index a354cca9ad..6fd498eea8 100755..100644 --- 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="Region/Majątek" name="RegionEstate"/> <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 & uderzenia" name="Bumps, Pushes &amp; Hits"/> + <menu_item_call label="Zderzenia, popchnięcia i uderzenia" name="Bumps, Pushes &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/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/pl/menu_wearable_list_item.xml index bf85246be8..bf85246be8 100755..100644 --- a/indra/newview/skins/default/xui/pl/menu_wearable_list_item.xml +++ b/indra/newview/skins/default/xui/pl/menu_wearable_list_item.xml diff --git a/indra/newview/skins/default/xui/pl/menu_wearing_gear.xml b/indra/newview/skins/default/xui/pl/menu_wearing_gear.xml index 47cafdbd99..47cafdbd99 100755..100644 --- a/indra/newview/skins/default/xui/pl/menu_wearing_gear.xml +++ b/indra/newview/skins/default/xui/pl/menu_wearing_gear.xml diff --git a/indra/newview/skins/default/xui/pl/menu_wearing_tab.xml b/indra/newview/skins/default/xui/pl/menu_wearing_tab.xml index 7531437043..7531437043 100755..100644 --- a/indra/newview/skins/default/xui/pl/menu_wearing_tab.xml +++ b/indra/newview/skins/default/xui/pl/menu_wearing_tab.xml diff --git a/indra/newview/skins/default/xui/pl/mime_types.xml b/indra/newview/skins/default/xui/pl/mime_types.xml index cbf2afa91d..cbf2afa91d 100755..100644 --- a/indra/newview/skins/default/xui/pl/mime_types.xml +++ b/indra/newview/skins/default/xui/pl/mime_types.xml diff --git a/indra/newview/skins/default/xui/pl/mime_types_linux.xml b/indra/newview/skins/default/xui/pl/mime_types_linux.xml index a2b8168b51..a2b8168b51 100755..100644 --- a/indra/newview/skins/default/xui/pl/mime_types_linux.xml +++ b/indra/newview/skins/default/xui/pl/mime_types_linux.xml diff --git a/indra/newview/skins/default/xui/pl/mime_types_mac.xml b/indra/newview/skins/default/xui/pl/mime_types_mac.xml index 7213b26165..7213b26165 100755..100644 --- a/indra/newview/skins/default/xui/pl/mime_types_mac.xml +++ b/indra/newview/skins/default/xui/pl/mime_types_mac.xml diff --git a/indra/newview/skins/default/xui/pl/notifications.xml b/indra/newview/skins/default/xui/pl/notifications.xml index f255b1b8ea..c4a65d92b4 100755..100644 --- 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 '[_NAME]' 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ę: + + '[ERROR_CODE]' + <usetemplate name="okbutton" yestext="OK"/> + </notification> + <notification name="MerchantPasteFailed"> + Kopiowanie lub przenoszenie przedmiotów na Marketplace nie powiodło się: + +'[ERROR_CODE]' + <usetemplate name="okbutton" yestext="OK"/> + </notification> + <notification name="MerchantTransactionFailed"> + Transakcja z Marketplace nie powiodła się: + + Powód: '[ERROR_REASON]' + [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ę: + + '[ERROR_CODE]' + <usetemplate name="okbutton" yestext="OK"/> + </notification> + <notification name="MerchantFolderActivationFailed"> + Aktywacja tego folderu wersji nie powiodła się: + + '[ERROR_CODE]' + <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 '[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 "Kosz" 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&task=knowledge&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&task=knowledge&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ć 'Zmień Ustawienia' 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 > Ustawienia > 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ć 'Zmień Ustawienia' 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&task=knowledge&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ć 'Zmień Ustawienia' 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 > Ustawienia > 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 '[FOLDERNAME]' 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"> - <nolink>[NAME]</nolink> jest w Second Life - </notification> - <notification name="FriendOffline"> - <nolink>[NAME]</nolink> opuszcza Second Life - </notification> <notification name="AddSelfFriend"> Nie możesz dodać siebie do listy znajomych. </notification> @@ -2361,9 +2368,6 @@ Spróbuj ponowanie za kilka minut. <notification name="NoValidCircuit"> Nieważny obwód kodowania. </notification> - <notification name="NoValidTimestamp"> - Niewłaściwy czas zapisu. - </notification> <notification name="NoPendingConnection"> Brak możliwości wykonania połączenia. </notification> @@ -2525,22 +2529,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]'s '<nolink>[TITLE]</nolink>' [MESSAGE] - <form name="form"> - <button name="Ignore" text="Zignoruj"/> - </form> + <form name="form"/> </notification> <notification name="ScriptDialogGroup"> [GROUPNAME]'s '<nolink>[TITLE]</nolink>' [MESSAGE] - <form name="form"> - <button name="Ignore" text="Zignoruj"/> - </form> + <form name="form"/> </notification> <notification name="BuyLindenDollarSuccess"> Dziękujemy za wpłatę! @@ -2857,10 +2856,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 +2884,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 +2908,16 @@ W innym przypadku możesz poszukać na mapie miejsca oznaczone jako "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/outfit_accordion_tab.xml b/indra/newview/skins/default/xui/pl/outfit_accordion_tab.xml index bac885e5d8..bac885e5d8 100755..100644 --- a/indra/newview/skins/default/xui/pl/outfit_accordion_tab.xml +++ b/indra/newview/skins/default/xui/pl/outfit_accordion_tab.xml diff --git a/indra/newview/skins/default/xui/pl/panel_active_object_row.xml b/indra/newview/skins/default/xui/pl/panel_active_object_row.xml index ab1d8d7007..ab1d8d7007 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_active_object_row.xml +++ b/indra/newview/skins/default/xui/pl/panel_active_object_row.xml diff --git a/indra/newview/skins/default/xui/pl/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/pl/panel_adhoc_control_panel.xml index ba0c85e4ef..ba0c85e4ef 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_adhoc_control_panel.xml +++ b/indra/newview/skins/default/xui/pl/panel_adhoc_control_panel.xml diff --git a/indra/newview/skins/default/xui/pl/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/pl/panel_avatar_list_item.xml index c43a9bed81..c43a9bed81 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_avatar_list_item.xml +++ b/indra/newview/skins/default/xui/pl/panel_avatar_list_item.xml diff --git a/indra/newview/skins/default/xui/pl/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/pl/panel_block_list_sidetray.xml index 62cb392ba7..62cb392ba7 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_block_list_sidetray.xml +++ b/indra/newview/skins/default/xui/pl/panel_block_list_sidetray.xml diff --git a/indra/newview/skins/default/xui/pl/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/pl/panel_body_parts_list_item.xml index cebb6e3cfe..cebb6e3cfe 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_body_parts_list_item.xml +++ b/indra/newview/skins/default/xui/pl/panel_body_parts_list_item.xml diff --git a/indra/newview/skins/default/xui/pl/panel_bodyparts_list_button_bar.xml b/indra/newview/skins/default/xui/pl/panel_bodyparts_list_button_bar.xml index 560bfe78f4..560bfe78f4 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_bodyparts_list_button_bar.xml +++ b/indra/newview/skins/default/xui/pl/panel_bodyparts_list_button_bar.xml diff --git a/indra/newview/skins/default/xui/pl/panel_bottomtray.xml b/indra/newview/skins/default/xui/pl/panel_bottomtray.xml index 8a033fc32f..8a033fc32f 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_bottomtray.xml +++ b/indra/newview/skins/default/xui/pl/panel_bottomtray.xml diff --git a/indra/newview/skins/default/xui/pl/panel_bottomtray_lite.xml b/indra/newview/skins/default/xui/pl/panel_bottomtray_lite.xml index e32c12a8ee..e32c12a8ee 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_bottomtray_lite.xml +++ b/indra/newview/skins/default/xui/pl/panel_bottomtray_lite.xml diff --git a/indra/newview/skins/default/xui/pl/panel_classified_info.xml b/indra/newview/skins/default/xui/pl/panel_classified_info.xml index 52f54fc7cf..52f54fc7cf 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_classified_info.xml +++ b/indra/newview/skins/default/xui/pl/panel_classified_info.xml diff --git a/indra/newview/skins/default/xui/pl/panel_clothing_list_button_bar.xml b/indra/newview/skins/default/xui/pl/panel_clothing_list_button_bar.xml index 17a6d1eb8b..17a6d1eb8b 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_clothing_list_button_bar.xml +++ b/indra/newview/skins/default/xui/pl/panel_clothing_list_button_bar.xml diff --git a/indra/newview/skins/default/xui/pl/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/pl/panel_clothing_list_item.xml index 42d1ead400..42d1ead400 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_clothing_list_item.xml +++ b/indra/newview/skins/default/xui/pl/panel_clothing_list_item.xml diff --git a/indra/newview/skins/default/xui/pl/panel_cof_wearables.xml b/indra/newview/skins/default/xui/pl/panel_cof_wearables.xml index 970b994c20..970b994c20 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_cof_wearables.xml +++ b/indra/newview/skins/default/xui/pl/panel_cof_wearables.xml diff --git a/indra/newview/skins/default/xui/pl/panel_deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/pl/panel_deletable_wearable_list_item.xml index f9fba4d79f..f9fba4d79f 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_deletable_wearable_list_item.xml +++ b/indra/newview/skins/default/xui/pl/panel_deletable_wearable_list_item.xml diff --git a/indra/newview/skins/default/xui/pl/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/pl/panel_dummy_clothing_list_item.xml index 83210808f1..83210808f1 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_dummy_clothing_list_item.xml +++ b/indra/newview/skins/default/xui/pl/panel_dummy_clothing_list_item.xml diff --git a/indra/newview/skins/default/xui/pl/panel_edit_alpha.xml b/indra/newview/skins/default/xui/pl/panel_edit_alpha.xml index 51ee3af00d..51ee3af00d 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_edit_alpha.xml +++ b/indra/newview/skins/default/xui/pl/panel_edit_alpha.xml diff --git a/indra/newview/skins/default/xui/pl/panel_edit_classified.xml b/indra/newview/skins/default/xui/pl/panel_edit_classified.xml index 7cfd9c221c..7cfd9c221c 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_edit_classified.xml +++ b/indra/newview/skins/default/xui/pl/panel_edit_classified.xml diff --git a/indra/newview/skins/default/xui/pl/panel_edit_eyes.xml b/indra/newview/skins/default/xui/pl/panel_edit_eyes.xml index 390a5313b5..390a5313b5 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_edit_eyes.xml +++ b/indra/newview/skins/default/xui/pl/panel_edit_eyes.xml diff --git a/indra/newview/skins/default/xui/pl/panel_edit_gloves.xml b/indra/newview/skins/default/xui/pl/panel_edit_gloves.xml index d32646d1a3..d32646d1a3 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_edit_gloves.xml +++ b/indra/newview/skins/default/xui/pl/panel_edit_gloves.xml diff --git a/indra/newview/skins/default/xui/pl/panel_edit_hair.xml b/indra/newview/skins/default/xui/pl/panel_edit_hair.xml index cbcba97eb6..cbcba97eb6 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_edit_hair.xml +++ b/indra/newview/skins/default/xui/pl/panel_edit_hair.xml diff --git a/indra/newview/skins/default/xui/pl/panel_edit_jacket.xml b/indra/newview/skins/default/xui/pl/panel_edit_jacket.xml index 7653e84cc0..7653e84cc0 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_edit_jacket.xml +++ b/indra/newview/skins/default/xui/pl/panel_edit_jacket.xml diff --git a/indra/newview/skins/default/xui/pl/panel_edit_pants.xml b/indra/newview/skins/default/xui/pl/panel_edit_pants.xml index 7975e55746..7975e55746 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_edit_pants.xml +++ b/indra/newview/skins/default/xui/pl/panel_edit_pants.xml diff --git a/indra/newview/skins/default/xui/pl/panel_edit_physics.xml b/indra/newview/skins/default/xui/pl/panel_edit_physics.xml index a773a52a59..a773a52a59 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_edit_physics.xml +++ b/indra/newview/skins/default/xui/pl/panel_edit_physics.xml diff --git a/indra/newview/skins/default/xui/pl/panel_edit_pick.xml b/indra/newview/skins/default/xui/pl/panel_edit_pick.xml index 72c162f63d..72c162f63d 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_edit_pick.xml +++ b/indra/newview/skins/default/xui/pl/panel_edit_pick.xml diff --git a/indra/newview/skins/default/xui/pl/panel_edit_profile.xml b/indra/newview/skins/default/xui/pl/panel_edit_profile.xml index e6fd8b18f8..e6fd8b18f8 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_edit_profile.xml +++ b/indra/newview/skins/default/xui/pl/panel_edit_profile.xml diff --git a/indra/newview/skins/default/xui/pl/panel_edit_shape.xml b/indra/newview/skins/default/xui/pl/panel_edit_shape.xml index 54f9fdc21c..54f9fdc21c 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_edit_shape.xml +++ b/indra/newview/skins/default/xui/pl/panel_edit_shape.xml diff --git a/indra/newview/skins/default/xui/pl/panel_edit_shirt.xml b/indra/newview/skins/default/xui/pl/panel_edit_shirt.xml index 9530c781ab..9530c781ab 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_edit_shirt.xml +++ b/indra/newview/skins/default/xui/pl/panel_edit_shirt.xml diff --git a/indra/newview/skins/default/xui/pl/panel_edit_shoes.xml b/indra/newview/skins/default/xui/pl/panel_edit_shoes.xml index d90a6d8726..d90a6d8726 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_edit_shoes.xml +++ b/indra/newview/skins/default/xui/pl/panel_edit_shoes.xml diff --git a/indra/newview/skins/default/xui/pl/panel_edit_skin.xml b/indra/newview/skins/default/xui/pl/panel_edit_skin.xml index 9e0acd3cec..9e0acd3cec 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_edit_skin.xml +++ b/indra/newview/skins/default/xui/pl/panel_edit_skin.xml diff --git a/indra/newview/skins/default/xui/pl/panel_edit_skirt.xml b/indra/newview/skins/default/xui/pl/panel_edit_skirt.xml index f74ad916cd..f74ad916cd 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_edit_skirt.xml +++ b/indra/newview/skins/default/xui/pl/panel_edit_skirt.xml diff --git a/indra/newview/skins/default/xui/pl/panel_edit_socks.xml b/indra/newview/skins/default/xui/pl/panel_edit_socks.xml index b41069e8d7..b41069e8d7 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_edit_socks.xml +++ b/indra/newview/skins/default/xui/pl/panel_edit_socks.xml diff --git a/indra/newview/skins/default/xui/pl/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/pl/panel_edit_tattoo.xml index 6fd1e2277a..6fd1e2277a 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_edit_tattoo.xml +++ b/indra/newview/skins/default/xui/pl/panel_edit_tattoo.xml diff --git a/indra/newview/skins/default/xui/pl/panel_edit_underpants.xml b/indra/newview/skins/default/xui/pl/panel_edit_underpants.xml index f2a9b10f17..f2a9b10f17 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_edit_underpants.xml +++ b/indra/newview/skins/default/xui/pl/panel_edit_underpants.xml diff --git a/indra/newview/skins/default/xui/pl/panel_edit_undershirt.xml b/indra/newview/skins/default/xui/pl/panel_edit_undershirt.xml index 7da1341e96..7da1341e96 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_edit_undershirt.xml +++ b/indra/newview/skins/default/xui/pl/panel_edit_undershirt.xml diff --git a/indra/newview/skins/default/xui/pl/panel_edit_wearable.xml b/indra/newview/skins/default/xui/pl/panel_edit_wearable.xml index 2027b8715b..2027b8715b 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_edit_wearable.xml +++ b/indra/newview/skins/default/xui/pl/panel_edit_wearable.xml diff --git a/indra/newview/skins/default/xui/pl/panel_group_control_panel.xml b/indra/newview/skins/default/xui/pl/panel_group_control_panel.xml index 4e373cdf8f..4e373cdf8f 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_group_control_panel.xml +++ b/indra/newview/skins/default/xui/pl/panel_group_control_panel.xml diff --git a/indra/newview/skins/default/xui/pl/panel_group_general.xml b/indra/newview/skins/default/xui/pl/panel_group_general.xml index a4d76badf0..a4d76badf0 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_group_general.xml +++ b/indra/newview/skins/default/xui/pl/panel_group_general.xml diff --git a/indra/newview/skins/default/xui/pl/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/pl/panel_group_info_sidetray.xml index 37fb529f2b..37fb529f2b 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_group_info_sidetray.xml +++ b/indra/newview/skins/default/xui/pl/panel_group_info_sidetray.xml diff --git a/indra/newview/skins/default/xui/pl/panel_group_invite.xml b/indra/newview/skins/default/xui/pl/panel_group_invite.xml index 1822551e86..1822551e86 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_group_invite.xml +++ b/indra/newview/skins/default/xui/pl/panel_group_invite.xml diff --git a/indra/newview/skins/default/xui/pl/panel_group_land_money.xml b/indra/newview/skins/default/xui/pl/panel_group_land_money.xml index aea4e50fd5..aea4e50fd5 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_group_land_money.xml +++ b/indra/newview/skins/default/xui/pl/panel_group_land_money.xml diff --git a/indra/newview/skins/default/xui/pl/panel_group_list_item.xml b/indra/newview/skins/default/xui/pl/panel_group_list_item.xml index a8b4056976..a8b4056976 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_group_list_item.xml +++ b/indra/newview/skins/default/xui/pl/panel_group_list_item.xml diff --git a/indra/newview/skins/default/xui/pl/panel_group_notices.xml b/indra/newview/skins/default/xui/pl/panel_group_notices.xml index a3b0998de3..a3b0998de3 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_group_notices.xml +++ b/indra/newview/skins/default/xui/pl/panel_group_notices.xml diff --git a/indra/newview/skins/default/xui/pl/panel_group_notify.xml b/indra/newview/skins/default/xui/pl/panel_group_notify.xml index d27a81217a..d27a81217a 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_group_notify.xml +++ b/indra/newview/skins/default/xui/pl/panel_group_notify.xml diff --git a/indra/newview/skins/default/xui/pl/panel_group_roles.xml b/indra/newview/skins/default/xui/pl/panel_group_roles.xml index 9e9c79d26a..9e9c79d26a 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_group_roles.xml +++ b/indra/newview/skins/default/xui/pl/panel_group_roles.xml diff --git a/indra/newview/skins/default/xui/pl/panel_im_control_panel.xml b/indra/newview/skins/default/xui/pl/panel_im_control_panel.xml index 4aadd3b93b..4aadd3b93b 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_im_control_panel.xml +++ b/indra/newview/skins/default/xui/pl/panel_im_control_panel.xml diff --git a/indra/newview/skins/default/xui/pl/panel_inventory_item.xml b/indra/newview/skins/default/xui/pl/panel_inventory_item.xml index d18047fbcf..d18047fbcf 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_inventory_item.xml +++ b/indra/newview/skins/default/xui/pl/panel_inventory_item.xml diff --git a/indra/newview/skins/default/xui/pl/panel_landmark_info.xml b/indra/newview/skins/default/xui/pl/panel_landmark_info.xml index 3370f6f58e..3370f6f58e 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_landmark_info.xml +++ b/indra/newview/skins/default/xui/pl/panel_landmark_info.xml diff --git a/indra/newview/skins/default/xui/pl/panel_landmarks.xml b/indra/newview/skins/default/xui/pl/panel_landmarks.xml index 039be3b504..039be3b504 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_landmarks.xml +++ b/indra/newview/skins/default/xui/pl/panel_landmarks.xml 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..100644 --- 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="<Wpisz Region>" 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_main_inventory.xml b/indra/newview/skins/default/xui/pl/panel_main_inventory.xml index 8d6fa1173c..8d6fa1173c 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/pl/panel_main_inventory.xml 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_me.xml b/indra/newview/skins/default/xui/pl/panel_me.xml index 72a5f51520..72a5f51520 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_me.xml +++ b/indra/newview/skins/default/xui/pl/panel_me.xml diff --git a/indra/newview/skins/default/xui/pl/panel_media_settings_general.xml b/indra/newview/skins/default/xui/pl/panel_media_settings_general.xml index 914a2aee73..914a2aee73 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_media_settings_general.xml +++ b/indra/newview/skins/default/xui/pl/panel_media_settings_general.xml diff --git a/indra/newview/skins/default/xui/pl/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/pl/panel_media_settings_permissions.xml index a87c29d7b3..a87c29d7b3 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_media_settings_permissions.xml +++ b/indra/newview/skins/default/xui/pl/panel_media_settings_permissions.xml diff --git a/indra/newview/skins/default/xui/pl/panel_media_settings_security.xml b/indra/newview/skins/default/xui/pl/panel_media_settings_security.xml index 7e95c4942f..7e95c4942f 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_media_settings_security.xml +++ b/indra/newview/skins/default/xui/pl/panel_media_settings_security.xml diff --git a/indra/newview/skins/default/xui/pl/panel_navigation_bar.xml b/indra/newview/skins/default/xui/pl/panel_navigation_bar.xml index b01e686c41..b01e686c41 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_navigation_bar.xml +++ b/indra/newview/skins/default/xui/pl/panel_navigation_bar.xml diff --git a/indra/newview/skins/default/xui/pl/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/pl/panel_nearby_chat_bar.xml index 4ed3ff669b..4ed3ff669b 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_nearby_chat_bar.xml +++ b/indra/newview/skins/default/xui/pl/panel_nearby_chat_bar.xml diff --git a/indra/newview/skins/default/xui/pl/panel_nearby_media.xml b/indra/newview/skins/default/xui/pl/panel_nearby_media.xml index d77c6d7852..d77c6d7852 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_nearby_media.xml +++ b/indra/newview/skins/default/xui/pl/panel_nearby_media.xml diff --git a/indra/newview/skins/default/xui/pl/panel_notify_textbox.xml b/indra/newview/skins/default/xui/pl/panel_notify_textbox.xml index e1668e1ef1..e1668e1ef1 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_notify_textbox.xml +++ b/indra/newview/skins/default/xui/pl/panel_notify_textbox.xml diff --git a/indra/newview/skins/default/xui/pl/panel_online_status_toast.xml b/indra/newview/skins/default/xui/pl/panel_online_status_toast.xml index fdc489f375..fdc489f375 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_online_status_toast.xml +++ b/indra/newview/skins/default/xui/pl/panel_online_status_toast.xml diff --git a/indra/newview/skins/default/xui/pl/panel_outfit_edit.xml b/indra/newview/skins/default/xui/pl/panel_outfit_edit.xml index 50353d4fba..50353d4fba 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_outfit_edit.xml +++ b/indra/newview/skins/default/xui/pl/panel_outfit_edit.xml diff --git a/indra/newview/skins/default/xui/pl/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/pl/panel_outfits_inventory.xml index bf23ace58f..bf23ace58f 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_outfits_inventory.xml +++ b/indra/newview/skins/default/xui/pl/panel_outfits_inventory.xml diff --git a/indra/newview/skins/default/xui/pl/panel_outfits_inventory_gear_default.xml b/indra/newview/skins/default/xui/pl/panel_outfits_inventory_gear_default.xml index 2f8c008f98..2f8c008f98 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_outfits_inventory_gear_default.xml +++ b/indra/newview/skins/default/xui/pl/panel_outfits_inventory_gear_default.xml diff --git a/indra/newview/skins/default/xui/pl/panel_outfits_list.xml b/indra/newview/skins/default/xui/pl/panel_outfits_list.xml index ed3057399d..ed3057399d 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_outfits_list.xml +++ b/indra/newview/skins/default/xui/pl/panel_outfits_list.xml diff --git a/indra/newview/skins/default/xui/pl/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/pl/panel_outfits_wearing.xml index 5559c151e7..5559c151e7 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_outfits_wearing.xml +++ b/indra/newview/skins/default/xui/pl/panel_outfits_wearing.xml diff --git a/indra/newview/skins/default/xui/pl/panel_people.xml b/indra/newview/skins/default/xui/pl/panel_people.xml index ef52e2148b..ef52e2148b 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_people.xml +++ b/indra/newview/skins/default/xui/pl/panel_people.xml diff --git a/indra/newview/skins/default/xui/pl/panel_pick_info.xml b/indra/newview/skins/default/xui/pl/panel_pick_info.xml index 26afded795..26afded795 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_pick_info.xml +++ b/indra/newview/skins/default/xui/pl/panel_pick_info.xml diff --git a/indra/newview/skins/default/xui/pl/panel_picks.xml b/indra/newview/skins/default/xui/pl/panel_picks.xml index 1ba4e76196..1ba4e76196 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_picks.xml +++ b/indra/newview/skins/default/xui/pl/panel_picks.xml diff --git a/indra/newview/skins/default/xui/pl/panel_place_profile.xml b/indra/newview/skins/default/xui/pl/panel_place_profile.xml index 2a4ffab36c..2a4ffab36c 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_place_profile.xml +++ b/indra/newview/skins/default/xui/pl/panel_place_profile.xml diff --git a/indra/newview/skins/default/xui/pl/panel_places.xml b/indra/newview/skins/default/xui/pl/panel_places.xml index d69d137d23..d69d137d23 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_places.xml +++ b/indra/newview/skins/default/xui/pl/panel_places.xml diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/pl/panel_preferences_advanced.xml index 5e61f62691..5e61f62691 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/pl/panel_preferences_advanced.xml diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/pl/panel_preferences_alerts.xml index d53a99e8c1..d53a99e8c1 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_preferences_alerts.xml +++ b/indra/newview/skins/default/xui/pl/panel_preferences_alerts.xml diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_chat.xml b/indra/newview/skins/default/xui/pl/panel_preferences_chat.xml index 7fd1029e6a..7fd1029e6a 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/pl/panel_preferences_chat.xml diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_colors.xml b/indra/newview/skins/default/xui/pl/panel_preferences_colors.xml index 3affda57bf..3affda57bf 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_preferences_colors.xml +++ b/indra/newview/skins/default/xui/pl/panel_preferences_colors.xml diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_general.xml b/indra/newview/skins/default/xui/pl/panel_preferences_general.xml index fff56eab6e..fff56eab6e 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/pl/panel_preferences_general.xml diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/pl/panel_preferences_graphics1.xml index 4cd271a141..4cd271a141 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/pl/panel_preferences_graphics1.xml diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_move.xml b/indra/newview/skins/default/xui/pl/panel_preferences_move.xml index 4c2df2c1f3..4c2df2c1f3 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_preferences_move.xml +++ b/indra/newview/skins/default/xui/pl/panel_preferences_move.xml diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/pl/panel_preferences_privacy.xml index 30b64bc977..30b64bc977 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_preferences_privacy.xml +++ b/indra/newview/skins/default/xui/pl/panel_preferences_privacy.xml diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_setup.xml b/indra/newview/skins/default/xui/pl/panel_preferences_setup.xml index b663e18227..b663e18227 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_preferences_setup.xml +++ b/indra/newview/skins/default/xui/pl/panel_preferences_setup.xml diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_sound.xml b/indra/newview/skins/default/xui/pl/panel_preferences_sound.xml index 46f5ebb8e2..46f5ebb8e2 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/pl/panel_preferences_sound.xml diff --git a/indra/newview/skins/default/xui/pl/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/pl/panel_prim_media_controls.xml index b5763e1291..b5763e1291 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_prim_media_controls.xml +++ b/indra/newview/skins/default/xui/pl/panel_prim_media_controls.xml diff --git a/indra/newview/skins/default/xui/pl/panel_region_covenant.xml b/indra/newview/skins/default/xui/pl/panel_region_covenant.xml index 932e3631ab..932e3631ab 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_region_covenant.xml +++ b/indra/newview/skins/default/xui/pl/panel_region_covenant.xml diff --git a/indra/newview/skins/default/xui/pl/panel_region_debug.xml b/indra/newview/skins/default/xui/pl/panel_region_debug.xml index c5b08383dc..c5b08383dc 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_region_debug.xml +++ b/indra/newview/skins/default/xui/pl/panel_region_debug.xml diff --git a/indra/newview/skins/default/xui/pl/panel_region_estate.xml b/indra/newview/skins/default/xui/pl/panel_region_estate.xml index 1b64827725..1b64827725 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_region_estate.xml +++ b/indra/newview/skins/default/xui/pl/panel_region_estate.xml diff --git a/indra/newview/skins/default/xui/pl/panel_region_general.xml b/indra/newview/skins/default/xui/pl/panel_region_general.xml index 601571f62e..601571f62e 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_region_general.xml +++ b/indra/newview/skins/default/xui/pl/panel_region_general.xml diff --git a/indra/newview/skins/default/xui/pl/panel_region_terrain.xml b/indra/newview/skins/default/xui/pl/panel_region_terrain.xml index f22b4a5989..f22b4a5989 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_region_terrain.xml +++ b/indra/newview/skins/default/xui/pl/panel_region_terrain.xml diff --git a/indra/newview/skins/default/xui/pl/panel_region_texture.xml b/indra/newview/skins/default/xui/pl/panel_region_texture.xml index c6ed2457f1..c6ed2457f1 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_region_texture.xml +++ b/indra/newview/skins/default/xui/pl/panel_region_texture.xml diff --git a/indra/newview/skins/default/xui/pl/panel_script_ed.xml b/indra/newview/skins/default/xui/pl/panel_script_ed.xml index b05223aa0f..b05223aa0f 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_script_ed.xml +++ b/indra/newview/skins/default/xui/pl/panel_script_ed.xml diff --git a/indra/newview/skins/default/xui/pl/panel_script_limits_my_avatar.xml b/indra/newview/skins/default/xui/pl/panel_script_limits_my_avatar.xml index a52d8aed3d..a52d8aed3d 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_script_limits_my_avatar.xml +++ b/indra/newview/skins/default/xui/pl/panel_script_limits_my_avatar.xml diff --git a/indra/newview/skins/default/xui/pl/panel_script_limits_region_memory.xml b/indra/newview/skins/default/xui/pl/panel_script_limits_region_memory.xml index 070f025087..070f025087 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_script_limits_region_memory.xml +++ b/indra/newview/skins/default/xui/pl/panel_script_limits_region_memory.xml diff --git a/indra/newview/skins/default/xui/pl/panel_scrolling_param.xml b/indra/newview/skins/default/xui/pl/panel_scrolling_param.xml index 70a6e39412..70a6e39412 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_scrolling_param.xml +++ b/indra/newview/skins/default/xui/pl/panel_scrolling_param.xml diff --git a/indra/newview/skins/default/xui/pl/panel_scrolling_param_base.xml b/indra/newview/skins/default/xui/pl/panel_scrolling_param_base.xml index fa659040ea..fa659040ea 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_scrolling_param_base.xml +++ b/indra/newview/skins/default/xui/pl/panel_scrolling_param_base.xml diff --git a/indra/newview/skins/default/xui/pl/panel_side_tray.xml b/indra/newview/skins/default/xui/pl/panel_side_tray.xml index ff4ca23a4d..ff4ca23a4d 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_side_tray.xml +++ b/indra/newview/skins/default/xui/pl/panel_side_tray.xml diff --git a/indra/newview/skins/default/xui/pl/panel_side_tray_tab_caption.xml b/indra/newview/skins/default/xui/pl/panel_side_tray_tab_caption.xml index 95cd7c53dc..95cd7c53dc 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_side_tray_tab_caption.xml +++ b/indra/newview/skins/default/xui/pl/panel_side_tray_tab_caption.xml diff --git a/indra/newview/skins/default/xui/pl/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/pl/panel_stand_stop_flying.xml index 9f7f7f1238..9f7f7f1238 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_stand_stop_flying.xml +++ b/indra/newview/skins/default/xui/pl/panel_stand_stop_flying.xml 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..100644 --- 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/panel_teleport_history.xml b/indra/newview/skins/default/xui/pl/panel_teleport_history.xml index b43bd96536..b43bd96536 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_teleport_history.xml +++ b/indra/newview/skins/default/xui/pl/panel_teleport_history.xml diff --git a/indra/newview/skins/default/xui/pl/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/pl/panel_teleport_history_item.xml index f0fe28c4ce..f0fe28c4ce 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_teleport_history_item.xml +++ b/indra/newview/skins/default/xui/pl/panel_teleport_history_item.xml diff --git a/indra/newview/skins/default/xui/pl/panel_voice_effect.xml b/indra/newview/skins/default/xui/pl/panel_voice_effect.xml index f8a076424f..f8a076424f 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_voice_effect.xml +++ b/indra/newview/skins/default/xui/pl/panel_voice_effect.xml diff --git a/indra/newview/skins/default/xui/pl/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/pl/panel_volume_pulldown.xml index 1611900700..1611900700 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_volume_pulldown.xml +++ b/indra/newview/skins/default/xui/pl/panel_volume_pulldown.xml diff --git a/indra/newview/skins/default/xui/pl/panel_world_map.xml b/indra/newview/skins/default/xui/pl/panel_world_map.xml index 69f18be767..69f18be767 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_world_map.xml +++ b/indra/newview/skins/default/xui/pl/panel_world_map.xml diff --git a/indra/newview/skins/default/xui/pl/role_actions.xml b/indra/newview/skins/default/xui/pl/role_actions.xml index 57df2bc70f..57df2bc70f 100755..100644 --- a/indra/newview/skins/default/xui/pl/role_actions.xml +++ b/indra/newview/skins/default/xui/pl/role_actions.xml diff --git a/indra/newview/skins/default/xui/pl/sidepanel_appearance.xml b/indra/newview/skins/default/xui/pl/sidepanel_appearance.xml index cea903769c..cea903769c 100755..100644 --- a/indra/newview/skins/default/xui/pl/sidepanel_appearance.xml +++ b/indra/newview/skins/default/xui/pl/sidepanel_appearance.xml diff --git a/indra/newview/skins/default/xui/pl/sidepanel_inventory.xml b/indra/newview/skins/default/xui/pl/sidepanel_inventory.xml index 1034a06f1f..1034a06f1f 100755..100644 --- a/indra/newview/skins/default/xui/pl/sidepanel_inventory.xml +++ b/indra/newview/skins/default/xui/pl/sidepanel_inventory.xml 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..100644 --- 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/ 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..100644 --- 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..100644 --- 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"> 'General' </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/pl/teleport_strings.xml b/indra/newview/skins/default/xui/pl/teleport_strings.xml index 0366c3fdbc..0366c3fdbc 100755..100644 --- a/indra/newview/skins/default/xui/pl/teleport_strings.xml +++ b/indra/newview/skins/default/xui/pl/teleport_strings.xml diff --git a/indra/newview/skins/default/xui/pl/xui_version.xml b/indra/newview/skins/default/xui/pl/xui_version.xml index 0e777751d3..0e777751d3 100755..100644 --- a/indra/newview/skins/default/xui/pl/xui_version.xml +++ b/indra/newview/skins/default/xui/pl/xui_version.xml 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..100644 --- 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 <nolink>[HOSTNAME]</nolink> ([HOSTIP]) -SLURL: <nolink>[SLURL]</nolink> -(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..100644 --- 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 & 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_activeim.xml b/indra/newview/skins/default/xui/pt/floater_activeim.xml index 892ccdf974..892ccdf974 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_activeim.xml +++ b/indra/newview/skins/default/xui/pt/floater_activeim.xml diff --git a/indra/newview/skins/default/xui/pt/floater_animation_anim_preview.xml b/indra/newview/skins/default/xui/pt/floater_animation_anim_preview.xml index 05326d8594..05326d8594 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_animation_anim_preview.xml +++ b/indra/newview/skins/default/xui/pt/floater_animation_anim_preview.xml diff --git a/indra/newview/skins/default/xui/pt/floater_animation_bvh_preview.xml b/indra/newview/skins/default/xui/pt/floater_animation_bvh_preview.xml index 5cae581045..64515dfa61 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_animation_bvh_preview.xml +++ b/indra/newview/skins/default/xui/pt/floater_animation_bvh_preview.xml @@ -141,35 +141,35 @@ A duração máxima da animação é de [MAX_LENGTH] segundos. Expressão </text> <combo_box name="emote_combo" tool_tip="Controla as expressões faciais durante a animação"> - <item label="(nenhum)" name="[None]" value=""/> - <item label="Aaaaah" name="Aaaaah" value="Aaaaah"/> - <item label="Com medo" name="Afraid" value="Com medo"/> - <item label="Bravo" name="Angry" value="Bravo"/> - <item label="Sorriso contagiante" name="BigSmile" value="Sorriso contagiante"/> - <item label="À toa" name="Bored" value="À toa"/> - <item label="Chorar" name="Cry" value="Chorar"/> - <item label="Desdenho" name="Disdain" value="Desdenho"/> - <item label="Com vergonha" name="Embarrassed" value="Com vergonha"/> - <item label="Franzir testa" name="Frown" value="Franzir testa"/> - <item label="Beijo" name="Kiss" value="Beijo"/> - <item label="Rir" name="Laugh" value="Rir"/> - <item label="Mostrar a língua" name="Plllppt" value="Mostrar a língua"/> - <item label="Asco" name="Repulsed" value="Asco"/> - <item label="Triste" name="Sad" value="Triste"/> - <item label="Encolher os ombros" name="Shrug" value="Encolher os ombros"/> - <item label="Sorriso" name="Smile" value="Sorriso"/> - <item label="Surpresa" name="Surprise" value="Surpresa"/> - <item label="Piscar" name="Wink" value="Piscar"/> - <item label="Preocupado" name="Worry" value="Preocupado"/> + <item label="(nenhum)" name="[None]"/> + <item label="Aaaaah" name="Aaaaah"/> + <item label="Com medo" name="Afraid"/> + <item label="Bravo" name="Angry"/> + <item label="Sorriso contagiante" name="BigSmile"/> + <item label="À toa" name="Bored"/> + <item label="Chorar" name="Cry"/> + <item label="Desdenho" name="Disdain"/> + <item label="Com vergonha" name="Embarrassed"/> + <item label="Franzir testa" name="Frown"/> + <item label="Beijo" name="Kiss"/> + <item label="Rir" name="Laugh"/> + <item label="Mostrar a língua" name="Plllppt"/> + <item label="Asco" name="Repulsed"/> + <item label="Triste" name="Sad"/> + <item label="Encolher os ombros" name="Shrug"/> + <item label="Sorriso" name="Smile"/> + <item label="Surpresa" name="Surprise"/> + <item label="Piscar" name="Wink"/> + <item label="Preocupado" name="Worry"/> </combo_box> <text name="preview_label"> Visualizar enquanto </text> <combo_box name="preview_base_anim" tool_tip="Use para testar o comportamento de sua animação enquanto seu avatar executa ações comuns."> - <item label="Em pé" name="Standing" value="Em pé"/> - <item label="Andar" name="Walking" value="Andar"/> - <item label="Sentado" name="Sitting" value="Sentado"/> - <item label="Voar" name="Flying" value="Voar"/> + <item label="Em pé" name="Standing"/> + <item label="Andar" name="Walking"/> + <item label="Sentado" name="Sitting"/> + <item label="Voar" name="Flying"/> </combo_box> <spinner label="Aproximação (seg)" name="ease_in_time" tool_tip="Tempo (em segundos) da transição inicial da animação"/> <spinner label="Afastamento (seg)" name="ease_out_time" tool_tip="Tempo (em segundos) da transição de saída da animação"/> 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_auction.xml b/indra/newview/skins/default/xui/pt/floater_auction.xml index 074f7bf001..074f7bf001 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_auction.xml +++ b/indra/newview/skins/default/xui/pt/floater_auction.xml diff --git a/indra/newview/skins/default/xui/pt/floater_autoreplace.xml b/indra/newview/skins/default/xui/pt/floater_autoreplace.xml index ca813a8540..ca813a8540 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_autoreplace.xml +++ b/indra/newview/skins/default/xui/pt/floater_autoreplace.xml diff --git a/indra/newview/skins/default/xui/pt/floater_avatar.xml b/indra/newview/skins/default/xui/pt/floater_avatar.xml index 168cdacae1..168cdacae1 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_avatar.xml +++ b/indra/newview/skins/default/xui/pt/floater_avatar.xml diff --git a/indra/newview/skins/default/xui/pt/floater_avatar_picker.xml b/indra/newview/skins/default/xui/pt/floater_avatar_picker.xml index 2b65952676..2b65952676 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_avatar_picker.xml +++ b/indra/newview/skins/default/xui/pt/floater_avatar_picker.xml diff --git a/indra/newview/skins/default/xui/pt/floater_avatar_textures.xml b/indra/newview/skins/default/xui/pt/floater_avatar_textures.xml index 9473ee7ce9..9473ee7ce9 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_avatar_textures.xml +++ b/indra/newview/skins/default/xui/pt/floater_avatar_textures.xml diff --git a/indra/newview/skins/default/xui/pt/floater_beacons.xml b/indra/newview/skins/default/xui/pt/floater_beacons.xml index f8ae3cd2d8..f8ae3cd2d8 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_beacons.xml +++ b/indra/newview/skins/default/xui/pt/floater_beacons.xml diff --git a/indra/newview/skins/default/xui/pt/floater_build_options.xml b/indra/newview/skins/default/xui/pt/floater_build_options.xml index acc462ea94..acc462ea94 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_build_options.xml +++ b/indra/newview/skins/default/xui/pt/floater_build_options.xml diff --git a/indra/newview/skins/default/xui/pt/floater_bulk_perms.xml b/indra/newview/skins/default/xui/pt/floater_bulk_perms.xml index 998fa8b2d6..998fa8b2d6 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_bulk_perms.xml +++ b/indra/newview/skins/default/xui/pt/floater_bulk_perms.xml diff --git a/indra/newview/skins/default/xui/pt/floater_bumps.xml b/indra/newview/skins/default/xui/pt/floater_bumps.xml index 475d36c119..475d36c119 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_bumps.xml +++ b/indra/newview/skins/default/xui/pt/floater_bumps.xml diff --git a/indra/newview/skins/default/xui/pt/floater_buy_contents.xml b/indra/newview/skins/default/xui/pt/floater_buy_contents.xml index b9e7a04412..b9e7a04412 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_buy_contents.xml +++ b/indra/newview/skins/default/xui/pt/floater_buy_contents.xml diff --git a/indra/newview/skins/default/xui/pt/floater_buy_currency.xml b/indra/newview/skins/default/xui/pt/floater_buy_currency.xml index 2845a29e1d..2845a29e1d 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_buy_currency.xml +++ b/indra/newview/skins/default/xui/pt/floater_buy_currency.xml diff --git a/indra/newview/skins/default/xui/pt/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/pt/floater_buy_currency_html.xml index 24e41ac8c8..24e41ac8c8 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_buy_currency_html.xml +++ b/indra/newview/skins/default/xui/pt/floater_buy_currency_html.xml diff --git a/indra/newview/skins/default/xui/pt/floater_buy_land.xml b/indra/newview/skins/default/xui/pt/floater_buy_land.xml index 258c95cc7d..258c95cc7d 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_buy_land.xml +++ b/indra/newview/skins/default/xui/pt/floater_buy_land.xml diff --git a/indra/newview/skins/default/xui/pt/floater_buy_object.xml b/indra/newview/skins/default/xui/pt/floater_buy_object.xml index c465197c9a..c465197c9a 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_buy_object.xml +++ b/indra/newview/skins/default/xui/pt/floater_buy_object.xml diff --git a/indra/newview/skins/default/xui/pt/floater_camera.xml b/indra/newview/skins/default/xui/pt/floater_camera.xml index 9cda01c187..9cda01c187 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_camera.xml +++ b/indra/newview/skins/default/xui/pt/floater_camera.xml diff --git a/indra/newview/skins/default/xui/pt/floater_chat_bar.xml b/indra/newview/skins/default/xui/pt/floater_chat_bar.xml index 2eb2c94940..2eb2c94940 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_chat_bar.xml +++ b/indra/newview/skins/default/xui/pt/floater_chat_bar.xml diff --git a/indra/newview/skins/default/xui/pt/floater_choose_group.xml b/indra/newview/skins/default/xui/pt/floater_choose_group.xml index 60f01a3733..60f01a3733 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_choose_group.xml +++ b/indra/newview/skins/default/xui/pt/floater_choose_group.xml diff --git a/indra/newview/skins/default/xui/pt/floater_color_picker.xml b/indra/newview/skins/default/xui/pt/floater_color_picker.xml index 4ea014335f..4ea014335f 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_color_picker.xml +++ b/indra/newview/skins/default/xui/pt/floater_color_picker.xml diff --git a/indra/newview/skins/default/xui/pt/floater_critical.xml b/indra/newview/skins/default/xui/pt/floater_critical.xml index 5d7fe0142b..5d7fe0142b 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_critical.xml +++ b/indra/newview/skins/default/xui/pt/floater_critical.xml diff --git a/indra/newview/skins/default/xui/pt/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/pt/floater_delete_env_preset.xml index a8b5d8f67d..a8b5d8f67d 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_delete_env_preset.xml +++ b/indra/newview/skins/default/xui/pt/floater_delete_env_preset.xml diff --git a/indra/newview/skins/default/xui/pt/floater_destinations.xml b/indra/newview/skins/default/xui/pt/floater_destinations.xml index df18698d2f..df18698d2f 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_destinations.xml +++ b/indra/newview/skins/default/xui/pt/floater_destinations.xml diff --git a/indra/newview/skins/default/xui/pt/floater_display_name.xml b/indra/newview/skins/default/xui/pt/floater_display_name.xml index 8daa40cc23..8daa40cc23 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_display_name.xml +++ b/indra/newview/skins/default/xui/pt/floater_display_name.xml diff --git a/indra/newview/skins/default/xui/pt/floater_edit_day_cycle.xml b/indra/newview/skins/default/xui/pt/floater_edit_day_cycle.xml index 9e25938986..9e25938986 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_edit_day_cycle.xml +++ b/indra/newview/skins/default/xui/pt/floater_edit_day_cycle.xml 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_edit_sky_preset.xml b/indra/newview/skins/default/xui/pt/floater_edit_sky_preset.xml index 1f1fbcce7e..1f1fbcce7e 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_edit_sky_preset.xml +++ b/indra/newview/skins/default/xui/pt/floater_edit_sky_preset.xml diff --git a/indra/newview/skins/default/xui/pt/floater_edit_water_preset.xml b/indra/newview/skins/default/xui/pt/floater_edit_water_preset.xml index 7bde22851e..7bde22851e 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_edit_water_preset.xml +++ b/indra/newview/skins/default/xui/pt/floater_edit_water_preset.xml diff --git a/indra/newview/skins/default/xui/pt/floater_environment_settings.xml b/indra/newview/skins/default/xui/pt/floater_environment_settings.xml index 4055ba97ef..4055ba97ef 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_environment_settings.xml +++ b/indra/newview/skins/default/xui/pt/floater_environment_settings.xml diff --git a/indra/newview/skins/default/xui/pt/floater_event.xml b/indra/newview/skins/default/xui/pt/floater_event.xml index a8dc3f96d7..a8dc3f96d7 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_event.xml +++ b/indra/newview/skins/default/xui/pt/floater_event.xml 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"> + "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 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_fast_timers.xml b/indra/newview/skins/default/xui/pt/floater_fast_timers.xml index eeb39583ef..eeb39583ef 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_fast_timers.xml +++ b/indra/newview/skins/default/xui/pt/floater_fast_timers.xml diff --git a/indra/newview/skins/default/xui/pt/floater_font_test.xml b/indra/newview/skins/default/xui/pt/floater_font_test.xml index c506cdb12d..c506cdb12d 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_font_test.xml +++ b/indra/newview/skins/default/xui/pt/floater_font_test.xml diff --git a/indra/newview/skins/default/xui/pt/floater_gesture.xml b/indra/newview/skins/default/xui/pt/floater_gesture.xml index 2e5b92aaf7..2e5b92aaf7 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_gesture.xml +++ b/indra/newview/skins/default/xui/pt/floater_gesture.xml diff --git a/indra/newview/skins/default/xui/pt/floater_god_tools.xml b/indra/newview/skins/default/xui/pt/floater_god_tools.xml index 8003a35d16..8003a35d16 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_god_tools.xml +++ b/indra/newview/skins/default/xui/pt/floater_god_tools.xml diff --git a/indra/newview/skins/default/xui/pt/floater_hardware_settings.xml b/indra/newview/skins/default/xui/pt/floater_hardware_settings.xml index 1204fb93e2..1204fb93e2 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_hardware_settings.xml +++ b/indra/newview/skins/default/xui/pt/floater_hardware_settings.xml diff --git a/indra/newview/skins/default/xui/pt/floater_help_browser.xml b/indra/newview/skins/default/xui/pt/floater_help_browser.xml index 9cc8a0a6b2..9cc8a0a6b2 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_help_browser.xml +++ b/indra/newview/skins/default/xui/pt/floater_help_browser.xml diff --git a/indra/newview/skins/default/xui/pt/floater_how_to.xml b/indra/newview/skins/default/xui/pt/floater_how_to.xml index 15c4946cb0..15c4946cb0 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_how_to.xml +++ b/indra/newview/skins/default/xui/pt/floater_how_to.xml diff --git a/indra/newview/skins/default/xui/pt/floater_hud.xml b/indra/newview/skins/default/xui/pt/floater_hud.xml index e458913452..e458913452 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_hud.xml +++ b/indra/newview/skins/default/xui/pt/floater_hud.xml diff --git a/indra/newview/skins/default/xui/pt/floater_im_container.xml b/indra/newview/skins/default/xui/pt/floater_im_container.xml index a1cea72b1e..a1cea72b1e 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_im_container.xml +++ b/indra/newview/skins/default/xui/pt/floater_im_container.xml diff --git a/indra/newview/skins/default/xui/pt/floater_im_session.xml b/indra/newview/skins/default/xui/pt/floater_im_session.xml index e592b14fa7..e592b14fa7 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_im_session.xml +++ b/indra/newview/skins/default/xui/pt/floater_im_session.xml diff --git a/indra/newview/skins/default/xui/pt/floater_image_preview.xml b/indra/newview/skins/default/xui/pt/floater_image_preview.xml index 362a553d64..362a553d64 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_image_preview.xml +++ b/indra/newview/skins/default/xui/pt/floater_image_preview.xml diff --git a/indra/newview/skins/default/xui/pt/floater_import_collada.xml b/indra/newview/skins/default/xui/pt/floater_import_collada.xml index ad55d416c3..ad55d416c3 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_import_collada.xml +++ b/indra/newview/skins/default/xui/pt/floater_import_collada.xml diff --git a/indra/newview/skins/default/xui/pt/floater_incoming_call.xml b/indra/newview/skins/default/xui/pt/floater_incoming_call.xml index 1e86f847ad..1e86f847ad 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_incoming_call.xml +++ b/indra/newview/skins/default/xui/pt/floater_incoming_call.xml diff --git a/indra/newview/skins/default/xui/pt/floater_inspect.xml b/indra/newview/skins/default/xui/pt/floater_inspect.xml index 6a00b1a628..6a00b1a628 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_inspect.xml +++ b/indra/newview/skins/default/xui/pt/floater_inspect.xml 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..100644 --- 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..100644 --- 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_joystick.xml b/indra/newview/skins/default/xui/pt/floater_joystick.xml index 98d8c0e319..98d8c0e319 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_joystick.xml +++ b/indra/newview/skins/default/xui/pt/floater_joystick.xml 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 'Largura de Banda' escolhida muito alta. + Possível conexão ruim ou pref de 'Banda larga' 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"> >> @@ -126,7 +126,7 @@ <floater.string name="bigger_label"> << </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_land_holdings.xml b/indra/newview/skins/default/xui/pt/floater_land_holdings.xml index 7475bdd5b8..7475bdd5b8 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_land_holdings.xml +++ b/indra/newview/skins/default/xui/pt/floater_land_holdings.xml 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..100644 --- 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=">" name="view_profile"/> </floater> diff --git a/indra/newview/skins/default/xui/pt/floater_lsl_guide.xml b/indra/newview/skins/default/xui/pt/floater_lsl_guide.xml index 73f187f0e4..73f187f0e4 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_lsl_guide.xml +++ b/indra/newview/skins/default/xui/pt/floater_lsl_guide.xml diff --git a/indra/newview/skins/default/xui/pt/floater_map.xml b/indra/newview/skins/default/xui/pt/floater_map.xml index 8233f2a43f..8233f2a43f 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_map.xml +++ b/indra/newview/skins/default/xui/pt/floater_map.xml 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_media_browser.xml b/indra/newview/skins/default/xui/pt/floater_media_browser.xml index 7491218067..7491218067 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_media_browser.xml +++ b/indra/newview/skins/default/xui/pt/floater_media_browser.xml diff --git a/indra/newview/skins/default/xui/pt/floater_media_settings.xml b/indra/newview/skins/default/xui/pt/floater_media_settings.xml index 5af002c502..5af002c502 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_media_settings.xml +++ b/indra/newview/skins/default/xui/pt/floater_media_settings.xml diff --git a/indra/newview/skins/default/xui/pt/floater_mem_leaking.xml b/indra/newview/skins/default/xui/pt/floater_mem_leaking.xml index efb5da4ace..efb5da4ace 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_mem_leaking.xml +++ b/indra/newview/skins/default/xui/pt/floater_mem_leaking.xml diff --git a/indra/newview/skins/default/xui/pt/floater_merchant_outbox.xml b/indra/newview/skins/default/xui/pt/floater_merchant_outbox.xml index bb6113671b..bb6113671b 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_merchant_outbox.xml +++ b/indra/newview/skins/default/xui/pt/floater_merchant_outbox.xml diff --git a/indra/newview/skins/default/xui/pt/floater_model_preview.xml b/indra/newview/skins/default/xui/pt/floater_model_preview.xml index 8194278b16..8194278b16 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_model_preview.xml +++ b/indra/newview/skins/default/xui/pt/floater_model_preview.xml diff --git a/indra/newview/skins/default/xui/pt/floater_moveview.xml b/indra/newview/skins/default/xui/pt/floater_moveview.xml index 728357a400..728357a400 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_moveview.xml +++ b/indra/newview/skins/default/xui/pt/floater_moveview.xml diff --git a/indra/newview/skins/default/xui/pt/floater_mute_object.xml b/indra/newview/skins/default/xui/pt/floater_mute_object.xml index 97fbd35fcc..97fbd35fcc 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_mute_object.xml +++ b/indra/newview/skins/default/xui/pt/floater_mute_object.xml diff --git a/indra/newview/skins/default/xui/pt/floater_my_appearance.xml b/indra/newview/skins/default/xui/pt/floater_my_appearance.xml index 38e06d2aed..38e06d2aed 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_my_appearance.xml +++ b/indra/newview/skins/default/xui/pt/floater_my_appearance.xml diff --git a/indra/newview/skins/default/xui/pt/floater_my_inventory.xml b/indra/newview/skins/default/xui/pt/floater_my_inventory.xml index 71d8682758..71d8682758 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_my_inventory.xml +++ b/indra/newview/skins/default/xui/pt/floater_my_inventory.xml diff --git a/indra/newview/skins/default/xui/pt/floater_object_weights.xml b/indra/newview/skins/default/xui/pt/floater_object_weights.xml index 45bd1c7127..45bd1c7127 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_object_weights.xml +++ b/indra/newview/skins/default/xui/pt/floater_object_weights.xml 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..100644 --- 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_outfit_save_as.xml b/indra/newview/skins/default/xui/pt/floater_outfit_save_as.xml index 60d4d3dc5c..60d4d3dc5c 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_outfit_save_as.xml +++ b/indra/newview/skins/default/xui/pt/floater_outfit_save_as.xml diff --git a/indra/newview/skins/default/xui/pt/floater_outgoing_call.xml b/indra/newview/skins/default/xui/pt/floater_outgoing_call.xml index 35afde7612..35afde7612 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_outgoing_call.xml +++ b/indra/newview/skins/default/xui/pt/floater_outgoing_call.xml diff --git a/indra/newview/skins/default/xui/pt/floater_pathfinding_characters.xml b/indra/newview/skins/default/xui/pt/floater_pathfinding_characters.xml index 05784115e7..05784115e7 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_pathfinding_characters.xml +++ b/indra/newview/skins/default/xui/pt/floater_pathfinding_characters.xml diff --git a/indra/newview/skins/default/xui/pt/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/pt/floater_pathfinding_console.xml index 182f2513e0..182f2513e0 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_pathfinding_console.xml +++ b/indra/newview/skins/default/xui/pt/floater_pathfinding_console.xml diff --git a/indra/newview/skins/default/xui/pt/floater_pathfinding_linksets.xml b/indra/newview/skins/default/xui/pt/floater_pathfinding_linksets.xml index e0c60679dd..e0c60679dd 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_pathfinding_linksets.xml +++ b/indra/newview/skins/default/xui/pt/floater_pathfinding_linksets.xml 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..100644 --- 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..100644 --- 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_people.xml b/indra/newview/skins/default/xui/pt/floater_people.xml index 10a516ee36..10a516ee36 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_people.xml +++ b/indra/newview/skins/default/xui/pt/floater_people.xml diff --git a/indra/newview/skins/default/xui/pt/floater_perm_prefs.xml b/indra/newview/skins/default/xui/pt/floater_perm_prefs.xml index 33a0d6a456..33a0d6a456 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_perm_prefs.xml +++ b/indra/newview/skins/default/xui/pt/floater_perm_prefs.xml diff --git a/indra/newview/skins/default/xui/pt/floater_picks.xml b/indra/newview/skins/default/xui/pt/floater_picks.xml index 9766196319..9766196319 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_picks.xml +++ b/indra/newview/skins/default/xui/pt/floater_picks.xml diff --git a/indra/newview/skins/default/xui/pt/floater_places.xml b/indra/newview/skins/default/xui/pt/floater_places.xml index 12c6548205..12c6548205 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_places.xml +++ b/indra/newview/skins/default/xui/pt/floater_places.xml diff --git a/indra/newview/skins/default/xui/pt/floater_post_process.xml b/indra/newview/skins/default/xui/pt/floater_post_process.xml index d4f2e96539..d4f2e96539 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_post_process.xml +++ b/indra/newview/skins/default/xui/pt/floater_post_process.xml diff --git a/indra/newview/skins/default/xui/pt/floater_preferences.xml b/indra/newview/skins/default/xui/pt/floater_preferences.xml index c89a61d9b1..c89a61d9b1 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_preferences.xml +++ b/indra/newview/skins/default/xui/pt/floater_preferences.xml diff --git a/indra/newview/skins/default/xui/pt/floater_preferences_proxy.xml b/indra/newview/skins/default/xui/pt/floater_preferences_proxy.xml index 3aaee2d4a7..3aaee2d4a7 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_preferences_proxy.xml +++ b/indra/newview/skins/default/xui/pt/floater_preferences_proxy.xml diff --git a/indra/newview/skins/default/xui/pt/floater_preview_animation.xml b/indra/newview/skins/default/xui/pt/floater_preview_animation.xml index 19474d8099..19474d8099 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_preview_animation.xml +++ b/indra/newview/skins/default/xui/pt/floater_preview_animation.xml diff --git a/indra/newview/skins/default/xui/pt/floater_preview_gesture.xml b/indra/newview/skins/default/xui/pt/floater_preview_gesture.xml index 089694608b..089694608b 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_preview_gesture.xml +++ b/indra/newview/skins/default/xui/pt/floater_preview_gesture.xml diff --git a/indra/newview/skins/default/xui/pt/floater_preview_notecard.xml b/indra/newview/skins/default/xui/pt/floater_preview_notecard.xml index d094c1b63a..d094c1b63a 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_preview_notecard.xml +++ b/indra/newview/skins/default/xui/pt/floater_preview_notecard.xml diff --git a/indra/newview/skins/default/xui/pt/floater_preview_sound.xml b/indra/newview/skins/default/xui/pt/floater_preview_sound.xml index 7c5a1538f2..7c5a1538f2 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_preview_sound.xml +++ b/indra/newview/skins/default/xui/pt/floater_preview_sound.xml diff --git a/indra/newview/skins/default/xui/pt/floater_preview_texture.xml b/indra/newview/skins/default/xui/pt/floater_preview_texture.xml index 6f39635240..6f39635240 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_preview_texture.xml +++ b/indra/newview/skins/default/xui/pt/floater_preview_texture.xml diff --git a/indra/newview/skins/default/xui/pt/floater_price_for_listing.xml b/indra/newview/skins/default/xui/pt/floater_price_for_listing.xml index b078962feb..b078962feb 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_price_for_listing.xml +++ b/indra/newview/skins/default/xui/pt/floater_price_for_listing.xml diff --git a/indra/newview/skins/default/xui/pt/floater_publish_classified.xml b/indra/newview/skins/default/xui/pt/floater_publish_classified.xml index de3417ea14..de3417ea14 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_publish_classified.xml +++ b/indra/newview/skins/default/xui/pt/floater_publish_classified.xml diff --git a/indra/newview/skins/default/xui/pt/floater_region_debug_console.xml b/indra/newview/skins/default/xui/pt/floater_region_debug_console.xml index d3b5df2d74..d3b5df2d74 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_region_debug_console.xml +++ b/indra/newview/skins/default/xui/pt/floater_region_debug_console.xml diff --git a/indra/newview/skins/default/xui/pt/floater_region_info.xml b/indra/newview/skins/default/xui/pt/floater_region_info.xml index cc5e0d59d4..cc5e0d59d4 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_region_info.xml +++ b/indra/newview/skins/default/xui/pt/floater_region_info.xml 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..100644 --- 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 > Invasão > Objetos ou texturas" name="Land__Encroachment__Objects_textures"/> <combo_box.item label="Terra > Invasão > Partículas" name="Land__Encroachment__Particles"/> <combo_box.item label="Terra > Violação > Á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_script_debug.xml b/indra/newview/skins/default/xui/pt/floater_script_debug.xml index 6d1d981ca7..6d1d981ca7 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_script_debug.xml +++ b/indra/newview/skins/default/xui/pt/floater_script_debug.xml diff --git a/indra/newview/skins/default/xui/pt/floater_script_debug_panel.xml b/indra/newview/skins/default/xui/pt/floater_script_debug_panel.xml index e70a30fa24..e70a30fa24 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_script_debug_panel.xml +++ b/indra/newview/skins/default/xui/pt/floater_script_debug_panel.xml diff --git a/indra/newview/skins/default/xui/pt/floater_script_limits.xml b/indra/newview/skins/default/xui/pt/floater_script_limits.xml index 64a8a49c85..64a8a49c85 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_script_limits.xml +++ b/indra/newview/skins/default/xui/pt/floater_script_limits.xml diff --git a/indra/newview/skins/default/xui/pt/floater_script_preview.xml b/indra/newview/skins/default/xui/pt/floater_script_preview.xml index 5be866d052..5be866d052 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_script_preview.xml +++ b/indra/newview/skins/default/xui/pt/floater_script_preview.xml diff --git a/indra/newview/skins/default/xui/pt/floater_script_queue.xml b/indra/newview/skins/default/xui/pt/floater_script_queue.xml index 5fb6dd1c35..5fb6dd1c35 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_script_queue.xml +++ b/indra/newview/skins/default/xui/pt/floater_script_queue.xml diff --git a/indra/newview/skins/default/xui/pt/floater_script_search.xml b/indra/newview/skins/default/xui/pt/floater_script_search.xml index 8878590a4e..8878590a4e 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_script_search.xml +++ b/indra/newview/skins/default/xui/pt/floater_script_search.xml diff --git a/indra/newview/skins/default/xui/pt/floater_search.xml b/indra/newview/skins/default/xui/pt/floater_search.xml index 3509cb786d..3509cb786d 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_search.xml +++ b/indra/newview/skins/default/xui/pt/floater_search.xml diff --git a/indra/newview/skins/default/xui/pt/floater_select_key.xml b/indra/newview/skins/default/xui/pt/floater_select_key.xml index 7264a5a713..7264a5a713 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_select_key.xml +++ b/indra/newview/skins/default/xui/pt/floater_select_key.xml diff --git a/indra/newview/skins/default/xui/pt/floater_sell_land.xml b/indra/newview/skins/default/xui/pt/floater_sell_land.xml index 014ae0845e..014ae0845e 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_sell_land.xml +++ b/indra/newview/skins/default/xui/pt/floater_sell_land.xml diff --git a/indra/newview/skins/default/xui/pt/floater_settings_debug.xml b/indra/newview/skins/default/xui/pt/floater_settings_debug.xml index 83f7b24572..83f7b24572 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_settings_debug.xml +++ b/indra/newview/skins/default/xui/pt/floater_settings_debug.xml 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..100644 --- 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_sound_devices.xml b/indra/newview/skins/default/xui/pt/floater_sound_devices.xml index 948d727540..948d727540 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_sound_devices.xml +++ b/indra/newview/skins/default/xui/pt/floater_sound_devices.xml diff --git a/indra/newview/skins/default/xui/pt/floater_sound_preview.xml b/indra/newview/skins/default/xui/pt/floater_sound_preview.xml index e62260c2e3..e62260c2e3 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_sound_preview.xml +++ b/indra/newview/skins/default/xui/pt/floater_sound_preview.xml diff --git a/indra/newview/skins/default/xui/pt/floater_spellcheck.xml b/indra/newview/skins/default/xui/pt/floater_spellcheck.xml index 02bb154d26..02bb154d26 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_spellcheck.xml +++ b/indra/newview/skins/default/xui/pt/floater_spellcheck.xml diff --git a/indra/newview/skins/default/xui/pt/floater_spellcheck_import.xml b/indra/newview/skins/default/xui/pt/floater_spellcheck_import.xml index f4e95bddec..f4e95bddec 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_spellcheck_import.xml +++ b/indra/newview/skins/default/xui/pt/floater_spellcheck_import.xml diff --git a/indra/newview/skins/default/xui/pt/floater_stats.xml b/indra/newview/skins/default/xui/pt/floater_stats.xml index f41fe17778..f41fe17778 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_stats.xml +++ b/indra/newview/skins/default/xui/pt/floater_stats.xml diff --git a/indra/newview/skins/default/xui/pt/floater_sys_well.xml b/indra/newview/skins/default/xui/pt/floater_sys_well.xml index 38beec022c..38beec022c 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_sys_well.xml +++ b/indra/newview/skins/default/xui/pt/floater_sys_well.xml diff --git a/indra/newview/skins/default/xui/pt/floater_telehub.xml b/indra/newview/skins/default/xui/pt/floater_telehub.xml index 6b35d3f919..6b35d3f919 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_telehub.xml +++ b/indra/newview/skins/default/xui/pt/floater_telehub.xml diff --git a/indra/newview/skins/default/xui/pt/floater_test_layout_stacks.xml b/indra/newview/skins/default/xui/pt/floater_test_layout_stacks.xml index b479d5f6d6..b479d5f6d6 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_test_layout_stacks.xml +++ b/indra/newview/skins/default/xui/pt/floater_test_layout_stacks.xml diff --git a/indra/newview/skins/default/xui/pt/floater_test_text_vertical_aligment.xml b/indra/newview/skins/default/xui/pt/floater_test_text_vertical_aligment.xml index dd282bf1fc..dd282bf1fc 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_test_text_vertical_aligment.xml +++ b/indra/newview/skins/default/xui/pt/floater_test_text_vertical_aligment.xml diff --git a/indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml index ba4ef0afde..ba4ef0afde 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml +++ b/indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml diff --git a/indra/newview/skins/default/xui/pt/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/pt/floater_texture_fetch_debugger.xml index 0e897aea09..0e897aea09 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_texture_fetch_debugger.xml +++ b/indra/newview/skins/default/xui/pt/floater_texture_fetch_debugger.xml diff --git a/indra/newview/skins/default/xui/pt/floater_tools.xml b/indra/newview/skins/default/xui/pt/floater_tools.xml index 356063a94f..356063a94f 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_tools.xml +++ b/indra/newview/skins/default/xui/pt/floater_tools.xml 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..100644 --- 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_tos.xml b/indra/newview/skins/default/xui/pt/floater_tos.xml index c4954cb61f..c4954cb61f 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_tos.xml +++ b/indra/newview/skins/default/xui/pt/floater_tos.xml diff --git a/indra/newview/skins/default/xui/pt/floater_toybox.xml b/indra/newview/skins/default/xui/pt/floater_toybox.xml index 3677c3b1f5..3677c3b1f5 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_toybox.xml +++ b/indra/newview/skins/default/xui/pt/floater_toybox.xml diff --git a/indra/newview/skins/default/xui/pt/floater_translation_settings.xml b/indra/newview/skins/default/xui/pt/floater_translation_settings.xml index 1955599a81..1955599a81 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_translation_settings.xml +++ b/indra/newview/skins/default/xui/pt/floater_translation_settings.xml 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/floater_url_entry.xml b/indra/newview/skins/default/xui/pt/floater_url_entry.xml index 48af8de363..48af8de363 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_url_entry.xml +++ b/indra/newview/skins/default/xui/pt/floater_url_entry.xml diff --git a/indra/newview/skins/default/xui/pt/floater_voice_controls.xml b/indra/newview/skins/default/xui/pt/floater_voice_controls.xml index 745a7d0e00..745a7d0e00 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_voice_controls.xml +++ b/indra/newview/skins/default/xui/pt/floater_voice_controls.xml diff --git a/indra/newview/skins/default/xui/pt/floater_voice_effect.xml b/indra/newview/skins/default/xui/pt/floater_voice_effect.xml index 71d3c33ae5..71d3c33ae5 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_voice_effect.xml +++ b/indra/newview/skins/default/xui/pt/floater_voice_effect.xml diff --git a/indra/newview/skins/default/xui/pt/floater_web_content.xml b/indra/newview/skins/default/xui/pt/floater_web_content.xml index 5101579c6f..5101579c6f 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_web_content.xml +++ b/indra/newview/skins/default/xui/pt/floater_web_content.xml diff --git a/indra/newview/skins/default/xui/pt/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/pt/floater_whitelist_entry.xml index 865d939d24..865d939d24 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_whitelist_entry.xml +++ b/indra/newview/skins/default/xui/pt/floater_whitelist_entry.xml diff --git a/indra/newview/skins/default/xui/pt/floater_window_size.xml b/indra/newview/skins/default/xui/pt/floater_window_size.xml index 7deb799bd7..7deb799bd7 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_window_size.xml +++ b/indra/newview/skins/default/xui/pt/floater_window_size.xml diff --git a/indra/newview/skins/default/xui/pt/floater_world_map.xml b/indra/newview/skins/default/xui/pt/floater_world_map.xml index 490a975e80..490a975e80 100755..100644 --- a/indra/newview/skins/default/xui/pt/floater_world_map.xml +++ b/indra/newview/skins/default/xui/pt/floater_world_map.xml diff --git a/indra/newview/skins/default/xui/pt/inspect_avatar.xml b/indra/newview/skins/default/xui/pt/inspect_avatar.xml index 19244d9b27..19244d9b27 100755..100644 --- a/indra/newview/skins/default/xui/pt/inspect_avatar.xml +++ b/indra/newview/skins/default/xui/pt/inspect_avatar.xml diff --git a/indra/newview/skins/default/xui/pt/inspect_group.xml b/indra/newview/skins/default/xui/pt/inspect_group.xml index 889d35f269..889d35f269 100755..100644 --- a/indra/newview/skins/default/xui/pt/inspect_group.xml +++ b/indra/newview/skins/default/xui/pt/inspect_group.xml diff --git a/indra/newview/skins/default/xui/pt/inspect_object.xml b/indra/newview/skins/default/xui/pt/inspect_object.xml index b72de7038d..b72de7038d 100755..100644 --- a/indra/newview/skins/default/xui/pt/inspect_object.xml +++ b/indra/newview/skins/default/xui/pt/inspect_object.xml diff --git a/indra/newview/skins/default/xui/pt/inspect_remote_object.xml b/indra/newview/skins/default/xui/pt/inspect_remote_object.xml index 789194bf2e..789194bf2e 100755..100644 --- a/indra/newview/skins/default/xui/pt/inspect_remote_object.xml +++ b/indra/newview/skins/default/xui/pt/inspect_remote_object.xml diff --git a/indra/newview/skins/default/xui/pt/language_settings.xml b/indra/newview/skins/default/xui/pt/language_settings.xml index 8799475ace..8799475ace 100755..100644 --- a/indra/newview/skins/default/xui/pt/language_settings.xml +++ b/indra/newview/skins/default/xui/pt/language_settings.xml diff --git a/indra/newview/skins/default/xui/pt/menu_add_wearable_gear.xml b/indra/newview/skins/default/xui/pt/menu_add_wearable_gear.xml index 4b81276ab3..4b81276ab3 100755..100644 --- a/indra/newview/skins/default/xui/pt/menu_add_wearable_gear.xml +++ b/indra/newview/skins/default/xui/pt/menu_add_wearable_gear.xml diff --git a/indra/newview/skins/default/xui/pt/menu_attachment_other.xml b/indra/newview/skins/default/xui/pt/menu_attachment_other.xml index 61953f9f78..61953f9f78 100755..100644 --- a/indra/newview/skins/default/xui/pt/menu_attachment_other.xml +++ b/indra/newview/skins/default/xui/pt/menu_attachment_other.xml 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..100644 --- 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_icon.xml b/indra/newview/skins/default/xui/pt/menu_avatar_icon.xml index f6211790a8..f6211790a8 100755..100644 --- a/indra/newview/skins/default/xui/pt/menu_avatar_icon.xml +++ b/indra/newview/skins/default/xui/pt/menu_avatar_icon.xml diff --git a/indra/newview/skins/default/xui/pt/menu_avatar_other.xml b/indra/newview/skins/default/xui/pt/menu_avatar_other.xml index 1af8d64438..1af8d64438 100755..100644 --- a/indra/newview/skins/default/xui/pt/menu_avatar_other.xml +++ b/indra/newview/skins/default/xui/pt/menu_avatar_other.xml 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..100644 --- 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_cof_attachment.xml b/indra/newview/skins/default/xui/pt/menu_cof_attachment.xml index 527e3af3c9..527e3af3c9 100755..100644 --- a/indra/newview/skins/default/xui/pt/menu_cof_attachment.xml +++ b/indra/newview/skins/default/xui/pt/menu_cof_attachment.xml diff --git a/indra/newview/skins/default/xui/pt/menu_cof_body_part.xml b/indra/newview/skins/default/xui/pt/menu_cof_body_part.xml index 704fd226eb..704fd226eb 100755..100644 --- a/indra/newview/skins/default/xui/pt/menu_cof_body_part.xml +++ b/indra/newview/skins/default/xui/pt/menu_cof_body_part.xml diff --git a/indra/newview/skins/default/xui/pt/menu_cof_clothing.xml b/indra/newview/skins/default/xui/pt/menu_cof_clothing.xml index 051323ae6a..051323ae6a 100755..100644 --- a/indra/newview/skins/default/xui/pt/menu_cof_clothing.xml +++ b/indra/newview/skins/default/xui/pt/menu_cof_clothing.xml diff --git a/indra/newview/skins/default/xui/pt/menu_cof_gear.xml b/indra/newview/skins/default/xui/pt/menu_cof_gear.xml index b59895573e..b59895573e 100755..100644 --- a/indra/newview/skins/default/xui/pt/menu_cof_gear.xml +++ b/indra/newview/skins/default/xui/pt/menu_cof_gear.xml diff --git a/indra/newview/skins/default/xui/pt/menu_edit.xml b/indra/newview/skins/default/xui/pt/menu_edit.xml index ff431c9a21..ff431c9a21 100755..100644 --- a/indra/newview/skins/default/xui/pt/menu_edit.xml +++ b/indra/newview/skins/default/xui/pt/menu_edit.xml diff --git a/indra/newview/skins/default/xui/pt/menu_favorites.xml b/indra/newview/skins/default/xui/pt/menu_favorites.xml index 062820fbca..062820fbca 100755..100644 --- a/indra/newview/skins/default/xui/pt/menu_favorites.xml +++ b/indra/newview/skins/default/xui/pt/menu_favorites.xml diff --git a/indra/newview/skins/default/xui/pt/menu_gesture_gear.xml b/indra/newview/skins/default/xui/pt/menu_gesture_gear.xml index 70d8ae7a8e..70d8ae7a8e 100755..100644 --- a/indra/newview/skins/default/xui/pt/menu_gesture_gear.xml +++ b/indra/newview/skins/default/xui/pt/menu_gesture_gear.xml diff --git a/indra/newview/skins/default/xui/pt/menu_group_plus.xml b/indra/newview/skins/default/xui/pt/menu_group_plus.xml index 1083845d68..1083845d68 100755..100644 --- a/indra/newview/skins/default/xui/pt/menu_group_plus.xml +++ b/indra/newview/skins/default/xui/pt/menu_group_plus.xml diff --git a/indra/newview/skins/default/xui/pt/menu_hide_navbar.xml b/indra/newview/skins/default/xui/pt/menu_hide_navbar.xml index 5f6bd096a8..5f6bd096a8 100755..100644 --- a/indra/newview/skins/default/xui/pt/menu_hide_navbar.xml +++ b/indra/newview/skins/default/xui/pt/menu_hide_navbar.xml diff --git a/indra/newview/skins/default/xui/pt/menu_imchiclet_adhoc.xml b/indra/newview/skins/default/xui/pt/menu_imchiclet_adhoc.xml index ead949ba13..ead949ba13 100755..100644 --- a/indra/newview/skins/default/xui/pt/menu_imchiclet_adhoc.xml +++ b/indra/newview/skins/default/xui/pt/menu_imchiclet_adhoc.xml diff --git a/indra/newview/skins/default/xui/pt/menu_imchiclet_group.xml b/indra/newview/skins/default/xui/pt/menu_imchiclet_group.xml index dd177d1b8d..dd177d1b8d 100755..100644 --- a/indra/newview/skins/default/xui/pt/menu_imchiclet_group.xml +++ b/indra/newview/skins/default/xui/pt/menu_imchiclet_group.xml diff --git a/indra/newview/skins/default/xui/pt/menu_imchiclet_p2p.xml b/indra/newview/skins/default/xui/pt/menu_imchiclet_p2p.xml index d821b3ded0..d821b3ded0 100755..100644 --- a/indra/newview/skins/default/xui/pt/menu_imchiclet_p2p.xml +++ b/indra/newview/skins/default/xui/pt/menu_imchiclet_p2p.xml diff --git a/indra/newview/skins/default/xui/pt/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/pt/menu_inspect_avatar_gear.xml index 2b5aa7508b..2b5aa7508b 100755..100644 --- a/indra/newview/skins/default/xui/pt/menu_inspect_avatar_gear.xml +++ b/indra/newview/skins/default/xui/pt/menu_inspect_avatar_gear.xml diff --git a/indra/newview/skins/default/xui/pt/menu_inspect_object_gear.xml b/indra/newview/skins/default/xui/pt/menu_inspect_object_gear.xml index 7e271904e9..7e271904e9 100755..100644 --- a/indra/newview/skins/default/xui/pt/menu_inspect_object_gear.xml +++ b/indra/newview/skins/default/xui/pt/menu_inspect_object_gear.xml diff --git a/indra/newview/skins/default/xui/pt/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/pt/menu_inspect_self_gear.xml index e8fafa58a9..e8fafa58a9 100755..100644 --- a/indra/newview/skins/default/xui/pt/menu_inspect_self_gear.xml +++ b/indra/newview/skins/default/xui/pt/menu_inspect_self_gear.xml diff --git a/indra/newview/skins/default/xui/pt/menu_inv_offer_chiclet.xml b/indra/newview/skins/default/xui/pt/menu_inv_offer_chiclet.xml index c404719c95..c404719c95 100755..100644 --- a/indra/newview/skins/default/xui/pt/menu_inv_offer_chiclet.xml +++ b/indra/newview/skins/default/xui/pt/menu_inv_offer_chiclet.xml 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..100644 --- 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_add.xml b/indra/newview/skins/default/xui/pt/menu_inventory_add.xml index 7a7ebc50af..7a7ebc50af 100755..100644 --- a/indra/newview/skins/default/xui/pt/menu_inventory_add.xml +++ b/indra/newview/skins/default/xui/pt/menu_inventory_add.xml 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..100644 --- 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_land.xml b/indra/newview/skins/default/xui/pt/menu_land.xml index 2ebe85df6e..2ebe85df6e 100755..100644 --- a/indra/newview/skins/default/xui/pt/menu_land.xml +++ b/indra/newview/skins/default/xui/pt/menu_land.xml diff --git a/indra/newview/skins/default/xui/pt/menu_landmark.xml b/indra/newview/skins/default/xui/pt/menu_landmark.xml index 6accfebee7..6accfebee7 100755..100644 --- a/indra/newview/skins/default/xui/pt/menu_landmark.xml +++ b/indra/newview/skins/default/xui/pt/menu_landmark.xml diff --git a/indra/newview/skins/default/xui/pt/menu_login.xml b/indra/newview/skins/default/xui/pt/menu_login.xml index 29dae6292a..29dae6292a 100755..100644 --- a/indra/newview/skins/default/xui/pt/menu_login.xml +++ b/indra/newview/skins/default/xui/pt/menu_login.xml 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_media_ctrl.xml b/indra/newview/skins/default/xui/pt/menu_media_ctrl.xml index ac84b02870..ac84b02870 100755..100644 --- a/indra/newview/skins/default/xui/pt/menu_media_ctrl.xml +++ b/indra/newview/skins/default/xui/pt/menu_media_ctrl.xml diff --git a/indra/newview/skins/default/xui/pt/menu_mini_map.xml b/indra/newview/skins/default/xui/pt/menu_mini_map.xml index 6a3fe55de5..6a3fe55de5 100755..100644 --- a/indra/newview/skins/default/xui/pt/menu_mini_map.xml +++ b/indra/newview/skins/default/xui/pt/menu_mini_map.xml diff --git a/indra/newview/skins/default/xui/pt/menu_model_import_gear_default.xml b/indra/newview/skins/default/xui/pt/menu_model_import_gear_default.xml index 079f876add..079f876add 100755..100644 --- a/indra/newview/skins/default/xui/pt/menu_model_import_gear_default.xml +++ b/indra/newview/skins/default/xui/pt/menu_model_import_gear_default.xml diff --git a/indra/newview/skins/default/xui/pt/menu_navbar.xml b/indra/newview/skins/default/xui/pt/menu_navbar.xml index 57c1471de3..57c1471de3 100755..100644 --- a/indra/newview/skins/default/xui/pt/menu_navbar.xml +++ b/indra/newview/skins/default/xui/pt/menu_navbar.xml diff --git a/indra/newview/skins/default/xui/pt/menu_nearby_chat.xml b/indra/newview/skins/default/xui/pt/menu_nearby_chat.xml index f1ea83c837..f1ea83c837 100755..100644 --- a/indra/newview/skins/default/xui/pt/menu_nearby_chat.xml +++ b/indra/newview/skins/default/xui/pt/menu_nearby_chat.xml diff --git a/indra/newview/skins/default/xui/pt/menu_notification_well_button.xml b/indra/newview/skins/default/xui/pt/menu_notification_well_button.xml index 43ad4134ec..43ad4134ec 100755..100644 --- a/indra/newview/skins/default/xui/pt/menu_notification_well_button.xml +++ b/indra/newview/skins/default/xui/pt/menu_notification_well_button.xml diff --git a/indra/newview/skins/default/xui/pt/menu_object.xml b/indra/newview/skins/default/xui/pt/menu_object.xml index 47b08a170c..47b08a170c 100755..100644 --- a/indra/newview/skins/default/xui/pt/menu_object.xml +++ b/indra/newview/skins/default/xui/pt/menu_object.xml diff --git a/indra/newview/skins/default/xui/pt/menu_object_icon.xml b/indra/newview/skins/default/xui/pt/menu_object_icon.xml index df224a88fa..df224a88fa 100755..100644 --- a/indra/newview/skins/default/xui/pt/menu_object_icon.xml +++ b/indra/newview/skins/default/xui/pt/menu_object_icon.xml diff --git a/indra/newview/skins/default/xui/pt/menu_outfit_gear.xml b/indra/newview/skins/default/xui/pt/menu_outfit_gear.xml index 3602bdaac4..3602bdaac4 100755..100644 --- a/indra/newview/skins/default/xui/pt/menu_outfit_gear.xml +++ b/indra/newview/skins/default/xui/pt/menu_outfit_gear.xml diff --git a/indra/newview/skins/default/xui/pt/menu_outfit_tab.xml b/indra/newview/skins/default/xui/pt/menu_outfit_tab.xml index 8db5e405b3..8db5e405b3 100755..100644 --- a/indra/newview/skins/default/xui/pt/menu_outfit_tab.xml +++ b/indra/newview/skins/default/xui/pt/menu_outfit_tab.xml diff --git a/indra/newview/skins/default/xui/pt/menu_participant_list.xml b/indra/newview/skins/default/xui/pt/menu_participant_list.xml index 01f1d4ef80..01f1d4ef80 100755..100644 --- a/indra/newview/skins/default/xui/pt/menu_participant_list.xml +++ b/indra/newview/skins/default/xui/pt/menu_participant_list.xml diff --git a/indra/newview/skins/default/xui/pt/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/pt/menu_people_friends_view_sort.xml index e7c325010f..e7c325010f 100755..100644 --- a/indra/newview/skins/default/xui/pt/menu_people_friends_view_sort.xml +++ b/indra/newview/skins/default/xui/pt/menu_people_friends_view_sort.xml diff --git a/indra/newview/skins/default/xui/pt/menu_people_groups.xml b/indra/newview/skins/default/xui/pt/menu_people_groups.xml index 2ba7af17cd..2ba7af17cd 100755..100644 --- a/indra/newview/skins/default/xui/pt/menu_people_groups.xml +++ b/indra/newview/skins/default/xui/pt/menu_people_groups.xml diff --git a/indra/newview/skins/default/xui/pt/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/pt/menu_people_groups_view_sort.xml index 86a9d2263f..86a9d2263f 100755..100644 --- a/indra/newview/skins/default/xui/pt/menu_people_groups_view_sort.xml +++ b/indra/newview/skins/default/xui/pt/menu_people_groups_view_sort.xml diff --git a/indra/newview/skins/default/xui/pt/menu_people_nearby.xml b/indra/newview/skins/default/xui/pt/menu_people_nearby.xml index 51464fed68..51464fed68 100755..100644 --- a/indra/newview/skins/default/xui/pt/menu_people_nearby.xml +++ b/indra/newview/skins/default/xui/pt/menu_people_nearby.xml diff --git a/indra/newview/skins/default/xui/pt/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/pt/menu_people_nearby_multiselect.xml index 7f3c6ace27..7f3c6ace27 100755..100644 --- a/indra/newview/skins/default/xui/pt/menu_people_nearby_multiselect.xml +++ b/indra/newview/skins/default/xui/pt/menu_people_nearby_multiselect.xml diff --git a/indra/newview/skins/default/xui/pt/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/pt/menu_people_nearby_view_sort.xml index 0d32d58de4..0d32d58de4 100755..100644 --- a/indra/newview/skins/default/xui/pt/menu_people_nearby_view_sort.xml +++ b/indra/newview/skins/default/xui/pt/menu_people_nearby_view_sort.xml diff --git a/indra/newview/skins/default/xui/pt/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/pt/menu_people_recent_view_sort.xml index f3b89e01cd..f3b89e01cd 100755..100644 --- a/indra/newview/skins/default/xui/pt/menu_people_recent_view_sort.xml +++ b/indra/newview/skins/default/xui/pt/menu_people_recent_view_sort.xml diff --git a/indra/newview/skins/default/xui/pt/menu_picks.xml b/indra/newview/skins/default/xui/pt/menu_picks.xml index 8b9e10fc02..8b9e10fc02 100755..100644 --- a/indra/newview/skins/default/xui/pt/menu_picks.xml +++ b/indra/newview/skins/default/xui/pt/menu_picks.xml diff --git a/indra/newview/skins/default/xui/pt/menu_picks_plus.xml b/indra/newview/skins/default/xui/pt/menu_picks_plus.xml index 95a7c05262..95a7c05262 100755..100644 --- a/indra/newview/skins/default/xui/pt/menu_picks_plus.xml +++ b/indra/newview/skins/default/xui/pt/menu_picks_plus.xml diff --git a/indra/newview/skins/default/xui/pt/menu_place.xml b/indra/newview/skins/default/xui/pt/menu_place.xml index 282ea20a7a..282ea20a7a 100755..100644 --- a/indra/newview/skins/default/xui/pt/menu_place.xml +++ b/indra/newview/skins/default/xui/pt/menu_place.xml diff --git a/indra/newview/skins/default/xui/pt/menu_place_add_button.xml b/indra/newview/skins/default/xui/pt/menu_place_add_button.xml index d099d04f8d..d099d04f8d 100755..100644 --- a/indra/newview/skins/default/xui/pt/menu_place_add_button.xml +++ b/indra/newview/skins/default/xui/pt/menu_place_add_button.xml diff --git a/indra/newview/skins/default/xui/pt/menu_places_gear_folder.xml b/indra/newview/skins/default/xui/pt/menu_places_gear_folder.xml index 7cba70a110..7cba70a110 100755..100644 --- a/indra/newview/skins/default/xui/pt/menu_places_gear_folder.xml +++ b/indra/newview/skins/default/xui/pt/menu_places_gear_folder.xml diff --git a/indra/newview/skins/default/xui/pt/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/pt/menu_places_gear_landmark.xml index fec0911fcf..fec0911fcf 100755..100644 --- a/indra/newview/skins/default/xui/pt/menu_places_gear_landmark.xml +++ b/indra/newview/skins/default/xui/pt/menu_places_gear_landmark.xml diff --git a/indra/newview/skins/default/xui/pt/menu_profile_overflow.xml b/indra/newview/skins/default/xui/pt/menu_profile_overflow.xml index d41ecbd755..d41ecbd755 100755..100644 --- a/indra/newview/skins/default/xui/pt/menu_profile_overflow.xml +++ b/indra/newview/skins/default/xui/pt/menu_profile_overflow.xml diff --git a/indra/newview/skins/default/xui/pt/menu_save_outfit.xml b/indra/newview/skins/default/xui/pt/menu_save_outfit.xml index 61c6b9202f..61c6b9202f 100755..100644 --- a/indra/newview/skins/default/xui/pt/menu_save_outfit.xml +++ b/indra/newview/skins/default/xui/pt/menu_save_outfit.xml diff --git a/indra/newview/skins/default/xui/pt/menu_script_chiclet.xml b/indra/newview/skins/default/xui/pt/menu_script_chiclet.xml index ccf3878e14..ccf3878e14 100755..100644 --- a/indra/newview/skins/default/xui/pt/menu_script_chiclet.xml +++ b/indra/newview/skins/default/xui/pt/menu_script_chiclet.xml diff --git a/indra/newview/skins/default/xui/pt/menu_slurl.xml b/indra/newview/skins/default/xui/pt/menu_slurl.xml index 6d4c84fc3c..6d4c84fc3c 100755..100644 --- a/indra/newview/skins/default/xui/pt/menu_slurl.xml +++ b/indra/newview/skins/default/xui/pt/menu_slurl.xml diff --git a/indra/newview/skins/default/xui/pt/menu_teleport_history_gear.xml b/indra/newview/skins/default/xui/pt/menu_teleport_history_gear.xml index f034509be8..f034509be8 100755..100644 --- a/indra/newview/skins/default/xui/pt/menu_teleport_history_gear.xml +++ b/indra/newview/skins/default/xui/pt/menu_teleport_history_gear.xml diff --git a/indra/newview/skins/default/xui/pt/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/pt/menu_teleport_history_item.xml index 3a2b3a8847..3a2b3a8847 100755..100644 --- a/indra/newview/skins/default/xui/pt/menu_teleport_history_item.xml +++ b/indra/newview/skins/default/xui/pt/menu_teleport_history_item.xml diff --git a/indra/newview/skins/default/xui/pt/menu_teleport_history_tab.xml b/indra/newview/skins/default/xui/pt/menu_teleport_history_tab.xml index 6a633cf74c..6a633cf74c 100755..100644 --- a/indra/newview/skins/default/xui/pt/menu_teleport_history_tab.xml +++ b/indra/newview/skins/default/xui/pt/menu_teleport_history_tab.xml diff --git a/indra/newview/skins/default/xui/pt/menu_text_editor.xml b/indra/newview/skins/default/xui/pt/menu_text_editor.xml index a26b50e1c2..a26b50e1c2 100755..100644 --- a/indra/newview/skins/default/xui/pt/menu_text_editor.xml +++ b/indra/newview/skins/default/xui/pt/menu_text_editor.xml diff --git a/indra/newview/skins/default/xui/pt/menu_toolbars.xml b/indra/newview/skins/default/xui/pt/menu_toolbars.xml index b58a1a6e4f..b58a1a6e4f 100755..100644 --- a/indra/newview/skins/default/xui/pt/menu_toolbars.xml +++ b/indra/newview/skins/default/xui/pt/menu_toolbars.xml diff --git a/indra/newview/skins/default/xui/pt/menu_topinfobar.xml b/indra/newview/skins/default/xui/pt/menu_topinfobar.xml index d9347950b1..d9347950b1 100755..100644 --- a/indra/newview/skins/default/xui/pt/menu_topinfobar.xml +++ b/indra/newview/skins/default/xui/pt/menu_topinfobar.xml diff --git a/indra/newview/skins/default/xui/pt/menu_url_agent.xml b/indra/newview/skins/default/xui/pt/menu_url_agent.xml index 102df18b28..102df18b28 100755..100644 --- a/indra/newview/skins/default/xui/pt/menu_url_agent.xml +++ b/indra/newview/skins/default/xui/pt/menu_url_agent.xml 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_url_group.xml b/indra/newview/skins/default/xui/pt/menu_url_group.xml index 5b67a69c9a..5b67a69c9a 100755..100644 --- a/indra/newview/skins/default/xui/pt/menu_url_group.xml +++ b/indra/newview/skins/default/xui/pt/menu_url_group.xml diff --git a/indra/newview/skins/default/xui/pt/menu_url_http.xml b/indra/newview/skins/default/xui/pt/menu_url_http.xml index e53a2572b8..e53a2572b8 100755..100644 --- a/indra/newview/skins/default/xui/pt/menu_url_http.xml +++ b/indra/newview/skins/default/xui/pt/menu_url_http.xml diff --git a/indra/newview/skins/default/xui/pt/menu_url_inventory.xml b/indra/newview/skins/default/xui/pt/menu_url_inventory.xml index 45c14355d0..45c14355d0 100755..100644 --- a/indra/newview/skins/default/xui/pt/menu_url_inventory.xml +++ b/indra/newview/skins/default/xui/pt/menu_url_inventory.xml diff --git a/indra/newview/skins/default/xui/pt/menu_url_map.xml b/indra/newview/skins/default/xui/pt/menu_url_map.xml index ba114cccaa..ba114cccaa 100755..100644 --- a/indra/newview/skins/default/xui/pt/menu_url_map.xml +++ b/indra/newview/skins/default/xui/pt/menu_url_map.xml diff --git a/indra/newview/skins/default/xui/pt/menu_url_objectim.xml b/indra/newview/skins/default/xui/pt/menu_url_objectim.xml index 2cd0f52ef3..2cd0f52ef3 100755..100644 --- a/indra/newview/skins/default/xui/pt/menu_url_objectim.xml +++ b/indra/newview/skins/default/xui/pt/menu_url_objectim.xml diff --git a/indra/newview/skins/default/xui/pt/menu_url_parcel.xml b/indra/newview/skins/default/xui/pt/menu_url_parcel.xml index 6cc668bfd3..6cc668bfd3 100755..100644 --- a/indra/newview/skins/default/xui/pt/menu_url_parcel.xml +++ b/indra/newview/skins/default/xui/pt/menu_url_parcel.xml diff --git a/indra/newview/skins/default/xui/pt/menu_url_slapp.xml b/indra/newview/skins/default/xui/pt/menu_url_slapp.xml index d0784149ac..d0784149ac 100755..100644 --- a/indra/newview/skins/default/xui/pt/menu_url_slapp.xml +++ b/indra/newview/skins/default/xui/pt/menu_url_slapp.xml diff --git a/indra/newview/skins/default/xui/pt/menu_url_slurl.xml b/indra/newview/skins/default/xui/pt/menu_url_slurl.xml index 7216ccf0b3..7216ccf0b3 100755..100644 --- a/indra/newview/skins/default/xui/pt/menu_url_slurl.xml +++ b/indra/newview/skins/default/xui/pt/menu_url_slurl.xml diff --git a/indra/newview/skins/default/xui/pt/menu_url_teleport.xml b/indra/newview/skins/default/xui/pt/menu_url_teleport.xml index f007425646..f007425646 100755..100644 --- a/indra/newview/skins/default/xui/pt/menu_url_teleport.xml +++ b/indra/newview/skins/default/xui/pt/menu_url_teleport.xml diff --git a/indra/newview/skins/default/xui/pt/menu_viewer.xml b/indra/newview/skins/default/xui/pt/menu_viewer.xml index 0bbb9683a0..3d5d9eccc6 100755..100644 --- a/indra/newview/skins/default/xui/pt/menu_viewer.xml +++ b/indra/newview/skins/default/xui/pt/menu_viewer.xml @@ -8,13 +8,14 @@ <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"/> <menu_item_check label="Voar" name="Fly"/> <menu_item_check label="Correr sempre" name="Always Run"/> <menu_item_call label="Parar minha animação" name="Stop Animating My Avatar"/> - <menu_item_call label="Andar/correr/voar..." name="Walk / run / fly"/> + <menu_item_call label="Andar/correr/voar..." name="WalkRunFly"/> </menu> <menu label="Status" name="Status"> <menu_item_check label="Ausente" name="Away"/> @@ -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"> @@ -62,7 +64,7 @@ <menu_item_call label="Foto" name="Take Snapshot"/> <menu_item_call label="Perfil da região" name="Place Profile"/> <menu_item_call label="Sobre terrenos" name="About Land"/> - <menu_item_call label="Região/Propriedade" name="Region/Estate"/> + <menu_item_call label="Região/Propriedade" name="RegionEstate"/> <menu_item_call label="Meus terrenos..." name="My Land"/> <menu_item_call label="Comprar este terreno" name="Buy Land"/> <menu label="Mostrar" name="LandShow"> @@ -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; Hits"/> + <menu_item_call label="Bumps, Pushes & Hits" name="Bumps, Pushes &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/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/pt/menu_wearable_list_item.xml index 2487f6779f..2487f6779f 100755..100644 --- a/indra/newview/skins/default/xui/pt/menu_wearable_list_item.xml +++ b/indra/newview/skins/default/xui/pt/menu_wearable_list_item.xml diff --git a/indra/newview/skins/default/xui/pt/menu_wearing_gear.xml b/indra/newview/skins/default/xui/pt/menu_wearing_gear.xml index 75dca703cb..75dca703cb 100755..100644 --- a/indra/newview/skins/default/xui/pt/menu_wearing_gear.xml +++ b/indra/newview/skins/default/xui/pt/menu_wearing_gear.xml diff --git a/indra/newview/skins/default/xui/pt/menu_wearing_tab.xml b/indra/newview/skins/default/xui/pt/menu_wearing_tab.xml index 4e6e52ebc7..4e6e52ebc7 100755..100644 --- a/indra/newview/skins/default/xui/pt/menu_wearing_tab.xml +++ b/indra/newview/skins/default/xui/pt/menu_wearing_tab.xml 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..100644 --- 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..100644 --- 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..100644 --- 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..a264495404 100755..100644 --- 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 '[_NAME]' 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: + + '[ERROR_CODE]' + <usetemplate name="okbutton" yestext="OK"/> + </notification> + <notification name="MerchantPasteFailed"> + Copiar ou mover para Listagens do Marketplace com falha com o erro: + + '[ERROR_CODE]' + <usetemplate name="okbutton" yestext="OK"/> + </notification> + <notification name="MerchantTransactionFailed"> + Ocorreu uma falha na transação com o Marketplace com o seguinte erro: + + Motivo: '[ERROR_REASON]' + [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: + + '[ERROR_CODE]' + <usetemplate name="okbutton" yestext="OK"/> + </notification> + <notification name="MerchantFolderActivationFailed"> + Falha ao ativar esta pasta de versões com erro: + + '[ERROR_CODE]' + <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 > 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 > Preferências > 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. '[REGION_NAME]' é 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 > Preferências > 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 'Pagar por objeto' 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 > Mostrar configurações de depuração > 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. @@ -2646,9 +2777,6 @@ Por favor, tente novamente em alguns instantes. <notification name="NoValidCircuit"> Código de circuito inválido. </notification> - <notification name="NoValidTimestamp"> - Hora inválida. - </notification> <notification name="NoPendingConnection"> Impossível criar a conexão pendente. </notification> @@ -2803,7 +2931,7 @@ Se permanecer aqui, você será desconectado. [MESSAGE] -Do objeto: <nolink>[OBJECTNAME]</nolink>, de: [NAME]? +Do objeto: <nolink>[OBJECTNAME]</nolink>, de: [NAME] <form name="form"> <button name="Gotopage" text="Carregar"/> <button name="Cancel" text="Cancelar"/> @@ -2829,6 +2957,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 '[field]' foi ignorado ao atualizar o perfil de experiência. + </notification> + <notification name="RestrictedToOwnerExperienceProfileMessage"> + Alterações ignoradas para o campo '[field]' 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"> + '<nolink>[OBJECTNAME]</nolink>', um objeto de propriedade de '[NAME]', 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 '<nolink>[OBJECTNAME]</nolink>' 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 +3342,10 @@ Você carregou uma textura com [RESOLUTION] para o(a) '[BODYREGION]' e ( [EXISTENCE] segundos de vida ) Você carregou uma textura com [RESOLUTION] para o(a) '[BODYREGION]' 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 +3919,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 '[OBJECT_NAME]' no lote '[PARCEL_NAME]' + <usetemplate ignoretext="Teletransportar: Você foi teletransportado por um objeto em um lote" name="notifyignore"/> </notification> <notification name="TeleportedByObjectOwnedBy"> Você foi teletransportado pelo objeto '[OBJECT_NAME]' de propriedade de [OWNER_ID] @@ -4055,7 +4255,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/outfit_accordion_tab.xml b/indra/newview/skins/default/xui/pt/outfit_accordion_tab.xml index b1ffa0d2e5..b1ffa0d2e5 100755..100644 --- a/indra/newview/skins/default/xui/pt/outfit_accordion_tab.xml +++ b/indra/newview/skins/default/xui/pt/outfit_accordion_tab.xml diff --git a/indra/newview/skins/default/xui/pt/panel_active_object_row.xml b/indra/newview/skins/default/xui/pt/panel_active_object_row.xml index 73f6b2225f..73f6b2225f 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_active_object_row.xml +++ b/indra/newview/skins/default/xui/pt/panel_active_object_row.xml diff --git a/indra/newview/skins/default/xui/pt/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/pt/panel_adhoc_control_panel.xml index bd50d4953d..bd50d4953d 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_adhoc_control_panel.xml +++ b/indra/newview/skins/default/xui/pt/panel_adhoc_control_panel.xml diff --git a/indra/newview/skins/default/xui/pt/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/pt/panel_avatar_list_item.xml index 22eb23ebc5..22eb23ebc5 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_avatar_list_item.xml +++ b/indra/newview/skins/default/xui/pt/panel_avatar_list_item.xml diff --git a/indra/newview/skins/default/xui/pt/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/pt/panel_block_list_sidetray.xml index 2fcf6b9932..2fcf6b9932 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_block_list_sidetray.xml +++ b/indra/newview/skins/default/xui/pt/panel_block_list_sidetray.xml diff --git a/indra/newview/skins/default/xui/pt/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/pt/panel_body_parts_list_item.xml index 87a2e1674d..87a2e1674d 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_body_parts_list_item.xml +++ b/indra/newview/skins/default/xui/pt/panel_body_parts_list_item.xml diff --git a/indra/newview/skins/default/xui/pt/panel_bodyparts_list_button_bar.xml b/indra/newview/skins/default/xui/pt/panel_bodyparts_list_button_bar.xml index 094a03553b..094a03553b 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_bodyparts_list_button_bar.xml +++ b/indra/newview/skins/default/xui/pt/panel_bodyparts_list_button_bar.xml diff --git a/indra/newview/skins/default/xui/pt/panel_bottomtray_lite.xml b/indra/newview/skins/default/xui/pt/panel_bottomtray_lite.xml index 78d9826099..78d9826099 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_bottomtray_lite.xml +++ b/indra/newview/skins/default/xui/pt/panel_bottomtray_lite.xml diff --git a/indra/newview/skins/default/xui/pt/panel_chiclet_bar.xml b/indra/newview/skins/default/xui/pt/panel_chiclet_bar.xml index 0551d9cba6..0551d9cba6 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_chiclet_bar.xml +++ b/indra/newview/skins/default/xui/pt/panel_chiclet_bar.xml diff --git a/indra/newview/skins/default/xui/pt/panel_classified_info.xml b/indra/newview/skins/default/xui/pt/panel_classified_info.xml index 73bfe7444e..73bfe7444e 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_classified_info.xml +++ b/indra/newview/skins/default/xui/pt/panel_classified_info.xml diff --git a/indra/newview/skins/default/xui/pt/panel_clothing_list_button_bar.xml b/indra/newview/skins/default/xui/pt/panel_clothing_list_button_bar.xml index bfdc7290d2..bfdc7290d2 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_clothing_list_button_bar.xml +++ b/indra/newview/skins/default/xui/pt/panel_clothing_list_button_bar.xml diff --git a/indra/newview/skins/default/xui/pt/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/pt/panel_clothing_list_item.xml index 4b45a49f74..4b45a49f74 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_clothing_list_item.xml +++ b/indra/newview/skins/default/xui/pt/panel_clothing_list_item.xml diff --git a/indra/newview/skins/default/xui/pt/panel_cof_wearables.xml b/indra/newview/skins/default/xui/pt/panel_cof_wearables.xml index 3e4b12b001..3e4b12b001 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_cof_wearables.xml +++ b/indra/newview/skins/default/xui/pt/panel_cof_wearables.xml diff --git a/indra/newview/skins/default/xui/pt/panel_deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/pt/panel_deletable_wearable_list_item.xml index 7ca5e23981..7ca5e23981 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_deletable_wearable_list_item.xml +++ b/indra/newview/skins/default/xui/pt/panel_deletable_wearable_list_item.xml diff --git a/indra/newview/skins/default/xui/pt/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/pt/panel_dummy_clothing_list_item.xml index 3dfb5a0a16..3dfb5a0a16 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_dummy_clothing_list_item.xml +++ b/indra/newview/skins/default/xui/pt/panel_dummy_clothing_list_item.xml diff --git a/indra/newview/skins/default/xui/pt/panel_edit_alpha.xml b/indra/newview/skins/default/xui/pt/panel_edit_alpha.xml index b274945dbd..b274945dbd 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_edit_alpha.xml +++ b/indra/newview/skins/default/xui/pt/panel_edit_alpha.xml diff --git a/indra/newview/skins/default/xui/pt/panel_edit_classified.xml b/indra/newview/skins/default/xui/pt/panel_edit_classified.xml index 23e00bfc3a..23e00bfc3a 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_edit_classified.xml +++ b/indra/newview/skins/default/xui/pt/panel_edit_classified.xml diff --git a/indra/newview/skins/default/xui/pt/panel_edit_eyes.xml b/indra/newview/skins/default/xui/pt/panel_edit_eyes.xml index f21656d526..f21656d526 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_edit_eyes.xml +++ b/indra/newview/skins/default/xui/pt/panel_edit_eyes.xml diff --git a/indra/newview/skins/default/xui/pt/panel_edit_gloves.xml b/indra/newview/skins/default/xui/pt/panel_edit_gloves.xml index 281823d641..281823d641 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_edit_gloves.xml +++ b/indra/newview/skins/default/xui/pt/panel_edit_gloves.xml diff --git a/indra/newview/skins/default/xui/pt/panel_edit_hair.xml b/indra/newview/skins/default/xui/pt/panel_edit_hair.xml index 13f1f892f9..13f1f892f9 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_edit_hair.xml +++ b/indra/newview/skins/default/xui/pt/panel_edit_hair.xml diff --git a/indra/newview/skins/default/xui/pt/panel_edit_jacket.xml b/indra/newview/skins/default/xui/pt/panel_edit_jacket.xml index 5798325bd7..5798325bd7 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_edit_jacket.xml +++ b/indra/newview/skins/default/xui/pt/panel_edit_jacket.xml diff --git a/indra/newview/skins/default/xui/pt/panel_edit_pants.xml b/indra/newview/skins/default/xui/pt/panel_edit_pants.xml index 18568a81a8..18568a81a8 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_edit_pants.xml +++ b/indra/newview/skins/default/xui/pt/panel_edit_pants.xml diff --git a/indra/newview/skins/default/xui/pt/panel_edit_physics.xml b/indra/newview/skins/default/xui/pt/panel_edit_physics.xml index 967aab8bc3..967aab8bc3 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_edit_physics.xml +++ b/indra/newview/skins/default/xui/pt/panel_edit_physics.xml diff --git a/indra/newview/skins/default/xui/pt/panel_edit_pick.xml b/indra/newview/skins/default/xui/pt/panel_edit_pick.xml index 5eb9987e71..5eb9987e71 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_edit_pick.xml +++ b/indra/newview/skins/default/xui/pt/panel_edit_pick.xml diff --git a/indra/newview/skins/default/xui/pt/panel_edit_profile.xml b/indra/newview/skins/default/xui/pt/panel_edit_profile.xml index 0ba7382845..0ba7382845 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_edit_profile.xml +++ b/indra/newview/skins/default/xui/pt/panel_edit_profile.xml diff --git a/indra/newview/skins/default/xui/pt/panel_edit_shape.xml b/indra/newview/skins/default/xui/pt/panel_edit_shape.xml index de41ba3ad2..de41ba3ad2 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_edit_shape.xml +++ b/indra/newview/skins/default/xui/pt/panel_edit_shape.xml diff --git a/indra/newview/skins/default/xui/pt/panel_edit_shirt.xml b/indra/newview/skins/default/xui/pt/panel_edit_shirt.xml index c7e2b1e64c..c7e2b1e64c 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_edit_shirt.xml +++ b/indra/newview/skins/default/xui/pt/panel_edit_shirt.xml diff --git a/indra/newview/skins/default/xui/pt/panel_edit_shoes.xml b/indra/newview/skins/default/xui/pt/panel_edit_shoes.xml index 08465d09e7..08465d09e7 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_edit_shoes.xml +++ b/indra/newview/skins/default/xui/pt/panel_edit_shoes.xml diff --git a/indra/newview/skins/default/xui/pt/panel_edit_skin.xml b/indra/newview/skins/default/xui/pt/panel_edit_skin.xml index d00aa2dc66..d00aa2dc66 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_edit_skin.xml +++ b/indra/newview/skins/default/xui/pt/panel_edit_skin.xml diff --git a/indra/newview/skins/default/xui/pt/panel_edit_skirt.xml b/indra/newview/skins/default/xui/pt/panel_edit_skirt.xml index 275efba6e6..275efba6e6 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_edit_skirt.xml +++ b/indra/newview/skins/default/xui/pt/panel_edit_skirt.xml diff --git a/indra/newview/skins/default/xui/pt/panel_edit_socks.xml b/indra/newview/skins/default/xui/pt/panel_edit_socks.xml index 6f4779d855..6f4779d855 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_edit_socks.xml +++ b/indra/newview/skins/default/xui/pt/panel_edit_socks.xml diff --git a/indra/newview/skins/default/xui/pt/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/pt/panel_edit_tattoo.xml index f85bb3c499..f85bb3c499 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_edit_tattoo.xml +++ b/indra/newview/skins/default/xui/pt/panel_edit_tattoo.xml diff --git a/indra/newview/skins/default/xui/pt/panel_edit_underpants.xml b/indra/newview/skins/default/xui/pt/panel_edit_underpants.xml index c383471851..c383471851 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_edit_underpants.xml +++ b/indra/newview/skins/default/xui/pt/panel_edit_underpants.xml diff --git a/indra/newview/skins/default/xui/pt/panel_edit_undershirt.xml b/indra/newview/skins/default/xui/pt/panel_edit_undershirt.xml index 0bf510c67f..0bf510c67f 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_edit_undershirt.xml +++ b/indra/newview/skins/default/xui/pt/panel_edit_undershirt.xml diff --git a/indra/newview/skins/default/xui/pt/panel_edit_wearable.xml b/indra/newview/skins/default/xui/pt/panel_edit_wearable.xml index 2e3e3d6305..2e3e3d6305 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_edit_wearable.xml +++ b/indra/newview/skins/default/xui/pt/panel_edit_wearable.xml 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'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="<" name="btn_prev"/> + <button label=">" 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"> + '[TEXT]' 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"> + "Parcel_PG_Light" + </string> + <string name="maturity_icon_moderate"> + "Parcel_M_Light" + </string> + <string name="maturity_icon_adult"> + "Parcel_R_Light" + </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="<" name="left_btn"/> + <button label=">" 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 "" 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_control_panel.xml b/indra/newview/skins/default/xui/pt/panel_group_control_panel.xml index 502dae8d67..502dae8d67 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_group_control_panel.xml +++ b/indra/newview/skins/default/xui/pt/panel_group_control_panel.xml diff --git a/indra/newview/skins/default/xui/pt/panel_group_general.xml b/indra/newview/skins/default/xui/pt/panel_group_general.xml index b634ec3f64..b634ec3f64 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_group_general.xml +++ b/indra/newview/skins/default/xui/pt/panel_group_general.xml 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..100644 --- 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_group_invite.xml b/indra/newview/skins/default/xui/pt/panel_group_invite.xml index 08bd4a3b6b..08bd4a3b6b 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_group_invite.xml +++ b/indra/newview/skins/default/xui/pt/panel_group_invite.xml diff --git a/indra/newview/skins/default/xui/pt/panel_group_land_money.xml b/indra/newview/skins/default/xui/pt/panel_group_land_money.xml index 2346fe7f4f..2346fe7f4f 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_group_land_money.xml +++ b/indra/newview/skins/default/xui/pt/panel_group_land_money.xml diff --git a/indra/newview/skins/default/xui/pt/panel_group_list_item.xml b/indra/newview/skins/default/xui/pt/panel_group_list_item.xml index 0490878507..0490878507 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_group_list_item.xml +++ b/indra/newview/skins/default/xui/pt/panel_group_list_item.xml diff --git a/indra/newview/skins/default/xui/pt/panel_group_notices.xml b/indra/newview/skins/default/xui/pt/panel_group_notices.xml index 3bff1f8fb3..3bff1f8fb3 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_group_notices.xml +++ b/indra/newview/skins/default/xui/pt/panel_group_notices.xml diff --git a/indra/newview/skins/default/xui/pt/panel_group_notify.xml b/indra/newview/skins/default/xui/pt/panel_group_notify.xml index 5a8ea81074..5a8ea81074 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_group_notify.xml +++ b/indra/newview/skins/default/xui/pt/panel_group_notify.xml diff --git a/indra/newview/skins/default/xui/pt/panel_group_roles.xml b/indra/newview/skins/default/xui/pt/panel_group_roles.xml index 162c4743ec..162c4743ec 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_group_roles.xml +++ b/indra/newview/skins/default/xui/pt/panel_group_roles.xml diff --git a/indra/newview/skins/default/xui/pt/panel_im_control_panel.xml b/indra/newview/skins/default/xui/pt/panel_im_control_panel.xml index 91b7d1b7cd..91b7d1b7cd 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_im_control_panel.xml +++ b/indra/newview/skins/default/xui/pt/panel_im_control_panel.xml diff --git a/indra/newview/skins/default/xui/pt/panel_inventory_item.xml b/indra/newview/skins/default/xui/pt/panel_inventory_item.xml index d18047fbcf..d18047fbcf 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_inventory_item.xml +++ b/indra/newview/skins/default/xui/pt/panel_inventory_item.xml diff --git a/indra/newview/skins/default/xui/pt/panel_landmark_info.xml b/indra/newview/skins/default/xui/pt/panel_landmark_info.xml index 39c19a22d4..39c19a22d4 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_landmark_info.xml +++ b/indra/newview/skins/default/xui/pt/panel_landmark_info.xml diff --git a/indra/newview/skins/default/xui/pt/panel_landmarks.xml b/indra/newview/skins/default/xui/pt/panel_landmarks.xml index 49e1203601..49e1203601 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_landmarks.xml +++ b/indra/newview/skins/default/xui/pt/panel_landmarks.xml 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..100644 --- 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_main_inventory.xml b/indra/newview/skins/default/xui/pt/panel_main_inventory.xml index dbf8e4fa52..dbf8e4fa52 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/pt/panel_main_inventory.xml 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_me.xml b/indra/newview/skins/default/xui/pt/panel_me.xml index 281c886bd4..281c886bd4 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_me.xml +++ b/indra/newview/skins/default/xui/pt/panel_me.xml diff --git a/indra/newview/skins/default/xui/pt/panel_media_settings_general.xml b/indra/newview/skins/default/xui/pt/panel_media_settings_general.xml index 43c0820036..43c0820036 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_media_settings_general.xml +++ b/indra/newview/skins/default/xui/pt/panel_media_settings_general.xml diff --git a/indra/newview/skins/default/xui/pt/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/pt/panel_media_settings_permissions.xml index 55226db274..55226db274 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_media_settings_permissions.xml +++ b/indra/newview/skins/default/xui/pt/panel_media_settings_permissions.xml diff --git a/indra/newview/skins/default/xui/pt/panel_media_settings_security.xml b/indra/newview/skins/default/xui/pt/panel_media_settings_security.xml index e38c44d8fe..e38c44d8fe 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_media_settings_security.xml +++ b/indra/newview/skins/default/xui/pt/panel_media_settings_security.xml diff --git a/indra/newview/skins/default/xui/pt/panel_navigation_bar.xml b/indra/newview/skins/default/xui/pt/panel_navigation_bar.xml index 4fa5436805..4fa5436805 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_navigation_bar.xml +++ b/indra/newview/skins/default/xui/pt/panel_navigation_bar.xml diff --git a/indra/newview/skins/default/xui/pt/panel_nearby_chat.xml b/indra/newview/skins/default/xui/pt/panel_nearby_chat.xml index 6828d41dee..6828d41dee 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_nearby_chat.xml +++ b/indra/newview/skins/default/xui/pt/panel_nearby_chat.xml diff --git a/indra/newview/skins/default/xui/pt/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/pt/panel_nearby_chat_bar.xml index 5628a87109..5628a87109 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_nearby_chat_bar.xml +++ b/indra/newview/skins/default/xui/pt/panel_nearby_chat_bar.xml diff --git a/indra/newview/skins/default/xui/pt/panel_nearby_media.xml b/indra/newview/skins/default/xui/pt/panel_nearby_media.xml index 43bf8f9661..43bf8f9661 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_nearby_media.xml +++ b/indra/newview/skins/default/xui/pt/panel_nearby_media.xml diff --git a/indra/newview/skins/default/xui/pt/panel_notify_textbox.xml b/indra/newview/skins/default/xui/pt/panel_notify_textbox.xml index dcd9ba1815..dcd9ba1815 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_notify_textbox.xml +++ b/indra/newview/skins/default/xui/pt/panel_notify_textbox.xml diff --git a/indra/newview/skins/default/xui/pt/panel_online_status_toast.xml b/indra/newview/skins/default/xui/pt/panel_online_status_toast.xml index fdc489f375..fdc489f375 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_online_status_toast.xml +++ b/indra/newview/skins/default/xui/pt/panel_online_status_toast.xml diff --git a/indra/newview/skins/default/xui/pt/panel_outbox_inventory.xml b/indra/newview/skins/default/xui/pt/panel_outbox_inventory.xml index 442622035a..442622035a 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_outbox_inventory.xml +++ b/indra/newview/skins/default/xui/pt/panel_outbox_inventory.xml diff --git a/indra/newview/skins/default/xui/pt/panel_outfit_edit.xml b/indra/newview/skins/default/xui/pt/panel_outfit_edit.xml index eb23f5c079..eb23f5c079 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_outfit_edit.xml +++ b/indra/newview/skins/default/xui/pt/panel_outfit_edit.xml diff --git a/indra/newview/skins/default/xui/pt/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/pt/panel_outfits_inventory.xml index 816a9bc46e..816a9bc46e 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_outfits_inventory.xml +++ b/indra/newview/skins/default/xui/pt/panel_outfits_inventory.xml diff --git a/indra/newview/skins/default/xui/pt/panel_outfits_inventory_gear_default.xml b/indra/newview/skins/default/xui/pt/panel_outfits_inventory_gear_default.xml index 736b8f1fdd..736b8f1fdd 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_outfits_inventory_gear_default.xml +++ b/indra/newview/skins/default/xui/pt/panel_outfits_inventory_gear_default.xml diff --git a/indra/newview/skins/default/xui/pt/panel_outfits_list.xml b/indra/newview/skins/default/xui/pt/panel_outfits_list.xml index 2d74e092a4..2d74e092a4 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_outfits_list.xml +++ b/indra/newview/skins/default/xui/pt/panel_outfits_list.xml diff --git a/indra/newview/skins/default/xui/pt/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/pt/panel_outfits_wearing.xml index 9224ec4742..9224ec4742 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_outfits_wearing.xml +++ b/indra/newview/skins/default/xui/pt/panel_outfits_wearing.xml diff --git a/indra/newview/skins/default/xui/pt/panel_people.xml b/indra/newview/skins/default/xui/pt/panel_people.xml index 205fd6b97d..205fd6b97d 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_people.xml +++ b/indra/newview/skins/default/xui/pt/panel_people.xml diff --git a/indra/newview/skins/default/xui/pt/panel_pick_info.xml b/indra/newview/skins/default/xui/pt/panel_pick_info.xml index caa140a245..caa140a245 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_pick_info.xml +++ b/indra/newview/skins/default/xui/pt/panel_pick_info.xml diff --git a/indra/newview/skins/default/xui/pt/panel_picks.xml b/indra/newview/skins/default/xui/pt/panel_picks.xml index 2ff1eed624..2ff1eed624 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_picks.xml +++ b/indra/newview/skins/default/xui/pt/panel_picks.xml diff --git a/indra/newview/skins/default/xui/pt/panel_place_profile.xml b/indra/newview/skins/default/xui/pt/panel_place_profile.xml index 8abe579702..8abe579702 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_place_profile.xml +++ b/indra/newview/skins/default/xui/pt/panel_place_profile.xml diff --git a/indra/newview/skins/default/xui/pt/panel_places.xml b/indra/newview/skins/default/xui/pt/panel_places.xml index 69f0baf65f..69f0baf65f 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_places.xml +++ b/indra/newview/skins/default/xui/pt/panel_places.xml diff --git a/indra/newview/skins/default/xui/pt/panel_postcard_message.xml b/indra/newview/skins/default/xui/pt/panel_postcard_message.xml index 9cde810430..9cde810430 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_postcard_message.xml +++ b/indra/newview/skins/default/xui/pt/panel_postcard_message.xml 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..100644 --- 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_advanced.xml b/indra/newview/skins/default/xui/pt/panel_preferences_advanced.xml index 3ea592a957..3ea592a957 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/pt/panel_preferences_advanced.xml diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/pt/panel_preferences_alerts.xml index 2ffe720ccf..2ffe720ccf 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_preferences_alerts.xml +++ b/indra/newview/skins/default/xui/pt/panel_preferences_alerts.xml diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml b/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml index 89f1e07647..89f1e07647 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_colors.xml b/indra/newview/skins/default/xui/pt/panel_preferences_colors.xml index d6c6f66e37..d6c6f66e37 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_preferences_colors.xml +++ b/indra/newview/skins/default/xui/pt/panel_preferences_colors.xml diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_general.xml b/indra/newview/skins/default/xui/pt/panel_preferences_general.xml index 68fbd049b1..68fbd049b1 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/pt/panel_preferences_general.xml diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml index 756e345cb8..756e345cb8 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_move.xml b/indra/newview/skins/default/xui/pt/panel_preferences_move.xml index fa6f5f5851..fa6f5f5851 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_preferences_move.xml +++ b/indra/newview/skins/default/xui/pt/panel_preferences_move.xml diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/pt/panel_preferences_privacy.xml index 78323fc47d..78323fc47d 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_preferences_privacy.xml +++ b/indra/newview/skins/default/xui/pt/panel_preferences_privacy.xml 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..100644 --- 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_preferences_sound.xml b/indra/newview/skins/default/xui/pt/panel_preferences_sound.xml index fff5fd7005..fff5fd7005 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/pt/panel_preferences_sound.xml diff --git a/indra/newview/skins/default/xui/pt/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/pt/panel_prim_media_controls.xml index 9e07b6772f..9e07b6772f 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_prim_media_controls.xml +++ b/indra/newview/skins/default/xui/pt/panel_prim_media_controls.xml diff --git a/indra/newview/skins/default/xui/pt/panel_region_covenant.xml b/indra/newview/skins/default/xui/pt/panel_region_covenant.xml index 65ac89baf8..65ac89baf8 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_region_covenant.xml +++ b/indra/newview/skins/default/xui/pt/panel_region_covenant.xml diff --git a/indra/newview/skins/default/xui/pt/panel_region_debug.xml b/indra/newview/skins/default/xui/pt/panel_region_debug.xml index 2647c7a1e2..2647c7a1e2 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_region_debug.xml +++ b/indra/newview/skins/default/xui/pt/panel_region_debug.xml diff --git a/indra/newview/skins/default/xui/pt/panel_region_environment.xml b/indra/newview/skins/default/xui/pt/panel_region_environment.xml index 79eedebe5f..79eedebe5f 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_region_environment.xml +++ b/indra/newview/skins/default/xui/pt/panel_region_environment.xml diff --git a/indra/newview/skins/default/xui/pt/panel_region_estate.xml b/indra/newview/skins/default/xui/pt/panel_region_estate.xml index b1453c9c32..b1453c9c32 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_region_estate.xml +++ b/indra/newview/skins/default/xui/pt/panel_region_estate.xml 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_region_general.xml b/indra/newview/skins/default/xui/pt/panel_region_general.xml index a0d4579a04..a0d4579a04 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_region_general.xml +++ b/indra/newview/skins/default/xui/pt/panel_region_general.xml diff --git a/indra/newview/skins/default/xui/pt/panel_region_terrain.xml b/indra/newview/skins/default/xui/pt/panel_region_terrain.xml index 74330a8946..74330a8946 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_region_terrain.xml +++ b/indra/newview/skins/default/xui/pt/panel_region_terrain.xml diff --git a/indra/newview/skins/default/xui/pt/panel_script_ed.xml b/indra/newview/skins/default/xui/pt/panel_script_ed.xml index c546adcf8b..c546adcf8b 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_script_ed.xml +++ b/indra/newview/skins/default/xui/pt/panel_script_ed.xml 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_script_limits_my_avatar.xml b/indra/newview/skins/default/xui/pt/panel_script_limits_my_avatar.xml index daf87c4dc6..daf87c4dc6 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_script_limits_my_avatar.xml +++ b/indra/newview/skins/default/xui/pt/panel_script_limits_my_avatar.xml diff --git a/indra/newview/skins/default/xui/pt/panel_script_limits_region_memory.xml b/indra/newview/skins/default/xui/pt/panel_script_limits_region_memory.xml index 94274b2cfe..94274b2cfe 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_script_limits_region_memory.xml +++ b/indra/newview/skins/default/xui/pt/panel_script_limits_region_memory.xml diff --git a/indra/newview/skins/default/xui/pt/panel_script_question_toast.xml b/indra/newview/skins/default/xui/pt/panel_script_question_toast.xml index a2d0237da0..a2d0237da0 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_script_question_toast.xml +++ b/indra/newview/skins/default/xui/pt/panel_script_question_toast.xml diff --git a/indra/newview/skins/default/xui/pt/panel_scrolling_param.xml b/indra/newview/skins/default/xui/pt/panel_scrolling_param.xml index 87e6d16056..87e6d16056 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_scrolling_param.xml +++ b/indra/newview/skins/default/xui/pt/panel_scrolling_param.xml diff --git a/indra/newview/skins/default/xui/pt/panel_scrolling_param_base.xml b/indra/newview/skins/default/xui/pt/panel_scrolling_param_base.xml index 0a5a2e2572..0a5a2e2572 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_scrolling_param_base.xml +++ b/indra/newview/skins/default/xui/pt/panel_scrolling_param_base.xml diff --git a/indra/newview/skins/default/xui/pt/panel_side_tray_tab_caption.xml b/indra/newview/skins/default/xui/pt/panel_side_tray_tab_caption.xml index 09444a5535..09444a5535 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_side_tray_tab_caption.xml +++ b/indra/newview/skins/default/xui/pt/panel_side_tray_tab_caption.xml 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..100644 --- 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..100644 --- 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..100644 --- 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..100644 --- 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..100644 --- 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_sound_devices.xml b/indra/newview/skins/default/xui/pt/panel_sound_devices.xml index 66db89f48f..66db89f48f 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_sound_devices.xml +++ b/indra/newview/skins/default/xui/pt/panel_sound_devices.xml diff --git a/indra/newview/skins/default/xui/pt/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/pt/panel_stand_stop_flying.xml index 05869cf67a..05869cf67a 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_stand_stop_flying.xml +++ b/indra/newview/skins/default/xui/pt/panel_stand_stop_flying.xml 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..100644 --- 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_teleport_history.xml b/indra/newview/skins/default/xui/pt/panel_teleport_history.xml index b77064a1ff..b77064a1ff 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_teleport_history.xml +++ b/indra/newview/skins/default/xui/pt/panel_teleport_history.xml diff --git a/indra/newview/skins/default/xui/pt/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/pt/panel_teleport_history_item.xml index 5d8a024754..5d8a024754 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_teleport_history_item.xml +++ b/indra/newview/skins/default/xui/pt/panel_teleport_history_item.xml 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/panel_voice_effect.xml b/indra/newview/skins/default/xui/pt/panel_voice_effect.xml index 1d7878408a..1d7878408a 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_voice_effect.xml +++ b/indra/newview/skins/default/xui/pt/panel_voice_effect.xml diff --git a/indra/newview/skins/default/xui/pt/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/pt/panel_volume_pulldown.xml index 1dfd2a69ca..1dfd2a69ca 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_volume_pulldown.xml +++ b/indra/newview/skins/default/xui/pt/panel_volume_pulldown.xml diff --git a/indra/newview/skins/default/xui/pt/panel_world_map.xml b/indra/newview/skins/default/xui/pt/panel_world_map.xml index accab068fd..accab068fd 100755..100644 --- a/indra/newview/skins/default/xui/pt/panel_world_map.xml +++ b/indra/newview/skins/default/xui/pt/panel_world_map.xml 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..100644 --- 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_appearance.xml b/indra/newview/skins/default/xui/pt/sidepanel_appearance.xml index a5048e63b2..a5048e63b2 100755..100644 --- a/indra/newview/skins/default/xui/pt/sidepanel_appearance.xml +++ b/indra/newview/skins/default/xui/pt/sidepanel_appearance.xml diff --git a/indra/newview/skins/default/xui/pt/sidepanel_inventory.xml b/indra/newview/skins/default/xui/pt/sidepanel_inventory.xml index 4747d14101..4747d14101 100755..100644 --- a/indra/newview/skins/default/xui/pt/sidepanel_inventory.xml +++ b/indra/newview/skins/default/xui/pt/sidepanel_inventory.xml 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..100644 --- 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..100644 --- 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..cab8d86a99 100755..100644 --- a/indra/newview/skins/default/xui/pt/strings.xml +++ b/indra/newview/skins/default/xui/pt/strings.xml @@ -29,7 +29,7 @@ Falha na inicialização dos gráficos. Atualize seu driver gráfico! </string> <string name="AboutHeader"> - [APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2] ([VIEWER_VERSION_3]) [BUILD_DATE] [BUILD_TIME] ([CHANNEL]) + [APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2].[VIEWER_VERSION_3] [BUILD_DATE] [BUILD_TIME] ([CHANNEL]) [[VIEWER_RELEASE_NOTES_URL] [Notas da versão]] </string> <string name="AboutCompiler"> @@ -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 > Mostrar configurações de depuração > 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..100644 --- 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 'Ilha Welcome Pública' 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. '[REGION_NAME]' é 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/pt/xui_version.xml b/indra/newview/skins/default/xui/pt/xui_version.xml index 0e777751d3..0e777751d3 100755..100644 --- a/indra/newview/skins/default/xui/pt/xui_version.xml +++ b/indra/newview/skins/default/xui/pt/xui_version.xml diff --git a/indra/newview/skins/default/xui/ru/floater_aaa.xml b/indra/newview/skins/default/xui/ru/floater_aaa.xml index aa18a4a4a3..aa18a4a4a3 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_aaa.xml +++ b/indra/newview/skins/default/xui/ru/floater_aaa.xml 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..100644 --- 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]», расположенном на <nolink>[HOSTNAME]</nolink> ([HOSTIP]) -SLURL: <nolink>[SLURL]</nolink> -(глобальные координаты [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: <nolink>[SLURL]</nolink> Все права защищены. Подробные сведения см. в файле 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..100644 --- 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_activeim.xml b/indra/newview/skins/default/xui/ru/floater_activeim.xml index adfa277822..adfa277822 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_activeim.xml +++ b/indra/newview/skins/default/xui/ru/floater_activeim.xml diff --git a/indra/newview/skins/default/xui/ru/floater_animation_anim_preview.xml b/indra/newview/skins/default/xui/ru/floater_animation_anim_preview.xml index 711afc2717..711afc2717 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_animation_anim_preview.xml +++ b/indra/newview/skins/default/xui/ru/floater_animation_anim_preview.xml diff --git a/indra/newview/skins/default/xui/ru/floater_animation_bvh_preview.xml b/indra/newview/skins/default/xui/ru/floater_animation_bvh_preview.xml index 8ad9d8657a..d709987147 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_animation_bvh_preview.xml +++ b/indra/newview/skins/default/xui/ru/floater_animation_bvh_preview.xml @@ -141,35 +141,35 @@ Выражение лица </text> <combo_box name="emote_combo" tool_tip="Контролирует выражение лица во время анимации"> - <item label="(нет)" name="[None]" value=""/> - <item label="Ааааах" name="Aaaaah" value="Ааааах"/> - <item label="Боится" name="Afraid" value="Боится"/> - <item label="Злится" name="Angry" value="Злится"/> - <item label="Широко улыбается" name="BigSmile" value="Широко улыбается"/> - <item label="Скучает" name="Bored" value="Скучает"/> - <item label="Плачет" name="Cry" value="Плачет"/> - <item label="Презирает" name="Disdain" value="Презирает"/> - <item label="Смущается" name="Embarrassed" value="Смущается"/> - <item label="Хмурится" name="Frown" value="Хмурится"/> - <item label="Целует" name="Kiss" value="Целует"/> - <item label="Смеется" name="Laugh" value="Смеется"/> - <item label="Дразнится" name="Plllppt" value="Дразнится"/> - <item label="Не соглашается" name="Repulsed" value="Не соглашается"/> - <item label="Грустит" name="Sad" value="Грустит"/> - <item label="Не понимает" name="Shrug" value="Не понимает"/> - <item label="Улыбается" name="Smile" value="Улыбается"/> - <item label="Удивляется" name="Surprise" value="Удивляется"/> - <item label="Подмигивает" name="Wink" value="Подмигивает"/> - <item label="Беспокоится" name="Worry" value="Беспокоится"/> + <item label="(нет)" name="[None]"/> + <item label="Ааааах" name="Aaaaah"/> + <item label="Боится" name="Afraid"/> + <item label="Злится" name="Angry"/> + <item label="Широко улыбается" name="BigSmile"/> + <item label="Скучает" name="Bored"/> + <item label="Плачет" name="Cry"/> + <item label="Презирает" name="Disdain"/> + <item label="Смущается" name="Embarrassed"/> + <item label="Хмурится" name="Frown"/> + <item label="Целует" name="Kiss"/> + <item label="Смеется" name="Laugh"/> + <item label="Дразнится" name="Plllppt"/> + <item label="Не соглашается" name="Repulsed"/> + <item label="Грустит" name="Sad"/> + <item label="Не понимает" name="Shrug"/> + <item label="Улыбается" name="Smile"/> + <item label="Удивляется" name="Surprise"/> + <item label="Подмигивает" name="Wink"/> + <item label="Беспокоится" name="Worry"/> </combo_box> <text name="preview_label"> Просмотр во время </text> <combo_box name="preview_base_anim" tool_tip="Просмотр вашей анимации во время выполнения аватаром действий."> - <item label="Стояние" name="Standing" value="Стояние"/> - <item label="Ходьба" name="Walking" value="Ходьба"/> - <item label="Сидение" name="Sitting" value="Сидение"/> - <item label="Полет" name="Flying" value="Полет"/> + <item label="Стояние" name="Standing"/> + <item label="Ходьба" name="Walking"/> + <item label="Сидение" name="Sitting"/> + <item label="Полет" name="Flying"/> </combo_box> <spinner label="Вход (сек.)" name="ease_in_time" tool_tip="Количество времени (в секундах) для входа в стартовое положение"/> <spinner label="Выход (сек.)" name="ease_out_time" tool_tip="Количество времени (в секундах) для выхода из анимации"/> 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_auction.xml b/indra/newview/skins/default/xui/ru/floater_auction.xml index 105c75c919..105c75c919 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_auction.xml +++ b/indra/newview/skins/default/xui/ru/floater_auction.xml diff --git a/indra/newview/skins/default/xui/ru/floater_autoreplace.xml b/indra/newview/skins/default/xui/ru/floater_autoreplace.xml index 6827931e5d..6827931e5d 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_autoreplace.xml +++ b/indra/newview/skins/default/xui/ru/floater_autoreplace.xml diff --git a/indra/newview/skins/default/xui/ru/floater_avatar.xml b/indra/newview/skins/default/xui/ru/floater_avatar.xml index b480af9345..b480af9345 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_avatar.xml +++ b/indra/newview/skins/default/xui/ru/floater_avatar.xml diff --git a/indra/newview/skins/default/xui/ru/floater_avatar_picker.xml b/indra/newview/skins/default/xui/ru/floater_avatar_picker.xml index edcc35d2b9..edcc35d2b9 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_avatar_picker.xml +++ b/indra/newview/skins/default/xui/ru/floater_avatar_picker.xml diff --git a/indra/newview/skins/default/xui/ru/floater_avatar_textures.xml b/indra/newview/skins/default/xui/ru/floater_avatar_textures.xml index cb39f66247..cb39f66247 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_avatar_textures.xml +++ b/indra/newview/skins/default/xui/ru/floater_avatar_textures.xml diff --git a/indra/newview/skins/default/xui/ru/floater_beacons.xml b/indra/newview/skins/default/xui/ru/floater_beacons.xml index 38d257ff81..38d257ff81 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_beacons.xml +++ b/indra/newview/skins/default/xui/ru/floater_beacons.xml diff --git a/indra/newview/skins/default/xui/ru/floater_build_options.xml b/indra/newview/skins/default/xui/ru/floater_build_options.xml index 9dd01dc823..9dd01dc823 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_build_options.xml +++ b/indra/newview/skins/default/xui/ru/floater_build_options.xml diff --git a/indra/newview/skins/default/xui/ru/floater_bulk_perms.xml b/indra/newview/skins/default/xui/ru/floater_bulk_perms.xml index 304bf97dc1..304bf97dc1 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_bulk_perms.xml +++ b/indra/newview/skins/default/xui/ru/floater_bulk_perms.xml diff --git a/indra/newview/skins/default/xui/ru/floater_bumps.xml b/indra/newview/skins/default/xui/ru/floater_bumps.xml index f81f728290..f81f728290 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_bumps.xml +++ b/indra/newview/skins/default/xui/ru/floater_bumps.xml diff --git a/indra/newview/skins/default/xui/ru/floater_buy_contents.xml b/indra/newview/skins/default/xui/ru/floater_buy_contents.xml index b1d66ae14d..b1d66ae14d 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_buy_contents.xml +++ b/indra/newview/skins/default/xui/ru/floater_buy_contents.xml diff --git a/indra/newview/skins/default/xui/ru/floater_buy_currency.xml b/indra/newview/skins/default/xui/ru/floater_buy_currency.xml index 87e8bd524e..87e8bd524e 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_buy_currency.xml +++ b/indra/newview/skins/default/xui/ru/floater_buy_currency.xml diff --git a/indra/newview/skins/default/xui/ru/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/ru/floater_buy_currency_html.xml index ac8ad469fb..ac8ad469fb 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_buy_currency_html.xml +++ b/indra/newview/skins/default/xui/ru/floater_buy_currency_html.xml diff --git a/indra/newview/skins/default/xui/ru/floater_buy_land.xml b/indra/newview/skins/default/xui/ru/floater_buy_land.xml index 907a795393..907a795393 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_buy_land.xml +++ b/indra/newview/skins/default/xui/ru/floater_buy_land.xml diff --git a/indra/newview/skins/default/xui/ru/floater_buy_object.xml b/indra/newview/skins/default/xui/ru/floater_buy_object.xml index d25f9eccc2..d25f9eccc2 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_buy_object.xml +++ b/indra/newview/skins/default/xui/ru/floater_buy_object.xml diff --git a/indra/newview/skins/default/xui/ru/floater_camera.xml b/indra/newview/skins/default/xui/ru/floater_camera.xml index 52e7c62e06..52e7c62e06 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_camera.xml +++ b/indra/newview/skins/default/xui/ru/floater_camera.xml diff --git a/indra/newview/skins/default/xui/ru/floater_chat_bar.xml b/indra/newview/skins/default/xui/ru/floater_chat_bar.xml index f6b2fc81e1..f6b2fc81e1 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_chat_bar.xml +++ b/indra/newview/skins/default/xui/ru/floater_chat_bar.xml diff --git a/indra/newview/skins/default/xui/ru/floater_choose_group.xml b/indra/newview/skins/default/xui/ru/floater_choose_group.xml index ab8350f539..ab8350f539 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_choose_group.xml +++ b/indra/newview/skins/default/xui/ru/floater_choose_group.xml diff --git a/indra/newview/skins/default/xui/ru/floater_color_picker.xml b/indra/newview/skins/default/xui/ru/floater_color_picker.xml index b7034bef0b..b7034bef0b 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_color_picker.xml +++ b/indra/newview/skins/default/xui/ru/floater_color_picker.xml diff --git a/indra/newview/skins/default/xui/ru/floater_critical.xml b/indra/newview/skins/default/xui/ru/floater_critical.xml index bc64f3a83e..bc64f3a83e 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_critical.xml +++ b/indra/newview/skins/default/xui/ru/floater_critical.xml diff --git a/indra/newview/skins/default/xui/ru/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/ru/floater_delete_env_preset.xml index 3303a4f4c1..3303a4f4c1 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_delete_env_preset.xml +++ b/indra/newview/skins/default/xui/ru/floater_delete_env_preset.xml diff --git a/indra/newview/skins/default/xui/ru/floater_destinations.xml b/indra/newview/skins/default/xui/ru/floater_destinations.xml index 5ba0841564..5ba0841564 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_destinations.xml +++ b/indra/newview/skins/default/xui/ru/floater_destinations.xml diff --git a/indra/newview/skins/default/xui/ru/floater_display_name.xml b/indra/newview/skins/default/xui/ru/floater_display_name.xml index feb8a2721f..feb8a2721f 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_display_name.xml +++ b/indra/newview/skins/default/xui/ru/floater_display_name.xml diff --git a/indra/newview/skins/default/xui/ru/floater_edit_day_cycle.xml b/indra/newview/skins/default/xui/ru/floater_edit_day_cycle.xml index 61d708c567..61d708c567 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_edit_day_cycle.xml +++ b/indra/newview/skins/default/xui/ru/floater_edit_day_cycle.xml 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_edit_sky_preset.xml b/indra/newview/skins/default/xui/ru/floater_edit_sky_preset.xml index 354120ea72..354120ea72 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_edit_sky_preset.xml +++ b/indra/newview/skins/default/xui/ru/floater_edit_sky_preset.xml diff --git a/indra/newview/skins/default/xui/ru/floater_edit_water_preset.xml b/indra/newview/skins/default/xui/ru/floater_edit_water_preset.xml index f6def86380..f6def86380 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_edit_water_preset.xml +++ b/indra/newview/skins/default/xui/ru/floater_edit_water_preset.xml diff --git a/indra/newview/skins/default/xui/ru/floater_environment_settings.xml b/indra/newview/skins/default/xui/ru/floater_environment_settings.xml index d752c08cbb..d752c08cbb 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_environment_settings.xml +++ b/indra/newview/skins/default/xui/ru/floater_environment_settings.xml diff --git a/indra/newview/skins/default/xui/ru/floater_event.xml b/indra/newview/skins/default/xui/ru/floater_event.xml index 5c5bcc6d09..5c5bcc6d09 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_event.xml +++ b/indra/newview/skins/default/xui/ru/floater_event.xml 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"> + "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 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_fast_timers.xml b/indra/newview/skins/default/xui/ru/floater_fast_timers.xml index 20936b8494..20936b8494 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_fast_timers.xml +++ b/indra/newview/skins/default/xui/ru/floater_fast_timers.xml diff --git a/indra/newview/skins/default/xui/ru/floater_font_test.xml b/indra/newview/skins/default/xui/ru/floater_font_test.xml index b51732d3f1..b51732d3f1 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_font_test.xml +++ b/indra/newview/skins/default/xui/ru/floater_font_test.xml diff --git a/indra/newview/skins/default/xui/ru/floater_gesture.xml b/indra/newview/skins/default/xui/ru/floater_gesture.xml index 759d81b2c6..759d81b2c6 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_gesture.xml +++ b/indra/newview/skins/default/xui/ru/floater_gesture.xml diff --git a/indra/newview/skins/default/xui/ru/floater_god_tools.xml b/indra/newview/skins/default/xui/ru/floater_god_tools.xml index 81329475aa..81329475aa 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_god_tools.xml +++ b/indra/newview/skins/default/xui/ru/floater_god_tools.xml diff --git a/indra/newview/skins/default/xui/ru/floater_hardware_settings.xml b/indra/newview/skins/default/xui/ru/floater_hardware_settings.xml index d7da112a27..d7da112a27 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_hardware_settings.xml +++ b/indra/newview/skins/default/xui/ru/floater_hardware_settings.xml diff --git a/indra/newview/skins/default/xui/ru/floater_help_browser.xml b/indra/newview/skins/default/xui/ru/floater_help_browser.xml index 2f560340ed..2f560340ed 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_help_browser.xml +++ b/indra/newview/skins/default/xui/ru/floater_help_browser.xml diff --git a/indra/newview/skins/default/xui/ru/floater_how_to.xml b/indra/newview/skins/default/xui/ru/floater_how_to.xml index 52525e5d33..52525e5d33 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_how_to.xml +++ b/indra/newview/skins/default/xui/ru/floater_how_to.xml diff --git a/indra/newview/skins/default/xui/ru/floater_hud.xml b/indra/newview/skins/default/xui/ru/floater_hud.xml index b05113bfe0..b05113bfe0 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_hud.xml +++ b/indra/newview/skins/default/xui/ru/floater_hud.xml diff --git a/indra/newview/skins/default/xui/ru/floater_im_container.xml b/indra/newview/skins/default/xui/ru/floater_im_container.xml index eba7a19cd4..eba7a19cd4 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_im_container.xml +++ b/indra/newview/skins/default/xui/ru/floater_im_container.xml diff --git a/indra/newview/skins/default/xui/ru/floater_im_session.xml b/indra/newview/skins/default/xui/ru/floater_im_session.xml index d4ca04b88b..d4ca04b88b 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_im_session.xml +++ b/indra/newview/skins/default/xui/ru/floater_im_session.xml diff --git a/indra/newview/skins/default/xui/ru/floater_image_preview.xml b/indra/newview/skins/default/xui/ru/floater_image_preview.xml index dbc4c32b98..dbc4c32b98 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_image_preview.xml +++ b/indra/newview/skins/default/xui/ru/floater_image_preview.xml diff --git a/indra/newview/skins/default/xui/ru/floater_import_collada.xml b/indra/newview/skins/default/xui/ru/floater_import_collada.xml index 122315cb26..122315cb26 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_import_collada.xml +++ b/indra/newview/skins/default/xui/ru/floater_import_collada.xml diff --git a/indra/newview/skins/default/xui/ru/floater_incoming_call.xml b/indra/newview/skins/default/xui/ru/floater_incoming_call.xml index 3f61421d0c..3f61421d0c 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_incoming_call.xml +++ b/indra/newview/skins/default/xui/ru/floater_incoming_call.xml diff --git a/indra/newview/skins/default/xui/ru/floater_inspect.xml b/indra/newview/skins/default/xui/ru/floater_inspect.xml index f7bb981575..f7bb981575 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_inspect.xml +++ b/indra/newview/skins/default/xui/ru/floater_inspect.xml 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..100644 --- 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..100644 --- 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_joystick.xml b/indra/newview/skins/default/xui/ru/floater_joystick.xml index 66568563da..66568563da 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_joystick.xml +++ b/indra/newview/skins/default/xui/ru/floater_joystick.xml 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=">>" name="minimize" tool_tip="Переключение размера"/> </floater> diff --git a/indra/newview/skins/default/xui/ru/floater_land_holdings.xml b/indra/newview/skins/default/xui/ru/floater_land_holdings.xml index 17d347867d..17d347867d 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_land_holdings.xml +++ b/indra/newview/skins/default/xui/ru/floater_land_holdings.xml 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..100644 --- 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=">" name="view_profile"/> </floater> diff --git a/indra/newview/skins/default/xui/ru/floater_lsl_guide.xml b/indra/newview/skins/default/xui/ru/floater_lsl_guide.xml index 95a3b8b2a0..95a3b8b2a0 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_lsl_guide.xml +++ b/indra/newview/skins/default/xui/ru/floater_lsl_guide.xml diff --git a/indra/newview/skins/default/xui/ru/floater_map.xml b/indra/newview/skins/default/xui/ru/floater_map.xml index 59ceb0a773..59ceb0a773 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_map.xml +++ b/indra/newview/skins/default/xui/ru/floater_map.xml 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_media_browser.xml b/indra/newview/skins/default/xui/ru/floater_media_browser.xml index d1fc105046..d1fc105046 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_media_browser.xml +++ b/indra/newview/skins/default/xui/ru/floater_media_browser.xml diff --git a/indra/newview/skins/default/xui/ru/floater_media_settings.xml b/indra/newview/skins/default/xui/ru/floater_media_settings.xml index 1515cbb3b8..1515cbb3b8 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_media_settings.xml +++ b/indra/newview/skins/default/xui/ru/floater_media_settings.xml diff --git a/indra/newview/skins/default/xui/ru/floater_mem_leaking.xml b/indra/newview/skins/default/xui/ru/floater_mem_leaking.xml index 7aa5c27cde..7aa5c27cde 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_mem_leaking.xml +++ b/indra/newview/skins/default/xui/ru/floater_mem_leaking.xml diff --git a/indra/newview/skins/default/xui/ru/floater_merchant_outbox.xml b/indra/newview/skins/default/xui/ru/floater_merchant_outbox.xml index 332fa3b82f..332fa3b82f 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_merchant_outbox.xml +++ b/indra/newview/skins/default/xui/ru/floater_merchant_outbox.xml diff --git a/indra/newview/skins/default/xui/ru/floater_model_preview.xml b/indra/newview/skins/default/xui/ru/floater_model_preview.xml index 0c6d41b4ef..0c6d41b4ef 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_model_preview.xml +++ b/indra/newview/skins/default/xui/ru/floater_model_preview.xml diff --git a/indra/newview/skins/default/xui/ru/floater_moveview.xml b/indra/newview/skins/default/xui/ru/floater_moveview.xml index cb1fda1a1f..cb1fda1a1f 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_moveview.xml +++ b/indra/newview/skins/default/xui/ru/floater_moveview.xml diff --git a/indra/newview/skins/default/xui/ru/floater_mute_object.xml b/indra/newview/skins/default/xui/ru/floater_mute_object.xml index 44177acb53..44177acb53 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_mute_object.xml +++ b/indra/newview/skins/default/xui/ru/floater_mute_object.xml diff --git a/indra/newview/skins/default/xui/ru/floater_my_appearance.xml b/indra/newview/skins/default/xui/ru/floater_my_appearance.xml index b90d80f3fd..b90d80f3fd 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_my_appearance.xml +++ b/indra/newview/skins/default/xui/ru/floater_my_appearance.xml diff --git a/indra/newview/skins/default/xui/ru/floater_my_inventory.xml b/indra/newview/skins/default/xui/ru/floater_my_inventory.xml index 534d2a5774..534d2a5774 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_my_inventory.xml +++ b/indra/newview/skins/default/xui/ru/floater_my_inventory.xml diff --git a/indra/newview/skins/default/xui/ru/floater_notification.xml b/indra/newview/skins/default/xui/ru/floater_notification.xml index c3e299202c..c3e299202c 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_notification.xml +++ b/indra/newview/skins/default/xui/ru/floater_notification.xml diff --git a/indra/newview/skins/default/xui/ru/floater_notifications_console.xml b/indra/newview/skins/default/xui/ru/floater_notifications_console.xml index bd836590e1..bd836590e1 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_notifications_console.xml +++ b/indra/newview/skins/default/xui/ru/floater_notifications_console.xml diff --git a/indra/newview/skins/default/xui/ru/floater_object_weights.xml b/indra/newview/skins/default/xui/ru/floater_object_weights.xml index 41e0118732..41e0118732 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_object_weights.xml +++ b/indra/newview/skins/default/xui/ru/floater_object_weights.xml 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..100644 --- 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_outfit_save_as.xml b/indra/newview/skins/default/xui/ru/floater_outfit_save_as.xml index 301206e473..301206e473 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_outfit_save_as.xml +++ b/indra/newview/skins/default/xui/ru/floater_outfit_save_as.xml diff --git a/indra/newview/skins/default/xui/ru/floater_outgoing_call.xml b/indra/newview/skins/default/xui/ru/floater_outgoing_call.xml index 5e50a75b85..5e50a75b85 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_outgoing_call.xml +++ b/indra/newview/skins/default/xui/ru/floater_outgoing_call.xml diff --git a/indra/newview/skins/default/xui/ru/floater_pathfinding_characters.xml b/indra/newview/skins/default/xui/ru/floater_pathfinding_characters.xml index ce7ffc3d20..ce7ffc3d20 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_pathfinding_characters.xml +++ b/indra/newview/skins/default/xui/ru/floater_pathfinding_characters.xml diff --git a/indra/newview/skins/default/xui/ru/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/ru/floater_pathfinding_console.xml index fa72df04fd..fa72df04fd 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_pathfinding_console.xml +++ b/indra/newview/skins/default/xui/ru/floater_pathfinding_console.xml diff --git a/indra/newview/skins/default/xui/ru/floater_pathfinding_linksets.xml b/indra/newview/skins/default/xui/ru/floater_pathfinding_linksets.xml index db100fa415..db100fa415 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_pathfinding_linksets.xml +++ b/indra/newview/skins/default/xui/ru/floater_pathfinding_linksets.xml 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..100644 --- 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..100644 --- 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_people.xml b/indra/newview/skins/default/xui/ru/floater_people.xml index 7abc34986a..7abc34986a 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_people.xml +++ b/indra/newview/skins/default/xui/ru/floater_people.xml diff --git a/indra/newview/skins/default/xui/ru/floater_perm_prefs.xml b/indra/newview/skins/default/xui/ru/floater_perm_prefs.xml index 626f3c9321..626f3c9321 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_perm_prefs.xml +++ b/indra/newview/skins/default/xui/ru/floater_perm_prefs.xml diff --git a/indra/newview/skins/default/xui/ru/floater_picks.xml b/indra/newview/skins/default/xui/ru/floater_picks.xml index e0ae8d6f03..e0ae8d6f03 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_picks.xml +++ b/indra/newview/skins/default/xui/ru/floater_picks.xml diff --git a/indra/newview/skins/default/xui/ru/floater_places.xml b/indra/newview/skins/default/xui/ru/floater_places.xml index 2a22a855ef..2a22a855ef 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_places.xml +++ b/indra/newview/skins/default/xui/ru/floater_places.xml diff --git a/indra/newview/skins/default/xui/ru/floater_post_process.xml b/indra/newview/skins/default/xui/ru/floater_post_process.xml index ae97670548..ae97670548 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_post_process.xml +++ b/indra/newview/skins/default/xui/ru/floater_post_process.xml diff --git a/indra/newview/skins/default/xui/ru/floater_preferences.xml b/indra/newview/skins/default/xui/ru/floater_preferences.xml index fc244b9d8b..fc244b9d8b 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_preferences.xml +++ b/indra/newview/skins/default/xui/ru/floater_preferences.xml diff --git a/indra/newview/skins/default/xui/ru/floater_preferences_proxy.xml b/indra/newview/skins/default/xui/ru/floater_preferences_proxy.xml index 13cff2bcbe..13cff2bcbe 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_preferences_proxy.xml +++ b/indra/newview/skins/default/xui/ru/floater_preferences_proxy.xml diff --git a/indra/newview/skins/default/xui/ru/floater_preview_animation.xml b/indra/newview/skins/default/xui/ru/floater_preview_animation.xml index 22c6bc5901..22c6bc5901 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_preview_animation.xml +++ b/indra/newview/skins/default/xui/ru/floater_preview_animation.xml diff --git a/indra/newview/skins/default/xui/ru/floater_preview_gesture.xml b/indra/newview/skins/default/xui/ru/floater_preview_gesture.xml index fde2cea00e..fde2cea00e 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_preview_gesture.xml +++ b/indra/newview/skins/default/xui/ru/floater_preview_gesture.xml diff --git a/indra/newview/skins/default/xui/ru/floater_preview_notecard.xml b/indra/newview/skins/default/xui/ru/floater_preview_notecard.xml index 2f39d4a4a4..2f39d4a4a4 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_preview_notecard.xml +++ b/indra/newview/skins/default/xui/ru/floater_preview_notecard.xml diff --git a/indra/newview/skins/default/xui/ru/floater_preview_sound.xml b/indra/newview/skins/default/xui/ru/floater_preview_sound.xml index 691b2f3e82..691b2f3e82 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_preview_sound.xml +++ b/indra/newview/skins/default/xui/ru/floater_preview_sound.xml diff --git a/indra/newview/skins/default/xui/ru/floater_preview_texture.xml b/indra/newview/skins/default/xui/ru/floater_preview_texture.xml index c9cb87282a..c9cb87282a 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_preview_texture.xml +++ b/indra/newview/skins/default/xui/ru/floater_preview_texture.xml diff --git a/indra/newview/skins/default/xui/ru/floater_price_for_listing.xml b/indra/newview/skins/default/xui/ru/floater_price_for_listing.xml index fd513c8cdb..fd513c8cdb 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_price_for_listing.xml +++ b/indra/newview/skins/default/xui/ru/floater_price_for_listing.xml diff --git a/indra/newview/skins/default/xui/ru/floater_publish_classified.xml b/indra/newview/skins/default/xui/ru/floater_publish_classified.xml index b9e33d6e22..b9e33d6e22 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_publish_classified.xml +++ b/indra/newview/skins/default/xui/ru/floater_publish_classified.xml diff --git a/indra/newview/skins/default/xui/ru/floater_region_debug_console.xml b/indra/newview/skins/default/xui/ru/floater_region_debug_console.xml index d413a0bdcc..d413a0bdcc 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_region_debug_console.xml +++ b/indra/newview/skins/default/xui/ru/floater_region_debug_console.xml diff --git a/indra/newview/skins/default/xui/ru/floater_region_info.xml b/indra/newview/skins/default/xui/ru/floater_region_info.xml index 011b58e385..011b58e385 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_region_info.xml +++ b/indra/newview/skins/default/xui/ru/floater_region_info.xml 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..100644 --- 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="Земля > Посягательство > Объекты или текстуры" 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/ru/floater_script_debug.xml b/indra/newview/skins/default/xui/ru/floater_script_debug.xml index b91fc4e4ff..b91fc4e4ff 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_script_debug.xml +++ b/indra/newview/skins/default/xui/ru/floater_script_debug.xml diff --git a/indra/newview/skins/default/xui/ru/floater_script_debug_panel.xml b/indra/newview/skins/default/xui/ru/floater_script_debug_panel.xml index e70a30fa24..e70a30fa24 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_script_debug_panel.xml +++ b/indra/newview/skins/default/xui/ru/floater_script_debug_panel.xml diff --git a/indra/newview/skins/default/xui/ru/floater_script_limits.xml b/indra/newview/skins/default/xui/ru/floater_script_limits.xml index 7805eac03b..7805eac03b 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_script_limits.xml +++ b/indra/newview/skins/default/xui/ru/floater_script_limits.xml diff --git a/indra/newview/skins/default/xui/ru/floater_script_preview.xml b/indra/newview/skins/default/xui/ru/floater_script_preview.xml index 78cefb7aa7..78cefb7aa7 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_script_preview.xml +++ b/indra/newview/skins/default/xui/ru/floater_script_preview.xml diff --git a/indra/newview/skins/default/xui/ru/floater_script_queue.xml b/indra/newview/skins/default/xui/ru/floater_script_queue.xml index 4f2e389b19..4f2e389b19 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_script_queue.xml +++ b/indra/newview/skins/default/xui/ru/floater_script_queue.xml diff --git a/indra/newview/skins/default/xui/ru/floater_script_search.xml b/indra/newview/skins/default/xui/ru/floater_script_search.xml index fc040f6593..fc040f6593 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_script_search.xml +++ b/indra/newview/skins/default/xui/ru/floater_script_search.xml diff --git a/indra/newview/skins/default/xui/ru/floater_search.xml b/indra/newview/skins/default/xui/ru/floater_search.xml index 405a6598ac..405a6598ac 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_search.xml +++ b/indra/newview/skins/default/xui/ru/floater_search.xml diff --git a/indra/newview/skins/default/xui/ru/floater_select_key.xml b/indra/newview/skins/default/xui/ru/floater_select_key.xml index 99c2b9a2c4..99c2b9a2c4 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_select_key.xml +++ b/indra/newview/skins/default/xui/ru/floater_select_key.xml diff --git a/indra/newview/skins/default/xui/ru/floater_sell_land.xml b/indra/newview/skins/default/xui/ru/floater_sell_land.xml index e15f761101..e15f761101 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_sell_land.xml +++ b/indra/newview/skins/default/xui/ru/floater_sell_land.xml diff --git a/indra/newview/skins/default/xui/ru/floater_settings_debug.xml b/indra/newview/skins/default/xui/ru/floater_settings_debug.xml index db78d11e90..db78d11e90 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_settings_debug.xml +++ b/indra/newview/skins/default/xui/ru/floater_settings_debug.xml 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..100644 --- 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_sound_devices.xml b/indra/newview/skins/default/xui/ru/floater_sound_devices.xml index fc8de858cd..fc8de858cd 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_sound_devices.xml +++ b/indra/newview/skins/default/xui/ru/floater_sound_devices.xml diff --git a/indra/newview/skins/default/xui/ru/floater_sound_preview.xml b/indra/newview/skins/default/xui/ru/floater_sound_preview.xml index 6fdb12b76b..6fdb12b76b 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_sound_preview.xml +++ b/indra/newview/skins/default/xui/ru/floater_sound_preview.xml diff --git a/indra/newview/skins/default/xui/ru/floater_spellcheck.xml b/indra/newview/skins/default/xui/ru/floater_spellcheck.xml index 691b4a89c3..691b4a89c3 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_spellcheck.xml +++ b/indra/newview/skins/default/xui/ru/floater_spellcheck.xml diff --git a/indra/newview/skins/default/xui/ru/floater_spellcheck_import.xml b/indra/newview/skins/default/xui/ru/floater_spellcheck_import.xml index a01866db73..a01866db73 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_spellcheck_import.xml +++ b/indra/newview/skins/default/xui/ru/floater_spellcheck_import.xml diff --git a/indra/newview/skins/default/xui/ru/floater_stats.xml b/indra/newview/skins/default/xui/ru/floater_stats.xml index 10e9f5a7f4..10e9f5a7f4 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_stats.xml +++ b/indra/newview/skins/default/xui/ru/floater_stats.xml diff --git a/indra/newview/skins/default/xui/ru/floater_sys_well.xml b/indra/newview/skins/default/xui/ru/floater_sys_well.xml index b6975ac9ab..b6975ac9ab 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_sys_well.xml +++ b/indra/newview/skins/default/xui/ru/floater_sys_well.xml diff --git a/indra/newview/skins/default/xui/ru/floater_telehub.xml b/indra/newview/skins/default/xui/ru/floater_telehub.xml index 799fd57b5b..799fd57b5b 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_telehub.xml +++ b/indra/newview/skins/default/xui/ru/floater_telehub.xml diff --git a/indra/newview/skins/default/xui/ru/floater_test_layout_stacks.xml b/indra/newview/skins/default/xui/ru/floater_test_layout_stacks.xml index b479d5f6d6..b479d5f6d6 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_test_layout_stacks.xml +++ b/indra/newview/skins/default/xui/ru/floater_test_layout_stacks.xml diff --git a/indra/newview/skins/default/xui/ru/floater_test_text_vertical_aligment.xml b/indra/newview/skins/default/xui/ru/floater_test_text_vertical_aligment.xml index d0bd86160e..d0bd86160e 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_test_text_vertical_aligment.xml +++ b/indra/newview/skins/default/xui/ru/floater_test_text_vertical_aligment.xml diff --git a/indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml index c9e117362f..c9e117362f 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml +++ b/indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml diff --git a/indra/newview/skins/default/xui/ru/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/ru/floater_texture_fetch_debugger.xml index 628e6c5c87..628e6c5c87 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_texture_fetch_debugger.xml +++ b/indra/newview/skins/default/xui/ru/floater_texture_fetch_debugger.xml diff --git a/indra/newview/skins/default/xui/ru/floater_tools.xml b/indra/newview/skins/default/xui/ru/floater_tools.xml index a67745534c..a67745534c 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_tools.xml +++ b/indra/newview/skins/default/xui/ru/floater_tools.xml 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..100644 --- 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_tos.xml b/indra/newview/skins/default/xui/ru/floater_tos.xml index bd72f6b308..bd72f6b308 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_tos.xml +++ b/indra/newview/skins/default/xui/ru/floater_tos.xml diff --git a/indra/newview/skins/default/xui/ru/floater_toybox.xml b/indra/newview/skins/default/xui/ru/floater_toybox.xml index a4754ad7ab..a4754ad7ab 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_toybox.xml +++ b/indra/newview/skins/default/xui/ru/floater_toybox.xml diff --git a/indra/newview/skins/default/xui/ru/floater_translation_settings.xml b/indra/newview/skins/default/xui/ru/floater_translation_settings.xml index ad280a50dd..ad280a50dd 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_translation_settings.xml +++ b/indra/newview/skins/default/xui/ru/floater_translation_settings.xml 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/floater_url_entry.xml b/indra/newview/skins/default/xui/ru/floater_url_entry.xml index 59f8dd0c31..59f8dd0c31 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_url_entry.xml +++ b/indra/newview/skins/default/xui/ru/floater_url_entry.xml diff --git a/indra/newview/skins/default/xui/ru/floater_voice_controls.xml b/indra/newview/skins/default/xui/ru/floater_voice_controls.xml index 2b23086062..2b23086062 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_voice_controls.xml +++ b/indra/newview/skins/default/xui/ru/floater_voice_controls.xml diff --git a/indra/newview/skins/default/xui/ru/floater_voice_effect.xml b/indra/newview/skins/default/xui/ru/floater_voice_effect.xml index d3cef042a3..d3cef042a3 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_voice_effect.xml +++ b/indra/newview/skins/default/xui/ru/floater_voice_effect.xml diff --git a/indra/newview/skins/default/xui/ru/floater_web_content.xml b/indra/newview/skins/default/xui/ru/floater_web_content.xml index 403ab0ef5d..403ab0ef5d 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_web_content.xml +++ b/indra/newview/skins/default/xui/ru/floater_web_content.xml diff --git a/indra/newview/skins/default/xui/ru/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/ru/floater_whitelist_entry.xml index 811a2756fa..811a2756fa 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_whitelist_entry.xml +++ b/indra/newview/skins/default/xui/ru/floater_whitelist_entry.xml diff --git a/indra/newview/skins/default/xui/ru/floater_window_size.xml b/indra/newview/skins/default/xui/ru/floater_window_size.xml index fbff6a72b2..fbff6a72b2 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_window_size.xml +++ b/indra/newview/skins/default/xui/ru/floater_window_size.xml diff --git a/indra/newview/skins/default/xui/ru/floater_world_map.xml b/indra/newview/skins/default/xui/ru/floater_world_map.xml index 7d2acfd9a0..7d2acfd9a0 100755..100644 --- a/indra/newview/skins/default/xui/ru/floater_world_map.xml +++ b/indra/newview/skins/default/xui/ru/floater_world_map.xml diff --git a/indra/newview/skins/default/xui/ru/inspect_avatar.xml b/indra/newview/skins/default/xui/ru/inspect_avatar.xml index e38ae967cc..e38ae967cc 100755..100644 --- a/indra/newview/skins/default/xui/ru/inspect_avatar.xml +++ b/indra/newview/skins/default/xui/ru/inspect_avatar.xml diff --git a/indra/newview/skins/default/xui/ru/inspect_group.xml b/indra/newview/skins/default/xui/ru/inspect_group.xml index ca600b0a1f..ca600b0a1f 100755..100644 --- a/indra/newview/skins/default/xui/ru/inspect_group.xml +++ b/indra/newview/skins/default/xui/ru/inspect_group.xml diff --git a/indra/newview/skins/default/xui/ru/inspect_object.xml b/indra/newview/skins/default/xui/ru/inspect_object.xml index 1a43357cd3..1a43357cd3 100755..100644 --- a/indra/newview/skins/default/xui/ru/inspect_object.xml +++ b/indra/newview/skins/default/xui/ru/inspect_object.xml diff --git a/indra/newview/skins/default/xui/ru/inspect_remote_object.xml b/indra/newview/skins/default/xui/ru/inspect_remote_object.xml index eec4817f02..eec4817f02 100755..100644 --- a/indra/newview/skins/default/xui/ru/inspect_remote_object.xml +++ b/indra/newview/skins/default/xui/ru/inspect_remote_object.xml diff --git a/indra/newview/skins/default/xui/ru/menu_add_wearable_gear.xml b/indra/newview/skins/default/xui/ru/menu_add_wearable_gear.xml index 786e571527..786e571527 100755..100644 --- a/indra/newview/skins/default/xui/ru/menu_add_wearable_gear.xml +++ b/indra/newview/skins/default/xui/ru/menu_add_wearable_gear.xml diff --git a/indra/newview/skins/default/xui/ru/menu_attachment_other.xml b/indra/newview/skins/default/xui/ru/menu_attachment_other.xml index 76acb32a64..76acb32a64 100755..100644 --- a/indra/newview/skins/default/xui/ru/menu_attachment_other.xml +++ b/indra/newview/skins/default/xui/ru/menu_attachment_other.xml 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..100644 --- 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_icon.xml b/indra/newview/skins/default/xui/ru/menu_avatar_icon.xml index 049001e8c3..049001e8c3 100755..100644 --- a/indra/newview/skins/default/xui/ru/menu_avatar_icon.xml +++ b/indra/newview/skins/default/xui/ru/menu_avatar_icon.xml diff --git a/indra/newview/skins/default/xui/ru/menu_avatar_other.xml b/indra/newview/skins/default/xui/ru/menu_avatar_other.xml index dfe3c2e701..dfe3c2e701 100755..100644 --- a/indra/newview/skins/default/xui/ru/menu_avatar_other.xml +++ b/indra/newview/skins/default/xui/ru/menu_avatar_other.xml 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..100644 --- 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_cof_attachment.xml b/indra/newview/skins/default/xui/ru/menu_cof_attachment.xml index 72d1bc52b5..72d1bc52b5 100755..100644 --- a/indra/newview/skins/default/xui/ru/menu_cof_attachment.xml +++ b/indra/newview/skins/default/xui/ru/menu_cof_attachment.xml diff --git a/indra/newview/skins/default/xui/ru/menu_cof_body_part.xml b/indra/newview/skins/default/xui/ru/menu_cof_body_part.xml index ee0a0c70ed..ee0a0c70ed 100755..100644 --- a/indra/newview/skins/default/xui/ru/menu_cof_body_part.xml +++ b/indra/newview/skins/default/xui/ru/menu_cof_body_part.xml diff --git a/indra/newview/skins/default/xui/ru/menu_cof_clothing.xml b/indra/newview/skins/default/xui/ru/menu_cof_clothing.xml index bbdf4fd0d4..bbdf4fd0d4 100755..100644 --- a/indra/newview/skins/default/xui/ru/menu_cof_clothing.xml +++ b/indra/newview/skins/default/xui/ru/menu_cof_clothing.xml diff --git a/indra/newview/skins/default/xui/ru/menu_cof_gear.xml b/indra/newview/skins/default/xui/ru/menu_cof_gear.xml index b7a32dfd75..b7a32dfd75 100755..100644 --- a/indra/newview/skins/default/xui/ru/menu_cof_gear.xml +++ b/indra/newview/skins/default/xui/ru/menu_cof_gear.xml diff --git a/indra/newview/skins/default/xui/ru/menu_edit.xml b/indra/newview/skins/default/xui/ru/menu_edit.xml index 0dddea9c04..0dddea9c04 100755..100644 --- a/indra/newview/skins/default/xui/ru/menu_edit.xml +++ b/indra/newview/skins/default/xui/ru/menu_edit.xml diff --git a/indra/newview/skins/default/xui/ru/menu_favorites.xml b/indra/newview/skins/default/xui/ru/menu_favorites.xml index 074be06ba9..074be06ba9 100755..100644 --- a/indra/newview/skins/default/xui/ru/menu_favorites.xml +++ b/indra/newview/skins/default/xui/ru/menu_favorites.xml diff --git a/indra/newview/skins/default/xui/ru/menu_gesture_gear.xml b/indra/newview/skins/default/xui/ru/menu_gesture_gear.xml index d0b68cefbd..d0b68cefbd 100755..100644 --- a/indra/newview/skins/default/xui/ru/menu_gesture_gear.xml +++ b/indra/newview/skins/default/xui/ru/menu_gesture_gear.xml diff --git a/indra/newview/skins/default/xui/ru/menu_group_plus.xml b/indra/newview/skins/default/xui/ru/menu_group_plus.xml index edd012b964..edd012b964 100755..100644 --- a/indra/newview/skins/default/xui/ru/menu_group_plus.xml +++ b/indra/newview/skins/default/xui/ru/menu_group_plus.xml diff --git a/indra/newview/skins/default/xui/ru/menu_hide_navbar.xml b/indra/newview/skins/default/xui/ru/menu_hide_navbar.xml index 34e5f4c0e4..34e5f4c0e4 100755..100644 --- a/indra/newview/skins/default/xui/ru/menu_hide_navbar.xml +++ b/indra/newview/skins/default/xui/ru/menu_hide_navbar.xml diff --git a/indra/newview/skins/default/xui/ru/menu_imchiclet_adhoc.xml b/indra/newview/skins/default/xui/ru/menu_imchiclet_adhoc.xml index 8b60a585ab..8b60a585ab 100755..100644 --- a/indra/newview/skins/default/xui/ru/menu_imchiclet_adhoc.xml +++ b/indra/newview/skins/default/xui/ru/menu_imchiclet_adhoc.xml diff --git a/indra/newview/skins/default/xui/ru/menu_imchiclet_group.xml b/indra/newview/skins/default/xui/ru/menu_imchiclet_group.xml index 766b3847a7..766b3847a7 100755..100644 --- a/indra/newview/skins/default/xui/ru/menu_imchiclet_group.xml +++ b/indra/newview/skins/default/xui/ru/menu_imchiclet_group.xml diff --git a/indra/newview/skins/default/xui/ru/menu_imchiclet_p2p.xml b/indra/newview/skins/default/xui/ru/menu_imchiclet_p2p.xml index a33f6d5be8..a33f6d5be8 100755..100644 --- a/indra/newview/skins/default/xui/ru/menu_imchiclet_p2p.xml +++ b/indra/newview/skins/default/xui/ru/menu_imchiclet_p2p.xml diff --git a/indra/newview/skins/default/xui/ru/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/ru/menu_inspect_avatar_gear.xml index 957609a7a3..957609a7a3 100755..100644 --- a/indra/newview/skins/default/xui/ru/menu_inspect_avatar_gear.xml +++ b/indra/newview/skins/default/xui/ru/menu_inspect_avatar_gear.xml diff --git a/indra/newview/skins/default/xui/ru/menu_inspect_object_gear.xml b/indra/newview/skins/default/xui/ru/menu_inspect_object_gear.xml index 30953e830b..30953e830b 100755..100644 --- a/indra/newview/skins/default/xui/ru/menu_inspect_object_gear.xml +++ b/indra/newview/skins/default/xui/ru/menu_inspect_object_gear.xml diff --git a/indra/newview/skins/default/xui/ru/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/ru/menu_inspect_self_gear.xml index 901bb615e0..901bb615e0 100755..100644 --- a/indra/newview/skins/default/xui/ru/menu_inspect_self_gear.xml +++ b/indra/newview/skins/default/xui/ru/menu_inspect_self_gear.xml diff --git a/indra/newview/skins/default/xui/ru/menu_inv_offer_chiclet.xml b/indra/newview/skins/default/xui/ru/menu_inv_offer_chiclet.xml index 95d162d7fe..95d162d7fe 100755..100644 --- a/indra/newview/skins/default/xui/ru/menu_inv_offer_chiclet.xml +++ b/indra/newview/skins/default/xui/ru/menu_inv_offer_chiclet.xml 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..100644 --- 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_add.xml b/indra/newview/skins/default/xui/ru/menu_inventory_add.xml index 9a240c653e..9a240c653e 100755..100644 --- a/indra/newview/skins/default/xui/ru/menu_inventory_add.xml +++ b/indra/newview/skins/default/xui/ru/menu_inventory_add.xml 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..100644 --- a/indra/newview/skins/default/xui/ru/menu_inventory_gear_default.xml +++ b/indra/newview/skins/default/xui/ru/menu_inventory_gear_default.xml @@ -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_land.xml b/indra/newview/skins/default/xui/ru/menu_land.xml index 5aa4e6ccd2..5aa4e6ccd2 100755..100644 --- a/indra/newview/skins/default/xui/ru/menu_land.xml +++ b/indra/newview/skins/default/xui/ru/menu_land.xml diff --git a/indra/newview/skins/default/xui/ru/menu_landmark.xml b/indra/newview/skins/default/xui/ru/menu_landmark.xml index 24b60f9d86..24b60f9d86 100755..100644 --- a/indra/newview/skins/default/xui/ru/menu_landmark.xml +++ b/indra/newview/skins/default/xui/ru/menu_landmark.xml diff --git a/indra/newview/skins/default/xui/ru/menu_login.xml b/indra/newview/skins/default/xui/ru/menu_login.xml index 885f6195b6..885f6195b6 100755..100644 --- a/indra/newview/skins/default/xui/ru/menu_login.xml +++ b/indra/newview/skins/default/xui/ru/menu_login.xml 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_media_ctrl.xml b/indra/newview/skins/default/xui/ru/menu_media_ctrl.xml index d7485b02af..d7485b02af 100755..100644 --- a/indra/newview/skins/default/xui/ru/menu_media_ctrl.xml +++ b/indra/newview/skins/default/xui/ru/menu_media_ctrl.xml diff --git a/indra/newview/skins/default/xui/ru/menu_mini_map.xml b/indra/newview/skins/default/xui/ru/menu_mini_map.xml index 6b3db11609..6b3db11609 100755..100644 --- a/indra/newview/skins/default/xui/ru/menu_mini_map.xml +++ b/indra/newview/skins/default/xui/ru/menu_mini_map.xml diff --git a/indra/newview/skins/default/xui/ru/menu_model_import_gear_default.xml b/indra/newview/skins/default/xui/ru/menu_model_import_gear_default.xml index 5ae5e7dfbc..5ae5e7dfbc 100755..100644 --- a/indra/newview/skins/default/xui/ru/menu_model_import_gear_default.xml +++ b/indra/newview/skins/default/xui/ru/menu_model_import_gear_default.xml diff --git a/indra/newview/skins/default/xui/ru/menu_navbar.xml b/indra/newview/skins/default/xui/ru/menu_navbar.xml index 2dd0c0df36..2dd0c0df36 100755..100644 --- a/indra/newview/skins/default/xui/ru/menu_navbar.xml +++ b/indra/newview/skins/default/xui/ru/menu_navbar.xml diff --git a/indra/newview/skins/default/xui/ru/menu_nearby_chat.xml b/indra/newview/skins/default/xui/ru/menu_nearby_chat.xml index 4b5346d083..4b5346d083 100755..100644 --- a/indra/newview/skins/default/xui/ru/menu_nearby_chat.xml +++ b/indra/newview/skins/default/xui/ru/menu_nearby_chat.xml diff --git a/indra/newview/skins/default/xui/ru/menu_notification_well_button.xml b/indra/newview/skins/default/xui/ru/menu_notification_well_button.xml index 4d067e232a..4d067e232a 100755..100644 --- a/indra/newview/skins/default/xui/ru/menu_notification_well_button.xml +++ b/indra/newview/skins/default/xui/ru/menu_notification_well_button.xml diff --git a/indra/newview/skins/default/xui/ru/menu_object.xml b/indra/newview/skins/default/xui/ru/menu_object.xml index 5f31941b2b..5f31941b2b 100755..100644 --- a/indra/newview/skins/default/xui/ru/menu_object.xml +++ b/indra/newview/skins/default/xui/ru/menu_object.xml diff --git a/indra/newview/skins/default/xui/ru/menu_object_icon.xml b/indra/newview/skins/default/xui/ru/menu_object_icon.xml index 0c50abcfbd..0c50abcfbd 100755..100644 --- a/indra/newview/skins/default/xui/ru/menu_object_icon.xml +++ b/indra/newview/skins/default/xui/ru/menu_object_icon.xml diff --git a/indra/newview/skins/default/xui/ru/menu_outfit_gear.xml b/indra/newview/skins/default/xui/ru/menu_outfit_gear.xml index d379a17216..d379a17216 100755..100644 --- a/indra/newview/skins/default/xui/ru/menu_outfit_gear.xml +++ b/indra/newview/skins/default/xui/ru/menu_outfit_gear.xml diff --git a/indra/newview/skins/default/xui/ru/menu_outfit_tab.xml b/indra/newview/skins/default/xui/ru/menu_outfit_tab.xml index 46404195b9..46404195b9 100755..100644 --- a/indra/newview/skins/default/xui/ru/menu_outfit_tab.xml +++ b/indra/newview/skins/default/xui/ru/menu_outfit_tab.xml diff --git a/indra/newview/skins/default/xui/ru/menu_participant_list.xml b/indra/newview/skins/default/xui/ru/menu_participant_list.xml index 932ad5bacf..932ad5bacf 100755..100644 --- a/indra/newview/skins/default/xui/ru/menu_participant_list.xml +++ b/indra/newview/skins/default/xui/ru/menu_participant_list.xml diff --git a/indra/newview/skins/default/xui/ru/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/ru/menu_people_friends_view_sort.xml index 0fa252aa99..0fa252aa99 100755..100644 --- a/indra/newview/skins/default/xui/ru/menu_people_friends_view_sort.xml +++ b/indra/newview/skins/default/xui/ru/menu_people_friends_view_sort.xml diff --git a/indra/newview/skins/default/xui/ru/menu_people_groups.xml b/indra/newview/skins/default/xui/ru/menu_people_groups.xml index 78d73c9d1e..78d73c9d1e 100755..100644 --- a/indra/newview/skins/default/xui/ru/menu_people_groups.xml +++ b/indra/newview/skins/default/xui/ru/menu_people_groups.xml diff --git a/indra/newview/skins/default/xui/ru/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/ru/menu_people_groups_view_sort.xml index 0358068db9..0358068db9 100755..100644 --- a/indra/newview/skins/default/xui/ru/menu_people_groups_view_sort.xml +++ b/indra/newview/skins/default/xui/ru/menu_people_groups_view_sort.xml diff --git a/indra/newview/skins/default/xui/ru/menu_people_nearby.xml b/indra/newview/skins/default/xui/ru/menu_people_nearby.xml index d05b7e7d01..d05b7e7d01 100755..100644 --- a/indra/newview/skins/default/xui/ru/menu_people_nearby.xml +++ b/indra/newview/skins/default/xui/ru/menu_people_nearby.xml diff --git a/indra/newview/skins/default/xui/ru/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/ru/menu_people_nearby_multiselect.xml index 88eb56c9f5..88eb56c9f5 100755..100644 --- a/indra/newview/skins/default/xui/ru/menu_people_nearby_multiselect.xml +++ b/indra/newview/skins/default/xui/ru/menu_people_nearby_multiselect.xml diff --git a/indra/newview/skins/default/xui/ru/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/ru/menu_people_nearby_view_sort.xml index 4589815f6b..4589815f6b 100755..100644 --- a/indra/newview/skins/default/xui/ru/menu_people_nearby_view_sort.xml +++ b/indra/newview/skins/default/xui/ru/menu_people_nearby_view_sort.xml diff --git a/indra/newview/skins/default/xui/ru/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/ru/menu_people_recent_view_sort.xml index 2ac83ffe52..2ac83ffe52 100755..100644 --- a/indra/newview/skins/default/xui/ru/menu_people_recent_view_sort.xml +++ b/indra/newview/skins/default/xui/ru/menu_people_recent_view_sort.xml diff --git a/indra/newview/skins/default/xui/ru/menu_picks.xml b/indra/newview/skins/default/xui/ru/menu_picks.xml index 839c7411a6..839c7411a6 100755..100644 --- a/indra/newview/skins/default/xui/ru/menu_picks.xml +++ b/indra/newview/skins/default/xui/ru/menu_picks.xml diff --git a/indra/newview/skins/default/xui/ru/menu_picks_plus.xml b/indra/newview/skins/default/xui/ru/menu_picks_plus.xml index 1bc4078179..1bc4078179 100755..100644 --- a/indra/newview/skins/default/xui/ru/menu_picks_plus.xml +++ b/indra/newview/skins/default/xui/ru/menu_picks_plus.xml diff --git a/indra/newview/skins/default/xui/ru/menu_place.xml b/indra/newview/skins/default/xui/ru/menu_place.xml index ee8878c131..ee8878c131 100755..100644 --- a/indra/newview/skins/default/xui/ru/menu_place.xml +++ b/indra/newview/skins/default/xui/ru/menu_place.xml diff --git a/indra/newview/skins/default/xui/ru/menu_place_add_button.xml b/indra/newview/skins/default/xui/ru/menu_place_add_button.xml index b1a38fb9eb..b1a38fb9eb 100755..100644 --- a/indra/newview/skins/default/xui/ru/menu_place_add_button.xml +++ b/indra/newview/skins/default/xui/ru/menu_place_add_button.xml diff --git a/indra/newview/skins/default/xui/ru/menu_places_gear_folder.xml b/indra/newview/skins/default/xui/ru/menu_places_gear_folder.xml index 25df8c5d19..25df8c5d19 100755..100644 --- a/indra/newview/skins/default/xui/ru/menu_places_gear_folder.xml +++ b/indra/newview/skins/default/xui/ru/menu_places_gear_folder.xml diff --git a/indra/newview/skins/default/xui/ru/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/ru/menu_places_gear_landmark.xml index b1ebd4af83..b1ebd4af83 100755..100644 --- a/indra/newview/skins/default/xui/ru/menu_places_gear_landmark.xml +++ b/indra/newview/skins/default/xui/ru/menu_places_gear_landmark.xml diff --git a/indra/newview/skins/default/xui/ru/menu_profile_overflow.xml b/indra/newview/skins/default/xui/ru/menu_profile_overflow.xml index 1865fead7b..1865fead7b 100755..100644 --- a/indra/newview/skins/default/xui/ru/menu_profile_overflow.xml +++ b/indra/newview/skins/default/xui/ru/menu_profile_overflow.xml diff --git a/indra/newview/skins/default/xui/ru/menu_save_outfit.xml b/indra/newview/skins/default/xui/ru/menu_save_outfit.xml index 88947e1433..88947e1433 100755..100644 --- a/indra/newview/skins/default/xui/ru/menu_save_outfit.xml +++ b/indra/newview/skins/default/xui/ru/menu_save_outfit.xml diff --git a/indra/newview/skins/default/xui/ru/menu_script_chiclet.xml b/indra/newview/skins/default/xui/ru/menu_script_chiclet.xml index 6cacff3870..6cacff3870 100755..100644 --- a/indra/newview/skins/default/xui/ru/menu_script_chiclet.xml +++ b/indra/newview/skins/default/xui/ru/menu_script_chiclet.xml diff --git a/indra/newview/skins/default/xui/ru/menu_slurl.xml b/indra/newview/skins/default/xui/ru/menu_slurl.xml index f02549055c..f02549055c 100755..100644 --- a/indra/newview/skins/default/xui/ru/menu_slurl.xml +++ b/indra/newview/skins/default/xui/ru/menu_slurl.xml diff --git a/indra/newview/skins/default/xui/ru/menu_teleport_history_gear.xml b/indra/newview/skins/default/xui/ru/menu_teleport_history_gear.xml index 332f2784b9..332f2784b9 100755..100644 --- a/indra/newview/skins/default/xui/ru/menu_teleport_history_gear.xml +++ b/indra/newview/skins/default/xui/ru/menu_teleport_history_gear.xml diff --git a/indra/newview/skins/default/xui/ru/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/ru/menu_teleport_history_item.xml index f495d27bf3..f495d27bf3 100755..100644 --- a/indra/newview/skins/default/xui/ru/menu_teleport_history_item.xml +++ b/indra/newview/skins/default/xui/ru/menu_teleport_history_item.xml diff --git a/indra/newview/skins/default/xui/ru/menu_teleport_history_tab.xml b/indra/newview/skins/default/xui/ru/menu_teleport_history_tab.xml index 9b2434a310..9b2434a310 100755..100644 --- a/indra/newview/skins/default/xui/ru/menu_teleport_history_tab.xml +++ b/indra/newview/skins/default/xui/ru/menu_teleport_history_tab.xml diff --git a/indra/newview/skins/default/xui/ru/menu_text_editor.xml b/indra/newview/skins/default/xui/ru/menu_text_editor.xml index 0c928308a1..0c928308a1 100755..100644 --- a/indra/newview/skins/default/xui/ru/menu_text_editor.xml +++ b/indra/newview/skins/default/xui/ru/menu_text_editor.xml diff --git a/indra/newview/skins/default/xui/ru/menu_toolbars.xml b/indra/newview/skins/default/xui/ru/menu_toolbars.xml index aa05dbc390..aa05dbc390 100755..100644 --- a/indra/newview/skins/default/xui/ru/menu_toolbars.xml +++ b/indra/newview/skins/default/xui/ru/menu_toolbars.xml diff --git a/indra/newview/skins/default/xui/ru/menu_topinfobar.xml b/indra/newview/skins/default/xui/ru/menu_topinfobar.xml index 76cadbe5a4..76cadbe5a4 100755..100644 --- a/indra/newview/skins/default/xui/ru/menu_topinfobar.xml +++ b/indra/newview/skins/default/xui/ru/menu_topinfobar.xml diff --git a/indra/newview/skins/default/xui/ru/menu_url_agent.xml b/indra/newview/skins/default/xui/ru/menu_url_agent.xml index fcd1fe310d..fcd1fe310d 100755..100644 --- a/indra/newview/skins/default/xui/ru/menu_url_agent.xml +++ b/indra/newview/skins/default/xui/ru/menu_url_agent.xml 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_url_group.xml b/indra/newview/skins/default/xui/ru/menu_url_group.xml index f25e2a7eb8..f25e2a7eb8 100755..100644 --- a/indra/newview/skins/default/xui/ru/menu_url_group.xml +++ b/indra/newview/skins/default/xui/ru/menu_url_group.xml diff --git a/indra/newview/skins/default/xui/ru/menu_url_http.xml b/indra/newview/skins/default/xui/ru/menu_url_http.xml index 781211b16f..781211b16f 100755..100644 --- a/indra/newview/skins/default/xui/ru/menu_url_http.xml +++ b/indra/newview/skins/default/xui/ru/menu_url_http.xml diff --git a/indra/newview/skins/default/xui/ru/menu_url_inventory.xml b/indra/newview/skins/default/xui/ru/menu_url_inventory.xml index 6127bf9868..6127bf9868 100755..100644 --- a/indra/newview/skins/default/xui/ru/menu_url_inventory.xml +++ b/indra/newview/skins/default/xui/ru/menu_url_inventory.xml diff --git a/indra/newview/skins/default/xui/ru/menu_url_map.xml b/indra/newview/skins/default/xui/ru/menu_url_map.xml index bbf64f20e9..bbf64f20e9 100755..100644 --- a/indra/newview/skins/default/xui/ru/menu_url_map.xml +++ b/indra/newview/skins/default/xui/ru/menu_url_map.xml diff --git a/indra/newview/skins/default/xui/ru/menu_url_objectim.xml b/indra/newview/skins/default/xui/ru/menu_url_objectim.xml index 4f5361b2e3..4f5361b2e3 100755..100644 --- a/indra/newview/skins/default/xui/ru/menu_url_objectim.xml +++ b/indra/newview/skins/default/xui/ru/menu_url_objectim.xml diff --git a/indra/newview/skins/default/xui/ru/menu_url_parcel.xml b/indra/newview/skins/default/xui/ru/menu_url_parcel.xml index 84a679703a..84a679703a 100755..100644 --- a/indra/newview/skins/default/xui/ru/menu_url_parcel.xml +++ b/indra/newview/skins/default/xui/ru/menu_url_parcel.xml diff --git a/indra/newview/skins/default/xui/ru/menu_url_slapp.xml b/indra/newview/skins/default/xui/ru/menu_url_slapp.xml index 3d582ea2c5..3d582ea2c5 100755..100644 --- a/indra/newview/skins/default/xui/ru/menu_url_slapp.xml +++ b/indra/newview/skins/default/xui/ru/menu_url_slapp.xml diff --git a/indra/newview/skins/default/xui/ru/menu_url_slurl.xml b/indra/newview/skins/default/xui/ru/menu_url_slurl.xml index cbceafea21..cbceafea21 100755..100644 --- a/indra/newview/skins/default/xui/ru/menu_url_slurl.xml +++ b/indra/newview/skins/default/xui/ru/menu_url_slurl.xml diff --git a/indra/newview/skins/default/xui/ru/menu_url_teleport.xml b/indra/newview/skins/default/xui/ru/menu_url_teleport.xml index 2ecde09383..2ecde09383 100755..100644 --- a/indra/newview/skins/default/xui/ru/menu_url_teleport.xml +++ b/indra/newview/skins/default/xui/ru/menu_url_teleport.xml diff --git a/indra/newview/skins/default/xui/ru/menu_viewer.xml b/indra/newview/skins/default/xui/ru/menu_viewer.xml index 266a1fb877..d22ca845f9 100755..100644 --- a/indra/newview/skins/default/xui/ru/menu_viewer.xml +++ b/indra/newview/skins/default/xui/ru/menu_viewer.xml @@ -8,13 +8,14 @@ <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"/> <menu_item_check label="Полет" name="Fly"/> <menu_item_check label="Всегда бегать" name="Always Run"/> <menu_item_call label="Остановить анимацию" name="Stop Animating My Avatar"/> - <menu_item_call label="Ходьба / бег / полет..." name="Walk / run / fly"/> + <menu_item_call label="Ходьба / бег / полет..." name="WalkRunFly"/> </menu> <menu label="Статус" name="Status"> <menu_item_check label="Нет на месте" name="Away"/> @@ -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"> @@ -60,7 +62,7 @@ <menu_item_call label="Снимок" name="Take Snapshot"/> <menu_item_call label="Профиль места" name="Place Profile"/> <menu_item_call label="О земле" name="About Land"/> - <menu_item_call label="Регион/землевладение" name="Region/Estate"/> + <menu_item_call label="Регион/землевладение" name="RegionEstate"/> <menu_item_call label="Мои владения..." name="My Land"/> <menu_item_call label="Купить эту землю" name="Buy Land"/> <menu label="Показать" name="LandShow"> @@ -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/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/ru/menu_wearable_list_item.xml index 2832e17b7d..2832e17b7d 100755..100644 --- a/indra/newview/skins/default/xui/ru/menu_wearable_list_item.xml +++ b/indra/newview/skins/default/xui/ru/menu_wearable_list_item.xml diff --git a/indra/newview/skins/default/xui/ru/menu_wearing_gear.xml b/indra/newview/skins/default/xui/ru/menu_wearing_gear.xml index c2351fbfff..c2351fbfff 100755..100644 --- a/indra/newview/skins/default/xui/ru/menu_wearing_gear.xml +++ b/indra/newview/skins/default/xui/ru/menu_wearing_gear.xml diff --git a/indra/newview/skins/default/xui/ru/menu_wearing_tab.xml b/indra/newview/skins/default/xui/ru/menu_wearing_tab.xml index f178b39c77..f178b39c77 100755..100644 --- a/indra/newview/skins/default/xui/ru/menu_wearing_tab.xml +++ b/indra/newview/skins/default/xui/ru/menu_wearing_tab.xml 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..100644 --- 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..100644 --- 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..100644 --- 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..70b9a25590 100755..100644 --- 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"> + Не удалось скопировать или переместить в папку запасов, ошибка: + + '[ERROR_CODE]' + <usetemplate name="okbutton" yestext="OK"/> + </notification> + <notification name="MerchantPasteFailed"> + Не удалось скопировать или переместить в списки товаров торгового центра, ошибка: + + '[ERROR_CODE]' + <usetemplate name="okbutton" yestext="OK"/> + </notification> + <notification name="MerchantTransactionFailed"> + Не удалось выполнить транзакцию с торговым центром, ошибка: + + Причина: '[ERROR_REASON]' + [ERROR_DESCRIPTION] + <usetemplate name="okbutton" yestext="OK"/> + </notification> + <notification name="MerchantUnprocessableEntity"> + Не удалось опубликовать этот продукт или активировать папку версии. Обычно это происходит из-за отсутствия информации в форме описания списка, но также может быть связано с ошибками в структуре папки. Отредактируйте список или проверьте папку списка на отсутствие ошибок. + <usetemplate name="okbutton" yestext="OK"/> + </notification> + <notification name="MerchantListingFailed"> + Не удалось опубликовать в торговом центре, ошибка: + + '[ERROR_CODE]' + <usetemplate name="okbutton" yestext="OK"/> + </notification> + <notification name="MerchantFolderActivationFailed"> + Не удалось активировать эту папку версии, ошибка: + + '[ERROR_CODE]' + <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. Вы пытаетесь посетить регион, контент в котором не соответствует вашим настройкам. Попробуйте изменить настройки в меню «Я > Настройки > Общие». <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]. Настройки для контента можно изменить на будущее с помощью команд меню «Я > Настройки > Общие». <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] вещей. Это ограничение можно изменить в меню «Дополнительно > Настройки отладки > WearFolderLimit. + </notification> <notification label="Предупреждение режима «Не беспокоить»" name="DoNotDisturbModePay"> Включен режим «Не беспокоить». Вы не будете получать никаких предметов, предлагаемых в обмен за этот платеж. @@ -2657,9 +2788,6 @@ http://secondlife.com/download. <notification name="NoValidCircuit"> Нет подходящего кода канала. </notification> - <notification name="NoValidTimestamp"> - Нет подходящей метки времени. - </notification> <notification name="NoPendingConnection"> Невозможно создать отложенное соединение. </notification> @@ -2814,7 +2942,7 @@ http://secondlife.com/download. [MESSAGE] -Из объекта: <nolink>[OBJECTNAME]</nolink>, владелец: [NAME]? +Из объекта: <nolink>[OBJECTNAME]</nolink>, владелец: [NAME] <form name="form"> <button name="Gotopage" text="Перейти на страницу"/> <button name="Cancel" text="Отмена"/> @@ -2840,6 +2968,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"> + Объект «<nolink>[OBJECTNAME]</nolink>», владелец которого – «[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"> Предупреждение. Объект «<nolink>[OBJECTNAME]</nolink>» требует полного доступа к вашему аккаунту для Linden-долларов. Если разрешить такой доступ, объект сможет в любое время снимать средства с вашего аккаунта или полностью опустошать его неоднократно и без предупреждения. @@ -3159,6 +3353,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 +3931,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 +4267,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_active_object_row.xml b/indra/newview/skins/default/xui/ru/panel_active_object_row.xml index 825f9a6229..825f9a6229 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_active_object_row.xml +++ b/indra/newview/skins/default/xui/ru/panel_active_object_row.xml diff --git a/indra/newview/skins/default/xui/ru/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/ru/panel_adhoc_control_panel.xml index ae2240593d..ae2240593d 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_adhoc_control_panel.xml +++ b/indra/newview/skins/default/xui/ru/panel_adhoc_control_panel.xml diff --git a/indra/newview/skins/default/xui/ru/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/ru/panel_avatar_list_item.xml index 4866bb7ed6..4866bb7ed6 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_avatar_list_item.xml +++ b/indra/newview/skins/default/xui/ru/panel_avatar_list_item.xml diff --git a/indra/newview/skins/default/xui/ru/panel_avatar_tag.xml b/indra/newview/skins/default/xui/ru/panel_avatar_tag.xml index 03c164affd..03c164affd 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_avatar_tag.xml +++ b/indra/newview/skins/default/xui/ru/panel_avatar_tag.xml diff --git a/indra/newview/skins/default/xui/ru/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/ru/panel_block_list_sidetray.xml index 70a1b25996..70a1b25996 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_block_list_sidetray.xml +++ b/indra/newview/skins/default/xui/ru/panel_block_list_sidetray.xml diff --git a/indra/newview/skins/default/xui/ru/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/ru/panel_body_parts_list_item.xml index 20a99500b6..20a99500b6 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_body_parts_list_item.xml +++ b/indra/newview/skins/default/xui/ru/panel_body_parts_list_item.xml diff --git a/indra/newview/skins/default/xui/ru/panel_bodyparts_list_button_bar.xml b/indra/newview/skins/default/xui/ru/panel_bodyparts_list_button_bar.xml index f7d31813f9..f7d31813f9 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_bodyparts_list_button_bar.xml +++ b/indra/newview/skins/default/xui/ru/panel_bodyparts_list_button_bar.xml diff --git a/indra/newview/skins/default/xui/ru/panel_bottomtray_lite.xml b/indra/newview/skins/default/xui/ru/panel_bottomtray_lite.xml index bcdff112c5..bcdff112c5 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_bottomtray_lite.xml +++ b/indra/newview/skins/default/xui/ru/panel_bottomtray_lite.xml diff --git a/indra/newview/skins/default/xui/ru/panel_chat_header.xml b/indra/newview/skins/default/xui/ru/panel_chat_header.xml index 7916bf5155..7916bf5155 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_chat_header.xml +++ b/indra/newview/skins/default/xui/ru/panel_chat_header.xml diff --git a/indra/newview/skins/default/xui/ru/panel_chiclet_bar.xml b/indra/newview/skins/default/xui/ru/panel_chiclet_bar.xml index f203ecde4b..f203ecde4b 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_chiclet_bar.xml +++ b/indra/newview/skins/default/xui/ru/panel_chiclet_bar.xml diff --git a/indra/newview/skins/default/xui/ru/panel_classified_info.xml b/indra/newview/skins/default/xui/ru/panel_classified_info.xml index c7fd0ad42f..c7fd0ad42f 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_classified_info.xml +++ b/indra/newview/skins/default/xui/ru/panel_classified_info.xml diff --git a/indra/newview/skins/default/xui/ru/panel_clothing_list_button_bar.xml b/indra/newview/skins/default/xui/ru/panel_clothing_list_button_bar.xml index cc3f7feb83..cc3f7feb83 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_clothing_list_button_bar.xml +++ b/indra/newview/skins/default/xui/ru/panel_clothing_list_button_bar.xml diff --git a/indra/newview/skins/default/xui/ru/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/ru/panel_clothing_list_item.xml index 98d4fd8b47..98d4fd8b47 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_clothing_list_item.xml +++ b/indra/newview/skins/default/xui/ru/panel_clothing_list_item.xml diff --git a/indra/newview/skins/default/xui/ru/panel_cof_wearables.xml b/indra/newview/skins/default/xui/ru/panel_cof_wearables.xml index 9e1bc4b5c4..9e1bc4b5c4 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_cof_wearables.xml +++ b/indra/newview/skins/default/xui/ru/panel_cof_wearables.xml diff --git a/indra/newview/skins/default/xui/ru/panel_deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/ru/panel_deletable_wearable_list_item.xml index 762baa2052..762baa2052 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_deletable_wearable_list_item.xml +++ b/indra/newview/skins/default/xui/ru/panel_deletable_wearable_list_item.xml diff --git a/indra/newview/skins/default/xui/ru/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/ru/panel_dummy_clothing_list_item.xml index dc9d678edd..dc9d678edd 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_dummy_clothing_list_item.xml +++ b/indra/newview/skins/default/xui/ru/panel_dummy_clothing_list_item.xml diff --git a/indra/newview/skins/default/xui/ru/panel_edit_alpha.xml b/indra/newview/skins/default/xui/ru/panel_edit_alpha.xml index 7cde4099ef..7cde4099ef 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_edit_alpha.xml +++ b/indra/newview/skins/default/xui/ru/panel_edit_alpha.xml diff --git a/indra/newview/skins/default/xui/ru/panel_edit_classified.xml b/indra/newview/skins/default/xui/ru/panel_edit_classified.xml index a2f06dbadf..a2f06dbadf 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_edit_classified.xml +++ b/indra/newview/skins/default/xui/ru/panel_edit_classified.xml diff --git a/indra/newview/skins/default/xui/ru/panel_edit_eyes.xml b/indra/newview/skins/default/xui/ru/panel_edit_eyes.xml index 84e1204b5d..84e1204b5d 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_edit_eyes.xml +++ b/indra/newview/skins/default/xui/ru/panel_edit_eyes.xml diff --git a/indra/newview/skins/default/xui/ru/panel_edit_gloves.xml b/indra/newview/skins/default/xui/ru/panel_edit_gloves.xml index 561777745e..561777745e 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_edit_gloves.xml +++ b/indra/newview/skins/default/xui/ru/panel_edit_gloves.xml diff --git a/indra/newview/skins/default/xui/ru/panel_edit_hair.xml b/indra/newview/skins/default/xui/ru/panel_edit_hair.xml index d5e67ddf87..d5e67ddf87 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_edit_hair.xml +++ b/indra/newview/skins/default/xui/ru/panel_edit_hair.xml diff --git a/indra/newview/skins/default/xui/ru/panel_edit_jacket.xml b/indra/newview/skins/default/xui/ru/panel_edit_jacket.xml index 2f5a437e69..2f5a437e69 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_edit_jacket.xml +++ b/indra/newview/skins/default/xui/ru/panel_edit_jacket.xml diff --git a/indra/newview/skins/default/xui/ru/panel_edit_pants.xml b/indra/newview/skins/default/xui/ru/panel_edit_pants.xml index 4970c93801..4970c93801 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_edit_pants.xml +++ b/indra/newview/skins/default/xui/ru/panel_edit_pants.xml diff --git a/indra/newview/skins/default/xui/ru/panel_edit_physics.xml b/indra/newview/skins/default/xui/ru/panel_edit_physics.xml index da4ebb154d..da4ebb154d 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_edit_physics.xml +++ b/indra/newview/skins/default/xui/ru/panel_edit_physics.xml diff --git a/indra/newview/skins/default/xui/ru/panel_edit_pick.xml b/indra/newview/skins/default/xui/ru/panel_edit_pick.xml index 6be1448ac5..6be1448ac5 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_edit_pick.xml +++ b/indra/newview/skins/default/xui/ru/panel_edit_pick.xml diff --git a/indra/newview/skins/default/xui/ru/panel_edit_profile.xml b/indra/newview/skins/default/xui/ru/panel_edit_profile.xml index e9a6a781db..e9a6a781db 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_edit_profile.xml +++ b/indra/newview/skins/default/xui/ru/panel_edit_profile.xml diff --git a/indra/newview/skins/default/xui/ru/panel_edit_shape.xml b/indra/newview/skins/default/xui/ru/panel_edit_shape.xml index 312ad593a1..312ad593a1 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_edit_shape.xml +++ b/indra/newview/skins/default/xui/ru/panel_edit_shape.xml diff --git a/indra/newview/skins/default/xui/ru/panel_edit_shirt.xml b/indra/newview/skins/default/xui/ru/panel_edit_shirt.xml index d576a2cd2f..d576a2cd2f 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_edit_shirt.xml +++ b/indra/newview/skins/default/xui/ru/panel_edit_shirt.xml diff --git a/indra/newview/skins/default/xui/ru/panel_edit_shoes.xml b/indra/newview/skins/default/xui/ru/panel_edit_shoes.xml index f6d7029108..f6d7029108 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_edit_shoes.xml +++ b/indra/newview/skins/default/xui/ru/panel_edit_shoes.xml diff --git a/indra/newview/skins/default/xui/ru/panel_edit_skin.xml b/indra/newview/skins/default/xui/ru/panel_edit_skin.xml index f5a5339afe..f5a5339afe 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_edit_skin.xml +++ b/indra/newview/skins/default/xui/ru/panel_edit_skin.xml diff --git a/indra/newview/skins/default/xui/ru/panel_edit_skirt.xml b/indra/newview/skins/default/xui/ru/panel_edit_skirt.xml index 909946e577..909946e577 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_edit_skirt.xml +++ b/indra/newview/skins/default/xui/ru/panel_edit_skirt.xml diff --git a/indra/newview/skins/default/xui/ru/panel_edit_socks.xml b/indra/newview/skins/default/xui/ru/panel_edit_socks.xml index 2827fbc028..2827fbc028 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_edit_socks.xml +++ b/indra/newview/skins/default/xui/ru/panel_edit_socks.xml diff --git a/indra/newview/skins/default/xui/ru/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/ru/panel_edit_tattoo.xml index 874d5f8bc4..874d5f8bc4 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_edit_tattoo.xml +++ b/indra/newview/skins/default/xui/ru/panel_edit_tattoo.xml diff --git a/indra/newview/skins/default/xui/ru/panel_edit_underpants.xml b/indra/newview/skins/default/xui/ru/panel_edit_underpants.xml index f2f6e5e516..f2f6e5e516 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_edit_underpants.xml +++ b/indra/newview/skins/default/xui/ru/panel_edit_underpants.xml diff --git a/indra/newview/skins/default/xui/ru/panel_edit_undershirt.xml b/indra/newview/skins/default/xui/ru/panel_edit_undershirt.xml index 6f84c6cec2..6f84c6cec2 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_edit_undershirt.xml +++ b/indra/newview/skins/default/xui/ru/panel_edit_undershirt.xml diff --git a/indra/newview/skins/default/xui/ru/panel_edit_wearable.xml b/indra/newview/skins/default/xui/ru/panel_edit_wearable.xml index 79130a9c80..79130a9c80 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_edit_wearable.xml +++ b/indra/newview/skins/default/xui/ru/panel_edit_wearable.xml 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'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="<" name="btn_prev"/> + <button label=">" 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"> + "Parcel_PG_Light" + </string> + <string name="maturity_icon_moderate"> + "Parcel_M_Light" + </string> + <string name="maturity_icon_adult"> + "Parcel_R_Light" + </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="<" name="left_btn"/> + <button label=">" 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_control_panel.xml b/indra/newview/skins/default/xui/ru/panel_group_control_panel.xml index 2e6f3502b6..2e6f3502b6 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_group_control_panel.xml +++ b/indra/newview/skins/default/xui/ru/panel_group_control_panel.xml diff --git a/indra/newview/skins/default/xui/ru/panel_group_general.xml b/indra/newview/skins/default/xui/ru/panel_group_general.xml index ba38dbf89e..ba38dbf89e 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_group_general.xml +++ b/indra/newview/skins/default/xui/ru/panel_group_general.xml 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..100644 --- 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_group_invite.xml b/indra/newview/skins/default/xui/ru/panel_group_invite.xml index 46424c168b..46424c168b 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_group_invite.xml +++ b/indra/newview/skins/default/xui/ru/panel_group_invite.xml diff --git a/indra/newview/skins/default/xui/ru/panel_group_land_money.xml b/indra/newview/skins/default/xui/ru/panel_group_land_money.xml index 9235aa2f69..9235aa2f69 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_group_land_money.xml +++ b/indra/newview/skins/default/xui/ru/panel_group_land_money.xml diff --git a/indra/newview/skins/default/xui/ru/panel_group_list_item.xml b/indra/newview/skins/default/xui/ru/panel_group_list_item.xml index b043ffbbe2..b043ffbbe2 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_group_list_item.xml +++ b/indra/newview/skins/default/xui/ru/panel_group_list_item.xml diff --git a/indra/newview/skins/default/xui/ru/panel_group_notices.xml b/indra/newview/skins/default/xui/ru/panel_group_notices.xml index 8d20c4a96b..8d20c4a96b 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_group_notices.xml +++ b/indra/newview/skins/default/xui/ru/panel_group_notices.xml diff --git a/indra/newview/skins/default/xui/ru/panel_group_notify.xml b/indra/newview/skins/default/xui/ru/panel_group_notify.xml index 1aee7a7f61..1aee7a7f61 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_group_notify.xml +++ b/indra/newview/skins/default/xui/ru/panel_group_notify.xml diff --git a/indra/newview/skins/default/xui/ru/panel_group_roles.xml b/indra/newview/skins/default/xui/ru/panel_group_roles.xml index 88af469fbd..88af469fbd 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_group_roles.xml +++ b/indra/newview/skins/default/xui/ru/panel_group_roles.xml diff --git a/indra/newview/skins/default/xui/ru/panel_im_control_panel.xml b/indra/newview/skins/default/xui/ru/panel_im_control_panel.xml index 2a23cdb800..2a23cdb800 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_im_control_panel.xml +++ b/indra/newview/skins/default/xui/ru/panel_im_control_panel.xml diff --git a/indra/newview/skins/default/xui/ru/panel_instant_message.xml b/indra/newview/skins/default/xui/ru/panel_instant_message.xml index cf9bc7fccb..cf9bc7fccb 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_instant_message.xml +++ b/indra/newview/skins/default/xui/ru/panel_instant_message.xml diff --git a/indra/newview/skins/default/xui/ru/panel_inventory_item.xml b/indra/newview/skins/default/xui/ru/panel_inventory_item.xml index d18047fbcf..d18047fbcf 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_inventory_item.xml +++ b/indra/newview/skins/default/xui/ru/panel_inventory_item.xml diff --git a/indra/newview/skins/default/xui/ru/panel_landmark_info.xml b/indra/newview/skins/default/xui/ru/panel_landmark_info.xml index f4febd49cd..f4febd49cd 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_landmark_info.xml +++ b/indra/newview/skins/default/xui/ru/panel_landmark_info.xml diff --git a/indra/newview/skins/default/xui/ru/panel_landmarks.xml b/indra/newview/skins/default/xui/ru/panel_landmarks.xml index 7d684cd479..7d684cd479 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_landmarks.xml +++ b/indra/newview/skins/default/xui/ru/panel_landmarks.xml 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..100644 --- 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_main_inventory.xml b/indra/newview/skins/default/xui/ru/panel_main_inventory.xml index 80a67371af..80a67371af 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/ru/panel_main_inventory.xml 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_me.xml b/indra/newview/skins/default/xui/ru/panel_me.xml index 21a125af87..21a125af87 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_me.xml +++ b/indra/newview/skins/default/xui/ru/panel_me.xml diff --git a/indra/newview/skins/default/xui/ru/panel_media_settings_general.xml b/indra/newview/skins/default/xui/ru/panel_media_settings_general.xml index d52397832c..d52397832c 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_media_settings_general.xml +++ b/indra/newview/skins/default/xui/ru/panel_media_settings_general.xml diff --git a/indra/newview/skins/default/xui/ru/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/ru/panel_media_settings_permissions.xml index cfb006f346..cfb006f346 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_media_settings_permissions.xml +++ b/indra/newview/skins/default/xui/ru/panel_media_settings_permissions.xml diff --git a/indra/newview/skins/default/xui/ru/panel_media_settings_security.xml b/indra/newview/skins/default/xui/ru/panel_media_settings_security.xml index bae491472a..bae491472a 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_media_settings_security.xml +++ b/indra/newview/skins/default/xui/ru/panel_media_settings_security.xml diff --git a/indra/newview/skins/default/xui/ru/panel_navigation_bar.xml b/indra/newview/skins/default/xui/ru/panel_navigation_bar.xml index 5e3de180f9..5e3de180f9 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_navigation_bar.xml +++ b/indra/newview/skins/default/xui/ru/panel_navigation_bar.xml diff --git a/indra/newview/skins/default/xui/ru/panel_nearby_chat.xml b/indra/newview/skins/default/xui/ru/panel_nearby_chat.xml index a8fdfde1c4..a8fdfde1c4 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_nearby_chat.xml +++ b/indra/newview/skins/default/xui/ru/panel_nearby_chat.xml diff --git a/indra/newview/skins/default/xui/ru/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/ru/panel_nearby_chat_bar.xml index 395c643b0b..395c643b0b 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_nearby_chat_bar.xml +++ b/indra/newview/skins/default/xui/ru/panel_nearby_chat_bar.xml diff --git a/indra/newview/skins/default/xui/ru/panel_nearby_media.xml b/indra/newview/skins/default/xui/ru/panel_nearby_media.xml index 3b23fc78f5..3b23fc78f5 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_nearby_media.xml +++ b/indra/newview/skins/default/xui/ru/panel_nearby_media.xml diff --git a/indra/newview/skins/default/xui/ru/panel_notify_textbox.xml b/indra/newview/skins/default/xui/ru/panel_notify_textbox.xml index 1ac88a01b3..1ac88a01b3 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_notify_textbox.xml +++ b/indra/newview/skins/default/xui/ru/panel_notify_textbox.xml diff --git a/indra/newview/skins/default/xui/ru/panel_online_status_toast.xml b/indra/newview/skins/default/xui/ru/panel_online_status_toast.xml index fdc489f375..fdc489f375 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_online_status_toast.xml +++ b/indra/newview/skins/default/xui/ru/panel_online_status_toast.xml diff --git a/indra/newview/skins/default/xui/ru/panel_outbox_inventory.xml b/indra/newview/skins/default/xui/ru/panel_outbox_inventory.xml index 0095d48af9..0095d48af9 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_outbox_inventory.xml +++ b/indra/newview/skins/default/xui/ru/panel_outbox_inventory.xml diff --git a/indra/newview/skins/default/xui/ru/panel_outfit_edit.xml b/indra/newview/skins/default/xui/ru/panel_outfit_edit.xml index 91c03342a7..91c03342a7 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_outfit_edit.xml +++ b/indra/newview/skins/default/xui/ru/panel_outfit_edit.xml diff --git a/indra/newview/skins/default/xui/ru/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/ru/panel_outfits_inventory.xml index 4d0e13fca2..4d0e13fca2 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_outfits_inventory.xml +++ b/indra/newview/skins/default/xui/ru/panel_outfits_inventory.xml diff --git a/indra/newview/skins/default/xui/ru/panel_outfits_inventory_gear_default.xml b/indra/newview/skins/default/xui/ru/panel_outfits_inventory_gear_default.xml index 96f4b4a893..96f4b4a893 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_outfits_inventory_gear_default.xml +++ b/indra/newview/skins/default/xui/ru/panel_outfits_inventory_gear_default.xml diff --git a/indra/newview/skins/default/xui/ru/panel_outfits_list.xml b/indra/newview/skins/default/xui/ru/panel_outfits_list.xml index 74551e4274..74551e4274 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_outfits_list.xml +++ b/indra/newview/skins/default/xui/ru/panel_outfits_list.xml diff --git a/indra/newview/skins/default/xui/ru/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/ru/panel_outfits_wearing.xml index 7ed6bf35c0..7ed6bf35c0 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_outfits_wearing.xml +++ b/indra/newview/skins/default/xui/ru/panel_outfits_wearing.xml diff --git a/indra/newview/skins/default/xui/ru/panel_people.xml b/indra/newview/skins/default/xui/ru/panel_people.xml index 9606f0aec1..9606f0aec1 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_people.xml +++ b/indra/newview/skins/default/xui/ru/panel_people.xml diff --git a/indra/newview/skins/default/xui/ru/panel_pick_info.xml b/indra/newview/skins/default/xui/ru/panel_pick_info.xml index 373cf211fb..373cf211fb 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_pick_info.xml +++ b/indra/newview/skins/default/xui/ru/panel_pick_info.xml diff --git a/indra/newview/skins/default/xui/ru/panel_picks.xml b/indra/newview/skins/default/xui/ru/panel_picks.xml index d6770e0eeb..d6770e0eeb 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_picks.xml +++ b/indra/newview/skins/default/xui/ru/panel_picks.xml diff --git a/indra/newview/skins/default/xui/ru/panel_place_profile.xml b/indra/newview/skins/default/xui/ru/panel_place_profile.xml index b486b918ed..b486b918ed 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_place_profile.xml +++ b/indra/newview/skins/default/xui/ru/panel_place_profile.xml diff --git a/indra/newview/skins/default/xui/ru/panel_places.xml b/indra/newview/skins/default/xui/ru/panel_places.xml index 54837d3c0b..54837d3c0b 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_places.xml +++ b/indra/newview/skins/default/xui/ru/panel_places.xml diff --git a/indra/newview/skins/default/xui/ru/panel_postcard_message.xml b/indra/newview/skins/default/xui/ru/panel_postcard_message.xml index 70587d8090..70587d8090 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_postcard_message.xml +++ b/indra/newview/skins/default/xui/ru/panel_postcard_message.xml 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..100644 --- 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_advanced.xml b/indra/newview/skins/default/xui/ru/panel_preferences_advanced.xml index 90743646fd..90743646fd 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/ru/panel_preferences_advanced.xml diff --git a/indra/newview/skins/default/xui/ru/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/ru/panel_preferences_alerts.xml index 9d7ae546fd..9d7ae546fd 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_preferences_alerts.xml +++ b/indra/newview/skins/default/xui/ru/panel_preferences_alerts.xml diff --git a/indra/newview/skins/default/xui/ru/panel_preferences_chat.xml b/indra/newview/skins/default/xui/ru/panel_preferences_chat.xml index 914426c91e..914426c91e 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/ru/panel_preferences_chat.xml diff --git a/indra/newview/skins/default/xui/ru/panel_preferences_colors.xml b/indra/newview/skins/default/xui/ru/panel_preferences_colors.xml index 48c34fcbb2..48c34fcbb2 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_preferences_colors.xml +++ b/indra/newview/skins/default/xui/ru/panel_preferences_colors.xml diff --git a/indra/newview/skins/default/xui/ru/panel_preferences_general.xml b/indra/newview/skins/default/xui/ru/panel_preferences_general.xml index b15d0e3abf..b15d0e3abf 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/ru/panel_preferences_general.xml diff --git a/indra/newview/skins/default/xui/ru/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/ru/panel_preferences_graphics1.xml index c93955fcdc..c93955fcdc 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/ru/panel_preferences_graphics1.xml diff --git a/indra/newview/skins/default/xui/ru/panel_preferences_move.xml b/indra/newview/skins/default/xui/ru/panel_preferences_move.xml index a6e9b00f2a..a6e9b00f2a 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_preferences_move.xml +++ b/indra/newview/skins/default/xui/ru/panel_preferences_move.xml diff --git a/indra/newview/skins/default/xui/ru/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/ru/panel_preferences_privacy.xml index 0a5974eed1..0a5974eed1 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_preferences_privacy.xml +++ b/indra/newview/skins/default/xui/ru/panel_preferences_privacy.xml 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..100644 --- 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_preferences_sound.xml b/indra/newview/skins/default/xui/ru/panel_preferences_sound.xml index 44f270527c..44f270527c 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/ru/panel_preferences_sound.xml diff --git a/indra/newview/skins/default/xui/ru/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/ru/panel_prim_media_controls.xml index 76bb6518e9..76bb6518e9 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_prim_media_controls.xml +++ b/indra/newview/skins/default/xui/ru/panel_prim_media_controls.xml diff --git a/indra/newview/skins/default/xui/ru/panel_region_covenant.xml b/indra/newview/skins/default/xui/ru/panel_region_covenant.xml index 706a38f110..706a38f110 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_region_covenant.xml +++ b/indra/newview/skins/default/xui/ru/panel_region_covenant.xml diff --git a/indra/newview/skins/default/xui/ru/panel_region_debug.xml b/indra/newview/skins/default/xui/ru/panel_region_debug.xml index 3eaa0b19e0..3eaa0b19e0 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_region_debug.xml +++ b/indra/newview/skins/default/xui/ru/panel_region_debug.xml diff --git a/indra/newview/skins/default/xui/ru/panel_region_environment.xml b/indra/newview/skins/default/xui/ru/panel_region_environment.xml index 85be8f63bd..85be8f63bd 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_region_environment.xml +++ b/indra/newview/skins/default/xui/ru/panel_region_environment.xml diff --git a/indra/newview/skins/default/xui/ru/panel_region_estate.xml b/indra/newview/skins/default/xui/ru/panel_region_estate.xml index bcfb974fcb..bcfb974fcb 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_region_estate.xml +++ b/indra/newview/skins/default/xui/ru/panel_region_estate.xml 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_region_general.xml b/indra/newview/skins/default/xui/ru/panel_region_general.xml index 8b4a127d7e..8b4a127d7e 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_region_general.xml +++ b/indra/newview/skins/default/xui/ru/panel_region_general.xml diff --git a/indra/newview/skins/default/xui/ru/panel_region_terrain.xml b/indra/newview/skins/default/xui/ru/panel_region_terrain.xml index af25565226..af25565226 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_region_terrain.xml +++ b/indra/newview/skins/default/xui/ru/panel_region_terrain.xml diff --git a/indra/newview/skins/default/xui/ru/panel_script_ed.xml b/indra/newview/skins/default/xui/ru/panel_script_ed.xml index 54a1eaab75..54a1eaab75 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_script_ed.xml +++ b/indra/newview/skins/default/xui/ru/panel_script_ed.xml 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_script_limits_my_avatar.xml b/indra/newview/skins/default/xui/ru/panel_script_limits_my_avatar.xml index a06c465a2b..a06c465a2b 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_script_limits_my_avatar.xml +++ b/indra/newview/skins/default/xui/ru/panel_script_limits_my_avatar.xml diff --git a/indra/newview/skins/default/xui/ru/panel_script_limits_region_memory.xml b/indra/newview/skins/default/xui/ru/panel_script_limits_region_memory.xml index 189e21fd2f..189e21fd2f 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_script_limits_region_memory.xml +++ b/indra/newview/skins/default/xui/ru/panel_script_limits_region_memory.xml diff --git a/indra/newview/skins/default/xui/ru/panel_script_question_toast.xml b/indra/newview/skins/default/xui/ru/panel_script_question_toast.xml index a2d0237da0..a2d0237da0 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_script_question_toast.xml +++ b/indra/newview/skins/default/xui/ru/panel_script_question_toast.xml diff --git a/indra/newview/skins/default/xui/ru/panel_scrolling_param.xml b/indra/newview/skins/default/xui/ru/panel_scrolling_param.xml index c25f92cb8d..c25f92cb8d 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_scrolling_param.xml +++ b/indra/newview/skins/default/xui/ru/panel_scrolling_param.xml diff --git a/indra/newview/skins/default/xui/ru/panel_scrolling_param_base.xml b/indra/newview/skins/default/xui/ru/panel_scrolling_param_base.xml index fa659040ea..fa659040ea 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_scrolling_param_base.xml +++ b/indra/newview/skins/default/xui/ru/panel_scrolling_param_base.xml diff --git a/indra/newview/skins/default/xui/ru/panel_side_tray_tab_caption.xml b/indra/newview/skins/default/xui/ru/panel_side_tray_tab_caption.xml index 1a260dc31f..1a260dc31f 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_side_tray_tab_caption.xml +++ b/indra/newview/skins/default/xui/ru/panel_side_tray_tab_caption.xml 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..100644 --- 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..100644 --- 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..100644 --- 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..100644 --- 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..100644 --- 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_sound_devices.xml b/indra/newview/skins/default/xui/ru/panel_sound_devices.xml index 98dab288a3..98dab288a3 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_sound_devices.xml +++ b/indra/newview/skins/default/xui/ru/panel_sound_devices.xml diff --git a/indra/newview/skins/default/xui/ru/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/ru/panel_stand_stop_flying.xml index 81a2175fc3..81a2175fc3 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_stand_stop_flying.xml +++ b/indra/newview/skins/default/xui/ru/panel_stand_stop_flying.xml 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..100644 --- 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_teleport_history.xml b/indra/newview/skins/default/xui/ru/panel_teleport_history.xml index c457bc2269..c457bc2269 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_teleport_history.xml +++ b/indra/newview/skins/default/xui/ru/panel_teleport_history.xml diff --git a/indra/newview/skins/default/xui/ru/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/ru/panel_teleport_history_item.xml index fdcaa843ec..fdcaa843ec 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_teleport_history_item.xml +++ b/indra/newview/skins/default/xui/ru/panel_teleport_history_item.xml 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/panel_voice_effect.xml b/indra/newview/skins/default/xui/ru/panel_voice_effect.xml index de0b38198f..de0b38198f 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_voice_effect.xml +++ b/indra/newview/skins/default/xui/ru/panel_voice_effect.xml diff --git a/indra/newview/skins/default/xui/ru/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/ru/panel_volume_pulldown.xml index fe044cd083..fe044cd083 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_volume_pulldown.xml +++ b/indra/newview/skins/default/xui/ru/panel_volume_pulldown.xml diff --git a/indra/newview/skins/default/xui/ru/panel_world_map.xml b/indra/newview/skins/default/xui/ru/panel_world_map.xml index 0ab8720185..0ab8720185 100755..100644 --- a/indra/newview/skins/default/xui/ru/panel_world_map.xml +++ b/indra/newview/skins/default/xui/ru/panel_world_map.xml 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..100644 --- 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_appearance.xml b/indra/newview/skins/default/xui/ru/sidepanel_appearance.xml index a23f6134f2..a23f6134f2 100755..100644 --- a/indra/newview/skins/default/xui/ru/sidepanel_appearance.xml +++ b/indra/newview/skins/default/xui/ru/sidepanel_appearance.xml diff --git a/indra/newview/skins/default/xui/ru/sidepanel_inventory.xml b/indra/newview/skins/default/xui/ru/sidepanel_inventory.xml index 725b680050..725b680050 100755..100644 --- a/indra/newview/skins/default/xui/ru/sidepanel_inventory.xml +++ b/indra/newview/skins/default/xui/ru/sidepanel_inventory.xml 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..100644 --- 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..100644 --- 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..1617451a3a 100755..100644 --- a/indra/newview/skins/default/xui/ru/strings.xml +++ b/indra/newview/skins/default/xui/ru/strings.xml @@ -38,7 +38,7 @@ Ошибка инициализации графики. Обновите графический драйвер! </string> <string name="AboutHeader"> - [APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2] ([VIEWER_VERSION_3]) [BUILD_DATE] [BUILD_TIME] ([CHANNEL]) + [APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2].[VIEWER_VERSION_3] [BUILD_DATE] [BUILD_TIME] ([CHANNEL]) [[VIEWER_RELEASE_NOTES_URL] [ReleaseNotes]] </string> <string name="AboutCompiler"> @@ -449,30 +449,51 @@ support@secondlife.com. <string name="TooltipMustSingleDrop"> Сюда можно перетащить только одну вещь </string> + <string name="TooltipTooManyWearables"> + Нельзя носить папку, содержащую более [AMOUNT] вещей. Это ограничение можно изменить в меню «Дополнительно > Настройки отладки > 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..100644 --- 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_aaa.xml b/indra/newview/skins/default/xui/tr/floater_aaa.xml index d663ec1a5b..d663ec1a5b 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_aaa.xml +++ b/indra/newview/skins/default/xui/tr/floater_aaa.xml 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..100644 --- 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"> - <nolink>[HOSTNAME]</nolink> ([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: <nolink>[SLURL]</nolink> -(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'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'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..100644 --- 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_activeim.xml b/indra/newview/skins/default/xui/tr/floater_activeim.xml index f3f66b942f..f3f66b942f 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_activeim.xml +++ b/indra/newview/skins/default/xui/tr/floater_activeim.xml diff --git a/indra/newview/skins/default/xui/tr/floater_animation_anim_preview.xml b/indra/newview/skins/default/xui/tr/floater_animation_anim_preview.xml index a63e1e107e..a63e1e107e 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_animation_anim_preview.xml +++ b/indra/newview/skins/default/xui/tr/floater_animation_anim_preview.xml diff --git a/indra/newview/skins/default/xui/tr/floater_animation_bvh_preview.xml b/indra/newview/skins/default/xui/tr/floater_animation_bvh_preview.xml index f8800c674d..c4e2fd2a93 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_animation_bvh_preview.xml +++ b/indra/newview/skins/default/xui/tr/floater_animation_bvh_preview.xml @@ -141,35 +141,35 @@ Maksimum animasyon uzunluğu [LENGTH] saniye. İfade </text> <combo_box name="emote_combo" tool_tip="Yüzün animasyon sırasındaki ifadesini kontrol eder"> - <item label="(Hiçbiri)" name="[None]" value=""/> - <item label="Aaaaah" name="Aaaaah" value="Aaaaah"/> - <item label="Korkmuş" name="Afraid" value="Korkmuş"/> - <item label="Kızgın" name="Angry" value="Kızgın"/> - <item label="Yaygın Gülümseyiş" name="BigSmile" value="Yaygın Gülümseyiş"/> - <item label="Canı Sıkılmış" name="Bored" value="Canı Sıkılmış"/> - <item label="Ağlama" name="Cry" value="Ağlama"/> - <item label="Dudak Bükme" name="Disdain" value="Dudak Bükme"/> - <item label="Utanmış" name="Embarrassed" value="Utanmış"/> - <item label="Kaş Çatma" name="Frown" value="Kaş Çatma"/> - <item label="Öpücük" name="Kiss" value="Öpücük"/> - <item label="Gülme" name="Laugh" value="Gülme"/> - <item label="Kahkaha" name="Plllppt" value="Kahkaha"/> - <item label="Tiksinmiş" name="Repulsed" value="Tiksinmiş"/> - <item label="Üzgün" name="Sad" value="Üzgün"/> - <item label="Omuz Silkme" name="Shrug" value="Omuz Silkme"/> - <item label="Gülümseme" name="Smile" value="Gülümseme"/> - <item label="Sürpriz" name="Surprise" value="Sürpriz"/> - <item label="Göz Kırpma" name="Wink" value="Göz Kırpma"/> - <item label="Endişelenme" name="Worry" value="Endişelenme"/> + <item label="(Hiçbiri)" name="[None]"/> + <item label="Aaaaah" name="Aaaaah"/> + <item label="Korkmuş" name="Afraid"/> + <item label="Kızgın" name="Angry"/> + <item label="Yaygın Gülümseyiş" name="BigSmile"/> + <item label="Canı Sıkılmış" name="Bored"/> + <item label="Ağlama" name="Cry"/> + <item label="Dudak Bükme" name="Disdain"/> + <item label="Utanmış" name="Embarrassed"/> + <item label="Kaş Çatma" name="Frown"/> + <item label="Öpücük" name="Kiss"/> + <item label="Gülme" name="Laugh"/> + <item label="Kahkaha" name="Plllppt"/> + <item label="Tiksinmiş" name="Repulsed"/> + <item label="Üzgün" name="Sad"/> + <item label="Omuz Silkme" name="Shrug"/> + <item label="Gülümseme" name="Smile"/> + <item label="Sürpriz" name="Surprise"/> + <item label="Göz Kırpma" name="Wink"/> + <item label="Endişelenme" name="Worry"/> </combo_box> <text name="preview_label"> Şu sırada önizle </text> <combo_box name="preview_base_anim" tool_tip="Animasyon davranışınızı avatarınız genel hareketleri yaparken test etmek için bunu kullanın."> - <item label="Ayakta Duruyor" name="Standing" value="Ayakta Duruyor"/> - <item label="Yürüyor" name="Walking" value="Yürüyor"/> - <item label="Oturuyor" name="Sitting" value="Oturuyor"/> - <item label="Uçuyor" name="Flying" value="Uçuyor"/> + <item label="Ayakta Duruyor" name="Standing"/> + <item label="Yürüyor" name="Walking"/> + <item label="Oturuyor" name="Sitting"/> + <item label="Uçuyor" name="Flying"/> </combo_box> <spinner label="Yavaş Başlangıç (saniye)" name="ease_in_time" tool_tip="Animasyonun kaynaştığı süre (saniye olarak)"/> <spinner label="Yavaş Bitiş (saniye)" name="ease_out_time" tool_tip="Animasyonun ayrıştığı süre (saniye olarak)"/> 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_auction.xml b/indra/newview/skins/default/xui/tr/floater_auction.xml index 3c945a9c96..3c945a9c96 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_auction.xml +++ b/indra/newview/skins/default/xui/tr/floater_auction.xml diff --git a/indra/newview/skins/default/xui/tr/floater_autoreplace.xml b/indra/newview/skins/default/xui/tr/floater_autoreplace.xml index e52e05dc61..e52e05dc61 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_autoreplace.xml +++ b/indra/newview/skins/default/xui/tr/floater_autoreplace.xml diff --git a/indra/newview/skins/default/xui/tr/floater_avatar.xml b/indra/newview/skins/default/xui/tr/floater_avatar.xml index c6b14ba710..c6b14ba710 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_avatar.xml +++ b/indra/newview/skins/default/xui/tr/floater_avatar.xml diff --git a/indra/newview/skins/default/xui/tr/floater_avatar_picker.xml b/indra/newview/skins/default/xui/tr/floater_avatar_picker.xml index 99c2aae5a3..99c2aae5a3 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_avatar_picker.xml +++ b/indra/newview/skins/default/xui/tr/floater_avatar_picker.xml diff --git a/indra/newview/skins/default/xui/tr/floater_avatar_textures.xml b/indra/newview/skins/default/xui/tr/floater_avatar_textures.xml index b519cfa1a9..b519cfa1a9 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_avatar_textures.xml +++ b/indra/newview/skins/default/xui/tr/floater_avatar_textures.xml diff --git a/indra/newview/skins/default/xui/tr/floater_beacons.xml b/indra/newview/skins/default/xui/tr/floater_beacons.xml index 08ebf36be5..08ebf36be5 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_beacons.xml +++ b/indra/newview/skins/default/xui/tr/floater_beacons.xml diff --git a/indra/newview/skins/default/xui/tr/floater_build_options.xml b/indra/newview/skins/default/xui/tr/floater_build_options.xml index 5e77f6b168..5e77f6b168 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_build_options.xml +++ b/indra/newview/skins/default/xui/tr/floater_build_options.xml diff --git a/indra/newview/skins/default/xui/tr/floater_bulk_perms.xml b/indra/newview/skins/default/xui/tr/floater_bulk_perms.xml index bf4473ce1f..bf4473ce1f 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_bulk_perms.xml +++ b/indra/newview/skins/default/xui/tr/floater_bulk_perms.xml diff --git a/indra/newview/skins/default/xui/tr/floater_bumps.xml b/indra/newview/skins/default/xui/tr/floater_bumps.xml index 06ae3a2ec3..06ae3a2ec3 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_bumps.xml +++ b/indra/newview/skins/default/xui/tr/floater_bumps.xml diff --git a/indra/newview/skins/default/xui/tr/floater_buy_contents.xml b/indra/newview/skins/default/xui/tr/floater_buy_contents.xml index 9012189ce5..9012189ce5 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_buy_contents.xml +++ b/indra/newview/skins/default/xui/tr/floater_buy_contents.xml diff --git a/indra/newview/skins/default/xui/tr/floater_buy_currency.xml b/indra/newview/skins/default/xui/tr/floater_buy_currency.xml index d90985dcff..d90985dcff 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_buy_currency.xml +++ b/indra/newview/skins/default/xui/tr/floater_buy_currency.xml diff --git a/indra/newview/skins/default/xui/tr/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/tr/floater_buy_currency_html.xml index 98aaf50db0..98aaf50db0 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_buy_currency_html.xml +++ b/indra/newview/skins/default/xui/tr/floater_buy_currency_html.xml diff --git a/indra/newview/skins/default/xui/tr/floater_buy_land.xml b/indra/newview/skins/default/xui/tr/floater_buy_land.xml index 7b43af2ea4..7b43af2ea4 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_buy_land.xml +++ b/indra/newview/skins/default/xui/tr/floater_buy_land.xml diff --git a/indra/newview/skins/default/xui/tr/floater_buy_object.xml b/indra/newview/skins/default/xui/tr/floater_buy_object.xml index 91ef05fb29..91ef05fb29 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_buy_object.xml +++ b/indra/newview/skins/default/xui/tr/floater_buy_object.xml diff --git a/indra/newview/skins/default/xui/tr/floater_camera.xml b/indra/newview/skins/default/xui/tr/floater_camera.xml index 22e2aa52c6..22e2aa52c6 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_camera.xml +++ b/indra/newview/skins/default/xui/tr/floater_camera.xml diff --git a/indra/newview/skins/default/xui/tr/floater_chat_bar.xml b/indra/newview/skins/default/xui/tr/floater_chat_bar.xml index cd999b4b7a..cd999b4b7a 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_chat_bar.xml +++ b/indra/newview/skins/default/xui/tr/floater_chat_bar.xml diff --git a/indra/newview/skins/default/xui/tr/floater_choose_group.xml b/indra/newview/skins/default/xui/tr/floater_choose_group.xml index 1bfc772f4a..1bfc772f4a 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_choose_group.xml +++ b/indra/newview/skins/default/xui/tr/floater_choose_group.xml diff --git a/indra/newview/skins/default/xui/tr/floater_color_picker.xml b/indra/newview/skins/default/xui/tr/floater_color_picker.xml index c9465fff83..c9465fff83 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_color_picker.xml +++ b/indra/newview/skins/default/xui/tr/floater_color_picker.xml diff --git a/indra/newview/skins/default/xui/tr/floater_critical.xml b/indra/newview/skins/default/xui/tr/floater_critical.xml index 041a303bae..041a303bae 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_critical.xml +++ b/indra/newview/skins/default/xui/tr/floater_critical.xml diff --git a/indra/newview/skins/default/xui/tr/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/tr/floater_delete_env_preset.xml index 915770f727..915770f727 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_delete_env_preset.xml +++ b/indra/newview/skins/default/xui/tr/floater_delete_env_preset.xml diff --git a/indra/newview/skins/default/xui/tr/floater_destinations.xml b/indra/newview/skins/default/xui/tr/floater_destinations.xml index 4504366d63..4504366d63 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_destinations.xml +++ b/indra/newview/skins/default/xui/tr/floater_destinations.xml diff --git a/indra/newview/skins/default/xui/tr/floater_display_name.xml b/indra/newview/skins/default/xui/tr/floater_display_name.xml index e39be5a24b..e39be5a24b 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_display_name.xml +++ b/indra/newview/skins/default/xui/tr/floater_display_name.xml diff --git a/indra/newview/skins/default/xui/tr/floater_edit_day_cycle.xml b/indra/newview/skins/default/xui/tr/floater_edit_day_cycle.xml index 4be1068dcc..4be1068dcc 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_edit_day_cycle.xml +++ b/indra/newview/skins/default/xui/tr/floater_edit_day_cycle.xml 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_edit_sky_preset.xml b/indra/newview/skins/default/xui/tr/floater_edit_sky_preset.xml index 0e9f86148d..0e9f86148d 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_edit_sky_preset.xml +++ b/indra/newview/skins/default/xui/tr/floater_edit_sky_preset.xml diff --git a/indra/newview/skins/default/xui/tr/floater_edit_water_preset.xml b/indra/newview/skins/default/xui/tr/floater_edit_water_preset.xml index 2ddee32bad..2ddee32bad 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_edit_water_preset.xml +++ b/indra/newview/skins/default/xui/tr/floater_edit_water_preset.xml diff --git a/indra/newview/skins/default/xui/tr/floater_environment_settings.xml b/indra/newview/skins/default/xui/tr/floater_environment_settings.xml index e702da7e1b..e702da7e1b 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_environment_settings.xml +++ b/indra/newview/skins/default/xui/tr/floater_environment_settings.xml diff --git a/indra/newview/skins/default/xui/tr/floater_event.xml b/indra/newview/skins/default/xui/tr/floater_event.xml index 60dece124b..60dece124b 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_event.xml +++ b/indra/newview/skins/default/xui/tr/floater_event.xml 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"> + "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 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'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_fast_timers.xml b/indra/newview/skins/default/xui/tr/floater_fast_timers.xml index 5736bda45e..5736bda45e 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_fast_timers.xml +++ b/indra/newview/skins/default/xui/tr/floater_fast_timers.xml diff --git a/indra/newview/skins/default/xui/tr/floater_font_test.xml b/indra/newview/skins/default/xui/tr/floater_font_test.xml index 5371d5d2a4..5371d5d2a4 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_font_test.xml +++ b/indra/newview/skins/default/xui/tr/floater_font_test.xml diff --git a/indra/newview/skins/default/xui/tr/floater_gesture.xml b/indra/newview/skins/default/xui/tr/floater_gesture.xml index 5f5d28ad6c..5f5d28ad6c 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_gesture.xml +++ b/indra/newview/skins/default/xui/tr/floater_gesture.xml diff --git a/indra/newview/skins/default/xui/tr/floater_god_tools.xml b/indra/newview/skins/default/xui/tr/floater_god_tools.xml index 26e5ebd18b..26e5ebd18b 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_god_tools.xml +++ b/indra/newview/skins/default/xui/tr/floater_god_tools.xml diff --git a/indra/newview/skins/default/xui/tr/floater_hardware_settings.xml b/indra/newview/skins/default/xui/tr/floater_hardware_settings.xml index b204389083..b204389083 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_hardware_settings.xml +++ b/indra/newview/skins/default/xui/tr/floater_hardware_settings.xml diff --git a/indra/newview/skins/default/xui/tr/floater_help_browser.xml b/indra/newview/skins/default/xui/tr/floater_help_browser.xml index 695f838936..695f838936 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_help_browser.xml +++ b/indra/newview/skins/default/xui/tr/floater_help_browser.xml diff --git a/indra/newview/skins/default/xui/tr/floater_how_to.xml b/indra/newview/skins/default/xui/tr/floater_how_to.xml index a42fe0b122..a42fe0b122 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_how_to.xml +++ b/indra/newview/skins/default/xui/tr/floater_how_to.xml diff --git a/indra/newview/skins/default/xui/tr/floater_hud.xml b/indra/newview/skins/default/xui/tr/floater_hud.xml index 09f119bbc1..09f119bbc1 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_hud.xml +++ b/indra/newview/skins/default/xui/tr/floater_hud.xml diff --git a/indra/newview/skins/default/xui/tr/floater_im_container.xml b/indra/newview/skins/default/xui/tr/floater_im_container.xml index 6504430b3c..6504430b3c 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_im_container.xml +++ b/indra/newview/skins/default/xui/tr/floater_im_container.xml diff --git a/indra/newview/skins/default/xui/tr/floater_im_session.xml b/indra/newview/skins/default/xui/tr/floater_im_session.xml index 52a10feeef..52a10feeef 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_im_session.xml +++ b/indra/newview/skins/default/xui/tr/floater_im_session.xml diff --git a/indra/newview/skins/default/xui/tr/floater_image_preview.xml b/indra/newview/skins/default/xui/tr/floater_image_preview.xml index a5963bdf63..a5963bdf63 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_image_preview.xml +++ b/indra/newview/skins/default/xui/tr/floater_image_preview.xml diff --git a/indra/newview/skins/default/xui/tr/floater_import_collada.xml b/indra/newview/skins/default/xui/tr/floater_import_collada.xml index 1e77d1b376..1e77d1b376 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_import_collada.xml +++ b/indra/newview/skins/default/xui/tr/floater_import_collada.xml diff --git a/indra/newview/skins/default/xui/tr/floater_incoming_call.xml b/indra/newview/skins/default/xui/tr/floater_incoming_call.xml index 0f2b27241e..0f2b27241e 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_incoming_call.xml +++ b/indra/newview/skins/default/xui/tr/floater_incoming_call.xml diff --git a/indra/newview/skins/default/xui/tr/floater_inspect.xml b/indra/newview/skins/default/xui/tr/floater_inspect.xml index 09130a31f3..09130a31f3 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_inspect.xml +++ b/indra/newview/skins/default/xui/tr/floater_inspect.xml 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..100644 --- 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..100644 --- 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_joystick.xml b/indra/newview/skins/default/xui/tr/floater_joystick.xml index 4a27aac3c1..4a27aac3c1 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_joystick.xml +++ b/indra/newview/skins/default/xui/tr/floater_joystick.xml 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_land_holdings.xml b/indra/newview/skins/default/xui/tr/floater_land_holdings.xml index a075a93c1e..a075a93c1e 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_land_holdings.xml +++ b/indra/newview/skins/default/xui/tr/floater_land_holdings.xml 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..100644 --- 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=">" name="view_profile"/> </floater> diff --git a/indra/newview/skins/default/xui/tr/floater_lsl_guide.xml b/indra/newview/skins/default/xui/tr/floater_lsl_guide.xml index 0b898d6032..0b898d6032 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_lsl_guide.xml +++ b/indra/newview/skins/default/xui/tr/floater_lsl_guide.xml diff --git a/indra/newview/skins/default/xui/tr/floater_map.xml b/indra/newview/skins/default/xui/tr/floater_map.xml index 7d6c314f04..7d6c314f04 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_map.xml +++ b/indra/newview/skins/default/xui/tr/floater_map.xml 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_media_browser.xml b/indra/newview/skins/default/xui/tr/floater_media_browser.xml index 6cce4d59b8..6cce4d59b8 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_media_browser.xml +++ b/indra/newview/skins/default/xui/tr/floater_media_browser.xml diff --git a/indra/newview/skins/default/xui/tr/floater_media_settings.xml b/indra/newview/skins/default/xui/tr/floater_media_settings.xml index 4205a0dbef..4205a0dbef 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_media_settings.xml +++ b/indra/newview/skins/default/xui/tr/floater_media_settings.xml diff --git a/indra/newview/skins/default/xui/tr/floater_mem_leaking.xml b/indra/newview/skins/default/xui/tr/floater_mem_leaking.xml index ba87ee99a4..ba87ee99a4 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_mem_leaking.xml +++ b/indra/newview/skins/default/xui/tr/floater_mem_leaking.xml diff --git a/indra/newview/skins/default/xui/tr/floater_merchant_outbox.xml b/indra/newview/skins/default/xui/tr/floater_merchant_outbox.xml index 325d1d9ed9..325d1d9ed9 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_merchant_outbox.xml +++ b/indra/newview/skins/default/xui/tr/floater_merchant_outbox.xml diff --git a/indra/newview/skins/default/xui/tr/floater_model_preview.xml b/indra/newview/skins/default/xui/tr/floater_model_preview.xml index c00cadd3bd..c00cadd3bd 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_model_preview.xml +++ b/indra/newview/skins/default/xui/tr/floater_model_preview.xml diff --git a/indra/newview/skins/default/xui/tr/floater_moveview.xml b/indra/newview/skins/default/xui/tr/floater_moveview.xml index 9226218a24..9226218a24 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_moveview.xml +++ b/indra/newview/skins/default/xui/tr/floater_moveview.xml diff --git a/indra/newview/skins/default/xui/tr/floater_mute_object.xml b/indra/newview/skins/default/xui/tr/floater_mute_object.xml index becad38a8e..becad38a8e 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_mute_object.xml +++ b/indra/newview/skins/default/xui/tr/floater_mute_object.xml diff --git a/indra/newview/skins/default/xui/tr/floater_my_appearance.xml b/indra/newview/skins/default/xui/tr/floater_my_appearance.xml index 4d71187a1f..4d71187a1f 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_my_appearance.xml +++ b/indra/newview/skins/default/xui/tr/floater_my_appearance.xml diff --git a/indra/newview/skins/default/xui/tr/floater_my_inventory.xml b/indra/newview/skins/default/xui/tr/floater_my_inventory.xml index 8c62692a88..8c62692a88 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_my_inventory.xml +++ b/indra/newview/skins/default/xui/tr/floater_my_inventory.xml diff --git a/indra/newview/skins/default/xui/tr/floater_notification.xml b/indra/newview/skins/default/xui/tr/floater_notification.xml index 89a56348f6..89a56348f6 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_notification.xml +++ b/indra/newview/skins/default/xui/tr/floater_notification.xml diff --git a/indra/newview/skins/default/xui/tr/floater_notifications_console.xml b/indra/newview/skins/default/xui/tr/floater_notifications_console.xml index e4eaf2cf9e..e4eaf2cf9e 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_notifications_console.xml +++ b/indra/newview/skins/default/xui/tr/floater_notifications_console.xml diff --git a/indra/newview/skins/default/xui/tr/floater_object_weights.xml b/indra/newview/skins/default/xui/tr/floater_object_weights.xml index b57943f666..b57943f666 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_object_weights.xml +++ b/indra/newview/skins/default/xui/tr/floater_object_weights.xml 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..100644 --- 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_outfit_save_as.xml b/indra/newview/skins/default/xui/tr/floater_outfit_save_as.xml index 7a9f507c93..7a9f507c93 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_outfit_save_as.xml +++ b/indra/newview/skins/default/xui/tr/floater_outfit_save_as.xml diff --git a/indra/newview/skins/default/xui/tr/floater_outgoing_call.xml b/indra/newview/skins/default/xui/tr/floater_outgoing_call.xml index 7ba4580f4f..7ba4580f4f 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_outgoing_call.xml +++ b/indra/newview/skins/default/xui/tr/floater_outgoing_call.xml diff --git a/indra/newview/skins/default/xui/tr/floater_pathfinding_characters.xml b/indra/newview/skins/default/xui/tr/floater_pathfinding_characters.xml index f38d8c84c6..f38d8c84c6 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_pathfinding_characters.xml +++ b/indra/newview/skins/default/xui/tr/floater_pathfinding_characters.xml diff --git a/indra/newview/skins/default/xui/tr/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/tr/floater_pathfinding_console.xml index 6eecc7fb77..6eecc7fb77 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_pathfinding_console.xml +++ b/indra/newview/skins/default/xui/tr/floater_pathfinding_console.xml diff --git a/indra/newview/skins/default/xui/tr/floater_pathfinding_linksets.xml b/indra/newview/skins/default/xui/tr/floater_pathfinding_linksets.xml index 2e416c9311..2e416c9311 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_pathfinding_linksets.xml +++ b/indra/newview/skins/default/xui/tr/floater_pathfinding_linksets.xml 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..100644 --- 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..100644 --- 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_people.xml b/indra/newview/skins/default/xui/tr/floater_people.xml index 94a27bff57..94a27bff57 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_people.xml +++ b/indra/newview/skins/default/xui/tr/floater_people.xml diff --git a/indra/newview/skins/default/xui/tr/floater_perm_prefs.xml b/indra/newview/skins/default/xui/tr/floater_perm_prefs.xml index 669b833c26..669b833c26 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_perm_prefs.xml +++ b/indra/newview/skins/default/xui/tr/floater_perm_prefs.xml diff --git a/indra/newview/skins/default/xui/tr/floater_picks.xml b/indra/newview/skins/default/xui/tr/floater_picks.xml index 513a2e319a..513a2e319a 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_picks.xml +++ b/indra/newview/skins/default/xui/tr/floater_picks.xml diff --git a/indra/newview/skins/default/xui/tr/floater_places.xml b/indra/newview/skins/default/xui/tr/floater_places.xml index 4e09a699f6..4e09a699f6 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_places.xml +++ b/indra/newview/skins/default/xui/tr/floater_places.xml diff --git a/indra/newview/skins/default/xui/tr/floater_post_process.xml b/indra/newview/skins/default/xui/tr/floater_post_process.xml index 5e419f8ffa..5e419f8ffa 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_post_process.xml +++ b/indra/newview/skins/default/xui/tr/floater_post_process.xml diff --git a/indra/newview/skins/default/xui/tr/floater_preferences.xml b/indra/newview/skins/default/xui/tr/floater_preferences.xml index edb3c19b81..edb3c19b81 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_preferences.xml +++ b/indra/newview/skins/default/xui/tr/floater_preferences.xml diff --git a/indra/newview/skins/default/xui/tr/floater_preferences_proxy.xml b/indra/newview/skins/default/xui/tr/floater_preferences_proxy.xml index 1c462e6ebf..1c462e6ebf 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_preferences_proxy.xml +++ b/indra/newview/skins/default/xui/tr/floater_preferences_proxy.xml diff --git a/indra/newview/skins/default/xui/tr/floater_preview_animation.xml b/indra/newview/skins/default/xui/tr/floater_preview_animation.xml index 23b4848333..23b4848333 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_preview_animation.xml +++ b/indra/newview/skins/default/xui/tr/floater_preview_animation.xml diff --git a/indra/newview/skins/default/xui/tr/floater_preview_gesture.xml b/indra/newview/skins/default/xui/tr/floater_preview_gesture.xml index dc6f66f657..dc6f66f657 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_preview_gesture.xml +++ b/indra/newview/skins/default/xui/tr/floater_preview_gesture.xml diff --git a/indra/newview/skins/default/xui/tr/floater_preview_notecard.xml b/indra/newview/skins/default/xui/tr/floater_preview_notecard.xml index 23391249d1..23391249d1 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_preview_notecard.xml +++ b/indra/newview/skins/default/xui/tr/floater_preview_notecard.xml diff --git a/indra/newview/skins/default/xui/tr/floater_preview_sound.xml b/indra/newview/skins/default/xui/tr/floater_preview_sound.xml index 50874f024a..50874f024a 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_preview_sound.xml +++ b/indra/newview/skins/default/xui/tr/floater_preview_sound.xml diff --git a/indra/newview/skins/default/xui/tr/floater_preview_texture.xml b/indra/newview/skins/default/xui/tr/floater_preview_texture.xml index 79e184130a..79e184130a 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_preview_texture.xml +++ b/indra/newview/skins/default/xui/tr/floater_preview_texture.xml diff --git a/indra/newview/skins/default/xui/tr/floater_price_for_listing.xml b/indra/newview/skins/default/xui/tr/floater_price_for_listing.xml index 5cdd25b64c..5cdd25b64c 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_price_for_listing.xml +++ b/indra/newview/skins/default/xui/tr/floater_price_for_listing.xml diff --git a/indra/newview/skins/default/xui/tr/floater_publish_classified.xml b/indra/newview/skins/default/xui/tr/floater_publish_classified.xml index 572892667b..572892667b 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_publish_classified.xml +++ b/indra/newview/skins/default/xui/tr/floater_publish_classified.xml diff --git a/indra/newview/skins/default/xui/tr/floater_region_debug_console.xml b/indra/newview/skins/default/xui/tr/floater_region_debug_console.xml index e2a5e8e86a..e2a5e8e86a 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_region_debug_console.xml +++ b/indra/newview/skins/default/xui/tr/floater_region_debug_console.xml diff --git a/indra/newview/skins/default/xui/tr/floater_region_info.xml b/indra/newview/skins/default/xui/tr/floater_region_info.xml index 2b2e00161b..2b2e00161b 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_region_info.xml +++ b/indra/newview/skins/default/xui/tr/floater_region_info.xml 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..100644 --- 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 > Tecavüz > Nesneler veya dokular" name="Land__Encroachment__Objects_textures"/> <combo_box.item label="Arazi > Tecavvüz > Parçacıklar" name="Land__Encroachment__Particles"/> <combo_box.item label="Arazi > Tecavvüz > 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_script_debug.xml b/indra/newview/skins/default/xui/tr/floater_script_debug.xml index baf0aabd85..baf0aabd85 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_script_debug.xml +++ b/indra/newview/skins/default/xui/tr/floater_script_debug.xml diff --git a/indra/newview/skins/default/xui/tr/floater_script_debug_panel.xml b/indra/newview/skins/default/xui/tr/floater_script_debug_panel.xml index e70a30fa24..e70a30fa24 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_script_debug_panel.xml +++ b/indra/newview/skins/default/xui/tr/floater_script_debug_panel.xml diff --git a/indra/newview/skins/default/xui/tr/floater_script_limits.xml b/indra/newview/skins/default/xui/tr/floater_script_limits.xml index 875599bde3..875599bde3 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_script_limits.xml +++ b/indra/newview/skins/default/xui/tr/floater_script_limits.xml diff --git a/indra/newview/skins/default/xui/tr/floater_script_preview.xml b/indra/newview/skins/default/xui/tr/floater_script_preview.xml index e193f7c1af..e193f7c1af 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_script_preview.xml +++ b/indra/newview/skins/default/xui/tr/floater_script_preview.xml diff --git a/indra/newview/skins/default/xui/tr/floater_script_queue.xml b/indra/newview/skins/default/xui/tr/floater_script_queue.xml index c1d98b717a..c1d98b717a 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_script_queue.xml +++ b/indra/newview/skins/default/xui/tr/floater_script_queue.xml diff --git a/indra/newview/skins/default/xui/tr/floater_script_search.xml b/indra/newview/skins/default/xui/tr/floater_script_search.xml index 54b1d20c8c..54b1d20c8c 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_script_search.xml +++ b/indra/newview/skins/default/xui/tr/floater_script_search.xml diff --git a/indra/newview/skins/default/xui/tr/floater_search.xml b/indra/newview/skins/default/xui/tr/floater_search.xml index 08c1e5162c..08c1e5162c 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_search.xml +++ b/indra/newview/skins/default/xui/tr/floater_search.xml diff --git a/indra/newview/skins/default/xui/tr/floater_select_key.xml b/indra/newview/skins/default/xui/tr/floater_select_key.xml index b828672ec2..b828672ec2 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_select_key.xml +++ b/indra/newview/skins/default/xui/tr/floater_select_key.xml diff --git a/indra/newview/skins/default/xui/tr/floater_sell_land.xml b/indra/newview/skins/default/xui/tr/floater_sell_land.xml index 9bea1e120e..9bea1e120e 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_sell_land.xml +++ b/indra/newview/skins/default/xui/tr/floater_sell_land.xml diff --git a/indra/newview/skins/default/xui/tr/floater_settings_debug.xml b/indra/newview/skins/default/xui/tr/floater_settings_debug.xml index 65264c57d7..65264c57d7 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_settings_debug.xml +++ b/indra/newview/skins/default/xui/tr/floater_settings_debug.xml 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..100644 --- 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_sound_devices.xml b/indra/newview/skins/default/xui/tr/floater_sound_devices.xml index 470a222d7e..470a222d7e 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_sound_devices.xml +++ b/indra/newview/skins/default/xui/tr/floater_sound_devices.xml diff --git a/indra/newview/skins/default/xui/tr/floater_sound_preview.xml b/indra/newview/skins/default/xui/tr/floater_sound_preview.xml index 1938f184b3..1938f184b3 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_sound_preview.xml +++ b/indra/newview/skins/default/xui/tr/floater_sound_preview.xml diff --git a/indra/newview/skins/default/xui/tr/floater_spellcheck.xml b/indra/newview/skins/default/xui/tr/floater_spellcheck.xml index f5f0ba8fd9..f5f0ba8fd9 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_spellcheck.xml +++ b/indra/newview/skins/default/xui/tr/floater_spellcheck.xml diff --git a/indra/newview/skins/default/xui/tr/floater_spellcheck_import.xml b/indra/newview/skins/default/xui/tr/floater_spellcheck_import.xml index ded71cad40..ded71cad40 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_spellcheck_import.xml +++ b/indra/newview/skins/default/xui/tr/floater_spellcheck_import.xml diff --git a/indra/newview/skins/default/xui/tr/floater_stats.xml b/indra/newview/skins/default/xui/tr/floater_stats.xml index 1ae42ad382..1ae42ad382 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_stats.xml +++ b/indra/newview/skins/default/xui/tr/floater_stats.xml diff --git a/indra/newview/skins/default/xui/tr/floater_sys_well.xml b/indra/newview/skins/default/xui/tr/floater_sys_well.xml index 301d9af063..301d9af063 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_sys_well.xml +++ b/indra/newview/skins/default/xui/tr/floater_sys_well.xml diff --git a/indra/newview/skins/default/xui/tr/floater_telehub.xml b/indra/newview/skins/default/xui/tr/floater_telehub.xml index 2cdb464ed0..2cdb464ed0 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_telehub.xml +++ b/indra/newview/skins/default/xui/tr/floater_telehub.xml diff --git a/indra/newview/skins/default/xui/tr/floater_test_layout_stacks.xml b/indra/newview/skins/default/xui/tr/floater_test_layout_stacks.xml index b479d5f6d6..b479d5f6d6 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_test_layout_stacks.xml +++ b/indra/newview/skins/default/xui/tr/floater_test_layout_stacks.xml diff --git a/indra/newview/skins/default/xui/tr/floater_test_text_vertical_aligment.xml b/indra/newview/skins/default/xui/tr/floater_test_text_vertical_aligment.xml index fcb7d87287..fcb7d87287 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_test_text_vertical_aligment.xml +++ b/indra/newview/skins/default/xui/tr/floater_test_text_vertical_aligment.xml diff --git a/indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml index 42483c09e1..42483c09e1 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml +++ b/indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml diff --git a/indra/newview/skins/default/xui/tr/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/tr/floater_texture_fetch_debugger.xml index 42426225c7..42426225c7 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_texture_fetch_debugger.xml +++ b/indra/newview/skins/default/xui/tr/floater_texture_fetch_debugger.xml diff --git a/indra/newview/skins/default/xui/tr/floater_tools.xml b/indra/newview/skins/default/xui/tr/floater_tools.xml index 56df06f83b..56df06f83b 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_tools.xml +++ b/indra/newview/skins/default/xui/tr/floater_tools.xml 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..100644 --- 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'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'ler" name="URLs"/> <scroll_list.columns label="Bellek (KB)" name="memory"/> </scroll_list> diff --git a/indra/newview/skins/default/xui/tr/floater_tos.xml b/indra/newview/skins/default/xui/tr/floater_tos.xml index 7ff0001ddd..7ff0001ddd 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_tos.xml +++ b/indra/newview/skins/default/xui/tr/floater_tos.xml diff --git a/indra/newview/skins/default/xui/tr/floater_toybox.xml b/indra/newview/skins/default/xui/tr/floater_toybox.xml index e60e176643..e60e176643 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_toybox.xml +++ b/indra/newview/skins/default/xui/tr/floater_toybox.xml diff --git a/indra/newview/skins/default/xui/tr/floater_translation_settings.xml b/indra/newview/skins/default/xui/tr/floater_translation_settings.xml index 33ce76bd9a..33ce76bd9a 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_translation_settings.xml +++ b/indra/newview/skins/default/xui/tr/floater_translation_settings.xml 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/floater_url_entry.xml b/indra/newview/skins/default/xui/tr/floater_url_entry.xml index 54c5b047a8..54c5b047a8 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_url_entry.xml +++ b/indra/newview/skins/default/xui/tr/floater_url_entry.xml diff --git a/indra/newview/skins/default/xui/tr/floater_voice_controls.xml b/indra/newview/skins/default/xui/tr/floater_voice_controls.xml index 5ff0804f17..5ff0804f17 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_voice_controls.xml +++ b/indra/newview/skins/default/xui/tr/floater_voice_controls.xml diff --git a/indra/newview/skins/default/xui/tr/floater_voice_effect.xml b/indra/newview/skins/default/xui/tr/floater_voice_effect.xml index 7a157244cd..7a157244cd 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_voice_effect.xml +++ b/indra/newview/skins/default/xui/tr/floater_voice_effect.xml diff --git a/indra/newview/skins/default/xui/tr/floater_web_content.xml b/indra/newview/skins/default/xui/tr/floater_web_content.xml index 93491b80fb..93491b80fb 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_web_content.xml +++ b/indra/newview/skins/default/xui/tr/floater_web_content.xml diff --git a/indra/newview/skins/default/xui/tr/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/tr/floater_whitelist_entry.xml index 1a9f731af0..1a9f731af0 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_whitelist_entry.xml +++ b/indra/newview/skins/default/xui/tr/floater_whitelist_entry.xml diff --git a/indra/newview/skins/default/xui/tr/floater_window_size.xml b/indra/newview/skins/default/xui/tr/floater_window_size.xml index aff20e7960..aff20e7960 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_window_size.xml +++ b/indra/newview/skins/default/xui/tr/floater_window_size.xml diff --git a/indra/newview/skins/default/xui/tr/floater_world_map.xml b/indra/newview/skins/default/xui/tr/floater_world_map.xml index e4729c2aed..e4729c2aed 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_world_map.xml +++ b/indra/newview/skins/default/xui/tr/floater_world_map.xml diff --git a/indra/newview/skins/default/xui/tr/inspect_avatar.xml b/indra/newview/skins/default/xui/tr/inspect_avatar.xml index cb3c7e9282..cb3c7e9282 100755..100644 --- a/indra/newview/skins/default/xui/tr/inspect_avatar.xml +++ b/indra/newview/skins/default/xui/tr/inspect_avatar.xml diff --git a/indra/newview/skins/default/xui/tr/inspect_group.xml b/indra/newview/skins/default/xui/tr/inspect_group.xml index 9b130c9ef6..9b130c9ef6 100755..100644 --- a/indra/newview/skins/default/xui/tr/inspect_group.xml +++ b/indra/newview/skins/default/xui/tr/inspect_group.xml diff --git a/indra/newview/skins/default/xui/tr/inspect_object.xml b/indra/newview/skins/default/xui/tr/inspect_object.xml index bd09267319..bd09267319 100755..100644 --- a/indra/newview/skins/default/xui/tr/inspect_object.xml +++ b/indra/newview/skins/default/xui/tr/inspect_object.xml diff --git a/indra/newview/skins/default/xui/tr/inspect_remote_object.xml b/indra/newview/skins/default/xui/tr/inspect_remote_object.xml index 4b696b2ae5..4b696b2ae5 100755..100644 --- a/indra/newview/skins/default/xui/tr/inspect_remote_object.xml +++ b/indra/newview/skins/default/xui/tr/inspect_remote_object.xml diff --git a/indra/newview/skins/default/xui/tr/menu_add_wearable_gear.xml b/indra/newview/skins/default/xui/tr/menu_add_wearable_gear.xml index dcb4629259..dcb4629259 100755..100644 --- a/indra/newview/skins/default/xui/tr/menu_add_wearable_gear.xml +++ b/indra/newview/skins/default/xui/tr/menu_add_wearable_gear.xml diff --git a/indra/newview/skins/default/xui/tr/menu_attachment_other.xml b/indra/newview/skins/default/xui/tr/menu_attachment_other.xml index 0cb233a657..0cb233a657 100755..100644 --- a/indra/newview/skins/default/xui/tr/menu_attachment_other.xml +++ b/indra/newview/skins/default/xui/tr/menu_attachment_other.xml 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..100644 --- 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_icon.xml b/indra/newview/skins/default/xui/tr/menu_avatar_icon.xml index dc3724cfc8..dc3724cfc8 100755..100644 --- a/indra/newview/skins/default/xui/tr/menu_avatar_icon.xml +++ b/indra/newview/skins/default/xui/tr/menu_avatar_icon.xml diff --git a/indra/newview/skins/default/xui/tr/menu_avatar_other.xml b/indra/newview/skins/default/xui/tr/menu_avatar_other.xml index 0da328a894..0da328a894 100755..100644 --- a/indra/newview/skins/default/xui/tr/menu_avatar_other.xml +++ b/indra/newview/skins/default/xui/tr/menu_avatar_other.xml 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..100644 --- 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_cof_attachment.xml b/indra/newview/skins/default/xui/tr/menu_cof_attachment.xml index d57c43f6c1..d57c43f6c1 100755..100644 --- a/indra/newview/skins/default/xui/tr/menu_cof_attachment.xml +++ b/indra/newview/skins/default/xui/tr/menu_cof_attachment.xml diff --git a/indra/newview/skins/default/xui/tr/menu_cof_body_part.xml b/indra/newview/skins/default/xui/tr/menu_cof_body_part.xml index 31f77d834a..31f77d834a 100755..100644 --- a/indra/newview/skins/default/xui/tr/menu_cof_body_part.xml +++ b/indra/newview/skins/default/xui/tr/menu_cof_body_part.xml diff --git a/indra/newview/skins/default/xui/tr/menu_cof_clothing.xml b/indra/newview/skins/default/xui/tr/menu_cof_clothing.xml index 784d809d70..784d809d70 100755..100644 --- a/indra/newview/skins/default/xui/tr/menu_cof_clothing.xml +++ b/indra/newview/skins/default/xui/tr/menu_cof_clothing.xml diff --git a/indra/newview/skins/default/xui/tr/menu_cof_gear.xml b/indra/newview/skins/default/xui/tr/menu_cof_gear.xml index 9480d30029..9480d30029 100755..100644 --- a/indra/newview/skins/default/xui/tr/menu_cof_gear.xml +++ b/indra/newview/skins/default/xui/tr/menu_cof_gear.xml diff --git a/indra/newview/skins/default/xui/tr/menu_edit.xml b/indra/newview/skins/default/xui/tr/menu_edit.xml index 81cd270af0..81cd270af0 100755..100644 --- a/indra/newview/skins/default/xui/tr/menu_edit.xml +++ b/indra/newview/skins/default/xui/tr/menu_edit.xml diff --git a/indra/newview/skins/default/xui/tr/menu_favorites.xml b/indra/newview/skins/default/xui/tr/menu_favorites.xml index 7bb2ed1ddc..7bb2ed1ddc 100755..100644 --- a/indra/newview/skins/default/xui/tr/menu_favorites.xml +++ b/indra/newview/skins/default/xui/tr/menu_favorites.xml diff --git a/indra/newview/skins/default/xui/tr/menu_gesture_gear.xml b/indra/newview/skins/default/xui/tr/menu_gesture_gear.xml index cb9b678fdd..cb9b678fdd 100755..100644 --- a/indra/newview/skins/default/xui/tr/menu_gesture_gear.xml +++ b/indra/newview/skins/default/xui/tr/menu_gesture_gear.xml diff --git a/indra/newview/skins/default/xui/tr/menu_group_plus.xml b/indra/newview/skins/default/xui/tr/menu_group_plus.xml index 82cf7dcf74..82cf7dcf74 100755..100644 --- a/indra/newview/skins/default/xui/tr/menu_group_plus.xml +++ b/indra/newview/skins/default/xui/tr/menu_group_plus.xml diff --git a/indra/newview/skins/default/xui/tr/menu_hide_navbar.xml b/indra/newview/skins/default/xui/tr/menu_hide_navbar.xml index d1f213516b..d1f213516b 100755..100644 --- a/indra/newview/skins/default/xui/tr/menu_hide_navbar.xml +++ b/indra/newview/skins/default/xui/tr/menu_hide_navbar.xml diff --git a/indra/newview/skins/default/xui/tr/menu_imchiclet_adhoc.xml b/indra/newview/skins/default/xui/tr/menu_imchiclet_adhoc.xml index 0396ad8fb5..0396ad8fb5 100755..100644 --- a/indra/newview/skins/default/xui/tr/menu_imchiclet_adhoc.xml +++ b/indra/newview/skins/default/xui/tr/menu_imchiclet_adhoc.xml diff --git a/indra/newview/skins/default/xui/tr/menu_imchiclet_group.xml b/indra/newview/skins/default/xui/tr/menu_imchiclet_group.xml index 60a50b114e..60a50b114e 100755..100644 --- a/indra/newview/skins/default/xui/tr/menu_imchiclet_group.xml +++ b/indra/newview/skins/default/xui/tr/menu_imchiclet_group.xml diff --git a/indra/newview/skins/default/xui/tr/menu_imchiclet_p2p.xml b/indra/newview/skins/default/xui/tr/menu_imchiclet_p2p.xml index 0ef4471088..0ef4471088 100755..100644 --- a/indra/newview/skins/default/xui/tr/menu_imchiclet_p2p.xml +++ b/indra/newview/skins/default/xui/tr/menu_imchiclet_p2p.xml diff --git a/indra/newview/skins/default/xui/tr/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/tr/menu_inspect_avatar_gear.xml index 69432e967b..69432e967b 100755..100644 --- a/indra/newview/skins/default/xui/tr/menu_inspect_avatar_gear.xml +++ b/indra/newview/skins/default/xui/tr/menu_inspect_avatar_gear.xml diff --git a/indra/newview/skins/default/xui/tr/menu_inspect_object_gear.xml b/indra/newview/skins/default/xui/tr/menu_inspect_object_gear.xml index d1d3f9ac8d..d1d3f9ac8d 100755..100644 --- a/indra/newview/skins/default/xui/tr/menu_inspect_object_gear.xml +++ b/indra/newview/skins/default/xui/tr/menu_inspect_object_gear.xml diff --git a/indra/newview/skins/default/xui/tr/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/tr/menu_inspect_self_gear.xml index 0655db8196..0655db8196 100755..100644 --- a/indra/newview/skins/default/xui/tr/menu_inspect_self_gear.xml +++ b/indra/newview/skins/default/xui/tr/menu_inspect_self_gear.xml diff --git a/indra/newview/skins/default/xui/tr/menu_inv_offer_chiclet.xml b/indra/newview/skins/default/xui/tr/menu_inv_offer_chiclet.xml index 2e2b17491a..2e2b17491a 100755..100644 --- a/indra/newview/skins/default/xui/tr/menu_inv_offer_chiclet.xml +++ b/indra/newview/skins/default/xui/tr/menu_inv_offer_chiclet.xml 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..100644 --- 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_add.xml b/indra/newview/skins/default/xui/tr/menu_inventory_add.xml index db2a9a2c8c..db2a9a2c8c 100755..100644 --- a/indra/newview/skins/default/xui/tr/menu_inventory_add.xml +++ b/indra/newview/skins/default/xui/tr/menu_inventory_add.xml 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..100644 --- 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_land.xml b/indra/newview/skins/default/xui/tr/menu_land.xml index d6d8dbf730..d6d8dbf730 100755..100644 --- a/indra/newview/skins/default/xui/tr/menu_land.xml +++ b/indra/newview/skins/default/xui/tr/menu_land.xml diff --git a/indra/newview/skins/default/xui/tr/menu_landmark.xml b/indra/newview/skins/default/xui/tr/menu_landmark.xml index c68a2f6a90..c68a2f6a90 100755..100644 --- a/indra/newview/skins/default/xui/tr/menu_landmark.xml +++ b/indra/newview/skins/default/xui/tr/menu_landmark.xml diff --git a/indra/newview/skins/default/xui/tr/menu_login.xml b/indra/newview/skins/default/xui/tr/menu_login.xml index ecd29370a5..ecd29370a5 100755..100644 --- a/indra/newview/skins/default/xui/tr/menu_login.xml +++ b/indra/newview/skins/default/xui/tr/menu_login.xml 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_media_ctrl.xml b/indra/newview/skins/default/xui/tr/menu_media_ctrl.xml index 8d04e645fd..8d04e645fd 100755..100644 --- a/indra/newview/skins/default/xui/tr/menu_media_ctrl.xml +++ b/indra/newview/skins/default/xui/tr/menu_media_ctrl.xml diff --git a/indra/newview/skins/default/xui/tr/menu_mini_map.xml b/indra/newview/skins/default/xui/tr/menu_mini_map.xml index 9abe78931e..9abe78931e 100755..100644 --- a/indra/newview/skins/default/xui/tr/menu_mini_map.xml +++ b/indra/newview/skins/default/xui/tr/menu_mini_map.xml diff --git a/indra/newview/skins/default/xui/tr/menu_model_import_gear_default.xml b/indra/newview/skins/default/xui/tr/menu_model_import_gear_default.xml index 51cf29a4de..51cf29a4de 100755..100644 --- a/indra/newview/skins/default/xui/tr/menu_model_import_gear_default.xml +++ b/indra/newview/skins/default/xui/tr/menu_model_import_gear_default.xml diff --git a/indra/newview/skins/default/xui/tr/menu_navbar.xml b/indra/newview/skins/default/xui/tr/menu_navbar.xml index b05b816e64..b05b816e64 100755..100644 --- a/indra/newview/skins/default/xui/tr/menu_navbar.xml +++ b/indra/newview/skins/default/xui/tr/menu_navbar.xml diff --git a/indra/newview/skins/default/xui/tr/menu_nearby_chat.xml b/indra/newview/skins/default/xui/tr/menu_nearby_chat.xml index b76a736979..b76a736979 100755..100644 --- a/indra/newview/skins/default/xui/tr/menu_nearby_chat.xml +++ b/indra/newview/skins/default/xui/tr/menu_nearby_chat.xml diff --git a/indra/newview/skins/default/xui/tr/menu_notification_well_button.xml b/indra/newview/skins/default/xui/tr/menu_notification_well_button.xml index 39c66268f5..39c66268f5 100755..100644 --- a/indra/newview/skins/default/xui/tr/menu_notification_well_button.xml +++ b/indra/newview/skins/default/xui/tr/menu_notification_well_button.xml diff --git a/indra/newview/skins/default/xui/tr/menu_object.xml b/indra/newview/skins/default/xui/tr/menu_object.xml index cfc9515d8f..cfc9515d8f 100755..100644 --- a/indra/newview/skins/default/xui/tr/menu_object.xml +++ b/indra/newview/skins/default/xui/tr/menu_object.xml diff --git a/indra/newview/skins/default/xui/tr/menu_object_icon.xml b/indra/newview/skins/default/xui/tr/menu_object_icon.xml index 3d5c68d9d3..3d5c68d9d3 100755..100644 --- a/indra/newview/skins/default/xui/tr/menu_object_icon.xml +++ b/indra/newview/skins/default/xui/tr/menu_object_icon.xml diff --git a/indra/newview/skins/default/xui/tr/menu_outfit_gear.xml b/indra/newview/skins/default/xui/tr/menu_outfit_gear.xml index 674041e9c9..674041e9c9 100755..100644 --- a/indra/newview/skins/default/xui/tr/menu_outfit_gear.xml +++ b/indra/newview/skins/default/xui/tr/menu_outfit_gear.xml diff --git a/indra/newview/skins/default/xui/tr/menu_outfit_tab.xml b/indra/newview/skins/default/xui/tr/menu_outfit_tab.xml index a48529e462..a48529e462 100755..100644 --- a/indra/newview/skins/default/xui/tr/menu_outfit_tab.xml +++ b/indra/newview/skins/default/xui/tr/menu_outfit_tab.xml diff --git a/indra/newview/skins/default/xui/tr/menu_participant_list.xml b/indra/newview/skins/default/xui/tr/menu_participant_list.xml index 1d56105e1e..1d56105e1e 100755..100644 --- a/indra/newview/skins/default/xui/tr/menu_participant_list.xml +++ b/indra/newview/skins/default/xui/tr/menu_participant_list.xml diff --git a/indra/newview/skins/default/xui/tr/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/tr/menu_people_friends_view_sort.xml index 404fab17e6..404fab17e6 100755..100644 --- a/indra/newview/skins/default/xui/tr/menu_people_friends_view_sort.xml +++ b/indra/newview/skins/default/xui/tr/menu_people_friends_view_sort.xml diff --git a/indra/newview/skins/default/xui/tr/menu_people_groups.xml b/indra/newview/skins/default/xui/tr/menu_people_groups.xml index 743b01844d..743b01844d 100755..100644 --- a/indra/newview/skins/default/xui/tr/menu_people_groups.xml +++ b/indra/newview/skins/default/xui/tr/menu_people_groups.xml diff --git a/indra/newview/skins/default/xui/tr/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/tr/menu_people_groups_view_sort.xml index a1e5ad9a50..a1e5ad9a50 100755..100644 --- a/indra/newview/skins/default/xui/tr/menu_people_groups_view_sort.xml +++ b/indra/newview/skins/default/xui/tr/menu_people_groups_view_sort.xml diff --git a/indra/newview/skins/default/xui/tr/menu_people_nearby.xml b/indra/newview/skins/default/xui/tr/menu_people_nearby.xml index 2d61461c91..2d61461c91 100755..100644 --- a/indra/newview/skins/default/xui/tr/menu_people_nearby.xml +++ b/indra/newview/skins/default/xui/tr/menu_people_nearby.xml diff --git a/indra/newview/skins/default/xui/tr/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/tr/menu_people_nearby_multiselect.xml index 20695d98e8..20695d98e8 100755..100644 --- a/indra/newview/skins/default/xui/tr/menu_people_nearby_multiselect.xml +++ b/indra/newview/skins/default/xui/tr/menu_people_nearby_multiselect.xml diff --git a/indra/newview/skins/default/xui/tr/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/tr/menu_people_nearby_view_sort.xml index 0ff2111e9e..0ff2111e9e 100755..100644 --- a/indra/newview/skins/default/xui/tr/menu_people_nearby_view_sort.xml +++ b/indra/newview/skins/default/xui/tr/menu_people_nearby_view_sort.xml diff --git a/indra/newview/skins/default/xui/tr/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/tr/menu_people_recent_view_sort.xml index adfba50138..adfba50138 100755..100644 --- a/indra/newview/skins/default/xui/tr/menu_people_recent_view_sort.xml +++ b/indra/newview/skins/default/xui/tr/menu_people_recent_view_sort.xml diff --git a/indra/newview/skins/default/xui/tr/menu_picks.xml b/indra/newview/skins/default/xui/tr/menu_picks.xml index 3e5375ecc0..3e5375ecc0 100755..100644 --- a/indra/newview/skins/default/xui/tr/menu_picks.xml +++ b/indra/newview/skins/default/xui/tr/menu_picks.xml diff --git a/indra/newview/skins/default/xui/tr/menu_picks_plus.xml b/indra/newview/skins/default/xui/tr/menu_picks_plus.xml index d9c4fefc97..d9c4fefc97 100755..100644 --- a/indra/newview/skins/default/xui/tr/menu_picks_plus.xml +++ b/indra/newview/skins/default/xui/tr/menu_picks_plus.xml diff --git a/indra/newview/skins/default/xui/tr/menu_place.xml b/indra/newview/skins/default/xui/tr/menu_place.xml index ad167a328a..ad167a328a 100755..100644 --- a/indra/newview/skins/default/xui/tr/menu_place.xml +++ b/indra/newview/skins/default/xui/tr/menu_place.xml diff --git a/indra/newview/skins/default/xui/tr/menu_place_add_button.xml b/indra/newview/skins/default/xui/tr/menu_place_add_button.xml index 8e52b3f7f2..8e52b3f7f2 100755..100644 --- a/indra/newview/skins/default/xui/tr/menu_place_add_button.xml +++ b/indra/newview/skins/default/xui/tr/menu_place_add_button.xml diff --git a/indra/newview/skins/default/xui/tr/menu_places_gear_folder.xml b/indra/newview/skins/default/xui/tr/menu_places_gear_folder.xml index b3a2986160..b3a2986160 100755..100644 --- a/indra/newview/skins/default/xui/tr/menu_places_gear_folder.xml +++ b/indra/newview/skins/default/xui/tr/menu_places_gear_folder.xml diff --git a/indra/newview/skins/default/xui/tr/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/tr/menu_places_gear_landmark.xml index 939ee2c7cb..939ee2c7cb 100755..100644 --- a/indra/newview/skins/default/xui/tr/menu_places_gear_landmark.xml +++ b/indra/newview/skins/default/xui/tr/menu_places_gear_landmark.xml diff --git a/indra/newview/skins/default/xui/tr/menu_profile_overflow.xml b/indra/newview/skins/default/xui/tr/menu_profile_overflow.xml index ed60dec63a..ed60dec63a 100755..100644 --- a/indra/newview/skins/default/xui/tr/menu_profile_overflow.xml +++ b/indra/newview/skins/default/xui/tr/menu_profile_overflow.xml diff --git a/indra/newview/skins/default/xui/tr/menu_save_outfit.xml b/indra/newview/skins/default/xui/tr/menu_save_outfit.xml index b28488fe30..b28488fe30 100755..100644 --- a/indra/newview/skins/default/xui/tr/menu_save_outfit.xml +++ b/indra/newview/skins/default/xui/tr/menu_save_outfit.xml diff --git a/indra/newview/skins/default/xui/tr/menu_script_chiclet.xml b/indra/newview/skins/default/xui/tr/menu_script_chiclet.xml index 7c1cefc2d1..7c1cefc2d1 100755..100644 --- a/indra/newview/skins/default/xui/tr/menu_script_chiclet.xml +++ b/indra/newview/skins/default/xui/tr/menu_script_chiclet.xml diff --git a/indra/newview/skins/default/xui/tr/menu_slurl.xml b/indra/newview/skins/default/xui/tr/menu_slurl.xml index 73ac068b26..73ac068b26 100755..100644 --- a/indra/newview/skins/default/xui/tr/menu_slurl.xml +++ b/indra/newview/skins/default/xui/tr/menu_slurl.xml diff --git a/indra/newview/skins/default/xui/tr/menu_teleport_history_gear.xml b/indra/newview/skins/default/xui/tr/menu_teleport_history_gear.xml index b08423be18..b08423be18 100755..100644 --- a/indra/newview/skins/default/xui/tr/menu_teleport_history_gear.xml +++ b/indra/newview/skins/default/xui/tr/menu_teleport_history_gear.xml diff --git a/indra/newview/skins/default/xui/tr/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/tr/menu_teleport_history_item.xml index d7ff807c3d..d7ff807c3d 100755..100644 --- a/indra/newview/skins/default/xui/tr/menu_teleport_history_item.xml +++ b/indra/newview/skins/default/xui/tr/menu_teleport_history_item.xml diff --git a/indra/newview/skins/default/xui/tr/menu_teleport_history_tab.xml b/indra/newview/skins/default/xui/tr/menu_teleport_history_tab.xml index b1e801c123..b1e801c123 100755..100644 --- a/indra/newview/skins/default/xui/tr/menu_teleport_history_tab.xml +++ b/indra/newview/skins/default/xui/tr/menu_teleport_history_tab.xml diff --git a/indra/newview/skins/default/xui/tr/menu_text_editor.xml b/indra/newview/skins/default/xui/tr/menu_text_editor.xml index 76c7b43e1e..76c7b43e1e 100755..100644 --- a/indra/newview/skins/default/xui/tr/menu_text_editor.xml +++ b/indra/newview/skins/default/xui/tr/menu_text_editor.xml diff --git a/indra/newview/skins/default/xui/tr/menu_toolbars.xml b/indra/newview/skins/default/xui/tr/menu_toolbars.xml index c8523a6ec9..c8523a6ec9 100755..100644 --- a/indra/newview/skins/default/xui/tr/menu_toolbars.xml +++ b/indra/newview/skins/default/xui/tr/menu_toolbars.xml diff --git a/indra/newview/skins/default/xui/tr/menu_topinfobar.xml b/indra/newview/skins/default/xui/tr/menu_topinfobar.xml index d9b8d50f18..d9b8d50f18 100755..100644 --- a/indra/newview/skins/default/xui/tr/menu_topinfobar.xml +++ b/indra/newview/skins/default/xui/tr/menu_topinfobar.xml diff --git a/indra/newview/skins/default/xui/tr/menu_url_agent.xml b/indra/newview/skins/default/xui/tr/menu_url_agent.xml index 109cd62495..109cd62495 100755..100644 --- a/indra/newview/skins/default/xui/tr/menu_url_agent.xml +++ b/indra/newview/skins/default/xui/tr/menu_url_agent.xml 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'yi Panoya Kopyala" name="url_copy"/> +</context_menu> diff --git a/indra/newview/skins/default/xui/tr/menu_url_group.xml b/indra/newview/skins/default/xui/tr/menu_url_group.xml index 40fa13b4cf..40fa13b4cf 100755..100644 --- a/indra/newview/skins/default/xui/tr/menu_url_group.xml +++ b/indra/newview/skins/default/xui/tr/menu_url_group.xml diff --git a/indra/newview/skins/default/xui/tr/menu_url_http.xml b/indra/newview/skins/default/xui/tr/menu_url_http.xml index fee8eba150..fee8eba150 100755..100644 --- a/indra/newview/skins/default/xui/tr/menu_url_http.xml +++ b/indra/newview/skins/default/xui/tr/menu_url_http.xml diff --git a/indra/newview/skins/default/xui/tr/menu_url_inventory.xml b/indra/newview/skins/default/xui/tr/menu_url_inventory.xml index 3b22c5afec..3b22c5afec 100755..100644 --- a/indra/newview/skins/default/xui/tr/menu_url_inventory.xml +++ b/indra/newview/skins/default/xui/tr/menu_url_inventory.xml diff --git a/indra/newview/skins/default/xui/tr/menu_url_map.xml b/indra/newview/skins/default/xui/tr/menu_url_map.xml index 770e330516..770e330516 100755..100644 --- a/indra/newview/skins/default/xui/tr/menu_url_map.xml +++ b/indra/newview/skins/default/xui/tr/menu_url_map.xml diff --git a/indra/newview/skins/default/xui/tr/menu_url_objectim.xml b/indra/newview/skins/default/xui/tr/menu_url_objectim.xml index ae68669605..ae68669605 100755..100644 --- a/indra/newview/skins/default/xui/tr/menu_url_objectim.xml +++ b/indra/newview/skins/default/xui/tr/menu_url_objectim.xml diff --git a/indra/newview/skins/default/xui/tr/menu_url_parcel.xml b/indra/newview/skins/default/xui/tr/menu_url_parcel.xml index eac1d743c3..eac1d743c3 100755..100644 --- a/indra/newview/skins/default/xui/tr/menu_url_parcel.xml +++ b/indra/newview/skins/default/xui/tr/menu_url_parcel.xml diff --git a/indra/newview/skins/default/xui/tr/menu_url_slapp.xml b/indra/newview/skins/default/xui/tr/menu_url_slapp.xml index a2ecfc6a48..a2ecfc6a48 100755..100644 --- a/indra/newview/skins/default/xui/tr/menu_url_slapp.xml +++ b/indra/newview/skins/default/xui/tr/menu_url_slapp.xml diff --git a/indra/newview/skins/default/xui/tr/menu_url_slurl.xml b/indra/newview/skins/default/xui/tr/menu_url_slurl.xml index 3f4e51b36c..3f4e51b36c 100755..100644 --- a/indra/newview/skins/default/xui/tr/menu_url_slurl.xml +++ b/indra/newview/skins/default/xui/tr/menu_url_slurl.xml diff --git a/indra/newview/skins/default/xui/tr/menu_url_teleport.xml b/indra/newview/skins/default/xui/tr/menu_url_teleport.xml index b7035a4d8f..b7035a4d8f 100755..100644 --- a/indra/newview/skins/default/xui/tr/menu_url_teleport.xml +++ b/indra/newview/skins/default/xui/tr/menu_url_teleport.xml diff --git a/indra/newview/skins/default/xui/tr/menu_viewer.xml b/indra/newview/skins/default/xui/tr/menu_viewer.xml index a488a0916f..cea57011dd 100755..100644 --- a/indra/newview/skins/default/xui/tr/menu_viewer.xml +++ b/indra/newview/skins/default/xui/tr/menu_viewer.xml @@ -8,13 +8,14 @@ <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"/> <menu_item_check label="Uç" name="Fly"/> <menu_item_check label="Daima Koş" name="Always Run"/> <menu_item_call label="Beni Anime Etmeyi Durdur" name="Stop Animating My Avatar"/> - <menu_item_call label="Yürü / koş / uç..." name="Walk / run / fly"/> + <menu_item_call label="Yürü / koş / uç..." name="WalkRunFly"/> </menu> <menu label="Durum" name="Status"> <menu_item_check label="Uzakta" name="Away"/> @@ -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"> @@ -60,7 +62,7 @@ <menu_item_call label="Anlık Görüntü" name="Take Snapshot"/> <menu_item_call label="Profili yerleştir" name="Place Profile"/> <menu_item_call label="Arazi hakkında" name="About Land"/> - <menu_item_call label="Bölge / Gayrimenkul" name="Region/Estate"/> + <menu_item_call label="Bölge / Gayrimenkul" name="RegionEstate"/> <menu_item_call label="Sahip olduğum arazi parçaları..." name="My Land"/> <menu_item_call label="Bu araziyi satın al" name="Buy Land"/> <menu label="Göster" name="LandShow"> @@ -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/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/tr/menu_wearable_list_item.xml index 448202df87..448202df87 100755..100644 --- a/indra/newview/skins/default/xui/tr/menu_wearable_list_item.xml +++ b/indra/newview/skins/default/xui/tr/menu_wearable_list_item.xml diff --git a/indra/newview/skins/default/xui/tr/menu_wearing_gear.xml b/indra/newview/skins/default/xui/tr/menu_wearing_gear.xml index 438e580cd3..438e580cd3 100755..100644 --- a/indra/newview/skins/default/xui/tr/menu_wearing_gear.xml +++ b/indra/newview/skins/default/xui/tr/menu_wearing_gear.xml diff --git a/indra/newview/skins/default/xui/tr/menu_wearing_tab.xml b/indra/newview/skins/default/xui/tr/menu_wearing_tab.xml index 9796546559..9796546559 100755..100644 --- a/indra/newview/skins/default/xui/tr/menu_wearing_tab.xml +++ b/indra/newview/skins/default/xui/tr/menu_wearing_tab.xml 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..100644 --- 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..100644 --- 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..100644 --- 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..df22251b3d 100755..100644 --- 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ı: '[_NAME]' 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'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: + + "[ERROR_CODE]" + <usetemplate name="okbutton" yestext="Tamam"/> + </notification> + <notification name="MerchantPasteFailed"> + Pazaryeri İlanlarına kopyalama ya da taşıma başarısız oldu. Hata kodu: + + "[ERROR_CODE]" + <usetemplate name="okbutton" yestext="Tamam"/> + </notification> + <notification name="MerchantTransactionFailed"> + Pazaryerinde yapılan işlem başarısız oldu. Hata kodu: + + Neden: "[ERROR_REASON]" + [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: + + "[ERROR_CODE]" + <usetemplate name="okbutton" yestext="Tamam"/> + </notification> + <notification name="MerchantFolderActivationFailed"> + Bu sürüm klasörünü etkinleştirilemedi. Hata kodu: + + "[ERROR_CODE]" + <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 > 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 > Tercihler > 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. "[REGION_NAME]" 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 > Tercihler > 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 'Nesne için ödeme yap' 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ş > Hata Ayıklama Ayarlarını Göster > 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. @@ -2657,9 +2788,6 @@ Lütfen biraz sonra tekrar deneyin. <notification name="NoValidCircuit"> Geçerli bir devre kodu yok. </notification> - <notification name="NoValidTimestamp"> - Geçerli bir zaman damgası yok. - </notification> <notification name="NoPendingConnection"> Beklemedeki bağlantı oluşturulamıyor. </notification> @@ -2814,7 +2942,7 @@ Bu bölgede kalmaya devam ederseniz oturumunuz sonlandırılacak. [MESSAGE] -Şu nesneden: <nolink>[OBJECTNAME]</nolink>, sahibi: [NAME]? +Kaynak nesne: <nolink>[OBJECTNAME]</nolink>, sahibi: [NAME] <form name="form"> <button name="Gotopage" text="Sayfaya git"/> <button name="Cancel" text="İptal"/> @@ -2840,6 +2968,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 "[field]" alanı göz ardı edildi. + </notification> + <notification name="RestrictedToOwnerExperienceProfileMessage"> + Yalnızca deneyimin sahibi tarafından ayarlanabilecek olan "[field]" 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"> + '<nolink>[OBJECTNAME]</nolink>', "[NAME]" 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ı: '<nolink>[OBJECTNAME]</nolink>' 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 +3353,10 @@ Lütfen ağ ve güvenlik duvarı ayarlarınızı kontrol edin. ( [EXISTENCE] saniyedir hayatta ) '[BODYREGION]' 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 +3925,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"> '[PARCEL_NAME]' parseli üzerindeki '[OBJECT_NAME]' 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 '[OBJECT_NAME]' nesnesi tarafından ışınlandınız @@ -4061,7 +4261,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_active_object_row.xml b/indra/newview/skins/default/xui/tr/panel_active_object_row.xml index b03ce3ebe5..b03ce3ebe5 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_active_object_row.xml +++ b/indra/newview/skins/default/xui/tr/panel_active_object_row.xml diff --git a/indra/newview/skins/default/xui/tr/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/tr/panel_adhoc_control_panel.xml index 602818de94..602818de94 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_adhoc_control_panel.xml +++ b/indra/newview/skins/default/xui/tr/panel_adhoc_control_panel.xml diff --git a/indra/newview/skins/default/xui/tr/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/tr/panel_avatar_list_item.xml index f330bd85e8..f330bd85e8 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_avatar_list_item.xml +++ b/indra/newview/skins/default/xui/tr/panel_avatar_list_item.xml diff --git a/indra/newview/skins/default/xui/tr/panel_avatar_tag.xml b/indra/newview/skins/default/xui/tr/panel_avatar_tag.xml index 81e04379a1..81e04379a1 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_avatar_tag.xml +++ b/indra/newview/skins/default/xui/tr/panel_avatar_tag.xml diff --git a/indra/newview/skins/default/xui/tr/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/tr/panel_block_list_sidetray.xml index 87b67e249e..87b67e249e 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_block_list_sidetray.xml +++ b/indra/newview/skins/default/xui/tr/panel_block_list_sidetray.xml diff --git a/indra/newview/skins/default/xui/tr/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/tr/panel_body_parts_list_item.xml index f991c3b688..f991c3b688 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_body_parts_list_item.xml +++ b/indra/newview/skins/default/xui/tr/panel_body_parts_list_item.xml diff --git a/indra/newview/skins/default/xui/tr/panel_bodyparts_list_button_bar.xml b/indra/newview/skins/default/xui/tr/panel_bodyparts_list_button_bar.xml index 6c2478cdb7..6c2478cdb7 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_bodyparts_list_button_bar.xml +++ b/indra/newview/skins/default/xui/tr/panel_bodyparts_list_button_bar.xml diff --git a/indra/newview/skins/default/xui/tr/panel_bottomtray_lite.xml b/indra/newview/skins/default/xui/tr/panel_bottomtray_lite.xml index 5d7006af2f..5d7006af2f 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_bottomtray_lite.xml +++ b/indra/newview/skins/default/xui/tr/panel_bottomtray_lite.xml diff --git a/indra/newview/skins/default/xui/tr/panel_chat_header.xml b/indra/newview/skins/default/xui/tr/panel_chat_header.xml index 7916bf5155..7916bf5155 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_chat_header.xml +++ b/indra/newview/skins/default/xui/tr/panel_chat_header.xml diff --git a/indra/newview/skins/default/xui/tr/panel_chiclet_bar.xml b/indra/newview/skins/default/xui/tr/panel_chiclet_bar.xml index a1e8190bbc..a1e8190bbc 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_chiclet_bar.xml +++ b/indra/newview/skins/default/xui/tr/panel_chiclet_bar.xml diff --git a/indra/newview/skins/default/xui/tr/panel_classified_info.xml b/indra/newview/skins/default/xui/tr/panel_classified_info.xml index d412a03e32..d412a03e32 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_classified_info.xml +++ b/indra/newview/skins/default/xui/tr/panel_classified_info.xml diff --git a/indra/newview/skins/default/xui/tr/panel_clothing_list_button_bar.xml b/indra/newview/skins/default/xui/tr/panel_clothing_list_button_bar.xml index bb5930ee79..bb5930ee79 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_clothing_list_button_bar.xml +++ b/indra/newview/skins/default/xui/tr/panel_clothing_list_button_bar.xml diff --git a/indra/newview/skins/default/xui/tr/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/tr/panel_clothing_list_item.xml index e60e291ee8..e60e291ee8 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_clothing_list_item.xml +++ b/indra/newview/skins/default/xui/tr/panel_clothing_list_item.xml diff --git a/indra/newview/skins/default/xui/tr/panel_cof_wearables.xml b/indra/newview/skins/default/xui/tr/panel_cof_wearables.xml index 7d70177553..7d70177553 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_cof_wearables.xml +++ b/indra/newview/skins/default/xui/tr/panel_cof_wearables.xml diff --git a/indra/newview/skins/default/xui/tr/panel_deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/tr/panel_deletable_wearable_list_item.xml index 47703136b0..47703136b0 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_deletable_wearable_list_item.xml +++ b/indra/newview/skins/default/xui/tr/panel_deletable_wearable_list_item.xml diff --git a/indra/newview/skins/default/xui/tr/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/tr/panel_dummy_clothing_list_item.xml index 28e034a357..28e034a357 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_dummy_clothing_list_item.xml +++ b/indra/newview/skins/default/xui/tr/panel_dummy_clothing_list_item.xml diff --git a/indra/newview/skins/default/xui/tr/panel_edit_alpha.xml b/indra/newview/skins/default/xui/tr/panel_edit_alpha.xml index e3ba806b0d..e3ba806b0d 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_edit_alpha.xml +++ b/indra/newview/skins/default/xui/tr/panel_edit_alpha.xml diff --git a/indra/newview/skins/default/xui/tr/panel_edit_classified.xml b/indra/newview/skins/default/xui/tr/panel_edit_classified.xml index 7584b754f1..7584b754f1 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_edit_classified.xml +++ b/indra/newview/skins/default/xui/tr/panel_edit_classified.xml diff --git a/indra/newview/skins/default/xui/tr/panel_edit_eyes.xml b/indra/newview/skins/default/xui/tr/panel_edit_eyes.xml index 42f62b6bbe..42f62b6bbe 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_edit_eyes.xml +++ b/indra/newview/skins/default/xui/tr/panel_edit_eyes.xml diff --git a/indra/newview/skins/default/xui/tr/panel_edit_gloves.xml b/indra/newview/skins/default/xui/tr/panel_edit_gloves.xml index be89e94bbf..be89e94bbf 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_edit_gloves.xml +++ b/indra/newview/skins/default/xui/tr/panel_edit_gloves.xml diff --git a/indra/newview/skins/default/xui/tr/panel_edit_hair.xml b/indra/newview/skins/default/xui/tr/panel_edit_hair.xml index f33a6d6402..f33a6d6402 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_edit_hair.xml +++ b/indra/newview/skins/default/xui/tr/panel_edit_hair.xml diff --git a/indra/newview/skins/default/xui/tr/panel_edit_jacket.xml b/indra/newview/skins/default/xui/tr/panel_edit_jacket.xml index 10bc4278db..10bc4278db 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_edit_jacket.xml +++ b/indra/newview/skins/default/xui/tr/panel_edit_jacket.xml diff --git a/indra/newview/skins/default/xui/tr/panel_edit_pants.xml b/indra/newview/skins/default/xui/tr/panel_edit_pants.xml index 06e1b7b4ab..06e1b7b4ab 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_edit_pants.xml +++ b/indra/newview/skins/default/xui/tr/panel_edit_pants.xml diff --git a/indra/newview/skins/default/xui/tr/panel_edit_physics.xml b/indra/newview/skins/default/xui/tr/panel_edit_physics.xml index 98dbfd8e42..98dbfd8e42 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_edit_physics.xml +++ b/indra/newview/skins/default/xui/tr/panel_edit_physics.xml diff --git a/indra/newview/skins/default/xui/tr/panel_edit_pick.xml b/indra/newview/skins/default/xui/tr/panel_edit_pick.xml index 98b02d27df..98b02d27df 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_edit_pick.xml +++ b/indra/newview/skins/default/xui/tr/panel_edit_pick.xml diff --git a/indra/newview/skins/default/xui/tr/panel_edit_profile.xml b/indra/newview/skins/default/xui/tr/panel_edit_profile.xml index 21f4e419bc..21f4e419bc 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_edit_profile.xml +++ b/indra/newview/skins/default/xui/tr/panel_edit_profile.xml diff --git a/indra/newview/skins/default/xui/tr/panel_edit_shape.xml b/indra/newview/skins/default/xui/tr/panel_edit_shape.xml index 57cd9aca75..57cd9aca75 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_edit_shape.xml +++ b/indra/newview/skins/default/xui/tr/panel_edit_shape.xml diff --git a/indra/newview/skins/default/xui/tr/panel_edit_shirt.xml b/indra/newview/skins/default/xui/tr/panel_edit_shirt.xml index 2dd417afc6..2dd417afc6 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_edit_shirt.xml +++ b/indra/newview/skins/default/xui/tr/panel_edit_shirt.xml diff --git a/indra/newview/skins/default/xui/tr/panel_edit_shoes.xml b/indra/newview/skins/default/xui/tr/panel_edit_shoes.xml index 34acb414b0..34acb414b0 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_edit_shoes.xml +++ b/indra/newview/skins/default/xui/tr/panel_edit_shoes.xml diff --git a/indra/newview/skins/default/xui/tr/panel_edit_skin.xml b/indra/newview/skins/default/xui/tr/panel_edit_skin.xml index fdf75100ed..fdf75100ed 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_edit_skin.xml +++ b/indra/newview/skins/default/xui/tr/panel_edit_skin.xml diff --git a/indra/newview/skins/default/xui/tr/panel_edit_skirt.xml b/indra/newview/skins/default/xui/tr/panel_edit_skirt.xml index 2099013fe1..2099013fe1 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_edit_skirt.xml +++ b/indra/newview/skins/default/xui/tr/panel_edit_skirt.xml diff --git a/indra/newview/skins/default/xui/tr/panel_edit_socks.xml b/indra/newview/skins/default/xui/tr/panel_edit_socks.xml index d386814d31..d386814d31 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_edit_socks.xml +++ b/indra/newview/skins/default/xui/tr/panel_edit_socks.xml diff --git a/indra/newview/skins/default/xui/tr/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/tr/panel_edit_tattoo.xml index 7f5590a485..7f5590a485 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_edit_tattoo.xml +++ b/indra/newview/skins/default/xui/tr/panel_edit_tattoo.xml diff --git a/indra/newview/skins/default/xui/tr/panel_edit_underpants.xml b/indra/newview/skins/default/xui/tr/panel_edit_underpants.xml index ed003e1adf..ed003e1adf 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_edit_underpants.xml +++ b/indra/newview/skins/default/xui/tr/panel_edit_underpants.xml diff --git a/indra/newview/skins/default/xui/tr/panel_edit_undershirt.xml b/indra/newview/skins/default/xui/tr/panel_edit_undershirt.xml index e0a0be8abb..e0a0be8abb 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_edit_undershirt.xml +++ b/indra/newview/skins/default/xui/tr/panel_edit_undershirt.xml diff --git a/indra/newview/skins/default/xui/tr/panel_edit_wearable.xml b/indra/newview/skins/default/xui/tr/panel_edit_wearable.xml index 7a4a09aaed..7a4a09aaed 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_edit_wearable.xml +++ b/indra/newview/skins/default/xui/tr/panel_edit_wearable.xml 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'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="<" name="btn_prev"/> + <button label=">" 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"> + "[TEXT]" 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"> + "Parcel_PG_Light" + </string> + <string name="maturity_icon_moderate"> + "Parcel_M_Light" + </string> + <string name="maturity_icon_adult"> + "Parcel_R_Light" + </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="<" name="left_btn"/> + <button label=">" 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'a katılmaya davet edin!"/> - <string name="facebook_friends_no_connected" value="Şu anda Facebook'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'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'a şu kimlikle bağlandınız:"/> + <string name="facebook_disconnected" value="Facebook'a bağlanılmadı"/> + <text name="account_caption_label"> + Facebook'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'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 "" 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_control_panel.xml b/indra/newview/skins/default/xui/tr/panel_group_control_panel.xml index 58bb68a5c3..58bb68a5c3 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_group_control_panel.xml +++ b/indra/newview/skins/default/xui/tr/panel_group_control_panel.xml diff --git a/indra/newview/skins/default/xui/tr/panel_group_general.xml b/indra/newview/skins/default/xui/tr/panel_group_general.xml index 0462026249..0462026249 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_group_general.xml +++ b/indra/newview/skins/default/xui/tr/panel_group_general.xml 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..100644 --- 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_group_invite.xml b/indra/newview/skins/default/xui/tr/panel_group_invite.xml index 77c4db2cdc..77c4db2cdc 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_group_invite.xml +++ b/indra/newview/skins/default/xui/tr/panel_group_invite.xml diff --git a/indra/newview/skins/default/xui/tr/panel_group_land_money.xml b/indra/newview/skins/default/xui/tr/panel_group_land_money.xml index e9112a862b..e9112a862b 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_group_land_money.xml +++ b/indra/newview/skins/default/xui/tr/panel_group_land_money.xml diff --git a/indra/newview/skins/default/xui/tr/panel_group_list_item.xml b/indra/newview/skins/default/xui/tr/panel_group_list_item.xml index f44d2b5e76..f44d2b5e76 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_group_list_item.xml +++ b/indra/newview/skins/default/xui/tr/panel_group_list_item.xml diff --git a/indra/newview/skins/default/xui/tr/panel_group_notices.xml b/indra/newview/skins/default/xui/tr/panel_group_notices.xml index 179b5fff69..179b5fff69 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_group_notices.xml +++ b/indra/newview/skins/default/xui/tr/panel_group_notices.xml diff --git a/indra/newview/skins/default/xui/tr/panel_group_notify.xml b/indra/newview/skins/default/xui/tr/panel_group_notify.xml index bcc5482daa..bcc5482daa 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_group_notify.xml +++ b/indra/newview/skins/default/xui/tr/panel_group_notify.xml diff --git a/indra/newview/skins/default/xui/tr/panel_group_roles.xml b/indra/newview/skins/default/xui/tr/panel_group_roles.xml index 59a48bbdc2..59a48bbdc2 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_group_roles.xml +++ b/indra/newview/skins/default/xui/tr/panel_group_roles.xml diff --git a/indra/newview/skins/default/xui/tr/panel_im_control_panel.xml b/indra/newview/skins/default/xui/tr/panel_im_control_panel.xml index aebdc6b48d..aebdc6b48d 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_im_control_panel.xml +++ b/indra/newview/skins/default/xui/tr/panel_im_control_panel.xml diff --git a/indra/newview/skins/default/xui/tr/panel_instant_message.xml b/indra/newview/skins/default/xui/tr/panel_instant_message.xml index cf9bc7fccb..cf9bc7fccb 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_instant_message.xml +++ b/indra/newview/skins/default/xui/tr/panel_instant_message.xml diff --git a/indra/newview/skins/default/xui/tr/panel_inventory_item.xml b/indra/newview/skins/default/xui/tr/panel_inventory_item.xml index d18047fbcf..d18047fbcf 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_inventory_item.xml +++ b/indra/newview/skins/default/xui/tr/panel_inventory_item.xml diff --git a/indra/newview/skins/default/xui/tr/panel_landmark_info.xml b/indra/newview/skins/default/xui/tr/panel_landmark_info.xml index 2cad753f25..2cad753f25 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_landmark_info.xml +++ b/indra/newview/skins/default/xui/tr/panel_landmark_info.xml diff --git a/indra/newview/skins/default/xui/tr/panel_landmarks.xml b/indra/newview/skins/default/xui/tr/panel_landmarks.xml index d40d0c1543..d40d0c1543 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_landmarks.xml +++ b/indra/newview/skins/default/xui/tr/panel_landmarks.xml 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..100644 --- 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_main_inventory.xml b/indra/newview/skins/default/xui/tr/panel_main_inventory.xml index c69fb39130..c69fb39130 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/tr/panel_main_inventory.xml 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_me.xml b/indra/newview/skins/default/xui/tr/panel_me.xml index 4b911c9ce6..4b911c9ce6 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_me.xml +++ b/indra/newview/skins/default/xui/tr/panel_me.xml diff --git a/indra/newview/skins/default/xui/tr/panel_media_settings_general.xml b/indra/newview/skins/default/xui/tr/panel_media_settings_general.xml index 89e78b75de..89e78b75de 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_media_settings_general.xml +++ b/indra/newview/skins/default/xui/tr/panel_media_settings_general.xml diff --git a/indra/newview/skins/default/xui/tr/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/tr/panel_media_settings_permissions.xml index 6c0b14a889..6c0b14a889 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_media_settings_permissions.xml +++ b/indra/newview/skins/default/xui/tr/panel_media_settings_permissions.xml diff --git a/indra/newview/skins/default/xui/tr/panel_media_settings_security.xml b/indra/newview/skins/default/xui/tr/panel_media_settings_security.xml index da3ca1bd29..da3ca1bd29 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_media_settings_security.xml +++ b/indra/newview/skins/default/xui/tr/panel_media_settings_security.xml diff --git a/indra/newview/skins/default/xui/tr/panel_navigation_bar.xml b/indra/newview/skins/default/xui/tr/panel_navigation_bar.xml index 8d43e3fb5a..8d43e3fb5a 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_navigation_bar.xml +++ b/indra/newview/skins/default/xui/tr/panel_navigation_bar.xml diff --git a/indra/newview/skins/default/xui/tr/panel_nearby_chat.xml b/indra/newview/skins/default/xui/tr/panel_nearby_chat.xml index d238388b0e..d238388b0e 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_nearby_chat.xml +++ b/indra/newview/skins/default/xui/tr/panel_nearby_chat.xml diff --git a/indra/newview/skins/default/xui/tr/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/tr/panel_nearby_chat_bar.xml index 7d191191c4..7d191191c4 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_nearby_chat_bar.xml +++ b/indra/newview/skins/default/xui/tr/panel_nearby_chat_bar.xml diff --git a/indra/newview/skins/default/xui/tr/panel_nearby_media.xml b/indra/newview/skins/default/xui/tr/panel_nearby_media.xml index a654b2ac14..a654b2ac14 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_nearby_media.xml +++ b/indra/newview/skins/default/xui/tr/panel_nearby_media.xml diff --git a/indra/newview/skins/default/xui/tr/panel_notify_textbox.xml b/indra/newview/skins/default/xui/tr/panel_notify_textbox.xml index b893da2a71..b893da2a71 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_notify_textbox.xml +++ b/indra/newview/skins/default/xui/tr/panel_notify_textbox.xml diff --git a/indra/newview/skins/default/xui/tr/panel_online_status_toast.xml b/indra/newview/skins/default/xui/tr/panel_online_status_toast.xml index fdc489f375..fdc489f375 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_online_status_toast.xml +++ b/indra/newview/skins/default/xui/tr/panel_online_status_toast.xml diff --git a/indra/newview/skins/default/xui/tr/panel_outbox_inventory.xml b/indra/newview/skins/default/xui/tr/panel_outbox_inventory.xml index a947eee150..a947eee150 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_outbox_inventory.xml +++ b/indra/newview/skins/default/xui/tr/panel_outbox_inventory.xml diff --git a/indra/newview/skins/default/xui/tr/panel_outfit_edit.xml b/indra/newview/skins/default/xui/tr/panel_outfit_edit.xml index 00cd49abcd..00cd49abcd 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_outfit_edit.xml +++ b/indra/newview/skins/default/xui/tr/panel_outfit_edit.xml diff --git a/indra/newview/skins/default/xui/tr/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/tr/panel_outfits_inventory.xml index 550f7ebf10..550f7ebf10 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_outfits_inventory.xml +++ b/indra/newview/skins/default/xui/tr/panel_outfits_inventory.xml diff --git a/indra/newview/skins/default/xui/tr/panel_outfits_inventory_gear_default.xml b/indra/newview/skins/default/xui/tr/panel_outfits_inventory_gear_default.xml index d222f1a6e3..d222f1a6e3 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_outfits_inventory_gear_default.xml +++ b/indra/newview/skins/default/xui/tr/panel_outfits_inventory_gear_default.xml diff --git a/indra/newview/skins/default/xui/tr/panel_outfits_list.xml b/indra/newview/skins/default/xui/tr/panel_outfits_list.xml index 60a3576d84..60a3576d84 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_outfits_list.xml +++ b/indra/newview/skins/default/xui/tr/panel_outfits_list.xml diff --git a/indra/newview/skins/default/xui/tr/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/tr/panel_outfits_wearing.xml index 462926738f..462926738f 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_outfits_wearing.xml +++ b/indra/newview/skins/default/xui/tr/panel_outfits_wearing.xml diff --git a/indra/newview/skins/default/xui/tr/panel_people.xml b/indra/newview/skins/default/xui/tr/panel_people.xml index b499ec8307..b499ec8307 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_people.xml +++ b/indra/newview/skins/default/xui/tr/panel_people.xml diff --git a/indra/newview/skins/default/xui/tr/panel_pick_info.xml b/indra/newview/skins/default/xui/tr/panel_pick_info.xml index f2bbfac232..f2bbfac232 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_pick_info.xml +++ b/indra/newview/skins/default/xui/tr/panel_pick_info.xml diff --git a/indra/newview/skins/default/xui/tr/panel_picks.xml b/indra/newview/skins/default/xui/tr/panel_picks.xml index 26beac7854..26beac7854 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_picks.xml +++ b/indra/newview/skins/default/xui/tr/panel_picks.xml diff --git a/indra/newview/skins/default/xui/tr/panel_place_profile.xml b/indra/newview/skins/default/xui/tr/panel_place_profile.xml index f42cde0ace..f42cde0ace 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_place_profile.xml +++ b/indra/newview/skins/default/xui/tr/panel_place_profile.xml diff --git a/indra/newview/skins/default/xui/tr/panel_places.xml b/indra/newview/skins/default/xui/tr/panel_places.xml index c2a3acf9c5..c2a3acf9c5 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_places.xml +++ b/indra/newview/skins/default/xui/tr/panel_places.xml diff --git a/indra/newview/skins/default/xui/tr/panel_postcard_message.xml b/indra/newview/skins/default/xui/tr/panel_postcard_message.xml index 2361f4c1c3..2361f4c1c3 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_postcard_message.xml +++ b/indra/newview/skins/default/xui/tr/panel_postcard_message.xml 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..100644 --- 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_advanced.xml b/indra/newview/skins/default/xui/tr/panel_preferences_advanced.xml index 82c7b87c9a..82c7b87c9a 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/tr/panel_preferences_advanced.xml diff --git a/indra/newview/skins/default/xui/tr/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/tr/panel_preferences_alerts.xml index 46a4793c53..46a4793c53 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_preferences_alerts.xml +++ b/indra/newview/skins/default/xui/tr/panel_preferences_alerts.xml diff --git a/indra/newview/skins/default/xui/tr/panel_preferences_chat.xml b/indra/newview/skins/default/xui/tr/panel_preferences_chat.xml index d46f3e08cc..d46f3e08cc 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/tr/panel_preferences_chat.xml diff --git a/indra/newview/skins/default/xui/tr/panel_preferences_colors.xml b/indra/newview/skins/default/xui/tr/panel_preferences_colors.xml index f6e9d0948c..f6e9d0948c 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_preferences_colors.xml +++ b/indra/newview/skins/default/xui/tr/panel_preferences_colors.xml diff --git a/indra/newview/skins/default/xui/tr/panel_preferences_general.xml b/indra/newview/skins/default/xui/tr/panel_preferences_general.xml index 2c05e8a47a..2c05e8a47a 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/tr/panel_preferences_general.xml diff --git a/indra/newview/skins/default/xui/tr/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/tr/panel_preferences_graphics1.xml index 25c9e966c7..25c9e966c7 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/tr/panel_preferences_graphics1.xml diff --git a/indra/newview/skins/default/xui/tr/panel_preferences_move.xml b/indra/newview/skins/default/xui/tr/panel_preferences_move.xml index c35eaec9c3..c35eaec9c3 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_preferences_move.xml +++ b/indra/newview/skins/default/xui/tr/panel_preferences_move.xml diff --git a/indra/newview/skins/default/xui/tr/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/tr/panel_preferences_privacy.xml index 185d557567..185d557567 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_preferences_privacy.xml +++ b/indra/newview/skins/default/xui/tr/panel_preferences_privacy.xml 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..100644 --- 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_preferences_sound.xml b/indra/newview/skins/default/xui/tr/panel_preferences_sound.xml index 9256f1d324..9256f1d324 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/tr/panel_preferences_sound.xml diff --git a/indra/newview/skins/default/xui/tr/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/tr/panel_prim_media_controls.xml index 0433d03450..0433d03450 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_prim_media_controls.xml +++ b/indra/newview/skins/default/xui/tr/panel_prim_media_controls.xml diff --git a/indra/newview/skins/default/xui/tr/panel_region_covenant.xml b/indra/newview/skins/default/xui/tr/panel_region_covenant.xml index 5c46365aea..5c46365aea 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_region_covenant.xml +++ b/indra/newview/skins/default/xui/tr/panel_region_covenant.xml diff --git a/indra/newview/skins/default/xui/tr/panel_region_debug.xml b/indra/newview/skins/default/xui/tr/panel_region_debug.xml index ec654aae82..ec654aae82 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_region_debug.xml +++ b/indra/newview/skins/default/xui/tr/panel_region_debug.xml diff --git a/indra/newview/skins/default/xui/tr/panel_region_environment.xml b/indra/newview/skins/default/xui/tr/panel_region_environment.xml index 058ea91b70..058ea91b70 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_region_environment.xml +++ b/indra/newview/skins/default/xui/tr/panel_region_environment.xml diff --git a/indra/newview/skins/default/xui/tr/panel_region_estate.xml b/indra/newview/skins/default/xui/tr/panel_region_estate.xml index 4a9028643f..4a9028643f 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_region_estate.xml +++ b/indra/newview/skins/default/xui/tr/panel_region_estate.xml 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_region_general.xml b/indra/newview/skins/default/xui/tr/panel_region_general.xml index e6abef883d..e6abef883d 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_region_general.xml +++ b/indra/newview/skins/default/xui/tr/panel_region_general.xml diff --git a/indra/newview/skins/default/xui/tr/panel_region_terrain.xml b/indra/newview/skins/default/xui/tr/panel_region_terrain.xml index 3226ee008e..3226ee008e 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_region_terrain.xml +++ b/indra/newview/skins/default/xui/tr/panel_region_terrain.xml diff --git a/indra/newview/skins/default/xui/tr/panel_script_ed.xml b/indra/newview/skins/default/xui/tr/panel_script_ed.xml index 83040d06e4..83040d06e4 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_script_ed.xml +++ b/indra/newview/skins/default/xui/tr/panel_script_ed.xml 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_script_limits_my_avatar.xml b/indra/newview/skins/default/xui/tr/panel_script_limits_my_avatar.xml index c821dc45c1..c821dc45c1 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_script_limits_my_avatar.xml +++ b/indra/newview/skins/default/xui/tr/panel_script_limits_my_avatar.xml diff --git a/indra/newview/skins/default/xui/tr/panel_script_limits_region_memory.xml b/indra/newview/skins/default/xui/tr/panel_script_limits_region_memory.xml index 2994aba39b..2994aba39b 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_script_limits_region_memory.xml +++ b/indra/newview/skins/default/xui/tr/panel_script_limits_region_memory.xml diff --git a/indra/newview/skins/default/xui/tr/panel_script_question_toast.xml b/indra/newview/skins/default/xui/tr/panel_script_question_toast.xml index a2d0237da0..a2d0237da0 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_script_question_toast.xml +++ b/indra/newview/skins/default/xui/tr/panel_script_question_toast.xml diff --git a/indra/newview/skins/default/xui/tr/panel_scrolling_param.xml b/indra/newview/skins/default/xui/tr/panel_scrolling_param.xml index aabdc7358b..aabdc7358b 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_scrolling_param.xml +++ b/indra/newview/skins/default/xui/tr/panel_scrolling_param.xml diff --git a/indra/newview/skins/default/xui/tr/panel_scrolling_param_base.xml b/indra/newview/skins/default/xui/tr/panel_scrolling_param_base.xml index fa659040ea..fa659040ea 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_scrolling_param_base.xml +++ b/indra/newview/skins/default/xui/tr/panel_scrolling_param_base.xml diff --git a/indra/newview/skins/default/xui/tr/panel_side_tray_tab_caption.xml b/indra/newview/skins/default/xui/tr/panel_side_tray_tab_caption.xml index b9c39ef8cb..b9c39ef8cb 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_side_tray_tab_caption.xml +++ b/indra/newview/skins/default/xui/tr/panel_side_tray_tab_caption.xml 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..100644 --- 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..100644 --- 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..100644 --- 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'a Yükle" name="send_to_facebook_btn"/> + <button label="Twitter'a Yükle" name="send_to_twitter_btn"/> + <button label="Flickr'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..100644 --- 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..100644 --- 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_sound_devices.xml b/indra/newview/skins/default/xui/tr/panel_sound_devices.xml index 982ef2ea3b..982ef2ea3b 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_sound_devices.xml +++ b/indra/newview/skins/default/xui/tr/panel_sound_devices.xml diff --git a/indra/newview/skins/default/xui/tr/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/tr/panel_stand_stop_flying.xml index 91d07a3b0c..91d07a3b0c 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_stand_stop_flying.xml +++ b/indra/newview/skins/default/xui/tr/panel_stand_stop_flying.xml 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..100644 --- 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_teleport_history.xml b/indra/newview/skins/default/xui/tr/panel_teleport_history.xml index f5b1175029..f5b1175029 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_teleport_history.xml +++ b/indra/newview/skins/default/xui/tr/panel_teleport_history.xml diff --git a/indra/newview/skins/default/xui/tr/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/tr/panel_teleport_history_item.xml index 311cee53c6..311cee53c6 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_teleport_history_item.xml +++ b/indra/newview/skins/default/xui/tr/panel_teleport_history_item.xml 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/panel_voice_effect.xml b/indra/newview/skins/default/xui/tr/panel_voice_effect.xml index b46833d7e6..b46833d7e6 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_voice_effect.xml +++ b/indra/newview/skins/default/xui/tr/panel_voice_effect.xml diff --git a/indra/newview/skins/default/xui/tr/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/tr/panel_volume_pulldown.xml index 0c8c7b68b5..0c8c7b68b5 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_volume_pulldown.xml +++ b/indra/newview/skins/default/xui/tr/panel_volume_pulldown.xml diff --git a/indra/newview/skins/default/xui/tr/panel_world_map.xml b/indra/newview/skins/default/xui/tr/panel_world_map.xml index 5595c13a7c..5595c13a7c 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_world_map.xml +++ b/indra/newview/skins/default/xui/tr/panel_world_map.xml 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..100644 --- 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'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_appearance.xml b/indra/newview/skins/default/xui/tr/sidepanel_appearance.xml index b632f21cf5..b632f21cf5 100755..100644 --- a/indra/newview/skins/default/xui/tr/sidepanel_appearance.xml +++ b/indra/newview/skins/default/xui/tr/sidepanel_appearance.xml diff --git a/indra/newview/skins/default/xui/tr/sidepanel_inventory.xml b/indra/newview/skins/default/xui/tr/sidepanel_inventory.xml index 3241d52c81..3241d52c81 100755..100644 --- a/indra/newview/skins/default/xui/tr/sidepanel_inventory.xml +++ b/indra/newview/skins/default/xui/tr/sidepanel_inventory.xml 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..100644 --- 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..100644 --- 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..18a133a447 100755..100644 --- a/indra/newview/skins/default/xui/tr/strings.xml +++ b/indra/newview/skins/default/xui/tr/strings.xml @@ -38,7 +38,7 @@ Grafik başlatma başarılamadı. Lütfen grafik sürücünüzü güncelleştirin! </string> <string name="AboutHeader"> - [APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2] ([VIEWER_VERSION_3]) [BUILD_DATE] [BUILD_TIME] ([CHANNEL]) + [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ı]] </string> <string name="AboutCompiler"> @@ -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ş > Hata Ayıklama Ayarlarını Göster > 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'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'ü 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'ü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]'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..100644 --- 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. "[REGION_NAME]" 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_aaa.xml b/indra/newview/skins/default/xui/zh/floater_aaa.xml index e2d6a2b004..e2d6a2b004 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_aaa.xml +++ b/indra/newview/skins/default/xui/zh/floater_aaa.xml 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..100644 --- 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]，主機：<nolink>[HOSTNAME]</nolink> ([HOSTIP]) -第二人生 URL：<nolink>[SLURL]</nolink> -（全域坐標：[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..100644 --- 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_activeim.xml b/indra/newview/skins/default/xui/zh/floater_activeim.xml index b148ca8eb4..b148ca8eb4 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_activeim.xml +++ b/indra/newview/skins/default/xui/zh/floater_activeim.xml diff --git a/indra/newview/skins/default/xui/zh/floater_animation_anim_preview.xml b/indra/newview/skins/default/xui/zh/floater_animation_anim_preview.xml index 76cb9079c4..76cb9079c4 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_animation_anim_preview.xml +++ b/indra/newview/skins/default/xui/zh/floater_animation_anim_preview.xml diff --git a/indra/newview/skins/default/xui/zh/floater_animation_bvh_preview.xml b/indra/newview/skins/default/xui/zh/floater_animation_bvh_preview.xml index ffb0de8a68..756cca825d 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_animation_bvh_preview.xml +++ b/indra/newview/skins/default/xui/zh/floater_animation_bvh_preview.xml @@ -141,35 +141,35 @@ 表情 </text> <combo_box name="emote_combo" tool_tip="控制動作演繹時臉部的姿態"> - <item label="（無）" name="[None]" value=""/> - <item label="張口吶喊貌" name="Aaaaah" value="張口吶喊貌"/> - <item label="害怕" name="Afraid" value="害怕"/> - <item label="生氣" name="Angry" value="生氣"/> - <item label="燦爛笑容" name="BigSmile" value="燦爛笑容"/> - <item label="無聊" name="Bored" value="無聊"/> - <item label="哭泣" name="Cry" value="哭泣"/> - <item label="鄙視" name="Disdain" value="鄙視"/> - <item label="尷尬" name="Embarrassed" value="尷尬"/> - <item label="皺眉" name="Frown" value="皺眉"/> - <item label="親吻" name="Kiss" value="親吻"/> - <item label="笑" name="Laugh" value="笑"/> - <item label="嫌惡貌" name="Plllppt" value="嫌惡貌"/> - <item label="作噁" name="Repulsed" value="作噁"/> - <item label="傷心" name="Sad" value="傷心"/> - <item label="聳聳肩" name="Shrug" value="聳聳肩"/> - <item label="微笑" name="Smile" value="微笑"/> - <item label="驚喜" name="Surprise" value="驚喜"/> - <item label="眨眼" name="Wink" value="眨眼"/> - <item label="擔心" name="Worry" value="擔心"/> + <item label="（無）" name="[None]"/> + <item label="張口吶喊貌" name="Aaaaah"/> + <item label="害怕" name="Afraid"/> + <item label="生氣" name="Angry"/> + <item label="燦爛笑容" name="BigSmile"/> + <item label="無聊" name="Bored"/> + <item label="哭泣" name="Cry"/> + <item label="鄙視" name="Disdain"/> + <item label="尷尬" name="Embarrassed"/> + <item label="皺眉" name="Frown"/> + <item label="親吻" name="Kiss"/> + <item label="笑" name="Laugh"/> + <item label="嫌惡貌" name="Plllppt"/> + <item label="作噁" name="Repulsed"/> + <item label="傷心" name="Sad"/> + <item label="聳聳肩" name="Shrug"/> + <item label="微笑" name="Smile"/> + <item label="驚喜" name="Surprise"/> + <item label="眨眼" name="Wink"/> + <item label="擔心" name="Worry"/> </combo_box> <text name="preview_label"> 預覽… </text> <combo_box name="preview_base_anim" tool_tip="用這個來測試你的化身從一般動作轉入動作演繹時的情況。"> - <item label="站立" name="Standing" value="站立"/> - <item label="步行中" name="Walking" value="步行中"/> - <item label="坐著" name="Sitting" value="坐著"/> - <item label="飛行" name="Flying" value="飛行"/> + <item label="站立" name="Standing"/> + <item label="步行中" name="Walking"/> + <item label="坐著" name="Sitting"/> + <item label="飛行" name="Flying"/> </combo_box> <spinner label="淡入（秒）" name="ease_in_time" tool_tip="動作攙混植入的時間長度（秒）"/> <spinner label="淡出（秒）" name="ease_out_time" tool_tip="動作攙混淡出的時間長度（秒）"/> 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_auction.xml b/indra/newview/skins/default/xui/zh/floater_auction.xml index 1b589a92cc..1b589a92cc 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_auction.xml +++ b/indra/newview/skins/default/xui/zh/floater_auction.xml diff --git a/indra/newview/skins/default/xui/zh/floater_autoreplace.xml b/indra/newview/skins/default/xui/zh/floater_autoreplace.xml index 4ee07e6295..4ee07e6295 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_autoreplace.xml +++ b/indra/newview/skins/default/xui/zh/floater_autoreplace.xml diff --git a/indra/newview/skins/default/xui/zh/floater_avatar.xml b/indra/newview/skins/default/xui/zh/floater_avatar.xml index 55b1a95a41..55b1a95a41 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_avatar.xml +++ b/indra/newview/skins/default/xui/zh/floater_avatar.xml diff --git a/indra/newview/skins/default/xui/zh/floater_avatar_picker.xml b/indra/newview/skins/default/xui/zh/floater_avatar_picker.xml index c19369c859..c19369c859 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_avatar_picker.xml +++ b/indra/newview/skins/default/xui/zh/floater_avatar_picker.xml diff --git a/indra/newview/skins/default/xui/zh/floater_avatar_textures.xml b/indra/newview/skins/default/xui/zh/floater_avatar_textures.xml index 69309c96de..69309c96de 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_avatar_textures.xml +++ b/indra/newview/skins/default/xui/zh/floater_avatar_textures.xml diff --git a/indra/newview/skins/default/xui/zh/floater_beacons.xml b/indra/newview/skins/default/xui/zh/floater_beacons.xml index 83e10804d6..83e10804d6 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_beacons.xml +++ b/indra/newview/skins/default/xui/zh/floater_beacons.xml diff --git a/indra/newview/skins/default/xui/zh/floater_build_options.xml b/indra/newview/skins/default/xui/zh/floater_build_options.xml index 29f36b461c..29f36b461c 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_build_options.xml +++ b/indra/newview/skins/default/xui/zh/floater_build_options.xml diff --git a/indra/newview/skins/default/xui/zh/floater_bulk_perms.xml b/indra/newview/skins/default/xui/zh/floater_bulk_perms.xml index c103ea938f..c103ea938f 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_bulk_perms.xml +++ b/indra/newview/skins/default/xui/zh/floater_bulk_perms.xml diff --git a/indra/newview/skins/default/xui/zh/floater_bumps.xml b/indra/newview/skins/default/xui/zh/floater_bumps.xml index 2d76a9f831..2d76a9f831 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_bumps.xml +++ b/indra/newview/skins/default/xui/zh/floater_bumps.xml diff --git a/indra/newview/skins/default/xui/zh/floater_buy_contents.xml b/indra/newview/skins/default/xui/zh/floater_buy_contents.xml index 5e4153de66..5e4153de66 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_buy_contents.xml +++ b/indra/newview/skins/default/xui/zh/floater_buy_contents.xml diff --git a/indra/newview/skins/default/xui/zh/floater_buy_currency.xml b/indra/newview/skins/default/xui/zh/floater_buy_currency.xml index fcf2800728..fcf2800728 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_buy_currency.xml +++ b/indra/newview/skins/default/xui/zh/floater_buy_currency.xml diff --git a/indra/newview/skins/default/xui/zh/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/zh/floater_buy_currency_html.xml index ec700ad7af..ec700ad7af 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_buy_currency_html.xml +++ b/indra/newview/skins/default/xui/zh/floater_buy_currency_html.xml diff --git a/indra/newview/skins/default/xui/zh/floater_buy_land.xml b/indra/newview/skins/default/xui/zh/floater_buy_land.xml index 51bbd6a561..51bbd6a561 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_buy_land.xml +++ b/indra/newview/skins/default/xui/zh/floater_buy_land.xml diff --git a/indra/newview/skins/default/xui/zh/floater_buy_object.xml b/indra/newview/skins/default/xui/zh/floater_buy_object.xml index ff4a1feedb..ff4a1feedb 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_buy_object.xml +++ b/indra/newview/skins/default/xui/zh/floater_buy_object.xml diff --git a/indra/newview/skins/default/xui/zh/floater_camera.xml b/indra/newview/skins/default/xui/zh/floater_camera.xml index becb7b9546..becb7b9546 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_camera.xml +++ b/indra/newview/skins/default/xui/zh/floater_camera.xml diff --git a/indra/newview/skins/default/xui/zh/floater_chat_bar.xml b/indra/newview/skins/default/xui/zh/floater_chat_bar.xml index f1a69a7688..f1a69a7688 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_chat_bar.xml +++ b/indra/newview/skins/default/xui/zh/floater_chat_bar.xml diff --git a/indra/newview/skins/default/xui/zh/floater_choose_group.xml b/indra/newview/skins/default/xui/zh/floater_choose_group.xml index 9977bfc828..9977bfc828 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_choose_group.xml +++ b/indra/newview/skins/default/xui/zh/floater_choose_group.xml diff --git a/indra/newview/skins/default/xui/zh/floater_color_picker.xml b/indra/newview/skins/default/xui/zh/floater_color_picker.xml index fa7b795d4f..fa7b795d4f 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_color_picker.xml +++ b/indra/newview/skins/default/xui/zh/floater_color_picker.xml diff --git a/indra/newview/skins/default/xui/zh/floater_critical.xml b/indra/newview/skins/default/xui/zh/floater_critical.xml index 7d08fe8af2..7d08fe8af2 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_critical.xml +++ b/indra/newview/skins/default/xui/zh/floater_critical.xml diff --git a/indra/newview/skins/default/xui/zh/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/zh/floater_delete_env_preset.xml index 4aafb31952..4aafb31952 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_delete_env_preset.xml +++ b/indra/newview/skins/default/xui/zh/floater_delete_env_preset.xml diff --git a/indra/newview/skins/default/xui/zh/floater_destinations.xml b/indra/newview/skins/default/xui/zh/floater_destinations.xml index f50a6a631a..f50a6a631a 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_destinations.xml +++ b/indra/newview/skins/default/xui/zh/floater_destinations.xml diff --git a/indra/newview/skins/default/xui/zh/floater_display_name.xml b/indra/newview/skins/default/xui/zh/floater_display_name.xml index aa71bba769..aa71bba769 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_display_name.xml +++ b/indra/newview/skins/default/xui/zh/floater_display_name.xml diff --git a/indra/newview/skins/default/xui/zh/floater_edit_day_cycle.xml b/indra/newview/skins/default/xui/zh/floater_edit_day_cycle.xml index b84a4027ea..b84a4027ea 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_edit_day_cycle.xml +++ b/indra/newview/skins/default/xui/zh/floater_edit_day_cycle.xml 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_edit_sky_preset.xml b/indra/newview/skins/default/xui/zh/floater_edit_sky_preset.xml index 1ff832cdc4..1ff832cdc4 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_edit_sky_preset.xml +++ b/indra/newview/skins/default/xui/zh/floater_edit_sky_preset.xml diff --git a/indra/newview/skins/default/xui/zh/floater_edit_water_preset.xml b/indra/newview/skins/default/xui/zh/floater_edit_water_preset.xml index 7943866e72..7943866e72 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_edit_water_preset.xml +++ b/indra/newview/skins/default/xui/zh/floater_edit_water_preset.xml diff --git a/indra/newview/skins/default/xui/zh/floater_environment_settings.xml b/indra/newview/skins/default/xui/zh/floater_environment_settings.xml index 1c6f2f936d..1c6f2f936d 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_environment_settings.xml +++ b/indra/newview/skins/default/xui/zh/floater_environment_settings.xml diff --git a/indra/newview/skins/default/xui/zh/floater_event.xml b/indra/newview/skins/default/xui/zh/floater_event.xml index 7175731fef..7175731fef 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_event.xml +++ b/indra/newview/skins/default/xui/zh/floater_event.xml 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"> + "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 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_fast_timers.xml b/indra/newview/skins/default/xui/zh/floater_fast_timers.xml index 871849305c..871849305c 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_fast_timers.xml +++ b/indra/newview/skins/default/xui/zh/floater_fast_timers.xml diff --git a/indra/newview/skins/default/xui/zh/floater_font_test.xml b/indra/newview/skins/default/xui/zh/floater_font_test.xml index ec83c51eb3..ec83c51eb3 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_font_test.xml +++ b/indra/newview/skins/default/xui/zh/floater_font_test.xml diff --git a/indra/newview/skins/default/xui/zh/floater_gesture.xml b/indra/newview/skins/default/xui/zh/floater_gesture.xml index e7b1ed1de3..e7b1ed1de3 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_gesture.xml +++ b/indra/newview/skins/default/xui/zh/floater_gesture.xml diff --git a/indra/newview/skins/default/xui/zh/floater_god_tools.xml b/indra/newview/skins/default/xui/zh/floater_god_tools.xml index 69a6eadc8c..69a6eadc8c 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_god_tools.xml +++ b/indra/newview/skins/default/xui/zh/floater_god_tools.xml diff --git a/indra/newview/skins/default/xui/zh/floater_hardware_settings.xml b/indra/newview/skins/default/xui/zh/floater_hardware_settings.xml index 9e3bb88ac0..9e3bb88ac0 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_hardware_settings.xml +++ b/indra/newview/skins/default/xui/zh/floater_hardware_settings.xml diff --git a/indra/newview/skins/default/xui/zh/floater_help_browser.xml b/indra/newview/skins/default/xui/zh/floater_help_browser.xml index e605d5f19c..e605d5f19c 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_help_browser.xml +++ b/indra/newview/skins/default/xui/zh/floater_help_browser.xml diff --git a/indra/newview/skins/default/xui/zh/floater_how_to.xml b/indra/newview/skins/default/xui/zh/floater_how_to.xml index e033327165..e033327165 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_how_to.xml +++ b/indra/newview/skins/default/xui/zh/floater_how_to.xml diff --git a/indra/newview/skins/default/xui/zh/floater_hud.xml b/indra/newview/skins/default/xui/zh/floater_hud.xml index a788961e95..a788961e95 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_hud.xml +++ b/indra/newview/skins/default/xui/zh/floater_hud.xml diff --git a/indra/newview/skins/default/xui/zh/floater_im_container.xml b/indra/newview/skins/default/xui/zh/floater_im_container.xml index 84ad869100..84ad869100 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_im_container.xml +++ b/indra/newview/skins/default/xui/zh/floater_im_container.xml diff --git a/indra/newview/skins/default/xui/zh/floater_im_session.xml b/indra/newview/skins/default/xui/zh/floater_im_session.xml index 864af2e592..864af2e592 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_im_session.xml +++ b/indra/newview/skins/default/xui/zh/floater_im_session.xml diff --git a/indra/newview/skins/default/xui/zh/floater_image_preview.xml b/indra/newview/skins/default/xui/zh/floater_image_preview.xml index d2de37fa6a..d2de37fa6a 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_image_preview.xml +++ b/indra/newview/skins/default/xui/zh/floater_image_preview.xml diff --git a/indra/newview/skins/default/xui/zh/floater_import_collada.xml b/indra/newview/skins/default/xui/zh/floater_import_collada.xml index 8f6b476ccf..8f6b476ccf 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_import_collada.xml +++ b/indra/newview/skins/default/xui/zh/floater_import_collada.xml diff --git a/indra/newview/skins/default/xui/zh/floater_incoming_call.xml b/indra/newview/skins/default/xui/zh/floater_incoming_call.xml index 4526eff21d..4526eff21d 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_incoming_call.xml +++ b/indra/newview/skins/default/xui/zh/floater_incoming_call.xml diff --git a/indra/newview/skins/default/xui/zh/floater_inspect.xml b/indra/newview/skins/default/xui/zh/floater_inspect.xml index 4e1f4b24fd..4e1f4b24fd 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_inspect.xml +++ b/indra/newview/skins/default/xui/zh/floater_inspect.xml 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..100644 --- 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..100644 --- 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_joystick.xml b/indra/newview/skins/default/xui/zh/floater_joystick.xml index e0b2cf5a1c..e0b2cf5a1c 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_joystick.xml +++ b/indra/newview/skins/default/xui/zh/floater_joystick.xml 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 'Bandwidth' 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_land_holdings.xml b/indra/newview/skins/default/xui/zh/floater_land_holdings.xml index aae2cfb466..aae2cfb466 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_land_holdings.xml +++ b/indra/newview/skins/default/xui/zh/floater_land_holdings.xml 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..100644 --- 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=">" name="view_profile"/> </floater> diff --git a/indra/newview/skins/default/xui/zh/floater_lsl_guide.xml b/indra/newview/skins/default/xui/zh/floater_lsl_guide.xml index b10a480b06..b10a480b06 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_lsl_guide.xml +++ b/indra/newview/skins/default/xui/zh/floater_lsl_guide.xml diff --git a/indra/newview/skins/default/xui/zh/floater_map.xml b/indra/newview/skins/default/xui/zh/floater_map.xml index 8a030b3b3f..8a030b3b3f 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_map.xml +++ b/indra/newview/skins/default/xui/zh/floater_map.xml 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_media_browser.xml b/indra/newview/skins/default/xui/zh/floater_media_browser.xml index 7f030924e1..7f030924e1 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_media_browser.xml +++ b/indra/newview/skins/default/xui/zh/floater_media_browser.xml diff --git a/indra/newview/skins/default/xui/zh/floater_media_settings.xml b/indra/newview/skins/default/xui/zh/floater_media_settings.xml index 3984095a65..3984095a65 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_media_settings.xml +++ b/indra/newview/skins/default/xui/zh/floater_media_settings.xml diff --git a/indra/newview/skins/default/xui/zh/floater_mem_leaking.xml b/indra/newview/skins/default/xui/zh/floater_mem_leaking.xml index 350254e385..350254e385 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_mem_leaking.xml +++ b/indra/newview/skins/default/xui/zh/floater_mem_leaking.xml diff --git a/indra/newview/skins/default/xui/zh/floater_merchant_outbox.xml b/indra/newview/skins/default/xui/zh/floater_merchant_outbox.xml index 6b6126c8e0..6b6126c8e0 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_merchant_outbox.xml +++ b/indra/newview/skins/default/xui/zh/floater_merchant_outbox.xml diff --git a/indra/newview/skins/default/xui/zh/floater_model_preview.xml b/indra/newview/skins/default/xui/zh/floater_model_preview.xml index 22b3d3b065..22b3d3b065 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_model_preview.xml +++ b/indra/newview/skins/default/xui/zh/floater_model_preview.xml diff --git a/indra/newview/skins/default/xui/zh/floater_moveview.xml b/indra/newview/skins/default/xui/zh/floater_moveview.xml index 0b267e8fae..0b267e8fae 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_moveview.xml +++ b/indra/newview/skins/default/xui/zh/floater_moveview.xml diff --git a/indra/newview/skins/default/xui/zh/floater_mute_object.xml b/indra/newview/skins/default/xui/zh/floater_mute_object.xml index 64998d3e28..64998d3e28 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_mute_object.xml +++ b/indra/newview/skins/default/xui/zh/floater_mute_object.xml diff --git a/indra/newview/skins/default/xui/zh/floater_my_appearance.xml b/indra/newview/skins/default/xui/zh/floater_my_appearance.xml index 217ea5d1f9..217ea5d1f9 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_my_appearance.xml +++ b/indra/newview/skins/default/xui/zh/floater_my_appearance.xml diff --git a/indra/newview/skins/default/xui/zh/floater_my_inventory.xml b/indra/newview/skins/default/xui/zh/floater_my_inventory.xml index 187597f4eb..187597f4eb 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_my_inventory.xml +++ b/indra/newview/skins/default/xui/zh/floater_my_inventory.xml diff --git a/indra/newview/skins/default/xui/zh/floater_notification.xml b/indra/newview/skins/default/xui/zh/floater_notification.xml index 1e0e207fb0..1e0e207fb0 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_notification.xml +++ b/indra/newview/skins/default/xui/zh/floater_notification.xml diff --git a/indra/newview/skins/default/xui/zh/floater_notifications_console.xml b/indra/newview/skins/default/xui/zh/floater_notifications_console.xml index 3478761b0b..3478761b0b 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_notifications_console.xml +++ b/indra/newview/skins/default/xui/zh/floater_notifications_console.xml diff --git a/indra/newview/skins/default/xui/zh/floater_object_weights.xml b/indra/newview/skins/default/xui/zh/floater_object_weights.xml index d2875b24b4..d2875b24b4 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_object_weights.xml +++ b/indra/newview/skins/default/xui/zh/floater_object_weights.xml 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..100644 --- 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_outfit_save_as.xml b/indra/newview/skins/default/xui/zh/floater_outfit_save_as.xml index 9e786edcdd..9e786edcdd 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_outfit_save_as.xml +++ b/indra/newview/skins/default/xui/zh/floater_outfit_save_as.xml diff --git a/indra/newview/skins/default/xui/zh/floater_outgoing_call.xml b/indra/newview/skins/default/xui/zh/floater_outgoing_call.xml index e57374f4d7..e57374f4d7 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_outgoing_call.xml +++ b/indra/newview/skins/default/xui/zh/floater_outgoing_call.xml diff --git a/indra/newview/skins/default/xui/zh/floater_pathfinding_characters.xml b/indra/newview/skins/default/xui/zh/floater_pathfinding_characters.xml index e6971d111f..e6971d111f 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_pathfinding_characters.xml +++ b/indra/newview/skins/default/xui/zh/floater_pathfinding_characters.xml diff --git a/indra/newview/skins/default/xui/zh/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/zh/floater_pathfinding_console.xml index be009b54d8..be009b54d8 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_pathfinding_console.xml +++ b/indra/newview/skins/default/xui/zh/floater_pathfinding_console.xml diff --git a/indra/newview/skins/default/xui/zh/floater_pathfinding_linksets.xml b/indra/newview/skins/default/xui/zh/floater_pathfinding_linksets.xml index 22e5d2e846..22e5d2e846 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_pathfinding_linksets.xml +++ b/indra/newview/skins/default/xui/zh/floater_pathfinding_linksets.xml 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..100644 --- 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..100644 --- 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_people.xml b/indra/newview/skins/default/xui/zh/floater_people.xml index f629f2f184..f629f2f184 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_people.xml +++ b/indra/newview/skins/default/xui/zh/floater_people.xml diff --git a/indra/newview/skins/default/xui/zh/floater_perm_prefs.xml b/indra/newview/skins/default/xui/zh/floater_perm_prefs.xml index b38db59ff3..b38db59ff3 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_perm_prefs.xml +++ b/indra/newview/skins/default/xui/zh/floater_perm_prefs.xml diff --git a/indra/newview/skins/default/xui/zh/floater_picks.xml b/indra/newview/skins/default/xui/zh/floater_picks.xml index a8bfcd99e3..a8bfcd99e3 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_picks.xml +++ b/indra/newview/skins/default/xui/zh/floater_picks.xml diff --git a/indra/newview/skins/default/xui/zh/floater_places.xml b/indra/newview/skins/default/xui/zh/floater_places.xml index f6ef1e2141..f6ef1e2141 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_places.xml +++ b/indra/newview/skins/default/xui/zh/floater_places.xml diff --git a/indra/newview/skins/default/xui/zh/floater_post_process.xml b/indra/newview/skins/default/xui/zh/floater_post_process.xml index 2908f7c1d0..2908f7c1d0 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_post_process.xml +++ b/indra/newview/skins/default/xui/zh/floater_post_process.xml diff --git a/indra/newview/skins/default/xui/zh/floater_preferences.xml b/indra/newview/skins/default/xui/zh/floater_preferences.xml index b0a27e8c1f..b0a27e8c1f 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_preferences.xml +++ b/indra/newview/skins/default/xui/zh/floater_preferences.xml diff --git a/indra/newview/skins/default/xui/zh/floater_preferences_proxy.xml b/indra/newview/skins/default/xui/zh/floater_preferences_proxy.xml index f91d5c5cdb..f91d5c5cdb 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_preferences_proxy.xml +++ b/indra/newview/skins/default/xui/zh/floater_preferences_proxy.xml diff --git a/indra/newview/skins/default/xui/zh/floater_preview_animation.xml b/indra/newview/skins/default/xui/zh/floater_preview_animation.xml index b94d67b7ef..b94d67b7ef 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_preview_animation.xml +++ b/indra/newview/skins/default/xui/zh/floater_preview_animation.xml diff --git a/indra/newview/skins/default/xui/zh/floater_preview_gesture.xml b/indra/newview/skins/default/xui/zh/floater_preview_gesture.xml index be75038a09..be75038a09 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_preview_gesture.xml +++ b/indra/newview/skins/default/xui/zh/floater_preview_gesture.xml diff --git a/indra/newview/skins/default/xui/zh/floater_preview_notecard.xml b/indra/newview/skins/default/xui/zh/floater_preview_notecard.xml index 9447939801..9447939801 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_preview_notecard.xml +++ b/indra/newview/skins/default/xui/zh/floater_preview_notecard.xml diff --git a/indra/newview/skins/default/xui/zh/floater_preview_sound.xml b/indra/newview/skins/default/xui/zh/floater_preview_sound.xml index d04428a36d..d04428a36d 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_preview_sound.xml +++ b/indra/newview/skins/default/xui/zh/floater_preview_sound.xml diff --git a/indra/newview/skins/default/xui/zh/floater_preview_texture.xml b/indra/newview/skins/default/xui/zh/floater_preview_texture.xml index c56b1c2987..c56b1c2987 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_preview_texture.xml +++ b/indra/newview/skins/default/xui/zh/floater_preview_texture.xml diff --git a/indra/newview/skins/default/xui/zh/floater_price_for_listing.xml b/indra/newview/skins/default/xui/zh/floater_price_for_listing.xml index 078b490655..078b490655 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_price_for_listing.xml +++ b/indra/newview/skins/default/xui/zh/floater_price_for_listing.xml diff --git a/indra/newview/skins/default/xui/zh/floater_publish_classified.xml b/indra/newview/skins/default/xui/zh/floater_publish_classified.xml index b810af0145..b810af0145 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_publish_classified.xml +++ b/indra/newview/skins/default/xui/zh/floater_publish_classified.xml diff --git a/indra/newview/skins/default/xui/zh/floater_region_debug_console.xml b/indra/newview/skins/default/xui/zh/floater_region_debug_console.xml index 4ff2a3fc79..4ff2a3fc79 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_region_debug_console.xml +++ b/indra/newview/skins/default/xui/zh/floater_region_debug_console.xml diff --git a/indra/newview/skins/default/xui/zh/floater_region_info.xml b/indra/newview/skins/default/xui/zh/floater_region_info.xml index 0e4879f555..0e4879f555 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_region_info.xml +++ b/indra/newview/skins/default/xui/zh/floater_region_info.xml 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..100644 --- 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="土地 > 侵佔 > 物件或材質" 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/zh/floater_script_debug.xml b/indra/newview/skins/default/xui/zh/floater_script_debug.xml index 5b3500c018..5b3500c018 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_script_debug.xml +++ b/indra/newview/skins/default/xui/zh/floater_script_debug.xml diff --git a/indra/newview/skins/default/xui/zh/floater_script_debug_panel.xml b/indra/newview/skins/default/xui/zh/floater_script_debug_panel.xml index e70a30fa24..e70a30fa24 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_script_debug_panel.xml +++ b/indra/newview/skins/default/xui/zh/floater_script_debug_panel.xml diff --git a/indra/newview/skins/default/xui/zh/floater_script_limits.xml b/indra/newview/skins/default/xui/zh/floater_script_limits.xml index 7cd2c8e6c6..7cd2c8e6c6 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_script_limits.xml +++ b/indra/newview/skins/default/xui/zh/floater_script_limits.xml diff --git a/indra/newview/skins/default/xui/zh/floater_script_preview.xml b/indra/newview/skins/default/xui/zh/floater_script_preview.xml index a6c6c76181..a6c6c76181 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_script_preview.xml +++ b/indra/newview/skins/default/xui/zh/floater_script_preview.xml diff --git a/indra/newview/skins/default/xui/zh/floater_script_queue.xml b/indra/newview/skins/default/xui/zh/floater_script_queue.xml index 7c253aa74c..7c253aa74c 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_script_queue.xml +++ b/indra/newview/skins/default/xui/zh/floater_script_queue.xml diff --git a/indra/newview/skins/default/xui/zh/floater_script_search.xml b/indra/newview/skins/default/xui/zh/floater_script_search.xml index 11c23d933f..11c23d933f 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_script_search.xml +++ b/indra/newview/skins/default/xui/zh/floater_script_search.xml diff --git a/indra/newview/skins/default/xui/zh/floater_search.xml b/indra/newview/skins/default/xui/zh/floater_search.xml index 3e85a529ae..3e85a529ae 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_search.xml +++ b/indra/newview/skins/default/xui/zh/floater_search.xml diff --git a/indra/newview/skins/default/xui/zh/floater_select_key.xml b/indra/newview/skins/default/xui/zh/floater_select_key.xml index 231eb48b04..231eb48b04 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_select_key.xml +++ b/indra/newview/skins/default/xui/zh/floater_select_key.xml diff --git a/indra/newview/skins/default/xui/zh/floater_sell_land.xml b/indra/newview/skins/default/xui/zh/floater_sell_land.xml index 9030f7eb63..9030f7eb63 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_sell_land.xml +++ b/indra/newview/skins/default/xui/zh/floater_sell_land.xml diff --git a/indra/newview/skins/default/xui/zh/floater_settings_debug.xml b/indra/newview/skins/default/xui/zh/floater_settings_debug.xml index 56a31bc292..56a31bc292 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_settings_debug.xml +++ b/indra/newview/skins/default/xui/zh/floater_settings_debug.xml 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..100644 --- 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_sound_devices.xml b/indra/newview/skins/default/xui/zh/floater_sound_devices.xml index 0374c74f8f..0374c74f8f 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_sound_devices.xml +++ b/indra/newview/skins/default/xui/zh/floater_sound_devices.xml diff --git a/indra/newview/skins/default/xui/zh/floater_sound_preview.xml b/indra/newview/skins/default/xui/zh/floater_sound_preview.xml index c942ba1cfb..c942ba1cfb 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_sound_preview.xml +++ b/indra/newview/skins/default/xui/zh/floater_sound_preview.xml diff --git a/indra/newview/skins/default/xui/zh/floater_spellcheck.xml b/indra/newview/skins/default/xui/zh/floater_spellcheck.xml index f5a6665844..f5a6665844 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_spellcheck.xml +++ b/indra/newview/skins/default/xui/zh/floater_spellcheck.xml diff --git a/indra/newview/skins/default/xui/zh/floater_spellcheck_import.xml b/indra/newview/skins/default/xui/zh/floater_spellcheck_import.xml index 6094a3bbce..6094a3bbce 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_spellcheck_import.xml +++ b/indra/newview/skins/default/xui/zh/floater_spellcheck_import.xml diff --git a/indra/newview/skins/default/xui/zh/floater_stats.xml b/indra/newview/skins/default/xui/zh/floater_stats.xml index f06eb5e78f..f06eb5e78f 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_stats.xml +++ b/indra/newview/skins/default/xui/zh/floater_stats.xml diff --git a/indra/newview/skins/default/xui/zh/floater_sys_well.xml b/indra/newview/skins/default/xui/zh/floater_sys_well.xml index ca0b7f146d..ca0b7f146d 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_sys_well.xml +++ b/indra/newview/skins/default/xui/zh/floater_sys_well.xml diff --git a/indra/newview/skins/default/xui/zh/floater_telehub.xml b/indra/newview/skins/default/xui/zh/floater_telehub.xml index ee21a78e90..ee21a78e90 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_telehub.xml +++ b/indra/newview/skins/default/xui/zh/floater_telehub.xml diff --git a/indra/newview/skins/default/xui/zh/floater_test_layout_stacks.xml b/indra/newview/skins/default/xui/zh/floater_test_layout_stacks.xml index 68fcf3f7f7..68fcf3f7f7 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_test_layout_stacks.xml +++ b/indra/newview/skins/default/xui/zh/floater_test_layout_stacks.xml diff --git a/indra/newview/skins/default/xui/zh/floater_test_text_vertical_aligment.xml b/indra/newview/skins/default/xui/zh/floater_test_text_vertical_aligment.xml index 83b6df6fe5..83b6df6fe5 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_test_text_vertical_aligment.xml +++ b/indra/newview/skins/default/xui/zh/floater_test_text_vertical_aligment.xml diff --git a/indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml index 02d06323d4..02d06323d4 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml +++ b/indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml diff --git a/indra/newview/skins/default/xui/zh/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/zh/floater_texture_fetch_debugger.xml index 0dcac17a75..0dcac17a75 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_texture_fetch_debugger.xml +++ b/indra/newview/skins/default/xui/zh/floater_texture_fetch_debugger.xml diff --git a/indra/newview/skins/default/xui/zh/floater_tools.xml b/indra/newview/skins/default/xui/zh/floater_tools.xml index 175e2bf7a4..175e2bf7a4 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_tools.xml +++ b/indra/newview/skins/default/xui/zh/floater_tools.xml 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..100644 --- 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_tos.xml b/indra/newview/skins/default/xui/zh/floater_tos.xml index 3da9445a55..3da9445a55 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_tos.xml +++ b/indra/newview/skins/default/xui/zh/floater_tos.xml diff --git a/indra/newview/skins/default/xui/zh/floater_toybox.xml b/indra/newview/skins/default/xui/zh/floater_toybox.xml index fc6b6ea611..fc6b6ea611 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_toybox.xml +++ b/indra/newview/skins/default/xui/zh/floater_toybox.xml diff --git a/indra/newview/skins/default/xui/zh/floater_translation_settings.xml b/indra/newview/skins/default/xui/zh/floater_translation_settings.xml index fe84872557..fe84872557 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_translation_settings.xml +++ b/indra/newview/skins/default/xui/zh/floater_translation_settings.xml 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/floater_url_entry.xml b/indra/newview/skins/default/xui/zh/floater_url_entry.xml index 9e3f3cd47d..9e3f3cd47d 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_url_entry.xml +++ b/indra/newview/skins/default/xui/zh/floater_url_entry.xml diff --git a/indra/newview/skins/default/xui/zh/floater_voice_controls.xml b/indra/newview/skins/default/xui/zh/floater_voice_controls.xml index a3a7679957..a3a7679957 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_voice_controls.xml +++ b/indra/newview/skins/default/xui/zh/floater_voice_controls.xml diff --git a/indra/newview/skins/default/xui/zh/floater_voice_effect.xml b/indra/newview/skins/default/xui/zh/floater_voice_effect.xml index aab5fa6028..aab5fa6028 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_voice_effect.xml +++ b/indra/newview/skins/default/xui/zh/floater_voice_effect.xml diff --git a/indra/newview/skins/default/xui/zh/floater_web_content.xml b/indra/newview/skins/default/xui/zh/floater_web_content.xml index be6bf8bb27..be6bf8bb27 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_web_content.xml +++ b/indra/newview/skins/default/xui/zh/floater_web_content.xml diff --git a/indra/newview/skins/default/xui/zh/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/zh/floater_whitelist_entry.xml index 967e36ead7..967e36ead7 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_whitelist_entry.xml +++ b/indra/newview/skins/default/xui/zh/floater_whitelist_entry.xml diff --git a/indra/newview/skins/default/xui/zh/floater_window_size.xml b/indra/newview/skins/default/xui/zh/floater_window_size.xml index 3942f72d76..3942f72d76 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_window_size.xml +++ b/indra/newview/skins/default/xui/zh/floater_window_size.xml diff --git a/indra/newview/skins/default/xui/zh/floater_world_map.xml b/indra/newview/skins/default/xui/zh/floater_world_map.xml index 4cd05ebaa0..4cd05ebaa0 100755..100644 --- a/indra/newview/skins/default/xui/zh/floater_world_map.xml +++ b/indra/newview/skins/default/xui/zh/floater_world_map.xml diff --git a/indra/newview/skins/default/xui/zh/inspect_avatar.xml b/indra/newview/skins/default/xui/zh/inspect_avatar.xml index ef10e5d2d0..ef10e5d2d0 100755..100644 --- a/indra/newview/skins/default/xui/zh/inspect_avatar.xml +++ b/indra/newview/skins/default/xui/zh/inspect_avatar.xml diff --git a/indra/newview/skins/default/xui/zh/inspect_group.xml b/indra/newview/skins/default/xui/zh/inspect_group.xml index ca5ccc3349..ca5ccc3349 100755..100644 --- a/indra/newview/skins/default/xui/zh/inspect_group.xml +++ b/indra/newview/skins/default/xui/zh/inspect_group.xml diff --git a/indra/newview/skins/default/xui/zh/inspect_object.xml b/indra/newview/skins/default/xui/zh/inspect_object.xml index 377b8b7c78..377b8b7c78 100755..100644 --- a/indra/newview/skins/default/xui/zh/inspect_object.xml +++ b/indra/newview/skins/default/xui/zh/inspect_object.xml diff --git a/indra/newview/skins/default/xui/zh/inspect_remote_object.xml b/indra/newview/skins/default/xui/zh/inspect_remote_object.xml index b8418fc8a1..b8418fc8a1 100755..100644 --- a/indra/newview/skins/default/xui/zh/inspect_remote_object.xml +++ b/indra/newview/skins/default/xui/zh/inspect_remote_object.xml diff --git a/indra/newview/skins/default/xui/zh/menu_add_wearable_gear.xml b/indra/newview/skins/default/xui/zh/menu_add_wearable_gear.xml index 3c8c3e4a31..3c8c3e4a31 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_add_wearable_gear.xml +++ b/indra/newview/skins/default/xui/zh/menu_add_wearable_gear.xml diff --git a/indra/newview/skins/default/xui/zh/menu_attachment_other.xml b/indra/newview/skins/default/xui/zh/menu_attachment_other.xml index 41b3409627..41b3409627 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_attachment_other.xml +++ b/indra/newview/skins/default/xui/zh/menu_attachment_other.xml 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..100644 --- 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_icon.xml b/indra/newview/skins/default/xui/zh/menu_avatar_icon.xml index cefb395256..cefb395256 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_avatar_icon.xml +++ b/indra/newview/skins/default/xui/zh/menu_avatar_icon.xml diff --git a/indra/newview/skins/default/xui/zh/menu_avatar_other.xml b/indra/newview/skins/default/xui/zh/menu_avatar_other.xml index dc035bafa0..dc035bafa0 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_avatar_other.xml +++ b/indra/newview/skins/default/xui/zh/menu_avatar_other.xml 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..100644 --- 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_cof_attachment.xml b/indra/newview/skins/default/xui/zh/menu_cof_attachment.xml index 876fef16df..876fef16df 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_cof_attachment.xml +++ b/indra/newview/skins/default/xui/zh/menu_cof_attachment.xml diff --git a/indra/newview/skins/default/xui/zh/menu_cof_body_part.xml b/indra/newview/skins/default/xui/zh/menu_cof_body_part.xml index d06207b19d..d06207b19d 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_cof_body_part.xml +++ b/indra/newview/skins/default/xui/zh/menu_cof_body_part.xml diff --git a/indra/newview/skins/default/xui/zh/menu_cof_clothing.xml b/indra/newview/skins/default/xui/zh/menu_cof_clothing.xml index 300ff47b12..300ff47b12 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_cof_clothing.xml +++ b/indra/newview/skins/default/xui/zh/menu_cof_clothing.xml diff --git a/indra/newview/skins/default/xui/zh/menu_cof_gear.xml b/indra/newview/skins/default/xui/zh/menu_cof_gear.xml index eb7093a23c..eb7093a23c 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_cof_gear.xml +++ b/indra/newview/skins/default/xui/zh/menu_cof_gear.xml diff --git a/indra/newview/skins/default/xui/zh/menu_edit.xml b/indra/newview/skins/default/xui/zh/menu_edit.xml index bda640e5f3..bda640e5f3 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_edit.xml +++ b/indra/newview/skins/default/xui/zh/menu_edit.xml diff --git a/indra/newview/skins/default/xui/zh/menu_favorites.xml b/indra/newview/skins/default/xui/zh/menu_favorites.xml index a01412ce1c..a01412ce1c 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_favorites.xml +++ b/indra/newview/skins/default/xui/zh/menu_favorites.xml diff --git a/indra/newview/skins/default/xui/zh/menu_gesture_gear.xml b/indra/newview/skins/default/xui/zh/menu_gesture_gear.xml index 5a38197e4c..5a38197e4c 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_gesture_gear.xml +++ b/indra/newview/skins/default/xui/zh/menu_gesture_gear.xml diff --git a/indra/newview/skins/default/xui/zh/menu_group_plus.xml b/indra/newview/skins/default/xui/zh/menu_group_plus.xml index d4a5a69104..d4a5a69104 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_group_plus.xml +++ b/indra/newview/skins/default/xui/zh/menu_group_plus.xml diff --git a/indra/newview/skins/default/xui/zh/menu_hide_navbar.xml b/indra/newview/skins/default/xui/zh/menu_hide_navbar.xml index 3f6820cb32..3f6820cb32 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_hide_navbar.xml +++ b/indra/newview/skins/default/xui/zh/menu_hide_navbar.xml diff --git a/indra/newview/skins/default/xui/zh/menu_imchiclet_adhoc.xml b/indra/newview/skins/default/xui/zh/menu_imchiclet_adhoc.xml index 85417d554e..85417d554e 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_imchiclet_adhoc.xml +++ b/indra/newview/skins/default/xui/zh/menu_imchiclet_adhoc.xml diff --git a/indra/newview/skins/default/xui/zh/menu_imchiclet_group.xml b/indra/newview/skins/default/xui/zh/menu_imchiclet_group.xml index 4664fcb027..4664fcb027 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_imchiclet_group.xml +++ b/indra/newview/skins/default/xui/zh/menu_imchiclet_group.xml diff --git a/indra/newview/skins/default/xui/zh/menu_imchiclet_p2p.xml b/indra/newview/skins/default/xui/zh/menu_imchiclet_p2p.xml index 636bdaae09..636bdaae09 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_imchiclet_p2p.xml +++ b/indra/newview/skins/default/xui/zh/menu_imchiclet_p2p.xml diff --git a/indra/newview/skins/default/xui/zh/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/zh/menu_inspect_avatar_gear.xml index f4e886ff67..f4e886ff67 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_inspect_avatar_gear.xml +++ b/indra/newview/skins/default/xui/zh/menu_inspect_avatar_gear.xml diff --git a/indra/newview/skins/default/xui/zh/menu_inspect_object_gear.xml b/indra/newview/skins/default/xui/zh/menu_inspect_object_gear.xml index abff0f64ac..abff0f64ac 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_inspect_object_gear.xml +++ b/indra/newview/skins/default/xui/zh/menu_inspect_object_gear.xml diff --git a/indra/newview/skins/default/xui/zh/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/zh/menu_inspect_self_gear.xml index c48ee0c9be..c48ee0c9be 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_inspect_self_gear.xml +++ b/indra/newview/skins/default/xui/zh/menu_inspect_self_gear.xml diff --git a/indra/newview/skins/default/xui/zh/menu_inv_offer_chiclet.xml b/indra/newview/skins/default/xui/zh/menu_inv_offer_chiclet.xml index 577e5988f8..577e5988f8 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_inv_offer_chiclet.xml +++ b/indra/newview/skins/default/xui/zh/menu_inv_offer_chiclet.xml 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..100644 --- 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_add.xml b/indra/newview/skins/default/xui/zh/menu_inventory_add.xml index 30bf5a7e75..30bf5a7e75 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_inventory_add.xml +++ b/indra/newview/skins/default/xui/zh/menu_inventory_add.xml 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..100644 --- 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_land.xml b/indra/newview/skins/default/xui/zh/menu_land.xml index 3ad9c0ab31..3ad9c0ab31 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_land.xml +++ b/indra/newview/skins/default/xui/zh/menu_land.xml diff --git a/indra/newview/skins/default/xui/zh/menu_landmark.xml b/indra/newview/skins/default/xui/zh/menu_landmark.xml index 7372b223cf..7372b223cf 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_landmark.xml +++ b/indra/newview/skins/default/xui/zh/menu_landmark.xml diff --git a/indra/newview/skins/default/xui/zh/menu_login.xml b/indra/newview/skins/default/xui/zh/menu_login.xml index 4a1e2f4364..4a1e2f4364 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_login.xml +++ b/indra/newview/skins/default/xui/zh/menu_login.xml 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_media_ctrl.xml b/indra/newview/skins/default/xui/zh/menu_media_ctrl.xml index d222d7f658..d222d7f658 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_media_ctrl.xml +++ b/indra/newview/skins/default/xui/zh/menu_media_ctrl.xml diff --git a/indra/newview/skins/default/xui/zh/menu_mini_map.xml b/indra/newview/skins/default/xui/zh/menu_mini_map.xml index 7fd629471a..7fd629471a 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_mini_map.xml +++ b/indra/newview/skins/default/xui/zh/menu_mini_map.xml diff --git a/indra/newview/skins/default/xui/zh/menu_model_import_gear_default.xml b/indra/newview/skins/default/xui/zh/menu_model_import_gear_default.xml index 5f82685632..5f82685632 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_model_import_gear_default.xml +++ b/indra/newview/skins/default/xui/zh/menu_model_import_gear_default.xml diff --git a/indra/newview/skins/default/xui/zh/menu_navbar.xml b/indra/newview/skins/default/xui/zh/menu_navbar.xml index d8356e6277..d8356e6277 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_navbar.xml +++ b/indra/newview/skins/default/xui/zh/menu_navbar.xml diff --git a/indra/newview/skins/default/xui/zh/menu_nearby_chat.xml b/indra/newview/skins/default/xui/zh/menu_nearby_chat.xml index ce5f5b6e17..ce5f5b6e17 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_nearby_chat.xml +++ b/indra/newview/skins/default/xui/zh/menu_nearby_chat.xml diff --git a/indra/newview/skins/default/xui/zh/menu_notification_well_button.xml b/indra/newview/skins/default/xui/zh/menu_notification_well_button.xml index b629f73584..b629f73584 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_notification_well_button.xml +++ b/indra/newview/skins/default/xui/zh/menu_notification_well_button.xml diff --git a/indra/newview/skins/default/xui/zh/menu_object.xml b/indra/newview/skins/default/xui/zh/menu_object.xml index 4e4e55e6f4..4e4e55e6f4 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_object.xml +++ b/indra/newview/skins/default/xui/zh/menu_object.xml diff --git a/indra/newview/skins/default/xui/zh/menu_object_icon.xml b/indra/newview/skins/default/xui/zh/menu_object_icon.xml index 9655732f2e..9655732f2e 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_object_icon.xml +++ b/indra/newview/skins/default/xui/zh/menu_object_icon.xml diff --git a/indra/newview/skins/default/xui/zh/menu_outfit_gear.xml b/indra/newview/skins/default/xui/zh/menu_outfit_gear.xml index 258d0d6b20..258d0d6b20 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_outfit_gear.xml +++ b/indra/newview/skins/default/xui/zh/menu_outfit_gear.xml diff --git a/indra/newview/skins/default/xui/zh/menu_outfit_tab.xml b/indra/newview/skins/default/xui/zh/menu_outfit_tab.xml index a4614710f4..a4614710f4 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_outfit_tab.xml +++ b/indra/newview/skins/default/xui/zh/menu_outfit_tab.xml diff --git a/indra/newview/skins/default/xui/zh/menu_participant_list.xml b/indra/newview/skins/default/xui/zh/menu_participant_list.xml index 2456e9fee9..2456e9fee9 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_participant_list.xml +++ b/indra/newview/skins/default/xui/zh/menu_participant_list.xml diff --git a/indra/newview/skins/default/xui/zh/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/zh/menu_people_friends_view_sort.xml index 59854faeec..59854faeec 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_people_friends_view_sort.xml +++ b/indra/newview/skins/default/xui/zh/menu_people_friends_view_sort.xml diff --git a/indra/newview/skins/default/xui/zh/menu_people_groups.xml b/indra/newview/skins/default/xui/zh/menu_people_groups.xml index b4b566f5ca..b4b566f5ca 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_people_groups.xml +++ b/indra/newview/skins/default/xui/zh/menu_people_groups.xml diff --git a/indra/newview/skins/default/xui/zh/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/zh/menu_people_groups_view_sort.xml index 1be5c69b94..1be5c69b94 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_people_groups_view_sort.xml +++ b/indra/newview/skins/default/xui/zh/menu_people_groups_view_sort.xml diff --git a/indra/newview/skins/default/xui/zh/menu_people_nearby.xml b/indra/newview/skins/default/xui/zh/menu_people_nearby.xml index d25adaf8fb..d25adaf8fb 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_people_nearby.xml +++ b/indra/newview/skins/default/xui/zh/menu_people_nearby.xml diff --git a/indra/newview/skins/default/xui/zh/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/zh/menu_people_nearby_multiselect.xml index 69f0eab7dc..69f0eab7dc 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_people_nearby_multiselect.xml +++ b/indra/newview/skins/default/xui/zh/menu_people_nearby_multiselect.xml diff --git a/indra/newview/skins/default/xui/zh/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/zh/menu_people_nearby_view_sort.xml index 6cb0ac3c89..6cb0ac3c89 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_people_nearby_view_sort.xml +++ b/indra/newview/skins/default/xui/zh/menu_people_nearby_view_sort.xml diff --git a/indra/newview/skins/default/xui/zh/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/zh/menu_people_recent_view_sort.xml index 5b6e7335d6..5b6e7335d6 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_people_recent_view_sort.xml +++ b/indra/newview/skins/default/xui/zh/menu_people_recent_view_sort.xml diff --git a/indra/newview/skins/default/xui/zh/menu_picks.xml b/indra/newview/skins/default/xui/zh/menu_picks.xml index 2e88ac2d39..2e88ac2d39 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_picks.xml +++ b/indra/newview/skins/default/xui/zh/menu_picks.xml diff --git a/indra/newview/skins/default/xui/zh/menu_picks_plus.xml b/indra/newview/skins/default/xui/zh/menu_picks_plus.xml index 80922a757d..80922a757d 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_picks_plus.xml +++ b/indra/newview/skins/default/xui/zh/menu_picks_plus.xml diff --git a/indra/newview/skins/default/xui/zh/menu_place.xml b/indra/newview/skins/default/xui/zh/menu_place.xml index 3733baf119..3733baf119 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_place.xml +++ b/indra/newview/skins/default/xui/zh/menu_place.xml diff --git a/indra/newview/skins/default/xui/zh/menu_place_add_button.xml b/indra/newview/skins/default/xui/zh/menu_place_add_button.xml index 95f8917234..95f8917234 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_place_add_button.xml +++ b/indra/newview/skins/default/xui/zh/menu_place_add_button.xml diff --git a/indra/newview/skins/default/xui/zh/menu_places_gear_folder.xml b/indra/newview/skins/default/xui/zh/menu_places_gear_folder.xml index 27f0c7ebdb..27f0c7ebdb 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_places_gear_folder.xml +++ b/indra/newview/skins/default/xui/zh/menu_places_gear_folder.xml diff --git a/indra/newview/skins/default/xui/zh/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/zh/menu_places_gear_landmark.xml index f23d970b78..f23d970b78 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_places_gear_landmark.xml +++ b/indra/newview/skins/default/xui/zh/menu_places_gear_landmark.xml diff --git a/indra/newview/skins/default/xui/zh/menu_profile_overflow.xml b/indra/newview/skins/default/xui/zh/menu_profile_overflow.xml index f77e7090c4..f77e7090c4 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_profile_overflow.xml +++ b/indra/newview/skins/default/xui/zh/menu_profile_overflow.xml diff --git a/indra/newview/skins/default/xui/zh/menu_save_outfit.xml b/indra/newview/skins/default/xui/zh/menu_save_outfit.xml index 53ee6ee977..53ee6ee977 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_save_outfit.xml +++ b/indra/newview/skins/default/xui/zh/menu_save_outfit.xml diff --git a/indra/newview/skins/default/xui/zh/menu_script_chiclet.xml b/indra/newview/skins/default/xui/zh/menu_script_chiclet.xml index e9817dd2bc..e9817dd2bc 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_script_chiclet.xml +++ b/indra/newview/skins/default/xui/zh/menu_script_chiclet.xml diff --git a/indra/newview/skins/default/xui/zh/menu_slurl.xml b/indra/newview/skins/default/xui/zh/menu_slurl.xml index 2cea18105a..2cea18105a 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_slurl.xml +++ b/indra/newview/skins/default/xui/zh/menu_slurl.xml diff --git a/indra/newview/skins/default/xui/zh/menu_teleport_history_gear.xml b/indra/newview/skins/default/xui/zh/menu_teleport_history_gear.xml index d188840588..d188840588 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_teleport_history_gear.xml +++ b/indra/newview/skins/default/xui/zh/menu_teleport_history_gear.xml diff --git a/indra/newview/skins/default/xui/zh/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/zh/menu_teleport_history_item.xml index bf60983896..bf60983896 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_teleport_history_item.xml +++ b/indra/newview/skins/default/xui/zh/menu_teleport_history_item.xml diff --git a/indra/newview/skins/default/xui/zh/menu_teleport_history_tab.xml b/indra/newview/skins/default/xui/zh/menu_teleport_history_tab.xml index 90e8098348..90e8098348 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_teleport_history_tab.xml +++ b/indra/newview/skins/default/xui/zh/menu_teleport_history_tab.xml diff --git a/indra/newview/skins/default/xui/zh/menu_text_editor.xml b/indra/newview/skins/default/xui/zh/menu_text_editor.xml index febc0b8b67..febc0b8b67 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_text_editor.xml +++ b/indra/newview/skins/default/xui/zh/menu_text_editor.xml diff --git a/indra/newview/skins/default/xui/zh/menu_toolbars.xml b/indra/newview/skins/default/xui/zh/menu_toolbars.xml index d318992dd5..d318992dd5 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_toolbars.xml +++ b/indra/newview/skins/default/xui/zh/menu_toolbars.xml diff --git a/indra/newview/skins/default/xui/zh/menu_topinfobar.xml b/indra/newview/skins/default/xui/zh/menu_topinfobar.xml index b07e9890ff..b07e9890ff 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_topinfobar.xml +++ b/indra/newview/skins/default/xui/zh/menu_topinfobar.xml diff --git a/indra/newview/skins/default/xui/zh/menu_url_agent.xml b/indra/newview/skins/default/xui/zh/menu_url_agent.xml index 752634dc6b..752634dc6b 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_url_agent.xml +++ b/indra/newview/skins/default/xui/zh/menu_url_agent.xml 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_url_group.xml b/indra/newview/skins/default/xui/zh/menu_url_group.xml index de97bb731f..de97bb731f 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_url_group.xml +++ b/indra/newview/skins/default/xui/zh/menu_url_group.xml diff --git a/indra/newview/skins/default/xui/zh/menu_url_http.xml b/indra/newview/skins/default/xui/zh/menu_url_http.xml index 861cbfb975..861cbfb975 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_url_http.xml +++ b/indra/newview/skins/default/xui/zh/menu_url_http.xml diff --git a/indra/newview/skins/default/xui/zh/menu_url_inventory.xml b/indra/newview/skins/default/xui/zh/menu_url_inventory.xml index 8eaea68c6f..8eaea68c6f 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_url_inventory.xml +++ b/indra/newview/skins/default/xui/zh/menu_url_inventory.xml diff --git a/indra/newview/skins/default/xui/zh/menu_url_map.xml b/indra/newview/skins/default/xui/zh/menu_url_map.xml index fbda20fd2f..fbda20fd2f 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_url_map.xml +++ b/indra/newview/skins/default/xui/zh/menu_url_map.xml diff --git a/indra/newview/skins/default/xui/zh/menu_url_objectim.xml b/indra/newview/skins/default/xui/zh/menu_url_objectim.xml index ac366f92ef..ac366f92ef 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_url_objectim.xml +++ b/indra/newview/skins/default/xui/zh/menu_url_objectim.xml diff --git a/indra/newview/skins/default/xui/zh/menu_url_parcel.xml b/indra/newview/skins/default/xui/zh/menu_url_parcel.xml index 330c28238f..330c28238f 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_url_parcel.xml +++ b/indra/newview/skins/default/xui/zh/menu_url_parcel.xml diff --git a/indra/newview/skins/default/xui/zh/menu_url_slapp.xml b/indra/newview/skins/default/xui/zh/menu_url_slapp.xml index 6ce9a10d3e..6ce9a10d3e 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_url_slapp.xml +++ b/indra/newview/skins/default/xui/zh/menu_url_slapp.xml diff --git a/indra/newview/skins/default/xui/zh/menu_url_slurl.xml b/indra/newview/skins/default/xui/zh/menu_url_slurl.xml index 2fb247f250..2fb247f250 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_url_slurl.xml +++ b/indra/newview/skins/default/xui/zh/menu_url_slurl.xml diff --git a/indra/newview/skins/default/xui/zh/menu_url_teleport.xml b/indra/newview/skins/default/xui/zh/menu_url_teleport.xml index e3e4b4716d..e3e4b4716d 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_url_teleport.xml +++ b/indra/newview/skins/default/xui/zh/menu_url_teleport.xml diff --git a/indra/newview/skins/default/xui/zh/menu_viewer.xml b/indra/newview/skins/default/xui/zh/menu_viewer.xml index adc29a3944..9572ad49d3 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_viewer.xml +++ b/indra/newview/skins/default/xui/zh/menu_viewer.xml @@ -8,13 +8,14 @@ <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"/> <menu_item_check label="飛行" name="Fly"/> <menu_item_check label="以跑代步" name="Always Run"/> <menu_item_call label="停止我身上的動作" name="Stop Animating My Avatar"/> - <menu_item_call label="行走 / 跑步 / 飛行…" name="Walk / run / fly"/> + <menu_item_call label="行走 / 跑步 / 飛行…" name="WalkRunFly"/> </menu> <menu label="狀態" name="Status"> <menu_item_check label="離開" name="Away"/> @@ -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"> @@ -60,7 +62,7 @@ <menu_item_call label="快照" name="Take Snapshot"/> <menu_item_call label="地點小檔案" name="Place Profile"/> <menu_item_call label="土地資料" name="About Land"/> - <menu_item_call label="地區/領地" name="Region/Estate"/> + <menu_item_call label="地區/領地" name="RegionEstate"/> <menu_item_call label="我所擁有的土地…" name="My Land"/> <menu_item_call label="購買這塊土地" name="Buy Land"/> <menu label="顯示" name="LandShow"> @@ -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/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/zh/menu_wearable_list_item.xml index 576f7f3b73..576f7f3b73 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_wearable_list_item.xml +++ b/indra/newview/skins/default/xui/zh/menu_wearable_list_item.xml diff --git a/indra/newview/skins/default/xui/zh/menu_wearing_gear.xml b/indra/newview/skins/default/xui/zh/menu_wearing_gear.xml index 6184f956d1..6184f956d1 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_wearing_gear.xml +++ b/indra/newview/skins/default/xui/zh/menu_wearing_gear.xml diff --git a/indra/newview/skins/default/xui/zh/menu_wearing_tab.xml b/indra/newview/skins/default/xui/zh/menu_wearing_tab.xml index c7d2853995..c7d2853995 100755..100644 --- a/indra/newview/skins/default/xui/zh/menu_wearing_tab.xml +++ b/indra/newview/skins/default/xui/zh/menu_wearing_tab.xml 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..100644 --- 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..100644 --- 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..100644 --- 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..0a98101b60 100755..100644 --- 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"> + 複製或移到限量資料夾時發生問題： + + '[ERROR_CODE]' + <usetemplate name="okbutton" yestext="確定"/> + </notification> + <notification name="MerchantPasteFailed"> + 複製或移到 Marketplace 刊登時發生問題： + + '[ERROR_CODE]' + <usetemplate name="okbutton" yestext="確定"/> + </notification> + <notification name="MerchantTransactionFailed"> + 和 Marketplace 進行的交易發生如下錯誤： + + 原因：'[ERROR_REASON]' + [ERROR_DESCRIPTION] + <usetemplate name="okbutton" yestext="確定"/> + </notification> + <notification name="MerchantUnprocessableEntity"> + 我們無法刊登這產品或啓用版本資料夾。 通常這是因為刊登內容表的資料不齊，但也可能因為資料夾結構有錯所致。 請編輯刊登內容或檢查刊登資料夾看是否有誤。 + <usetemplate name="okbutton" yestext="確定"/> + </notification> + <notification name="MerchantListingFailed"> + 刊登到 Marketplace 時，發生錯誤： + + '[ERROR_CODE]' + <usetemplate name="okbutton" yestext="確定"/> + </notification> + <notification name="MerchantFolderActivationFailed"> + 啓用此版本資料夾時發生錯誤： + + '[ERROR_CODE]' + <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] 你所欲前往的地區含有超過你目前偏好的分級的內容。 你可以到「我自己 > 偏好設定 > 一般設定」變更你的偏好設定。 <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"> + 無法進入地區。 '[REGION_NAME]' 是個「技巧性博奕」(Skill Gaming)地區，你必須符合一定條件才可進入。 欲知詳情，請參閱 [http://wiki.secondlife.com/wiki/Linden_Lab_Official:Skill_Gaming_in_Second_Life 技巧性博奕常見問題集]。 + <usetemplate name="okbutton" yestext="確定"/> + </notification> <notification name="PreferredMaturityChanged"> 你將不再收到通知，告知你即將進入一個 [RATING] 內容分級的地區。 你可以到選單列底下的「我自己 > 偏好設定 > 一般設定」變更你的內容偏好。 <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] 個物項的資料夾作穿戴動作。 欲變更此上限，可到「進階」>「顯示除錯設定」>「WearFolderLimit」。 + </notification> <notification label="「請勿打擾」模式警告" name="DoNotDisturbModePay"> 你已開啟「請勿打擾」。 你將不會收到任何付款購買的物項。 @@ -2647,9 +2778,6 @@ SHA1 指紋：[MD5_DIGEST] <notification name="NoValidCircuit"> 沒有有效的線路碼。 </notification> - <notification name="NoValidTimestamp"> - 沒有有效的時間戳記。 - </notification> <notification name="NoPendingConnection"> 無法建立待通的連線。 </notification> @@ -2804,7 +2932,7 @@ SHA1 指紋：[MD5_DIGEST] [MESSAGE] -來源物件：<nolink>[OBJECTNAME]</nolink>（所有人是 [NAME]）？ +來源物件：<nolink>[OBJECTNAME]</nolink>（所有人：[NAME]） <form name="form"> <button name="Gotopage" text="前往頁面"/> <button name="Cancel" text="取消"/> @@ -2830,6 +2958,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"> + 已在更新體驗簡覽時忽略不可編輯的欄位 '[field]'。 + </notification> + <notification name="RestrictedToOwnerExperienceProfileMessage"> + 已忽略對欄位 '[field]' 的變更，只有體驗擁有人可作此變更。 + </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"> + '<nolink>[OBJECTNAME]</nolink>'，一個由 '[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"> 警告：物件 '<nolink>[OBJECTNAME]</nolink>' 要求全權存取你的林登幣帳戶。 你如果允許存取帳戶，它將可在任何時候從你帳戶取走資金，或完全加以清空，或定期取走部分資金，且不會發出警告。 @@ -3149,6 +3343,10 @@ SHA1 指紋：[MD5_DIGEST] （存續 [EXISTENCE] 秒鐘） 你在 [TIME] 秒鐘後在本地為 '[BODYREGION]' 更新了一個 [RESOLUTION] 的定貌材質。 </notification> + <notification name="CannotUploadTexture"> + 無法上傳質料。 +[REASON] + </notification> <notification name="LivePreviewUnavailable"> 我們無法顯示這個材質的預覽，因為它設為「禁止複製」且 / 或「禁止轉移」。 <usetemplate ignoretext="「禁止複製」和「禁止轉移」的材質若不能使用實時預覽模式，請給我警示。" name="okignore" yestext="確定"/> @@ -3724,9 +3922,11 @@ SHA1 指紋：[MD5_DIGEST] </notification> <notification name="TeleportedByAttachment"> 你已成功被 [ITEM_ID] 上的一個附件瞬間傳送 + <usetemplate ignoretext="瞬間傳送：你已成功被一個附件瞬間傳送" name="notifyignore"/> </notification> <notification name="TeleportedByObjectOnParcel"> 你已成功被 '[PARCEL_NAME]' 地段的物件 '[OBJECT_NAME]' 瞬間傳送 + <usetemplate ignoretext="瞬間傳送：你已被一個物件或地段瞬間傳送成功" name="notifyignore"/> </notification> <notification name="TeleportedByObjectOwnedBy"> 你已成功被 [OWNER_ID] 擁有的物件 '[OBJECT_NAME]' 瞬間傳送 @@ -4058,7 +4258,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_active_object_row.xml b/indra/newview/skins/default/xui/zh/panel_active_object_row.xml index 42a4aa9e85..42a4aa9e85 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_active_object_row.xml +++ b/indra/newview/skins/default/xui/zh/panel_active_object_row.xml diff --git a/indra/newview/skins/default/xui/zh/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/zh/panel_adhoc_control_panel.xml index 7d16ac4129..7d16ac4129 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_adhoc_control_panel.xml +++ b/indra/newview/skins/default/xui/zh/panel_adhoc_control_panel.xml diff --git a/indra/newview/skins/default/xui/zh/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/zh/panel_avatar_list_item.xml index e0a49a0add..e0a49a0add 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_avatar_list_item.xml +++ b/indra/newview/skins/default/xui/zh/panel_avatar_list_item.xml diff --git a/indra/newview/skins/default/xui/zh/panel_avatar_tag.xml b/indra/newview/skins/default/xui/zh/panel_avatar_tag.xml index fd91ea97d1..fd91ea97d1 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_avatar_tag.xml +++ b/indra/newview/skins/default/xui/zh/panel_avatar_tag.xml diff --git a/indra/newview/skins/default/xui/zh/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/zh/panel_block_list_sidetray.xml index 9f59bb32f8..9f59bb32f8 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_block_list_sidetray.xml +++ b/indra/newview/skins/default/xui/zh/panel_block_list_sidetray.xml diff --git a/indra/newview/skins/default/xui/zh/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/zh/panel_body_parts_list_item.xml index fef692c1c5..fef692c1c5 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_body_parts_list_item.xml +++ b/indra/newview/skins/default/xui/zh/panel_body_parts_list_item.xml diff --git a/indra/newview/skins/default/xui/zh/panel_bodyparts_list_button_bar.xml b/indra/newview/skins/default/xui/zh/panel_bodyparts_list_button_bar.xml index e4e7a661a7..e4e7a661a7 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_bodyparts_list_button_bar.xml +++ b/indra/newview/skins/default/xui/zh/panel_bodyparts_list_button_bar.xml diff --git a/indra/newview/skins/default/xui/zh/panel_bottomtray_lite.xml b/indra/newview/skins/default/xui/zh/panel_bottomtray_lite.xml index 9833e9ef8b..9833e9ef8b 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_bottomtray_lite.xml +++ b/indra/newview/skins/default/xui/zh/panel_bottomtray_lite.xml diff --git a/indra/newview/skins/default/xui/zh/panel_chat_header.xml b/indra/newview/skins/default/xui/zh/panel_chat_header.xml index 7916bf5155..7916bf5155 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_chat_header.xml +++ b/indra/newview/skins/default/xui/zh/panel_chat_header.xml diff --git a/indra/newview/skins/default/xui/zh/panel_chiclet_bar.xml b/indra/newview/skins/default/xui/zh/panel_chiclet_bar.xml index 69340349bc..69340349bc 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_chiclet_bar.xml +++ b/indra/newview/skins/default/xui/zh/panel_chiclet_bar.xml diff --git a/indra/newview/skins/default/xui/zh/panel_classified_info.xml b/indra/newview/skins/default/xui/zh/panel_classified_info.xml index 6f2dd89318..6f2dd89318 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_classified_info.xml +++ b/indra/newview/skins/default/xui/zh/panel_classified_info.xml diff --git a/indra/newview/skins/default/xui/zh/panel_clothing_list_button_bar.xml b/indra/newview/skins/default/xui/zh/panel_clothing_list_button_bar.xml index ba63dada76..ba63dada76 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_clothing_list_button_bar.xml +++ b/indra/newview/skins/default/xui/zh/panel_clothing_list_button_bar.xml diff --git a/indra/newview/skins/default/xui/zh/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/zh/panel_clothing_list_item.xml index 55e72f5347..55e72f5347 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_clothing_list_item.xml +++ b/indra/newview/skins/default/xui/zh/panel_clothing_list_item.xml diff --git a/indra/newview/skins/default/xui/zh/panel_cof_wearables.xml b/indra/newview/skins/default/xui/zh/panel_cof_wearables.xml index c074abb568..c074abb568 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_cof_wearables.xml +++ b/indra/newview/skins/default/xui/zh/panel_cof_wearables.xml diff --git a/indra/newview/skins/default/xui/zh/panel_deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/zh/panel_deletable_wearable_list_item.xml index a9e65419c2..a9e65419c2 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_deletable_wearable_list_item.xml +++ b/indra/newview/skins/default/xui/zh/panel_deletable_wearable_list_item.xml diff --git a/indra/newview/skins/default/xui/zh/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/zh/panel_dummy_clothing_list_item.xml index 6377bf4135..6377bf4135 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_dummy_clothing_list_item.xml +++ b/indra/newview/skins/default/xui/zh/panel_dummy_clothing_list_item.xml diff --git a/indra/newview/skins/default/xui/zh/panel_edit_alpha.xml b/indra/newview/skins/default/xui/zh/panel_edit_alpha.xml index 32765a3e16..32765a3e16 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_edit_alpha.xml +++ b/indra/newview/skins/default/xui/zh/panel_edit_alpha.xml diff --git a/indra/newview/skins/default/xui/zh/panel_edit_classified.xml b/indra/newview/skins/default/xui/zh/panel_edit_classified.xml index b06ece02ad..b06ece02ad 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_edit_classified.xml +++ b/indra/newview/skins/default/xui/zh/panel_edit_classified.xml diff --git a/indra/newview/skins/default/xui/zh/panel_edit_eyes.xml b/indra/newview/skins/default/xui/zh/panel_edit_eyes.xml index f44d411908..f44d411908 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_edit_eyes.xml +++ b/indra/newview/skins/default/xui/zh/panel_edit_eyes.xml diff --git a/indra/newview/skins/default/xui/zh/panel_edit_gloves.xml b/indra/newview/skins/default/xui/zh/panel_edit_gloves.xml index d107eea553..d107eea553 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_edit_gloves.xml +++ b/indra/newview/skins/default/xui/zh/panel_edit_gloves.xml diff --git a/indra/newview/skins/default/xui/zh/panel_edit_hair.xml b/indra/newview/skins/default/xui/zh/panel_edit_hair.xml index 65f78f9273..65f78f9273 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_edit_hair.xml +++ b/indra/newview/skins/default/xui/zh/panel_edit_hair.xml diff --git a/indra/newview/skins/default/xui/zh/panel_edit_jacket.xml b/indra/newview/skins/default/xui/zh/panel_edit_jacket.xml index 61e45f911e..61e45f911e 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_edit_jacket.xml +++ b/indra/newview/skins/default/xui/zh/panel_edit_jacket.xml diff --git a/indra/newview/skins/default/xui/zh/panel_edit_pants.xml b/indra/newview/skins/default/xui/zh/panel_edit_pants.xml index 846ed72961..846ed72961 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_edit_pants.xml +++ b/indra/newview/skins/default/xui/zh/panel_edit_pants.xml diff --git a/indra/newview/skins/default/xui/zh/panel_edit_physics.xml b/indra/newview/skins/default/xui/zh/panel_edit_physics.xml index 26fedb59be..26fedb59be 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_edit_physics.xml +++ b/indra/newview/skins/default/xui/zh/panel_edit_physics.xml diff --git a/indra/newview/skins/default/xui/zh/panel_edit_pick.xml b/indra/newview/skins/default/xui/zh/panel_edit_pick.xml index faee42fd0e..faee42fd0e 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_edit_pick.xml +++ b/indra/newview/skins/default/xui/zh/panel_edit_pick.xml diff --git a/indra/newview/skins/default/xui/zh/panel_edit_profile.xml b/indra/newview/skins/default/xui/zh/panel_edit_profile.xml index 849b82c71a..849b82c71a 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_edit_profile.xml +++ b/indra/newview/skins/default/xui/zh/panel_edit_profile.xml diff --git a/indra/newview/skins/default/xui/zh/panel_edit_shape.xml b/indra/newview/skins/default/xui/zh/panel_edit_shape.xml index f249100786..f249100786 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_edit_shape.xml +++ b/indra/newview/skins/default/xui/zh/panel_edit_shape.xml diff --git a/indra/newview/skins/default/xui/zh/panel_edit_shirt.xml b/indra/newview/skins/default/xui/zh/panel_edit_shirt.xml index bc69f2ffc4..bc69f2ffc4 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_edit_shirt.xml +++ b/indra/newview/skins/default/xui/zh/panel_edit_shirt.xml diff --git a/indra/newview/skins/default/xui/zh/panel_edit_shoes.xml b/indra/newview/skins/default/xui/zh/panel_edit_shoes.xml index e190bb5bd8..e190bb5bd8 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_edit_shoes.xml +++ b/indra/newview/skins/default/xui/zh/panel_edit_shoes.xml diff --git a/indra/newview/skins/default/xui/zh/panel_edit_skin.xml b/indra/newview/skins/default/xui/zh/panel_edit_skin.xml index d8552f52f0..d8552f52f0 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_edit_skin.xml +++ b/indra/newview/skins/default/xui/zh/panel_edit_skin.xml diff --git a/indra/newview/skins/default/xui/zh/panel_edit_skirt.xml b/indra/newview/skins/default/xui/zh/panel_edit_skirt.xml index 34319fcc01..34319fcc01 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_edit_skirt.xml +++ b/indra/newview/skins/default/xui/zh/panel_edit_skirt.xml diff --git a/indra/newview/skins/default/xui/zh/panel_edit_socks.xml b/indra/newview/skins/default/xui/zh/panel_edit_socks.xml index 8e19fb5692..8e19fb5692 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_edit_socks.xml +++ b/indra/newview/skins/default/xui/zh/panel_edit_socks.xml diff --git a/indra/newview/skins/default/xui/zh/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/zh/panel_edit_tattoo.xml index f5111d629a..f5111d629a 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_edit_tattoo.xml +++ b/indra/newview/skins/default/xui/zh/panel_edit_tattoo.xml diff --git a/indra/newview/skins/default/xui/zh/panel_edit_underpants.xml b/indra/newview/skins/default/xui/zh/panel_edit_underpants.xml index 5ead7c9004..5ead7c9004 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_edit_underpants.xml +++ b/indra/newview/skins/default/xui/zh/panel_edit_underpants.xml diff --git a/indra/newview/skins/default/xui/zh/panel_edit_undershirt.xml b/indra/newview/skins/default/xui/zh/panel_edit_undershirt.xml index e497e285c9..e497e285c9 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_edit_undershirt.xml +++ b/indra/newview/skins/default/xui/zh/panel_edit_undershirt.xml diff --git a/indra/newview/skins/default/xui/zh/panel_edit_wearable.xml b/indra/newview/skins/default/xui/zh/panel_edit_wearable.xml index 4dd7ea6d93..4dd7ea6d93 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_edit_wearable.xml +++ b/indra/newview/skins/default/xui/zh/panel_edit_wearable.xml 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'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="<" name="btn_prev"/> + <button label=">" 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"> + "Parcel_PG_Light" + </string> + <string name="maturity_icon_moderate"> + "Parcel_M_Light" + </string> + <string name="maturity_icon_adult"> + "Parcel_R_Light" + </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="<" name="left_btn"/> + <button label=">" 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"> + 不同標籤之間以半形空格分隔 標籤若含空格，用 "" 半形符號括住 - </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_control_panel.xml b/indra/newview/skins/default/xui/zh/panel_group_control_panel.xml index f468aba514..f468aba514 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_group_control_panel.xml +++ b/indra/newview/skins/default/xui/zh/panel_group_control_panel.xml diff --git a/indra/newview/skins/default/xui/zh/panel_group_general.xml b/indra/newview/skins/default/xui/zh/panel_group_general.xml index 2b16b61dd1..2b16b61dd1 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_group_general.xml +++ b/indra/newview/skins/default/xui/zh/panel_group_general.xml 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..100644 --- 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_group_invite.xml b/indra/newview/skins/default/xui/zh/panel_group_invite.xml index 250bbaab6a..250bbaab6a 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_group_invite.xml +++ b/indra/newview/skins/default/xui/zh/panel_group_invite.xml diff --git a/indra/newview/skins/default/xui/zh/panel_group_land_money.xml b/indra/newview/skins/default/xui/zh/panel_group_land_money.xml index 81d5573e1c..81d5573e1c 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_group_land_money.xml +++ b/indra/newview/skins/default/xui/zh/panel_group_land_money.xml diff --git a/indra/newview/skins/default/xui/zh/panel_group_list_item.xml b/indra/newview/skins/default/xui/zh/panel_group_list_item.xml index fec4bb572a..fec4bb572a 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_group_list_item.xml +++ b/indra/newview/skins/default/xui/zh/panel_group_list_item.xml diff --git a/indra/newview/skins/default/xui/zh/panel_group_notices.xml b/indra/newview/skins/default/xui/zh/panel_group_notices.xml index ba5f4f1bba..ba5f4f1bba 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_group_notices.xml +++ b/indra/newview/skins/default/xui/zh/panel_group_notices.xml diff --git a/indra/newview/skins/default/xui/zh/panel_group_notify.xml b/indra/newview/skins/default/xui/zh/panel_group_notify.xml index 08a8c94876..08a8c94876 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_group_notify.xml +++ b/indra/newview/skins/default/xui/zh/panel_group_notify.xml diff --git a/indra/newview/skins/default/xui/zh/panel_group_roles.xml b/indra/newview/skins/default/xui/zh/panel_group_roles.xml index b4b32c204a..b4b32c204a 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_group_roles.xml +++ b/indra/newview/skins/default/xui/zh/panel_group_roles.xml diff --git a/indra/newview/skins/default/xui/zh/panel_im_control_panel.xml b/indra/newview/skins/default/xui/zh/panel_im_control_panel.xml index e937368a2b..e937368a2b 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_im_control_panel.xml +++ b/indra/newview/skins/default/xui/zh/panel_im_control_panel.xml diff --git a/indra/newview/skins/default/xui/zh/panel_instant_message.xml b/indra/newview/skins/default/xui/zh/panel_instant_message.xml index cf9bc7fccb..cf9bc7fccb 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_instant_message.xml +++ b/indra/newview/skins/default/xui/zh/panel_instant_message.xml diff --git a/indra/newview/skins/default/xui/zh/panel_inventory_item.xml b/indra/newview/skins/default/xui/zh/panel_inventory_item.xml index d18047fbcf..d18047fbcf 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_inventory_item.xml +++ b/indra/newview/skins/default/xui/zh/panel_inventory_item.xml diff --git a/indra/newview/skins/default/xui/zh/panel_landmark_info.xml b/indra/newview/skins/default/xui/zh/panel_landmark_info.xml index b50aa24d3f..b50aa24d3f 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_landmark_info.xml +++ b/indra/newview/skins/default/xui/zh/panel_landmark_info.xml diff --git a/indra/newview/skins/default/xui/zh/panel_landmarks.xml b/indra/newview/skins/default/xui/zh/panel_landmarks.xml index eea406170a..eea406170a 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_landmarks.xml +++ b/indra/newview/skins/default/xui/zh/panel_landmarks.xml 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..100644 --- 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_main_inventory.xml b/indra/newview/skins/default/xui/zh/panel_main_inventory.xml index 0ad3d8506d..0ad3d8506d 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/zh/panel_main_inventory.xml 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_me.xml b/indra/newview/skins/default/xui/zh/panel_me.xml index aad1348e46..aad1348e46 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_me.xml +++ b/indra/newview/skins/default/xui/zh/panel_me.xml diff --git a/indra/newview/skins/default/xui/zh/panel_media_settings_general.xml b/indra/newview/skins/default/xui/zh/panel_media_settings_general.xml index 0c11befcf5..0c11befcf5 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_media_settings_general.xml +++ b/indra/newview/skins/default/xui/zh/panel_media_settings_general.xml diff --git a/indra/newview/skins/default/xui/zh/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/zh/panel_media_settings_permissions.xml index 4a1eaef3a1..4a1eaef3a1 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_media_settings_permissions.xml +++ b/indra/newview/skins/default/xui/zh/panel_media_settings_permissions.xml diff --git a/indra/newview/skins/default/xui/zh/panel_media_settings_security.xml b/indra/newview/skins/default/xui/zh/panel_media_settings_security.xml index da84d6fe02..da84d6fe02 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_media_settings_security.xml +++ b/indra/newview/skins/default/xui/zh/panel_media_settings_security.xml diff --git a/indra/newview/skins/default/xui/zh/panel_navigation_bar.xml b/indra/newview/skins/default/xui/zh/panel_navigation_bar.xml index 7a11aa961b..7a11aa961b 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_navigation_bar.xml +++ b/indra/newview/skins/default/xui/zh/panel_navigation_bar.xml diff --git a/indra/newview/skins/default/xui/zh/panel_navmesh_rebake.xml b/indra/newview/skins/default/xui/zh/panel_navmesh_rebake.xml index bb52c13a11..bb52c13a11 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_navmesh_rebake.xml +++ b/indra/newview/skins/default/xui/zh/panel_navmesh_rebake.xml diff --git a/indra/newview/skins/default/xui/zh/panel_nearby_chat.xml b/indra/newview/skins/default/xui/zh/panel_nearby_chat.xml index fc52168bb7..fc52168bb7 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_nearby_chat.xml +++ b/indra/newview/skins/default/xui/zh/panel_nearby_chat.xml diff --git a/indra/newview/skins/default/xui/zh/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/zh/panel_nearby_chat_bar.xml index 9489113d09..9489113d09 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_nearby_chat_bar.xml +++ b/indra/newview/skins/default/xui/zh/panel_nearby_chat_bar.xml diff --git a/indra/newview/skins/default/xui/zh/panel_nearby_media.xml b/indra/newview/skins/default/xui/zh/panel_nearby_media.xml index c11a7a088b..c11a7a088b 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_nearby_media.xml +++ b/indra/newview/skins/default/xui/zh/panel_nearby_media.xml diff --git a/indra/newview/skins/default/xui/zh/panel_notify_textbox.xml b/indra/newview/skins/default/xui/zh/panel_notify_textbox.xml index 01a8210338..01a8210338 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_notify_textbox.xml +++ b/indra/newview/skins/default/xui/zh/panel_notify_textbox.xml diff --git a/indra/newview/skins/default/xui/zh/panel_online_status_toast.xml b/indra/newview/skins/default/xui/zh/panel_online_status_toast.xml index a5d3afccb9..a5d3afccb9 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_online_status_toast.xml +++ b/indra/newview/skins/default/xui/zh/panel_online_status_toast.xml diff --git a/indra/newview/skins/default/xui/zh/panel_outbox_inventory.xml b/indra/newview/skins/default/xui/zh/panel_outbox_inventory.xml index 8de0bb0e4d..8de0bb0e4d 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_outbox_inventory.xml +++ b/indra/newview/skins/default/xui/zh/panel_outbox_inventory.xml diff --git a/indra/newview/skins/default/xui/zh/panel_outfit_edit.xml b/indra/newview/skins/default/xui/zh/panel_outfit_edit.xml index a698da0ab1..a698da0ab1 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_outfit_edit.xml +++ b/indra/newview/skins/default/xui/zh/panel_outfit_edit.xml diff --git a/indra/newview/skins/default/xui/zh/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/zh/panel_outfits_inventory.xml index 8dd93543c0..8dd93543c0 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_outfits_inventory.xml +++ b/indra/newview/skins/default/xui/zh/panel_outfits_inventory.xml diff --git a/indra/newview/skins/default/xui/zh/panel_outfits_inventory_gear_default.xml b/indra/newview/skins/default/xui/zh/panel_outfits_inventory_gear_default.xml index 92ec774f9b..92ec774f9b 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_outfits_inventory_gear_default.xml +++ b/indra/newview/skins/default/xui/zh/panel_outfits_inventory_gear_default.xml diff --git a/indra/newview/skins/default/xui/zh/panel_outfits_list.xml b/indra/newview/skins/default/xui/zh/panel_outfits_list.xml index cfb0180f9c..cfb0180f9c 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_outfits_list.xml +++ b/indra/newview/skins/default/xui/zh/panel_outfits_list.xml diff --git a/indra/newview/skins/default/xui/zh/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/zh/panel_outfits_wearing.xml index 693cdcdeca..693cdcdeca 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_outfits_wearing.xml +++ b/indra/newview/skins/default/xui/zh/panel_outfits_wearing.xml diff --git a/indra/newview/skins/default/xui/zh/panel_people.xml b/indra/newview/skins/default/xui/zh/panel_people.xml index da5918d553..da5918d553 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_people.xml +++ b/indra/newview/skins/default/xui/zh/panel_people.xml diff --git a/indra/newview/skins/default/xui/zh/panel_pick_info.xml b/indra/newview/skins/default/xui/zh/panel_pick_info.xml index cd4cdbf999..cd4cdbf999 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_pick_info.xml +++ b/indra/newview/skins/default/xui/zh/panel_pick_info.xml diff --git a/indra/newview/skins/default/xui/zh/panel_picks.xml b/indra/newview/skins/default/xui/zh/panel_picks.xml index 98d36eaea0..98d36eaea0 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_picks.xml +++ b/indra/newview/skins/default/xui/zh/panel_picks.xml diff --git a/indra/newview/skins/default/xui/zh/panel_place_profile.xml b/indra/newview/skins/default/xui/zh/panel_place_profile.xml index a364f732d8..a364f732d8 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_place_profile.xml +++ b/indra/newview/skins/default/xui/zh/panel_place_profile.xml diff --git a/indra/newview/skins/default/xui/zh/panel_places.xml b/indra/newview/skins/default/xui/zh/panel_places.xml index 08cae610f6..08cae610f6 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_places.xml +++ b/indra/newview/skins/default/xui/zh/panel_places.xml diff --git a/indra/newview/skins/default/xui/zh/panel_postcard_message.xml b/indra/newview/skins/default/xui/zh/panel_postcard_message.xml index 563c4fca3c..563c4fca3c 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_postcard_message.xml +++ b/indra/newview/skins/default/xui/zh/panel_postcard_message.xml 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..100644 --- 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_advanced.xml b/indra/newview/skins/default/xui/zh/panel_preferences_advanced.xml index 170cdddb8c..170cdddb8c 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/zh/panel_preferences_advanced.xml diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/zh/panel_preferences_alerts.xml index 94eb3c1389..94eb3c1389 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_preferences_alerts.xml +++ b/indra/newview/skins/default/xui/zh/panel_preferences_alerts.xml diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml b/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml index b5cdddc252..b5cdddc252 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_colors.xml b/indra/newview/skins/default/xui/zh/panel_preferences_colors.xml index 6af4bb8970..6af4bb8970 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_preferences_colors.xml +++ b/indra/newview/skins/default/xui/zh/panel_preferences_colors.xml diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_general.xml b/indra/newview/skins/default/xui/zh/panel_preferences_general.xml index 20335d82ae..20335d82ae 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/zh/panel_preferences_general.xml diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml index 2311eb99a7..2311eb99a7 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_move.xml b/indra/newview/skins/default/xui/zh/panel_preferences_move.xml index 3a27477885..3a27477885 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_preferences_move.xml +++ b/indra/newview/skins/default/xui/zh/panel_preferences_move.xml diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/zh/panel_preferences_privacy.xml index aa2486e988..aa2486e988 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_preferences_privacy.xml +++ b/indra/newview/skins/default/xui/zh/panel_preferences_privacy.xml 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..100644 --- 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_preferences_sound.xml b/indra/newview/skins/default/xui/zh/panel_preferences_sound.xml index e57f08fd74..e57f08fd74 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/zh/panel_preferences_sound.xml diff --git a/indra/newview/skins/default/xui/zh/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/zh/panel_prim_media_controls.xml index 09043311da..09043311da 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_prim_media_controls.xml +++ b/indra/newview/skins/default/xui/zh/panel_prim_media_controls.xml diff --git a/indra/newview/skins/default/xui/zh/panel_region_covenant.xml b/indra/newview/skins/default/xui/zh/panel_region_covenant.xml index d5dd337795..d5dd337795 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_region_covenant.xml +++ b/indra/newview/skins/default/xui/zh/panel_region_covenant.xml diff --git a/indra/newview/skins/default/xui/zh/panel_region_debug.xml b/indra/newview/skins/default/xui/zh/panel_region_debug.xml index 0bb59a7b14..0bb59a7b14 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_region_debug.xml +++ b/indra/newview/skins/default/xui/zh/panel_region_debug.xml diff --git a/indra/newview/skins/default/xui/zh/panel_region_environment.xml b/indra/newview/skins/default/xui/zh/panel_region_environment.xml index 8f466af39e..8f466af39e 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_region_environment.xml +++ b/indra/newview/skins/default/xui/zh/panel_region_environment.xml diff --git a/indra/newview/skins/default/xui/zh/panel_region_estate.xml b/indra/newview/skins/default/xui/zh/panel_region_estate.xml index f3c1c85379..f3c1c85379 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_region_estate.xml +++ b/indra/newview/skins/default/xui/zh/panel_region_estate.xml 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_region_general.xml b/indra/newview/skins/default/xui/zh/panel_region_general.xml index 0ce3b659b2..0ce3b659b2 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_region_general.xml +++ b/indra/newview/skins/default/xui/zh/panel_region_general.xml diff --git a/indra/newview/skins/default/xui/zh/panel_region_terrain.xml b/indra/newview/skins/default/xui/zh/panel_region_terrain.xml index 85e759e445..85e759e445 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_region_terrain.xml +++ b/indra/newview/skins/default/xui/zh/panel_region_terrain.xml diff --git a/indra/newview/skins/default/xui/zh/panel_script_ed.xml b/indra/newview/skins/default/xui/zh/panel_script_ed.xml index c64982b397..c64982b397 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_script_ed.xml +++ b/indra/newview/skins/default/xui/zh/panel_script_ed.xml 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_script_limits_my_avatar.xml b/indra/newview/skins/default/xui/zh/panel_script_limits_my_avatar.xml index eb32d39f78..eb32d39f78 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_script_limits_my_avatar.xml +++ b/indra/newview/skins/default/xui/zh/panel_script_limits_my_avatar.xml diff --git a/indra/newview/skins/default/xui/zh/panel_script_limits_region_memory.xml b/indra/newview/skins/default/xui/zh/panel_script_limits_region_memory.xml index 40a2dd6926..40a2dd6926 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_script_limits_region_memory.xml +++ b/indra/newview/skins/default/xui/zh/panel_script_limits_region_memory.xml diff --git a/indra/newview/skins/default/xui/zh/panel_script_question_toast.xml b/indra/newview/skins/default/xui/zh/panel_script_question_toast.xml index a2d0237da0..a2d0237da0 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_script_question_toast.xml +++ b/indra/newview/skins/default/xui/zh/panel_script_question_toast.xml diff --git a/indra/newview/skins/default/xui/zh/panel_scrolling_param.xml b/indra/newview/skins/default/xui/zh/panel_scrolling_param.xml index bc29058f77..bc29058f77 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_scrolling_param.xml +++ b/indra/newview/skins/default/xui/zh/panel_scrolling_param.xml diff --git a/indra/newview/skins/default/xui/zh/panel_scrolling_param_base.xml b/indra/newview/skins/default/xui/zh/panel_scrolling_param_base.xml index fa659040ea..fa659040ea 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_scrolling_param_base.xml +++ b/indra/newview/skins/default/xui/zh/panel_scrolling_param_base.xml diff --git a/indra/newview/skins/default/xui/zh/panel_side_tray_tab_caption.xml b/indra/newview/skins/default/xui/zh/panel_side_tray_tab_caption.xml index cdd79da30c..cdd79da30c 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_side_tray_tab_caption.xml +++ b/indra/newview/skins/default/xui/zh/panel_side_tray_tab_caption.xml 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..100644 --- 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..100644 --- 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..100644 --- 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..100644 --- 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..100644 --- 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_sound_devices.xml b/indra/newview/skins/default/xui/zh/panel_sound_devices.xml index fa4e24a605..fa4e24a605 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_sound_devices.xml +++ b/indra/newview/skins/default/xui/zh/panel_sound_devices.xml diff --git a/indra/newview/skins/default/xui/zh/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/zh/panel_stand_stop_flying.xml index 4586d4eca1..4586d4eca1 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_stand_stop_flying.xml +++ b/indra/newview/skins/default/xui/zh/panel_stand_stop_flying.xml 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..100644 --- 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_teleport_history.xml b/indra/newview/skins/default/xui/zh/panel_teleport_history.xml index 44d545a86d..44d545a86d 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_teleport_history.xml +++ b/indra/newview/skins/default/xui/zh/panel_teleport_history.xml diff --git a/indra/newview/skins/default/xui/zh/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/zh/panel_teleport_history_item.xml index 93c02900e2..93c02900e2 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_teleport_history_item.xml +++ b/indra/newview/skins/default/xui/zh/panel_teleport_history_item.xml 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/panel_voice_effect.xml b/indra/newview/skins/default/xui/zh/panel_voice_effect.xml index 6c8a452014..6c8a452014 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_voice_effect.xml +++ b/indra/newview/skins/default/xui/zh/panel_voice_effect.xml diff --git a/indra/newview/skins/default/xui/zh/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/zh/panel_volume_pulldown.xml index 70ec028176..70ec028176 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_volume_pulldown.xml +++ b/indra/newview/skins/default/xui/zh/panel_volume_pulldown.xml diff --git a/indra/newview/skins/default/xui/zh/panel_world_map.xml b/indra/newview/skins/default/xui/zh/panel_world_map.xml index 84018768a1..84018768a1 100755..100644 --- a/indra/newview/skins/default/xui/zh/panel_world_map.xml +++ b/indra/newview/skins/default/xui/zh/panel_world_map.xml 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..100644 --- 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_appearance.xml b/indra/newview/skins/default/xui/zh/sidepanel_appearance.xml index 83a9bdf6a5..83a9bdf6a5 100755..100644 --- a/indra/newview/skins/default/xui/zh/sidepanel_appearance.xml +++ b/indra/newview/skins/default/xui/zh/sidepanel_appearance.xml diff --git a/indra/newview/skins/default/xui/zh/sidepanel_inventory.xml b/indra/newview/skins/default/xui/zh/sidepanel_inventory.xml index 54ea7cab22..54ea7cab22 100755..100644 --- a/indra/newview/skins/default/xui/zh/sidepanel_inventory.xml +++ b/indra/newview/skins/default/xui/zh/sidepanel_inventory.xml 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..100644 --- 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..100644 --- 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..2e07e4ebd0 100755..100644 --- a/indra/newview/skins/default/xui/zh/strings.xml +++ b/indra/newview/skins/default/xui/zh/strings.xml @@ -38,7 +38,7 @@ 顯像初始化失敗。 請更新你的顯像卡驅動程式！ </string> <string name="AboutHeader"> - [APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2] ([VIEWER_VERSION_3]) [BUILD_DATE] [BUILD_TIME] ([CHANNEL]) + [APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2].[VIEWER_VERSION_3] [BUILD_DATE] [BUILD_TIME] ([CHANNEL]) [[VIEWER_RELEASE_NOTES_URL] [ReleaseNotes]] </string> <string name="AboutCompiler"> @@ -444,30 +444,51 @@ http://secondlife.com/viewer-access-faq <string name="TooltipMustSingleDrop"> 只有一個物品可以被拖曳到此處 </string> + <string name="TooltipTooManyWearables"> + 你不能對含超過 [AMOUNT] 個物項的資料夾作穿戴動作。 欲變更此上限，可到「進階」>「顯示除錯設定」>「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..100644 --- 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"> + 無法進入地區。 '[REGION_NAME]' 是個「技巧性博奕」(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"> |