diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-12-17 18:55:01 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-12-17 18:55:01 -0500 |
| commit | 36634bc1ec8d185b8b1d974b8bf215d3a413e242 (patch) | |
| tree | 402b4c5ba9f70c960348c07021e32e25a3f8083b /indra/newview/skins/default/xui/en/strings.xml | |
| parent | 6b065789c0f38256adb046a0231fe22d05d038da (diff) | |
| parent | 74b36a4cf15593e32611f9848b3360605834d626 (diff) | |
automated merge viewer2.0->avp
--HG--
branch : avatar-pipeline
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, 8 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 2f50c5ee6c..ec4723bd55 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2074,6 +2074,10 @@ this texture in your inventory <!-- panel classified --> <string name="ClassifiedClicksTxt">Clicks: [TELEPORT] teleport, [MAP] map, [PROFILE] profile</string> <string name="ClassifiedUpdateAfterPublish">(will update after publish)</string> + + <!-- panel picks --> + <string name="NoPicksClassifiedsText">There are no picks/classifieds here</string> + <string name="PicksClassifiedsLoadingText">Loading...</string> <!-- Multi Preview Floater --> <string name="MultiPreviewTitle">Preview</string> @@ -2842,6 +2846,10 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="IM_to_label">To</string> <string name="IM_moderator_label">(Moderator)</string> + <!-- voice calls --> + <string name="started_call">Started a voice call</string> + <string name="joined_call">Joined the voice call</string> + <string name="ringing-im"> Joining Voice Chat... </string> |