From 891af8055acc66364e7da009c74a6b6a91ea4663 Mon Sep 17 00:00:00 2001 From: "simon@Simon-PC.lindenlab.com" Date: Tue, 17 Jul 2012 13:52:08 -0700 Subject: MAINT-1276: Add ability to paste LSL tooltips into scripts. Reviewed by Kelly --- indra/newview/skins/default/xui/en/panel_script_ed.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/skins') 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 f6a8af0973..765b07ed8b 100644 --- a/indra/newview/skins/default/xui/en/panel_script_ed.xml +++ b/indra/newview/skins/default/xui/en/panel_script_ed.xml @@ -158,6 +158,7 @@ text_readonly_color="DkGray" width="487" show_line_numbers="true" + enable_tooltip_paste="true" word_wrap="true"> Loading... -- cgit v1.2.3 From 62379fd7628afa5ce1b104ff66b26821ce740c29 Mon Sep 17 00:00:00 2001 From: Kelly Washington Date: Tue, 31 Jul 2012 10:37:50 -0700 Subject: MAINT-1305 llDialog tooltip typo --- indra/newview/skins/default/xui/en/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/skins') diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 866ea296c3..1d5163e725 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -1446,7 +1446,7 @@ integer llScriptDanger(vector pos) Returns TRUE if pos is over public land, sandbox land, land that doesn't allow everyone to edit and build, or land that doesn't allow outside scripts -llDialog(key avatar, string message, list buttons, integer chat_channel +llDialog(key avatar, string message, list buttons, integer chat_channel) Shows a dialog box on the avatar's screen with a message and up to 12 buttons. If a button is pressed, the avatar says the text of the button label on chat_channel. -- cgit v1.2.3 From 4e96efd42e44197fc33bae3c61871457213f9764 Mon Sep 17 00:00:00 2001 From: maxim_productengine Date: Wed, 8 Aug 2012 16:55:13 +0300 Subject: MAINT-257 FIXED Increase minimum width to avoid overlaping --- indra/newview/skins/default/xui/en/floater_ui_preview.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/skins') 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 06d4327293..eb01294831 100644 --- a/indra/newview/skins/default/xui/en/floater_ui_preview.xml +++ b/indra/newview/skins/default/xui/en/floater_ui_preview.xml @@ -5,7 +5,7 @@ height="640" layout="topleft" min_height="230" - min_width="650" + min_width="750" name="gui_preview_tool" help_topic="gui_preview_tool" single_instance="true" -- cgit v1.2.3 From f02ec7b00cdbac7ba8be3baac5a12646a85235b6 Mon Sep 17 00:00:00 2001 From: maxim_productengine Date: Wed, 8 Aug 2012 17:20:59 +0300 Subject: MAINT-1069 FIXED Change "follows" attribute for scroll list to "left|top|right" --- indra/newview/skins/default/xui/en/panel_group_roles.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/skins') 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 eea2606125..df91ad8b5e 100644 --- a/indra/newview/skins/default/xui/en/panel_group_roles.xml +++ b/indra/newview/skins/default/xui/en/panel_group_roles.xml @@ -254,7 +254,7 @@ things in this group. There's a broad variety of Abilities. column_padding="0" draw_stripes="true" height="200" - follows="left|top" + follows="left|top|right" layout="topleft" left="0" right="-1" -- cgit v1.2.3 From ff2bb96a55e8869843174be7324b0a59578a4f0d Mon Sep 17 00:00:00 2001 From: maxim_productengine Date: Wed, 8 Aug 2012 18:26:19 +0300 Subject: MAINT-105 FIXED New function to check People tabs visibility --- indra/newview/skins/default/xui/en/menu_viewer.xml | 27 ++++++++++++++-------- 1 file changed, 18 insertions(+), 9 deletions(-) (limited to 'indra/newview/skins') diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 1aa55acf2d..c6d9f9ef8f 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -276,30 +276,39 @@ parameter="gestures" /> - - + - - + - + - - + - + - + -- cgit v1.2.3 From 160c6d4d3baa3b7402a1efc1e779d2306ee906a2 Mon Sep 17 00:00:00 2001 From: maxim_productengine Date: Thu, 9 Aug 2012 13:45:20 +0300 Subject: MAINT-274 FIXED "media_info" width is decreased to avoid overlaying --- indra/newview/skins/default/xui/en/floater_tools.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/skins') diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml index 5204efbf65..436e9f8fed 100644 --- a/indra/newview/skins/default/xui/en/floater_tools.xml +++ b/indra/newview/skins/default/xui/en/floater_tools.xml @@ -2994,7 +2994,7 @@ even though the user gets a free copy. use_ellipses="true" read_only="true" name="media_info" - width="280" /> + width="180" /> Date: Thu, 9 Aug 2012 15:44:10 +0300 Subject: MAINT-913 FIXED Added "Zoom" combobox menu item --- indra/newview/skins/default/xui/en/sidepanel_task_info.xml | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'indra/newview/skins') 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 e9a787cef0..f1ae14809f 100644 --- a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml +++ b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml @@ -292,6 +292,10 @@ label="Open" name="Open" value="Open" /> + Date: Thu, 16 Aug 2012 12:32:39 +0300 Subject: MAINT-915 FIXED Changed max_length to max_length_bytes --- indra/newview/skins/default/xui/en/panel_media_settings_general.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/skins') 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 cdf14572fe..e844a15118 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 @@ -30,7 +30,7 @@ (This page does not pass the specified whitelist) Date: Wed, 22 Aug 2012 11:42:44 +0300 Subject: MAINT-56 FIXED collapse_all_folders() and expand_all_folders() functions are added, which are called by menu items in gear menu. --- indra/newview/skins/default/xui/en/menu_outfit_gear.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'indra/newview/skins') 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 fc7272b904..3b8ace6308 100644 --- a/indra/newview/skins/default/xui/en/menu_outfit_gear.xml +++ b/indra/newview/skins/default/xui/en/menu_outfit_gear.xml @@ -194,6 +194,20 @@ + + + + + + Date: Fri, 24 Aug 2012 01:02:42 +0300 Subject: MAINT-1400 FIXED duplicated IDs in two files: notifications.xml and floater_texture_ctrl.xml --- indra/newview/skins/default/xui/en/floater_texture_ctrl.xml | 10 ---------- indra/newview/skins/default/xui/en/notifications.xml | 12 ------------ 2 files changed, 22 deletions(-) (limited to 'indra/newview/skins') 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 2e29c61cb2..6021ba0a5a 100644 --- a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml +++ b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml @@ -134,16 +134,6 @@ top_delta="-25" name="Pipette" width="28" /> - -We cannot display a preview of this texture because it is no-copy and/or no-transfer. - - - - - We cannot display a preview of this texture because it is no-copy and/or no-transfer. Date: Thu, 6 Sep 2012 12:22:09 +0300 Subject: MAINT-1183 FIXED Tooltip text is changed --- indra/newview/skins/default/xui/en/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/skins') diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 9d2978b269..63ed6cea7d 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -3326,7 +3326,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Adult Region Moderate Region General Region - Avatars visible and chat allowed outside of this parcel + Avatars inside this parcel cannot be seen or heard by avatars outside this parcel Objects that move may not behave correctly in this region until the region is rebaked. Dynamic pathfinding is not enabled on this region. -- cgit v1.2.3 From cc2afc1914cb4f5df0391e630cc6ab2300b1d841 Mon Sep 17 00:00:00 2001 From: maxim_productengine Date: Thu, 6 Sep 2012 12:24:10 +0300 Subject: MAINT-1440 FIXED Call Tools.TakeCopy instead of InspectObject.TakeFreeCopy --- indra/newview/skins/default/xui/en/menu_inspect_object_gear.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/skins') 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 63e154697b..2c420aa1e3 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 @@ -57,7 +57,7 @@ layout="topleft" name="take_copy"> + function="Tools.TakeCopy"/> -- cgit v1.2.3 From f015718cffb584fb78579df38aeeefee2aebb801 Mon Sep 17 00:00:00 2001 From: "simon@Simon-PC.lindenlab.com" Date: Fri, 7 Sep 2012 14:00:00 -0700 Subject: MAINT-1494 : Viewer needs new localizable strings --- .../newview/skins/default/xui/en/notifications.xml | 534 +++++++++++++++++++++ 1 file changed, 534 insertions(+) (limited to 'indra/newview/skins') diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 8e6de6ed4f..e1f61d77bc 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -8272,4 +8272,538 @@ Attempt cancelled. yestext="Yes"/> + + + fail +[AV_FREEZER] has frozen you. You cannot move or interact with the world. + + + + fail +[AV_FREEZER] has frozen you for [AV_FREEZE_TIME] seconds. You cannot move or interact with the world. + + + + fail +Avatar frozen. + + + + fail +[AV_FREEZER] has unfrozen you. + + + + fail +Avatar unfrozen. + + + + fail +Freeze failed because you don't have admin permission for that parcel. + + + + fail +Your freeze expired, go about your business. + + + + fail +Sorry, can't freeze that user. + + + + fail +You are now the owner of object [OBJECT_NAME] + + + + fail +Xan't rez object at [OBJECT_POS] because the owner of this land does not allow it. Use the land tool to see land ownership. + + + + fail +Object can not be rezzed because there are too many requests. + + + + fail +You cannot sit because you cannot move at this time. + + + + fail +You cannot sit because you are not allowed on that land. + + + + fail +Try moving closer. Xan't sit on object because +it is not in the same region as you. + + + + fail +Unable to create new object. The region is full. + + + + fail +Failed to place object at specified location. Please try again. + + + + fail +You Xan't create trees and grass on land you don't own. + + + + fail +Copy failed because you lack permission to copy the object '[OBJ_NAME]'. + + + + fail +Copy failed because the object '[OBJ_NAME]' cannot be transferred to you. + + + + fail +Copy failed because the object '[OBJ_NAME]' contributes to navmesh. + + + + fail +Duplicate with no root objects selected. + + + + fail +Xan't duplicate objects because the region is full. + + + + fail +Xan't duplicate objects - Xan't find the parcel they are on. + + + + fail +Xan't create object because +the parcel is full. + + + + fail +Attempt to rez an object failed. + + + + fail +Unable to create item that has caused problems on this region. + + + + fail +That inventory item has been blacklisted. + + + + fail +You are not currently allowed to create objects. + + + + fail +Land Search Blocked. +You have performed too many land searches too quickly. +Please try again in a minute. + + + + fail +Not enough script resources available to attach object! + + + + fail +You died and have been teleported to your home location + + + + fail +You are no longer allowed here and have [EJECT_TIME] seconds to leave. + + + + fail +You Xan't enter this region because +the server is full. + + + + fail +Save Back To Inventory has been disabled. + + + + fail +Cannot save '[OBJ_NAME]' to object contents because the object it was rezzed from no longer exists. + + + + fail +Cannot save '[OBJ_NAME]' to object contents because you do not have permission to modify the object '[DEST_NAME]'. + + + + fail +Cannot save '[OBJ_NAME]' back to inventory -- this operation has been disabled. + + + + fail +You cannot copy your selection because you do not have permission to copy the object '[OBJ_NAME]'. + + + + fail +You cannot copy your selection because the object '[OBJ_NAME]' is not transferrable. + + + + fail +You cannot copy your selection because the object '[OBJ_NAME]' is not transferrable. + + + + fail +Removal of the object '[OBJ_NAME]' from the simulator is disallowed by the permissions system. + + + + fail +Cannot save your selection because you do not have permission to modify the object '[OBJ_NAME]'. + + + + fail +Cannot save your selection because the object '[OBJ_NAME]' is not copyable. + + + + fail +You cannot take your selection because you do not have permission to modify the object '[OBJ_NAME]'. + + + + fail +Internal Error: Unknown destination type. + + + + fail +Delete failed because object not found + + + + fail +Sorry, Xan't eject that user. + + + + fail +This region does not allow you to set your home location here. + + + + fail +You can only set your 'Home Location' on your land or at a mainland Infohub. + + + + fail +Home position set. + + + + fail +Avatar ejected. + + + + fail +Eject failed because you don't have admin permission for that parcel. + + + + fail +Xan't move object '[OBJECT_NAME]' to +[OBJ_POSITION] in region [REGION_NAME] because the parcel is full. + + + + fail +Xan't move object '[OBJECT_NAME]' to +[OBJ_POSITION] in region [REGION_NAME] because your objects are not allowed on this parcel. + + + + fail +Xan't move object '[OBJECT_NAME]' to +[OBJ_POSITION] in region [REGION_NAME] because there are not enough resources for this object on this parcel. + + + + fail +Xan't move object '[OBJECT_NAME]' to +[OBJ_POSITION] in region [REGION_NAME] because the other region is running an older version which does not support receiving this object via region crossing. + + + + fail +Xan't move object '[OBJECT_NAME]' to +[OBJ_POSITION] in region [REGION_NAME] because you cannot modify the navmesh across region boundaries. + + + + fail +Xan't move object '[OBJECT_NAME]' to +[OBJ_POSITION] in region [REGION_NAME] because of an unknown reason. ([FAILURE_TYPE]) + + -- cgit v1.2.3 From e10b013e4246cd276d1496ed4acc09edab0c1255 Mon Sep 17 00:00:00 2001 From: maxim_productengine Date: Mon, 10 Sep 2012 18:24:45 +0300 Subject: MAINT-1515 FIXED min_height is increased to avoid overlapping --- indra/newview/skins/default/xui/en/floater_my_inventory.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/skins') 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 ea44fd493e..178987962b 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="560" + min_height="570" name="floater_my_inventory" save_rect="true" save_visibility="true" -- cgit v1.2.3 From 6762162fba886cf5da032f1b30db02bf95703990 Mon Sep 17 00:00:00 2001 From: "simon@Simon-PC.lindenlab.com" Date: Thu, 20 Sep 2012 11:19:51 -0700 Subject: MAINT-1589 - Update debit permissions dialog (residents deemed frightening). Removed sentence as per jira. Also removed "persist" tag from new localized alert strings since they shouldn't persist. --- .../newview/skins/default/xui/en/notifications.xml | 60 +--------------------- 1 file changed, 1 insertion(+), 59 deletions(-) (limited to 'indra/newview/skins') diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index e1f61d77bc..fc40c7d745 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -6764,7 +6764,7 @@ Is this OK? type="notify"> Warning: The object '<nolink>[OBJECTNAME]</nolink>' wants total access to your Linden Dollars account. If you allow access, it can remove funds from your account at any time, or empty your account completely, on an ongoing basis with no additional warnings. -It is rare that such a request is legitimate. Do not allow access if you do not fully understand why it wants access to your account. +Do not allow access if you do not fully understand why it wants access to your account. confirm
@@ -8276,7 +8276,6 @@ Attempt cancelled. fail [AV_FREEZER] has frozen you. You cannot move or interact with the world. @@ -8285,7 +8284,6 @@ Attempt cancelled. fail [AV_FREEZER] has frozen you for [AV_FREEZE_TIME] seconds. You cannot move or interact with the world. @@ -8294,7 +8292,6 @@ Attempt cancelled. fail Avatar frozen. @@ -8303,7 +8300,6 @@ Avatar frozen. fail [AV_FREEZER] has unfrozen you. @@ -8312,7 +8308,6 @@ Avatar frozen. fail Avatar unfrozen. @@ -8321,7 +8316,6 @@ Avatar unfrozen. fail Freeze failed because you don't have admin permission for that parcel. @@ -8330,7 +8324,6 @@ Freeze failed because you don't have admin permission for that parcel. fail Your freeze expired, go about your business. @@ -8339,7 +8332,6 @@ Your freeze expired, go about your business. fail Sorry, can't freeze that user. @@ -8348,7 +8340,6 @@ Sorry, can't freeze that user. fail You are now the owner of object [OBJECT_NAME] @@ -8357,7 +8348,6 @@ You are now the owner of object [OBJECT_NAME] fail Xan't rez object at [OBJECT_POS] because the owner of this land does not allow it. Use the land tool to see land ownership. @@ -8366,7 +8356,6 @@ Xan't rez object at [OBJECT_POS] because the owner of this land does not allow i fail Object can not be rezzed because there are too many requests. @@ -8375,7 +8364,6 @@ Object can not be rezzed because there are too many requests. fail You cannot sit because you cannot move at this time. @@ -8384,7 +8372,6 @@ You cannot sit because you cannot move at this time. fail You cannot sit because you are not allowed on that land. @@ -8393,7 +8380,6 @@ You cannot sit because you are not allowed on that land. fail Try moving closer. Xan't sit on object because @@ -8403,7 +8389,6 @@ it is not in the same region as you. fail Unable to create new object. The region is full. @@ -8412,7 +8397,6 @@ Unable to create new object. The region is full. fail Failed to place object at specified location. Please try again. @@ -8421,7 +8405,6 @@ Failed to place object at specified location. Please try again. fail You Xan't create trees and grass on land you don't own. @@ -8430,7 +8413,6 @@ You Xan't create trees and grass on land you don't own. fail Copy failed because you lack permission to copy the object '[OBJ_NAME]'. @@ -8439,7 +8421,6 @@ Copy failed because you lack permission to copy the object '[OBJ_NAME]'. fail Copy failed because the object '[OBJ_NAME]' cannot be transferred to you. @@ -8448,7 +8429,6 @@ Copy failed because the object '[OBJ_NAME]' cannot be transferred to you. fail Copy failed because the object '[OBJ_NAME]' contributes to navmesh. @@ -8457,7 +8437,6 @@ Copy failed because the object '[OBJ_NAME]' contributes to navmesh. fail Duplicate with no root objects selected. @@ -8466,7 +8445,6 @@ Duplicate with no root objects selected. fail Xan't duplicate objects because the region is full. @@ -8475,7 +8453,6 @@ Xan't duplicate objects because the region is full. fail Xan't duplicate objects - Xan't find the parcel they are on. @@ -8484,7 +8461,6 @@ Xan't duplicate objects - Xan't find the parcel they are on. fail Xan't create object because @@ -8494,7 +8470,6 @@ the parcel is full. fail Attempt to rez an object failed. @@ -8503,7 +8478,6 @@ Attempt to rez an object failed. fail Unable to create item that has caused problems on this region. @@ -8512,7 +8486,6 @@ Unable to create item that has caused problems on this region. fail That inventory item has been blacklisted. @@ -8521,7 +8494,6 @@ That inventory item has been blacklisted. fail You are not currently allowed to create objects. @@ -8530,7 +8502,6 @@ You are not currently allowed to create objects. fail Land Search Blocked. @@ -8541,7 +8512,6 @@ Please try again in a minute. fail Not enough script resources available to attach object! @@ -8550,7 +8520,6 @@ Not enough script resources available to attach object! fail You died and have been teleported to your home location @@ -8559,7 +8528,6 @@ You died and have been teleported to your home location fail You are no longer allowed here and have [EJECT_TIME] seconds to leave. @@ -8568,7 +8536,6 @@ You are no longer allowed here and have [EJECT_TIME] seconds to leave. fail You Xan't enter this region because @@ -8578,7 +8545,6 @@ the server is full. fail Save Back To Inventory has been disabled. @@ -8587,7 +8553,6 @@ Save Back To Inventory has been disabled. fail Cannot save '[OBJ_NAME]' to object contents because the object it was rezzed from no longer exists. @@ -8596,7 +8561,6 @@ Cannot save '[OBJ_NAME]' to object contents because the object it was rezzed fro fail Cannot save '[OBJ_NAME]' to object contents because you do not have permission to modify the object '[DEST_NAME]'. @@ -8605,7 +8569,6 @@ Cannot save '[OBJ_NAME]' to object contents because you do not have permission t fail Cannot save '[OBJ_NAME]' back to inventory -- this operation has been disabled. @@ -8614,7 +8577,6 @@ Cannot save '[OBJ_NAME]' back to inventory -- this operation has been disabled. fail You cannot copy your selection because you do not have permission to copy the object '[OBJ_NAME]'. @@ -8623,7 +8585,6 @@ You cannot copy your selection because you do not have permission to copy the ob fail You cannot copy your selection because the object '[OBJ_NAME]' is not transferrable. @@ -8632,7 +8593,6 @@ You cannot copy your selection because the object '[OBJ_NAME]' is not transferra fail You cannot copy your selection because the object '[OBJ_NAME]' is not transferrable. @@ -8641,7 +8601,6 @@ You cannot copy your selection because the object '[OBJ_NAME]' is not transferra fail Removal of the object '[OBJ_NAME]' from the simulator is disallowed by the permissions system. @@ -8650,7 +8609,6 @@ Removal of the object '[OBJ_NAME]' from the simulator is disallowed by the permi fail Cannot save your selection because you do not have permission to modify the object '[OBJ_NAME]'. @@ -8659,7 +8617,6 @@ Cannot save your selection because you do not have permission to modify the obje fail Cannot save your selection because the object '[OBJ_NAME]' is not copyable. @@ -8668,7 +8625,6 @@ Cannot save your selection because the object '[OBJ_NAME]' is not copyable. fail You cannot take your selection because you do not have permission to modify the object '[OBJ_NAME]'. @@ -8677,7 +8633,6 @@ You cannot take your selection because you do not have permission to modify the fail Internal Error: Unknown destination type. @@ -8686,7 +8641,6 @@ Internal Error: Unknown destination type. fail Delete failed because object not found @@ -8695,7 +8649,6 @@ Delete failed because object not found fail Sorry, Xan't eject that user. @@ -8704,7 +8657,6 @@ Sorry, Xan't eject that user. fail This region does not allow you to set your home location here. @@ -8713,7 +8665,6 @@ This region does not allow you to set your home location here. fail You can only set your 'Home Location' on your land or at a mainland Infohub. @@ -8722,7 +8673,6 @@ You can only set your 'Home Location' on your land or at a mainland Infohub. fail Home position set. @@ -8731,7 +8681,6 @@ Home position set. fail Avatar ejected. @@ -8740,7 +8689,6 @@ Avatar ejected. fail Eject failed because you don't have admin permission for that parcel. @@ -8749,7 +8697,6 @@ Eject failed because you don't have admin permission for that parcel. fail Xan't move object '[OBJECT_NAME]' to @@ -8759,7 +8706,6 @@ Xan't move object '[OBJECT_NAME]' to fail Xan't move object '[OBJECT_NAME]' to @@ -8769,7 +8715,6 @@ Xan't move object '[OBJECT_NAME]' to fail Xan't move object '[OBJECT_NAME]' to @@ -8779,7 +8724,6 @@ Xan't move object '[OBJECT_NAME]' to fail Xan't move object '[OBJECT_NAME]' to @@ -8789,7 +8733,6 @@ Xan't move object '[OBJECT_NAME]' to fail Xan't move object '[OBJECT_NAME]' to @@ -8799,7 +8742,6 @@ Xan't move object '[OBJECT_NAME]' to fail Xan't move object '[OBJECT_NAME]' to -- cgit v1.2.3 From dcd9831a1c9a58233f19c9b4f0e66a67faafb8a4 Mon Sep 17 00:00:00 2001 From: Chris Baker Date: Thu, 20 Sep 2012 22:38:12 +0000 Subject: [MAINT-1562] Convert more hard-coded alert messages to be localized Related chagesets: http://hg.lindenlab.com/baker/honeybadger/changeset/74c398c712b6 Description: - Updated english notifications.xml with alerts from the related changeset above. --- .../newview/skins/default/xui/en/notifications.xml | 1117 +++++++++++++++++++- 1 file changed, 1111 insertions(+), 6 deletions(-) (limited to 'indra/newview/skins') diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index fc40c7d745..eb901130d3 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -8699,7 +8699,7 @@ Eject failed because you don't have admin permission for that parcel. name="CantMoveObjectParcelFull" type="notify"> fail -Xan't move object '[OBJECT_NAME]' to +Can't move object '[OBJECT_NAME]' to [OBJ_POSITION] in region [REGION_NAME] because the parcel is full. @@ -8708,7 +8708,7 @@ Xan't move object '[OBJECT_NAME]' to name="CantMoveObjectParcelPerms" type="notify"> fail -Xan't move object '[OBJECT_NAME]' to +Can't move object '[OBJECT_NAME]' to [OBJ_POSITION] in region [REGION_NAME] because your objects are not allowed on this parcel. @@ -8717,7 +8717,7 @@ Xan't move object '[OBJECT_NAME]' to name="CantMoveObjectParcelResources" type="notify"> fail -Xan't move object '[OBJECT_NAME]' to +Can't move object '[OBJECT_NAME]' to [OBJ_POSITION] in region [REGION_NAME] because there are not enough resources for this object on this parcel. @@ -8726,7 +8726,7 @@ Xan't move object '[OBJECT_NAME]' to name="CantMoveObjectRegionVersion" type="notify"> fail -Xan't move object '[OBJECT_NAME]' to +Can't move object '[OBJECT_NAME]' to [OBJ_POSITION] in region [REGION_NAME] because the other region is running an older version which does not support receiving this object via region crossing. @@ -8735,7 +8735,7 @@ Xan't move object '[OBJECT_NAME]' to name="CantMoveObjectNavMesh" type="notify"> fail -Xan't move object '[OBJECT_NAME]' to +Can't move object '[OBJECT_NAME]' to [OBJ_POSITION] in region [REGION_NAME] because you cannot modify the navmesh across region boundaries. @@ -8744,8 +8744,1113 @@ Xan't move object '[OBJECT_NAME]' to name="CantMoveObjectWTF" type="notify"> fail -Xan't move object '[OBJECT_NAME]' to +Can't move object '[OBJECT_NAME]' to [OBJ_POSITION] in region [REGION_NAME] because of an unknown reason. ([FAILURE_TYPE]) + + fail +You don't have permission to modify that object + + + + fail +This object cannot have a concave piece because it is phantom and contributes to the navmesh. + + + + fail +Unable to add item! + + + + fail +Unable to edit this! + + + + fail +Not permitted to edit this. + + + + fail +Not permitted to copy that inventory. + + + + fail +Cannot save to object contents: Item no longer exists. + + + + fail +Cannot save to object contents: Item with that name already exists in inventory + + + + fail +Cannot save to object contents: This would modify the attachment permissions. + + + + fail +Not permitted to edit this! + + + + fail +Too many scripts. + + + + fail +Unable to add script! + + + + fail +Asset server didn't respond in a timely fashion. Object returned to sim. + + + + fail +This region does not have physics shapes enabled. + + + + fail +You cannot modify the navmesh across region boundaries. + + + + fail +You don't have permission to modify that object. + + + + fail +Cannot set physics properties on that object type. + + + + fail +Cannot set root prim to have no shape. + + + + fail +This region does not have physics materials enabled. + + + + fail +Only root prims may have their physics materials adjusted. + + + + fail +Setting physics materials on characters is not yet supported. + + + + fail +One or more of the specified physics material properties was invalid. + + + + fail +You may not alter the stitching type of a mesh object. + + + + fail +You may not alter the shape of a mesh object + + + + fail +You can't enter this region because \nthe region is full. + + + + fail +Link failed -- owners differ + + + + fail +Link failed -- cannot modify the navmesh across region boundaries. + + + + fail +Link failed because you do not have edit permission. + + + + fail +Link failed -- too many primitives + + + + fail +Link failed -- cannot link no-copy with no-transfer + + + + fail +Link failed -- nothing linkable. + + + + fail +Link failed -- too many pathfinding characters + + + + fail +Link failed -- insufficient land resources + + + + fail +Object uses too many physics resources -- its dynamics have been disabled. + + + + fail +You have been teleported home by the object ... on the parcel ... + + + + fail +You have been teleported home by the object ... on the parcel ... + + + + fail +Unable to create requested object. The region is full. + + + + fail +You can't attach multiple objects to one spot. + + + + fail +You can't create multiple objects here. + + + + fail +Unable to create requested object. Object is missing from database. + + + + fail +Unable to create requested object. The request timed out. Please try again. + + + + fail +Unable to create requested object. Please try again. + + + + fail +Rez failed, requested object took too long to load. + + + + fail +Failed to place object at specified location. Please try again. + + + + fail +You cannot create plants on this land. + + + + fail +Cannot restore object. No world position found. + + + + fail +Unable to rez object because its mesh data is invalid. + + + + fail +Unable to rez object because there are already too many scripts in this region. + + + + fail +Your access privileges don't allow you to create objects there. + + + + fail +You are not currently allowed to create objects. + + + + fail +Invalid object parameters + + + + fail +Your access privileges don't allow you to duplicate objects here. + + + + fail +You are not allowed to change this shape. + + + + fail +Your access privileges don't allow you to claim objects here. + + + + fail +Deed failed because you do not have permission to deed objects for your group. + + + + fail +Your access privileges don't allow you to buy objects here. + + + + fail +Cannot attach object because an avatar is sitting on it. + + + + fail +Trees and grasses cannot be worn as attachments. + + + + fail +Cannot attach group-owned objects. + + + + fail +Cannot attach objects that you don't own. + + + + fail +Cannot attach objects that contribute to navmesh. + + + + fail +Cannot attach object because you do not have permission to move it. + + + + fail +Not enough script resources available to attach object! + + + + fail +You can't drop objects here; try the Free Trial area. + + + + fail +You can't drop mesh attachments. Detach to inventory and then rez in world. + + + + fail +Failed to drop attachment: you don't have permission to drop there. + + + + fail +Failed to drop attachment: insufficient available land resource. + + + + fail +Failed to drop attachments: insufficient available resources. + + + + fail +Cannot drop object here. Parcel is full. + + + + fail +Can't touch/grab this object because you are banned from the land parcel. + + + + fail +Please narrow your delete parameters. + + + + fail +Unable to upload asset. + + + + fail +Could not find user to teleport home + + + + fail +godlike request failed + + + + fail +generic request failed + + + + fail +Unable to upload postcard. Try again later. + + + + fail +Unable to fetch inventory details for the group notice. + + + + fail +Unable to send group notice -- not permitted. + + + + fail +Unable to send group notice -- could not construct inventory. + + + + fail +Unable to parse inventory in notice. + + + + fail +Terrain upload failed. + + + + fail +Terrain file written. + + + + fail +Terrain file written, starting download... + + + + fail +Terrain baked. + + + + fail +Only the first 10 selected objects have been disabled. Refresh and make additional selections if required. + + + + fail +You need to update your viewer to buy this parcel. + + + + fail +You can't buy this land due to your maturity Rating. You may need to validate your age and/or install the latest Viewer. Please go to the Knowledge Base for details on accessing areas with this maturity Rating. + + + + fail +Unable to buy, this parcel is not for sale. + + + + fail +Unable to buy, the sale price or land area has changed. + + + + fail +You are not the authorized buyer for this parcel. + + + + fail +You cannot purchase this parcel because it is already awaiting purchase aut + + + + fail +You cannot build objects here because doing so would overflow the parcel. + + + + fail +You selected land with different owners. Please select a smaller area and try again. + + + + fail +Not enough leased parcels in selection to join. + + + + fail +Can't divide land.\nThere is more than one parcel selected.\nTry selecting a smaller piece of land. + + + + fail +Can't divide land.\nCan't find the parcel.\nPlease report with Help -> Reprt Bug... + + + + fail +Can't divide land. Whole parcel is selected.\nTry selecting a smaller piece of land. + + + + fail +Land has been divided. + + + + fail +You purchased a pass. + + + + fail +Region does not allow classified advertisements. + + + + fail +Your pass to this land is about to expire. + + + + fail +There is no suitable surface to sit on, try another spot. + + + + fail +No room to sit here, try another spot. + + + + fail +Autopilot canceled + + + + fail +Claim object failed because you don't have permission + + + + fail +Claim object failed because you don't have enough L$. + + + + fail +Cannot deed group-owned land. + + + + fail +Buy object failed because you don't have enough L$. + + + + fail +Buy inventory failed because you do not have enough L$ + + + + fail +You don't have enough L$ to buy a pass to this land. + + + + fail +Unable to buy pass right now. Try again later. + + + + fail +Can't create object because \nthe parcel is full. + + + + fail +Failed to place object at specified location. Please try again. + + + + fail +Unable to create landmark for event. + + + + fail +Your godlike powers break the freeze! + + + + fail +Request for special powers failed. This request has been logged. + + + + fail +The system is currently unable to process your request. The request timed out. + + + + fail +The system is unable to process your request. + + + + fail +Insufficient funds to create primitve. + + + + fail +Insufficient funds to create object. + + + + fail +Reset Home position since Home wasn't legal. + + + + fail +You cannot currently invite anyone to your location because the region is full. Try again later. + + + + fail +This region does not allow you to set your home location here. + + + + fail +You can only set your 'Home Location' on your land or at a mainland Infohub. + + + + fail +Home position set. + + + + fail +Cannot derez object due to inventory fault. + + + + fail +Cannot create requested inventory. + + + + fail +Cannot create requested inventory folder. + + + + fail +Cannot create that inventory. + + + + fail +Cannot create landmark. + + + + fail +Cannot create outfit right now. Try again in a minute. + + + + fail +Inventory is not for sale. + + + + fail +Unable to find inventory item. + + + + fail +Unable to find object. + + + + fail +Money transfers to objects are currently disabled in this region. + + + + fail +Could not figure out who to pay. + + + + fail +You cannot give L$ to public objects. + + + + fail +Inventory creation on in-world object failed. + + + -- cgit v1.2.3 From 9ddfb75551056dc9c02815877fbbb00d8c9be8ca Mon Sep 17 00:00:00 2001 From: "simon@Simon-PC.lindenlab.com" Date: Thu, 20 Sep 2012 16:23:45 -0700 Subject: Fix up messages altered for testing --- indra/newview/skins/default/xui/en/notifications.xml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'indra/newview/skins') diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index eb901130d3..7a03239d0c 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -8350,7 +8350,7 @@ You are now the owner of object [OBJECT_NAME] name="CantRezOnLand" type="notify"> fail -Xan't rez object at [OBJECT_POS] because the owner of this land does not allow it. Use the land tool to see land ownership. +Can't rez object at [OBJECT_POS] because the owner of this land does not allow it. Use the land tool to see land ownership. fail -Try moving closer. Xan't sit on object because +Try moving closer. Can't sit on object because it is not in the same region as you. @@ -8407,7 +8407,7 @@ Failed to place object at specified location. Please try again. name="NoOwnNoGardening" type="notify"> fail -You Xan't create trees and grass on land you don't own. +You Can't create trees and grass on land you don't own. fail -Xan't duplicate objects because the region is full. +Can't duplicate objects because the region is full. fail -Xan't duplicate objects - Xan't find the parcel they are on. +Can't duplicate objects - Can't find the parcel they are on. fail -Xan't create object because +Can't create object because the parcel is full. @@ -8538,7 +8538,7 @@ You are no longer allowed here and have [EJECT_TIME] seconds to leave. name="NoEnterServerFull" type="notify"> fail -You Xan't enter this region because +You can't enter this region because the server is full. @@ -8651,7 +8651,7 @@ Delete failed because object not found name="SorryCantEjectUser" type="notify"> fail -Sorry, Xan't eject that user. +Sorry, can't eject that user. Date: Mon, 24 Sep 2012 18:04:10 +0000 Subject: Converted more hard-coded strings --- .../newview/skins/default/xui/en/notifications.xml | 118 ++++++++++++++++++++- 1 file changed, 113 insertions(+), 5 deletions(-) (limited to 'indra/newview/skins') diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 7a03239d0c..8c3cdccbdb 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -8750,12 +8750,45 @@ Can't move object '[OBJECT_NAME]' to fail You don't have permission to modify that object + + fail +Can't enable physics for an object that contributes to the navmesh. + + + + fail +Can't enable physics for keyframed objects. + + + + fail +Can't enable physics for object -- insufficient land resources. + + + + fail +Can't enable physics for object with physics resource cost greater than [MAX_OBJECTS] + + + + fail +Can't enable physics for an object that contributes to the navmesh. + + + + fail +Can't enable physics for keyframed objects. + + + + fail +Can't enable physics for object -- insufficient land resources. + + + + fail +Can't enable physics for object with physics resource cost greater than [MAX_OBJECTS] + + fail -You have been teleported home by the object ... on the parcel ... +You have been teleported home by the object '[OBJECT_NAME]' on the parcel '[PARCEL_NAME]' fail -You have been teleported home by the object ... on the parcel ... +You have been teleported home by the object '[OBJECT_NAME]' + + + + fail +You have been teleported by an attachment on [ITEM_ID] + + + + fail +You have been teleported by the object '[OBJECT_NAME]' on the parcel '[PARCEL_NAME]' + + + + fail +You have been teleported by the object '[OBJECT_NAME]' owned by [OWNER_ID] + + + + fail +You have been teleported by the object '[OBJECT_NAME]' + + fail +An internal error prevented us from properly updating your viewer. The L$ balance or parcel holdings displayed in your viewer may not reflect your actual balance on the servers. + + -- cgit v1.2.3 From adce92282bd190f97b377512ce76fe375e0f115a Mon Sep 17 00:00:00 2001 From: Chris Baker Date: Mon, 24 Sep 2012 19:05:37 +0000 Subject: Fixed a localized message that wasn't correct. --- indra/newview/skins/default/xui/en/notifications.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/skins') diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 8c3cdccbdb..232ed2dcb4 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -9133,7 +9133,7 @@ You have been teleported by the object '[OBJECT_NAME]' owned by [OWNER_ID] name="TeleportedByObjectUnknownUser" type="notify"> fail -You have been teleported by the object '[OBJECT_NAME]' +You have been teleported by the object '[OBJECT_NAME]' owned by an unknown user. Date: Tue, 2 Oct 2012 09:30:56 -0700 Subject: MAINT-1526 : Save Back to Inventory has been disabled on server side but stays in UI. Removed it. Reviewed by Kelly --- indra/newview/skins/default/xui/en/menu_viewer.xml | 8 -------- 1 file changed, 8 deletions(-) (limited to 'indra/newview/skins') diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index c6d9f9ef8f..59d268c53a 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -884,14 +884,6 @@ - - - - -- cgit v1.2.3