diff options
author | simon <none@none> | 2013-08-26 15:45:09 -0700 |
---|---|---|
committer | simon <none@none> | 2013-08-26 15:45:09 -0700 |
commit | 90d1c5b3676fe4e8ea8668b41fdf92613d5f102d (patch) | |
tree | 8d5afd9678fd44444bcc7b5d311b5cfb7abe5217 /indra/newview/skins/default/xui/en/strings.xml | |
parent | ac2dc34ed0abbac8d5a8eb7f887037fe387c6a7a (diff) | |
parent | 27d637d0f14fdfff496256222dc1343d2d7ee9ae (diff) |
Merge downstream code for CHUIStorm
Diffstat (limited to 'indra/newview/skins/default/xui/en/strings.xml')
-rwxr-xr-x | indra/newview/skins/default/xui/en/strings.xml | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index ed862dd269..2bff018710 100755 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -209,7 +209,8 @@ Please try logging in again in a minute.</string> <string name="SLappAgentIM">IM</string> <string name="SLappAgentPay">Pay</string> <string name="SLappAgentOfferTeleport">Offer Teleport to </string> - <string name="SLappAgentRequestFriend">Friend Request </string> + <string name="SLappAgentRequestFriend">Friend Request</string> + <string name="SLappAgentRemoveFriend">Friend Removal</string> <!-- ButtonToolTips, llfloater.cpp --> <string name="BUTTON_CLOSE_DARWIN">Close (⌘W)</string> @@ -3934,5 +3935,8 @@ Try enclosing path to the editor with double quotes. <string name="logging_calls_enabled_log_empty"> There are no logged conversations. After you contact someone, or someone contacts you, a log entry will be shown here. </string> + <string name="loading_chat_logs"> + Loading... + </string> </strings> |