From 9dfe0ca9a0228c4fa75c8a3e51840696cc6b4960 Mon Sep 17 00:00:00 2001 From: Adam Moss Date: Fri, 22 May 2009 09:58:47 +0000 Subject: svn merge -r121194:121210 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.onetwo-merge-1 QAR-1531 viewer 1.23rc1+1.23rc2 merge to trunk --- .../newview/skins/default/xui/de/floater_about.xml | 3 +- .../skins/default/xui/de/floater_about_land.xml | 207 +- .../skins/default/xui/de/floater_avatar_picker.xml | 54 +- .../default/xui/de/floater_avatar_textures.xml | 47 +- .../skins/default/xui/de/floater_bulk_perms.xml | 44 + .../skins/default/xui/de/floater_buy_land.xml | 205 +- .../skins/default/xui/de/floater_customize.xml | 530 +- .../skins/default/xui/de/floater_font_test.xml | 6 + .../skins/default/xui/de/floater_joystick.xml | 44 +- .../skins/default/xui/de/floater_land_holdings.xml | 21 +- .../skins/default/xui/de/floater_notification.xml | 7 + .../xui/de/floater_notifications_console.xml | 5 + .../skins/default/xui/de/floater_perm_prefs.xml | 16 + .../skins/default/xui/de/floater_report_abuse.xml | 24 +- .../skins/default/xui/de/floater_sell_land.xml | 28 +- .../skins/default/xui/de/floater_snapshot.xml | 4 +- .../skins/default/xui/de/floater_sound_preview.xml | 4 +- .../skins/default/xui/de/floater_statistics.xml | 2 + .../newview/skins/default/xui/de/floater_tools.xml | 427 +- .../skins/default/xui/de/floater_world_map.xml | 38 +- .../skins/default/xui/de/menu_inventory.xml | 119 +- .../newview/skins/default/xui/de/menu_mini_map.xml | 8 + indra/newview/skins/default/xui/de/menu_viewer.xml | 37 +- .../newview/skins/default/xui/de/notifications.xml | 7378 ++++++------------ .../skins/default/xui/de/panel_group_general.xml | 14 +- .../skins/default/xui/de/panel_group_invite.xml | 8 +- .../default/xui/de/panel_group_land_money.xml | 44 +- .../skins/default/xui/de/panel_group_roles.xml | 2 +- .../default/xui/de/panel_notifications_channel.xml | 15 + .../default/xui/de/panel_preferences_general.xml | 45 +- .../skins/default/xui/de/panel_region_covenant.xml | 96 +- .../skins/default/xui/de/panel_region_general.xml | 72 +- indra/newview/skins/default/xui/de/strings.xml | 99 +- .../skins/default/xui/de/teleport_strings.xml | 30 +- .../newview/skins/default/xui/es/floater_about.xml | 2 +- .../skins/default/xui/es/floater_about_land.xml | 251 +- .../skins/default/xui/es/floater_avatar_picker.xml | 43 +- .../skins/default/xui/es/floater_bulk_perms.xml | 44 + .../skins/default/xui/es/floater_buy_currency.xml | 10 +- .../skins/default/xui/es/floater_buy_land.xml | 28 +- .../skins/default/xui/es/floater_customize.xml | 171 +- .../skins/default/xui/es/floater_font_test.xml | 6 + .../skins/default/xui/es/floater_joystick.xml | 2 + .../skins/default/xui/es/floater_land_holdings.xml | 5 +- .../skins/default/xui/es/floater_perm_prefs.xml | 16 + .../skins/default/xui/es/floater_report_abuse.xml | 18 +- .../skins/default/xui/es/floater_sell_land.xml | 8 +- .../skins/default/xui/es/floater_sound_preview.xml | 2 +- .../skins/default/xui/es/floater_statistics.xml | 2 + .../newview/skins/default/xui/es/floater_tools.xml | 90 +- .../skins/default/xui/es/floater_world_map.xml | 37 +- .../skins/default/xui/es/menu_inventory.xml | 1 + .../newview/skins/default/xui/es/menu_mini_map.xml | 8 + indra/newview/skins/default/xui/es/menu_viewer.xml | 14 +- .../newview/skins/default/xui/es/notifications.xml | 8093 +++++++------------ .../skins/default/xui/es/panel_group_general.xml | 13 +- .../skins/default/xui/es/panel_group_invite.xml | 4 +- .../default/xui/es/panel_group_land_money.xml | 10 +- .../skins/default/xui/es/panel_group_roles.xml | 2 +- .../default/xui/es/panel_preferences_general.xml | 41 +- .../skins/default/xui/es/panel_region_covenant.xml | 86 +- .../skins/default/xui/es/panel_region_general.xml | 21 +- indra/newview/skins/default/xui/es/strings.xml | 73 +- .../skins/default/xui/es/teleport_strings.xml | 6 +- .../newview/skins/default/xui/fr/floater_about.xml | 5 +- .../skins/default/xui/fr/floater_about_land.xml | 263 +- .../skins/default/xui/fr/floater_avatar_picker.xml | 53 +- .../default/xui/fr/floater_avatar_textures.xml | 55 +- .../skins/default/xui/fr/floater_beacons.xml | 4 +- .../skins/default/xui/fr/floater_bulk_perms.xml | 10 +- .../skins/default/xui/fr/floater_buy_contents.xml | 2 +- .../skins/default/xui/fr/floater_buy_currency.xml | 17 +- .../skins/default/xui/fr/floater_buy_land.xml | 22 +- .../skins/default/xui/fr/floater_customize.xml | 235 +- .../skins/default/xui/fr/floater_font_test.xml | 14 +- .../skins/default/xui/fr/floater_god_tools.xml | 14 +- indra/newview/skins/default/xui/fr/floater_im.xml | 2 +- .../skins/default/xui/fr/floater_land_holdings.xml | 21 +- .../default/xui/fr/floater_live_lsleditor.xml | 2 +- .../xui/fr/floater_notifications_console.xml | 4 +- .../skins/default/xui/fr/floater_perm_prefs.xml | 4 +- .../skins/default/xui/fr/floater_report_abuse.xml | 20 +- .../skins/default/xui/fr/floater_sell_land.xml | 8 +- .../skins/default/xui/fr/floater_sound_preview.xml | 2 +- .../skins/default/xui/fr/floater_statistics.xml | 2 + .../newview/skins/default/xui/fr/floater_tools.xml | 39 +- .../skins/default/xui/fr/floater_top_objects.xml | 12 +- .../skins/default/xui/fr/floater_world_map.xml | 64 +- indra/newview/skins/default/xui/fr/menu_login.xml | 2 +- .../newview/skins/default/xui/fr/menu_mini_map.xml | 8 + indra/newview/skins/default/xui/fr/menu_viewer.xml | 18 +- .../newview/skins/default/xui/fr/notifications.xml | 7503 ++++++------------ .../newview/skins/default/xui/fr/panel_friends.xml | 12 +- .../skins/default/xui/fr/panel_group_general.xml | 52 +- .../default/xui/fr/panel_group_land_money.xml | 18 +- .../default/xui/fr/panel_notifications_channel.xml | 2 +- .../default/xui/fr/panel_preferences_general.xml | 29 + .../skins/default/xui/fr/panel_region_covenant.xml | 95 +- .../skins/default/xui/fr/panel_region_debug.xml | 6 +- .../skins/default/xui/fr/panel_region_general.xml | 28 +- .../newview/skins/default/xui/fr/role_actions.xml | 4 +- indra/newview/skins/default/xui/fr/strings.xml | 28 +- .../skins/default/xui/fr/teleport_strings.xml | 31 +- .../newview/skins/default/xui/it/floater_about.xml | 2 +- .../skins/default/xui/it/floater_about_land.xml | 289 +- .../skins/default/xui/it/floater_avatar_picker.xml | 43 +- .../skins/default/xui/it/floater_bulk_perms.xml | 44 + .../skins/default/xui/it/floater_buy_currency.xml | 21 +- .../skins/default/xui/it/floater_buy_land.xml | 29 +- .../skins/default/xui/it/floater_color_picker.xml | 12 +- .../skins/default/xui/it/floater_customize.xml | 213 +- .../skins/default/xui/it/floater_font_test.xml | 6 + .../skins/default/xui/it/floater_joystick.xml | 2 + .../skins/default/xui/it/floater_land_holdings.xml | 5 +- .../skins/default/xui/it/floater_perm_prefs.xml | 16 + .../skins/default/xui/it/floater_report_abuse.xml | 18 +- .../skins/default/xui/it/floater_sell_land.xml | 17 +- .../skins/default/xui/it/floater_sound_preview.xml | 2 +- .../skins/default/xui/it/floater_statistics.xml | 2 + .../newview/skins/default/xui/it/floater_tools.xml | 82 +- .../skins/default/xui/it/floater_world_map.xml | 46 +- .../skins/default/xui/it/menu_inventory.xml | 1 + .../newview/skins/default/xui/it/menu_mini_map.xml | 8 + indra/newview/skins/default/xui/it/menu_viewer.xml | 16 +- .../newview/skins/default/xui/it/notifications.xml | 7708 ++++++------------- .../skins/default/xui/it/panel_group_general.xml | 12 +- .../skins/default/xui/it/panel_group_invite.xml | 8 +- .../default/xui/it/panel_group_land_money.xml | 8 +- .../skins/default/xui/it/panel_group_roles.xml | 2 +- indra/newview/skins/default/xui/it/panel_login.xml | 20 +- .../default/xui/it/panel_preferences_chat.xml | 3 +- .../default/xui/it/panel_preferences_general.xml | 47 +- .../skins/default/xui/it/panel_region_covenant.xml | 72 +- .../skins/default/xui/it/panel_region_general.xml | 20 +- indra/newview/skins/default/xui/it/strings.xml | 73 +- .../skins/default/xui/it/teleport_strings.xml | 6 +- .../newview/skins/default/xui/ja/floater_about.xml | 5 +- .../skins/default/xui/ja/floater_about_land.xml | 176 +- .../skins/default/xui/ja/floater_avatar_picker.xml | 59 +- .../default/xui/ja/floater_avatar_textures.xml | 49 +- .../skins/default/xui/ja/floater_bulk_perms.xml | 1 + .../skins/default/xui/ja/floater_buy_currency.xml | 4 +- .../skins/default/xui/ja/floater_buy_land.xml | 22 +- .../skins/default/xui/ja/floater_customize.xml | 508 +- .../skins/default/xui/ja/floater_font_test.xml | 6 + .../skins/default/xui/ja/floater_god_tools.xml | 2 +- .../skins/default/xui/ja/floater_land_holdings.xml | 5 +- .../default/xui/ja/floater_preview_gesture.xml | 4 +- .../skins/default/xui/ja/floater_report_abuse.xml | 82 +- .../skins/default/xui/ja/floater_sell_land.xml | 14 +- .../skins/default/xui/ja/floater_sound_preview.xml | 2 +- .../skins/default/xui/ja/floater_statistics.xml | 2 + .../skins/default/xui/ja/floater_telehub.xml | 6 +- .../newview/skins/default/xui/ja/floater_tools.xml | 66 +- .../skins/default/xui/ja/floater_world_map.xml | 96 +- indra/newview/skins/default/xui/ja/menu_login.xml | 2 +- .../newview/skins/default/xui/ja/menu_mini_map.xml | 8 + indra/newview/skins/default/xui/ja/menu_viewer.xml | 16 +- .../newview/skins/default/xui/ja/notifications.xml | 7941 +++++++------------ .../skins/default/xui/ja/panel_group_general.xml | 18 +- .../default/xui/ja/panel_group_land_money.xml | 8 +- .../skins/default/xui/ja/panel_group_notices.xml | 2 +- .../default/xui/ja/panel_notifications_channel.xml | 2 +- .../default/xui/ja/panel_preferences_chat.xml | 2 +- .../default/xui/ja/panel_preferences_general.xml | 29 + .../skins/default/xui/ja/panel_region_covenant.xml | 89 +- .../skins/default/xui/ja/panel_region_general.xml | 78 +- .../newview/skins/default/xui/ja/role_actions.xml | 92 +- indra/newview/skins/default/xui/ja/strings.xml | 26 +- .../skins/default/xui/ja/teleport_strings.xml | 26 +- .../newview/skins/default/xui/nl/floater_about.xml | 2 +- .../skins/default/xui/nl/floater_about_land.xml | 252 +- .../skins/default/xui/nl/floater_bulk_perms.xml | 44 + .../skins/default/xui/nl/floater_buy_currency.xml | 16 +- .../skins/default/xui/nl/floater_buy_land.xml | 32 +- .../skins/default/xui/nl/floater_customize.xml | 148 +- .../skins/default/xui/nl/floater_font_test.xml | 6 + .../skins/default/xui/nl/floater_joystick.xml | 2 + .../skins/default/xui/nl/floater_perm_prefs.xml | 16 + .../skins/default/xui/nl/floater_report_abuse.xml | 18 +- .../skins/default/xui/nl/floater_sell_land.xml | 15 +- .../skins/default/xui/nl/floater_statistics.xml | 2 + .../newview/skins/default/xui/nl/floater_tools.xml | 84 +- .../skins/default/xui/nl/floater_world_map.xml | 31 +- .../skins/default/xui/nl/menu_inventory.xml | 1 + .../newview/skins/default/xui/nl/menu_mini_map.xml | 8 + indra/newview/skins/default/xui/nl/menu_viewer.xml | 14 +- .../newview/skins/default/xui/nl/notifications.xml | 8122 +++++++------------- .../skins/default/xui/nl/panel_group_general.xml | 12 +- .../skins/default/xui/nl/panel_group_invite.xml | 4 +- .../skins/default/xui/nl/panel_group_roles.xml | 2 +- .../skins/default/xui/nl/panel_region_general.xml | 23 +- indra/newview/skins/default/xui/nl/strings.xml | 73 +- .../skins/default/xui/nl/teleport_strings.xml | 8 +- .../skins/default/xui/pl/floater_about_land.xml | 178 +- .../default/xui/pl/floater_animation_preview.xml | 32 +- .../skins/default/xui/pl/floater_auction.xml | 2 +- .../skins/default/xui/pl/floater_avatar_picker.xml | 49 +- .../default/xui/pl/floater_avatar_textures.xml | 4 +- .../skins/default/xui/pl/floater_beacons.xml | 2 +- .../skins/default/xui/pl/floater_build_options.xml | 2 +- .../skins/default/xui/pl/floater_bulk_perms.xml | 44 + .../newview/skins/default/xui/pl/floater_bumps.xml | 2 +- .../skins/default/xui/pl/floater_buy_currency.xml | 18 +- .../skins/default/xui/pl/floater_buy_land.xml | 70 +- .../skins/default/xui/pl/floater_camera.xml | 2 +- .../skins/default/xui/pl/floater_critical.xml | 2 +- .../skins/default/xui/pl/floater_customize.xml | 472 +- .../skins/default/xui/pl/floater_font_test.xml | 6 + .../skins/default/xui/pl/floater_god_tools.xml | 41 +- indra/newview/skins/default/xui/pl/floater_im.xml | 2 +- .../skins/default/xui/pl/floater_land_holdings.xml | 23 +- .../skins/default/xui/pl/floater_mute_object.xml | 7 +- .../skins/default/xui/pl/floater_perm_prefs.xml | 16 + .../skins/default/xui/pl/floater_post_process.xml | 2 +- .../default/xui/pl/floater_preview_gesture.xml | 37 +- .../default/xui/pl/floater_preview_notecard.xml | 2 +- .../skins/default/xui/pl/floater_report_abuse.xml | 20 +- .../skins/default/xui/pl/floater_script_search.xml | 6 +- .../skins/default/xui/pl/floater_sound_preview.xml | 2 +- .../skins/default/xui/pl/floater_statistics.xml | 2 + .../skins/default/xui/pl/floater_telehub.xml | 27 +- .../skins/default/xui/pl/floater_texture_ctrl.xml | 2 +- .../newview/skins/default/xui/pl/floater_tools.xml | 90 +- .../skins/default/xui/pl/floater_top_objects.xml | 32 +- indra/newview/skins/default/xui/pl/floater_tos.xml | 4 +- .../default/xui/pl/floater_windlight_options.xml | 2 +- .../skins/default/xui/pl/floater_world_map.xml | 82 +- .../skins/default/xui/pl/menu_inventory.xml | 119 +- .../newview/skins/default/xui/pl/menu_mini_map.xml | 8 + indra/newview/skins/default/xui/pl/menu_viewer.xml | 402 +- .../newview/skins/default/xui/pl/notifications.xml | 8007 +++++++------------ .../skins/default/xui/pl/panel_audio_device.xml | 2 +- .../newview/skins/default/xui/pl/panel_friends.xml | 2 +- .../skins/default/xui/pl/panel_group_general.xml | 53 +- .../skins/default/xui/pl/panel_group_invite.xml | 8 +- .../default/xui/pl/panel_group_land_money.xml | 33 +- .../skins/default/xui/pl/panel_group_roles.xml | 4 +- .../default/xui/pl/panel_preferences_chat.xml | 6 +- .../default/xui/pl/panel_preferences_general.xml | 63 +- .../default/xui/pl/panel_preferences_graphics1.xml | 2 +- .../skins/default/xui/pl/panel_region_covenant.xml | 81 +- .../skins/default/xui/pl/panel_region_general.xml | 73 +- .../skins/default/xui/pl/panel_status_bar.xml | 30 +- .../newview/skins/default/xui/pl/role_actions.xml | 44 +- indra/newview/skins/default/xui/pl/strings.xml | 101 +- .../skins/default/xui/pl/teleport_strings.xml | 16 +- .../newview/skins/default/xui/pt/floater_about.xml | 2 +- .../skins/default/xui/pt/floater_about_land.xml | 175 +- .../skins/default/xui/pt/floater_avatar_picker.xml | 43 +- .../skins/default/xui/pt/floater_bulk_perms.xml | 44 + .../skins/default/xui/pt/floater_buy_currency.xml | 6 +- .../skins/default/xui/pt/floater_buy_land.xml | 36 +- .../skins/default/xui/pt/floater_customize.xml | 140 +- .../skins/default/xui/pt/floater_font_test.xml | 6 + .../skins/default/xui/pt/floater_joystick.xml | 2 + .../skins/default/xui/pt/floater_land_holdings.xml | 5 +- .../skins/default/xui/pt/floater_mute_object.xml | 4 +- .../skins/default/xui/pt/floater_perm_prefs.xml | 16 + .../skins/default/xui/pt/floater_report_abuse.xml | 18 +- .../skins/default/xui/pt/floater_sell_land.xml | 15 +- .../skins/default/xui/pt/floater_sound_preview.xml | 2 +- .../skins/default/xui/pt/floater_statistics.xml | 2 + .../newview/skins/default/xui/pt/floater_tools.xml | 84 +- .../skins/default/xui/pt/floater_world_map.xml | 42 +- .../skins/default/xui/pt/menu_inventory.xml | 5 +- .../newview/skins/default/xui/pt/menu_mini_map.xml | 8 + indra/newview/skins/default/xui/pt/menu_viewer.xml | 16 +- .../newview/skins/default/xui/pt/notifications.xml | 8038 +++++++------------ .../skins/default/xui/pt/panel_group_general.xml | 12 +- .../skins/default/xui/pt/panel_group_invite.xml | 8 +- .../default/xui/pt/panel_group_land_money.xml | 8 +- .../skins/default/xui/pt/panel_group_roles.xml | 2 +- .../default/xui/pt/panel_preferences_general.xml | 39 +- .../skins/default/xui/pt/panel_region_covenant.xml | 86 +- .../skins/default/xui/pt/panel_region_general.xml | 21 +- indra/newview/skins/default/xui/pt/strings.xml | 73 +- 277 files changed, 27574 insertions(+), 46458 deletions(-) create mode 100644 indra/newview/skins/default/xui/de/floater_bulk_perms.xml create mode 100644 indra/newview/skins/default/xui/de/floater_font_test.xml create mode 100644 indra/newview/skins/default/xui/de/floater_notification.xml create mode 100644 indra/newview/skins/default/xui/de/floater_notifications_console.xml create mode 100644 indra/newview/skins/default/xui/de/floater_perm_prefs.xml create mode 100644 indra/newview/skins/default/xui/de/floater_statistics.xml create mode 100644 indra/newview/skins/default/xui/de/menu_mini_map.xml create mode 100644 indra/newview/skins/default/xui/de/panel_notifications_channel.xml create mode 100644 indra/newview/skins/default/xui/es/floater_bulk_perms.xml create mode 100644 indra/newview/skins/default/xui/es/floater_font_test.xml create mode 100644 indra/newview/skins/default/xui/es/floater_perm_prefs.xml create mode 100644 indra/newview/skins/default/xui/es/floater_statistics.xml create mode 100644 indra/newview/skins/default/xui/es/menu_mini_map.xml create mode 100644 indra/newview/skins/default/xui/fr/floater_statistics.xml create mode 100644 indra/newview/skins/default/xui/fr/menu_mini_map.xml create mode 100644 indra/newview/skins/default/xui/it/floater_bulk_perms.xml create mode 100644 indra/newview/skins/default/xui/it/floater_font_test.xml create mode 100644 indra/newview/skins/default/xui/it/floater_perm_prefs.xml create mode 100644 indra/newview/skins/default/xui/it/floater_statistics.xml create mode 100644 indra/newview/skins/default/xui/it/menu_mini_map.xml create mode 100644 indra/newview/skins/default/xui/ja/floater_font_test.xml create mode 100644 indra/newview/skins/default/xui/ja/floater_statistics.xml create mode 100644 indra/newview/skins/default/xui/ja/menu_mini_map.xml create mode 100644 indra/newview/skins/default/xui/nl/floater_bulk_perms.xml create mode 100644 indra/newview/skins/default/xui/nl/floater_font_test.xml create mode 100644 indra/newview/skins/default/xui/nl/floater_perm_prefs.xml create mode 100644 indra/newview/skins/default/xui/nl/floater_statistics.xml create mode 100644 indra/newview/skins/default/xui/nl/menu_mini_map.xml create mode 100644 indra/newview/skins/default/xui/pl/floater_bulk_perms.xml create mode 100644 indra/newview/skins/default/xui/pl/floater_font_test.xml create mode 100644 indra/newview/skins/default/xui/pl/floater_perm_prefs.xml create mode 100644 indra/newview/skins/default/xui/pl/floater_statistics.xml create mode 100644 indra/newview/skins/default/xui/pl/menu_mini_map.xml create mode 100644 indra/newview/skins/default/xui/pt/floater_bulk_perms.xml create mode 100644 indra/newview/skins/default/xui/pt/floater_font_test.xml create mode 100644 indra/newview/skins/default/xui/pt/floater_perm_prefs.xml create mode 100644 indra/newview/skins/default/xui/pt/floater_statistics.xml create mode 100644 indra/newview/skins/default/xui/pt/menu_mini_map.xml (limited to 'indra/newview/skins/default/xui') diff --git a/indra/newview/skins/default/xui/de/floater_about.xml b/indra/newview/skins/default/xui/de/floater_about.xml index 238dfd5baf..c3935882af 100644 --- a/indra/newview/skins/default/xui/de/floater_about.xml +++ b/indra/newview/skins/default/xui/de/floater_about.xml @@ -20,13 +20,14 @@ 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 und Mark Adler. +google-perftools Copyright (c) 2005, Google Inc. Alle Rechte vorbehalten. Details siehe licenses.txt. Voice-Chat-Audiocoding: Polycom(R) Siren14(TM) (ITU-T Empf.G.722.1 Anhang C) -I get by with a little help from my friends. (etwa: Ich überlebe mit ein bisschen Unterstützung von meinen Freunden.) --Richard Starkey +Um im Geschäftsleben erfolreich zu sein, sei kühn, sei schnell, sei anders. --Henry Marchant Sie befinden sich in [POSITION] 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 c2b22caa20..93e7297fd2 100644 --- a/indra/newview/skins/default/xui/de/floater_about_land.xml +++ b/indra/newview/skins/default/xui/de/floater_about_land.xml @@ -8,6 +8,18 @@ Beschreibung: + + Typ: + + + Mainland / Homestead + + + Einstufung: + + + Adult + Eigentümer: @@ -29,9 +41,10 @@ Nicht zu verkaufen. - Preis: [PRICE] L$. + Preis: [PRICE] L$ ([PRICE_PER_SQM] L$/qm.). -