diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-07-08 17:12:31 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-07-08 17:12:31 -0700 |
| commit | e6ac587f372559c4c84f8b1e4bc5ab94d9a665c3 (patch) | |
| tree | a72d41f9ce9231052ccf7fc7bc2947e194624415 /indra/newview/skins/default | |
| parent | 0be0b0e8b01338564b1502b8bb2b40e5a9454b0f (diff) | |
ACME-651 : Use localizable strings and simplify the xml for status and error fields
Diffstat (limited to 'indra/newview/skins/default')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_social.xml | 34 | ||||
| -rwxr-xr-x | indra/newview/skins/default/xui/en/strings.xml | 6 |
2 files changed, 8 insertions, 32 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_social.xml b/indra/newview/skins/default/xui/en/floater_social.xml index 52840c5435..781c48729c 100644 --- a/indra/newview/skins/default/xui/en/floater_social.xml +++ b/indra/newview/skins/default/xui/en/floater_social.xml @@ -67,22 +67,7 @@ valign="center" text_color="DrYellow" font="SansSerif"> - Problem connecting to Facebook - </text> - <text - name="connection_error_posting_text" - type="string" - follows="left|top" - top="3" - left="12" - width="250" - height="20" - wrap="true" - halign="left" - valign="center" - text_color="DrYellow" - font="SansSerif"> - Problem posting to Facebook + Error </text> <loading_indicator follows="left|top" @@ -105,22 +90,7 @@ valign="center" text_color="EmphasisColor" font="SansSerif"> - Connecting to Facebook... - </text> - <text - name="connection_posting_text" - type="string" - follows="left|top" - top="3" - left="38" - width="250" - height="20" - wrap="true" - halign="left" - valign="center" - text_color="EmphasisColor" - font="SansSerif"> - Posting... + Loading... </text> </panel> </floater> diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 0f3f4619f6..5067922b88 100755 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -148,6 +148,12 @@ Please try logging in again in a minute.</string> <string name="SentToInvalidRegion">You were sent to an invalid region.</string> <string name="TestingDisconnect">Testing viewer disconnect</string> + <!-- Facebook Connect and, eventually, other Social Network --> + <string name="SocialFacebookConnecting">Connecting to Facebook...</string> + <string name="SocialFacebookPosting">Posting...</string> + <string name="SocialFacebookErrorConnecting">Problem connecting to Facebook</string> + <string name="SocialFacebookErrorPosting">Problem posting to Facebook</string> + <!-- Tooltip --> <string name="TooltipPerson">Person</string><!-- Object under mouse pointer is an avatar --> <string name="TooltipNoName">(no name)</string> <!-- No name on an object --> |