diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-08-06 12:33:08 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-08-06 12:33:08 +0100 |
| commit | cb1744dae641e3bbab13e88312f1df0e8f5af2b4 (patch) | |
| tree | 635fbd375a85ce3bdc6fbc02443a910b8bc18d20 /indra/newview/skins/default/xui/en | |
| parent | 8780c59894ce79fe354f55d204a3067556c7e710 (diff) | |
| parent | 6d1b8925163e347215a44ec094f974aa860ff35f (diff) | |
merge from viewer-release
Diffstat (limited to 'indra/newview/skins/default/xui/en')
| -rw-r--r-- | indra/newview/skins/default/xui/en/language_settings.xml | 1 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/menu_wearable_list_item.xml | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/en/language_settings.xml b/indra/newview/skins/default/xui/en/language_settings.xml index c523185034..c8a06fe401 100644 --- a/indra/newview/skins/default/xui/en/language_settings.xml +++ b/indra/newview/skins/default/xui/en/language_settings.xml @@ -23,6 +23,7 @@ datetimeToCodes["month"] = "%B"; // August datetimeToCodes["mthnum"] = "%m"; // 08 datetimeToCodes["day"] = "%d"; // 31 + datetimeToCodes["sday"] = "%-d"; // 9 datetimeToCodes["hour24"] = "%H"; // 14 datetimeToCodes["hour"] = "%H"; // 14 datetimeToCodes["hour12"] = "%I"; // 02 diff --git a/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml index c3adbb7904..8af2e1eaca 100644 --- a/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml +++ b/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml @@ -59,7 +59,7 @@ function="Wearable.Edit" /> </menu_item_call> <menu_item_call - label="Object Profile" + label="Item Profile" layout="topleft" name="object_profile"> <on_click |