diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-08-04 15:30:11 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-08-04 15:30:11 -0400 |
| commit | 57fec33490140e26298bdcf87e49f9060e586a92 (patch) | |
| tree | cfc875d0e4ab9721928be720865e2dfb30bef730 /indra/newview/skins | |
| parent | 1b46240ed84e2847dbf7da0d67c67940b646448c (diff) | |
| parent | f8a17690bcb2dc52a22e0a176e03fe3711d980da (diff) | |
merge changes for storm-1291
Diffstat (limited to 'indra/newview/skins')
| -rw-r--r-- | indra/newview/skins/default/xui/en/strings.xml | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 47e02378fe..f049f857f0 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -3414,6 +3414,34 @@ Abuse Report</string> <string name="Female - Stick tougue out">Female - Stick tougue out</string> <string name="Female - Wow">Female - Wow</string> + <string name="/bow">/bow</string> + <string name="/clap">/clap</string> + <string name="/count">/count</string> + <string name="/extinguish">/extinguish</string> + <string name="/kmb">/kmb</string> + <string name="/muscle">/muscle</string> + <string name="/no">/no</string> + <string name="/no!">/no!</string> + <string name="/paper">/paper</string> + <string name="/pointme">/pointme</string> + <string name="/pointyou">/pointyou</string> + <string name="/rock">/rock</string> + <string name="/scissor">/scissor</string> + <string name="/smoke">/smoke</string> + <string name="/stretch">/stretch</string> + <string name="/whistle">/whistle</string> + <string name="/yes">/yes</string> + <string name="/yes!">/yes!</string> + <string name="afk">afk</string> + <string name="dance1">dance1</string> + <string name="dance2">dance2</string> + <string name="dance3">dance3</string> + <string name="dance4">dance4</string> + <string name="dance5">dance5</string> + <string name="dance6">dance6</string> + <string name="dance7">dance7</string> + <string name="dance8">dance8</string> + <!-- birth date format shared by avatar inspector and profile panels --> <string name="AvatarBirthDateFormat">[mthnum,datetime,slt]/[day,datetime,slt]/[year,datetime,slt]</string> |