115 files changed, 1149 insertions, 310 deletions

diff --git a/linden/indra/llcommon/llkeythrottle.h b/linden/indra/llcommon/llkeythrottle.h
new file mode 100644
index 0000000..ded9e17
--- /dev/null
+++ b/linden/indra/llcommon/llkeythrottle.h
@@ -0,0 +1,218 @@
+/** 
+ * @file llkeythrottle.h
+ * @brief LLKeyThrottle class definition
+ *
+ * $LicenseInfo:firstyear=2005&license=internal$
+ * 
+ * Copyright (c) 2005-2007, Linden Research, Inc.
+ * 
+ * The following source code is PROPRIETARY AND CONFIDENTIAL. Use of
+ * this source code is governed by the Linden Lab Source Code Disclosure
+ * Agreement ("Agreement") previously entered between you and Linden
+ * Lab. By accessing, using, copying, modifying or distributing this
+ * software, you acknowledge that you have been informed of your
+ * obligations under the Agreement and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_LLKEY_THROTTLE_H
+#define LL_LLKEY_THROTTLE_H
+
+// LLKeyThrottle keeps track of the number of action occurences with a key value
+// for a type over a given time period.  If the rate set in the constructor is
+// exceeed, the key is considered blocked.  The transition from unblocked to
+// blocked is noted so the responsible agent can be informed.  This transition
+// takes twice the look back window to clear.
+
+#include "linden_common.h"
+
+#include "llframetimer.h"
+#include <map>
+
+
+// Implementation utility class - use LLKeyThrottle, not this
+template <class T>
+class LLKeyThrottleImpl
+{
+public:
+        struct Entry {
+                U32             count;
+                BOOL    blocked;
+
+                Entry() : count(0), blocked(FALSE) { }
+        };
+
+        typedef std::map<T, Entry> EntryMap;
+
+        EntryMap * prevMap;
+        EntryMap * currMap;
+        
+        U32 countLimit;
+                // maximum number of keys allowed per interval
+                
+        U64 interval_usec;
+                // each map covers this time period
+        U64 start_usec;
+                // currMap started counting at this time
+                // prevMap covers the previous interval
+        
+        LLKeyThrottleImpl() : prevMap(0), currMap(0) { }
+
+        static U64 getTime()
+        {
+                return LLFrameTimer::getTotalTime();
+        }
+};
+
+
+template< class T >
+class LLKeyThrottle
+{
+public:
+        LLKeyThrottle(U32 limit, F32 interval)
+                : m(* new LLKeyThrottleImpl<T>)
+        {
+                // limit is the maximum number of keys
+                // allowed per interval (in seconds)
+                m.countLimit = limit;
+                m.interval_usec = (U64)(interval * USEC_PER_SEC);
+                m.start_usec = LLKeyThrottleImpl<T>::getTime();
+
+                m.prevMap = new typename LLKeyThrottleImpl<T>::EntryMap;
+                m.currMap = new typename LLKeyThrottleImpl<T>::EntryMap;
+        }
+                
+        ~LLKeyThrottle()
+        {
+                delete m.prevMap;
+                delete m.currMap;
+                delete &m;
+        }
+
+        enum State {
+                THROTTLE_OK,                    // rate not exceeded, let pass
+                THROTTLE_NEWLY_BLOCKED, // rate exceed for the first time
+                THROTTLE_BLOCKED,               // rate exceed, block key
+        };
+
+        // call each time the key wants use
+        State noteAction(const T& id, S32 weight = 1)
+        {
+                U64 now = LLKeyThrottleImpl<T>::getTime();
+
+                if (now >= (m.start_usec + m.interval_usec))
+                {
+                        if (now < (m.start_usec + 2 * m.interval_usec))
+                        {
+                                // prune old data
+                                delete m.prevMap;
+                                m.prevMap = m.currMap;
+                                m.currMap = new typename LLKeyThrottleImpl<T>::EntryMap;
+
+                                m.start_usec += m.interval_usec;
+                        }
+                        else
+                        {
+                                // lots of time has passed, all data is stale
+                                delete m.prevMap;
+                                delete m.currMap;
+                                m.prevMap = new typename LLKeyThrottleImpl<T>::EntryMap;
+                                m.currMap = new typename LLKeyThrottleImpl<T>::EntryMap;
+
+                                m.start_usec = now;
+                        }
+                }
+
+                U32 prevCount = 0;
+                BOOL prevBlocked = FALSE;
+
+                typename LLKeyThrottleImpl<T>::EntryMap::const_iterator prev = m.prevMap->find(id);
+                if (prev != m.prevMap->end())
+                {
+                        prevCount = prev->second.count;
+                        prevBlocked = prev->second.blocked;
+                }
+
+                typename LLKeyThrottleImpl<T>::Entry& curr = (*m.currMap)[id];
+
+                bool wereBlocked = curr.blocked || prevBlocked;
+
+                curr.count += weight;
+
+                // curr.count is the number of keys in
+                // this current 'time slice' from the beginning of it until now
+                // prevCount is the number of keys in the previous
+                // time slice scaled to be one full time slice back from the current 
+                // (now) time.
+
+                // compute current, windowed rate
+                F64 timeInCurrent = ((F64)(now - m.start_usec) / m.interval_usec);
+                F64 averageCount = curr.count + prevCount * (1.0 - timeInCurrent);
+                
+                curr.blocked |= averageCount > m.countLimit;
+
+                bool nowBlocked = curr.blocked || prevBlocked;
+
+                if (!nowBlocked)
+                {
+                        return THROTTLE_OK;
+                }
+                else if (!wereBlocked)
+                {
+                        return THROTTLE_NEWLY_BLOCKED;
+                }
+                else
+                {
+                        return THROTTLE_BLOCKED;
+                }
+        }
+
+        // call to force throttle conditions for id
+        void throttleAction(const T& id)
+        {
+                noteAction(id);
+                typename LLKeyThrottleImpl<T>::Entry& curr = (*m.currMap)[id];
+                if (curr.count < m.countLimit)
+                {
+                        curr.count = m.countLimit;
+                }
+                curr.blocked = TRUE;
+        }
+
+        // returns TRUE if key is blocked
+        BOOL isThrottled(const T& id) const
+        {
+                if (m.currMap->empty()
+                        && m.prevMap->empty())
+                {
+                        // most of the time we'll fall in here
+                        return FALSE;
+                }
+
+                // NOTE, we ignore the case where id is in the map but the map is stale.  
+                // You might think that we'd stop throttling things in such a case, 
+                // however it may be that a god has disabled scripts in the region or 
+                // estate --> we probably want to report the state of the id when the 
+                // scripting engine was paused.
+                typename LLKeyThrottleImpl<T>::EntryMap::const_iterator entry = m.currMap->find(id);
+                if (entry != m.currMap->end())
+                {
+                        return entry->second.blocked;
+                }
+                entry = m.prevMap->find(id);
+                if (entry != m.prevMap->end())
+                {
+                        return entry->second.blocked;
+                }
+                return FALSE;
+        }
+
+protected:
+        LLKeyThrottleImpl<T>& m;
+};
+
+#endif
diff --git a/linden/indra/llcommon/llversionviewer.h b/linden/indra/llcommon/llversionviewer.h
index e3a4df1..e24c38b 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 = 18;
 const S32 LL_VERSION_PATCH = 5;
-const S32 LL_VERSION_BUILD = 1;
+const S32 LL_VERSION_BUILD = 2;
 
 const char * const LL_CHANNEL = "Second Life Release";
 
diff --git a/linden/indra/llui/llmenugl.cpp b/linden/indra/llui/llmenugl.cpp
index 8ec5656..d150f89 100644
--- a/linden/indra/llui/llmenugl.cpp
+++ b/linden/indra/llui/llmenugl.cpp
@@ -1421,6 +1421,7 @@ void LLMenuItemBranchGL::onVisibilityChange( BOOL new_visibility )
         {
                 mBranch->setVisible(FALSE);
         }
+        LLMenuItemGL::onVisibilityChange(new_visibility);
 }
 
 BOOL LLMenuItemBranchGL::handleKeyHere( KEY key, MASK mask, BOOL called_from_parent )
diff --git a/linden/indra/llui/llview.cpp b/linden/indra/llui/llview.cpp
index ef91d9c..9442a5c 100644
--- a/linden/indra/llui/llview.cpp
+++ b/linden/indra/llui/llview.cpp
@@ -791,6 +791,7 @@ BOOL LLView::setLabelArg(const LLString& key, const LLStringExplicit& text)
         return FALSE;
 }
 
+// virtual
 void LLView::onVisibilityChange ( BOOL new_visibility )
 {
         for ( child_list_iter_t child_it = mChildList.begin(); child_it != mChildList.end(); ++child_it)
diff --git a/linden/indra/newview/English.lproj/InfoPlist.strings b/linden/indra/newview/English.lproj/InfoPlist.strings
index a25f977..9dfdda9 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.18.5.1";
-CFBundleGetInfoString = "Second Life version 1.18.5.1, Copyright 2004-2007 Linden Research, Inc.";
+CFBundleShortVersionString = "Second Life version 1.18.5.2";
+CFBundleGetInfoString = "Second Life version 1.18.5.2, Copyright 2004-2007 Linden Research, Inc.";
diff --git a/linden/indra/newview/Info-SecondLife.plist b/linden/indra/newview/Info-SecondLife.plist
index 2c9f58a..fac66b8 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.18.5.1</string>
+        <string>1.18.5.2</string>
         <key>CSResourcesFileMapped</key>
         <true/>
 </dict>
diff --git a/linden/indra/newview/llclassifiedstatsresponder.cpp b/linden/indra/newview/llclassifiedstatsresponder.cpp
index 00b1878..d44f2cc 100644
--- a/linden/indra/newview/llclassifiedstatsresponder.cpp
+++ b/linden/indra/newview/llclassifiedstatsresponder.cpp
@@ -32,14 +32,14 @@
 #include "llview.h"
 #include "message.h"
 
-LLClassifiedStatsResponder::LLClassifiedStatsResponder(LLViewHandle classified_panel_handle)
-: mClassifiedPanelHandle(classified_panel_handle)
+LLClassifiedStatsResponder::LLClassifiedStatsResponder(LLViewHandle classified_panel_handle, LLUUID classified_id)
+: mClassifiedPanelHandle(classified_panel_handle),
+mClassifiedID(classified_id)
 {
 }
 /*virtual*/
 void LLClassifiedStatsResponder::result(const LLSD& content)
 {
-        LLUUID classified_id = content["classified_id"];
         S32 teleport = content["teleport_clicks"].asInteger();
         S32 map = content["map_clicks"].asInteger();
         S32 profile = content["profile_clicks"].asInteger();
@@ -47,16 +47,15 @@ void LLClassifiedStatsResponder::result(const LLSD& content)
         S32 search_map = content["search_map_clicks"].asInteger();
         S32 search_profile = content["search_profile_clicks"].asInteger();
 
-        std::string msg = llformat("Clicks: %d teleport, %d map, %d profile",
-                                                                        teleport + search_teleport,
-                                                                        map + search_map,
-                                                                        profile + search_profile);
-
         LLPanelClassified* classified_panelp = (LLPanelClassified*)LLPanel::getPanelByHandle(mClassifiedPanelHandle);
 
         if(classified_panelp)
         {
-                classified_panelp->setClickThroughText(msg);
+                classified_panelp->setClickThrough(mClassifiedID, 
+                                                                                        teleport + search_teleport, 
+                                                                                        map + search_map,
+                                                                                        profile + search_profile,
+                                                                                        true);
         }
 
 }
@@ -68,3 +67,4 @@ void LLClassifiedStatsResponder::error(U32 status, const std::string& reason)
                 << status << ": " << reason << ")" << llendl;
 }
 
+
diff --git a/linden/indra/newview/llclassifiedstatsresponder.h b/linden/indra/newview/llclassifiedstatsresponder.h
index c3eddbe..25579be 100644
--- a/linden/indra/newview/llclassifiedstatsresponder.h
+++ b/linden/indra/newview/llclassifiedstatsresponder.h
@@ -24,11 +24,12 @@
 
 #include "llhttpclient.h"
 #include "llview.h"
+#include "lluuid.h"
 
 class LLClassifiedStatsResponder : public LLHTTPClient::Responder
 {
 public:
-        LLClassifiedStatsResponder(LLViewHandle classified_panel_handle);
+        LLClassifiedStatsResponder(LLViewHandle classified_panel_handle, LLUUID classified_id);
         //If we get back a normal response, handle it here
         virtual void result(const LLSD& content);
         //If we get back an error (not found, etc...), handle it here
@@ -36,6 +37,7 @@ public:
 
 protected:
         LLViewHandle mClassifiedPanelHandle;
+        LLUUID mClassifiedID;
 };
 
 #endif // LL_LLCLASSIFIEDSTATSRESPONDER_H
diff --git a/linden/indra/newview/llfloaterchat.cpp b/linden/indra/newview/llfloaterchat.cpp
index b435ada..5fdbf7d 100644
--- a/linden/indra/newview/llfloaterchat.cpp
+++ b/linden/indra/newview/llfloaterchat.cpp
@@ -164,6 +164,7 @@ void LLFloaterChat::onVisibilityChange(BOOL new_visibility)
 {
         // Hide the chat overlay when our history is visible.
         gConsole->setVisible( !new_visibility );
+        LLFloater::onVisibilityChange(new_visibility);
 }
 
 
diff --git a/linden/indra/newview/llfloaterdirectory.cpp b/linden/indra/newview/llfloaterdirectory.cpp
index f386f5b..1693532 100644
--- a/linden/indra/newview/llfloaterdirectory.cpp
+++ b/linden/indra/newview/llfloaterdirectory.cpp
@@ -470,37 +470,6 @@ void LLFloaterDirectory::setVisible(BOOL visible)
         LLFloater::setVisible(visible);
 }
 
-// virtual
-void LLFloaterDirectory::setMinimized(BOOL b)
-{
-        mMinimizing = true;
-        LLFloater::setMinimized(b);
-        mMinimizing = false;
-}
-
-// virtual
-void LLFloaterDirectory::reshape(S32 width, S32 height, BOOL called_from_parent)
-{
-        // HACK: If the window (screen window) is made too small, the search floater
-        // will get resized below its minimum size, resulting in buttons hanging off
-        // the edge.  So we need to limit reshape size.
-        // BUT: Minimizing the window is considered a resize.
-        // Remove this code when DEV-5670 is fixed ("Sanitize floater sizing behavior
-        // when SL window is made very small").  JC
-        if (!mMinimizing)
-        {
-                if (width < getMinWidth())
-                {
-                        width = getMinWidth();
-                }
-                if (height < getMinHeight())
-                {
-                        height = getMinHeight();
-                }
-        }
-        LLFloater::reshape(width, height, called_from_parent);
-}
-
 void LLFloaterDirectory::onClose(bool app_quitting)
 {
         setVisible(FALSE);
diff --git a/linden/indra/newview/llfloaterdirectory.h b/linden/indra/newview/llfloaterdirectory.h
index d973f86..4b0d81e 100644
--- a/linden/indra/newview/llfloaterdirectory.h
+++ b/linden/indra/newview/llfloaterdirectory.h
@@ -62,8 +62,6 @@ public:
         /*virtual*/ ~LLFloaterDirectory();
 
         /*virtual*/ void setVisible(BOOL visible);
-        /*virtual*/ void setMinimized(BOOL minimize);
-        /*virtual*/ void reshape(S32 width, S32 height, BOOL called_from_parent);
 
         // Used for toggling God mode, which changes to visibility of 
         // some picks.
diff --git a/linden/indra/newview/llpanelclassified.cpp b/linden/indra/newview/llpanelclassified.cpp
index cb75f16..e0f750f 100644
--- a/linden/indra/newview/llpanelclassified.cpp
+++ b/linden/indra/newview/llpanelclassified.cpp
@@ -91,7 +91,8 @@ public:
                 S32 profile_clicks = atoi(strings[3].c_str());
                 LLPanelClassified::setClickThrough(classified_id, teleport_clicks,
                                                                                    map_clicks,
-                                                                                   profile_clicks);
+                                                                                   profile_clicks,
+                                                                                   false);
                 return true;
         }
 };
@@ -127,7 +128,14 @@ LLPanelClassified::LLPanelClassified(BOOL in_finder, bool from_search)
         mProfileBtn(NULL),
         mInfoText(NULL),
         mSetBtn(NULL),
-        mClickThroughText(NULL)
+        mClickThroughText(NULL),
+        mTeleportClicksOld(0),
+        mMapClicksOld(0),
+        mProfileClicksOld(0),
+        mTeleportClicksNew(0),
+        mMapClicksNew(0),
+        mProfileClicksNew(0)
+
 {
     sAllPanels.push_back(this);
 
@@ -368,16 +376,12 @@ void LLPanelClassified::setClassifiedID(const LLUUID& id)
         mClassifiedID = id;
 }
 
-void LLPanelClassified::setClickThroughText(const std::string& text)
-{
-        if(mClickThroughText)
-                this->mClickThroughText->setText(text);
-}
 //static
 void LLPanelClassified::setClickThrough(const LLUUID& classified_id,
                                                                                 S32 teleport,
                                                                                 S32 map,
-                                                                                S32 profile)
+                                                                                S32 profile,
+                                                                                bool from_new_table)
 {
         for (panel_list_t::iterator iter = sAllPanels.begin(); iter != sAllPanels.end(); ++iter)
         {
@@ -388,22 +392,29 @@ void LLPanelClassified::setClickThrough(const LLUUID& classified_id,
                         continue;
                 }
 
-                // We need to see if we should use the new stat table or the old.  
-                // If the SearchStatRequest capability exists, then the data will come
-                // from the new table.
-                std::string url = gAgent.getRegion()->getCapability("SearchStatRequest");
+                // We need to check to see if the data came from the new stat_table 
+                // or the old classified table. We also need to cache the data from 
+                // the two separate sources so as to display the aggregate totals.
 
-                if (!url.empty())
+                if (from_new_table)
                 {
-                        return;
+                        self->mTeleportClicksNew = teleport;
+                        self->mMapClicksNew = map;
+                        self->mProfileClicksNew = profile;
+                }
+                else
+                {
+                        self->mTeleportClicksOld = teleport;
+                        self->mMapClicksOld = map;
+                        self->mProfileClicksOld = profile;
                 }
 
                 if (self->mClickThroughText)
                 {
                         std::string msg = llformat("Clicks: %d teleport, %d map, %d profile",
-                                                                        teleport,
-                                                                        map,
-                                                                        profile);
+                                                                        self->mTeleportClicksNew + self->mTeleportClicksOld,
+                                                                        self->mMapClicksNew + self->mMapClicksOld,
+                                                                        self->mProfileClicksNew + self->mProfileClicksOld);
                         self->mClickThroughText->setText(msg);
                 }
         }
@@ -449,7 +460,7 @@ void LLPanelClassified::sendClassifiedInfoRequest()
                 if (!url.empty())
                 {
                         llinfos << "Classified stat request via capability" << llendl;
-                        LLHTTPClient::post(url, body, new LLClassifiedStatsResponder(this->getHandle()));
+                        LLHTTPClient::post(url, body, new LLClassifiedStatsResponder(this->getHandle(), mClassifiedID));
                 }
         }
 }
@@ -929,7 +940,6 @@ void LLPanelClassified::sendClassifiedClickMessage(const char* type)
         strings.push_back(mClassifiedID.asString());
         strings.push_back(type);
         LLUUID no_invoice;
-        send_generic_message("classifiedclick", strings, no_invoice);
 
         // New classified click-through handling
         LLSD body;
@@ -938,11 +948,16 @@ void LLPanelClassified::sendClassifiedClickMessage(const char* type)
         body["classified_id"] = mClassifiedID;
         std::string url = gAgent.getRegion()->getCapability("SearchStatTracking");
 
+        // If the capability exists send to the new database, otherwise send to the old one.
         if (!url.empty())
         {
                 llinfos << "LLPanelClassified::sendClassifiedClickMessage via capability" << llendl;
                 LLHTTPClient::post(url, body, new LLHTTPClient::Responder());
         }
+        else
+        {
+                send_generic_message("classifiedclick", strings, no_invoice);
+        }
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/linden/indra/newview/llpanelclassified.h b/linden/indra/newview/llpanelclassified.h
index 6ebac4c..a2bb29b 100644
--- a/linden/indra/newview/llpanelclassified.h
+++ b/linden/indra/newview/llpanelclassified.h
@@ -81,7 +81,7 @@ public:
         void setClassifiedID(const LLUUID& id);
         void setClickThroughText(const std::string& text);
         static void setClickThrough(const LLUUID& classified_id,
-                                                                S32 teleport, S32 map, S32 profile);
+                                                                S32 teleport, S32 map, S32 profile, bool from_new_table);
 
         // check that the title is valid (E.G. starts with a number or letter)
         BOOL titleIsValid();
@@ -129,6 +129,14 @@ protected:
         LLUUID mParcelID;
         S32 mPriceForListing;
 
+        // Needed for stat tracking
+        S32 mTeleportClicksOld;
+        S32 mMapClicksOld;
+        S32 mProfileClicksOld;
+        S32 mTeleportClicksNew;
+        S32 mMapClicksNew;
+        S32 mProfileClicksNew;
+
         // Data will be requested on first draw
         BOOL mDataRequested;
 
diff --git a/linden/indra/newview/llpaneldirbrowser.cpp b/linden/indra/newview/llpaneldirbrowser.cpp
index c4e33cb..27fb3ac 100644
--- a/linden/indra/newview/llpaneldirbrowser.cpp
+++ b/linden/indra/newview/llpaneldirbrowser.cpp
@@ -1247,6 +1247,7 @@ void LLPanelDirBrowser::onVisibilityChange(BOOL new_visibility)
         {
                 onCommitList(NULL, this);
         }
+        LLPanel::onVisibilityChange(new_visibility);
 }
 
 S32 LLPanelDirBrowser::showNextButton(S32 rows)
diff --git a/linden/indra/newview/llpaneldirfind.cpp b/linden/indra/newview/llpaneldirfind.cpp
index 24db19f..591f06d 100644
--- a/linden/indra/newview/llpaneldirfind.cpp
+++ b/linden/indra/newview/llpaneldirfind.cpp
@@ -137,6 +137,9 @@ BOOL LLPanelDirFindAll::postBuild()
                 mWebBrowser->setOpenInInternalBrowser( false );
                 mWebBrowser->setOpenInExternalBrowser( false ); 
 
+                // redirect 404 pages from S3 somewhere else
+                mWebBrowser->set404RedirectUrl( childGetText("redirect_404_url") );
+                
                 // Track updates for progress display.
                 mWebBrowser->addObserver(this);
 
diff --git a/linden/indra/newview/llpanelplace.cpp b/linden/indra/newview/llpanelplace.cpp
index d08d25e..8825ce7 100644
--- a/linden/indra/newview/llpanelplace.cpp
+++ b/linden/indra/newview/llpanelplace.cpp
@@ -89,6 +89,9 @@ BOOL LLPanelPlace::postBuild()
         mSnapshotCtrl->setEnabled(FALSE);
 
     mNameEditor = LLViewerUICtrlFactory::getTextBoxByName(this, "name_editor");
+        // Text boxes appear to have a " " in them by default.  This breaks the
+        // emptiness test for filling in data from the network.  Slam to empty.
+        mNameEditor->setText( LLString::null );
 
     mDescEditor = LLUICtrlFactory::getTextEditorByName(this, "desc_editor");
 
@@ -141,6 +144,10 @@ void LLPanelPlace::resetLocation()
         mPosGlobal.clearVec();
         mPosRegion.clearVec();
         mAuctionID = 0;
+        mNameEditor->setText( LLString::null );
+        mDescEditor->setText( LLString::null );
+        mInfoEditor->setText( LLString::null );
+        mLocationEditor->setText( LLString::null );
 }
 
 void LLPanelPlace::setParcelID(const LLUUID& parcel_id)
@@ -154,10 +161,6 @@ void LLPanelPlace::setSnapshot(const LLUUID& snapshot_id)
         mSnapshotCtrl->setImageAssetID(snapshot_id);
 }
 
-void LLPanelPlace::setName(const std::string& name)
-{
-        mNameEditor->setText(name);
-}
 
 void LLPanelPlace::setLocationString(const std::string& location)
 {
@@ -256,11 +259,17 @@ void LLPanelPlace::processParcelInfoReply(LLMessageSystem *msg, void **)
                 std::string name_str(name);
                 std::string desc_str(desc);
 
-                if(! name_str.empty() && ! self->mNameEditor->getText().empty())
+                if( !name_str.empty()
+                        && self->mNameEditor->getText().empty())
+                {
                         self->mNameEditor->setText(name_str);
+                }
 
-                if(! desc_str.empty() && ! self->mDescEditor->getText().empty())
+                if( !desc_str.empty()
+                        && self->mDescEditor->getText().empty())
+                {
                         self->mDescEditor->setText(desc_str);
+                }
 
                 LLString info_text;
                 LLUIString traffic = self->getUIString("traffic_text");
diff --git a/linden/indra/newview/llpanelplace.h b/linden/indra/newview/llpanelplace.h
index e7c17cf..c473900 100644
--- a/linden/indra/newview/llpanelplace.h
+++ b/linden/indra/newview/llpanelplace.h
@@ -64,7 +64,6 @@ public:
         void displayItemInfo(const LLInventoryItem* pItem);
         void setRegionID(const LLUUID& region_id) { mRegionID = region_id; }
         void setSnapshot(const LLUUID& snapshot_id);
-        void setName(const std::string& name);
         void setLocationString(const std::string& location);
         void setErrorStatus(U32 status, const std::string& reason);
 
diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index bd959b9..c337044 100644
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -131,6 +131,7 @@
 #include "pipeline.h"
 #include "viewer.h"
 #include "llfloaterworldmap.h"
+#include "llkeythrottle.h"
 
 #include <boost/tokenizer.hpp>
 
@@ -144,6 +145,12 @@
 const F32 BIRD_AUDIBLE_RADIUS = 32.0f;
 const F32 SIT_DISTANCE_FROM_TARGET = 0.25f;
 static const F32 LOGOUT_REPLY_TIME = 3.f;       // Wait this long after LogoutReply before quitting.
+
+// Determine how quickly residents' scripts can issue question dialogs
+// Allow bursts of up to 5 dialogs in 10 seconds. 10*2=20 seconds recovery if throttle kicks in
+static const U32 LLREQUEST_PERMISSION_THROTTLE_LIMIT    = 5;     // requests
+static const F32 LLREQUEST_PERMISSION_THROTTLE_INTERVAL = 10.0f; // seconds
+
 extern BOOL gDebugClicks;
 
 extern void bad_network_handler();
@@ -4448,6 +4455,27 @@ void process_script_question(LLMessageSystem *msg, void **user_data)
         // don't display permission requests if this object is muted - JS.
         if (gMuteListp->isMuted(taskid)) return;
 
+        // throttle excessive requests from any specific user's scripts
+        LLString throttle_owner_name = owner_name;
+        typedef LLKeyThrottle<LLString> LLStringThrottle;
+        static LLStringThrottle question_throttle( LLREQUEST_PERMISSION_THROTTLE_LIMIT, LLREQUEST_PERMISSION_THROTTLE_INTERVAL );
+
+        switch (question_throttle.noteAction(throttle_owner_name))
+        {
+                case LLStringThrottle::THROTTLE_NEWLY_BLOCKED:
+                        llinfos << "process_script_question throttled"
+                                        << " owner_name:" << owner_name
+                                        << llendl;
+                        // Fall through
+
+                case LLStringThrottle::THROTTLE_BLOCKED:
+                        // Escape altogether until we recover
+                        return;
+
+                case LLStringThrottle::THROTTLE_OK:
+                        break;
+        }
+
         LLString script_question;
         if (questions)
         {
diff --git a/linden/indra/newview/llwebbrowserctrl.cpp b/linden/indra/newview/llwebbrowserctrl.cpp
index ca03f48..879d229 100644
--- a/linden/indra/newview/llwebbrowserctrl.cpp
+++ b/linden/indra/newview/llwebbrowserctrl.cpp
@@ -183,7 +183,7 @@ BOOL LLWebBrowserCtrl::handleScrollWheel( S32 x, S32 y, S32 clicks )
 
         // note: this isn't really necessary right now since the page is updated
         // on a timer but if that becomes too burdensome and the page is only updated
-        // once after load then this will be nexessary
+        // once after load then this will be necessary
         LLMozLib::getInstance()->grabBrowserWindow( mEmbeddedBrowserWindowId );
 
         return TRUE;
@@ -314,7 +314,8 @@ void LLWebBrowserCtrl::onVisibilityChange ( BOOL new_visibility )
         else
         {
                 mFrequentUpdates = false;
-        };
+        }
+        LLUICtrl::onVisibilityChange(new_visibility);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -362,6 +363,20 @@ bool LLWebBrowserCtrl::canNavigateForward()
 
 ////////////////////////////////////////////////////////////////////////////////
 //
+bool LLWebBrowserCtrl::set404RedirectUrl(  std::string redirect_url )
+{
+        return LLMozLib::getInstance()->set404RedirectUrl( mEmbeddedBrowserWindowId, redirect_url );
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//
+bool LLWebBrowserCtrl::clr404RedirectUrl()
+{
+        return LLMozLib::getInstance()->clr404RedirectUrl( mEmbeddedBrowserWindowId );
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//
 void LLWebBrowserCtrl::navigateTo( std::string urlIn )
 {
         const std::string protocol( "secondlife://" );
@@ -420,7 +435,7 @@ void LLWebBrowserCtrl::draw()
                 return;
 
         // NOTE: optimization needed here - probably only need to do this once
-        // unless tearoffs change the parent which they problably do.
+        // unless tearoffs change the parent which they probably do.
         LLUICtrl* ptr = (LLUICtrl*)findRootMostFocusRoot();
         if ( ptr && ptr->hasFocus() )
         {
diff --git a/linden/indra/newview/llwebbrowserctrl.h b/linden/indra/newview/llwebbrowserctrl.h
index ec3ddfd..8b19a23 100644
--- a/linden/indra/newview/llwebbrowserctrl.h
+++ b/linden/indra/newview/llwebbrowserctrl.h
@@ -197,6 +197,10 @@ class LLWebBrowserCtrl :
                 void setHomePageUrl( const std::string urlIn );
                 std::string getHomePageUrl();
 
+                // set/clear URL to visit when a 404 page is reached
+                bool set404RedirectUrl( std::string redirect_url );
+                bool clr404RedirectUrl();
+
                 // accessor/mutator for flag that indicates if frequent updates to texture happen
                 bool getFrequentUpdates() { return mFrequentUpdates; };
                 void setFrequentUpdates( bool frequentUpdatesIn ) {  mFrequentUpdates = frequentUpdatesIn; };
diff --git a/linden/indra/newview/releasenotes.txt b/linden/indra/newview/releasenotes.txt
index 9817d7f..d98a14c 100644
--- a/linden/indra/newview/releasenotes.txt
+++ b/linden/indra/newview/releasenotes.txt
@@ -1,3 +1,15 @@
+Release Notes for Second Life 1.18.5(2) November 21, 2007
+=====================================
+Changes:
+* Permissions request dialogue boxes are now throttled to prevent griefing
+* Additional localization work on xml files for Japanese, Korean, and German.
+
+Bug fixes:
+* Fixed various XML errors related to the search feature, Windows & Linux only
+* Fixed VWR-3064: Land Search does not show Description Text for any parcel selected in Search
+* Fixed VWR-3084: Dramatic drop in frame rate after the first use of the new search engine.
+* Fixed VWR-3200: Classifieds Statistics in profile are broken
+
 Release Notes for Second Life 1.18.5(1) November 16, 2007
 =====================================
 Changes:
diff --git a/linden/indra/newview/res/newViewRes.rc b/linden/indra/newview/res/newViewRes.rc
index 7f45e83..fe21ed9 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,18,5,1
- PRODUCTVERSION 1,18,5,1
+ FILEVERSION 1,18,5,2
+ PRODUCTVERSION 1,18,5,2
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -246,12 +246,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Linden Lab"
             VALUE "FileDescription", "Second Life"
-            VALUE "FileVersion", "1.18.5.1"
+            VALUE "FileVersion", "1.18.5.2"
             VALUE "InternalName", "Second Life"
             VALUE "LegalCopyright", "Copyright � 2001-2007, Linden Research, Inc."
             VALUE "OriginalFilename", "SecondLife.exe"
             VALUE "ProductName", "Second Life"
-            VALUE "ProductVersion", "1.18.5.1"
+            VALUE "ProductVersion", "1.18.5.2"
         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 5476b354..2e23ade 100644
--- a/linden/indra/newview/skins/xui/de/alerts.xml
+++ b/linden/indra/newview/skins/xui/de/alerts.xml
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <alerts>
+        <global name="skipnexttime">
+                Nicht mehr anzeigen
+        </global>
+        <global name="alwayschoose">
+                Diese Option immer auswählen
+        </global>
         <alert name="MissingAlert">
                 <message name="message">
                         [ALERT_NAME] fehlt in alerts.xml!
@@ -322,7 +328,7 @@ einer Region befindet, die das verbietet.
         </alert>
         <alert name="ClickPublishHelpAvatar">
                 <message name="message">
-                        In Suche veröffentlichen
+                        In Suche anzeigen
                 </message>
         </alert>
         <alert name="ClickPartnerHelpAvatar">
@@ -686,12 +692,15 @@ Möchten Sie auf www.secondlife.com ein Konto anlegen?
         </alert>
         <alert name="AddClassified">
                 <message name="message">
-                        Anzeigen erscheinen eine Woche lang im Abschnitt &apos;Anzeigen&apos; des Suchverzeichnisses.
+                        Anzeigen erscheinen eine Woche lang auf der Registerkarte &apos;Anzeigen&apos;
+im Suchverzeichnis.
  
-Füllen Sie Ihre Anzeige aus und klicken Sie auf &apos;Veröffentlichen...&apos;, um sie zum Verzeichnis hinzuzufügen.
+Füllen Sie Ihre Anzeige aus und klicken Sie auf &apos;Veröffentlichen...&apos;, um sie zum
+Verzeichnis hinzuzufügen.
  
 Sie werden gebeten, einen Preis zu bezahlen, wenn Sie auf &apos;Veröffentlichen&apos; klicken.
-Wenn Sie mehr bezahlen, erscheint Ihre Anzeige weiter oben in der Liste, ebenso wenn ein Benutzer nach Ihren Suchbegriffen sucht.
+Wenn Sie mehr bezahlen oder ein Benutzer nach Ihren Suchbegriffen sucht,
+erscheint Ihre Anzeige weiter oben in der Liste.
                 </message>
                 <option name="OK">
                         OK
@@ -1183,6 +1192,20 @@ Bitte wählen Sie einen männlichen oder weiblichen Avatar.
                         Abbrechen
                 </option>
         </alert>
+        <alert name="TeleportFromLandmark">
+                <message name="message">
+                        Möchten Sie sich wirklich teleportieren?
+                </message>
+                <ignore name="ignore">
+                        Beim Teleportieren von einer Landmarke im Inventar
+                </ignore>
+                <option name="Teleport">
+                        Teleportieren
+                </option>
+                <option name="Cancel">
+                        Abbrechen
+                </option>
+        </alert>
         <alert name="ProblemAddingEstateManager">
                 <message name="message">
                         Es gibt Probleme beim Hinzufügen eines neuen Grundstücksverwalters.  Bei mindestens einem Grundstück ist die Verwalterliste voll.
@@ -1204,10 +1227,10 @@ Standard: aus
         <alert name="HelpEstateVoiceChat" title="Voice-Chat erlauben">
                 <message name="message">
                         Die Parzellen auf diesem Grundstück können über eigene Voice-
-                        Channel verfügen, die es Einwohnern ermöglichen, sich mit
-                        anderen Personen in der Nähe zu unterhalten.
+Channel verfügen, die es Einwohnern ermöglichen, sich mit
+anderen Personen in der Nähe zu unterhalten.
 
-                        Standard: aus
+Standard: aus
                 </message>
         </alert>
         <alert name="VoiceVersionMismatch" title="Falsche Voice-Version">
@@ -3793,7 +3816,7 @@ die im Regler definierte Position festzulegen und die Animation auszuschalten.
         <alert name="HelpEstateExternallyVisible" title="Öffentlich">
                 <message name="message">
                         Aktivieren Sie diese Option, um Einwohnern den Zugang zu diesem Grundstück zu
-                         erlauben, ohne auf der Zugangsliste zu stehen.
+erlauben, ohne auf der Zugangsliste zu stehen.
  
 Standard: ein
                 </message>
@@ -3810,17 +3833,17 @@ Standard: aus
         <alert name="HelpEstateAllowResident" title="Zugang erlauben">
                 <message name="message">
                         Der Zugang zu diesem Grundstück wird auf die hier 
-                        aufgeführten Einwohner und Gruppen beschränkt.  Diese Einstellung ist 
-                        nur verfügbar, wenn &apos;Vom Festland aus sichtbar&apos; 
-                        deaktiviert ist.
+aufgeführten Einwohner und Gruppen beschränkt.  Diese Einstellung ist 
+nur verfügbar, wenn &apos;Vom Festland aus sichtbar&apos; 
+deaktiviert ist.
                 </message>
         </alert>
         <alert name="HelpEstateAllowGroup" title="Gruppenzugang erlauben">
                 <message name="message">
                         Der Zugang zu diesem Grundstück wird auf die hier 
-                        aufgeführten Einwohner und Gruppen beschränkt.  Diese Einstellung ist 
-                        nur verfügbar, wenn &apos;Vom Festland aus sichtbar&apos; 
-                        deaktiviert ist.
+aufgeführten Einwohner und Gruppen beschränkt.  Diese Einstellung ist 
+nur verfügbar, wenn &apos;Vom Festland aus sichtbar&apos; 
+deaktiviert ist.
                 </message>
         </alert>
         <alert name="HelpEstateBanResident" title="Zugang verweigern">
@@ -4398,10 +4421,15 @@ wirklich permanent löschen?
         <alert name="BadURL">
                 <message name="message">
                         Second Life kann den folgenden Link nicht verarbeiten:
-   [SLURL] 
- Die meisten Links ähneln dem Folgenden:  secondlife://app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about  
 
-Bitte überprüfen Sie die Schreibweise und versuchen Sie es erneut.
+[SLURL]
+
+Die meisten Links ähneln dem Folgenden:
+
+secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-
+fd37083abc4c/about
+
+Überprüfen Sie die Schreibweise und versuchen Sie es erneut.
                 </message>
         </alert>
 </alerts>
diff --git a/linden/indra/newview/skins/xui/de/floater_about.xml b/linden/indra/newview/skins/xui/de/floater_about.xml
index 468f1b9..f05a7d5 100644
--- a/linden/indra/newview/skins/xui/de/floater_about.xml
+++ b/linden/indra/newview/skins/xui/de/floater_about.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="floater_about" title="Über Second Life">
         <text_editor name="credits_editor">
-                Second Life wird Ihnen präsentiert von 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, 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 und vielen anderen.
+                Second Life wird Ihnen präsentiert von 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 und vielen anderen.
 
 Im Gedenken an Jesse Malthus. Du wirst allen in Erinnerung bleiben, die deine Stimme hören durften.
 
-Vielen Dank den folgenden Einwohnern, die uns geholfen haben, dies zur bisher besten Version zu machen: 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, 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.
+Vielen Dank den folgenden Einwohnern, die uns geholfen haben, dies zur bisher besten Version zu machen: 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.
 
 APR Copyright (C) 2000-2004 The Apache Software Foundation
 cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel@haxx.se)
@@ -27,7 +27,7 @@ Alle Rechte vorbehalten.  Details siehe licenses.txt.
 Voice-Chat-Audiocoding: Polycom(R) Siren14(TM) (ITU-T Empf. G.722.1 Anhang C)
 
 
-Mr. Watson - kommen Sie bitte her - ich möchte Sie sehen.
+Mr. Watson – kommen Sie bitte her – ich möchte Sie sehen.
         </text_editor>
         <text name="you_are_at">
                 Sie befinden sich in [POSITION]
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 c2da0f0..964f142 100644
--- a/linden/indra/newview/skins/xui/de/floater_about_land.xml
+++ b/linden/indra/newview/skins/xui/de/floater_about_land.xml
@@ -342,8 +342,7 @@
                         <check_box label="Sicher (kein Schaden)" name="check safe" />
                         <check_box label="Stoßen beschränken" name="PushRestrictCheck"
                              tool_tip="llPushObject funktioniert nur in Skripts des Parzelleneigentümers oder in Skripts, die dem Stoßenden gehören." />
-                        <check_box label="In Suchen &gt; Orte (30 L$/Woche) zeigen unter"
-                             name="ShowDirectoryCheck"
+                        <check_box label="Ort in Suche anzeigen (30 L$/Woche) unter" name="ShowDirectoryCheck"
                              tool_tip="Diese Parzelle in Suchergebnissen anzeigen." />
                         <combo_box allow_text_entry="false" bottom="-140" enabled="true" follows="left|top"
                              height="18" hidden="false" left="266" max_chars="20" mouse_opaque="true"
diff --git a/linden/indra/newview/skins/xui/de/floater_chat_history.xml b/linden/indra/newview/skins/xui/de/floater_chat_history.xml
index 21dcb9d..9493e23 100644
--- a/linden/indra/newview/skins/xui/de/floater_chat_history.xml
+++ b/linden/indra/newview/skins/xui/de/floater_chat_history.xml
@@ -3,4 +3,13 @@
         <button label="Chat" name="Chat" />
         <button label="Stummschalten" name="Mute resident" />
         <check_box label="Stummgeschalteten Text anzeigen" name="show mutes" />
+        <string name="ringing">
+                Verbindung mit In-Welt-Voice-Chat...
+        </string>
+        <string name="connected">
+                Verbunden
+        </string>
+        <string name="hang_up">
+                Verbindung mit In-Welt-Voice-Chat getrennt
+        </string>
 </floater>
diff --git a/linden/indra/newview/skins/xui/de/floater_directory.xml b/linden/indra/newview/skins/xui/de/floater_directory.xml
index bc0173e..adaa9b6 100644
--- a/linden/indra/newview/skins/xui/de/floater_directory.xml
+++ b/linden/indra/newview/skins/xui/de/floater_directory.xml
@@ -4,10 +4,10 @@
                 <panel label="Alle" name="all_panel">
                         <button label="&lt; Vorherige" label_selected="&lt; Vorherige" name="&lt; Prev" />
                         <button label="Weiter &gt;" label_selected="Weiter &gt;" name="Next &gt;" />
-                        <text name="find" left_delta="38">
+                        <text left_delta="38" name="find">
                                 Suchen:
                         </text>
-<line_editor left_delta="48" name="name" />
+                        <line_editor left_delta="48" name="name" />
                         <button label="Suchen" label_selected="Suchen" name="Search" />
                         <check_box label="Ab-18-Inhalte einschließen" name="incmature" />
                         <scroll_list name="results">
@@ -23,10 +23,46 @@
                                 <column label="Members" name="members" />
                         </scroll_list>
                 </panel>
+                <panel label="Alle" name="find_all_panel">
+                        <button label="Zurück" name="back_btn" />
+                        <button label="Weiter" name="forward_btn" />
+                        <line_editor label="Suchen" name="search_editor" tool_tip="Second Life durchsuchen" />
+                        <button label="Suchen" name="search_btn" />
+                        <combo_box name="Category">
+                                <combo_item name="AnyCategory">
+                                        Alle Kategorien
+                                </combo_item>
+                                <combo_item name="Classifieds">
+                                        Anzeigen
+                                </combo_item>
+                                <combo_item name="Events">
+                                        Events
+                                </combo_item>
+                                <combo_item name="Groups">
+                                        Gruppen
+                                </combo_item>
+                                <combo_item name="People">
+                                        Leute
+                                </combo_item>
+                                <combo_item name="Places">
+                                        Orte
+                                </combo_item>
+                                <combo_item name="Wiki">
+                                        Wiki
+                                </combo_item>
+                        </combo_box>
+                        <check_box label="Ab-18-Inhalte einschließen" name="mature_check" />
+                        <text name="loading_text">
+                                Wird geladen...
+                        </text>
+                        <text name="done_text">
+                                Fertig
+                        </text>
+                </panel>
                 <panel label="Anzeigen" name="classified_panel">
                         <button label="&lt; Vorherige" label_selected="&lt; Vorherige" name="&lt; Prev" />
                         <button label="Weiter &gt;" label_selected="Weiter &gt;" name="Next &gt;" />
-                        <text name="find" left_delta="38">
+                        <text left_delta="38" name="find">
                                 Suchen:
                         </text>
                         <line_editor left_delta="48" name="name" width="116" />
@@ -102,7 +138,7 @@
                         <text name="text2" width="90">
                                 Name/Beschr.:
                         </text>
-                        <combo_box name="category combo" width="185" left="374">
+                        <combo_box left="374" name="category combo" width="185">
                                 <combo_item name="All">
                                         Alle
                                 </combo_item>
@@ -140,7 +176,7 @@
                                         Sonstiges
                                 </combo_item>
                         </combo_box>
-                        <line_editor name="event_search_text" width="185" left="374"/>
+                        <line_editor left="374" name="event_search_text" width="185" />
                         <check_box label="Ab 18 anzeigen" name="incmature" />
                         <button label="Suchen" label_selected="Suchen" name="Search" tool_tip="Suchen" />
                         <button label="Löschen" label_selected="Löschen" name="Delete" />
@@ -207,7 +243,7 @@ die Benutzer dort verbringen.
                              bottom="-38" drop_shadow_visible="true" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="left" height="32" left="354"
                              mouse_opaque="true" name="land" v_pad="0" width="430">
-                        Land kann direkt für Linden Dollar (L$) oder bei einer Auktion für L$
+                                Land kann direkt für Linden Dollar (L$) oder bei einer Auktion für L$
 oder US$ erworben werden. Um direkt zu kaufen, klicken Sie auf dem betreffenden
 Land in der Titelleiste auf den Namen.
                         </text>
@@ -223,7 +259,7 @@ Land in der Titelleiste auf den Namen.
                 <panel label="Orte" name="places_panel">
                         <button label="&lt; Vorherige" label_selected="&lt; Vorherige" name="&lt; Prev" />
                         <button label="Weiter &gt;" label_selected="Weiter &gt;" name="Next &gt;" />
-                        <text name="find" left_delta="38">
+                        <text left_delta="38" name="find">
                                 Suchen:
                         </text>
                         <line_editor left_delta="48" name="name" width="118" />
@@ -280,10 +316,10 @@ Land in der Titelleiste auf den Namen.
                 <panel label="Leute" name="people_panel">
                         <button label="&lt; Vorherige" label_selected="&lt; Vorherige" name="&lt; Prev" />
                         <button label="Weiter &gt;" label_selected="Weiter &gt;" name="Next &gt;" />
-                        <text name="find" left_delta="38">
+                        <text left_delta="38" name="find">
                                 Suchen:
                         </text>
-<line_editor left_delta="48" name="name" />
+                        <line_editor left_delta="48" name="name" />
                         <button label="Suchen" label_selected="Suchen" name="Search" />
                         <scroll_list name="results">
                                 <column label="" name="icon" />
@@ -294,10 +330,10 @@ Land in der Titelleiste auf den Namen.
                 <panel label="Gruppen" name="groups_panel">
                         <button label="&lt; Vorherige" label_selected="&lt; Vorherige" name="&lt; Prev" />
                         <button label="Weiter &gt;" label_selected="Weiter &gt;" name="Next &gt;" />
-                        <text name="find" left_delta="38">
+                        <text left_delta="38" name="find">
                                 Suchen:
                         </text>
-<line_editor left_delta="48" name="name" />
+                        <line_editor left_delta="48" name="name" />
                         <button label="Suchen" label_selected="Suchen" name="Search" />
                         <check_box label="Ab-18-Gruppen einschließen" name="incmature" />
                         <scroll_list name="results">
@@ -308,5 +344,25 @@ Land in der Titelleiste auf den Namen.
                                 <column label="" name="score" />
                         </scroll_list>
                 </panel>
+                <panel label="Alle (alt)" name="find_all_old_panel">
+                        <button label="&lt; Vorherige/s" label_selected="&lt; Vorherige/s" name="&lt; Prev" />
+                        <button label="Weiter &gt;" label_selected="Weiter &gt;" name="Next &gt;" />
+                        <text name="find">
+                                Suchen:
+                        </text>
+                        <button label="Suchen" label_selected="Suchen" name="Search" />
+                        <check_box label="Ab-18-Inhalte einschließen" name="incmature" />
+                        <scroll_list name="results">
+                                <column label="Name" name="name" />
+                                <column label="Preis" name="price" />
+                                <column label="Zeit (PT)" name="date" />
+                                <column label="Zeit" name="time" />
+                                <column label="Traffic" name="dwell" />
+                                <column label="Gebiet" name="area" />
+                                <column label="L$/qm" name="per_meter" />
+                                <column label="Online" name="online" />
+                                <column label="Mitglieder" name="members" />
+                        </scroll_list>
+                </panel>
         </tab_container>
 </floater>
diff --git a/linden/indra/newview/skins/xui/de/floater_html_help.xml b/linden/indra/newview/skins/xui/de/floater_html_help.xml
index c9703df..008e2b8 100644
--- a/linden/indra/newview/skins/xui/de/floater_html_help.xml
+++ b/linden/indra/newview/skins/xui/de/floater_html_help.xml
@@ -5,6 +5,6 @@
         <button label="Weiterleiten" name="forward_btn" />
         <button label="Schließen" name="close_btn" />
         <text name="status_text">
-                Fertig
+                Bereit
         </text>
 </floater>
diff --git a/linden/indra/newview/skins/xui/de/floater_im.xml b/linden/indra/newview/skins/xui/de/floater_im.xml
index 9babd27..7ea68b5 100644
--- a/linden/indra/newview/skins/xui/de/floater_im.xml
+++ b/linden/indra/newview/skins/xui/de/floater_im.xml
@@ -27,4 +27,7 @@
         <text name="removed_from_group">
                 Sie wurden von der Gruppe ausgeschlossen.
         </text>
+        <string name="invite_message">
+                Klicken Sie auf [BUTTON NAME], um eine Verbindung zu diesem Voice-Chat herzustellen.
+        </string>
 </multi_floater>
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 b96366c..1537cc9 100644
--- a/linden/indra/newview/skins/xui/de/floater_instant_message.xml
+++ b/linden/indra/newview/skins/xui/de/floater_instant_message.xml
@@ -1,5 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater label="(unbekannt)" name="im_floater" title="(unbekannt)">
+        <string name="ringing">
+                Anruf...
+        </string>
+        <string name="connected">
+                Verbunden. Klicken Sie auf Anruf beenden, um die Verbindung zu trennen
+        </string>
+        <string name="hang_up">
+                Anruf beendet
+        </string>
         <button label="Profil..." name="profile_callee_btn" />
         <button label="Anrufen" name="start_call_btn" />
         <button label="Anruf beenden" name="end_call_btn" />
diff --git a/linden/indra/newview/skins/xui/de/floater_instant_message_ad_hoc.xml b/linden/indra/newview/skins/xui/de/floater_instant_message_ad_hoc.xml
index d899a3b..2418741 100644
--- a/linden/indra/newview/skins/xui/de/floater_instant_message_ad_hoc.xml
+++ b/linden/indra/newview/skins/xui/de/floater_instant_message_ad_hoc.xml
@@ -25,6 +25,15 @@
                         </panel>

                 </layout_panel>

         </layout_stack>

+        <string name="ringing">

+                Voice-Chat wird beigetreten...

+        </string>

+        <string name="connected">

+                Verbunden. Klicken Sie auf Anruf beenden, um die Verbindung zu trennen

+        </string>

+        <string name="hang_up">

+                Voice-Chat verlassen

+        </string>

         <text name="live_help_dialog">

                 *** Willkommen bei Help Request ***  

 Bitte werfen Sie zuerst einen Blick auf unsere SL-Hilfeseiten. Drücken Sie dazu F1. Oder rufen Sie unter http://secondlife.com/knowledgebase/ die Knowledge Base auf. 

diff --git a/linden/indra/newview/skins/xui/de/floater_instant_message_group.xml b/linden/indra/newview/skins/xui/de/floater_instant_message_group.xml
index b898674..6c4e0cd 100644
--- a/linden/indra/newview/skins/xui/de/floater_instant_message_group.xml
+++ b/linden/indra/newview/skins/xui/de/floater_instant_message_group.xml
@@ -41,4 +41,13 @@
                         </panel>

                 </layout_panel>

         </layout_stack>

+        <string name="ringing">

+                Voice-Chat wird beigetreten...

+        </string>

+        <string name="connected">

+                Verbunden. Klicken Sie auf Anruf beenden, um die Verbindung zu trennen

+        </string>

+        <string name="hang_up">

+                Voice-Chat verlassen

+        </string>

 </floater>

diff --git a/linden/indra/newview/skins/xui/de/floater_lagmeter.xml b/linden/indra/newview/skins/xui/de/floater_lagmeter.xml
index c64490c..dffbf9e 100644
--- a/linden/indra/newview/skins/xui/de/floater_lagmeter.xml
+++ b/linden/indra/newview/skins/xui/de/floater_lagmeter.xml
@@ -90,7 +90,7 @@
                 600

         </text>

         <text name="network_ping_warning_ms">

-                250

+                300

         </text>

         <text name="network_ping_critical_msg">

                 Ping-Zeit der Verbindung übersteigt [NETWORK_PING_CRITICAL] ms

diff --git a/linden/indra/newview/skins/xui/de/floater_land_holdings.xml b/linden/indra/newview/skins/xui/de/floater_land_holdings.xml
index df5f92b..f9dcfc9 100644
--- a/linden/indra/newview/skins/xui/de/floater_land_holdings.xml
+++ b/linden/indra/newview/skins/xui/de/floater_land_holdings.xml
@@ -21,18 +21,21 @@
                 Zulässiger Landbesitz bei aktuellem Zahlungsplan:
         </text>
         <text name="allowed_text">
-                0 Quadratmeter
+                [AREA] qm
         </text>
         <text name="current_label">
                 Aktueller Landbesitz:
         </text>
         <text name="current_text">
-                0 Quadratmeter
+                [AREA] qm
         </text>
         <text name="available_label">
                 Für Landkäufe verfügbar:
         </text>
         <text name="available_text">
-                0 Quadratmeter
+                [AREA] qm
         </text>
+        <string name="area_string">
+                [AREA] qm
+        </string>
 </floater>
diff --git a/linden/indra/newview/skins/xui/de/floater_report_bug.xml b/linden/indra/newview/skins/xui/de/floater_report_bug.xml
index 96f11d2..1e8cae5 100644
--- a/linden/indra/newview/skins/xui/de/floater_report_bug.xml
+++ b/linden/indra/newview/skins/xui/de/floater_report_bug.xml
@@ -10,7 +10,8 @@
                 Position:
         </text>
         <text bottom_delta="-38" height="32" name="select_object_label">
-                Klicken Sie auf die Schaltfläche, dann auf das Objekt:
+                Klicken Sie auf die Schaltfläche, 
+dann auf das Objekt:
         </text>
         <button label="" label_selected="" name="pick_btn"
              tool_tip="Objektauswahl – Wählen Sie ein Objekt als Thema dieses Berichts aus" />
diff --git a/linden/indra/newview/skins/xui/de/menu_inventory.xml b/linden/indra/newview/skins/xui/de/menu_inventory.xml
index 7c14d2e..43f2c8e 100644
--- a/linden/indra/newview/skins/xui/de/menu_inventory.xml
+++ b/linden/indra/newview/skins/xui/de/menu_inventory.xml
@@ -46,7 +46,7 @@
         <menu_item_call label="Objekte abnehmen" name="Take Off Items" />
         <menu_item_call label="Konferenz-Chat starten" name="Conference Chat Folder" />
         <menu_item_call label="Wiedergeben/Abspielen" name="Sound Play" />
-        <menu_item_call label="Zu Landmarke teleportieren" name="Teleport To Landmark" />
+        <menu_item_call label="Landmarken-Info" name="Teleport To Landmark" />
         <menu_item_call label="In Welt abspielen" name="Animation Play" />
         <menu_item_call label="Lokal wiedergeben" name="Animation Audition" />
         <menu_item_call label="Instant Message senden" name="Send Instant Message" />
diff --git a/linden/indra/newview/skins/xui/de/menu_viewer.xml b/linden/indra/newview/skins/xui/de/menu_viewer.xml
index 67b6eee..0fce2f0 100644
--- a/linden/indra/newview/skins/xui/de/menu_viewer.xml
+++ b/linden/indra/newview/skins/xui/de/menu_viewer.xml
@@ -208,6 +208,16 @@
                         <menu_item_call label="Hilfe zum Allgemeine Probleme-Tracker..."
                              name="Publc Issue Tracker Help..." />
                 </menu>
+                <menu label="Fehlermeldungen" name="Bug Reporting">
+                        <menu_item_call label="Allgemeiner Probleme-Tracker..." name="Public Issue Tracker..." />
+                        <menu_item_call label="Hilfe zum Allgemeinen Probleme-Tracker..."
+                             name="Publc Issue Tracker Help..." />
+                        <menu_item_call label="Fehlermeldungs-1x1..." name="Bug Reporing 101..." />
+                        <menu_item_call label="Sicherheitsfragen..." name="Security Issues..." />
+                        <menu_item_call label="QA-Wiki..." name="QA Wiki..." />
+                        <menu_item_separator label="-----------" name="separator7" />
+                        <menu_item_call label="Fehler melden..." name="Report Bug..." />
+                </menu>
         </menu>
         <menu label="Hilfe" name="Help">
                 <menu_item_call label="Hilfe zu Second Life" name="Second Life Help" />
diff --git a/linden/indra/newview/skins/xui/de/notify.xml b/linden/indra/newview/skins/xui/de/notify.xml
index b646deb..0b7413d 100644
--- a/linden/indra/newview/skins/xui/de/notify.xml
+++ b/linden/indra/newview/skins/xui/de/notify.xml
@@ -960,6 +960,11 @@ Klicken Sie auf &apos;Akzeptieren&apos;, um dem Gespräch beizutreten, oder auf
                         [VOICE_CHANNEL_NAME] ist zurzeit nicht erreichbar.  Sie werden nun wieder mit dem Umgebungs-Voice-Chat verbunden.
                 </message>
         </notify>
+        <notify name="VoiceChannelJoinFailed">
+                <message name="message">
+                        Verbindung zu [VOICE_CHANNEL_NAME] nicht möglich. Bitte versuchen Sie es später.  Sie werden nun wieder mit dem Umgebungs-Voice-Chat verbunden.
+                </message>
+        </notify>
         <notify name="VoiceLoginRetry">
                 <message name="message">
                         Wir erstellen einen Voice-Kanal für Sie. Bitte warten Sie einen Moment.
diff --git a/linden/indra/newview/skins/xui/de/panel_avatar_classified.xml b/linden/indra/newview/skins/xui/de/panel_avatar_classified.xml
index ee89582..3a717b9 100644
--- a/linden/indra/newview/skins/xui/de/panel_avatar_classified.xml
+++ b/linden/indra/newview/skins/xui/de/panel_avatar_classified.xml
@@ -22,4 +22,10 @@
         <text name="ad_placed_paid">
                 Anzeige: [DATE], [AMT] L$ für Eintrag bezahlt.
         </text>
+        <text name="update_txt">
+                Aktualisieren
+        </text>
+        <text name="publish_txt">
+                Veröffentlichen...
+        </text>
 </panel>
diff --git a/linden/indra/newview/skins/xui/de/panel_group_general.xml b/linden/indra/newview/skins/xui/de/panel_group_general.xml
index ae2d750..8c0ec27 100644
--- a/linden/indra/newview/skins/xui/de/panel_group_general.xml
+++ b/linden/indra/newview/skins/xui/de/panel_group_general.xml
@@ -7,6 +7,9 @@ allgemeine Gruppeneinstellungen und Mitgliederoptionen.
 
 Bewegen Sie die Maus über die Optionen, um weitere Informationen anzuzeigen.
         </text>
+        <string name="group_info_unchanged">
+                Die allgemeine Gruppeninfo wurde geändert.
+        </string>
         <button label="?" label_selected="?" name="help_button" />
         <line_editor label="Neuen Gruppennamen hier eingeben" name="group_name_editor" />
         <text name="group_name">
@@ -73,7 +76,7 @@ Sind Sie wirklich, WIRKLICH sicher, dass Sie 100 L$ für die Gründung dieser Gr
                 <check_box label="Gruppenmitteilungen erhalten" name="receive_notices"
                      tool_tip="Festlegen, ob Sie von dieser Gruppe Mitteilungen erhalten können.  Deaktivieren Sie diese Option, wenn Sie von der Gruppe Spam erhalten."
                      width="173" />
-                <check_box label="Gruppe in Profil anzeigen" name="list_groups_in_profile"
+                <check_box label="Gruppe in meinem Profil anzeigen" name="list_groups_in_profile"
                      tool_tip="Steuert, ob diese Gruppe in Ihrem Profil angezeigt wird" />
         </panel>
 </panel>
diff --git a/linden/indra/newview/skins/xui/de/panel_group_land_money.xml b/linden/indra/newview/skins/xui/de/panel_group_land_money.xml
index 25ef8f9..6b624b3 100644
--- a/linden/indra/newview/skins/xui/de/panel_group_land_money.xml
+++ b/linden/indra/newview/skins/xui/de/panel_group_land_money.xml
@@ -28,19 +28,19 @@ enthalten Informationen über die Gruppenfinanzen.
                 Gesamtbeitrag:
         </text>
         <text name="total_contributed_land_value">
-                0 Quadratmeter
+                [AREA] qm
         </text>
         <text name="total_land_in_use_label">
                 Insgesamt verwendetes Land:
         </text>
         <text name="total_land_in_use_value">
-                0 Quadratmeter
+                [AREA] qm
         </text>
         <text name="land_available_label">
                 Land verfügbar:
         </text>
         <text name="land_available_value">
-                0 Quadratmeter
+                [AREA] qm
         </text>
         <text name="your_contribution_label">
                 Ihr Beitrag:
@@ -48,8 +48,11 @@ enthalten Informationen über die Gruppenfinanzen.
         <text name="your_contribution_max_value_append">
                 qm
         </text>
+        <string name="land_contrib_error">
+                Ihr Landbeitrag kann nicht festgelegt werden.
+        </string>
         <text name="your_contribution_max_value">
-                (max. [AMOUNT])
+                Quadratmeter (max. [AMOUNT])
         </text>
         <text name="group_over_limit_text">
                 Die Gruppenmitglieder müssen mehr Landnutzungsrechte spenden, damit das verwendete Land gehalten werden kann.
diff --git a/linden/indra/newview/skins/xui/de/panel_group_voting.xml b/linden/indra/newview/skins/xui/de/panel_group_voting.xml
index 3e4bc71..ebdd6bc 100644
--- a/linden/indra/newview/skins/xui/de/panel_group_voting.xml
+++ b/linden/indra/newview/skins/xui/de/panel_group_voting.xml
@@ -67,9 +67,8 @@ enthalten Sie sich der Stimme.
         <text name="duration_text">
                 Tage
         </text>
-        <text_editor name="proposal_text" width="271" />
-        <radio_group left="285" name="majority" tool_tip="Majority of total votes needed to win."
-             width="127">
+        <text_editor name="proposal_text" />
+        <radio_group name="majority" tool_tip="Majority of total votes needed to win.">
                 Einfache Mehrheit
                 2/3-Mehrheit
                 Einstimmig
@@ -82,10 +81,10 @@ enthalten Sie sich der Stimme.
         </text>
         <button label="Angebot senden" label_selected="Angebot senden" name="btn_submit" />
         <button label="Abbrechen" label_selected="Abbrechen" name="btn_cancel" />
-        <button label="Ja" label_selected="Ja" name="btn_yes" left="235" />
+        <button label="Ja" label_selected="Ja" name="btn_yes"  />
         <button label="Nein" label_selected="Nein" name="btn_no" />
-        <button label="Enthalten" label_selected="Enthalten" name="btn_abstain" width="80" />
-        <text bottom="-240" name="txt">
+        <button label="Enthalten" label_selected="Enthalten" name="btn_abstain"  />
+        <text  name="txt">
                 Alte Gruppenabstimmungen
         </text>
         <text name="instructions">
diff --git a/linden/indra/newview/skins/xui/de/panel_overlaybar.xml b/linden/indra/newview/skins/xui/de/panel_overlaybar.xml
index dc970ed..394baa7 100644
--- a/linden/indra/newview/skins/xui/de/panel_overlaybar.xml
+++ b/linden/indra/newview/skins/xui/de/panel_overlaybar.xml
@@ -2,8 +2,8 @@
 <panel name="overlay">
         <button label="IM erhalten" label_selected="IM erhalten" name="IM Received"
              tool_tip="Sie haben eine unbeantwortete Instant Message. Klicken Sie, um IMs anzuzeigen." />
-        <button label="Als nicht beschäftigt anzeigen"
-             label_selected="Als nicht beschäftigt anzeigen" name="Set Not Busy"
+        <button label="Beschäftigt"
+             label_selected="Beschäftigt" name="Set Not Busy"
              tool_tip="Chat und IM sind ausgeblendet. Klicken Sie hier, um den Beschäftigt-Modus zu verlassen." />
         <button label="Versionsschlüssel see above"
              label_selected="Versionsschlüssel see above" name="Release Keys"
diff --git a/linden/indra/newview/skins/xui/de/panel_place.xml b/linden/indra/newview/skins/xui/de/panel_place.xml
index 1c25733..cd876e6 100644
--- a/linden/indra/newview/skins/xui/de/panel_place.xml
+++ b/linden/indra/newview/skins/xui/de/panel_place.xml
@@ -4,15 +4,24 @@
         <button label="Auf Karte" name="map_btn" />
         <button label="Gebote..." name="auction_btn" />
         <text name="traffic_text">
-                Traffic: [TRAFFIC].
+                Traffic: [TRAFFIC]
         </text>
         <text name="area_text">
                 Gebiet: [AREA] qm
         </text>
         <text name="forsale_text">
-                Steht zum Verkauf für [PRICE] L$.
+                Steht zum Verkauf für [PRICE] L$
         </text>
         <text name="auction_text">
                 Auktions-ID [ID].
         </text>
+        <text name="server_update_text">
+                Ohne Serverupdate sind keine Ortsinformationen verfügbar.
+        </text>
+        <text name="server_error_text">
+                Zur Zeit gibt es keine Informationen zu diesem Standort. Bitte versuchen Sie es später.
+        </text>
+        <text name="server_forbidden_text">
+                Die Informationen über diesen Standort sind zugriffsbeschränkt.  Bitte wenden Sie sich bezüglich Ihrer Berechtigungen an den Eigentümer der Parzelle.
+        </text>
 </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 0981886..712bf0d 100644
--- a/linden/indra/newview/skins/xui/de/panel_place_small.xml
+++ b/linden/indra/newview/skins/xui/de/panel_place_small.xml
@@ -3,4 +3,25 @@
         <button label="Teleportieren" name="teleport_btn" />
         <button label="Auf Karte" name="map_btn" />
         <button label="Gebote..." name="auction_btn" />
+        <string name="traffic_text">
+                Traffic: [TRAFFIC]
+        </string>
+        <string name="area_text">
+                Gebiet: [AREA] qm
+        </string>
+        <string name="forsale_text">
+                Steht zum Verkauf für [PRICE] L$
+        </string>
+        <string name="auction_text">
+                Auktions-ID [ID].
+        </string>
+        <text name="server_update_text">
+                Ohne Serverupdate sind keine Ortsinformationen verfügbar.
+        </text>
+        <text name="server_error_text">
+                Zur Zeit gibt es keine Informationen zu diesem Standort. Bitte versuchen Sie es später.
+        </text>
+        <text name="server_forbidden_text">
+                Die Informationen über diesen Standort sind zugriffsbeschränkt.  Bitte wenden Sie sich bezüglich Ihrer Berechtigungen an den Eigentümer der Parzelle.
+        </text>
 </panel>
diff --git a/linden/indra/newview/skins/xui/de/panel_preferences_general.xml b/linden/indra/newview/skins/xui/de/panel_preferences_general.xml
index 247c760..d6ec39e 100644
--- a/linden/indra/newview/skins/xui/de/panel_preferences_general.xml
+++ b/linden/indra/newview/skins/xui/de/panel_preferences_general.xml
@@ -77,25 +77,25 @@
                         Englisch
                 </combo_item>
                 <combo_item type="string" length="1" name="Chinese">
-                        Chinesisch - Beta
+                        Chinesisch
                 </combo_item>
                 <combo_item type="string" length="1" name="Deutsch(German)">
-                        Deutsch - Beta
+                        Deutsch
                 </combo_item>
                 <combo_item type="string" length="1" name="French">
-                        Français (Französisch) - Beta
+                        Français (Französisch)
                 </combo_item>
                 <combo_item type="string" length="1" name="(Japanese)">
-                        日本語 (Japanisch) - Beta
+                        日本語 (Japanisch)
                 </combo_item>
                 <combo_item type="string" length="1" name="(Korean)">
-                        한국어 (Koreanisch) - Beta
+                        한국어 (Koreanisch)
                 </combo_item>
                 <combo_item type="string" length="1" name="Portugese">
-                        Portugiesisch - Beta
+                        Portugiesisch
                 </combo_item>
                 <combo_item type="string" length="1" name="Spanish">
-                        Español (Spanisch) - Beta
+                        Español (Spanisch)
                 </combo_item>
         </combo_box>
 </panel>
diff --git a/linden/indra/newview/skins/xui/de/panel_region_general.xml b/linden/indra/newview/skins/xui/de/panel_region_general.xml
index 3844aa8..b4357f0 100644
--- a/linden/indra/newview/skins/xui/de/panel_region_general.xml
+++ b/linden/indra/newview/skins/xui/de/panel_region_general.xml
@@ -16,10 +16,9 @@
         <button label="?" name="restrict_pushobject_help" />
         <check_box label="Landwiederverkauf zulassen" name="allow_land_resell_check" />
         <button label="?" name="land_resell_help" />
-        <check_box label="Zusammenlegen/Teilen von Land zulassen"
-             name="allow_parcel_changes_check" />
+        <check_box label="Landumverteilung zulassen" name="allow_parcel_changes_check" />
         <button label="?" name="parcel_changes_help" />
-        <check_box label="Parzellensuche unterbinden" name="block_parcel_search_check"
+        <check_box label="Landanzeige in Suche blockieren" name="block_parcel_search_check"
              tool_tip="Diese Region und ihre Parzellen in Suchergebnissen anzeigen" />
         <button label="?" name="parcel_search_help" />
         <spinner label="Avatar-Limit" name="agent_limit_spin" />
diff --git a/linden/indra/newview/skins/xui/de/panel_status_bar.xml b/linden/indra/newview/skins/xui/de/panel_status_bar.xml
index 764372b..c6d3cef 100644
--- a/linden/indra/newview/skins/xui/de/panel_status_bar.xml
+++ b/linden/indra/newview/skins/xui/de/panel_status_bar.xml
@@ -36,4 +36,6 @@
         <text name="bandwidth_tooltip">
                 Bandbreite
         </text>
+        <line_editor label="Suchen" name="search_editor" tool_tip="Second Life durchsuchen" />
+        <button name="search_btn" tool_tip="Second Life durchsuchen" />
 </panel>
diff --git a/linden/indra/newview/skins/xui/de/panel_voice_options.xml b/linden/indra/newview/skins/xui/de/panel_voice_options.xml
index 8eb35a4..ebbdcf6 100644
--- a/linden/indra/newview/skins/xui/de/panel_voice_options.xml
+++ b/linden/indra/newview/skins/xui/de/panel_voice_options.xml
@@ -11,7 +11,7 @@
                         Voice-Chat von Avatarposition aus hören.

                 </radio_item>

         </radio_group>

-        <check_box label="Viewer im &amp;apos;Zum-Sprechen-drücken&amp;apos;-Modus starten"

+        <check_box label="Viewer im &apos;Zum-Sprechen-drücken&apos;-Modus starten"

              name="push_to_talk_check" />

         <check_box label="&apos;Zum-Sprechen-drücken&apos; im Umschaltmodus verwenden"

              name="push_to_talk_toggle_check" />

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 6f253a1..a012625 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_directory.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_directory.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="true" height="570" min_height="570" min_width="780"
+     can_resize="false" height="570" min_height="570" min_width="780"
      name="directory" rect_control="FloaterFindRect2"
      title="Search Second Life" width="780">
         <tab_container bottom="-570" follows="left|top|right|bottom" height="550" left="0"
@@ -93,6 +93,7 @@
                                 height="16" />
                         <text hidden="true" name="loading_text">Loading...</text>
                         <text hidden="true" name="done_text">Done</text>
+                        <text hidden="true" name="redirect_404_url">http://secondlife.com/app/search/notfound.html</text>
                 </panel>
                 
                 <panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
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 52074c4..2e4171a 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_html.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_html.xml
@@ -7,17 +7,17 @@
         <web_browser bottom="40" follows="top|left|bottom|right" font="SansSerifSmall" left="15"
              name="html_floater_browser" right="-15" top="-56" />
         <button bottom="-45" follows="top|left" font="SansSerifSmall" height="20" label="Back"
-             left="15" name="back_btn" width="70" />
+             left="15" name="back_btn" width="80" />
         <button bottom_delta="0" follows="top|left" font="SansSerifSmall" height="20"
-             label="Home" left_delta="75" name="home_btn" width="70" />
+             label="Home" left_delta="83" name="home_btn" width="80" />
         <button bottom_delta="0" follows="top|left" font="SansSerifSmall" height="20"
-             label="Forward" left_delta="75" name="forward_btn" width="70" />
+             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"
-             name="url_edit" select_all_on_focus_received="true" width="350" />
+             follows="top|left|right" font="SansSerifSmall" height="20" hidden="false" left_delta="90" max_length="256" mouse_opaque="true"
+             name="url_edit" select_all_on_focus_received="true" width="345" />
         <button bottom_delta="0" follows="top|right" font="SansSerifSmall" height="20"
-             label="Go" left_delta="360" name="go_btn" width="70" />
+             label="Go" left_delta="350" 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_lagmeter.xml b/linden/indra/newview/skins/xui/en-us/floater_lagmeter.xml
index 9e2c410..de4dd6c 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_lagmeter.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_lagmeter.xml
@@ -5,7 +5,7 @@
         can_minimize="true"

     can_resize="false" 

     height="150" 

-    width="350"

+    width="370"

     name="floater_lagmeter" 

     title="Lag Meter"

     rect_control="FloaterLagMeter" >

@@ -44,7 +44,7 @@
                         name="client" 

                         v_pad="0" 

                         h_pad="0" 

-                        width="50"

+                        width="128"

                         height="16" >

                                 Client:

                         </text>

@@ -58,7 +58,7 @@
                         follows="left|top" 

                         font="SansSerif"

                         halign="left" 

-                        left="66" 

+                        left="110" 

                         right="-10"

                         mouse_opaque="true"

                         name="client_text" 

@@ -149,7 +149,7 @@
                         follows="left|top" 

                         font="SansSerif"

                         halign="left" 

-                        left="80" 

+                        left="110" 

                         right="-10"

                         mouse_opaque="true"

                         name="network_text" 

@@ -226,7 +226,7 @@
                         name="server" 

                         v_pad="0" 

                         h_pad="0" 

-                        width="50"

+                        width="60"

                         height="16" >

                                 Server:

                         </text>

@@ -240,7 +240,7 @@
                         follows="left|top" 

                         font="SansSerif"

                         halign="left" 

-                        left="70" 

+                        left="85" 

                         right="-10"

                         mouse_opaque="true"

                         name="server_text" 

@@ -297,7 +297,7 @@
                         Lag Meter

                 </text>

                 <text hidden="true" name="max_width_px">

-                        350

+                        360

                 </text>

                 <text hidden="true" name="min_title_msg">

                         Lag

diff --git a/linden/indra/newview/skins/xui/en-us/floater_my_friends.xml b/linden/indra/newview/skins/xui/en-us/floater_my_friends.xml
index 50c69c6..366f50d 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_my_friends.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_my_friends.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>

-<floater can_close="false" can_minimize="true" can_drag_on_left="false" can_tear_off="false" can_resize="true" height="390" min_height="240" min_width="365" name="floater_my_friends"

+<floater can_close="false" can_minimize="true" can_drag_on_left="false" can_tear_off="false" can_resize="true" height="390" min_height="240" min_width="500" name="floater_my_friends"

      title="Contacts" 

      width="395">

         <tab_container bottom="10" height="360" tab_width="80" follows="left|right|top|bottom" left="0" name="friends_and_groups" tab_position="left" width="388">

diff --git a/linden/indra/newview/skins/xui/en-us/floater_report_abuse.xml b/linden/indra/newview/skins/xui/en-us/floater_report_abuse.xml
index 180b00c..d4a0034 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_report_abuse.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_report_abuse.xml
@@ -46,7 +46,7 @@
         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom_delta="-22" drop_shadow_visible="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="16" left="16"
-             mouse_opaque="true" name="select_object_label" v_pad="0" width="200">
+             mouse_opaque="true" name="select_object_label" v_pad="0" width="220">
                 Click the button then the object:
         </text>
         <button bottom_delta="-32" font="SansSerif" halign="center" height="32" label=""
@@ -147,12 +147,12 @@
         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom_delta="-24" drop_shadow_visible="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="16" left="16"
-             mouse_opaque="true" name="dscr_title" v_pad="0" width="50">
+             mouse_opaque="true" name="dscr_title" v_pad="0" width="180">
                 Details:
         </text>
         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom_delta="-32" drop_shadow_visible="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="48" left="64"
+             font="SansSerifSmall" h_pad="0" halign="left" height="48" left="70"
              mouse_opaque="true" name="bug_aviso" v_pad="0" width="308">
 Please be specific about the date, location, nature of
 abuse, relevant chat/IM text, and select the object
diff --git a/linden/indra/newview/skins/xui/en-us/panel_group_voting.xml b/linden/indra/newview/skins/xui/en-us/panel_group_voting.xml
index 26536ed..507649e 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_group_voting.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_group_voting.xml
@@ -136,16 +136,16 @@ vote on open proposals, and view old proposals.
              height="20" label="Cancel" label_selected="Cancel" left_delta="128"
              mouse_opaque="true" name="btn_cancel" width="75" />
         <button bottom="-218" follows="top" font="SansSerif" halign="center" height="20"
-             label="Yes" label_selected="Yes" left="246" mouse_opaque="true"
-             name="btn_yes" width="43" />
+             label="Yes" label_selected="Yes" left="200" mouse_opaque="true"
+             name="btn_yes" width="63" />
         <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-             height="20" label="No" label_selected="No" left_delta="48"
-             mouse_opaque="true" name="btn_no" width="43" />
+             height="20" label="No" label_selected="No" left_delta="70"
+             mouse_opaque="true" name="btn_no" width="63" />
         <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-             height="20" label="Abstain" label_selected="Abstain" left_delta="48"
+             height="20" label="Abstain" label_selected="Abstain" left_delta="70"
              mouse_opaque="true" name="btn_abstain" width="63" />
         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-255" drop_shadow_visible="true" follows="left|top"
+             bottom="-240" drop_shadow_visible="true" follows="left|top"
              font="SansSerifBig" h_pad="0" halign="left" height="10" left="12"
              mouse_opaque="false" name="txt" v_pad="0" width="363">
                 Group Voting History
diff --git a/linden/indra/newview/skins/xui/en-us/panel_region_covenant.xml b/linden/indra/newview/skins/xui/en-us/panel_region_covenant.xml
index 7410c17..f213c07 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_region_covenant.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_region_covenant.xml
@@ -34,16 +34,16 @@
         </text>
         <text bg_readonly_color="clear" bottom_delta="-28" follows="left|top"
              font="SansSerif" height="20" left_delta="0" name="resellable_clause"
-             text_readonly_color="white" width="300">
+             text_readonly_color="white" width="465">
                 Purchased land in this region may or may not be resold.
         </text>
         <text bg_readonly_color="clear" bottom_delta="-18" follows="left|top"
              font="SansSerif" height="20" left_delta="0" name="changeable_clause"
-             text_readonly_color="white" width="375">
+             text_readonly_color="white" width="465">
                 Purchased land in this region may or may not be joined or subdivided.
         </text>
            <text bottom_delta="-22" follows="left|top" font="SansSerifSmall" height="16"
-             left_delta="0" name="covenent_instructions" width="440">
+             left_delta="0" name="covenent_instructions" width="465">
                 Drag and drop a notecard to change the Covenant for this Estate.
         </text>
         <text_editor bg_readonly_color="clear" bottom_delta="-242" enabled="false"
diff --git a/linden/indra/newview/skins/xui/en-us/panel_region_debug.xml b/linden/indra/newview/skins/xui/en-us/panel_region_debug.xml
index 5b67146..9134e3f 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_region_debug.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_region_debug.xml
@@ -13,17 +13,17 @@
              left="10" name="disable_scripts_check"
              tool_tip="Disable all scripts in this region" width="80" />
         <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-             left="130" name="disable_scripts_help" width="18" />
+             left="160" name="disable_scripts_help" width="18" />
         <check_box bottom_delta="-20" follows="left|top" height="20" label="Disable Collisions"
              left="10" name="disable_collisions_check"
              tool_tip="Disable non-avatar collisions in this region" width="80" />
         <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-             left="130" name="disable_collisions_help" width="18" />
+             left="160" name="disable_collisions_help" width="18" />
         <check_box bottom_delta="-20" follows="left|top" height="20" label="Disable Physics"
              left="10" name="disable_physics_check"
              tool_tip="Disable all physics in this region" width="80" />
         <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-             left="130" name="disable_physics_help" width="18" />
+             left="160" name="disable_physics_help" width="18" />
         <button bottom_delta="-30" enabled="false" follows="left|top" height="20" label="Apply"
              left="60" name="apply_btn" width="100" />
         <button bottom_delta="-50" follows="left|top" height="20" label="Choose Avatar..."
diff --git a/linden/indra/newview/skins/xui/en-us/panel_region_texture.xml b/linden/indra/newview/skins/xui/en-us/panel_region_texture.xml
index 5bd28fc..1c3d586 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_region_texture.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_region_texture.xml
@@ -57,28 +57,28 @@
                 Northeast
         </text>
         <spinner bottom_delta="-20" follows="left|top" height="20" increment="0.5" label="Low"
-             label_width="30" left="10" max_val="500" min_val="-500"
+             label_width="37" left="10" max_val="500" min_val="-500"
              name="height_start_spin_0" width="100" />
         <spinner bottom_delta="0" follows="left|top" height="20" increment="0.5" label="Low"
-             label_width="30" left="120" max_val="500" min_val="-500"
+             label_width="37" left="120" max_val="500" min_val="-500"
              name="height_start_spin_1" width="100" />
         <spinner bottom_delta="0" follows="left|top" height="20" increment="0.5" label="Low"
-             label_width="30" left="230" max_val="500" min_val="-500"
+             label_width="37" left="230" max_val="500" min_val="-500"
              name="height_start_spin_2" width="100" />
         <spinner bottom_delta="0" follows="left|top" height="20" increment="0.5" label="Low"
-             label_width="30" left="340" max_val="500" min_val="-500"
+             label_width="37" left="340" max_val="500" min_val="-500"
              name="height_start_spin_3" width="100" />
         <spinner bottom_delta="-20" follows="left|top" height="20" increment="0.5" label="High"
-             label_width="30" left="10" max_val="500" min_val="-500"
+             label_width="37" left="10" max_val="500" min_val="-500"
              name="height_range_spin_0" width="100" />
         <spinner bottom_delta="0" follows="left|top" height="20" increment="0.5" label="High"
-             label_width="30" left="120" max_val="500" min_val="-500"
+             label_width="37" left="120" max_val="500" min_val="-500"
              name="height_range_spin_1" width="100" />
         <spinner bottom_delta="0" follows="left|top" height="20" increment="0.5" label="High"
-             label_width="30" left="230" max_val="500" min_val="-500"
+             label_width="37" left="230" max_val="500" min_val="-500"
              name="height_range_spin_2" width="100" />
         <spinner bottom_delta="0" follows="left|top" height="20" increment="0.5" label="High"
-             label_width="30" left="340" max_val="500" min_val="-500"
+             label_width="37" left="340" max_val="500" min_val="-500"
              name="height_range_spin_3" width="100" />
         <text bottom_delta="-40" follows="left|top" height="20" left="25"
              name="height_text_lbl10" width="480">
diff --git a/linden/indra/newview/skins/xui/ja/alerts.xml b/linden/indra/newview/skins/xui/ja/alerts.xml
index 165bdb6..5d49099 100644
--- a/linden/indra/newview/skins/xui/ja/alerts.xml
+++ b/linden/indra/newview/skins/xui/ja/alerts.xml
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <alerts>
+        <global name="skipnexttime">
+                今後は表示しない
+        </global>
+        <global name="alwayschoose">
+                常にこのオプションを選択
+        </global>
         <alert name="MissingAlert">
                 <message name="message">
                         [ALERT_NAME]がalerts.xmlに含まれていません！
@@ -358,7 +364,7 @@ Studio exhibitのウェブ・ページで確認してください。
         </alert>
         <alert name="ClickPublishHelpAvatar">
                 <message name="message">
-                        「検索��公開」を選択すると表示:
+                        「検索��表示」を選択すると表示:
                         - 検索結果における自分のプロフィール
                         - パブリックグループページにおける自分のプロフィールへのリンク
                 </message>
@@ -756,12 +762,15 @@ Studio exhibitのウェブ・ページで確認してください。
         </alert>
         <alert name="AddClassified">
                 <message name="message">
-                        クラシファイド広告は、検索ウィンドウのクラシファイドセクションに1週間掲示されます。
+                        検索ディレクトリの「クラシファイド」セクションに、
+クラシファイド広告が1週間掲載されます。
  
-広告を記入後、『発行』をクリックし、ディレクトリに追加します。
+広告を記入後、「発行」をクリックし、ディレクトリに
+追加します。
  
-発行する際に、支払い金額を尋ねられます。
-支払い金額を多くすれば、あなたの広告は上位にリストされます。また、キーワード検索の結果でも上位にリストされるようになります。
+「発行」をクリックすると、支払金額を尋ねられます。
+多く払うほどクラシファイドリストとキーワード検索
+の上位に表示されます。
                 </message>
                 <option name="OK">
                         OK
@@ -1274,6 +1283,20 @@ www.secondlife.comに戻って新規アカウントの作成を行いますか�
                         キャンセル
                 </option>
         </alert>
+        <alert name="TeleportFromLandmark">
+                <message name="message">
+                        本当にテレポートしますか?
+                </message>
+                <ignore name="ignore">
+                        持ち物のランドマークからテレポートする時
+                </ignore>
+                <option name="Teleport">
+                        テレポート
+                </option>
+                <option name="Cancel">
+                        キャンセル
+                </option>
+        </alert>
         <alert name="ProblemAddingEstateManager">
                 <message name="message">
                         新しい不動産マネージャーの追加に関する問題。1つ以上の不動産で、マネージャーリストが満杯になっています。
@@ -1295,10 +1318,10 @@ www.secondlife.comに戻って新規アカウントの作成を行いますか�
         <alert name="HelpEstateVoiceChat" title="ボイスチャットを許可">
                 <message name="message">
                         この不動産の区画は、住人が近所の人と対話できる
-                        独自のボイスチャンネルを持つことが
-                        できます。
+独自のボイスチャンネルを持つことが
+できます。
 
-                        デフォルト:オフ
+デフォルト:オフ
                 </message>
         </alert>
         <alert name="VoiceVersionMismatch" title="ボイスバージョンの不一致">
@@ -3889,7 +3912,7 @@ Linden社所有のメインランドの不動産での太陽の位置に
         <alert name="HelpEstateExternallyVisible" title="パブリック・アクセス">
                 <message name="message">
                         このチェックボックスは、他の不動産にいる住人が、アクセスリストに登録されていなくても、この不動産に立ち入ることができるかどうかを
-                         設定します。
+設定します。
  
 デフォルト:オン
                 </message>
@@ -3906,17 +3929,17 @@ Linden社所有のメインランドの不動産での太陽の位置に
         <alert name="HelpEstateAllowResident" title="アクセスを許可">
                 <message name="message">
                         この不動産へのアクセスは、ここに登録されている住人と
-                        下記で特別に登録されたグループのみに許可されます。この設定は、
-                        「メインランドからここが見える」がチェックされていない場合のみ、
-                        利用できます。
+下記で特別に登録されたグループのみに許可されます。この設定は、
+「メインランドからここが見える」がチェックされていない場合のみ、
+利用できます。
                 </message>
         </alert>
         <alert name="HelpEstateAllowGroup" title="グループ・アクセスを許可">
                 <message name="message">
                         この不動産へのアクセスは、ここに登録されているグループと
-                        下記で特別に登録された住人のみに許可されます。この設定は、
-                        「メインランドからここが見える」がチェックされていない場合のみ、
-                        利用できます。
+下記で特別に登録された住人のみに許可されます。この設定は、
+「メインランドからここが見える」がチェックされていない場合のみ、
+利用できます。
                 </message>
         </alert>
         <alert name="HelpEstateBanResident" title="アクセス拒否">
@@ -4482,14 +4505,15 @@ Linden Lab
         <alert name="BadURL">
                 <message name="message">
                         Second Life がリンクを処理できません。
-   
-    [SLURL]
-   
-   ほとんどのリンクは、次のような形式です。
-   
-    secondlife://app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about
-   
-   つづりをチェックし、もう一度試してください。
+
+[SLURL]
+
+ほとんどのリンクは、次のような形式です。
+
+secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-
+fd37083abc4c/about
+
+つづりをチェックし、もう一度試してください。
                 </message>
         </alert>
 </alerts>
diff --git a/linden/indra/newview/skins/xui/ja/floater_about.xml b/linden/indra/newview/skins/xui/ja/floater_about.xml
index 16fcc6d..4a93007 100644
--- a/linden/indra/newview/skins/xui/ja/floater_about.xml
+++ b/linden/indra/newview/skins/xui/ja/floater_about.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="floater_about" title="Second Lifeについて">
         <text_editor name="credits_editor">
-                Second Life は、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, 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 と、その他多数の人達によって作成されました。
+                Second Life は、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 と、その他多数の人達によって作成されました。
 
-また、Jesse Malthus を記念して一言。あなたの声と一緒に仕事をした全ての人が、あなたの素晴らしさを忘れることはないでしょう。
+在りし日の Jesse Malthus を偲んで一言。あなたと出会った全ての人が、あなたの素晴らしさを忘れることはないでしょう。
 
-これが、現在の最高のバージョンであることを保証するために、支援してくれた次の居住者の方々に厚く感謝いたします。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, 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.
+現在の最高のバージョンであることを保証するために、支援してくれた住人のみなさんに厚く感謝いたします。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, 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.
 
 APR Copyright (C) 2000-2004 The Apache Software Foundation
 cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel@haxx.se)
@@ -24,10 +24,10 @@ zlib Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler.
 
 All rights reserved.詳細は licenses.txt をご覧ください。
 
-Voice chat Audio coding:Polycom(R) Siren14(TM) (ITU-T Rec.G.722.1 Annex C)
+Voice chat Audio coding:Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
 
 
-ワトソン���� -- ����来てく�����い – 会い�������。
+ワトソン君�������������来てく���た�����。
         </text_editor>
         <text name="you_are_at">
                 [POSITION]中
diff --git a/linden/indra/newview/skins/xui/ja/floater_about_land.xml b/linden/indra/newview/skins/xui/ja/floater_about_land.xml
index 4f5e0bd..f4e77b8 100644
--- a/linden/indra/newview/skins/xui/ja/floater_about_land.xml
+++ b/linden/indra/newview/skins/xui/ja/floater_about_land.xml
@@ -270,7 +270,7 @@
                         <check_box label="安全（ダメージなし）" name="check safe" />
                         <check_box label="プッシュを制限" name="PushRestrictCheck"
                              tool_tip="llPushObjectが機能するのは、区画オーナーのスクリプトを通じて使用された場合か、またはプッシュ元がオーナーになっているスクリプトを通じて使用された場合だけです。" />
-                        <check_box label="「検索���＞「場所」���表示（L$30/週）"
+                        <check_box label="検索に表示����週L$30）以下の場所"
                              name="ShowDirectoryCheck"
                              tool_tip="検索結果で、この区画を人に見せる" />
                         <combo_box name="land category">
@@ -365,7 +365,8 @@
                                 ミュージックURL：
                         </text>
                         <text type="string" length="1" name="Media texture:">
-                                サウンドの設定:
+                                サウンド
+設定:
                         </text>
                         <text type="string" length="1" name="Replace this texture:">
                                 このテクスチャーを置換：
diff --git a/linden/indra/newview/skins/xui/ja/floater_chat_history.xml b/linden/indra/newview/skins/xui/ja/floater_chat_history.xml
index b6e7b4b..253ed4c 100644
--- a/linden/indra/newview/skins/xui/ja/floater_chat_history.xml
+++ b/linden/indra/newview/skins/xui/ja/floater_chat_history.xml
@@ -3,4 +3,13 @@
         <button label="ﾁｬｯﾄ" name="Chat" />
         <button label="ﾐｭｰﾄ" name="Mute resident" />
         <check_box label="ﾐｭｰﾄされたﾃｷｽﾄを表示" name="show mutes" />
+        <string name="ringing">
+                インワールドボイスチャットに接続中．．．
+        </string>
+        <string name="connected">
+                接続しました
+        </string>
+        <string name="hang_up">
+                インワールドボイスチャットの通話が切断されました
+        </string>
 </floater>
diff --git a/linden/indra/newview/skins/xui/ja/floater_directory.xml b/linden/indra/newview/skins/xui/ja/floater_directory.xml
index b111a50..75dc1cf 100644
--- a/linden/indra/newview/skins/xui/ja/floater_directory.xml
+++ b/linden/indra/newview/skins/xui/ja/floater_directory.xml
@@ -22,6 +22,42 @@
                                 <column label="メンバー" name="members" />
                         </scroll_list>
                 </panel>
+                <panel label="全て" name="find_all_panel">
+                        <button label="戻る" name="back_btn" />
+                        <button label="進む" name="forward_btn" />
+                        <line_editor label="検索" name="search_editor" tool_tip="Second Lifeを検索" />
+                        <button label="検索" name="search_btn" />
+                        <combo_box name="Category">
+                                <combo_item name="AnyCategory">
+                                        全カテゴリー
+                                </combo_item>
+                                <combo_item name="Classifieds">
+                                        クラシファイド広告
+                                </combo_item>
+                                <combo_item name="Events">
+                                        イベント
+                                </combo_item>
+                                <combo_item name="Groups">
+                                        グループ
+                                </combo_item>
+                                <combo_item name="People">
+                                        人々
+                                </combo_item>
+                                <combo_item name="Places">
+                                        場所
+                                </combo_item>
+                                <combo_item name="Wiki">
+                                        Wiki
+                                </combo_item>
+                        </combo_box>
+                        <check_box label="成人向けコンテンツを含む" name="mature_check" />
+                        <text name="loading_text">
+                                ローディング中...
+                        </text>
+                        <text name="done_text">
+                                完了
+                        </text>
+                </panel>
                 <panel label="クラシファイド広告" name="classified_panel">
                         <button label="＜以前" label_selected="＜以前" name="&lt; Prev" />
                         <button label="次へ＞" label_selected="次へ＞" name="Next &gt;" />
@@ -195,10 +231,10 @@
                                 </combo_item>
                         </combo_box>
                         <check_box label="価格 &lt;= L$" name="pricecheck" />
-                        <check_box label="面積 &gt;= 平方メートル" name="areacheck" bottom_delta="-22"/>
-                        <line_editor left="275" bottom_delta="-20" name="areaedit" width="50" />
-                        <button label="検索" label_selected="検索" name="Search" left="330" width="63"/>
-                        <text name="land" left="406">
+                        <check_box bottom_delta="-22" label="面積 &gt;= 平方メートル" name="areacheck" />
+                        <line_editor bottom_delta="-20" left="275" name="areaedit" width="50" />
+                        <button label="検索" label_selected="検索" left="330" name="Search" width="63" />
+                        <text left="406" name="land">
                                 土地はL$で直接買うか、L$建またはUS$建のオークションで買え
 ます。直接購買は土地に行きタイトル・バーの土地の名前をクリ
 ックしてください。
@@ -297,5 +333,25 @@
                                 <column label="" name="score" />
                         </scroll_list>
                 </panel>
+                <panel label="全(旧)" name="find_all_old_panel">
+                        <button label="＜戻る" label_selected="＜戻る" name="&lt; Prev" />
+                        <button label="次へ＞" label_selected="次へ＞" name="Next &gt;" />
+                        <text name="find">
+                                検索
+                        </text>
+                        <button label="検索" label_selected="検索" name="Search" />
+                        <check_box label="成人向けコンテンツを含む" name="incmature" />
+                        <scroll_list name="results">
+                                <column label="名前" name="name" />
+                                <column label="価格" name="price" />
+                                <column label="時間（太平洋時間）" name="date" />
+                                <column label="時間" name="time" />
+                                <column label="交通量" name="dwell" />
+                                <column label="面積" name="area" />
+                                <column label="L$／平方メートル" name="per_meter" />
+                                <column label="オンライン" name="online" />
+                                <column label="メンバー" name="members" />
+                        </scroll_list>
+                </panel>
         </tab_container>
 </floater>
diff --git a/linden/indra/newview/skins/xui/ja/floater_html_help.xml b/linden/indra/newview/skins/xui/ja/floater_html_help.xml
index 9b13474..e0bc67d 100644
--- a/linden/indra/newview/skins/xui/ja/floater_html_help.xml
+++ b/linden/indra/newview/skins/xui/ja/floater_html_help.xml
@@ -5,6 +5,6 @@
         <button label="転送" name="forward_btn" />
         <button label="閉じる" name="close_btn" />
         <text name="status_text">
-                完了
+                準������了
         </text>
 </floater>
diff --git a/linden/indra/newview/skins/xui/ja/floater_im.xml b/linden/indra/newview/skins/xui/ja/floater_im.xml
index 78d5dd2..6f75073 100644
--- a/linden/indra/newview/skins/xui/ja/floater_im.xml
+++ b/linden/indra/newview/skins/xui/ja/floater_im.xml
@@ -27,4 +27,7 @@
         <text name="removed_from_group">
                 あなたはグループから削除されました。
         </text>
+        <string name="invite_message">
+                このボイスチャットに応答/接続する場合は、[BUTTON NAME]をクリックしてください。
+        </string>
 </multi_floater>
diff --git a/linden/indra/newview/skins/xui/ja/floater_instant_message.xml b/linden/indra/newview/skins/xui/ja/floater_instant_message.xml
index b8baa0d..172b701 100644
--- a/linden/indra/newview/skins/xui/ja/floater_instant_message.xml
+++ b/linden/indra/newview/skins/xui/ja/floater_instant_message.xml
@@ -1,5 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater label="（不明）" name="im_floater" title="（不明）">
+        <string name="ringing">
+                かけていますc
+        </string>
+        <string name="connected">
+                接続しました、通話を終了する場合は「通話の終了」をクリックしてください。
+        </string>
+        <string name="hang_up">
+                通話が終了しました
+        </string>
         <button label="プロフィール..." name="profile_callee_btn" />
         <button label="コール" name="start_call_btn" />
         <button label="コールの終了" name="end_call_btn" />
diff --git a/linden/indra/newview/skins/xui/ja/floater_instant_message_ad_hoc.xml b/linden/indra/newview/skins/xui/ja/floater_instant_message_ad_hoc.xml
index 127b9fb..75c90d1 100644
--- a/linden/indra/newview/skins/xui/ja/floater_instant_message_ad_hoc.xml
+++ b/linden/indra/newview/skins/xui/ja/floater_instant_message_ad_hoc.xml
@@ -25,6 +25,15 @@
                         </panel>

                 </layout_panel>

         </layout_stack>

+        <string name="ringing">

+                ボイスチャットに参加する．．．

+        </string>

+        <string name="connected">

+                接続しました、通話を終了する場合は「通話の終了」をクリックしてください。

+        </string>

+        <string name="hang_up">

+                ボイスチャットから退席しました

+        </string>

         <text name="live_help_dialog">

                 *** ヘルプリクエストへようこそ *** 

 まずF1を押してSLヘルプページを開くか、ナレッジベースのページ http://secondlife.com/knowledgebase/ へアクセスしてください。

diff --git a/linden/indra/newview/skins/xui/ja/floater_instant_message_group.xml b/linden/indra/newview/skins/xui/ja/floater_instant_message_group.xml
index 5dd7c59..d88ffca 100644
--- a/linden/indra/newview/skins/xui/ja/floater_instant_message_group.xml
+++ b/linden/indra/newview/skins/xui/ja/floater_instant_message_group.xml
@@ -41,4 +41,13 @@
                         </panel>

                 </layout_panel>

         </layout_stack>

+        <string name="ringing">

+                ボイスチャットに参加します．．．

+        </string>

+        <string name="connected">

+                接続しました、通話を終了する場合は「通話の終了」をクリックしてください。

+        </string>

+        <string name="hang_up">

+                ボイスチャットから退席しました

+        </string>

 </floater>

diff --git a/linden/indra/newview/skins/xui/ja/floater_lagmeter.xml b/linden/indra/newview/skins/xui/ja/floater_lagmeter.xml
index 51e6832..fbd7a6d 100644
--- a/linden/indra/newview/skins/xui/ja/floater_lagmeter.xml
+++ b/linden/indra/newview/skins/xui/ja/floater_lagmeter.xml
@@ -90,7 +90,7 @@
                 600

         </text>

         <text name="network_ping_warning_ms">

-                250

+                300

         </text>

         <text name="network_ping_critical_msg">

                 接続の ping 時間: ＞ [NETWORK_PING_CRITICAL] ミリ秒

diff --git a/linden/indra/newview/skins/xui/ja/floater_land_holdings.xml b/linden/indra/newview/skins/xui/ja/floater_land_holdings.xml
index 32b9e3e..49d7f16 100644
--- a/linden/indra/newview/skins/xui/ja/floater_land_holdings.xml
+++ b/linden/indra/newview/skins/xui/ja/floater_land_holdings.xml
@@ -22,18 +22,21 @@
                 現在の支払いプランでの許可された保有地：
         </text>
         <text name="allowed_text">
-                0平方メートル
+                ［AREA］平方メートル
         </text>
         <text name="current_label">
                 現在の保有地：
         </text>
         <text name="current_text">
-                0平方メートル
+                ［AREA］平方メートル
         </text>
         <text name="available_label">
                 土地購入可：
         </text>
         <text name="available_text">
-                0平方メートル
+                ［AREA］平方メートル
         </text>
+        <string name="area_string">
+                ［AREA］平方メートル
+        </string>
 </floater>
diff --git a/linden/indra/newview/skins/xui/ja/floater_report_bug.xml b/linden/indra/newview/skins/xui/ja/floater_report_bug.xml
index 89c15ba..7c20151 100644
--- a/linden/indra/newview/skins/xui/ja/floater_report_bug.xml
+++ b/linden/indra/newview/skins/xui/ja/floater_report_bug.xml
@@ -10,7 +10,7 @@
                 位置：
         </text>
         <text name="select_object_label">
-                ������ン�������ック���てから��ブ����クト����リック：
+                ﾎﾞﾀﾝをｸﾘ��ｸしてからｵﾌﾞｼﾞ����ﾄをｸﾘ��������
         </text>
         <button label="" label_selected="" name="pick_btn"
              tool_tip="オブジェクト・ピッカー - この報告の主題となるオブジェクトを特定" />
diff --git a/linden/indra/newview/skins/xui/ja/floater_tools.xml b/linden/indra/newview/skins/xui/ja/floater_tools.xml
index deb93fb..a23c2e1 100644
--- a/linden/indra/newview/skins/xui/ja/floater_tools.xml
+++ b/linden/indra/newview/skins/xui/ja/floater_tools.xml
@@ -148,7 +148,7 @@
                         <check_box label="誰に対しても移動を許可" name="checkbox allow everyone move" />
                         <check_box label="誰に対してもコピーを許可"
                              name="checkbox allow everyone copy" />
-                        <check_box label="検索��表示" name="search_check"
+                        <check_box label="検索��表示" name="search_check"
                              tool_tip="検索結果で、このオブジェクトを人に見せる" />
                         <check_box label="売り出し中" name="checkbox for sale" />
                         <text name="Price:  L$">
diff --git a/linden/indra/newview/skins/xui/ja/menu_inventory.xml b/linden/indra/newview/skins/xui/ja/menu_inventory.xml
index 7c1d910..6a222f5 100644
--- a/linden/indra/newview/skins/xui/ja/menu_inventory.xml
+++ b/linden/indra/newview/skins/xui/ja/menu_inventory.xml
@@ -46,7 +46,7 @@
         <menu_item_call label="アイテムを取り外す" name="Take Off Items" />
         <menu_item_call label="会議チャット開始" name="Conference Chat Folder" />
         <menu_item_call label="再生" name="Sound Play" />
-        <menu_item_call label="ランドマークに���レポート" name="Teleport To Landmark" />
+        <menu_item_call label="ランドマーク���報" name="Teleport To Landmark" />
         <menu_item_call label="世界で再生" name="Animation Play" />
         <menu_item_call label="ローカルに再生" name="Animation Audition" />
         <menu_item_call label="インスタント・メッセージを送信"
diff --git a/linden/indra/newview/skins/xui/ja/menu_viewer.xml b/linden/indra/newview/skins/xui/ja/menu_viewer.xml
index 60d9066..09201e9 100644
--- a/linden/indra/newview/skins/xui/ja/menu_viewer.xml
+++ b/linden/indra/newview/skins/xui/ja/menu_viewer.xml
@@ -83,7 +83,7 @@
                 <menu_item_check label="インスタント・メッセージ" name="Instant Message" />
                 <menu_item_call label="持ち物" name="Inventory" />
                 <menu_item_check label="アクティブ・スピーカー" name="Active Speakers" />
-                <menu_item_check label="������������������ト" name="Mute List" />
+                <menu_item_check label="����������������" name="Mute List" />
                 <menu_item_separator label="-----------" name="separator2" />
                 <menu_item_check label="カメラ・コントロール" name="Camera Controls" />
                 <menu_item_check label="移動コントロール" name="Movement Controls" />
@@ -209,6 +209,16 @@
                      name="Set Scripts to Not Running in Selection" />
                 <menu_item_separator label="-----------" name="separator6" />
                 <menu_item_call label="バグの報告..." name="Report Bug..." />
+                <menu label="バグの報告" name="Bug Reporting">
+                        <menu_item_call label="パブリック問題トラッカー..." name="Public Issue Tracker..." />
+                        <menu_item_call label="パブリック問題トラッカー ヘルプ..."
+                             name="Publc Issue Tracker Help..." />
+                        <menu_item_call label="バグの報告 101..." name="Bug Reporing 101..." />
+                        <menu_item_call label="セキュリティ問題..." name="Security Issues..." />
+                        <menu_item_call label="QA Wiki..." name="QA Wiki..." />
+                        <menu_item_separator label="-----------" name="separator7" />
+                        <menu_item_call label="バグの報告..." name="Report Bug..." />
+                </menu>
         </menu>
         <menu label="ヘルプ" name="Help">
                 <menu_item_call label="Second Life ヘルプ" name="Second Life Help" />
diff --git a/linden/indra/newview/skins/xui/ja/notify.xml b/linden/indra/newview/skins/xui/ja/notify.xml
index 97522a6..ef7afd7 100644
--- a/linden/indra/newview/skins/xui/ja/notify.xml
+++ b/linden/indra/newview/skins/xui/ja/notify.xml
@@ -958,6 +958,11 @@ Mキーを押して移行します。
                         [VOICE_CHANNEL_NAME]は、あなたのコールを受け取れません。空間ボイスチャットに再接続されます。
                 </message>
         </notify>
+        <notify name="VoiceChannelJoinFailed">
+                <message name="message">
+                        [VOICE_CHANNEL_NAME]への接続に失敗しました。時間をおいて、再度、試みてください。空間ボイスチャットに再接続されます。
+                </message>
+        </notify>
         <notify name="VoiceLoginRetry">
                 <message name="message">
                         あなた用のボイスチャンネルを作成しています。1分ほどかかります。
diff --git a/linden/indra/newview/skins/xui/ja/panel_avatar.xml b/linden/indra/newview/skins/xui/ja/panel_avatar.xml
index f52183f..e095745 100644
--- a/linden/indra/newview/skins/xui/ja/panel_avatar.xml
+++ b/linden/indra/newview/skins/xui/ja/panel_avatar.xml
@@ -71,7 +71,7 @@
                              tool_tip="この人に持ち物品目を与えるには、ここにドロップします">
                                 持ち物アイテムをここにドロップします
                         </text>
-                        <check_box label="検索��表示" name="allow_publish"
+                        <check_box label="検索��表示" name="allow_publish"
                              tool_tip="検索で、詳細やイメージなどさらなるプロフィール情報を公開する。" />
                         <button label="?" label_selected="?" name="?" />
                         <button label="地図上に表示" label_selected="地図上に表示"
diff --git a/linden/indra/newview/skins/xui/ja/panel_avatar_classified.xml b/linden/indra/newview/skins/xui/ja/panel_avatar_classified.xml
index 5c2aad8..713fb01 100644
--- a/linden/indra/newview/skins/xui/ja/panel_avatar_classified.xml
+++ b/linden/indra/newview/skins/xui/ja/panel_avatar_classified.xml
@@ -22,4 +22,10 @@
         <text name="ad_placed_paid">
                 広告掲載：[DATE]、L$[AMT] 支払い済み
         </text>
+        <text name="update_txt">
+                アップデート
+        </text>
+        <text name="publish_txt">
+                公開...
+        </text>
 </panel>
diff --git a/linden/indra/newview/skins/xui/ja/panel_group_general.xml b/linden/indra/newview/skins/xui/ja/panel_group_general.xml
index 3f38078..2557946 100644
--- a/linden/indra/newview/skins/xui/ja/panel_group_general.xml
+++ b/linden/indra/newview/skins/xui/ja/panel_group_general.xml
@@ -7,6 +7,9 @@
 
 オプションの上でマウスカーソルを動かすと、ヘルプ情報を得られます。
         </text>
+        <string name="group_info_unchanged">
+                グループ設定が変更されました。
+        </string>
         <button label="?" label_selected="?" name="help_button" />
         <line_editor label="あなたの新しいグループ名を記入してください"
              name="group_name_editor">
@@ -63,17 +66,17 @@
                 グループの環境設定
         </text>
         <panel name="preferences_container">
-                <check_box label="検索��表示" name="show_in_group_list"
+                <check_box label="検索��表示" name="show_in_group_list"
                      tool_tip="検索結果で、このグループを人に見せる" />
                 <check_box label="ウェブ上で公開" name="publish_on_web"
                      tool_tip="このグループの情報をウェブ上で公開できるようにするかどうかを指定します。" />
                 <check_box label="会員募集" name="open_enrollement"
                      tool_tip="このグループに招待状なしで新しいメンバーを受け入れるかどうかを指定します。" />
-                <check_box label="入会費：L＄" name="check_enrollment_fee"
+                <check_box label="入会費：L$" name="check_enrollment_fee"
                      tool_tip="このグループへの参加に入会費を必須とするかどうかを指定します。" />
                 <spinner name="spin_enrollment_fee"
                      tool_tip="「入会費」がチェックされている場合、新規会員は入会時にこの費用を支払う必要があります。" />
-                <check_box label="成人向ｸﾞﾙ��ﾌﾟ" name="mature"
+                <check_box label="成人向け��ループ" name="mature"
                      tool_tip="あなたのグループ情報が成人向けとみなされるかどうかを指定します。" />
                 <panel name="title_container">
                         <text name="active_title_label">
diff --git a/linden/indra/newview/skins/xui/ja/panel_group_land_money.xml b/linden/indra/newview/skins/xui/ja/panel_group_land_money.xml
index 537b135..1f26063 100644
--- a/linden/indra/newview/skins/xui/ja/panel_group_land_money.xml
+++ b/linden/indra/newview/skins/xui/ja/panel_group_land_money.xml
@@ -29,19 +29,19 @@
                 寄付総額：
         </text>
         <text name="total_contributed_land_value">
-                0平方メートル
+                ［AREA］平方メートル
         </text>
         <text name="total_land_in_use_label">
                 土地利用の合計：
         </text>
         <text name="total_land_in_use_value">
-                0平方メートル
+                ［AREA］平方メートル
         </text>
         <text name="land_available_label">
                 利用可の土地：
         </text>
         <text name="land_available_value">
-                0平方メートル
+                ［AREA］平方メートル
         </text>
         <text name="your_contribution_label">
                 あなたの貢献：
@@ -49,8 +49,11 @@
         <text name="your_contribution_max_value_append">
                 平方ﾒｰﾄﾙ
         </text>
+        <string name="land_contrib_error">
+                土地の出資設定を行うことができませんでした。
+        </string>
         <text name="your_contribution_max_value">
-                ([AMOUNT]最大)
+                平方メートル ([AMOUNT]最大)
         </text>
         <text name="group_over_limit_text">
                 使用中の土地をサポートするには、グループ・メンバーがさらに多くの土地クレジットを提供する必要があります。
diff --git a/linden/indra/newview/skins/xui/ja/panel_group_notices.xml b/linden/indra/newview/skins/xui/ja/panel_group_notices.xml
index b5fe45c..46eb096 100644
--- a/linden/indra/newview/skins/xui/ja/panel_group_notices.xml
+++ b/linden/indra/newview/skins/xui/ja/panel_group_notices.xml
@@ -37,14 +37,14 @@
                 <text name="lbl2">
                         通知を送るには、件名を入力します。 持ち物のアイテムを
 1つ、このパネルにドラッグして、通知に添付
-できます。 添付できるのは、コピー、譲渡可能なアイテムで、
-フォルダーに送ることはできません。
+できます。 添付できるのは、コピー、譲渡可能なアイテ
+��で、��ォルダーに送ることはできません。
                 </text>
                 <text name="lbl3">
                         件名：
                 </text>
                 <text name="lbl4">
-                        メッセ��ジ：
+                        ﾒｯｾｰ��������
                 </text>
                 <text name="lbl5">
                         添付：
diff --git a/linden/indra/newview/skins/xui/ja/panel_group_roles.xml b/linden/indra/newview/skins/xui/ja/panel_group_roles.xml
index b86928f..97a757e 100644
--- a/linden/indra/newview/skins/xui/ja/panel_group_roles.xml
+++ b/linden/indra/newview/skins/xui/ja/panel_group_roles.xml
@@ -48,7 +48,7 @@
         <tab_container name="roles_tab_container">
                 <panel label="メンバー" name="members_sub_tab" tool_tip="Members">
                         <button label="検索" name="search_button" />
-                        <button label="��べ��を表示" name="show_all_button" />
+                        <button label="全てを表示" name="show_all_button" />
                         <name_list name="member_list">
                                 <column label="メンバー名" name="name" />
                                 <column label="Donated Tier" name="donated" />
diff --git a/linden/indra/newview/skins/xui/ja/panel_group_voting.xml b/linden/indra/newview/skins/xui/ja/panel_group_voting.xml
index fc5dd94..789c2de 100644
--- a/linden/indra/newview/skins/xui/ja/panel_group_voting.xml
+++ b/linden/indra/newview/skins/xui/ja/panel_group_voting.xml
@@ -87,7 +87,8 @@
                 グループ投票履歴
         </text>
         <text name="instructions">
-                結果を確認するには、[過去の投票]をダブルクリックするか、いずれかの投票を選択した後、[アイテムを表示]をクリックします。
+                結果を確認するには、[過去の投票]をダブルクリックするか、いずれかの
+投票を選択した後、[アイテムを表示]をクリックします。
         </text>
         <text name="history_list_lbl">
                 過去の投票                                                         投票終了
diff --git a/linden/indra/newview/skins/xui/ja/panel_place.xml b/linden/indra/newview/skins/xui/ja/panel_place.xml
index f8af570..3df6640 100644
--- a/linden/indra/newview/skins/xui/ja/panel_place.xml
+++ b/linden/indra/newview/skins/xui/ja/panel_place.xml
@@ -4,10 +4,10 @@
         <button label="地図上に表示" name="map_btn" />
         <button label="賭ける..." name="auction_btn" />
         <text name="traffic_text">
-                交通量： [TRAFFIC].
+                交通量： [TRAFFIC]
         </text>
         <text name="area_text">
-                エリ��：[AREA]平方メートル
+                ��積：［AREA］平方メートル
         </text>
         <text name="forsale_text">
                 L$[PRICE]で売り出し中。
@@ -15,4 +15,13 @@
         <text name="auction_text">
                 オークションID [ID]。
         </text>
+        <text name="server_update_text">
+                土地情報のご利用には、サーバーのアップデートが必要です。
+        </text>
+        <text name="server_error_text">
+                現在の所在地についての情報は現在ご利用できません。時間をおいて、再度、試みてください。
+        </text>
+        <text name="server_forbidden_text">
+                現在の所在地についての情報は、アクセス制限のため利用できません。区画所有者の許可があるかどうかご確認ください。
+        </text>
 </panel>
diff --git a/linden/indra/newview/skins/xui/ja/panel_place_small.xml b/linden/indra/newview/skins/xui/ja/panel_place_small.xml
index 6c1851e..a639acd 100644
--- a/linden/indra/newview/skins/xui/ja/panel_place_small.xml
+++ b/linden/indra/newview/skins/xui/ja/panel_place_small.xml
@@ -3,4 +3,25 @@
         <button label="テレポート" name="teleport_btn" />
         <button label="地図上に表示" name="map_btn" />
         <button label="賭ける..." name="auction_btn" />
+        <string name="traffic_text">
+                交通量： [TRAFFIC]
+        </string>
+        <string name="area_text">
+                面積：［AREA］平方メートル
+        </string>
+        <string name="forsale_text">
+                L$[PRICE]で売り出し中
+        </string>
+        <string name="auction_text">
+                オークションID [ID]。
+        </string>
+        <text name="server_update_text">
+                土地情報のご利用には、サーバーのアップデートが必要です。
+        </text>
+        <text name="server_error_text">
+                現在の所在地についての情報が現在ご利用できません。時間をおいて、再度、試みてください。
+        </text>
+        <text name="server_forbidden_text">
+                現在の所在地についての情報は、アクセス制限のためご利用できません。区画所有者の許可があるかどうかご確認ください。
+        </text>
 </panel>
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 dac17d1..c4e3889 100644
--- a/linden/indra/newview/skins/xui/ja/panel_preferences_general.xml
+++ b/linden/indra/newview/skins/xui/ja/panel_preferences_general.xml
@@ -82,25 +82,25 @@
                         英語
                 </combo_item>
                 <combo_item type="string" length="1" name="Chinese">
-                        中国語 - ベータ
+                        中国語
                 </combo_item>
                 <combo_item type="string" length="1" name="Deutsch(German)">
-                        ドイツ語 - ベータ
+                        ドイツ語
                 </combo_item>
                 <combo_item type="string" length="1" name="French">
-                        フランス語 - ベータ
+                        フランス語
                 </combo_item>
                 <combo_item type="string" length="1" name="(Japanese)">
-                        日本語 (日本語) – ベータ版
+                        日本語 (日本語)
                 </combo_item>
                 <combo_item type="string" length="1" name="(Korean)">
-                        한국어 (韓国語) – ベータ版
+                        한국어 (韓国語)
                 </combo_item>
                 <combo_item type="string" length="1" name="Portugese">
-                        ポルトガル語 - ベータ
+                        ポルトガル語
                 </combo_item>
                 <combo_item type="string" length="1" name="Spanish">
-                        スペイン語 - ベータ
+                        スペイン語
                 </combo_item>
         </combo_box>
 </panel>
diff --git a/linden/indra/newview/skins/xui/ja/panel_region_general.xml b/linden/indra/newview/skins/xui/ja/panel_region_general.xml
index da78367..6b0cfb4 100644
--- a/linden/indra/newview/skins/xui/ja/panel_region_general.xml
+++ b/linden/indra/newview/skins/xui/ja/panel_region_general.xml
@@ -18,7 +18,7 @@
         <button label="?" name="land_resell_help" />
         <check_box label="土地の統合／分割を許可" name="allow_parcel_changes_check" />
         <button label="?" name="parcel_changes_help" />
-        <check_box label="���画の検索をブロック" name="block_parcel_search_check"
+        <check_box label="���地の検索表示をブロック" name="block_parcel_search_check"
              tool_tip="検索結果で、この地域と区画を人に見せる" />
         <button label="?" name="parcel_search_help" />
         <spinner label="人物の制限" name="agent_limit_spin" />
diff --git a/linden/indra/newview/skins/xui/ja/panel_status_bar.xml b/linden/indra/newview/skins/xui/ja/panel_status_bar.xml
index 71b06c2..1dd7dfa 100644
--- a/linden/indra/newview/skins/xui/ja/panel_status_bar.xml
+++ b/linden/indra/newview/skins/xui/ja/panel_status_bar.xml
@@ -35,4 +35,6 @@
         <text name="bandwidth_tooltip">
                 帯域幅
         </text>
+        <line_editor label="検索" name="search_editor" tool_tip="Second Lifeを検索" />
+        <button name="search_btn" tool_tip="Second Lifeを検索" />
 </panel>
diff --git a/linden/indra/newview/skins/xui/ko/alerts.xml b/linden/indra/newview/skins/xui/ko/alerts.xml
index a477746..2d2ae14 100644
--- a/linden/indra/newview/skins/xui/ko/alerts.xml
+++ b/linden/indra/newview/skins/xui/ko/alerts.xml
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <alerts>
+        <global name="skipnexttime">
+                이 메시지를 다시 표시 안 함
+        </global>
+        <global name="alwayschoose">
+                항상 이 옵션 선택
+        </global>
         <alert name="MissingAlert">
                 <message name="message">
                         alerts.xml에 [ALERT_NAME]이(가) 없습니다.
@@ -362,9 +368,7 @@
         </alert>
         <alert name="ClickPublishHelpAvatar">
                 <message name="message">
-                        웹에 게시 옵션을 선택하면 
-[SECOND_LIFE] 
- 웹 사이트에 내 이름, 이미지 및  ‘자기 소개’ 텍스트를 게시할 수 있습니다.
+                        검색 보기
                 </message>
         </alert>
         <alert name="ClickPartnerHelpAvatar">
@@ -763,12 +767,15 @@ www.secondlife.com으로 이동하여 새로운 계정을 만드시겠습니까?
         </alert>
         <alert name="AddClassified">
                 <message name="message">
-                        분류된 광고가 1주일 동안 찾기 디렉토리의 ’광고’ 섹션에 나타납니다.
+                        분류된 광고가 1주일 동안 디렉토리의 &apos;광고&apos; 섹션에
+나타납니다.
  
-광고를 작성한 후 &apos;게시하기&apos;를 클릭하여 디렉토리에 추가합니다.
+광고를 작성한 후 &apos;게시하기&apos;를 클릭하여 디렉토리에
+추가합니다.
  
 게시하기를 클릭하면 요금 결제를 묻는 메시지가 나타납니다.
-더 높은 가격을 지불할수록 목록에서 더 높은 위치에 게재되고 키워드 검색 시 결과에 더 우선적으로 표시됩니다.
+더 높은 가격을 지불할수록 목록에서 더 높은 위치에 게재되고
+키워드 검색 시 결과에 더 우선적으로 표시됩니다.
                 </message>
                 <option name="OK">
                         확인
@@ -1227,6 +1234,20 @@ www.secondlife.com으로 돌아가 신규 계정을 만드시겠습니까?
                         취소
                 </option>
         </alert>
+        <alert name="TeleportFromLandmark">
+                <message name="message">
+                        텔리포트하시겠습니까?
+                </message>
+                <ignore name="ignore">
+                        인벤토리의 랜드마크에서 텔리포트하는 경우
+                </ignore>
+                <option name="Teleport">
+                        텔리포트
+                </option>
+                <option name="Cancel">
+                        취소
+                </option>
+        </alert>
         <alert name="ProblemAddingEstateManager">
                 <message name="message">
                         새로운 사유지 관리자를 추가하는 데 문제가 발생하였습니다.  하나 이상의 사유지 관리자 목록이 모두 찬 상태입니다.
@@ -1248,10 +1269,10 @@ www.secondlife.com으로 돌아가 신규 계정을 만드시겠습니까?
         <alert name="HelpEstateVoiceChat" title="음성 채팅 허용">
                 <message name="message">
                         이 사유지의 구획은 주민들이 부근에 있는 다른 사람들과 대화할 수 있는
-   음성 대화를 할수 있게
-   설정합니다.
+음성 대화를 할 수 있게
+설정합니다.
 
-   기본 설정: 꺼짐
+기본 설정: 꺼짐
                 </message>
         </alert>
         <alert name="VoiceVersionMismatch" title="음성 버전이 일치하지 않음.">
@@ -3924,7 +3945,7 @@ http://secondlife.com/tiki/tiki-index.php?page=RawTerrainFile
         <alert name="HelpEstateExternallyVisible" title="일반 공개">
                 <message name="message">
                         다른 사유지 내에 있는 주민들이
-    접근 권한 리스트에 올라있지 않아도 이 사유지에 들어갈 수 있는지 여부를 설정합니다.
+접근 권한 리스트에 올라있지 않아도 이 사유지에 들어갈 수 있는지 여부를 설정합니다.
  
 기본 설정: 켜짐
                 </message>
@@ -3940,16 +3961,18 @@ http://secondlife.com/tiki/tiki-index.php?page=RawTerrainFile
         </alert>
         <alert name="HelpEstateAllowResident" title="액세스 허용">
                 <message name="message">
-                        사유지 사용권한은 목록에 있는 주민들과 아래 목록에  그룹들로 제한됩니다.
- 
-(사유지를 메인랜드에서 확인할 수 있는 경우, 사용권한은 주민 또는 목록상의 그룹으로 제한될 수 없고, 이러한 제어는 비활성화 됩니다. ‘접근 거부’ 목록만 사용됨).
+                        사유지 사용권한은 목록에 있는 
+주민들과 아래 목록에 그룹들로 제한됩니다.  (사유지를 메인랜드에서 확인할 수 있는 경우, 
+사용권한은 주민 또는 목록상의 그룹으로 제한될 수 없고, 이러한 제어는 비활성화됩니다. 
+&apos;접근 거부&apos; 목록만 사용됨)
                 </message>
         </alert>
         <alert name="HelpEstateAllowGroup" title="그룹 액세스 허용">
                 <message name="message">
-                        사유지 사용권한은 목록상의 그룹들과 위에 특별히 허락된 주민들로 제한됩니다. 
- 
-(사유지를 메인랜드에서 확인할 수 있는 경우, 사용권한은 주민 또는 목록상의 그룹으로 제한될 수 없고, 이러한 제어는 비활성화 됩니다. ‘접근 거부’ 목록만 사용됨).
+                        사유지 사용권한은 목록상의 그룹들과 
+위에 특별히 허락된 주민들로 제한됩니다.  (사유지를 메인랜드에서 확인할 수 있는 경우, 
+사용권한은 주민 또는 목록상의 그룹으로 제한될 수 없고, 이러한 제어는 비활성화됩니다. 
+&apos;접근 거부&apos; 목록만 사용됨)
                 </message>
         </alert>
         <alert name="HelpEstateBanResident" title="액세스 거부">
@@ -4543,14 +4566,15 @@ http://secondlife.com/community/support.php
         <alert name="BadURL">
                 <message name="message">
                         Second Life에서 링크로 연결되지 않습니다:
-   
-    [SLURL]
-   
-   대부분의 링크 형식은 다음과 유사합니다:
-   
-    secondlife://app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about
-   
-   맞춤법을 확인하고 다시 시도하십시오.
+
+[SLURL]
+
+대부분의 링크 형식은 다음과 유사합니다:
+
+secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-
+fd37083abc4c/about
+
+맞춤법을 확인하고 다시 시도하십시오.
                 </message>
         </alert>
 </alerts>
diff --git a/linden/indra/newview/skins/xui/ko/floater_about.xml b/linden/indra/newview/skins/xui/ko/floater_about.xml
index ad29d59..f6b0b8f 100644
--- a/linden/indra/newview/skins/xui/ko/floater_about.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_about.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="floater_about" title="세컨드라이프 정보">
         <text_editor name="credits_editor">
-                Second Life 제작자들: 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, 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, 그 외에 많은 분들이 수고해 주셨습니다.
+                Second Life 제작자들: 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, 그 외에 많은 분들이 수고해 주셨습니다.
 
 Jesse Malthus를 기억하며... 그의 목소리를 들었던 모든 사람들에 의해 그는 다정스럽게 기억될 것입니다.
 
-현재 버전이 최고 버전이 될 수 있도록 도와주신 주민들께 감사 드립니다: 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, 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 등.
+현재 버전이 최고 버전이 될 수 있도록 도와주신 주민들께 감사 드립니다: 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 등.
 
 APR Copyright (C) 2000-2004 The Apache Software Foundation
 cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel@haxx.se)
@@ -27,7 +27,7 @@ zlib Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler.
 음성 채팅 오디오 코딩: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
 
 
-와트슨씨. 이리 오세요. 보고 싶군요.
+와트슨씨, 이리 오세요. 보고 싶군요.
         </text_editor>
         <text name="you_are_at">
                 [POSITION]에 있습니다.
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 76c3444..4cbdda2 100644
--- a/linden/indra/newview/skins/xui/ko/floater_about_land.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_about_land.xml
@@ -268,7 +268,7 @@
                         <check_box label="안전(데미지 없음)" name="check safe" />
                         <check_box label="밀기 한정" name="PushRestrictCheck"
                              tool_tip="llPushObject기능은 구획 소유주 스크립트이거나 기능 구현자가 스크립트 소유자인 경우에만 작동합니다." />
-                        <check_box label="검��� &gt; ���소(L$30/주)��� 보���기" name="ShowDirectoryCheck"
+                        <check_box label="장소 검색(L$30/주) 표��� ���치" name="ShowDirectoryCheck"
                              tool_tip="사람들이 이 구획 검색 결과를 봅니다." />
                         <combo_box name="land category">
                                 <combo_item name="AnyCategory">
diff --git a/linden/indra/newview/skins/xui/ko/floater_chat_history.xml b/linden/indra/newview/skins/xui/ko/floater_chat_history.xml
index 6babcf2..1112789 100644
--- a/linden/indra/newview/skins/xui/ko/floater_chat_history.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_chat_history.xml
@@ -3,4 +3,13 @@
         <button label="채팅" name="Chat" />
         <button label="차단" name="Mute resident" />
         <check_box label="음소거된 텍스트 표시하기" name="show mutes" />
+        <string name="ringing">
+                음성 채팅에 연결하는 중...
+        </string>
+        <string name="connected">
+                연결됨
+        </string>
+        <string name="hang_up">
+                음성 채팅 연결 끊김
+        </string>
 </floater>
diff --git a/linden/indra/newview/skins/xui/ko/floater_directory.xml b/linden/indra/newview/skins/xui/ko/floater_directory.xml
index ce8835f..c8bfc1c 100644
--- a/linden/indra/newview/skins/xui/ko/floater_directory.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_directory.xml
@@ -22,6 +22,42 @@
                                 <column label="회원" name="members" />
                         </scroll_list>
                 </panel>
+                <panel label="전체" name="find_all_panel">
+                        <button label="뒤로" name="back_btn" />
+                        <button label="앞으로" name="forward_btn" />
+                        <line_editor label="검색" name="search_editor" tool_tip="검색" />
+                        <button label="검색" name="search_btn" />
+                        <combo_box name="Category">
+                                <combo_item name="AnyCategory">
+                                        모든 카테고리
+                                </combo_item>
+                                <combo_item name="Classifieds">
+                                        광고
+                                </combo_item>
+                                <combo_item name="Events">
+                                        이벤트
+                                </combo_item>
+                                <combo_item name="Groups">
+                                        그룹
+                                </combo_item>
+                                <combo_item name="People">
+                                        사람
+                                </combo_item>
+                                <combo_item name="Places">
+                                        장소
+                                </combo_item>
+                                <combo_item name="Wiki">
+                                        위키
+                                </combo_item>
+                        </combo_box>
+                        <check_box label="성인용 컨텐츠 포함" name="mature_check" />
+                        <text name="loading_text">
+                                로딩 중...
+                        </text>
+                        <text name="done_text">
+                                완료
+                        </text>
+                </panel>
                 <panel label="광고" name="classified_panel">
                         <button label="&lt; 이전" label_selected="&lt; 이전" name="&lt; Prev" />
                         <button label="다음 &gt;" label_selected="다음 &gt;" name="Next &gt;" />
@@ -294,5 +330,25 @@
                                 <column label="" name="score" />
                         </scroll_list>
                 </panel>
+                <panel label="전체(구)" name="find_all_old_panel">
+                        <button label="&lt; 이전" label_selected="&lt; 이전" name="&lt; Prev" />
+                        <button label="다음 &gt;" label_selected="다음 &gt;" name="Next &gt;" />
+                        <text name="find">
+                                찾기:
+                        </text>
+                        <button label="검색" label_selected="검색" name="Search" />
+                        <check_box label="성인용 컨텐츠 포함" name="incmature" />
+                        <scroll_list name="results">
+                                <column label="이름" name="name" />
+                                <column label="가격" name="price" />
+                                <column label="시간(태평양시)" name="date" />
+                                <column label="시간" name="time" />
+                                <column label="통행량" name="dwell" />
+                                <column label="면적" name="area" />
+                                <column label="L$/sq.m" name="per_meter" />
+                                <column label="온라인" name="online" />
+                                <column label="회원" name="members" />
+                        </scroll_list>
+                </panel>
         </tab_container>
 </floater>
diff --git a/linden/indra/newview/skins/xui/ko/floater_html_help.xml b/linden/indra/newview/skins/xui/ko/floater_html_help.xml
index 2258112..2a2f355 100644
--- a/linden/indra/newview/skins/xui/ko/floater_html_help.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_html_help.xml
@@ -5,6 +5,6 @@
         <button label="앞으로" name="forward_btn" />
         <button label="닫기" name="close_btn" />
         <text name="status_text">
-                ������
+                ������
         </text>
 </floater>
diff --git a/linden/indra/newview/skins/xui/ko/floater_im.xml b/linden/indra/newview/skins/xui/ko/floater_im.xml
index 60ff087..6920056 100644
--- a/linden/indra/newview/skins/xui/ko/floater_im.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_im.xml
@@ -27,4 +27,7 @@
         <text name="removed_from_group">
                 그룹에서 제거되었습니다.
         </text>
+        <string name="invite_message">
+                음성 채팅을 수락/연결하려면 [BUTTON NAME] 버튼을 클릭하십시오.
+        </string>
 </multi_floater>
diff --git a/linden/indra/newview/skins/xui/ko/floater_instant_message.xml b/linden/indra/newview/skins/xui/ko/floater_instant_message.xml
index 0c77254..935de51 100644
--- a/linden/indra/newview/skins/xui/ko/floater_instant_message.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_instant_message.xml
@@ -1,5 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater label="(알 수 없음)" name="im_floater" title="(알 수 없음)">
+        <string name="ringing">
+                음성 채팅 연결  중...
+        </string>
+        <string name="connected">
+                연결되었습니다. 연결을 끊으려면 통화 종료 버튼을 클릭하십시오.
+        </string>
+        <string name="hang_up">
+                통화 종료
+        </string>
         <button label="프로필¡¦}" name="profile_callee_btn" />
         <button label="전화" name="start_call_btn" />
         <button label="전화 종료" name="end_call_btn" />
diff --git a/linden/indra/newview/skins/xui/ko/floater_instant_message_ad_hoc.xml b/linden/indra/newview/skins/xui/ko/floater_instant_message_ad_hoc.xml
index a026194..e99555b 100644
--- a/linden/indra/newview/skins/xui/ko/floater_instant_message_ad_hoc.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_instant_message_ad_hoc.xml
@@ -26,6 +26,15 @@
                         </panel>

                 </layout_panel>

         </layout_stack>

+        <string name="ringing">

+                음성 채팅에 참가 중...

+        </string>

+        <string name="connected">

+                연결되었습니다. 연결을 끊으려면 통화 종료 버튼을 클릭하십시오.

+        </string>

+        <string name="hang_up">

+                음성 채팅에서 나왔습니다.

+        </string>

         <text name="live_help_dialog">

                 *** 도움말 요청에 오신 것을 환영합니다 *** 

 먼저, F1을 누르거나 지식창고(http://secondlife.com/ support/)에서 SL 도움말 페이지를 확인하십시오.

diff --git a/linden/indra/newview/skins/xui/ko/floater_instant_message_group.xml b/linden/indra/newview/skins/xui/ko/floater_instant_message_group.xml
index 897e31f..b93d4e7 100644
--- a/linden/indra/newview/skins/xui/ko/floater_instant_message_group.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_instant_message_group.xml
@@ -42,4 +42,13 @@
                         </panel>

                 </layout_panel>

         </layout_stack>

+        <string name="ringing">

+                그룹 음성 채팅에 참가 중...

+        </string>

+        <string name="connected">

+                연결되었습니다. 연결을 끊으려면 통화 종료 버튼을 클릭하십시오.

+        </string>

+        <string name="hang_up">

+                그룹 음성 채팅에서 나왔습니다.

+        </string>

 </floater>

diff --git a/linden/indra/newview/skins/xui/ko/floater_lagmeter.xml b/linden/indra/newview/skins/xui/ko/floater_lagmeter.xml
index 0f4c24a..0795341 100644
--- a/linden/indra/newview/skins/xui/ko/floater_lagmeter.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_lagmeter.xml
@@ -90,7 +90,7 @@
                 600

         </text>

         <text name="network_ping_warning_ms">

-                250

+                300

         </text>

         <text name="network_ping_critical_msg">

                 연결 ping 시간이[NETWORK_PING_CRITICAL] ms이상입니다.

diff --git a/linden/indra/newview/skins/xui/ko/floater_land_holdings.xml b/linden/indra/newview/skins/xui/ko/floater_land_holdings.xml
index 59c818b..5956860 100644
--- a/linden/indra/newview/skins/xui/ko/floater_land_holdings.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_land_holdings.xml
@@ -21,18 +21,21 @@
                 현재 결제수단으로 허용되는 토지 보유량:
         </text>
         <text name="allowed_text">
-                0 제곱미터
+                [AREA]제곱미터
         </text>
         <text name="current_label">
                 현재 토지 보유량:
         </text>
         <text name="current_text">
-                0 제곱미터
+                [AREA]제곱미터
         </text>
         <text name="available_label">
                 토지 구매에 사용 가능:
         </text>
         <text name="available_text">
-                0 제곱미터
+                [AREA]제곱미터
         </text>
+        <string name="area_string">
+                [AREA]제곱미터
+        </string>
 </floater>
diff --git a/linden/indra/newview/skins/xui/ko/menu_inventory.xml b/linden/indra/newview/skins/xui/ko/menu_inventory.xml
index dcf71d2..5d3d1c2 100644
--- a/linden/indra/newview/skins/xui/ko/menu_inventory.xml
+++ b/linden/indra/newview/skins/xui/ko/menu_inventory.xml
@@ -46,7 +46,7 @@
         <menu_item_call label="아이템 벗기" name="Take Off Items" />
         <menu_item_call label="회의 채팅 시작" name="Conference Chat Folder" />
         <menu_item_call label="재생" name="Sound Play" />
-        <menu_item_call label="랜드마크로 텔���포트" name="Teleport To Landmark" />
+        <menu_item_call label="랜드마크 정���" name="Teleport To Landmark" />
         <menu_item_call label="월드에서 재생" name="Animation Play" />
         <menu_item_call label="로컬 재생" name="Animation Audition" />
         <menu_item_call label="메신저 전송" name="Send Instant Message" />
diff --git a/linden/indra/newview/skins/xui/ko/menu_viewer.xml b/linden/indra/newview/skins/xui/ko/menu_viewer.xml
index e30b28b..518d88c 100644
--- a/linden/indra/newview/skins/xui/ko/menu_viewer.xml
+++ b/linden/indra/newview/skins/xui/ko/menu_viewer.xml
@@ -203,6 +203,15 @@
                      name="Set Scripts to Not Running in Selection" />
                 <menu_item_separator label="-----------" name="separator6" />
                 <menu_item_call label="버그 신고" name="Report Bug..." />
+                <menu label="버그 신고" name="Bug Reporting">
+                        <menu_item_call label="일반 문제 추적하기" name="Public Issue Tracker..." />
+                        <menu_item_call label="일반 문제 추적하기 도움말" name="Publc Issue Tracker Help..." />
+                        <menu_item_call label="버그 보고 101" name="Bug Reporing 101..." />
+                        <menu_item_call label="보안 문제" name="Security Issues..." />
+                        <menu_item_call label="QA 위키" name="QA Wiki..." />
+                        <menu_item_separator label="-----------" name="separator7" />
+                        <menu_item_call label="버그 신고" name="Report Bug..." />
+                </menu>
         </menu>
         <menu label="도움말" name="Help">
                 <menu_item_call label="세컨드라이프 도움말" name="Second Life Help" />
diff --git a/linden/indra/newview/skins/xui/ko/notify.xml b/linden/indra/newview/skins/xui/ko/notify.xml
index 128abad..4f47ede 100644
--- a/linden/indra/newview/skins/xui/ko/notify.xml
+++ b/linden/indra/newview/skins/xui/ko/notify.xml
@@ -960,6 +960,11 @@ sculpted prim은 그 형태를 지정하는 특별한 텍스처를 요구합니�
                         [VOICE_CHANNEL_NAME]님은 당신의 통화를 받을 수 없습니다.  이제 공간이 존재하는 음성 채팅으로 다시 연결됩니다.
                 </message>
         </notify>
+        <notify name="VoiceChannelJoinFailed">
+                <message name="message">
+                        [VOICE_CHANNEL_NAME]에 연결하지 못했습니다. 나중에 다시 시도하십시오.  이제 공간이 존재하는 음성 채팅으로 다시 연결됩니다.
+                </message>
+        </notify>
         <notify name="VoiceLoginRetry">
                 <message name="message">
                         당신을 위한 음성 채널을 생성 중입니다. 이는 최대 1 분 정도 소요됩니다.
diff --git a/linden/indra/newview/skins/xui/ko/panel_avatar_classified.xml b/linden/indra/newview/skins/xui/ko/panel_avatar_classified.xml
index ca337a7..37c972c 100644
--- a/linden/indra/newview/skins/xui/ko/panel_avatar_classified.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_avatar_classified.xml
@@ -22,4 +22,10 @@
         <text name="ad_placed_paid">
                 게재 광고: [DATE], 게재 비용 L$[AMT]를 지불했습니다.
         </text>
+        <text name="update_txt">
+                업데이트
+        </text>
+        <text name="publish_txt">
+                게시하기¡¦
+        </text>
 </panel>
diff --git a/linden/indra/newview/skins/xui/ko/panel_friends.xml b/linden/indra/newview/skins/xui/ko/panel_friends.xml
index 87c8f2e..feff26c 100644
--- a/linden/indra/newview/skins/xui/ko/panel_friends.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_friends.xml
@@ -4,8 +4,8 @@
              tool_tip="Shift키 또는 Control키를 누른 상태에서 클릭하여 여러 명의 친구를 선택하십시오.">

                 <column label="이름" name="friend_name" />

         </scroll_list>

-        <panel name="rights_container" right="-10">

-                <text name="friend_name_label">

+        <panel name="rights_container" >

+                <text name="friend_name_label" right="-10">

                         친구를 선택하여 권한 변경

                 </text>

                 <check_box label="내 온라인 상태를 확인할 수 있습니다."

@@ -21,17 +21,21 @@
                 </text>

         </panel>

         <pad left="-95" />

-        <button label="메신저/전화" name="im_btn" tool_tip="메신저 세션 열기"

+        <button label="메신저/전화" name="im_btn" 

+                 tool_tip="메신저 세션 열기"

              width="90" />

         <button label="프로필" name="profile_btn"

-             tool_tip="그림, 그룹 및 기타 정보 표시" width="90" />

+             tool_tip="그림, 그룹 및 기타 정보 표시" 

+                 width="90" />

         <button label="텔레포트..." name="offer_teleport_btn"

              tool_tip="친구에게 내 현재 위치로 텔레포트를 제공함"

              width="90" />

-        <button label="지불¡¦}" name="pay_btn"

-             tool_tip="친구에게 린든 달러(L$) 주기" width="90" />

-        <button label="제거¡¦}" name="remove_btn"

-             tool_tip="이 사람을 내 친구 목록에서 삭제" width="90" />

+        <button label="지불" name="pay_btn"

+             tool_tip="친구에게 린든 달러(L$) 주기" 

+                 width="90" />

+        <button label="제거" name="remove_btn"

+             tool_tip="이 사람을 내 친구 목록에서 삭제" 

+                 width="90" />

         <button label="추가..." name="add_btn" tool_tip="주민에게 친구 추가 요청"

              width="90" />

 </panel>

diff --git a/linden/indra/newview/skins/xui/ko/panel_group_general.xml b/linden/indra/newview/skins/xui/ko/panel_group_general.xml
index 2dedb3a..5555fa6 100644
--- a/linden/indra/newview/skins/xui/ko/panel_group_general.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_group_general.xml
@@ -7,6 +7,9 @@
 
 마우스를 옵션 위로 가져가면 자세한 도움말이 표시됩니다.
         </text>
+        <string name="group_info_unchanged">
+                일반 그룹 정보가 변경되었습니다.
+        </string>
         <button label="?" label_selected="?" name="help_button" />
         <line_editor label="새 그룹 이름 입력" name="group_name_editor">
                 새 그룹 이름 입력
diff --git a/linden/indra/newview/skins/xui/ko/panel_group_land_money.xml b/linden/indra/newview/skins/xui/ko/panel_group_land_money.xml
index 15594ea..72797f2 100644
--- a/linden/indra/newview/skins/xui/ko/panel_group_land_money.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_group_land_money.xml
@@ -27,19 +27,19 @@
                 총 기여:
         </text>
         <text name="total_contributed_land_value">
-                0제곱미터
+                [AREA]제곱미터
         </text>
         <text name="total_land_in_use_label">
                 사용 중인 토지:
         </text>
         <text name="total_land_in_use_value">
-                0제곱미터
+                [AREA]제곱미터
         </text>
         <text name="land_available_label">
                 미사용중인 토지:
         </text>
         <text name="land_available_value">
-                0제곱미터
+                [AREA]제곱미터
         </text>
         <text name="your_contribution_label">
                 기여:
@@ -47,8 +47,11 @@
         <text name="your_contribution_max_value_append">
                 평방 미터
         </text>
+        <string name="land_contrib_error">
+                귀하의 토지 기부를 설정할 수 없습니다.
+        </string>
         <text name="your_contribution_max_value">
-                (최대 [AMOUNT])
+                제곱미터(최대 [AMOUNT])
         </text>
         <text name="group_over_limit_text">
                 그룹 회원은 사용 중인 토지를 지원하기 위해 더 많은 토지 신용을 기여해야 합니다.
diff --git a/linden/indra/newview/skins/xui/ko/panel_group_voting.xml b/linden/indra/newview/skins/xui/ko/panel_group_voting.xml
index 278362d..051a348 100644
--- a/linden/indra/newview/skins/xui/ko/panel_group_voting.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_group_voting.xml
@@ -87,7 +87,7 @@
                 그룹 투표 기록
         </text>
         <text name="instructions">
-                과거의 투표를 더블클릭하거나 하나를 선택하고 결과보기를 클릭하여 결과를 봅니다.
+                제안을 선택하고 결과보기를 클릭하여 결과를 봅니다.
         </text>
         <text name="history_list_lbl">
                 과거의 투표                                                         투표 종료
diff --git a/linden/indra/newview/skins/xui/ko/panel_overlaybar.xml b/linden/indra/newview/skins/xui/ko/panel_overlaybar.xml
index 143fc26..0f0df1e 100644
--- a/linden/indra/newview/skins/xui/ko/panel_overlaybar.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_overlaybar.xml
@@ -2,7 +2,7 @@
 <panel name="overlay">
         <button label="메신저 수령" label_selected="메신저 수령" name="IM Received"
              tool_tip="대기 중인 메시지가 있습니다. 메신지를 확인 하시려면 메신저 버튼을 클릭하십시오." />
-        <button label="용무 ���음으로 ��정" label_selected="용무 ���음으로 ��정"
+        <button label="다른 용무 ��" label_selected="다른 용무 ��"
              name="Set Not Busy"
              tool_tip="채팅과 메신저가 숨겨져 있습니다. 다른 용무 중을 해제하려면 여기를 클릭하십시오." />
         <button label="키 해제" label_selected="키 해제" name="Release Keys"
diff --git a/linden/indra/newview/skins/xui/ko/panel_place.xml b/linden/indra/newview/skins/xui/ko/panel_place.xml
index ec8a5fe..3d8eac1 100644
--- a/linden/indra/newview/skins/xui/ko/panel_place.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_place.xml
@@ -4,10 +4,10 @@
         <button label="지도에 표시" name="map_btn" />
         <button label="신청..." name="auction_btn" />
         <text name="traffic_text">
-                통행량: [TRAFFIC].
+                통행량: [TRAFFIC]
         </text>
         <text name="area_text">
-                면적: [AREA]sq. m.
+                면적: [AREA]제곱미터
         </text>
         <text name="forsale_text">
                 L$ [PRICE]에 판매.
@@ -15,4 +15,13 @@
         <text name="auction_text">
                 경매 ID [ID].
         </text>
+        <text name="server_update_text">
+                서버를 업데이트하지 않으면 토지소개를 볼 수 없습니다.
+        </text>
+        <text name="server_error_text">
+                현재 이 토지에 대한 소개를 볼 수 없습니다. 나중에 다시 시도하십시오.
+        </text>
+        <text name="server_forbidden_text">
+                접근 제한으로 인해 이 토지에 대한 소개를 볼 수 없습니다.  구획 소유자에게 권한을 확인하십시오.
+        </text>
 </panel>
diff --git a/linden/indra/newview/skins/xui/ko/panel_place_small.xml b/linden/indra/newview/skins/xui/ko/panel_place_small.xml
index b88ba33..df30b19 100644
--- a/linden/indra/newview/skins/xui/ko/panel_place_small.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_place_small.xml
@@ -3,4 +3,25 @@
         <button label="텔리포트" name="teleport_btn" />
         <button label="지도에 표시" name="map_btn" />
         <button label="신청..." name="auction_btn" />
+        <string name="traffic_text">
+                통행량: [TRAFFIC]
+        </string>
+        <string name="area_text">
+                면적: [AREA]제곱미터
+        </string>
+        <string name="forsale_text">
+                L$ [PRICE]에 판매.
+        </string>
+        <string name="auction_text">
+                경매 ID [ID].
+        </string>
+        <text name="server_update_text">
+                서버를 업데이트하지 않으면 지역 소개를 볼 수 없습니다.
+        </text>
+        <text name="server_error_text">
+                현재 이 토지에 대한 소개를 볼 수 없습니다. 나중에 다시 시도하십시오.
+        </text>
+        <text name="server_forbidden_text">
+                접근 제한으로 인해 이 토지에 대한 소개를 볼 수 없습니다.  구획 소유자에게 권한을 확인하십시오.
+        </text>
 </panel>
diff --git a/linden/indra/newview/skins/xui/ko/panel_preferences_general.xml b/linden/indra/newview/skins/xui/ko/panel_preferences_general.xml
index 655a054..9955686 100644
--- a/linden/indra/newview/skins/xui/ko/panel_preferences_general.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_preferences_general.xml
@@ -77,25 +77,25 @@
                         영어(English)
                 </combo_item>
                 <combo_item type="string" length="1" name="Chinese">
-                        중국어(Chinese) – 베타
+                        중국어(Chinese)
                 </combo_item>
                 <combo_item type="string" length="1" name="Deutsch(German)">
-                        독일어(German) – 베타
+                        독일어(German)
                 </combo_item>
                 <combo_item type="string" length="1" name="French">
-                        불어(French) – 베타
+                        불어(French)
                 </combo_item>
                 <combo_item type="string" length="1" name="(Japanese)">
-                        일본어 (Japanese) - 베타
+                        일본어 (Japanese)
                 </combo_item>
                 <combo_item type="string" length="1" name="(Korean)">
-                        한국어 (Korean) - 베타
+                        한국어 (Korean)
                 </combo_item>
                 <combo_item type="string" length="1" name="Portugese">
-                        포르투갈어 –베타
+                        포르투갈어(Portugese)
                 </combo_item>
                 <combo_item type="string" length="1" name="Spanish">
-                        스페인어 (Español) - 베타
+                        스페인어 (Español) 
                 </combo_item>
         </combo_box>
 </panel>
diff --git a/linden/indra/newview/skins/xui/ko/panel_region_general.xml b/linden/indra/newview/skins/xui/ko/panel_region_general.xml
index ce0537e..66ba650 100644
--- a/linden/indra/newview/skins/xui/ko/panel_region_general.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_region_general.xml
@@ -18,7 +18,7 @@
         <button label="?" name="land_resell_help" />
         <check_box label="구획 결합/분할 허용" name="allow_parcel_changes_check" />
         <button label="?" name="parcel_changes_help" />
-        <check_box label="구��� 검색 차단" name="block_parcel_search_check"
+        <check_box label="���지 검색 차단" name="block_parcel_search_check"
              tool_tip="사람들이 이 지역과 구획들의 검색 결과를 봅니다." />
         <button label="?" name="parcel_search_help" />
         <spinner label="에이전트 제한" name="agent_limit_spin" />
diff --git a/linden/indra/newview/skins/xui/ko/panel_status_bar.xml b/linden/indra/newview/skins/xui/ko/panel_status_bar.xml
index 99698f4..da61e70 100644
--- a/linden/indra/newview/skins/xui/ko/panel_status_bar.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_status_bar.xml
@@ -36,4 +36,6 @@
         <text name="bandwidth_tooltip">
                 대역폭
         </text>
+        <line_editor label="검색" name="search_editor" tool_tip="Second Life 검색" />
+        <button name="search_btn" tool_tip="Second Life 검색" />
 </panel>
diff --git a/linden/indra/newview/skins/xui/ko/panel_voice_options.xml b/linden/indra/newview/skins/xui/ko/panel_voice_options.xml
index 4ef500b..b3ac789 100644
--- a/linden/indra/newview/skins/xui/ko/panel_voice_options.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_voice_options.xml
@@ -11,7 +11,7 @@
                         아바타 위치에서 음성 채팅 청취

                 </radio_item>

         </radio_group>

-        <check_box label="Push-to-Talk 모드로 세컨드라이프  시작"

+        <check_box label="Push-to-Talk 모드로 세컨드라이프 시작"

              name="push_to_talk_check" />

         <check_box label="Push-to-Talk 토글 모드 사용" name="push_to_talk_toggle_check" />

         <text name="push_to_talk_label">

diff --git a/linden/libraries/include/llmozlib.h b/linden/libraries/include/llmozlib.h
index f22af81..ad850e5 100644
--- a/linden/libraries/include/llmozlib.h
+++ b/linden/libraries/include/llmozlib.h
@@ -143,6 +143,10 @@ class LLMozLib
                 bool canNavigateForward( int browserWindowIdIn );
                 bool navigateForward( int browserWindowIdIn );
 
+                // set/clear URL to redirect to when a 404 page is reached
+                bool set404RedirectUrl( int browser_window_in, std::string redirect_url );
+                bool clr404RedirectUrl( int browser_window_in );
+
                 // access to rendered bitmap data
                 const unsigned char* grabBrowserWindow( int browserWindowIdIn );
                 const unsigned char* getBrowserWindowPixels( int browserWindowIdIn );