From e4467e9964d50db547ca5441fbfa6a60473fa7f2 Mon Sep 17 00:00:00 2001 From: eli_linden Date: Mon, 23 May 2011 10:58:41 -0700 Subject: sync with viewer-development --- indra/newview/skins/default/xui/en/strings.xml | 150 ++++++++++++------------- 1 file changed, 75 insertions(+), 75 deletions(-) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 2a6af23d3a..f8c90106b7 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -58,81 +58,81 @@ Quit http://join.secondlife.com/ - -The viewer you are using can no longer access Second Life. Please visit the following page to download a new viewer: -http://secondlife.com/download - -For more information, see our FAQ below: -http://secondlife.com/viewer-access-faq - Optional viewer update available: [VERSION] - Required viewer update: [VERSION] - This agent is already logged in. - - Sorry! We couldn't log you in. -Please check to make sure you entered the right - * Username (like bobsmith12 or steller.sunshine) - * Password -Also, please make sure your Caps Lock key is off. - As a security precaution your password has been changed. -Please go to your account page at http://secondlife.com/password -and answer the security question to reset your password. -We are very sorry for the inconvenience. - We made some changes to our system and you will need to reset your password. -Please go to your account page at http://secondlife.com/password -and answer the security question to reset your password. -We are very sorry for the inconvenience. - Second Life is temporarily closed for maintenance. -Logins are currently restricted to employees only. -Check www.secondlife.com/status for updates. - Second Life logins are temporarily restricted in order to make sure that those in-world have the best possible experience. - -People with free accounts will not be able to access Second Life during this time, to make room for those who have paid for Second Life. - Second Life cannot be accessed from this computer. -If you feel this is an error, please contact -support@secondlife.com. - Your account is not accessible until -[TIME] Pacific Time. - We are unable to complete your request at this time. -Please contact Second Life support for assistance at http://secondlife.com/support. -If you are unable to change your password, please call (866) 476-9763. - Data inconsistency found during login. -Please contact support@secondlife.com. - Your account is undergoing minor maintenance. -Your account is not accessible until -[TIME] Pacific Time. -If you feel this is an error, please contact support@secondlife.com. - Request for logout responded with a fault from simulator. - The system is logging you out right now. -Your Account will not be available until -[TIME] Pacific Time. - Unable to create valid session. - Unable to connect to a simulator. - Your account can only access Second Life -between [START] and [END] Pacific Time. -Please come back during those hours. -If you feel this is an error, please contact support@secondlife.com. - Incorrect parameters. -If you feel this is an error, please contact support@secondlife.com. - First name parameter must be alphanumeric. -If you feel this is an error, please contact support@secondlife.com. - Last name parameter must be alphanumeric. -If you feel this is an error, please contact support@secondlife.com. - Region is going offline. -Please try logging in again in a minute. - Agent not in region. -Please try logging in again in a minute. - The region was logging in another session. -Please try logging in again in a minute. - The region was logging out the previous session. -Please try logging in again in a minute. - The region is still logging out the previous session. -Please try logging in again in a minute. - Region has logged out last session. -Please try logging in again in a minute. - Region has begun the logout process. -Please try logging in again in a minute. - The system has begun logging out your last session. -Please try logging in again in a minute. + +The viewer you are using can no longer access Second Life. Please visit the following page to download a new viewer: +http://secondlife.com/download + +For more information, see our FAQ below: +http://secondlife.com/viewer-access-faq + Optional viewer update available: [VERSION] + Required viewer update: [VERSION] + This agent is already logged in. + + Sorry! We couldn't log you in. +Please check to make sure you entered the right + * Username (like bobsmith12 or steller.sunshine) + * Password +Also, please make sure your Caps Lock key is off. + As a security precaution your password has been changed. +Please go to your account page at http://secondlife.com/password +and answer the security question to reset your password. +We are very sorry for the inconvenience. + We made some changes to our system and you will need to reset your password. +Please go to your account page at http://secondlife.com/password +and answer the security question to reset your password. +We are very sorry for the inconvenience. + Second Life is temporarily closed for maintenance. +Logins are currently restricted to employees only. +Check www.secondlife.com/status for updates. + Second Life logins are temporarily restricted in order to make sure that those in-world have the best possible experience. + +People with free accounts will not be able to access Second Life during this time, to make room for those who have paid for Second Life. + Second Life cannot be accessed from this computer. +If you feel this is an error, please contact +support@secondlife.com. + Your account is not accessible until +[TIME] Pacific Time. + We are unable to complete your request at this time. +Please contact Second Life support for assistance at http://secondlife.com/support. +If you are unable to change your password, please call (866) 476-9763. + Data inconsistency found during login. +Please contact support@secondlife.com. + Your account is undergoing minor maintenance. +Your account is not accessible until +[TIME] Pacific Time. +If you feel this is an error, please contact support@secondlife.com. + Request for logout responded with a fault from simulator. + The system is logging you out right now. +Your Account will not be available until +[TIME] Pacific Time. + Unable to create valid session. + Unable to connect to a simulator. + Your account can only access Second Life +between [START] and [END] Pacific Time. +Please come back during those hours. +If you feel this is an error, please contact support@secondlife.com. + Incorrect parameters. +If you feel this is an error, please contact support@secondlife.com. + First name parameter must be alphanumeric. +If you feel this is an error, please contact support@secondlife.com. + Last name parameter must be alphanumeric. +If you feel this is an error, please contact support@secondlife.com. + Region is going offline. +Please try logging in again in a minute. + Agent not in region. +Please try logging in again in a minute. + The region was logging in another session. +Please try logging in again in a minute. + The region was logging out the previous session. +Please try logging in again in a minute. + The region is still logging out the previous session. +Please try logging in again in a minute. + Region has logged out last session. +Please try logging in again in a minute. + Region has begun the logout process. +Please try logging in again in a minute. + The system has begun logging out your last session. +Please try logging in again in a minute. -- cgit v1.2.3 From 57a19cf1949ea1dad48a3dda288a9a12caf22c75 Mon Sep 17 00:00:00 2001 From: eli_linden Date: Mon, 23 May 2011 13:54:52 -0700 Subject: FIX VWR-25016 en_xui_change --- .../skins/default/xui/en/floater_sell_land.xml | 30 +++++++++++----------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'indra/newview/skins/default/xui/en') 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 619669d28a..38b305db7e 100644 --- a/indra/newview/skins/default/xui/en/floater_sell_land.xml +++ b/indra/newview/skins/default/xui/en/floater_sell_land.xml @@ -41,14 +41,14 @@ follows="top|left" left="16" name="info_parcel_label" - width="48"> + width="70"> Parcel: PARCEL NAME @@ -57,14 +57,14 @@ follows="top|left" left="16" name="info_size_label" - width="48"> + width="70"> Size: [AREA] m² @@ -164,14 +164,14 @@ left_delta="0" name="sell_to_agent" top_pad="4" - width="170" /> + width="150" />