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 --- .../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 +- 53 files changed, 4008 insertions(+), 6330 deletions(-) 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 (limited to 'indra/newview/skins/default/xui/pl') 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 0592df1108..5f4bf4ece6 100755 --- a/indra/newview/skins/default/xui/pl/floater_about_land.xml +++ b/indra/newview/skins/default/xui/pl/floater_about_land.xml @@ -8,6 +8,18 @@ Opis: + + Typ: + + + Region Główny / Ziemia + + + Rodzaj: + + + 'Adult' + Właściciel: @@ -16,7 +28,7 @@