diff options
author | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-09-14 18:48:46 -0700 |
---|---|---|
committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-09-14 18:48:46 -0700 |
commit | 0f86aa86f1780f70f125254d2108a33fcd9a7514 (patch) | |
tree | 3e31eeee14b6bc03401ced16d6c12606ebe38136 /indra/newview/skins/default/xui | |
parent | 399ba09c08d8ccaf9b34daa8b743f837639b2f35 (diff) | |
parent | 72f6bebe59f5f900af02a4d234a4091a3e034529 (diff) |
merging in latest changes
Diffstat (limited to 'indra/newview/skins/default/xui')
-rw-r--r-- | indra/newview/skins/default/xui/en/floater_conversation_log.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_conversation_log.xml b/indra/newview/skins/default/xui/en/floater_conversation_log.xml index df78bbccec..12d17e6b37 100644 --- a/indra/newview/skins/default/xui/en/floater_conversation_log.xml +++ b/indra/newview/skins/default/xui/en/floater_conversation_log.xml @@ -15,7 +15,7 @@ width="450"> <string name="logging_calls_disabled"> - Conversations are not being logged. To log conversations in the future, select "Save IM logs in my computer" under Preferences > Privacy. + Conversations are not being logged. To log conversations in the future, select "Save IM logs on my computer" under Preferences > Privacy. </string> <panel |