From 377e35af14ec8e6aa689a9aa9817705b4d699e83 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Fri, 6 Jan 2012 09:19:10 -0800
Subject: looking for better fix to EXP-1695 [I18N] [INCORRECT CURRENCY
 LAYOUT/FORMAT] - Currency in  Group Profile > Land/Asset and New Group
 (French viewer) Backed out changeset: c01a6186b15c

---
 indra/newview/skins/default/xui/en/panel_group_general.xml | 13 ++-----------
 indra/newview/skins/default/xui/en/strings.xml             |  2 +-
 2 files changed, 3 insertions(+), 12 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_group_general.xml b/indra/newview/skins/default/xui/en/panel_group_general.xml
index adde982c60..38b680ba86 100644
--- a/indra/newview/skins/default/xui/en/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_general.xml
@@ -225,22 +225,13 @@ Hover your mouse over the options for more help.
          height="23"
          increment="1"
          label_width="15"
+         label="L$"
          layout="topleft"
          max_val="99999"
          left="30"
          name="spin_enrollment_fee"
          tool_tip="New members must pay this fee to join the group when Enrollment Fee is checked."
-         width="150" />
-        <text
-         follows="left|top"
-         type="string"
-         height="16"
-         left_pad="2"
-         name="currency_label"
-         top_delta="5"
-         width="18">
-         L$
-        </text>
+         width="170" />
         <combo_box
          follows="left|top"
          height="23"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 2ae56bc729..492e51e0fd 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2272,7 +2272,7 @@ Returns a string with the requested data about the region
 	<string name="NextStipendDay"       value="The next stipend day is " />
 	<string name="GroupPlanningDate">[mthnum,datetime,utc]/[day,datetime,utc]/[year,datetime,utc]</string>
 	<string name="GroupIndividualShare" value="                      Group       Individual Share" />
-	<string name="GroupColumn"          value="Group" />
+	<string name="GroupColumn"          value="                      Group" />
 	<string name="Balance">Balance</string>
 	<string name="Credits">Credits</string>
 	<string name="Debits">Debits</string>
-- 
cgit v1.2.3


From 757a955bd700eb4f838762dcbe789a77ee052064 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Fri, 6 Jan 2012 12:07:52 -0800
Subject: Looking for better fix to EXP-1693 - date localization

Backed out changeset: 4f3024e9d629
---
 indra/newview/skins/default/xui/en/strings.xml | 3 ---
 1 file changed, 3 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 492e51e0fd..9752a07b66 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3503,9 +3503,6 @@ Abuse Report</string>
   <string name="dateTimeDayFormat">[MDAY]</string>
   <string name="dateTimeAM">AM</string>
   <string name="dateTimePM">PM</string>
-  
-  <!-- Format string for displaying a localized date in a scroll list cell of type "date" -->
-  <string name="ScrollListCellDateFormat">[wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]</string>
 
   <!--  currency formatting -->
   <string name="LocalEstimateUSD">US$ [AMOUNT]</string>
-- 
cgit v1.2.3