livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

(no name) mark for nameless objects made localizable + German translation

Ansariel 2011-11-17 20:00:44 +01:00
parent b459034860
commit 6a654c0dd2
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/llviewermessage.cpp
View File

@ -169,9 +169,6 @@ LLFrameTimer gThrottleTimer;
const U32 OFFER_THROTTLE_MAX_COUNT=5; //number of items per time period
const F32 OFFER_THROTTLE_TIME=10.f; //time period in seconds
// no name object substitute name -KC
const static std::string NO_NAME_OBJECT = "(no name)";
//script permissions
const std::string SCRIPT_QUESTIONS[SCRIPT_PERMISSION_EOF] =
{
@ -3539,9 +3536,10 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
if (chat.mSourceType == CHAT_SOURCE_OBJECT && boost::regex_search(from_name, whitespace_exp))
{
//[FIRE-2434 Mark Unamed Objects based on setting
if (gSavedSettings.getBOOL("FSMarkObjects"))
static LLCachedControl<bool> FSMarkObjects(gSavedSettings, "FSMarkObjects");
if (FSMarkObjects)
{
chat.mFromName = NO_NAME_OBJECT;
chat.mFromName = LLTrans::getString("no_name_object");
}
else
{

2
indra/newview/skins/default/xui/de/panel_preferences_chat.xml
View File

@ -125,7 +125,7 @@
<check_box name="FSShowChatChannel" label="Kanalauswahl in Eingabezeile anzeigen"/>
<check_box label="Haupteingabezeile für Chat automatisch verstecken" name="AutohideChatBar" tool_tip="Eingabezeile in der unteren Buttonleiste automatisch verstecken und nur zur Eingabe anzeigen"/>
<check_box label="Chatleiste nach Senden deaktivieren" name="CloseChatOnReturn"/>
<check_box name="FSMarkObjects" label="Objektename als (no name) anzeigen um Vortäuschungen zu unterbinden"/>
<check_box name="FSMarkObjects" label="Objektename als (unbenannt) anzeigen um Vortäuschungen zu unterbinden"/>
<!-- Groups -->
<text name="group_enhancements">

3
indra/newview/skins/default/xui/de/strings.xml
View File

@ -880,6 +880,9 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
<string name="ST_NO_JOINT">
HAUPTVERZEICHNIS oder VERBINDUNG nicht gefunden.
</string>
<string name="no_name_object">
(unbenannt)
</string>
<string name="whisper">
flüstert:
</string>

1
indra/newview/skins/default/xui/en/strings.xml
View File

@ -395,6 +395,7 @@ Please try logging in again in a minute.</string>
<string name="ST_NO_JOINT">Can't find ROOT or JOINT.</string>
<!-- Chat -->
<string name="no_name_object">(no name)</string>
<string name="whisper">whispers:</string>
<string name="shout">shouts:</string>
<string name="ringing">Connecting to in-world Voice Chat...</string>