diff options
| author | Richard Linden <none@none> | 2012-01-12 12:54:46 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-01-12 12:54:46 -0800 |
| commit | 26829e6fa2de6e59f46ba340ca7ad6c430728470 (patch) | |
| tree | 6f33024f248c9128795697a5d00217a51fec19c6 /indra/newview/skins/default | |
| parent | 37c68057c92f5a21a3d21b4ac01690a1cf4cf8e4 (diff) | |
| parent | 757a955bd700eb4f838762dcbe789a77ee052064 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience/
Diffstat (limited to 'indra/newview/skins/default')
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_group_general.xml | 13 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/strings.xml | 5 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/fr/sidepanel_item_info.xml | 2 |
3 files changed, 4 insertions, 16 deletions
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..9752a07b66 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> @@ -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> diff --git a/indra/newview/skins/default/xui/fr/sidepanel_item_info.xml b/indra/newview/skins/default/xui/fr/sidepanel_item_info.xml index 0b5333fc80..95649d3934 100644 --- a/indra/newview/skins/default/xui/fr/sidepanel_item_info.xml +++ b/indra/newview/skins/default/xui/fr/sidepanel_item_info.xml @@ -13,7 +13,7 @@ Le propriétaire peut : </panel.string> <panel.string name="acquiredDate"> - [wkday,datetime,local] [day,datetime,local] [mth,datetime,local] [year,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] + [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local] </panel.string> <panel.string name="origin_inventory"> (inventaire) |