merge changes for storm-1577

indra/newview/CMakeLists.txt

indra/newview/app_settings/settings.xml

indra/newview/llfloaterpreference.cpp

indra/newview/llfloaterpreference.h

indra/newview/llfloatertranslationsettings.cpp

indra/newview/llfloatertranslationsettings.h

indra/newview/lltranslate.cpp

indra/newview/lltranslate.h

indra/newview/llviewerfloaterreg.cpp

indra/newview/llviewermessage.cpp

...iew/skins/default/xui/en/floater_translation_settings.xml

...a/newview/skins/default/xui/en/panel_preferences_chat.xml

indra/newview/skins/default/xui/en/strings.xml

indra/newview/tests/lltranslate_test.cpp