diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2014-12-02 14:48:45 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2014-12-02 14:48:45 -0500 |
| commit | 6cffbfba8b7dd1f6752fb2b4a93265906e9aeb9c (patch) | |
| tree | 3e4fc80698d063e8fa6d1ee9a652970e04014ecd /indra/newview/skins/default/xui/en | |
| parent | 04d9c91a5f27b554e733b77272c8c3afea458810 (diff) | |
| parent | 4f076daeff1bb626bb90a57cbe91660349ec62f1 (diff) | |
merge
Diffstat (limited to 'indra/newview/skins/default/xui/en')
| -rwxr-xr-x | indra/newview/skins/default/xui/en/strings.xml | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index cc2f645b8e..f77678e5f8 100755 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2307,6 +2307,7 @@ The [[MARKETPLACE_CREATE_STORE_URL] Marketplace store] is returning errors. <string name="LoadingContents">Loading contents...</string> <string name="NoContents">No contents</string> <string name="WornOnAttachmentPoint" value=" (worn on [ATTACHMENT_POINT])" /> + <string name="AttachmentErrorMessage" value=" ([ATTACHMENT_ERROR])" /> <string name="ActiveGesture" value="[GESLABEL] (active)"/> <!-- Inventory permissions --> <string name="PermYes">Yes</string> @@ -2433,9 +2434,12 @@ The [[MARKETPLACE_CREATE_STORE_URL] Marketplace store] is returning errors. <string name="Stomach">Stomach</string> <string name="Left Pec">Left Pec</string> <string name="Right Pec">Right Pec</string> - <string name="Neck">Neck</string> - <string name="Avatar Center">Avatar Center</string> + <string name="Neck">Neck</string> + <string name="Avatar Center">Avatar Center</string> <string name="Invalid Attachment">Invalid Attachment Point</string> + <string name="ATTACHMENT_MISSING_ITEM">Error: missing item</string> + <string name="ATTACHMENT_MISSING_BASE_ITEM">Error: missing base item</string> + <string name="ATTACHMENT_NOT_ATTACHED">Error: object is in current outfit but not attached</string> <!-- Avatar age computation, see LLDateUtil::ageFromDate --> <string name="YearsMonthsOld">[AGEYEARS] [AGEMONTHS] old</string> |