From b9d92585f8c2456995ff0b0c3bad865b6361f841 Mon Sep 17 00:00:00 2001 From: Eli Linden Date: Mon, 28 Mar 2011 11:42:18 -0700 Subject: catchup with viewer-development --- .../skins/default/xui/da/floater_about_land.xml | 8 - .../xui/da/floater_inventory_item_properties.xml | 6 - .../newview/skins/default/xui/da/floater_tools.xml | 6 - .../skins/default/xui/da/inspect_avatar.xml | 2 - .../skins/default/xui/da/panel_edit_profile.xml | 4 - .../skins/default/xui/da/panel_profile_view.xml | 2 - .../skins/default/xui/da/sidepanel_task_info.xml | 6 - .../skins/default/xui/de/floater_about_land.xml | 8 - .../xui/de/floater_inventory_item_properties.xml | 6 - .../skins/default/xui/de/floater_script_search.xml | 2 +- .../newview/skins/default/xui/de/floater_tools.xml | 6 - .../skins/default/xui/de/inspect_avatar.xml | 3 - .../newview/skins/default/xui/de/inspect_group.xml | 3 - .../skins/default/xui/de/panel_activeim_row.xml | 6 - .../skins/default/xui/de/panel_chat_header.xml | 1 - .../skins/default/xui/de/panel_edit_profile.xml | 4 - .../skins/default/xui/de/panel_group_invite.xml | 2 +- .../skins/default/xui/de/panel_instant_message.xml | 1 - .../skins/default/xui/de/panel_profile_view.xml | 2 - .../skins/default/xui/de/sidepanel_task_info.xml | 6 - .../skins/default/xui/en/floater_about_land.xml | 38 +- .../default/xui/en/floater_hardware_settings.xml | 2 +- .../xui/en/floater_inventory_item_properties.xml | 6 +- .../xui/en/floater_region_debug_console.xml | 3 +- .../newview/skins/default/xui/en/floater_tools.xml | 59 +- .../skins/default/xui/en/floater_ui_preview.xml | 4 + .../skins/default/xui/en/inspect_avatar.xml | 9 +- .../newview/skins/default/xui/en/inspect_group.xml | 3 +- indra/newview/skins/default/xui/en/main_view.xml | 7 + .../skins/default/xui/en/menu_attachment_self.xml | 2 +- .../skins/default/xui/en/menu_avatar_self.xml | 2 +- .../skins/default/xui/en/menu_bottomtray.xml | 12 + .../default/xui/en/menu_inspect_self_gear.xml | 240 ++++++- indra/newview/skins/default/xui/en/menu_viewer.xml | 13 +- .../newview/skins/default/xui/en/notifications.xml | 791 +++++++++++++++++---- .../skins/default/xui/en/panel_activeim_row.xml | 3 +- .../skins/default/xui/en/panel_bottomtray.xml | 35 +- .../skins/default/xui/en/panel_chat_header.xml | 3 +- .../skins/default/xui/en/panel_edit_pick.xml | 10 +- .../skins/default/xui/en/panel_edit_profile.xml | 12 +- .../skins/default/xui/en/panel_group_general.xml | 6 +- .../skins/default/xui/en/panel_instant_message.xml | 3 +- indra/newview/skins/default/xui/en/panel_login.xml | 41 +- .../skins/default/xui/en/panel_main_inventory.xml | 2 +- .../default/xui/en/panel_outfits_inventory.xml | 8 +- .../newview/skins/default/xui/en/panel_people.xml | 26 +- .../newview/skins/default/xui/en/panel_places.xml | 18 +- .../skins/default/xui/en/panel_profile_view.xml | 6 +- .../skins/default/xui/en/panel_script_ed.xml | 4 + .../skins/default/xui/en/sidepanel_inventory.xml | 36 +- .../skins/default/xui/en/sidepanel_task_info.xml | 6 +- indra/newview/skins/default/xui/en/strings.xml | 18 + .../skins/default/xui/es/floater_about_land.xml | 8 - .../xui/es/floater_inventory_item_properties.xml | 6 - .../newview/skins/default/xui/es/floater_tools.xml | 6 - .../skins/default/xui/es/inspect_avatar.xml | 2 - .../skins/default/xui/es/panel_edit_profile.xml | 4 - .../skins/default/xui/es/panel_landmark_info.xml | 2 +- .../skins/default/xui/es/panel_place_profile.xml | 4 +- .../skins/default/xui/es/panel_profile_view.xml | 2 - .../skins/default/xui/es/panel_region_covenant.xml | 7 +- .../skins/default/xui/es/sidepanel_task_info.xml | 6 - indra/newview/skins/default/xui/es/strings.xml | 2 +- .../skins/default/xui/fr/floater_about_land.xml | 8 - .../xui/fr/floater_inventory_item_properties.xml | 6 - .../newview/skins/default/xui/fr/floater_tools.xml | 6 - .../skins/default/xui/fr/inspect_avatar.xml | 3 - .../newview/skins/default/xui/fr/inspect_group.xml | 3 - .../skins/default/xui/fr/panel_activeim_row.xml | 6 - .../skins/default/xui/fr/panel_chat_header.xml | 1 - .../skins/default/xui/fr/panel_edit_profile.xml | 4 - .../skins/default/xui/fr/panel_instant_message.xml | 1 - .../skins/default/xui/fr/panel_profile_view.xml | 2 - .../skins/default/xui/fr/sidepanel_task_info.xml | 6 - .../skins/default/xui/it/floater_about_land.xml | 10 +- .../xui/it/floater_inventory_item_properties.xml | 6 - .../newview/skins/default/xui/it/floater_tools.xml | 6 - .../skins/default/xui/it/panel_profile_view.xml | 1 - .../skins/default/xui/it/sidepanel_task_info.xml | 6 - .../skins/default/xui/ja/floater_about_land.xml | 8 - .../xui/ja/floater_inventory_item_properties.xml | 6 - .../newview/skins/default/xui/ja/floater_tools.xml | 6 - .../skins/default/xui/ja/inspect_avatar.xml | 1 - .../newview/skins/default/xui/ja/inspect_group.xml | 3 - .../skins/default/xui/ja/panel_activeim_row.xml | 6 - .../skins/default/xui/ja/panel_chat_header.xml | 1 - .../skins/default/xui/ja/panel_instant_message.xml | 1 - .../skins/default/xui/ja/panel_profile_view.xml | 1 - .../skins/default/xui/ja/sidepanel_task_info.xml | 6 - .../skins/default/xui/nl/floater_about_land.xml | 6 +- .../xui/nl/floater_inventory_item_properties.xml | 6 - .../newview/skins/default/xui/nl/floater_tools.xml | 6 - .../skins/default/xui/pl/floater_about_land.xml | 8 - .../xui/pl/floater_inventory_item_properties.xml | 6 - .../newview/skins/default/xui/pl/floater_tools.xml | 6 - .../skins/default/xui/pl/inspect_avatar.xml | 2 - .../skins/default/xui/pl/panel_edit_profile.xml | 4 - .../skins/default/xui/pl/panel_profile_view.xml | 2 - .../skins/default/xui/pl/sidepanel_task_info.xml | 6 - .../skins/default/xui/pt/floater_about_land.xml | 8 - .../xui/pt/floater_inventory_item_properties.xml | 6 - .../newview/skins/default/xui/pt/floater_tools.xml | 6 - .../skins/default/xui/pt/inspect_avatar.xml | 2 - .../skins/default/xui/pt/panel_edit_profile.xml | 4 - .../skins/default/xui/pt/panel_group_roles.xml | 12 +- .../skins/default/xui/pt/panel_profile_view.xml | 2 - .../skins/default/xui/pt/sidepanel_task_info.xml | 6 - 107 files changed, 1137 insertions(+), 636 deletions(-) delete mode 100644 indra/newview/skins/default/xui/de/panel_activeim_row.xml delete mode 100644 indra/newview/skins/default/xui/fr/panel_activeim_row.xml delete mode 100644 indra/newview/skins/default/xui/ja/panel_activeim_row.xml 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 a096a87928..e78924a1ab 100644 --- a/indra/newview/skins/default/xui/da/floater_about_land.xml +++ b/indra/newview/skins/default/xui/da/floater_about_land.xml @@ -87,15 +87,9 @@ Gå til 'Verden' > 'Om land' eller vælg en anden parcel Ejer: - - Leyla Linden - Gruppe: - - Leyla Linden - + + + þ: [COUNT] + - Mrs. Esbee Linden (esbee.linden) + TestString PleaseIgnore (please.ignore) - Mrs. Erica "Moose" Linden (erica.linden) + TestString PleaseIgnore (please.ignore) + +Select an editor by setting the environment variable LL_XUI_EDITOR +or the ExternalEditor setting +or specifying its path in the "Editor Path" field. - Grumpity's Grumpy Group of Moose + TestString PleaseIgnore + function="Self.EnableStandUp" /> 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 2afa29ec10..d727294cc8 100644 --- a/indra/newview/skins/default/xui/en/menu_avatar_self.xml +++ b/indra/newview/skins/default/xui/en/menu_avatar_self.xml @@ -193,7 +193,7 @@ + + + + + + + layout="topleft" + name="Self Pie"> + layout="topleft" + name="Sit Down Here"> - + layout="topleft" + name="Stand Up"> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + label="Change Outfit" + layout="topleft" + name="Chenge Outfit"> - + + function="EditOutfit" /> + + + + + + label="My Friends" + layout="topleft" + name="Friends..."> + function="SideTray.PanelPeopleTab" + parameter="friends_panel" /> + layout="topleft" + name="Groups..."> + label="My Profile" + layout="topleft" + name="Profile..."> + + + @@ -261,6 +261,17 @@ function="Floater.Toggle" parameter="world_map" /> + + + + fail @@ -116,6 +117,7 @@ Error details: The notification called '[_NAME]' was not found in noti Floater error: Could not find the following controls: [CONTROLS] + fail @@ -126,6 +128,7 @@ Floater error: Could not find the following controls: name="TutorialNotFound" type="alertmodal"> No tutorial is currently available. + fail @@ -154,6 +157,7 @@ No tutorial is currently available. name="BadInstallation" type="alertmodal"> An error occurred while updating [APP_NAME]. Please [http://get.secondlife.com download the latest version] of the Viewer. + fail @@ -163,8 +167,9 @@ No tutorial is currently available. icon="alertmodal.tga" name="LoginFailedNoNetwork" type="alertmodal"> -Could not connect to the [SECOND_LIFE_GRID]. -'[DIAGNOSTIC]' + fail + Could not connect to the [SECOND_LIFE_GRID]. + '[DIAGNOSTIC]' Make sure your Internet connection is working properly. Message Template [PATH] not found. + fail @@ -198,6 +204,7 @@ Save changes to current clothing/body part? name="CompileQueueSaveText" type="alertmodal"> There was a problem uploading the text for a script due to the following reason: [REASON]. Please try again later. + fail There was a problem uploading the compiled script due to the following reason: [REASON]. Please try again later. + fail There was a problem writing animation data. Please try again later. + fail There was a problem uploading the auction snapshot due to the following reason: [REASON] + fail Unable to view the contents of more than one item at a time. Please select only one object and try again. + fail Save all changes to clothing/body parts? - confirm + Granting modify rights to another Resident allows them to change, delete or take ANY objects you may have in-world. Be VERY careful when handing out this permission. Do you want to grant modify rights for [NAME]? +confirm Granting modify rights to another Resident allows them to change ANY objects you may have in-world. Be VERY careful when handing out this permission. Do you want to grant modify rights for the selected Residents? +confirm Do you want to revoke modify rights for [NAME]? +confirm Do you want to revoke modify rights for the selected Residents? +confirm Unable to create group. [MESSAGE] - group + fail + @@ -324,7 +342,9 @@ Unable to create group. type="alertmodal"> [NEEDS_APPLY_MESSAGE] [WANT_APPLY_MESSAGE] - confirm + group + You must specify a subject to send a group notice. - group + fail + @@ -349,6 +371,8 @@ You are about to add group members to the role of [ROLE_NAME]. Members cannot be removed from that role. The members must resign from the role themselves. Are you sure you want to continue? + group + confirm You are about to drop your attachment. Are you sure you want to continue? + confirm Joining this group costs L$[COST]. Do you wish to proceed? + confirm + funds + group You are joining group [NAME]. Do you wish to proceed? + group + confirm Joining this group costs L$[COST]. You do not have enough L$ to join this group. + group + fail + funds group + funds fail For L$[COST] you can enter this land ('[PARCEL_NAME]') for [TIME] hours. Buy a pass? + funds + confirm Sale price must be set to more than L$0 if selling to anyone. Please select an individual to sell to if selling for L$0. + fail The selected [LAND_SIZE] m² land is being set for sale. Your selling price will be L$[SALE_PRICE] and will be authorized for sale to [NAME]. + confirm confirm confirm + group confirm confirm confirm confirm Are you sure you want to return all listed objects back to their owner's inventory? + confirm Are you sure you want to disable all objects in this region? + confirm confirm + group fail confirm You must be standing inside the land parcel to set its Landing Point. + fail Please enter a valid email address for the recipient(s). + fail Please enter your email address. + fail Email snapshot with the default subject or message? + confirm Error processing snapshot data + fail Error encoding snapshot. + fail There was a problem sending a snapshot due to the following reason: [REASON] + fail There was a problem uploading a report screenshot due to the following reason: [REASON] + fail + fail You must agree to the Terms of Service to continue logging into [SECOND_LIFE]. @@ -698,6 +759,7 @@ You must agree to the Terms of Service to continue logging into [SECOND_LIFE]. type="alertmodal"> Could not put on outfit. The outfit folder contains no clothing, body parts, or attachments. + fail You can not wear clothes or body parts that are in the trash + fail Could not attach object. Exceeds the attachments limit of [MAX_ATTACHMENTS] objects. Please detach another object first. + fail You can not wear that item because it has not yet loaded. Please try again in a minute. + fail + fail Oops! Something was left blank. You need to enter the Username name of your avatar. You need an account to enter [SECOND_LIFE]. Would you like to create one now? + confirm + fail You need to enter either the Username or both the First and Last name of your avatar into the Username field, then login again. - -Classified ads appear in the 'Classified' section of the Search directory and on [http://secondlife.com/community/classifieds secondlife.com] for one week. -Fill out your ad, then click 'Publish...' to add it to the directory. -You'll be asked for a price to pay when clicking Publish. -Paying more makes your ad appear higher in the list, and also appear higher when people search for keywords. - - - Delete classified '[NAME]'? There is no reimbursement for fees paid. + confirm You have selected to delete the media associated with this face. Are you sure you want to continue? + confirm Save changes to classified [NAME]? + confirm Insufficient funds to create classified. + fail @@ -819,6 +876,7 @@ Insufficient funds to create classified. name="DeleteAvatarPick" type="alertmodal"> Delete pick <nolink>[PICK]</nolink>? + confirm Delete the selected outfit? + confirm Go to the [SECOND_LIFE] events web page? + confirm http://secondlife.com/events/ @@ -856,6 +916,7 @@ Go to the [SECOND_LIFE] events web page? name="SelectProposalToView" type="alertmodal"> Please select a proposal to view. + fail Please select a history item to view. + fail @@ -3363,6 +3637,7 @@ Sorry, you have to wait longer before you can change your display name. See http://wiki.secondlife.com/wiki/Setting_your_display_name Please try again later. + fail fail The display name you wish to set contains invalid characters. + fail Your display name must contain letters other than punctuation. + fail @@ -3401,6 +3679,7 @@ Please try again later. name="OfferTeleport" type="alertmodal"> Offer a teleport to your location with the following message? + confirm
Join me in [REGION] @@ -3422,6 +3701,7 @@ Join me in [REGION] name="OfferTeleportFromGod" type="alertmodal"> God summon Resident to your location? + confirm Join me in [REGION] @@ -3443,6 +3723,7 @@ Join me in [REGION] name="TeleportFromLandmark" type="alertmodal"> Are you sure you want to teleport to <nolink>[LOCATION]</nolink>? + confirm -Teleport to [PICK]? + Teleport to [PICK]? + confirm Teleport to [CLASSIFIED]? + confirm Teleport to [HISTORY_ENTRY]? + confirm Type a short announcement which will be sent to everyone currently in your estate. + confirm