Merge remote branch 'thickbrick/translate_fixes_b' into weekly

9 files changed, 410 insertions, 196 deletions

diff --git a/linden/indra/llui/lllineeditor.cpp b/linden/indra/llui/lllineeditor.cpp
index 66ef4c6..49fe3be 100644
--- a/linden/indra/llui/lllineeditor.cpp
+++ b/linden/indra/llui/lllineeditor.cpp
@@ -96,23 +96,23 @@ static LLRegisterWidget<LLLineEditor> r1("line_editor");
 class LineChatTranslationReceiver : public LLTranslate::TranslationReceiver
 {
 public :
-        LineChatTranslationReceiver(const std::string &toLang, LLLineEditor* line): LLTranslate::TranslationReceiver("", toLang),
-                m_line(line)    
+        LineChatTranslationReceiver(const std::string &toLang, LLLineEditor* line, const S32 start, const S32 len):
+                LLTranslate::TranslationReceiver("", toLang),
+                m_line(line),
+                m_position(start),
+                m_origLength(len)
         {
         }
  
-        static boost::intrusive_ptr<LineChatTranslationReceiver> build(const std::string &toLang,LLLineEditor* line)
+        static boost::intrusive_ptr<LineChatTranslationReceiver> build(const std::string &toLang,LLLineEditor* line, const S32 start, const S32 len)
         {
-                return boost::intrusive_ptr<LineChatTranslationReceiver>(new LineChatTranslationReceiver(toLang,line));
+                return boost::intrusive_ptr<LineChatTranslationReceiver>(new LineChatTranslationReceiver(toLang, line, start, len));
         }
 
 protected:
         void handleResponse(const std::string &translation, const std::string &detectedLanguage)
         {
-                static BOOL* rep = rebind_llcontrol<BOOL>("EmeraldTranslateReplace", &gSavedSettings, true);
-                if(*rep)
-                        m_line->deleteSelection();
-                m_line->insert(((*rep)?"":" (") + translation + ((*rep)?"":")"),m_line->getCursor());
+                m_line->translationReplace(translation, m_position, m_origLength);
         }
         void handleFailure()
         {
@@ -120,6 +120,8 @@ protected:
         }
 private:
         LLLineEditor* m_line;
+        S32 m_position;
+        S32 m_origLength;
 };
  
 LLLineEditor::LLLineEditor(const std::string& name, const LLRect& rect,
@@ -151,6 +153,7 @@ LLLineEditor::LLLineEditor(const std::string& name, const LLRect& rect,
                 mLastSelectionY(-1),
                 mLastSelectionStart(-1),
                 mLastSelectionEnd(-1),
+                mLastContextMenuX(-1),
                 mPrevalidateFunc( prevalidate_func ),
                 mCursorColor(           LLUI::sColorsGroup->getColor( "TextCursorColor" ) ),
                 mFgColor(                       LLUI::sColorsGroup->getColor( "TextFgColor" ) ),
@@ -172,7 +175,7 @@ LLLineEditor::LLLineEditor(const std::string& name, const LLRect& rect,
                 mImage( sImage ),
                 mReplaceNewlinesWithSpaces( TRUE ),
                 mSpellCheckable( FALSE ),
-                mShowMisspellings(FALSE)
+                mAllowTranslate(TRUE)
 {
         llassert( max_length_bytes > 0 );
 
@@ -211,12 +214,6 @@ LLLineEditor::LLLineEditor(const std::string& name, const LLRect& rect,
         }
         mImage = sImage;
 
-        // in other words, highlighting requires a restart
-        if (glggHunSpell->getSpellCheckHighlight())
-        {
-                mShowMisspellings = TRUE;
-        }
-
         // make the popup menu available
         //LLMenuGL* menu = LLUICtrlFactory::getInstance()->buildMenu("menu_texteditor.xml", parent_view);
         LLMenuGL* menu = new LLMenuGL("wot");
@@ -224,46 +221,49 @@ LLLineEditor::LLLineEditor(const std::string& name, const LLRect& rect,
         {
         menu = new LLMenuGL(LLStringUtil::null);
         }*/
-        menu->append(new LLMenuItemCallGL("Cut", context_cut, NULL, this));
-        menu->append(new LLMenuItemCallGL("Copy", context_copy, NULL, this));
-        menu->append(new LLMenuItemCallGL("Paste", context_paste, NULL, this));
-        menu->append(new LLMenuItemCallGL("Delete", context_delete, NULL, this));
-        menu->append(new LLMenuItemCallGL("Select All", context_selectall, NULL, this));
+
+        menu->append(new LLMenuItemCallGL("Cut", context_cut, context_enable_cut, this));
+        menu->append(new LLMenuItemCallGL("Copy", context_copy, context_enable_copy, this));
+        menu->append(new LLMenuItemCallGL("Paste", context_paste, context_enable_paste, this));
+        menu->append(new LLMenuItemCallGL("Delete", context_delete, context_enable_delete, this));
+        menu->append(new LLMenuItemCallGL("Select All", context_selectall, context_enable_selectall, this));
+
         menu->appendSeparator("Transep");
         LLMenuGL* translatemenu = new LLMenuGL("Translate To");
         translatemenu->setCanTearOff(FALSE);
         SpellMenuBind* t=new SpellMenuBind;t->origin=this;t->word="en";
-        translatemenu->append(new LLMenuItemCallGL("English",translateText, NULL, t));
+        translatemenu->append(new LLMenuItemCallGL("English", context_translate, context_enable_translate, t));
         t=new SpellMenuBind;t->origin=this;t->word="da";
-        translatemenu->append(new LLMenuItemCallGL("Danish",translateText, NULL, t));
+        translatemenu->append(new LLMenuItemCallGL("Danish", context_translate, context_enable_translate, t));
         t=new SpellMenuBind;t->origin=this;t->word="de";
-        translatemenu->append(new LLMenuItemCallGL("Deutsch(German)",translateText, NULL, t));
+        translatemenu->append(new LLMenuItemCallGL("Deutsch(German)", context_translate, context_enable_translate, t));
         t=new SpellMenuBind;t->origin=this;t->word="es";
-        translatemenu->append(new LLMenuItemCallGL("Spanish",translateText, NULL, t));
+        translatemenu->append(new LLMenuItemCallGL("Spanish", context_translate, context_enable_translate, t));
         t=new SpellMenuBind;t->origin=this;t->word="fr";
-        translatemenu->append(new LLMenuItemCallGL("French",translateText, NULL, t));
+        translatemenu->append(new LLMenuItemCallGL("French", context_translate, context_enable_translate, t));
         t=new SpellMenuBind;t->origin=this;t->word="it";
-        translatemenu->append(new LLMenuItemCallGL("Italian",translateText, NULL, t));
+        translatemenu->append(new LLMenuItemCallGL("Italian", context_translate, context_enable_translate, t));
         t=new SpellMenuBind;t->origin=this;t->word="hu";
-        translatemenu->append(new LLMenuItemCallGL("Hungarian",translateText, NULL, t));
+        translatemenu->append(new LLMenuItemCallGL("Hungarian", context_translate, context_enable_translate, t));
         t=new SpellMenuBind;t->origin=this;t->word="nl";
-        translatemenu->append(new LLMenuItemCallGL("Dutch",translateText, NULL, t));
+        translatemenu->append(new LLMenuItemCallGL("Dutch", context_translate, context_enable_translate, t));
         t=new SpellMenuBind;t->origin=this;t->word="pl";
-        translatemenu->append(new LLMenuItemCallGL("Polish",translateText, NULL, t));
+        translatemenu->append(new LLMenuItemCallGL("Polish", context_translate, context_enable_translate, t));
         t=new SpellMenuBind;t->origin=this;t->word="pt";
-        translatemenu->append(new LLMenuItemCallGL("Portugese",translateText, NULL, t));
+        translatemenu->append(new LLMenuItemCallGL("Portugese", context_translate, context_enable_translate, t));
         t=new SpellMenuBind;t->origin=this;t->word="ru";
-        translatemenu->append(new LLMenuItemCallGL("Russian",translateText, NULL, t));
+        translatemenu->append(new LLMenuItemCallGL("Russian", context_translate, context_enable_translate, t));
         t=new SpellMenuBind;t->origin=this;t->word="tr";
-        translatemenu->append(new LLMenuItemCallGL("Turkish",translateText, NULL, t));
+        translatemenu->append(new LLMenuItemCallGL("Turkish", context_translate, context_enable_translate, t));
         t=new SpellMenuBind;t->origin=this;t->word="uk";
-        translatemenu->append(new LLMenuItemCallGL("Ukrainian",translateText, NULL, t));
+        translatemenu->append(new LLMenuItemCallGL("Ukrainian", context_translate, context_enable_translate, t));
         t=new SpellMenuBind;t->origin=this;t->word="zh";
-        translatemenu->append(new LLMenuItemCallGL("Chinese",translateText, NULL, t));
+        translatemenu->append(new LLMenuItemCallGL("Chinese", context_translate, context_enable_translate, t));
         t=new SpellMenuBind;t->origin=this;t->word="ja";
-        translatemenu->append(new LLMenuItemCallGL("Japanese",translateText, NULL, t));
+        translatemenu->append(new LLMenuItemCallGL("Japanese", context_translate, context_enable_translate, t));
         t=new SpellMenuBind;t->origin=this;t->word="ko";
-        translatemenu->append(new LLMenuItemCallGL("Korean",translateText, NULL, t));
+        translatemenu->append(new LLMenuItemCallGL("Korean", context_translate, context_enable_translate, t));
+
         menu->appendMenu(translatemenu);
         menu->appendSeparator("Spelsep");
         //menu->setBackgroundColor(gColors.getColor("MenuPopupBgColor"));
@@ -439,7 +439,7 @@ void LLLineEditor::setText(const LLStringExplicit &new_text)
 
 
 // Picks a new cursor position based on the actual screen size of text being drawn.
-S32 LLLineEditor::calculateCursorFromMouse( S32 local_mouse_x )
+S32 LLLineEditor::calculateCursorFromMouse( S32 local_mouse_x ) const
 {
         const llwchar* wtext = mText.getWString().c_str();
         LLWString asterix_text;
@@ -517,17 +517,30 @@ void LLLineEditor::deselect()
         mIsSelecting = FALSE;
 }
 
+BOOL LLLineEditor::context_enable_cut(void* data)
+{
+        LLLineEditor* line = (LLLineEditor*)data;
+        return (line && line->canCut());
+}
 
 void LLLineEditor::context_cut(void* data)
 {
         LLLineEditor* line = (LLLineEditor*)data;
         if(line)line->cut();
 }
+
+BOOL LLLineEditor::context_enable_copy(void* data)
+{
+        LLLineEditor* line = (LLLineEditor*)data;
+        return (line &&line->canCopy());
+}
+
 void LLLineEditor::context_copy(void* data)
 {
         LLLineEditor* line = (LLLineEditor*)data;
         if(line)line->copy();
 }
+
 void LLLineEditor::spell_correct(void* data)
 {
         SpellMenuBind* tempBind = (SpellMenuBind*)data;
@@ -539,31 +552,52 @@ void LLLineEditor::spell_correct(void* data)
 
         }
 }
-void LLLineEditor::translateText(void * data)
+
+BOOL LLLineEditor::context_enable_translate(void* data)
+{
+        SpellMenuBind* t = (SpellMenuBind*)data;
+        return (t && t->origin && t->origin->canTranslate());
+}
+
+void LLLineEditor::context_translate(void * data)
 {
         SpellMenuBind* t = (SpellMenuBind*)data;
         LLLineEditor* line = t->origin;
         const std::string &toLang = t->word;//LLTranslate::getTranslateLanguage();
-        LLHTTPClient::ResponderPtr result = LineChatTranslationReceiver::build(toLang,line);
-        S32 left_pos = llmin( line->mSelectionStart, line->mSelectionEnd );
-        S32 length = abs( line->mSelectionStart - line->mSelectionEnd );
-        LLTranslate::translateMessage(result,"", toLang, line->mText.getString().substr(left_pos, length));
+
+        bool has_text = false;
+        S32 start, length;
+        if (line->hasSelection())
+        {
+                // translate selection
+                start = llmin(line->mSelectionStart, line->mSelectionEnd);
+                length = abs(line->mSelectionEnd - line->mSelectionStart);
+                has_text = length > 0;
+        }
+        else
+        {
+                // translate one word at click position
+                S32 at = line->calculateCursorFromMouse(line->mLastContextMenuX);
+                has_text = line->getWordBoundriesAt(at, &start, &length);
+        }
+
+        if (has_text)
+        {
+                std::string to_translate = wstring_to_utf8str(line->getWText().substr(start, length));
+                LLHTTPClient::ResponderPtr result = LineChatTranslationReceiver::build(toLang, line, start, length);
+                LLTranslate::translateMessage(result,"", toLang, to_translate);
+        }
 }
+
 void LLLineEditor::spell_show(void * data)
 {
         SpellMenuBind* tempBind = (SpellMenuBind*)data;
         LLLineEditor* line = tempBind->origin;
 
-        if( tempBind && line)
+        if (tempBind && line)
         {
-                if (tempBind->word == "Show Misspellings")
-                {
-                        line->mShowMisspellings = TRUE;
-                }
-                else
-                {
-                        line->mShowMisspellings = FALSE;
-                }
+                BOOL show = (tempBind->word == "Show Misspellings");
+                glggHunSpell->setSpellCheckHighlight(show);
         }
 }
 
@@ -623,18 +657,36 @@ void LLLineEditor::spell_add(void* data)
         }
 }
 
+BOOL LLLineEditor::context_enable_paste(void* data)
+{
+        LLLineEditor* line = (LLLineEditor*)data;
+        return (line && line->canPaste());
+}
+
 void LLLineEditor::context_paste(void* data)
 {
         LLLineEditor* line = (LLLineEditor*)data;
         if(line)line->paste();
 }
 
+BOOL LLLineEditor::context_enable_delete(void* data)
+{
+        LLLineEditor* line = (LLLineEditor*)data;
+        return (line && line->canDoDelete());
+}
+
 void LLLineEditor::context_delete(void* data)
 {
         LLLineEditor* line = (LLLineEditor*)data;
         if(line)line->doDelete();
 }
 
+BOOL LLLineEditor::context_enable_selectall(void* data)
+{
+        LLLineEditor* line = (LLLineEditor*)data;
+        return (line && line->canSelectAll());
+}
+
 void LLLineEditor::context_selectall(void* data)
 {
         LLLineEditor* line = (LLLineEditor*)data;
@@ -738,7 +790,8 @@ BOOL LLLineEditor::handleRightMouseDown( S32 x, S32 y, MASK mask )
 
         //setCursorAtLocalPos( x);
         S32 wordStart = 0;
-        S32 wordEnd = calculateCursorFromMouse(x);
+        S32 wordEnd = 0;
+        S32 pos = calculateCursorFromMouse(x);
 
         LLMenuGL* menu = (LLMenuGL*)mPopupMenuHandle.get();
         if (menu)
@@ -761,36 +814,21 @@ BOOL LLLineEditor::handleRightMouseDown( S32 x, S32 y, MASK mask )
                 }
                 suggestionMenuItems.clear();
 
-                menu->setItemVisible("Translate To", !mReadOnly);
-                menu->setItemVisible("Transep", !mReadOnly);
-
                 // spell_check="true" in xui
+                menu->setItemVisible("Spelsep", !mReadOnly && mSpellCheckable);
                 if (!mReadOnly && mSpellCheckable)
                 {
-                        const LLWString& text = mText.getWString();
-
                         // search for word matches
-                        if (LLTextEditor::isPartOfWord(text[wordEnd]))
+                        bool is_word_part = getWordBoundriesAt(pos, &wordStart, &wordEnd);
+                        if (is_word_part)
                         {
-                                // Select word the cursor is over
-                                while ((wordEnd > 0) && LLTextEditor::isPartOfWord(text[wordEnd-1]))
-                                {
-                                        wordEnd--;
-                                }
-                                wordStart = wordEnd;
-                                //startSelection();
-
-                                while ((wordEnd < (S32)text.length()) && LLTextEditor::isPartOfWord( text[wordEnd] ) )
-                                {
-                                        wordEnd++;
-                                }               
+                                const LLWString& text = mText.getWString();
                                 std::string selectedWord(std::string(text.begin(), text.end()).substr(wordStart,wordEnd-wordStart));
                                 
                                 if (!glggHunSpell->isSpelledRight(selectedWord))
                                 {       
                                         //misspelled word here, and you have just right clicked on it!
                                         std::vector<std::string> suggs = glggHunSpell->getSuggestionList(selectedWord);
-                                        //menu->setItemVisible("Transep",(suggs.size()>0));
 
                                         for (int i = 0; i<(int)suggs.size() ;i++)
                                         {
@@ -821,7 +859,7 @@ BOOL LLLineEditor::handleRightMouseDown( S32 x, S32 y, MASK mask )
 
                         SpellMenuBind * tempStruct = new SpellMenuBind;
                         tempStruct->origin = this;
-                        if (mShowMisspellings)
+                        if (glggHunSpell->getSpellCheckHighlight())
                         {
                                 tempStruct->word = "Hide Misspellings";
                         }
@@ -836,6 +874,7 @@ BOOL LLLineEditor::handleRightMouseDown( S32 x, S32 y, MASK mask )
                         menu->append(suggMenuItem);
                 }
 
+                mLastContextMenuX = x;
                 menu->buildDrawLabels();
                 menu->updateParent(LLMenuGL::sMenuContainer);
                 LLMenuGL::showPopup(this, menu, x, y);
@@ -1109,13 +1148,9 @@ void LLLineEditor::setSelection(S32 start, S32 end)
 {
         S32 len = mText.length();
 
-        mIsSelecting = TRUE;
-
-        // JC, yes, this seems odd, but I think you have to presume a 
-        // selection dragged from the end towards the start.
-        mSelectionStart = llclamp(end, 0, len);
-        mSelectionEnd = llclamp(start, 0, len);
-        setCursor(start);
+        mSelectionStart = llclamp(start, 0, len);
+        mSelectionEnd = llclamp(end, 0, len);
+        setCursor(end);
 }
 
 void LLLineEditor::setDrawAsterixes(BOOL b)
@@ -1152,6 +1187,26 @@ S32 LLLineEditor::nextWordPos(S32 cursorPos) const
         return cursorPos;
 }
 
+BOOL LLLineEditor::getWordBoundriesAt(const S32 at, S32* word_begin, S32* word_length) const
+{
+        const LLWString& wtext = mText.getWString();
+        S32 pos = at;
+        if (LLTextEditor::isPartOfWord(wtext[pos]))
+        {
+                while ( (pos > 0) && LLTextEditor::isPartOfWord(wtext[pos - 1]) )
+                {
+                        pos--;
+                }
+                *word_begin = pos;
+                while ( (pos < wtext.length()) && LLTextEditor::isPartOfWord(wtext[pos]) )
+                {
+                        pos++;
+                }
+                *word_length = pos - *word_begin;
+                return TRUE;
+        }
+        return FALSE;
+}
 
 BOOL LLLineEditor::handleSelectionKey(KEY key, MASK mask)
 {
@@ -1315,6 +1370,37 @@ void LLLineEditor::spellReplace(SpellMenuBind* spellData)
 
 
 }
+
+void LLLineEditor::translationReplace(const std::string &translation, const S32 orig_start, const S32 orig_length)
+{
+        //*TODO: should probably check if the content was modified since the http query
+        //       was made, so we don't insert text in the wrong place.
+        BOOL replace = gSavedSettings.getBOOL("EmeraldTranslateReplace");
+        std::string text = replace ? translation : " (" + translation + ")";
+        S32 pos = replace ? orig_start : orig_start + orig_length;
+        if (replace)
+        {
+                mText.erase(orig_start, orig_length);
+        }
+        insert(text, pos);
+
+        S32 text_wlen = utf8str_to_wstring(text).length();
+        if (hasSelection())
+        {
+                setSelection(pos, pos + text_wlen);
+        }
+        setCursor(pos + text_wlen);
+}
+
+BOOL LLLineEditor::canTranslate() const
+{
+        // if allow_translate="true" in xui, and if other factors permit, we allow it
+        S32 pos = calculateCursorFromMouse(mLastContextMenuX);
+        const LLWString& wtext = getWText();
+        bool is_word_part = (pos > -1) && LLTextEditor::isPartOfWord(wtext[pos]);
+        return (mAllowTranslate && !mReadOnly && (is_word_part || hasSelection()));
+}
+
 void LLLineEditor::insert(std::string what, S32 wher)
 {
         LLLineEditorRollback rollback(this);
@@ -1925,7 +2011,7 @@ void LLLineEditor::drawMisspelled(LLRect background)
                         }
                 }
 
-                if (mShowMisspellings)
+                if (glggHunSpell->getSpellCheckHighlight())
                 {
                         for (int i =0; i<(int)misspellLocations.size(); i++)
                         {
@@ -2830,6 +2916,11 @@ LLView* LLLineEditor::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory
         {
                 line_editor->setSpellCheckable(spell_checking);
         }
+        BOOL allow_translate = TRUE;
+        if (node->getAttributeBOOL("allow_translate", allow_translate))
+        {
+                line_editor->setAllowTranslate(allow_translate);
+        }
         
         line_editor->setColorParameters(node);
         
diff --git a/linden/indra/llui/lllineeditor.h b/linden/indra/llui/lllineeditor.h
index 147b232..f9e0621 100644
--- a/linden/indra/llui/lllineeditor.h
+++ b/linden/indra/llui/lllineeditor.h
@@ -107,6 +107,8 @@ public:
         };
 
         virtual void spellReplace(SpellMenuBind* spellData);
+        virtual void translationReplace(const std::string &translation, const S32 orig_start, const S32 orig_length);
+        virtual BOOL canTranslate() const;
         virtual void insert(std::string what,S32 wher);
 
         // LLEditMenuHandler overrides
@@ -133,15 +135,22 @@ public:
         virtual void    deselect();
         virtual BOOL    canDeselect() const;
 
+        static BOOL context_enable_cut(void* data);
         static void context_cut(void* data);
+        static BOOL context_enable_copy(void* data);
         static void context_copy(void* data);
-        static void spell_correct(void* data);
-        static void spell_show(void* data);
-        static void translateText(void * data);
-        static void spell_add(void* data);
+        static BOOL context_enable_paste(void* data);
         static void context_paste(void* data);
+        static BOOL context_enable_delete(void* data);
         static void context_delete(void* data);
+        static BOOL context_enable_selectall(void* data);
         static void context_selectall(void* data);
+        static BOOL context_enable_translate(void * data);
+        static void context_translate(void * data);
+        static void spell_correct(void* data);
+        static void spell_show(void* data);
+        static void spell_add(void* data);
+
         std::vector<S32> getMisspelledWordsPositions();
         // view overrides
         virtual void    draw();
@@ -199,6 +208,7 @@ public:
         void setReadOnlyBgColor( const LLColor4& c )    { mReadOnlyBgColor = c; }
         void setFocusBgColor(const LLColor4& c)                 { mFocusBgColor = c; }
         void setSpellCheckable(BOOL b)                                  { mSpellCheckable = b; }
+        void setAllowTranslate(BOOL b)                                  { mAllowTranslate = b; }
 
         const LLColor4& getFgColor() const                      { return mFgColor; }
         const LLColor4& getReadOnlyFgColor() const      { return mReadOnlyFgColor; }
@@ -215,6 +225,7 @@ public:
         // get the cursor position of the beginning/end of the prev/next word in the text
         S32                             prevWordPos(S32 cursorPos) const;
         S32                             nextWordPos(S32 cursorPos) const;
+        BOOL                    getWordBoundriesAt(const S32 at, S32* word_begin, S32* word_length) const;
 
         BOOL                    hasSelection() const { return (mSelectionStart != mSelectionEnd); }
         void                    startSelection();
@@ -261,7 +272,7 @@ private:
         void                    removeChar();
         void                    addChar(const llwchar c);
         void                    setCursorAtLocalPos(S32 local_mouse_x);
-        S32                             calculateCursorFromMouse(S32 local_mouse_x);
+        S32                             calculateCursorFromMouse(S32 local_mouse_x) const;
         S32                             findPixelNearestPos(S32 cursor_offset = 0) const;
         void                    reportBadKeystroke();
         BOOL                    handleSpecialKey(KEY key, MASK mask);
@@ -294,10 +305,11 @@ protected:
         S32                             mStartSpellHere;                // the position of the first char on the screen, stored so we know when to update
         S32                             mEndSpellHere;                  // the location of the last char on the screen
         BOOL                    mSpellCheckable;                // set in xui as "spell_check". Default value for a field
-        BOOL                    mShowMisspellings;              // show misspellings as highlighted (initialized in the ctor)           
         LLFrameTimer mSpellTimer;
         //to keep track of what we have to remove before showing menu
         std::vector<SpellMenuBind* > suggestionMenuItems;
+        S32 mLastContextMenuX;
+        BOOL                    mAllowTranslate;                // set in xui as "allow_translate".
 
         // line history support:
         BOOL            mHaveHistory;                           // flag for enabled line history
diff --git a/linden/indra/llui/lltexteditor.cpp b/linden/indra/llui/lltexteditor.cpp
index b101588..8dcb014 100644
--- a/linden/indra/llui/lltexteditor.cpp
+++ b/linden/indra/llui/lltexteditor.cpp
@@ -105,21 +105,23 @@ bool (* LLTextEditor::mSecondlifeURLcallbackRightClick)(const std::string&)   =
 class TextChatTranslationReceiver : public LLTranslate::TranslationReceiver
 {
 public :
-        TextChatTranslationReceiver(const std::string &toLang, LLTextEditor* line): LLTranslate::TranslationReceiver("", toLang),
-                m_line(line)    
+        TextChatTranslationReceiver(const std::string &toLang, LLTextEditor* line, const S32 start, const S32 len):
+                LLTranslate::TranslationReceiver("", toLang),
+                m_line(line),
+                m_position(start),
+                m_origLength(len)
         {
         }
 
-        static boost::intrusive_ptr<TextChatTranslationReceiver> build(const std::string &toLang,LLTextEditor* line)
+        static boost::intrusive_ptr<TextChatTranslationReceiver> build(const std::string &toLang,LLTextEditor* line, const S32 start, const S32 len)
         {
-                return boost::intrusive_ptr<TextChatTranslationReceiver>(new TextChatTranslationReceiver(toLang,line));
+                return boost::intrusive_ptr<TextChatTranslationReceiver>(new TextChatTranslationReceiver(toLang, line, start, len));
         }
 
 protected:
         void handleResponse(const std::string &translation, const std::string &detectedLanguage)
         {
-                BOOL rep = gSavedSettings.getBOOL("EmeraldTranslateReplace");
-                m_line->insertText((rep?"":" (") + translation +(rep?"":")"),rep);
+                m_line->translationReplace(translation, m_position, m_origLength);
         }
         void handleFailure()
         {
@@ -127,6 +129,8 @@ protected:
         }
 private:
         LLTextEditor* m_line;
+        S32 m_position;
+        S32 m_origLength;
 };
 
 ///////////////////////////////////////////////////////////////////
@@ -321,10 +325,12 @@ LLTextEditor::LLTextEditor(
         mMouseDownY(0),
         mLastSelectionX(-1),
         mLastSelectionY(-1),
+        mLastContextMenuX(-1),
+        mLastContextMenuY(-1),
         mReflowNeeded(FALSE),
         mScrollNeeded(FALSE),
         mSpellCheckable(FALSE),
-        mShowMisspellings(FALSE)
+        mAllowTranslate(TRUE)
 {
         mSourceID.generate();
 
@@ -377,12 +383,6 @@ LLTextEditor::LLTextEditor(
         mParseHTML=FALSE;
         mHTML.clear();
 
-        // in other words, highlighting requires a restart
-        if (glggHunSpell->getSpellCheckHighlight())
-        {
-                mShowMisspellings = TRUE;
-        }
-
         // make the popup menu available
         //LLMenuGL* menu = LLUICtrlFactory::getInstance()->buildMenu("menu_texteditor.xml", parent_view);
         LLMenuGL* menu = new LLMenuGL("wot");
@@ -390,46 +390,46 @@ LLTextEditor::LLTextEditor(
         {
                         menu = new LLMenuGL(LLStringUtil::null);
         }*/
-        menu->append(new LLMenuItemCallGL("Cut", context_cut, NULL, this));
-        menu->append(new LLMenuItemCallGL("Copy", context_copy, NULL, this));
-        menu->append(new LLMenuItemCallGL("Paste", context_paste, NULL, this));
-        menu->append(new LLMenuItemCallGL("Delete", context_delete, NULL, this));
-        menu->append(new LLMenuItemCallGL("Select All", context_selectall, NULL, this));
-        menu->appendSeparator("transep");
+        menu->append(new LLMenuItemCallGL("Cut", context_cut, context_enable_cut, this));
+        menu->append(new LLMenuItemCallGL("Copy", context_copy, context_enable_copy, this));
+        menu->append(new LLMenuItemCallGL("Paste", context_paste, context_enable_paste, this));
+        menu->append(new LLMenuItemCallGL("Delete", context_delete, context_enable_delete, this));
+        menu->append(new LLMenuItemCallGL("Select All", context_selectall, context_enable_selectall, this));
+        menu->appendSeparator("Transep");
         LLMenuGL* translatemenu = new LLMenuGL("Translate To");
         translatemenu->setCanTearOff(FALSE);
         SpellMenuBind* t=new SpellMenuBind;t->origin=this;t->word="en";
-        translatemenu->append(new LLMenuItemCallGL("English",translateText, NULL, t));
+        translatemenu->append(new LLMenuItemCallGL("English", context_translate, context_enable_translate, t));
         t=new SpellMenuBind;t->origin=this;t->word="da";
-        translatemenu->append(new LLMenuItemCallGL("Danish",translateText, NULL, t));
+        translatemenu->append(new LLMenuItemCallGL("Danish", context_translate, context_enable_translate, t));
         t=new SpellMenuBind;t->origin=this;t->word="de";
-        translatemenu->append(new LLMenuItemCallGL("Deutsch(German)",translateText, NULL, t));
+        translatemenu->append(new LLMenuItemCallGL("Deutsch(German)", context_translate, context_enable_translate, t));
         t=new SpellMenuBind;t->origin=this;t->word="es";
-        translatemenu->append(new LLMenuItemCallGL("Spanish",translateText, NULL, t));
+        translatemenu->append(new LLMenuItemCallGL("Spanish", context_translate, context_enable_translate, t));
         t=new SpellMenuBind;t->origin=this;t->word="fr";
-        translatemenu->append(new LLMenuItemCallGL("French",translateText, NULL, t));
+        translatemenu->append(new LLMenuItemCallGL("French", context_translate, context_enable_translate, t));
         t=new SpellMenuBind;t->origin=this;t->word="it";
-        translatemenu->append(new LLMenuItemCallGL("Italian",translateText, NULL, t));
+        translatemenu->append(new LLMenuItemCallGL("Italian", context_translate, context_enable_translate, t));
         t=new SpellMenuBind;t->origin=this;t->word="hu";
-        translatemenu->append(new LLMenuItemCallGL("Hungarian",translateText, NULL, t));
+        translatemenu->append(new LLMenuItemCallGL("Hungarian", context_translate, context_enable_translate, t));
         t=new SpellMenuBind;t->origin=this;t->word="nl";
-        translatemenu->append(new LLMenuItemCallGL("Dutch",translateText, NULL, t));
+        translatemenu->append(new LLMenuItemCallGL("Dutch", context_translate, context_enable_translate, t));
         t=new SpellMenuBind;t->origin=this;t->word="pl";
-        translatemenu->append(new LLMenuItemCallGL("Polish",translateText, NULL, t));
+        translatemenu->append(new LLMenuItemCallGL("Polish", context_translate, context_enable_translate, t));
         t=new SpellMenuBind;t->origin=this;t->word="pt";
-        translatemenu->append(new LLMenuItemCallGL("Portugese",translateText, NULL, t));
+        translatemenu->append(new LLMenuItemCallGL("Portugese", context_translate, context_enable_translate, t));
         t=new SpellMenuBind;t->origin=this;t->word="ru";
-        translatemenu->append(new LLMenuItemCallGL("Russian",translateText, NULL, t));
+        translatemenu->append(new LLMenuItemCallGL("Russian", context_translate, context_enable_translate, t));
         t=new SpellMenuBind;t->origin=this;t->word="tr";
-        translatemenu->append(new LLMenuItemCallGL("Turkish",translateText, NULL, t));
+        translatemenu->append(new LLMenuItemCallGL("Turkish", context_translate, context_enable_translate, t));
         t=new SpellMenuBind;t->origin=this;t->word="uk";
-        translatemenu->append(new LLMenuItemCallGL("Ukrainian",translateText, NULL, t));
+        translatemenu->append(new LLMenuItemCallGL("Ukrainian", context_translate, context_enable_translate, t));
         t=new SpellMenuBind;t->origin=this;t->word="zh";
-        translatemenu->append(new LLMenuItemCallGL("Chinese",translateText, NULL, t));
+        translatemenu->append(new LLMenuItemCallGL("Chinese", context_translate, context_enable_translate, t));
         t=new SpellMenuBind;t->origin=this;t->word="ja";
-        translatemenu->append(new LLMenuItemCallGL("Japanese",translateText, NULL, t));
+        translatemenu->append(new LLMenuItemCallGL("Japanese", context_translate, context_enable_translate, t));
         t=new SpellMenuBind;t->origin=this;t->word="ko";
-        translatemenu->append(new LLMenuItemCallGL("Korean",translateText, NULL, t));
+        translatemenu->append(new LLMenuItemCallGL("Korean", context_translate, context_enable_translate, t));
         
         menu->appendMenu(translatemenu);
         menu->appendSeparator("Spelsep");
@@ -439,7 +439,6 @@ LLTextEditor::LLTextEditor(
         mPopupMenuHandle = menu->getHandle();
 }
 
-
 LLTextEditor::~LLTextEditor()
 {
         gFocusMgr.releaseFocusIfNeeded( this ); // calls onCommit()
@@ -457,27 +456,67 @@ LLTextEditor::~LLTextEditor()
         std::for_each(mUndoStack.begin(), mUndoStack.end(), DeletePointer());
         LLView::deleteViewByHandle(mPopupMenuHandle);
 }
+
+BOOL LLTextEditor::context_enable_cut(void* data)
+{
+        LLTextEditor* line = (LLTextEditor*)data;
+        return (line && line->canCut());
+}
+
 void LLTextEditor::context_cut(void* data)
 {
         LLTextEditor* line = (LLTextEditor*)data;
         if(line)line->cut();
 }
+
+BOOL LLTextEditor::context_enable_copy(void* data)
+{
+        LLTextEditor* line = (LLTextEditor*)data;
+        return (line && line->canCopy());
+}
+
 void LLTextEditor::context_copy(void* data)
 {
         LLTextEditor* line = (LLTextEditor*)data;
         if(line)line->copy();
 }
-void LLTextEditor::translateText(void * data)
+
+BOOL LLTextEditor::context_enable_translate(void * data)
+{
+        SpellMenuBind* t = (SpellMenuBind*)data;
+        return (t && t->origin && t->origin->canTranslate());
+}
+
+void LLTextEditor::context_translate(void * data)
 {
         SpellMenuBind* t = (SpellMenuBind*)data;
         LLTextEditor* line = t->origin;
         const std::string &toLang = t->word;//LLTranslate::getTranslateLanguage();
-        LLHTTPClient::ResponderPtr result = TextChatTranslationReceiver::build(toLang,line);
 
-        S32 left_pos = llmin( line->mSelectionStart, line->mSelectionEnd );
-        S32 length = abs( line->mSelectionStart - line->mSelectionEnd );
-        LLTranslate::translateMessage(result,"", toLang, line->getText().substr(left_pos, length));
+        bool has_text = false;
+        S32 start, length;
+        if (line->hasSelection())
+        {
+                // translate selection
+                start = llmin(line->mSelectionStart, line->mSelectionEnd);
+                length = abs(line->mSelectionEnd - line->mSelectionStart);
+                has_text = length > 0;
+        }
+        else
+        {
+                // translate one word as click position
+                S32 at = line->getCursorPosFromLocalCoord(line->mLastContextMenuX, line->mLastContextMenuY, TRUE);
+                has_text = line->getWordBoundriesAt(at, &start, &length);
+        }
+
+        if (has_text)
+        {
+                const std::string to_translate =  wstring_to_utf8str(line->getWText().substr(start, length));
+                LLHTTPClient::ResponderPtr result = TextChatTranslationReceiver::build(toLang, line, start, length);
+                LLTranslate::translateMessage(result,"", toLang, to_translate);
+        }
 }
+
 void LLTextEditor::spell_correct(void* data)
 {
         SpellMenuBind* tempBind = (SpellMenuBind*)data;
@@ -496,14 +535,8 @@ void LLTextEditor::spell_show(void * data)
 
         if (tempBind && line)
         {
-                if (tempBind->word == "Show Misspellings")
-                {
-                        glggHunSpell->setSpellCheckHighlight(TRUE);
-                }
-                else
-                {
-                        glggHunSpell->setSpellCheckHighlight(FALSE);
-                }
+                BOOL show = (tempBind->word == "Show Misspellings");
+                glggHunSpell->setSpellCheckHighlight(show);
         }
 }
 
@@ -555,16 +588,37 @@ void LLTextEditor::spell_add(void* data)
                         tempBind->origin->mPrevSpelledText.erase();//make it update
         }
 }
+
+BOOL LLTextEditor::context_enable_paste(void* data)
+{
+        LLTextEditor* line = (LLTextEditor*)data;
+        return(line && line->canPaste());
+}
+
 void LLTextEditor::context_paste(void* data)
 {
         LLTextEditor* line = (LLTextEditor*)data;
         if(line)line->paste();
 }
+
+BOOL LLTextEditor::context_enable_delete(void* data)
+{
+        LLTextEditor* line = (LLTextEditor*)data;
+        return (line && line->canDoDelete());
+}
+
 void LLTextEditor::context_delete(void* data)
 {
         LLTextEditor* line = (LLTextEditor*)data;
         if(line)line->doDelete();
 }
+
+BOOL LLTextEditor::context_enable_selectall(void* data)
+{
+        LLTextEditor* line = (LLTextEditor*)data;
+        return (line && line->canSelectAll());
+}
+
 void LLTextEditor::context_selectall(void* data)
 {
         LLTextEditor* line = (LLTextEditor*)data;
@@ -947,6 +1001,26 @@ S32 LLTextEditor::nextWordPos(S32 cursorPos) const
         return cursorPos;
 }
 
+BOOL LLTextEditor::getWordBoundriesAt(const S32 at, S32* word_begin, S32* word_length) const
+{
+        S32 pos = at;
+        if (isPartOfWord(mWText[pos]))
+        {
+                while ( (pos > 0) && isPartOfWord(mWText[pos - 1]) )
+                {
+                        pos--;
+                }
+                *word_begin = pos;
+                while ( (pos < getLength()) && isPartOfWord(mWText[pos]) )
+                {
+                        pos++;
+                }
+                *word_length = pos - *word_begin;
+                return TRUE;
+        }
+        return FALSE;
+}
+
 S32 LLTextEditor::getLineStart( S32 line ) const
 {
         S32 num_lines = getLineCount();
@@ -1439,7 +1513,8 @@ BOOL LLTextEditor::handleRightMouseDown( S32 x, S32 y, MASK mask )
 
         //setCursorAtLocalPos( x, y, TRUE );
         S32 wordStart = 0;
-        S32 wordEnd = getCursorPosFromLocalCoord(x,y,TRUE);
+        S32 wordEnd = 0;
+        S32 pos = getCursorPosFromLocalCoord(x,y,TRUE);
 
         LLMenuGL* menu = (LLMenuGL*)mPopupMenuHandle.get();
         if (menu)
@@ -1458,35 +1533,21 @@ BOOL LLTextEditor::handleRightMouseDown( S32 x, S32 y, MASK mask )
                 }
                 suggestionMenuItems.clear();
 
-                menu->setItemVisible("Translate To", !mReadOnly);
-                menu->setItemVisible("Transep", !mReadOnly);
-
                 // spell_check="true" in xui
+                menu->setItemVisible("Spelsep", !mReadOnly && mSpellCheckable);
                 if (!mReadOnly && mSpellCheckable)
                 {
-                        const LLWString &text = mWText;
-                        
-                        if (isPartOfWord(text[wordEnd]) && !mReadOnly)
+                        bool is_word_part = getWordBoundriesAt(pos, &wordStart, &wordEnd);
+                        if (is_word_part)
                         {
-                                // Select word the cursor is over
-                                while ((wordEnd > 0) && isPartOfWord(text[wordEnd-1]))
-                                {
-                                        wordEnd--;
-                                }
-                                wordStart = wordEnd;
-                                //startSelection();
-
-                                while ((wordEnd < (S32)text.length()) && isPartOfWord( text[wordEnd] ) )
-                                {
-                                        wordEnd++;
-                                }               
+                                const LLWString &text = mWText;
                                 std::string selectedWord(std::string(text.begin(), text.end()).substr(wordStart,wordEnd-wordStart));
+
                                 if (!glggHunSpell->isSpelledRight(selectedWord))
                                 {
                                         //misspelled word here, and you have just right clicked on it!
                                         std::vector<std::string> suggs = glggHunSpell->getSuggestionList(selectedWord);
 
-                                        //menu->setItemVisible("Transep",(suggs.size()>0));
                                         for (int i = 0; i<(int)suggs.size(); i++)
                                         {
                                                 SpellMenuBind * tempStruct = new SpellMenuBind;
@@ -1517,7 +1578,7 @@ BOOL LLTextEditor::handleRightMouseDown( S32 x, S32 y, MASK mask )
 
                         SpellMenuBind * tempStruct = new SpellMenuBind;
                         tempStruct->origin = this;
-                        if (mShowMisspellings)
+                        if (glggHunSpell->getSpellCheckHighlight())
                         {
                                 tempStruct->word = "Hide Misspellings";
                         }
@@ -1531,6 +1592,8 @@ BOOL LLTextEditor::handleRightMouseDown( S32 x, S32 y, MASK mask )
                         suggestionMenuItems.push_back(tempStruct);
                         menu->append(suggMenuItem);
                 }
+                mLastContextMenuX = x;
+                mLastContextMenuY = y;
                 menu->buildDrawLabels();
                 menu->updateParent(LLMenuGL::sMenuContainer);
                 LLMenuGL::showPopup(this, menu, x, y);
@@ -2238,6 +2301,35 @@ void LLTextEditor::spellReplace(SpellMenuBind* spellData)
         needsReflow();
 }
 
+void LLTextEditor::translationReplace(const std::string &translation, const S32 orig_start, const S32 orig_length)
+{
+        //*TODO: should probably check if the content was modified since the http query
+        //       was made, so we don't insert text in the wrong place.
+        BOOL replace = gSavedSettings.getBOOL("EmeraldTranslateReplace");
+        LLWString wtext = utf8str_to_wstring(replace ? translation : " (" + translation + ")");
+        S32 pos = replace ? orig_start : orig_start + orig_length;
+        if (replace)
+        {
+                remove(orig_start, orig_length, FALSE);
+        }
+        S32 inserted = insert(pos, wtext, FALSE);
+        if (hasSelection())
+        {
+                mSelectionStart = llclamp(pos, 0, getLength());
+                mSelectionEnd = llclamp(pos + inserted, mSelectionStart, getLength());
+        }
+        setCursorPos(pos + inserted);
+        needsReflow();
+}
+
+BOOL LLTextEditor::canTranslate() const
+{
+        // if allow_translate="true" in xui, and if other factors permit, we allow it
+        S32 pos = getCursorPosFromLocalCoord(mLastContextMenuX, mLastContextMenuY, TRUE);
+        bool is_word_part = (pos > -1) && isPartOfWord(mWText[pos]);
+        return (mAllowTranslate && !mReadOnly && (is_word_part || hasSelection()));
+}
+
 // paste from clipboard
 void LLTextEditor::paste()
 {
@@ -3162,7 +3254,7 @@ void LLTextEditor::drawMisspelled()
                         }
                 }
                 //draw
-                if (mShowMisspellings)
+                if (glggHunSpell->getSpellCheckHighlight())
                 {
                         for (int i = 0; i<(int)misspellLocations.size() ;i++)
                         {
@@ -4901,6 +4993,8 @@ void LLTextEditor::setTextEditorParameters(LLXMLNodePtr node)
 
         node->getAttributeBOOL("spell_check", mSpellCheckable);
 
+        node->getAttributeBOOL("allow_translate", mAllowTranslate);
+
         LLColor4 color;
         if (LLUICtrlFactory::getAttributeColor(node,"cursor_color", color)) 
         {
diff --git a/linden/indra/llui/lltexteditor.h b/linden/indra/llui/lltexteditor.h
index 57a6bbd..f2a831b 100644
--- a/linden/indra/llui/lltexteditor.h
+++ b/linden/indra/llui/lltexteditor.h
@@ -136,6 +136,8 @@ public:
         virtual BOOL    canPaste() const;
  
         virtual void    spellReplace(SpellMenuBind* spellData);
+        virtual void    translationReplace(const std::string &translation, const S32 orig_start, const S32 orig_length);
+        virtual BOOL    canTranslate() const;
  
         virtual void    updatePrimary();
         virtual void    copyPrimary();
@@ -148,13 +150,19 @@ public:
         virtual BOOL    canSelectAll()  const;
         virtual void    deselect();
         virtual BOOL    canDeselect() const;
-        static void context_cut(void* data);
 
+        static BOOL context_enable_cut(void* data);
+        static void context_cut(void* data);
+        static BOOL context_enable_copy(void* data);
         static void context_copy(void* data);
+        static BOOL context_enable_paste(void* data);
         static void context_paste(void* data);
+        static BOOL context_enable_delete(void* data);
         static void context_delete(void* data);
+        static BOOL context_enable_selectall(void* data);
         static void context_selectall(void* data);
-        static void translateText(void * data);
+        static BOOL context_enable_translate(void * data);
+        static void context_translate(void * data);
         static void spell_correct(void* data);
         static void spell_add(void* data);
         static void spell_show(void* data);
@@ -352,6 +360,7 @@ public:
 
         S32                             prevWordPos(S32 cursorPos) const;
         S32                             nextWordPos(S32 cursorPos) const;
+        BOOL                    getWordBoundriesAt(const S32 at, S32* word_begin, S32* word_length) const;
 
         S32                     getLineCount() const { return mLineStartList.size(); }
         S32                     getLineStart( S32 line ) const;
@@ -527,7 +536,7 @@ private:
         S32 spellEnd;
         std::vector<S32> misspellLocations;     // where all the mispelled words are
         BOOL                    mSpellCheckable;                        // set in xui as "spell_check". Default value for a field
-        BOOL                    mShowMisspellings;              // show misspellings as highlighted (initialized in the ctor)
+        BOOL                    mAllowTranslate;                // set in xui as "allow_translate".
         
         S32                             mMaxTextByteLength;             // Maximum length mText is allowed to be in bytes
 
@@ -568,6 +577,8 @@ private:
 
         //to keep track of what we have to remove before showing menu
         std::vector<SpellMenuBind* > suggestionMenuItems;
+        S32 mLastContextMenuX;
+        S32 mLastContextMenuY;
 
         line_list_t mLineStartList;
         BOOL                    mReflowNeeded;
diff --git a/linden/indra/newview/lgghunspell_wrapper.cpp b/linden/indra/newview/lgghunspell_wrapper.cpp
index f800043..aa4507c 100644
--- a/linden/indra/newview/lgghunspell_wrapper.cpp
+++ b/linden/indra/newview/lgghunspell_wrapper.cpp
@@ -72,7 +72,7 @@ static char * countryCodesraw[] = {
   (char*)"CF",(char*)"Central African Republic",
   (char*)"CG",(char*)"Congo",
   (char*)"CH",(char*)"Switzerland",
-  (char*)"CI",(char*)"Côte D'ivoire (Ivory Coast)",
+  (char*)"CI",(char*)"Côte D'ivoire (Ivory Coast)",
   (char*)"CK",(char*)"Cook Iislands",
   (char*)"CL",(char*)"Chile",
   (char*)"CM",(char*)"Cameroon",
@@ -212,7 +212,7 @@ static char * countryCodesraw[] = {
   (char*)"PW",(char*)"Palau",
   (char*)"PY",(char*)"Paraguay",
   (char*)"QA",(char*)"Qatar",
-  (char*)"RE",(char*)"Réunion",
+  (char*)"RE",(char*)"Réunion",
   (char*)"RO",(char*)"Romania",
   (char*)"RU",(char*)"Russian Federation",
   (char*)"RW",(char*)"Rwanda",
@@ -333,7 +333,7 @@ static char * languageCodesraw[]={
   (char*)"ga",(char*)"Irish",
   (char*)"gd",(char*)"Gaelic",
   (char*)"gl",(char*)"Galician",
-  (char*)"gn",(char*)"Guaraní",
+  (char*)"gn",(char*)"Guaraní",
   (char*)"gu",(char*)"Gujarati",
   (char*)"gv",(char*)"Manx",
   (char*)"ha",(char*)"Hausa",
@@ -456,7 +456,7 @@ static char * languageCodesraw[]={
   (char*)"uz",(char*)"Uzbek",
   (char*)"ve",(char*)"Venda",
   (char*)"vi",(char*)"Vietnamese",
-  (char*)"vo",(char*)"Volapük",
+  (char*)"vo",(char*)"Volapük",
   (char*)"wa",(char*)"Walloon",
   (char*)"wo",(char*)"Wolof",
   (char*)"xh",(char*)"Xhosa",
@@ -470,10 +470,9 @@ static char * languageCodesraw[]={
 #define LANGUAGE_CODES_RAW_SIZE 368
 
 lggHunSpell_Wrapper::lggHunSpell_Wrapper()
-        :
-        mSpellCheckHighlight(false)
 {
         //languageCodes(begin(languageCodesraw), end(languageCodesraw));    
+        mSpellCheckHighlight = rebind_llcontrol<BOOL>("EmeraldSpellDisplay", &gSavedSettings, false);
 }
 
 lggHunSpell_Wrapper::~lggHunSpell_Wrapper()
@@ -638,8 +637,6 @@ void lggHunSpell_Wrapper::processSettings()
         //expects everything to already be in saved settings
         //this will also reload and read the installed dicts
         setNewDictionary(gSavedSettings.getString("EmeraldSpellBase"));
-        mSpellCheckHighlight = gSavedSettings.getBOOL("EmeraldSpellDisplay");
-        
 }
 
 void lggHunSpell_Wrapper::addDictionary(std::string additionalDictionary)
@@ -966,5 +963,8 @@ void lggHunSpell_Wrapper::editCustomButton()
 
 void lggHunSpell_Wrapper::setSpellCheckHighlight(BOOL highlight)
 {
-        mSpellCheckHighlight = highlight;
+        if (mSpellCheckHighlight)
+        {
+                *mSpellCheckHighlight = highlight;
+        }
 }
diff --git a/linden/indra/newview/lgghunspell_wrapper.h b/linden/indra/newview/lgghunspell_wrapper.h
index b5f3ddb..71b2f14 100644
--- a/linden/indra/newview/lgghunspell_wrapper.h
+++ b/linden/indra/newview/lgghunspell_wrapper.h
@@ -55,7 +55,7 @@ public:
         std::string VEC2CSV(std::vector<std::string> vec);
 
         void setSpellCheckHighlight(BOOL highlight);
-        BOOL getSpellCheckHighlight() { return mSpellCheckHighlight; }
+        BOOL getSpellCheckHighlight() { return mSpellCheckHighlight && *mSpellCheckHighlight; }
 
 private:
         void createCustomDic();
@@ -67,7 +67,7 @@ private:
         std::string currentBaseDic;
         //std::vector<std::string> languageCodes;
         //std::vector<std::string> countryCodes;
-        BOOL mSpellCheckHighlight;
+        BOOL* mSpellCheckHighlight;
 };
 
 extern lggHunSpell_Wrapper* glggHunSpell; // the singleton hunspell wrapper
diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index 35fd395..6322d27 100755
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -2716,43 +2716,46 @@ void process_decline_callingcard(LLMessageSystem* msg, void**)
 class ChatTranslationReceiver : public LLTranslate::TranslationReceiver
 {
 public :
-        ChatTranslationReceiver(const std::string &fromLang, const std::string &toLang, LLChat *chat,
-                const BOOL history)
+        ChatTranslationReceiver(const std::string &fromLang, const std::string &toLang, const LLChat &chat,
+                const std::string &orig_mesg, const BOOL history)
                 : LLTranslate::TranslationReceiver(fromLang, toLang),
                 m_chat(chat),
+                m_origMesg(orig_mesg),
                 m_history(history)
         {
         }
 
-        static boost::intrusive_ptr<ChatTranslationReceiver> build(const std::string &fromLang, const std::string &toLang, LLChat *chat, const BOOL history)
+        static boost::intrusive_ptr<ChatTranslationReceiver> build(const std::string &fromLang, const std::string &toLang, const LLChat &chat, const std::string &orig_mesg, const BOOL history)
         {
-                return boost::intrusive_ptr<ChatTranslationReceiver>(new ChatTranslationReceiver(fromLang, toLang, chat, history));
+                return boost::intrusive_ptr<ChatTranslationReceiver>(new ChatTranslationReceiver(fromLang, toLang, chat, orig_mesg, history));
         }
 
 protected:
-        void handleResponse(const std::string &translation, const std::string &detectedLanguage)
+        void handleResponse(const std::string &translation, const std::string &detected_language)
         {
-                if (m_toLang != detectedLanguage)
-                        m_chat->mText += " (" + translation + ")";
-
-                add_floater_chat(*m_chat, m_history);
+                // filter out non-interesting responeses
+                if ( !translation.empty()
+                        && (m_toLang != detected_language)
+                        && (LLStringUtil::compareInsensitive(translation, m_origMesg) != 0) )
+                {
+                        m_chat.mText += " (" + translation + ")";
+                }
 
-                delete m_chat;
+                add_floater_chat(m_chat, m_history);
         }
 
         void handleFailure()
         {
                 LLTranslate::TranslationReceiver::handleFailure();
 
-                m_chat->mText += " (?)";
+                m_chat.mText += " (?)";
 
-                add_floater_chat(*m_chat, m_history);
-
-                delete m_chat;
+                add_floater_chat(m_chat, m_history);
         }
 
 private:
-        LLChat *m_chat;
+        LLChat m_chat;
+        std::string m_origMesg;
         const BOOL m_history;
 };
 
@@ -2770,9 +2773,9 @@ void add_floater_chat(const LLChat &chat, const BOOL history)
         }
 }
 
-void check_translate_chat(const std::string &mesg, LLChat &chat, const BOOL history)
+void check_translate_chat(const std::string &mesg, const LLChat &chat, const BOOL history)
 {
-        const bool translate = LLUI::sConfigGroup->getBOOL("TranslateChat");
+        const bool translate = gSavedSettings.getBOOL("TranslateChat");
 
         if (translate && chat.mSourceType != CHAT_SOURCE_SYSTEM)
         {
@@ -2780,9 +2783,8 @@ void check_translate_chat(const std::string &mesg, LLChat &chat, const BOOL hist
                 // SVC-4879
                 const std::string &fromLang = "";
                 const std::string &toLang = LLTranslate::getTranslateLanguage();
-                LLChat *newChat = new LLChat(chat);
 
-                LLHTTPClient::ResponderPtr result = ChatTranslationReceiver::build(fromLang, toLang, newChat, history);
+                LLHTTPClient::ResponderPtr result = ChatTranslationReceiver::build(fromLang, toLang, chat, mesg, history);
                 LLTranslate::translateMessage(result, fromLang, toLang, mesg);
         }
         else
@@ -2961,8 +2963,9 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
                 std::string prefix = mesg.substr(0, 4);
                 if (prefix == "/me " || prefix == "/me'")
                 {
-                        chat.mText = from_name;
-                        chat.mText += mesg.substr(3);
+                        const std::string spacer = mesg.substr(3,1);
+                        mesg = mesg.substr(4);
+                        chat.mText = from_name + spacer + mesg;
                         ircstyle = TRUE;
                 }
                 else
diff --git a/linden/indra/newview/llviewermessage.h b/linden/indra/newview/llviewermessage.h
index 1a6c03b..11a3554 100644
--- a/linden/indra/newview/llviewermessage.h
+++ b/linden/indra/newview/llviewermessage.h
@@ -76,7 +76,7 @@ void process_script_question(LLMessageSystem *msg, void **user_data);
 void process_chat_from_simulator(LLMessageSystem *mesgsys, void **user_data);
 
 void add_floater_chat(const LLChat &chat, const BOOL history);
-void check_translate_chat(const std::string &mesg, LLChat &chat, const BOOL history);
+void check_translate_chat(const std::string &mesg, const LLChat &chat, const BOOL history);
 
 //void process_agent_to_new_region(LLMessageSystem *mesgsys, void **user_data);
 void send_agent_update(BOOL force_send, BOOL send_reliable = FALSE);
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_login.xml b/linden/indra/newview/skins/default/xui/en-us/panel_login.xml
index dda5e4d..96f3f77 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_login.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_login.xml
@@ -58,7 +58,8 @@
                bevel_style="in" border_style="line" border_thickness="1" 
                max_length="31" mouse_opaque="true"
                handle_edit_keys_directly="true"
-               select_all_on_focus_received="true" />
+               select_all_on_focus_received="true"
+               allow_translate="false" />
 
 
   <!-- LAST NAME -->
@@ -77,7 +78,8 @@
                bevel_style="in" border_style="line" border_thickness="1" 
                max_length="31" mouse_opaque="true"
                handle_edit_keys_directly="true"
-               select_all_on_focus_received="true" />
+               select_all_on_focus_received="true"
+               allow_translate="false" />
 
 
   <!-- PASSWORD -->
@@ -96,7 +98,8 @@
                bevel_style="in" border_style="line" border_thickness="1" 
                max_length="16" mouse_opaque="true"
                      handle_edit_keys_directly="true"
-               select_all_on_focus_received="true" />
+               select_all_on_focus_received="true"
+               allow_translate="false" />
         <check_box name="remember_check" label="Remember password"
              bottom_delta="-24" left_delta="0" height="16" width="140"
              follows="left|bottom" font="SansSerifSmall" control_name="RememberPassword"