diff options
author | dolphin <dolphin@lindenlab.com> | 2013-08-27 16:51:05 -0700 |
---|---|---|
committer | dolphin <dolphin@lindenlab.com> | 2013-08-27 16:51:05 -0700 |
commit | d29268f331380eb89224c5b0168bf89bd0116422 (patch) | |
tree | 47973dc2fbe434066e1de0c1695c3033eb76cc80 /indra/newview/skins/default/xui/en/strings.xml | |
parent | eaf847e60df3c078d15f8991e9448b06ffa83bf7 (diff) | |
parent | 6e1138585bf745f73f0bb99ca62f77eeb273f1e4 (diff) |
Merge
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 baeab47a4e..b02d4e5d8f 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> @@ -3933,5 +3934,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> |