Second Life viewer sources 1.19.0.3

70 files changed, 434 insertions, 379 deletions

diff --git a/linden/doc/contributions.txt b/linden/doc/contributions.txt
index 3bbdb92..d35e2aa 100644
--- a/linden/doc/contributions.txt
+++ b/linden/doc/contributions.txt
@@ -34,6 +34,7 @@ Alissa Sabre
         VWR-2116
         VWR-2826
         VWR-4010
+        VWR-3410
 Angus Boyd
         VWR-592
 Argent Stonecutter
diff --git a/linden/indra/linux_crash_logger/llcrashloggerlinux.cpp b/linden/indra/linux_crash_logger/llcrashloggerlinux.cpp
index e96264e..f90fea2 100644
--- a/linden/indra/linux_crash_logger/llcrashloggerlinux.cpp
+++ b/linden/indra/linux_crash_logger/llcrashloggerlinux.cpp
@@ -55,8 +55,6 @@
 static const char dialog_text[] =
 "Second Life appears to have crashed or frozen last time it ran.\n"
 "This crash reporter collects information about your computer's hardware, operating system, and some Second Life logs, all of which are used for debugging purposes only.\n"
-"In the space below, please briefly describe what you were doing or trying to do just prior to the crash. Thank you for your help!\n"
-"This report is NOT read by Customer Support. If you have billing or other questions, contact support by visiting http://www.secondlife.com/support\n"
 "\n"
 "Send crash report?";
 
diff --git a/linden/indra/llcommon/llversionviewer.h b/linden/indra/llcommon/llversionviewer.h
index e85fa5d..e23403c 100644
--- a/linden/indra/llcommon/llversionviewer.h
+++ b/linden/indra/llcommon/llversionviewer.h
@@ -35,7 +35,7 @@
 const S32 LL_VERSION_MAJOR = 1;
 const S32 LL_VERSION_MINOR = 19;
 const S32 LL_VERSION_PATCH = 0;
-const S32 LL_VERSION_BUILD = 2;
+const S32 LL_VERSION_BUILD = 3;
 
 const char * const LL_CHANNEL = "Second Life Release";
 
diff --git a/linden/indra/llcrashlogger/llcrashlogger.cpp b/linden/indra/llcrashlogger/llcrashlogger.cpp
index 8b1fffa..ab464bd 100755
--- a/linden/indra/llcrashlogger/llcrashlogger.cpp
+++ b/linden/indra/llcrashlogger/llcrashlogger.cpp
@@ -83,7 +83,9 @@ void LLCrashLoggerText::updateApplication(LLString message)
 }
 
 LLCrashLogger::LLCrashLogger() :
-mSentCrashLogs(false)
+        mCrashBehavior(CRASH_BEHAVIOR_ASK),
+        mCrashInPreviousExec(false),
+        mSentCrashLogs(false)
 {
 
 }
diff --git a/linden/indra/llui/llbutton.cpp b/linden/indra/llui/llbutton.cpp
index 9fa1c8e..7513fc2 100644
--- a/linden/indra/llui/llbutton.cpp
+++ b/linden/indra/llui/llbutton.cpp
@@ -956,37 +956,37 @@ S32 round_up(S32 grid, S32 value)
 
 void                    LLButton::setImageUnselected(const LLString &image_name)
 {       
-        setImageUnselected(LLUI::getUIImageByName(image_name));
+        setImageUnselected(image_name.empty() ? NULL : LLUI::getUIImageByName(image_name));
         mImageUnselectedName = image_name;
 }
 
 void                    LLButton::setImageSelected(const LLString &image_name)
 {       
-        setImageSelected(LLUI::getUIImageByName(image_name));
+        setImageSelected(image_name.empty() ? NULL : LLUI::getUIImageByName(image_name));
         mImageSelectedName = image_name;
 }
 
 void                    LLButton::setImageHoverSelected(const LLString &image_name)
 {
-        setImageHoverSelected(LLUI::getUIImageByName(image_name));
+        setImageHoverSelected(image_name.empty() ? NULL : LLUI::getUIImageByName(image_name));
         mImageHoverSelectedName = image_name;
 }
 
 void                    LLButton::setImageHoverUnselected(const LLString &image_name)
 {
-        setImageHoverUnselected(LLUI::getUIImageByName(image_name));
+        setImageHoverUnselected(image_name.empty() ? NULL : LLUI::getUIImageByName(image_name));
         mImageHoverUnselectedName = image_name;
 }
 
 void                    LLButton::setImageDisabled(const LLString &image_name)
 {
-        setImageDisabled(LLUI::getUIImageByName(image_name));
+        setImageDisabled(image_name.empty() ? NULL : LLUI::getUIImageByName(image_name));
         mImageDisabledName = image_name;
 }
 
 void                    LLButton::setImageDisabledSelected(const LLString &image_name)
 {
-        setImageDisabledSelected(LLUI::getUIImageByName(image_name));
+        setImageDisabledSelected(image_name.empty() ? NULL : LLUI::getUIImageByName(image_name));
         mImageDisabledSelectedName = image_name;
 }
 
diff --git a/linden/indra/llui/llcombobox.cpp b/linden/indra/llui/llcombobox.cpp
index 96092b4..0e0f5f2 100644
--- a/linden/indra/llui/llcombobox.cpp
+++ b/linden/indra/llui/llcombobox.cpp
@@ -1086,6 +1086,10 @@ BOOL LLComboBox::operateOnAll(EOperation op)
         return FALSE;
 }
 
+BOOL LLComboBox::selectItemRange( S32 first, S32 last )
+{
+        return mList->selectItemRange(first, last);
+}
 
 
 //
diff --git a/linden/indra/llui/llcombobox.h b/linden/indra/llui/llcombobox.h
index 7511449..db1c251 100644
--- a/linden/indra/llui/llcombobox.h
+++ b/linden/indra/llui/llcombobox.h
@@ -156,7 +156,7 @@ public:
         virtual BOOL    getCanSelect() const                            { return TRUE; }
         virtual BOOL    selectFirstItem()                                       { return setCurrentByIndex(0); }
         virtual BOOL    selectNthItem( S32 index )                      { return setCurrentByIndex(index); }
-        virtual BOOL    selectItemRange( S32 first, S32 last ) { return setCurrentByIndex(first); }
+        virtual BOOL    selectItemRange( S32 first, S32 last );
         virtual S32             getFirstSelectedIndex() const           { return getCurrentIndex(); }
         virtual BOOL    setCurrentByID( const LLUUID& id );
         virtual LLUUID  getCurrentID();                         // LLUUID::null if no items in menu
diff --git a/linden/indra/llui/llfloater.cpp b/linden/indra/llui/llfloater.cpp
index 496b67f..6d86652 100644
--- a/linden/indra/llui/llfloater.cpp
+++ b/linden/indra/llui/llfloater.cpp
@@ -1434,21 +1434,7 @@ void LLFloater::draw()
                         }
                 }
 
-                if( mDefaultBtn)
-                {
-                        if (gFocusMgr.childHasKeyboardFocus( this ) && mDefaultBtn->getEnabled())
-                        {
-                                LLUICtrl* focus_ctrl = gFocusMgr.getKeyboardFocus();
-                                // is this button a direct descendent and not a nested widget (e.g. checkbox)?
-                                BOOL focus_is_child_button = focus_ctrl->getWidgetType() == WIDGET_TYPE_BUTTON && focus_ctrl->getParent() == this;
-                                // only enable default button when current focus is not a button
-                                mDefaultBtn->setBorderEnabled(!focus_is_child_button);
-                        }
-                        else
-                        {
-                                mDefaultBtn->setBorderEnabled(FALSE);
-                        }
-                }
+                LLPanel::updateDefaultBtn();
 
                 // draw children
                 LLView* focused_child = gFocusMgr.getKeyboardFocus();
@@ -1459,6 +1445,7 @@ void LLFloater::draw()
                         focused_child->setVisible(FALSE);
                 }
 
+                // don't call LLPanel::draw() since we've implemented custom background rendering
                 LLView::draw();
 
                 if( mBgVisible )
diff --git a/linden/indra/llui/lllineeditor.cpp b/linden/indra/llui/lllineeditor.cpp
index 88c8d75..b091bb7 100644
--- a/linden/indra/llui/lllineeditor.cpp
+++ b/linden/indra/llui/lllineeditor.cpp
@@ -2418,6 +2418,12 @@ void LLLineEditor::resetPreedit()
 {
         if (hasPreeditString())
         {
+                if (hasSelection())
+                {
+                        llwarns << "Preedit and selection!" << llendl;
+                        deselect();
+                }
+
                 const S32 preedit_pos = mPreeditPositions.front();
                 mText.erase(preedit_pos, mPreeditPositions.back() - preedit_pos);
                 mText.insert(preedit_pos, mPreeditOverwrittenWString);
@@ -2427,11 +2433,10 @@ void LLLineEditor::resetPreedit()
                 mPreeditOverwrittenWString.clear();
                 mPreeditPositions.clear();
 
-                mKeystrokeTimer.reset();
-                if (mKeystrokeCallback)
-                {
-                        mKeystrokeCallback(this, mCallbackUserData);
-                }
+                // Don't reset key stroke timer nor invoke keystroke callback,
+                // because a call to updatePreedit should be follow soon in 
+                // normal course of operation, and timer and callback will be 
+                // maintained there.  Doing so here made an odd sound.  (VWR-3410) 
         }
 }
 
@@ -2444,27 +2449,10 @@ void LLLineEditor::updatePreedit(const LLWString &preedit_string,
                 return;
         }
 
-        if (hasSelection())
-        {
-                if (hasPreeditString())
-                {
-                        llwarns << "Preedit and selection!" << llendl;
-                        deselect();
-                }
-                else
-                {
-                        deleteSelection();
-                }
-        }
+        // Note that call to updatePreedit is always preceeded by resetPreedit,
+        // so we have no existing selection/preedit.
 
         S32 insert_preedit_at = getCursor();
-        if (hasPreeditString())
-        {
-                insert_preedit_at = mPreeditPositions.front();
-                //mText.replace(insert_preedit_at, mPreeditPositions.back() - insert_preedit_at, mPreeditOverwrittenWString);
-                mText.erase(insert_preedit_at, mPreeditPositions.back() - insert_preedit_at);
-                mText.insert(insert_preedit_at, mPreeditOverwrittenWString);
-        }
 
         mPreeditWString = preedit_string;
         mPreeditPositions.resize(preedit_segment_lengths.size() + 1);
diff --git a/linden/indra/llui/llpanel.cpp b/linden/indra/llui/llpanel.cpp
index 7430e50..b72e104 100644
--- a/linden/indra/llui/llpanel.cpp
+++ b/linden/indra/llui/llpanel.cpp
@@ -214,6 +214,17 @@ void LLPanel::draw()
                 }
         }
 
+        updateDefaultBtn();
+
+        LLView::draw();
+}
+
+void LLPanel::updateDefaultBtn()
+{
+        // This method does not call LLView::draw() so callers will need
+        // to take care of that themselves at the appropriate place in
+        // their rendering sequence
+
         if( mDefaultBtn)
         {
                 if (gFocusMgr.childHasKeyboardFocus( this ) && mDefaultBtn->getEnabled())
@@ -228,8 +239,6 @@ void LLPanel::draw()
                         mDefaultBtn->setBorderEnabled(FALSE);
                 }
         }
-
-        LLView::draw();
 }
 
 void LLPanel::refresh()
diff --git a/linden/indra/llui/llpanel.h b/linden/indra/llui/llpanel.h
index bcbda2c..aeba6d9 100644
--- a/linden/indra/llui/llpanel.h
+++ b/linden/indra/llui/llpanel.h
@@ -119,6 +119,7 @@ public:
         void                    setBackgroundOpaque(BOOL b)             { mBgOpaque = b; }
         void                    setDefaultBtn(LLButton* btn = NULL);
         void                    setDefaultBtn(const LLString& id);
+        void                    updateDefaultBtn();
         void                    setLabel(const LLStringExplicit& label) { mLabel = label; }
         LLString                getLabel() const { return mLabel; }
         
diff --git a/linden/indra/llui/llscrolllistctrl.cpp b/linden/indra/llui/llscrolllistctrl.cpp
index 36a7b00..043caa9 100644
--- a/linden/indra/llui/llscrolllistctrl.cpp
+++ b/linden/indra/llui/llscrolllistctrl.cpp
@@ -220,22 +220,14 @@ LLScrollListText::LLScrollListText( const LLString& text, const LLFontGL* font,
 :       LLScrollListCell(width),
         mText( text ),
         mFont( font ),
+        mColor(color),
+        mUseColor(use_color),
         mFontStyle( font_style ),
         mFontAlignment( font_alignment ),
         mVisible( visible ),
         mHighlightCount( 0 ),
         mHighlightOffset( 0 )
 {
-        if (use_color)
-        {
-                mColor = new LLColor4();
-                mColor->setVec(color);
-        }
-        else
-        {
-                mColor = NULL;
-        }
-
         sCount++;
 
         // initialize rounded rect image
@@ -248,7 +240,6 @@ LLScrollListText::LLScrollListText( const LLString& text, const LLFontGL* font,
 LLScrollListText::~LLScrollListText()
 {
         sCount--;
-        delete mColor;
 }
 
 S32     LLScrollListText::getContentWidth() const
@@ -259,11 +250,8 @@ S32	LLScrollListText::getContentWidth() const
 
 void LLScrollListText::setColor(const LLColor4& color)
 {
-        if (!mColor)
-        {
-                mColor = new LLColor4();
-        }
-        *mColor = color;
+        mColor = color;
+        mUseColor = TRUE;
 }
 
 void LLScrollListText::setText(const LLStringExplicit& text)
@@ -273,14 +261,14 @@ void LLScrollListText::setText(const LLStringExplicit& text)
 
 void LLScrollListText::draw(const LLColor4& color, const LLColor4& highlight_color) const
 {
-        const LLColor4* display_color;
-        if (mColor)
+        LLColor4 display_color;
+        if (mUseColor)
         {
                 display_color = mColor;
         }
         else
         {
-                display_color = &color;
+                display_color = color;
         }
 
         if (mHighlightCount > 0)
@@ -327,7 +315,7 @@ void LLScrollListText::draw(const LLColor4& color, const LLColor4& highlight_col
         }
         mFont->render(mText.getWString(), 0, 
                                                 start_x, 2.f,
-                                                *display_color,
+                                                display_color,
                                                 mFontAlignment,
                                                 LLFontGL::BOTTOM, 
                                                 mFontStyle,
@@ -1070,7 +1058,7 @@ BOOL LLScrollListCtrl::selectItemRange( S32 first_index, S32 last_index )
                 {
                         if( itemp->getEnabled() )
                         {
-                                selectItem(itemp);
+                                selectItem(itemp, FALSE);
                                 success = TRUE;
                                 if (!success)
                                         mOriginalSelection = first_index;
diff --git a/linden/indra/llui/llscrolllistctrl.h b/linden/indra/llui/llscrolllistctrl.h
index 71ba63d..e9486cb 100644
--- a/linden/indra/llui/llscrolllistctrl.h
+++ b/linden/indra/llui/llscrolllistctrl.h
@@ -111,7 +111,8 @@ public:
 private:
         LLUIString              mText;
         const LLFontGL* mFont;
-        LLColor4*               mColor;
+        LLColor4                mColor;
+        U8                              mUseColor;
         U8                              mFontStyle;
         LLFontGL::HAlign mFontAlignment;
         BOOL                    mVisible;
diff --git a/linden/indra/llui/lltexteditor.cpp b/linden/indra/llui/lltexteditor.cpp
index ca9ea0a..9061ca3 100644
--- a/linden/indra/llui/lltexteditor.cpp
+++ b/linden/indra/llui/lltexteditor.cpp
@@ -4439,6 +4439,12 @@ void LLTextEditor::resetPreedit()
 {
         if (hasPreeditString())
         {
+                if (hasSelection())
+                {
+                        llwarns << "Preedit and selection!" << llendl;
+                        deselect();
+                }
+
                 mCursorPos = mPreeditPositions.front();
                 removeStringNoUndo(mCursorPos, mPreeditPositions.back() - mCursorPos);
                 insertStringNoUndo(mCursorPos, mPreeditOverwrittenWString);
@@ -4447,9 +4453,10 @@ void LLTextEditor::resetPreedit()
                 mPreeditOverwrittenWString.clear();
                 mPreeditPositions.clear();
 
-                updateLineStartList();
-                setCursorPos(mCursorPos);
-                // updateScrollFromCursor();
+                // A call to updatePreedit should soon follow under a
+                // normal course of operation, so we don't need to 
+                // maintain internal variables such as line start 
+                // positions now.
         }
 }
 
@@ -4462,28 +4469,9 @@ void LLTextEditor::updatePreedit(const LLWString &preedit_string,
                 return;
         }
 
-        if (hasSelection())
-        {
-                if (hasPreeditString())
-                {
-                        llwarns << "Preedit and selection!" << llendl;
-                        deselect();
-                }
-                else
-                {
-                        deleteSelection(TRUE);
-                }
-        }
-
         getWindow()->hideCursorUntilMouseMove();
 
         S32 insert_preedit_at = mCursorPos;
-        if (hasPreeditString())
-        {
-                insert_preedit_at = mPreeditPositions.front();
-                removeStringNoUndo(insert_preedit_at, mPreeditPositions.back() - insert_preedit_at);
-                insertStringNoUndo(insert_preedit_at, mPreeditOverwrittenWString);
-        }
 
         mPreeditWString = preedit_string;
         mPreeditPositions.resize(preedit_segment_lengths.size() + 1);
diff --git a/linden/indra/llwindow/llwindowmacosx.cpp b/linden/indra/llwindow/llwindowmacosx.cpp
index f522abb..b458d7f 100644
--- a/linden/indra/llwindow/llwindowmacosx.cpp
+++ b/linden/indra/llwindow/llwindowmacosx.cpp
@@ -2099,15 +2099,17 @@ OSStatus LLWindowMacOSX::eventHandler (EventHandlerCallRef myHandler, EventRef e
                                                 }
 
                                                 // Handle preedit string.
-                                                if (preedit_string.length() > 0)
+                                                if (preedit_string.length() == 0)
                                                 {
-                                                        if (preedit_segment_lengths.size() == 0)
-                                                        {
-                                                                preedit_segment_lengths.push_back(preedit_string.length());
-                                                                preedit_standouts.push_back(FALSE);
-                                                        }
-                                                        mPreeditor->updatePreedit(preedit_string, preedit_segment_lengths, preedit_standouts, caret_position);
+                                                        preedit_segment_lengths.clear();
+                                                        preedit_standouts.clear();
+                                                }
+                                                else if (preedit_segment_lengths.size() == 0)
+                                                {
+                                                        preedit_segment_lengths.push_back(preedit_string.length());
+                                                        preedit_standouts.push_back(FALSE);
                                                 }
+                                                mPreeditor->updatePreedit(preedit_string, preedit_segment_lengths, preedit_standouts, caret_position);
 
                                                 result = noErr;
                                         }
@@ -3354,6 +3356,8 @@ void LLWindowMacOSX::interruptLanguageTextInput()
         {
                 FixTSMDocument(mTSMDocument);
         }
+        // Don't we need to call resetPreedit here?
+        // Well, if Apple's TSM document is correct, we don't.
 }
 
 #endif // LL_DARWIN
diff --git a/linden/indra/llwindow/llwindowwin32.cpp b/linden/indra/llwindow/llwindowwin32.cpp
index e9315c9..4ad044b 100644
--- a/linden/indra/llwindow/llwindowwin32.cpp
+++ b/linden/indra/llwindow/llwindowwin32.cpp
@@ -3703,6 +3703,10 @@ void LLWindowWin32::interruptLanguageTextInput()
                         LLWinImm::notifyIME(himc, NI_COMPOSITIONSTR, CPS_COMPLETE, 0);
                         LLWinImm::releaseContext(mWindowHandle, himc);
                 }
+
+                // Win32 document says there will be no composition string
+                // after NI_COMPOSITIONSTR returns.  The following call to
+                // resetPreedit should be a NOP unless IME goes mad...
                 mPreeditor->resetPreedit();
         }
 }
@@ -3846,7 +3850,12 @@ void LLWindowWin32::handleCompositionMessage(const U32 indexes)
                         }
                 }
 
-                if (preedit_string.length() > 0)
+                if (preedit_string.length() == 0)
+                {
+                        preedit_segment_lengths.clear();
+                        preedit_standouts.clear();
+                }
+                else
                 {
                         if (preedit_segment_lengths.size() == 0)
                         {
@@ -3856,8 +3865,8 @@ void LLWindowWin32::handleCompositionMessage(const U32 indexes)
                         {
                                 preedit_standouts.assign(preedit_segment_lengths.size(), FALSE);
                         }
-                        mPreeditor->updatePreedit(preedit_string, preedit_segment_lengths, preedit_standouts, caret_position);
                 }
+                mPreeditor->updatePreedit(preedit_string, preedit_segment_lengths, preedit_standouts, caret_position);
 
                 // Some IME doesn't query char position after WM_IME_COMPOSITION,
                 // so we need to update them actively.
diff --git a/linden/indra/newview/English.lproj/InfoPlist.strings b/linden/indra/newview/English.lproj/InfoPlist.strings
index 76c6915..9e5db0d 100644
--- a/linden/indra/newview/English.lproj/InfoPlist.strings
+++ b/linden/indra/newview/English.lproj/InfoPlist.strings
@@ -1,5 +1,5 @@
 /* Localized versions of Info.plist keys */
 
 CFBundleName = "Second Life";
-CFBundleShortVersionString = "Second Life version 1.19.0.2";
-CFBundleGetInfoString = "Second Life version 1.19.0.2, Copyright 2004-2007 Linden Research, Inc.";
+CFBundleShortVersionString = "Second Life version 1.19.0.3";
+CFBundleGetInfoString = "Second Life version 1.19.0.3, Copyright 2004-2007 Linden Research, Inc.";
diff --git a/linden/indra/newview/Info-SecondLife.plist b/linden/indra/newview/Info-SecondLife.plist
index c93fbe0..050aa93 100644
--- a/linden/indra/newview/Info-SecondLife.plist
+++ b/linden/indra/newview/Info-SecondLife.plist
@@ -32,7 +32,7 @@
                 </dict>
         </array>
         <key>CFBundleVersion</key>
-        <string>1.19.0.2</string>
+        <string>1.19.0.3</string>
         <key>CSResourcesFileMapped</key>
         <true/>
 </dict>
diff --git a/linden/indra/newview/linux_tools/client-readme.txt b/linden/indra/newview/linux_tools/client-readme.txt
index 89454e2..ff607b7 100644
--- a/linden/indra/newview/linux_tools/client-readme.txt
+++ b/linden/indra/newview/linux_tools/client-readme.txt
@@ -1,5 +1,5 @@
-Second Life - Linux Alpha README
--=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+Second Life - Linux Beta README
+-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 
 This document contains information about the Second Life Linux
 client, and isn't meant to serve as an introduction to Second
@@ -26,16 +26,14 @@ Life itself - please see <http://www.secondlife.com/whatis/>.
 1. INTRODUCTION
 -=-=-=-=-=-=-=-
 
-Hi!  This is an ALPHA release of the Second Life client for Linux.
-The 'alpha' status means that not everything is implemented yet and
-we're still hard at work on this version of the client, but many
-residents find that it already works well 'out of the box' for accessing
-Second Life.
+Hi!  This is a BETA release of the Second Life client for Linux.
+The 'beta' status means that although we're still smoothing-out a few rough
+edges, this version of the client is functionally complete and should
+work quite well 'out of the box' for accessing Second Life.
 
 We encourage you to try it out and let us know of its compatibility
-with your system.  Be aware that although the client itself is provided
-for testing purposes, any changes you make within the Second Life world
-are permanent.
+with your system.  Be aware that although this is a 'beta' client, it connects
+to the main Second Life world and changes you make there are permanent.
 
 You will have either obtained this client from secondlife.com (the official
 site) or from a third-party packager; if you encounter any problems then
@@ -98,7 +96,7 @@ you wish.
 -=-=-=-=-=-=-=-
 
 These are the most commonly-encountered known issues which are specific to
-the Alpha release of the Linux client.
+the Beta release of the Linux client.
 
 * VISUAL EFFECTS AND PERFORMANCE - many Linux graphics drivers are not as
   robust as their counterparts for other operating systems, so some advanced
@@ -106,9 +104,9 @@ the Alpha release of the Linux client.
   stability.  See PROBLEM 3 in the TROUBLESHOOTING section if you wish to
   turn these on to possibly enhance your experience.
 
-* MISC - The following features are not currently fully implemented on the
-  Linux client and are therefore known not to work properly:
-  * Movie recording
+* MISC - The following features are known to not yet be fully operational on
+  the Linux client:
+  * Movie recording (soon to be deprecated)
   * Full Unicode font rendering
 
 * UPLOAD / SAVE / COLOR-PICKER DIALOGS - These only appear when the client
@@ -214,7 +212,7 @@ configuration options for advanced troubleshooters.
   you disable specific GL extensions, each of which is represented by a
   letter ("a"-"o").  If you can narrow down a stability problem on your system
   to just one or two GL extensions then please post details of your hardware
-  (and drivers) to the Linux Client Alpha Testers forum (see link below) along
+  (and drivers) to the Linux Client Testers forum (see link below) along
   with the minimal LL_GL_BLACKLIST which solves your problems.  This will help
   us to improve stability for your hardware while minimally impacting
   performance.
@@ -256,7 +254,7 @@ bugs in all Second Life releases if you find that the Troubleshooting
 section in this file hasn't helped (please note, however, that this is
 not a support forum).
 
-Linux Client Alpha Testers forum:
+Linux Client Testers forum:
 <http://forums.secondlife.com/forumdisplay.php?forumid=263>
 This is a forum where Linux Client users can help each other out and
 discuss the latest updates.
diff --git a/linden/indra/newview/linux_tools/wrapper.sh b/linden/indra/newview/linux_tools/wrapper.sh
index 4ed0609..587c56f 100755
--- a/linden/indra/newview/linux_tools/wrapper.sh
+++ b/linden/indra/newview/linux_tools/wrapper.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-## Here are some configuration options for Linux Client Alpha Testers.
-## These options are for self-assisted troubleshooting during this alpha
+## Here are some configuration options for Linux Client Testers.
+## These options are for self-assisted troubleshooting during this beta
 ## testing phase; you should not usually need to touch them.
 
 ## - Avoids using the ESD audio driver.
@@ -21,14 +21,14 @@ export LL_GL_BASICEXT=x
 
 ## - Avoids *all* optional OpenGL extensions.  This is the safest and least-
 ##   exciting option.  Enable this if you experience stability issues, and
-##   report whether it helps in the Linux Client Alpha Testers forum.
+##   report whether it helps in the Linux Client Testers forum.
 #export LL_GL_NOEXT=x
 
 ## - For advanced troubleshooters, this lets you disable specific GL
 ##   extensions, each of which is represented by a letter a-o.  If you can
 ##   narrow down a stability problem on your system to just one or two
 ##   extensions then please post details of your hardware (and drivers) to
-##   the Linux Client Alpha Testers forum along with the minimal
+##   the Linux Client Testers forum along with the minimal
 ##   LL_GL_BLACKLIST which solves your problems.
 #export LL_GL_BLACKLIST=abcdefghijklmno
 
@@ -114,8 +114,8 @@ fi
         
 
 echo
-echo '*********************************************************'
-echo 'This is an ALPHA release of the Second Life linux client.'
+echo '*******************************************************'
+echo 'This is a BETA release of the Second Life linux client.'
 echo 'Thank you for testing!'
 echo 'Please see README-linux.txt before reporting problems.'
 echo
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index 2933fe9..e3d7073 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -2190,25 +2190,19 @@ bool LLAppViewer::initConfiguration()
                         {
                                 llinfos << "Sending crash report." << llendl;
 
-                                removeMarkerFile();
 #if LL_WINDOWS
                                 std::string exe_path = gDirUtilp->getAppRODataDir();
                                 exe_path += gDirUtilp->getDirDelimiter();
                                 exe_path += "win_crash_logger.exe";
 
-                                std::string arg_string = "-previous -user ";
-                                arg_string += gGridName;
-                                arg_string += " -name \"";
-                                arg_string += gSecondLife;
-                                arg_string += "\"";
+                                std::string arg_string = "-previous ";
                                 // Spawn crash logger.
                                 // NEEDS to wait until completion, otherwise log files will get smashed.
                                 _spawnl(_P_WAIT, exe_path.c_str(), exe_path.c_str(), arg_string.c_str(), NULL);
 #elif LL_DARWIN
                                 std::string command_str;
                                 command_str = "crashreporter.app/Contents/MacOS/crashreporter ";
-                                command_str += "-previous -user ";
-                                command_str += gGridName;
+                                command_str += "-previous";
                                 // XXX -- We need to exit fullscreen mode for this to work.
                                 // XXX -- system() also doesn't wait for completion.  Hmm...
                                 system(command_str.c_str());            /* Flawfinder: Ignore */
@@ -2223,10 +2217,6 @@ bool LLAppViewer::initConfiguration()
                                 char* const cmdargv[] =
                                         {(char*)cmd.c_str(),
                                          (char*)"-previous",
-                                         (char*)"-user",
-                                         (char*)gGridName,
-                                         (char*)"-name",
-                                         (char*)gSecondLife.c_str(),
                                          NULL};
                                 pid_t pid = fork();
                                 if (pid == 0)
diff --git a/linden/indra/newview/llappviewermacosx.cpp b/linden/indra/newview/llappviewermacosx.cpp
index 3e31ad7..e277425 100644
--- a/linden/indra/newview/llappviewermacosx.cpp
+++ b/linden/indra/newview/llappviewermacosx.cpp
@@ -112,10 +112,7 @@ void LLAppViewerMacOSX::handleCrashReporting()
 {
         // Macintosh
         LLString command_str;
-        command_str = "crashreporter.app/Contents/MacOS/crashreporter ";
-        command_str += "-user ";
-        command_str += gGridName;
-        command_str += " &";    // This backgrounds the command so system() doesn't block until the crashreporter exits.
+        command_str = "open crashreporter.app";
         system(command_str.c_str());            /* Flawfinder: ignore */
                 
         // Sometimes signals don't seem to quit the viewer.  
diff --git a/linden/indra/newview/llcontroldef.cpp b/linden/indra/newview/llcontroldef.cpp
index c30c9a6..2255496 100644
--- a/linden/indra/newview/llcontroldef.cpp
+++ b/linden/indra/newview/llcontroldef.cpp
@@ -886,6 +886,7 @@ void declare_settings()
         //gSavedSettings.declareVec3("FocusOffsetBuild",                LLVector3(4,  0,  0), "[NOT USED]");
         gSavedSettings.declareVec3("FocusOffsetDefault",        LLVector3(1,  0,  1), "Default focus point offset relative to avatar (x-axis is forward)");
         gSavedSettings.declareBOOL("TrackFocusObject", TRUE, "Camera tracks last object zoomed on");
+        gSavedSettings.declareBOOL("CameraMouseWheelZoom", TRUE, "Camera zooms in and out with mousewheel");
 
         gSavedSettings.declareVec3d("FocusPosOnLogout",         LLVector3d(0,  0,  0), "Camera focus point when last logged out (global coordinates)");
         gSavedSettings.declareVec3d("CameraPosOnLogout",        LLVector3d(0,  0,  0), "Camera position when last logged out (global coordinates)");
diff --git a/linden/indra/newview/llpanelgroupvoting.cpp b/linden/indra/newview/llpanelgroupvoting.cpp
index b78d5c2..58a4842 100644
--- a/linden/indra/newview/llpanelgroupvoting.cpp
+++ b/linden/indra/newview/llpanelgroupvoting.cpp
@@ -604,9 +604,25 @@ void LLPanelGroupVoting::impl::sendGroupProposalsRequest(const LLUUID& group_id)
         gAgent.sendReliableMessage();
 }
 
-void LLPanelGroupVoting::handleResponse(void *userdata, ResponseType response, bool success)
+void LLPanelGroupVoting::handleResponse(
+        const LLUUID& group_id,
+        ResponseType response,
+        bool success)
 {
-        impl* self = (impl*)userdata;
+        impl* self = NULL;
+
+        //see if the voting ballot for the group is still even open
+        std::map<LLUUID, LLPanelGroupVoting::impl*>::const_iterator self_iter =
+                LLPanelGroupVoting::impl::sGroupIDs.find(group_id);
+
+        if ( LLPanelGroupVoting::impl::sGroupIDs.end() != self_iter )
+        {
+                //cool, we found the panel's implementation
+                //(the panel is still open)
+                //then we want to do some other stuff :)
+                self = self_iter->second;
+        }
+
         if ( self )
         {
                 //refresh the proposals now that we've hit no
@@ -633,15 +649,44 @@ void LLPanelGroupVoting::handleResponse(void *userdata, ResponseType response, b
         }
 }
 
+void LLPanelGroupVoting::handleFailure(
+        const LLUUID& group_id)
+{
+        impl* self = NULL;
+
+        //see if the voting ballot for the group is still even open
+        std::map<LLUUID, LLPanelGroupVoting::impl*>::const_iterator self_iter =
+                LLPanelGroupVoting::impl::sGroupIDs.find(group_id);
+
+        if ( LLPanelGroupVoting::impl::sGroupIDs.end() != self_iter )
+        {
+                //cool, we found the panel's implementation
+                //(the panel is still open)
+                //then we want to do some other stuff :)
+                self = self_iter->second;
+        }
+
+        if ( self )
+        {
+                self->setEnableListProposals();         
+        }
+}
+
 class LLStartGroupVoteResponder : public LLHTTPClient::Responder
 {
 public:
-        LLStartGroupVoteResponder(void *userdata) : mUserData(userdata) {};
+        LLStartGroupVoteResponder(const LLUUID& group_id)
+        {
+                mGroupID = group_id;
+        }
+
         //If we get back a normal response, handle it here
         virtual void result(const LLSD& content)
         {
                 //Ack'd the proposal initialization, now let's finish up.
-                LLPanelGroupVoting::handleResponse(mUserData,LLPanelGroupVoting::START_VOTE);
+                LLPanelGroupVoting::handleResponse(
+                        mGroupID,
+                        LLPanelGroupVoting::START_VOTE);
         }
 
         //If we get back an error (not found, etc...), handle it here
@@ -649,21 +694,29 @@ public:
         {
                 llinfos << "LLPanelGroupVotingResponder::error "
                         << status << ": " << reason << llendl;
+
+                LLPanelGroupVoting::handleFailure(mGroupID);
         }
 private:
-        void *mUserData;
+        LLUUID mGroupID;
 };
 
 class LLGroupProposalBallotResponder : public LLHTTPClient::Responder
 {
 public:
-        LLGroupProposalBallotResponder(void *userdata) : mUserData(userdata) {};
+        LLGroupProposalBallotResponder(const LLUUID& group_id)
+        {
+                mGroupID = group_id;
+        }
+
         //If we get back a normal response, handle it here
         virtual void result(const LLSD& content)
         {
                 //Ack'd the proposal initialization, now let's finish up.
-
-                LLPanelGroupVoting::handleResponse(mUserData,LLPanelGroupVoting::BALLOT,content["voted"].asBoolean());
+                LLPanelGroupVoting::handleResponse(
+                        mGroupID,
+                        LLPanelGroupVoting::BALLOT,
+                        content["voted"].asBoolean());
         }
 
         //If we get back an error (not found, etc...), handle it here
@@ -671,9 +724,11 @@ public:
         {
                 llinfos << "LLPanelGroupVotingResponder::error "
                         << status << ": " << reason << llendl;
+
+                LLPanelGroupVoting::handleFailure(mGroupID);
         }
 private:
-        void *mUserData;
+        LLUUID mGroupID;
 };
 
 void LLPanelGroupVoting::impl::sendStartGroupProposal()
@@ -715,7 +770,11 @@ void LLPanelGroupVoting::impl::sendStartGroupProposal()
                 body["duration"]                = duration_seconds;
                 body["proposal-text"]   = mProposalText->getText();
 
-                LLHTTPClient::post(url, body, new LLStartGroupVoteResponder((void*)this));
+                LLHTTPClient::post(
+                        url,
+                        body,
+                        new LLStartGroupVoteResponder(mGroupID),
+                        300);
         }
         else
         {       //DEPRECATED!!!!!!!  This is a fallback just in case our backend cap is not there.  Delete this block ASAP!
@@ -758,7 +817,11 @@ void LLPanelGroupVoting::impl::sendGroupProposalBallot(const char* vote)
                 body["group-id"]                = mGroupID;
                 body["vote"]    = vote;
 
-                LLHTTPClient::post(url, body, new LLGroupProposalBallotResponder((void*)this));
+                LLHTTPClient::post(
+                        url,
+                        body,
+                        new LLGroupProposalBallotResponder(mGroupID),
+                        300);
         }
         else
         {       //DEPRECATED!!!!!!!  This is a fallback just in case our backend cap is not there.  Delete this block ASAP!
@@ -829,23 +892,23 @@ void LLPanelGroupVoting::impl::addPendingActiveScrollListItem(unsigned int curre
                                                                                                                           EAddPosition pos)
 {
         std::stringstream pending;
+        //*TODO: translate
         pending << "Retrieving active proposals ("
                         << current
                         << "\\" << expected  << ")";
 
-        LLSD row;
-        row["columns"][0]["value"] = pending.str();
-        row["columns"][0]["font"] = "SANSSERIF_SMALL";
-        mProposals->addElement(row, pos);
+        mProposals->addCommentText(pending.str());
 }
 
 void LLPanelGroupVoting::impl::addNoActiveScrollListItem(EAddPosition pos)
 {
+        //*TODO: translate
         mProposals->addCommentText("There are currently no active proposals", pos);
 }
 
 void LLPanelGroupVoting::impl::addNoHistoryScrollListItem(EAddPosition pos)
 {
+        //*TODO: translate
         mVotesHistory->addCommentText("There are currently no archived proposals", pos);
 }
 
@@ -853,16 +916,13 @@ void LLPanelGroupVoting::impl::addPendingHistoryScrollListItem(unsigned int curr
                                                                                                                           unsigned int expected,
                                                                                                                           EAddPosition pos)
 {
+        //*TODO: translate
         std::stringstream pending;
         pending << "Retrieving archived proposals ("
                         << current
                         << "\\" << expected  << ")";
 
-        LLSD row;
-        row["columns"][0]["value"] = pending.str();
-        row["columns"][0]["font"] = "SANSSERIF_SMALL";
-
-        mVotesHistory->addElement(row, pos);
+        mVotesHistory->addCommentText(pending.str());
 }
                                                                                                                                                 
 
diff --git a/linden/indra/newview/llpanelgroupvoting.h b/linden/indra/newview/llpanelgroupvoting.h
index 3d56f69..05f53b5 100644
--- a/linden/indra/newview/llpanelgroupvoting.h
+++ b/linden/indra/newview/llpanelgroupvoting.h
@@ -55,7 +55,12 @@ public:
         virtual bool needsApply(LLString& mesg);
         virtual bool apply(LLString& mesg);
         virtual void update(LLGroupChange gc);
-        static  void handleResponse(void *userdata, ResponseType response, bool succes=true);
+        static  void handleResponse(
+                const LLUUID& group_id,
+                ResponseType response,
+                bool succes=true);      
+        static  void handleFailure(     const LLUUID& group_id);
+
 protected:
         class impl;
         impl* mImpl;
diff --git a/linden/indra/newview/llstatusbar.cpp b/linden/indra/newview/llstatusbar.cpp
index 29335d9..bdaf133 100644
--- a/linden/indra/newview/llstatusbar.cpp
+++ b/linden/indra/newview/llstatusbar.cpp
@@ -416,6 +416,8 @@ void LLStatusBar::refresh()
         childSetVisible("buyland", canBuyLand);
         if (canBuyLand)
         {
+                //HACK: layout tweak until this is all xml
+                x += 9;
                 childGetRect( "buyland", buttonRect );
                 r.setOriginAndSize( x, y, buttonRect.getWidth(), buttonRect.getHeight());
                 childSetRect( "buyland", r );
diff --git a/linden/indra/newview/lltexturecache.cpp b/linden/indra/newview/lltexturecache.cpp
index 59d50d2..11fd348 100644
--- a/linden/indra/newview/lltexturecache.cpp
+++ b/linden/indra/newview/lltexturecache.cpp
@@ -492,7 +492,11 @@ bool LLTextureCacheWorker::doWrite()
                 idx = mCache->getHeaderCacheEntry(mID, true, &mImageSize); // touch entry
                 if (idx >= 0)
                 {
-                        llassert_always(cur_imagesize <= 0 || mImageSize == cur_imagesize);
+                        if(cur_imagesize > 0 && mImageSize != cur_imagesize)
+                        {
+                                llwarns << "Header cache entry size: " << cur_imagesize << " != mImageSize: " << mImageSize << llendl;
+                                offset = 0; // re-write header
+                        }
                         mState = offset < TEXTURE_CACHE_ENTRY_SIZE ? HEADER : BODY;
                 }
                 else
diff --git a/linden/indra/newview/llviewerimagelist.cpp b/linden/indra/newview/llviewerimagelist.cpp
index 68edca8..99ac3a7 100644
--- a/linden/indra/newview/llviewerimagelist.cpp
+++ b/linden/indra/newview/llviewerimagelist.cpp
@@ -253,8 +253,10 @@ void LLViewerImageList::doPreloadImages()
         preloadUIImage("map_track_16.tga", LLUUID::null, FALSE);
         preloadUIImage("media_icon.tga", LLUUID::null, FALSE);
         preloadUIImage("music_icon.tga", LLUUID::null, FALSE);
-        preloadUIImage("noentrylines.tga", LLUUID::null, TRUE);
-        preloadUIImage("noentrypasslines.tga", LLUUID::null, TRUE);
+        image = preloadUIImage("noentrylines.tga", LLUUID::null, TRUE);
+        if (image) image->setClamp(FALSE, FALSE);       
+        image = preloadUIImage("noentrypasslines.tga", LLUUID::null, TRUE);
+        if (image) image->setClamp(FALSE, FALSE);       
         preloadUIImage("notify_tip_icon.tga", LLUUID::null, FALSE);
         preloadUIImage("notify_caution_icon.tga", LLUUID::null, FALSE);
         preloadUIImage("notify_box_icon.tga", LLUUID::null, FALSE);
diff --git a/linden/indra/newview/macview.xcodeproj/project.pbxproj b/linden/indra/newview/macview.xcodeproj/project.pbxproj
index c1cb556..fdbd211 100644
--- a/linden/indra/newview/macview.xcodeproj/project.pbxproj
+++ b/linden/indra/newview/macview.xcodeproj/project.pbxproj
@@ -1028,7 +1028,7 @@
                 1AA2EEA30CBBE2BF0017E185 /* llfloaterurldisplay.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloaterurldisplay.cpp; sourceTree = "<group>"; };
                 1AA2EEA50CBBE2D40017E185 /* llremoteparcelrequest.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llremoteparcelrequest.h; sourceTree = "<group>"; };
                 1AA2EEA60CBBE2D40017E185 /* llremoteparcelrequest.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llremoteparcelrequest.cpp; sourceTree = "<group>"; };
-                1AB0DADC0A52E8A0001CACEB /* message_template.msg */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; name = message_template.msg; path = ../../scripts/messages/message_template.msg; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.simpleColoring; };
+                1AB0DADC0A52E8A0001CACEB /* message_template.msg */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; name = message_template.msg; path = ../../scripts/messages/message_template.msg; sourceTree = SOURCE_ROOT; };
                 1AD3940C0CAB0003004BA76A /* llurlsimstring.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llurlsimstring.h; sourceTree = "<group>"; };
                 1AD3940D0CAB0003004BA76A /* llurldispatcher.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llurldispatcher.h; sourceTree = "<group>"; };
                 1AD3940E0CAB000F004BA76A /* llurlsimstring.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llurlsimstring.cpp; sourceTree = "<group>"; };
@@ -4253,7 +4253,6 @@
                 20286C28FDCF999611CA2CEA /* Project object */ = {
                         isa = PBXProject;
                         buildConfigurationList = 999484580883114300EFC621 /* Build configuration list for PBXProject "macview" */;
-                        compatibilityVersion = "Xcode 2.4";
                         hasScannedForEncodings = 1;
                         knownRegions = (
                                 English,
diff --git a/linden/indra/newview/releasenotes.txt b/linden/indra/newview/releasenotes.txt
index de547c5..7aa71f9 100644
--- a/linden/indra/newview/releasenotes.txt
+++ b/linden/indra/newview/releasenotes.txt
@@ -1,3 +1,17 @@
+Release Notes for Second Life 1.19.0(3) February 22nd, 2008
+=====================================
+
+Fixes:
+* Land for sale icon in menubar overlaps push object restriction icon
+* Upload Animation window: Button missing in Stopped window state
+* Client crashes when viewing the proposals tab in group information
+* My Landmarks dropdown list adds additional entries every time the world map is opened 
+* Groups > Proposals > Past Vote text gets chomped 
+* Defaulted buttons in floater dialogs remain highlighted when not in focus
+* VWR-4556: 1.19.0: Ban lines around limited-access parcels are no longer visible
+* VWR-3410: Too many typing sounds when chatting in Japanese
+
+
 Release Notes for Second Life 1.19.0(2) February 13th, 2008
 =====================================
 
diff --git a/linden/indra/newview/res/newViewRes.rc b/linden/indra/newview/res/newViewRes.rc
index 909393b..411a17a 100644
--- a/linden/indra/newview/res/newViewRes.rc
+++ b/linden/indra/newview/res/newViewRes.rc
@@ -228,8 +228,8 @@ TOOLPIPETTE             CURSOR                  "toolpipette.cur"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,19,0,2
- PRODUCTVERSION 1,19,0,2
+ FILEVERSION 1,19,0,3
+ PRODUCTVERSION 1,19,0,3
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -246,12 +246,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Linden Lab"
             VALUE "FileDescription", "Second Life"
-            VALUE "FileVersion", "1.19.0.2"
+            VALUE "FileVersion", "1.19.0.3"
             VALUE "InternalName", "Second Life"
             VALUE "LegalCopyright", "Copyright � 2001-2007, Linden Research, Inc."
             VALUE "OriginalFilename", "SecondLife.exe"
             VALUE "ProductName", "Second Life"
-            VALUE "ProductVersion", "1.19.0.2"
+            VALUE "ProductVersion", "1.19.0.3"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/linden/indra/newview/skins/xui/de/alerts.xml b/linden/indra/newview/skins/xui/de/alerts.xml
index f09d0f6..a534508 100644
--- a/linden/indra/newview/skins/xui/de/alerts.xml
+++ b/linden/indra/newview/skins/xui/de/alerts.xml
@@ -446,7 +446,7 @@ Fortfahren?
 Fortfahren?
                 </message>
                 <option name="Join">
-                        Zusammenlegen
+                        Beitreten
                 </option>
                 <option name="Cancel">
                         Abbrechen
@@ -3218,7 +3218,7 @@ Die Option zum Austritt aus einer Gruppe finden Sie unter
 [INVITE]
                 </message>
                 <option name="Join">
-                        Zusammenlegen
+                        Beitreten
                 </option>
                 <option name="Decline">
                         Ablehnen
@@ -3235,7 +3235,7 @@ Die Option zum Austritt aus einer Gruppe finden Sie unter
 [INVITE]
                 </message>
                 <option name="Join">
-                        Zusammenlegen
+                        Beitreten
                 </option>
                 <option name="Decline">
                         Ablehnen
diff --git a/linden/indra/newview/skins/xui/de/floater_about_land.xml b/linden/indra/newview/skins/xui/de/floater_about_land.xml
index ff86898..fe9542f 100644
--- a/linden/indra/newview/skins/xui/de/floater_about_land.xml
+++ b/linden/indra/newview/skins/xui/de/floater_about_land.xml
@@ -84,7 +84,7 @@
                                 Jeder
                         </text>
                         <text name="area_text">
-                                Gebiet
+                                Gebiet:
                         </text>
                         <text name="area_size_text">
                                 [AREA] qm
diff --git a/linden/indra/newview/skins/xui/de/floater_directory.xml b/linden/indra/newview/skins/xui/de/floater_directory.xml
index cf6a0ea..506ed19 100644
--- a/linden/indra/newview/skins/xui/de/floater_directory.xml
+++ b/linden/indra/newview/skins/xui/de/floater_directory.xml
@@ -223,12 +223,12 @@
                         <button label="Weiter &gt;" label_selected="Weiter &gt;" name="Next &gt;" />
                         <check_box label="Nur Orte mit Bildern anzeigen" name="incpictures" />
                         <check_box
-                             label="Parzellen, die Inhalte mit Zugangsbeschränkung enthalten, einschließen"
+                             label="Parzellen mit zugangsbeschränkten Inhalten einschließen"
                              name="incmature" />
                         <text
                              name="These are the most popular places in the world, as measured by traffic,         the amount of time people spend there.">
-                                Das sind die beliebtesten Orte der Second Life-Welt, nach Traffic sowie Zeit gemessen,
-die Benutzer dort verbringen.
+                                Das sind die beliebtesten Orte der Second Life-Welt, nach Traffic sowie 
+Zeit gemessen, die Benutzer dort verbringen.
                         </text>
                         <scroll_list name="results">
                                 <column label="" name="icon" />
diff --git a/linden/indra/newview/skins/xui/de/floater_instant_message.xml b/linden/indra/newview/skins/xui/de/floater_instant_message.xml
index eb29ed4..84e8206 100644
--- a/linden/indra/newview/skins/xui/de/floater_instant_message.xml
+++ b/linden/indra/newview/skins/xui/de/floater_instant_message.xml
@@ -16,7 +16,7 @@
                 icn_voice-pvtfocus.tga
         </string>
         <button label="Profil..." name="profile_callee_btn" />
-        <button label="Anrufen" name="start_call_btn" />
+        <button label="Anrufen" name="start_call_btn" halign="" pad_right="7" />
         <button label="Anruf beenden" name="end_call_btn" />
         <panel name="speaker_controls">
                 <check_box label="Voice-Chat stummschalten" name="mute_btn" tool_tip="Voice stummschalten" />
diff --git a/linden/indra/newview/skins/xui/de/floater_tools.xml b/linden/indra/newview/skins/xui/de/floater_tools.xml
index 7662819..f5f16af 100644
--- a/linden/indra/newview/skins/xui/de/floater_tools.xml
+++ b/linden/indra/newview/skins/xui/de/floater_tools.xml
@@ -561,7 +561,7 @@
                      name="button abandon land" />
                 <button label="Unterteilen..." label_selected="Unterteilen..."
                      name="button subdivide land" />
-                <button label="Beitreten..." label_selected="Beitreten..." name="button join land" />
+                <button label="Zusammenlegen" label_selected="Zusammenlegen" name="button join land" />
                 <button label="Info zu Land..." label_selected="Info zu Land..."
                      name="button about land" />
         </panel>
diff --git a/linden/indra/newview/skins/xui/de/panel_chat_bar.xml b/linden/indra/newview/skins/xui/de/panel_chat_bar.xml
index 86fbe49..36037de 100644
--- a/linden/indra/newview/skins/xui/de/panel_chat_bar.xml
+++ b/linden/indra/newview/skins/xui/de/panel_chat_bar.xml
@@ -4,7 +4,7 @@
              tool_tip="Klicken Sie hier zur Anzeige des Gesprächs" />
         <line_editor label="Zum Chatten hier klicken." name="Chat Editor"
              tool_tip="Eingabe für Sprechen, Strg-Eingabe für Rufen." />
-        <button label="Sprechen" label_selected="Sprechen" name="Say" tool_tip="(Eingabe)" />
+        <button label="Reden" label_selected="Reden" name="Say" tool_tip="(Eingabe)" />
         <button label="Rufen" label_selected="Rufen" name="Shout" tool_tip="(Strg-Eingabe)" />
         <combo_box label="Gesten" name="Gesture">
                 <combo_item name="Gestures">
diff --git a/linden/indra/newview/skins/xui/de/panel_friends.xml b/linden/indra/newview/skins/xui/de/panel_friends.xml
index a0b1595..b5fde69 100644
--- a/linden/indra/newview/skins/xui/de/panel_friends.xml
+++ b/linden/indra/newview/skins/xui/de/panel_friends.xml
@@ -27,12 +27,12 @@
         <button label="IM/Anruf" name="im_btn" tool_tip="Beginnt eine Instant Message-Sitzung" />

         <button label="Profil" name="profile_btn"

              tool_tip="Bilder, Gruppen und andere Informationen anzeigen" />

-        <button label="Teleport..." name="offer_teleport_btn"

+        <button label="Teleport" name="offer_teleport_btn"

              tool_tip="Bieten Sie diesem Freund einen Teleport an Ihre Position an" />

-        <button label="Zahlen..." name="pay_btn"

+        <button label="Zahlen" name="pay_btn"

              tool_tip="Diesem Freund Linden-Dollar (L$) geben" />

-        <button label="Entfernen..." name="remove_btn"

+        <button label="Entfernen" name="remove_btn"

              tool_tip="Diese Person von Ihrer Freundesliste entfernen" />

-        <button label="Hinzufügen..." name="add_btn"

+        <button label="Hinzufügen" name="add_btn"

              tool_tip="Bieten Sie einem Einwohner die Freundschaft an" />

 </panel>

diff --git a/linden/indra/newview/skins/xui/de/panel_place_small.xml b/linden/indra/newview/skins/xui/de/panel_place_small.xml
index 712bf0d..8d95c43 100644
--- a/linden/indra/newview/skins/xui/de/panel_place_small.xml
+++ b/linden/indra/newview/skins/xui/de/panel_place_small.xml
@@ -10,7 +10,7 @@
                 Gebiet: [AREA] qm
         </string>
         <string name="forsale_text">
-                Steht zum Verkauf für [PRICE] L$
+                zu verkaufen für [PRICE]L$
         </string>
         <string name="auction_text">
                 Auktions-ID [ID].
diff --git a/linden/indra/newview/skins/xui/de/panel_preferences_graphics1.xml b/linden/indra/newview/skins/xui/de/panel_preferences_graphics1.xml
index 6199691..4d11706 100644
--- a/linden/indra/newview/skins/xui/de/panel_preferences_graphics1.xml
+++ b/linden/indra/newview/skins/xui/de/panel_preferences_graphics1.xml
@@ -5,7 +5,7 @@
         </text>
         <check_box label="In Fenster ausführen" name="windowed mode" />
         <text_editor name="voice_chat_description">
-                Wenn deaktiviert, schaltet die Anzeige bei Anmeldung auf Vollbild um.
+                Wenn deaktiviert Anzeige bei Anmeldung in Vollbild.
         </text_editor>
         <text type="string" length="1" name="Fullscreen Aspect Ratio:">
                 Vollbild-Aspektverhältnis:
diff --git a/linden/indra/newview/skins/xui/de/panel_region_estate.xml b/linden/indra/newview/skins/xui/de/panel_region_estate.xml
index 998c8ab..5839cf5 100644
--- a/linden/indra/newview/skins/xui/de/panel_region_estate.xml
+++ b/linden/indra/newview/skins/xui/de/panel_region_estate.xml
@@ -18,7 +18,7 @@
         <text name="Only Allow">
                 Zugang beschränken auf:
         </text>
-        <check_box label="Einwohner mit hinterlegten Zahlungsinformationen" name="limit_payment"
+        <check_box label="Einwohner mit Zahlungsinformationen" name="limit_payment"
              tool_tip="Nicht identifizierte Einwohner verbannen." />
         <check_box label="Altersgeprüfte Erwachsene" name="limit_age_verified"
              tool_tip="Einwohner ohne Altersprüfung verbannen. Weitere Informationen finden Sie auf support.secondlife.com." />
diff --git a/linden/indra/newview/skins/xui/de/panel_toolbar.xml b/linden/indra/newview/skins/xui/de/panel_toolbar.xml
index 8d8d0b6..37282ae 100644
--- a/linden/indra/newview/skins/xui/de/panel_toolbar.xml
+++ b/linden/indra/newview/skins/xui/de/panel_toolbar.xml
@@ -6,7 +6,7 @@
         </string>
         <button label="Unterhalten" name="communicate_btn"
              tool_tip="Unterhalten Sie sich mit Freunden und in Gruppen." />
-        <button label="Chat" name="chat_btn" tool_tip="Chat-Leiste anzeigen. (Eingabe)" />
+        <button label="" name="chat_btn" tool_tip="Chat-Leiste anzeigen. (Eingabe)" />
         <button label="Freunde" name="friends_btn"
              tool_tip="Suchen und unterhalten Sie sich mit Ihren Freunden." />
         <button label="Fliegen" label_selected="Landen" name="fly_btn"
diff --git a/linden/indra/newview/skins/xui/de/panel_voice_controls.xml b/linden/indra/newview/skins/xui/de/panel_voice_controls.xml
index 5a19d25..80eb0e7 100644
--- a/linden/indra/newview/skins/xui/de/panel_voice_controls.xml
+++ b/linden/indra/newview/skins/xui/de/panel_voice_controls.xml
@@ -2,9 +2,11 @@
 <panel name="voice_controls">

         <button name="speakers_btn"

              tool_tip="Liste der Einwohner in der Umgebung anzeigen, die Voice-Chat verwenden" />

-        <button label="Sprechen" name="push_to_talk"

-             tool_tip="Zum Sprechen Taste gedrückt halten" />

+        <button label="Reden" name="push_to_talk" 

+             tool_tip="Zum Sprechen Taste gedrückt halten" width="70" left_delta="37"/>

         <button name="ptt_lock"

-             tool_tip="Klicken Sie auf das Schloss, um in den Gesprächsmodus zu wechseln" />

-        <button name="show_channel" tool_tip="Klicken, um den aktuellen Voice-Kanal anzuzeigen" />

+             tool_tip="Klicken Sie auf das Schloss, um in den Gesprächsmodus zu wechseln" left_delta="2"/>

+        <icon bottom="-19" height="16" image_name="icn_voice_ptt-off.tga" left_delta="49"

+             name="voice_volume" width="16" />

+        <button name="show_channel" tool_tip="Klicken, um den aktuellen Voice-Kanal anzuzeigen" left_delta="16"/>

 </panel>

diff --git a/linden/indra/newview/skins/xui/en-us/floater_about.xml b/linden/indra/newview/skins/xui/en-us/floater_about.xml
index 40cdcf1..d01ef3f 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_about.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_about.xml
@@ -7,11 +7,9 @@
              follows="left|top|right|bottom" font="SansSerifSmall" height="168" left="6"
              max_length="65536" mouse_opaque="true" name="credits_editor"
              text_color="1, 1, 1, 1" text_readonly_color="1, 1, 1, 1" width="458"
-             word_wrap="true">Second Life is brought to you by Philip, Andrew, Tessa, Cory, Frank, James, Doug, Hunter, Richard, John, Eric, Avi, AaronB, AaronY, Ian, Peter, Mark, Robin, Stephen, Tracy, Ryan, Alberto, Haney, Tanya, JimJ, Dan, Ben, Stephanie, Tim, Evan, Catherine, Colin, Chris, Reuben, Charity, Jeska, James, JonHenry, Kelly, Callum, Char, Daniel, DavidF, Don, Jeff, Lauren, Lee, Michael, Ramzi, Vektor, Steve, TomY, Tess, Kona, Brent, Clarissa, PeterP, Jesse, Annette, Cyn, Blue, Ginsu, Jonathan, Karen, Adam, Nova, Deana, Lizzie, Patsy, DavidK, Isaac, Pathfinder, Monroe, Jill, Benny, Altruima, Rheya, Jennifer, Jack, DaveP, Brad, Mick, Babbage, Elisabeth, Brian, Beth, Data, Ethan, Wendy, Nicole, Sky, Jeffrey, Zero, Coffee, Tesla, Kenny, Makiko, Nigel, Teeple, Lucy, Mia, Dee, Guy, Harry, Liana, Branka, Jimbo, Aura, Vasuda, SarahD, bethanye, Torley, Runitai, MikeS, PaulM, Milo, Hermia, JoeM, Melanie, Rejean, DSmith, SMiller, Susan, Jose, DongYun, Justin, Andrey, Syrah, Donovan, Henrik, Nora, Lexie, AC, Donna, ChrisC, Alex, Leyla, Kyle, Mathew, Devin, Joshua, DanC, Jessica, Harmony, Claudia, Tramel, Glenn, Betsy, Fritz, Jun, Adam, Cassandra, Ken, RyanW, Spike, Tofu, Varas, Andy, Luke, RobLa, Chiyo, JohnZ, Dustin, George, Del, PeterP, Migyeong, Matthew, RMullane, CChampion, JTurbin, JamesC, Viola, Lightfoot, Jacqui, Sturm, Adrian, Buttercup, Alfred, Sunil, Alfred, Noel, Irfan, Jill, Yool, Jane, Yuki, Yoz, Matthew, Arthur, Jennifer, Karl, Brian, Ben, Janine, Christopher, Madhavi, Everett, Anthony, Joon, Jake, sean, Adreanne, Stephany, KellyJo, Jeremy, Pramod, Joshua, Sean, Christopher, Amy, Ceren, Katherine, jon, Sudheendra, James, Stephan, Kari, Kartic, Todd, Thomas, Joki, Rebecca, Belinda, Bert, Roger, Bridie, Kristi, Brian, Maria, John, Aric, Nathanel, Melinda, Darrell, Jennifer, Sandy, Greg, Rob, Brad, Chris, Eric, Palmer, Asi, Katja, Lisa, Minda, Jen, Aaron, Bryan, Mark, Jonathan, Jamie, Laurel, William, Matthew, Steve, David, Remy, James, Tim, Lee, Brian, Ashlei, Sam, Mike, Ethan, Austin, Wanda, Paul, Brian, Rachel, Valentyn, Emma Williams, Autum, Steven, Laley, Charles, Jessica, Sue, Gillian, CG, Kip, Kristen, Shamiran, Blake, Brett, Erica, Kent, Joel, Plexus, Twilight, Joppa and many others.
+             word_wrap="true">Second Life is brought to you by Philip, Andrew, Tessa, Cory, Frank, James, Doug, Hunter, Richard, John, Eric, Avi, AaronB, AaronY, Ian, Peter, Mark, Robin, Stephen, Tracy, Ryan, Alberto, Haney, Tanya, JimJ, Dan, Ben, Stephanie, Tim, Evan, Catherine, Colin, Chris, Reuben, Charity, Jeska, James, JonHenry, Kelly, Callum, Char, Daniel, DavidF, Don, Jeff, Lauren, Lee, Michael, Ramzi, Vektor, Steve, TomY, Tess, Kona, Brent, Clarissa, PeterP, Jesse, Annette, Cyn, Blue, Ginsu, Jonathan, Karen, Adam, Nova, Deana, Lizzie, Patsy, DavidK, Isaac, Pathfinder, Monroe, Jill, Benny, Altruima, Rheya, Jennifer, Jack, DaveP, Brad, Mick, Babbage, Elisabeth, Brian, Beth, Data, Ethan, Wendy, Nicole, Sky, Jeffrey, Zero, Coffee, Tesla, Kenny, Makiko, Nigel, Teeple, Lucy, Mia, Dee, Guy, Harry, Liana, Branka, Jimbo, Aura, Vasuda, SarahD, bethanye, Torley, Runitai, MikeS, PaulM, Milo, Hermia, JoeM, Melanie, Rejean, DSmith, SMiller, Susan, Jose, DongYun, Justin, Andrey, Syrah, Donovan, Henrik, Nora, Lexie, AC, Donna, ChrisC, Alex, Leyla, Kyle, Mathew, Devin, Joshua, DanC, Jessica, Harmony, Claudia, Tramel, Glenn, Betsy, Fritz, Jun, Adam, Cassandra, Ken, RyanW, Spike, Tofu, Varas, Andy, Luke, RobLa, Chiyo, JohnZ, Dustin, George, Del, PeterP, Migyeong, Matthew, RMullane, CChampion, JTurbin, JamesC, Viola, Lightfoot, Jacqui, Sturm, Adrian, Buttercup, Alfred, Sunil, Alfred, Noel, Irfan, Jill, Yool, Jane, Yuki, Yoz, Matthew, Arthur, Jennifer, Karl, Brian, Ben, Janine, Christopher, Madhavi, Everett, Anthony, Joon, Jake, sean, Adreanne, Stephany, KellyJo, Jeremy, Pramod, Joshua, Sean, Christopher, Amy, Ceren, Katherine, jon, Sudheendra, James, Stephan, Kari, Kartic, Todd, Thomas, Joki, Rebecca, Belinda, Bert, Roger, Bridie, Kristi, Brian, Maria, John, Aric, Nathanel, Melinda, Darrell, Jennifer, Sandy, Greg, Rob, Brad, Chris, Eric, Palmer, Asi, Katja, Lisa, Minda, Jen, Aaron, Bryan, Mark, Jonathan, Jamie, Laurel, William, Matthew, Steve, David, Remy, James, Tim, Lee, Brian, Ashlei, Sam, Mike, Ethan, Austin, Wanda, Paul, Brian, Rachel, Valentyn, Emma Williams, Autum, Steven, Laley, Charles, Jessica, Sue, Gillian, CG, Kip, Kristen, Shamiran, Blake, Brett, Erica, Kent, Joel, Plexus, Twilight, Joppa, Enus, Kraft, Naveen, Simon, Q, Ronp, Laurap, Ram, KyleJM, Marty, Kend, Daveh, Prospero, Melissa, Nat, Hamilton, Green, Seraph, Ekim, Miz, Jimmy, Kosmo, Rome, Doris, JT, Benoc, Whump, Mango, Trinity, Patch, TJ, Christy, Bao, Joohwan, Kate, Oreh, Angela, Johan, Cheah, Lan, Matias, Brandy, Cogsworth, Aleks,  Mitchell, Space, Einstein, Bambers, Colton, Malbers, Maggie, Umesh, Santosh, Rose, Stash, Rothman, Winnie, Stella, Niall and many others.
 
-In Memory of Jesse Malthus, you will be fondly remembered by all who heard your voice.
-
-Thank you to the following residents for helping to ensure that this is the best version yet: Aces Spade, Adrian Buckler, Adrienne LeShelle, Amanda Ascot, AnnaQuay Heart, Aquamina Khalifa, Arienne Anatine, Aston Hildyard, Ayami Kamachi, Badinage Odets, Biffy Berjis, Bigfox Pye, BigJohn Jade, BigRick Byrd, Brettus Tripsa, Brock Fitzgerald, Broker Allen, Browse by Name, Chiria Celt, Christopher Prudhomme, dale Cao, dale Lynch, Dante Tucker, DaQbet Kish, Dargon Pacer, Darius Antonelli, Deira Llanfair, DeviantBone Xi, Dore Dorado, Englishwob Etchegaray, Enya Masala, Eric Renneville, Fairfax Michinaga, FireFox Bancroft, FOXI Cortes, Frederick Earp, Geo Meek, Gotthilf Fischer, Hallo Loon, Hawk Carter, Hazel Kyrgyz, Hecter Barbosa, Hex Link, Ice Pak, Ideasu Mukerji, Itoku Kamachi, Jared Halleck, Jaykob Carter, Jennifer Drumheller, JensMartin Tomsen, JIAB Boa, Jim Gustafson, JimmyJet Fossett, Joseph Rustamova, Jt Volos, Karilyn Kidomen, Kaysha Sion, Keaton Nacon, Kevin Susenko, Khashai Steinbeck, Kira Cuddihy, Kit Massiel, Kojo Dixon, KUieTSToRm Lightcloud, Kwai Kyong, Kyrtis Daehlie, LazyGunGuy Bartlett, Lewcas Zapedzki, Lioc Cioc, LLIB Utu, Lou Liebknecht, Luca Draken, Maci Homewood, Major Sewell, Mari Todriya, MarieElize Noel, matt27 Churchill, Maverick Miasma, maydaysos Young, Mediaho Ball, Mikayla Gillespie, Mike Faulkland, Modfire Milland, MollyBrown Foxley, Mosley Jewell, Nuahs Zapedzki, Nyx Divine, Panther Farber, Paul Bumi, Preciousse Moody, PrincessNina Prefect, Prio Serpentine, Rainbow Drake, Randall Rall, Randy Kazan, Reinhart Mokeev, Rhyph Somme, Rico Roizman, Ruge Dryke, Ryan Orbit, Safira Rosher, Samantha Bainbridge, Sammy Foxley, Sash Furst, Saturn Ariantho, Sienna Summers, Skye Enoch, Sofie Kanno, Solar Legion, Sonic Oki, Sunra Saenz, Taina Heart, Taryn Sprawl, tenerife Wei, TomDragon Nilsson, Trebla Reve, Trouble Carnell, user1cat Orbit, Vance Merlin, Veritas Variscan, Web Page, Wi3g3ht3s Ihnen, WinDrftr DeFarge, Yuu Nakamichi, Zac Delec, Zed Fairweather, Zimmo Hallard.
+Thank you to the following residents for helping to ensure that this is the best version yet: aaron23 decuir, Abelv Vollmar, Abyssin Otoro, ActingIll Igaly, Adamas Carter, Addy Broome, Adelia Menges, Alexandra Rucker, Alexandrea Fride, Alissa Sabre, Alyx Jonson, Ann Otoole, Anton Fargis, Aradia Dielli, Araina jewell, Arcane Clawtooth, arcangelo vantelli, Are Sperber, Argent Stonecutter, arkady yost, Ashcroft Burnham, Ashen Arida, Auron Forcella, Azadine Umarov, Azildin Furst, Balp Allen, Balpien Hammerer, Barney Boomslang, Barrett Slade, becky pippen, Beeflin Grut, Beer Dailey, Behemoth Greenwood, bigmanu greene, bitova loon, Bonca Chikuwa, Bonnie Bechir, Brandon Catteneo, buttonpusher jones, Carina Raymaker, Ceera Murakami, Celierra Darling, ChatNoir Moonsoo, Cheetah Hammerer, chet neurocam, Cinthya Loveless, Cold Spitteler, Coral Quinnell, Crash Pointe, CrazyTB Oh, Creem Pye, Crom Chaffe, ctrl althouse, dade carver, Dael Ra, dakota schwade, Dale Innis, Damian McLeod, Danger Lytton, danielluh ashton, DanOfWA Flanagan, Davec Horsforth, Davidius Morigi, davie zinner, Day Oh, DBDigital Epsilon, Deany Fall, deBruce Munro, Decaf Coffey, Dedric Mauriac, Deeso Saeed, Dekka Raymaker, dexter eberhart, Dildo Spitz, Dizzy Banjo, djcabello klaar, Dnali Anabuki, Domchi Underwood, Doran Zemlja, Drew Dwi, Duckless Vandyke, Duncan Stenvaag, Dylan Rickenbacker, dzogchen Moody, Dzonatas Sol, Eddy Stryker, Edward Griffith, Edward Pearse, ein duesenburg, Elle Pollack, Elle74 Zaftig, Emileigh Starbrook, Emma Nowhere, ener bing, Erdrick Balbozar, eric domela, Evangeline Biedermann, Excalibur Longstaff, Fake Fitzgerald, Feldspar Millgrove, Feynt Mistral, Fluf Fredriksson, Forbid Utorid, Fortyniner Beck, Francesco Despres, Francisco Koolhoven, Franta Burt, Fury Rosewood, garde Burrel, Garmin Kawaguichi, Gavin Ichigo, Gellan Glenelg, Genie Demina, Gennifer Meredith, Gigs Taggart, Goldie Katsu, Gwyneth Llewelyn, Haravikk Mistral, Harleen Gretzky, Haruki Watanabe, Heather Manatiso, Henri Beauchamp, Honey Fairweather, Hypatia Callisto, Ice Brodie, icktoofay Kamachi, IntLibber Brautigan, Janise Dreamscape, Jay Shinobu, Jenni Ryba, Jeremy Ondricek, JetZep Zabelin, Jims Smythe, Jini Hammerer, Jopy Weber, JustOneMore Loon, Kaluura Boa, Kara Markova, Kevin Susenko, Khyra Ares, Kii Lilliehook, Kitty Barnett, Kris Kuttelwascher, Lanita Wingtips, Laura18 Streeter, Lee Ludd, Lettrius Jewell, Liberty Tesla, LilyAnna Carter, Lindal Kidd, Lisa Lowe, Lisa McConnell, Lola Machin, luca peck, Lupus Clawtooth, M1sha Dallin, Macsima Dagostino, Mana Janus, Mani Canning, Manjusri Binder, marceledward edman, march Korda, marchino villota, Marcus Llewellyn, MartinRJ Fayray, Matthew Dowd, Max Kleiber, mazzy fastback, McCabe Maxsted, Mckailen Kohnke, Meghan Dench, Melvin Starbrook, Mercia Mcmahon, Miakoda Carnell, Michelle2 Zenovka, Michi Lumin, mick parnall, Milla Michinaga, Millie Thompson, miranda Ashby, Mircea Lobo, MIssSara Beck, mouse mimistrobell, Myria Boa, Nanci Barthelmess, Nargus Asturias, Natalya Debevec, Nedrae Messmer, Nexeus Fatale, Niky Zenovka, Nimrod Szondi, Ninane Yoshikawa, Noch Tripsa, nokithecat writer, Nyko Merlin, Onyx Halberd, oryx tempel, Osprey Therian, Pac Hyun, Panagea McMillan, Patrick Ferrentino, PattehPh0x Katsu, ponk bing, Poppy Linden, Prajna Vella, Precious Rhiano, Prokofy Neva, Randall Lovenkraft, Rascal Ratelle, Raydon Writer, Rhaorth Antonelli, Rock Hayek, Ron Crimson, Ron Khondji, Ronald Richez, Rui Clary, Ruud Lathrop, Sakkano Imako, Sam Reinard, Sascha Vandyke, Scrippy Scofield, Sean18 McCarey, Sedona Mills, Sekonda Huet, Seraph Nephilim, Sergei Milos, Shadowquine Maltz, shai khalifa, sheilah flatley, Sheri Underwood, Shuggy Husky, Sierra Janus, Sigma Avro, Simil Miles, simon kline, Simon Nolan, Sindy Tsure, Sparks Keynes, Squirrel Wood, Stahi Columbia, StarSong Bright, Summer Seale, Sunn Thunders, Susan Koltai, Syler Zhora, Synack Fitzgerald, Tayra Dagostino, Tee Cramer, Teravus Ousley, Thomas Shikami, Tia Araw, Tillie Ariantho, Topher Brooks, Torley Linden, Twosteppin Jewell, tx Oh, urantia jewell, vaguegirl Petty, VeC Merlin, venus petrov, vv33d Beck, vynka dean, zann canto, zeebster colasanti, Zi Ree, Zion Tristan, Zorin Frobozz, Zyzzy Zarf
 
 APR Copyright (C) 2000-2004 The Apache Software Foundation
 cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel@haxx.se)
@@ -33,7 +31,7 @@ All rights reserved.  See licenses.txt for details.
 Voice chat Audio coding: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
 
 
-Mr. Watson -- come here -- I want to see you.</text_editor>
+Happiness is a warm puppy. -- Charles M. Schulz</text_editor>
 
         <text_editor bg_readonly_color="0, 0, 0, 0" bottom_delta="174" embedded_items="false"
              follows="left|top|right|bottom" font="SansSerif" height="238" left="6"
diff --git a/linden/indra/newview/skins/xui/en-us/floater_directory.xml b/linden/indra/newview/skins/xui/en-us/floater_directory.xml
index 321b585..bb2fee5 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_directory.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_directory.xml
@@ -284,7 +284,7 @@
                              font="SansSerifSmall" height="16" initial_value="false" label="Show Mature"
                              left="569" mouse_opaque="true" name="incmature" width="120" />
                         <button bottom="-28" follows="left|top" font="SansSerif" halign="center" height="20"
-                             label="Search" label_selected="Search" left_delta="100" mouse_opaque="true"
+                             label="Search" label_selected="Search" left_delta="110" mouse_opaque="true"
                              name="Search" tool_tip="Search" width="80" />
                         <button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
                              height="20" label="Delete" label_selected="Delete" left="80"
diff --git a/linden/indra/newview/skins/xui/en-us/floater_html.xml b/linden/indra/newview/skins/xui/en-us/floater_html.xml
index 2c55711..fe295c7 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_html.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_html.xml
@@ -14,10 +14,10 @@
              label="Forward" left_delta="83" name="forward_btn" width="80" />
              
         <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
-             follows="top|left|right" font="SansSerifSmall" height="20" hidden="false" left_delta="75" max_length="256" mouse_opaque="true"
+             follows="top|left|right" font="SansSerifSmall" height="20" hidden="false" left_delta="85" max_length="256" mouse_opaque="true"
              name="url_edit" select_all_on_focus_received="true" width="435" />
         <button bottom_delta="0" follows="top|right" font="SansSerifSmall" height="20"
-             label="Go" left_delta="450" name="go_btn" width="70" />
+             label="Go" left_delta="440" name="go_btn" width="70" />
              
         <!-- web_browser bottom="20" follows="top|left|bottom|right" font="SansSerifSmall" left="15"
              name="html_floater_browser" right="-15" top="-56" / -->
diff --git a/linden/indra/newview/skins/xui/en-us/floater_land_holdings.xml b/linden/indra/newview/skins/xui/en-us/floater_land_holdings.xml
index 8b730f8..c218886 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_land_holdings.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_land_holdings.xml
@@ -36,7 +36,7 @@
         </text>
         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="-337" drop_shadow_visible="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="348"
+             font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="340"
              mouse_opaque="true" name="allowed_text" v_pad="0" width="132">
                 [AREA] sq. meters
         </text>
@@ -48,7 +48,7 @@
         </text>
         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="-357" drop_shadow_visible="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="348"
+             font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="340"
              mouse_opaque="true" name="current_text" v_pad="0" width="132">
                 [AREA] sq. meters
         </text>
@@ -60,8 +60,8 @@
         </text>
         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="-377" drop_shadow_visible="true" follows="left|top"
-             font="SansSerifBold" h_pad="0" halign="left" height="16" left_delta="348"
-             mouse_opaque="true" name="available_text" v_pad="0" width="132">
+             font="SansSerifBold" h_pad="0" halign="left" height="16" left_delta="340"
+             mouse_opaque="true" name="available_text" v_pad="0" width="140">
                 [AREA] sq. meters
         </text>
         <string name="area_string">[AREA] sq. meters</string>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_tools.xml b/linden/indra/newview/skins/xui/en-us/floater_tools.xml
index cb237fa..59a114f 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_tools.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_tools.xml
@@ -1183,7 +1183,7 @@
                         <button bottom="-30" follows="left|top" font="SansSerif" halign="center" height="20"
                              hidden="false" label="New Script..." label_selected="New Script..."
                              left="10" mouse_opaque="true" name="button new script" scale_image="TRUE"
-                             width="100" />
+                             width="130" />
                         <panel bottom_delta="-330" follows="left|top" height="325" hidden="false" left="10"
                              mouse_opaque="true" name="ContentsInventory" width="252" />
                 </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_login.xml b/linden/indra/newview/skins/xui/en-us/panel_login.xml
index acb016d..47ad4b3 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_login.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_login.xml
@@ -42,12 +42,12 @@
              bottom="10" drop_shadow_visible="true" follows="left|bottom"
              font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
              left="32" mouse_opaque="true" name="start_location_text" v_pad="0"
-             width="85">
+             width="95">
                 Start Location:
         </text>
         <combo_box allow_text_entry="true" bottom="8" follows="left|bottom" height="18"
              hidden="false" left_delta="97" max_chars="128" mouse_opaque="true"
-             name="start_location_combo" width="140">
+             name="start_location_combo" width="155">
                 <combo_item name="MyHome" value="My Home">
                         My Home
                 </combo_item>
@@ -60,7 +60,7 @@
         </combo_box>
         <check_box bottom="10" follows="left|bottom" font="SansSerifSmall" height="16"
              hidden="false" initial_value="false" label="Remember password"
-             left_delta="167" mouse_opaque="true" name="remember_check" width="138" />
+             left_delta="165" mouse_opaque="true" name="remember_check" width="138" />
         <button bottom="28" follows="left|bottom" font="SansSerif" halign="center"
              height="24" hidden="false" label="Connect" label_selected="Connect"
              left="440" mouse_opaque="true" name="connect_btn" scale_image="TRUE"
diff --git a/linden/indra/newview/skins/xui/en-us/panel_preferences_chat.xml b/linden/indra/newview/skins/xui/en-us/panel_preferences_chat.xml
index 0d1b7a7..52184bb 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_preferences_chat.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_preferences_chat.xml
@@ -64,7 +64,7 @@
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="-160" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-             left="12" mouse_opaque="false" name="text_box3" v_pad="0" width="128">
+             left="12" mouse_opaque="false" name="text_box3" v_pad="0" width="135">
                 Chat Console:
         </text>
         <spinner bottom_delta="-6" control_name="ChatPersistTime" decimal_digits="0" enabled="true"
@@ -97,7 +97,7 @@
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="-207" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-             left="12" mouse_opaque="false" name="text_box6" v_pad="0" width="128">
+             left="12" mouse_opaque="false" name="text_box6" v_pad="0" width="135">
                 Chat Options:
         </text>
         <check_box bottom_delta="-6" control_name="ChatFullWidth" enabled="true" follows="left|top"
diff --git a/linden/indra/newview/skins/xui/en-us/panel_preferences_graphics2.xml b/linden/indra/newview/skins/xui/en-us/panel_preferences_graphics2.xml
index b01a317..7b6a5eb 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_preferences_graphics2.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_preferences_graphics2.xml
@@ -89,7 +89,7 @@
              bottom="-247" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
              left="10" mouse_opaque="true" name="Object Mesh Detail:" v_pad="0"
-             width="128">
+             width="135">
                 Object Mesh Detail:
         </text>
         <slider_bar bottom="-251" control_name="RenderVolumeLODFactor" enabled="true"
@@ -100,7 +100,7 @@
              bottom="-266" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
              left="10" mouse_opaque="true" name="Flexible Mesh Detail:" v_pad="0"
-             width="128">
+             width="135">
                 Flexible Mesh Detail:
         </text>
         <slider_bar bottom="-270" control_name="RenderFlexTimeFactor" enabled="true"
diff --git a/linden/indra/newview/skins/xui/en-us/panel_preferences_voice.xml b/linden/indra/newview/skins/xui/en-us/panel_preferences_voice.xml
index fcf3147..e962eb4 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_preferences_voice.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_preferences_voice.xml
@@ -86,8 +86,8 @@
         </text_editor>
         <button bottom_delta="-30" follows="left|top" font="SansSerif" height="20"
              label="Device Settings" left_delta="0" mouse_opaque="true"
-             name="device_settings_btn" width="150" />
+             name="device_settings_btn" width="155" />
         <button bottom_delta="-30" follows="left|top" font="SansSerif" height="20"
              label="Voice Chat Setup" left_delta="0" mouse_opaque="true"
-             name="launch_voice_wizard_button" width="140" />
+             name="launch_voice_wizard_button" width="155" />
 </panel>
diff --git a/linden/indra/newview/skins/xui/ja/floater_tools.xml b/linden/indra/newview/skins/xui/ja/floater_tools.xml
index 44915ec..bfff2c3 100644
--- a/linden/indra/newview/skins/xui/ja/floater_tools.xml
+++ b/linden/indra/newview/skins/xui/ja/floater_tools.xml
@@ -32,7 +32,7 @@
         <check_box label="テクスチャーを選択" name="radio select face" />
         <check_box label="リンク部位を編集" name="checkbox edit linked parts" />
         <check_box label="ｸﾞﾘｯﾄﾞ使用" left_delta="27" name="checkbox snap to grid" />
-        <button label="オプション..." label_selected="オプション..."
+        <button label="オプション" label_selected="オプション"
              name="Options..." />
         <check_box label="両側を引伸ばす" left="116" name="checkbox uniform" />
         <check_box label="テクスチャーを引伸ばす" name="checkbox stretch textures" />
@@ -556,7 +556,7 @@
                         <button label="揃える" label_selected="揃える" left="150" name="button align" />
                 </panel>
                 <panel label="コンテンツ" name="Contents">
-                        <button label="新しいスクリプト..."
+                        <button label="新しいスクリプト"
                              label_selected="新しいスクリプト..." name="button new script" />
                 </panel>
         </tab_container>
diff --git a/linden/indra/newview/skins/xui/ja/panel_chat_bar.xml b/linden/indra/newview/skins/xui/ja/panel_chat_bar.xml
index e33a928..f0bb74b 100644
--- a/linden/indra/newview/skins/xui/ja/panel_chat_bar.xml
+++ b/linden/indra/newview/skins/xui/ja/panel_chat_bar.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel name="chat_bar">
-        <button label="��ーカル・��ャット" label_selected="履歴" name="History"
+        <button label="周辺チャット" label_selected="履歴" name="History"
              tool_tip="過去の発言を表示するには、ここをクリック" />
         <line_editor label="チャットを開始するには、ここをクリックします。"
              name="Chat Editor"
diff --git a/linden/indra/newview/skins/xui/ja/panel_login.xml b/linden/indra/newview/skins/xui/ja/panel_login.xml
index 68b87fb..1f6a4d5 100644
--- a/linden/indra/newview/skins/xui/ja/panel_login.xml
+++ b/linden/indra/newview/skins/xui/ja/panel_login.xml
@@ -13,7 +13,7 @@
                 パスワード：
         </text>
         <text name="start_location_text">
-                開始ロ������������：
+                ロ����ン位置：
         </text>
         <combo_box name="start_location_combo">
                 <combo_item name="MyHome">
diff --git a/linden/indra/newview/skins/xui/ja/panel_preferences_general.xml b/linden/indra/newview/skins/xui/ja/panel_preferences_general.xml
index dc7d2ff..8ca1cba 100644
--- a/linden/indra/newview/skins/xui/ja/panel_preferences_general.xml
+++ b/linden/indra/newview/skins/xui/ja/panel_preferences_general.xml
@@ -27,7 +27,7 @@
         <check_box label="小さなアバター名" name="small_avatar_names_checkbox" />
         <color_swatch label="" name="effect_color_swatch"
              tool_tip="カラー・ピッカーをクリックして開く" />
-        <spinner label="退席までの���イムアウト：" name="afk_timeout_spinner" />
+        <spinner label="退席までの��間：" name="afk_timeout_spinner" />
         <check_box label="オンライン・フレンド通知を表示"
              name="friends_online_notify_checkbox" />
         <check_box label="ミニマップを回転" name="rotate_mini_map_checkbox" />
@@ -40,7 +40,7 @@
              name="use_system_color_picker_checkbox"
              tool_tip="Second Life内蔵でない、デフォルト・システムのカラー選択を使用" />
         <text type="string" length="1" name="start_location_textbox">
-                開始ロ������������：
+                ロ����ン位置：
         </text>
         <text type="string" length="1" name="show_names_textbox">
                 名前を表示：
diff --git a/linden/indra/newview/skins/xui/ja/panel_preferences_graphics1.xml b/linden/indra/newview/skins/xui/ja/panel_preferences_graphics1.xml
index b6e791e..58169d6 100644
--- a/linden/indra/newview/skins/xui/ja/panel_preferences_graphics1.xml
+++ b/linden/indra/newview/skins/xui/ja/panel_preferences_graphics1.xml
@@ -5,7 +5,7 @@
         </text>
         <check_box label="ウィンドウ内で実行" name="windowed mode" />
         <text_editor name="voice_chat_description">
-                チェックされて������場合は、ログイン�������フルスクリーンで表示します。
+                チェック�������場合は、ログイン�����フルスクリーン表示
         </text_editor>
         <text type="string" length="1" name="Fullscreen Aspect Ratio:">
                 全画面の縦横比：
@@ -26,7 +26,7 @@
         </combo_box>
         <check_box label="自動検出" name="aspect_auto_detect" />
         <text type="string" length="1" name="UI Size:">
-                UIサイズ:
+                UIサイズ：
         </text>
         <text type="string" length="1" name="(meters, lower is faster)">
                 （メートル、低いほど速い）
diff --git a/linden/indra/newview/skins/xui/ja/panel_preferences_graphics3.xml b/linden/indra/newview/skins/xui/ja/panel_preferences_graphics3.xml
index 2d538b5..7a373e3 100644
--- a/linden/indra/newview/skins/xui/ja/panel_preferences_graphics3.xml
+++ b/linden/indra/newview/skins/xui/ja/panel_preferences_graphics3.xml
@@ -49,7 +49,7 @@
         <text type="string" length="1" name="(lower is faster)" left="223" >
                 （低いほど速い）
         </text>
-        <spinner label="デバッグ用標識���イン���幅:" name="debug beacon line width" label_width="148" width="208"/>
+        <spinner label="デバッグ用標識線の幅：" name="debug beacon line width" label_width="148" width="208"/>
         <check_box
              label="次回起動時にグラフィック・ハードウェアを自動検出"
              name="probe_hardware_checkbox" left="160"
diff --git a/linden/indra/newview/skins/xui/ja/panel_toolbar.xml b/linden/indra/newview/skins/xui/ja/panel_toolbar.xml
index 38bcb69..9f21fa1 100644
--- a/linden/indra/newview/skins/xui/ja/panel_toolbar.xml
+++ b/linden/indra/newview/skins/xui/ja/panel_toolbar.xml
@@ -7,7 +7,7 @@
         </string>
         <button label="コミュニケート" name="communicate_btn"
              tool_tip="フレンドやグループとコミュケート。" />
-        <button label="チャット" name="chat_btn"
+        <button label="" name="chat_btn"
              tool_tip="チャット・バーを表示します。(Enter)" />
         <button label="フレンド" name="friends_btn"
              tool_tip="フレンドを探して会話する" />
diff --git a/linden/indra/newview/skins/xui/ko/floater_about_land.xml b/linden/indra/newview/skins/xui/ko/floater_about_land.xml
index 52b7e2e..aabaffa 100644
--- a/linden/indra/newview/skins/xui/ko/floater_about_land.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_about_land.xml
@@ -14,14 +14,14 @@
                         <text type="string" length="1" name="OwnerText">
                                 Leyla Linden
                         </text>
-                        <button label="프로필…" label_selected="프로필…" name="Profile..." />
+                        <button label="프로필" label_selected="프로필" name="Profile..." />
                         <text type="string" length="1" name="Group:">
                                 그룹:
                         </text>
-                        <button label="설정…" label_selected="설정…" name="Set..." />
+                        <button label="설정" label_selected="설정" name="Set..." />
                         <check_box label="그룹에 양도 허용" name="check deed"
                              tool_tip="그룹 운영진은 이 토지가 그룹의 토지 할당으로 유지되도록 해당 토지를 그룹에 양도할 수 있습니다." />
-                        <button label="양도..." label_selected="양도..." name="Deed..."
+                        <button label="양도" label_selected="양도" name="Deed..."
                              tool_tip="사용자가 선택된 그룹의 운영진일 경우에만 토지를 양도할 수 있습니다." />
                         <check_box label="소유주가 양도로 기부" name="check contrib"
                              tool_tip="토지가 그룹에 양도되면, 이전 소유주는 해당 토지를 그룹을 지원하기에 충분한 토지 할당분을 기부한 셈입니다." />
@@ -34,7 +34,7 @@
                         <text type="string" length="1" name="For Sale: Price L$[PRICE].">
                                 가격: L$[PRICE].
                         </text>
-                        <button label="토지 판매…" label_selected="토지 판매…" name="Sell Land..." />
+                        <button label="토지 판매" label_selected="토지 판매" name="Sell Land..." />
                         <text type="string" length="1" name="For sale to">
                                 판매 대상: [BUYER]
                         </text>
@@ -64,18 +64,18 @@
                         <text type="string" length="1" name="DwellText">
                                 거짓
                         </text>
-                        <button label="토지 구매하기..." label_selected="토지 구매하기..."
+                        <button label="토지 구매하기" label_selected="토지 구매하기"
                              name="Buy Land..." />
-                        <button label="그룹 토지 구매..." label_selected="그룹 토지 구매..."
+                        <button label="그룹 토지 구매" label_selected="그룹 토지 구매"
                              name="Buy For Group..." />
-                        <button label="패스 구매하기..." label_selected="패스 구매하기..."
+                        <button label="패스 구매하기" label_selected="패스 구매하기"
                              name="Buy Pass..."
                              tool_tip="패스는 이 토지에 대한 임시 통행권을 부여합니다." />
-                        <button label="토지 버리기..." label_selected="토지 버리기..."
+                        <button label="토지 버리기" label_selected="토지 버리기"
                              name="Abandon Land..." />
-                        <button label="토지 재청구…" label_selected="토지 재청구…"
+                        <button label="토지 재청구" label_selected="토지 재청구"
                              name="Reclaim Land..." />
-                        <button label="린든 판매…" label_selected="린든 판매…"
+                        <button label="린든 판매" label_selected="린든 판매"
                              name="Linden Sale..."
                              tool_tip="토지는 소유 상태여야 하며, 컨탠츠가 설정되어야 하며, 비경매상태 이어야 합니다." />
                         <text name="new users only">
@@ -197,7 +197,7 @@
                                 [COUNT]
                         </text>
                         <button label="표시" label_selected="표시" name="ShowOwner" />
-                        <button label="반환…" label_selected="반환…" name="ReturnOwner..."
+                        <button label="반환" label_selected="반환" name="ReturnOwner..."
                              tool_tip="오브젝트를 각 소유자에게 반환." />
                         <text type="string" length="1" name="Set to group:">
                                 그룹으로 설정:
@@ -206,7 +206,7 @@
                                 [COUNT]
                         </text>
                         <button label="표시" label_selected="표시" name="ShowGroup" />
-                        <button label="반환…" label_selected="반환…" name="ReturnGroup..."
+                        <button label="반환" label_selected="반환" name="ReturnGroup..."
                              tool_tip="오브젝트를 각 소유자에게 반환." />
                         <text type="string" length="1" name="Owned by others:">
                                 다른 사람이 소유:
@@ -215,7 +215,7 @@
                                 [COUNT]
                         </text>
                         <button label="표시" label_selected="표시" name="ShowOther" />
-                        <button label="반환…" label_selected="반환…" name="ReturnOther..."
+                        <button label="반환" label_selected="반환" name="ReturnOther..."
                              tool_tip="오브젝트를 각 소유자에게 반환." />
                         <text type="string" length="1" name="Selected / sat upon:">
                                 선택 / 차지:
@@ -232,7 +232,7 @@
                         </text>
                         <button label="목록 새로 고침" label_selected="목록 새로 고침"
                              name="Refresh List" />
-                        <button label="오브젝트 반환…" label_selected="오브젝트 반환…"
+                        <button label="오브젝트 반환" label_selected="오브젝트 반환"
                              name="Return objects..." />
                         <button label="" label_selected="" name="Type" tool_tip="유형 기준 정렬" />
                         <button label="이름" label_selected="이름" name="Name"
@@ -429,9 +429,9 @@
                         <name_list name="AccessList" tool_tip="([LISTED] 목록에 있음, [MAX] 최대)">
                                 <column label="허용된 주민" name="name" />
                         </name_list>
-                        <button label="추가..." label_selected="추가..." name="Add..." />
+                        <button label="추가" label_selected="추가" name="Add..." />
                         <button label="제거" label_selected="제거" name="Remove" />
-                        <check_box label="다��� ������자에게 통행권 판���:" name="PassCheck"
+                        <check_box label="���근 허용 ���상:" name="PassCheck"
                              tool_tip="이 구획에 대한 임시 통행권 부여" />
                         <spinner label="가격 (L$):" name="PriceSpin" />
                         <spinner label="사용시간:" name="HoursSpin" />
@@ -445,7 +445,7 @@
                         <name_list name="LandBanList">
                                 <column label="출입금지된 주민" name="name" />
                         </name_list>
-                        <button label="추가..." label_selected="추가..." name="Add..." />
+                        <button label="추가" label_selected="추가" name="Add..." />
                         <button label="제거" label_selected="제거" name="Remove" />
                         <text type="string" length="1" name="Deny by Payment Status:">
                                 지불 상태별로 출입 거부
diff --git a/linden/indra/newview/skins/xui/ko/floater_buy_currency.xml b/linden/indra/newview/skins/xui/ko/floater_buy_currency.xml
index 23c552e..4e29f0a 100644
--- a/linden/indra/newview/skins/xui/ko/floater_buy_currency.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_buy_currency.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="buy currency" title="린든달러(L$) 구매">
         <text name="info_buying">
-                린든달러(L$) 구매:
+                린든달러(L$) 구매
         </text>
         <text name="info_cannot_buy">
-                지금 구입할 ��� 없음:
+                린든달러(L$) 구매 ��가
         </text>
         <text name="info_need_more">
-                린든달러(L$)가 ��� 필���합니다:
+                린든달러(L$) ������
         </text>
         <text name="error_message">
                 문제가 발생했습니다.
@@ -23,7 +23,7 @@
                 [NAME] L$ [PRICE]
         </text>
         <text name="currency_action">
-                린든달러(L$) 구매
+                구매 액
         </text>
         <line_editor name="currency_amt">
                 1234
@@ -32,26 +32,26 @@
                 약 US$ [USD]
         </text>
         <text name="balance_label">
-                귀���의 ��재 보유 상황
+                현재 보유 린든달러(L$)
         </text>
         <text name="balance_amount">
                 L$ [AMT]
         </text>
         <text name="buying_label">
-                구매 중��������.
+                구매 중��� ���������러(L$)
         </text>
         <text name="buying_amount">
                 L$ [AMT]
         </text>
         <text name="total_label">
-                ������의 잔고는
+                ���매��� 잔고
         </text>
         <text name="total_amount">
                 L$ [AMT]
         </text>
         <text name="purchase_warning_repurchase">
-                이 구매��� 확인하��� ���든달러(L$) 구매만 수행됩니다.
-��� ���업을 다시 시도해야 합니다.
+                구매��� 린든달러(L$) 구매만 수행됩니다.
+작업을 다시 시도해야 합니다.
         </text>
         <text name="purchase_warning_notenough">
                 충분한 린든달러를 구매하지 않았습니다.
diff --git a/linden/indra/newview/skins/xui/ko/floater_customize.xml b/linden/indra/newview/skins/xui/ko/floater_customize.xml
index d1c939d..41e8ee2 100644
--- a/linden/indra/newview/skins/xui/ko/floater_customize.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_customize.xml
@@ -35,22 +35,22 @@
                                 [DESC]: 착용 안 함
                         </text>
                         <text type="string" length="1" name="path">
-                                [PATH]에 ��������
+                                [PATH] 에 ��������
                         </text>
                         <text type="string" length="1" name="not worn instructions">
-                                인벤토리로부��� 새 모습을 드래그하여 
+                                인벤토리에��� 새 모습을 드래그하여 
  아바타에 적용해 보십시오.. 또는, 
- 조절 슬라이더로 새로운 형태를 만들어 사용할 수도 있습니다.
+ 조절 슬라이더로 새로운 형태를 만들어 사용할 수 있습니다.
                         </text>
                         <text type="string" length="1" name="no modify instructions">
                                 이 착용물을 수정할 권한이 없습니다.
                         </text>
                         <button label="새 외형 만들기" label_selected="새 외형 만들기"
                              name="Create New" />
-                        <button label="벗기" label_selected="벗기" name="Take Off" />
-                        <button label="저장" label_selected="저장" name="Save"  left="73" />
-                        <button label="다른 이름으로 저장" label_selected="다른 이름으로 저장"
-                             name="Save As" width="132" left="161" />
+                        <button label="벗기" label_selected="벗기" name="Take Off" width="82" left="13"/>
+                        <button label="저장" label_selected="저장" name="Save" width="82" left="103"/>
+                        <button label="다른 이름 저장" label_selected="다른 이름 저장" 
+                                name="Save As"  width="100" left="192"/>
                 </panel>
                 <panel label="피부" name="Skin">
                         <button label="피부색" label_selected="피부색" name="Skin Color" />
@@ -70,12 +70,12 @@
                                 [DESC]: 착용 안 함
                         </text>
                         <text type="string" length="1" name="path">
-                                [PATH]에 ��������
+                                [PATH] 에 ��������
                         </text>
                         <text type="string" length="1" name="not worn instructions">
-                                인벤토리로부��� 새 피부를 드래그하여 
+                                인벤토리에��� 새 피부를 드래그하여 
  아바타에 적용해 보십시오.또는, 
- 조절 슬라이더로 새로운 형태를 만들어 사용할 수도 있습니다.
+ 조절 슬라이더로 새로운 형태를 만들어 사용할 수 있습니다.
                         </text>
                         <text type="string" length="1" name="no modify instructions">
                                 이 착용물을 수정할 권한이 없습니다.
@@ -89,10 +89,10 @@
                         <button label="무작위" label_selected="무작위" name="Randomize" />
                         <button label="새 피부 만들기" label_selected="새 피부 만들기"
                              name="Create New" />
-                        <button label="벗기" label_selected="벗기" name="Take Off" />
-                        <button label="저장" label_selected="저장" name="Save" />
-                        <button label="다른 이름으로 저장" label_selected="다른 이름으로 저장"
-                             name="Save As" />
+                        <button label="벗기" label_selected="벗기" name="Take Off" width="82" left="13"/>
+                        <button label="저장" label_selected="저장" name="Save" width="82" left="103"/>
+                        <button label="다른 이름 저장" label_selected="다른 이름 저장"
+                             name="Save As"  width="100" left="192"/>
                         <button label="되돌리기" label_selected="되돌리기" name="Revert" />
                 </panel>
                 <panel label="헤어" name="Hair">
@@ -113,12 +113,12 @@
                                 [DESC]: 착용 안 함
                         </text>
                         <text type="string" length="1" name="path">
-                                [PATH]에 ��������
+                                [PATH] 에 ��������
                         </text>
                         <text type="string" length="1" name="not worn instructions">
-                                인벤토리로부��� 새로운 헤어를 드래그하여 
+                                인벤토리에��� 새로운 헤어를 드래그하여 
  아바타에 적용해 보십시오.또는, 
- 조절 슬라이더로 새로운 형태를 만들어 사용할 수도 있습니다.
+ 조절 슬라이더로 새로운 형태를 만들어 사용할 수 있습니다.
                         </text>
                         <text type="string" length="1" name="no modify instructions">
                                 이 착용물을 수정할 권한이 없습니다.
@@ -128,10 +128,10 @@
                         <button label="무작위" label_selected="무작위" name="Randomize" />
                         <button label="새 헤어 만들기" label_selected="새 헤어 만들기"
                              name="Create New" />
-                        <button label="벗기" label_selected="벗기" name="Take Off" />
-                        <button label="저장" label_selected="저장" name="Save" />
-                        <button label="다른 이름으로 저장" label_selected="다른 이름으로 저장"
-                             name="Save As" />
+                        <button label="벗기" label_selected="벗기" name="Take Off" width="82" left="13"/>
+                        <button label="저장" label_selected="저장" name="Save" width="82" left="103"/>
+                        <button label="다른 이름 저장" label_selected="다른 이름 저장"
+                             name="Save As"  width="100" left="192"/>
                         <button label="되돌리기" label_selected="되돌리기" name="Revert" />
                 </panel>
                 <panel label="눈" name="Eyes">
@@ -148,12 +148,12 @@
                                 [DESC]: 착용 안 함
                         </text>
                         <text type="string" length="1" name="path">
-                                [PATH]에 ��������
+                                [PATH] 에 ��������
                         </text>
                         <text type="string" length="1" name="not worn instructions">
-                                인벤토리로부��� 새  눈을 드래그하여 
+                                인벤토리에��� 새  눈을 드래그하여 
  아바타에 적용해 보십시오.또는, 
- 조절 슬라이더로 새로운 형태를 만들어 사용할 수도 있습니다.
+ 조절 슬라이더로 새로운 형태를 만들어 사용할 수 있습니다.
                         </text>
                         <text type="string" length="1" name="no modify instructions">
                                 이 착용물을 수정할 권한이 없습니다.
@@ -162,10 +162,10 @@
                              tool_tip="그림을 선택하려면 클릭 하십시오." />
                         <button label="무작위" label_selected="무작위" name="Randomize" />
                         <button label="새 눈 만들기" label_selected="새 눈 만들기" name="Create New" />
-                        <button label="벗기" label_selected="벗기" name="Take Off" />
-                        <button label="저장" label_selected="저장" name="Save" />
-                        <button label="다른 이름으로 저장" label_selected="다른 이름으로 저장"
-                             name="Save As" />
+                        <button label="벗기" label_selected="벗기" name="Take Off" width="82" left="13"/>
+                        <button label="저장" label_selected="저장" name="Save" width="82" left="103"/>
+                        <button label="다른 이름 저장" label_selected="다른 이름 저장"
+                             name="Save As"  width="100" left="192"/>
                         <button label="되돌리기" label_selected="되돌리기" name="Revert" />
                 </panel>
                 <panel label="의상" />
@@ -176,10 +176,10 @@
                              tool_tip="색 관리기를 열려면 클릭 하십시오." />
                         <button label="새 셔츠 만들기" label_selected="새 셔츠 만들기"
                              name="Create New" />
-                        <button label="벗기" label_selected="벗기" name="Take Off" />
-                        <button label="저장" label_selected="저장" name="Save" />
-                        <button label="다른 이름으로 저장" label_selected="다른 이름으로 저장"
-                             name="Save As" />
+                        <button label="벗기" label_selected="벗기" name="Take Off" width="82" left="13"/>
+                        <button label="저장" label_selected="저장" name="Save" width="82" left="103"/>
+                        <button label="다른 이름 저장" label_selected="다른 이름 저장"
+                             name="Save As"  width="100" left="192"/>
                         <button label="되돌리기" label_selected="되돌리기" name="Revert" />
                         <text type="string" length="1" name="title">
                                 [DESC]
@@ -194,11 +194,11 @@
                                 [DESC]: 착용 안 함
                         </text>
                         <text type="string" length="1" name="path">
-                                [PATH]에 ��������
+                                [PATH] 에 ��������
                         </text>
                         <text type="string" length="1" name="not worn instructions">
-                                인벤토리로부터 새 셔츠를 드래그하여 아바타에 적용해 보십시오.또는, 
- 조절 슬라이더로 새로운 형태를 만들어 ���용할 ���도 있습니다.
+                                인벤토리에서 새 셔츠를 드래그하여 아바타에 적용 하시거나, 
+조절 슬라이더로 새로운 형태를 만들 수 있습니다.
                         </text>
                         <text type="string" length="1" name="no modify instructions">
                                 이 착용물을 수정할 권한이 없습니다.
@@ -211,11 +211,11 @@
                              tool_tip="색 관리기를 열려면 클릭 하십시오." />
                         <button label="새 바지 만들기" label_selected="새 바지 만들기"
                              name="Create New" />
-                        <button label="벗기" label_selected="벗기" name="Take Off" />
-                        <button label="저장" label_selected="저장" name="Save" />
-                        <button label="다른 이름으로 저장" label_selected="다른 이름으로 저장"
-                             name="Save As" />
-                        <button label="되돌리기" label_selected="되돌리기" name="Revert" />
+                        <button label="벗기" label_selected="벗기" name="Take Off" width="82" left="13"/>
+                    <button label="저장" label_selected="저장" name="Save" width="82" left="103"/>
+                    <button label="다른 이름 저장" label_selected="다른 이름 저장"
+                                name="Save As" width="100" left="192"/>
+                    <button label="되돌리기" label_selected="되돌리기" name="Revert" />
                         <text type="string" length="1" name="title">
                                 [DESC]
                         </text>
@@ -229,12 +229,12 @@
                                 [DESC]: 착용 안 함
                         </text>
                         <text type="string" length="1" name="path">
-                                [PATH]에 ��������
+                                [PATH] 에 ��������
                         </text>
                         <text type="string" length="1" name="not worn instructions">
-                                인벤토리로부��� 새 바지를 드래그하여 
+                                인벤토리에��� 새 바지를 드래그하여 
  아바타에 적용해 보십시오.또는, 
- 조절 슬라이더로 새로운 형태를 만들어 사용할 수도 있습니다.
+ 조절 슬라이더로 새로운 형태를 만들어 사용할 수 있습니다.
                         </text>
                         <text type="string" length="1" name="no modify instructions">
                                 이 착용물을 수정할 권한이 없습니다.
@@ -254,11 +254,11 @@
                                 [DESC]: 착용 안 함
                         </text>
                         <text type="string" length="1" name="path">
-                                [PATH]에 ��������
+                                [PATH] 에 ��������
                         </text>
                         <text type="string" length="1" name="not worn instructions">
-                                인벤토리로부터 새 신발을 드래그하여 아바타에 적용해 보십시오. 또는, 
- 조절 슬라이더로 새로운 형태를 만들어 사용할 수도 있습니다.
+                                인벤토리에서 새 신발을 드래그하여 아바타에 적용해 보십시오. 또는, 
+ 조절 슬라이더로 새로운 형태를 만들어 사용할 수 있습니다.
                         </text>
                         <text type="string" length="1" name="no modify instructions">
                                 이 착용물을 수정할 권한이 없습니다.
@@ -269,10 +269,10 @@
                              tool_tip="색 관리기를 열려면 클릭 하십시오." />
                         <button label="새 신발 만들기" label_selected="새 신발 만들기"
                              name="Create New" />
-                        <button label="벗기" label_selected="벗기" name="Take Off" />
-                        <button label="저장" label_selected="저장" name="Save" />
-                        <button label="다른 이름으로 저장" label_selected="다른 이름으로 저장"
-                             name="Save As" />
+                        <button label="벗기" label_selected="벗기" name="Take Off" width="82" left="13"/>
+                        <button label="저장" label_selected="저장" name="Save" width="82" left="103"/>
+                        <button label="다른 이름 저장" label_selected="다른 이름 저장"
+                             name="Save As"  width="100" left="192"/>
                         <button label="되돌리기" label_selected="되돌리기" name="Revert" />
                 </panel>
                 <panel label="양말" name="Socks">
@@ -289,12 +289,12 @@
                                 [DESC]: 착용 안 함
                         </text>
                         <text type="string" length="1" name="path">
-                                [PATH]에 ��������
+                                [PATH] 에 ��������
                         </text>
                         <text type="string" length="1" name="not worn instructions">
-                                인벤토리로부��� 새 양말을 드래그하여 
+                                인벤토리에��� 새 양말을 드래그하여 
  아바타에 적용해 보십시오.또는, 
- 조절 슬라이더로 새로운 형태를 만들어 사용할 수도 있습니다.
+ 조절 슬라이더로 새로운 형태를 만들어 사용할 수 있습니다.
                         </text>
                         <text type="string" length="1" name="no modify instructions">
                                 이 착용물을 수정할 권한이 없습니다.
@@ -305,10 +305,10 @@
                              tool_tip="색 관리기를 열려면 클릭 하십시오." />
                         <button label="새 양말 만들기" label_selected="새 양말 만들기"
                              name="Create New" />
-                        <button label="벗기" label_selected="벗기" name="Take Off" />
-                        <button label="저장" label_selected="저장" name="Save" />
-                        <button label="다른 이름으로 저장" label_selected="다른 이름으로 저장"
-                             name="Save As" />
+                        <button label="벗기" label_selected="벗기" name="Take Off" width="82" left="13"/>
+                        <button label="저장" label_selected="저장" name="Save" width="82" left="103"/>
+                        <button label="다른 이름 저장" label_selected="다른 이름 저장"
+                             name="Save As"  width="100" left="192"/>
                         <button label="되돌리기" label_selected="되돌리기" name="Revert" />
                 </panel>
                 <panel label="재킷" name="Jacket">
@@ -325,12 +325,12 @@
                                 [DESC]: 착용 안 함
                         </text>
                         <text type="string" length="1" name="path">
-                                [PATH]에 ��������
+                                [PATH] 에 ��������
                         </text>
                         <text type="string" length="1" name="not worn instructions">
-                                인벤토리로부��� 새 재킷을 드래그하여 
+                                인벤토리에��� 새 재킷을 드래그하여 
  아바타에 적용해 보십시오.또는, 
- 조절 슬라이더로 새로운 형태를 만들어 사용할 수도 있습니다.
+ 조절 슬라이더로 새로운 형태를 만들어 사용할 수 있습니다.
                         </text>
                         <text type="string" length="1" name="no modify instructions">
                                 이 착용물을 수정할 권한이 없습니다.
@@ -343,10 +343,10 @@
                              tool_tip="색 관리기를 열려면 클릭 하십시오." />
                         <button label="새 재킷 만들기" label_selected="새 재킷 만들기"
                              name="Create New" />
-                        <button label="벗기" label_selected="벗기" name="Take Off" />
-                        <button label="저장" label_selected="저장" name="Save" />
-                        <button label="다른 이름으로 저장" label_selected="다른 이름으로 저장"
-                             name="Save As" />
+                        <button label="벗기" label_selected="벗기" name="Take Off" width="82" left="13"/>
+                        <button label="저장" label_selected="저장" name="Save" width="82" left="103"/>
+                        <button label="다른 이름 저장" label_selected="다른 이름 저장"
+                             name="Save As"  width="100" left="192"/>
                         <button label="되돌리기" label_selected="되돌리기" name="Revert" />
                 </panel>
                 <panel label="장갑" name="Gloves">
@@ -363,11 +363,11 @@
                                 [DESC]: 착용 안 함
                         </text>
                         <text type="string" length="1" name="path">
-                                [PATH]에 ��������
+                                [PATH] 에 ��������
                         </text>
                         <text type="string" length="1" name="not worn instructions">
-                                인벤토리로부터 새 장갑을 드래그하여 아바타에 적용해 보십시오.또는, 
- 조절 슬라이더로 새로운 형태를 만들어 사용할 수도 있습니다.
+                                인벤토리에서 새 장갑을 드래그하여 아바타에 적용해 보십시오.또는, 
+ 조절 슬라이더로 새로운 형태를 만들어 사용할 수 있습니다.
                         </text>
                         <text type="string" length="1" name="no modify instructions">
                                 이 착용물을 수정할 권한이 없습니다.
@@ -378,10 +378,10 @@
                              tool_tip="색 관리기를 열려면 클릭 하십시오." />
                         <button label="새 장갑 만들기" label_selected="새 장갑 만들기"
                              name="Create New" />
-                        <button label="벗기" label_selected="벗기" name="Take Off" />
-                        <button label="저장" label_selected="저장" name="Save" />
-                        <button label="다른 이름으로 저장" label_selected="다른 이름으로 저장"
-                             name="Save As" />
+                        <button label="벗기" label_selected="벗기" name="Take Off" width="82" left="13"/>
+                        <button label="저장" label_selected="저장" name="Save" width="82" left="103"/>
+                        <button label="다른 이름 저장" label_selected="다른 이름 저장"
+                             name="Save As"  width="100" left="192"/>
                         <button label="되돌리기" label_selected="되돌리기" name="Revert" />
                 </panel>
                 <panel label="내의(상)" name="Undershirt">
@@ -398,12 +398,12 @@
                                 [DESC]: 착용 안 함
                         </text>
                         <text type="string" length="1" name="path">
-                                [PATH]에 ��������
+                                [PATH] 에 ��������
                         </text>
                         <text type="string" length="1" name="not worn instructions">
-                                인벤토리로부��� 새 내의(상)을 드래그하여 
+                                인벤토리에��� 새 내의(상)을 드래그하여 
  아바타에 적용해 보십시오.또는, 
- 조절 슬라이더로 새로운 형태를 만들어 사용할 수도 있습니다.
+ 조절 슬라이더로 새로운 형태를 만들어 사용할 수 있습니다.
                         </text>
                         <text type="string" length="1" name="no modify instructions">
                                 이 착용물을 수정할 권한이 없습니다.
@@ -414,10 +414,10 @@
                              tool_tip="색 관리기를 열려면 클릭 하십시오." />
                         <button label="새 내의(상) 만들기" label_selected="새 내의(상) 만들기"
                              name="Create New" />
-                        <button label="벗기" label_selected="벗기" name="Take Off" />
-                        <button label="저장" label_selected="저장" name="Save" />
-                        <button label="다른 이름으로 저장" label_selected="다른 이름으로 저장"
-                             name="Save As" />
+                        <button label="벗기" label_selected="벗기" name="Take Off" width="82" left="13"/>
+                        <button label="저장" label_selected="저장" name="Save" width="82" left="103"/>
+                        <button label="다른 이름 저장" label_selected="다른 이름 저장"
+                             name="Save As"  width="100" left="192"/>
                         <button label="되돌리기" label_selected="되돌리기" name="Revert" />
                 </panel>
                 <panel label="내의(하)" name="Underpants">
@@ -434,12 +434,12 @@
                                 [DESC]: 착용 안 함
                         </text>
                         <text type="string" length="1" name="path">
-                                [PATH]에 ��������
+                                [PATH] 에 ��������
                         </text>
                         <text type="string" length="1" name="not worn instructions">
-                                인벤토리로부��� 새 내의(하)을 드래그하여 
+                                인벤토리에��� 새 내의(하)을 드래그하여 
  아바타에 적용해 보십시오.또는, 
- 조절 슬라이더로 새로운 형태를 만들어 사용할 수도 있습니다.
+ 조절 슬라이더로 새로운 형태를 만들어 사용할 수 있습니다.
                         </text>
                         <text type="string" length="1" name="no modify instructions">
                                 이 착용물을 수정할 권한이 없습니다.
@@ -450,10 +450,10 @@
                              tool_tip="색 관리기를 열려면 클릭 하십시오." />
                         <button label="새 내의(하) 만들기" label_selected="새 내의(하) 만들기"
                              name="Create New" />
-                        <button label="벗기" label_selected="벗기" name="Take Off" />
-                        <button label="저장" label_selected="저장" name="Save" />
-                        <button label="다른 이름으로 저장" label_selected="다른 이름으로 저장"
-                             name="Save As" />
+                        <button label="벗기" label_selected="벗기" name="Take Off" width="82" left="13"/>
+                        <button label="저장" label_selected="저장" name="Save" width="82" left="103"/>
+                        <button label="다른 이름 저장" label_selected="다른 이름 저장"
+                             name="Save As"  width="100" left="192"/>
                         <button label="되돌리기" label_selected="되돌리기" name="Revert" />
                 </panel>
                 <panel label="치마" name="Skirt">
@@ -470,12 +470,12 @@
                                 [DESC]: 착용 안 함
                         </text>
                         <text type="string" length="1" name="path">
-                                [PATH]에 ��������
+                                [PATH] 에 ��������
                         </text>
                         <text type="string" length="1" name="not worn instructions">
-                                인벤토리로부��� 새 스커트를 드래그하여 
+                                인벤토리에��� 새 스커트를 드래그하여 
  아바타에 적용해 보십시오.또는, 
- 조절 슬라이더로 새로운 형태를 만들어 사용할 수도 있습니다.
+ 조절 슬라이더로 새로운 형태를 만들어 사용할 수 있습니다.
                         </text>
                         <text type="string" length="1" name="no modify instructions">
                                 이 착용물을 수정할 권한이 없습니다.
@@ -486,10 +486,10 @@
                              tool_tip="색 관리기를 열려면 클릭 하십시오." />
                         <button label="새 치마 만들기" label_selected="새 치마 만들기"
                              name="Create New" />
-                        <button label="벗기" label_selected="벗기" name="Take Off" />
-                        <button label="저장" label_selected="저장" name="Save" />
-                        <button label="다른 이름으로 저장" label_selected="다른 이름으로 저장"
-                             name="Save As" />
+                        <button label="벗기" label_selected="벗기" name="Take Off" width="82" left="13"/>
+                        <button label="저장" label_selected="저장" name="Save" width="82" left="103"/>
+                        <button label="다른 이름 저장" label_selected="다른 이름 저장"
+                             name="Save As"  width="100" left="192"/>
                         <button label="되돌리기" label_selected="되돌리기" name="Revert" />
                 </panel>
         </tab_container>
diff --git a/linden/indra/newview/skins/xui/ko/floater_directory.xml b/linden/indra/newview/skins/xui/ko/floater_directory.xml
index 646976b..aaa7c07 100644
--- a/linden/indra/newview/skins/xui/ko/floater_directory.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_directory.xml
@@ -58,7 +58,7 @@
                         </combo_box>
                         <check_box label="성인용 컨텐츠 포함" name="mature_check" />
                         <text name="loading_text">
-                                로딩 중...
+                                로딩 중
                         </text>
                         <text name="done_text">
                                 완료
@@ -69,10 +69,10 @@
                 </panel>
                 <panel label="광고" name="classified_panel">
                         <string name="searching_text">
-                                검색...
+                                검색
                         </string>
                         <string name="not_found_text">
-                                발견되지 않음.
+                                발견되지 않음
                         </string>
                         <button label="&lt; 이전" label_selected="&lt; 이전" name="&lt; Prev" />
                         <button label="다음 &gt;" label_selected="다음 &gt;" name="Next &gt;" />
@@ -126,10 +126,10 @@
                 </panel>
                 <panel label="이벤트" name="events_panel">
                         <string name="searching_text">
-                                검색...
+                                검색
                         </string>
                         <string name="not_found_text">
-                                발견되지 않음.
+                                발견되지 않음
                         </string>
                         <radio_group name="date_mode">
                                 <radio_item name="current">
@@ -208,10 +208,10 @@
                 </panel>
                 <panel label="인기 장소" name="popular_panel">
                         <string name="searching_text">
-                                검색...
+                                검색
                         </string>
                         <string name="not_found_text">
-                                발견되지 않음.
+                                발견되지 않음
                         </string>
                         <button label="&lt; 이전" label_selected="&lt; 이전" name="&lt; Prev" />
                         <button label="다음 &gt;" label_selected="다음 &gt;" name="Next &gt;" />
@@ -219,7 +219,8 @@
                         <check_box label="성인 컨텐츠가 있는 구획 포함" name="incmature" />
                         <text
                              name="These are the most popular places in the world, as measured by traffic,         the amount of time people spend there.">
-                                본 장소들은 통행량(주민들이 해당장소에서 머무는 시간 기준)에 따른 가장 인기 있는 장소들입니다.
+                                본 장소들은 통행량에 따른 가장 인기 있는 장소들입니다
+(해당장소에서 머무는 시간 기준).
                         </text>
                         <scroll_list name="results">
                                 <column label="" name="icon" />
@@ -230,10 +231,10 @@
                 </panel>
                 <panel label="토지 매물" name="land_sales_panel">
                         <string name="searching_text">
-                                검색...
+                                검색
                         </string>
                         <string name="not_found_text">
-                                발견되지 않음.
+                                발견되지 않음
                         </string>
                         <button label="&lt; 이전" label_selected="&lt; 이전" name="&lt; Prev" />
                         <button label="다음 &gt;" label_selected="다음 &gt;" name="Next &gt;" />
@@ -280,10 +281,10 @@
                 </panel>
                 <panel label="장소" name="places_panel">
                         <string name="searching_text">
-                                검색...
+                                검색
                         </string>
                         <string name="not_found_text">
-                                발견되지 않음.
+                                발견되지 않음
                         </string>
                         <button label="&lt; 이전" label_selected="&lt; 이전" name="&lt; Prev" />
                         <button label="다음 &gt;" label_selected="다음 &gt;" name="Next &gt;" />
@@ -342,10 +343,10 @@
                 </panel>
                 <panel label="사람" name="people_panel">
                         <string name="searching_text">
-                                검색...
+                                검색
                         </string>
                         <string name="not_found_text">
-                                발견되지 않음.
+                                발견되지 않음
                         </string>
                         <button label="&lt; 이전" label_selected="&lt; 이전" name="&lt; Prev" />
                         <button label="다음 &gt;" label_selected="다음 &gt;" name="Next &gt;" />
@@ -361,10 +362,10 @@
                 </panel>
                 <panel label="그룹" name="groups_panel">
                         <string name="searching_text">
-                                검색...
+                                검색
                         </string>
                         <string name="not_found_text">
-                                발견되지 않음.
+                                발견되지 않음
                         </string>
                         <button label="&lt; 이전" label_selected="&lt; 이전" name="&lt; Prev" />
                         <button label="다음 &gt;" label_selected="다음 &gt;" name="Next &gt;" />
@@ -383,10 +384,10 @@
                 </panel>
                 <panel label="전체(구)" name="find_all_old_panel">
                         <string name="searching_text">
-                                검색...
+                                검색
                         </string>
                         <string name="not_found_text">
-                                발견되지 않음.
+                                발견되지 않음
                         </string>
                         <button label="&lt; 이전" label_selected="&lt; 이전" name="&lt; Prev" />
                         <button label="다음 &gt;" label_selected="다음 &gt;" name="Next &gt;" />
diff --git a/linden/indra/newview/skins/xui/ko/floater_gesture.xml b/linden/indra/newview/skins/xui/ko/floater_gesture.xml
index 063dd97..00e9161 100644
--- a/linden/indra/newview/skins/xui/ko/floater_gesture.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_gesture.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="gestures" title="사용중인 제스처">
         <text name="help_label">
-                ���스처��� 클릭하거��� 키를 눌러 ���니메니���과 ���운������ 재생합니다.
+                ������을 더블클릭 ��는 키를 눌러 ��������를 재생합니다.
         </text>
         <scroll_list name="gesture_list">
                 <column label="트리거" name="trigger" />
diff --git a/linden/indra/newview/skins/xui/ko/floater_mute_object.xml b/linden/indra/newview/skins/xui/ko/floater_mute_object.xml
index 864cffb..103ea95 100644
--- a/linden/indra/newview/skins/xui/ko/floater_mute_object.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_mute_object.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>

 <floater name="mute by name" title="이름별 오브젝트 음소거">

         <text name="message">

-                이름별 음소거는 오브젝트 채팅과 메신저에만 영향을 주며 사운드에는 영향을 주지 않습니다.

-��브젝����� ���름��� 정확��게 입력해야 합니다.

+                오브젝트 채팅과 메신저에만 영향을 주며 사운드에는

+ ������� ������니다. 정확�� ���름을 ���력해야 합니다.

         </text>

         <line_editor name="object_name">

                 오브젝트 이름

diff --git a/linden/indra/newview/skins/xui/ko/panel_groups.xml b/linden/indra/newview/skins/xui/ko/panel_groups.xml
index a1cc616..2628229 100644
--- a/linden/indra/newview/skins/xui/ko/panel_groups.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_groups.xml
@@ -12,5 +12,5 @@
         <button label="활성화" name="Activate" width="90"/>

         <button label="탈퇴" name="Leave" width="90"/>

         <button label="만들기" name="Create" width="90"/>

-        <button label="검색¡¦}" name="Search..." width="90"/>

+        <button label="검색" name="Search..." width="90"/>

 </panel>

diff --git a/linden/indra/newview/skins/xui/ko/panel_toolbar.xml b/linden/indra/newview/skins/xui/ko/panel_toolbar.xml
index 40e5f0e..075fcd2 100644
--- a/linden/indra/newview/skins/xui/ko/panel_toolbar.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_toolbar.xml
@@ -4,9 +4,9 @@
         <string name="Redock Windows">
                 창 합치기
         </string>
-        <button label="통��" name="communicate_btn"
+        <button label="���뮤���케이트" name="communicate_btn"
              tool_tip="친구 및 그룹과 통신합니다." />
-        <button label="채팅" name="chat_btn" tool_tip="채팅 표시줄 표시 (입력)" />
+        <button label="" name="chat_btn" tool_tip="채팅 표시줄 표시 (입력)" />
         <button label="친구" name="friends_btn"
              tool_tip="친구를 찾아 이야기합니다." />
         <button label="비행" label_selected="비행 중지" name="fly_btn"
diff --git a/linden/indra/newview/skins/xui/ko/panel_voice_controls.xml b/linden/indra/newview/skins/xui/ko/panel_voice_controls.xml
index f079158..536581c 100644
--- a/linden/indra/newview/skins/xui/ko/panel_voice_controls.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_voice_controls.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>

 <panel name="voice_controls">

         <button name="speakers_btn" tool_tip="음성 채팅 사용 주민 보기" />

-        <button label="말하기" name="push_to_talk"

-             tool_tip="말���기를 하려면 버튼을 ������������." />

+        <button label="음성" name="push_to_talk"

+             tool_tip="음성 채���을 하려면 버튼을 클�� 하��������." />

         <button name="ptt_lock"

-             tool_tip="말���기 모드로 변경하려면 잠금을 클릭��������." />

+             tool_tip="음성 채��� 모드로 변경하려면 잠금을 클릭 ����������." />

         <button name="show_channel"

-             tool_tip="현재 음성 채널을 표시하려면 클릭하십시오." />

+             tool_tip="현재 음성 채널을 표시하려면 클릭 하십시오." />

 </panel>

diff --git a/linden/indra/test/lluri_tut.cpp b/linden/indra/test/lluri_tut.cpp
index c13a830..786df92 100644
--- a/linden/indra/test/lluri_tut.cpp
+++ b/linden/indra/test/lluri_tut.cpp
@@ -254,8 +254,8 @@ namespace tut
                                           "http:%2F%2F10.0.1.4:12032%2Fagent%2Fgod%2Fagent-id%2Fmap%2Flayer%2F%3Fresume=http:%2F%2Fstation3.ll.com:12032%2Fagent%2F203ad6df-b522-491d-ba48-4e24eb57aeff%2Fsend-postcard");
                 // French cedilla (C with squiggle, like in the word Francais) is UTF-8 C3 A7
                 std::string cedilla;
-                cedilla.push_back( 0xC3 );
-                cedilla.push_back( 0xA7 );
+                cedilla.push_back( (char)0xC3 );
+                cedilla.push_back( (char)0xA7 );
                 ensure_equals("escape UTF8", LLURI::escape( cedilla, unreserved), "%C3%A7");
         }
         
diff --git a/linden/indra/win_crash_logger/llcrashloggerwindows.cpp b/linden/indra/win_crash_logger/llcrashloggerwindows.cpp
index 65c91be..e719d30 100644
--- a/linden/indra/win_crash_logger/llcrashloggerwindows.cpp
+++ b/linden/indra/win_crash_logger/llcrashloggerwindows.cpp
@@ -319,7 +319,8 @@ bool LLCrashLoggerWindows::mainLoop()
         else if (mCrashBehavior == CRASH_BEHAVIOR_ASK)
         {
                 gHwndReport = CreateDialog(hInst, MAKEINTRESOURCE(IDD_PREVREPORTBOX), 0, NULL);
-                LRESULT result = SendDlgItemMessage(gHwndReport, IDC_CHECK_AUTO, BM_SETCHECK, 1, 0);
+                // Ignore result
+                (void) SendDlgItemMessage(gHwndReport, IDC_CHECK_AUTO, BM_SETCHECK, 1, 0);
                 // Include the product name in the caption and various dialog items.
                 ProcessCaption(gHwndReport);
                 ProcessDlgItemText(gHwndReport, IDC_STATIC_MSG);
@@ -340,6 +341,7 @@ bool LLCrashLoggerWindows::mainLoop()
                 ShowWindow(gHwndReport, SW_SHOW );
                 
                 MSG msg;
+                msg.wParam = 0;
                 while (!LLApp::isQuitting() && GetMessage(&msg, NULL, 0, 0))
                 {
                         TranslateMessage(&msg);