From 1a7013d5cf63006ff9f4d30b21c4f369915de332 Mon Sep 17 00:00:00 2001
From: Andrew Dyukov <adyukov@productengine.com>
Date: Fri, 4 Dec 2009 19:28:27 +0200
Subject: Implemented normal task EXT-2832 (Hide "undock" icon on the
 floaters).

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/strings.xml | 1 -
 1 file changed, 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en/strings.xml')

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index e47ec1ebda..194e359e10 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -88,7 +88,6 @@
 	<string name="BUTTON_MINIMIZE">Minimize</string>
 	<string name="BUTTON_TEAR_OFF">Tear Off</string>
 	<string name="BUTTON_DOCK">Dock</string>
-	<string name="BUTTON_UNDOCK">Undock</string>
 	<string name="BUTTON_HELP">Show Help</string>
 
 	<!-- searching - generic -->
-- 
cgit v1.2.3


From b65334a4c133984fed9466db60df92756e8de05d Mon Sep 17 00:00:00 2001
From: Ramzi Linden <ramzi@lindenlab.com>
Date: Mon, 7 Dec 2009 16:25:08 -0800
Subject: L10N: Add much-needed linguistic context in the comments of
 strings.xml; L10N: consistency in phrasing on the 2 separate places in the
 Nav Bar where you create/edit a Landmark Also, add a separator to menu_NavBar
 so its easier to parse visually.

---
 indra/newview/skins/default/xui/en/strings.xml | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/strings.xml')

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index b014b8d1c0..2449820958 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -1882,6 +1882,7 @@ this texture in your inventory
 	<string name="InvFolder All">All</string>
 
 	<!-- inventory FVBridge -->
+	<!--  This is used in llpanelinventory.cpp when constructing a context menu for an item for Sale  -->
 	<string name="Buy">Buy</string>
 	<string name="BuyforL$">Buy for L$</string>
 
@@ -2008,8 +2009,8 @@ this texture in your inventory
 
 	<!-- groups -->
 	<string name="GroupsNone">none</string>
-  <string name="Group" value=" (group)" />
-  <string name="Unknown">(Unknown)</string>
+	<string name="Group" value=" (group)" />
+	<string name="Unknown">(Unknown)</string>
 	<string name="SummaryForTheWeek"    value="Summary for this week, beginning on " />
 	<string name="NextStipendDay"       value="The next stipend day is " />
 	<string name="GroupIndividualShare" value="                      Group       Individual Share" />
@@ -2019,7 +2020,8 @@ this texture in your inventory
 	<string name="Total">Total</string>
 	<string name="NoGroupDataFound">No group data found for group </string>
 
-	<!-- floater IM -->
+	<!-- floater IM bonus_info: When a Linden with Admin/god status receives a new IM this displays the estate (Mainland vs. teen grid) of the source avatar.
+		This is to help Lindens when answering questions. -->
 	<string name="IMParentEstate">parent estate</string>
 	<string name="IMMainland">mainland</string>
 	<string name="IMTeen">teen</string>
@@ -2108,8 +2110,8 @@ this texture in your inventory
 		Unknown file extension .%s
 Expected .wav, .tga, .bmp, .jpg, .jpeg, or .bvh
 	</string>
-	<string name="AddLandmarkNavBarMenu">Add Landmark...</string>
-	<string name="EditLandmarkNavBarMenu">Edit Landmark...</string>
+	<string name="AddLandmarkNavBarMenu">Add to My Landmarks...</string>
+	<string name="EditLandmarkNavBarMenu">Edit my Landmark...</string>
 
 	<!-- menu accelerators -->
 	<string name="accel-mac-control">&#8963;</string>
@@ -2780,7 +2782,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
   <!-- Navigation bar location input control.
        Strings are here because widget xml is not localizable -->
   <string name="LocationCtrlAddLandmarkTooltip">Add to My Landmarks</string>
-  <string name="LocationCtrlEditLandmarkTooltip">Edit My Landmark</string>
+  <string name="LocationCtrlEditLandmarkTooltip">Edit my Landmark</string>
   <string name="LocationCtrlInfoBtnTooltip">See more info about the current location</string>
   <string name="LocationCtrlComboBtnTooltip">My location history</string>
   <string name="LocationCtrlForSaleTooltip">Buy this land</string>
-- 
cgit v1.2.3


From 6301211b7c9fc214c6dcfb6b8a573e62a0fb9bad Mon Sep 17 00:00:00 2001
From: Ramzi Linden <ramzi@lindenlab.com>
Date: Mon, 7 Dec 2009 17:28:39 -0800
Subject: EXT-2855 delete 2 more entries in strings.xml that are not actually
 user-visible

---
 indra/newview/skins/default/xui/en/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/strings.xml')

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index df991b173a..3b32912fbf 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2389,8 +2389,8 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 <string name="Eyes Bugged">Eyes Bugged</string>
 
 
-<string name="Eyes Shear Left Up">Eyes Shear Left Up</string>
-<string name="Eyes Shear Right Up">Eyes Shear Right Up</string>
+
+
 
 
 
-- 
cgit v1.2.3