diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-04-21 11:43:43 -0700 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-04-21 11:43:43 -0700 |
| commit | 270d13388223b641b3746000209c2c55c5fb641d (patch) | |
| tree | 79bddeb0ad19640299a0ae5e08fba3230adbbde8 /indra/newview/skins/default/xui/en/strings.xml | |
| parent | 9fdba53b09193290ab33fc6aa414329d126505ed (diff) | |
| parent | c34bb6f62b0ce623074378173fa9693d938eeb89 (diff) | |
Automated merge
Diffstat (limited to 'indra/newview/skins/default/xui/en/strings.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/en/strings.xml | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 323edec455..344e0eb66f 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -3112,4 +3112,10 @@ Abuse Report</string> <string name="New Script">New Script</string> <string name="New Folder">New Folder</string> <string name="Contents">Contents</string> -</strings> + + <!-- birth date format shared by avatar inspector and profile panels --> + <string name="AvatarBirthDateFormat">[mthnum,datetime,slt]/[day,datetime,slt]/[year,datetime,slt]</string> + + <string name="DefaultMimeType">none/none</string> + + </strings> |