summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en
diff options
context:
space:
mode:
authorGilbert Gonzales <gilbert@lindenlab.com>2013-06-25 13:44:36 -0700
committerGilbert Gonzales <gilbert@lindenlab.com>2013-06-25 13:44:36 -0700
commit7b79b455d0b3b60669bbe8978732fe7db62d678b (patch)
treea5bb7b00a63572ae2162a313c7b6f3ca36d8f2d5 /indra/newview/skins/default/xui/en
parentd63dd9d442a2c30b26163cdaf475ed31070aa92b (diff)
parentfa48ae87415d7e5d5bf7549af30832a14d6a7de2 (diff)
merge
Diffstat (limited to 'indra/newview/skins/default/xui/en')
-rw-r--r--indra/newview/skins/default/xui/en/floater_social.xml4
-rwxr-xr-xindra/newview/skins/default/xui/en/strings.xml3
2 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_social.xml b/indra/newview/skins/default/xui/en/floater_social.xml
index f8ab2000cf..76c15b9624 100644
--- a/indra/newview/skins/default/xui/en/floater_social.xml
+++ b/indra/newview/skins/default/xui/en/floater_social.xml
@@ -49,7 +49,7 @@
left="9"
length="1"
max_length="700"
- name="message"
+ name="status_message"
type="string"
word_wrap="true">
</text_editor>
@@ -57,7 +57,7 @@
follows="left|top"
height="23"
label="Post"
- name="post_btn"
+ name="post_status_btn"
top_pad="18"
width="100">
<button.commit_callback
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index f7b33b0a4a..4613ae054f 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3421,6 +3421,9 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
Drag items from inventory here
</string>
+ <string name="facebook_post_success">
+ Posting to Facebook was successful.
+ </string>
<string name="no_session_message">
(IM Session Doesn't Exist)